From jake_goerzen at users.sourceforge.net Tue Sep 2 00:36:33 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 1 Sep 2014 22:36:33 +0000 Subject: SF.net SVN: gar:[24062] csw/mgar/pkg/stellarium/trunk/Makefile Message-ID: <3hn5qp6gBNzZ6@mail.opencsw.org> Revision: 24062 http://sourceforge.net/p/gar/code/24062 Author: jake_goerzen Date: 2014-09-01 22:36:30 +0000 (Mon, 01 Sep 2014) Log Message: ----------- stellarium: add one more no-direct-binding override Modified Paths: -------------- csw/mgar/pkg/stellarium/trunk/Makefile Modified: csw/mgar/pkg/stellarium/trunk/Makefile =================================================================== --- csw/mgar/pkg/stellarium/trunk/Makefile 2014-09-01 22:00:11 UTC (rev 24061) +++ csw/mgar/pkg/stellarium/trunk/Makefile 2014-09-01 22:36:30 UTC (rev 24062) @@ -41,6 +41,7 @@ CHECKPKG_OVERRIDES_CSWstellarium += no-direct-binding|/opt/csw/bin/stellarium|is|not|directly|bound|to|soname|libQtScript.so.4 CHECKPKG_OVERRIDES_CSWstellarium += no-direct-binding|/opt/csw/bin/stellarium|is|not|directly|bound|to|soname|libintl.so.8 CHECKPKG_OVERRIDES_CSWstellarium += no-direct-binding|/opt/csw/bin/stellarium|is|not|directly|bound|to|soname|libstdc++.so.6 +CHECKPKG_OVERRIDES_CSWstellarium += no-direct-binding|/opt/csw/bin/stellarium|is|not|directly|bound|to|soname|libGLU.so.1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Wed Sep 3 22:49:53 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Wed, 3 Sep 2014 20:49:53 +0000 Subject: SF.net SVN: gar:[24064] csw/mgar/pkg/perl/trunk Message-ID: <3hpHMh6F5Lz1Hj@mail.opencsw.org> Revision: 24064 http://sourceforge.net/p/gar/code/24064 Author: claudio_sf Date: 2014-09-03 20:49:48 +0000 (Wed, 03 Sep 2014) Log Message: ----------- perl/trunk: Perl 5.20.1-RC1 test run Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile csw/mgar/pkg/perl/trunk/checksums Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-09-02 14:10:14 UTC (rev 24063) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-09-03 20:49:48 UTC (rev 24064) @@ -1,5 +1,5 @@ NAME = perl -VERSION = 5.20.0 +VERSION = 5.20.1-RC1 VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) #CATEGORIES = lang GARTYPE = v2 Modified: csw/mgar/pkg/perl/trunk/checksums =================================================================== --- csw/mgar/pkg/perl/trunk/checksums 2014-09-02 14:10:14 UTC (rev 24063) +++ csw/mgar/pkg/perl/trunk/checksums 2014-09-03 20:49:48 UTC (rev 24064) @@ -1 +1 @@ -20cbecd4e9e880ee7a50a136c8b1484e perl-5.20.0.tar.bz2 +bf7022bca93ae41485b62221c31f1e55 perl-5.20.1-RC1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed Sep 3 22:52:29 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Wed, 3 Sep 2014 20:52:29 +0000 Subject: SF.net SVN: gar:[24065] csw/mgar/pkg Message-ID: <3hpHQk3WY3z1M0@mail.opencsw.org> Revision: 24065 http://sourceforge.net/p/gar/code/24065 Author: rmottola Date: 2014-09-03 20:52:28 +0000 (Wed, 03 Sep 2014) Log Message: ----------- gs_projectcenter/trunk: PC with solaris fixes Added Paths: ----------- csw/mgar/pkg/gs_projectcenter/ csw/mgar/pkg/gs_projectcenter/Makefile csw/mgar/pkg/gs_projectcenter/branches/ csw/mgar/pkg/gs_projectcenter/tags/ csw/mgar/pkg/gs_projectcenter/trunk/ csw/mgar/pkg/gs_projectcenter/trunk/Makefile csw/mgar/pkg/gs_projectcenter/trunk/checksums csw/mgar/pkg/gs_projectcenter/trunk/files/ csw/mgar/pkg/gs_projectcenter/trunk/files/0001-solaris-fix.patch Added: csw/mgar/pkg/gs_projectcenter/Makefile =================================================================== --- csw/mgar/pkg/gs_projectcenter/Makefile (rev 0) +++ csw/mgar/pkg/gs_projectcenter/Makefile 2014-09-03 20:52:28 UTC (rev 24065) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gs_projectcenter/trunk =================================================================== --- csw/mgar/pkg/gs_projectcenter/trunk 2014-09-03 20:49:48 UTC (rev 24064) +++ csw/mgar/pkg/gs_projectcenter/trunk 2014-09-03 20:52:28 UTC (rev 24065) Property changes on: csw/mgar/pkg/gs_projectcenter/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gs_projectcenter/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_projectcenter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gs_projectcenter/trunk/Makefile 2014-09-03 20:52:28 UTC (rev 24065) @@ -0,0 +1,48 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ProjectCenter +VERSION = 0.6.1 +GARTYPE = v2 + +DESCRIPTION = GNUstep IDE +define BLURB + GNUstep IDE for creating Tools and Applications with Makefile generation. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui CSWgnustep-back + +MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-solaris-fix.patch + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +# now special targets for build and install so that we can source +# GNUstep.sh before +# configure is skipped +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + +include gar/category.mk + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gs_projectcenter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gs_projectcenter/trunk/checksums =================================================================== --- csw/mgar/pkg/gs_projectcenter/trunk/checksums (rev 0) +++ csw/mgar/pkg/gs_projectcenter/trunk/checksums 2014-09-03 20:52:28 UTC (rev 24065) @@ -0,0 +1 @@ +c74742f931136829f55a319bedbd37ac ProjectCenter-0.6.1.tar.gz Added: csw/mgar/pkg/gs_projectcenter/trunk/files/0001-solaris-fix.patch =================================================================== --- csw/mgar/pkg/gs_projectcenter/trunk/files/0001-solaris-fix.patch (rev 0) +++ csw/mgar/pkg/gs_projectcenter/trunk/files/0001-solaris-fix.patch 2014-09-03 20:52:28 UTC (rev 24065) @@ -0,0 +1,58 @@ +Index: Modules/Debuggers/ProjectCenter/PTYView.m +=================================================================== +--- src.orig/Modules/Debuggers/ProjectCenter/PTYView.m (revision 38050) ++++ src/Modules/Debuggers/ProjectCenter/PTYView.m (working copy) +@@ -20,8 +20,20 @@ + ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#import "PTYView.h" + ++/* define this if you need the forkpty replacement and it is not automatically ++activated */ ++#undef USE_FORKPTY_REPLACEMENT + ++/* check for solaris */ ++#if (defined (__SVR4) && defined (__sun)) || defined(__SOLARIS__) ++#ifndef __SOLARIS__ ++#define __SOLARIS__ 1 ++#endif ++#define USE_FORKPTY_REPLACEMENT 0 ++#endif ++ + #include + #include + +@@ -50,11 +62,6 @@ + #define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter] + #endif + +-/* check for solaris */ +-#if defined (__SVR4) && defined (__sun) +-#define __SOLARIS__ 1 +-#define USE_FORKPTY_REPLACEMENT 1 +-#endif + + #if defined(__SOLARIS__) + #include +@@ -65,7 +72,6 @@ + # include + #endif + +-#import "PTYView.h" + + #ifdef USE_FORKPTY_REPLACEMENT + int openpty(int *amaster, int *aslave, char *name, const struct termios *termp, const struct winsize *winp) +Index: Modules/Debuggers/ProjectCenter/GNUmakefile +=================================================================== +--- src.oric/Modules/Debuggers/ProjectCenter/GNUmakefile (revision 38050) ++++ src/Modules/Debuggers/ProjectCenter/GNUmakefile (working copy) +@@ -49,7 +49,7 @@ + PTYView.m + + +-ADDITIONAL_NATIVE_LIBS += util ++#ADDITIONAL_NATIVE_LIBS += util + + include ../../GNUmakefile.bundles + include $(GNUSTEP_MAKEFILES)/bundle.make This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Sep 6 09:44:46 2014 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 6 Sep 2014 07:44:46 +0000 Subject: SF.net SVN: gar:[24066] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: <3hqnpS6P3qzDy@mail.opencsw.org> Revision: 24066 http://sourceforge.net/p/gar/code/24066 Author: rthurner Date: 2014-09-06 07:44:43 +0000 (Sat, 06 Sep 2014) Log Message: ----------- subversion/trunk: svn, add overrides temporary Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2014-09-03 20:52:28 UTC (rev 24065) +++ csw/mgar/pkg/subversion/trunk/Makefile 2014-09-06 07:44:43 UTC (rev 24066) @@ -77,6 +77,7 @@ 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) @@ -101,6 +102,7 @@ RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2 + PACKAGES += CSWjavasvn SPKG_DESC_CSWjavasvn = Subversion Java Language Binding PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.* @@ -153,7 +155,7 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby1-9-1-1 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1 @@ -164,7 +166,6 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWrbsvn += dependency-on-stub|ruby_stub PACKAGES += CSWpythonsvn SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding @@ -188,50 +189,50 @@ CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWpython # 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|CSWlibiconv2 +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 +CHECKPKG_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|CSWlibiconv2 # 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 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 Sep 7 08:45:17 2014 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 7 Sep 2014 06:45:17 +0000 Subject: SF.net SVN: gar:[24068] csw/mgar/pkg/mercurial/trunk Message-ID: <3hrNRN0hBjzTW@mail.opencsw.org> Revision: 24068 http://sourceforge.net/p/gar/code/24068 Author: rthurner Date: 2014-09-07 06:45:14 +0000 (Sun, 07 Sep 2014) Log Message: ----------- mercurial/trunk: update to hg-3.1.1 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-09-06 08:00:28 UTC (rev 24067) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2014-09-07 06:45:14 UTC (rev 24068) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.1 +VERSION = 3.1.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2014-09-06 08:00:28 UTC (rev 24067) +++ csw/mgar/pkg/mercurial/trunk/checksums 2014-09-07 06:45:14 UTC (rev 24068) @@ -1 +1 @@ -d3916736a9d356899191409e546b5964 mercurial-3.1.tar.gz +5a530bb472b3cb306b757c8f5df91358 mercurial-3.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 12:22:03 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 10:22:03 +0000 Subject: SF.net SVN: gar:[24070] csw/mgar/pkg/gnutls3/trunk Message-ID: <3hrTFN5wB8zYm@mail.opencsw.org> Revision: 24070 http://sourceforge.net/p/gar/code/24070 Author: chninkel Date: 2014-09-07 10:22:01 +0000 (Sun, 07 Sep 2014) Log Message: ----------- gnutls3/trunk: updated to 3.1.26 Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile csw/mgar/pkg/gnutls3/trunk/checksums Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2014-09-07 10:17:18 UTC (rev 24069) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2014-09-07 10:22:01 UTC (rev 24070) @@ -1,5 +1,5 @@ NAME = gnutls -VERSION = 3.1.25 +VERSION = 3.1.26 DESCRIPTION = GNU Transport Layer Security libraries and tools define BLURB Modified: csw/mgar/pkg/gnutls3/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls3/trunk/checksums 2014-09-07 10:17:18 UTC (rev 24069) +++ csw/mgar/pkg/gnutls3/trunk/checksums 2014-09-07 10:22:01 UTC (rev 24070) @@ -1 +1 @@ -2118ac8199fd3b3f0509ee4854d1d942 gnutls-3.1.25.tar.xz +293c6518e7316ad20f2da03c7268865e gnutls-3.1.26.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 12:23:23 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 10:23:23 +0000 Subject: SF.net SVN: gar:[24071] csw/mgar/pkg/jq/trunk Message-ID: <3hrTGv3s5rzd2@mail.opencsw.org> Revision: 24071 http://sourceforge.net/p/gar/code/24071 Author: chninkel Date: 2014-09-07 10:23:22 +0000 (Sun, 07 Sep 2014) Log Message: ----------- jq/trunk: updated to 1.4 Modified Paths: -------------- csw/mgar/pkg/jq/trunk/Makefile csw/mgar/pkg/jq/trunk/checksums Modified: csw/mgar/pkg/jq/trunk/Makefile =================================================================== --- csw/mgar/pkg/jq/trunk/Makefile 2014-09-07 10:22:01 UTC (rev 24070) +++ csw/mgar/pkg/jq/trunk/Makefile 2014-09-07 10:23:22 UTC (rev 24071) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = jq -VERSION = 1.3 +VERSION = 1.4 GARTYPE = v2 DESCRIPTION = A lightweight and flexible command-line JSON processor. Modified: csw/mgar/pkg/jq/trunk/checksums =================================================================== --- csw/mgar/pkg/jq/trunk/checksums 2014-09-07 10:22:01 UTC (rev 24070) +++ csw/mgar/pkg/jq/trunk/checksums 2014-09-07 10:23:22 UTC (rev 24071) @@ -1 +1 @@ -26081b05d22525eca5cbdd8f9f4db17d jq-1.3.tar.gz +e3c75a4f805bb5342c9f4b3603fb248f jq-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 12:26:05 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 10:26:05 +0000 Subject: SF.net SVN: gar:[24072] csw/mgar/pkg/lftp/trunk Message-ID: <3hrTL16pT6zhS@mail.opencsw.org> Revision: 24072 http://sourceforge.net/p/gar/code/24072 Author: chninkel Date: 2014-09-07 10:26:04 +0000 (Sun, 07 Sep 2014) Log Message: ----------- lftp/trunk: updated to 4.5.5 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2014-09-07 10:23:22 UTC (rev 24071) +++ csw/mgar/pkg/lftp/trunk/Makefile 2014-09-07 10:26:04 UTC (rev 24072) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = lftp -VERSION = 4.4.15 +VERSION = 4.5.5 GARTYPE = v2 DESCRIPTION = A sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2014-09-07 10:23:22 UTC (rev 24071) +++ csw/mgar/pkg/lftp/trunk/checksums 2014-09-07 10:26:04 UTC (rev 24072) @@ -1 +1 @@ -fd07f97f99c767309660ab1b1ac31a00 lftp-4.4.15.tar.gz +656bcda0b5c628b60e5252c06071140f lftp-4.5.5.tar.gz Modified: csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes =================================================================== --- csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes 2014-09-07 10:23:22 UTC (rev 24071) +++ csw/mgar/pkg/lftp/trunk/files/CSWlftp.cswreleasenotes 2014-09-07 10:26:04 UTC (rev 24072) @@ -1,3 +1,9 @@ +lftp (4.5.5,REV=2014.09.07) unstable + + * New upstream release. + + -- Yann Rouillard Sun, 07 Sep 2014 12:25:42 +0100 + lftp (4.4.15,REV=2014.02.18) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 12:29:28 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 10:29:28 +0000 Subject: SF.net SVN: gar:[24073] csw/mgar/pkg/openssh/trunk Message-ID: <3hrTR92xwNzll@mail.opencsw.org> Revision: 24073 http://sourceforge.net/p/gar/code/24073 Author: chninkel Date: 2014-09-07 10:29:27 +0000 (Sun, 07 Sep 2014) Log Message: ----------- openssh/trunk: updated to current 6.7p1 snapshot Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-6.7p1-gsskex-all-20140907.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-6.6p1-gsskex-all-20140320.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2014-09-07 10:26:04 UTC (rev 24072) +++ csw/mgar/pkg/openssh/trunk/Makefile 2014-09-07 10:29:27 UTC (rev 24073) @@ -12,7 +12,7 @@ ###### Package information ####### NAME = openssh -VERSION = 6.6p1 +VERSION = 6.7p1 GSSKEX_PATCH_VERSION = 6.6p1 GSSKEX_PATCH_DATE = 20140320 GARTYPE = v2 @@ -36,7 +36,6 @@ SPKG_DESC_CSWopenssh = OpenSSH Secure Shell server BUILD_DEP_PKGS = CSWautoconf CSWlibssl-dev CSWlibz-dev 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 @@ -116,13 +115,15 @@ ###### Upstream and OpenCSW files information ####### -MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/ +MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/ http://www.mindrot.org/openssh_snap/ UPSTREAM_MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*p\d+).tar.gz -DISTFILES = $(NAME)-$(VERSION).tar.gz +#DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = openssh-SNAP-20140907.tar.gz +DISTNAME = openssh DISTFILES += CSWopenssh.cswreleasenotes DISTFILES += CSWopenssh_client.cswreleasenotes DISTFILES += cswusergroup Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2014-09-07 10:26:04 UTC (rev 24072) +++ csw/mgar/pkg/openssh/trunk/checksums 2014-09-07 10:29:27 UTC (rev 24073) @@ -1 +1 @@ -3e9800e6bca1fbac0eea4d41baa7f239 openssh-6.6p1.tar.gz +3c66cb6d7c729ba9963eb7af7ff06f51 openssh-SNAP-20140907.tar.gz Modified: csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes 2014-09-07 10:26:04 UTC (rev 24072) +++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh.cswreleasenotes 2014-09-07 10:29:27 UTC (rev 24073) @@ -1,3 +1,10 @@ +openssh (6.7p1,REV=UNRELEASED) unstable + + * New upstream release. + * Updated the GSSAPI key exchange patch + + -- Yann Rouillard Sun, 07 Sep 2014 12:27:42 +0100 + openssh (6.6p1,REV=2014.03.20) unstable * New upstream release. Modified: csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes 2014-09-07 10:26:04 UTC (rev 24072) +++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh_client.cswreleasenotes 2014-09-07 10:29:27 UTC (rev 24073) @@ -1,3 +1,10 @@ +openssh (6.7p1,REV=UNRELEASED) unstable + + * New upstream release. + * Updated the GSSAPI key exchange patch + + -- Yann Rouillard Sun, 07 Sep 2014 12:27:42 +0100 + openssh (6.6p1,REV=2014.03.20) unstable * New upstream release. Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-6.6p1-gsskex-all-20140320.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-6.6p1-gsskex-all-20140320.patch 2014-09-07 10:26:04 UTC (rev 24072) +++ csw/mgar/pkg/openssh/trunk/files/openssh-6.6p1-gsskex-all-20140320.patch 2014-09-07 10:29:27 UTC (rev 24073) @@ -1,2938 +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. -+ -+ - [ 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 -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+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) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ 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) -+ -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); -+ 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 ], -+ [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 ], -+ [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 - - #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 -@@ -94,6 +98,11 @@ - #ifdef HAVE_EVP_SHA256 - { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, - #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, -1}, - }; - -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,7 +73,10 @@ - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, - KEX_ECDH_SHA2, - KEX_C25519_SHA256, -+ 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 -+#include -+ -+#include -+ -+#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->hash_alg, -+ 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_bn(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 -+ -+#include -+#include -+ -+#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->hash_alg, -+ 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_bn(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,7 +1709,14 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; - kex->kex[KEX_ECDH_SHA2] = kexecdh_server; - kex->kex[KEX_C25519_SHA256] = kexc25519_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_GSSUSEROK = 46, MONITOR_ANS_GSSUSEROK = 47, - MONITOR_REQ_GSSCHECKMIC = 48, MONITOR_ANS_GSSCHECKMIC = 49, - MONITOR_REQ_TERM = 50, -+ -+ 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,11 +242,31 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; - kex->kex[KEX_ECDH_SHA2] = kexecdh_client; - kex->kex[KEX_C25519_SHA256] = kexc25519_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 -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -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; - kex->kex[KEX_C25519_SHA256] = kexc25519_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 Added: csw/mgar/pkg/openssh/trunk/files/openssh-6.7p1-gsskex-all-20140907.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-6.7p1-gsskex-all-20140907.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-6.7p1-gsskex-all-20140907.patch 2014-09-07 10:29:27 UTC (rev 24073) @@ -0,0 +1,2937 @@ +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. ++ ++ - [ 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 ++ ++ ++20060829 ++ - [ gss-serv-krb5.c ] ++ Fix CCAPI credentials cache name when creating KRB5CCNAME environment ++ variable ++ ++20060828 ++ - [ gss-genr.c ] ++ Avoid Heimdal context freeing problem ++ ++ ++20060818 ++ - [ gss-genr.c ssh-gss.h sshconnect2.c ] ++ Make sure that SPENGO is disabled ++ ++ ++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) ++ ++ - [ gss-serv-krb5.c ] ++ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H ++ (from jbasney AT ncsa.uiuc.edu) ++ ++ - [ 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) ++ +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 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 12:31:05 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 10:31:05 +0000 Subject: SF.net SVN: gar:[24074] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: <3hrTRn15pKznF@mail.opencsw.org> Revision: 24074 http://sourceforge.net/p/gar/code/24074 Author: chninkel Date: 2014-09-07 10:31:04 +0000 (Sun, 07 Sep 2014) Log Message: ----------- openssh/trunk: enabled tests Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2014-09-07 10:29:27 UTC (rev 24073) +++ csw/mgar/pkg/openssh/trunk/Makefile 2014-09-07 10:31:04 UTC (rev 24074) @@ -178,7 +178,7 @@ # the chroot usage by sshd EXTRA_LD_OPTIONS = -z nolazyload -TEST_SCRIPTS = +TEST_TARGET = tests include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 12:38:58 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 10:38:58 +0000 Subject: SF.net SVN: gar:[24075] csw/mgar/pkg/jq/trunk Message-ID: <3hrTcw6504ztJ@mail.opencsw.org> Revision: 24075 http://sourceforge.net/p/gar/code/24075 Author: chninkel Date: 2014-09-07 10:38:58 +0000 (Sun, 07 Sep 2014) Log Message: ----------- jq/trunk: remove patch 0001-remove-valgrind-usage-in-tests.patch as it was fixed upstream Modified Paths: -------------- csw/mgar/pkg/jq/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch Modified: csw/mgar/pkg/jq/trunk/Makefile =================================================================== --- csw/mgar/pkg/jq/trunk/Makefile 2014-09-07 10:31:04 UTC (rev 24074) +++ csw/mgar/pkg/jq/trunk/Makefile 2014-09-07 10:38:58 UTC (rev 24075) @@ -28,10 +28,6 @@ MASTER_SITES = http://stedolan.github.io/jq/download/source/ DISTFILES = $(DISTNAME).tar.gz -# The jq test suite uses valgrind to check for memory leaks -# but we don't have it on Solaris -PATCHFILES += 0001-remove-valgrind-usage-in-tests.patch - ##### Build and installation information ##### GARCOMPILER = GNU Deleted: csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch =================================================================== --- csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch 2014-09-07 10:31:04 UTC (rev 24074) +++ csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch 2014-09-07 10:38:58 UTC (rev 24075) @@ -1,22 +0,0 @@ -From 6844b92414bfc868430485a64606411f8db5d6af Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Sun, 13 Oct 2013 17:19:50 +0200 -Subject: [PATCH] remove valgrind usage in tests - ---- - tests/run | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/run b/tests/run -index a4b5b32..42ecf58 100755 ---- a/tests/run -+++ b/tests/run -@@ -1,3 +1,3 @@ - #!/bin/sh - --cat $@ | valgrind --error-exitcode=1 -q --leak-check=full ./jq --run-tests -\ No newline at end of file -+cat $@ | ./jq --run-tests --- -1.8.3.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 13:58:03 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 11:58:03 +0000 Subject: SF.net SVN: gar:[24078] csw/mgar/pkg/screen/trunk Message-ID: <3hrWNB1vXkzxt@mail.opencsw.org> Revision: 24078 http://sourceforge.net/p/gar/code/24078 Author: chninkel Date: 2014-09-07 11:57:40 +0000 (Sun, 07 Sep 2014) Log Message: ----------- screen/trunk: updated to 4.2.1 Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2014-09-07 11:47:55 UTC (rev 24077) +++ csw/mgar/pkg/screen/trunk/Makefile 2014-09-07 11:57:40 UTC (rev 24078) @@ -1,5 +1,5 @@ NAME = screen -VERSION = 4.2.0 +VERSION = 4.2.1 GARTYPE = v2 DESCRIPTION = A window manager that multiplexes a physical terminal. Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2014-09-07 11:47:55 UTC (rev 24077) +++ csw/mgar/pkg/screen/trunk/checksums 2014-09-07 11:57:40 UTC (rev 24078) @@ -1 +1 @@ -e5199156a8ac863bbf92495a7638b612 screen-4.2.0.tar.gz +419a0594e2b25039239af8b90eda7d92 screen-4.2.1.tar.gz Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-09-07 11:47:55 UTC (rev 24077) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2014-09-07 11:57:40 UTC (rev 24078) @@ -1,3 +1,9 @@ +screen (4.2.1,REV=2014.09.07) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 07 Sep 2014 13:53:14 +0200 + screen (4.2.0,REV=2014.04.22) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 14:40:39 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 12:40:39 +0000 Subject: SF.net SVN: gar:[24080] csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch Message-ID: <3hrXKK5m25z12R@mail.opencsw.org> Revision: 24080 http://sourceforge.net/p/gar/code/24080 Author: chninkel Date: 2014-09-07 12:40:39 +0000 (Sun, 07 Sep 2014) Log Message: ----------- screen/trunk: updated opencsw paths for new release Modified Paths: -------------- csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch Modified: csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch 2014-09-07 12:05:53 UTC (rev 24079) +++ csw/mgar/pkg/screen/trunk/files/opencsw_paths.patch 2014-09-07 12:40:39 UTC (rev 24080) @@ -36,7 +36,7 @@ users with a 'message of the -day'. Typically installed in a global /local/etc/screenrc. +day'. Typically installed in a global /etc/opt/csw/screenrc. - The option \*Q-n\*U may be used to suppress the line feed. + The option \*Q\-n\*U may be used to suppress the line feed. See also \*Qsleep\*U. Echo is also useful for online checking of environment variables. @@ -4846,21 +4846,17 @@ Examples in the @@ -51,17 +51,17 @@ .IP $HOME/.screenrc -Read in after /usr/local/etc/screenrc +Read in after /etc/opt/csw/screenrc - .IP $SCREENDIR/S- --.IP /local/screens/S- -+.IP /var/opt/csw/run/screens/S- + .IP $SCREENDIR/S\- +-.IP /local/screens/S\- ++.IP /var/opt/csw/run/screens/S\- Socket directories (default) --.IP /usr/tmp/screens/S- +-.IP /usr/tmp/screens/S\- -Alternate socket directories. .IP "/.termcap" Written by the "termcap" output function --.IP /usr/tmp/screens/screen-exchange +-.IP /usr/tmp/screens/screen\-exchange -or - .IP /tmp/screen-exchange + .IP /tmp/screen\-exchange .I screen `interprocess communication buffer' diff --git a/doc/screen.texinfo b/doc/screen.texinfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 7 18:24:23 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 7 Sep 2014 16:24:23 +0000 Subject: SF.net SVN: gar:[24081] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: <3hrdHT3QX3z173@mail.opencsw.org> Revision: 24081 http://sourceforge.net/p/gar/code/24081 Author: chninkel Date: 2014-09-07 16:24:22 +0000 (Sun, 07 Sep 2014) Log Message: ----------- gnutls3/trunk: force regeneration of files created by autogen to avoid header mismatch Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2014-09-07 12:40:39 UTC (rev 24080) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2014-09-07 16:24:22 UTC (rev 24081) @@ -88,3 +88,8 @@ include gar/category.mk +# We must regerenere this file with autogen otherwise we run into an error like this: +# error option template version mismatches autoopts/options.h header +# We simply delete them as they will be regenerated thanks to the Makefile rules +pre-build: + gfind $(WORKSRC) -regex ".*/src/.*-args.c" -delete This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 8 11:41:01 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 8 Sep 2014 09:41:01 +0000 Subject: SF.net SVN: gar:[24083] csw/mgar/pkg/php5/trunk/Makefile Message-ID: <3hs4Hk4kpxz1JS@mail.opencsw.org> Revision: 24083 http://sourceforge.net/p/gar/code/24083 Author: dmichelsen Date: 2014-09-08 09:40:59 +0000 (Mon, 08 Sep 2014) Log Message: ----------- php5/trunk: Update dependency to libtidy, reenable support for sqlite3 Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2014-09-07 16:25:55 UTC (rev 24082) +++ csw/mgar/pkg/php5/trunk/Makefile 2014-09-08 09:40:59 UTC (rev 24083) @@ -205,7 +205,7 @@ $(eval $(call php5_subpackage,sysvmsg,)) $(eval $(call php5_subpackage,sysvsem,)) $(eval $(call php5_subpackage,sysvshm,)) -$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99)) +$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99-0)) $(eval $(call php5_subpackage,tokenizer,)) $(eval $(call php5_subpackage,wddx,)) $(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) @@ -257,7 +257,6 @@ RUNTIME_DEP_PKGS_CSWphp5-tokenizer += CSWlibz1 RUNTIME_DEP_PKGS_CSWphp5-hash += CSWlibz1 RUNTIME_DEP_PKGS_CSWphp5-sysvshm += CSWlibz1 -RUNTIME_DEP_PKGS_CSWphp5-tidy += CSWlibtidy0-99-0 RUNTIME_DEP_PKGS_CSWphp5-tidy += CSWlibz1 RUNTIME_DEP_PKGS_CSWphp5-gmp += CSWlibz1 RUNTIME_DEP_PKGS_CSWphp5-sysvmsg += CSWlibz1 @@ -480,8 +479,8 @@ CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(bindir)/ -#CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) -CONFIGURE_ARGS += --without-pdo-sqlite +CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) +#CONFIGURE_ARGS += --without-pdo-sqlite CONFIGURE_ARGS += --with-pear=shared CONFIGURE_ARGS += --with-pgsql=shared,$(bindir)/ CONFIGURE_ARGS += --with-png-dir=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Tue Sep 9 00:01:40 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Mon, 8 Sep 2014 22:01:40 +0000 Subject: SF.net SVN: gar:[24084] csw/mgar/pkg Message-ID: <3hsNkD0y36z5Q@mail.opencsw.org> Revision: 24084 http://sourceforge.net/p/gar/code/24084 Author: rmottola Date: 2014-09-08 22:01:38 +0000 (Mon, 08 Sep 2014) Log Message: ----------- gs_PRICE/trunk: initial PRICE release Added Paths: ----------- csw/mgar/pkg/gs_PRICE/ csw/mgar/pkg/gs_PRICE/Makefile csw/mgar/pkg/gs_PRICE/branches/ csw/mgar/pkg/gs_PRICE/tags/ csw/mgar/pkg/gs_PRICE/trunk/ csw/mgar/pkg/gs_PRICE/trunk/Makefile csw/mgar/pkg/gs_PRICE/trunk/checksums csw/mgar/pkg/gs_PRICE/trunk/files/ Added: csw/mgar/pkg/gs_PRICE/Makefile =================================================================== --- csw/mgar/pkg/gs_PRICE/Makefile (rev 0) +++ csw/mgar/pkg/gs_PRICE/Makefile 2014-09-08 22:01:38 UTC (rev 24084) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/gs_PRICE/trunk =================================================================== --- csw/mgar/pkg/gs_PRICE/trunk 2014-09-08 09:40:59 UTC (rev 24083) +++ csw/mgar/pkg/gs_PRICE/trunk 2014-09-08 22:01:38 UTC (rev 24084) Property changes on: csw/mgar/pkg/gs_PRICE/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/gs_PRICE/trunk/Makefile =================================================================== --- csw/mgar/pkg/gs_PRICE/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gs_PRICE/trunk/Makefile 2014-09-08 22:01:38 UTC (rev 24084) @@ -0,0 +1,46 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = PRICE +VERSION = 1.2.0 +GARTYPE = v2 + +DESCRIPTION = Image viewing and filtering program +define BLURB + Raster image viewing, manipulation, filtering and enhancement program based on GNUstep. Capable of opening several documents at once and running high quality filters on them. +endef + +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc +DEP_PKGS = CSWgnustep-make CSWgnustep-base CSWgnustep-gui CSWgnustep-back + +MASTER_SITES = http://downloads.sourceforge.net/project/price/PRICE%20source/$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz + +#we absolutely need GCC for Objective-C support. The only alternative in the future would be clang +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +# now special targets for build and install so that we can source +# GNUstep.sh before +# configure is skipped +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = sourcegs +INSTALL_SCRIPTS = sourcegs + +# Disable test scripts for now +TEST_SCRIPTS = none +SKIPTEST = 1 + +include gar/category.mk + +build-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) + @$(MAKECOOKIE) + +install-sourcegs: + . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) install DESTDIR=$(DESTDIR) + @$(MAKECOOKIE) + +test-none : + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/gs_PRICE/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/gs_PRICE/trunk/checksums =================================================================== --- csw/mgar/pkg/gs_PRICE/trunk/checksums (rev 0) +++ csw/mgar/pkg/gs_PRICE/trunk/checksums 2014-09-08 22:01:38 UTC (rev 24084) @@ -0,0 +1 @@ +e35f0fa12caaf94c0028e4dea7ef96c7 PRICE-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Fri Sep 12 17:01:18 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Fri, 12 Sep 2014 15:01:18 +0000 Subject: SF.net SVN: gar:[24088] csw/mgar/pkg/gnustep-make/trunk/Makefile Message-ID: <3hvgCK50J4z1SR@mail.opencsw.org> Revision: 24088 http://sourceforge.net/p/gar/code/24088 Author: rmottola Date: 2014-09-12 15:01:17 +0000 (Fri, 12 Sep 2014) Log Message: ----------- gnustep-make/trunk: file check override Modified Paths: -------------- csw/mgar/pkg/gnustep-make/trunk/Makefile Modified: csw/mgar/pkg/gnustep-make/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-09-11 13:12:13 UTC (rev 24087) +++ csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-09-12 15:01:17 UTC (rev 24088) @@ -18,6 +18,9 @@ #we absolutely need GCC for Objective-C support. The only alternative in the future would be clang GARCOMPILER = GNU +#we override this, it is harmless, it is for Debian only +CHECKPKG_OVERRIDES_CSWgnustep-make += file-with-bad-content|/usr/share|root/opt/csw/GNUstep/System/Library/Makefiles/deb-equivs-control.template + #we have no tests anyway SKIPTEST = 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 Sep 13 07:45:05 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Sep 2014 05:45:05 +0000 Subject: SF.net SVN: gar:[24089] csw/mgar/pkg Message-ID: <3hw2qS0gJqzK5@mail.opencsw.org> Revision: 24089 http://sourceforge.net/p/gar/code/24089 Author: wahwah Date: 2014-09-13 05:45:03 +0000 (Sat, 13 Sep 2014) Log Message: ----------- abcm2ps/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/abcm2ps/ csw/mgar/pkg/abcm2ps/Makefile csw/mgar/pkg/abcm2ps/branches/ csw/mgar/pkg/abcm2ps/tags/ csw/mgar/pkg/abcm2ps/trunk/ csw/mgar/pkg/abcm2ps/trunk/Makefile csw/mgar/pkg/abcm2ps/trunk/checksums csw/mgar/pkg/abcm2ps/trunk/files/ csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch Added: csw/mgar/pkg/abcm2ps/Makefile =================================================================== --- csw/mgar/pkg/abcm2ps/Makefile (rev 0) +++ csw/mgar/pkg/abcm2ps/Makefile 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/abcm2ps/trunk =================================================================== --- csw/mgar/pkg/abcm2ps/trunk 2014-09-12 15:01:17 UTC (rev 24088) +++ csw/mgar/pkg/abcm2ps/trunk 2014-09-13 05:45:03 UTC (rev 24089) Property changes on: csw/mgar/pkg/abcm2ps/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/abcm2ps/trunk/Makefile =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/Makefile (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/Makefile 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,53 @@ +# $Id$ + +NAME = abcm2ps +VERSION = 8.2.1 +GARTYPE = v2 + +DESCRIPTION = Convert ABC to music sheet in PostScript or SVG + +VENDOR_URL = http://moinejf.free.fr/ + +MASTER_SITES = http://moinejf.free.fr/ +DISTFILES = $(DISTNAME).tar.gz + +# abcm2ps comes with homegrown configure script and Makefile. Following +# patchset replaces this with simple autotools build. Upstream author (J-FM) +# wasn't interested in merging this change, most likely due to perceived +# complexity of autotools. +# +# As a result, maintaining this package will suck. Every time upstream changes +# their build script, this patch will stop applying cleanly and you'll need to +# figure out what has changed and adjust autotools patch. Alternatively, you +# can try modifying original homegrown build system to work with Solaris or +# convince upstream author to merge this patch. Both of those have been +# attempted before, and failed. You have been warned. +# +# --Maciej, 2014-09-12 + +PATCHFILES += 0001-Remove-custom-Makefile.patch +PATCHFILES += 0002-Remove-the-custom-Makefile.in-and-config.h.in.patch +PATCHFILES += 0003-Remove-the-custom-config.h.patch +PATCHFILES += 0004-Remove-configure.patch +PATCHFILES += 0005-Add-a-smoke-test.patch +PATCHFILES += 0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch +PATCHFILES += 0007-Add-Makefile.am-and-configure.ac.patch +PATCHFILES += 0008-Add-standard-GNU-project-files.patch + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpango1-0-0 +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpangoft2-1-0-0 +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpangocairo1-0-0 + +include gar/category.mk + +pre-configure: + (cd $(WORKSRC); autoreconf -fi) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/abcm2ps/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/abcm2ps/trunk/checksums =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/checksums (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/checksums 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1 @@ +160e5d57328b61b95336f360ee7a09f4 abcm2ps-8.2.1.tar.gz Added: csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,167 @@ +From 71749412c686ba60930cc47b30514071ae4ae937 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 12 Sep 2014 01:49:56 +0200 +Subject: [PATCH 1/8] Remove custom Makefile + +--- + Makefile | 148 --------------------------------------------------------------- + 1 file changed, 148 deletions(-) + delete mode 100644 Makefile + +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index 9ad34d5..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,148 +0,0 @@ +-# Makefile source for abcm2ps +- +-VERSION = 8.2.1 +- +-CC = gcc +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +- +-CPPFLAGS = -I. +-CPPPANGO = +-CFLAGS = -g -O2 -Wall -pipe +-LDFLAGS = -lm +- +-prefix = /usr/local +-exec_prefix = ${prefix} +- +-srcdir = . +-VPATH = . +-bindir = ${exec_prefix}/bin +-libdir = ${exec_prefix}/lib +-datadir = ${prefix}/share +-docdir = ${prefix}/doc +- +-# unix +-OBJECTS=abc2ps.o \ +- abcparse.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ +- slre.o subs.o svg.o syms.o +-abcm2ps: $(OBJECTS) +- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) +- +-$(OBJECTS): abcparse.h config.h Makefile +-abc2ps.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ +- subs.o svg.o syms.o: abc2ps.h +-abc2ps.o front.o: front.h +-front.o parse.o slre.o: slre.h +-subs.o: subs.c +- $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPPANGO) -c -o $@ $< +- +-abcmfe: front.c front.h slre.h +- $(CC) $(CFLAGS) -DMAIN -o $@ $< slre.o +- +-DOCFILES=$(addprefix $(srcdir)/,Changes README *.abc *.eps *.txt) +- +-install: abcm2ps +- mkdir -p $(bindir); \ +- mkdir -p $(datadir)/abcm2ps; \ +- mkdir -p $(docdir)/abcm2ps; \ +- $(INSTALL_PROGRAM) abcm2ps $(bindir) +- for f in $(srcdir)/*.fmt; do \ +- $(INSTALL_DATA) $$f $(datadir)/abcm2ps; \ +- done +- for f in $(DOCFILES); do \ +- $(INSTALL_DATA) $$f $(docdir)/abcm2ps; \ +- done +- +-uninstall: +- echo "uninstalling..."; \ +- rm -f $(bindir)/abcm2ps; \ +- rm -rf $(datadir)/abcm2ps; \ +- rm -rf $(docdir)/abcm2ps +- +-DIST_FILES = \ +- abcm2ps-$(VERSION)/Changes \ +- abcm2ps-$(VERSION)/INSTALL \ +- abcm2ps-$(VERSION)/Makefile \ +- abcm2ps-$(VERSION)/Makefile.in \ +- abcm2ps-$(VERSION)/README \ +- abcm2ps-$(VERSION)/abc2ps.c \ +- abcm2ps-$(VERSION)/abc2ps.h \ +- abcm2ps-$(VERSION)/abcparse.c \ +- abcm2ps-$(VERSION)/abcparse.h \ +- abcm2ps-$(VERSION)/accordion.abc \ +- abcm2ps-$(VERSION)/build.ninja \ +- abcm2ps-$(VERSION)/buffer.c \ +- abcm2ps-$(VERSION)/chinese.abc \ +- abcm2ps-$(VERSION)/configure \ +- abcm2ps-$(VERSION)/config.h \ +- abcm2ps-$(VERSION)/config.h.in \ +- abcm2ps-$(VERSION)/deco.c \ +- abcm2ps-$(VERSION)/deco.abc \ +- abcm2ps-$(VERSION)/draw.c \ +- abcm2ps-$(VERSION)/features.txt \ +- abcm2ps-$(VERSION)/flute.fmt \ +- abcm2ps-$(VERSION)/format.c \ +- abcm2ps-$(VERSION)/format.txt \ +- abcm2ps-$(VERSION)/front.c \ +- abcm2ps-$(VERSION)/front.h \ +- abcm2ps-$(VERSION)/glyph.c \ +- abcm2ps-$(VERSION)/landscape.fmt \ +- abcm2ps-$(VERSION)/music.c \ +- abcm2ps-$(VERSION)/musicfont.fmt \ +- abcm2ps-$(VERSION)/newfeatures.abc \ +- abcm2ps-$(VERSION)/options.txt \ +- abcm2ps-$(VERSION)/parse.c \ +- abcm2ps-$(VERSION)/sample.abc \ +- abcm2ps-$(VERSION)/sample2.abc \ +- abcm2ps-$(VERSION)/sample3.abc \ +- abcm2ps-$(VERSION)/sample3.eps \ +- abcm2ps-$(VERSION)/sample4.abc \ +- abcm2ps-$(VERSION)/sample5.abc \ +- abcm2ps-$(VERSION)/sample8.html \ +- abcm2ps-$(VERSION)/slre.c \ +- abcm2ps-$(VERSION)/slre.h \ +- abcm2ps-$(VERSION)/subs.c \ +- abcm2ps-$(VERSION)/svg.c \ +- abcm2ps-$(VERSION)/syms.c \ +- abcm2ps-$(VERSION)/voices.abc +- +-dist: Changes +- ln -s . abcm2ps-$(VERSION); \ +- tar -zcvf abcm2ps-$(VERSION).tar.gz $(DIST_FILES); \ +- rm abcm2ps-$(VERSION) +- +-zip-dist: +- ln -s . abcm2ps-$(VERSION); \ +- zip -r abcm2ps-$(VERSION).zip $(DIST_FILES); \ +- rm abcm2ps-$(VERSION) +- +-zip: abcm2ps.exe +- strip abcm2ps.exe; \ +- cd ..; zip -r abcm2ps-$(VERSION).zip \ +- abcm2ps-$(VERSION)/abcm2ps.exe \ +- abcm2ps-$(VERSION)/License \ +- abcm2ps-$(VERSION)/Changes \ +- abcm2ps-$(VERSION)/INSTALL \ +- abcm2ps-$(VERSION)/sample3.eps \ +- abcm2ps-$(VERSION)/*.abc \ +- abcm2ps-$(VERSION)/*.fmt \ +- abcm2ps-$(VERSION)/*.txt ; cd - +- +-EXAMPLES = accordion.ps \ +- chinese.ps \ +- deco.ps \ +- newfeatures.ps \ +- sample.ps \ +- sample2.ps \ +- sample3.ps \ +- sample4.ps \ +- sample5.ps \ +- voices.ps +- +-test: $(EXAMPLES) +-%.ps: %.abc +- ./abcm2ps -O $@ $< +- +-clean: +- rm -f *.o $(EXAMPLES) # *.obj +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,191 @@ +From 8e6806ec225a43eb49d0253dc4d14b9685c08a02 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 3 Sep 2014 22:32:26 +0100 +Subject: [PATCH 2/8] Remove the custom Makefile.in and config.h.in + +--- + Makefile.in | 148 ------------------------------------------------------------ + config.h.in | 16 ------- + 2 files changed, 164 deletions(-) + delete mode 100644 Makefile.in + delete mode 100644 config.h.in + +diff --git a/Makefile.in b/Makefile.in +deleted file mode 100644 +index d9f01fe..0000000 +--- a/Makefile.in ++++ /dev/null +@@ -1,148 +0,0 @@ +-# Makefile source for abcm2ps +- +-VERSION = @VERSION@ +- +-CC = @CC@ +-INSTALL = @INSTALL@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +- +-CPPFLAGS = @CPPFLAGS@ -I. +-CPPPANGO = @CPPPANGO@ +-CFLAGS = @CFLAGS@ +-LDFLAGS = @LDFLAGS@ -lm +- +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +- +-srcdir = @srcdir@ +-VPATH = @srcdir@ +-bindir = @bindir@ +-libdir = @libdir@ +-datadir = @datarootdir@ +-docdir = @docdir@ +- +-# unix +-OBJECTS=abc2ps.o \ +- abcparse.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ +- slre.o subs.o svg.o syms.o +-abcm2ps: $(OBJECTS) +- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) +- +-$(OBJECTS): abcparse.h config.h Makefile +-abc2ps.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ +- subs.o svg.o syms.o: abc2ps.h +-abc2ps.o front.o: front.h +-front.o parse.o slre.o: slre.h +-subs.o: subs.c +- $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPPANGO) -c -o $@ $< +- +-abcmfe: front.c front.h slre.h +- $(CC) $(CFLAGS) -DMAIN -o $@ $< slre.o +- +-DOCFILES=$(addprefix $(srcdir)/,Changes README *.abc *.eps *.txt) +- +-install: abcm2ps +- mkdir -p $(bindir); \ +- mkdir -p $(datadir)/abcm2ps; \ +- mkdir -p $(docdir)/abcm2ps; \ +- $(INSTALL_PROGRAM) abcm2ps $(bindir) +- for f in $(srcdir)/*.fmt; do \ +- $(INSTALL_DATA) $$f $(datadir)/abcm2ps; \ +- done +- for f in $(DOCFILES); do \ +- $(INSTALL_DATA) $$f $(docdir)/abcm2ps; \ +- done +- +-uninstall: +- echo "uninstalling..."; \ +- rm -f $(bindir)/abcm2ps; \ +- rm -rf $(datadir)/abcm2ps; \ +- rm -rf $(docdir)/abcm2ps +- +-DIST_FILES = \ +- abcm2ps-$(VERSION)/Changes \ +- abcm2ps-$(VERSION)/INSTALL \ +- abcm2ps-$(VERSION)/Makefile \ +- abcm2ps-$(VERSION)/Makefile.in \ +- abcm2ps-$(VERSION)/README \ +- abcm2ps-$(VERSION)/abc2ps.c \ +- abcm2ps-$(VERSION)/abc2ps.h \ +- abcm2ps-$(VERSION)/abcparse.c \ +- abcm2ps-$(VERSION)/abcparse.h \ +- abcm2ps-$(VERSION)/accordion.abc \ +- abcm2ps-$(VERSION)/build.ninja \ +- abcm2ps-$(VERSION)/buffer.c \ +- abcm2ps-$(VERSION)/chinese.abc \ +- abcm2ps-$(VERSION)/configure \ +- abcm2ps-$(VERSION)/config.h \ +- abcm2ps-$(VERSION)/config.h.in \ +- abcm2ps-$(VERSION)/deco.c \ +- abcm2ps-$(VERSION)/deco.abc \ +- abcm2ps-$(VERSION)/draw.c \ +- abcm2ps-$(VERSION)/features.txt \ +- abcm2ps-$(VERSION)/flute.fmt \ +- abcm2ps-$(VERSION)/format.c \ +- abcm2ps-$(VERSION)/format.txt \ +- abcm2ps-$(VERSION)/front.c \ +- abcm2ps-$(VERSION)/front.h \ +- abcm2ps-$(VERSION)/glyph.c \ +- abcm2ps-$(VERSION)/landscape.fmt \ +- abcm2ps-$(VERSION)/music.c \ +- abcm2ps-$(VERSION)/musicfont.fmt \ +- abcm2ps-$(VERSION)/newfeatures.abc \ +- abcm2ps-$(VERSION)/options.txt \ +- abcm2ps-$(VERSION)/parse.c \ +- abcm2ps-$(VERSION)/sample.abc \ +- abcm2ps-$(VERSION)/sample2.abc \ +- abcm2ps-$(VERSION)/sample3.abc \ +- abcm2ps-$(VERSION)/sample3.eps \ +- abcm2ps-$(VERSION)/sample4.abc \ +- abcm2ps-$(VERSION)/sample5.abc \ +- abcm2ps-$(VERSION)/sample8.html \ +- abcm2ps-$(VERSION)/slre.c \ +- abcm2ps-$(VERSION)/slre.h \ +- abcm2ps-$(VERSION)/subs.c \ +- abcm2ps-$(VERSION)/svg.c \ +- abcm2ps-$(VERSION)/syms.c \ +- abcm2ps-$(VERSION)/voices.abc +- +-dist: Changes +- ln -s . abcm2ps-$(VERSION); \ +- tar -zcvf abcm2ps-$(VERSION).tar.gz $(DIST_FILES); \ +- rm abcm2ps-$(VERSION) +- +-zip-dist: +- ln -s . abcm2ps-$(VERSION); \ +- zip -r abcm2ps-$(VERSION).zip $(DIST_FILES); \ +- rm abcm2ps-$(VERSION) +- +-zip: abcm2ps.exe +- strip abcm2ps.exe; \ +- cd ..; zip -r abcm2ps-$(VERSION).zip \ +- abcm2ps-$(VERSION)/abcm2ps.exe \ +- abcm2ps-$(VERSION)/License \ +- abcm2ps-$(VERSION)/Changes \ +- abcm2ps-$(VERSION)/INSTALL \ +- abcm2ps-$(VERSION)/sample3.eps \ +- abcm2ps-$(VERSION)/*.abc \ +- abcm2ps-$(VERSION)/*.fmt \ +- abcm2ps-$(VERSION)/*.txt ; cd - +- +-EXAMPLES = accordion.ps \ +- chinese.ps \ +- deco.ps \ +- newfeatures.ps \ +- sample.ps \ +- sample2.ps \ +- sample3.ps \ +- sample4.ps \ +- sample5.ps \ +- voices.ps +- +-test: $(EXAMPLES) +-%.ps: %.abc +- ./abcm2ps -O $@ $< +- +-clean: +- rm -f *.o $(EXAMPLES) # *.obj +diff --git a/config.h.in b/config.h.in +deleted file mode 100644 +index 650eee1..0000000 +--- a/config.h.in ++++ /dev/null +@@ -1,16 +0,0 @@ +-/* config.h.in */ +- +-/* uncomment to handle the european A4 format. */ +-//#define A4_FORMAT 1 +- +-/* uncomment to have ~ as roll instead of twiddle. */ +-//#define DECO_IS_ROLL 1 +- +-/* comment if you have not mmap() */ +-#define HAVE_MMAP 1 +- +-/* default directory to search for format files */ +-#define DEFAULT_FDIR xxx +- +-#define VERSION xxx +-#define VDATE xxx +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,35 @@ +From 11a50a6a7d2a0dca42204611b64e9ca9c0794cf6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 3 Sep 2014 22:32:41 +0100 +Subject: [PATCH 3/8] Remove the custom config.h + +--- + config.h | 16 ---------------- + 1 file changed, 16 deletions(-) + delete mode 100644 config.h + +diff --git a/config.h b/config.h +deleted file mode 100644 +index 9c82344..0000000 +--- a/config.h ++++ /dev/null +@@ -1,16 +0,0 @@ +-/* config.h.in */ +- +-/* uncomment to handle the european A4 format. */ +-//#define A4_FORMAT 1 +- +-/* uncomment to have ~ as roll instead of twiddle. */ +-//#define DECO_IS_ROLL 1 +- +-/* comment if you have not mmap() */ +-#define HAVE_MMAP 1 +- +-/* default directory to search for format files */ +-#define DEFAULT_FDIR "/usr/local/share/abcm2ps" +- +-#define VERSION "8.2.1" +-#define VDATE "September 3, 2014" +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,94 @@ +From 8d373e7d60b5c19571629df9e38f8222d2d80ee3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 12 Sep 2014 02:45:34 +0200 +Subject: [PATCH 4/8] Remove configure + +--- + configure | 75 --------------------------------------------------------------- + 1 file changed, 75 deletions(-) + delete mode 100755 configure + +diff --git a/configure b/configure +deleted file mode 100755 +index adbc44a..0000000 +--- a/configure ++++ /dev/null +@@ -1,75 +0,0 @@ +-#! /bin/sh +- +-### custom variables ### +- +-CC=gcc +-CFLAGS="-g -O2 -Wall -pipe" +- +-INSTALL="/usr/bin/install -c" +-INSTALL_DATA='${INSTALL} -m 644' +-INSTALL_PROGRAM='${INSTALL}' +- +-prefix=/usr/local +-exec_prefix='${prefix}' +-srcdir=. +-bindir='${exec_prefix}/bin' +-libdir='${exec_prefix}/lib' +-datarootdir='${prefix}/share' +-docdir='${prefix}/doc' +-DEFAULT_FDIR="$prefix/share/abcm2ps" +- +-### custom end ### +- +-if test -f ./custom; then +- . ./custom +-fi +- +-VERSION=8.2.1 +-VDATE='September 3, 2014' +- +-case "$1" in +- --*=*) +- cmd=${1#--} +- eval $cmd +- ;; +-esac +- +-if which pkg-config > /dev/null ; then +- if pkg-config --exists freetype2 ; then +- if pkg-config --exists pangocairo ; then +- CPPFLAGS="-DHAVE_PANGO=1" +- CPPPANGO="`pkg-config pango cairo freetype2 --cflags`" +- LDFLAGS="$LDFLAGS `pkg-config pangocairo pangoft2 freetype2 --libs`" +- else +- echo "pangocairo not found - no pango support" +- fi +- else +- echo "freetype2 not found - no pango support" +- fi +-else +- echo "pkg-config not found - no pango support" +-fi +- +-sed "s+ at CC@+$CC+ +-s+ at CPPFLAGS@+$CPPFLAGS+ +-s+ at CPPPANGO@+$CPPPANGO+ +-s+ at CFLAGS@+$CFLAGS+ +-s+ at LDFLAGS@+$LDFLAGS+ +-s+ at INSTALL@+$INSTALL+ +-s+ at INSTALL_DATA@+$INSTALL_DATA+ +-s+ at INSTALL_PROGRAM@+$INSTALL_PROGRAM+ +-s+ at prefix@+$prefix+ +-s+ at exec_prefix@+$exec_prefix+ +-s+ at srcdir@+$srcdir+ +-s+ at bindir@+$bindir+ +-s+ at libdir@+$libdir+ +-s+ at datarootdir@+$datarootdir+ +-s+ at docdir@+$docdir+ +-s+ at VERSION@+$VERSION+" Makefile.in > Makefile +-echo "Makefile created" +- +-sed "s/define VERSION xxx/\define VERSION \"$VERSION\"/ +-s/define VDATE xxx/define VDATE \"$VDATE\"/ +-s+define DEFAULT_FDIR xxx+define DEFAULT_FDIR \"$DEFAULT_FDIR\"+ +-" config.h.in > config.h +-echo "config.h created" +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0005-Add-a-smoke-test.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,43 @@ +From e67c0b024e7303027ee701c6fc578de4908ca288 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 3 Sep 2014 22:26:55 +0100 +Subject: [PATCH 5/8] Add a smoke test. + +--- + smoketest.sh | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + create mode 100755 smoketest.sh + +diff --git a/smoketest.sh b/smoketest.sh +new file mode 100755 +index 0000000..f1b2bac +--- /dev/null ++++ b/smoketest.sh +@@ -0,0 +1,24 @@ ++#!/bin/bash ++ ++set -e ++ ++FILES=( ++ accordion ++ chinese ++ deco ++ newfeatures ++ sample ++ sample2 ++ sample3 ++ sample4 ++ sample5 ++ voices ++) ++ ++for f in ${FILES[@]}; do ++ ./abcm2ps -O "${f}.ps" "${f}.abc" ++ rm -f "${f}.ps" ++done ++ ++echo PASS ++exit 0 +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,26 @@ +From 800c809cabd225881c7015ea304e086045e37656 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 3 Sep 2014 22:26:28 +0100 +Subject: [PATCH 6/8] subs.c includes config.h to get HAVE_PANGO + +--- + subs.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/subs.c b/subs.c +index 3ff6163..21ac637 100644 +--- a/subs.c ++++ b/subs.c +@@ -27,6 +27,9 @@ + #include + #include + #include ++ ++#include "config.h" /* for HAVE_PANGO */ ++ + #ifdef HAVE_PANGO + #include + #include +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0007-Add-Makefile.am-and-configure.ac.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,127 @@ +From a6c029c905ba969d279c9874aa1324e40e125586 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 3 Sep 2014 22:29:57 +0100 +Subject: [PATCH 7/8] Add Makefile.am and configure.ac + +Sources used: +http://www.gnu.org/software/automake/manual/automake.html +https://www.flameeyes.eu/autotools-mythbuster/ + +DEFAULT_FDIR is no longer necessary because --datadir can be used instead, and +.fmt files will be put in the ${pkgdatadir}/abcm2ps directory. +--- + Makefile.am | 34 ++++++++++++++++++++++++++++++++++ + configure.ac | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 94 insertions(+) + create mode 100644 Makefile.am + create mode 100644 configure.ac + +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..b441095 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,34 @@ ++bin_PROGRAMS = abcm2ps ++abcm2ps_SOURCES = abc2ps.h abcparse.h front.h slre.h \ ++ abc2ps.c abcparse.c buffer.c deco.c draw.c format.c front.c \ ++ glyph.c music.c parse.c slre.c subs.c svg.c syms.c ++ ++abcm2ps_CPPFLAGS = $(PANGO_CFLAGS) ++abcm2ps_LDADD = $(PANGO_LIBS) ++ ++abcm2ps_CPPFLAGS += $(CAIRO_CFLAGS) ++abcm2ps_LDADD += $(CAIRO_LIBS) ++ ++abcm2ps_CPPFLAGS += $(PANGOCAIRO_CFLAGS) ++abcm2ps_LDADD += $(PANGOCAIRO_LIBS) ++ ++abcm2ps_CPPFLAGS += $(PANGOFT2_CFLAGS) ++abcm2ps_LDADD += $(PANGOFT2_LIBS) ++ ++abcm2ps_CPPFLAGS += $(GOBJECT_CFLAGS) ++abcm2ps_LDADD += $(GOBJECT_LIBS) ++ ++# for SVG ++abcm2ps_LDADD += -lm ++ ++dist_doc_DATA = README ChangeLog NEWS *.abc *.eps *.txt ++dist_pkgdata_DATA = *.fmt ++ ++# Requires slre ++# bin_PROGRAMS += abcmfe ++# abcmfe_SOURCES = front.c front.h slre.h ++# abcmfe_CPPFLAGS = -DMAIN ++ ++TESTS = smoketest.sh ++ ++EXTRA_DIST = $(TESTS) +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..01a787d +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,60 @@ ++dnl Configure source for abcm2ps -*- sh -*- ++dnl Copyright (C) 2001-2014 JF Moine. ++ ++AC_PREREQ(2.59) ++AC_INIT([abcm2ps], [8.2.2]) ++ ++AM_INIT_AUTOMAKE([1.11 silent-rules]) ++ ++VDATE='August 9, 2014' ++ ++dnl Checks for programs. ++AC_PROG_CC ++AC_PROG_INSTALL ++ ++AC_CONFIG_HEADER([config.h]) ++ ++dnl Checks for header files. ++AC_HEADER_STDC ++AC_CHECK_HEADER([malloc.h]) ++ ++PKG_PROG_PKG_CONFIG ++ ++dnl Check for options ++AC_ARG_ENABLE(pango, ++[ --enable-pango Use pango if available [[default: yes]]], ++[checkpango="$enableval"], ++[checkpango="yes"]) ++ ++AS_IF([test "x$checkpango" = "xyes"], [ ++ PKG_CHECK_MODULES(PANGO, [pango]) ++ PKG_CHECK_MODULES(CAIRO, [cairo]) ++ PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo]) ++ PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) ++ PKG_CHECK_MODULES(PANGOFT2, [pangoft2]) ++ # Additional check to see if we can link. ++ AC_SEARCH_LIBS([pango_version], [pango-1.0], ++ AC_DEFINE([HAVE_PANGO], [1], [Use the Pango library]), ++ AC_MSG_ERROR([Unable to find the pango-1.0 library.])) ++]) ++ ++AC_ARG_ENABLE(a4, ++[ --enable-a4 Handle european A4 format instead of default US letter], ++[if test "$enableval" = "yes"; then ++ AC_DEFINE([A4_FORMAT], [], [Handle the A4 format])dnl ++fi]) ++ ++AC_ARG_ENABLE(deco-is-roll, ++[ --enable-deco-is-roll Have ~ as roll instead of twiddle], ++[if test "$enableval" = "yes"; then ++ AC_DEFINE([DECO_IS_ROLL], [], [Have ~ as roll instead of twiddle])dnl ++fi]) ++ ++dnl Build characteristics ++AC_SUBST(CPPPANGO) ++ ++AC_DEFINE_UNQUOTED([VDATE], ["$VDATE"], [Date of last modifications]) ++AC_DEFINE([DEFAULT_FDIR], ["$pkgdatadir"], [Location of .fmt files]) ++ ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT +-- +2.0.3 + Added: csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch (rev 0) +++ csw/mgar/pkg/abcm2ps/trunk/files/0008-Add-standard-GNU-project-files.patch 2014-09-13 05:45:03 UTC (rev 24089) @@ -0,0 +1,39 @@ +From 81fe0f0a9737478df1a9652f26ce207f6bc06654 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Wed, 3 Sep 2014 22:25:01 +0100 +Subject: [PATCH 8/8] Add standard GNU project files. + +AUTHORS +ChangeLog (symlink to Changes) +NEWS +--- + AUTHORS | 2 ++ + ChangeLog | 1 + + NEWS | 0 + 3 files changed, 3 insertions(+) + create mode 100644 AUTHORS + create mode 120000 ChangeLog + create mode 100644 NEWS + +diff --git a/AUTHORS b/AUTHORS +new file mode 100644 +index 0000000..25f0b08 +--- /dev/null ++++ b/AUTHORS +@@ -0,0 +1,2 @@ ++abc2ps was developped by Michael Methfessel: ++abcm2ps by moinejf (at) free (dot) fr +diff --git a/ChangeLog b/ChangeLog +new file mode 120000 +index 0000000..c38de3d +--- /dev/null ++++ b/ChangeLog +@@ -0,0 +1 @@ ++Changes +\ No newline at end of file +diff --git a/NEWS b/NEWS +new file mode 100644 +index 0000000..e69de29 +-- +2.0.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Sep 13 07:55:27 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Sep 2014 05:55:27 +0000 Subject: SF.net SVN: gar:[24090] csw/mgar/pkg/abcm2ps/trunk/Makefile Message-ID: <3hw3306m3MzNV@mail.opencsw.org> Revision: 24090 http://sourceforge.net/p/gar/code/24090 Author: wahwah Date: 2014-09-13 05:55:25 +0000 (Sat, 13 Sep 2014) Log Message: ----------- abcm2ps/trunk: libintl8 is only linked on sparc Modified Paths: -------------- csw/mgar/pkg/abcm2ps/trunk/Makefile Modified: csw/mgar/pkg/abcm2ps/trunk/Makefile =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/Makefile 2014-09-13 05:45:03 UTC (rev 24089) +++ csw/mgar/pkg/abcm2ps/trunk/Makefile 2014-09-13 05:55:25 UTC (rev 24090) @@ -40,12 +40,15 @@ RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpango1-0-0 RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpangoft2-1-0-0 -RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibintl8 RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWabcm2ps += CSWlibpangocairo1-0-0 +# libintl18 is only linked on sparc +RUNTIME_DEP_PKGS_CSWabcm2ps_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWabcm2ps += $(RUNTIME_DEP_PKGS_CSWabcm2ps_$(GARCH)) + include gar/category.mk pre-configure: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Sep 13 08:02:17 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 13 Sep 2014 06:02:17 +0000 Subject: SF.net SVN: gar:[24091] csw/mgar/pkg/abcm2ps/trunk Message-ID: <3hw3C52rKgzRp@mail.opencsw.org> Revision: 24091 http://sourceforge.net/p/gar/code/24091 Author: wahwah Date: 2014-09-13 06:02:16 +0000 (Sat, 13 Sep 2014) Log Message: ----------- abcm2ps/trunk: Upgrade to 8.2.2, remove homegrown build files with a command and not a patch Modified Paths: -------------- csw/mgar/pkg/abcm2ps/trunk/Makefile csw/mgar/pkg/abcm2ps/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch Modified: csw/mgar/pkg/abcm2ps/trunk/Makefile =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/Makefile 2014-09-13 05:55:25 UTC (rev 24090) +++ csw/mgar/pkg/abcm2ps/trunk/Makefile 2014-09-13 06:02:16 UTC (rev 24091) @@ -1,7 +1,7 @@ # $Id$ NAME = abcm2ps -VERSION = 8.2.1 +VERSION = 8.2.2 GARTYPE = v2 DESCRIPTION = Convert ABC to music sheet in PostScript or SVG @@ -25,10 +25,6 @@ # # --Maciej, 2014-09-12 -PATCHFILES += 0001-Remove-custom-Makefile.patch -PATCHFILES += 0002-Remove-the-custom-Makefile.in-and-config.h.in.patch -PATCHFILES += 0003-Remove-the-custom-config.h.patch -PATCHFILES += 0004-Remove-configure.patch PATCHFILES += 0005-Add-a-smoke-test.patch PATCHFILES += 0006-subs.c-includes-config.h-to-get-HAVE_PANGO.patch PATCHFILES += 0007-Add-Makefile.am-and-configure.ac.patch @@ -52,5 +48,6 @@ include gar/category.mk pre-configure: + (cd $(WORKSRC); rm -f Makefile Makefile.in configure configure.in config.h) (cd $(WORKSRC); autoreconf -fi) @$(MAKECOOKIE) Modified: csw/mgar/pkg/abcm2ps/trunk/checksums =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/checksums 2014-09-13 05:55:25 UTC (rev 24090) +++ csw/mgar/pkg/abcm2ps/trunk/checksums 2014-09-13 06:02:16 UTC (rev 24091) @@ -1 +1 @@ -160e5d57328b61b95336f360ee7a09f4 abcm2ps-8.2.1.tar.gz +00483395493d19aef1b5bc61a430cee8 abcm2ps-8.2.2.tar.gz Deleted: csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch 2014-09-13 05:55:25 UTC (rev 24090) +++ csw/mgar/pkg/abcm2ps/trunk/files/0001-Remove-custom-Makefile.patch 2014-09-13 06:02:16 UTC (rev 24091) @@ -1,167 +0,0 @@ -From 71749412c686ba60930cc47b30514071ae4ae937 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 12 Sep 2014 01:49:56 +0200 -Subject: [PATCH 1/8] Remove custom Makefile - ---- - Makefile | 148 --------------------------------------------------------------- - 1 file changed, 148 deletions(-) - delete mode 100644 Makefile - -diff --git a/Makefile b/Makefile -deleted file mode 100644 -index 9ad34d5..0000000 ---- a/Makefile -+++ /dev/null -@@ -1,148 +0,0 @@ --# Makefile source for abcm2ps -- --VERSION = 8.2.1 -- --CC = gcc --INSTALL = /usr/bin/install -c --INSTALL_DATA = ${INSTALL} -m 644 --INSTALL_PROGRAM = ${INSTALL} -- --CPPFLAGS = -I. --CPPPANGO = --CFLAGS = -g -O2 -Wall -pipe --LDFLAGS = -lm -- --prefix = /usr/local --exec_prefix = ${prefix} -- --srcdir = . --VPATH = . --bindir = ${exec_prefix}/bin --libdir = ${exec_prefix}/lib --datadir = ${prefix}/share --docdir = ${prefix}/doc -- --# unix --OBJECTS=abc2ps.o \ -- abcparse.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ -- slre.o subs.o svg.o syms.o --abcm2ps: $(OBJECTS) -- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) -- --$(OBJECTS): abcparse.h config.h Makefile --abc2ps.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ -- subs.o svg.o syms.o: abc2ps.h --abc2ps.o front.o: front.h --front.o parse.o slre.o: slre.h --subs.o: subs.c -- $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPPANGO) -c -o $@ $< -- --abcmfe: front.c front.h slre.h -- $(CC) $(CFLAGS) -DMAIN -o $@ $< slre.o -- --DOCFILES=$(addprefix $(srcdir)/,Changes README *.abc *.eps *.txt) -- --install: abcm2ps -- mkdir -p $(bindir); \ -- mkdir -p $(datadir)/abcm2ps; \ -- mkdir -p $(docdir)/abcm2ps; \ -- $(INSTALL_PROGRAM) abcm2ps $(bindir) -- for f in $(srcdir)/*.fmt; do \ -- $(INSTALL_DATA) $$f $(datadir)/abcm2ps; \ -- done -- for f in $(DOCFILES); do \ -- $(INSTALL_DATA) $$f $(docdir)/abcm2ps; \ -- done -- --uninstall: -- echo "uninstalling..."; \ -- rm -f $(bindir)/abcm2ps; \ -- rm -rf $(datadir)/abcm2ps; \ -- rm -rf $(docdir)/abcm2ps -- --DIST_FILES = \ -- abcm2ps-$(VERSION)/Changes \ -- abcm2ps-$(VERSION)/INSTALL \ -- abcm2ps-$(VERSION)/Makefile \ -- abcm2ps-$(VERSION)/Makefile.in \ -- abcm2ps-$(VERSION)/README \ -- abcm2ps-$(VERSION)/abc2ps.c \ -- abcm2ps-$(VERSION)/abc2ps.h \ -- abcm2ps-$(VERSION)/abcparse.c \ -- abcm2ps-$(VERSION)/abcparse.h \ -- abcm2ps-$(VERSION)/accordion.abc \ -- abcm2ps-$(VERSION)/build.ninja \ -- abcm2ps-$(VERSION)/buffer.c \ -- abcm2ps-$(VERSION)/chinese.abc \ -- abcm2ps-$(VERSION)/configure \ -- abcm2ps-$(VERSION)/config.h \ -- abcm2ps-$(VERSION)/config.h.in \ -- abcm2ps-$(VERSION)/deco.c \ -- abcm2ps-$(VERSION)/deco.abc \ -- abcm2ps-$(VERSION)/draw.c \ -- abcm2ps-$(VERSION)/features.txt \ -- abcm2ps-$(VERSION)/flute.fmt \ -- abcm2ps-$(VERSION)/format.c \ -- abcm2ps-$(VERSION)/format.txt \ -- abcm2ps-$(VERSION)/front.c \ -- abcm2ps-$(VERSION)/front.h \ -- abcm2ps-$(VERSION)/glyph.c \ -- abcm2ps-$(VERSION)/landscape.fmt \ -- abcm2ps-$(VERSION)/music.c \ -- abcm2ps-$(VERSION)/musicfont.fmt \ -- abcm2ps-$(VERSION)/newfeatures.abc \ -- abcm2ps-$(VERSION)/options.txt \ -- abcm2ps-$(VERSION)/parse.c \ -- abcm2ps-$(VERSION)/sample.abc \ -- abcm2ps-$(VERSION)/sample2.abc \ -- abcm2ps-$(VERSION)/sample3.abc \ -- abcm2ps-$(VERSION)/sample3.eps \ -- abcm2ps-$(VERSION)/sample4.abc \ -- abcm2ps-$(VERSION)/sample5.abc \ -- abcm2ps-$(VERSION)/sample8.html \ -- abcm2ps-$(VERSION)/slre.c \ -- abcm2ps-$(VERSION)/slre.h \ -- abcm2ps-$(VERSION)/subs.c \ -- abcm2ps-$(VERSION)/svg.c \ -- abcm2ps-$(VERSION)/syms.c \ -- abcm2ps-$(VERSION)/voices.abc -- --dist: Changes -- ln -s . abcm2ps-$(VERSION); \ -- tar -zcvf abcm2ps-$(VERSION).tar.gz $(DIST_FILES); \ -- rm abcm2ps-$(VERSION) -- --zip-dist: -- ln -s . abcm2ps-$(VERSION); \ -- zip -r abcm2ps-$(VERSION).zip $(DIST_FILES); \ -- rm abcm2ps-$(VERSION) -- --zip: abcm2ps.exe -- strip abcm2ps.exe; \ -- cd ..; zip -r abcm2ps-$(VERSION).zip \ -- abcm2ps-$(VERSION)/abcm2ps.exe \ -- abcm2ps-$(VERSION)/License \ -- abcm2ps-$(VERSION)/Changes \ -- abcm2ps-$(VERSION)/INSTALL \ -- abcm2ps-$(VERSION)/sample3.eps \ -- abcm2ps-$(VERSION)/*.abc \ -- abcm2ps-$(VERSION)/*.fmt \ -- abcm2ps-$(VERSION)/*.txt ; cd - -- --EXAMPLES = accordion.ps \ -- chinese.ps \ -- deco.ps \ -- newfeatures.ps \ -- sample.ps \ -- sample2.ps \ -- sample3.ps \ -- sample4.ps \ -- sample5.ps \ -- voices.ps -- --test: $(EXAMPLES) --%.ps: %.abc -- ./abcm2ps -O $@ $< -- --clean: -- rm -f *.o $(EXAMPLES) # *.obj --- -2.0.3 - Deleted: csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch 2014-09-13 05:55:25 UTC (rev 24090) +++ csw/mgar/pkg/abcm2ps/trunk/files/0002-Remove-the-custom-Makefile.in-and-config.h.in.patch 2014-09-13 06:02:16 UTC (rev 24091) @@ -1,191 +0,0 @@ -From 8e6806ec225a43eb49d0253dc4d14b9685c08a02 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= -Date: Wed, 3 Sep 2014 22:32:26 +0100 -Subject: [PATCH 2/8] Remove the custom Makefile.in and config.h.in - ---- - Makefile.in | 148 ------------------------------------------------------------ - config.h.in | 16 ------- - 2 files changed, 164 deletions(-) - delete mode 100644 Makefile.in - delete mode 100644 config.h.in - -diff --git a/Makefile.in b/Makefile.in -deleted file mode 100644 -index d9f01fe..0000000 ---- a/Makefile.in -+++ /dev/null -@@ -1,148 +0,0 @@ --# Makefile source for abcm2ps -- --VERSION = @VERSION@ -- --CC = @CC@ --INSTALL = @INSTALL@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -- --CPPFLAGS = @CPPFLAGS@ -I. --CPPPANGO = @CPPPANGO@ --CFLAGS = @CFLAGS@ --LDFLAGS = @LDFLAGS@ -lm -- --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --srcdir = @srcdir@ --VPATH = @srcdir@ --bindir = @bindir@ --libdir = @libdir@ --datadir = @datarootdir@ --docdir = @docdir@ -- --# unix --OBJECTS=abc2ps.o \ -- abcparse.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ -- slre.o subs.o svg.o syms.o --abcm2ps: $(OBJECTS) -- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) -- --$(OBJECTS): abcparse.h config.h Makefile --abc2ps.o buffer.o deco.o draw.o format.o front.o glyph.o music.o parse.o \ -- subs.o svg.o syms.o: abc2ps.h --abc2ps.o front.o: front.h --front.o parse.o slre.o: slre.h --subs.o: subs.c -- $(CC) $(CFLAGS) $(CPPFLAGS) $(CPPPANGO) -c -o $@ $< -- --abcmfe: front.c front.h slre.h -- $(CC) $(CFLAGS) -DMAIN -o $@ $< slre.o -- --DOCFILES=$(addprefix $(srcdir)/,Changes README *.abc *.eps *.txt) -- --install: abcm2ps -- mkdir -p $(bindir); \ -- mkdir -p $(datadir)/abcm2ps; \ -- mkdir -p $(docdir)/abcm2ps; \ -- $(INSTALL_PROGRAM) abcm2ps $(bindir) -- for f in $(srcdir)/*.fmt; do \ -- $(INSTALL_DATA) $$f $(datadir)/abcm2ps; \ -- done -- for f in $(DOCFILES); do \ -- $(INSTALL_DATA) $$f $(docdir)/abcm2ps; \ -- done -- --uninstall: -- echo "uninstalling..."; \ -- rm -f $(bindir)/abcm2ps; \ -- rm -rf $(datadir)/abcm2ps; \ -- rm -rf $(docdir)/abcm2ps -- --DIST_FILES = \ -- abcm2ps-$(VERSION)/Changes \ -- abcm2ps-$(VERSION)/INSTALL \ -- abcm2ps-$(VERSION)/Makefile \ -- abcm2ps-$(VERSION)/Makefile.in \ -- abcm2ps-$(VERSION)/README \ -- abcm2ps-$(VERSION)/abc2ps.c \ -- abcm2ps-$(VERSION)/abc2ps.h \ -- abcm2ps-$(VERSION)/abcparse.c \ -- abcm2ps-$(VERSION)/abcparse.h \ -- abcm2ps-$(VERSION)/accordion.abc \ -- abcm2ps-$(VERSION)/build.ninja \ -- abcm2ps-$(VERSION)/buffer.c \ -- abcm2ps-$(VERSION)/chinese.abc \ -- abcm2ps-$(VERSION)/configure \ -- abcm2ps-$(VERSION)/config.h \ -- abcm2ps-$(VERSION)/config.h.in \ -- abcm2ps-$(VERSION)/deco.c \ -- abcm2ps-$(VERSION)/deco.abc \ -- abcm2ps-$(VERSION)/draw.c \ -- abcm2ps-$(VERSION)/features.txt \ -- abcm2ps-$(VERSION)/flute.fmt \ -- abcm2ps-$(VERSION)/format.c \ -- abcm2ps-$(VERSION)/format.txt \ -- abcm2ps-$(VERSION)/front.c \ -- abcm2ps-$(VERSION)/front.h \ -- abcm2ps-$(VERSION)/glyph.c \ -- abcm2ps-$(VERSION)/landscape.fmt \ -- abcm2ps-$(VERSION)/music.c \ -- abcm2ps-$(VERSION)/musicfont.fmt \ -- abcm2ps-$(VERSION)/newfeatures.abc \ -- abcm2ps-$(VERSION)/options.txt \ -- abcm2ps-$(VERSION)/parse.c \ -- abcm2ps-$(VERSION)/sample.abc \ -- abcm2ps-$(VERSION)/sample2.abc \ -- abcm2ps-$(VERSION)/sample3.abc \ -- abcm2ps-$(VERSION)/sample3.eps \ -- abcm2ps-$(VERSION)/sample4.abc \ -- abcm2ps-$(VERSION)/sample5.abc \ -- abcm2ps-$(VERSION)/sample8.html \ -- abcm2ps-$(VERSION)/slre.c \ -- abcm2ps-$(VERSION)/slre.h \ -- abcm2ps-$(VERSION)/subs.c \ -- abcm2ps-$(VERSION)/svg.c \ -- abcm2ps-$(VERSION)/syms.c \ -- abcm2ps-$(VERSION)/voices.abc -- --dist: Changes -- ln -s . abcm2ps-$(VERSION); \ -- tar -zcvf abcm2ps-$(VERSION).tar.gz $(DIST_FILES); \ -- rm abcm2ps-$(VERSION) -- --zip-dist: -- ln -s . abcm2ps-$(VERSION); \ -- zip -r abcm2ps-$(VERSION).zip $(DIST_FILES); \ -- rm abcm2ps-$(VERSION) -- --zip: abcm2ps.exe -- strip abcm2ps.exe; \ -- cd ..; zip -r abcm2ps-$(VERSION).zip \ -- abcm2ps-$(VERSION)/abcm2ps.exe \ -- abcm2ps-$(VERSION)/License \ -- abcm2ps-$(VERSION)/Changes \ -- abcm2ps-$(VERSION)/INSTALL \ -- abcm2ps-$(VERSION)/sample3.eps \ -- abcm2ps-$(VERSION)/*.abc \ -- abcm2ps-$(VERSION)/*.fmt \ -- abcm2ps-$(VERSION)/*.txt ; cd - -- --EXAMPLES = accordion.ps \ -- chinese.ps \ -- deco.ps \ -- newfeatures.ps \ -- sample.ps \ -- sample2.ps \ -- sample3.ps \ -- sample4.ps \ -- sample5.ps \ -- voices.ps -- --test: $(EXAMPLES) --%.ps: %.abc -- ./abcm2ps -O $@ $< -- --clean: -- rm -f *.o $(EXAMPLES) # *.obj -diff --git a/config.h.in b/config.h.in -deleted file mode 100644 -index 650eee1..0000000 ---- a/config.h.in -+++ /dev/null -@@ -1,16 +0,0 @@ --/* config.h.in */ -- --/* uncomment to handle the european A4 format. */ --//#define A4_FORMAT 1 -- --/* uncomment to have ~ as roll instead of twiddle. */ --//#define DECO_IS_ROLL 1 -- --/* comment if you have not mmap() */ --#define HAVE_MMAP 1 -- --/* default directory to search for format files */ --#define DEFAULT_FDIR xxx -- --#define VERSION xxx --#define VDATE xxx --- -2.0.3 - Deleted: csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch 2014-09-13 05:55:25 UTC (rev 24090) +++ csw/mgar/pkg/abcm2ps/trunk/files/0003-Remove-the-custom-config.h.patch 2014-09-13 06:02:16 UTC (rev 24091) @@ -1,35 +0,0 @@ -From 11a50a6a7d2a0dca42204611b64e9ca9c0794cf6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= -Date: Wed, 3 Sep 2014 22:32:41 +0100 -Subject: [PATCH 3/8] Remove the custom config.h - ---- - config.h | 16 ---------------- - 1 file changed, 16 deletions(-) - delete mode 100644 config.h - -diff --git a/config.h b/config.h -deleted file mode 100644 -index 9c82344..0000000 ---- a/config.h -+++ /dev/null -@@ -1,16 +0,0 @@ --/* config.h.in */ -- --/* uncomment to handle the european A4 format. */ --//#define A4_FORMAT 1 -- --/* uncomment to have ~ as roll instead of twiddle. */ --//#define DECO_IS_ROLL 1 -- --/* comment if you have not mmap() */ --#define HAVE_MMAP 1 -- --/* default directory to search for format files */ --#define DEFAULT_FDIR "/usr/local/share/abcm2ps" -- --#define VERSION "8.2.1" --#define VDATE "September 3, 2014" --- -2.0.3 - Deleted: csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch =================================================================== --- csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch 2014-09-13 05:55:25 UTC (rev 24090) +++ csw/mgar/pkg/abcm2ps/trunk/files/0004-Remove-configure.patch 2014-09-13 06:02:16 UTC (rev 24091) @@ -1,94 +0,0 @@ -From 8d373e7d60b5c19571629df9e38f8222d2d80ee3 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 12 Sep 2014 02:45:34 +0200 -Subject: [PATCH 4/8] Remove configure - ---- - configure | 75 --------------------------------------------------------------- - 1 file changed, 75 deletions(-) - delete mode 100755 configure - -diff --git a/configure b/configure -deleted file mode 100755 -index adbc44a..0000000 ---- a/configure -+++ /dev/null -@@ -1,75 +0,0 @@ --#! /bin/sh -- --### custom variables ### -- --CC=gcc --CFLAGS="-g -O2 -Wall -pipe" -- --INSTALL="/usr/bin/install -c" --INSTALL_DATA='${INSTALL} -m 644' --INSTALL_PROGRAM='${INSTALL}' -- --prefix=/usr/local --exec_prefix='${prefix}' --srcdir=. --bindir='${exec_prefix}/bin' --libdir='${exec_prefix}/lib' --datarootdir='${prefix}/share' --docdir='${prefix}/doc' --DEFAULT_FDIR="$prefix/share/abcm2ps" -- --### custom end ### -- --if test -f ./custom; then -- . ./custom --fi -- --VERSION=8.2.1 --VDATE='September 3, 2014' -- --case "$1" in -- --*=*) -- cmd=${1#--} -- eval $cmd -- ;; --esac -- --if which pkg-config > /dev/null ; then -- if pkg-config --exists freetype2 ; then -- if pkg-config --exists pangocairo ; then -- CPPFLAGS="-DHAVE_PANGO=1" -- CPPPANGO="`pkg-config pango cairo freetype2 --cflags`" -- LDFLAGS="$LDFLAGS `pkg-config pangocairo pangoft2 freetype2 --libs`" -- else -- echo "pangocairo not found - no pango support" -- fi -- else -- echo "freetype2 not found - no pango support" -- fi --else -- echo "pkg-config not found - no pango support" --fi -- --sed "s+ at CC@+$CC+ --s+ at CPPFLAGS@+$CPPFLAGS+ --s+ at CPPPANGO@+$CPPPANGO+ --s+ at CFLAGS@+$CFLAGS+ --s+ at LDFLAGS@+$LDFLAGS+ --s+ at INSTALL@+$INSTALL+ --s+ at INSTALL_DATA@+$INSTALL_DATA+ --s+ at INSTALL_PROGRAM@+$INSTALL_PROGRAM+ --s+ at prefix@+$prefix+ --s+ at exec_prefix@+$exec_prefix+ --s+ at srcdir@+$srcdir+ --s+ at bindir@+$bindir+ --s+ at libdir@+$libdir+ --s+ at datarootdir@+$datarootdir+ --s+ at docdir@+$docdir+ --s+ at VERSION@+$VERSION+" Makefile.in > Makefile --echo "Makefile created" -- --sed "s/define VERSION xxx/\define VERSION \"$VERSION\"/ --s/define VDATE xxx/define VDATE \"$VDATE\"/ --s+define DEFAULT_FDIR xxx+define DEFAULT_FDIR \"$DEFAULT_FDIR\"+ --" config.h.in > config.h --echo "config.h created" --- -2.0.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Sep 13 21:25:06 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 13 Sep 2014 19:25:06 +0000 Subject: SF.net SVN: gar:[24092] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: <3hwP1W4fntzfr@mail.opencsw.org> Revision: 24092 http://sourceforge.net/p/gar/code/24092 Author: lblume Date: 2014-09-13 19:25:05 +0000 (Sat, 13 Sep 2014) Log Message: ----------- ImageMagick/trunk: Temporary downgrade to repush proper .so.1 libs Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-09-13 06:02:16 UTC (rev 24091) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-09-13 19:25:05 UTC (rev 24092) @@ -1,7 +1,6 @@ NAME = imagemagick -VERSION = 6.8.9 -GARSUBREV = 6 -#BETAREV = beta20140518 +VERSION = 6.8.7 +GARSUBREV = 10 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -13,15 +12,9 @@ endef MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ -#MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/beta/ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) DISTFILES = $(DISTNAME).tar.xz -#DISTFILES = $(DISTNAME)~$(BETAREV).tar.xz -DISTFILES += map.ImageMagick -# libc 1.22.5 for gnutls -LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.ImageMagick)" - PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GCC4 @@ -40,48 +33,45 @@ BUILD_DEP_PKGS += CSWlibdjvulibre-dev BUILD_DEP_PKGS += CSWilmbase-dev BUILD_DEP_PKGS += CSWliblqr-dev -BUILD_DEP_PKGS += CSWopenjpeg-dev +BUILD_DEP_PKGS += CSWlibjasper-dev BUILD_DEP_PKGS += CSWlibrsvg-dev BUILD_DEP_PKGS += CSWliblcms2-dev BUILD_DEP_PKGS += CSWgraphviz-dev -BUILD_DEP_PKGS += CSWlibfftw-dev -PACKAGES += CSWlibmagickcore6q16hdri2 -CATALOGNAME_CSWlibmagickcore6q16hdri2 = libmagickcore6q16hdri2 -SPKG_DESC_CSWlibmagickcore6q16hdri2 += Library from ImageMagick, libMagickCore-6.Q16HDRI.so.2 -PKGFILES_CSWlibmagickcore6q16hdri2 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.2\.0\.0) -PKGFILES_CSWlibmagickcore6q16hdri2 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.2(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgomp1 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibgcc-s1 +PACKAGES += CSWlibmagickcore6q16hdri1 +CATALOGNAME_CSWlibmagickcore6q16hdri1 = libmagickcore6q16hdri1 +SPKG_DESC_CSWlibmagickcore6q16hdri1 += Library from ImageMagick, libMagickCore-6.Q16HDRI.so.1 +PKGFILES_CSWlibmagickcore6q16hdri1 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.1\.0\.0) +PKGFILES_CSWlibmagickcore6q16hdri1 += $(call baseisadirs,$(libdir),libMagickCore-6\.Q16HDRI\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibgcc-s1 -PACKAGES += CSWlibmagickwand6q16hdri2 -CATALOGNAME_CSWlibmagickwand6q16hdri2 = libmagickwand6q16hdri2 -SPKG_DESC_CSWlibmagickwand6q16hdri2 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.2 -PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0) -PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*) -PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2\.0\.0) -PKGFILES_CSWlibmagickwand6q16hdri2 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.2(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibmagickcore6q16hdri2 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgomp1 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibgcc-s1 +PACKAGES += CSWlibmagickwand6q16hdri1 +CATALOGNAME_CSWlibmagickwand6q16hdri1 = libmagickwand6q16hdri1 +SPKG_DESC_CSWlibmagickwand6q16hdri1 += Library from ImageMagick, libMagickWand-6.Q16HDRI.so.1 +PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1\.0\.0) +PKGFILES_CSWlibmagickwand6q16hdri1 += $(call baseisadirs,$(libdir),libMagickWand-6\.Q16HDRI\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgcc-s1 -PACKAGES += CSWlibmagick++6q16hdri5 -CATALOGNAME_CSWlibmagick++6q16hdri5 = libmagick++6q16hdri5 -PKGFILES_CSWlibmagick++6q16hdri5 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.5\.0\.0) -PKGFILES_CSWlibmagick++6q16hdri5 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.5(\.\d+)*) -SPKG_DESC_CSWlibmagick++6q16hdri5 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.5 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibmagickcore6q16hdri2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibmagickwand6q16hdri2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibstdc++6 +PACKAGES += CSWlibmagick++6q16hdri3 +CATALOGNAME_CSWlibmagick++6q16hdri3 = libmagick++6q16hdri3 +PKGFILES_CSWlibmagick++6q16hdri3 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.3\.0\.0) +PKGFILES_CSWlibmagick++6q16hdri3 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibmagick++6q16hdri3 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.3 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibstdc++6 PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries @@ -90,16 +80,16 @@ PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL) PKGFILES_CSWimagemagick-dev += $(docdir)/.* RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri2 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri2 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri5 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri3 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl PACKAGES += CSWimagemagick SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and interative manipulation of images # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore6q16hdri2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand6q16hdri2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjpeg7 @@ -117,7 +107,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibdjvulibre21 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibopenjp2-7 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjasper1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgcc-s1 @@ -128,19 +118,18 @@ ### # Needed for the Solaris ld bug -ifeq ($(shell /usr/bin/uname -p),sparc) -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri2 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagickcore6q16hdri1 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibimath2-0-10 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8 @@ -156,21 +145,58 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWliblqr1-0 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibgomp1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri5 += CSWlibglib2-0-0 -endif +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibfftw3-3 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibfontconfig1 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWliblqr1-0 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWliblcms2-2 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += surplus-dependency|CSWlibgomp1 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibfftw3-3 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibfontconfig1 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWliblqr1-0 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWliblcms2-2 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += surplus-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri1 += surplus-dependency|CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWlibmagickcore6q16hdri1 += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibfftw3-3 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibhalf10 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibfontconfig1 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibgdk-pixbuf2-0-0 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibimath2-0-10 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWliblqr1-0 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWliblcms2-2 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibilmthread2-0-10 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibiex2-0-10 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibcdt5 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibltdl7 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWimagemagick += surplus-dependency|CSWlibgomp1 ### + #PACKAGES += CSWpm-image-magick #SPKG_DESC_CSWpm-image-magick = Image::Magick: Perl binding for Imagemagick #PKGFILES_CSWpm-image-magick += $(libdir)/perl/.* @@ -182,10 +208,20 @@ # No binary in that package, since no 64 bit perl #CHECKPKG_OVERRIDES_CSWpm-image-magick += 64-bit-binaries-missing +# Libs must be reuploaded to replace stubs +CHECKPKG_OVERRIDES_CSWimagemagick += dependency-on-stub|libmagickcore6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWimagemagick += dependency-on-stub|libmagickwand6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += dependency-on-stub|libmagickcore|6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += dependency-on-stub|libmagickcore6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWlibmagick++6q16hdri3 += dependency-on-stub|libmagickwand6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWlibmagickwand6q16hdri1 += dependency-on-stub|libmagickcore6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWimagemagick-dev += dependency-on-stub|libmagickcore6q16hdri1_stub +CHECKPKG_OVERRIDES_CSWimagemagick-dev += dependency-on-stub|libmagickwand6q16hdri1_stub + REINPLACE_USRLOCAL += config/mime.xml -EXTRA_LINKER_FLAGS = -lsocket -lnsl -EXTRA_LD_OPTIONS = -z nolazyload +EXTRA_LINKER_FLAGS = -lsocket -lnsl +EXTRA_LD_OPTIONS = -z nolazyload # We especially don't want ISALIST for the above /usr/openwin/lib # This should be reworked after a general rework of ISALIST in GAR @@ -209,19 +245,13 @@ CONFIGURE_ARGS += --with-rsvg CONFIGURE_ARGS += --with-gvc CONFIGURE_ARGS += --with-gslib -CONFIGURE_ARGS += --with-openjp2 # Disable perl completely until it's rebuilt with GCC CONFIGURE_ARGS += --without-perl #CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl #CONFIGURE_ARGS-64 += --without-perl +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -# Needed so no extra instruction set is built in -CONFIGURE_ARGS-32-i386 += --with-gcc-arch=pentiumpro -CONFIGURE_ARGS-64-i386 += --with-gcc-arch=opteron - -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) $(CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH)) - # One test is failing: # FAIL: Magick++/tests/attributes.sh # This has been reported upstream at 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 Sep 14 00:45:55 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 13 Sep 2014 22:45:55 +0000 Subject: SF.net SVN: gar:[24093] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: <3hwTSw3WG9zwj@mail.opencsw.org> Revision: 24093 http://sourceforge.net/p/gar/code/24093 Author: lblume Date: 2014-09-13 22:45:53 +0000 (Sat, 13 Sep 2014) Log Message: ----------- ImageMagick/trunk: Add subdirectory for download Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-09-13 19:25:05 UTC (rev 24092) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2014-09-13 22:45:53 UTC (rev 24093) @@ -11,7 +11,7 @@ PhotoCD, and GIF. endef -MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/ +MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) DISTFILES = $(DISTNAME).tar.xz 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 Sep 14 00:48:04 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 13 Sep 2014 22:48:04 +0000 Subject: SF.net SVN: gar:[24094] csw/mgar/pkg/ImageMagick/trunk/checksums Message-ID: <3hwTWL5vp2z110@mail.opencsw.org> Revision: 24094 http://sourceforge.net/p/gar/code/24094 Author: lblume Date: 2014-09-13 22:48:01 +0000 (Sat, 13 Sep 2014) Log Message: ----------- ImageMagick/trunk: Add checksum Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2014-09-13 22:45:53 UTC (rev 24093) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2014-09-13 22:48:01 UTC (rev 24094) @@ -1 +1 @@ -97f24ab74f1e42ac90d337b073f99799 ImageMagick-6.8.9-6.tar.xz +9795bb8406b63d0a62fe0af5f5bd2d6c ImageMagick-6.8.7-10.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Sep 15 09:28:01 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 15 Sep 2014 07:28:01 +0000 Subject: SF.net SVN: gar:[24098] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3hxK161pYSz1Lj@mail.opencsw.org> Revision: 24098 http://sourceforge.net/p/gar/code/24098 Author: claudio_sf Date: 2014-09-15 07:27:57 +0000 (Mon, 15 Sep 2014) Log Message: ----------- perl/trunk: Comment overrides after stub changes infrastructure Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-09-15 07:18:03 UTC (rev 24097) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-09-15 07:27:57 UTC (rev 24098) @@ -49,25 +49,25 @@ #OBSOLETED_BY_CSWperl += CSWpm-parse-cpan-meta #OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-yaml #OBSOLETED_BY_CSWperl += CSWpm-module-metadata -CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub +#CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub #OBSOLETED_BY_CSWperl += CSWpm-cpan-meta-requirements #OBSOLETED_BY_CSWperl += CSWpm-perl-ostype #INCOMPATIBLE_PKGS = CSWperldoc CSWpm-module-build CSWpm-json-pp CSWpm-cpan-meta CSWpm-cpan-meta-yaml CSWpm-module-metadata CSWpm-cpan-meta-requirements CSWpm-perl-ostype -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWpm-module-metadata += file-with-bad-content -CHECKPKG_OVERRIDES_CSWpm-parse-cpan-meta += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-cpan-meta += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-cpan-meta-requirements += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-perl-ostype += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-cpan-meta-yaml += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-module-build += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-json-pp += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWpm-module-metadata += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWpm-module-metadata += file-with-bad-content +#CHECKPKG_OVERRIDES_CSWpm-parse-cpan-meta += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-cpan-meta += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-cpan-meta-requirements += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-perl-ostype += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-cpan-meta-yaml += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-module-build += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-json-pp += surplus-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWpm-module-metadata += surplus-dependency|CSWperl # Overridden because "/usr/ccs/bin/elfdump -y " returns output -#CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.1 -#CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libssp.so.0 +CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWperl += no-direct-binding|/opt/csw/lib/perl/5.18/CORE/libperl.so|is|not|directly|bound|to|soname|libssp.so.0 # Custom configure CONFIGURE_SCRIPTS = perl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From claudio_sf at users.sourceforge.net Mon Sep 15 09:34:04 2014 From: claudio_sf at users.sourceforge.net (claudio_sf at users.sourceforge.net) Date: Mon, 15 Sep 2014 07:34:04 +0000 Subject: SF.net SVN: gar:[24099] csw/mgar/pkg/perl/trunk/Makefile Message-ID: <3hxK7s56csz1Q2@mail.opencsw.org> Revision: 24099 http://sourceforge.net/p/gar/code/24099 Author: claudio_sf Date: 2014-09-15 07:34:03 +0000 (Mon, 15 Sep 2014) Log Message: ----------- perl/trunk: Add upstream MASTER_SITE instead of local file Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2014-09-15 07:27:57 UTC (rev 24098) +++ csw/mgar/pkg/perl/trunk/Makefile 2014-09-15 07:34:03 UTC (rev 24099) @@ -14,7 +14,8 @@ libraries. endef -MASTER_SITES = manual:// +#MASTER_SITES = manual:// +MASTER_SITES = http://www.cpan.org/src/5.0/ VENDOR_URL = http://www.perl.org #DISTFILES = $(NAME)-$(VERSION).tar.gz # The source has been patched to fix a failing patch (Solaris only). The patch was discussed with upstream (p5p) and committed to BLEAD. The patch is in the files directory. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 15 11:53:49 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Sep 2014 09:53:49 +0000 Subject: SF.net SVN: gar:[24101] csw/mgar/pkg/cpan Message-ID: <3hxNF82xFNzMw@mail.opencsw.org> Revision: 24101 http://sourceforge.net/p/gar/code/24101 Author: dmichelsen Date: 2014-09-15 09:53:48 +0000 (Mon, 15 Sep 2014) Log Message: ----------- cpan/JSON-RPC/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/JSON-RPC/ csw/mgar/pkg/cpan/JSON-RPC/branches/ csw/mgar/pkg/cpan/JSON-RPC/tags/ csw/mgar/pkg/cpan/JSON-RPC/trunk/ csw/mgar/pkg/cpan/JSON-RPC/trunk/Makefile csw/mgar/pkg/cpan/JSON-RPC/trunk/checksums csw/mgar/pkg/cpan/JSON-RPC/trunk/files/ Index: csw/mgar/pkg/cpan/JSON-RPC/trunk =================================================================== --- csw/mgar/pkg/cpan/JSON-RPC/trunk 2014-09-15 09:35:08 UTC (rev 24100) +++ csw/mgar/pkg/cpan/JSON-RPC/trunk 2014-09-15 09:53:48 UTC (rev 24101) Property changes on: csw/mgar/pkg/cpan/JSON-RPC/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/cpan/JSON-RPC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/JSON-RPC/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/JSON-RPC/trunk/Makefile 2014-09-15 09:53:48 UTC (rev 24101) @@ -0,0 +1,34 @@ +NAME = JSON-RPC +VERSION = 1.04 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DMAKI + +DESCRIPTION = JSON RPC 2.0 Server Implementation +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWpm-plack + +PACKAGES += CSWpm-json-rpc +CATALOGNAME_CSWpm-json-rpc = pm_json_rpc +SPKG_DESC_CSWpm-json-rpc = JSON RPC 2.0 Server Implementation +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-json-rpc = 1 +RUNTIME_DEP_PKGS_CSWpm-json-rpc += CSWpm-json +RUNTIME_DEP_PKGS_CSWpm-json-rpc += CSWpm-libwww-perl +RUNTIME_DEP_PKGS_CSWpm-json-rpc += CSWpm-class-accessor-lite +RUNTIME_DEP_PKGS_CSWpm-json-rpc += CSWpm-plack +RUNTIME_DEP_PKGS_CSWpm-json-rpc += CSWpm-http-message +RUNTIME_DEP_PKGS_CSWpm-json-rpc += CSWpm-router-simple + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/JSON-RPC/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/JSON-RPC/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/JSON-RPC/trunk/checksums 2014-09-15 09:53:48 UTC (rev 24101) @@ -0,0 +1 @@ +29279bcd8c901e3ab62a60bf7afc8a06 JSON-RPC-1.04.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 15 16:47:31 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Sep 2014 14:47:31 +0000 Subject: SF.net SVN: gar:[24103] csw/mgar/pkg/cpan/Net-Server/trunk Message-ID: <3hxVm5145szh8@mail.opencsw.org> Revision: 24103 http://sourceforge.net/p/gar/code/24103 Author: dmichelsen Date: 2014-09-15 14:47:28 +0000 (Mon, 15 Sep 2014) Log Message: ----------- cpan/Net-Server/trunk: Update to 2.008 and makemake Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Server/trunk/Makefile csw/mgar/pkg/cpan/Net-Server/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Net-Server/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/Makefile 2014-09-15 13:03:35 UTC (rev 24102) +++ csw/mgar/pkg/cpan/Net-Server/trunk/Makefile 2014-09-15 14:47:28 UTC (rev 24103) @@ -1,22 +1,22 @@ NAME = Net-Server -VERSION = 0.97 +VERSION = 2.008 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RHANDOM DESCRIPTION = Extensible, general Perl server engine define BLURB - Net::Server is an extensible, generic Perl server engine. - Net::Server combines the good properties from Net::Daemon (0.34), - NetServer::Generic (1.03), and Net::FTPServer (1.0), and also from various - concepts in the Apache Webserver. endef -DISTFILES = COPYING +CATALOG_RELEASE = unstable -PACKAGES = CSWpmnetserver -CATALOGNAME = pm_netserver +LICENSE_TEXT = This module is licensed under the unknown license -ARCHALL = 1 +PACKAGES += CSWpm-net-server +CATALOGNAME_CSWpm-net-server = pm_net_server +SPKG_DESC_CSWpm-net-server = Extensible, general Perl server engine +ARCHALL_CSWpm-net-server = 1 +OBSOLETED_BY_CSWpm-net-server += CSWpmnetserver +CATALOGNAME_CSWpmnetserver = pm_netserver_stub include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-Server/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/checksums 2014-09-15 13:03:35 UTC (rev 24102) +++ csw/mgar/pkg/cpan/Net-Server/trunk/checksums 2014-09-15 14:47:28 UTC (rev 24103) @@ -1,2 +1 @@ -0b2333ad7bf7e32d5a0c87ecc9c78d6a COPYING -f884b6c5b1d2698a82bbc7ba659690a1 Net-Server-0.97.tar.gz +85d488bc800f582839dd924ffa3f0d26 Net-Server-2.008.tar.gz Deleted: csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING 2014-09-15 13:03:35 UTC (rev 24102) +++ csw/mgar/pkg/cpan/Net-Server/trunk/files/COPYING 2014-09-15 14:47:28 UTC (rev 24103) @@ -1,4 +0,0 @@ -Paul Seamons - http://seamons.com/ - - Rob Brown 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 Sep 16 14:18:30 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 16 Sep 2014 12:18:30 +0000 Subject: SF.net SVN: gar:[24105] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: <3hy3Pj6tqmz12S@mail.opencsw.org> Revision: 24105 http://sourceforge.net/p/gar/code/24105 Author: lblume Date: 2014-09-16 12:18:26 +0000 (Tue, 16 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Add patch for default config location issue Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-09-16 11:50:12 UTC (rev 24104) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-09-16 12:18:26 UTC (rev 24105) @@ -44,6 +44,9 @@ (Structured Query Language) database server. endef +# DB install script looks at the wrong place +PATCHFILES += 0006-default-cnf-location.patch + # Comes from the MySQL5.5 recipe, though only one compiler will be kept in 5.6 ### For GCC4 EXTRA_CFLAGS_GCC4_sparc += -mno-app-regs Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch 2014-09-16 12:18:26 UTC (rev 24105) @@ -0,0 +1,15 @@ +diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in +index 6a12a40..dfe2317 100644 +--- a/scripts/mysql_install_db.pl.in ++++ b/scripts/mysql_install_db.pl.in +@@ -474,8 +474,8 @@ $config_file= "$basedir/my.$cnfext"; + my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext", + ".", "share","share/mysql","support-files"); + # Distros might move files +-if ((! -r $cfg_template) && (-r "@pkgdatadir@/my-default.cnf")) { +- $cfg_template = "@pkgdatadir@/my-default.cnf"; ++if ((! -r $cfg_template) && (-r "@pkgdatadir@/support-files/my-default.cnf")) { ++ $cfg_template = "@pkgdatadir@/support-files/my-default.cnf"; + } + + -e $cfg_template or cannot_find_file("my-default.$cnfext"); 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 Sep 16 16:41:29 2014 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 16 Sep 2014 14:41:29 +0000 Subject: SF.net SVN: gar:[24106] csw/mgar/pkg/ghostscript/branches/gs871/ Message-ID: <3hy6ZZ56jLz17l@mail.opencsw.org> Revision: 24106 http://sourceforge.net/p/gar/code/24106 Author: cgrzemba Date: 2014-09-16 14:41:26 +0000 (Tue, 16 Sep 2014) Log Message: ----------- older verion for foo2zjs Added Paths: ----------- csw/mgar/pkg/ghostscript/branches/gs871/ 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 Sep 16 16:43:14 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 16 Sep 2014 14:43:14 +0000 Subject: SF.net SVN: gar:[24107] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/ 0006-default-cnf-location.patch Message-ID: <3hy6cc2zzLz1C3@mail.opencsw.org> Revision: 24107 http://sourceforge.net/p/gar/code/24107 Author: lblume Date: 2014-09-16 14:43:11 +0000 (Tue, 16 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Edit patch Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch 2014-09-16 14:41:26 UTC (rev 24106) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0006-default-cnf-location.patch 2014-09-16 14:43:11 UTC (rev 24107) @@ -1,5 +1,3 @@ -diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in -index 6a12a40..dfe2317 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -474,8 +474,8 @@ $config_file= "$basedir/my.$cnfext"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed Sep 17 10:01:34 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Wed, 17 Sep 2014 08:01:34 +0000 Subject: SF.net SVN: gar:[24108] csw/mgar/pkg/gnustep-make/trunk/Makefile Message-ID: <3hyYfh2T91zc2@mail.opencsw.org> Revision: 24108 http://sourceforge.net/p/gar/code/24108 Author: rmottola Date: 2014-09-17 08:01:33 +0000 (Wed, 17 Sep 2014) Log Message: ----------- gnustep-make/trunk: enable solaris 9 & 10 Modified Paths: -------------- csw/mgar/pkg/gnustep-make/trunk/Makefile Modified: csw/mgar/pkg/gnustep-make/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-09-16 14:43:11 UTC (rev 24107) +++ csw/mgar/pkg/gnustep-make/trunk/Makefile 2014-09-17 08:01:33 UTC (rev 24108) @@ -15,6 +15,10 @@ MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/ DISTFILES = $(DISTNAME).tar.gz +#where can we build? +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + #we absolutely need GCC for Objective-C support. The only alternative in the future would be clang GARCOMPILER = GNU 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 Sep 17 16:22:11 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 17 Sep 2014 14:22:11 +0000 Subject: SF.net SVN: gar:[24110] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/ quick_start-csw Message-ID: <3hyk6G2rzmz15J@mail.opencsw.org> Revision: 24110 http://sourceforge.net/p/gar/code/24110 Author: lblume Date: 2014-09-17 14:22:11 +0000 (Wed, 17 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Update quick start script for DB installation Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw 2014-09-17 13:40:35 UTC (rev 24109) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw 2014-09-17 14:22:11 UTC (rev 24110) @@ -14,11 +14,11 @@ MYSQL_HOME=${prefix} MYSQL_VAR=/var${prefix} sysconfdir=/etc${prefix} -DEFAULTS_FILE=${prefix}/support-files/my-small.cnf +DEFAULTS_FILE=${prefix}/share/mysql5/support-files/my-small.cnf MYSQLD_USER=mysql # # Provide a default data directory -MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_DATADIR=$MYSQL_VAR/mysql5 # echo echo "This is the start script to setup a MySQL-5 database" 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 Sep 17 16:30:58 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 17 Sep 2014 14:30:58 +0000 Subject: SF.net SVN: gar:[24111] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/ quick_start-csw Message-ID: <3hykHy5VDXz18h@mail.opencsw.org> Revision: 24111 http://sourceforge.net/p/gar/code/24111 Author: lblume Date: 2014-09-17 14:30:57 +0000 (Wed, 17 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Incorrect version suffix in script Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw 2014-09-17 14:22:11 UTC (rev 24110) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/quick_start-csw 2014-09-17 14:30:57 UTC (rev 24111) @@ -18,7 +18,7 @@ MYSQLD_USER=mysql # # Provide a default data directory -MYSQLD_DATADIR=$MYSQL_VAR/mysql5 +MYSQLD_DATADIR=$MYSQL_VAR/mysql56 # echo echo "This is the start script to setup a MySQL-5 database" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Thu Sep 18 08:13:28 2014 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Thu, 18 Sep 2014 06:13:28 +0000 Subject: SF.net SVN: gar:[24113] csw/mgar/pkg/gnustep-base/trunk/Makefile Message-ID: <3hz7CT4TW4z4l@mail.opencsw.org> Revision: 24113 http://sourceforge.net/p/gar/code/24113 Author: rmottola Date: 2014-09-18 06:13:24 +0000 (Thu, 18 Sep 2014) Log Message: ----------- gnustep-base/trunk: attempt to fix dependencies Modified Paths: -------------- csw/mgar/pkg/gnustep-base/trunk/Makefile Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-09-17 20:50:12 UTC (rev 24112) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2014-09-18 06:13:24 UTC (rev 24113) @@ -10,8 +10,13 @@ GNUstep-core base framework, which provides all Foundation equivalent classes, useful for all non-gui objective-c development. A prerequisite for all GNUstep tools as well as applications. endef -BUILD_DEP_PKGS = CSWgmake CSWgcc4objc CSWlibgnutls-dev CSWlibffi-dev CSWlibicu-dev -DEP_PKGS = CSWgnustep-make CSWlibgnutls28 CSWlibssl1-0-0 CSWlibffi5 CSWlibicuuc52 +BUILD_DEP_PKGS = CSWgmake CSWgcc4objc CSWlibgnutls-dev CSWlibffi-dev CSWlibicu-dev CSWlibxml2-dev CSWlibxslt-dev +DEP_PKGS = CSWgnustep-make +DEP_PKGS += CSWlibffi5 +DEP_PGKS += CSWlibicui18n52 CSWlibicuuc52 CSWlibicudata52 +DEP_PGKS += CSWlibobjc4 CSWlibgcc-s1 CSWlibgmp10 +DEP_PGKS += CSWlibssl1-0-0 CSWlibgnutls28 CSWlibgcrypt20 +DEP_PGKS += CSWlibxslt1 CSWlibxml2-2 MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/ DISTFILES = $(DISTNAME).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 22 10:11:18 2014 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 22 Sep 2014 08:11:18 +0000 Subject: SF.net SVN: gar:[24116] csw/mgar/pkg Message-ID: <3j1ddq1jtXzlN@mail.opencsw.org> Revision: 24116 http://sourceforge.net/p/gar/code/24116 Author: wahwah Date: 2014-09-22 08:11:17 +0000 (Mon, 22 Sep 2014) Log Message: ----------- fossil/trunk: Initial commit, submitted by Freddy Added Paths: ----------- csw/mgar/pkg/fossil/ csw/mgar/pkg/fossil/Makefile csw/mgar/pkg/fossil/branches/ csw/mgar/pkg/fossil/tags/ csw/mgar/pkg/fossil/trunk/ csw/mgar/pkg/fossil/trunk/Makefile csw/mgar/pkg/fossil/trunk/checksums csw/mgar/pkg/fossil/trunk/files/ csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch Added: csw/mgar/pkg/fossil/Makefile =================================================================== --- csw/mgar/pkg/fossil/Makefile (rev 0) +++ csw/mgar/pkg/fossil/Makefile 2014-09-22 08:11:17 UTC (rev 24116) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/fossil/trunk =================================================================== --- csw/mgar/pkg/fossil/trunk 2014-09-19 07:10:53 UTC (rev 24115) +++ csw/mgar/pkg/fossil/trunk 2014-09-22 08:11:17 UTC (rev 24116) Property changes on: csw/mgar/pkg/fossil/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/fossil/trunk/Makefile =================================================================== --- csw/mgar/pkg/fossil/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fossil/trunk/Makefile 2014-09-22 08:11:17 UTC (rev 24116) @@ -0,0 +1,36 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# Recipe sent in by Freddy DISSAUX freddy.dsx free.fr +NAME = fossil +VERSION = 1.29 +GARTYPE = v2 +GARCOMPILER = GNU +DISTVERSION = 20140612172556 +DESCRIPTION = DSCM with built-in wiki, http interface and server, tickets database +define BLURB +Fossil is an easy-to-use Distributed Source Control Management system (DSCM) +which supports access and administration over HTTP CGI or via a built-in HTTP +server, has a built-in wiki, file browser, ticket system, and more. +endef +VENDOR_URL = http://www.fossil-scm.org/ + +MASTER_SITES = http://www.fossil-scm.org/download/ +DISTFILES = $(NAME)-src-$(DISTVERSION).tar.gz +WORKSRC = $(WORKDIR)/$(NAME)-src-$(DISTVERSION) +PATCHDIR = $(WORKSRC) +PATCHFILES += 0001-Include-string.h-to-mitigate-warnings.patch + +BUILD_DEP_PKGS = CSWlibssl-dev + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-openssl=$(includedir) + +# Remove exec_prefix from DIRPATHS: +NODIRPATHS += --exec_prefix=/opt/csw +# No test/check target provided by fossil +TEST_SCRIPTS = + +RUNTIME_DEP_PKGS_CSWfossil = CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWfossil += CSWlibz1 + +include gar/category.mk Property changes on: csw/mgar/pkg/fossil/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/fossil/trunk/checksums =================================================================== --- csw/mgar/pkg/fossil/trunk/checksums (rev 0) +++ csw/mgar/pkg/fossil/trunk/checksums 2014-09-22 08:11:17 UTC (rev 24116) @@ -0,0 +1 @@ +dd8e7392e1a0ea69eb391f8b13ee34bf fossil-src-20140612172556.tar.gz Added: csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch =================================================================== --- csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch (rev 0) +++ csw/mgar/pkg/fossil/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch 2014-09-22 08:11:17 UTC (rev 24116) @@ -0,0 +1,25 @@ +From 3e7862a7efa384b5957a864c1b809afe480d3e51 Mon Sep 17 00:00:00 2001 +From: Freddy DISSAUX +Date: Sat, 20 Sep 2014 17:31:33 +0200 +Subject: [PATCH] Include string.h to mitigate warnings + +--- + src/makeheaders.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/makeheaders.c b/src/makeheaders.c +index 858426f..087af9b 100644 +--- a/src/makeheaders.c ++++ b/src/makeheaders.c +@@ -44,6 +44,8 @@ + # define WIN32 + # endif + # include ++#elif defined(__sun) && defined(__SVR4) ++# include + #else + # include + #endif +-- +2.0.3 + 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 Sep 22 10:13:37 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 22 Sep 2014 08:13:37 +0000 Subject: SF.net SVN: gar:[24117] csw/mgar/pkg/vim/trunk Message-ID: <3j1dhL39p4zph@mail.opencsw.org> Revision: 24117 http://sourceforge.net/p/gar/code/24117 Author: lblume Date: 2014-09-22 08:13:37 +0000 (Mon, 22 Sep 2014) Log Message: ----------- vim/trunk: Bump to patchlevel 453 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2014-09-22 08:11:17 UTC (rev 24116) +++ csw/mgar/pkg/vim/trunk/Makefile 2014-09-22 08:13:37 UTC (rev 24117) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 295 +PATCHREV = 453 VERSION = $(DISTVERSION).$(PATCHREV) GARTYPE = v2 SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2014-09-22 08:11:17 UTC (rev 24116) +++ csw/mgar/pkg/vim/trunk/checksums 2014-09-22 08:13:37 UTC (rev 24117) @@ -293,4 +293,162 @@ 5689299be18cf9e01dc32e00aefc18b4 7.4.293 a2c6744c3f930560f3ed935eceacb1b0 7.4.294 8bcaa5f32681cadc66deba0426d1d502 7.4.295 +a97c0a2a53100f77afb44faaa171f87a 7.4.296 +9529b33b8bc4460da1a2c29c8d2be448 7.4.297 +c7d7bd8c7b1933a34b0c2764f615cd13 7.4.298 +3034535cafb2d22c9994489ce619d90c 7.4.299 +d785b6b1824654e10daa9eb07983540c 7.4.300 +ab622a7604b7911915eb5f6d6816cdba 7.4.301 +661e5c18b96cff2173775cb314237b9d 7.4.302 +bc83a243fe49348899c127e45d75f028 7.4.303 +862e59bcaffd5492254ad394c5e5707a 7.4.304 +202c86801f64776ffa7bd5a67a772d3a 7.4.305 +3de1f97842a15cb3a48e6cc74a71e304 7.4.306 +f9fe230c45badb31b8686d2fbf6d4bae 7.4.307 +544283a3feaba24c507603b97c33ddf9 7.4.308 +62c84cc03042bd1d9c5fc97df481d794 7.4.309 +109ff3d623a79b1a14300655990175f6 7.4.310 +e4bb6e6ccad4eebac4d4606833f89037 7.4.311 +7d973177b3673b0a70c27fd26690c802 7.4.312 +1318b6ee01858fc2dc0517d48a9dde53 7.4.313 +f75f3becd81dee9b0dd35d59d0594e10 7.4.314 +2bbc4522bdde605f8efaf97a32b7891d 7.4.315 +7b408846d44d3b1aa50388bd7fa7a487 7.4.316 +7573e5f110385b51ba66e1e2e8347752 7.4.317 +98952cd5264d54129a938cb8e5cfeddb 7.4.318 +b36fa474597833adab5ad59e4722f3c8 7.4.319 +49dae589daf998e1bec22d592d1d0624 7.4.320 +47f13d3b20a35102f6e734a72aad9f91 7.4.321 +4ee325f6eda1a2cee12e31f23b830400 7.4.322 +f5fdaa47f5ba3a5a117da60b3b13b58a 7.4.323 +3b99e0397b3e152e7e8ec7ea367f4062 7.4.324 +0fcf0269c0e8b84068b09967235bcd8d 7.4.325 +a385915b625c72b46751b8a06d77117c 7.4.326 +856b69db417fb4f170ea4f8836bd0365 7.4.327 +2362078d5a89a955e669684e57a962ef 7.4.328 +541010690bcaa172aea98dda1965a551 7.4.329 +006db7e591be5d8b8ebbba9ceae8785d 7.4.330 +32178fab06017dd9383a9a535c6ee976 7.4.331 +d69dffb19819860189f156333d316db9 7.4.332 +201e5644b356f7a00e4ecb4ee3bacc82 7.4.333 +f8f3973ce342d486b7bcbcf4f7441042 7.4.334 +a467529b3368ae973514c3b41553f37b 7.4.335 +7e516921dc5c465cd8df5a65c53a6878 7.4.336 +72617b57df781ab4e1d2b41806e663a9 7.4.337 +c0b1b5982f67aeb06d5eb1d1d3849a25 7.4.338 +77bbef9cd275b8c474351fd8f27e8c9d 7.4.339 +affc717308b40a93deab7d5a72334c86 7.4.340 +8bf071f620b7cc1967addfff70bdedd2 7.4.341 +89a197e7ee2dc524edbd377db2832531 7.4.342 +8eb062b2671393cc44817c16050374f6 7.4.343 +be66ffa877dcf4edf124932d318ee465 7.4.344 +82daf31b5532c7f84f76bb21c8a6ef99 7.4.345 +33401fd8e44704c0c3caacb70b8a78e3 7.4.346 +9e6a19d9b1e426f6e3c4bfc4328b82e3 7.4.347 +689082867a60664cea5afbd38f96962e 7.4.348 +0877a1574c00144bacca726133236d17 7.4.349 +cee62fb2b83fcee036e02b6973af5957 7.4.350 +3d7cd74058b30252ed99c1698a5046a2 7.4.351 +2e4cc570e0d9ec8f646260c93a6d8efb 7.4.352 +cf0eb8fcdd50c38ae55e6d80b3e1c2a9 7.4.353 +34dd62b2e8d6c8b7f0939a4fc695065a 7.4.354 +922d1d6044cd7ce3191941cee2d71e45 7.4.355 +82cf8a6dc0c4ffd26cc65eb0e13c24a3 7.4.356 +af14ad11e7738721f2fc80ec73d3b5bc 7.4.357 +d511f334441ef6c8bc5ef0a7310929da 7.4.358 +65ac447baf1da45141c367707a5ab156 7.4.359 +ba3e4550d4c419461b5f193c3018428b 7.4.360 +0bd4ccaf026911f9f3e43f204dc8d353 7.4.361 +5fe04992d2abe178e63b58e676783eee 7.4.362 +05499020c0457a7e451fc44b98edc52d 7.4.363 +1f459bbaacdd5d3d05c122da47c39ecc 7.4.364 +66c632be3f0befe4a12c118a9e856025 7.4.365 +bd6e6e294bdbcb70d35f468e5186d7a7 7.4.366 +0d3cbbc24082e8495fd28bfcbaf4e036 7.4.367 +caf3f3d88962eeaa4f178386fb4a7abf 7.4.368 +c24772db570cc1c1afa9209ed03c6939 7.4.369 +ce92198f4178543571bc040cf4a5653f 7.4.370 +3a9680791f5c93b51110bbf10e65040e 7.4.371 +238108a067906e3dc107f143fac01c2c 7.4.372 +8f14c7627e233fef528c6a0d1fd2cc7f 7.4.373 +f3c429f2ccee5671aa4f23b15b7ef926 7.4.374 +32bee89388fa0a96f0b8ad2397315bd7 7.4.375 +e5c6e21d60c7d10aeabc382150bac5fa 7.4.376 +ddf59fc955745735cbc8d4502ff84d29 7.4.377 +d68871fcaf7da6a32e63599d22ab9960 7.4.378 +318669d44d830bccff61248e606c49b4 7.4.379 +b9cfe3596774dd80a4db274a454b1e4a 7.4.380 +8f39b5d3f37fadf08be2a792b8ff5647 7.4.381 +646d11d169b09957a9e5cd95397c0e3f 7.4.382 +a21f94be8287d74fba1e829ddee6e58b 7.4.383 +da6141dfa00e44417d85a1b89726e57a 7.4.384 +4738deffdd929dd47d1d18f3f4333105 7.4.385 +41d9cdc9b89e46a5e69fbc45ac8f00f5 7.4.386 +b6b5d548e3052d9216e8eea32e27b5e9 7.4.387 +62703b70cfb0008837720da25034b7d3 7.4.388 +731e9735eeedc48440082ecbe3642a65 7.4.389 +51d11cc388169fa1bf29d2b525587086 7.4.390 +daa4347e47d3ca483f0e99f2835033ab 7.4.391 +891c612994d674224d1259d1ed7b1761 7.4.392 +850083cb9e3bff53e66470d6ec1b37fa 7.4.393 +08f14b6cb097cea3a14d65f068579b6a 7.4.394 +2619c0aedfd5b92a0d8be67ea17ba21a 7.4.395 +5b96e528052385167dc94f9bb8aef9ca 7.4.396 +7e8376933e6d74cfcfc82531d9f078ea 7.4.397 +79aa5124d630aaa02355ab5de6ee8b3d 7.4.398 +43a3fd90cf4a92349b085a529f110077 7.4.399 +f0e4064b0f5df95c2973b1857b670adf 7.4.400 +f5d338100e4e5496df69a9c46ca5f922 7.4.401 +32a9848bcb8da4cb2b55433aeaee68fc 7.4.402 +79f602c4e1b48d37718d4f86ce2caa75 7.4.403 +a90232993083f86728c58a3d2872ecb1 7.4.404 +839f7bfeec89fb143580d18fbdf41936 7.4.405 +5cf1658257acbda5fd3e2a29a58d7654 7.4.406 +64278ebd6cedfca13830d120aab45110 7.4.407 +9232e5adc637644330172996c78971c7 7.4.408 +527886d5a2ef630e5cf94fe94fb056ca 7.4.409 +81451c6a22dc4ba56b59464d2ecc1369 7.4.410 +50cf000b275d049e5aa8347be82e1e02 7.4.411 +191f2ac576ae99ae85dbc8ac33dc70f4 7.4.412 +d820fe6850e98380b194cd66d63a01c3 7.4.413 +aa6e0b02c1ae9f80f11b42571bf87aaa 7.4.414 +f705fb3d07c6f96adb858b59e8976959 7.4.415 +a5b32df79da64c3bd3c3a276b0bf8d54 7.4.416 +4f32ed3c3fd801a91d0c9d575700e26e 7.4.417 +068fdf4aeb89e08358f249b50247a0c3 7.4.418 +1b89802e9d44b56af6cbd5305b9981ae 7.4.419 +daaad58269ff8a5d814032e4c36698b4 7.4.420 +89c26204324e138c7553b0787287da25 7.4.421 +bfb194077449019d6afc1820b5e921ad 7.4.422 +0bf6453db46296484f796bda5504328c 7.4.423 +1fb63d4defe8d21cdfd2ab34b53a8798 7.4.424 +be3c9ba47c189e273bd37b9881a831aa 7.4.425 +ee1d39e3604a9212fd6e0ede288cb4a5 7.4.426 +2cc31d6799dea0bcddbcf80a1627c45e 7.4.427 +2a88f036069bbdd1ca953a84f824d0ac 7.4.428 +9ddf13fe4273a0c63028ae61d597f77f 7.4.429 +92d4d261a83403dab66edb93b1562e07 7.4.430 +02379c798cbcf34076d463487d7c25ae 7.4.431 +3c2e78d08521ed4e559b828d993ffd4f 7.4.432 +948da2567228a48160aaa0a75a124860 7.4.433 +8d05462187fd93a350d88e9bfaa65c26 7.4.434 +ca42274c0b7c8095018aa33d79ebb492 7.4.435 +c57d0c7845160a3b57b7b619bfbadb3c 7.4.436 +c97f335b29b28b435a101c22c0b74e78 7.4.437 +1807743700000a818e6eee1ebe4764b8 7.4.438 +7399f47096531ec9353c04ee36b04e37 7.4.439 +9cc78a051da02fde3ef488aebdf8f307 7.4.440 +a3dfc81ee81259f0acbba5982adc0bd6 7.4.441 +78181a415e29e0a7685bc8f5207f9131 7.4.442 +3dadc7044bc3a5603f82406e850f2d5e 7.4.443 +1cb7b7aa7a1859e703b2110980d11f9f 7.4.444 +5c3ab448911c9363ab200ce92e3d35a5 7.4.445 +e8cdc48202a550298a7525b6823057a4 7.4.446 +01f30e82150185778b1c290fd599c38a 7.4.447 +00f2e53895fef2084d608712aafceaf5 7.4.448 +35d9f8aae6fc9c8b6b3e2a0933ccb734 7.4.449 +1f1405f037cf6b2d95d115444a4ba8b9 7.4.450 +167005e12ff531637fbc19b5c8beea81 7.4.451 +76596c3657ac05ab6cf1f04bad757a0f 7.4.452 +32f1a419dd29d7cec173c22685080488 7.4.453 607e135c559be642f210094ad023dc65 vim-7.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Sep 22 10:14:43 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 22 Sep 2014 08:14:43 +0000 Subject: SF.net SVN: gar:[24118] csw/mgar/pkg/gvim/trunk Message-ID: <3j1djb597lzt0@mail.opencsw.org> Revision: 24118 http://sourceforge.net/p/gar/code/24118 Author: lblume Date: 2014-09-22 08:14:43 +0000 (Mon, 22 Sep 2014) Log Message: ----------- gvim/trunk: Bump to patchlevel 453 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2014-09-22 08:13:37 UTC (rev 24117) +++ csw/mgar/pkg/gvim/trunk/Makefile 2014-09-22 08:14:43 UTC (rev 24118) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 295 +PATCHREV = 453 VERSION = $(DISTVERSION).$(PATCHREV) GARTYPE = v2 SPKG_SOURCEURL = http://www.vim.org/download.php Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2014-09-22 08:13:37 UTC (rev 24117) +++ csw/mgar/pkg/gvim/trunk/checksums 2014-09-22 08:14:43 UTC (rev 24118) @@ -293,4 +293,162 @@ 5689299be18cf9e01dc32e00aefc18b4 7.4.293 a2c6744c3f930560f3ed935eceacb1b0 7.4.294 8bcaa5f32681cadc66deba0426d1d502 7.4.295 +a97c0a2a53100f77afb44faaa171f87a 7.4.296 +9529b33b8bc4460da1a2c29c8d2be448 7.4.297 +c7d7bd8c7b1933a34b0c2764f615cd13 7.4.298 +3034535cafb2d22c9994489ce619d90c 7.4.299 +d785b6b1824654e10daa9eb07983540c 7.4.300 +ab622a7604b7911915eb5f6d6816cdba 7.4.301 +661e5c18b96cff2173775cb314237b9d 7.4.302 +bc83a243fe49348899c127e45d75f028 7.4.303 +862e59bcaffd5492254ad394c5e5707a 7.4.304 +202c86801f64776ffa7bd5a67a772d3a 7.4.305 +3de1f97842a15cb3a48e6cc74a71e304 7.4.306 +f9fe230c45badb31b8686d2fbf6d4bae 7.4.307 +544283a3feaba24c507603b97c33ddf9 7.4.308 +62c84cc03042bd1d9c5fc97df481d794 7.4.309 +109ff3d623a79b1a14300655990175f6 7.4.310 +e4bb6e6ccad4eebac4d4606833f89037 7.4.311 +7d973177b3673b0a70c27fd26690c802 7.4.312 +1318b6ee01858fc2dc0517d48a9dde53 7.4.313 +f75f3becd81dee9b0dd35d59d0594e10 7.4.314 +2bbc4522bdde605f8efaf97a32b7891d 7.4.315 +7b408846d44d3b1aa50388bd7fa7a487 7.4.316 +7573e5f110385b51ba66e1e2e8347752 7.4.317 +98952cd5264d54129a938cb8e5cfeddb 7.4.318 +b36fa474597833adab5ad59e4722f3c8 7.4.319 +49dae589daf998e1bec22d592d1d0624 7.4.320 +47f13d3b20a35102f6e734a72aad9f91 7.4.321 +4ee325f6eda1a2cee12e31f23b830400 7.4.322 +f5fdaa47f5ba3a5a117da60b3b13b58a 7.4.323 +3b99e0397b3e152e7e8ec7ea367f4062 7.4.324 +0fcf0269c0e8b84068b09967235bcd8d 7.4.325 +a385915b625c72b46751b8a06d77117c 7.4.326 +856b69db417fb4f170ea4f8836bd0365 7.4.327 +2362078d5a89a955e669684e57a962ef 7.4.328 +541010690bcaa172aea98dda1965a551 7.4.329 +006db7e591be5d8b8ebbba9ceae8785d 7.4.330 +32178fab06017dd9383a9a535c6ee976 7.4.331 +d69dffb19819860189f156333d316db9 7.4.332 +201e5644b356f7a00e4ecb4ee3bacc82 7.4.333 +f8f3973ce342d486b7bcbcf4f7441042 7.4.334 +a467529b3368ae973514c3b41553f37b 7.4.335 +7e516921dc5c465cd8df5a65c53a6878 7.4.336 +72617b57df781ab4e1d2b41806e663a9 7.4.337 +c0b1b5982f67aeb06d5eb1d1d3849a25 7.4.338 +77bbef9cd275b8c474351fd8f27e8c9d 7.4.339 +affc717308b40a93deab7d5a72334c86 7.4.340 +8bf071f620b7cc1967addfff70bdedd2 7.4.341 +89a197e7ee2dc524edbd377db2832531 7.4.342 +8eb062b2671393cc44817c16050374f6 7.4.343 +be66ffa877dcf4edf124932d318ee465 7.4.344 +82daf31b5532c7f84f76bb21c8a6ef99 7.4.345 +33401fd8e44704c0c3caacb70b8a78e3 7.4.346 +9e6a19d9b1e426f6e3c4bfc4328b82e3 7.4.347 +689082867a60664cea5afbd38f96962e 7.4.348 +0877a1574c00144bacca726133236d17 7.4.349 +cee62fb2b83fcee036e02b6973af5957 7.4.350 +3d7cd74058b30252ed99c1698a5046a2 7.4.351 +2e4cc570e0d9ec8f646260c93a6d8efb 7.4.352 +cf0eb8fcdd50c38ae55e6d80b3e1c2a9 7.4.353 +34dd62b2e8d6c8b7f0939a4fc695065a 7.4.354 +922d1d6044cd7ce3191941cee2d71e45 7.4.355 +82cf8a6dc0c4ffd26cc65eb0e13c24a3 7.4.356 +af14ad11e7738721f2fc80ec73d3b5bc 7.4.357 +d511f334441ef6c8bc5ef0a7310929da 7.4.358 +65ac447baf1da45141c367707a5ab156 7.4.359 +ba3e4550d4c419461b5f193c3018428b 7.4.360 +0bd4ccaf026911f9f3e43f204dc8d353 7.4.361 +5fe04992d2abe178e63b58e676783eee 7.4.362 +05499020c0457a7e451fc44b98edc52d 7.4.363 +1f459bbaacdd5d3d05c122da47c39ecc 7.4.364 +66c632be3f0befe4a12c118a9e856025 7.4.365 +bd6e6e294bdbcb70d35f468e5186d7a7 7.4.366 +0d3cbbc24082e8495fd28bfcbaf4e036 7.4.367 +caf3f3d88962eeaa4f178386fb4a7abf 7.4.368 +c24772db570cc1c1afa9209ed03c6939 7.4.369 +ce92198f4178543571bc040cf4a5653f 7.4.370 +3a9680791f5c93b51110bbf10e65040e 7.4.371 +238108a067906e3dc107f143fac01c2c 7.4.372 +8f14c7627e233fef528c6a0d1fd2cc7f 7.4.373 +f3c429f2ccee5671aa4f23b15b7ef926 7.4.374 +32bee89388fa0a96f0b8ad2397315bd7 7.4.375 +e5c6e21d60c7d10aeabc382150bac5fa 7.4.376 +ddf59fc955745735cbc8d4502ff84d29 7.4.377 +d68871fcaf7da6a32e63599d22ab9960 7.4.378 +318669d44d830bccff61248e606c49b4 7.4.379 +b9cfe3596774dd80a4db274a454b1e4a 7.4.380 +8f39b5d3f37fadf08be2a792b8ff5647 7.4.381 +646d11d169b09957a9e5cd95397c0e3f 7.4.382 +a21f94be8287d74fba1e829ddee6e58b 7.4.383 +da6141dfa00e44417d85a1b89726e57a 7.4.384 +4738deffdd929dd47d1d18f3f4333105 7.4.385 +41d9cdc9b89e46a5e69fbc45ac8f00f5 7.4.386 +b6b5d548e3052d9216e8eea32e27b5e9 7.4.387 +62703b70cfb0008837720da25034b7d3 7.4.388 +731e9735eeedc48440082ecbe3642a65 7.4.389 +51d11cc388169fa1bf29d2b525587086 7.4.390 +daa4347e47d3ca483f0e99f2835033ab 7.4.391 +891c612994d674224d1259d1ed7b1761 7.4.392 +850083cb9e3bff53e66470d6ec1b37fa 7.4.393 +08f14b6cb097cea3a14d65f068579b6a 7.4.394 +2619c0aedfd5b92a0d8be67ea17ba21a 7.4.395 +5b96e528052385167dc94f9bb8aef9ca 7.4.396 +7e8376933e6d74cfcfc82531d9f078ea 7.4.397 +79aa5124d630aaa02355ab5de6ee8b3d 7.4.398 +43a3fd90cf4a92349b085a529f110077 7.4.399 +f0e4064b0f5df95c2973b1857b670adf 7.4.400 +f5d338100e4e5496df69a9c46ca5f922 7.4.401 +32a9848bcb8da4cb2b55433aeaee68fc 7.4.402 +79f602c4e1b48d37718d4f86ce2caa75 7.4.403 +a90232993083f86728c58a3d2872ecb1 7.4.404 +839f7bfeec89fb143580d18fbdf41936 7.4.405 +5cf1658257acbda5fd3e2a29a58d7654 7.4.406 +64278ebd6cedfca13830d120aab45110 7.4.407 +9232e5adc637644330172996c78971c7 7.4.408 +527886d5a2ef630e5cf94fe94fb056ca 7.4.409 +81451c6a22dc4ba56b59464d2ecc1369 7.4.410 +50cf000b275d049e5aa8347be82e1e02 7.4.411 +191f2ac576ae99ae85dbc8ac33dc70f4 7.4.412 +d820fe6850e98380b194cd66d63a01c3 7.4.413 +aa6e0b02c1ae9f80f11b42571bf87aaa 7.4.414 +f705fb3d07c6f96adb858b59e8976959 7.4.415 +a5b32df79da64c3bd3c3a276b0bf8d54 7.4.416 +4f32ed3c3fd801a91d0c9d575700e26e 7.4.417 +068fdf4aeb89e08358f249b50247a0c3 7.4.418 +1b89802e9d44b56af6cbd5305b9981ae 7.4.419 +daaad58269ff8a5d814032e4c36698b4 7.4.420 +89c26204324e138c7553b0787287da25 7.4.421 +bfb194077449019d6afc1820b5e921ad 7.4.422 +0bf6453db46296484f796bda5504328c 7.4.423 +1fb63d4defe8d21cdfd2ab34b53a8798 7.4.424 +be3c9ba47c189e273bd37b9881a831aa 7.4.425 +ee1d39e3604a9212fd6e0ede288cb4a5 7.4.426 +2cc31d6799dea0bcddbcf80a1627c45e 7.4.427 +2a88f036069bbdd1ca953a84f824d0ac 7.4.428 +9ddf13fe4273a0c63028ae61d597f77f 7.4.429 +92d4d261a83403dab66edb93b1562e07 7.4.430 +02379c798cbcf34076d463487d7c25ae 7.4.431 +3c2e78d08521ed4e559b828d993ffd4f 7.4.432 +948da2567228a48160aaa0a75a124860 7.4.433 +8d05462187fd93a350d88e9bfaa65c26 7.4.434 +ca42274c0b7c8095018aa33d79ebb492 7.4.435 +c57d0c7845160a3b57b7b619bfbadb3c 7.4.436 +c97f335b29b28b435a101c22c0b74e78 7.4.437 +1807743700000a818e6eee1ebe4764b8 7.4.438 +7399f47096531ec9353c04ee36b04e37 7.4.439 +9cc78a051da02fde3ef488aebdf8f307 7.4.440 +a3dfc81ee81259f0acbba5982adc0bd6 7.4.441 +78181a415e29e0a7685bc8f5207f9131 7.4.442 +3dadc7044bc3a5603f82406e850f2d5e 7.4.443 +1cb7b7aa7a1859e703b2110980d11f9f 7.4.444 +5c3ab448911c9363ab200ce92e3d35a5 7.4.445 +e8cdc48202a550298a7525b6823057a4 7.4.446 +01f30e82150185778b1c290fd599c38a 7.4.447 +00f2e53895fef2084d608712aafceaf5 7.4.448 +35d9f8aae6fc9c8b6b3e2a0933ccb734 7.4.449 +1f1405f037cf6b2d95d115444a4ba8b9 7.4.450 +167005e12ff531637fbc19b5c8beea81 7.4.451 +76596c3657ac05ab6cf1f04bad757a0f 7.4.452 +32f1a419dd29d7cec173c22685080488 7.4.453 607e135c559be642f210094ad023dc65 vim-7.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Sep 22 11:04:42 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 22 Sep 2014 09:04:42 +0000 Subject: SF.net SVN: gar:[24119] csw/mgar/pkg/gvim/trunk/Makefile Message-ID: <3j1fqL2p90zxd@mail.opencsw.org> Revision: 24119 http://sourceforge.net/p/gar/code/24119 Author: lblume Date: 2014-09-22 09:04:40 +0000 (Mon, 22 Sep 2014) Log Message: ----------- gvim/trunk: Remove patch included upstream Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2014-09-22 08:14:43 UTC (rev 24118) +++ csw/mgar/pkg/gvim/trunk/Makefile 2014-09-22 09:04:40 UTC (rev 24119) @@ -28,8 +28,6 @@ PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -PATCHFILES += 0007-export-fix-for-solaris-sh.patch - PATCHDIRLEVEL = 0 DISTNAME = $(NAME)$(subst .,,$(DISTVERSION)) 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 Sep 22 11:50:19 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 22 Sep 2014 09:50:19 +0000 Subject: SF.net SVN: gar:[24120] csw/mgar/pkg/vim/trunk/Makefile Message-ID: <3j1gqw1Rjtz17m@mail.opencsw.org> Revision: 24120 http://sourceforge.net/p/gar/code/24120 Author: lblume Date: 2014-09-22 09:50:16 +0000 (Mon, 22 Sep 2014) Log Message: ----------- vim/trunk: Remove patch integrated upstream Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2014-09-22 09:04:40 UTC (rev 24119) +++ csw/mgar/pkg/vim/trunk/Makefile 2014-09-22 09:50:16 UTC (rev 24120) @@ -62,8 +62,6 @@ PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) -PATCHFILES += 0007-export-fix-for-solaris-sh.patch - PATCHDIRLEVEL = 0 DISTNAME = $(NAME)$(subst .,,$(DISTVERSION)) 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 Sep 24 09:27:31 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 24 Sep 2014 07:27:31 +0000 Subject: SF.net SVN: gar:[24125] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: <3j2rZ672rQz17J@mail.opencsw.org> Revision: 24125 http://sourceforge.net/p/gar/code/24125 Author: lblume Date: 2014-09-24 07:27:30 +0000 (Wed, 24 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.40 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-09-23 12:06:11 UTC (rev 24124) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2014-09-24 07:27:30 UTC (rev 24125) @@ -14,7 +14,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 39 +PATCHLEVEL = 40 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-09-23 12:06:11 UTC (rev 24124) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2014-09-24 07:27:30 UTC (rev 24125) @@ -1 +1 @@ -b6f0ba553fb1ac839921b1135cb184ae mysql-5.5.39.tar.gz +90c5a7b69e833c393de5f07659b786bd mysql-5.5.40.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 24 14:53:56 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Sep 2014 12:53:56 +0000 Subject: SF.net SVN: gar:[24127] csw/mgar/pkg/automake/trunk Message-ID: <3j2zpr2wYVz1HP@mail.opencsw.org> Revision: 24127 http://sourceforge.net/p/gar/code/24127 Author: dmichelsen Date: 2014-09-24 12:53:53 +0000 (Wed, 24 Sep 2014) Log Message: ----------- automake/trunk: Update to 1.13.4 and 1.14.1 Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile csw/mgar/pkg/automake/trunk/checksums Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2014-09-24 07:28:11 UTC (rev 24126) +++ csw/mgar/pkg/automake/trunk/Makefile 2014-09-24 12:53:53 UTC (rev 24127) @@ -1,9 +1,9 @@ NAME = automake -VERSION = 1.13.1 +VERSION = 1.14.1 GARTYPE = v2 EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.6 1.12.6 1.13.1 +MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.6 1.12.6 1.13.4 1.14.1 DESCRIPTION = A tool for automatically generating Makefiles. define BLURB @@ -44,12 +44,14 @@ CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.11 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.12 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.13 +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.14 # These are just docs, override for now CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.9/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.10/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.11/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.12/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.13/py-compile +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.14/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.6/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.7/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.8/INSTALL @@ -58,6 +60,7 @@ CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.12/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.13/INSTALL +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.14/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/info/automake.info-1 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-1 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-2 @@ -65,6 +68,7 @@ CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/texinfo.tex CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.12/texinfo.tex CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.13/texinfo.tex +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.14/texinfo.tex # Lots of test fail on Solaris, but they are safe to ignore for now: # @@ -92,8 +96,10 @@ # There are 172 of 2968 tests failed in 1.12 SKIPTEST-1.12.6 ?= 1 -SKIPTEST-1.13.1 ?= 1 +SKIPTEST-1.13.4 ?= 1 +SKIPTEST-1.14.1 ?= 1 + SKIPTEST = $(SKIPTEST-$(VERSION)) ARCHALL = 1 @@ -108,11 +114,12 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.12.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.13.4 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* # alternatives [options] --install link name path priority [- # -slave link name path]... [--initscript service] -ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11 1.12 1.13 +ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11 1.12 1.13 1.14 ALTERNATIVE_1.6 = $(bindir)/automake automake $(bindir)/automake-1.6 60 ALTERNATIVE_1.6 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.6 ALTERNATIVE_1.7 = $(bindir)/automake automake $(bindir)/automake-1.7 70 @@ -129,6 +136,8 @@ ALTERNATIVE_1.12 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.12 ALTERNATIVE_1.13 = $(bindir)/automake automake $(bindir)/automake-1.13 130 ALTERNATIVE_1.13 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.13 +ALTERNATIVE_1.14 = $(bindir)/automake automake $(bindir)/automake-1.14 140 +ALTERNATIVE_1.14 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.14 include gar/category.mk Modified: csw/mgar/pkg/automake/trunk/checksums =================================================================== --- csw/mgar/pkg/automake/trunk/checksums 2014-09-24 07:28:11 UTC (rev 24126) +++ csw/mgar/pkg/automake/trunk/checksums 2014-09-24 12:53:53 UTC (rev 24127) @@ -1,7 +1,8 @@ 03bc9ebfa805f9ee5635f1f53fa1fa5f automake-1.10.3.tar.gz 0286dc30295b62985ca51919202ecfcc automake-1.11.6.tar.gz 199d39ece2e6070d64ac20d45ac86026 automake-1.12.6.tar.gz -78a0ef8216b0556b44508e7b5b0c0847 automake-1.13.1.tar.gz +9199e266993a5bbdc914923349d51e3e automake-1.13.4.tar.gz +d052a3e884631b9c7892f2efce542d75 automake-1.14.1.tar.gz 2bd506db63b6d10458cb644b6171ce93 automake-1.6.3.tar.gz eb25355e3cf00aac83c580dde970a0b4 automake-1.7.9.tar.gz ce0662da5df68014eb1683c184c47a8e automake-1.8.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Sep 24 18:29:09 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 24 Sep 2014 16:29:09 +0000 Subject: SF.net SVN: gar:[24128] csw/mgar/pkg/tor/branches/alpha Message-ID: <3j34b72X4wzF@mail.opencsw.org> Revision: 24128 http://sourceforge.net/p/gar/code/24128 Author: jake_goerzen Date: 2014-09-24 16:29:09 +0000 (Wed, 24 Sep 2014) Log Message: ----------- tor: bump to version 0.2.5.8-rc Modified Paths: -------------- csw/mgar/pkg/tor/branches/alpha/Makefile csw/mgar/pkg/tor/branches/alpha/checksums Modified: csw/mgar/pkg/tor/branches/alpha/Makefile =================================================================== --- csw/mgar/pkg/tor/branches/alpha/Makefile 2014-09-24 12:53:53 UTC (rev 24127) +++ csw/mgar/pkg/tor/branches/alpha/Makefile 2014-09-24 16:29:09 UTC (rev 24128) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.5.3-alpha +VERSION = 0.2.5.8-rc GARTYPE = v2 DESCRIPTION = Secure network traffic router @@ -15,7 +15,6 @@ MASTER_SITES = http://www.torproject.org/dist/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += pulled-from-gitrepo-fixes-bug11426.patch PATCHFILES += 0001-add-test-to-detech-we-are-on-Solaris.patch # File name regex to get notifications about upstream software releases Modified: csw/mgar/pkg/tor/branches/alpha/checksums =================================================================== --- csw/mgar/pkg/tor/branches/alpha/checksums 2014-09-24 12:53:53 UTC (rev 24127) +++ csw/mgar/pkg/tor/branches/alpha/checksums 2014-09-24 16:29:09 UTC (rev 24128) @@ -1 +1 @@ -8714ea9ceaa7477534c88385edfdf7df tor-0.2.5.3-alpha.tar.gz +f72f4a9647b0e5ce01c7f126f6e54beb tor-0.2.5.8-rc.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 25 16:01:55 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Sep 2014 14:01:55 +0000 Subject: SF.net SVN: gar:[24131] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: <3j3dGt270gz1TZ@mail.opencsw.org> Revision: 24131 http://sourceforge.net/p/gar/code/24131 Author: dmichelsen Date: 2014-09-25 14:01:54 +0000 (Thu, 25 Sep 2014) Log Message: ----------- libsunperf/trunk: Adjust modulation name Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2014-09-25 11:56:19 UTC (rev 24130) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2014-09-25 14:01:54 UTC (rev 24131) @@ -54,12 +54,12 @@ SRCDIR-sparcv9 = v9 SRCDIR-amd64 = amd64 -install-custom-i386: +install-custom-pentium_pro: ginstall -d $(DESTDIR)$(libdir) $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)$(ISA_SS32-$(GARCH))/$L; fi;) @$(MAKECOOKIE) -install-custom-sparc: +install-custom-sparcv8plus: ginstall -d $(DESTDIR)$(libdir) ginstall -d $(DESTDIR)$(libdir)/v8 ln -s v8/$(FLIBS-sparc) $(DESTDIR)$(libdir)/$(FLIBS-sparc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 25 16:12:12 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 25 Sep 2014 14:12:12 +0000 Subject: SF.net SVN: gar:[24132] csw/mgar/pkg/libsunperf/branches/sos12/ Message-ID: <3j3dVr16Qpzp@mail.opencsw.org> Revision: 24132 http://sourceforge.net/p/gar/code/24132 Author: dmichelsen Date: 2014-09-25 14:12:11 +0000 (Thu, 25 Sep 2014) Log Message: ----------- libsunperf: Put away old libs for sos12 Added Paths: ----------- csw/mgar/pkg/libsunperf/branches/sos12/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Sep 25 20:37:38 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 25 Sep 2014 18:37:38 +0000 Subject: SF.net SVN: gar:[24133] csw/mgar/pkg/bash/trunk Message-ID: <3j3lNx079Mz8w@mail.opencsw.org> Revision: 24133 http://sourceforge.net/p/gar/code/24133 Author: chninkel Date: 2014-09-25 18:37:37 +0000 (Thu, 25 Sep 2014) Log Message: ----------- bash/trunk: add patch eol-pushback.patch to fix CVE-2014-7169 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/eol-pushback.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2014-09-25 14:12:11 UTC (rev 24132) +++ csw/mgar/pkg/bash/trunk/Makefile 2014-09-25 18:37:37 UTC (rev 24133) @@ -74,6 +74,10 @@ # add /opt/csw/bin in the hardcoded paths used for auto-selecting the EDITOR variable PATCHFILES += 0001-bashbug-editor-path.patch +# Current patch proposed to fix CVE-2014-7169 +# see http://www.openwall.com/lists/oss-security/2014/09/25/10 +PATCHFILES += eol-pushback.patch + LICENSE = COPYING # we add CSW bash to the /etc/shells files using the build script Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2014-09-25 14:12:11 UTC (rev 24132) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2014-09-25 18:37:37 UTC (rev 24133) @@ -1,5 +1,11 @@ bash (4.3.25,REV=2014.09.25) unstable + * Added patch eol-pushback.patch to fix CVE-2014-7169 + + -- Yann Rouillard Thu, 25 Sep 2014 20:35:06 +0200 + +bash (4.3.25,REV=2014.09.25) unstable + * Added bash patch bash43-025 to fix CVE-2014-6271 -- Yann Rouillard Thu, 25 Sep 2014 08:45:14 +0200 Added: csw/mgar/pkg/bash/trunk/files/eol-pushback.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/eol-pushback.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/eol-pushback.patch 2014-09-25 18:37:37 UTC (rev 24133) @@ -0,0 +1,11 @@ +*** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400 +--- parse.y 2014-09-24 22:47:28.000000000 -0400 +*************** +*** 2959,2962 **** +--- 2959,2964 ---- + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\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 Fri Sep 26 13:48:41 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 26 Sep 2014 11:48:41 +0000 Subject: SF.net SVN: gar:[24136] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: <3j4BGY2hbWzWn@mail.opencsw.org> Revision: 24136 http://sourceforge.net/p/gar/code/24136 Author: lblume Date: 2014-09-26 11:48:40 +0000 (Fri, 26 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.5.x: Add an override to live along MySQL 5.6 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-09-26 10:34:46 UTC (rev 24135) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2014-09-26 11:48:40 UTC (rev 24136) @@ -121,6 +121,7 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(sbindir)/$(bin_name)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-collision PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Sep 26 14:56:06 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 26 Sep 2014 12:56:06 +0000 Subject: SF.net SVN: gar:[24137] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: <3j4CmL0Pzgzc0@mail.opencsw.org> Revision: 24137 http://sourceforge.net/p/gar/code/24137 Author: lblume Date: 2014-09-26 12:56:03 +0000 (Fri, 26 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.5.x: Some file-collision overrides missing 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-09-26 11:48:40 UTC (rev 24136) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2014-09-26 12:56:03 UTC (rev 24137) @@ -173,6 +173,7 @@ ### For GCC4 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSW$(NAME) += file-collision #CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry # It's intentional. There's a sparcv8-incompatible assembler code there, so we @@ -202,6 +203,7 @@ CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/sparcv9/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/amd64/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 +CHECKPKG_OVERRIDES_CSW$(NAME) += file-collision # An example: # s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Sep 26 17:19:55 2014 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Sep 2014 15:19:55 +0000 Subject: SF.net SVN: gar:[24140] csw/mgar/pkg/bash/trunk Message-ID: <3j4Gyb69cpz15m@mail.opencsw.org> Revision: 24140 http://sourceforge.net/p/gar/code/24140 Author: chninkel Date: 2014-09-26 15:19:52 +0000 (Fri, 26 Sep 2014) Log Message: ----------- bash/trunk: add patches bash-4.2-cve-2014-7169-{0,1,2}.patch to fix CVE-2014-7169 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-0.patch csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-1.patch csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-2.patch Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/eol-pushback.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2014-09-26 14:02:24 UTC (rev 24139) +++ csw/mgar/pkg/bash/trunk/Makefile 2014-09-26 15:19:52 UTC (rev 24140) @@ -74,9 +74,11 @@ # add /opt/csw/bin in the hardcoded paths used for auto-selecting the EDITOR variable PATCHFILES += 0001-bashbug-editor-path.patch -# Current patch proposed to fix CVE-2014-7169 -# see http://www.openwall.com/lists/oss-security/2014/09/25/10 -PATCHFILES += eol-pushback.patch +# Serie of patches taken from fedora to fix CVE-2014-7169 +# see https://access.redhat.com/articles/1200223 for impacts of the patch +PATCHFILES += bash-4.2-cve-2014-7169-0.patch +PATCHFILES += bash-4.2-cve-2014-7169-1.patch +PATCHFILES += bash-4.2-cve-2014-7169-2.patch LICENSE = COPYING Added: csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-0.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-0.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-0.patch 2014-09-26 15:19:52 UTC (rev 24140) @@ -0,0 +1,12 @@ +*** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400 +--- parse.y 2014-09-24 22:47:28.000000000 -0400 +*************** +*** 2959,2962 **** +--- 2959,2964 ---- + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\n'; + Added: csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-1.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-1.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-1.patch 2014-09-26 15:19:52 UTC (rev 24140) @@ -0,0 +1,155 @@ +--- ../bash-4.2-orig/variables.c 2014-09-25 13:07:59.313209541 +0200 ++++ variables.c 2014-09-25 13:15:29.869420719 +0200 +@@ -268,7 +268,7 @@ + static void propagate_temp_var __P((PTR_T)); + static void dispose_temporary_env __P((sh_free_func_t *)); + +-static inline char *mk_env_string __P((const char *, const char *)); ++static inline char *mk_env_string __P((const char *, const char *, int)); + static char **make_env_array_from_var_list __P((SHELL_VAR **)); + static char **make_var_export_array __P((VAR_CONTEXT *)); + static char **make_func_export_array __P((void)); +@@ -301,6 +301,14 @@ + #endif + } + ++/* Prefix and suffix for environment variable names which contain ++ shell functions. */ ++#define FUNCDEF_PREFIX "BASH_FUNC_" ++#define FUNCDEF_PREFIX_LEN (strlen (FUNCDEF_PREFIX)) ++#define FUNCDEF_SUFFIX "()" ++#define FUNCDEF_SUFFIX_LEN (strlen (FUNCDEF_SUFFIX)) ++ ++ + /* Initialize the shell variables from the current environment. + If PRIVMODE is nonzero, don't import functions from ENV or + parse $SHELLOPTS. */ +@@ -338,36 +346,48 @@ + + /* If exported function, define it now. Don't import functions from + the environment in privileged mode. */ +- if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4)) +- { +- string_length = strlen (string); +- temp_string = (char *)xmalloc (3 + string_length + char_index); ++ if (privmode == 0 && read_but_dont_execute == 0 ++ && STREQN (FUNCDEF_PREFIX, name, FUNCDEF_PREFIX_LEN) ++ && STREQ (name + char_index - FUNCDEF_SUFFIX_LEN, FUNCDEF_SUFFIX) ++ && STREQN ("() {", string, 4)) ++ { ++ size_t name_length ++ = char_index - (FUNCDEF_PREFIX_LEN + FUNCDEF_SUFFIX_LEN); ++ char *temp_name = name + FUNCDEF_PREFIX_LEN; ++ /* Temporarily remove the suffix. */ ++ temp_name[name_length] = '\0'; + +- strcpy (temp_string, name); +- temp_string[char_index] = ' '; +- strcpy (temp_string + char_index + 1, string); ++ string_length = strlen (string); ++ temp_string = (char *)xmalloc (name_length + 1 + string_length + 1); ++ memcpy (temp_string, temp_name, name_length); ++ temp_string[name_length] = ' '; ++ memcpy (temp_string + name_length + 1, string, string_length + 1); + + /* Don't import function names that are invalid identifiers from the + environment, though we still allow them to be defined as shell + variables. */ +- if (legal_identifier (name)) +- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); ++ if (legal_identifier (temp_name)) ++ parse_and_execute (temp_string, temp_name, ++ SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + +- if (temp_var = find_function (name)) ++ if (temp_var = find_function (temp_name)) + { + VSETATTR (temp_var, (att_exported|att_imported)); + array_needs_making = 1; + } + else + { + if (temp_var = bind_variable (name, string, 0)) + { + VSETATTR (temp_var, (att_exported | att_imported | att_invisible)); + array_needs_making = 1; + } + last_command_exit_value = 1; + report_error (_("error importing function definition for `%s'"), name); + } ++ ++ /* Restore the original suffix. */ ++ temp_name[name_length] = FUNCDEF_SUFFIX[0]; + } + #if defined (ARRAY_VARS) + # if ARRAY_EXPORT +@@ -2537,7 +2557,7 @@ + var->context = variable_context; /* XXX */ + + INVALIDATE_EXPORTSTR (var); +- var->exportstr = mk_env_string (name, value); ++ var->exportstr = mk_env_string (name, value, 0); + + array_needs_making = 1; + +@@ -3388,22 +3408,43 @@ + /* */ + /* **************************************************************** */ + ++/* Returns the string NAME=VALUE if !FUNCTIONP or if VALUE == NULL (in ++ which case it is treated as empty). Otherwise, decorate NAME with ++ FUNCDEF_PREFIX and FUNCDEF_SUFFIX, and return a string of the form ++ FUNCDEF_PREFIX NAME FUNCDEF_SUFFIX = VALUE (without spaces). */ + static inline char * +-mk_env_string (name, value) ++mk_env_string (name, value, functionp) + const char *name, *value; ++ int functionp; + { +- int name_len, value_len; +- char *p; ++ size_t name_len, value_len; ++ char *p, *q; + + name_len = strlen (name); + value_len = STRLEN (value); +- p = (char *)xmalloc (2 + name_len + value_len); +- strcpy (p, name); +- p[name_len] = '='; ++ if (functionp && value != NULL) ++ { ++ p = (char *)xmalloc (FUNCDEF_PREFIX_LEN + name_len + FUNCDEF_SUFFIX_LEN ++ + 1 + value_len + 1); ++ q = p; ++ memcpy (q, FUNCDEF_PREFIX, FUNCDEF_PREFIX_LEN); ++ q += FUNCDEF_PREFIX_LEN; ++ memcpy (q, name, name_len); ++ q += name_len; ++ memcpy (q, FUNCDEF_SUFFIX, FUNCDEF_SUFFIX_LEN); ++ q += FUNCDEF_SUFFIX_LEN; ++ } ++ else ++ { ++ p = (char *)xmalloc (name_len + 1 + value_len + 1); ++ memcpy (p, name, name_len); ++ q = p + name_len; ++ } ++ q[0] = '='; + if (value && *value) +- strcpy (p + name_len + 1, value); ++ memcpy (q + 1, value, value_len + 1); + else +- p[name_len + 1] = '\0'; ++ q[1] = '\0'; + return (p); + } + +@@ -3489,7 +3530,7 @@ + /* Gee, I'd like to get away with not using savestring() if we're + using the cached exportstr... */ + list[list_index] = USE_EXPORTSTR ? savestring (value) +- : mk_env_string (var->name, value); ++ : mk_env_string (var->name, value, function_p (var)); + + if (USE_EXPORTSTR == 0) + SAVE_EXPORTSTR (var, list[list_index]); Added: csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-2.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-2.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/bash-4.2-cve-2014-7169-2.patch 2014-09-26 15:19:52 UTC (rev 24140) @@ -0,0 +1,83 @@ +--- ../bash-4.2-orig/parse.y 2014-09-25 13:07:59.218209276 +0200 ++++ parse.y 2014-09-25 15:26:52.813159810 +0200 +@@ -264,9 +264,21 @@ + + /* Variables to manage the task of reading here documents, because we need to + defer the reading until after a complete command has been collected. */ +-static REDIRECT *redir_stack[10]; ++static REDIRECT **redir_stack; + int need_here_doc; + ++/* Pushes REDIR onto redir_stack, resizing it as needed. */ ++static void ++push_redir_stack (REDIRECT *redir) ++{ ++ /* Guard against oveflow. */ ++ if (need_here_doc + 1 > INT_MAX / sizeof (*redir_stack)) ++ abort (); ++ redir_stack = xrealloc (redir_stack, ++ (need_here_doc + 1) * sizeof (*redir_stack)); ++ redir_stack[need_here_doc++] = redir; ++} ++ + /* Where shell input comes from. History expansion is performed on each + line when the shell is interactive. */ + static char *shell_input_line = (char *)NULL; +@@ -519,42 +531,42 @@ + source.dest = 0; + redir.filename = $2; + $$ = make_redirection (source, r_reading_until, redir, 0); +- redir_stack[need_here_doc++] = $$; ++ push_redir_stack ($$); + } + | NUMBER LESS_LESS WORD + { + source.dest = $1; + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, 0); +- redir_stack[need_here_doc++] = $$; ++ push_redir_stack ($$); + } + | REDIR_WORD LESS_LESS WORD + { + source.filename = $1; + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); +- redir_stack[need_here_doc++] = $$; ++ push_redir_stack ($$); + } + | LESS_LESS_MINUS WORD + { + source.dest = 0; + redir.filename = $2; + $$ = make_redirection (source, r_deblank_reading_until, redir, 0); +- redir_stack[need_here_doc++] = $$; ++ push_redir_stack ($$); + } + | NUMBER LESS_LESS_MINUS WORD + { + source.dest = $1; + redir.filename = $3; + $$ = make_redirection (source, r_deblank_reading_until, redir, 0); +- redir_stack[need_here_doc++] = $$; ++ push_redir_stack ($$); + } + | REDIR_WORD LESS_LESS_MINUS WORD + { + source.filename = $1; + redir.filename = $3; + $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); +- redir_stack[need_here_doc++] = $$; ++ push_redir_stack ($$); + } + | LESS_LESS_LESS WORD + { +@@ -4757,7 +4769,7 @@ + case CASE: + case SELECT: + case FOR: +- if (word_top < MAX_CASE_NEST) ++ if (word_top + 1 < MAX_CASE_NEST) + word_top++; + word_lineno[word_top] = line_number; + break; Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2014-09-26 14:02:24 UTC (rev 24139) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2014-09-26 15:19:52 UTC (rev 24140) @@ -1,8 +1,10 @@ -bash (4.3.25,REV=2014.09.25) unstable +bash (4.3.25,REV=2014.09.26) unstable - * Added patch eol-pushback.patch to fix CVE-2014-7169 + * Added patches bash-4.2-cve-2014-7169-{0,1,2}.patch to fix CVE-2014-7169 + Patches are taken from fedora, see https://access.redhat.com/articles/1200223 + for impacts of the patch - -- Yann Rouillard Thu, 25 Sep 2014 20:35:06 +0200 + -- Yann Rouillard Fri, 26 Sep 2014 17:17:22 +0200 bash (4.3.25,REV=2014.09.25) unstable Deleted: csw/mgar/pkg/bash/trunk/files/eol-pushback.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/eol-pushback.patch 2014-09-26 14:02:24 UTC (rev 24139) +++ csw/mgar/pkg/bash/trunk/files/eol-pushback.patch 2014-09-26 15:19:52 UTC (rev 24140) @@ -1,11 +0,0 @@ -*** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400 ---- parse.y 2014-09-24 22:47:28.000000000 -0400 -*************** -*** 2959,2962 **** ---- 2959,2964 ---- - word_desc_to_read = (WORD_DESC *)NULL; - -+ eol_ungetc_lookahead = 0; -+ - current_token = '\n'; /* XXX */ - last_read_token = '\n'; 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 Sep 26 19:43:42 2014 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Fri, 26 Sep 2014 17:43:42 +0000 Subject: SF.net SVN: gar:[24141] csw/mgar/pkg/tor/trunk Message-ID: <3j4L892YSyz1Hx@mail.opencsw.org> Revision: 24141 http://sourceforge.net/p/gar/code/24141 Author: jake_goerzen Date: 2014-09-26 17:43:41 +0000 (Fri, 26 Sep 2014) Log Message: ----------- tor: bump to version 0.2.4.24 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2014-09-26 15:19:52 UTC (rev 24140) +++ csw/mgar/pkg/tor/trunk/Makefile 2014-09-26 17:43:41 UTC (rev 24141) @@ -1,6 +1,6 @@ # $Id$ NAME = tor -VERSION = 0.2.4.23 +VERSION = 0.2.4.24 GARTYPE = v2 DESCRIPTION = Secure network traffic router Modified: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums 2014-09-26 15:19:52 UTC (rev 24140) +++ csw/mgar/pkg/tor/trunk/checksums 2014-09-26 17:43:41 UTC (rev 24141) @@ -1 +1 @@ -9e39928e310612c3bffee727f554c63f tor-0.2.4.23.tar.gz +9acb86b529f0f48cc495da3801f85d1f tor-0.2.4.24.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Sep 26 22:59:56 2014 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 26 Sep 2014 20:59:56 +0000 Subject: SF.net SVN: gar:[24142] csw/mgar/pkg/git/trunk Message-ID: <3j4QVh3DsvzGf@mail.opencsw.org> Revision: 24142 http://sourceforge.net/p/gar/code/24142 Author: bdwalton Date: 2014-09-26 20:59:52 +0000 (Fri, 26 Sep 2014) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2014-09-26 17:43:41 UTC (rev 24141) +++ csw/mgar/pkg/git/trunk/Makefile 2014-09-26 20:59:52 UTC (rev 24142) @@ -1,5 +1,5 @@ NAME = git -VERSION = 2.0.3 +VERSION = 2.1.1 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2014-09-26 17:43:41 UTC (rev 24141) +++ csw/mgar/pkg/git/trunk/checksums 2014-09-26 20:59:52 UTC (rev 24142) @@ -1 +1 @@ -c549f5df737c0a559df0e911c8e1b7e5 git-2.0.3.tar.gz +5c5d15717fdf5644fe23fa415c39a7c6 git-2.1.1.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 Sat Sep 27 17:46:00 2014 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 27 Sep 2014 15:46:00 +0000 Subject: SF.net SVN: gar:[24143] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: <3j4vV03nywzY3@mail.opencsw.org> Revision: 24143 http://sourceforge.net/p/gar/code/24143 Author: lblume Date: 2014-09-27 15:45:56 +0000 (Sat, 27 Sep 2014) Log Message: ----------- mysql5/branches/mysql-5.6.x: Add incompatibility for the client Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-09-26 20:59:52 UTC (rev 24142) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2014-09-27 15:45:56 UTC (rev 24143) @@ -137,6 +137,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 CHECKPKG_OVERRIDES_CSW$(NAME)client += file-collision +INCOMPATIBLE_PKGS_CSW$(NAME)client = CSWmysql5client PACKAGES += CSW$(NAME) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database 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 Sep 27 21:54:12 2014 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 27 Sep 2014 19:54:12 +0000 Subject: SF.net SVN: gar:[24145] csw/mgar/pkg/lang-python/numpy/trunk/Makefile Message-ID: <3j510J0CqXzfh@mail.opencsw.org> Revision: 24145 http://sourceforge.net/p/gar/code/24145 Author: dmichelsen Date: 2014-09-27 19:54:09 +0000 (Sat, 27 Sep 2014) Log Message: ----------- lang-python/numpy/trunk: Restrict to Solaris 10 Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2014-09-27 18:45:46 UTC (rev 24144) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2014-09-27 19:54:09 UTC (rev 24145) @@ -20,6 +20,9 @@ # PATCHFILES += 0001-mvec-is-a-SPARC-only-library.patch +# This is a special library, Solaris 10 only, sorry +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-7-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Sep 29 16:55:49 2014 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 29 Sep 2014 14:55:49 +0000 Subject: SF.net SVN: gar:[24150] csw/mgar/pkg/gpgme/trunk/Makefile Message-ID: <3j66HD4B6gz14C@mail.opencsw.org> Revision: 24150 http://sourceforge.net/p/gar/code/24150 Author: pfelecan Date: 2014-09-29 14:55:48 +0000 (Mon, 29 Sep 2014) Log Message: ----------- overrides for SPARC Modified Paths: -------------- csw/mgar/pkg/gpgme/trunk/Makefile Modified: csw/mgar/pkg/gpgme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gpgme/trunk/Makefile 2014-09-29 13:22:23 UTC (rev 24149) +++ csw/mgar/pkg/gpgme/trunk/Makefile 2014-09-29 14:55:48 UTC (rev 24150) @@ -30,6 +30,11 @@ PATCHFILES += 0001-fix-tz-set-warning.patch PATCHFILES += 0002-fix-trace-macros-in-non-void-return.patch +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-fd-passing + +BUILD64_LIBS_ONLY = 1 + BUILD_DEP_PKGS += CSWlibgpg-error-dev BUILD_DEP_PKGS += CSWlibpth-dev BUILD_DEP_PKGS += CSWlibassuan-dev @@ -46,6 +51,8 @@ RUNTIME_DEP_PKGS_CSWlibgpgme-pthread11 += CSWlibassuan0 RUNTIME_DEP_PKGS_CSWlibgpgme-pthread11 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibgpgme-pthread11 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibgpgme-pthread11 += forbidden-version-interface-dependencies|/opt/csw/lib/libgpgme-pthread.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibgpgme-pthread11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libgpgme-pthread.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 PACKAGES += CSWlibgpgme11 CATALOGNAME_CSWlibgpgme11 = libgpgme11 @@ -54,6 +61,8 @@ RUNTIME_DEP_PKGS_CSWlibgpgme11 += CSWlibassuan0 RUNTIME_DEP_PKGS_CSWlibgpgme11 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibgpgme11 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibgpgme11 += forbidden-version-interface-dependencies|/opt/csw/lib/libgpgme.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibgpgme11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libgpgme.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 PACKAGES += CSWgpgme-dev CATALOGNAME_CSWgpgme-dev = gpgme_dev @@ -61,15 +70,4 @@ RUNTIME_DEP_PKGS_CSWgpgme-dev += CSWlibgpgme11 RUNTIME_DEP_PKGS_CSWgpgme-dev += CSWlibgpgme-pthread11 -BUILD64_LIBS_ONLY = 1 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-fd-passing -# CONFIGURE_ARGS += --with-gpg-version=2 -# CONFIGURE_ARGS += --with-gpgsm-version=2 -# CONFIGURE_ARGS += --with-gpgconf-version=2 -# CONFIGURE_ARGS += --with-gpgconf=$(prefix)/bin -# CONFIGURE_ARGS += --with-gpg=$(prefix)/bin -# CONFIGURE_ARGS += --with-gpgsm=$(prefix)/bin - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Sep 29 17:15:42 2014 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 29 Sep 2014 15:15:42 +0000 Subject: SF.net SVN: gar:[24151] csw/mgar/pkg/gpgme/trunk/Makefile Message-ID: <3j66k2440fz17c@mail.opencsw.org> Revision: 24151 http://sourceforge.net/p/gar/code/24151 Author: pfelecan Date: 2014-09-29 15:15:41 +0000 (Mon, 29 Sep 2014) Log Message: ----------- overrides for x86 Modified Paths: -------------- csw/mgar/pkg/gpgme/trunk/Makefile Modified: csw/mgar/pkg/gpgme/trunk/Makefile =================================================================== --- csw/mgar/pkg/gpgme/trunk/Makefile 2014-09-29 14:55:48 UTC (rev 24150) +++ csw/mgar/pkg/gpgme/trunk/Makefile 2014-09-29 15:15:41 UTC (rev 24151) @@ -53,6 +53,7 @@ RUNTIME_DEP_PKGS_CSWlibgpgme-pthread11 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibgpgme-pthread11 += forbidden-version-interface-dependencies|/opt/csw/lib/libgpgme-pthread.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 CHECKPKG_OVERRIDES_CSWlibgpgme-pthread11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libgpgme-pthread.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibgpgme-pthread11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libgpgme-pthread.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 PACKAGES += CSWlibgpgme11 CATALOGNAME_CSWlibgpgme11 = libgpgme11 @@ -63,6 +64,7 @@ RUNTIME_DEP_PKGS_CSWlibgpgme11 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibgpgme11 += forbidden-version-interface-dependencies|/opt/csw/lib/libgpgme.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 CHECKPKG_OVERRIDES_CSWlibgpgme11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libgpgme.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibgpgme11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libgpgme.so.11.13.0|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1 PACKAGES += CSWgpgme-dev CATALOGNAME_CSWgpgme-dev = gpgme_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 29 21:04:46 2014 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 29 Sep 2014 19:04:46 +0000 Subject: SF.net SVN: gar:[24152] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: <3j6CpM1pvfz1HB@mail.opencsw.org> Revision: 24152 http://sourceforge.net/p/gar/code/24152 Author: guillomovitch Date: 2014-09-29 19:04:42 +0000 (Mon, 29 Sep 2014) Log Message: ----------- new version 2.3.11.1 Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/checksums Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-09-29 15:15:41 UTC (rev 24151) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2014-09-29 19:04:42 UTC (rev 24152) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.10 +VERSION = 2.3.11.1 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-09-29 15:15:41 UTC (rev 24151) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2014-09-29 19:04:42 UTC (rev 24152) @@ -1 +1 @@ -e2f71321216dd7a0603f6c4ebf037574 FusionInventory-Agent-2.3.10.tar.gz +e599a3f5ac15fba2f5c8d5277a10a4a8 FusionInventory-Agent-2.3.11.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.