From lblume at users.sourceforge.net Sun Sep 1 11:50:54 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 01 Sep 2013 09:50:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21880] csw/mgar/pkg/procmail/trunk/Makefile Message-ID: Revision: 21880 http://gar.svn.sourceforge.net/gar/?rev=21880&view=rev Author: lblume Date: 2013-09-01 09:50:51 +0000 (Sun, 01 Sep 2013) Log Message: ----------- procmail/trunk: Add migration of old files Modified Paths: -------------- csw/mgar/pkg/procmail/trunk/Makefile Modified: csw/mgar/pkg/procmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/procmail/trunk/Makefile 2013-08-31 13:08:52 UTC (rev 21879) +++ csw/mgar/pkg/procmail/trunk/Makefile 2013-09-01 09:50:51 UTC (rev 21880) @@ -32,6 +32,11 @@ PROTOTYPE_PERMS_procmail = 6755 PROTOTYPE_GROUP_procmail = mail +# Move the old configuration, if any +MIGRATE_FILES_CSWprocmail = procmailrc +MIGRATE_SOURCE_DIR = $(prefix)/etc +MIGRATE_DEST_DIR = $(sysconfdir) + include gar/category.mk configure-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Sep 2 11:52:35 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 02 Sep 2013 09:52:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21881] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 21881 http://gar.svn.sourceforge.net/gar/?rev=21881&view=rev Author: bonivart Date: 2013-09-02 09:52:34 +0000 (Mon, 02 Sep 2013) Log Message: ----------- pkgutil/trunk: update Yann's path patch Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2013-09-01 09:50:51 UTC (rev 21880) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2013-09-02 09:52:34 UTC (rev 21881) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.6.6b1 +VERSION = 2.6.6b2 GARTYPE = v2 DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2013-09-01 09:50:51 UTC (rev 21880) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2013-09-02 09:52:34 UTC (rev 21881) @@ -1 +1 @@ -16e9c7aa0a39730753b0412aab93d044 pkgutil-2.6.6b1.zip +f1dded1c4719190630a8d8dc910abaab pkgutil-2.6.6b2.zip 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 3 09:21:42 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 03 Sep 2013 07:21:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21882] csw/mgar/pkg/awstats/trunk/Makefile Message-ID: Revision: 21882 http://gar.svn.sourceforge.net/gar/?rev=21882&view=rev Author: lblume Date: 2013-09-03 07:21:41 +0000 (Tue, 03 Sep 2013) Log Message: ----------- awstats/trunk: Add some decent defaults and some comments to the recipe Modified Paths: -------------- csw/mgar/pkg/awstats/trunk/Makefile Modified: csw/mgar/pkg/awstats/trunk/Makefile =================================================================== --- csw/mgar/pkg/awstats/trunk/Makefile 2013-09-02 09:52:34 UTC (rev 21881) +++ csw/mgar/pkg/awstats/trunk/Makefile 2013-09-03 07:21:41 UTC (rev 21882) @@ -47,26 +47,36 @@ include gar/category.mk install-custom: + ginstall -d $(DESTDIR)$(localstatedir)/awstats/ ginstall -d $(DESTDIR)$(docdir)/awstats/ cp -R $(WORKSRC)/docs/* $(DESTDIR)$(docdir)/awstats/ ginstall -d $(DESTDIR)$(sharedstatedir)/awstats/ cp -R $(WORKSRC)/tools/* $(DESTDIR)$(sharedstatedir)/awstats/ ginstall -d $(DESTDIR)$(sharedstatedir)/www/awstats/htdocs/ + + # Create the hierarchy that will be used by the webserver cp -R $(WORKSRC)/wwwroot/classes \ $(WORKSRC)/wwwroot/css \ $(WORKSRC)/wwwroot/icon \ $(WORKSRC)/wwwroot/js \ $(DESTDIR)$(sharedstatedir)/www/awstats/htdocs/ + ginstall -d $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/ cp -R $(WORKSRC)/wwwroot/cgi-bin/* \ $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/ ginstall -d $(DESTDIR)$(sysconfdir)/awstats/ + + # Configure the default configuration file location for extracted data + # and where to find the OpenCSW Apache logs cat $(WORKSRC)/wwwroot/cgi-bin/awstats.model.conf | perl -p \ - -e 's!/var/log/httpd/mylog.log!/var/opt/csw/awstats/awstats.log!;' \ + -e 's!^LogFile=.*!LogFile="$(prefix)/apache2/var/log/access_log"!;' \ + -e 's!^DirData=.*!DirData="$(localstatedir)/awstats"!;' \ > $(DESTDIR)$(sysconfdir)/awstats.conf + rm -f $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/awstats.model.conf + # Substitute defaults with OpenCSW locations ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra/ cat $(WORKSRC)/tools/httpd_conf | perl -p \ -e 's!/usr/local/awstats/wwwroot/cgi-bin/!$(sharedstatedir)/www/awstats/cgi-bin/!;' \ @@ -75,11 +85,9 @@ -e 's!/usr/local/awstats/!$(sharedstatedir)/www/awstats/!;' \ > $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-awstats.conf rm -f $(DESTDIR)$(sharedstatedir)/awstats/httpd_conf + chmod -R +rX $(DESTDIR)$(sharedstatedir)/www/awstats \ $(DESTDIR)$(docdir)/awstats chmod +rx $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/*.pl \ $(DESTDIR)$(sharedstatedir)/awstats/*.pl @$(MAKECOOKIE) - -# ./awstats_updateall.pl now -awstatsprog=/opt/csw/share/www/awstats/cgi-bin/awstats.pl -configdir=/etc/opt/csw - 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 3 13:39:25 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 03 Sep 2013 11:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21883] csw/mgar/pkg/libwebp/trunk/Makefile Message-ID: Revision: 21883 http://gar.svn.sourceforge.net/gar/?rev=21883&view=rev Author: lblume Date: 2013-09-03 11:39:23 +0000 (Tue, 03 Sep 2013) Log Message: ----------- libwebp/trunk: Incorrect project URL Modified Paths: -------------- csw/mgar/pkg/libwebp/trunk/Makefile Modified: csw/mgar/pkg/libwebp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwebp/trunk/Makefile 2013-09-03 07:21:41 UTC (rev 21882) +++ csw/mgar/pkg/libwebp/trunk/Makefile 2013-09-03 11:39:23 UTC (rev 21883) @@ -12,6 +12,7 @@ GOOGLE_PROJECT = webp MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = https://code.google.com/p/webp/ GARCOMPILER = SOS12U3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Sep 4 13:44:06 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 04 Sep 2013 11:44:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21884] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21884 http://gar.svn.sourceforge.net/gar/?rev=21884&view=rev Author: cgrzemba Date: 2013-09-04 11:44:03 +0000 (Wed, 04 Sep 2013) Log Message: ----------- qt4-gcc/trunk: disable 'script' for Sparc because core dump in desginer, qmlplugindump, ... Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-03 11:39:23 UTC (rev 21883) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-04 11:44:03 UTC (rev 21884) @@ -11,8 +11,6 @@ development and internationalization. endef -GARCOMPILER = GNU - MASTER_SITES = http://download.qt-project.org/official_releases/qt/$(basename $(VERSION))/$(VERSION)/ DISTNAME = qt-everywhere-opensource-src-$(VERSION) DISTFILES = $(DISTNAME).tar.gz @@ -22,6 +20,9 @@ NOGITPATCH = 1 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GNU +# GARFLAVOR = DBG + REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl.cpp @@ -42,9 +43,13 @@ # http://wiki.opencsw.org/porting-faq#toc9 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS EXTRA_CXXFLAGS = -DSUN_OGL_NO_VERTEX_MACROS +# override -O2 because of core dumps of designer, qmlplugindump and other in libQtDeclarative.so.4? +CXXFLAGS = -pipe $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_CXXFLAGS) platform_arg = solaris-g++ +CONFIGURE_ARGS_DBG += -debug +CONFIGURE_ARGS_OPT += -release CONFIGURE_ARGS += -confirm-license CONFIGURE_ARGS += -prefix $(prefix) CONFIGURE_ARGS += -docdir $(sharedstatedir)/$(NAME)$(MAJOR)/doc @@ -72,7 +77,7 @@ CONFIGURE_ARGS += -system-libjpeg CONFIGURE_ARGS += -no-rpath CONFIGURE_ARGS += -reduce-relocations -CONFIGURE_ARGS += -no-separate-debug-info +# CONFIGURE_ARGS += -no-separate-debug-info CONFIGURE_ARGS += -verbose CONFIGURE_ARGS += -lfontconfig CONFIGURE_ARGS += -I$(includedir)/freetype2 @@ -93,9 +98,15 @@ CONFIGURE_ARGS += -I$(includedir)/gtk-2.0 CONFIGURE_ARGS += -I/usr/X11/include CONFIGURE_ARGS += -I/usr/X11/share/include -CONFIGURE_ARGS_sparc += -big-endian -host-big-endian +CONFIGURE_ARGS_sparc += -big-endian -host-big-endian + +# not build for Sparc because core dump in designer, qmlplugindump, .. +CONFIGURE_ARGS_sparc += -no-javascript-jit +CONFIGURE_ARGS_sparc += -no-script + # CONFIGURE_ARGS_i386 += -little-endian -host-big-endian CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # TEST_TARGET = @@ -135,7 +146,7 @@ PKGFILES_CSWqt4-private-dev += $(includedir)/QtGui/private/.* PKGFILES_CSWqt4-private-dev += $(includedir)/QtScript/private/.* PKGFILES_CSWqt4-private-dev += $(includedir)/src/.* -ARCHALL_CSWqt4-private-dev = 1 +# ARCHALL_CSWqt4-private-dev = 1 RUNTIME_DEP_PKGS_CSWqt4-private-dev += CSWqt4-dev CHECKPKG_OVERRIDES_CSWqt4-private-dev += surplus-dependency|CSWqt4-dev @@ -180,7 +191,7 @@ # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWsqlite -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibicui18n50 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Sep 6 14:33:34 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 06 Sep 2013 12:33:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21885] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21885 http://gar.svn.sourceforge.net/gar/?rev=21885&view=rev Author: cgrzemba Date: 2013-09-06 12:33:34 +0000 (Fri, 06 Sep 2013) Log Message: ----------- qt4-gcc/trunk: add chkpkg hints Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-04 11:44:03 UTC (rev 21884) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-06 12:33:34 UTC (rev 21885) @@ -146,9 +146,10 @@ PKGFILES_CSWqt4-private-dev += $(includedir)/QtGui/private/.* PKGFILES_CSWqt4-private-dev += $(includedir)/QtScript/private/.* PKGFILES_CSWqt4-private-dev += $(includedir)/src/.* -# ARCHALL_CSWqt4-private-dev = 1 +ARCHALL_CSWqt4-private-dev = 1 RUNTIME_DEP_PKGS_CSWqt4-private-dev += CSWqt4-dev CHECKPKG_OVERRIDES_CSWqt4-private-dev += surplus-dependency|CSWqt4-dev +CHECKPKG_OVERRIDES_CSWqt4-private-dev += archall-devel-package PACKAGES += CSWqt4-dev SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files @@ -161,7 +162,6 @@ PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/imports/.* PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/mkspecs/.* EXTRA_PKGFILES_EXCLUDED_CSWqt4-dev += $(PKGFILES_CSWqt4-private-dev) -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesignercomponents4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesigner4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtxml4 @@ -172,8 +172,6 @@ RUNTIME_DEP_PKGS_CSWqt4-dev += CSWdbus RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtclucene4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtcore4 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscripttools4 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdeclarative4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtopengl4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtmultimedia4 @@ -203,20 +201,63 @@ RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstvideo0-10-0 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstaudio0-10-0 + CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50 -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/twitter/twitter_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/flickr/flickr_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/samegame/samegame_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/rssnews/rssnews_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/photoviewer/photoviewer_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/calculator/calculator_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/snake/snake_harmattan.desktop -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri - +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/twitter/twitter_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/flickr/flickr_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/samegame/samegame_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/rssnews/rssnews_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/photoviewer/photoviewer_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/calculator/calculator_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/snake/snake_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri +CHECKPKG_OVERRIDES_CSWqt4-dev_i386 += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus +CHECKPKG_OVERRIDES_CSWqt4-dev += $(CHECKPKG_OVERRIDES_CSWqt4-dev_$(GARCH)) +# +# temporary special packaging for Sprac build without script +# +RUNTIME_DEP_PKGS_CSWqt4-dev_i386 += CSWlibqtscript4 +RUNTIME_DEP_PKGS_CSWqt4-dev_i386 += CSWlibqtscripttools4 +RUNTIME_DEP_PKGS_CSWqt4-dev_i386 += CSWlibqtdeclarative4 +RUNTIME_DEP_PKGS_CSWqt4-dev += $(RUNTIME_DEP_PKGS_CSWqt4-dev_$(GARCH)) + +PACKAGES += CSWlibqtscript4 +PKGFILES_CSWlibqtscript4 += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtscript4 += $(DESCRIPTION), libQtScript.so.4 +RUNTIME_DEP_PKGS_CSWlibqtscript4_i386 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqtscript4_i386 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibqtscript4_i386 += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibqtscript4 += $(RUNTIME_DEP_PKGS_CSWlibqtscript4_$(GARCH)) + +PACKAGES += CSWlibqtscripttools4 +PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtscripttools4 += $(DESCRIPTION), libQtScriptTools.so.4 +RUNTIME_DEP_PKGS_CSWlibqtscripttools4_i386 += CSWlibqtscript4 +RUNTIME_DEP_PKGS_CSWlibqtscripttools4_i386 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqtscripttools4_i386 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibqtscripttools4_i386 += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibqtscripttools4_i386 += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += $(RUNTIME_DEP_PKGS_CSWlibqtscripttools4_$(GARCH)) + +PACKAGES += CSWlibqtdeclarative4 +PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtdeclarative4 += $(DESCRIPTION), libQtDeclarative.so.4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtscript4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtnetwork4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtgui4 +# RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtsql4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += $(RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_$(GARCH)) +# +# end temporay packaging +# + PACKAGES += CSWlibqthelp4 PKGFILES_CSWlibqthelp4 += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqthelp4 += $(DESCRIPTION), libQtHelp.so.4 @@ -257,23 +298,6 @@ RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH)) - -PACKAGES += CSWlibqtscript4 -PKGFILES_CSWlibqtscript4 += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibqtscript4 += $(DESCRIPTION), libQtScript.so.4 -RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibqtcore4 - -PACKAGES += CSWlibqtscripttools4 -PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibqtscripttools4 += $(DESCRIPTION), libQtScriptTools.so.4 -RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtscript4 -RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtgui4 -RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtcore4 - PACKAGES += CSWlibqtsql4 PKGFILES_CSWlibqtsql4 += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtsql4 += $(DESCRIPTION), libQtSql.so.4 @@ -322,27 +346,16 @@ RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtcore4 -PACKAGES += CSWlibqtdeclarative4 -PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibqtdeclarative4 += $(DESCRIPTION), libQtDeclarative.so.4 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtscript4 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtnetwork4 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtcore4 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtgui4 -# RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4 - PACKAGES += CSWlibqtdesigner4 PKGFILES_CSWlibqtdesigner4 += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtdesigner4 += $(DESCRIPTION), libQtDesigner.so.4 -RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtscript4 +RUNTIME_DEP_PKGS_CSWlibqtdesigner4_i386 += CSWlibqtscript4 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += $(RUNTIME_DEP_PKGS_CSWlibqtdesigner4_$(GARCH)) PACKAGES += CSWlibqtdesignercomponents4 PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*) 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 6 22:35:01 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 06 Sep 2013 20:35:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21886] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 21886 http://gar.svn.sourceforge.net/gar/?rev=21886&view=rev Author: chninkel Date: 2013-09-06 20:35:01 +0000 (Fri, 06 Sep 2013) Log Message: ----------- gar/lftp: updated to 4.4.9 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-09-06 12:33:34 UTC (rev 21885) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-09-06 20:35:01 UTC (rev 21886) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = lftp -VERSION = 4.4.8 +VERSION = 4.4.9 GARTYPE = v2 DESCRIPTION = A sophisticated command-line ftp/http client @@ -52,12 +52,6 @@ PATCHFILES += dont_use_csw_getopt_h.patch -# Disable the use of IPV6_V6ONLY function if it is not defined -# It is not mandatory here, lftp uses the option for the torrent listen socket -# it opens a socket first for ipv4 then for ipv6, so the ipv6 one will never -# catch the ipv4 connection even if IPV6_V6ONLY can't be set -PATCHFILES += 0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch - # Update the system-wide lftp.conf path in the man page PATCHFILES += 0007-update-configuration-files-paths-in-documentation.patch Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2013-09-06 12:33:34 UTC (rev 21885) +++ csw/mgar/pkg/lftp/trunk/checksums 2013-09-06 20:35:01 UTC (rev 21886) @@ -1 +1 @@ -30b58bd1d7f73ed51ee9778497f4fb1f lftp-4.4.8.tar.gz +d6fe9ea4f4214b217140977025300535 lftp-4.4.9.tar.gz Deleted: csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch =================================================================== --- csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch 2013-09-06 12:33:34 UTC (rev 21885) +++ csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch 2013-09-06 20:35:01 UTC (rev 21886) @@ -1,24 +0,0 @@ -From 4dcd1af03e96e63ea860b8da1a3845f94c85b4a0 Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Fri, 22 Jul 2011 23:26:04 +0200 -Subject: [PATCH] no ipv6_v6only setsock option under solaris 9 - ---- - src/network.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/network.cc b/src/network.cc -index fc7b407..e5af45a 100644 ---- a/src/network.cc -+++ b/src/network.cc -@@ -285,7 +285,7 @@ int Networker::SocketAccept(int fd,sockaddr_u *u,const char *hostname) - - void Networker::SocketSinglePF(int s,int pf) - { --#if INET6 -+#if INET6 && IPV6_V6ONLY - if(pf==PF_INET6) { - int on = 1; - if(-1==setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&on, sizeof(on))) --- -1.7.6 Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-09-06 12:33:34 UTC (rev 21885) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-09-06 20:35:01 UTC (rev 21886) @@ -1,3 +1,11 @@ +lftp (4.4.9,REV=2013.09.06) unstable + + * New upstream release. + * Removed 0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch patch + that was only mandatory for Solaris 9. + + -- Yann Rouillard Fri, 06 Sep 2013 22:18:55 +0200 + lftp (4.4.8,REV=2013.07.10) unstable * New upstream release. 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 7 12:34:56 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 07 Sep 2013 10:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21887] csw/mgar/pkg/graphviz/trunk Message-ID: Revision: 21887 http://gar.svn.sourceforge.net/gar/?rev=21887&view=rev Author: lblume Date: 2013-09-07 10:34:55 +0000 (Sat, 07 Sep 2013) Log Message: ----------- graphviz/trunk: Bump version to 2.34.0; remove old patch files Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch csw/mgar/pkg/graphviz/trunk/files/configure.patch csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2013-09-07 10:34:55 UTC (rev 21887) @@ -4,7 +4,7 @@ # investigated. NAME = graphviz -VERSION = 2.32.0 +VERSION = 2.34.0 GARTYPE = v2 DESCRIPTION = Graph visualization tools @@ -20,8 +20,6 @@ GARCOMPILER = GCC4 -PATCHFILES += 0001_configure_tcl_bin_path_not_good_for_64bit.patch - INCOMPATIBLE_PKGS = CSWgraphvis BUILD64 = 1 Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/checksums 2013-09-07 10:34:55 UTC (rev 21887) @@ -1 +1 @@ -deda3933da701e2cc9ad968249a0b096 graphviz-2.32.0.tar.gz +a8a54f8abac5bcdafd9a568e85a086d6 graphviz-2.34.0.tar.gz Deleted: csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,20 +0,0 @@ ---- a/configure jeu. f?vr 14 14:30:22 2013 -+++ b/configure mar. juil 30 22:09:59 2013 -@@ -23637,7 +23637,7 @@ - # can't assume ksh on all architectures - # TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*} - # so use sed instead -- TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'` -+ TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/.*tclsh.*$%%'` - - if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then - TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic" -@@ -23853,7 +23853,7 @@ - # can't assume ksh on all architectures - # WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*} - # so use sed instead -- WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` -+ WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/.*wish.*$%%'` - - if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then - TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix" Deleted: csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,55 +0,0 @@ ---- a/configure Tue Jul 30 23:30:11 2013 -+++ b/configure Tue Jul 30 23:39:30 2013 -@@ -20960,7 +20960,7 @@ - if test "x$GUILE" == "x"; then - use_guile="No (guile not available)" - else -- GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'` -+ GUILE_VERSION=`$GUILE --version | gsed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'` - GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` - GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` - if test 0$GUILE_VERSION_MAJOR -lt 2; then -@@ -20987,12 +20987,12 @@ - pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null` -+ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -21003,12 +21003,12 @@ - pkg_cv_GUILE_LIBS="$GUILE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null` -+ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -21028,9 +21028,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` -+ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` - else -- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` -+ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GUILE_PKG_ERRORS" >&5 Deleted: csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,25 +0,0 @@ ---- graphviz2/Makefile.am.orig 2011-05-19 16:37:11.967464147 -0400 -+++ graphviz2/Makefile.am 2011-05-19 16:16:07.582870659 -0400 -@@ -12,7 +12,7 @@ - txt_DATA = $(txt) - html_DATA = $(html) - --pkginclude_HEADERS = graphviz_version.h -+pkginclude_HEADERS = $(top_builddir)/graphviz_version.h - - man_MANS = graphviz.7 - -@@ -28,10 +28,10 @@ - # rm -f ToPAS - # find $(distdir) -type f -exec md5sum {} >>ToPAS \; - --BUILT_SOURCES = graphviz_version.h -+BUILT_SOURCES = $(top_builddir)/graphviz_version.h - --graphviz_version.h: config.h -- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h -+$(top_builddir)/graphviz_version.h: config.h -+ ggrep 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h - - EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \ - autogen.sh config/depcomp config/config.rpath \ Deleted: csw/mgar/pkg/graphviz/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/configure.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/configure.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,39 +0,0 @@ ---- graphviz-2.28.0/configure.orig 2011-05-07 05:27:36.000000000 +0200 -+++ graphviz-2.28.0/configure 2011-05-31 14:13:54.695706826 +0200 -@@ -4056,7 +4056,7 @@ - if test "x${prefix}" != "x/usr"; then - CPPFLAGS="$CPPFLAGS -I${prefix}/include" - LDFLAGS="$LDFLAGS -L${prefix}/lib" -- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH" -+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH$PATHSEPARATOR$prefix/lib/pkgconfig" - export PKG_CONFIG_PATH - fi - -@@ -25115,7 +25115,7 @@ - - if test -n "$GDLIB_CONFIG"; then - GD_INCLUDES=`$GDLIB_CONFIG --includes` -- GD_LDFLAGS=`$GDLIB_CONFIG --ldflags | sed 's/-xarch=386 //'` -+ GD_LDFLAGS=`$GDLIB_CONFIG --ldflags | sed 's/-xarch=[^ ]* //'` - GD_LIBS=`$GDLIB_CONFIG --libs` - GD_MAJORVERSION=`$GDLIB_CONFIG --majorversion` - GD_MINORVERSION=`$GDLIB_CONFIG --minorversion` -@@ -25270,7 +25270,8 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lgd $GD_LIBS $LIBS" -+GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" -+LIBS="$GD_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -25296,8 +25297,6 @@ - $as_echo "$ac_cv_lib_gd_main" >&6; } - if test "x$ac_cv_lib_gd_main" = x""yes; then : - -- GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS" -- - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBGD 1 - _ACEOF Deleted: csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,15 +0,0 @@ ---- graphviz-2.28.0/tclpkg/gv/Makefile.am.orig 2011-03-28 20:15:56.000000000 +0200 -+++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2011-05-29 16:38:29.887586723 +0200 -@@ -133,9 +133,9 @@ - - pkgperldir = $(pkglibdir)/perl - PERL ?= perl --PERL_CC = $(shell $(PERL) -MExtUtils::Embed -e ccopts) --PERL_LD = $(shell $(PERL) -MExtUtils::Embed -e ldopts) --VENDOR_ARCH = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};') -+PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(PERL) -pe 's/-x.*? //g'` -+PERL_LD = `$(PERL) -MExtUtils::Embed -e ldopts` -+VENDOR_ARCH = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'` - PERL_data = gv.pm - nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data) - libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c Deleted: csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,11 +0,0 @@ ---- graphviz-2.28.0/lib/gvpr/Makefile.am.orig 2011-05-29 14:42:32.102324093 +0200 -+++ graphviz-2.28.0/lib/gvpr/Makefile.am 2011-05-29 14:42:51.192032898 +0200 -@@ -3,6 +3,8 @@ - - pkgconfigdir = $(libdir)/pkgconfig - -+LIBS= -+ - GVPR_VERSION="2:0:0" - - AM_CPPFLAGS = \ Deleted: csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,9 +0,0 @@ ---- graphviz2/lib/sfdpgen/post_process.c.orig 2011-05-20 11:08:31.253933170 -0400 -+++ graphviz2/lib/sfdpgen/post_process.c 2011-05-20 11:06:43.000000000 -0400 -@@ -412,7 +412,7 @@ - - - void SparseStressMajorizationSmoother_delete(SparseStressMajorizationSmoother sm){ -- return StressMajorizationSmoother_delete(sm); -+ StressMajorizationSmoother_delete(sm); - } Deleted: csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch 2013-09-06 20:35:01 UTC (rev 21886) +++ csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch 2013-09-07 10:34:55 UTC (rev 21887) @@ -1,13 +0,0 @@ ---- graphviz2/lib/ortho/trapezoid.c.orig 2011-05-20 10:21:30.053193399 -0400 -+++ graphviz2/lib/ortho/trapezoid.c 2011-05-20 10:15:18.261136653 -0400 -@@ -28,6 +28,10 @@ - - #ifdef WIN32 - #define log2(x) (log(x)/log(2)) -+#else -+#ifndef HAVE_LOG2 -+#define log2(x) (log(x)/log(2)) -+#endif - #endif - - /* Node types */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Sep 7 18:43:48 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 07 Sep 2013 16:43:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21888] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 21888 http://gar.svn.sourceforge.net/gar/?rev=21888&view=rev Author: pfelecan Date: 2013-09-07 16:43:46 +0000 (Sat, 07 Sep 2013) Log Message: ----------- mercurial/trunk: runtime dependencies in prepapration for dual Python 2 interpreter support Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2013-09-07 10:34:55 UTC (rev 21887) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-09-07 16:43:46 UTC (rev 21888) @@ -22,6 +22,10 @@ #TEST_SCRIPTS = $(WORKSRC)/tests/run_tests.py #TEST_TARGET = +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-7-1-0 + CHECKPKG_OVERRIDES_CSWmercurial += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWmercurial += catalogname-does-not-start-with-py_ 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 7 18:58:47 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 07 Sep 2013 16:58:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21889] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 21889 http://gar.svn.sourceforge.net/gar/?rev=21889&view=rev Author: wahwah Date: 2013-09-07 16:58:46 +0000 (Sat, 07 Sep 2013) Log Message: ----------- csw-upload-pkg: Explicitly get full package data The first lookup returns a shortened version, without the name of the OS release. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-09-07 16:43:46 UTC (rev 21888) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-09-07 16:58:46 UTC (rev 21889) @@ -236,6 +236,10 @@ try: srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( catrel, arch, osrel, catalogname) + # To get the full information; the Srv4ByCatalogAndCatalogname + # return a smaller set of data. + srv4_in_catalog = self._rest_client.GetPkgByMd5( + srv4_in_catalog['md5_sum']) except urllib2.HTTPError, e: srv4_in_catalog = None if srv4_in_catalog: 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 7 20:07:28 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 07 Sep 2013 18:07:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21890] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 21890 http://gar.svn.sourceforge.net/gar/?rev=21890&view=rev Author: rthurner Date: 2013-09-07 18:07:28 +0000 (Sat, 07 Sep 2013) Log Message: ----------- mercurial, upgrade to hg-2.7.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 2013-09-07 16:58:46 UTC (rev 21889) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-09-07 18:07:28 UTC (rev 21890) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.7 +VERSION = 2.7.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-09-07 16:58:46 UTC (rev 21889) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-09-07 18:07:28 UTC (rev 21890) @@ -1 +1 @@ -61093c08ca5d8d1310382d17764f0c43 mercurial-2.7.tar.gz +3313de3667902ae4dc82f29f5280294d mercurial-2.7.1.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 9 22:51:37 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Sep 2013 20:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21891] csw/mgar/pkg/lang-python/simplejson/trunk/Makefile Message-ID: Revision: 21891 http://gar.svn.sourceforge.net/gar/?rev=21891&view=rev Author: wahwah Date: 2013-09-09 20:51:35 +0000 (Mon, 09 Sep 2013) Log Message: ----------- lang-python/simplejson/trunk: Python 2.7 support Modified Paths: -------------- csw/mgar/pkg/lang-python/simplejson/trunk/Makefile Modified: csw/mgar/pkg/lang-python/simplejson/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/simplejson/trunk/Makefile 2013-09-07 18:07:28 UTC (rev 21890) +++ csw/mgar/pkg/lang-python/simplejson/trunk/Makefile 2013-09-09 20:51:35 UTC (rev 21891) @@ -12,7 +12,7 @@ endef # Download from github does not really work as there are some suffixes at the end I cannot guess -MASTER_SITES = https://github.com/simplejson/simplejson/tarball/v2.2.1 +MASTER_SITES = https://github.com/simplejson/simplejson/tarball/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTNAME = simplejson-simplejson-52d0050 @@ -22,7 +22,8 @@ PACKAGES = CSWpy-simplejson SPKG_DESC_CSWpy-simplejson = JSON encoder and decoder -# Is this really necessary? We are already depending on CSWpython as category == 'python' RUNTIME_DEP_PKGS_CSWpy-simplejson += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-simplejson += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-simplejson += CSWlibgcc-s1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 9 22:56:44 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 09 Sep 2013 20:56:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21892] csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile Message-ID: Revision: 21892 http://gar.svn.sourceforge.net/gar/?rev=21892&view=rev Author: wahwah Date: 2013-09-09 20:56:44 +0000 (Mon, 09 Sep 2013) Log Message: ----------- lang-python/pyelftools/trunk: Build for Solaris 9 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-09-09 20:51:35 UTC (rev 21891) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-09-09 20:56:44 UTC (rev 21892) @@ -12,6 +12,8 @@ CATEGORIES = python DISTFILES = $(DISTNAME).tar.gz +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + # Since elftools are used for checkpkg, they need to be built for all # platforms on which we're building. PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 10 09:38:09 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Sep 2013 07:38:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21893] csw/mgar/pkg/autogen/trunk Message-ID: Revision: 21893 http://gar.svn.sourceforge.net/gar/?rev=21893&view=rev Author: pfelecan Date: 2013-09-10 07:38:08 +0000 (Tue, 10 Sep 2013) Log Message: ----------- autogen/trunk: bump to latest upstream revision Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile csw/mgar/pkg/autogen/trunk/checksums Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-09-09 20:56:44 UTC (rev 21892) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-09-10 07:38:08 UTC (rev 21893) @@ -2,7 +2,7 @@ NAME = autogen -VERSION = 5.18 +VERSION = 5.18.1 GARTYPE = v2 DESCRIPTION = The Automated Text and Program Generation Tool Modified: csw/mgar/pkg/autogen/trunk/checksums =================================================================== --- csw/mgar/pkg/autogen/trunk/checksums 2013-09-09 20:56:44 UTC (rev 21892) +++ csw/mgar/pkg/autogen/trunk/checksums 2013-09-10 07:38:08 UTC (rev 21893) @@ -1 +1 @@ -ef49893d65a490f4e1ae0a4d816cf6aa autogen-5.18.tar.xz +843a613e08ef8d47aba6733c60c8bda4 autogen-5.18.1.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 10 09:40:03 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Sep 2013 07:40:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21894] csw/mgar/pkg/gdb/trunk Message-ID: Revision: 21894 http://gar.svn.sourceforge.net/gar/?rev=21894&view=rev Author: pfelecan Date: 2013-09-10 07:40:02 +0000 (Tue, 10 Sep 2013) Log Message: ----------- gdb/trunk: bump to latest upstream revision Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile csw/mgar/pkg/gdb/trunk/checksums Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 07:38:08 UTC (rev 21893) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 07:40:02 UTC (rev 21894) @@ -1,7 +1,7 @@ # $Id$ NAME = gdb -VERSION = 7.6 +VERSION = 7.6.1 GARTYPE = v2 DESCRIPTION = The GNU Debugger Modified: csw/mgar/pkg/gdb/trunk/checksums =================================================================== --- csw/mgar/pkg/gdb/trunk/checksums 2013-09-10 07:38:08 UTC (rev 21893) +++ csw/mgar/pkg/gdb/trunk/checksums 2013-09-10 07:40:02 UTC (rev 21894) @@ -1 +1 @@ -a9836707337e5f7bf76a009a8904f470 gdb-7.6.tar.gz +d42841167fd061d90fddf9a7212a1f9f gdb-7.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 10 10:15:28 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Sep 2013 08:15:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21895] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 21895 http://gar.svn.sourceforge.net/gar/?rev=21895&view=rev Author: pfelecan Date: 2013-09-10 08:15:27 +0000 (Tue, 10 Sep 2013) Log Message: ----------- autogen/trunk: adapt override to new DSO Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2013-09-10 07:40:02 UTC (rev 21894) +++ csw/mgar/pkg/autogen/trunk/Makefile 2013-09-10 08:15:27 UTC (rev 21895) @@ -92,9 +92,9 @@ OBSOLETED_BY_CSWlibopts25 = CSWautogenrt RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibintl8 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libgen.so.1 -CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.0|is|not|directly|bound|to|soname|libintl.so.8 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.1|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.1|is|not|directly|bound|to|soname|libgen.so.1 +CHECKPKG_OVERRIDES_CSWlibopts25 += no-direct-binding|/opt/csw/lib/libopts.so.25.15.1|is|not|directly|bound|to|soname|libintl.so.8 PACKAGES += CSWautogen-dev CATALOGNAME_CSWautogen-dev = autogen_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 10 10:25:08 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Sep 2013 08:25:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21896] csw/mgar/pkg/gdb/trunk Message-ID: Revision: 21896 http://gar.svn.sourceforge.net/gar/?rev=21896&view=rev Author: pfelecan Date: 2013-09-10 08:25:08 +0000 (Tue, 10 Sep 2013) Log Message: ----------- gdb/trunk: remove patch applied by upstream Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/gdb/trunk/files/0004-missing-symbol-ps_lgetxregsize.patch Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 08:15:27 UTC (rev 21895) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 08:25:08 UTC (rev 21896) @@ -34,7 +34,6 @@ # from private patch 4: PATCHFILES += 0003-Extend-to-OpenCSW-the-OpenSolaris-gdb-fork-child.patch # aggregate from http://sourceware.org/bugzilla/show_bug.cgi?id=15420%3E -PATCHFILES += 0004-missing-symbol-ps_lgetxregsize.patch GARCOMPILER = GNU Deleted: csw/mgar/pkg/gdb/trunk/files/0004-missing-symbol-ps_lgetxregsize.patch =================================================================== --- csw/mgar/pkg/gdb/trunk/files/0004-missing-symbol-ps_lgetxregsize.patch 2013-09-10 08:15:27 UTC (rev 21895) +++ csw/mgar/pkg/gdb/trunk/files/0004-missing-symbol-ps_lgetxregsize.patch 2013-09-10 08:25:08 UTC (rev 21896) @@ -1,106 +0,0 @@ -From 0320b16973a5858f709c75f6232d6c68a347e528 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Wed, 14 Aug 2013 12:01:19 +0200 -Subject: [PATCH] missing symbol ps_lgetxregsize - -Patch set from http://sourceware.org/bugzilla/show_bug.cgi?id=15420%3E -signaled by Ralph Boehme -Fix issue reported at https://www.opencsw.org/mantis/view.php?id=5101 ---- - gdb/ChangeLog | 9 +++++++++ - gdb/configure | 7 ------- - gdb/configure.ac | 7 ------- - gdb/sol-thread.c | 24 ++++++++++++++++++++++++ - 4 files changed, 33 insertions(+), 14 deletions(-) - -diff --git a/gdb/ChangeLog b/gdb/ChangeLog -index c9e1b3d..98d7e13 100644 ---- a/gdb/ChangeLog -+++ b/gdb/ChangeLog -@@ -1,3 +1,12 @@ -+2013-05-10 Joel Brobecker -+ -+ PR tdep/15420: -+ * sol-thread.c (ps_lgetxregsize, ps_lgetxregs, ps_lsetxregs): -+ New functions, directly copied from sparc-sol-thread.c. -+ * sparc-sol-thread.c: Delete. -+ * configure.ac: Remove code handling sparc-solaris-thread.c. -+ * configure: Regenerate. -+ - 2013-04-26 Joel Brobecker - - * NEWS: Change "since GDB 7.5" into "in GDB 7.6". -diff --git a/gdb/configure b/gdb/configure -index b6ad59c..5ac0a23 100755 ---- a/gdb/configure -+++ b/gdb/configure -@@ -11949,13 +11949,6 @@ $as_echo "#define HAVE_THREAD_DB_LIB 1" >>confdefs.h - - CONFIG_OBS="${CONFIG_OBS} sol-thread.o" - CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c" -- # On SPARC CPUs, we also need to build sparc-sol-thread. -- case ${host_cpu} in -- sparc*) -- CONFIG_OBS="${CONFIG_OBS} sparc-sol-thread.o" -- CONFIG_SRCS="${CONFIG_SRCS} sparc-sol-thread.c" -- ;; -- esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } - if test "${ac_cv_lib_dl_dlopen+set}" = set; then : -diff --git a/gdb/configure.ac b/gdb/configure.ac -index e733d9d..e7ce71b 100644 ---- a/gdb/configure.ac -+++ b/gdb/configure.ac -@@ -1733,13 +1733,6 @@ if test ${build} = ${host} -a ${host} = ${target} ; then - [Define if using Solaris thread debugging.]) - CONFIG_OBS="${CONFIG_OBS} sol-thread.o" - CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c" -- # On SPARC CPUs, we also need to build sparc-sol-thread. -- case ${host_cpu} in -- sparc*) -- CONFIG_OBS="${CONFIG_OBS} sparc-sol-thread.o" -- CONFIG_SRCS="${CONFIG_SRCS} sparc-sol-thread.c" -- ;; -- esac - AC_CHECK_LIB(dl, dlopen) - CONFIG_LDFLAGS="${CONFIG_LDFLAGS} $RDYNAMIC" - # Sun randomly tweaked the prototypes in -diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c -index ec3df83..7bb0864 100644 ---- a/gdb/sol-thread.c -+++ b/gdb/sol-thread.c -@@ -907,6 +907,30 @@ ps_plog (const char *fmt, ...) - vfprintf_filtered (gdb_stderr, fmt, args); - } - -+/* Get size of extra register set. Currently a noop. */ -+ -+ps_err_e -+ps_lgetxregsize (gdb_ps_prochandle_t ph, lwpid_t lwpid, int *xregsize) -+{ -+ return PS_OK; -+} -+ -+/* Get extra register set. Currently a noop. */ -+ -+ps_err_e -+ps_lgetxregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, caddr_t xregset) -+{ -+ return PS_OK; -+} -+ -+/* Set extra register set. Currently a noop. */ -+ -+ps_err_e -+ps_lsetxregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, caddr_t xregset) -+{ -+ return PS_OK; -+} -+ - /* Get floating-point registers for LWP. */ - - ps_err_e --- -1.8.3.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 10 10:27:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Sep 2013 08:27:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21897] csw/mgar/pkg/gdb/trunk/Makefile Message-ID: Revision: 21897 http://gar.svn.sourceforge.net/gar/?rev=21897&view=rev Author: pfelecan Date: 2013-09-10 08:27:47 +0000 (Tue, 10 Sep 2013) Log Message: ----------- gdb/trunk: remove also the comment associated with the patch applied by upstream Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 08:25:08 UTC (rev 21896) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 08:27:47 UTC (rev 21897) @@ -33,7 +33,6 @@ PATCHFILES += 0002-OpenSolaris-gdb-fork-child.patch # from private patch 4: PATCHFILES += 0003-Extend-to-OpenCSW-the-OpenSolaris-gdb-fork-child.patch -# aggregate from http://sourceware.org/bugzilla/show_bug.cgi?id=15420%3E GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 10 10:36:38 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 10 Sep 2013 08:36:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21898] csw/mgar/pkg/lang-python/python-pexpect/trunk/ Makefile Message-ID: Revision: 21898 http://gar.svn.sourceforge.net/gar/?rev=21898&view=rev Author: wahwah Date: 2013-09-10 08:36:38 +0000 (Tue, 10 Sep 2013) Log Message: ----------- lang-python/python-pexpect/trunk: Python 2.7 support Modified Paths: -------------- csw/mgar/pkg/lang-python/python-pexpect/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-pexpect/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-pexpect/trunk/Makefile 2013-09-10 08:27:47 UTC (rev 21897) +++ csw/mgar/pkg/lang-python/python-pexpect/trunk/Makefile 2013-09-10 08:36:38 UTC (rev 21898) @@ -15,8 +15,9 @@ SPKG_SOURCEURL = http://www.noah.org/wiki/Pexpect MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = LICENSE TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) +CHECKPKG_OVERRIDES_CSWpy-pexpect += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/pexpect.py +CHECKPKG_OVERRIDES_CSWpy-pexpect += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/pexpect.py 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 Tue Sep 10 11:43:36 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 10 Sep 2013 09:43:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21899] csw/mgar/pkg/gdb/trunk/Makefile Message-ID: Revision: 21899 http://gar.svn.sourceforge.net/gar/?rev=21899&view=rev Author: pfelecan Date: 2013-09-10 09:43:36 +0000 (Tue, 10 Sep 2013) Log Message: ----------- gdb/trunk: remove all references to obsoleted flex-new package Modified Paths: -------------- csw/mgar/pkg/gdb/trunk/Makefile Modified: csw/mgar/pkg/gdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 08:36:38 UTC (rev 21898) +++ csw/mgar/pkg/gdb/trunk/Makefile 2013-09-10 09:43:36 UTC (rev 21899) @@ -43,7 +43,7 @@ ISAEXEC = 1 BUILD_DEP_PKGS += CSWgcc4ada -BUILD_DEP_PKGS += CSWflex-new +BUILD_DEP_PKGS += CSWflex BUILD_DEP_PKGS += CSWexpect BUILD_DEP_PKGS += CSWdejagnu BUILD_DEP_PKGS += CSWlibiconv-dev @@ -143,7 +143,7 @@ include gar/category.mk -PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) +PATH := /opt/csw/gnu:$(PATH) # this halves at least the test time on a mono-core: test-parallel: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 10 11:43:38 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Sep 2013 09:43:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21900] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 21900 http://gar.svn.sourceforge.net/gar/?rev=21900&view=rev Author: dmichelsen Date: 2013-09-10 09:43:38 +0000 (Tue, 10 Sep 2013) Log Message: ----------- pidgin/trunk: Enable SASL, update library dependencies, use bz2 upstream archive Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2013-09-10 09:43:36 UTC (rev 21899) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2013-09-10 09:43:38 UTC (rev 21900) @@ -10,13 +10,15 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(NAME)-$(VERSION).tar.bz2 STRIP_LIBTOOL = 1 +VENDOR_URL = http://pidgin.im + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-dbus-services=/etc/opt/csw/dbus-1 -CONFIGURE_ARGS += --with-tclconfig=/opt/csw/lib -CONFIGURE_ARGS += --with-tkconfig=/opt/csw/lib +CONFIGURE_ARGS += --with-dbus-services=$(sysconfdir)/dbus-1 +CONFIGURE_ARGS += --with-tclconfig=$(libdir) +CONFIGURE_ARGS += --with-tkconfig=$(libdir) CONFIGURE_ARGS += --enable-gnutls=yes CONFIGURE_ARGS += --enable-nss=yes CONFIGURE_ARGS += --disable-avahi @@ -25,7 +27,12 @@ CONFIGURE_ARGS += --disable-vv CONFIGURE_ARGS += --enable-trayicon-compat +CONFIGURE_ARGS += --enable-gtkui +CONFIGURE_ARGS += --enable-consoleui +# We deffinitely want SASL +CONFIGURE_ARGS += --enable-cyrus-sasl + # For msgfmt, msgmerge, xgettext and gettext to be used from GNU CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) @@ -43,7 +50,7 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWpidgin += CSWgstreamer +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWpidgin += CSWgtkspell RUNTIME_DEP_PKGS_CSWpidgin += CSWlibatk1-0-0 @@ -56,7 +63,6 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWtk RUNTIME_DEP_PKGS_CSWpidgin += CSWdbus RUNTIME_DEP_PKGS_CSWpidgin += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWpidgin += CSWgstplugins RUNTIME_DEP_PKGS_CSWpidgin += CSWlibnss3 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgthread2-0-0 @@ -76,6 +82,7 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilc1-1-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2 BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibxml2-dev Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2013-09-10 09:43:36 UTC (rev 21899) +++ csw/mgar/pkg/pidgin/trunk/checksums 2013-09-10 09:43:38 UTC (rev 21900) @@ -1 +1 @@ -1a4b996212309c6b55f7411659ca2650 pidgin-2.10.7.tar.gz +ea88976b9952e80b702b030489f94393 pidgin-2.10.7.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 Tue Sep 10 15:15:38 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 10 Sep 2013 13:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21901] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 21901 http://gar.svn.sourceforge.net/gar/?rev=21901&view=rev Author: lblume Date: 2013-09-10 13:15:36 +0000 (Tue, 10 Sep 2013) Log Message: ----------- ImageMagick/trunk: Bump version to 6.8.6-9 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-09-10 09:43:38 UTC (rev 21900) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-09-10 13:15:36 UTC (rev 21901) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.8.6 -GARSUBREV = 8 +GARSUBREV = 9 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2013-09-10 09:43:38 UTC (rev 21900) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2013-09-10 13:15:36 UTC (rev 21901) @@ -1 +1 @@ -0f4fb4997f8e8cf0d5b4d4cb3da0e0b4 ImageMagick-6.8.6-8.tar.xz +20df51f2315a7ab44507383d175b1c50 ImageMagick-6.8.6-9.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Sep 10 16:24:26 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 10 Sep 2013 14:24:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21902] csw/mgar/pkg/librecad/trunk/files/ 0000-add-csw-settings.patch Message-ID: Revision: 21902 http://gar.svn.sourceforge.net/gar/?rev=21902&view=rev Author: cgrzemba Date: 2013-09-10 14:24:26 +0000 (Tue, 10 Sep 2013) Log Message: ----------- librecad/trunk: fix include path Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch Modified: csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch =================================================================== --- csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch 2013-09-10 13:15:36 UTC (rev 21901) +++ csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch 2013-09-10 14:24:26 UTC (rev 21902) @@ -25,7 +25,7 @@ +# + +exists("/opt/csw/gxx/include") { -+ INCLUDEPATH += "/opt/csw/gxx/include" ++ INCLUDEPATH += "/opt/csw/include" + INCLUDEPATH += "/opt/csw/gxx/include/boost" + INCLUDEPATH += "/opt/csw/include/freetype2" +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 10 16:40:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 10 Sep 2013 14:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21903] csw/mgar/pkg Message-ID: Revision: 21903 http://gar.svn.sourceforge.net/gar/?rev=21903&view=rev Author: dmichelsen Date: 2013-09-10 14:40:10 +0000 (Tue, 10 Sep 2013) Log Message: ----------- libreoffice/trunk: First tiny commit Added Paths: ----------- csw/mgar/pkg/libreoffice/ csw/mgar/pkg/libreoffice/Makefile csw/mgar/pkg/libreoffice/branches/ csw/mgar/pkg/libreoffice/tags/ csw/mgar/pkg/libreoffice/trunk/ csw/mgar/pkg/libreoffice/trunk/Makefile csw/mgar/pkg/libreoffice/trunk/checksums csw/mgar/pkg/libreoffice/trunk/files/ Added: csw/mgar/pkg/libreoffice/Makefile =================================================================== --- csw/mgar/pkg/libreoffice/Makefile (rev 0) +++ csw/mgar/pkg/libreoffice/Makefile 2013-09-10 14:40:10 UTC (rev 21903) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libreoffice/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libreoffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/libreoffice/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libreoffice/trunk/Makefile 2013-09-10 14:40:10 UTC (rev 21903) @@ -0,0 +1,27 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libreoffice +VERSION = 4.1.1.2 +GARTYPE = v2 + +DESCRIPTION = Libre Office + +MASTER_SITES = http://download.documentfoundation.org/libreoffice/src/4.1.1/ +DISTFILES += libreoffice-$(VERSION).tar.xz +DISTFILES += libreoffice-dictionaries-$(VERSION).tar.xz +DISTFILES += libreoffice-help-$(VERSION).tar.xz +DISTFILES += libreoffice-translations-$(VERSION).tar.xz + +EXTRA_INC += /usr/openwin/share/include +EXTRA_INC += /usr/X11/include +EXTRA_LIB += /usr/X11/lib +EXTRA_CPPFLAGS += -D_XFUNCPROTOBEGIN= -D_XFUNCPROTOEND= + +CONFIGURE_ARGS = $(DIRPATHS) + +# We probably have libxext headers on OpenCSW, but better skip them +CONFIGURE_ARGS += --without-system-xextensions-headers + +include gar/category.mk + Property changes on: csw/mgar/pkg/libreoffice/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libreoffice/trunk/checksums =================================================================== --- csw/mgar/pkg/libreoffice/trunk/checksums (rev 0) +++ csw/mgar/pkg/libreoffice/trunk/checksums 2013-09-10 14:40:10 UTC (rev 21903) @@ -0,0 +1,4 @@ +4eb8fd2b0d1177d19b2f797faabc4ea2 libreoffice-4.1.1.2.tar.xz +482c3ba55f6062eaf49eb493200643c9 libreoffice-dictionaries-4.1.1.2.tar.xz +f6b418a1ed94ef9d5ee30e9f5d7f305a libreoffice-help-4.1.1.2.tar.xz +e8c69bdb55586531cc192904467f5e24 libreoffice-translations-4.1.1.2.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 Tue Sep 10 21:09:17 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 10 Sep 2013 19:09:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21904] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 21904 http://gar.svn.sourceforge.net/gar/?rev=21904&view=rev Author: chninkel Date: 2013-09-10 19:09:16 +0000 (Tue, 10 Sep 2013) Log Message: ----------- add support for per-os-release allowed library versions dependencies The check for usage of forbidden library version interface must take into account the os release to accomodate differences between releases. For example it's fine to only allowed libc version < SUNW_1.22.6 under Solaris 10, but it doesn't make sense under Solaris 11 as SUNW_1.23 was provided from the very first release. This patch also include a new comparison function to be able to compare version dependencies so that we do not have to declare all versions (SUNW_0.8, SUNW_0.9...) but only the maximal version allowed. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-09-10 14:40:10 UTC (rev 21903) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-09-10 19:09:16 UTC (rev 21904) @@ -55,19 +55,51 @@ ]) ALLOWED_VERSION_DEPENDENCIES = { - "libc.so.1": ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.22.6', - 'SUNW_1.22.5', 'SUNW_1.22.4', 'SUNW_1.22.3', 'SUNW_1.22.2', - 'SUNW_1.22.1', 'SUNW_1.22', 'SUNW_1.21.3', 'SUNW_1.21.2', - 'SUNW_1.21.1', 'SUNW_1.21', 'SUNW_1.20.4', 'SUNW_1.20.1', - 'SUNW_1.20', 'SUNW_1.19', 'SUNW_1.18.1', 'SUNW_1.18', - 'SUNW_1.17', 'SUNW_1.16', 'SUNW_1.15', 'SUNW_1.14', - 'SUNW_1.13', 'SUNW_1.12', 'SUNW_1.11', 'SUNW_1.10', - 'SUNW_1.9', 'SUNW_1.8', 'SUNW_1.7', 'SUNW_1.6', 'SUNW_1.5', - 'SUNW_1.4', 'SUNW_1.3', 'SUNW_1.2', 'SUNW_1.1', 'SUNW_0.9', - 'SUNW_0.8', 'SUNW_0.7', 'SISCD_2.3'], + "libc.so.1": { + u'SunOS5.11': ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.23', 'SISCD_2.3'], + u'SunOS5.10': ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.22.6', 'SISCD_2.3'], + }, } +def CompareLibraryVersions(version1, version2): + """Compare two library versions + + Library versions often have the following forms: + PREFIX_NUMBER1.NUMBER2.NUMBER3 (e.g. SUNW_1.22.3) + with the more recent one having the highest numbers. + + It is useful to compare two versions of this form and + this function will do this job as long as the given + versions have the same format and same prefix. + + Returns: + 0 if two versions are equal + 1 if version1 > version2 + -1 if version1 < version2 + None if two versions are completely differents + and can't be compared + """ + version1_parts = re.findall('([^_.]+)', version1) + version2_parts = re.findall('([^_.]+)', version2) + + for part1, part2 in zip(version1_parts, version2_parts): + if part1.isdigit() and part2.isdigit(): + comp_value = cmp(int(part1), int(part2)) + if comp_value != 0: + return comp_value + elif part1 != part2: + # Not equal string means not the same form + # or prefix so we can't compare them + return None + + # if we are here it means all parts compared are equal. + # if there are some remaining parts, it means one version is longer. + # The longest is the most recent (1.22.1 is more recent than 1.22) + # so we just compare the size + return cmp(len(version1_parts), len(version2_parts)) + + def ProcessSoname( ldd_emulator, soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger, @@ -259,10 +291,21 @@ # We should then emulate ldd but that will not be for today... pass + osrel = pkg_data['basic_stats']['parsed_basename']['osrel'] for version_dep in binary_elf_info['version needed']: - if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and - not version_dep['version'] in - ALLOWED_VERSION_DEPENDENCIES[version_dep['soname']]): + soname = version_dep['soname'] + if not soname in ALLOWED_VERSION_DEPENDENCIES: + continue + + allowed = False + versions_allowed = ALLOWED_VERSION_DEPENDENCIES[soname][osrel] + for version_ref in versions_allowed: + ret = CompareLibraryVersions(version_dep['version'], version_ref) + if ret is not None and ret <= 0: + allowed = True + break + + if not allowed: messenger.Message( "Binary %s requires interface version %s in library %s which is" " only available in recent Solaris releases." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Wed Sep 11 14:14:27 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Wed, 11 Sep 2013 12:14:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21905] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: Revision: 21905 http://gar.svn.sourceforge.net/gar/?rev=21905&view=rev Author: guillomovitch Date: 2013-09-11 12:14:25 +0000 (Wed, 11 Sep 2013) Log Message: ----------- fusioninventory-agent/trunk: new version 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 2013-09-10 19:09:16 UTC (rev 21904) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2013-09-11 12:14:25 UTC (rev 21905) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.0 +VERSION = 2.3.1 GARTYPE = v2 CATEGORIES = cpan @@ -70,7 +70,6 @@ PKGFILES_CSWfi-agent-task-esx = $(bindir)/fusioninventory-esx PKGFILES_CSWfi-agent-task-esx += $(mandir)/man1/fusioninventory-esx.1 PKGFILES_CSWfi-agent-task-esx += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm -PKGFILES_CSWfi-agent-task-esx += $(datadir)/fusioninventory/lib/FusionInventory/Agent/SOAP/.* CHECKPKG_OVERRIDES_CSWfi-agent-task-esx += surplus-dependency|CSWperl PACKAGES += CSWfi-agent-task-network @@ -84,7 +83,6 @@ PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.* PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.* PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/SNMP.* -PKGFILES_CSWfi-agent-task-network += $(datadir)/fusioninventory/lib/FusionInventory/Agent/Tools/SNMP.pm CHECKPKG_OVERRIDES_CSWfi-agent-task-network += surplus-dependency|CSWperl PACKAGES += CSWfi-agent-task-deploy Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2013-09-10 19:09:16 UTC (rev 21904) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2013-09-11 12:14:25 UTC (rev 21905) @@ -1 +1 @@ -a4b17fe8d9cc7ceae673d81ea2917dc3 FusionInventory-Agent-2.3.0.tar.gz +8b74e4411593a8b0fc4d7d5d97a969ce FusionInventory-Agent-2.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 11 16:57:36 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 11 Sep 2013 14:57:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21906] csw/mgar/pkg/qt4-gcc/trunk Message-ID: Revision: 21906 http://gar.svn.sourceforge.net/gar/?rev=21906&view=rev Author: pfelecan Date: 2013-09-11 14:57:34 +0000 (Wed, 11 Sep 2013) Log Message: ----------- qt4-gcc/trunk: this recipe builds WebKit; for the moment the related libraries are not provided in their own packages. Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/qt4-gcc/trunk/files/0003-configure-must-use-bash.patch csw/mgar/pkg/qt4-gcc/trunk/files/0004-webkit-port.patch Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-11 12:14:25 UTC (rev 21905) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-11 14:57:34 UTC (rev 21906) @@ -17,7 +17,7 @@ LICENSE = README -NOGITPATCH = 1 +#NOGITPATCH = 1 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GNU @@ -33,12 +33,20 @@ PATCHFILES += mkspec-csw.patch # bug in 4.8.1, see: https//bugreports.qt-project.org/browse/QTBUG-25281 # PATCHFILES += 0001-shapeinput.patch +PATCHFILES += 0003-configure-must-use-bash.patch +PATCHFILES += 0004-webkit-port.patch BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWunixodbc-dev BUILD_DEP_PKGS += CSWpostgresql-dev BUILD_DEP_PKGS += CSWfreetds-dev BUILD_DEP_PKGS += CSWmysql-dev +BUILD_DEP_PKGS += CSWcups-dev +BUILD_DEP_PKGS += CSWgstplugins-dev +BUILD_DEP_PKGS += CSWgstreamer-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibxml2-dev # http://wiki.opencsw.org/porting-faq#toc9 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS @@ -93,26 +101,33 @@ CONFIGURE_ARGS += -qt-libpng CONFIGURE_ARGS += -qt-libmng CONFIGURE_ARGS += -qt-zlib +CONFIGURE_ARGS += -xmlpatterns +CONFIGURE_ARGS += -webkit # compile error: error: 'QGtkStyle' has not been declared ??? since 10.12.2012 CONFIGURE_ARGS += -no-gtkstyle +CONFIGURE_ARGS += -I$(includedir)/glib-2.0 +CONFIGURE_ARGS += -I$(libdir)/glib-2.0/include CONFIGURE_ARGS += -I$(includedir)/gtk-2.0 +CONFIGURE_ARGS += -I$(includedir)/gstreamer-0.10 +CONFIGURE_ARGS += -I$(includedir)/libxml2 CONFIGURE_ARGS += -I/usr/X11/include CONFIGURE_ARGS += -I/usr/X11/share/include CONFIGURE_ARGS_sparc += -big-endian -host-big-endian # not build for Sparc because core dump in designer, qmlplugindump, .. -CONFIGURE_ARGS_sparc += -no-javascript-jit +# not built for i386 because of cti_vm_throw referenced in JITStubs +CONFIGURE_ARGS += -no-javascript-jit CONFIGURE_ARGS_sparc += -no-script # CONFIGURE_ARGS_i386 += -little-endian -host-big-endian CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) -# TEST_TARGET = - INSTALL_ROOT = $(DESTDIR) EXTRA_INSTALL_EXPORTS = INSTALL_ROOT +# skip this if you are not connected to as X Windows server +TEST_SCRIPTS = custom PACKAGES += CSWlibqtcore4 PKGFILES_CSWlibqtcore4 += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*) @@ -385,6 +400,11 @@ PATH:=:/opt/csw/gnu:$(PATH) +libraries4test=$(shell pwd)/$(WORKSRC)/lib +test-custom: + cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) LD_LIBRARY_PATH=$(libraries4test) && $(MAKE) -i -k -C $(OBJDIR) TESTRUNNER='LD_LIBRARY_PATH=$(libraries4test)' check + $(MAKECOOKIE) + # pre-reconfigure-modulated: # cd $(WORKSRC) && gmake confclean # @$(MAKECOOKIE) @@ -392,10 +412,14 @@ # Ship private headers - ugly hack to build Qt Creator QML Designer; # adapted from Debian rules +# and +# prune tests from the destination directory (we don't want them in +# our packages isn't it?) post-install: gtar --directory=$(WORKSRC)/include/QtCore --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtCore --extract --file=- gtar --directory=$(WORKSRC)/include/QtDeclarative --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtDeclarative --extract --file=- gtar --directory=$(WORKSRC)/include/QtGui --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtGui --extract --file=- gtar --directory=$(WORKSRC)/include/QtScript --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtScript --extract --file=- cd $(WORKSRC) && gtar --create --file=- src/corelib/*/*_p.h src/declarative/*/*_p.h src/gui/*/*_p.h src/script/*/*_p.h | gtar --directory=$(DESTDIR)$(includedir) --extract --file=- + rm -rf $(DESTDIR)/$(prefix)/tests $(MAKECOOKIE) Added: csw/mgar/pkg/qt4-gcc/trunk/files/0003-configure-must-use-bash.patch =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/files/0003-configure-must-use-bash.patch (rev 0) +++ csw/mgar/pkg/qt4-gcc/trunk/files/0003-configure-must-use-bash.patch 2013-09-11 14:57:34 UTC (rev 21906) @@ -0,0 +1,23 @@ +From 1f4c381cfd6306da028778639d4c3b5e9b634cf9 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 11 Sep 2013 12:01:49 +0200 +Subject: [PATCH] configure must use bash + +As a linuxism, but not only; anyway, without this, there is no webkit... +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 460b446..3e51ec7 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#! /usr/bin/env bash + ############################################################################# + ## + ## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +-- +1.8.3.4 + Added: csw/mgar/pkg/qt4-gcc/trunk/files/0004-webkit-port.patch =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/files/0004-webkit-port.patch (rev 0) +++ csw/mgar/pkg/qt4-gcc/trunk/files/0004-webkit-port.patch 2013-09-11 14:57:34 UTC (rev 21906) @@ -0,0 +1,863 @@ +From a25f273e5af1653f7c7d7f1529fb9d11d26cd547 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 11 Sep 2013 12:19:17 +0200 +Subject: [PATCH] webkit port + +All this to port WebKit at least for Solaris 10. It is very possible that the +pthread_getattr_np implementation must be tweaked for Solaris 11. +--- + .../Source/JavaScriptCore/API/JSValueRef.cpp | 2 +- + .../JavaScriptCore/bytecode/SamplingTool.cpp | 9 +- + .../JavaScriptCore/heap/MachineStackMarker.cpp | 162 ++++++++++++++++++++- + .../Source/JavaScriptCore/heap/MarkStackPosix.cpp | 4 +- + .../JavaScriptCore/runtime/DateConstructor.cpp | 28 ++-- + .../JavaScriptCore/runtime/DateConversion.cpp | 2 +- + .../Source/JavaScriptCore/runtime/DateInstance.cpp | 4 +- + .../JavaScriptCore/runtime/DatePrototype.cpp | 10 +- + .../runtime/JSGlobalObjectFunctions.cpp | 6 +- + .../Source/JavaScriptCore/runtime/JSValue.cpp | 2 +- + .../Source/JavaScriptCore/runtime/MathObject.cpp | 6 +- + .../JavaScriptCore/runtime/NumberPrototype.cpp | 8 +- + .../webkit/Source/JavaScriptCore/wtf/DateMath.cpp | 7 +- + .../Source/JavaScriptCore/wtf/PageAllocation.h | 2 +- + .../Source/JavaScriptCore/wtf/RandomNumberSeed.h | 6 +- + .../webkit/Source/JavaScriptCore/wtf/dtoa.cpp | 6 +- + src/3rdparty/webkit/Source/WebCore/WebCore.pri | 2 +- + .../WebCore/bindings/js/JSDataViewCustom.cpp | 2 +- + .../bindings/js/JSHTMLOptionsCollectionCustom.cpp | 2 +- + .../WebCore/bindings/js/JSWebKitPointCustom.cpp | 4 +- + .../webkit/Source/WebCore/css/WebKitCSSMatrix.cpp | 32 ++-- + .../WebCore/html/canvas/IntegralTypedArrayBase.h | 2 +- + .../webkit/Source/WebCore/page/DOMWindow.cpp | 8 +- + .../webkit/Source/WebCore/page/WindowFeatures.cpp | 2 +- + .../webkit/Source/WebCore/xml/XPathFunctions.cpp | 6 +- + .../webkit/Source/WebCore/xml/XPathValue.cpp | 4 +- + 26 files changed, 248 insertions(+), 80 deletions(-) + +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/API/JSValueRef.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/API/JSValueRef.cpp +index e2626be..e3c857e 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/API/JSValueRef.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/API/JSValueRef.cpp +@@ -216,7 +216,7 @@ JSValueRef JSValueMakeNumber(JSContextRef ctx, double value) + // Our JSValue representation relies on a standard bit pattern for NaN. NaNs + // generated internally to JavaScriptCore naturally have that representation, + // but an external NaN might not. +- if (isnan(value)) ++ if (std::isnan(value)) + value = NaN; + + return toRef(exec, jsNumber(value)); +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/bytecode/SamplingTool.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/bytecode/SamplingTool.cpp +index f47e698..edfd600 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/bytecode/SamplingTool.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/bytecode/SamplingTool.cpp +@@ -34,7 +34,7 @@ + #include "Opcode.h" + + #if !OS(WINDOWS) +-#include ++// #include + #endif + + namespace JSC { +@@ -103,9 +103,14 @@ static void sleepForMicroseconds(unsigned us) + + #else + ++extern "C" ++{ ++ int usleep(useconds_t useconds); ++} ++ + static void sleepForMicroseconds(unsigned us) + { +- usleep(us); ++ usleep(us); + } + + #endif +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp +index 01d77d6..a420dee 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -61,7 +61,7 @@ + #if !OS(HAIKU) + #include + #endif +-#include ++// #include + + #if OS(SOLARIS) + #include +@@ -341,6 +341,166 @@ typedef pthread_attr_t PlatformThreadRegisters; + #error Need a thread register struct for this platform + #endif + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define PTHREAD_CREATE_NODAEMON_NP 0 ++#define PTHREAD_CREATE_DAEMON_NP THR_DAEMON ++ ++typedef struct _thrattr { ++ size_t stksize; // pr_stkbase lwpstatus_pr_ustack ++ void *stkaddr; // pr_stksize lwpstatus_pr_ustack ++ int detachstate; // {PTHREAD_CREATE_JOINABLE, PTHREAD_CREATED_DETACHED} ++ // from /proc/self/lwp/tid/lwpstatus.pr_flags PR_DETACH ++ int daemonstate; // {PTHREAD_CREATE_DAEMON_NP, } ++ // from /proc/self/lwp/tid/lwpstatus.pr_flags PR_DAEMON ++ int scope; // {PTHREAD_SCOPE_PROCESS, PTHREAD_SCOPE_SYSTEM} ++ int prio; // lwpsinfo.pr_pri ++ int policy; // {SCHED_OTHER, SCHED_FIFO, SCHED_RR} ++ /* these are reversed in Solaris 11 TODO: conditionally define */ ++ size_t guardsize; ++ int inherit; // {PTHREAD_EXPLICIT_SCHED, PTHREAD_INHERIT_SCHED} ++} thrattr_t; ++ ++static const char* prefix = "/proc/self/lwp/"; ++static const char* prefixFormat = "%s%lu/lwp%s"; ++ ++static int getStatus(pthread_t thread, lwpstatus_t *status) ++{ ++ static const char* name = "status"; ++ int rc = 0; ++ if(status != (lwpstatus_t*)0) ++ { ++ unsigned int length = snprintf((char*)0, 0, prefixFormat, prefix, thread, name) + 1; ++ char* path = (char*)malloc(sizeof(char) * length); ++ if(path != (char*)0) ++ { ++ snprintf(path, length, prefixFormat, prefix, thread, name); ++ int fd = open(path, O_RDONLY); ++ if(fd != -1) ++ { ++ ssize_t size = read(fd, status, sizeof(lwpstatus_t)); ++ switch(size) ++ { ++ case -1: ++ rc = errno; ++ break; ++ case sizeof(lwpstatus_t): ++ break; ++ default: ++ rc = ENODATA; ++ break; ++ } ++ close(fd); ++ } ++ else ++ { ++ rc = (errno) ? errno : EIO; ++ } ++ free(path); ++ } ++ else ++ { ++ rc = (errno) ? errno : EIO; ++ } ++ } ++ else ++ { ++ rc = EINVAL; ++ } ++ return(rc); ++} ++ ++static int getInfo(pthread_t thread, lwpsinfo_t *info) ++{ ++ static const char* name = "sinfo"; ++ int rc = 0; ++ if(info != (lwpsinfo_t*)0) ++ { ++ unsigned int length = snprintf((char*)0, 0, prefixFormat, prefix, thread, name) + 1; ++ char* path = (char*)malloc(sizeof(char) * length); ++ if(path != (char*)0) ++ { ++ snprintf(path, length, prefixFormat, prefix, thread, name); ++ int fd = open(path, O_RDONLY); ++ if(fd != -1) ++ { ++ ssize_t size = read(fd, info, sizeof(lwpsinfo_t)); ++ switch(size) ++ { ++ case -1: ++ rc = errno; ++ break; ++ case sizeof(lwpsinfo_t): ++ break; ++ default: ++ rc = ENODATA; ++ break; ++ } ++ close(fd); ++ } ++ else ++ { ++ rc = (errno) ? errno : EIO; ++ } ++ free(path); ++ } ++ else ++ { ++ rc = (errno) ? errno : EIO; ++ } ++ } ++ else ++ { ++ rc = EINVAL; ++ } ++ return(rc); ++} ++ ++static int pthread_getattr_np(pthread_t thread, pthread_attr_t *attr) ++{ ++ int rc = 0; ++ if(attr != (pthread_attr_t*)0) ++ { ++ lwpstatus_t status; ++ lwpsinfo_t info; ++ if(getStatus(thread, &status) == 0 && getInfo(thread, &info) == 0) ++ { ++ thrattr_t *ap = (thrattr_t *)attr->__pthread_attrp; ++ stack_t* stack = (stack_t*)status.pr_ustack; ++ ap->stksize = stack->ss_size; ++ ap->stkaddr = stack->ss_sp + stack->ss_size; /* from high to low */ ++ ap->detachstate = status.pr_flags & PR_DETACH; ++ ap->daemonstate = status.pr_flags & PR_DAEMON; ++ /* scope not needed*/ ++ ap->prio = info.pr_pri; ++ /* policy not needed */ ++ /* inherit not needed */ ++ /* guard size not needed */ ++ } ++ else ++ { ++ rc = (errno) ? errno : EIO; ++ } ++ } ++ else ++ { ++ rc = EINVAL; ++ } ++ return(rc); ++} ++ ++ + static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs) + { + #if OS(DARWIN) +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkStackPosix.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkStackPosix.cpp +index 2a5b298..3ca4c05 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkStackPosix.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkStackPosix.cpp +@@ -28,7 +28,9 @@ + + #if OS(UNIX) && !OS(SYMBIAN) + +-#include ++extern "C" { ++ int getpagesize(void); ++} + #include + + namespace JSC { +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConstructor.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConstructor.cpp +index 9bbb688..01abf7c 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConstructor.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConstructor.cpp +@@ -98,13 +98,13 @@ JSObject* constructDate(ExecState* exec, JSGlobalObject* globalObject, const Arg + args.at(5).toNumber(exec), + args.at(6).toNumber(exec) + }; +- if (isnan(doubleArguments[0]) +- || isnan(doubleArguments[1]) +- || (numArgs >= 3 && isnan(doubleArguments[2])) +- || (numArgs >= 4 && isnan(doubleArguments[3])) +- || (numArgs >= 5 && isnan(doubleArguments[4])) +- || (numArgs >= 6 && isnan(doubleArguments[5])) +- || (numArgs >= 7 && isnan(doubleArguments[6]))) ++ if (std::isnan(doubleArguments[0]) ++ || std::isnan(doubleArguments[1]) ++ || (numArgs >= 3 && std::isnan(doubleArguments[2])) ++ || (numArgs >= 4 && std::isnan(doubleArguments[3])) ++ || (numArgs >= 5 && std::isnan(doubleArguments[4])) ++ || (numArgs >= 6 && std::isnan(doubleArguments[5])) ++ || (numArgs >= 7 && std::isnan(doubleArguments[6]))) + value = NaN; + else { + GregorianDateTime t; +@@ -178,13 +178,13 @@ static EncodedJSValue JSC_HOST_CALL dateUTC(ExecState* exec) + exec->argument(6).toNumber(exec) + }; + int n = exec->argumentCount(); +- if (isnan(doubleArguments[0]) +- || isnan(doubleArguments[1]) +- || (n >= 3 && isnan(doubleArguments[2])) +- || (n >= 4 && isnan(doubleArguments[3])) +- || (n >= 5 && isnan(doubleArguments[4])) +- || (n >= 6 && isnan(doubleArguments[5])) +- || (n >= 7 && isnan(doubleArguments[6]))) ++ if (std::isnan(doubleArguments[0]) ++ || std::isnan(doubleArguments[1]) ++ || (n >= 3 && std::isnan(doubleArguments[2])) ++ || (n >= 4 && std::isnan(doubleArguments[3])) ++ || (n >= 5 && std::isnan(doubleArguments[4])) ++ || (n >= 6 && std::isnan(doubleArguments[5])) ++ || (n >= 7 && std::isnan(doubleArguments[6]))) + return JSValue::encode(jsNaN()); + + GregorianDateTime t; +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConversion.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConversion.cpp +index 1418876..3560ef6 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -60,7 +60,7 @@ double parseDate(ExecState* exec, const UString &date) + if (date == exec->globalData().cachedDateString) + return exec->globalData().cachedDateStringValue; + double value = parseES5DateFromNullTerminatedCharacters(date.utf8().data()); +- if (isnan(value)) ++ if (std::isnan(value)) + value = parseDateFromNullTerminatedCharacters(exec, date.utf8().data()); + exec->globalData().cachedDateString = date; + exec->globalData().cachedDateStringValue = value; +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateInstance.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateInstance.cpp +index d8ca072..b8df6f6 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateInstance.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DateInstance.cpp +@@ -51,7 +51,7 @@ DateInstance::DateInstance(ExecState* exec, Structure* structure, double time) + const GregorianDateTime* DateInstance::calculateGregorianDateTime(ExecState* exec) const + { + double milli = internalNumber(); +- if (isnan(milli)) ++ if (std::isnan(milli)) + return 0; + + if (!m_data) +@@ -67,7 +67,7 @@ const GregorianDateTime* DateInstance::calculateGregorianDateTime(ExecState* exe + const GregorianDateTime* DateInstance::calculateGregorianDateTimeUTC(ExecState* exec) const + { + double milli = internalNumber(); +- if (isnan(milli)) ++ if (std::isnan(milli)) + return 0; + + if (!m_data) +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DatePrototype.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DatePrototype.cpp +index 444fa98..cec40cc 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DatePrototype.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/DatePrototype.cpp +@@ -799,7 +799,7 @@ EncodedJSValue JSC_HOST_CALL dateProtoFuncGetMilliSeconds(ExecState* exec) + + DateInstance* thisDateObj = asDateInstance(thisValue); + double milli = thisDateObj->internalNumber(); +- if (isnan(milli)) ++ if (std::isnan(milli)) + return JSValue::encode(jsNaN()); + + double secs = floor(milli / msPerSecond); +@@ -815,7 +815,7 @@ EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCMilliseconds(ExecState* exec) + + DateInstance* thisDateObj = asDateInstance(thisValue); + double milli = thisDateObj->internalNumber(); +- if (isnan(milli)) ++ if (std::isnan(milli)) + return JSValue::encode(jsNaN()); + + double secs = floor(milli / msPerSecond); +@@ -860,7 +860,7 @@ static EncodedJSValue setNewValueFromTimeArgs(ExecState* exec, int numArgsToUse, + DateInstance* thisDateObj = asDateInstance(thisValue); + double milli = thisDateObj->internalNumber(); + +- if (!exec->argumentCount() || isnan(milli)) { ++ if (!exec->argumentCount() || std::isnan(milli)) { + JSValue result = jsNaN(); + thisDateObj->setInternalValue(exec->globalData(), result); + return JSValue::encode(result); +@@ -905,7 +905,7 @@ static EncodedJSValue setNewValueFromDateArgs(ExecState* exec, int numArgsToUse, + double ms = 0; + + GregorianDateTime gregorianDateTime; +- if (numArgsToUse == 3 && isnan(milli)) ++ if (numArgsToUse == 3 && std::isnan(milli)) + msToGregorianDateTime(exec, 0, true, gregorianDateTime); + else { + ms = milli - floor(milli / msPerSecond) * msPerSecond; +@@ -1029,7 +1029,7 @@ EncodedJSValue JSC_HOST_CALL dateProtoFuncSetYear(ExecState* exec) + double ms = 0; + + GregorianDateTime gregorianDateTime; +- if (isnan(milli)) ++ if (std::isnan(milli)) + // Based on ECMA 262 B.2.5 (setYear) + // the time must be reset to +0 if it is NaN. + msToGregorianDateTime(exec, 0, true, gregorianDateTime); +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +index f0da773..9651888 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +@@ -472,7 +472,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncParseInt(ExecState* exec) + double d = value.asDouble(); + if (isfinite(d)) + return JSValue::encode(jsNumber((d > 0) ? floor(d) : ceil(d))); +- if (isnan(d) || isinf(d)) ++ if (std::isnan(d) || isinf(d)) + return JSValue::encode(jsNaN()); + return JSValue::encode(jsNumber(0)); + } +@@ -487,13 +487,13 @@ EncodedJSValue JSC_HOST_CALL globalFuncParseFloat(ExecState* exec) + + EncodedJSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec) + { +- return JSValue::encode(jsBoolean(isnan(exec->argument(0).toNumber(exec)))); ++ return JSValue::encode(jsBoolean(std::isnan(exec->argument(0).toNumber(exec)))); + } + + EncodedJSValue JSC_HOST_CALL globalFuncIsFinite(ExecState* exec) + { + double n = exec->argument(0).toNumber(exec); +- return JSValue::encode(jsBoolean(!isnan(n) && !isinf(n))); ++ return JSValue::encode(jsBoolean(!std::isnan(n) && !isinf(n))); + } + + EncodedJSValue JSC_HOST_CALL globalFuncDecodeURI(ExecState* exec) +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValue.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValue.cpp +index d3ee89e..aa0c332 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValue.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValue.cpp +@@ -44,7 +44,7 @@ double JSValue::toInteger(ExecState* exec) const + if (isInt32()) + return asInt32(); + double d = toNumber(exec); +- return isnan(d) ? 0.0 : trunc(d); ++ return std::isnan(d) ? 0.0 : trunc(d); + } + + double JSValue::toIntegerPreserveNaN(ExecState* exec) const +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/MathObject.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/MathObject.cpp +index 52bd76a..3858e38 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/MathObject.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/MathObject.cpp +@@ -173,7 +173,7 @@ EncodedJSValue JSC_HOST_CALL mathProtoFuncMax(ExecState* exec) + double result = -Inf; + for (unsigned k = 0; k < argsCount; ++k) { + double val = exec->argument(k).toNumber(exec); +- if (isnan(val)) { ++ if (std::isnan(val)) { + result = NaN; + break; + } +@@ -189,7 +189,7 @@ EncodedJSValue JSC_HOST_CALL mathProtoFuncMin(ExecState* exec) + double result = +Inf; + for (unsigned k = 0; k < argsCount; ++k) { + double val = exec->argument(k).toNumber(exec); +- if (isnan(val)) { ++ if (std::isnan(val)) { + result = NaN; + break; + } +@@ -206,7 +206,7 @@ EncodedJSValue JSC_HOST_CALL mathProtoFuncPow(ExecState* exec) + double arg = exec->argument(0).toNumber(exec); + double arg2 = exec->argument(1).toNumber(exec); + +- if (isnan(arg2)) ++ if (std::isnan(arg2)) + return JSValue::encode(jsNaN()); + if (isinf(arg2) && fabs(arg) == 1) + return JSValue::encode(jsNaN()); +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/NumberPrototype.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/NumberPrototype.cpp +index 24532dd..765d156 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/NumberPrototype.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/NumberPrototype.cpp +@@ -110,7 +110,7 @@ EncodedJSValue JSC_HOST_CALL numberProtoFuncToExponential(ExecState* exec) + return throwVMError(exec, createRangeError(exec, "toExponential() argument must be between 0 and 20")); + + // Handle NaN and Infinity. +- if (isnan(x) || isinf(x)) ++ if (std::isnan(x) || isinf(x)) + return JSValue::encode(jsString(exec, UString::number(x))); + + // Round if the argument is not undefined, always format as exponential. +@@ -149,7 +149,7 @@ EncodedJSValue JSC_HOST_CALL numberProtoFuncToFixed(ExecState* exec) + + // The check above will return false for NaN or Infinity, these will be + // handled by numberToString. +- ASSERT(!isnan(x) && !isinf(x)); ++ ASSERT(!std::isnan(x) && !isinf(x)); + + // Convert to decimal with rounding, and format as decimal. + NumberToStringBuffer buffer; +@@ -184,7 +184,7 @@ EncodedJSValue JSC_HOST_CALL numberProtoFuncToPrecision(ExecState* exec) + return JSValue::encode(jsString(exec, UString::number(x))); + + // Handle NaN and Infinity. +- if (isnan(x) || isinf(x)) ++ if (std::isnan(x) || isinf(x)) + return JSValue::encode(jsString(exec, UString::number(x))); + + // Convert to decimal with rounding. +@@ -241,7 +241,7 @@ EncodedJSValue JSC_HOST_CALL numberProtoFuncToString(ExecState* exec) + char s[2048 + 3]; + const char* lastCharInString = s + sizeof(s) - 1; + double x = v.uncheckedGetNumber(); +- if (isnan(x) || isinf(x)) ++ if (std::isnan(x) || isinf(x)) + return JSValue::encode(jsString(exec, UString::number(x))); + + bool isNegative = x < 0.0; +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp +index b181ee2..723d888 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp +@@ -91,7 +91,6 @@ + #include + #include + +- + #if HAVE(ERRNO_H) + #include + #endif +@@ -998,7 +997,7 @@ double parseDateFromNullTerminatedCharacters(const char* dateString) + bool haveTZ; + int offset; + double ms = parseDateFromNullTerminatedCharacters(dateString, haveTZ, offset); +- if (isnan(ms)) ++ if (std::isnan(ms)) + return NaN; + + // fall back to local timezone +@@ -1092,7 +1091,7 @@ static double getDSTOffset(ExecState* exec, double ms, double utcOffset) + double getUTCOffset(ExecState* exec) + { + double utcOffset = exec->globalData().cachedUTCOffset; +- if (!isnan(utcOffset)) ++ if (!std::isnan(utcOffset)) + return utcOffset; + exec->globalData().cachedUTCOffset = calculateUTCOffset(); + return exec->globalData().cachedUTCOffset; +@@ -1144,7 +1143,7 @@ double parseDateFromNullTerminatedCharacters(ExecState* exec, const char* dateSt + bool haveTZ; + int offset; + double ms = WTF::parseDateFromNullTerminatedCharacters(dateString, haveTZ, offset); +- if (isnan(ms)) ++ if (std::isnan(ms)) + return NaN; + + // fall back to local timezone +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocation.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocation.h +index ad3d217..a6da78d 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocation.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocation.h +@@ -58,7 +58,7 @@ + + #if HAVE(MMAP) + #include +-#include ++/* #include */ + #endif + + namespace WTF { +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/RandomNumberSeed.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/RandomNumberSeed.h +index 0703abf..dcb5388 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/RandomNumberSeed.h ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/RandomNumberSeed.h +@@ -35,7 +35,9 @@ + + #if OS(UNIX) + #include +-#include ++extern "C"{ ++pid_t getpid(void); ++} + #endif + + #if USE(MERSENNE_TWISTER_19937) +@@ -62,7 +64,7 @@ inline void initializeRandomNumberGenerator() + // srandomdev is not guaranteed to exist on linux so we use this poor seed, this should be improved + timeval time; + gettimeofday(&time, 0); +- srandom(static_cast(time.tv_usec * getpid())); ++ srandom(static_cast(time.tv_usec * ::getpid())); + #else + srand(static_cast(time(0))); + #endif +diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/dtoa.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/dtoa.cpp +index b162543..800a0a7 100644 +--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/dtoa.cpp ++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/dtoa.cpp +@@ -1317,7 +1317,7 @@ void dtoa(DtoaBuffer result, double dd, int ndigits, bool& signOut, int& exponen + // roundingNone only allowed (only sensible?) with leftright set. + ASSERT(!roundingNone || leftright); + +- ASSERT(!isnan(dd) && !isinf(dd)); ++ ASSERT(!std::isnan(dd) && !isinf(dd)); + + int bbits, b2, b5, be, dig, i, ieps, ilim = 0, ilim0, ilim1 = 0, + j, j1, k, k0, k_check, m2, m5, s2, s5, +@@ -1811,8 +1811,8 @@ static ALWAYS_INLINE void copyAsciiToUTF16(UChar* next, const char* src, unsigne + unsigned numberToString(double d, NumberToStringBuffer buffer) + { + // Handle NaN and Infinity. +- if (isnan(d) || isinf(d)) { +- if (isnan(d)) { ++ if (std::isnan(d) || isinf(d)) { ++ if (std::isnan(d)) { + copyAsciiToUTF16(buffer, "NaN", 3); + return 3; + } +diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri +index d83eec7..25e6dd5 100644 +--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri ++++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri +@@ -326,7 +326,7 @@ mac { + } + + unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections ++unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,-z,ignore + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF + + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork +diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDataViewCustom.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDataViewCustom.cpp +index 48d56d8..c49baf4 100644 +--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDataViewCustom.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDataViewCustom.cpp +@@ -89,7 +89,7 @@ static JSValue getDataViewMember(ExecState* exec, DataView* imp, DataViewAccessT + case AccessDataViewMemberAsFloat32: + case AccessDataViewMemberAsFloat64: { + double value = (type == AccessDataViewMemberAsFloat32) ? imp->getFloat32(byteOffset, littleEndian, ec) : imp->getFloat64(byteOffset, littleEndian, ec); +- result = isnan(value) ? JSValue(nonInlineNaN()) : jsNumber(value); ++ result = std::isnan(value) ? JSValue(nonInlineNaN()) : jsNumber(value); + break; + } default: + ASSERT_NOT_REACHED(); +diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp +index d169bc4..d356fb9 100644 +--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp +@@ -47,7 +47,7 @@ void JSHTMLOptionsCollection::setLength(ExecState* exec, JSValue value) + ExceptionCode ec = 0; + unsigned newLength = 0; + double lengthValue = value.toNumber(exec); +- if (!isnan(lengthValue) && !isinf(lengthValue)) { ++ if (!std::isnan(lengthValue) && !isinf(lengthValue)) { + if (lengthValue < 0.0) + ec = INDEX_SIZE_ERR; + else if (lengthValue > static_cast(UINT_MAX)) +diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSWebKitPointCustom.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSWebKitPointCustom.cpp +index e1b20ce..734242e 100644 +--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSWebKitPointCustom.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSWebKitPointCustom.cpp +@@ -41,9 +41,9 @@ EncodedJSValue JSC_HOST_CALL JSWebKitPointConstructor::constructJSWebKitPoint(Ex + if (exec->argumentCount() >= 2) { + x = static_cast(exec->argument(0).toNumber(exec)); + y = static_cast(exec->argument(1).toNumber(exec)); +- if (isnan(x)) ++ if (std::isnan(x)) + x = 0; +- if (isnan(y)) ++ if (std::isnan(y)) + y = 0; + } + return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), WebKitPoint::create(x, y)))); +diff --git a/src/3rdparty/webkit/Source/WebCore/css/WebKitCSSMatrix.cpp b/src/3rdparty/webkit/Source/WebCore/css/WebKitCSSMatrix.cpp +index 26fe286..776366b 100644 +--- a/src/3rdparty/webkit/Source/WebCore/css/WebKitCSSMatrix.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/css/WebKitCSSMatrix.cpp +@@ -105,53 +105,53 @@ PassRefPtr WebKitCSSMatrix::inverse(ExceptionCode& ec) const + + PassRefPtr WebKitCSSMatrix::translate(double x, double y, double z) const + { +- if (isnan(x)) ++ if (std::isnan(x)) + x = 0; +- if (isnan(y)) ++ if (std::isnan(y)) + y = 0; +- if (isnan(z)) ++ if (std::isnan(z)) + z = 0; + return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).translate3d(x, y, z)); + } + + PassRefPtr WebKitCSSMatrix::scale(double scaleX, double scaleY, double scaleZ) const + { +- if (isnan(scaleX)) ++ if (std::isnan(scaleX)) + scaleX = 1; +- if (isnan(scaleY)) ++ if (std::isnan(scaleY)) + scaleY = scaleX; +- if (isnan(scaleZ)) ++ if (std::isnan(scaleZ)) + scaleZ = 1; + return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).scale3d(scaleX, scaleY, scaleZ)); + } + + PassRefPtr WebKitCSSMatrix::rotate(double rotX, double rotY, double rotZ) const + { +- if (isnan(rotX)) ++ if (std::isnan(rotX)) + rotX = 0; + +- if (isnan(rotY) && isnan(rotZ)) { ++ if (std::isnan(rotY) && std::isnan(rotZ)) { + rotZ = rotX; + rotX = 0; + rotY = 0; + } + +- if (isnan(rotY)) ++ if (std::isnan(rotY)) + rotY = 0; +- if (isnan(rotZ)) ++ if (std::isnan(rotZ)) + rotZ = 0; + return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).rotate3d(rotX, rotY, rotZ)); + } + + PassRefPtr WebKitCSSMatrix::rotateAxisAngle(double x, double y, double z, double angle) const + { +- if (isnan(x)) ++ if (std::isnan(x)) + x = 0; +- if (isnan(y)) ++ if (std::isnan(y)) + y = 0; +- if (isnan(z)) ++ if (std::isnan(z)) + z = 0; +- if (isnan(angle)) ++ if (std::isnan(angle)) + angle = 0; + if (x == 0 && y == 0 && z == 0) + z = 1; +@@ -160,14 +160,14 @@ PassRefPtr WebKitCSSMatrix::rotateAxisAngle(double x, double y, + + PassRefPtr WebKitCSSMatrix::skewX(double angle) const + { +- if (isnan(angle)) ++ if (std::isnan(angle)) + angle = 0; + return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewX(angle)); + } + + PassRefPtr WebKitCSSMatrix::skewY(double angle) const + { +- if (isnan(angle)) ++ if (std::isnan(angle)) + angle = 0; + return WebKitCSSMatrix::create(TransformationMatrix(m_matrix).skewY(angle)); + } +diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/IntegralTypedArrayBase.h b/src/3rdparty/webkit/Source/WebCore/html/canvas/IntegralTypedArrayBase.h +index 0b26844..7f534cd 100644 +--- a/src/3rdparty/webkit/Source/WebCore/html/canvas/IntegralTypedArrayBase.h ++++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/IntegralTypedArrayBase.h +@@ -43,7 +43,7 @@ class IntegralTypedArrayBase : public TypedArrayBase { + { + if (index >= TypedArrayBase::m_length) + return; +- if (isnan(value)) // Clamp NaN to 0 ++ if (std::isnan(value)) // Clamp NaN to 0 + value = 0; + // The double cast is necessary to get the correct wrapping + // for out-of-range values with Int32Array and Uint32Array. +diff --git a/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp b/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp +index a86c1af..ba482bf 100644 +--- a/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp +@@ -333,13 +333,13 @@ void DOMWindow::adjustWindowRect(const FloatRect& screen, FloatRect& window, con + ASSERT(isfinite(window.height())); + + // Update window values if new requested values are not NaN. +- if (!isnan(pendingChanges.x())) ++ if (!std::isnan(pendingChanges.x())) + window.setX(pendingChanges.x()); +- if (!isnan(pendingChanges.y())) ++ if (!std::isnan(pendingChanges.y())) + window.setY(pendingChanges.y()); +- if (!isnan(pendingChanges.width())) ++ if (!std::isnan(pendingChanges.width())) + window.setWidth(pendingChanges.width()); +- if (!isnan(pendingChanges.height())) ++ if (!std::isnan(pendingChanges.height())) + window.setHeight(pendingChanges.height()); + + // Resize the window to between 100 and the screen width and height. +diff --git a/src/3rdparty/webkit/Source/WebCore/page/WindowFeatures.cpp b/src/3rdparty/webkit/Source/WebCore/page/WindowFeatures.cpp +index 7564152..cea8c99 100644 +--- a/src/3rdparty/webkit/Source/WebCore/page/WindowFeatures.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/page/WindowFeatures.cpp +@@ -225,7 +225,7 @@ float WindowFeatures::floatFeature(const DialogFeaturesMap& features, const char + // return the number 0 and false for ok. But "0q" should yield the minimum rather than the default. + bool ok; + double parsedNumber = it->second.toDouble(&ok); +- if ((parsedNumber == 0 && !ok) || isnan(parsedNumber)) ++ if ((parsedNumber == 0 && !ok) || std::isnan(parsedNumber)) + return defaultValue; + if (parsedNumber < min || max <= min) + return min; +diff --git a/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp b/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp +index 1807172..06c6b93 100644 +--- a/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp +@@ -507,14 +507,14 @@ Value FunSubstring::evaluate() const + { + String s = arg(0)->evaluate().toString(); + double doublePos = arg(1)->evaluate().toNumber(); +- if (isnan(doublePos)) ++ if (std::isnan(doublePos)) + return ""; + long pos = static_cast(FunRound::round(doublePos)); + bool haveLength = argCount() == 3; + long len = -1; + if (haveLength) { + double doubleLen = arg(2)->evaluate().toNumber(); +- if (isnan(doubleLen)) ++ if (std::isnan(doubleLen)) + return ""; + len = static_cast(FunRound::round(doubleLen)); + } +@@ -664,7 +664,7 @@ Value FunCeiling::evaluate() const + + double FunRound::round(double val) + { +- if (!isnan(val) && !isinf(val)) { ++ if (!std::isnan(val) && !isinf(val)) { + if (signbit(val) && val >= -0.5) + val *= 0; // negative zero + else +diff --git a/src/3rdparty/webkit/Source/WebCore/xml/XPathValue.cpp b/src/3rdparty/webkit/Source/WebCore/xml/XPathValue.cpp +index 29e211e..5b7c518 100644 +--- a/src/3rdparty/webkit/Source/WebCore/xml/XPathValue.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/xml/XPathValue.cpp +@@ -76,7 +76,7 @@ bool Value::toBoolean() const + case BooleanValue: + return m_bool; + case NumberValue: +- return m_number != 0 && !isnan(m_number); ++ return m_number != 0 && !std::isnan(m_number); + case StringValue: + return !m_data->m_string.isEmpty(); + } +@@ -125,7 +125,7 @@ String Value::toString() const + case StringValue: + return m_data->m_string; + case NumberValue: +- if (isnan(m_number)) ++ if (std::isnan(m_number)) + return "NaN"; + if (m_number == 0) + return "0"; +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 11 21:43:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 11 Sep 2013 19:43:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21907] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 21907 http://gar.svn.sourceforge.net/gar/?rev=21907&view=rev Author: dmichelsen Date: 2013-09-11 19:43:41 +0000 (Wed, 11 Sep 2013) Log Message: ----------- wireshark/trunk: Update to 1.10.2 Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2013-09-11 14:57:34 UTC (rev 21906) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2013-09-11 19:43:41 UTC (rev 21907) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.10.0 +VERSION = 1.10.2 GARTYPE = v2 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2013-09-11 14:57:34 UTC (rev 21906) +++ csw/mgar/pkg/wireshark/trunk/checksums 2013-09-11 19:43:41 UTC (rev 21907) @@ -1 +1 @@ -72e51cd33fd33c7044a41c2ab51ad7af wireshark-1.10.0.tar.bz2 +cd7fedd0a67df5ad4905fd356efdc1e8 wireshark-1.10.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Sep 11 21:48:35 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 11 Sep 2013 19:48:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[21908] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 21908 http://gar.svn.sourceforge.net/gar/?rev=21908&view=rev Author: chninkel Date: 2013-09-11 19:48:35 +0000 (Wed, 11 Sep 2013) Log Message: ----------- gar/v2: add SunOS5.9 in the table listing the allowed library version dependencies per OS Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-09-11 19:43:41 UTC (rev 21907) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-09-11 19:48:35 UTC (rev 21908) @@ -58,6 +58,7 @@ "libc.so.1": { u'SunOS5.11': ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.23', 'SISCD_2.3'], u'SunOS5.10': ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.22.6', 'SISCD_2.3'], + u'SunOS5.9': ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.21.2', 'SISCD_2.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 Wed Sep 11 22:03:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 11 Sep 2013 20:03:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21909] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 21909 http://gar.svn.sourceforge.net/gar/?rev=21909&view=rev Author: lblume Date: 2013-09-11 20:03:02 +0000 (Wed, 11 Sep 2013) Log Message: ----------- ilmbase/trunk: Replace -pthread in the .pc file with something that works with Studio Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2013-09-11 19:48:35 UTC (rev 21908) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2013-09-11 20:03:02 UTC (rev 21909) @@ -96,3 +96,12 @@ CONFIGURE_ARGS += --disable-static include gar/category.mk + +post-install-modulated: + # Make -pthread option Studio-compatible + # The replacement comes from gcc-4.8 -dumpspecs + perl -i -p \ + -e 's,-pthread,-lpthread -D_REENTRANT -D_PTHREADS,' \ + $(DESTDIR)$(libdir)/pkgconfig/*.pc + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Sep 11 22:12:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 11 Sep 2013 20:12:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21910] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 21910 http://gar.svn.sourceforge.net/gar/?rev=21910&view=rev Author: lblume Date: 2013-09-11 20:12:58 +0000 (Wed, 11 Sep 2013) Log Message: ----------- ilmbase/trunk: Missing dependencies? Weird. Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2013-09-11 20:03:02 UTC (rev 21909) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2013-09-11 20:12:58 UTC (rev 21910) @@ -55,6 +55,7 @@ SPKG_DESC_CSWlibiexmath2-0-10 += $(DESCRIPTION), libIexMath-2_0.so.10 RUNTIME_DEP_PKGS_CSWlibiexmath2-0-10 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibiexmath2-0-10 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibiexmath2-0-10 += CSWlibiex2-0-10 PACKAGES += CSWlibilmthread2-0-10 CATALOGNAME_CSWlibilmthread2-0-10 = libilmthread2_0_10 @@ -63,6 +64,7 @@ SPKG_DESC_CSWlibilmthread2-0-10 += $(DESCRIPTION), libIlmThread-2_0.so.10 RUNTIME_DEP_PKGS_CSWlibilmthread2-0-10 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibilmthread2-0-10 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibilmthread2-0-10 += CSWlibiex2-0-10 PACKAGES += CSWlibimath2-0-10 CATALOGNAME_CSWlibimath2-0-10 = libimath2_0_10 @@ -71,6 +73,7 @@ SPKG_DESC_CSWlibimath2-0-10 += $(DESCRIPTION), libImath-2_0.so.10 RUNTIME_DEP_PKGS_CSWlibimath2-0-10 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibimath2-0-10 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibimath2-0-10 += CSWlibiex2-0-10 PACKAGES += CSWilmbase-dev SPKG_DESC_CSWilmbase-dev += Development files for ILM base libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 12 11:36:50 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 12 Sep 2013 09:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21911] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21911 http://gar.svn.sourceforge.net/gar/?rev=21911&view=rev Author: pfelecan Date: 2013-09-12 09:36:49 +0000 (Thu, 12 Sep 2013) Log Message: ----------- qt4-gcc/trunk: activate Id keyword expansion (why is this not the default I cannot get) Property Changed: ---------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Property changes on: csw/mgar/pkg/qt4-gcc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 12 14:13:55 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 12 Sep 2013 12:13:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21912] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21912 http://gar.svn.sourceforge.net/gar/?rev=21912&view=rev Author: pfelecan Date: 2013-09-12 12:13:54 +0000 (Thu, 12 Sep 2013) Log Message: ----------- qt4-gcc/trunk: create the target directories for private development headers Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-12 09:36:49 UTC (rev 21911) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-12 12:13:54 UTC (rev 21912) @@ -416,9 +416,13 @@ # prune tests from the destination directory (we don't want them in # our packages isn't it?) post-install: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(includedir)/QtCore gtar --directory=$(WORKSRC)/include/QtCore --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtCore --extract --file=- + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(includedir)/QtDeclarative gtar --directory=$(WORKSRC)/include/QtDeclarative --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtDeclarative --extract --file=- + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(includedir)/QtGui gtar --directory=$(WORKSRC)/include/QtGui --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtGui --extract --file=- + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(includedir)/QtScript gtar --directory=$(WORKSRC)/include/QtScript --create --file=- private | gtar --directory=$(DESTDIR)$(includedir)/QtScript --extract --file=- cd $(WORKSRC) && gtar --create --file=- src/corelib/*/*_p.h src/declarative/*/*_p.h src/gui/*/*_p.h src/script/*/*_p.h | gtar --directory=$(DESTDIR)$(includedir) --extract --file=- rm -rf $(DESTDIR)/$(prefix)/tests This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 12 17:44:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 12 Sep 2013 15:44:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21913] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21913 http://gar.svn.sourceforge.net/gar/?rev=21913&view=rev Author: pfelecan Date: 2013-09-12 15:44:25 +0000 (Thu, 12 Sep 2013) Log Message: ----------- qt4-gcc/trunk: split 2 new libraries: qtxmlpatterns and qtwebkit Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-12 12:13:54 UTC (rev 21912) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-12 15:44:25 UTC (rev 21913) @@ -390,6 +390,18 @@ RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibqtcore4 +PACKAGES += CSWlibqtwebkit4 +CATALOGNAME_CSWlibqtwebkit4 = libqtwebkit4 +PKGFILES_CSWlibqtwebkit4 += $(call baseisadirs,$(libdir),libQtWebKit\.so\.4\.9\.4) +PKGFILES_CSWlibqtwebkit4 += $(call baseisadirs,$(libdir),libQtWebKit\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtwebkit4 += $(DESCRIPTION), libQtWebKit.so.4 + +PACKAGES += CSWlibqtxmlpatterns4 +CATALOGNAME_CSWlibqtxmlpatterns4 = libqtxmlpatterns4 +PKGFILES_CSWlibqtxmlpatterns4 += $(call baseisadirs,$(libdir),libQtXmlPatterns\.so\.4\.8\.5) +PKGFILES_CSWlibqtxmlpatterns4 += $(call baseisadirs,$(libdir),libQtXmlPatterns\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibqtxmlpatterns4 += $(DESCRIPTION), libQtXmlPatterns.so.4 + PACKAGES += CSWqt4-doc SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation # Catch-all This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 13 11:48:34 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 13 Sep 2013 09:48:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21914] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21914 http://gar.svn.sourceforge.net/gar/?rev=21914&view=rev Author: pfelecan Date: 2013-09-13 09:48:31 +0000 (Fri, 13 Sep 2013) Log Message: ----------- qt4-gcc/trunk: declare the run-time dependencies for the 2 new libraries: qtxmlpatterns and qtwebkit Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-12 15:44:25 UTC (rev 21913) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 09:48:31 UTC (rev 21914) @@ -190,6 +190,8 @@ RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtopengl4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtmultimedia4 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtxmlpatterns4 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtwebkit4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibphonon4 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtsql4 @@ -395,12 +397,23 @@ PKGFILES_CSWlibqtwebkit4 += $(call baseisadirs,$(libdir),libQtWebKit\.so\.4\.9\.4) PKGFILES_CSWlibqtwebkit4 += $(call baseisadirs,$(libdir),libQtWebKit\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtwebkit4 += $(DESCRIPTION), libQtWebKit.so.4 +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibqtnetwork4 +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibqtwebkit4 += CSWlibgcc-s1 PACKAGES += CSWlibqtxmlpatterns4 CATALOGNAME_CSWlibqtxmlpatterns4 = libqtxmlpatterns4 PKGFILES_CSWlibqtxmlpatterns4 += $(call baseisadirs,$(libdir),libQtXmlPatterns\.so\.4\.8\.5) PKGFILES_CSWlibqtxmlpatterns4 += $(call baseisadirs,$(libdir),libQtXmlPatterns\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtxmlpatterns4 += $(DESCRIPTION), libQtXmlPatterns.so.4 +RUNTIME_DEP_PKGS_CSWlibqtxmlpatterns4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqtxmlpatterns4 += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibqtxmlpatterns4 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibqtxmlpatterns4 += CSWlibqtnetwork4 PACKAGES += CSWqt4-doc SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 13 13:14:19 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 13 Sep 2013 11:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21915] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21915 http://gar.svn.sourceforge.net/gar/?rev=21915&view=rev Author: pfelecan Date: 2013-09-13 11:14:16 +0000 (Fri, 13 Sep 2013) Log Message: ----------- qt4-gcc/trunk: a new dependency for the declarative library and an innocuous override for "bad" content. Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 09:48:31 UTC (rev 21914) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 11:14:16 UTC (rev 21915) @@ -232,6 +232,7 @@ # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += $(CHECKPKG_OVERRIDES_CSWqt4-dev_$(GARCH)) +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/webbrowser/webbrowser_harmattan.desktop # # temporary special packaging for Sprac build without script @@ -266,7 +267,8 @@ RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtnetwork4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtgui +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtxmlpatterns4 # RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtsql4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 13 14:13:37 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 13 Sep 2013 12:13:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21916] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21916 http://gar.svn.sourceforge.net/gar/?rev=21916&view=rev Author: pfelecan Date: 2013-09-13 12:13:37 +0000 (Fri, 13 Sep 2013) Log Message: ----------- qt4-gcc/trunk: the new dependency for the declarative library is only for the x86 architecture. Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 11:14:16 UTC (rev 21915) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 12:13:37 UTC (rev 21916) @@ -268,7 +268,7 @@ RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtgui -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtxmlpatterns4 +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtxmlpatterns4 # RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtsql4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 13 16:47:40 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 13 Sep 2013 14:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21917] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21917 http://gar.svn.sourceforge.net/gar/?rev=21917&view=rev Author: pfelecan Date: 2013-09-13 14:47:38 +0000 (Fri, 13 Sep 2013) Log Message: ----------- qt4-gcc/trunk: fix dependency for the declarative library Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 12:13:37 UTC (rev 21916) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-13 14:47:38 UTC (rev 21917) @@ -267,7 +267,7 @@ RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtnetwork4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtgui +RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibqtxmlpatterns4 # RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4_i386 += CSWlibgcc-s1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 13 18:20:30 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 13 Sep 2013 16:20:30 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[664] web/wordpresscsw/wp-content/themes/opencsw Message-ID: <3cc2C93gNDzPS@mail.opencsw.org> Revision: 664 http://sourceforge.net/p/opencsw/code/664 Author: dmichelsen Date: 2013-09-13 16:20:27 +0000 (Fri, 13 Sep 2013) Log Message: ----------- Add section on qa maintainer pages for active maintainers without packages Modified Paths: -------------- web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php web/wordpresscsw/wp-content/themes/opencsw/qa-maintainers.php Modified: web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php 2013-05-22 14:22:49 UTC (rev 663) +++ web/wordpresscsw/wp-content/themes/opencsw/maintainersDAO.php 2013-09-13 16:20:27 UTC (rev 664) @@ -352,6 +352,37 @@ // ----------------------------------------------------------------------------------------------------------------------- // + // Get information about "active" maintainers (who signed up) but never released a package + // + // ----------------------------------------------------------------------------------------------------------------------- + function getListOfActiveMaintainersWithoutPackages() { + + // Define the query used to retrieve the packages from the database + $sqlQuery = "select m.fullname, m.maintainer, m.status from maintainers as m where (select count(*) from packages as p where p.maintlogin = m.maintainer) = 0 order by m.fullname asc" ; + + // Execute the query to retrieve the row to update + $this->execQuery($sqlQuery); + + // Return value + $output = array(); // Array used to store the output + $idxCount = 0; // Index on the current line in the array + + // Check if there is a result + while ($row = mysql_fetch_row($this->result)) { + $output[$idxCount] = array( // Copy the current row into the array of results + "fullname" => $row[0], // Copy the field into the array of results + "maintainer" => $row[1], + "status" => $row[2], + ); + $idxCount++; // Increase the index + } + + // Return the array to the caller + return $output; // Return the array to the caller + } + + // ----------------------------------------------------------------------------------------------------------------------- + // // Get the list of former maintainers // // ----------------------------------------------------------------------------------------------------------------------- Modified: web/wordpresscsw/wp-content/themes/opencsw/qa-maintainers.php =================================================================== --- web/wordpresscsw/wp-content/themes/opencsw/qa-maintainers.php 2013-05-22 14:22:49 UTC (rev 663) +++ web/wordpresscsw/wp-content/themes/opencsw/qa-maintainers.php 2013-09-13 16:20:27 UTC (rev 664) @@ -12,6 +12,7 @@ // Retrieve the statistics from the database $arrayActiveMaint = $maintDAO->getListOfActiveMaintainersWithPackageCount(); + $arrayNopkgMaint = $maintDAO->getListOfActiveMaintainersWithoutPackages(); $arrayRetiredMaint = $maintDAO->getListOfRetiredMaintainersWithPackageCount(); // Disconnect from the database @@ -51,6 +52,37 @@ ?> + +

QA pages active maintainers without packages

+ + The following list provides direct access link to the QA pages of each active maintainers who s not owning any packages. + +
+
+ + + \n" ; + for( $i = 0 ; $i < count($arrayNopkgMaint) ; $i++) { + $maint = $arrayNopkgMaint[$i] ; // Get the current row + print "\n"; + if ( ( ($i +1) % 3 == 0) && ( $i <> 0 ) ) { + print "\n" ; + print "\n" ; + } else { + if (count($arrayMaint) == 1) { + print "\n" ; + } else { + if ( $i == ( count($arrayMaint) - 1 ) ) { + print "\n" ; + } + } + } + } + ?> + +
" . $maint["fullname"] . "
+

QA pages of retired maintainers

The following list provides direct access link to the QA pages of each retired maintainers who are still owning at least 1 package. The package owned by retired mainainters are declared as orphaned and available for takeover. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sat Sep 14 13:50:50 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sat, 14 Sep 2013 11:50:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21918] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 21918 http://gar.svn.sourceforge.net/gar/?rev=21918&view=rev Author: cgrzemba Date: 2013-09-14 11:50:48 +0000 (Sat, 14 Sep 2013) Log Message: ----------- opencsw-manual/trunk: mention catalog in heading Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-09-13 14:47:38 UTC (rev 21917) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-09-14 11:50:48 UTC (rev 21918) @@ -50,7 +50,7 @@ ------------------ -Selecting a mirror +Selecting catalog and mirror ------------------ Now that you are about to install lots of stuff it may be a good time to select This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sat Sep 14 17:31:02 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:31:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21919] csw/mgar/pkg/netsnmp/trunk Message-ID: Revision: 21919 http://gar.svn.sourceforge.net/gar/?rev=21919&view=rev Author: cgrzemba Date: 2013-09-14 15:31:01 +0000 (Sat, 14 Sep 2013) Log Message: ----------- netsnmp/trunk: bump version (LTS) 5.7.2 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile csw/mgar/pkg/netsnmp/trunk/checksums Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-09-14 11:50:48 UTC (rev 21918) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-09-14 15:31:01 UTC (rev 21919) @@ -5,7 +5,7 @@ # NAME = netsnmp -VERSION = 5.6.1.1 +VERSION = 5.7.2 GARTYPE = v2 DESCRIPTION = A suite of applications used to implement SNMP @@ -47,55 +47,55 @@ CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev SPKG_DESC_CSWnetsnmp-dev += $(DESCRIPTION), development files PKGFILES_CSWnetsnmp-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmphelpers25 -RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpmibs25 -RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmptrapd25 -RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpagent25 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmphelpers30 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpmibs30 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmptrapd30 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpagent30 # CHECKPKG_OVERRIDES_CSWnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl -PACKAGES += CSWlibnetsnmp25 -CATALOGNAME_CSWlibnetsnmp25 = libnetsnmp25 -SPKG_DESC_CSWlibnetsnmp25 += $(DESCRIPTION), libsnmp.so.25 -PKGFILES_CSWlibnetsnmp25 += $(call baseisadirs,$(libdir),libnetsnmp\.so\.25(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibnetsnmp25 += CSWlibssl1-0-0 +PACKAGES += CSWlibnetsnmp30 +CATALOGNAME_CSWlibnetsnmp30 = libnetsnmp30 +SPKG_DESC_CSWlibnetsnmp30 += $(DESCRIPTION), libsnmp.so.30 +PKGFILES_CSWlibnetsnmp30 += $(call baseisadirs,$(libdir),libnetsnmp\.so\.30(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmp30 += CSWlibssl1-0-0 -PACKAGES += CSWlibnetsnmpagent25 -CATALOGNAME_CSWlibnetsnmpagent25 = libnetsnmpagent25 -SPKG_DESC_CSWlibnetsnmpagent25 += $(DESCRIPTION), libsnmpagent.so.25 -PKGFILES_CSWlibnetsnmpagent25 += $(call baseisadirs,$(libdir),libnetsnmpagent\.so\.25(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibnetsnmpagent25 += CSWlibnetsnmp25 +PACKAGES += CSWlibnetsnmpagent30 +CATALOGNAME_CSWlibnetsnmpagent30 = libnetsnmpagent30 +SPKG_DESC_CSWlibnetsnmpagent30 += $(DESCRIPTION), libsnmpagent.so.30 +PKGFILES_CSWlibnetsnmpagent30 += $(call baseisadirs,$(libdir),libnetsnmpagent\.so\.30(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmpagent30 += CSWlibnetsnmp30 -PACKAGES += CSWlibnetsnmphelpers25 -CATALOGNAME_CSWlibnetsnmphelpers25 = libnetsnmphelpers25 -SPKG_DESC_CSWlibnetsnmphelpers25 += $(DESCRIPTION), libsnmphelpers.so.25 -PKGFILES_CSWlibnetsnmphelpers25 += $(call baseisadirs,$(libdir),libnetsnmphelpers\.so\.25(\.\d+)*) +PACKAGES += CSWlibnetsnmphelpers30 +CATALOGNAME_CSWlibnetsnmphelpers30 = libnetsnmphelpers30 +SPKG_DESC_CSWlibnetsnmphelpers30 += $(DESCRIPTION), libsnmphelpers.so.30 +PKGFILES_CSWlibnetsnmphelpers30 += $(call baseisadirs,$(libdir),libnetsnmphelpers\.so\.30(\.\d+)*) -PACKAGES += CSWlibnetsnmpmibs25 -CATALOGNAME_CSWlibnetsnmpmibs25 = libnetsnmpmibs25 -SPKG_DESC_CSWlibnetsnmpmibs25 += $(DESCRIPTION), libsnmpmibs.so.25 -PKGFILES_CSWlibnetsnmpmibs25 += $(call baseisadirs,$(libdir),libnetsnmpmibs\.so\.25(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibnetsnmpagent25 +PACKAGES += CSWlibnetsnmpmibs30 +CATALOGNAME_CSWlibnetsnmpmibs30 = libnetsnmpmibs30 +SPKG_DESC_CSWlibnetsnmpmibs30 += $(DESCRIPTION), libsnmpmibs.so.30 +PKGFILES_CSWlibnetsnmpmibs30 += $(call baseisadirs,$(libdir),libnetsnmpmibs\.so\.30(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs30 += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs30 += CSWlibnetsnmpagent30 -PACKAGES += CSWlibnetsnmptrapd25 -CATALOGNAME_CSWlibnetsnmptrapd25 = libnetsnmptrapd25 -SPKG_DESC_CSWlibnetsnmptrapd25 += $(DESCRIPTION), libsnmptrapd.so.25 -PKGFILES_CSWlibnetsnmptrapd25 += $(call baseisadirs,$(libdir),libnetsnmptrapd\.so\.25(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpmibs25 -RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpagent25 +PACKAGES += CSWlibnetsnmptrapd30 +CATALOGNAME_CSWlibnetsnmptrapd30 = libnetsnmptrapd30 +SPKG_DESC_CSWlibnetsnmptrapd30 += $(DESCRIPTION), libsnmptrapd.so.30 +PKGFILES_CSWlibnetsnmptrapd30 += $(call baseisadirs,$(libdir),libnetsnmptrapd\.so\.30(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd30 += CSWlibnetsnmpmibs30 +RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd30 += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd30 += CSWlibnetsnmpagent30 EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod PACKAGES += CSWpmnetsnmp SPKG_DESC_CSWpmnetsnmp+= $(DESCRIPTION), Perl binding PKGFILES_CSWpmnetsnmp += $(libdir)/perl.* RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWperl -# RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpmibs25 -RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmptrapd25 -RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent25 +# RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpmibs30 +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmptrapd30 +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent30 EXTRA_MERGE_EXCLUDE_FILES += .*/*.pyc PACKAGES += CSWpy-netsnmp @@ -104,15 +104,15 @@ PKGFILES_CSWpy-netsnmp = $(libdir)/python.* RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWpython RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibnetsnmp30 CHECKPKG_OVERRIDES_CSWpy-netsnmp += surplus-dependency|CSWpython PACKAGES += CSWnetsnmp SPKG_DESC_CSWnetsnmp += $(DESCRIPTION), Base -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpmibs25 -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmptrapd25 -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpagent25 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpmibs30 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmptrapd30 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmp30 +RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpagent30 RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl # CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpcmd.1 Modified: csw/mgar/pkg/netsnmp/trunk/checksums =================================================================== --- csw/mgar/pkg/netsnmp/trunk/checksums 2013-09-14 11:50:48 UTC (rev 21918) +++ csw/mgar/pkg/netsnmp/trunk/checksums 2013-09-14 15:31:01 UTC (rev 21919) @@ -1 +1 @@ -79e2b9cac947567a01ae2cc67ad8fe53 net-snmp-5.6.1.1.tar.gz +5bddd02e2f82b62daa79f82717737a14 net-snmp-5.7.2.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 14 17:36:10 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:36:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21920] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 21920 http://gar.svn.sourceforge.net/gar/?rev=21920&view=rev Author: lblume Date: 2013-09-14 15:36:09 +0000 (Sat, 14 Sep 2013) Log Message: ----------- zlib/trunk: bump version to 1.2.8; update patch; change explanation of -xcode Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile csw/mgar/pkg/zlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch Removed Paths: ------------- csw/mgar/pkg/zlib/trunk/files/configure.diff Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2013-09-14 15:31:01 UTC (rev 21919) +++ csw/mgar/pkg/zlib/trunk/Makefile 2013-09-14 15:36:09 UTC (rev 21920) @@ -1,7 +1,7 @@ #: $Id$ NAME = zlib -VERSION = 1.2.7 +VERSION = 1.2.8 GARTYPE = v2 DESCRIPTION = Zlib data compression library @@ -20,11 +20,11 @@ MASTER_SITES = http://zlib.net/ MASTER_SITES += $(SF_MIRROR) SF_PROJECT = libpng -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz DISTFILES += COPYING PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch -PATCHFILES += configure.diff +PATCHFILES += 0004-remove-fast-from-configure.patch PACKAGES += CSWlibz1 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 @@ -40,9 +40,10 @@ EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium -# # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 +# http://docs.oracle.com/cd/E19205-01/819-5267/bkbaq/index.html +# http://unix.derkeiler.com/Newsgroups/comp.unix.solaris/2005-12/msg01281.html EXTRA_CFLAGS_sparc = -xcode=pic13 -EXTRA_CFLAGS_i386 = -Kpic +EXTRA_CFLAGS_i386 = -KPIC EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) CONFIGURE_ARGS += --prefix=$(prefix) Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2013-09-14 15:31:01 UTC (rev 21919) +++ csw/mgar/pkg/zlib/trunk/checksums 2013-09-14 15:36:09 UTC (rev 21920) @@ -1 +1 @@ -2ab442d169156f34c379c968f3f482dd zlib-1.2.7.tar.bz2 +28f1205d8dd2001f26fec1e8c2cebe37 zlib-1.2.8.tar.xz Copied: csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch (from rev 21918, csw/mgar/pkg/zlib/trunk/files/configure.diff) =================================================================== --- csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch (rev 0) +++ csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch 2013-09-14 15:36:09 UTC (rev 21920) @@ -0,0 +1,14 @@ +index b77a8a8..cb4872a 100755 +--- a/configure ++++ b/configure +@@ -267,8 +267,8 @@ else + LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;; + SunOS\ 5* | solaris*) + LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"} +- SFLAGS=${CFLAGS-"-fast -KPIC"} +- CFLAGS=${CFLAGS-"-fast"} ++ SFLAGS=${CFLAGS-"-KPIC"} ++ CFLAGS=${CFLAGS-""} + if test $build64 -eq 1; then + # old versions of SunPRO/Workshop/Studio don't support -m64, + # but newer ones do. Check for it. Deleted: csw/mgar/pkg/zlib/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/configure.diff 2013-09-14 15:31:01 UTC (rev 21919) +++ csw/mgar/pkg/zlib/trunk/files/configure.diff 2013-09-14 15:36:09 UTC (rev 21920) @@ -1,27 +0,0 @@ ---- zlib-1.2.4/configure.orig 2010-03-12 16:06:14.000000000 +0100 -+++ zlib-1.2.4/configure 2010-03-19 03:56:46.336725066 +0100 -@@ -29,7 +29,7 @@ - exec_prefix=${exec_prefix-'${prefix}'} - libdir=${libdir-'${exec_prefix}/lib'} - includedir=${includedir-'${prefix}/include'} --mandir=${mandir-'${prefix}/share/man'} -+#mandir=${mandir-'${prefix}/share/man'} - shared_ext='.so' - shared=0 - gcc=0 -@@ -154,11 +154,11 @@ - SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"} - case `(uname -m || echo unknown) 2>/dev/null` in - i86*) -- SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."} -- CFLAGS=${CFLAGS-"-xpentium -fast"} ;; -+ SFLAGS="${CFLAGS} -KPIC -L." -+ CFLAGS=${CFLAGS} ;; - *) -- SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."} -- CFLAGS=${CFLAGS-"-fast -xcg92"} ;; -+ SFLAGS="${CFLAGS} -KPIC -L." -+ CFLAGS=${CFLAGS} ;; - esac ;; - SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} - CFLAGS=${CFLAGS-"-O2"} 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 14 17:36:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:36:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21921] csw/mgar/gar/v2/lib Message-ID: Revision: 21921 http://gar.svn.sourceforge.net/gar/?rev=21921&view=rev Author: wahwah Date: 2013-09-14 15:36:14 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb: Store inf. who added a package to the catg There was a bug where getpass was unconditionally used to store who inserted a package to a catalog. The 'who' variable should be used instead. pkgdb: Remove a comment about a proxy. The comment was wrong. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/web/releases_web.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-09-14 15:36:09 UTC (rev 21920) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-09-14 15:36:14 UTC (rev 21921) @@ -1185,7 +1185,7 @@ osrel=sqo_osrel, catrel=sqo_catrel, srv4file=sqo_srv4, - created_by=getpass.getuser()) + created_by=who) def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel): sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( Modified: csw/mgar/gar/v2/lib/web/releases_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/releases_web.py 2013-09-14 15:36:09 UTC (rev 21920) +++ csw/mgar/gar/v2/lib/web/releases_web.py 2013-09-14 15:36:14 UTC (rev 21921) @@ -204,8 +204,7 @@ srv4_to_remove = pkg_in_catalog.srv4file c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name) - # Retrieving logged in user name from the HTTP environment. - # This does not work on the buildfarm. :-( + # This is set by basic HTTP auth. username = web.ctx.env.get('REMOTE_USER') c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name, who=username) 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 14 17:36:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21922] csw/mgar/gar/v2/lib Message-ID: Revision: 21922 http://gar.svn.sourceforge.net/gar/?rev=21922&view=rev Author: wahwah Date: 2013-09-14 15:36:41 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: Add a REST endpoint for recent pkgs This can be used to pull information about recently built packages. It can be used to embed information in websites, for example. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-09-14 15:36:14 UTC (rev 21921) +++ csw/mgar/gar/v2/lib/python/models.py 2013-09-14 15:36:41 UTC (rev 21922) @@ -528,6 +528,45 @@ return rows +def GetRecentlyBuiltPackages(): + join = [ + # sqlbuilder.INNERJOINOn(None, + # Srv4FileInCatalog, + # Srv4FileInCatalog.q.srv4file==Srv4FileStats.q.id), + # sqlbuilder.INNERJOINOn(None, + # CatalogGenData, + # Srv4FileStats.q.md5_sum==CatalogGenData.q.md5_sum), + ] + where = sqlbuilder.AND( + # Srv4FileStats.q.use_to_generate_catalogs==True, + ) + select = sqlbuilder.Select( + [ + 'srv4_file_stats.md5_sum', # Hardcoded table name, is it portable? + 'srv4_file_stats.catalogname', + # 'version_string', + # 'pkgname', + # 'basename', + # 'size', + # 'deps', + # 'i_deps', + # 'pkginfo_name', + # The above columns are used to generate catalogs. + # Additional columns can be added blow. + 'srv4_file_stats.maintainer_id', + 'srv4_file_stats.mtime', + # 'created_on', + # 'created_by', + ], + where=where, + orderBy='-mtime', + join=join, + limit=30) + query = sqlobject.sqlhub.processConnection.sqlrepr(select) + rows = sqlobject.sqlhub.processConnection.queryAll(query) + return rows + + def GetSqoTriad(osrel, arch, catrel): sqo_osrel = OsRelease.selectBy(short_name=osrel).getOne() sqo_arch = Architecture.selectBy(name=arch).getOne() Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:36:14 UTC (rev 21921) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:36:41 UTC (rev 21922) @@ -39,6 +39,7 @@ r'/catalognames/([^/]+)/', 'Catalogname', ) urls_rest = ( + r'/rest/svr4/recent/', 'RestSrv4List', r'/rest/catalogs/', 'RestCatalogList', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'RestCatalogDetail', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename', @@ -515,6 +516,28 @@ raise web.internalerror(e) +class RestSrv4List(object): + + def GET(self): + pkgs = models.Srv4FileStats.select().orderBy('-mtime')[:30] + now = datetime.datetime.now() + def Ago(timedelta): + # Not sure why there is a time difference between mysql and the datetime + # module. + timezone_diff = 1.0 + return "%.1fh" % (timedelta.seconds / 60.0 / 60.0 - timezone_diff) + pkgs_ago = [(x, Ago(now - x.mtime)) for x in pkgs] + def PrepareForJson(pkg_ago): + pkg, ago = pkg_ago + _, pkg_dict = pkg.GetRestRepr(quick=True) + pkg_dict['ago'] = ago + pkg_dict['maintainer'] = pkg.maintainer.GetRestRepr() + return pkg_dict + response = cjson.encode([PrepareForJson(x) for x in pkgs_ago]) + web.header('Content-Length', str(len(response))) + return response + + class RestCatalogList(object): def GET(self): archs = models.Architecture.select() 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 14 17:36:50 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:36:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21923] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 21923 http://gar.svn.sourceforge.net/gar/?rev=21923&view=rev Author: wahwah Date: 2013-09-14 15:36:50 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb: Cleanup. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-09-14 15:36:41 UTC (rev 21922) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2013-09-14 15:36:50 UTC (rev 21923) @@ -1180,17 +1180,20 @@ sqo_srv4, osrel, arch, catrel) # Our srv4 is already part of that catalog. return + # SQL INSERT happens here. obj = m.Srv4FileInCatalog( arch=sqo_arch, osrel=sqo_osrel, catrel=sqo_catrel, srv4file=sqo_srv4, created_by=who) + # The package is now in the catalog. def RemoveSrv4(self, sqo_srv4, osrel, arch, catrel): sqo_osrel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad( osrel, arch, catrel) try: + # There's a race condition in here. Maybe SQLObject allows to delete atomically? sqo_srv4_in_cat = m.Srv4FileInCatalog.select( sqlobject.AND( m.Srv4FileInCatalog.q.arch==sqo_arch, 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 14 17:37:02 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:37:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21924] csw/mgar/gar/v2/lib Message-ID: Revision: 21924 http://gar.svn.sourceforge.net/gar/?rev=21924&view=rev Author: wahwah Date: 2013-09-14 15:37:02 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: Add an endpoint with catalog timing inf This can be used to find out when a given package was inserted in a given catalog. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-09-14 15:36:50 UTC (rev 21923) +++ csw/mgar/gar/v2/lib/python/models.py 2013-09-14 15:37:02 UTC (rev 21924) @@ -519,7 +519,14 @@ 'size', 'deps', 'i_deps', - 'pkginfo_name'], + 'pkginfo_name', + # The above columns are used to generate catalogs. + # Additional columns can be added blow. + 'maintainer_id', + 'mtime', + 'created_on', + 'created_by', + ], where=where, orderBy='catalogname', join=join) Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:36:50 UTC (rev 21923) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:02 UTC (rev 21924) @@ -50,6 +50,8 @@ 'PkgnamesAndPathsByBasedir', # with ?basedir=... r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/for-generation/', 'CatalogForGeneration', + r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/timing/', + 'CatalogTiming', # Query by catalog release, arch, OS release and catalogname r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname', @@ -614,6 +616,39 @@ return response +class CatalogTiming(object): + + def GET(self, catrel_name, arch_name, osrel_name): + """A list of tuples, aligning with the catalog format. + + catalogname version_string pkgname + basename md5_sum size deps category i_deps + """ + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) + def PrepareForJson(row): + # The size (5th row) is returned as a large integer, which cannot be represented + # in JSON. + # 'maintainer', #9 + # 'mtime', #10 + # 'created_on', #11 + # 'created_by', #12 + newrow = list(row) + newrow[5] = int(newrow[5]) + newrow[6] = cjson.decode(newrow[6]) + newrow[7] = cjson.decode(newrow[7]) + if newrow[10]: + newrow[10] = newrow[10].isoformat() + if newrow[11]: + newrow[11] = newrow[11].isoformat() + return newrow + rows = [PrepareForJson(x) for x in rows] + response = cjson.encode(rows) + web.header('Content-Length', str(len(response))) + return response + + web.webapi.internalerror = web.debugerror 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 14 17:37:19 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:37:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21925] csw/mgar/gar/v2/lib Message-ID: Revision: 21925 http://gar.svn.sourceforge.net/gar/?rev=21925&view=rev Author: wahwah Date: 2013-09-14 15:37:19 +0000 (Sat, 14 Sep 2013) Log Message: ----------- cleanup Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2013-09-14 15:37:02 UTC (rev 21924) +++ csw/mgar/gar/v2/lib/python/models.py 2013-09-14 15:37:19 UTC (rev 21925) @@ -515,7 +515,7 @@ 'version_string', 'pkgname', 'basename', - 'srv4_file_stats.md5_sum', + 'srv4_file_stats.md5_sum', # Hardcoded table name, is it portable? 'size', 'deps', 'i_deps', Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:02 UTC (rev 21924) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:19 UTC (rev 21925) @@ -225,8 +225,7 @@ sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) t2 = time.time() - pkgs = models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel) - pkgs = list(pkgs) + pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)) t3 = time.time() timeinfo = "Query evaluation: %.2fs" % (t3-t2) return render.CatalogDetail(cat_name, pkgs, timeinfo, len(pkgs)) @@ -315,6 +314,7 @@ class RestCatalogDetail(object): + def GET(self, catrel_name, arch_name, osrel_name): sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) @@ -339,7 +339,7 @@ db_catalog = checkpkg_lib.Catalog() try: pkgs = db_catalog.GetPkgByPath(filename, osrel, arch, catrel) - except sqlobject.main.SQLObjectNotFound, e: + except sqlobject.main.SQLObjectNotFound: raise web.notfound() web.header('Content-type', 'application/x-vnd.opencsw.pkg;type=pkgname-list') web.header('X-Rest-Info', 'I could tell you about the format, but I won\'t') 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 14 17:37:29 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:37:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21926] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21926 http://gar.svn.sourceforge.net/gar/?rev=21926&view=rev Author: wahwah Date: 2013-09-14 15:37:29 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: Add an endpoint with the list of maints All the email addresses that ever produced a package, as seen by the buildfarm. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:19 UTC (rev 21925) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:29 UTC (rev 21926) @@ -57,6 +57,7 @@ 'Srv4ByCatAndCatalogname', r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', + r'/rest/maintainers/', 'RestMaintainerList', r'/rest/maintainers/([0-9]+)/', 'RestMaintainerDetail', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', r'/rest/srv4/([0-9a-f]{32})/files/', 'RestSrv4DetailFiles', @@ -257,6 +258,14 @@ return render.MaintainerDetail(maintainer, pkgs) +class RestMaintainerList(object): + + def GET(self): + maintainers = models.Maintainer.select().orderBy('email') + maintainers = [m.GetRestRepr() for m in maintainers] + return cjson.encode(maintainers) + + class RestMaintainerDetail(object): def GET(self, id): maintainer = models.Maintainer.selectBy(id=id).getOne() 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 14 17:37:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21927] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21927 http://gar.svn.sourceforge.net/gar/?rev=21927&view=rev Author: wahwah Date: 2013-09-14 15:37:41 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: Endpoint to look up maints by email Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:29 UTC (rev 21926) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:41 UTC (rev 21927) @@ -58,6 +58,7 @@ r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname', r'/rest/maintainers/', 'RestMaintainerList', + r'/rest/maintainers/by-email/', 'RestMaintainerDetailByName', # with ?email=... r'/rest/maintainers/([0-9]+)/', 'RestMaintainerDetail', r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail', r'/rest/srv4/([0-9a-f]{32})/files/', 'RestSrv4DetailFiles', @@ -272,6 +273,18 @@ return cjson.encode(maintainer.GetRestRepr()) +class RestMaintainerDetailByName(object): + + def GET(self): + user_data = web.input() + email = user_data.email + try: + maintainer = models.Maintainer.selectBy(email=email).getOne() + return cjson.encode(maintainer.GetRestRepr()) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() + + class MaintainerCheckpkgReport(object): def GET(self, id): maintainer = models.Maintainer.selectBy(id=id).getOne() 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 14 17:37:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:37:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21928] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21928 http://gar.svn.sourceforge.net/gar/?rev=21928&view=rev Author: wahwah Date: 2013-09-14 15:37:49 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: Non-existing maintainer won't give 500 Queries for non-exising maintainer IDs will now give 404 errors. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:41 UTC (rev 21927) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:49 UTC (rev 21928) @@ -268,9 +268,13 @@ class RestMaintainerDetail(object): + def GET(self, id): - maintainer = models.Maintainer.selectBy(id=id).getOne() - return cjson.encode(maintainer.GetRestRepr()) + try: + maintainer = models.Maintainer.selectBy(id=id).getOne() + return cjson.encode(maintainer.GetRestRepr()) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() class RestMaintainerDetailByName(object): 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 14 17:37:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21929] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21929 http://gar.svn.sourceforge.net/gar/?rev=21929&view=rev Author: wahwah Date: 2013-09-14 15:37:57 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: If a package is not there, still allow It's about XSS protection: the server should always return the Allow-From header even when it returns a 404, otherwise clients (e.g. jQuery) return errors. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:49 UTC (rev 21928) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:57 UTC (rev 21929) @@ -477,6 +477,7 @@ def GET(self, catrel_name, arch_name, osrel_name, catalogname): """Get a srv4 reference by catalog ane catalogname.""" + web.header('Access-Control-Allow-Origin', '*') try: sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( osrel_name, arch_name, catrel_name) @@ -500,7 +501,6 @@ srv4 = res.getOne() mimetype, data = srv4.GetRestRepr() web.header('Content-type', mimetype) - web.header('Access-Control-Allow-Origin', '*') return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: raise web.notfound() 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 14 17:38:05 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 15:38:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21930] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21930 http://gar.svn.sourceforge.net/gar/?rev=21930&view=rev Author: wahwah Date: 2013-09-14 15:38:05 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb-web: Speed up queries by reducing pkg info Most clients don't need all that information, and should be able to make additional queries to find out. The non-quick mode will eventually be removed entirely. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:37:57 UTC (rev 21929) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 15:38:05 UTC (rev 21930) @@ -499,7 +499,7 @@ ) try: srv4 = res.getOne() - mimetype, data = srv4.GetRestRepr() + mimetype, data = srv4.GetRestRepr(quick=True) web.header('Content-type', mimetype) return cjson.encode(data) except sqlobject.main.SQLObjectNotFound: 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 14 18:01:42 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 14 Sep 2013 16:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21931] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 21931 http://gar.svn.sourceforge.net/gar/?rev=21931&view=rev Author: lblume Date: 2013-09-14 16:01:42 +0000 (Sat, 14 Sep 2013) Log Message: ----------- zlib/trunk: Actually, that patch is not needed, set variables are used Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2013-09-14 15:38:05 UTC (rev 21930) +++ csw/mgar/pkg/zlib/trunk/Makefile 2013-09-14 16:01:42 UTC (rev 21931) @@ -24,7 +24,6 @@ DISTFILES += COPYING PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch -PATCHFILES += 0004-remove-fast-from-configure.patch PACKAGES += CSWlibz1 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 Deleted: csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch =================================================================== --- csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch 2013-09-14 15:38:05 UTC (rev 21930) +++ csw/mgar/pkg/zlib/trunk/files/0004-remove-fast-from-configure.patch 2013-09-14 16:01:42 UTC (rev 21931) @@ -1,14 +0,0 @@ -index b77a8a8..cb4872a 100755 ---- a/configure -+++ b/configure -@@ -267,8 +267,8 @@ else - LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;; - SunOS\ 5* | solaris*) - LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"} -- SFLAGS=${CFLAGS-"-fast -KPIC"} -- CFLAGS=${CFLAGS-"-fast"} -+ SFLAGS=${CFLAGS-"-KPIC"} -+ CFLAGS=${CFLAGS-""} - if test $build64 -eq 1; then - # old versions of SunPRO/Workshop/Studio don't support -m64, - # but newer ones do. Check for it. 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 14 19:22:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 17:22:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21932] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21932 http://gar.svn.sourceforge.net/gar/?rev=21932&view=rev Author: wahwah Date: 2013-09-14 17:22:17 +0000 (Sat, 14 Sep 2013) Log Message: ----------- pkgdb: Throw a 404 for bad catrel, arch, osrel The previous behavior was to throw a 500, but a 404 response is a better one. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 16:01:42 UTC (rev 21931) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-14 17:22:17 UTC (rev 21932) @@ -224,8 +224,11 @@ class CatalogDetail(object): def GET(self, catrel_name, arch_name, osrel_name): cat_name = " ".join((catrel_name, arch_name, osrel_name)) - sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() t2 = time.time() pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)) t3 = time.time() @@ -342,8 +345,11 @@ class RestCatalogDetail(object): def GET(self, catrel_name, arch_name, osrel_name): - sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)) if not len(pkgs): raise web.notfound() @@ -513,8 +519,11 @@ def GET(self, catrel_name, arch_name, osrel_name, pkgname): """Get a srv4 reference by catalog ane pkgname.""" configuration.SetUpSqlobjectConnection() - sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() join = [ sqlbuilder.INNERJOINOn(None, models.Srv4FileInCatalog, @@ -608,8 +617,11 @@ catalogname version_string pkgname basename md5_sum size deps category i_deps """ - sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) def GenCatalogEntry(row): i_deps = cjson.decode(row[7]) 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 14 23:07:15 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 14 Sep 2013 21:07:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21933] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 21933 http://gar.svn.sourceforge.net/gar/?rev=21933&view=rev Author: wahwah Date: 2013-09-14 21:07:13 +0000 (Sat, 14 Sep 2013) Log Message: ----------- gardev/trunk: Updated dependencies Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2013-09-14 17:22:17 UTC (rev 21932) +++ csw/mgar/pkg/gardev/trunk/Makefile 2013-09-14 21:07:13 UTC (rev 21933) @@ -1,3 +1,5 @@ +# $Id$ + NAME = gar_dev VERSION = 1.0 GARTYPE = v2 @@ -33,23 +35,22 @@ RUNTIME_DEP_PKGS_CSWgar-dev += CSWnetcat RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-cheetah RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-curl -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-core -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-hachoir-parser RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-libmagic RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-mako RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-mox -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpymysql +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-mysql RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-progressbar +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-pyelftools RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-sqlobject RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-unittest2 -RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-yaml RUNTIME_DEP_PKGS_CSWgar-dev += CSWpython RUNTIME_DEP_PKGS_CSWgar-dev += CSWsvn RUNTIME_DEP_PKGS_CSWgar-dev += CSWwget RUNTIME_DEP_PKGS_CSWgar-dev += CSWxz -MASTER_SITES = +MASTER_SITES = + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Property changes on: csw/mgar/pkg/gardev/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id 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 14 23:44:01 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Sep 2013 21:44:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21934] csw/mgar/pkg Message-ID: Revision: 21934 http://gar.svn.sourceforge.net/gar/?rev=21934&view=rev Author: dmichelsen Date: 2013-09-14 21:43:59 +0000 (Sat, 14 Sep 2013) Log Message: ----------- sk1libs/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/sk1libs/ csw/mgar/pkg/sk1libs/Makefile csw/mgar/pkg/sk1libs/branches/ csw/mgar/pkg/sk1libs/tags/ csw/mgar/pkg/sk1libs/trunk/ csw/mgar/pkg/sk1libs/trunk/Makefile csw/mgar/pkg/sk1libs/trunk/checksums csw/mgar/pkg/sk1libs/trunk/files/ Added: csw/mgar/pkg/sk1libs/Makefile =================================================================== --- csw/mgar/pkg/sk1libs/Makefile (rev 0) +++ csw/mgar/pkg/sk1libs/Makefile 2013-09-14 21:43:59 UTC (rev 21934) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/sk1libs/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/sk1libs/trunk/Makefile =================================================================== --- csw/mgar/pkg/sk1libs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/sk1libs/trunk/Makefile 2013-09-14 21:43:59 UTC (rev 21934) @@ -0,0 +1,56 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = sk1libs +VERSION = 0.9.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Prepress library + +MASTER_SITES = http://uniconvertor.googlecode.com/files/ +DISTFILES = $(DISTNAME).tar.gz + +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-sk1libs += CSWliblcms1 + +# This is /usr/share/fonts, don't know what to put there for Solaris +CHECKPKG_OVERRIDES_CSWpy-sk1libs += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/sk1libs/utils/fs.py +CHECKPKG_OVERRIDES_CSWpy-sk1libs += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/sk1libs/utils/fs.py + +# Reinplace until this is fixed: +# http://code.google.com/p/sk1/issues/detail?id=37 +REINPLACEMENTS += strip_wall +REINPLACE_MATCH_strip_wall = -Wall +REINPLACE_WITH_strip_wall = +REINPLACE_FILES_strip_wall += setup.py + +REINPLACEMENTS += freetype2 +REINPLACE_MATCH_freetype2 = /usr/include/freetype2 +REINPLACE_WITH_freetype2 = $(includedir)/freetype2 +REINPLACE_FILES_freetype2 += setup.py + +# Reinplace until this is fixed: +# http://code.google.com/p/sk1/issues/detail?id=38 +REINPLACEMENTS += noextraarg +REINPLACE_MATCH_noextraarg = "" +REINPLACE_WITH_noextraarg = +REINPLACE_FILES_noextraarg += setup.py + +# Reinplace location of Adobe Reader +REINPLACEMENTS += adobereader +REINPLACE_MATCH_adobereader = /usr/local/Acrobat +REINPLACE_WITH_adobereader = /opt/csw/share/Adobe/Reader +REINPLACE_FILES_adobereader += src/libpdf/rl_config.py + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/sk1libs/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/sk1libs/trunk/checksums =================================================================== --- csw/mgar/pkg/sk1libs/trunk/checksums (rev 0) +++ csw/mgar/pkg/sk1libs/trunk/checksums 2013-09-14 21:43:59 UTC (rev 21934) @@ -0,0 +1 @@ +e18088bbc8a105e7535a96f40b80f284 sk1libs-0.9.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 14 23:47:34 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Sep 2013 21:47:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21935] csw/mgar/pkg Message-ID: Revision: 21935 http://gar.svn.sourceforge.net/gar/?rev=21935&view=rev Author: dmichelsen Date: 2013-09-14 21:47:33 +0000 (Sat, 14 Sep 2013) Log Message: ----------- lang-python/sk1libs: Move toplevel sk1libs to lang-python Added Paths: ----------- csw/mgar/pkg/lang-python/sk1libs/ Removed Paths: ------------- csw/mgar/pkg/sk1libs/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Sep 15 00:16:04 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 14 Sep 2013 22:16:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21936] csw/mgar/pkg/lang-python/uniconvertor/trunk/ Makefile Message-ID: Revision: 21936 http://gar.svn.sourceforge.net/gar/?rev=21936&view=rev Author: dmichelsen Date: 2013-09-14 22:16:04 +0000 (Sat, 14 Sep 2013) Log Message: ----------- lang-python/uniconvertor/trunk: Reinplacements Modified Paths: -------------- csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile Modified: csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile 2013-09-14 21:47:33 UTC (rev 21935) +++ csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile 2013-09-14 22:16:04 UTC (rev 21936) @@ -11,10 +11,25 @@ MASTER_SITES = http://uniconvertor.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.gz +REINPLACEMENTS += pyimport +REINPLACE_MATCH_pyimport = imaging.Image, imaging.ImageChops +REINPLACE_WITH_pyimport = imaging +REINPLACE_FILES_pyimport += src/app/scripts/export_raster.py + PACKAGES += CSWuniconvertor SPKG_DESC_CSWuniconvertor = UniConvertor is a universal vector graphics translator RUNTIME_DEP_PKGS_CSWuniconvertor += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWuniconvertor += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWuniconvertor += CSWlibpython2-7-1-0 +# Can't track this with checkpkg +RUNTIME_DEP_PKGS_CSWuniconvertor += CSWpy-sk1libs +CHECKPKG_OVERRIDES_CSWuniconvertor += surplus-dependency|CSWpy-sk1libs + +# Again /usr/share/fonts/ ... +CHECKPKG_OVERRIDES_CSWuniconvertor += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/uniconvertor/app/conf/configurator.py +CHECKPKG_OVERRIDES_CSWuniconvertor += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/uniconvertor/app/conf/configurator.py + # This is intentional as it is a program, not a module CHECKPKG_OVERRIDES_CSWuniconvertor += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWuniconvertor += catalogname-does-not-start-with-py_ 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 15 11:01:12 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 15 Sep 2013 09:01:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21937] csw/mgar/pkg Message-ID: Revision: 21937 http://gar.svn.sourceforge.net/gar/?rev=21937&view=rev Author: chninkel Date: 2013-09-15 09:01:11 +0000 (Sun, 15 Sep 2013) Log Message: ----------- svr4pkg/trunk: new package Added Paths: ----------- csw/mgar/pkg/svr4pkg/ csw/mgar/pkg/svr4pkg/Makefile csw/mgar/pkg/svr4pkg/branches/ csw/mgar/pkg/svr4pkg/tags/ csw/mgar/pkg/svr4pkg/trunk/ csw/mgar/pkg/svr4pkg/trunk/Makefile csw/mgar/pkg/svr4pkg/trunk/checksums csw/mgar/pkg/svr4pkg/trunk/files/ Added: csw/mgar/pkg/svr4pkg/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/Makefile (rev 0) +++ csw/mgar/pkg/svr4pkg/Makefile 2013-09-15 09:01:11 UTC (rev 21937) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/svr4pkg/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 09:01:11 UTC (rev 21937) @@ -0,0 +1,19 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = svr4pkg +VERSION = X.Y +GARTYPE = v2 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/svr4pkg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/svr4pkg/trunk/checksums =================================================================== 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 15 11:37:45 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 15 Sep 2013 09:37:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[21938] csw/mgar/pkg/svr4pkg/trunk Message-ID: Revision: 21938 http://gar.svn.sourceforge.net/gar/?rev=21938&view=rev Author: chninkel Date: 2013-09-15 09:37:44 +0000 (Sun, 15 Sep 2013) Log Message: ----------- svr4pkg: created a first working recipe Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile csw/mgar/pkg/svr4pkg/trunk/checksums Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 09:01:11 UTC (rev 21937) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 09:37:44 UTC (rev 21938) @@ -2,18 +2,33 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = svr4pkg -VERSION = X.Y +VERSION = 0.1 GARTYPE = v2 -DESCRIPTION = Brief description +DESCRIPTION = Basic perl implementation of solaris native svr4 packages tools define BLURB - Long description + Basic perl implementation of solaris native svr4 packages tools endef -MASTER_SITES = -DISTFILES = $(DISTNAME).tar.gz +GITHUB_USER = yannrouillard +MASTER_SITES = $(GITHUB_MIRROR) +DISTNAME = $(GITHUB_USER)-$(NAME)-35370d6 +DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) -CONFIGURE_ARGS = $(DIRPATHS) +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + include gar/category.mk +install-custom: + @echo " ==> Installing $(NAME)" + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/svr4pkg $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(docdir)$(NAME) + ginstall $(WORKSRC)/README.md $(DESTDIR)$(docdir)$(NAME) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/svr4pkg/trunk/checksums =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/checksums 2013-09-15 09:01:11 UTC (rev 21937) +++ csw/mgar/pkg/svr4pkg/trunk/checksums 2013-09-15 09:37:44 UTC (rev 21938) @@ -0,0 +1 @@ +672a9ec401a079fb50c0fcf7869e5d75 svr4pkg-0.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 15 11:38:20 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 15 Sep 2013 09:38:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21939] csw/mgar/pkg/svr4pkg/trunk/Makefile Message-ID: Revision: 21939 http://gar.svn.sourceforge.net/gar/?rev=21939&view=rev Author: chninkel Date: 2013-09-15 09:38:20 +0000 (Sun, 15 Sep 2013) Log Message: ----------- svr4pkg/trunk: added symlink to native tools names Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 09:37:44 UTC (rev 21938) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 09:38:20 UTC (rev 21939) @@ -24,10 +24,15 @@ include gar/category.mk +NATIVE_TOOLS = pkgadd pkgrm pkginfo pkgchk pkgparam + install-custom: @echo " ==> Installing $(NAME)" ginstall -d $(DESTDIR)$(bindir) ginstall $(WORKSRC)/svr4pkg $(DESTDIR)$(bindir) + cd "$(DESTDIR)$(bindir)" && for TOOL in $(NATIVE_TOOLS); do \ + gln -sf svr4pkg "$$TOOL"; \ + done ginstall -d $(DESTDIR)$(docdir)$(NAME) ginstall $(WORKSRC)/README.md $(DESTDIR)$(docdir)$(NAME) @$(MAKECOOKIE) 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 15 12:06:01 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 15 Sep 2013 10:06:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21940] csw/mgar/pkg/svr4pkg/trunk/Makefile Message-ID: Revision: 21940 http://gar.svn.sourceforge.net/gar/?rev=21940&view=rev Author: chninkel Date: 2013-09-15 10:06:01 +0000 (Sun, 15 Sep 2013) Log Message: ----------- svr4pkg/trunk: remove dependency on CSWcommon Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 09:38:20 UTC (rev 21939) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-09-15 10:06:01 UTC (rev 21940) @@ -15,6 +15,12 @@ DISTNAME = $(GITHUB_USER)-$(NAME)-35370d6 DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) +# We disable inclusion of CSWcommon by default as +# this package could be installed before anything +COMMON_PKG_DEPENDS = +# We disable the checkpkg alarms related +CHECKPKG_OVERRIDES_CSWsvr4pkg += missing-dependency| + ARCHALL = 1 CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Sep 15 13:19:46 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 15 Sep 2013 11:19:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21941] csw/mgar/pkg/lang-python Message-ID: Revision: 21941 http://gar.svn.sourceforge.net/gar/?rev=21941&view=rev Author: wahwah Date: 2013-09-15 11:19:45 +0000 (Sun, 15 Sep 2013) Log Message: ----------- pkg/lang-python/lockfile: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/lockfile/ csw/mgar/pkg/lang-python/lockfile/Makefile csw/mgar/pkg/lang-python/lockfile/branches/ csw/mgar/pkg/lang-python/lockfile/tags/ csw/mgar/pkg/lang-python/lockfile/trunk/Makefile csw/mgar/pkg/lang-python/lockfile/trunk/checksums csw/mgar/pkg/lang-python/lockfile/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/lang-python/lockfile/Makefile csw/mgar/pkg/lang-python/lockfile/branches/ csw/mgar/pkg/lang-python/lockfile/tags/ csw/mgar/pkg/lang-python/lockfile/trunk/Makefile csw/mgar/pkg/lang-python/lockfile/trunk/checksums csw/mgar/pkg/lang-python/lockfile/trunk/files/ Deleted: csw/mgar/pkg/lang-python/lockfile/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/Makefile 2013-08-14 13:51:47 UTC (rev 21736) +++ csw/mgar/pkg/lang-python/lockfile/Makefile 2013-09-15 11:19:45 UTC (rev 21941) @@ -1,15 +0,0 @@ -# vim: ft=make ts=4 sw=4 noet - -default: - @echo "You are in the pkg/ directory." - -%: - $(MAKE) -C trunk $* - -paranoid-%: - $(MAKE) -C trunk $* || exit 2 - -export BUILDLOG ?= $(shell pwd)/buildlog.txt - -report-%: - $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Copied: csw/mgar/pkg/lang-python/lockfile/Makefile (from rev 20848, csw/mgar/pkg/lang-python/python-markdown/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/lockfile/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/lockfile/Makefile 2013-09-15 11:19:45 UTC (rev 21941) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Deleted: csw/mgar/pkg/lang-python/lockfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile 2013-08-14 13:51:47 UTC (rev 21736) +++ csw/mgar/pkg/lang-python/lockfile/trunk/Makefile 2013-09-15 11:19:45 UTC (rev 21941) @@ -1,25 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = Markdown -VERSION = 2.3.1 -CATEGORIES = python -GARTYPE = v2 - -DESCRIPTION = Python implementation of Markdown - -PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc - -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(DISTNAME).tar.gz - -VENDOR_URL = http://www.freewisdom.org/projects/python-markdown/ - -PACKAGES = CSWpy-markdown -ARCHALL_CSWpy-markdown = 1 - -# There is no testsuite -TEST_SCRIPTS = - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/lockfile/trunk/Makefile (from rev 21045, csw/mgar/pkg/lang-python/python-markdown/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/lockfile/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/lockfile/trunk/Makefile 2013-09-15 11:19:45 UTC (rev 21941) @@ -0,0 +1,23 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = lockfile +VERSION = 0.9.1 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = Platform-independent file locking module + +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = https://pypi.python.org/pypi/lockfile + +ARCHALL_CSWpy-lockfile = 1 + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk Deleted: csw/mgar/pkg/lang-python/lockfile/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-markdown/trunk/checksums 2013-08-14 13:51:47 UTC (rev 21736) +++ csw/mgar/pkg/lang-python/lockfile/trunk/checksums 2013-09-15 11:19:45 UTC (rev 21941) @@ -1 +0,0 @@ -82f6828ec2292dda52fc38b743776bc6 Markdown-2.3.1.tar.gz Copied: csw/mgar/pkg/lang-python/lockfile/trunk/checksums (from rev 21045, csw/mgar/pkg/lang-python/python-markdown/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/lockfile/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/lockfile/trunk/checksums 2013-09-15 11:19:45 UTC (rev 21941) @@ -0,0 +1 @@ +ce61468d4c1263e3005737bbed2641f0 lockfile-0.9.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 Sun Sep 15 14:25:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 15 Sep 2013 12:25:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21942] csw/mgar/pkg/xchm/trunk/Makefile Message-ID: Revision: 21942 http://gar.svn.sourceforge.net/gar/?rev=21942&view=rev Author: lblume Date: 2013-09-15 12:25:56 +0000 (Sun, 15 Sep 2013) Log Message: ----------- xchm/trunk: Add a build dep Modified Paths: -------------- csw/mgar/pkg/xchm/trunk/Makefile Modified: csw/mgar/pkg/xchm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchm/trunk/Makefile 2013-09-15 11:19:45 UTC (rev 21941) +++ csw/mgar/pkg/xchm/trunk/Makefile 2013-09-15 12:25:56 UTC (rev 21942) @@ -20,6 +20,7 @@ BUILD_DEP_PKGS += CSWwxwidgets-dev BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibchm-dev RUNTIME_DEP_PKGS_CSWxchm = CSWchmlib RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetscommon 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 15 14:35:05 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 15 Sep 2013 12:35:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21943] csw/mgar/pkg/xchm/trunk/Makefile Message-ID: Revision: 21943 http://gar.svn.sourceforge.net/gar/?rev=21943&view=rev Author: lblume Date: 2013-09-15 12:35:04 +0000 (Sun, 15 Sep 2013) Log Message: ----------- xchm/trunk: Update dependencies; add proper flags Modified Paths: -------------- csw/mgar/pkg/xchm/trunk/Makefile Modified: csw/mgar/pkg/xchm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchm/trunk/Makefile 2013-09-15 12:25:56 UTC (rev 21942) +++ csw/mgar/pkg/xchm/trunk/Makefile 2013-09-15 12:35:04 UTC (rev 21943) @@ -22,12 +22,13 @@ BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWlibchm-dev -RUNTIME_DEP_PKGS_CSWxchm = CSWchmlib -RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetscommon +RUNTIME_DEP_PKGS_CSWxchm += CSWlibchm0 +RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgets RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetsgtk2 -RUNTIME_DEP_PKGS_CSWxchm += CSWsunmath -RUNTIME_DEP_PKGS_CSWxchm += CSWncurses +EXTRA_CFLAGS = -xnorunpath +EXTRA_CXXFLAGS = -norunpath + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Sep 15 22:37:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 15 Sep 2013 20:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21944] csw/mgar/pkg/less/trunk Message-ID: Revision: 21944 http://gar.svn.sourceforge.net/gar/?rev=21944&view=rev Author: dmichelsen Date: 2013-09-15 20:37:58 +0000 (Sun, 15 Sep 2013) Log Message: ----------- less/trunk: Update to 458 Modified Paths: -------------- csw/mgar/pkg/less/trunk/Makefile csw/mgar/pkg/less/trunk/checksums Modified: csw/mgar/pkg/less/trunk/Makefile =================================================================== --- csw/mgar/pkg/less/trunk/Makefile 2013-09-15 12:35:04 UTC (rev 21943) +++ csw/mgar/pkg/less/trunk/Makefile 2013-09-15 20:37:58 UTC (rev 21944) @@ -1,5 +1,5 @@ NAME = less -VERSION = 451 +VERSION = 458 GARTYPE = v2 DESCRIPTION = Less is a free, open-source file pager Modified: csw/mgar/pkg/less/trunk/checksums =================================================================== --- csw/mgar/pkg/less/trunk/checksums 2013-09-15 12:35:04 UTC (rev 21943) +++ csw/mgar/pkg/less/trunk/checksums 2013-09-15 20:37:58 UTC (rev 21944) @@ -1 +1 @@ -765f082658002b2b46b86af4a0da1842 less-451.tar.gz +935b38aa2e73c888c210dedf8fd94f49 less-458.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 Mon Sep 16 10:38:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 16 Sep 2013 08:38:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[21945] csw/mgar/pkg/libid3tag/trunk/Makefile Message-ID: Revision: 21945 http://gar.svn.sourceforge.net/gar/?rev=21945&view=rev Author: lblume Date: 2013-09-16 08:38:00 +0000 (Mon, 16 Sep 2013) Log Message: ----------- libid3tag/trunk: Respin with GCC4; update dependency Modified Paths: -------------- csw/mgar/pkg/libid3tag/trunk/Makefile Modified: csw/mgar/pkg/libid3tag/trunk/Makefile =================================================================== --- csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-15 20:37:58 UTC (rev 21944) +++ csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 08:38:00 UTC (rev 21945) @@ -12,12 +12,11 @@ DISTFILES = $(NAME)-$(VERSION)$(REV).tar.gz DISTFILES += id3tag.pc-32 id3tag.pc-64 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GCC4 WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(REV) -RUNTIME_DEP_PKGS = CSWzlib +RUNTIME_DEP_PKGS = CSWlibz1 BUILD64_LIBS_ONLY = 1 NOISALIST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Sep 16 15:07:51 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 16 Sep 2013 13:07:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21946] csw/mgar/pkg/libid3tag/trunk/Makefile Message-ID: Revision: 21946 http://gar.svn.sourceforge.net/gar/?rev=21946&view=rev Author: lblume Date: 2013-09-16 13:07:51 +0000 (Mon, 16 Sep 2013) Log Message: ----------- libid3tag/trunk: Split the package properly; update deps Modified Paths: -------------- csw/mgar/pkg/libid3tag/trunk/Makefile Modified: csw/mgar/pkg/libid3tag/trunk/Makefile =================================================================== --- csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 08:38:00 UTC (rev 21945) +++ csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 13:07:51 UTC (rev 21946) @@ -1,6 +1,6 @@ -NAME = libid3tag +NAME = libid3tag VERSION = 0.15.1 -REV = b +REV = b GARTYPE = v2 DESCRIPTION = A library for reading and (eventually) writing ID3 tags @@ -23,10 +23,25 @@ CONFIGURE_ARGS = $(DIRPATHS) +SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) + +PACKAGES += CSWlibid3tag0 +CATALOGNAME_CSWlibid3tag0 = libid3tag0 +PKGFILES_CSWlibid3tag0 += $(call baseisadirs,$(libdir),libid3tag\.so\.0\.3\.0) +PKGFILES_CSWlibid3tag0 += $(call baseisadirs,$(libdir),libid3tag\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibid3tag0 += $(DESCRIPTION), libid3tag.so.0 +RUNTIME_DEP_PKGS_CSWlibid3tag0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibid3tag0 += CSWlibz1 +OBSOLETED_BY_CSWlibid3tag0 += CSWlibid3tag + +PACKAGES += CSWlibid3tag-dev +CATALOGNAME_CSWlibid3tag-dev = libid3tag_dev +SPKG_DESC_CSWlibid3tag-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibid3tag-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibid3tag-dev += CSWlibid3tag0 + include gar/category.mk -SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) - post-install-modulated: @ginstall -d $(DESTDIR)$(libdir)/pkgconfig @ginstall $(WORKDIR)/id3tag.pc-$(MEMORYMODEL) $(DESTDIR)$(libdir)/pkgconfig/id3tag.pc 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 16 16:47:48 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 16 Sep 2013 14:47:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21947] csw/mgar/pkg/libid3tag/trunk/Makefile Message-ID: Revision: 21947 http://gar.svn.sourceforge.net/gar/?rev=21947&view=rev Author: lblume Date: 2013-09-16 14:47:48 +0000 (Mon, 16 Sep 2013) Log Message: ----------- libid3tag/trunk: Modify the revision so it comes at the end, like for other such packages Modified Paths: -------------- csw/mgar/pkg/libid3tag/trunk/Makefile Modified: csw/mgar/pkg/libid3tag/trunk/Makefile =================================================================== --- csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 13:07:51 UTC (rev 21946) +++ csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 14:47:48 UTC (rev 21947) @@ -1,7 +1,7 @@ -NAME = libid3tag -VERSION = 0.15.1 -REV = b -GARTYPE = v2 +NAME = libid3tag +VERSION = 0.15.1 +GARSUBREV = b +GARTYPE = v2 DESCRIPTION = A library for reading and (eventually) writing ID3 tags define BLURB @@ -9,12 +9,12 @@ SF_PROJECT = mad MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION)$(REV).tar.gz +DISTFILES = $(NAME)-$(VERSION)$(GARSUBREV).tar.gz DISTFILES += id3tag.pc-32 id3tag.pc-64 GARCOMPILER = GCC4 -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(REV) +WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(GARSUBREV) RUNTIME_DEP_PKGS = CSWlibz1 @@ -23,8 +23,6 @@ CONFIGURE_ARGS = $(DIRPATHS) -SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) - PACKAGES += CSWlibid3tag0 CATALOGNAME_CSWlibid3tag0 = libid3tag0 PKGFILES_CSWlibid3tag0 += $(call baseisadirs,$(libdir),libid3tag\.so\.0\.3\.0) @@ -42,6 +40,8 @@ include gar/category.mk +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) + post-install-modulated: @ginstall -d $(DESTDIR)$(libdir)/pkgconfig @ginstall $(WORKDIR)/id3tag.pc-$(MEMORYMODEL) $(DESTDIR)$(libdir)/pkgconfig/id3tag.pc 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 16 16:52:05 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 16 Sep 2013 14:52:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21948] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 21948 http://gar.svn.sourceforge.net/gar/?rev=21948&view=rev Author: lblume Date: 2013-09-16 14:52:05 +0000 (Mon, 16 Sep 2013) Log Message: ----------- gvim/trunk: Bump to 7.4.027 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 2013-09-16 14:47:48 UTC (rev 21947) +++ csw/mgar/pkg/gvim/trunk/Makefile 2013-09-16 14:52:05 UTC (rev 21948) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 0 +PATCHREV = 27 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 2013-09-16 14:47:48 UTC (rev 21947) +++ csw/mgar/pkg/gvim/trunk/checksums 2013-09-16 14:52:05 UTC (rev 21948) @@ -1 +1,28 @@ +f234692c9ab5265ba6ba6f55c0f81764 7.4.001 +a03e1a5ad3722f2011751dda977641af 7.4.002 +e6d070f592bb6da4d8cf2f7f134425e5 7.4.003 +77566c96ea0feb3effd5624e02126b11 7.4.004 +c71f2af8c787f6b7f57be9937f925a20 7.4.005 +88f99b8f2e2a5eab0b054b839edc3856 7.4.006 +59f1c6e00ae3309a3f998e795b998be1 7.4.007 +6d17c2f54ed124b03d60121e9a7aa150 7.4.008 +e53775eb1a632e68e14d2002b8c220b4 7.4.009 +ed08869476205e90af14e0be02cc5cfd 7.4.010 +b87237dfa835d07a005d3d3a8476fb34 7.4.011 +d058bb40d1c670529c19c3c3d3c76421 7.4.012 +c5d0ae4f982c57467bc330f03f1f176d 7.4.013 +914eb6390a5a6b677c2f0ef0edefb60c 7.4.014 +56c2924732fc886e46569a399864a5cc 7.4.015 +35a4cf5f64dcb948bb13a2db592c168f 7.4.016 +67f6ab40bdd3107c0731766278cfdc73 7.4.017 +4c8b21a64040356066c5bcc4d056bec5 7.4.018 +fbf7aef0eab753fcf4c4d575c76fd4bf 7.4.019 +c6a5bc4865a5e5e8c16333d5095fd571 7.4.020 +a983fabe523f0c91cbeec43a16b599c9 7.4.021 +612b6401b7ad5a8859439dc1e257ad05 7.4.022 +cdd8466563a0fd4fb538dbc1606d4a42 7.4.023 +7720495cecc60252198c1c5056de010a 7.4.024 +161173463dc95145c48f7691aee73f13 7.4.025 +8e0181a33d4cf99f3ff8f359c99af7b5 7.4.026 +97f5e46883edf23f873522db86e721a6 7.4.027 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 16 16:52:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 16 Sep 2013 14:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21949] csw/mgar/pkg/vim/trunk Message-ID: Revision: 21949 http://gar.svn.sourceforge.net/gar/?rev=21949&view=rev Author: lblume Date: 2013-09-16 14:52:56 +0000 (Mon, 16 Sep 2013) Log Message: ----------- vim/trunk: Bump to 7.4.027 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 2013-09-16 14:52:05 UTC (rev 21948) +++ csw/mgar/pkg/vim/trunk/Makefile 2013-09-16 14:52:56 UTC (rev 21949) @@ -1,6 +1,6 @@ NAME = vim DISTVERSION = 7.4 -PATCHREV = 0 +PATCHREV = 27 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 2013-09-16 14:52:05 UTC (rev 21948) +++ csw/mgar/pkg/vim/trunk/checksums 2013-09-16 14:52:56 UTC (rev 21949) @@ -1 +1,28 @@ +f234692c9ab5265ba6ba6f55c0f81764 7.4.001 +a03e1a5ad3722f2011751dda977641af 7.4.002 +e6d070f592bb6da4d8cf2f7f134425e5 7.4.003 +77566c96ea0feb3effd5624e02126b11 7.4.004 +c71f2af8c787f6b7f57be9937f925a20 7.4.005 +88f99b8f2e2a5eab0b054b839edc3856 7.4.006 +59f1c6e00ae3309a3f998e795b998be1 7.4.007 +6d17c2f54ed124b03d60121e9a7aa150 7.4.008 +e53775eb1a632e68e14d2002b8c220b4 7.4.009 +ed08869476205e90af14e0be02cc5cfd 7.4.010 +b87237dfa835d07a005d3d3a8476fb34 7.4.011 +d058bb40d1c670529c19c3c3d3c76421 7.4.012 +c5d0ae4f982c57467bc330f03f1f176d 7.4.013 +914eb6390a5a6b677c2f0ef0edefb60c 7.4.014 +56c2924732fc886e46569a399864a5cc 7.4.015 +35a4cf5f64dcb948bb13a2db592c168f 7.4.016 +67f6ab40bdd3107c0731766278cfdc73 7.4.017 +4c8b21a64040356066c5bcc4d056bec5 7.4.018 +fbf7aef0eab753fcf4c4d575c76fd4bf 7.4.019 +c6a5bc4865a5e5e8c16333d5095fd571 7.4.020 +a983fabe523f0c91cbeec43a16b599c9 7.4.021 +612b6401b7ad5a8859439dc1e257ad05 7.4.022 +cdd8466563a0fd4fb538dbc1606d4a42 7.4.023 +7720495cecc60252198c1c5056de010a 7.4.024 +161173463dc95145c48f7691aee73f13 7.4.025 +8e0181a33d4cf99f3ff8f359c99af7b5 7.4.026 +97f5e46883edf23f873522db86e721a6 7.4.027 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 cgrzemba at users.sourceforge.net Mon Sep 16 17:07:09 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 16 Sep 2013 15:07:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21950] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 21950 http://gar.svn.sourceforge.net/gar/?rev=21950&view=rev Author: cgrzemba Date: 2013-09-16 15:07:08 +0000 (Mon, 16 Sep 2013) Log Message: ----------- librecad/trunk: fixing packaging and version Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2013-09-16 14:52:56 UTC (rev 21949) +++ csw/mgar/pkg/librecad/trunk/Makefile 2013-09-16 15:07:08 UTC (rev 21950) @@ -2,8 +2,8 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = LibreCAD -VERSION = 2.0.0beta2 -# GIT_VERSION = 216dc66b2a +VERSION = 2.0.0rc2 +GIT_VERSION = $(VERSION) GARTYPE = v2 CATEGORIES = gnome @@ -24,7 +24,7 @@ # DISTFILES = $(DISTNAME).tar.gz GIT_REPOS = http://github.com/$(NAME)/$(NAME).git GIT_USE_PROXY = 1 -# GIT_TREEISH_LibreCAD.git = $(GIT_VERSION) +GIT_TREEISH_LibreCAD.git = $(GIT_VERSION) GARCOMPILER = GNU # prefix = $(BUILD_PREFIX)/gxx @@ -40,7 +40,7 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWlibfreetype-dev -PACKAGES += CSWlibreCAD +PACKAGES = CSWlibreCAD CATALOGNAME_CSWlibreCAD = libreCAD PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Sep 16 19:30:13 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 16 Sep 2013 19:30:13 +0200 Subject: [csw-devel] SF.net SVN: gar:[21946] csw/mgar/pkg/libid3tag/trunk/Makefile In-Reply-To: References: Message-ID: Hi Laurent, Am 16.09.2013 um 15:07 schrieb lblume at users.sourceforge.net: > Revision: 21946 > http://gar.svn.sourceforge.net/gar/?rev=21946&view=rev > Author: lblume > Date: 2013-09-16 13:07:51 +0000 (Mon, 16 Sep 2013) > Log Message: > ----------- > libid3tag/trunk: Split the package properly; update deps > > Modified Paths: > -------------- > csw/mgar/pkg/libid3tag/trunk/Makefile > > Modified: csw/mgar/pkg/libid3tag/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 08:38:00 UTC (rev 21945) > +++ csw/mgar/pkg/libid3tag/trunk/Makefile 2013-09-16 13:07:51 UTC (rev 21946) > @@ -1,6 +1,6 @@ > -NAME = libid3tag > +NAME = libid3tag > VERSION = 0.15.1 > -REV = b > +REV = b > GARTYPE = v2 > > DESCRIPTION = A library for reading and (eventually) writing ID3 tags > @@ -23,10 +23,25 @@ > > CONFIGURE_ARGS = $(DIRPATHS) > > +SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) You can also set the version now to arbitrary strings directly, like VERSION = 0.15.1b depending in the further use in WORKSRC and DISTNAME. The SPKG_VERSION hack was at times when the version number was not allowed to have strings. > + > +PACKAGES += CSWlibid3tag0 > +CATALOGNAME_CSWlibid3tag0 = libid3tag0 > +PKGFILES_CSWlibid3tag0 += $(call baseisadirs,$(libdir),libid3tag\.so\.0\.3\.0) > +PKGFILES_CSWlibid3tag0 += $(call baseisadirs,$(libdir),libid3tag\.so\.0(\.\d+)*) You can also use the more precise $(call pkgfiles_lib,libid3tag.so.0) which has a simlar expansion. > +SPKG_DESC_CSWlibid3tag0 += $(DESCRIPTION), libid3tag.so.0 > +RUNTIME_DEP_PKGS_CSWlibid3tag0 += CSWlibgcc-s1 > +RUNTIME_DEP_PKGS_CSWlibid3tag0 += CSWlibz1 > +OBSOLETED_BY_CSWlibid3tag0 += CSWlibid3tag > + > +PACKAGES += CSWlibid3tag-dev > +CATALOGNAME_CSWlibid3tag-dev = libid3tag_dev > +SPKG_DESC_CSWlibid3tag-dev += $(DESCRIPTION), development files > +PKGFILES_CSWlibid3tag-dev += $(PKGFILES_DEVEL) > +RUNTIME_DEP_PKGS_CSWlibid3tag-dev += CSWlibid3tag0 > + > include gar/category.mk > > -SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) Best regards -- Dago > - > post-install-modulated: > @ginstall -d $(DESTDIR)$(libdir)/pkgconfig > @ginstall $(WORKDIR)/id3tag.pc-$(MEMORYMODEL) $(DESTDIR)$(libdir)/pkgconfig/id3tag.pc > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2351 bytes Desc: not available URL: From dmichelsen at users.sourceforge.net Mon Sep 16 21:04:46 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 16 Sep 2013 19:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21951] csw/mgar/pkg/libgssglue/trunk/Makefile Message-ID: Revision: 21951 http://gar.svn.sourceforge.net/gar/?rev=21951&view=rev Author: dmichelsen Date: 2013-09-16 19:04:46 +0000 (Mon, 16 Sep 2013) Log Message: ----------- libgssglue/trunk: Try to depend on kerberos libs explicitly as rdesktop does not seem to work otherwise Modified Paths: -------------- csw/mgar/pkg/libgssglue/trunk/Makefile Modified: csw/mgar/pkg/libgssglue/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgssglue/trunk/Makefile 2013-09-16 15:07:08 UTC (rev 21950) +++ csw/mgar/pkg/libgssglue/trunk/Makefile 2013-09-16 19:04:46 UTC (rev 21951) @@ -18,6 +18,12 @@ SPKG_DESC_CSWlibgssglue0 = A GSSAPI interface PKGFILES_CSWlibgssglue0 += $(call pkgfiles_lib,libgssglue.so.0) +# We must link against the kerberos libraries although they are not directly pulled in or it will not work +RUNTIME_DEP_PKGS_CSWlibgssglue0 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibgssglue0 += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibgssglue0 += CSWlibgssapi-krb5-2 +CHECKPKG_OVERRIDES_CSWlibgssglue0 += soname-unused + PACKAGES += CSWlibgssglue-dev SPKG_DESC_CSWlibgssglue-dev = Development files for libgssglue.so.0 # PKGFILES is catchall @@ -25,6 +31,10 @@ EXTRA_CPPFLAGS += -DUSE_SOLARIS_SHARED_LIBRARIES=1 +# We must link against the kerberos libraries although they are not directly pulled in or it will not work +LINKER_IGNORE = +EXTRA_LINKER_FLAGS += -lkrb5 -lkrb5support -lgssapi_krb5 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) 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 16 23:07:48 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Sep 2013 21:07:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21952] csw/mgar/gar/v2/lib/python/rest.py Message-ID: Revision: 21952 http://gar.svn.sourceforge.net/gar/?rev=21952&view=rev Author: wahwah Date: 2013-09-16 21:07:48 +0000 (Mon, 16 Sep 2013) Log Message: ----------- Added method for quering timing endpoint. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2013-09-16 19:04:46 UTC (rev 21951) +++ csw/mgar/gar/v2/lib/python/rest.py 2013-09-16 21:07:48 UTC (rev 21952) @@ -262,7 +262,15 @@ data = urllib2.urlopen(url).read() return cjson.decode(data) + def GetCatalogTimingInformation(self, catrel, arch, osrel): + url = ( + self.rest_url + + self.PKGDB_APP + + "/catalogs/%s/%s/%s/timing/" % (catrel, arch, osrel)) + data = urllib2.urlopen(url).read() + return cjson.decode(data) + class CachedPkgstats(object): """Class responsible for holding and caching package stats. 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 16 23:54:22 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Sep 2013 21:54:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21953] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 21953 http://gar.svn.sourceforge.net/gar/?rev=21953&view=rev Author: wahwah Date: 2013-09-16 21:54:22 +0000 (Mon, 16 Sep 2013) Log Message: ----------- mGAR v2: Add a configure step for Python It's rare, but still. Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-09-16 21:07:48 UTC (rev 21952) +++ csw/mgar/gar/v2/gar.lib.mk 2013-09-16 21:54:22 UTC (rev 21953) @@ -860,6 +860,13 @@ cd $* && $(CONFIGURE_ENV) ./waf configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) +PYCONFIGURE_CMD = config +configure-%/setup.py: + @echo " ==> Running setup.py $(PYBUILD_TYPE) in $*" + @( cd $* ; $(BUILD_ENV) $(PYTHON_EXECUTABLE) ./setup.py $(PYCONFIGURE_CMD) $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + + #################### BUILD RULES #################### # build from a standard gnu-style makefile's default rule. 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 16 23:55:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 16 Sep 2013 21:55:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21954] csw/mgar/pkg Message-ID: Revision: 21954 http://gar.svn.sourceforge.net/gar/?rev=21954&view=rev Author: wahwah Date: 2013-09-16 21:55:16 +0000 (Mon, 16 Sep 2013) Log Message: ----------- pypcap/trunk: it does not build Added Paths: ----------- csw/mgar/pkg/pypcap/ csw/mgar/pkg/pypcap/Makefile csw/mgar/pkg/pypcap/branches/ csw/mgar/pkg/pypcap/tags/ csw/mgar/pkg/pypcap/trunk/ csw/mgar/pkg/pypcap/trunk/Makefile csw/mgar/pkg/pypcap/trunk/checksums csw/mgar/pkg/pypcap/trunk/files/ Added: csw/mgar/pkg/pypcap/Makefile =================================================================== --- csw/mgar/pkg/pypcap/Makefile (rev 0) +++ csw/mgar/pkg/pypcap/Makefile 2013-09-16 21:55:16 UTC (rev 21954) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pypcap/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pypcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/pypcap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pypcap/trunk/Makefile 2013-09-16 21:55:16 UTC (rev 21954) @@ -0,0 +1,20 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pypcap +VERSION = 1.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Simplified object-oriented Python extension module for libpcap + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = --with-pcap /opt/csw +CONFIGURE_SCRIPTS = $(WORKSRC)/setup.py + +PACKAGES = CSWpy-pcap + +include gar/category.mk + Property changes on: csw/mgar/pkg/pypcap/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pypcap/trunk/checksums =================================================================== --- csw/mgar/pkg/pypcap/trunk/checksums (rev 0) +++ csw/mgar/pkg/pypcap/trunk/checksums 2013-09-16 21:55:16 UTC (rev 21954) @@ -0,0 +1 @@ +034c3cbbfa81aa19e8f685b767c65764 pypcap-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 Tue Sep 17 10:41:23 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 17 Sep 2013 08:41:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21955] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21955 http://gar.svn.sourceforge.net/gar/?rev=21955&view=rev Author: lblume Date: 2013-09-17 08:41:22 +0000 (Tue, 17 Sep 2013) Log Message: ----------- samba/branches/samba3: Reintroducing the Solaris 9 target Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-16 21:55:16 UTC (rev 21954) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-17 08:41:22 UTC (rev 21955) @@ -28,11 +28,11 @@ PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch PATCHFILES += 0003-rename-nss-modules.patch -GARCOMPILER=SOS12U3 +# Studio 12 is the last supported on Solaris 9 +GARCOMPILER-5.9 = SOS12 +GARCOMPILER-5.10 = SOS12U3 +GARCOMPILER = $(GARCOMPILER-$(GAROSREL)) -#What needs to be fixed: -# Split libs and packages - BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibkrb5-dev @@ -40,7 +40,8 @@ BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibreadline-dev -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGES += CSWsamba CATALOGNAME_CSWsamba= samba @@ -50,7 +51,6 @@ RUNTIME_DEP_PKGS_CSWsamba += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibz1 RUNTIME_DEP_PKGS_CSWsamba += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibfam0 RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsamba += CSWlibcom-err3 @@ -64,6 +64,11 @@ RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba += CSWlibtevent0 +# Different dependency names on different repos +RUNTIME_DEP_PKGS_CSWsamba_5.9 += CSWgamin +RUNTIME_DEP_PKGS_CSWsamba_5.10 += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWsamba += $(RUNTIME_DEP_PKGS_CSWsamba_$(GAROSREL)) + # Make one unified package for now OBSOLETED_BY_CSWsamba += CSWsambacommon CATALOGNAME_CSWsambacommon = samba_common_stub @@ -314,7 +319,10 @@ EXTRA_LINKER_FLAGS += -lintl EXTRA_LINKER_FLAGS += -z ignore -z lazyload -BUILD64 = 1 +# 32 bit only on Solaris 9 - just to save build time +BUILD64-5.9 = +BUILD64-5.10 = 1 +BUILD64 = $(BUILD64-$(GAROSREL)) ISAEXEC = 1 SMBLOCKDIR = $(localstatedir)/samba/locks @@ -331,7 +339,12 @@ CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-winbind CONFIGURE_ARGS += --with-static-modules=vfs_solarisacl -CONFIGURE_ARGS += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex + +# ZFS is only on S10+ +CONFIGURE_ARGS_5.9 += --with-shared-modules=vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex +CONFIGURE_ARGS_5.10 += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) + CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --with-ads CONFIGURE_ARGS += --with-ldap 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 17 10:51:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 17 Sep 2013 08:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21956 http://gar.svn.sourceforge.net/gar/?rev=21956&view=rev Author: lblume Date: 2013-09-17 08:51:36 +0000 (Tue, 17 Sep 2013) Log Message: ----------- samba/branches/samba3: Fix the compiler selection by OS version Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-17 08:41:22 UTC (rev 21955) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-17 08:51:36 UTC (rev 21956) @@ -29,9 +29,11 @@ PATCHFILES += 0003-rename-nss-modules.patch # Studio 12 is the last supported on Solaris 9 -GARCOMPILER-5.9 = SOS12 -GARCOMPILER-5.10 = SOS12U3 -GARCOMPILER = $(GARCOMPILER-$(GAROSREL)) +ifeq ($(shell /usr/bin/uname -r),5.9) + GARCOMPILER = SOS12 +else + GARCOMPILER = SOS12U3 +endif BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWopenldap-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Sep 17 11:00:59 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 17 Sep 2013 11:00:59 +0200 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile In-Reply-To: References: Message-ID: Hi Laurent, Am 17.09.2013 um 10:51 schrieb lblume at users.sourceforge.net: > Revision: 21956 > http://gar.svn.sourceforge.net/gar/?rev=21956&view=rev > Author: lblume > Date: 2013-09-17 08:51:36 +0000 (Tue, 17 Sep 2013) > Log Message: > ----------- > samba/branches/samba3: Fix the compiler selection by OS version > > Modified Paths: > -------------- > csw/mgar/pkg/samba/branches/samba3/Makefile > > Modified: csw/mgar/pkg/samba/branches/samba3/Makefile > =================================================================== > --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-17 08:41:22 UTC (rev 21955) > +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-17 08:51:36 UTC (rev 21956) > @@ -29,9 +29,11 @@ > PATCHFILES += 0003-rename-nss-modules.patch > > # Studio 12 is the last supported on Solaris 9 > -GARCOMPILER-5.9 = SOS12 > -GARCOMPILER-5.10 = SOS12U3 > -GARCOMPILER = $(GARCOMPILER-$(GAROSREL)) > +ifeq ($(shell /usr/bin/uname -r),5.9) > + GARCOMPILER = SOS12 > +else > + GARCOMPILER = SOS12U3 > +endif I suggest using GARCOMPILER_5.9 = SOS12 GARCOMPILER_5.10 = SOS12U3 GARCOMPILER_5.11 = SOS12U3 GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) or GARCOMPILER_5.9 = SOS12 GARCOMPILER = $(or $(GARCOMPILER_$(GAROSREL)),SOS12U3) uname -r is already in GAROSREL. Best regards -- Dago > > BUILD_DEP_PKGS += CSWlibtalloc-dev > BUILD_DEP_PKGS += CSWopenldap-dev > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2351 bytes Desc: not available URL: From dmichelsen at users.sourceforge.net Tue Sep 17 11:26:57 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 17 Sep 2013 09:26:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21957] csw/mgar/pkg/libgssglue/trunk/Makefile Message-ID: Revision: 21957 http://gar.svn.sourceforge.net/gar/?rev=21957&view=rev Author: dmichelsen Date: 2013-09-17 09:26:56 +0000 (Tue, 17 Sep 2013) Log Message: ----------- libgssglue/trunk: Add gssapi_mech.conf Modified Paths: -------------- csw/mgar/pkg/libgssglue/trunk/Makefile Modified: csw/mgar/pkg/libgssglue/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgssglue/trunk/Makefile 2013-09-17 08:51:36 UTC (rev 21956) +++ csw/mgar/pkg/libgssglue/trunk/Makefile 2013-09-17 09:26:56 UTC (rev 21957) @@ -17,6 +17,7 @@ PACKAGES += CSWlibgssglue0 SPKG_DESC_CSWlibgssglue0 = A GSSAPI interface PKGFILES_CSWlibgssglue0 += $(call pkgfiles_lib,libgssglue.so.0) +PKGFILES_CSWlibgssglue0 += $(sysconfdir)/.* # We must link against the kerberos libraries although they are not directly pulled in or it will not work RUNTIME_DEP_PKGS_CSWlibgssglue0 += CSWlibkrb5-3 @@ -24,11 +25,28 @@ RUNTIME_DEP_PKGS_CSWlibgssglue0 += CSWlibgssapi-krb5-2 CHECKPKG_OVERRIDES_CSWlibgssglue0 += soname-unused +# These are really comments +CHECKPKG_OVERRIDES_CSWlibgssglue0 += file-with-bad-content|/usr/local|root/etc/opt/csw/gssapi_mech.conf.CSW +CHECKPKG_OVERRIDES_CSWlibgssglue0 += file-with-bad-content|/usr/local|root/etc/opt/csw/64/gssapi_mech.conf.CSW + PACKAGES += CSWlibgssglue-dev SPKG_DESC_CSWlibgssglue-dev = Development files for libgssglue.so.0 # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibgssglue-dev += CSWlibgssglue0 +REINPLACEMENTS += mech +REINPLACE_MATCH_mech = /etc/mech.conf +REINPLACE_WITH_mech = $(abspath $(sysconfdir)/$(MM_LIBDIR))/gssapi_mech.conf +REINPLACE_FILES_mech += src/g_initialize.c + +PRESERVECONF += $(sysconfdir)/gssapi_mech.conf +PRESERVECONF += $(sysconfdir)/64/gssapi_mech.conf + +REINPLACEMENTS += krb5 +REINPLACE_MATCH_krb5 = /usr/lib/libgssapi_krb5.so +REINPLACE_WITH_krb5 = $(libdir)/libgssapi_krb5.so.2 +REINPLACE_FILES_krb5 += doc/gssapi_mech.conf + EXTRA_CPPFLAGS += -DUSE_SOLARIS_SHARED_LIBRARIES=1 # We must link against the kerberos libraries although they are not directly pulled in or it will not work @@ -38,5 +56,11 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +#DEVEL_EXECUTABLES += $(sysconfdir)/.* +#EXTRA_MERGE_SCRIPTS_isa-extra += merge-copy-config-only + include gar/category.mk +post-install: + ginstall -D -m 0644 $(WORKSRC)/doc/gssapi_mech.conf $(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/gssapi_mech.conf + $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Sep 17 13:57:50 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 17 Sep 2013 11:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21958] csw/mgar/pkg/sox/trunk Message-ID: Revision: 21958 http://gar.svn.sourceforge.net/gar/?rev=21958&view=rev Author: lblume Date: 2013-09-17 11:57:49 +0000 (Tue, 17 Sep 2013) Log Message: ----------- sox/trunk: Bump to 14.4.1; switch compiler to GCC; disable seeking on a pipe completely, that was ugly in the first place Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2013-09-17 09:26:56 UTC (rev 21957) +++ csw/mgar/pkg/sox/trunk/Makefile 2013-09-17 11:57:49 UTC (rev 21958) @@ -1,5 +1,5 @@ NAME = sox -VERSION = 14.4.0 +VERSION = 14.4.1 GARTYPE = v2 DESCRIPTION = Swiss Army Knife of sound processing utilities @@ -12,13 +12,14 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.bz2 +GARCOMPILER = GCC4 + # There is a hack in there to rewind pipes when detecting file formats. -# As the FILE struct is opaque in 64 bit we must disable this for 64 bit. -# But as we only need the library in 64 bit anyway this shouldn't hurt. +# As the FILE struct is opaque in 64 bit we must disable this: +# I believe the behaviour should be consistent in both 32 and 64, and +# anyway, rewinding a *pipe*?! PATCHFILES = 0001-Disable-stdio-hack-to-rewind-pipes.patch -PATCHFILES += 0001-Fix-SunStudio-version-string.patch - VENDOR_URL = http://sox.sourceforge.net/ BUILD_DEP_PKGS += CSWlibvorbis-dev @@ -31,7 +32,7 @@ BUILD_DEP_PKGS += CSWlibz-dev BUILD_DEP_PKGS += CSWlibmagic-dev BUILD_DEP_PKGS += CSWlibmp3lame-dev -BUILD_DEP_PKGS += CSWlibsndfile +BUILD_DEP_PKGS += CSWlibsndfile-dev BUILD_DEP_PKGS += CSWlibid3tag PACKAGES += CSWsox Modified: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums 2013-09-17 09:26:56 UTC (rev 21957) +++ csw/mgar/pkg/sox/trunk/checksums 2013-09-17 11:57:49 UTC (rev 21958) @@ -1 +1 @@ -813807c6d6fcd4b0af5c995e61f46687 sox-14.4.0.tar.bz2 +ff9ca6aca972549de0e80e8e30ed379c sox-14.4.1.tar.bz2 Modified: csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch =================================================================== --- csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch 2013-09-17 09:26:56 UTC (rev 21957) +++ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch 2013-09-17 11:57:49 UTC (rev 21958) @@ -1,31 +1,17 @@ -From 91792a0837969dd584dd469c06874111d80cfcec Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 6 Nov 2009 16:05:59 +0100 -Subject: [PATCH] Disable stdio hack to rewind pipes - ---- - src/formats.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/src/formats.c b/src/formats.c -index 556f611..f238929 100644 +index 785eca7..62dd19b 100644 --- a/src/formats.c +++ b/src/formats.c -@@ -397,13 +397,12 @@ static void UNUSED rewind_pipe(FILE * fp) - fp->_r += AUTO_DETECT_SIZE; +@@ -411,8 +411,12 @@ static void UNUSED rewind_pipe(FILE * fp) + fp->_r += PIPE_AUTO_DETECT_SIZE; #elif defined __GLIBC__ fp->_IO_read_ptr = fp->_IO_read_base; --#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H -+#elif !defined _LP64 && (defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H) +-#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H ++#elif (defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H) && ! defined sun fp->_ptr = fp->_base; ++#elif defined sun ++ /* Solaris will not allow to seek on pipe */ ++ #define NO_REWIND_PIPE ++ (void)fp; #else /* To fix this #error, either simply remove the #error line and live without * file-type detection with pipes, or add support for your compiler in the - * lines above. Test with cat monkey.au | ./sox --info - */ -- #error FIX NEEDED HERE - #define NO_REWIND_PIPE - (void)fp; - #endif --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Sep 17 14:33:10 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 17 Sep 2013 12:33:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21959] csw/mgar/pkg/sox/trunk/Makefile Message-ID: Revision: 21959 http://gar.svn.sourceforge.net/gar/?rev=21959&view=rev Author: lblume Date: 2013-09-17 12:33:10 +0000 (Tue, 17 Sep 2013) Log Message: ----------- sox/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2013-09-17 11:57:49 UTC (rev 21958) +++ csw/mgar/pkg/sox/trunk/Makefile 2013-09-17 12:33:10 UTC (rev 21959) @@ -57,8 +57,9 @@ RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibgomp1 -RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibsndfile -RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibsndfile1 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibid3tag0 PACKAGES += CSWlibsox-dev CATALOGNAME_CSWlibsox-dev = libsox_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Sep 18 09:49:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Sep 2013 07:49:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21960] csw/mgar/pkg/pypcap/trunk Message-ID: Revision: 21960 http://gar.svn.sourceforge.net/gar/?rev=21960&view=rev Author: wahwah Date: 2013-09-18 07:49:58 +0000 (Wed, 18 Sep 2013) Log Message: ----------- pypcap/trunk: a few patches to make it build Modified Paths: -------------- csw/mgar/pkg/pypcap/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pypcap/trunk/files/0001-Strings-must-not-be-thrown-as-exceptions.patch csw/mgar/pkg/pypcap/trunk/files/0002-Use-a-shared-object-if-available.patch csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch Modified: csw/mgar/pkg/pypcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/pypcap/trunk/Makefile 2013-09-17 12:33:10 UTC (rev 21959) +++ csw/mgar/pkg/pypcap/trunk/Makefile 2013-09-18 07:49:58 UTC (rev 21960) @@ -11,10 +11,23 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(DISTNAME).tar.gz -CONFIGURE_ARGS = --with-pcap /opt/csw +PATCHFILES += 0001-Strings-must-not-be-thrown-as-exceptions.patch +PATCHFILES += 0002-Use-a-shared-object-if-available.patch +PATCHFILES += 0003-include-pcap-must-be-first-to-pick-pcap_file.patch + +CONFIGURE_ARGS = --with-pcap=/opt/csw CONFIGURE_SCRIPTS = $(WORKSRC)/setup.py PACKAGES = CSWpy-pcap +TEST_SCRIPTS = + +LICENSE = LICENSE + +RUNTIME_DEP_PKGS_CSWpy-pcap += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-pcap += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWpy-pcap += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-pcap += CSWlibgcc-s1 + include gar/category.mk Added: csw/mgar/pkg/pypcap/trunk/files/0001-Strings-must-not-be-thrown-as-exceptions.patch =================================================================== --- csw/mgar/pkg/pypcap/trunk/files/0001-Strings-must-not-be-thrown-as-exceptions.patch (rev 0) +++ csw/mgar/pkg/pypcap/trunk/files/0001-Strings-must-not-be-thrown-as-exceptions.patch 2013-09-18 07:49:58 UTC (rev 21960) @@ -0,0 +1,25 @@ +From 78ca4ca4eba27103d007b9044efa7ffda49ee949 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 18 Sep 2013 09:09:53 +0200 +Subject: [PATCH] Strings must not be thrown as exceptions + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 09f74e4..104ee90 100644 +--- a/setup.py ++++ b/setup.py +@@ -60,7 +60,7 @@ class config_pcap(config.config): + print 'found', cfg + self._write_config_h(cfg) + return cfg +- raise "couldn't find pcap build or installation directory" ++ raise Exception("couldn't find pcap build or installation directory") + + def run(self): + #config.log.set_verbosity(0) +-- +1.8.3.4 + Added: csw/mgar/pkg/pypcap/trunk/files/0002-Use-a-shared-object-if-available.patch =================================================================== --- csw/mgar/pkg/pypcap/trunk/files/0002-Use-a-shared-object-if-available.patch (rev 0) +++ csw/mgar/pkg/pypcap/trunk/files/0002-Use-a-shared-object-if-available.patch 2013-09-18 07:49:58 UTC (rev 21960) @@ -0,0 +1,24 @@ +From f51d387c2bdb7b4c302d11eff4a49ce32a09a7d9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 18 Sep 2013 09:37:08 +0200 +Subject: [PATCH] Use a shared object if available + +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index 104ee90..24eaa1e 100644 +--- a/setup.py ++++ b/setup.py +@@ -48,6 +48,7 @@ class config_pcap(config.config): + cfg['include_dirs'] = [ os.path.join(d, sd) ] + for sd in ('lib', ''): + for lib in (('pcap', 'libpcap.a'), ++ ('pcap', 'libpcap.so'), + ('pcap', 'libpcap.dylib'), + ('wpcap', 'wpcap.lib')): + if os.path.exists(os.path.join(d, sd, lib[1])): +-- +1.8.3.4 + Added: csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch =================================================================== --- csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch (rev 0) +++ csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch 2013-09-18 07:49:58 UTC (rev 21960) @@ -0,0 +1,25 @@ +From 39090d39583a80ed4d412bed41e837bed8414afa Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 18 Sep 2013 09:43:43 +0200 +Subject: [PATCH] include/pcap must be first to pick pcap_file() + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 24eaa1e..7a0728f 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,7 +42,7 @@ class config_pcap(config.config): + dirs = [ '/usr', sys.prefix ] + glob.glob('/opt/libpcap*') + \ + glob.glob('../libpcap*') + glob.glob('../wpdpack*') + for d in dirs: +- for sd in ('include', 'include/pcap', ''): ++ for sd in ('include/pcap', 'include', ''): + incdirs = [ os.path.join(d, sd) ] + if os.path.exists(os.path.join(d, sd, 'pcap.h')): + cfg['include_dirs'] = [ os.path.join(d, sd) ] +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Sep 18 09:54:14 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 18 Sep 2013 07:54:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21961] csw/mgar/pkg/pypcap/trunk/files/ 0003-include-pcap-must-be-first-to-pick-pcap_file.patch Message-ID: Revision: 21961 http://gar.svn.sourceforge.net/gar/?rev=21961&view=rev Author: wahwah Date: 2013-09-18 07:54:14 +0000 (Wed, 18 Sep 2013) Log Message: ----------- pypcap/trunk: Add an explanation of what the problem is Modified Paths: -------------- csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch Modified: csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch =================================================================== --- csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch 2013-09-18 07:49:58 UTC (rev 21960) +++ csw/mgar/pkg/pypcap/trunk/files/0003-include-pcap-must-be-first-to-pick-pcap_file.patch 2013-09-18 07:54:14 UTC (rev 21961) @@ -3,6 +3,16 @@ Date: Wed, 18 Sep 2013 09:43:43 +0200 Subject: [PATCH] include/pcap must be first to pick pcap_file() +If /opt/csw/include/pcap.h gets picked up first, it and only it gets parsed +and searched for "pcap_file(". But /opt/csw/include/pcap.h is only +an empty compatibility file, it only includes the /opt/csw/include/pcap/pcap.h +file. But since this code only parses the first found include file, +.../include/pcap/pcap.h doesn't get parsed and the configure script thinks +that the pcap_file() function is not available. + +The downsides of custom configure scripts with custom discovery methods, not +actually running the compiler. + --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Wed Sep 18 11:53:25 2013 From: laurent at opencsw.org (Laurent Blume) Date: Wed, 18 Sep 2013 11:53:25 +0200 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile In-Reply-To: References: Message-ID: <52397815.9030403@opencsw.org> On 17/09/13 11:00, Dagobert Michelsen wrote: > I suggest using > > GARCOMPILER_5.9 = SOS12 > GARCOMPILER_5.10 = SOS12U3 > GARCOMPILER_5.11 = SOS12U3 > GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) > > or > > GARCOMPILER_5.9 = SOS12 > GARCOMPILER = $(or $(GARCOMPILER_$(GAROSREL)),SOS12U3) > > uname -r is already in GAROSREL. That's what I tried first, but it did not work. Looking around, the if way is the only one I found. Laurent From dam at opencsw.org Wed Sep 18 12:48:20 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 18 Sep 2013 12:48:20 +0200 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile In-Reply-To: <52397815.9030403@opencsw.org> References: <52397815.9030403@opencsw.org> Message-ID: <6DF61B86-044B-43FF-B31D-0277613EA136@opencsw.org> Hi Laurent, Am 18.09.2013 um 11:53 schrieb Laurent Blume : > On 17/09/13 11:00, Dagobert Michelsen wrote: >> I suggest using >> >> GARCOMPILER_5.9 = SOS12 >> GARCOMPILER_5.10 = SOS12U3 >> GARCOMPILER_5.11 = SOS12U3 >> GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) >> >> or >> >> GARCOMPILER_5.9 = SOS12 >> GARCOMPILER = $(or $(GARCOMPILER_$(GAROSREL)),SOS12U3) >> >> uname -r is already in GAROSREL. > > That's what I tried first, but it did not work. Looking around, the if way is the only one I found. Really? Interesting? I probably should have a look to see why. Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2351 bytes Desc: not available URL: From laurent at opencsw.org Wed Sep 18 13:44:21 2013 From: laurent at opencsw.org (Laurent Blume) Date: Wed, 18 Sep 2013 13:44:21 +0200 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile In-Reply-To: <6DF61B86-044B-43FF-B31D-0277613EA136@opencsw.org> References: <52397815.9030403@opencsw.org> <6DF61B86-044B-43FF-B31D-0277613EA136@opencsw.org> Message-ID: <52399215.30603@opencsw.org> On 18/09/13 12:48, Dagobert Michelsen wrote: > GARCOMPILER_5.9 = SOS12 >>>GARCOMPILER_5.10 = SOS12U3 >>>GARCOMPILER_5.11 = SOS12U3 >>>GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) Just copy/pasting that bit above, I get this: $ mgar build /export/espace/apps/OpenCSW/mgar/.buildsys/v2/gar//gar.conf.mk:103: *** The compiler '' is unknown. Please select one of GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3. Arr?t. I think we discussed that before, didn't we? Can't remember for sure, though. Laurent From jh at opencsw.org Wed Sep 18 13:46:53 2013 From: jh at opencsw.org (Jan Holzhueter) Date: Wed, 18 Sep 2013 13:46:53 +0200 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile In-Reply-To: <52399215.30603@opencsw.org> References: <52397815.9030403@opencsw.org> <6DF61B86-044B-43FF-B31D-0277613EA136@opencsw.org> <52399215.30603@opencsw.org> Message-ID: <523992AD.2070802@opencsw.org> Am 18.09.13 13:44, schrieb Laurent Blume: > On 18/09/13 12:48, Dagobert Michelsen wrote: >> GARCOMPILER_5.9 = SOS12 >>>> GARCOMPILER_5.10 = SOS12U3 >>>> GARCOMPILER_5.11 = SOS12U3 >>>> GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) > > Just copy/pasting that bit above, I get this: > > $ mgar build > /export/espace/apps/OpenCSW/mgar/.buildsys/v2/gar//gar.conf.mk:103: *** > The compiler '' is unknown. Please select one of GCC3 GCC4 SOS11 SOS12 > SOS12U1 SOS12U2 SOS12U3. Arr?t. > > I think we discussed that before, didn't we? Can't remember for sure, > though. Yes we did and I think GARCOMPILER is set before there is a GAROSREL :) Might be wrong though and is was something diffrend Greetings Jan From cgrzemba at users.sourceforge.net Wed Sep 18 16:25:11 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 18 Sep 2013 14:25:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21962] csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch Message-ID: Revision: 21962 http://gar.svn.sourceforge.net/gar/?rev=21962&view=rev Author: cgrzemba Date: 2013-09-18 14:25:10 +0000 (Wed, 18 Sep 2013) Log Message: ----------- qt4-gcc/trunk: gxx prefix is not true anymore Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch Modified: csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch 2013-09-18 07:54:14 UTC (rev 21961) +++ csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch 2013-09-18 14:25:10 UTC (rev 21962) @@ -32,8 +32,8 @@ -QMAKE_INCDIR = /usr/sfw/include -QMAKE_LIBDIR = /usr/sfw/lib/64 -+QMAKE_INCDIR = /opt/csw/gxx/include -+QMAKE_LIBDIR = /opt/csw/gxx/lib/64 ++QMAKE_INCDIR = /opt/csw/include ++QMAKE_LIBDIR = /opt/csw/lib/64 QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib/64 QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] @@ -45,8 +45,8 @@ -QMAKE_INCDIR = /usr/sfw/include -QMAKE_LIBDIR = /usr/sfw/lib -+QMAKE_INCDIR = /opt/csw/gxx/include -+QMAKE_LIBDIR = /opt/csw/gxx/lib ++QMAKE_INCDIR = /opt/csw/include ++QMAKE_LIBDIR = /opt/csw/lib QMAKE_INCDIR_X11 = /usr/openwin/include QMAKE_LIBDIR_X11 = /usr/openwin/lib QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Sep 18 20:00:25 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 18 Sep 2013 18:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21963] csw/mgar/pkg/jpegoptim/trunk Message-ID: Revision: 21963 http://gar.svn.sourceforge.net/gar/?rev=21963&view=rev Author: bonivart Date: 2013-09-18 18:00:24 +0000 (Wed, 18 Sep 2013) Log Message: ----------- jpegoptim/trunk: update to 1.3.0 Modified Paths: -------------- csw/mgar/pkg/jpegoptim/trunk/Makefile csw/mgar/pkg/jpegoptim/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch Modified: csw/mgar/pkg/jpegoptim/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/Makefile 2013-09-18 14:25:10 UTC (rev 21962) +++ csw/mgar/pkg/jpegoptim/trunk/Makefile 2013-09-18 18:00:24 UTC (rev 21963) @@ -1,5 +1,5 @@ NAME = jpegoptim -VERSION = 1.2.4 +VERSION = 1.3.0 GARTYPE = v2 DESCRIPTION = Utility to optimize jpeg files @@ -10,9 +10,8 @@ MASTER_SITES = http://www.kokkonen.net/tjko/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0001-Remove-Wall-reference.patch +RUNTIME_DEP_PKGS += CSWlibjpeg7 -RUNTIME_DEP_PKGS = CSWjpeg TEST_TARGET = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/jpegoptim/trunk/checksums =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/checksums 2013-09-18 14:25:10 UTC (rev 21962) +++ csw/mgar/pkg/jpegoptim/trunk/checksums 2013-09-18 18:00:24 UTC (rev 21963) @@ -1 +1 @@ -40e8e627181f524ad29717c5b07cd442 jpegoptim-1.2.4.tar.gz +2864f8992adbb23c719a8b7c64f7b054 jpegoptim-1.3.0.tar.gz Deleted: csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch =================================================================== --- csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch 2013-09-18 14:25:10 UTC (rev 21962) +++ csw/mgar/pkg/jpegoptim/trunk/files/0001-Remove-Wall-reference.patch 2013-09-18 18:00:24 UTC (rev 21963) @@ -1,25 +0,0 @@ -From 662e771db49dd61d275acf9a9a696f6e0f46f081 Mon Sep 17 00:00:00 2001 -From: Peter Bonivart -Date: Wed, 20 Apr 2011 14:47:36 +0200 -Subject: [PATCH] Remove-Wall-reference - ---- - Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index da51df6..4668240 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -32,7 +32,7 @@ mandir = $(prefix)/share/man - - CC = @CC@ - XCPPFLAGS = @CPPFLAGS@ --CFLAGS = @CFLAGS@ $(XCPPFLAGS) $(DEFS) -Wall -+CFLAGS = @CFLAGS@ $(XCPPFLAGS) $(DEFS) - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - STRIP = strip --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Sep 19 09:37:53 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 19 Sep 2013 08:37:53 +0100 Subject: [csw-devel] SF.net SVN: gar:[21956] csw/mgar/pkg/samba/branches/samba3/Makefile In-Reply-To: <523992AD.2070802@opencsw.org> References: <52397815.9030403@opencsw.org> <6DF61B86-044B-43FF-B31D-0277613EA136@opencsw.org> <52399215.30603@opencsw.org> <523992AD.2070802@opencsw.org> Message-ID: 2013/9/18 Jan Holzhueter > > Yes we did and I think GARCOMPILER is set before there is a GAROSREL :) I thought that make tracks dependencies between variables. foo = $(bar) bar = something The above example works just fine. But I had a similar problem. In the python category file, I had to set GARCOMPILER below the gar.mk include, otherwise it wouldn't work. https://github.com/opencsw/gar/blob/master/categories/python/category.mk Maciej From cgrzemba at users.sourceforge.net Thu Sep 19 10:01:22 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 19 Sep 2013 08:01:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21964] csw/mgar/pkg/librecad/trunk Message-ID: Revision: 21964 http://gar.svn.sourceforge.net/gar/?rev=21964&view=rev Author: cgrzemba Date: 2013-09-19 08:01:20 +0000 (Thu, 19 Sep 2013) Log Message: ----------- librecad/trunk: update csw customizing for new version Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch Added Paths: ----------- csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2013-09-18 18:00:24 UTC (rev 21963) +++ csw/mgar/pkg/librecad/trunk/Makefile 2013-09-19 08:01:20 UTC (rev 21964) @@ -30,10 +30,11 @@ # prefix = $(BUILD_PREFIX)/gxx PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc -PATCHFILES += 0000-adjust-for-csw-environment.patch +# PATCHFILES += 0000-adjust-for-csw-environment.patch PATCHFILES += 0000-add-csw-settings.patch PATCHFILES += 0001-adjust-rs_system-forcsw.patch PATCHFILES += 0002-set-version-from-git.patch +PATCHFILES += 0003-fix-postprocessing.patch BUILD_DEP_PKGS += CSWqt4-dev BUILD_DEP_PKGS += CSWmuparser-dev Modified: csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch =================================================================== --- csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch 2013-09-18 18:00:24 UTC (rev 21963) +++ csw/mgar/pkg/librecad/trunk/files/0000-add-csw-settings.patch 2013-09-19 08:01:20 UTC (rev 21964) @@ -4,19 +4,18 @@ Subject: [PATCH] add csw settings --- - settings_csw.pro | 15 +++++++++++++++ - 1 Datei ge?ndert, 15 Zeilen hinzugef?gt(+) - create mode 100644 settings_csw.pro + custom.pro | 13 +++++++++++++++ + 1 Datei ge?ndert, 13 Zeilen hinzugef?gt(+) + create mode 100644 custom.pro -diff --git a/settings_csw.pro b/settings_csw.pro +diff --git a/custom.pro b/custom.pro new file mode 100644 index 0000000..9f6b517 --- /dev/null -+++ b/settings_csw.pro -@@ -0,0 +1,15 @@ ++++ b/custom.pro +@@ -0,0 +1,13 @@ + + -+SUBDIRS += ttff2lff +INSTALLDIR = ../../unix + + @@ -24,11 +23,10 @@ +# add csw muparser include dir +# + -+exists("/opt/csw/gxx/include") { -+ INCLUDEPATH += "/opt/csw/include" -+ INCLUDEPATH += "/opt/csw/gxx/include/boost" -+ INCLUDEPATH += "/opt/csw/include/freetype2" -+} ++INCLUDEPATH += "/opt/csw/include" ++INCLUDEPATH += "/opt/csw/include/freetype2" ++BOOST_DIR += "/opt/csw/gxx" ++QMAKE_LFLAGS += -Bdirect -zignore -- 1.7.10.2 Added: csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch =================================================================== --- csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch (rev 0) +++ csw/mgar/pkg/librecad/trunk/files/0003-fix-postprocessing.patch 2013-09-19 08:01:20 UTC (rev 21964) @@ -0,0 +1,20 @@ +--- a/scripts/postprocess-unix.sh ++++ b/scripts/postprocess-unix.sh +@@ -10,7 +10,7 @@ SPTDIR="${LCDIR}/support" + DOCDIR="${SPTDIR}/doc" + LRELEASE="lrelease" + +-[ "$( which lrelease-qt4 )" ] && LRELEASE="lrelease-qt4" ++# [ "$( which lrelease-qt4 )" ] && LRELEASE="lrelease-qt4" + + # Generate Help Files + cd "${DOCDIR}" +@@ -27,7 +27,7 @@ cp "${SPTDIR}"/fonts/*.lff* "${RESOURCEDIR}"/fonts + cp "${SPTDIR}"/doc/*.qch "${RESOURCEDIR}"/doc + cp "${SPTDIR}"/doc/*.qhc "${RESOURCEDIR}"/doc + find "${SPTDIR}"/library -type d | sed 's:^.*support/::' | xargs -IFILES mkdir "${RESOURCEDIR}"/FILES +-find "${SPTDIR}"/library -type f -iname *.dxf | sed 's/^.*support//' | xargs -IFILES cp "${SPTDIR}"/FILES "${RESOURCEDIR}"/FILES ++gfind "${SPTDIR}"/library -type f -iname *.dxf | sed 's/^.*support//' | xargs -IFILES cp "${SPTDIR}"/FILES "${RESOURCEDIR}"/FILES + + # Generate translations + ${LRELEASE} "${LCDIR}"/src/src.pro This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Sep 20 12:39:20 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 20 Sep 2013 10:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21965] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 21965 http://gar.svn.sourceforge.net/gar/?rev=21965&view=rev Author: cgrzemba Date: 2013-09-20 10:39:19 +0000 (Fri, 20 Sep 2013) Log Message: ----------- change package name to lowercase Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2013-09-19 08:01:20 UTC (rev 21964) +++ csw/mgar/pkg/librecad/trunk/Makefile 2013-09-20 10:39:19 UTC (rev 21965) @@ -41,24 +41,24 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWlibfreetype-dev -PACKAGES = CSWlibreCAD -CATALOGNAME_CSWlibreCAD = libreCAD -PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) -PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* -PKGFILES_CSWlibreCAD += $(libdir)/$(call tolower,$(NAME))/.* -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtgui4 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsvg4 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2 -# RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4 -CHECKPKG_OVERRIDES_CSWlibreCAD += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad -CHECKPKG_OVERRIDES_CSWlibreCAD += catalogname-not-lowercase +PACKAGES = CSWlibrecad +CATALOGNAME_CSWlibrecad = librecad +SPKG_DESC_CSWlibrecad = $(DESCRIPTION) +PKGFILES_CSWlibrecad += $(call baseisadirs,$(bindir),.*) +PKGFILES_CSWlibrecad += $(datadir)/$(call tolower,$(NAME))/.* +PKGFILES_CSWlibrecad += $(libdir)/$(call tolower,$(NAME))/.* +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqthelp4 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsvg4 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibmuparser2 +# RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4 +# CHECKPKG_OVERRIDES_CSWlibrecad += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad +OBSOLETED_BY_CSWlibrecad = CSWLibreCAD - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = custom @@ -75,8 +75,8 @@ ginstall -d $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources gcp -rf $(WORKSRC)/unix/resources/* \ $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources - ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibreCAD) - $(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibreCAD);) + ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibrecad) + $(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibrecad);) @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Sep 20 20:55:13 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 20 Sep 2013 18:55:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21966] csw/mgar/pkg/bind/trunk Message-ID: Revision: 21966 http://gar.svn.sourceforge.net/gar/?rev=21966&view=rev Author: bonivart Date: 2013-09-20 18:55:12 +0000 (Fri, 20 Sep 2013) Log Message: ----------- bind/trunk: update to 9.9.4 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2013-09-20 10:39:19 UTC (rev 21965) +++ csw/mgar/pkg/bind/trunk/Makefile 2013-09-20 18:55:12 UTC (rev 21966) @@ -2,27 +2,27 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.9.3 +VERSION = 9.9.4 GARTYPE = v2 # Enable these for Px-releases -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#RELEASE = P2 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -#DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -113,12 +113,12 @@ CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot # Will not split out all these libs -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.7|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.99.0.1|soname=libdns.so.99|pkgname=CSWlibbind|expected=CSWlibdns99 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.0.1|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.3|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.6|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.4|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.90.0.8|soname=libbind9.so.90|pkgname=CSWlibbind|expected=CSWlibbind9-90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.100.1.1|soname=libdns.so.100|pkgname=CSWlibbind|expected=CSWlibdns100 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.95.2.1|soname=libisc.so.95|pkgname=CSWlibbind|expected=CSWlibisc95 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.90.0.4|soname=libisccc.so.90|pkgname=CSWlibbind|expected=CSWlibisccc90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.90.0.7|soname=libisccfg.so.90|pkgname=CSWlibbind|expected=CSWlibisccfg90 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.90.0.5|soname=liblwres.so.90|pkgname=CSWlibbind|expected=CSWliblwres90 # Some new checks, have no idea about their relevance CHECKPKG_OVERRIDES_CSWlibbind += no-direct-binding Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2013-09-20 10:39:19 UTC (rev 21965) +++ csw/mgar/pkg/bind/trunk/checksums 2013-09-20 18:55:12 UTC (rev 21966) @@ -1 +1 @@ -943f6de6bfdfd821aa444242c02c1322 bind-9.9.3-P2.tar.gz +f69757adc86776daed8e5acb0ee7c0ca bind-9.9.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 20 22:11:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 20 Sep 2013 20:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21967] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 21967 http://gar.svn.sourceforge.net/gar/?rev=21967&view=rev Author: dmichelsen Date: 2013-09-20 20:11:36 +0000 (Fri, 20 Sep 2013) Log Message: ----------- xapian-core/trunk: Work towards 1.3.1 Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch Removed Paths: ------------- csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-20 18:55:12 UTC (rev 21966) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-20 20:11:36 UTC (rev 21967) @@ -1,5 +1,5 @@ NAME = xapian-core -VERSION = 1.2.13 +VERSION = 1.3.1 GARTYPE = v2 DESCRIPTION = An open source search engine library @@ -13,13 +13,20 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch +# PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch # Use patch until this is fixed: -# http://trac.xapian.org/ticket/611 -PATCHFILES += quest-fix.patch -PATCHDIRLEVEL = 0 +# http://trac.xapian.org/ticket/626 +PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch +# This is strange and needs further examination +PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch + +# Use patch until this is fixed: +# http://trac.xapian.org/ticket/627 +PATCHFILES += 0003-log-is-ambigous-to-float-and-double.patch + + VENDOR_URL = http://xapian.org/ PACKAGES += CSWxapian @@ -54,3 +61,7 @@ CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html include gar/category.mk + +post-patch: + cd $(WORKSRC) && autoreconf -fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/xapian-core/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-core/trunk/checksums 2013-09-20 18:55:12 UTC (rev 21966) +++ csw/mgar/pkg/xapian-core/trunk/checksums 2013-09-20 20:11:36 UTC (rev 21967) @@ -1 +1 @@ -d6e15fff5ecae1c03171d64c45ef9685 xapian-core-1.2.13.tar.gz +f25d4aff5f6a9a3ded84f8636233721c xapian-core-1.3.1.tar.gz Added: csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch 2013-09-20 20:11:36 UTC (rev 21967) @@ -0,0 +1,26 @@ +From 83506df0b040989eda490611936319f6c9e80cf3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 20 Sep 2013 21:10:21 +0200 +Subject: [PATCH] Check for explicit value or HAVE_UUID_UNPARSE_LOWER will + always be set + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e12b6a0..6542546 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -721,7 +721,7 @@ case $enable_backend_chert$enable_backend_brass in + dnl Older versions of libuuid (such as that on CentOS 4.7) don't have + dnl uuid_unparse_lower(), only uuid_unparse(). + AC_LINK_IFELSE([AC_LANG_CALL([], [uuid_unparse_lower])], [found=true], [found=false]) +- if $found ; then ++ if test $found = "true"; then + AC_DEFINE([HAVE_UUID_UNPARSE_LOWER], [1], + [Define to 1 if you have the 'uuid_unparse_lower' function.]) + fi +-- +1.8.3.4 + Added: csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch 2013-09-20 20:11:36 UTC (rev 21967) @@ -0,0 +1,24 @@ +From fb227745970abc9da3e03d31e9fabeb8a2210783 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 20 Sep 2013 21:46:53 +0200 +Subject: [PATCH] Somehow round is missing in cmath + +--- + geospatial/geoencode.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/geospatial/geoencode.cc b/geospatial/geoencode.cc +index 4eaabb9..339b736 100644 +--- a/geospatial/geoencode.cc ++++ b/geospatial/geoencode.cc +@@ -27,6 +27,7 @@ + #include "geoencode.h" + + #include ++#include + + using namespace std; + +-- +1.8.3.4 + Added: csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch 2013-09-20 20:11:36 UTC (rev 21967) @@ -0,0 +1,25 @@ +From bdf4d8e5b1d788ab2ebc4f736ea0c2d837a8dfd0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 20 Sep 2013 21:47:43 +0200 +Subject: [PATCH] log() is ambigous to float and double + +--- + weight/tfidfweight.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/weight/tfidfweight.cc b/weight/tfidfweight.cc +index e02ed88..355d438 100644 +--- a/weight/tfidfweight.cc ++++ b/weight/tfidfweight.cc +@@ -123,7 +123,7 @@ TfIdfWeight::get_wdfn(Xapian::termcount wdf, char c) const + return (wdf * wdf); + case 'l': + if (wdf == 0) return 0; +- return (1 + log(wdf)); ++ return (1 + log((double)wdf)); + default: + return wdf; + } +-- +1.8.3.4 + Deleted: csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch 2013-09-20 18:55:12 UTC (rev 21966) +++ csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch 2013-09-20 20:11:36 UTC (rev 21967) @@ -1,31 +0,0 @@ -Index: examples/quest.cc -=================================================================== ---- examples/quest.cc (revision 17016) -+++ examples/quest.cc (working copy) -@@ -69,14 +69,6 @@ - return strcmp(f1.s, f2.s) < 0; - } - --inline bool operator<(const qp_flag & f, const char * s) { -- return strcmp(f.s, s) < 0; --} -- --inline bool operator<(const char * s, const qp_flag & f) { -- return strcmp(s, f.s) < 0; --} -- - static void show_usage() { - cout << "Usage: "PROG_NAME" [OPTIONS] 'QUERY'\n" - "NB: QUERY should be quoted to protect it from the shell.\n\n" -@@ -110,8 +102,10 @@ - } - - static unsigned --decode_qp_flag(const char * f) -+decode_qp_flag(const char * s) - { -+ qp_flag f; -+ f.s = s; - const qp_flag * p = lower_bound(flag_tab, flag_tab + n_flag_tab, f); - if (p == flag_tab + n_flag_tab || f < *p) - return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Sep 21 11:19:40 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 21 Sep 2013 09:19:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21968] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 21968 http://gar.svn.sourceforge.net/gar/?rev=21968&view=rev Author: wahwah Date: 2013-09-21 09:19:40 +0000 (Sat, 21 Sep 2013) Log Message: ----------- pkgdb-web: Throw a 404 on nonexisting catalog In the timing endpoint. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-20 20:11:36 UTC (rev 21967) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-09-21 09:19:40 UTC (rev 21968) @@ -662,8 +662,11 @@ catalogname version_string pkgname basename md5_sum size deps category i_deps """ - sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( - osrel_name, arch_name, catrel_name) + try: + sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad( + osrel_name, arch_name, catrel_name) + except sqlobject.main.SQLObjectNotFound: + raise web.notfound() rows = list(models.GetCatalogGenerationResult(sqo_osrel, sqo_arch, sqo_catrel)) def PrepareForJson(row): # The size (5th row) is returned as a large integer, which cannot be represented This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 14:19:10 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 12:19:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21969] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 21969 http://gar.svn.sourceforge.net/gar/?rev=21969&view=rev Author: chninkel Date: 2013-09-21 12:19:10 +0000 (Sat, 21 Sep 2013) Log Message: ----------- openssh/trunk: updated to 6.3p1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-09-21 09:19:40 UTC (rev 21968) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-09-21 12:19:10 UTC (rev 21969) @@ -12,7 +12,7 @@ ###### Package information ####### NAME = openssh -VERSION = 6.2p2 +VERSION = 6.3p1 GSSKEX_PATCH_VERSION = 6.2p1 GSSKEX_PATCH_DATE = 20130502 GARTYPE = v2 Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2013-09-21 09:19:40 UTC (rev 21968) +++ csw/mgar/pkg/openssh/trunk/checksums 2013-09-21 12:19:10 UTC (rev 21969) @@ -1 +1 @@ -be46174dcbb77ebb4ea88ef140685de1 openssh-6.2p2.tar.gz +225e75c9856f76011966013163784038 openssh-6.3p1.tar.gz Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2013-09-21 09:19:40 UTC (rev 21968) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2013-09-21 12:19:10 UTC (rev 21969) @@ -1,7 +1,13 @@ -openssh (6.2p1,REV=2013.05.02) unstable +openssh (6.3p1,REV=2013.09.20) unstable * New upstream release. + -- Yann Rouillard Fri, 20 Sep 2013 21:20:54 +0200 + +openssh (6.2p2,REV=2013.05.02) unstable + + * New upstream release. + -- Yann Rouillard Thu, 02 May 2013 19:48:33 +0200 openssh (6.1p1,REV=2013.01.08) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 14:19:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 12:19:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21970] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 21970 http://gar.svn.sourceforge.net/gar/?rev=21970&view=rev Author: chninkel Date: 2013-09-21 12:19:47 +0000 (Sat, 21 Sep 2013) Log Message: ----------- openssh/trunk: updated GSS Kex patch for openssh 6.3p1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-09-21 12:19:10 UTC (rev 21969) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-09-21 12:19:47 UTC (rev 21970) @@ -13,8 +13,8 @@ NAME = openssh VERSION = 6.3p1 -GSSKEX_PATCH_VERSION = 6.2p1 -GSSKEX_PATCH_DATE = 20130502 +GSSKEX_PATCH_VERSION = 6.3p1 +GSSKEX_PATCH_DATE = 20130920 GARTYPE = v2 DESCRIPTION = OpenSSH Secure Shell Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch 2013-09-21 12:19:10 UTC (rev 21969) +++ csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch 2013-09-21 12:19:47 UTC (rev 21970) @@ -1,2953 +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 \ - 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); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -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++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -197,7 +352,7 @@ - } - - ctx->major = gss_init_sec_context(&ctx->minor, -- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, -+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, - GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, - 0, NULL, recv_tok, NULL, send_tok, flags, NULL); - -@@ -227,8 +382,42 @@ - } - - OM_uint32 -+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) -+{ -+ gss_buffer_desc gssbuf; -+ gss_name_t gssname; -+ OM_uint32 status; -+ gss_OID_set oidset; -+ -+ gssbuf.value = (void *) name; -+ gssbuf.length = strlen(gssbuf.value); -+ -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ ctx->major = gss_import_name(&ctx->minor, &gssbuf, -+ GSS_C_NT_USER_NAME, &gssname); -+ -+ if (!ctx->major) -+ ctx->major = gss_acquire_cred(&ctx->minor, -+ gssname, 0, oidset, GSS_C_INITIATE, -+ &ctx->client_creds, NULL, NULL); -+ -+ gss_release_name(&status, &gssname); -+ gss_release_oid_set(&status, &oidset); -+ -+ if (ctx->major) -+ ssh_gssapi_error(ctx); -+ -+ return(ctx->major); -+} -+ -+OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +425,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -249,11 +451,16 @@ - } - - int --ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) -+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, -+ const char *client) - { - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -263,6 +470,10 @@ - ssh_gssapi_build_ctx(ctx); - ssh_gssapi_set_oid(*ctx, oid); - major = ssh_gssapi_import_name(*ctx, host); -+ -+ if (!GSS_ERROR(major) && client) -+ major = ssh_gssapi_client_identity(*ctx, client); -+ - if (!GSS_ERROR(major)) { - major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, - NULL); -@@ -272,10 +483,67 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); - } - -+int -+ssh_gssapi_credentials_updated(Gssctxt *ctxt) { -+ static gss_name_t saved_name = GSS_C_NO_NAME; -+ static OM_uint32 saved_lifetime = 0; -+ static gss_OID saved_mech = GSS_C_NO_OID; -+ static gss_name_t name; -+ static OM_uint32 last_call = 0; -+ OM_uint32 lifetime, now, major, minor; -+ int equal; -+ gss_cred_usage_t usage = GSS_C_INITIATE; -+ -+ now = time(NULL); -+ -+ if (ctxt) { -+ debug("Rekey has happened - updating saved versions"); -+ -+ if (saved_name != GSS_C_NO_NAME) -+ gss_release_name(&minor, &saved_name); -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &saved_name, &saved_lifetime, NULL, NULL); -+ -+ if (!GSS_ERROR(major)) { -+ saved_mech = ctxt->oid; -+ saved_lifetime+= now; -+ } else { -+ /* Handle the error */ -+ } -+ return 0; -+ } -+ -+ if (now - last_call < 10) -+ return 0; -+ -+ last_call = now; -+ -+ if (saved_mech == GSS_C_NO_OID) -+ return 0; -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &name, &lifetime, NULL, NULL); -+ if (major == GSS_S_CREDENTIALS_EXPIRED) -+ return 0; -+ else if (GSS_ERROR(major)) -+ return 0; -+ -+ major = gss_compare_name(&minor, saved_name, name, &equal); -+ gss_release_name(&minor, &name); -+ if (GSS_ERROR(major)) -+ return 0; -+ -+ if (equal && (saved_lifetime < lifetime + now - 10)) -+ return 1; -+ -+ return 0; -+} -+ - #endif /* GSSAPI */ -diff --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 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -184,6 +190,71 @@ - return; - } - -+int -+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, -+ ssh_gssapi_client *client) -+{ -+ krb5_ccache ccache = NULL; -+ krb5_principal principal = NULL; -+ char *name = NULL; -+ krb5_error_code problem; -+ OM_uint32 maj_status, min_status; -+ -+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { -+ logit("krb5_cc_resolve(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ return 0; -+ } -+ -+ /* Find out who the principal in this cache is */ -+ if ((problem = krb5_cc_get_principal(krb_context, ccache, -+ &principal))) { -+ logit("krb5_cc_get_principal(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { -+ logit("krb5_unparse_name(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ -+ if (strcmp(name,client->exportedname.value)!=0) { -+ debug("Name in local credentials cache differs. Not storing"); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ krb5_free_unparsed_name(krb_context, name); -+ return 0; -+ } -+ krb5_free_unparsed_name(krb_context, name); -+ -+ /* Name matches, so lets get on with it! */ -+ -+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { -+ logit("krb5_cc_initialize(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ krb5_free_principal(krb_context, principal); -+ -+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, -+ ccache))) { -+ logit("gss_krb5_copy_ccache() failed. Sorry!"); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ return 1; -+} -+ - ssh_gssapi_mech gssapi_kerberos_mech = { - "toWM5Slw5Ew8Mqkay+al2g==", - "Kerberos", -@@ -191,7 +262,8 @@ - NULL, - &ssh_gssapi_krb5_userok, - NULL, -- &ssh_gssapi_krb5_storecreds -+ &ssh_gssapi_krb5_storecreds, -+ &ssh_gssapi_krb5_updatecreds - }; - - #endif /* KRB5 */ -diff --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}}; -+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL}, 0, 0}; - - ssh_gssapi_mech gssapi_null_mech = -- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; -+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; - - #ifdef KRB5 - extern ssh_gssapi_mech gssapi_kerberos_mech; -@@ -81,25 +86,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } -+ -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +126,29 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL, NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, -+ const char *dummy) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -123,7 +158,9 @@ - gss_OID_set supported; - - gss_create_empty_oid_set(&min_status, oidset); -- gss_indicate_mechs(&min_status, &supported); -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported))) -+ return; - - while (supported_mechs[i]->name != NULL) { - if (GSS_ERROR(gss_test_oid_set_member(&min_status, -@@ -247,8 +284,48 @@ - ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) - { - int i = 0; -+ int equal = 0; -+ gss_name_t new_name = GSS_C_NO_NAME; -+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER; - -- 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 -@@ -358,6 +362,20 @@ - k->kex_type = KEX_ECDH_SHA2; - k->evp_md = kex_ecdh_name_to_evpmd(k->name); - #endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); -+#endif - } else - fatal("bad kex alg %s", k->name); - } -diff --speed-large-files --minimal -Nru openssh-5.8p1/kex.h openssh-5.8p1.new/kex.h ---- openssh-5.8p1/kex.h 2010-09-24 14:11:14.000000000 +0200 -+++ openssh-5.8p1.new/kex.h 2011-02-12 18:07:11.161650596 +0100 -@@ -73,6 +73,9 @@ - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, - KEX_ECDH_SHA2, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -129,6 +132,12 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+ char *gss_client; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -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) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_client: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexdh_client: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (kex->gss_deleg_creds) -+ ssh_gssapi_credentials_updated(ctxt); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff --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())) -+ xfree(mechs); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_server: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexgss_server: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_clear_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+ -+ /* If this was a rekey, then save out any delegated credentials we -+ * just exchanged. */ -+ if (options.gss_store_rekey) -+ ssh_gssapi_rekey_creds(); -+} -+#endif /* GSSAPI */ -diff --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 -@@ -971,6 +971,8 @@ - } - break; - #endif /* OPENSSL_HAS_ECC */ -+ case KEY_NULL: -+ return "null"; - } - return "ssh-unknown"; - } -@@ -1276,6 +1278,8 @@ - strcmp(name, "ecdsa-sha2-nistp521-cert-v01 at openssh.com") == 0) { - return KEY_ECDSA_CERT; - #endif -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; - } - - debug2("key_type_from_name: unknown key type '%s'", name); -diff --speed-large-files --minimal -Nru openssh-5.8p1/key.h openssh-5.8p1.new/key.h ---- openssh-5.8p1/key.h 2010-11-05 00:19:49.000000000 +0100 -+++ openssh-5.8p1.new/key.h 2011-02-12 18:07:11.216270794 +0100 -@@ -44,6 +44,7 @@ - KEY_ECDSA_CERT, - KEY_RSA_CERT_V00, - KEY_DSA_CERT_V00, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor.c openssh-5.8p1.new/monitor.c ---- openssh-5.8p1/monitor.c 2010-09-10 03:23:34.000000000 +0200 -+++ openssh-5.8p1.new/monitor.c 2011-02-12 18:07:11.241713537 +0100 -@@ -172,6 +172,8 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); -+int mm_answer_gss_updatecreds(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -241,6 +243,7 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - #ifdef JPAKE - {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, -@@ -253,6 +256,12 @@ - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -357,6 +366,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -443,6 +456,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1692,6 +1709,13 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; - kex->kex[KEX_ECDH_SHA2] = kexecdh_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1898,6 +1922,9 @@ - OM_uint32 major; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - goid.elements = buffer_get_string(m, &len); - goid.length = len; - -@@ -1925,6 +1952,9 @@ - OM_uint32 flags = 0; /* GSI needs this */ - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - in.value = buffer_get_string(m, &len); - in.length = len; - major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); -@@ -1942,6 +1972,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1953,6 +1984,9 @@ - OM_uint32 ret; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - gssbuf.value = buffer_get_string(m, &len); - gssbuf.length = len; - mic.value = buffer_get_string(m, &len); -@@ -1979,7 +2013,11 @@ - { - int authenticated; - -- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ authenticated = authctxt->valid && -+ ssh_gssapi_userok(authctxt->user, authctxt->pw); - - buffer_clear(m); - buffer_put_int(m, authenticated); -@@ -1992,6 +2030,74 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, -+ (int) data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ /* And credential updating, for when rekeying */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1); -+ -+ return (0); -+} -+ -+int -+mm_answer_gss_updatecreds(int socket, Buffer *m) { -+ ssh_gssapi_ccache store; -+ int ok; -+ -+ store.filename = buffer_get_string(m, NULL); -+ store.envvar = buffer_get_string(m, NULL); -+ store.envval = buffer_get_string(m, NULL); -+ -+ ok = ssh_gssapi_update_creds(&store); -+ -+ xfree(store.filename); -+ xfree(store.envvar); -+ xfree(store.envval); -+ -+ buffer_clear(m); -+ buffer_put_int(m, ok); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m); -+ -+ return(0); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor.h openssh-5.8p1.new/monitor.h ---- openssh-5.8p1/monitor.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.8p1.new/monitor.h 2011-02-12 18:07:11.311728071 +0100 -@@ -53,6 +53,9 @@ - MONITOR_REQ_JPAKE_STEP2 = 56, MONITOR_ANS_JPAKE_STEP2 = 57, - MONITOR_REQ_JPAKE_KEY_CONFIRM = 58, MONITOR_ANS_JPAKE_KEY_CONFIRM = 59, - MONITOR_REQ_JPAKE_CHECK_CONFIRM = 60, MONITOR_ANS_JPAKE_CHECK_CONFIRM = 61, -+ -+ MONITOR_REQ_GSSSIGN = 62, MONITOR_ANS_GSSSIGN = 63, -+ MONITOR_REQ_GSSUPCREDS = 64, MONITOR_ANS_GSSUPCREDS = 65, - - MONITOR_REQ_PAM_START = 100, - MONITOR_REQ_PAM_ACCOUNT = 102, MONITOR_ANS_PAM_ACCOUNT = 103, - MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105, -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor_wrap.c openssh-5.8p1.new/monitor_wrap.c ---- openssh-5.8p1/monitor_wrap.c 2010-08-31 14:41:14.000000000 +0200 -+++ openssh-5.8p1.new/monitor_wrap.c 2011-02-12 18:07:11.359631731 +0100 -@@ -1232,7 +1232,7 @@ - } - - int --mm_ssh_gssapi_userok(char *user) -+mm_ssh_gssapi_userok(char *user, struct passwd *pw) - { - Buffer m; - int authenticated = 0; -@@ -1249,6 +1249,51 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ -+int -+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store) -+{ -+ Buffer m; -+ int ok; -+ -+ buffer_init(&m); -+ -+ buffer_put_cstring(&m, store->filename ? store->filename : ""); -+ buffer_put_cstring(&m, store->envvar ? store->envvar : ""); -+ buffer_put_cstring(&m, store->envval ? store->envval : ""); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m); -+ -+ ok = buffer_get_int(&m); -+ -+ buffer_free(&m); -+ -+ return (ok); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff --speed-large-files --minimal -Nru openssh-5.8p1/monitor_wrap.h openssh-5.8p1.new/monitor_wrap.h ---- openssh-5.8p1/monitor_wrap.h 2009-03-05 14:58:22.000000000 +0100 -+++ openssh-5.8p1.new/monitor_wrap.h 2011-02-12 18:07:11.407619296 +0100 -@@ -57,8 +57,10 @@ - OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); --int mm_ssh_gssapi_userok(char *user); -+int mm_ssh_gssapi_userok(char *user, struct passwd *); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); -+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); - #endif - - #ifdef USE_PAM -diff --speed-large-files --minimal -Nru openssh-5.8p1/readconf.c openssh-5.8p1.new/readconf.c ---- openssh-5.8p1/readconf.c 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/readconf.c 2011-02-12 18:07:11.460306621 +0100 -@@ -129,6 +129,8 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, -+ oGssServerIdentity, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, -@@ -169,10 +171,19 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, -+ { "gssapiclientidentity", oGssClientIdentity }, -+ { "gssapiserveridentity", oGssServerIdentity }, -+ { "gssapirenewalforcesrekey", oGssRenewalRekey }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, -+ { "gssapiclientidentity", oUnsupported }, -+ { "gssapirenewalforcesrekey", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -479,10 +490,30 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ -+ case oGssClientIdentity: -+ charptr = &options->gss_client_identity; -+ goto parse_string; -+ -+ case oGssServerIdentity: -+ charptr = &options->gss_server_identity; -+ goto parse_string; -+ -+ case oGssRenewalRekey: -+ intptr = &options->gss_renewal_rekey; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1092,7 +1123,12 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; -+ options->gss_renewal_rekey = -1; -+ options->gss_client_identity = NULL; -+ options->gss_server_identity = NULL; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1193,8 +1229,14 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; -+ if (options->gss_renewal_rekey == -1) -+ options->gss_renewal_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff --speed-large-files --minimal -Nru openssh-5.8p1/readconf.h openssh-5.8p1.new/readconf.h ---- openssh-5.8p1/readconf.h 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/readconf.h 2011-02-12 18:07:11.507187275 +0100 -@@ -46,7 +46,12 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ -+ int gss_renewal_rekey; /* Credential renewal forces rekey */ -+ char *gss_client_identity; /* Principal to initiate GSSAPI with */ -+ char *gss_server_identity; /* GSSAPI target principal */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/servconf.c openssh-5.8p1.new/servconf.c ---- openssh-5.8p1/servconf.c 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/servconf.c 2011-02-12 18:07:11.533252334 +0100 -@@ -97,7 +97,10 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; -+ options->gss_store_rekey = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -226,8 +229,14 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; -+ if (options->gss_store_rekey == -1) -+ options->gss_store_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -322,7 +331,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, sGssStoreRekey, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, sHostCertificate, -@@ -386,10 +397,20 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, - #endif -+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL }, - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, - { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, -@@ -944,10 +965,22 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ -+ case sGssStoreRekey: -+ intptr = &options->gss_store_rekey; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; -@@ -1704,7 +1737,10 @@ - #endif - #ifdef GSSAPI - dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); -+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); - dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); -+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); -+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey); - #endif - #ifdef JPAKE - dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, -diff --speed-large-files --minimal -Nru openssh-5.8p1/servconf.h openssh-5.8p1.new/servconf.h ---- openssh-5.8p1/servconf.h 2010-11-20 05:19:38.000000000 +0100 -+++ openssh-5.8p1.new/servconf.h 2011-02-12 18:07:11.548572408 +0100 -@@ -97,7 +97,10 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ -+ int gss_store_rekey; - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh-gss.h openssh-5.8p1.new/ssh-gss.h ---- openssh-5.8p1/ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ openssh-5.8p1.new/ssh-gss.h 2011-02-12 18:07:11.567306608 +0100 -@@ -1,6 +1,6 @@ - /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */ - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -60,10 +60,22 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; - char *envval; -+ struct passwd *owner; - void *data; - } ssh_gssapi_ccache; - -@@ -71,8 +83,11 @@ - gss_buffer_desc displayname; - gss_buffer_desc exportedname; - gss_cred_id_t creds; -+ gss_name_t name; - struct ssh_gssapi_mech_struct *mech; - ssh_gssapi_ccache store; -+ int used; -+ int updated; - } ssh_gssapi_client; - - typedef struct ssh_gssapi_mech_struct { -@@ -83,6 +98,7 @@ - int (*userok) (ssh_gssapi_client *, char *); - int (*localname) (ssh_gssapi_client *, char **); - void (*storecreds) (ssh_gssapi_client *); -+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *); - } ssh_gssapi_mech; - - typedef struct { -@@ -93,10 +109,11 @@ - gss_OID oid; /* client */ - gss_cred_id_t creds; /* server */ - gss_name_t client; /* server */ -- gss_cred_id_t client_creds; /* server */ -+ gss_cred_id_t client_creds; /* both */ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -116,16 +133,30 @@ - void ssh_gssapi_delete_ctx(Gssctxt **); - OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); --int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); -+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *); -+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); -+int ssh_gssapi_credentials_updated(Gssctxt *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, -+ const char *); -+char *ssh_gssapi_client_mechanisms(const char *, const char *); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, -+ const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, -+ const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); --int ssh_gssapi_userok(char *name); -+int ssh_gssapi_userok(char *name, struct passwd *); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_do_child(char ***, u_int *); - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); -+ -+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh_config openssh-5.8p1.new/ssh_config ---- openssh-5.8p1/ssh_config 2010-01-12 09:40:27.000000000 +0100 -+++ openssh-5.8p1.new/ssh_config 2011-02-12 18:07:11.580240516 +0100 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -diff --speed-large-files --minimal -Nru openssh-5.8p1/ssh_config.5 openssh-5.8p1.new/ssh_config.5 ---- openssh-5.8p1/ssh_config.5 2010-12-26 04:26:48.000000000 +0100 -+++ openssh-5.8p1.new/ssh_config.5 2011-02-12 18:07:11.600266821 +0100 -@@ -508,11 +508,43 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIClientIdentity -+If set, specifies the GSSAPI client identity that ssh should use when -+connecting to the server. The default is unset, which means that the default -+identity will be used. -+.It Cm GSSAPIServerIdentity -+If set, specifies the GSSAPI server identity that ssh should expect when -+connecting to the server. The default is unset, which means that the -+expected GSSAPI server identity will be determined from the target -+hostname. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . --Note that this option applies to protocol version 2 only. -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPIRenewalForcesRekey -+If set to -+.Dq yes -+then renewal of the client's GSSAPI credentials will force the rekeying of the -+ssh connection. With a compatible server, this can delegate the renewed -+credentials to a session on the server. -+The default is -+.Dq no . -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshconnect2.c openssh-5.8p1.new/sshconnect2.c ---- openssh-5.8p1/sshconnect2.c 2010-12-01 02:21:51.000000000 +0100 -+++ openssh-5.8p1.new/sshconnect2.c 2011-02-12 18:07:11.623078773 +0100 -@@ -159,9 +159,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -196,6 +221,17 @@ - if (options.kex_algorithms != NULL) - myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ xfree(gss); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -206,10 +242,30 @@ - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; - kex->kex[KEX_ECDH_SHA2] = kexecdh_client; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+ } -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_client = options.gss_client_identity; -+ if (options.gss_server_identity) { -+ kex->gss_host = options.gss_server_identity; -+ } else { -+ kex->gss_host = gss_host; -+ } -+ } -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -304,6 +360,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -319,6 +376,11 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ NULL, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, -@@ -625,19 +687,31 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ const char *gss_host; -+ -+ if (options.gss_server_identity) -+ gss_host = options.gss_server_identity; -+ else if (options.gss_trust_dns) -+ gss_host = get_canonical_hostname(1); -+ else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ - - if (gss_supported == NULL) -- gss_indicate_mechs(&min, &gss_supported); -+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) { -+ gss_supported = NULL; -+ return 0; -+ } - - /* Check to see if the mechanism is usable before we offer it */ - while (mech < gss_supported->count && !ok) { - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host, -+ options.gss_client_identity)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -734,8 +808,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -845,6 +919,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -diff --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; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshd_config openssh-5.8p1.new/sshd_config ---- openssh-5.8p1/sshd_config 2010-09-10 03:20:12.000000000 +0200 -+++ openssh-5.8p1.new/sshd_config 2011-02-12 18:07:11.668077725 +0100 -@@ -72,6 +72,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -diff --speed-large-files --minimal -Nru openssh-5.8p1/sshd_config.5 openssh-5.8p1.new/sshd_config.5 ---- openssh-5.8p1/sshd_config.5 2010-12-26 04:26:48.000000000 +0100 -+++ openssh-5.8p1.new/sshd_config.5 2011-02-12 18:07:11.685676774 +0100 -@@ -423,12 +423,40 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. -+.It Cm GSSAPIStoreCredentialsOnRekey -+Controls whether the user's GSSAPI credentials should be updated following a -+successful connection rekeying. This option can be used to accepted renewed -+or updated credentials from a compatible client. The default is -+.Dq no . - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed Copied: csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch (from rev 21969, csw/mgar/pkg/openssh/trunk/files/openssh-6.2p1-gsskex-all-20130502.patch) =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/openssh-6.3p1-gsskex-all-20130920.patch 2013-09-21 12:19:47 UTC (rev 21970) @@ -0,0 +1,2934 @@ +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 \ + 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); ++ @@ 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 Sat Sep 21 15:59:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 13:59:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21971] csw/mgar/pkg/lang-python/pyopenssl/trunk Message-ID: Revision: 21971 http://gar.svn.sourceforge.net/gar/?rev=21971&view=rev Author: chninkel Date: 2013-09-21 13:59:52 +0000 (Sat, 21 Sep 2013) Log Message: ----------- pyopenssl/trunk: updated to 0.13.1 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-09-21 12:19:47 UTC (rev 21970) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-09-21 13:59:52 UTC (rev 21971) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pyOpenSSL -VERSION = 0.13 +VERSION = 0.13.1 GARTYPE = v2 CATEGORIES = python Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2013-09-21 12:19:47 UTC (rev 21970) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/checksums 2013-09-21 13:59:52 UTC (rev 21971) @@ -1 +1 @@ -767bca18a71178ca353dff9e10941929 pyOpenSSL-0.13.tar.gz +e27a3b76734c39ea03952ca94cc56715 pyOpenSSL-0.13.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 Sat Sep 21 16:00:23 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 14:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21972] csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile Message-ID: Revision: 21972 http://gar.svn.sourceforge.net/gar/?rev=21972&view=rev Author: chninkel Date: 2013-09-21 14:00:22 +0000 (Sat, 21 Sep 2013) Log Message: ----------- pyopenssl/trunk: added dependency on python 2.7 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-09-21 13:59:52 UTC (rev 21971) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-09-21 14:00:22 UTC (rev 21972) @@ -15,9 +15,14 @@ MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz +BUILD_DEP_PKGS_CSWpy-openssl += CSWpython_dev +BUILD_DEP_PKGS_CSWpy-openssl += CSWpython27_dev + PACKAGES = CSWpy-openssl +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-6-1-0 TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 16:00:56 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 14:00:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21973] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 21973 http://gar.svn.sourceforge.net/gar/?rev=21973&view=rev Author: chninkel Date: 2013-09-21 14:00:56 +0000 (Sat, 21 Sep 2013) Log Message: ----------- sasl/trunk: updated to 2.1.26 Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sasl/trunk/checksums csw/mgar/pkg/sasl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 14:00:22 UTC (rev 21972) +++ csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 14:00:56 UTC (rev 21973) @@ -1,5 +1,5 @@ NAME = sasl -VERSION = 2.1.25 +VERSION = 2.1.26 FILEVERSION = $(VERSION) GARTYPE = v2 @@ -12,7 +12,7 @@ layer is inserted between the protocol and the connection. endef -MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ +MASTER_SITES = ftp://ftp.cyrusimap.org/cyrus-sasl/ DISTNAME = cyrus-$(NAME)-$(VERSION) DISTFILES = cyrus-$(NAME)-$(FILEVERSION).tar.gz # This file will be renamed to cswsaslauthd during install Modified: csw/mgar/pkg/sasl/trunk/checksums =================================================================== --- csw/mgar/pkg/sasl/trunk/checksums 2013-09-21 14:00:22 UTC (rev 21972) +++ csw/mgar/pkg/sasl/trunk/checksums 2013-09-21 14:00:56 UTC (rev 21973) @@ -1 +1 @@ -341cffe829a4d71f2a6503d669d5a946 cyrus-sasl-2.1.25.tar.gz +a7f4e5e559a0e37b3ffc438c9456e425 cyrus-sasl-2.1.26.tar.gz Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-09-21 14:00:22 UTC (rev 21972) +++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-09-21 14:00:56 UTC (rev 21973) @@ -1,3 +1,9 @@ +sasl (2.1.26,REV=2013.09.21) + + * New upstream version. + + -- Yann Rouillard Sat, 21 Sep 2013 14:24:32 +0200 + sasl (2.1.25,REV=2013.07.09) * Updated README.CSW for sasl package to add information about This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 16:01:28 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 14:01:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[21974] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 21974 http://gar.svn.sourceforge.net/gar/?rev=21974&view=rev Author: chninkel Date: 2013-09-21 14:01:28 +0000 (Sat, 21 Sep 2013) Log Message: ----------- sasl/trunk: removed check-realloc.patch which has been applied upstream Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sasl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 14:00:56 UTC (rev 21973) +++ csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 14:01:28 UTC (rev 21974) @@ -36,9 +36,6 @@ # patch libtool discards -R options passed with LDFLAGS PATCHFILES += ltmain.diff -# Use patch until it is fixed upstream: -# http://www.spinics.net/lists/cyrus-sasl/msg02004.html -PATCHFILES += check-realloc.patch VENDOR_URL = http://asg.web.cmu.edu/sasl/ Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-09-21 14:00:56 UTC (rev 21973) +++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-09-21 14:01:28 UTC (rev 21974) @@ -1,6 +1,7 @@ sasl (2.1.26,REV=2013.09.21) * New upstream version. + * Removed patch check-realloc.patch that has been applied upstream. -- Yann Rouillard Sat, 21 Sep 2013 14:24:32 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 16:02:30 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 14:02:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21975] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 21975 http://gar.svn.sourceforge.net/gar/?rev=21975&view=rev Author: chninkel Date: 2013-09-21 14:02:30 +0000 (Sat, 21 Sep 2013) Log Message: ----------- sasl/trunk: added a patch to workaround gethostname redefinition in sasl source Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sasl/trunk/files/0003-remove-gethostname-re-definition-on-sun.patch Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 14:01:28 UTC (rev 21974) +++ csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 14:02:30 UTC (rev 21975) @@ -36,6 +36,9 @@ # patch libtool discards -R options passed with LDFLAGS PATCHFILES += ltmain.diff +# sasl thinks it must define gethostname on Solaris but +# it's not the case +PATCHFILES += 0003-remove-gethostname-re-definition-on-sun.patch VENDOR_URL = http://asg.web.cmu.edu/sasl/ Added: csw/mgar/pkg/sasl/trunk/files/0003-remove-gethostname-re-definition-on-sun.patch =================================================================== --- csw/mgar/pkg/sasl/trunk/files/0003-remove-gethostname-re-definition-on-sun.patch (rev 0) +++ csw/mgar/pkg/sasl/trunk/files/0003-remove-gethostname-re-definition-on-sun.patch 2013-09-21 14:02:30 UTC (rev 21975) @@ -0,0 +1,28 @@ +From 48ff17f70e0c9caf46eec2623de5532c60e5a847 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Sat, 21 Sep 2013 16:46:07 +0200 +Subject: [PATCH] remove gethostname re-definition on sun + +--- + lib/saslutil.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/lib/saslutil.c b/lib/saslutil.c +index 6174124..00c76b4 100644 +--- a/lib/saslutil.c ++++ b/lib/saslutil.c +@@ -80,11 +80,6 @@ + * sasl_erasebuffer + */ + +-#ifdef sun +-/* gotta define gethostname ourselves on suns */ +-extern int gethostname(char *, int); +-#endif +- + char *encode_table; + char *decode_table; + +-- +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 Sat Sep 21 17:16:36 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 15:16:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21976] csw/mgar/pkg/sasl/branches/libsasl2-2/ Message-ID: Revision: 21976 http://gar.svn.sourceforge.net/gar/?rev=21976&view=rev Author: chninkel Date: 2013-09-21 15:16:36 +0000 (Sat, 21 Sep 2013) Log Message: ----------- sasl/branches/libsasl2-2: created a branch for the libsasl.2.so.2 soname Added Paths: ----------- csw/mgar/pkg/sasl/branches/libsasl2-2/ Property changes on: csw/mgar/pkg/sasl/branches/libsasl2-2 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:mergeinfo + /csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2:6997-15913 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 17:36:36 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 15:36:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21977] csw/mgar/pkg/sasl/trunk Message-ID: Revision: 21977 http://gar.svn.sourceforge.net/gar/?rev=21977&view=rev Author: chninkel Date: 2013-09-21 15:36:36 +0000 (Sat, 21 Sep 2013) Log Message: ----------- sasl/trunk: update package name as the soname has been bumped by upstream Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sasl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 15:16:36 UTC (rev 21976) +++ csw/mgar/pkg/sasl/trunk/Makefile 2013-09-21 15:36:36 UTC (rev 21977) @@ -46,8 +46,13 @@ SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48 -RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-3 +CHECKPKG_OVERRIDES_CSWsasl += surplus-dependency|CSWlibsasl2-3 +# The sasl package contains the sasl modules which are .so files +# This is normal even if it's not a developement package +CHECKPKG_OVERRIDES_CSWsasl += shared-lib-package-contains-so-symlink + PACKAGES += CSWsaslauthd SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon RUNTIME_DEP_PKGS_CSWsaslauthd += CSWsasl @@ -91,20 +96,22 @@ CHECKPKG_OVERRIDES_CSWsaslsql += catalogname-does-not-match-pkgname|pkgname=CSWsaslsql|catalogname=sasl_sql|expected-catalogname=saslsql PKGFILES_CSWsaslsql = $(call pkgfiles_lib,sasl2/libsql.so) -PACKAGES += CSWlibsasl2-2 -SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2 -PKGFILES_CSWlibsasl2-2 += $(call pkgfiles_lib,libsasl2.so.2) +PACKAGES += CSWlibsasl2-3 +SPKG_DESC_CSWlibsasl2-3 = Simple authentication and security layer library, libsasl2.so.2 +PKGFILES_CSWlibsasl2-3 += $(call pkgfiles_lib,libsasl2.so.3) PACKAGES += CSWsasl-dev SPKG_DESC_CSWsasl-dev = Development files for SASL PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-3 +RUNTIME_DEP_PKGS_CSWsasl-dev += CSWsasl + PACKAGES += CSWsaslsample CATALOGNAME_CSWsaslsample = sasl_sample SPKG_DESC_CSWsaslsample = Cyrus Simple Authentication and Security Layer sample client/server RUNTIME_DEP_PKGS_CSWsaslsample = CSWsasl -RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-3 RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibgssapi-krb5-2 PKGFILES_CSWsaslsample = $(bindir)/sasl-sample-server PKGFILES_CSWsaslsample += $(bindir)/sasl-sample-client Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-09-21 15:16:36 UTC (rev 21976) +++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW 2013-09-21 15:36:36 UTC (rev 21977) @@ -1,6 +1,6 @@ sasl (2.1.26,REV=2013.09.21) - * New upstream version. + * New upstream version with a soname bump (libsasl.2.so.2 -> libsasl.2.so.3). * Removed patch check-realloc.patch that has been applied upstream. -- Yann Rouillard Sat, 21 Sep 2013 14:24:32 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 17:48:18 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 15:48:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21978] csw/mgar/pkg/sasl/branches/libsasl2-2/ Message-ID: Revision: 21978 http://gar.svn.sourceforge.net/gar/?rev=21978&view=rev Author: chninkel Date: 2013-09-21 15:48:18 +0000 (Sat, 21 Sep 2013) Log Message: ----------- sasl/branches/libsasl2-2: remove the libsasl2-2 branch, we will not release two packages after all Removed Paths: ------------- csw/mgar/pkg/sasl/branches/libsasl2-2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 18:00:38 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 16:00:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21979] csw/mgar/pkg/gnutls3/trunk Message-ID: Revision: 21979 http://gar.svn.sourceforge.net/gar/?rev=21979&view=rev Author: chninkel Date: 2013-09-21 16:00:38 +0000 (Sat, 21 Sep 2013) Log Message: ----------- gnutls3/trunk: updated to 3.1.14 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 2013-09-21 15:48:18 UTC (rev 21978) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-09-21 16:00:38 UTC (rev 21979) @@ -1,5 +1,5 @@ NAME = gnutls -VERSION = 3.1.13 +VERSION = 3.1.14 DESCRIPTION = GNU Transport Layer Security libraries and tools define BLURB @@ -40,6 +40,7 @@ RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls13 CHECKPKG_OVERRIDES_CSWgnutls += unidentified-dependency|CSWlibgnutls13 CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls13 +CHECKPKG_OVERRIDES_CSWgnutls += surplus-dependency|CSWlibgnutls28 PACKAGES += CSWlibgnutls28 CATALOGNAME_CSWlibgnutls = libgnutls28 Modified: csw/mgar/pkg/gnutls3/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls3/trunk/checksums 2013-09-21 15:48:18 UTC (rev 21978) +++ csw/mgar/pkg/gnutls3/trunk/checksums 2013-09-21 16:00:38 UTC (rev 21979) @@ -1 +1 @@ -1106f63e3795569f5a527b5cf68fc5b1 gnutls-3.1.13.tar.xz +0c68ab04c41fcafaad033d17434510b5 gnutls-3.1.14.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 Sat Sep 21 18:01:09 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 16:01:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21980] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21980 http://gar.svn.sourceforge.net/gar/?rev=21980&view=rev Author: chninkel Date: 2013-09-21 16:01:09 +0000 (Sat, 21 Sep 2013) Log Message: ----------- gnutls3/trunk: added libiconv_dev as a build dependency Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-09-21 16:00:38 UTC (rev 21979) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-09-21 16:01:09 UTC (rev 21980) @@ -29,6 +29,7 @@ BUILD_DEP_PKGS += CSWlibgpg-error-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev BUILD_DEP_PKGS += CSWlibp11kit-dev +BUILD_DEP_PKGS += CSWlibiconv-dev PACKAGES += CSWgnutls CATALOGNAME_gnutls = gnutls This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 21 18:01:32 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 21 Sep 2013 16:01:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21981] csw/mgar/pkg/gnutls3/trunk/files/ 0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch Message-ID: Revision: 21981 http://gar.svn.sourceforge.net/gar/?rev=21981&view=rev Author: chninkel Date: 2013-09-21 16:01:31 +0000 (Sat, 21 Sep 2013) Log Message: ----------- gnutls3/trunk: fixed 0003-force-use-of-bash-shell-in-non-portable-test-scripts patch Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/files/0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch Modified: csw/mgar/pkg/gnutls3/trunk/files/0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch =================================================================== --- csw/mgar/pkg/gnutls3/trunk/files/0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch 2013-09-21 16:01:09 UTC (rev 21980) +++ csw/mgar/pkg/gnutls3/trunk/files/0003-force-use-of-bash-shell-in-non-portable-test-scripts.patch 2013-09-21 16:01:31 UTC (rev 21981) @@ -4,43784 +4,10 @@ Subject: [PATCH] force use of bash shell in non portable test scripts --- - Makefile.in | 73 +- - aclocal.m4 | 173 +- - config.h.in | 3 - - configure | 9 +- - doc/Makefile.in | 76 +- - doc/credentials/Makefile.in | 73 +- - doc/credentials/openpgp/Makefile.in | 60 +- - doc/credentials/srp/Makefile.in | 60 +- - doc/credentials/x509/Makefile.in | 60 +- - doc/cyclo/Makefile.in | 60 +- - doc/examples/Makefile.in | 79 +- - doc/gnutls.info | 2556 ++++++------- - doc/gnutls.info-1 | 5064 +++++++++++++------------ - doc/gnutls.info-2 | 5033 +++++++++++++------------ - doc/gnutls.info-3 | 5634 ++++++++++++++++++++++------ - doc/gnutls.info-4 | 6801 +++++++++------------------------- - doc/gnutls.info-5 | Bin 16644 -> 0 bytes - doc/latex/Makefile.in | 60 +- - doc/manpages/Makefile.in | 60 +- - doc/reference/Makefile.in | 60 +- - doc/scripts/Makefile.in | 60 +- - extra/Makefile.in | 74 +- - extra/includes/Makefile.in | 60 +- - gl/Makefile.in | 74 +- - gl/tests/Makefile.in | 207 +- - guile/Makefile.in | 73 +- - guile/modules/Makefile.in | 60 +- - guile/src/Makefile.in | 61 +- - guile/tests/Makefile.in | 62 +- - lib/Makefile.in | 76 +- - lib/accelerated/Makefile.in | 74 +- - lib/accelerated/x86/Makefile.in | 61 +- - lib/algorithms/Makefile.in | 61 +- - lib/auth/Makefile.in | 61 +- - lib/ext/Makefile.in | 61 +- - lib/extras/Makefile.in | 61 +- - lib/includes/Makefile.in | 60 +- - lib/minitasn1/Makefile.in | 61 +- - lib/nettle/Makefile.in | 61 +- - lib/opencdk/Makefile.in | 61 +- - lib/openpgp/Makefile.in | 61 +- - lib/x509/Makefile.in | 61 +- - libdane/Makefile.in | 74 +- - libdane/includes/Makefile.in | 60 +- - src/Makefile.in | 93 +- - src/crywrap/Makefile.in | 61 +- - src/libopts/Makefile.in | 61 +- - tests/Makefile.in | 146 +- - tests/cert-tests/Makefile.in | 62 +- - tests/dsa/Makefile.in | 62 +- tests/dsa/testdsa | 3 +- - tests/dtls/Makefile.in | 63 +- - tests/ecdsa/Makefile.in | 62 +- - tests/key-id/Makefile.in | 62 +- - tests/openpgp-certs/Makefile.in | 62 +- tests/openpgp-certs/testcerts | 2 +- - tests/pkcs1-padding/Makefile.in | 62 +- - tests/pkcs12-decode/Makefile.in | 62 +- - tests/pkcs8-decode/Makefile.in | 62 +- - tests/rsa-md5-collision/Makefile.in | 62 +- - tests/safe-renegotiation/Makefile.in | 68 +- - tests/scripts/Makefile.in | 60 +- - tests/scripts/common.sh | 2 +- - tests/sha2/Makefile.in | 62 +- - tests/slow/Makefile.in | 65 +- - tests/srp/Makefile.in | 63 +- - tests/suite/Makefile.in | 65 +- - tests/userid/Makefile.in | 62 +- - 68 files changed, 13842 insertions(+), 15271 deletions(-) - delete mode 100644 doc/gnutls.info-5 + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index 6094f8b..5384e41 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -34,51 +34,23 @@ - # along with this file; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -- esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -1709,12 +1681,13 @@ distclean-libtool: - # (which will cause the Makefiles to be regenerated when you run 'make'); - # (2) otherwise, pass the desired values on the 'make' command line. - $(am__recursive_targets): -- @fail=; \ -- if $(am__make_keepgoing); then \ -- failcom='fail=yes'; \ -- else \ -- failcom='exit 1'; \ -- fi; \ -+ @fail= failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ -diff --git a/aclocal.m4 b/aclocal.m4 -index 1d13dcd..bd383f8 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1,6 +1,6 @@ --# generated automatically by aclocal 1.13.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.13.1 -*- Autoconf -*- - --# Copyright (C) 1996-2013 Free Software Foundation, Inc. -+# Copyright (C) 1996-2012 Free Software Foundation, Inc. - - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], - [am__api_version='1.13' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.13.3], [], -+m4_if([$1], [1.13.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.13.3])dnl -+[AM_AUTOMAKE_VERSION([1.13.1])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -@@ -452,7 +452,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "$am__include" && continue -+ test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the -@@ -808,8 +808,7 @@ fi - AC_DEFUN([AM_PROG_MKDIR_P], - [AC_PREREQ([2.60])dnl - AC_REQUIRE([AC_PROG_MKDIR_P])dnl --dnl FIXME we are no longer going to remove this! adjust warning --dnl FIXME message accordingly. -+dnl FIXME to be removed in Automake 1.14. - AC_DIAGNOSE([obsolete], - [$0: this macro is deprecated, and will soon be removed. - You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, -@@ -1068,114 +1067,76 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - # Substitute a variable $(am__untar) that extract such - # a tarball read from stdin. - # $(am__untar) < result.tar --# - AC_DEFUN([_AM_PROG_TAR], - [# Always define AMTAR for backward compatibility. Yes, it's still used - # in the wild :-( We should find a proper way to deprecate it ... - AC_SUBST([AMTAR], ['$${TAR-tar}']) -- --# We'll loop over all known methods to create a tar archive until one works. -+m4_if([$1], [v7], -+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. - _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of '-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac - --m4_if([$1], [v7], -- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -- -- [m4_case([$1], -- [ustar], -- [# The POSIX 1988 'ustar' format is defined with fixed-size fields. -- # There is notably a 21 bits limit for the UID and the GID. In fact, -- # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 -- # and bug#13588). -- am_max_uid=2097151 # 2^21 - 1 -- am_max_gid=$am_max_uid -- # The $UID and $GID variables are not portable, so we need to resort -- # to the POSIX-mandated id(1) utility. Errors in the 'id' calls -- # below are definitely unexpected, so allow the users to see them -- # (that is, avoid stderr redirection). -- am_uid=`id -u || echo unknown` -- am_gid=`id -g || echo unknown` -- AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) -- if test $am_uid -le $am_max_uid; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- _am_tools=none -- fi -- AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) -- if test $am_gid -le $am_max_gid; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- _am_tools=none -- fi], -- -- [pax], -- [], -- -- [m4_fatal([Unknown tar format])]) -- -- AC_MSG_CHECKING([how to create a $1 tar archive]) -- -- # Go ahead even if we have the value already cached. We do so because we -- # need to set the values for the 'am__tar' and 'am__untar' variables. -- _am_tools=${am_cv_prog_tar_$1-$_am_tools} -- -- for _am_tool in $_am_tools; do -- case $_am_tool in -- gnutar) -- for _am_tar in tar gnutar gtar; do -- AM_RUN_LOG([$_am_tar --version]) && break -- done -- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -- am__untar="$_am_tar -xf -" -- ;; -- plaintar) -- # Must skip GNU tar: if it does not support --format= it doesn't create -- # ustar tarball either. -- (tar --version) >/dev/null 2>&1 && continue -- am__tar='tar chf - "$$tardir"' -- am__tar_='tar chf - "$tardir"' -- am__untar='tar xf -' -- ;; -- pax) -- am__tar='pax -L -x $1 -w "$$tardir"' -- am__tar_='pax -L -x $1 -w "$tardir"' -- am__untar='pax -r' -- ;; -- cpio) -- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -- am__untar='cpio -i -H $1 -d' -- ;; -- none) -- am__tar=false -- am__tar_=false -- am__untar=false -- ;; -- esac -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break - -- # If the value was cached, stop now. We just wanted to have am__tar -- # and am__untar set. -- test -n "${am_cv_prog_tar_$1}" && break -- -- # tar/untar a dummy directory, and stop if the command works. -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -- rm -rf conftest.dir -- if test -s conftest.tar; then -- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -- fi -- done -+ # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir - -- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -- AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -- -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) - AC_SUBST([am__tar]) - AC_SUBST([am__untar]) - ]) # _AM_PROG_TAR -diff --git a/config.h.in b/config.h.in -index a8fefc4..b5bb371 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -1245,9 +1245,6 @@ - /* Define to 1 if getpeername is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_GETPEERNAME - --/* Define to 1 if gets is declared even after undefining macros. */ --#undef HAVE_RAW_DECL_GETS -- - /* Define to 1 if getsockname is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_GETSOCKNAME - -diff --git a/configure b/configure -index ec80aec..75de56d 100755 ---- a/configure -+++ b/configure -@@ -4799,17 +4799,12 @@ mkdir_p='$(MKDIR_P)' - # in the wild :-( We should find a proper way to deprecate it ... - AMTAR='$${TAR-tar}' - -- --# We'll loop over all known methods to create a tar archive until one works. --_am_tools='gnutar pax cpio none' -- - am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - - - -- - # Check whether --enable-silent-rules was given. - if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -@@ -34286,7 +34281,7 @@ _ACEOF - - - -- for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do -+ for gl_func in dprintf fpurge fseeko ftello getdelim getline pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do - as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 - $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -@@ -59483,7 +59478,7 @@ $as_echo X"$mf" | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "$am__include" && continue -+ test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the -diff --git a/doc/Makefile.in b/doc/Makefile.in -index c49a0e4..48438c0 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -35,51 +35,23 @@ - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -- esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -3538,15 +3510,12 @@ $(top_srcdir)/configure: $(am__configure_deps) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(am__aclocal_m4_deps): -- - alert-printlist$(EXEEXT): $(alert_printlist_OBJECTS) $(alert_printlist_DEPENDENCIES) $(EXTRA_alert_printlist_DEPENDENCIES) - @rm -f alert-printlist$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(alert_printlist_OBJECTS) $(alert_printlist_LDADD) $(LIBS) -- - errcodes$(EXEEXT): $(errcodes_OBJECTS) $(errcodes_DEPENDENCIES) $(EXTRA_errcodes_DEPENDENCIES) - @rm -f errcodes$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(errcodes_OBJECTS) $(errcodes_LDADD) $(LIBS) -- - printlist$(EXEEXT): $(printlist_OBJECTS) $(printlist_DEPENDENCIES) $(EXTRA_printlist_DEPENDENCIES) - @rm -f printlist$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(printlist_OBJECTS) $(printlist_LDADD) $(LIBS) -@@ -3806,12 +3775,13 @@ uninstall-imagesDATA: - # (which will cause the Makefiles to be regenerated when you run 'make'); - # (2) otherwise, pass the desired values on the 'make' command line. - $(am__recursive_targets): -- @fail=; \ -- if $(am__make_keepgoing); then \ -- failcom='fail=yes'; \ -- else \ -- failcom='exit 1'; \ -- fi; \ -+ @fail= failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ -diff --git a/doc/credentials/Makefile.in b/doc/credentials/Makefile.in -index a8c25a5..1bd81c2 100644 ---- a/doc/credentials/Makefile.in -+++ b/doc/credentials/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -34,51 +34,23 @@ - # along with this file; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -- esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -1642,12 +1614,13 @@ clean-libtool: - # (which will cause the Makefiles to be regenerated when you run 'make'); - # (2) otherwise, pass the desired values on the 'make' command line. - $(am__recursive_targets): -- @fail=; \ -- if $(am__make_keepgoing); then \ -- failcom='fail=yes'; \ -- else \ -- failcom='exit 1'; \ -- fi; \ -+ @fail= failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ -diff --git a/doc/credentials/openpgp/Makefile.in b/doc/credentials/openpgp/Makefile.in -index f76db17..f5bd167 100644 ---- a/doc/credentials/openpgp/Makefile.in -+++ b/doc/credentials/openpgp/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -14,51 +14,23 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -- esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -diff --git a/doc/credentials/srp/Makefile.in b/doc/credentials/srp/Makefile.in -index bc70f3f..b3218f0 100644 ---- a/doc/credentials/srp/Makefile.in -+++ b/doc/credentials/srp/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -14,51 +14,23 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -- esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -diff --git a/doc/credentials/x509/Makefile.in b/doc/credentials/x509/Makefile.in -index f42dda6..d05da51 100644 ---- a/doc/credentials/x509/Makefile.in -+++ b/doc/credentials/x509/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -14,51 +14,23 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -- esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -diff --git a/doc/cyclo/Makefile.in b/doc/cyclo/Makefile.in -index 62c6554..af63011 100644 ---- a/doc/cyclo/Makefile.in -+++ b/doc/cyclo/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -34,51 +34,23 @@ - # along with this file; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -- esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in -index 4010816..5dce863 100644 ---- a/doc/examples/Makefile.in -+++ b/doc/examples/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.13.3 from Makefile.am. -+# Makefile.in generated by automake 1.13.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -36,51 +36,23 @@ - - - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' --am__make_running_with_option = \ -- case $${target_option-} in \ -- ?) ;; \ -- *) echo "am__make_running_with_option: internal error: invalid" \ -- "target option '$${target_option-}' specified" >&2; \ -- exit 1;; \ -- esac; \ -- has_opt=no; \ -- sane_makeflags=$$MAKEFLAGS; \ -- if $(am__is_gnu_make); then \ -- sane_makeflags=$$MFLAGS; \ -- else \ -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- bs=\\; \ -- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -- esac; \ -- fi; \ -- skip_next=no; \ -- strip_trailopt () \ -- { \ -- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -- }; \ -- for flg in $$sane_makeflags; do \ -- test $$skip_next = yes && { skip_next=no; continue; }; \ -- case $$flg in \ -- *=*|--*) continue;; \ -- -*I) strip_trailopt 'I'; skip_next=yes;; \ -- -*I?*) strip_trailopt 'I';; \ -- -*O) strip_trailopt 'O'; skip_next=yes;; \ -- -*O?*) strip_trailopt 'O';; \ -- -*l) strip_trailopt 'l'; skip_next=yes;; \ -- -*l?*) strip_trailopt 'l';; \ -- -[dEDm]) skip_next=yes;; \ -- -[JT]) skip_next=yes;; \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ - esac; \ -- case $$flg in \ -- *$$target_option*) has_opt=yes; break;; \ -- esac; \ -- done; \ -- test $$has_opt = yes --am__make_dryrun = (target_option=n; $(am__make_running_with_option)) --am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -1819,7 +1791,6 @@ clean-noinstLTLIBRARIES: - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -- - libexamples.la: $(libexamples_la_OBJECTS) $(libexamples_la_DEPENDENCIES) $(EXTRA_libexamples_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libexamples_la_OBJECTS) $(libexamples_la_LIBADD) $(LIBS) - -@@ -1831,75 +1802,57 @@ clean-noinstPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -- - ex-cert-select$(EXEEXT): $(ex_cert_select_OBJECTS) $(ex_cert_select_DEPENDENCIES) $(EXTRA_ex_cert_select_DEPENDENCIES) - @rm -f ex-cert-select$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_cert_select_OBJECTS) $(ex_cert_select_LDADD) $(LIBS) -- - ex-cert-select-pkcs11$(EXEEXT): $(ex_cert_select_pkcs11_OBJECTS) $(ex_cert_select_pkcs11_DEPENDENCIES) $(EXTRA_ex_cert_select_pkcs11_DEPENDENCIES) - @rm -f ex-cert-select-pkcs11$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_cert_select_pkcs11_OBJECTS) $(ex_cert_select_pkcs11_LDADD) $(LIBS) -- - ex-client-anon$(EXEEXT): $(ex_client_anon_OBJECTS) $(ex_client_anon_DEPENDENCIES) $(EXTRA_ex_client_anon_DEPENDENCIES) - @rm -f ex-client-anon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_anon_OBJECTS) $(ex_client_anon_LDADD) $(LIBS) -- - ex-client-dtls$(EXEEXT): $(ex_client_dtls_OBJECTS) $(ex_client_dtls_DEPENDENCIES) $(EXTRA_ex_client_dtls_DEPENDENCIES) - @rm -f ex-client-dtls$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_dtls_OBJECTS) $(ex_client_dtls_LDADD) $(LIBS) -- - ex-client-psk$(EXEEXT): $(ex_client_psk_OBJECTS) $(ex_client_psk_DEPENDENCIES) $(EXTRA_ex_client_psk_DEPENDENCIES) - @rm -f ex-client-psk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_psk_OBJECTS) $(ex_client_psk_LDADD) $(LIBS) -- - ex-client-resume$(EXEEXT): $(ex_client_resume_OBJECTS) $(ex_client_resume_DEPENDENCIES) $(EXTRA_ex_client_resume_DEPENDENCIES) - @rm -f ex-client-resume$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_resume_OBJECTS) $(ex_client_resume_LDADD) $(LIBS) -- - ex-client-srp$(EXEEXT): $(ex_client_srp_OBJECTS) $(ex_client_srp_DEPENDENCIES) $(EXTRA_ex_client_srp_DEPENDENCIES) - @rm -f ex-client-srp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_srp_OBJECTS) $(ex_client_srp_LDADD) $(LIBS) -- - ex-client-x509$(EXEEXT): $(ex_client_x509_OBJECTS) $(ex_client_x509_DEPENDENCIES) $(EXTRA_ex_client_x509_DEPENDENCIES) - @rm -f ex-client-x509$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_x509_OBJECTS) $(ex_client_x509_LDADD) $(LIBS) -- - ex-client-xssl1$(EXEEXT): $(ex_client_xssl1_OBJECTS) $(ex_client_xssl1_DEPENDENCIES) $(EXTRA_ex_client_xssl1_DEPENDENCIES) - @rm -f ex-client-xssl1$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_xssl1_OBJECTS) $(ex_client_xssl1_LDADD) $(LIBS) -- - ex-client-xssl2$(EXEEXT): $(ex_client_xssl2_OBJECTS) $(ex_client_xssl2_DEPENDENCIES) $(EXTRA_ex_client_xssl2_DEPENDENCIES) - @rm -f ex-client-xssl2$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_client_xssl2_OBJECTS) $(ex_client_xssl2_LDADD) $(LIBS) -- - ex-cxx$(EXEEXT): $(ex_cxx_OBJECTS) $(ex_cxx_DEPENDENCIES) $(EXTRA_ex_cxx_DEPENDENCIES) - @rm -f ex-cxx$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(ex_cxx_OBJECTS) $(ex_cxx_LDADD) $(LIBS) -- - ex-ocsp-client$(EXEEXT): $(ex_ocsp_client_OBJECTS) $(ex_ocsp_client_DEPENDENCIES) $(EXTRA_ex_ocsp_client_DEPENDENCIES) - @rm -f ex-ocsp-client$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_ocsp_client_OBJECTS) $(ex_ocsp_client_LDADD) $(LIBS) -- - ex-serv-anon$(EXEEXT): $(ex_serv_anon_OBJECTS) $(ex_serv_anon_DEPENDENCIES) $(EXTRA_ex_serv_anon_DEPENDENCIES) - @rm -f ex-serv-anon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_serv_anon_OBJECTS) $(ex_serv_anon_LDADD) $(LIBS) -- - ex-serv-dtls$(EXEEXT): $(ex_serv_dtls_OBJECTS) $(ex_serv_dtls_DEPENDENCIES) $(EXTRA_ex_serv_dtls_DEPENDENCIES) - @rm -f ex-serv-dtls$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_serv_dtls_OBJECTS) $(ex_serv_dtls_LDADD) $(LIBS) -- - ex-serv-pgp$(EXEEXT): $(ex_serv_pgp_OBJECTS) $(ex_serv_pgp_DEPENDENCIES) $(EXTRA_ex_serv_pgp_DEPENDENCIES) - @rm -f ex-serv-pgp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_serv_pgp_OBJECTS) $(ex_serv_pgp_LDADD) $(LIBS) -- - ex-serv-psk$(EXEEXT): $(ex_serv_psk_OBJECTS) $(ex_serv_psk_DEPENDENCIES) $(EXTRA_ex_serv_psk_DEPENDENCIES) - @rm -f ex-serv-psk$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_serv_psk_OBJECTS) $(ex_serv_psk_LDADD) $(LIBS) -- - ex-serv-srp$(EXEEXT): $(ex_serv_srp_OBJECTS) $(ex_serv_srp_DEPENDENCIES) $(EXTRA_ex_serv_srp_DEPENDENCIES) - @rm -f ex-serv-srp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ex_serv_srp_OBJECTS) $(ex_serv_srp_LDADD) $(LIBS) -- - print-ciphersuites$(EXEEXT): $(print_ciphersuites_OBJECTS) $(print_ciphersuites_DEPENDENCIES) $(EXTRA_print_ciphersuites_DEPENDENCIES) - @rm -f print-ciphersuites$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(print_ciphersuites_OBJECTS) $(print_ciphersuites_LDADD) $(LIBS) -diff --git a/doc/gnutls.info b/doc/gnutls.info -index cf9247a..e343fae 100644 ---- a/doc/gnutls.info -+++ b/doc/gnutls.info -@@ -1,4 +1,4 @@ --This is gnutls.info, produced by makeinfo version 5.1 from gnutls.texi. -+This is gnutls.info, produced by makeinfo version 4.13 from gnutls.texi. - - This manual is last updated 2 April 2013 for version 3.1.13 of GnuTLS. - -@@ -11,6 +11,7 @@ Copyright (C) 2001-2013 Free Software Foundation, Inc.\\ Copyright (C) - Foundation; with no Invariant Sections, no Front-Cover Texts, and - no Back-Cover Texts. A copy of the license is included in the - section entitled "GNU Free Documentation License". -+ - INFO-DIR-SECTION Software libraries - START-INFO-DIR-ENTRY - * GnuTLS: (gnutls). GNU Transport Layer Security Library. -@@ -28,1285 +29,1284 @@ END-INFO-DIR-ENTRY - -  - Indirect: --gnutls.info-1: 1279 --gnutls.info-2: 303309 --gnutls.info-3: 749430 --gnutls.info-4: 947014 --gnutls.info-5: 1275242 -+gnutls.info-1: 1281 -+gnutls.info-2: 301128 -+gnutls.info-3: 740825 -+gnutls.info-4: 1045275 -  - Tag Table: - (Indirect) --Node: Top1279 --Node: Preface2461 --Node: Introduction to GnuTLS3845 --Node: Downloading and installing5485 --Node: Document overview7996 --Node: Introduction to TLS8997 --Ref: Introduction to TLS-Footnote-110139 --Node: TLS layers10429 --Ref: fig:tls-layers11388 --Node: The transport layer11463 --Node: The TLS record protocol12067 --Node: Encryption algorithms used in the record layer13342 --Ref: tab:ciphers14238 --Ref: tab:macs15610 --Node: Compression algorithms used in the record layer16301 --Ref: gnutls_compression_method_t17245 --Node: Weaknesses and countermeasures17930 --Ref: Weaknesses and countermeasures-Footnote-118958 --Node: On Record Padding19036 --Node: The TLS Alert Protocol20960 --Ref: The Alert Protocol21160 --Ref: tab:alerts22044 --Node: The TLS Handshake Protocol24812 --Ref: The Handshake Protocol25011 --Node: TLS Cipher Suites25677 --Ref: TLS Cipher Suites-Footnote-126660 --Node: Authentication26774 --Node: Client Authentication27485 --Node: Resuming Sessions27962 --Ref: resume28121 --Node: TLS Extensions28767 --Node: Maximum fragment length negotiation29441 --Node: Server name indication30045 --Ref: serverind30245 --Node: Session tickets31091 --Node: HeartBeat31701 --Node: Safe renegotiation33006 --Node: OCSP status request37910 --Node: SRTP39732 --Ref: gnutls_srtp_profile_t40211 --Node: How to use TLS in application protocols42547 --Node: Separate ports43065 --Ref: Separate ports-Footnote-144480 --Node: Upward negotiation44556 --Ref: Upward negotiation-Footnote-147236 --Node: On SSL 2 and older protocols47264 --Node: Authentication methods49142 --Node: Certificate authentication50037 --Ref: tab:key-exchange50595 --Node: X.509 certificates53099 --Ref: fig:x50953578 --Node: X.509 certificate structure54127 --Ref: tab:x50954525 --Ref: tab:x509-ext56319 --Node: Importing an X.509 certificate59310 --Node: X.509 distinguished names60692 --Node: X.509 public and private keys64355 --Node: Verifying X.509 certificate paths66797 --Ref: gnutls_certificate_status_t74562 --Node: Verifying a certificate in the context of TLS session76548 --Ref: gnutls_certificate_verify_flags78038 --Node: OpenPGP certificates80168 --Ref: fig:openpgp80982 --Ref: tab:openpgp-certificate81772 --Ref: tab:openpgp-key-exchange83446 --Ref: OpenPGP certificates-Footnote-187541 --Node: Advanced certificate verification87596 --Node: Verifying a certificate using trust on first use authentication88483 --Node: Verifying a certificate using DANE89707 --Node: Digital signatures91215 --Node: More on certificate authentication96429 --Node: PKCS 10 certificate requests97249 --Ref: ex:crq100489 --Node: PKIX certificate revocation lists102570 --Ref: tab:crl103445 --Node: OCSP certificate status checking108976 --Ref: tab:ocsp-response115659 --Ref: gnutls_x509_crl_reason_t119206 --Node: Managing encrypted keys120530 --Ref: gnutls_pkcs_encrypt_flags_t124581 --Node: certtool Invocation131329 --Ref: certtool usage131917 --Ref: certtool debug138298 --Ref: certtool generate-request138442 --Ref: certtool verify-chain138786 --Ref: certtool verify138963 --Ref: certtool verify-crl139281 --Ref: certtool get-dh-params139581 --Ref: certtool load-privkey139880 --Ref: certtool load-pubkey140053 --Ref: certtool load-certificate140223 --Ref: certtool load-ca-privkey140404 --Ref: certtool load-ca-certificate140608 --Ref: certtool cprint140820 --Ref: certtool null-password141052 --Ref: certtool pubkey-info141245 --Ref: certtool to-p12141488 --Ref: certtool rsa141787 --Ref: certtool dsa141918 --Ref: certtool ecc142048 --Ref: certtool ecdsa142220 --Ref: certtool hash142339 --Ref: certtool inder142528 --Ref: certtool inraw142850 --Ref: certtool outder142975 --Ref: certtool outraw143123 --Ref: certtool sec-param143253 --Ref: certtool pkcs-cipher143474 --Ref: certtool exit status143714 --Ref: certtool See Also143946 --Ref: certtool Examples143995 --Ref: certtool Files147909 --Node: ocsptool Invocation153420 --Ref: ocsptool usage153961 --Ref: ocsptool debug157288 --Ref: ocsptool ask157432 --Ref: ocsptool exit status157827 --Ref: ocsptool See Also158059 --Ref: ocsptool Examples158109 --Node: danetool Invocation163087 --Ref: danetool usage163541 --Ref: danetool debug166951 --Ref: danetool load-pubkey167095 --Ref: danetool load-certificate167265 --Ref: danetool dlv167446 --Ref: danetool hash167605 --Ref: danetool check167796 --Ref: danetool check-ee168085 --Ref: danetool check-ca168268 --Ref: danetool insecure168446 --Ref: danetool local-dns168591 --Ref: danetool inder168820 --Ref: danetool inraw169142 --Ref: danetool tlsa-rr169267 --Ref: danetool host169562 --Ref: danetool proto169755 --Ref: danetool ca169977 --Ref: danetool x509170150 --Ref: danetool local170411 --Ref: danetool domain170539 --Ref: danetool exit status170944 --Ref: danetool See Also171176 --Ref: danetool Examples171226 --Node: Shared-key and anonymous authentication172391 --Node: SRP authentication172960 --Node: Authentication using SRP173223 --Node: srptool Invocation176264 --Ref: srptool usage177075 --Ref: srptool debug179209 --Ref: srptool verify179353 --Ref: srptool passwd-conf179491 --Ref: srptool create-conf179693 --Ref: srptool exit status179940 --Ref: srptool See Also180170 --Ref: srptool Examples180283 --Node: PSK authentication180927 --Node: Authentication using PSK181223 --Node: psktool Invocation182441 --Ref: psktool usage182927 --Ref: psktool debug184537 --Ref: psktool exit status184681 --Ref: psktool See Also184911 --Ref: psktool Examples185011 --Node: Anonymous authentication185472 --Node: Selecting an appropriate authentication method186462 --Node: Hardware security modules and abstract key types191300 --Node: Abstract key types192311 --Node: Abstract public keys193728 --Node: Abstract private keys198339 --Node: Operations201733 --Node: Smart cards and HSMs208012 --Ref: fig:pkcs11-vision209882 --Ref: Smart cards and HSMs-Footnote-1210194 --Node: PKCS11 Initialization210234 --Ref: PKCS11 Initialization-Footnote-1212783 --Node: Accessing objects that require a PIN212826 --Ref: gnutls_pin_flag_t214505 --Node: Reading objects216024 --Node: Writing objects221152 --Node: Using a PKCS11 token with TLS223533 --Node: p11tool Invocation224830 --Ref: p11tool usage225459 --Ref: p11tool debug229752 --Ref: p11tool write229896 --Ref: p11tool generate-rsa230071 --Ref: p11tool generate-dsa230241 --Ref: p11tool generate-ecc230411 --Ref: p11tool private230581 --Ref: p11tool sec-param230802 --Ref: p11tool inder231047 --Ref: p11tool inraw231187 --Ref: p11tool provider231311 --Ref: p11tool exit status231507 --Ref: p11tool See Also231737 --Ref: p11tool Examples231785 --Node: Trusted Platform Module232898 --Node: Keys in TPM234164 --Node: Key generation235643 --Node: Using keys237904 --Node: tpmtool Invocation241554 --Ref: tpmtool usage241980 --Ref: tpmtool debug245540 --Ref: tpmtool generate-rsa245684 --Ref: tpmtool user245954 --Ref: tpmtool system246313 --Ref: tpmtool sec-param246666 --Ref: tpmtool inder246993 --Ref: tpmtool outder247211 --Ref: tpmtool exit status247346 --Ref: tpmtool See Also247576 --Ref: tpmtool Examples247637 --Node: How to use GnuTLS in applications248252 --Node: Introduction to the library248821 --Node: General idea249373 --Ref: fig:gnutls-design250222 --Ref: General idea-Footnote-1251518 --Node: Error handling251563 --Node: Common types253133 --Node: Debugging and auditing254019 --Node: Thread safety255634 --Node: Callback functions258105 --Node: Preparation259069 --Node: Headers259488 --Node: Initialization259777 --Node: Version check260430 --Node: Building the source260967 --Node: Session initialization263078 --Node: Associating the credentials266605 --Ref: tab:key-exchange-cred267350 --Node: Certificate credentials268517 --Node: SRP credentials281882 --Node: PSK credentials286342 --Node: Anonymous credentials290005 --Node: Setting up the transport layer290820 --Node: Asynchronous operation298699 --Node: DTLS sessions303309 --Ref: DTLS sessions-Footnote-1305551 --Node: TLS handshake305628 --Node: Data transfer and termination308296 --Node: Buffered data transfer316902 --Node: Handling alerts318419 --Node: Priority Strings321782 --Ref: tab:prio-keywords322513 --Ref: tab:prio-algorithms326131 --Ref: tab:prio-special1328171 --Ref: tab:prio-special2330167 --Ref: Priority Strings-Footnote-1334528 --Ref: Priority Strings-Footnote-2334601 --Node: Selecting cryptographic key sizes334792 --Ref: tab:key-sizes335434 --Node: Advanced topics339610 --Node: Session resumption339982 --Node: Certificate verification344115 --Ref: dane_verify_status_t352618 --Node: Parameter generation353011 --Node: Keying Material Exporters356680 --Node: Channel Bindings357736 --Node: Interoperability359242 --Node: Compatibility with the OpenSSL library360849 --Node: GnuTLS application examples361574 --Ref: examples361792 --Node: Client examples362066 --Node: Simple client example with X.509 certificate support362951 --Ref: ex:verify363244 --Node: Simple client example with SSH-style certificate verification368120 --Node: Simple client example with anonymous authentication372041 --Node: Simple Datagram TLS client example375351 --Node: Obtaining session information379118 --Node: Using a callback to select the certificate to use383163 --Node: Verifying a certificate389110 --Ref: ex:verify2389347 --Node: Client using a smart card with TLS393702 --Ref: ex:pkcs11-client393935 --Node: Client with Resume capability example398140 --Ref: ex:resume-client398415 --Node: Simple client example with SRP authentication402555 --Node: Simple client example in C++405995 --Node: Helper functions for TCP connections408567 --Node: Helper functions for UDP connections410027 --Node: Server examples411716 --Node: Echo server with X.509 authentication412180 --Node: Echo server with OpenPGP authentication417593 --Node: Echo server with SRP authentication422824 --Node: Echo server with anonymous authentication428058 --Node: DTLS echo server with X.509 authentication432798 --Node: OCSP example444685 --Ref: Generate OCSP request444851 --Node: Miscellaneous examples453072 --Node: Checking for an alert453422 --Node: X.509 certificate parsing example454725 --Ref: ex:x509-info454982 --Node: Listing the ciphersuites in a priority string458248 --Node: PKCS #12 structure generation example459988 --Node: XSSL examples463690 --Node: Example client with X.509 certificate authentication464285 --Node: Example client with X.509 certificate authentication and TOFU466173 --Node: Using GnuTLS as a cryptographic library468623 --Node: Symmetric algorithms469288 --Node: Public key algorithms470647 --Node: Hash and HMAC functions471115 --Node: Random number generation472925 --Ref: gnutls_rnd_level_t473258 --Node: Other included programs473948 --Node: gnutls-cli Invocation474517 --Ref: gnutls-cli usage475077 --Ref: gnutls-cli debug480493 --Ref: gnutls-cli tofu480637 --Ref: gnutls-cli dane480888 --Ref: gnutls-cli local-dns481148 --Ref: gnutls-cli ca-verification481377 --Ref: gnutls-cli ocsp481663 --Ref: gnutls-cli resume481823 --Ref: gnutls-cli rehandshake481969 --Ref: gnutls-cli starttls482136 --Ref: gnutls-cli disable-extensions482322 --Ref: gnutls-cli dh-bits482517 --Ref: gnutls-cli priority482869 --Ref: gnutls-cli ranges483215 --Ref: gnutls-cli list483431 --Ref: gnutls-cli exit status483669 --Ref: gnutls-cli See Also483905 --Ref: gnutls-cli Examples483982 --Node: gnutls-serv Invocation485742 --Ref: gnutls-serv usage486217 --Ref: gnutls-serv debug490478 --Ref: gnutls-serv heartbeat490622 --Ref: gnutls-serv priority490773 --Ref: gnutls-serv ocsp-response491119 --Ref: gnutls-serv list491343 --Ref: gnutls-serv exit status491581 --Ref: gnutls-serv See Also491819 --Ref: gnutls-serv Examples491897 --Node: gnutls-cli-debug Invocation497326 --Ref: gnutls-cli-debug usage498146 --Ref: gnutls-cli-debug debug498961 --Ref: gnutls-cli-debug exit status499105 --Ref: gnutls-cli-debug See Also499353 --Ref: gnutls-cli-debug Examples499436 --Node: Internal architecture of GnuTLS501859 --Node: The TLS Protocol502401 --Ref: fig:client-server502877 --Node: TLS Handshake Protocol502967 --Ref: fig:gnutls-handshake503409 --Ref: fig:gnutls-handshake-sequence503918 --Node: TLS Authentication Methods504016 --Ref: TLS Authentication Methods-Footnote-1506314 --Node: TLS Extension Handling506380 --Node: Cryptographic Backend518071 --Ref: fig:crypto-layers518805 --Ref: Cryptographic Backend-Footnote-1522516 --Ref: Cryptographic Backend-Footnote-2522600 --Node: Upgrading from previous versions522707 --Node: Support526993 --Node: Getting help527223 --Node: Commercial Support527825 --Node: Bug Reports528651 --Node: Contributing530015 --Node: Error codes532019 --Node: Supported ciphersuites550523 --Ref: ciphersuites550696 --Node: API reference557967 --Node: Core TLS API558377 --Ref: gnutls_alert_get558606 --Ref: gnutls_alert_get_name559230 --Ref: gnutls_alert_get_strname559615 --Ref: gnutls_alert_send559950 --Ref: gnutls_alert_send_appropriate560833 --Ref: gnutls_anon_allocate_client_credentials561584 --Ref: gnutls_anon_allocate_server_credentials562043 --Ref: gnutls_anon_free_client_credentials562494 --Ref: gnutls_anon_free_server_credentials562870 --Ref: gnutls_anon_set_params_function563238 --Ref: gnutls_anon_set_server_dh_params563756 --Ref: gnutls_anon_set_server_params_function564280 --Ref: gnutls_auth_client_get_type564789 --Ref: gnutls_auth_get_type565301 --Ref: gnutls_auth_server_get_type565998 --Ref: gnutls_bye566490 --Ref: gnutls_certificate_activation_time_peers568096 --Ref: gnutls_certificate_allocate_credentials568563 --Ref: gnutls_certificate_client_get_request_status569039 --Ref: gnutls_certificate_expiration_time_peers569462 --Ref: gnutls_certificate_free_ca_names569866 --Ref: gnutls_certificate_free_cas570540 --Ref: gnutls_certificate_free_credentials570964 --Ref: gnutls_certificate_free_crls571485 --Ref: gnutls_certificate_free_keys571790 --Ref: gnutls_certificate_get_issuer572227 --Ref: gnutls_certificate_get_ours572865 --Ref: gnutls_certificate_get_peers573398 --Ref: gnutls_certificate_get_peers_subkey_id574262 --Ref: gnutls_certificate_send_x509_rdn_sequence574777 --Ref: gnutls_certificate_server_set_request575505 --Ref: gnutls_certificate_set_dh_params576158 --Ref: gnutls_certificate_set_ocsp_status_request_file576879 --Ref: gnutls_certificate_set_ocsp_status_request_function577754 --Ref: gnutls_certificate_set_params_function579138 --Ref: gnutls_certificate_set_pin_function579677 --Ref: gnutls_certificate_set_retrieve_function580341 --Ref: gnutls_certificate_set_verify_flags582219 --Ref: gnutls_certificate_set_verify_function582717 --Ref: gnutls_certificate_set_verify_limits583786 --Ref: gnutls_certificate_set_x509_crl584472 --Ref: gnutls_certificate_set_x509_crl_file585305 --Ref: gnutls_certificate_set_x509_crl_mem586091 --Ref: gnutls_certificate_set_x509_key586873 --Ref: gnutls_certificate_set_x509_key_file587887 --Ref: gnutls_certificate_set_x509_key_file2589193 --Ref: gnutls_certificate_set_x509_key_mem590644 --Ref: gnutls_certificate_set_x509_key_mem2591895 --Ref: gnutls_certificate_set_x509_simple_pkcs12_file593310 --Ref: gnutls_certificate_set_x509_simple_pkcs12_mem594838 --Ref: gnutls_certificate_set_x509_system_trust596336 --Ref: gnutls_certificate_set_x509_trust596908 --Ref: gnutls_certificate_set_x509_trust_file597895 --Ref: gnutls_certificate_set_x509_trust_mem599113 --Ref: gnutls_certificate_type_get600061 --Ref: gnutls_certificate_type_get_id600463 --Ref: gnutls_certificate_type_get_name600860 --Ref: gnutls_certificate_type_list601243 --Ref: gnutls_certificate_verification_status_print601597 --Ref: gnutls_certificate_verify_peers2602357 --Ref: gnutls_certificate_verify_peers3603623 --Ref: gnutls_check_version604969 --Ref: gnutls_cipher_get605578 --Ref: gnutls_cipher_get_id605884 --Ref: gnutls_cipher_get_key_size606266 --Ref: gnutls_cipher_get_name606593 --Ref: gnutls_cipher_list606940 --Ref: gnutls_cipher_suite_get_name607500 --Ref: gnutls_cipher_suite_info608118 --Ref: gnutls_compression_get609297 --Ref: gnutls_compression_get_id609650 --Ref: gnutls_compression_get_name610014 --Ref: gnutls_compression_list610396 --Ref: gnutls_credentials_clear610714 --Ref: gnutls_credentials_set610947 --Ref: gnutls_db_check_entry612320 --Ref: gnutls_db_check_entry_time612719 --Ref: gnutls_db_get_ptr613073 --Ref: gnutls_db_remove_session613390 --Ref: gnutls_db_set_cache_expiration613932 --Ref: gnutls_db_set_ptr614278 --Ref: gnutls_db_set_remove_function614618 --Ref: gnutls_db_set_retrieve_function615126 --Ref: gnutls_db_set_store_function615817 --Ref: gnutls_deinit616289 --Ref: gnutls_dh_get_group616633 --Ref: gnutls_dh_get_peers_public_bits617364 --Ref: gnutls_dh_get_prime_bits617808 --Ref: gnutls_dh_get_pubkey618448 --Ref: gnutls_dh_get_secret_bits619040 --Ref: gnutls_dh_params_cpy619472 --Ref: gnutls_dh_params_deinit619930 --Ref: gnutls_dh_params_export2_pkcs3620205 --Ref: gnutls_dh_params_export_pkcs3621026 --Ref: gnutls_dh_params_export_raw622045 --Ref: gnutls_dh_params_generate2622798 --Ref: gnutls_dh_params_import_pkcs3623749 --Ref: gnutls_dh_params_import_raw624524 --Ref: gnutls_dh_params_init625173 --Ref: gnutls_dh_set_prime_bits625542 --Ref: gnutls_ecc_curve_get626639 --Ref: gnutls_ecc_curve_get_name627032 --Ref: gnutls_ecc_curve_get_size627368 --Ref: gnutls_ecc_curve_list627614 --Ref: gnutls_error_is_fatal627937 --Ref: gnutls_error_to_alert628697 --Ref: gnutls_fingerprint629374 --Ref: gnutls_global_deinit630366 --Ref: gnutls_global_init630684 --Ref: gnutls_global_set_audit_log_function632036 --Ref: gnutls_global_set_log_function632677 --Ref: gnutls_global_set_log_level633185 --Ref: gnutls_global_set_mem_functions633688 --Ref: gnutls_global_set_mutex634924 --Ref: gnutls_global_set_time_function635765 --Ref: gnutls_handshake636176 --Ref: gnutls_handshake_get_last_in637508 --Ref: gnutls_handshake_get_last_out638138 --Ref: gnutls_handshake_set_max_packet_length638783 --Ref: gnutls_handshake_set_post_client_hello_function639474 --Ref: gnutls_handshake_set_private_extensions640562 --Ref: gnutls_handshake_set_random641246 --Ref: gnutls_handshake_set_timeout641958 --Ref: gnutls_heartbeat_allowed642509 --Ref: gnutls_heartbeat_enable642983 --Ref: gnutls_heartbeat_get_timeout643319 --Ref: gnutls_heartbeat_ping643863 --Ref: gnutls_heartbeat_pong644831 --Ref: gnutls_heartbeat_set_timeouts645243 --Ref: gnutls_hex2bin646249 --Ref: gnutls_hex_decode646817 --Ref: gnutls_hex_encode647392 --Ref: gnutls_init647975 --Ref: gnutls_key_generate649099 --Ref: gnutls_kx_get649518 --Ref: gnutls_kx_get_id649849 --Ref: gnutls_kx_get_name650193 --Ref: gnutls_kx_list650538 --Ref: gnutls_load_file650866 --Ref: gnutls_mac_get651402 --Ref: gnutls_mac_get_id651708 --Ref: gnutls_mac_get_key_size652122 --Ref: gnutls_mac_get_name652435 --Ref: gnutls_mac_list652754 --Ref: gnutls_ocsp_status_request_enable_client653345 --Ref: gnutls_ocsp_status_request_get654291 --Ref: gnutls_ocsp_status_request_is_checked654970 --Ref: gnutls_openpgp_send_cert655644 --Ref: gnutls_pem_base64_decode656219 --Ref: gnutls_pem_base64_decode_alloc657082 --Ref: gnutls_pem_base64_encode657879 --Ref: gnutls_pem_base64_encode_alloc658694 --Ref: gnutls_perror659400 --Ref: gnutls_pk_algorithm_get_name659696 --Ref: gnutls_pk_bits_to_sec_param660052 --Ref: gnutls_pk_get_id660526 --Ref: gnutls_pk_get_name661044 --Ref: gnutls_pk_list661406 --Ref: gnutls_pk_to_sign661739 --Ref: gnutls_prf662150 --Ref: gnutls_prf_raw663763 --Ref: gnutls_priority_certificate_type_list665400 --Ref: gnutls_priority_compression_list665848 --Ref: gnutls_priority_deinit666262 --Ref: gnutls_priority_ecc_curve_list666512 --Ref: gnutls_priority_get_cipher_suite_index666947 --Ref: gnutls_priority_init667837 --Ref: gnutls_priority_protocol_list670379 --Ref: gnutls_priority_set670787 --Ref: gnutls_priority_set_direct671219 --Ref: gnutls_priority_sign_list672019 --Ref: gnutls_protocol_get_id672431 --Ref: gnutls_protocol_get_name672747 --Ref: gnutls_protocol_get_version673106 --Ref: gnutls_protocol_list673409 --Ref: gnutls_psk_allocate_client_credentials673779 --Ref: gnutls_psk_allocate_server_credentials674274 --Ref: gnutls_psk_client_get_hint674745 --Ref: gnutls_psk_free_client_credentials675228 --Ref: gnutls_psk_free_server_credentials675599 --Ref: gnutls_psk_server_get_username675962 --Ref: gnutls_psk_set_client_credentials676328 --Ref: gnutls_psk_set_client_credentials_function677320 --Ref: gnutls_psk_set_params_function678239 --Ref: gnutls_psk_set_server_credentials_file678761 --Ref: gnutls_psk_set_server_credentials_function679408 --Ref: gnutls_psk_set_server_credentials_hint680357 --Ref: gnutls_psk_set_server_dh_params680991 --Ref: gnutls_psk_set_server_params_function681518 --Ref: gnutls_random_art682001 --Ref: gnutls_range_split682716 --Ref: gnutls_record_can_use_length_hiding683847 --Ref: gnutls_record_check_pending684602 --Ref: gnutls_record_cork685019 --Ref: gnutls_record_disable_padding685413 --Ref: gnutls_record_get_direction686025 --Ref: gnutls_record_get_max_size686937 --Ref: gnutls_record_recv687299 --Ref: gnutls_record_recv_seq688802 --Ref: gnutls_record_send689793 --Ref: gnutls_record_send_range691275 --Ref: gnutls_record_set_max_empty_records692465 --Ref: gnutls_record_set_max_size693365 --Ref: gnutls_record_set_timeout694280 --Ref: gnutls_record_uncork694863 --Ref: gnutls_rehandshake695538 --Ref: gnutls_safe_renegotiation_status696822 --Ref: gnutls_sec_param_get_name697237 --Ref: gnutls_sec_param_to_pk_bits697611 --Ref: gnutls_server_name_get698257 --Ref: gnutls_server_name_set699617 --Ref: gnutls_session_channel_binding700605 --Ref: gnutls_session_enable_compatibility_mode701328 --Ref: gnutls_session_force_valid701926 --Ref: gnutls_session_get_data702352 --Ref: gnutls_session_get_data2703144 --Ref: gnutls_session_get_desc703902 --Ref: gnutls_session_get_id704313 --Ref: gnutls_session_get_id2705204 --Ref: gnutls_session_get_ptr705676 --Ref: gnutls_session_get_random706076 --Ref: gnutls_session_is_resumed706676 --Ref: gnutls_session_resumption_requested707012 --Ref: gnutls_session_set_data707399 --Ref: gnutls_session_set_premaster708259 --Ref: gnutls_session_set_ptr709348 --Ref: gnutls_session_ticket_enable_client709763 --Ref: gnutls_session_ticket_enable_server710177 --Ref: gnutls_session_ticket_key_generate710741 --Ref: gnutls_set_default_priority711171 --Ref: gnutls_sign_algorithm_get711943 --Ref: gnutls_sign_algorithm_get_client712328 --Ref: gnutls_sign_algorithm_get_requested712737 --Ref: gnutls_sign_get_hash_algorithm713769 --Ref: gnutls_sign_get_id714181 --Ref: gnutls_sign_get_name714544 --Ref: gnutls_sign_get_pk_algorithm714894 --Ref: gnutls_sign_is_secure715305 --Ref: gnutls_sign_list715558 --Ref: gnutls_srp_allocate_client_credentials715888 --Ref: gnutls_srp_allocate_server_credentials716364 --Ref: gnutls_srp_base64_decode716812 --Ref: gnutls_srp_base64_decode_alloc717527 --Ref: gnutls_srp_base64_encode718200 --Ref: gnutls_srp_base64_encode_alloc719011 --Ref: gnutls_srp_free_client_credentials719747 --Ref: gnutls_srp_free_server_credentials720118 --Ref: gnutls_srp_server_get_username720481 --Ref: gnutls_srp_set_client_credentials720935 --Ref: gnutls_srp_set_client_credentials_function721691 --Ref: gnutls_srp_set_prime_bits722795 --Ref: gnutls_srp_set_server_credentials_file723485 --Ref: gnutls_srp_set_server_credentials_function724226 --Ref: gnutls_srp_verifier725600 --Ref: gnutls_srtp_get_keys726528 --Ref: gnutls_srtp_get_mki727927 --Ref: gnutls_srtp_get_profile_id728501 --Ref: gnutls_srtp_get_profile_name728959 --Ref: gnutls_srtp_get_selected_profile729380 --Ref: gnutls_srtp_set_mki729829 --Ref: gnutls_srtp_set_profile730283 --Ref: gnutls_srtp_set_profile_direct730820 --Ref: gnutls_store_commitment731547 --Ref: gnutls_store_pubkey732805 --Ref: gnutls_strerror733967 --Ref: gnutls_strerror_name734452 --Ref: gnutls_supplemental_get_name734921 --Ref: gnutls_tdb_deinit735329 --Ref: gnutls_tdb_init735544 --Ref: gnutls_tdb_set_store_commitment_func735894 --Ref: gnutls_tdb_set_store_func736488 --Ref: gnutls_tdb_set_verify_func736985 --Ref: gnutls_transport_get_int737471 --Ref: gnutls_transport_get_int2737884 --Ref: gnutls_transport_get_ptr738392 --Ref: gnutls_transport_get_ptr2738813 --Ref: gnutls_transport_set_errno739352 --Ref: gnutls_transport_set_errno_function740210 --Ref: gnutls_transport_set_int740752 --Ref: gnutls_transport_set_int2741113 --Ref: gnutls_transport_set_ptr741677 --Ref: gnutls_transport_set_ptr2742095 --Ref: gnutls_transport_set_pull_function742744 --Ref: gnutls_transport_set_pull_timeout_function743529 --Ref: gnutls_transport_set_push_function744496 --Ref: gnutls_transport_set_vec_push_function745346 --Ref: gnutls_url_is_supported746047 --Ref: gnutls_verify_stored_pubkey746428 --Node: High level TLS API749430 --Node: Datagram TLS API749659 --Ref: gnutls_dtls_cookie_send749941 --Ref: gnutls_dtls_cookie_verify751027 --Ref: gnutls_dtls_get_data_mtu751895 --Ref: gnutls_dtls_get_mtu752299 --Ref: gnutls_dtls_get_timeout752747 --Ref: gnutls_dtls_prestate_set753295 --Ref: gnutls_dtls_set_data_mtu753701 --Ref: gnutls_dtls_set_mtu754563 --Ref: gnutls_dtls_set_timeouts755174 --Ref: gnutls_record_get_discarded756189 --Node: X509 certificate API756468 --Ref: gnutls_pkcs7_deinit756787 --Ref: gnutls_pkcs7_delete_crl757000 --Ref: gnutls_pkcs7_delete_crt757458 --Ref: gnutls_pkcs7_export757931 --Ref: gnutls_pkcs7_export2758842 --Ref: gnutls_pkcs7_get_crl_count759524 --Ref: gnutls_pkcs7_get_crl_raw759898 --Ref: gnutls_pkcs7_get_crt_count760699 --Ref: gnutls_pkcs7_get_crt_raw761083 --Ref: gnutls_pkcs7_import761971 --Ref: gnutls_pkcs7_init762597 --Ref: gnutls_pkcs7_set_crl763017 --Ref: gnutls_pkcs7_set_crl_raw763447 --Ref: gnutls_pkcs7_set_crt763866 --Ref: gnutls_pkcs7_set_crt_raw764379 --Ref: gnutls_x509_crl_check_issuer764843 --Ref: gnutls_x509_crl_deinit765286 --Ref: gnutls_x509_crl_export765497 --Ref: gnutls_x509_crl_export2766424 --Ref: gnutls_x509_crl_get_authority_key_gn_serial767188 --Ref: gnutls_x509_crl_get_authority_key_id768506 --Ref: gnutls_x509_crl_get_crt_count769574 --Ref: gnutls_x509_crl_get_crt_serial769937 --Ref: gnutls_x509_crl_get_dn_oid770714 --Ref: gnutls_x509_crl_get_extension_data771535 --Ref: gnutls_x509_crl_get_extension_info772650 --Ref: gnutls_x509_crl_get_extension_oid773928 --Ref: gnutls_x509_crl_get_issuer_dn774794 --Ref: gnutls_x509_crl_get_issuer_dn2775670 --Ref: gnutls_x509_crl_get_issuer_dn_by_oid776354 --Ref: gnutls_x509_crl_get_next_update777865 --Ref: gnutls_x509_crl_get_number778304 --Ref: gnutls_x509_crl_get_raw_issuer_dn779034 --Ref: gnutls_x509_crl_get_signature779493 --Ref: gnutls_x509_crl_get_signature_algorithm780087 --Ref: gnutls_x509_crl_get_this_update780529 --Ref: gnutls_x509_crl_get_version780859 --Ref: gnutls_x509_crl_import781172 --Ref: gnutls_x509_crl_init781801 --Ref: gnutls_x509_crl_list_import782374 --Ref: gnutls_x509_crl_list_import2783366 --Ref: gnutls_x509_crl_print784274 --Ref: gnutls_x509_crl_set_authority_key_id784927 --Ref: gnutls_x509_crl_set_crt785580 --Ref: gnutls_x509_crl_set_crt_serial786158 --Ref: gnutls_x509_crl_set_next_update786795 --Ref: gnutls_x509_crl_set_number787207 --Ref: gnutls_x509_crl_set_this_update787784 --Ref: gnutls_x509_crl_set_version788193 --Ref: gnutls_x509_crl_sign2788743 --Ref: gnutls_x509_crl_verify789632 --Ref: gnutls_x509_crq_deinit790787 --Ref: gnutls_x509_crq_export791028 --Ref: gnutls_x509_crq_export2792030 --Ref: gnutls_x509_crq_get_attribute_by_oid792809 --Ref: gnutls_x509_crq_get_attribute_data793834 --Ref: gnutls_x509_crq_get_attribute_info794946 --Ref: gnutls_x509_crq_get_basic_constraints796143 --Ref: gnutls_x509_crq_get_challenge_password797401 --Ref: gnutls_x509_crq_get_dn798018 --Ref: gnutls_x509_crq_get_dn2798843 --Ref: gnutls_x509_crq_get_dn_by_oid799546 --Ref: gnutls_x509_crq_get_dn_oid801007 --Ref: gnutls_x509_crq_get_extension_by_oid801794 --Ref: gnutls_x509_crq_get_extension_data802945 --Ref: gnutls_x509_crq_get_extension_info804073 --Ref: gnutls_x509_crq_get_key_id805348 --Ref: gnutls_x509_crq_get_key_purpose_oid806380 --Ref: gnutls_x509_crq_get_key_rsa_raw807406 --Ref: gnutls_x509_crq_get_key_usage808030 --Ref: gnutls_x509_crq_get_pk_algorithm809121 --Ref: gnutls_x509_crq_get_private_key_usage_period809883 --Ref: gnutls_x509_crq_get_subject_alt_name810564 --Ref: gnutls_x509_crq_get_subject_alt_othername_oid812127 --Ref: gnutls_x509_crq_get_version813604 --Ref: gnutls_x509_crq_import813955 --Ref: gnutls_x509_crq_init814647 --Ref: gnutls_x509_crq_print814987 --Ref: gnutls_x509_crq_set_attribute_by_oid815647 --Ref: gnutls_x509_crq_set_basic_constraints816517 --Ref: gnutls_x509_crq_set_challenge_password817261 --Ref: gnutls_x509_crq_set_dn817717 --Ref: gnutls_x509_crq_set_dn_by_oid818270 --Ref: gnutls_x509_crq_set_key819379 --Ref: gnutls_x509_crq_set_key_purpose_oid819847 --Ref: gnutls_x509_crq_set_key_rsa_raw820626 --Ref: gnutls_x509_crq_set_key_usage821207 --Ref: gnutls_x509_crq_set_private_key_usage_period821711 --Ref: gnutls_x509_crq_set_subject_alt_name822240 --Ref: gnutls_x509_crq_set_version823038 --Ref: gnutls_x509_crq_sign2823530 --Ref: gnutls_x509_crq_verify824511 --Ref: gnutls_x509_crt_check_hostname825110 --Ref: gnutls_x509_crt_check_issuer825761 --Ref: gnutls_x509_crt_check_revocation826356 --Ref: gnutls_x509_crt_cpy_crl_dist_points827007 --Ref: gnutls_x509_crt_deinit827596 --Ref: gnutls_x509_crt_export827819 --Ref: gnutls_x509_crt_export2828730 --Ref: gnutls_x509_crt_get_activation_time829428 --Ref: gnutls_x509_crt_get_authority_info_access829811 --Ref: gnutls_x509_crt_get_authority_key_gn_serial833204 --Ref: gnutls_x509_crt_get_authority_key_id834649 --Ref: gnutls_x509_crt_get_basic_constraints835785 --Ref: gnutls_x509_crt_get_ca_status837004 --Ref: gnutls_x509_crt_get_crl_dist_points837891 --Ref: gnutls_x509_crt_get_dn839221 --Ref: gnutls_x509_crt_get_dn2840073 --Ref: gnutls_x509_crt_get_dn_by_oid840770 --Ref: gnutls_x509_crt_get_dn_oid842539 --Ref: gnutls_x509_crt_get_expiration_time843567 --Ref: gnutls_x509_crt_get_extension_by_oid843938 --Ref: gnutls_x509_crt_get_extension_data845059 --Ref: gnutls_x509_crt_get_extension_info846157 --Ref: gnutls_x509_crt_get_extension_oid847518 --Ref: gnutls_x509_crt_get_fingerprint848481 --Ref: gnutls_x509_crt_get_issuer849276 --Ref: gnutls_x509_crt_get_issuer_alt_name849919 --Ref: gnutls_x509_crt_get_issuer_alt_name2851724 --Ref: gnutls_x509_crt_get_issuer_alt_othername_oid853311 --Ref: gnutls_x509_crt_get_issuer_dn854965 --Ref: gnutls_x509_crt_get_issuer_dn2855843 --Ref: gnutls_x509_crt_get_issuer_dn_by_oid856571 --Ref: gnutls_x509_crt_get_issuer_dn_oid858358 --Ref: gnutls_x509_crt_get_issuer_unique_id859394 --Ref: gnutls_x509_crt_get_key_id860211 --Ref: gnutls_x509_crt_get_key_purpose_oid861199 --Ref: gnutls_x509_crt_get_key_usage862360 --Ref: gnutls_x509_crt_get_pk_algorithm863432 --Ref: gnutls_x509_crt_get_pk_dsa_raw864153 --Ref: gnutls_x509_crt_get_pk_rsa_raw864821 --Ref: gnutls_x509_crt_get_policy865399 --Ref: gnutls_x509_crt_get_private_key_usage_period866313 --Ref: gnutls_x509_crt_get_proxy867068 --Ref: gnutls_x509_crt_get_raw_dn868094 --Ref: gnutls_x509_crt_get_raw_issuer_dn868692 --Ref: gnutls_x509_crt_get_serial869276 --Ref: gnutls_x509_crt_get_signature870021 --Ref: gnutls_x509_crt_get_signature_algorithm870627 --Ref: gnutls_x509_crt_get_subject871100 --Ref: gnutls_x509_crt_get_subject_alt_name871748 --Ref: gnutls_x509_crt_get_subject_alt_name2873512 --Ref: gnutls_x509_crt_get_subject_alt_othername_oid875082 --Ref: gnutls_x509_crt_get_subject_key_id876727 --Ref: gnutls_x509_crt_get_subject_unique_id877564 --Ref: gnutls_x509_crt_get_version878363 --Ref: gnutls_x509_crt_import878695 --Ref: gnutls_x509_crt_init879389 --Ref: gnutls_x509_crt_list_import879728 --Ref: gnutls_x509_crt_list_import2881092 --Ref: gnutls_x509_crt_list_verify882044 --Ref: gnutls_x509_crt_print883715 --Ref: gnutls_x509_crt_set_activation_time884611 --Ref: gnutls_x509_crt_set_authority_info_access885078 --Ref: gnutls_x509_crt_set_authority_key_id885973 --Ref: gnutls_x509_crt_set_basic_constraints886555 --Ref: gnutls_x509_crt_set_ca_status887254 --Ref: gnutls_x509_crt_set_crl_dist_points887852 --Ref: gnutls_x509_crt_set_crl_dist_points2888504 --Ref: gnutls_x509_crt_set_crq889203 --Ref: gnutls_x509_crt_set_crq_extensions889760 --Ref: gnutls_x509_crt_set_dn890222 --Ref: gnutls_x509_crt_set_dn_by_oid890775 --Ref: gnutls_x509_crt_set_expiration_time891892 --Ref: gnutls_x509_crt_set_extension_by_oid892331 --Ref: gnutls_x509_crt_set_issuer_dn893114 --Ref: gnutls_x509_crt_set_issuer_dn_by_oid893688 --Ref: gnutls_x509_crt_set_key894941 --Ref: gnutls_x509_crt_set_key_purpose_oid895448 --Ref: gnutls_x509_crt_set_key_usage896216 --Ref: gnutls_x509_crt_set_pin_function896667 --Ref: gnutls_x509_crt_set_policy897347 --Ref: gnutls_x509_crt_set_private_key_usage_period898168 --Ref: gnutls_x509_crt_set_proxy898675 --Ref: gnutls_x509_crt_set_proxy_dn899489 --Ref: gnutls_x509_crt_set_serial900513 --Ref: gnutls_x509_crt_set_subject_alt_name901378 --Ref: gnutls_x509_crt_set_subject_alternative_name902200 --Ref: gnutls_x509_crt_set_subject_key_id903024 --Ref: gnutls_x509_crt_set_version903524 --Ref: gnutls_x509_crt_sign904347 --Ref: gnutls_x509_crt_sign2904902 --Ref: gnutls_x509_crt_verify905770 --Ref: gnutls_x509_dn_deinit906697 --Ref: gnutls_x509_dn_export906959 --Ref: gnutls_x509_dn_export2907853 --Ref: gnutls_x509_dn_get_rdn_ava908514 --Ref: gnutls_x509_dn_import909544 --Ref: gnutls_x509_dn_init910170 --Ref: gnutls_x509_dn_oid_known910596 --Ref: gnutls_x509_dn_oid_name911265 --Ref: gnutls_x509_policy_release911801 --Ref: gnutls_x509_privkey_cpy912164 --Ref: gnutls_x509_privkey_deinit912634 --Ref: gnutls_x509_privkey_export912881 --Ref: gnutls_x509_privkey_export2913946 --Ref: gnutls_x509_privkey_export2_pkcs8914779 --Ref: gnutls_x509_privkey_export_dsa_raw916055 --Ref: gnutls_x509_privkey_export_ecc_raw916831 --Ref: gnutls_x509_privkey_export_pkcs8917614 --Ref: gnutls_x509_privkey_export_rsa_raw919119 --Ref: gnutls_x509_privkey_export_rsa_raw2920016 --Ref: gnutls_x509_privkey_fix921038 --Ref: gnutls_x509_privkey_generate921431 --Ref: gnutls_x509_privkey_get_key_id922180 --Ref: gnutls_x509_privkey_get_pk_algorithm923172 --Ref: gnutls_x509_privkey_get_pk_algorithm2923605 --Ref: gnutls_x509_privkey_import924097 --Ref: gnutls_x509_privkey_import2924897 --Ref: gnutls_x509_privkey_import_dsa_raw925896 --Ref: gnutls_x509_privkey_import_ecc_raw926622 --Ref: gnutls_x509_privkey_import_openssl927335 --Ref: gnutls_x509_privkey_import_pkcs8928213 --Ref: gnutls_x509_privkey_import_rsa_raw929665 --Ref: gnutls_x509_privkey_import_rsa_raw2930524 --Ref: gnutls_x509_privkey_init931492 --Ref: gnutls_x509_privkey_sec_param931835 --Ref: gnutls_x509_privkey_verify_params932272 --Ref: gnutls_x509_rdn_get932629 --Ref: gnutls_x509_rdn_get_by_oid933333 --Ref: gnutls_x509_rdn_get_oid934310 --Ref: gnutls_x509_trust_list_add_cas935064 --Ref: gnutls_x509_trust_list_add_crls935683 --Ref: gnutls_x509_trust_list_add_named_crt936668 --Ref: gnutls_x509_trust_list_add_system_trust937783 --Ref: gnutls_x509_trust_list_add_trust_file938481 --Ref: gnutls_x509_trust_list_add_trust_mem939353 --Ref: gnutls_x509_trust_list_deinit940147 --Ref: gnutls_x509_trust_list_get_issuer940548 --Ref: gnutls_x509_trust_list_init941177 --Ref: gnutls_x509_trust_list_remove_cas941670 --Ref: gnutls_x509_trust_list_remove_trust_file942192 --Ref: gnutls_x509_trust_list_remove_trust_mem942804 --Ref: gnutls_x509_trust_list_verify_crt943346 --Ref: gnutls_x509_trust_list_verify_named_crt944513 --Node: OCSP API947014 --Ref: gnutls_ocsp_req_add_cert947308 --Ref: gnutls_ocsp_req_add_cert_id948273 --Ref: gnutls_ocsp_req_deinit949598 --Ref: gnutls_ocsp_req_export949820 --Ref: gnutls_ocsp_req_get_cert_id950239 --Ref: gnutls_ocsp_req_get_extension951830 --Ref: gnutls_ocsp_req_get_nonce953161 --Ref: gnutls_ocsp_req_get_version953814 --Ref: gnutls_ocsp_req_import954190 --Ref: gnutls_ocsp_req_init954691 --Ref: gnutls_ocsp_req_print955011 --Ref: gnutls_ocsp_req_randomize_nonce955746 --Ref: gnutls_ocsp_req_set_extension956184 --Ref: gnutls_ocsp_req_set_nonce956873 --Ref: gnutls_ocsp_resp_check_crt957465 --Ref: gnutls_ocsp_resp_deinit958048 --Ref: gnutls_ocsp_resp_export958277 --Ref: gnutls_ocsp_resp_get_certs958701 --Ref: gnutls_ocsp_resp_get_extension959825 --Ref: gnutls_ocsp_resp_get_nonce961164 --Ref: gnutls_ocsp_resp_get_produced961829 --Ref: gnutls_ocsp_resp_get_responder962175 --Ref: gnutls_ocsp_resp_get_response962925 --Ref: gnutls_ocsp_resp_get_signature964052 --Ref: gnutls_ocsp_resp_get_signature_algorithm964540 --Ref: gnutls_ocsp_resp_get_single965017 --Ref: gnutls_ocsp_resp_get_status966958 --Ref: gnutls_ocsp_resp_get_version967376 --Ref: gnutls_ocsp_resp_import967773 --Ref: gnutls_ocsp_resp_init968340 --Ref: gnutls_ocsp_resp_print968667 --Ref: gnutls_ocsp_resp_verify969392 --Ref: gnutls_ocsp_resp_verify_direct970984 --Node: OpenPGP API972096 --Ref: gnutls_certificate_set_openpgp_key972416 --Ref: gnutls_certificate_set_openpgp_key_file973347 --Ref: gnutls_certificate_set_openpgp_key_file2974091 --Ref: gnutls_certificate_set_openpgp_key_mem975098 --Ref: gnutls_certificate_set_openpgp_key_mem2975855 --Ref: gnutls_certificate_set_openpgp_keyring_file976879 --Ref: gnutls_certificate_set_openpgp_keyring_mem977599 --Ref: gnutls_openpgp_crt_check_hostname978359 --Ref: gnutls_openpgp_crt_deinit978930 --Ref: gnutls_openpgp_crt_export979153 --Ref: gnutls_openpgp_crt_export2979902 --Ref: gnutls_openpgp_crt_get_auth_subkey980467 --Ref: gnutls_openpgp_crt_get_creation_time981181 --Ref: gnutls_openpgp_crt_get_expiration_time981512 --Ref: gnutls_openpgp_crt_get_fingerprint981893 --Ref: gnutls_openpgp_crt_get_key_id982452 --Ref: gnutls_openpgp_crt_get_key_usage982840 --Ref: gnutls_openpgp_crt_get_name983402 --Ref: gnutls_openpgp_crt_get_pk_algorithm984132 --Ref: gnutls_openpgp_crt_get_pk_dsa_raw984850 --Ref: gnutls_openpgp_crt_get_pk_rsa_raw985551 --Ref: gnutls_openpgp_crt_get_preferred_key_id986192 --Ref: gnutls_openpgp_crt_get_revoked_status986660 --Ref: gnutls_openpgp_crt_get_subkey_count987034 --Ref: gnutls_openpgp_crt_get_subkey_creation_time987445 --Ref: gnutls_openpgp_crt_get_subkey_expiration_time987871 --Ref: gnutls_openpgp_crt_get_subkey_fingerprint988343 --Ref: gnutls_openpgp_crt_get_subkey_id989004 --Ref: gnutls_openpgp_crt_get_subkey_idx989428 --Ref: gnutls_openpgp_crt_get_subkey_pk_algorithm989842 --Ref: gnutls_openpgp_crt_get_subkey_pk_dsa_raw990683 --Ref: gnutls_openpgp_crt_get_subkey_pk_rsa_raw991454 --Ref: gnutls_openpgp_crt_get_subkey_revoked_status992161 --Ref: gnutls_openpgp_crt_get_subkey_usage992639 --Ref: gnutls_openpgp_crt_get_version993321 --Ref: gnutls_openpgp_crt_import993659 --Ref: gnutls_openpgp_crt_init994227 --Ref: gnutls_openpgp_crt_print994520 --Ref: gnutls_openpgp_crt_set_preferred_key_id995192 --Ref: gnutls_openpgp_crt_verify_ring995821 --Ref: gnutls_openpgp_crt_verify_self996717 --Ref: gnutls_openpgp_keyring_check_id997311 --Ref: gnutls_openpgp_keyring_deinit997819 --Ref: gnutls_openpgp_keyring_get_crt998082 --Ref: gnutls_openpgp_keyring_get_crt_count998749 --Ref: gnutls_openpgp_keyring_import999124 --Ref: gnutls_openpgp_keyring_init999746 --Ref: gnutls_openpgp_privkey_deinit1000071 --Ref: gnutls_openpgp_privkey_export1000320 --Ref: gnutls_openpgp_privkey_export21001288 --Ref: gnutls_openpgp_privkey_export_dsa_raw1002062 --Ref: gnutls_openpgp_privkey_export_rsa_raw1002837 --Ref: gnutls_openpgp_privkey_export_subkey_dsa_raw1003743 --Ref: gnutls_openpgp_privkey_export_subkey_rsa_raw1004588 --Ref: gnutls_openpgp_privkey_get_fingerprint1005538 --Ref: gnutls_openpgp_privkey_get_key_id1006142 --Ref: gnutls_openpgp_privkey_get_pk_algorithm1006545 --Ref: gnutls_openpgp_privkey_get_preferred_key_id1007326 --Ref: gnutls_openpgp_privkey_get_revoked_status1007828 --Ref: gnutls_openpgp_privkey_get_subkey_count1008264 --Ref: gnutls_openpgp_privkey_get_subkey_creation_time1008691 --Ref: gnutls_openpgp_privkey_get_subkey_fingerprint1009122 --Ref: gnutls_openpgp_privkey_get_subkey_id1009797 --Ref: gnutls_openpgp_privkey_get_subkey_idx1010274 --Ref: gnutls_openpgp_privkey_get_subkey_pk_algorithm1010716 --Ref: gnutls_openpgp_privkey_get_subkey_revoked_status1011585 --Ref: gnutls_openpgp_privkey_import1012057 --Ref: gnutls_openpgp_privkey_init1012768 --Ref: gnutls_openpgp_privkey_sec_param1013095 --Ref: gnutls_openpgp_privkey_set_preferred_key_id1013558 --Ref: gnutls_openpgp_set_recv_key_function1014217 --Node: PKCS 12 API1014668 --Ref: gnutls_pkcs12_bag_decrypt1014961 --Ref: gnutls_pkcs12_bag_deinit1015393 --Ref: gnutls_pkcs12_bag_encrypt1015621 --Ref: gnutls_pkcs12_bag_get_count1016126 --Ref: gnutls_pkcs12_bag_get_data1016438 --Ref: gnutls_pkcs12_bag_get_friendly_name1017039 --Ref: gnutls_pkcs12_bag_get_key_id1017671 --Ref: gnutls_pkcs12_bag_get_type1018285 --Ref: gnutls_pkcs12_bag_init1018631 --Ref: gnutls_pkcs12_bag_set_crl1019081 --Ref: gnutls_pkcs12_bag_set_crt1019514 --Ref: gnutls_pkcs12_bag_set_data1019960 --Ref: gnutls_pkcs12_bag_set_friendly_name1020431 --Ref: gnutls_pkcs12_bag_set_key_id1021110 --Ref: gnutls_pkcs12_deinit1021761 --Ref: gnutls_pkcs12_export1021973 --Ref: gnutls_pkcs12_export21022893 --Ref: gnutls_pkcs12_generate_mac1023582 --Ref: gnutls_pkcs12_get_bag1023990 --Ref: gnutls_pkcs12_import1024605 --Ref: gnutls_pkcs12_init1025331 --Ref: gnutls_pkcs12_set_bag1025759 --Ref: gnutls_pkcs12_simple_parse1026170 --Ref: gnutls_pkcs12_verify_mac1028758 --Node: PKCS 11 API1029119 --Ref: gnutls_pkcs11_add_provider1029448 --Ref: gnutls_pkcs11_copy_secret_key1029978 --Ref: gnutls_pkcs11_copy_x509_crt1030703 --Ref: gnutls_pkcs11_copy_x509_privkey1031357 --Ref: gnutls_pkcs11_deinit1032147 --Ref: gnutls_pkcs11_delete_url1032340 --Ref: gnutls_pkcs11_get_pin_function1032856 --Ref: gnutls_pkcs11_init1033219 --Ref: gnutls_pkcs11_obj_deinit1034181 --Ref: gnutls_pkcs11_obj_export1034430 --Ref: gnutls_pkcs11_obj_export21035381 --Ref: gnutls_pkcs11_obj_export_url1036090 --Ref: gnutls_pkcs11_obj_get_info1036612 --Ref: gnutls_pkcs11_obj_get_type1037482 --Ref: gnutls_pkcs11_obj_import_url1037843 --Ref: gnutls_pkcs11_obj_init1038565 --Ref: gnutls_pkcs11_obj_list_import_url1038940 --Ref: gnutls_pkcs11_obj_list_import_url21039813 --Ref: gnutls_pkcs11_obj_set_pin_function1040716 --Ref: gnutls_pkcs11_privkey_deinit1041233 --Ref: gnutls_pkcs11_privkey_export_url1041494 --Ref: gnutls_pkcs11_privkey_generate1042004 --Ref: gnutls_pkcs11_privkey_generate21042674 --Ref: gnutls_pkcs11_privkey_get_info1043690 --Ref: gnutls_pkcs11_privkey_get_pk_algorithm1044577 --Ref: gnutls_pkcs11_privkey_import_url1045113 --Ref: gnutls_pkcs11_privkey_init1045834 --Ref: gnutls_pkcs11_privkey_set_pin_function1046209 --Ref: gnutls_pkcs11_privkey_status1046729 --Ref: gnutls_pkcs11_reinit1047100 --Ref: gnutls_pkcs11_set_pin_function1047538 --Ref: gnutls_pkcs11_set_token_function1048028 --Ref: gnutls_pkcs11_token_get_flags1048434 --Ref: gnutls_pkcs11_token_get_info1048946 --Ref: gnutls_pkcs11_token_get_mechanism1049623 --Ref: gnutls_pkcs11_token_get_url1050236 --Ref: gnutls_pkcs11_token_init1050904 --Ref: gnutls_pkcs11_token_set_pin1051542 --Ref: gnutls_pkcs11_type_get_name1052155 --Ref: gnutls_x509_crt_import_pkcs111052644 --Ref: gnutls_x509_crt_import_pkcs11_url1053164 --Ref: gnutls_x509_crt_list_import_pkcs111053823 --Node: TPM API1054437 --Ref: gnutls_tpm_get_registered1054716 --Ref: gnutls_tpm_key_list_deinit1055109 --Ref: gnutls_tpm_key_list_get_url1055377 --Ref: gnutls_tpm_privkey_delete1056029 --Ref: gnutls_tpm_privkey_generate1056465 --Node: Abstract key API1057811 --Ref: gnutls_certificate_set_key1058123 --Ref: gnutls_certificate_set_retrieve_function21059486 --Ref: gnutls_pcert_deinit1061351 --Ref: gnutls_pcert_import_openpgp1061596 --Ref: gnutls_pcert_import_openpgp_raw1062206 --Ref: gnutls_pcert_import_x5091062984 --Ref: gnutls_pcert_import_x509_raw1063582 --Ref: gnutls_pcert_list_import_x509_raw1064285 --Ref: gnutls_privkey_decrypt_data1065328 --Ref: gnutls_privkey_deinit1065962 --Ref: gnutls_privkey_get_pk_algorithm1066221 --Ref: gnutls_privkey_get_type1066840 --Ref: gnutls_privkey_import_ext1067326 --Ref: gnutls_privkey_import_ext21068281 --Ref: gnutls_privkey_import_openpgp1069461 --Ref: gnutls_privkey_import_openpgp_raw1070306 --Ref: gnutls_privkey_import_pkcs111071021 --Ref: gnutls_privkey_import_pkcs11_url1071784 --Ref: gnutls_privkey_import_tpm_raw1072238 --Ref: gnutls_privkey_import_tpm_url1073110 --Ref: gnutls_privkey_import_url1074217 --Ref: gnutls_privkey_import_x5091074764 --Ref: gnutls_privkey_import_x509_raw1075517 --Ref: gnutls_privkey_init1076300 --Ref: gnutls_privkey_set_pin_function1076659 --Ref: gnutls_privkey_sign_data1077231 --Ref: gnutls_privkey_sign_hash1078247 --Ref: gnutls_privkey_sign_raw_data1079427 --Ref: gnutls_privkey_status1080445 --Ref: gnutls_pubkey_deinit1080973 --Ref: gnutls_pubkey_encrypt_data1081219 --Ref: gnutls_pubkey_export1081779 --Ref: gnutls_pubkey_export21082793 --Ref: gnutls_pubkey_get_key_id1083558 --Ref: gnutls_pubkey_get_key_usage1084548 --Ref: gnutls_pubkey_get_openpgp_key_id1085050 --Ref: gnutls_pubkey_get_pk_algorithm1086252 --Ref: gnutls_pubkey_get_pk_dsa_raw1086877 --Ref: gnutls_pubkey_get_pk_ecc_raw1087558 --Ref: gnutls_pubkey_get_pk_ecc_x9621088201 --Ref: gnutls_pubkey_get_pk_rsa_raw1088853 --Ref: gnutls_pubkey_get_preferred_hash_algorithm1089481 --Ref: gnutls_pubkey_get_verify_algorithm1090445 --Ref: gnutls_pubkey_import1091067 --Ref: gnutls_pubkey_import_dsa_raw1091786 --Ref: gnutls_pubkey_import_ecc_raw1092447 --Ref: gnutls_pubkey_import_ecc_x9621093055 --Ref: gnutls_pubkey_import_openpgp1093689 --Ref: gnutls_pubkey_import_openpgp_raw1094334 --Ref: gnutls_pubkey_import_pkcs111095028 --Ref: gnutls_pubkey_import_pkcs11_url1095581 --Ref: gnutls_pubkey_import_privkey1096093 --Ref: gnutls_pubkey_import_rsa_raw1096688 --Ref: gnutls_pubkey_import_tpm_raw1097244 --Ref: gnutls_pubkey_import_tpm_url1098021 --Ref: gnutls_pubkey_import_url1098917 --Ref: gnutls_pubkey_import_x5091099410 --Ref: gnutls_pubkey_import_x509_crq1099915 --Ref: gnutls_pubkey_import_x509_raw1100423 --Ref: gnutls_pubkey_init1101005 --Ref: gnutls_pubkey_print1101337 --Ref: gnutls_pubkey_set_key_usage1102075 --Ref: gnutls_pubkey_set_pin_function1102644 --Ref: gnutls_pubkey_verify_data1103215 --Ref: gnutls_pubkey_verify_data21103986 --Ref: gnutls_pubkey_verify_hash1104709 --Ref: gnutls_pubkey_verify_hash21105490 --Ref: gnutls_x509_crl_privkey_sign1106229 --Ref: gnutls_x509_crq_privkey_sign1107151 --Ref: gnutls_x509_crq_set_pubkey1108164 --Ref: gnutls_x509_crt_privkey_sign1108635 --Ref: gnutls_x509_crt_set_pubkey1109513 --Node: DANE API1109925 --Ref: dane_cert_type_name1110296 --Ref: dane_cert_usage_name1110585 --Ref: dane_match_type_name1110874 --Ref: dane_query_data1111156 --Ref: dane_query_deinit1111835 --Ref: dane_query_entries1112040 --Ref: dane_query_status1112282 --Ref: dane_query_tlsa1112576 --Ref: dane_state_deinit1113155 --Ref: dane_state_init1113347 --Ref: dane_state_set_dlv_file1113730 --Ref: dane_strerror1114030 --Ref: dane_verification_status_print1114529 --Ref: dane_verify_crt1115123 --Ref: dane_verify_session_crt1116993 --Node: Cryptographic API1117946 --Ref: gnutls_cipher_add_auth1118274 --Ref: gnutls_cipher_decrypt1118856 --Ref: gnutls_cipher_decrypt21119340 --Ref: gnutls_cipher_deinit1119952 --Ref: gnutls_cipher_encrypt1120237 --Ref: gnutls_cipher_encrypt21120697 --Ref: gnutls_cipher_get_block_size1121325 --Ref: gnutls_cipher_init1121626 --Ref: gnutls_cipher_set_iv1122345 --Ref: gnutls_cipher_tag1122696 --Ref: gnutls_hash1123158 --Ref: gnutls_hash_deinit1123595 --Ref: gnutls_hash_fast1123929 --Ref: gnutls_hash_get_len1124440 --Ref: gnutls_hash_init1124768 --Ref: gnutls_hash_output1125310 --Ref: gnutls_hmac1125597 --Ref: gnutls_hmac_deinit1126034 --Ref: gnutls_hmac_fast1126367 --Ref: gnutls_hmac_get_len1126980 --Ref: gnutls_hmac_init1127295 --Ref: gnutls_hmac_output1127977 --Ref: gnutls_rnd1128260 --Ref: gnutls_rnd_refresh1128651 --Node: Compatibility API1128932 --Ref: gnutls_certificate_set_rsa_export_params1129310 --Ref: gnutls_certificate_type_set_priority1129826 --Ref: gnutls_cipher_set_priority1130555 --Ref: gnutls_compression_set_priority1131279 --Ref: gnutls_kx_set_priority1132153 --Ref: gnutls_mac_set_priority1132858 --Ref: gnutls_openpgp_privkey_sign_hash1133575 --Ref: gnutls_protocol_set_priority1134277 --Ref: gnutls_rsa_export_get_modulus_bits1134821 --Ref: gnutls_rsa_export_get_pubkey1135186 --Ref: gnutls_rsa_params_cpy1135777 --Ref: gnutls_rsa_params_deinit1136206 --Ref: gnutls_rsa_params_export_pkcs11136483 --Ref: gnutls_rsa_params_export_raw1137428 --Ref: gnutls_rsa_params_generate21138345 --Ref: gnutls_rsa_params_import_pkcs11139139 --Ref: gnutls_rsa_params_import_raw1139838 --Ref: gnutls_rsa_params_init1140640 --Ref: gnutls_set_default_export_priority1141021 --Ref: gnutls_sign_callback_get1141859 --Ref: gnutls_sign_callback_set1142355 --Ref: gnutls_x509_crl_sign1143309 --Ref: gnutls_x509_crq_sign1143924 --Ref: gnutls_x509_crt_get_preferred_hash_algorithm1144486 --Ref: gnutls_x509_crt_get_verify_algorithm1145377 --Ref: gnutls_x509_crt_verify_data1146089 --Ref: gnutls_x509_crt_verify_hash1146827 --Ref: gnutls_x509_privkey_sign_data1147580 --Ref: gnutls_x509_privkey_sign_hash1148849 --Node: Copying Information1149502 --Node: Bibliography1174676 --Ref: CBCATT1174815 --Ref: GPGH1174992 --Ref: GUTPKI1175114 --Ref: KEYPIN1175288 --Ref: NISTSP800571175462 --Ref: RFC22461175709 --Ref: RFC46801175864 --Ref: RFC45141176021 --Ref: RFC43461176224 --Ref: RFC43471176373 --Ref: RFC52461176539 --Ref: RFC24401176689 --Ref: RFC48801176870 --Ref: RFC42111177063 --Ref: RFC28171177256 --Ref: RFC28181177408 --Ref: RFC29451177521 --Ref: RFC29861177670 --Ref: PKIX1177858 --Ref: RFC37491178120 --Ref: RFC38201178285 --Ref: RFC65201178527 --Ref: RFC57461178765 --Ref: RFC52801178973 --Ref: TLSTKT1179239 --Ref: PKCS121179470 --Ref: PKCS111179610 --Ref: RESCORLA1179755 --Ref: SELKEY1179851 --Ref: SSL31180009 --Ref: STEVENS1180199 --Ref: TLSEXT1180307 --Ref: TLSPGP1180523 --Ref: TLSSRP1180687 --Ref: TLSPSK1180883 --Ref: TOMSRP1181051 --Ref: WEGER1181163 --Ref: ECRYPT1181354 --Ref: RFC50561181558 --Ref: RFC59291181710 --Ref: PKCS11URI1181852 --Ref: TPMURI1182035 --Ref: ANDERSON1182228 --Ref: RFC48211182374 --Ref: RFC25601182526 --Ref: RIVESTCRL1182719 --Node: Function and Data Index1183079 --Node: Concept Index1275242 -+Node: Top1281 -+Node: Preface2463 -+Node: Introduction to GnuTLS3846 -+Node: Downloading and installing5486 -+Node: Document overview7998 -+Node: Introduction to TLS8996 -+Ref: Introduction to TLS-Footnote-110133 -+Node: TLS layers10420 -+Ref: fig:tls-layers11368 -+Node: The transport layer11443 -+Node: The TLS record protocol12047 -+Node: Encryption algorithms used in the record layer13320 -+Ref: tab:ciphers14197 -+Ref: tab:macs15479 -+Node: Compression algorithms used in the record layer16109 -+Ref: gnutls_compression_method_t17051 -+Node: Weaknesses and countermeasures17738 -+Ref: Weaknesses and countermeasures-Footnote-118762 -+Node: On Record Padding18837 -+Node: The TLS Alert Protocol20760 -+Ref: The Alert Protocol20960 -+Ref: tab:alerts21839 -+Node: The TLS Handshake Protocol24510 -+Ref: The Handshake Protocol24709 -+Node: TLS Cipher Suites25372 -+Ref: TLS Cipher Suites-Footnote-126352 -+Node: Authentication26461 -+Node: Client Authentication27176 -+Node: Resuming Sessions27652 -+Ref: resume27811 -+Node: TLS Extensions28455 -+Node: Maximum fragment length negotiation29133 -+Node: Server name indication29736 -+Ref: serverind29936 -+Node: Session tickets30782 -+Node: HeartBeat31390 -+Node: Safe renegotiation32696 -+Node: OCSP status request37592 -+Node: SRTP39414 -+Ref: gnutls_srtp_profile_t39891 -+Node: How to use TLS in application protocols42236 -+Node: Separate ports42754 -+Ref: Separate ports-Footnote-144162 -+Node: Upward negotiation44235 -+Ref: Upward negotiation-Footnote-146907 -+Node: On SSL 2 and older protocols46932 -+Node: Authentication methods48811 -+Node: Certificate authentication49704 -+Ref: tab:key-exchange50252 -+Node: X.509 certificates52628 -+Ref: fig:x50953106 -+Node: X.509 certificate structure53654 -+Ref: tab:x50954043 -+Ref: tab:x509-ext55706 -+Node: Importing an X.509 certificate58239 -+Node: X.509 distinguished names59623 -+Node: X.509 public and private keys63294 -+Node: Verifying X.509 certificate paths65736 -+Ref: gnutls_certificate_status_t73497 -+Node: Verifying a certificate in the context of TLS session75495 -+Ref: gnutls_certificate_verify_flags76976 -+Node: OpenPGP certificates79109 -+Ref: fig:openpgp79910 -+Ref: tab:openpgp-certificate80694 -+Ref: tab:openpgp-key-exchange82257 -+Ref: OpenPGP certificates-Footnote-186276 -+Node: Advanced certificate verification86328 -+Node: Verifying a certificate using trust on first use authentication87212 -+Node: Verifying a certificate using DANE88435 -+Node: Digital signatures89938 -+Node: More on certificate authentication95134 -+Node: PKCS 10 certificate requests95953 -+Ref: ex:crq99200 -+Node: PKIX certificate revocation lists101281 -+Ref: tab:crl102145 -+Node: OCSP certificate status checking107568 -+Ref: tab:ocsp-response114248 -+Ref: gnutls_x509_crl_reason_t117669 -+Node: Managing encrypted keys119003 -+Ref: gnutls_pkcs_encrypt_flags_t123055 -+Node: certtool Invocation129823 -+Ref: certtool usage130411 -+Ref: certtool debug136363 -+Ref: certtool generate-request136508 -+Ref: certtool verify-chain136851 -+Ref: certtool verify137027 -+Ref: certtool verify-crl137344 -+Ref: certtool get-dh-params137643 -+Ref: certtool load-privkey137940 -+Ref: certtool load-pubkey138112 -+Ref: certtool load-certificate138282 -+Ref: certtool load-ca-privkey138463 -+Ref: certtool load-ca-certificate138667 -+Ref: certtool cprint138879 -+Ref: certtool null-password139112 -+Ref: certtool pubkey-info139304 -+Ref: certtool to-p12139546 -+Ref: certtool rsa139846 -+Ref: certtool dsa139977 -+Ref: certtool ecc140107 -+Ref: certtool ecdsa140279 -+Ref: certtool hash140396 -+Ref: certtool inder140586 -+Ref: certtool inraw140908 -+Ref: certtool outder141031 -+Ref: certtool outraw141181 -+Ref: certtool sec-param141309 -+Ref: certtool pkcs-cipher141531 -+Ref: certtool exit status141770 -+Ref: certtool See Also142001 -+Ref: certtool Examples142051 -+Ref: certtool Files145935 -+Node: ocsptool Invocation151325 -+Ref: ocsptool usage151866 -+Ref: ocsptool debug154972 -+Ref: ocsptool ask155117 -+Ref: ocsptool exit status155512 -+Ref: ocsptool See Also155743 -+Ref: ocsptool Examples155794 -+Node: danetool Invocation160755 -+Ref: danetool usage161209 -+Ref: danetool debug164403 -+Ref: danetool load-pubkey164548 -+Ref: danetool load-certificate164717 -+Ref: danetool dlv164898 -+Ref: danetool hash165058 -+Ref: danetool check165248 -+Ref: danetool check-ee165535 -+Ref: danetool check-ca165716 -+Ref: danetool insecure165892 -+Ref: danetool local-dns166036 -+Ref: danetool inder166265 -+Ref: danetool inraw166587 -+Ref: danetool tlsa-rr166710 -+Ref: danetool host167007 -+Ref: danetool proto167200 -+Ref: danetool ca167421 -+Ref: danetool x509167593 -+Ref: danetool local167852 -+Ref: danetool domain167978 -+Ref: danetool exit status168383 -+Ref: danetool See Also168614 -+Ref: danetool Examples168665 -+Node: Shared-key and anonymous authentication169822 -+Node: SRP authentication170391 -+Node: Authentication using SRP170654 -+Node: srptool Invocation173700 -+Ref: srptool usage174515 -+Ref: srptool debug176528 -+Ref: srptool verify176673 -+Ref: srptool passwd-conf176810 -+Ref: srptool create-conf177011 -+Ref: srptool exit status177257 -+Ref: srptool See Also177486 -+Ref: srptool Examples177600 -+Node: PSK authentication178238 -+Node: Authentication using PSK178534 -+Node: psktool Invocation179755 -+Ref: psktool usage180242 -+Ref: psktool debug181761 -+Ref: psktool exit status181906 -+Ref: psktool See Also182135 -+Ref: psktool Examples182236 -+Node: Anonymous authentication182690 @@ 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 bonivart at users.sourceforge.net Sat Sep 21 23:43:56 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 21 Sep 2013 21:43:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21982] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 21982 http://gar.svn.sourceforge.net/gar/?rev=21982&view=rev Author: bonivart Date: 2013-09-21 21:43:56 +0000 (Sat, 21 Sep 2013) Log Message: ----------- clamav/trunk: update to 0.98 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2013-09-21 16:01:31 UTC (rev 21981) +++ csw/mgar/pkg/clamav/trunk/Makefile 2013-09-21 21:43:56 UTC (rev 21982) @@ -1,16 +1,11 @@ NAME = clamav -VERSION = 0.97.8 +VERSION = 0.98 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest GARTYPE = v2 DESCRIPTION = Clam AntiVirus define BLURB - Clam AntiVirus is an open source (GPL) anti-virus toolkit for UNIX, designed - especially for e-mail scanning on mail gateways. It provides a number of - utilities including a flexible and scalable multi-threaded daemon, a command - line scanner and advanced tool for automatic database updates. The core of - the package is an anti-virus engine available in a form of shared library. endef SF_PROJECT = clamav @@ -44,15 +39,15 @@ RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6 INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel -PATCHFILES = CSWclamav.freshclam.conf.p -PATCHFILES += CSWclamav.clamd.conf.p -PATCHFILES += CSWclamav.clamav-milter.conf.p -PATCHFILES += CSWclamav.optparser.c.p +#PATCHFILES = CSWclamav.freshclam.conf.p +#PATCHFILES += CSWclamav.clamd.conf.p +#PATCHFILES += CSWclamav.clamav-milter.conf.p +#PATCHFILES += CSWclamav.optparser.c.p # Must have 64-bit libmilter for this to work #BUILD64 = 1 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GNU @@ -98,14 +93,25 @@ #SKIPTEST = 1 +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.sample +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-milter.conf.sample +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clambc +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamconf +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamscan +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdscan +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdtop +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/sigtool +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamd +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamav-milter + # These are harmless examples -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW -CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.17 +CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.18 # We don't split to three separate packages -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.17|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.17|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.17|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.18|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.18|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.18|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 # Weirdly needed for sparc CHECKPKG_OVERRIDES_CSWlibclam6 += surplus-dependency|CSWlibstdc++6 @@ -137,7 +143,7 @@ # @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib @ginstall -d $(DOCDEST)/html @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html - @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf +# @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf # rm -f $(DESTDIR)/var/opt/csw/$(NAME)/db/* @ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/db @$(MAKECOOKIE) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2013-09-21 16:01:31 UTC (rev 21981) +++ csw/mgar/pkg/clamav/trunk/checksums 2013-09-21 21:43:56 UTC (rev 21982) @@ -1 +1 @@ -ac52bcbad3ea72eac08fedb9772f648b clamav-0.97.8.tar.gz +ca0b8c930efcb8be1d47592d268006c5 clamav-0.98.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Sep 22 14:57:42 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 22 Sep 2013 12:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21983] csw/mgar/pkg/scons/trunk Message-ID: Revision: 21983 http://gar.svn.sourceforge.net/gar/?rev=21983&view=rev Author: rthurner Date: 2013-09-22 12:57:41 +0000 (Sun, 22 Sep 2013) Log Message: ----------- scons, update to scons-2.3.0 Modified Paths: -------------- csw/mgar/pkg/scons/trunk/Makefile csw/mgar/pkg/scons/trunk/checksums Modified: csw/mgar/pkg/scons/trunk/Makefile =================================================================== --- csw/mgar/pkg/scons/trunk/Makefile 2013-09-21 21:43:56 UTC (rev 21982) +++ csw/mgar/pkg/scons/trunk/Makefile 2013-09-22 12:57:41 UTC (rev 21983) @@ -1,7 +1,7 @@ # $Id$ NAME = scons -VERSION = 2.1.0 +VERSION = 2.3.0 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/scons/trunk/checksums =================================================================== --- csw/mgar/pkg/scons/trunk/checksums 2013-09-21 21:43:56 UTC (rev 21982) +++ csw/mgar/pkg/scons/trunk/checksums 2013-09-22 12:57:41 UTC (rev 21983) @@ -1 +1 @@ -47daf989e303a045b76c11236df719df scons-2.1.0.tar.gz +083ce5624d6adcbdaf2526623f456ca9 scons-2.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Sep 22 15:59:20 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 22 Sep 2013 13:59:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21984] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 21984 http://gar.svn.sourceforge.net/gar/?rev=21984&view=rev Author: rthurner Date: 2013-09-22 13:59:20 +0000 (Sun, 22 Sep 2013) Log Message: ----------- libserf, upgrade to serf-1.3.1 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2013-09-22 12:57:41 UTC (rev 21983) +++ csw/mgar/pkg/libserf/trunk/Makefile 2013-09-22 13:59:20 UTC (rev 21984) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.3.0 +VERSION = 1.3.1 DISTNAME = serf-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2013-09-22 12:57:41 UTC (rev 21983) +++ csw/mgar/pkg/libserf/trunk/checksums 2013-09-22 13:59:20 UTC (rev 21984) @@ -1 +1 @@ -bb0dbf9494495db7e8b34eac99b2dc3a serf-1.3.0.tar.bz2 +da5aca0cad19fd9c19129c3f8f7393dd serf-1.3.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Sep 22 16:26:38 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 22 Sep 2013 14:26:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21985] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 21985 http://gar.svn.sourceforge.net/gar/?rev=21985&view=rev Author: bonivart Date: 2013-09-22 14:26:38 +0000 (Sun, 22 Sep 2013) Log Message: ----------- clamav/trunk: new patch style, fix conf samples Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2013-09-22 13:59:20 UTC (rev 21984) +++ csw/mgar/pkg/clamav/trunk/Makefile 2013-09-22 14:26:38 UTC (rev 21985) @@ -1,7 +1,5 @@ NAME = clamav VERSION = 0.98 -#VERSION = 0.97rc -#DISTNAME = $(NAME)-devel-latest GARTYPE = v2 DESCRIPTION = Clam AntiVirus @@ -10,10 +8,7 @@ SF_PROJECT = clamav MASTER_SITES = $(SF_MIRRORS) -#MASTER_SITES = http://www.clamav.net/snapshot/ -#MASTER_SITES = http://www.clamav.net/internal/ DISTFILES = $(NAME)-$(VERSION).tar.gz -#DISTFILES = $(NAME)-devel-latest.tar.gz PACKAGES += CSWclamav CATALOGNAME_CSWclamav = clamav @@ -39,16 +34,11 @@ RUNTIME_DEP_PKGS_CSWlibclam6-dev = CSWlibclam6 INCOMPATIBLE_PKGS_CSWlibclam6-dev = CSWlibclamav-devel CSWlibclamav6-devel -#PATCHFILES = CSWclamav.freshclam.conf.p -#PATCHFILES += CSWclamav.clamd.conf.p -#PATCHFILES += CSWclamav.clamav-milter.conf.p -#PATCHFILES += CSWclamav.optparser.c.p +PATCHFILES += 0001-Enable-conf-files-fix-some-paths.patch # Must have 64-bit libmilter for this to work #BUILD64 = 1 -#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - GARCOMPILER = GNU sysconfdir = /etc/opt/csw @@ -93,20 +83,9 @@ #SKIPTEST = 1 -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.sample -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamav-milter.conf.sample -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clambc -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/freshclam -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamconf -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamscan -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdscan -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/clamdtop -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/bin/sigtool -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamd -CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/sbin/clamav-milter - # These are harmless examples CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.18 +CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW # We don't split to three separate packages CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.18|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 @@ -144,6 +123,9 @@ @ginstall -d $(DOCDEST)/html @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html # @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf + @mv $(DESTDIR)$(sysconfdir)/freshclam.conf.sample $(DESTDIR)$(sysconfdir)/freshclam.conf + @mv $(DESTDIR)$(sysconfdir)/clamav-milter.conf.sample $(DESTDIR)$(sysconfdir)/clamav-milter.conf + @mv $(DESTDIR)$(sysconfdir)/clamd.conf.sample $(DESTDIR)$(sysconfdir)/clamd.conf # rm -f $(DESTDIR)/var/opt/csw/$(NAME)/db/* @ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/db @$(MAKECOOKIE) Added: csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch =================================================================== --- csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/0001-Enable-conf-files-fix-some-paths.patch 2013-09-22 14:26:38 UTC (rev 21985) @@ -0,0 +1,85 @@ +From e9e2ae967643bd37ed0533aadffac2f7503d8006 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Sun, 22 Sep 2013 14:55:21 +0200 +Subject: [PATCH] Enable conf files, fix some paths + +--- + etc/clamav-milter.conf.sample | 4 ++-- + etc/clamd.conf.sample | 4 ++-- + etc/freshclam.conf.sample | 2 +- + shared/optparser.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample +index b7d66a4..2a968c7 100644 +--- a/etc/clamav-milter.conf.sample ++++ b/etc/clamav-milter.conf.sample +@@ -3,7 +3,7 @@ + ## + + # Comment or remove the line below. +-Example ++#Example + + + ## +@@ -201,7 +201,7 @@ Example + # Note #3: clamav-milter will wait for the process to exit. Be quick or fork to + # avoid unnecessary delays in email delievery + # Default: disabled +-#VirusAction /usr/local/bin/my_infected_message_handler ++#VirusAction /opt/csw/bin/my_infected_message_handler + + ## + ## Logging options +diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample +index 9aab51a..4c3f4d6 100644 +--- a/etc/clamd.conf.sample ++++ b/etc/clamd.conf.sample +@@ -5,7 +5,7 @@ + + + # Comment or remove the line below. +-Example ++#Example + + # Uncomment this option to enable logging. + # LogFile must be writable for the user running daemon. +@@ -82,7 +82,7 @@ Example + + # Path to a local socket file the daemon will listen on. + # Default: disabled (must be specified by a user) +-#LocalSocket /tmp/clamd.socket ++LocalSocket /tmp/clamd.socket + + # Sets the group ownership on the unix socket. + # Default: disabled (the primary group of the user running clamd) +diff --git a/etc/freshclam.conf.sample b/etc/freshclam.conf.sample +index d2ea3d1..859bfea 100644 +--- a/etc/freshclam.conf.sample ++++ b/etc/freshclam.conf.sample +@@ -5,7 +5,7 @@ + + + # Comment or remove the line below. +-Example ++#Example + + # Path to the database directory. + # WARNING: It must match clamd.conf's directive! +diff --git a/shared/optparser.c b/shared/optparser.c +index d706098..b34db39 100644 +--- a/shared/optparser.c ++++ b/shared/optparser.c +@@ -483,7 +483,7 @@ const struct clam_option __clam_options[] = { + + { "ReportHostname", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "When AddHeader is in use, this option allows to arbitrary set the reported\nhostname. This may be desirable in order to avoid leaking internal names.\nIf unset the real machine name is used.", "my.mail.server.name" }, + +- { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/usr/local/bin/my_infected_message_handler" }, ++ { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/opt/csw/bin/my_infected_message_handler" }, + + { "Chroot", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Chroot to the specified directory.\nChrooting is performed just after reading the config file and before\ndropping privileges.", "/newroot" }, + +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Sep 23 09:20:16 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 23 Sep 2013 07:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21986] csw/mgar/pkg/zlib/trunk/Makefile Message-ID: Revision: 21986 http://gar.svn.sourceforge.net/gar/?rev=21986&view=rev Author: guengel Date: 2013-09-23 07:20:16 +0000 (Mon, 23 Sep 2013) Log Message: ----------- zlib/trunk: Use bash instead of sh in configure script. Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2013-09-22 14:26:38 UTC (rev 21985) +++ csw/mgar/pkg/zlib/trunk/Makefile 2013-09-23 07:20:16 UTC (rev 21986) @@ -51,4 +51,12 @@ CONFIGURE_ARGS += --includedir=$(includedir) CONFIGURE_ARGS += --shared +# By default, the configure script uses /bin/sh +# which gives trouble when expanding $mandir, i.e. +# we end up with man pages installed into +# /opt/csw/share/man/share/man} +REINPLACE_MATCH = ^\#!/bin/sh +REINPLACE_WITH = \#!$(prefix)/bin/bash +REINPLACE_FILES = configure + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Sep 23 22:26:12 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 23 Sep 2013 20:26:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21987] csw/mgar/pkg/torque/trunk Message-ID: Revision: 21987 http://gar.svn.sourceforge.net/gar/?rev=21987&view=rev Author: wahwah Date: 2013-09-23 20:26:11 +0000 (Mon, 23 Sep 2013) Log Message: ----------- torque/trunk: The newest version fails. Modified Paths: -------------- csw/mgar/pkg/torque/trunk/Makefile csw/mgar/pkg/torque/trunk/checksums Added Paths: ----------- csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch Modified: csw/mgar/pkg/torque/trunk/Makefile =================================================================== --- csw/mgar/pkg/torque/trunk/Makefile 2013-09-23 07:20:16 UTC (rev 21986) +++ csw/mgar/pkg/torque/trunk/Makefile 2013-09-23 20:26:11 UTC (rev 21987) @@ -2,16 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# ! still fails: +# checking for on_exit... no +# configure: error: Must have atexit() or on_exit() + NAME = torque -VERSION = 3.0.2 +VERSION = 4.2.5 GARTYPE = v2 DESCRIPTION = Batch job scheduling system -MASTER_SITES += http://www.adaptivecomputing.com/resources/downloads/torque/ +# Their download process is broken. Our scheme won't work. This is the URL for the 4.2.5 version: +# http://www.adaptivecomputing.com/index.php?wpfb_dl=1677 +# But the file downloaded has a different name, and only downloads after a HTTP redirect. + +# MASTER_SITES += http://adaptive.wpengine.com/resources/downloads/torque/ DISTFILES += $(DISTNAME).tar.gz -PATCHFILES += 0001-daemonize-function-prototype.patch +# PATCHFILES += 0001-daemonize-function-prototype.patch +PATCHFILES += 0001-Disable-the-broken-lxml2-detection.patch +PATCHFILES += 0002-Replace-an-obsolete-macro.patch +PATCHFILES += 0003-Hardcode-the-name-of-libxml2-library.patch + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-server-home @@ -20,10 +32,19 @@ # CSWtk 8.5 is only available on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -VENDOR_URL = http://www.clusterresources.com/products/torque-resource-manager.php +VENDOR_URL = http://www.adaptivecomputing.com/products/open-source/torque/ LICENSE = PBS_License_2.5.txt +# Their libxml2 detection is broken. There is a custom sed expression that is +# supposed to filter the output from libxml2-config, but it doesn't work. +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibssl-dev +# BUILD_DEP_PKGS += CSWautoconf +# BUILD_DEP_PKGS += CSWautomake +# BUILD_DEP_PKGS += CSWlibtool +# BUILD_DEP_PKGS += CSWpkgconfig + PACKAGES = CSWtorque SPKG_DESC_CSWtorque = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWtorque-dev += CSWlibtorque2 @@ -51,3 +72,7 @@ include gar/category.mk PATH := /opt/csw/gnu:$(PATH) + +# pre-configure: +# cd $(WORKSRC); autoreconf -fi +# $(MAKECOOKIE) Modified: csw/mgar/pkg/torque/trunk/checksums =================================================================== --- csw/mgar/pkg/torque/trunk/checksums 2013-09-23 07:20:16 UTC (rev 21986) +++ csw/mgar/pkg/torque/trunk/checksums 2013-09-23 20:26:11 UTC (rev 21987) @@ -1 +1 @@ -a2f008c7eeffcb3a0721fbb252397936 torque-3.0.2.tar.gz +1e5053efe77090c55529210855af47a0 torque-4.2.5.tar.gz Added: csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch =================================================================== --- csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch (rev 0) +++ csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch 2013-09-23 20:26:11 UTC (rev 21987) @@ -0,0 +1,50 @@ +From d212de7e660a354ce0e214cbc7bf99d2d2ceda1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 23 Sep 2013 20:43:10 +0100 +Subject: [PATCH] Disable the broken -lxml2 detection + +The xml2-config utility returns not just "-lxml2" like on Ubuntu, but instead it outputs this: + +-L/opt/csw/lib -R/opt/csw/lib -lxml2 -lz -lpthread -liconv -lm -lsocket -lnsl + +...and so the sed expression fails to extract the right information. +--- + configure | 2 +- + configure.ac | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 364455e..2b00e82 100755 +--- a/configure ++++ b/configure +@@ -17841,7 +17841,7 @@ as_val=`eval 'as_val=${'$as_ac_Lib'} + #define `$as_echo "HAVE_LIB${xmlLib}" | $as_tr_cpp` 1 + _ACEOF + +- LIBS="-l${xmlLib} $LIBS" ++ LIBS="${xmlLib} $LIBS" + + else + { { $as_echo "$as_me:$LINENO: error: TORQUE needs libxml2-devel in order to build" >&5 +diff --git a/configure.ac b/configure.ac +index fbadb19..81dd98d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -749,7 +749,13 @@ AC_CHECK_LIB(crypto, BN_init, + dnl + dnl we need libxml2 + dnl +-xmlLib=`xml2-config --libs | sed 's/-L@<:@^@<:@:space:@:>@@:>@* //g;s/-l//'` ++dnl xmlLib=`xml2-config --libs | sed 's/-L@<:@^@<:@:space:@:>@@:>@* //g;s/-l//'` ++dnl on Solaris: ++dnl -L/opt/csw/lib -R/opt/csw/lib -lxml2 -lz -lpthread -liconv -lm -lsocket -lnsl ++dnl on Ubuntu: ++dnl -lxml2 ++dnl so the sed expression doesn't work on Solaris at all. ++xmlLib=xml2 + + dnl skip the first two chars because its -l + AC_CHECK_LIB(${xmlLib}, xmlGetProp, +-- +1.8.3.4 + Added: csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch =================================================================== --- csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch (rev 0) +++ csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch 2013-09-23 20:26:11 UTC (rev 21987) @@ -0,0 +1,26 @@ +From 81c917d4af507aad4678c91b1cdaa8d0c72a625c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 23 Sep 2013 20:48:59 +0100 +Subject: [PATCH] Replace an obsolete macro + +AM_CONFIG_HEADER -> AM_CONFIG_HEADERS +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 81dd98d..5494755 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,7 +79,7 @@ gccwarnings=yes + dnl Instead of putting a long list of defines on the command line + dnl for each compile, use a file called "pbs_config.h" that will + dnl be created in the include directory. +-AM_CONFIG_HEADER([src/include/pbs_config.h]) ++AC_CONFIG_HEADERS([src/include/pbs_config.h]) + + dnl + dnl Find our git revision hash for program outputs +-- +1.8.3.4 + Added: csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch =================================================================== --- csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch (rev 0) +++ csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch 2013-09-23 20:26:11 UTC (rev 21987) @@ -0,0 +1,26 @@ +From 76b05d335f1e06e252a630dfac81b2c6992fba62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Mon, 23 Sep 2013 21:19:20 +0100 +Subject: [PATCH] Hardcode the name of libxml2 library. + +--- + configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 2b00e82..70eeafd 100755 +--- a/configure ++++ b/configure +@@ -17763,7 +17763,8 @@ fi + + + +-xmlLib=`xml2-config --libs | sed 's/-L[^[:space:]]* //g;s/-l//'` ++# xmlLib=`xml2-config --libs | sed 's/-L[^[:space:]]* //g;s/-l//'` ++xmlLib=xml2 + + + as_ac_Lib=`$as_echo "ac_cv_lib_${xmlLib}''_xmlGetProp" | $as_tr_sh` +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 24 10:19:51 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Sep 2013 08:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21988] csw/mgar/pkg/m4/trunk Message-ID: Revision: 21988 http://gar.svn.sourceforge.net/gar/?rev=21988&view=rev Author: dmichelsen Date: 2013-09-24 08:19:51 +0000 (Tue, 24 Sep 2013) Log Message: ----------- m4/trunk: Update to 1.4.17 Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/m4/trunk/checksums Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2013-09-23 20:26:11 UTC (rev 21987) +++ csw/mgar/pkg/m4/trunk/Makefile 2013-09-24 08:19:51 UTC (rev 21988) @@ -1,5 +1,5 @@ NAME = m4 -VERSION = 1.4.16 +VERSION = 1.4.17 GARTYPE = v2 DESCRIPTION = GNU m4 Unix macro processor @@ -11,20 +11,29 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.xz +DISTFILES += $(DISTNAME).tar.xz +VENDOR_URL = http://www.gnu.org/software/m4/ + +GARCOMPILER = SOS12U3 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +# Having a .git in $WORKSRC turns on developer mode and enabled gcc flags. +# Disable until this is fixed: +# http://lists.gnu.org/archive/html/bug-m4/2013-09/msg00009.html +NOGITPATCH = 1 + PACKAGES = CSWgm4 -SPKG_SOURCEURL = http://www.gnu.org/software/m4/ +BUILD64 = 1 +ISAEXEC = 1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g # This must only be shipped by libiconv -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +EXTRA_MERGE_EXCLUDE_FILES = .*/charset.alias include gar/category.mk Modified: csw/mgar/pkg/m4/trunk/checksums =================================================================== --- csw/mgar/pkg/m4/trunk/checksums 2013-09-23 20:26:11 UTC (rev 21987) +++ csw/mgar/pkg/m4/trunk/checksums 2013-09-24 08:19:51 UTC (rev 21988) @@ -1 +1 @@ -7548ec061a1ba993790159764f522d0e m4-1.4.16.tar.xz +12a3c829301a4fd6586a57d3fcf196dc m4-1.4.17.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 24 10:38:06 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 24 Sep 2013 08:38:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21989] csw/mgar/pkg/m4/trunk/Makefile Message-ID: Revision: 21989 http://gar.svn.sourceforge.net/gar/?rev=21989&view=rev Author: dmichelsen Date: 2013-09-24 08:38:06 +0000 (Tue, 24 Sep 2013) Log Message: ----------- m4/trunk: Default compiler and platforms is ok Modified Paths: -------------- csw/mgar/pkg/m4/trunk/Makefile Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2013-09-24 08:19:51 UTC (rev 21988) +++ csw/mgar/pkg/m4/trunk/Makefile 2013-09-24 08:38:06 UTC (rev 21989) @@ -15,10 +15,6 @@ VENDOR_URL = http://www.gnu.org/software/m4/ -GARCOMPILER = SOS12U3 -PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 - # Having a .git in $WORKSRC turns on developer mode and enabled gcc flags. # Disable until this is fixed: # http://lists.gnu.org/archive/html/bug-m4/2013-09/msg00009.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 24 13:50:13 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Sep 2013 11:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21990] csw/mgar/pkg/lang-python/pyqt/trunk Message-ID: Revision: 21990 http://gar.svn.sourceforge.net/gar/?rev=21990&view=rev Author: pfelecan Date: 2013-09-24 11:50:11 +0000 (Tue, 24 Sep 2013) Log Message: ----------- lang-python/pyqt/trunk: - supports only Python 2.7 for ABI compatibility reasons - addition of a documentation package - supports webkit and xmlpatterns as delivered by the new Qt4 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-24 08:38:06 UTC (rev 21989) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-24 11:50:11 UTC (rev 21990) @@ -4,6 +4,8 @@ VERSION = 4.10.2 CATEGORIES = python PYTHON_VERSION = 2_7 +# support only Python 2.7 as it is build with gcc +MODULATIONS_PYTHON_VERSION = $(PYTHON_VERSION) GARTYPE = v2 DESCRIPTION = Python bindings for Qt @@ -23,6 +25,7 @@ BUILD_DEP_PKGS += CSWqt4-dev BUILD_DEP_PKGS += CSWpy-sip +BUILD_DEP_PKGS += CSWpython27-dev GARCOMPILER = GNU EXTRA_CFLAGS += -std=gnu99 -D_XPG6 @@ -41,18 +44,23 @@ SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files ARCHALL_CSWpy-pyqt-common = 1 +PACKAGES += CSWpy-pyqt-doc +CATALOGNAME_CSWpy-pyqt-doc = py_pyqt_doc +SPKG_DESC_CSWpy-pyqt-doc = $(DESCRIPTION), documentation +PKGFILES_CSWpy-pyqt-doc += $(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)/.* +ARCHALL_CSWpy-pyqt-doc = 1 + PACKAGES += CSWpy-pyqt CATALOGNAME_CSWpy-pyqt = py_pyqt SPKG_DESC_CSWpy-pyqt = $(DESCRIPTION) PKGFILES_CSWpy-pyqt += /opt/csw/bin/pylupdate4 PKGFILES_CSWpy-pyqt += /opt/csw/bin/pyrcc4 -PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/PyQt4/.*[.]so -PKGFILES_CSWpy-pyqt += /opt/csw/plugins/designer/libpythonplugin.so -PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/dbus/mainloop/qt.so +PKGFILES_CSWpy-pyqt += $(PYTHON_SITE_PACKAGES)/PyQt4/.* +PKGFILES_CSWpy-pyqt += /opt/csw/lib/qt4/plugins/designer/.* RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibphonon4 -RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdbus4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdeclarative4 @@ -70,10 +78,9 @@ RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWpy-pyqt-common -CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpy-pyqt-common -CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386 +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386 include gar/category.mk @@ -152,5 +159,7 @@ $(INSTALL_ENV) \ $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(DESTDIR) install ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/pyqtconfig.py $(DESTDIR)/$(PYTHON_SITE_PACKAGES)/PyQt4 - + ginstall -d "$(DESTDIR)$(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)" + gtar --directory=$(WORKSRC)/doc --create --file=- html | \ + gtar --directory="$(DESTDIR)$(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)" --extract --file=- @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-09-24 08:38:06 UTC (rev 21989) +++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-09-24 11:50:11 UTC (rev 21990) @@ -1,14 +1,16 @@ -From a61b2572022b23ee0f6f6b1c3cebf786d850e62f Mon Sep 17 00:00:00 2001 +From 43252bcbc6f7166bc5dc75a1a5c552f425f0737d Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Wed, 10 Jul 2013 19:14:25 +0200 +Date: Tue, 24 Sep 2013 10:17:14 +0200 Subject: [PATCH] disable ocsw unsupported modules +- QAxContainer is for COM +- QtAssistant is obsoleted --- - configure-ng.py | 18 ------------------ - 1 file changed, 18 deletions(-) + configure-ng.py | 6 ------ + 1 file changed, 6 deletions(-) diff --git a/configure-ng.py b/configure-ng.py -index 100ba59..3ee4977 100644 +index 100ba59..5781614 100644 --- a/configure-ng.py +++ b/configure-ng.py @@ -73,10 +73,8 @@ class ModuleMetadata: @@ -22,18 +24,7 @@ 'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib='qpycore'), 'QtDBus': ModuleMetadata(qmake_QT=['dbus', '-gui'], qpy_lib='qpydbus'), -@@ -95,10 +93,7 @@ QT4_MODULES = { - 'QtSql': ModuleMetadata(qmake_QT=['sql']), - 'QtSvg': ModuleMetadata(qmake_QT=['svg']), - 'QtTest': ModuleMetadata(qmake_QT=['testlib']), -- 'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']), - 'QtXml': ModuleMetadata(qmake_QT=['xml', '-gui']), -- 'QtXmlPatterns': ModuleMetadata( -- qmake_QT=['xmlpatterns', '-gui', 'network']), - 'phonon': ModuleMetadata(qmake_QT=['phonon']) - } - -@@ -106,7 +101,6 @@ QT4_MODULES = { +@@ -106,7 +104,6 @@ QT4_MODULES = { QT5_MODULES = { 'dbus': ModuleMetadata(qmake_QT=['-gui'], qmake_TARGET='qt', in_consolidated=False), @@ -41,33 +32,7 @@ 'Qt': ModuleMetadata(qmake_QT=['-core', '-gui'], in_consolidated=False), 'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib='qpycore'), -@@ -129,12 +123,7 @@ QT5_MODULES = { - 'QtSql': ModuleMetadata(qmake_QT=['sql', 'widgets']), - 'QtSvg': ModuleMetadata(qmake_QT=['svg']), - 'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']), -- 'QtWebKit': ModuleMetadata( -- qmake_QT=['webkit', 'webkitwidgets', -- 'network']), - 'QtXml': ModuleMetadata(qmake_QT=['xml', '-gui']), -- 'QtXmlPatterns': ModuleMetadata( -- qmake_QT=['xmlpatterns', '-gui', 'network']) - } - - -@@ -948,12 +937,8 @@ def check_modules(target_config, verbose): - 'new QSvgWidget()') - check_module(target_config, verbose, 'QtTest', 'QtTest', - 'QTest::qSleep(0)') -- check_module(target_config, verbose, 'QtWebKit', 'qwebpage.h', -- 'new QWebPage()') - check_module(target_config, verbose, 'QtXml', 'qdom.h', - 'new QDomDocument()') -- check_module(target_config, verbose, 'QtXmlPatterns', 'qxmlname.h', -- 'new QXmlName()') - - if target_config.qt_version < 0x050000: - check_module(target_config, verbose, 'phonon', 'phonon/videowidget.h', -@@ -969,9 +954,6 @@ def check_modules(target_config, verbose): +@@ -969,9 +966,6 @@ def check_modules(target_config, verbose): else: inform("QtDesigner module disabled with static Qt libraries.") @@ -78,5 +43,5 @@ # properly versioning its API. if target_config.qt_version >= 0x040700: -- -1.8.3.1 +1.8.3.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Sep 24 16:56:58 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 24 Sep 2013 14:56:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21991] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 21991 http://gar.svn.sourceforge.net/gar/?rev=21991&view=rev Author: pfelecan Date: 2013-09-24 14:56:57 +0000 (Tue, 24 Sep 2013) Log Message: ----------- lang-python/pyqt/trunk: exclude experimental Python 3 code Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-24 11:50:11 UTC (rev 21990) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-24 14:56:57 UTC (rev 21991) @@ -39,6 +39,10 @@ INSTALL_SCRIPTS = custom +# experimental Python 3 code which is indiscriminately included and +# raises compilation error when Python 2 is used... +EXTRA_MERGE_EXCLUDE_FILES += $(PYTHON_SITE_PACKAGES)/PyQt4/uic/port_v3/.* + PACKAGES += CSWpy-pyqt-common CATALOGNAME_CSWpy-pyqt-common = py_pyqt_common SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 24 20:46:55 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 24 Sep 2013 18:46:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21992] csw/mgar/pkg/samba/branches/samba4/ Message-ID: Revision: 21992 http://gar.svn.sourceforge.net/gar/?rev=21992&view=rev Author: wahwah Date: 2013-09-24 18:46:55 +0000 (Tue, 24 Sep 2013) Log Message: ----------- samba: Make a branch for samba 4 experiments Added Paths: ----------- csw/mgar/pkg/samba/branches/samba4/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Sep 24 20:49:34 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 24 Sep 2013 18:49:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21993] csw/mgar/pkg/samba/branches/samba4 Message-ID: Revision: 21993 http://gar.svn.sourceforge.net/gar/?rev=21993&view=rev Author: slowfranklin Date: 2013-09-24 18:49:34 +0000 (Tue, 24 Sep 2013) Log Message: ----------- samba/branches/samba4: Another work in progress Samba4 package Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Added Paths: ----------- csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-24 18:46:55 UTC (rev 21992) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-24 18:49:34 UTC (rev 21993) @@ -1,10 +1,5 @@ -#Todo stuff -# There are lots of files and libs which are part of samba 3 package too. There should be removed from packinging -# See http://sources.debian.net/src/samba4/4.0.3%2Bdfsg1-0.1/debian/rules -# All remaining libs are need to be split off. See debian package too. - NAME = samba -VERSION = 4.0.6 +VERSION = 4.0.9 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -16,249 +11,539 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += cswsamba DISTFILES += cswwinbind +# From http://www.reallylinux.com/docs/smb.conf +DISTFILES += smb.conf +# This is taken from the old Samba package +DISTFILES += cswkrb5.conf EXPANDVARS += cswsamba EXPANDVARS += cswwinbind EXPANDVARS += smb.conf -# From http://www.reallylinux.com/docs/smb.conf -DISTFILES += smb.conf +GARCOMPILER = GNU +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +BUILD_DEP_PKGS += CSWlibtalloc-dev -# This is taken from the old Samba package -DISTFILES += cswkrb5.conf - PATCHFILES += 0001-fix-xml.patch -#From https://bugzilla.samba.org/show_bug.cgi?id=7588 +# From https://bugzilla.samba.org/show_bug.cgi?id=7588 PATCHFILES += nss_winbind.patch PATCHFILES += smbd_patch_for_setgroups.patch +# From https://bugzilla.samba.org/show_bug.cgi?id=10112 +PATCHFILES += 0003-Use-R-linker-flag-instead-of-rpath.patch -BUILD_DEP_PKGS += CSWlibtalloc-dev -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# Filesystem layout +SMBLOCKDIR = $(localstatedir)/samba/locks +SMBLOGDIR = $(localstatedir)/samba/log +SMBPRIVATEDIR = $(sysconfdir)/samba/private +SMBCONFIGDIR = $(sysconfdir)/samba +SMBPRIVATELIB = $(libdir)/samba4 +# List of modules and libraries +SMB_VFS_MODULES_A = vfs_audit,vfs_extd_audit,vfs_full_audit,vfs_fake_perms,vfs_fake_acls +SMB_VFS_MODULES_B = vfs_recycle,vfs_netatalk,vfs_readonly,vfs_cap,vfs_expand_msdfs,vfs_shadow_copy,vfs_shadow_copy2 +SMB_VFS_MODULES_C = vfs_xattr_tdb,vfs_posix_eadb,vfs_solarisacl,vfs_zfsacl,vfs_catia +SMB_VFS_MODULES_D = vfs_streams_xattr,vfs_streams_depot,vfs_cacheprime,vfs_prealloc,vfs_commit,vfs_notify_fam +SMB_VFS_MODULES_E = vfs_readahead,vfs_aio_pthread,vfs_aio_posix,vfs_preopen,vfs_syncops +SMB_VFS_MODULES_F = vfs_acl_xattr,vfs_acl_tdb,vfs_smb_traffic_analyzer,vfs_dirsort,vfs_scannedonly,vfs_crossrename +SMB_VFS_MODULES_G = vfs_time_audit,vfs_media_harmony,vfs_dfs_samba4 +SMB_VFS_MODULES = $(SMB_VFS_MODULES_A),$(SMB_VFS_MODULES_B),$(SMB_VFS_MODULES_C),$(SMB_VFS_MODULES_D),$(SMB_VFS_MODULES_E),$(SMB_VFS_MODULES_F),$(SMB_VFS_MODULES_G) +SMB_IDMAP_MODULES = idmap_ad,idmap_adex,idmap_autorid,idmap_hash,idmap_ldap,idmap_nss,idmap_rid,idmap_tdb,idmap_tdb2 +SMB_PDB_MODULES = pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 +SMB_AUTH_MODULES = auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 +SMB_MODULES = $(SMB_VFS_MODULES),$(SMB_IDMAP_MODULES),$(SMB_PDB_MODULES),$(SMB_AUTH_MODULES) + +# Main package CSWsamba4 PACKAGES += CSWsamba4 SPKG_DESC_CSWsamba4 = $(DESCRIPTION) -# PKGFILES is catchall +# OBSOLETED_BY_CSWsamba4 += CSWsamba +SMB_BINS = eventlogadm gentest locktest masktest ndrdump net ntlm_auth pdbedit pidl +SMB_BINS += profiles samba-tool smbcontrol smbstatus smbtorture testparm +SMB_SBINS = smbd nmbd samba samba_dnsupdate samba_kcc samba_spnupdate samba_upgradedns +SMB_MANPAGES = findsmb\.1 log2pcap\.1 vfstest\.1 +SMB_MANPAGES += lmhosts\.5 smb.conf\.5 smbpasswd\.5 smbgetrc\.5 +SMB_MANPAGES += samba\.7 +SMB_MANPAGES += net\.8 pdbedit\.8 eventlogadm\.8 smbd\.8 nmbd\.8 samba\.8 samba-tool\.8 smbpasswd\.8 smbspool\.8 smbta-util\.8 +SMB_MANPAGES += tdbbackup\.8 tdbdump\.8 tdbrestore\.8 tdbtool\.8 +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),init\.d/cswsamba4) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),openldap/schema/samba\.schema) +PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(bindir),$B)) +PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(mandir),man1/$B\.1)) +PKGFILES_CSWsamba4 += $(foreach B,$(SMB_SBINS),$(call baseisadirs,$(sbindir),$B)) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),codepages/.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),setup/.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),perl5/.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(SMBCONFIGDIR),smb.conf.CSW) +PKGFILES_CSWsamba4 += $(foreach M,$(SMB_MANPAGES),$(call baseisadirs,$(mandir),man./$M)) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/vfs_.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/idmap_.*) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),mit_samba\.so) +PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so) +RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibfam0 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 -# Just docs override for now -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/lmhosts.5 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/smb.conf.5 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/nmbd.8 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smbd.8 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tdbbackup.8 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/idmap_tdb2.8 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8 -CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8 - +# Package with clients, finished PACKAGES += CSWsamba4-client -SPKG_DESC_CSWsamba4-client = Client binaries for samba4 -SMB_CLIENT_TOOLS = cifsdd smbclient4 nmblookup4 -PKGFILES_CSWsamba4-client += $(foreach T,$(SMB_CLIENT_TOOLS),$(call baseisadirs,$(bindir),$T) $(mandir)/man1/$T\.1) +SPKG_DESC_CSWsamba4-client = Samba 4 clients +# OBSOLETED_BY_CSWsamba4-client += CSWsamba-client +SMB_CLIENT_BINS = cifsdd dbwrap_tool nmblookup nmblookup4 oLschema2ldif regdiff regpatch regshell regtree rpcclient +SMB_CLIENT_BINS += samba-regedit sharesec smbcacls smbclient smbclient4 smbcquotas smbget smbpasswd smbprint +SMB_CLIENT_BINS += smbspool smbta-util smbtar smbtree tdbbackup tdbdump tdbrestore tdbtool +SMB_CLIENT_BINS += ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch +PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(bindir),$C)) +PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 +# Development package +PACKAGES += CSWsamba4-dev +SPKG_DESC_CSWsamba4-dev = Development files for Samba 4 +# OBSOLETED_BY_CSWsamba4-dev += CSWsamba-dev +PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWsamba4-dev += $(libdir)/lib.*\.so) +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtorture0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-policy0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-winbind +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-samr0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbldap0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 -# Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba4-client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smbclient.1 +# Package CSWsamba4 libraries +PACKAGES += CSWsamba4-libs +SPKG_DESC_CSWsamba4-libs = Samba 4 libraries +SMB_LIBS = libdcerpc-atsvc.so.0 libdcerpc-binding.so.0 libdcerpc-samr.so.0 libdcerpc-server.so.0 libdcerpc.so.0 libgensec.so.0 +SMB_LIBS += libndr-krb5pac.so.0 libndr-nbt.so.0 libndr-standard.so.0 libndr.so.0 libnetapi.so.0 libpdb.so.0 +SMB_LIBS += libregistry.so.0 libsamba-credentials.so.0 libsamba-hostconfig.so.0 libsamba-policy.so.0 +SMB_LIBS += libsamba-util.so.0 libsamdb.so.0 libsmbclient-raw.so.0 libsmbconf.so.0 libsmbldap.so.0 libtevent-util.so.0 +SMB_LIBS += libtorture.so.0 +# PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L)) +PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.* +PKGFILES_CSWsamba4-libs += $(mandir)/man7/libsmbclient.7 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 -#PACKAGES += CSWsambadoc -SPKG_DESC_CSWsambadoc = Samba documentation -ARCHALL_CSWsambadoc = 1 +PACKAGES += CSWlibdcerpc-atsvc0 +PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-atsvc0 += $(DESCRIPTION), libdcerpc-atsvc.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibsamba-util0 +PACKAGES += CSWlibdcerpc-binding0 +PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0 + +PACKAGES += CSWlibdcerpc-samr0 +PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-samr0 += $(DESCRIPTION), libdcerpc-samr.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibsamba-util0 + +PACKAGES += CSWlibdcerpc-server0 +PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0 + +PACKAGES += CSWlibdcerpc0 +PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) +PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-util0 + +PACKAGES += CSWlibgensec0 +PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) +PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0 + +PACKAGES += CSWlibndr-krb5pac0 +PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) +PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0 + +PACKAGES += CSWlibndr-nbt0 +PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) +PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0 + +PACKAGES += CSWlibndr-standard0 +PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) +PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 + +PACKAGES += CSWlibndr0 +PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) +PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 + PACKAGES += CSWlibnetapi0 -PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0) -SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 +PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0) +PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0 -PACKAGES += CSWlibnss-winbind1 -PKGFILES_CSWlibnss-winbind1 += $(call pkgfiles_lib,libnss_winbind.so.1) -SPKG_DESC_CSWlibnss-winbind1 += Winbind nss libary,libnss_winbind.so.1 +PACKAGES += CSWlibpdb0 +PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0) +PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-util0 -PACKAGES += CSWsamba4-dev -SPKG_DESC_CSWsamba4-dev = Development files for Samba, libsmbclient.so.0 -PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbsharemodes0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba +PACKAGES += CSWlibregistry0 +PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) +PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibregistry0 += $(DESCRIPTION), libregistry.so.0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0 +PACKAGES += CSWlibsamba-credentials0 +PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-credentials0 += $(DESCRIPTION), libsamba-credentials.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0 -PACKAGES += CSWsamba4-swat -SPKG_DESC_CSWsamba4-swat = Web-based samba administration tools -PKGFILES_CSWsamba4-swat += $(call baseisadirs,$(sbindir),swat) -PKGFILES_CSWsamba4-swat += $(mandir)/.*/swat\.* -PKGFILES_CSWsamba4-swat += $(sharedstatedir)/samba/swat/.* -PKGFILES_CSWsamba4-swat += $(prefix)/swat/.* -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibtdb1 +PACKAGES += CSWlibsamba-hostconfig0 +PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-hostconfig0 += $(DESCRIPTION), libsamba-hostconfig.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0 -# Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/ix01.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/appendix.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/secure.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/nw4migration.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-Developers-Guide/pwencrypt.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/classicalprinting.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/bugreport.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/compiling.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/NetworkBrowsing.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/domain-member.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/locking.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/samba-pdc.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/install.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/diagnosis.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/pam.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/winbind.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/AccessControls.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/swat.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/lmhosts.5.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/nmbd.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/idmap_tdb2.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smb.conf.5.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/winbindd.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbd.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/net.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/tdbbackup.8.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbclient.1.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/export/home|root/opt/csw/swat/help/Samba3-HOWTO/msdfs.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/ix01.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/appendix.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/happy.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/CUPS-printing.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html -CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ch-ldap-tls.html +PACKAGES += CSWlibsamba-policy0 +PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0 +PACKAGES += CSWlibsamba-util0 +PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1) +PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamba-util0 += $(DESCRIPTION), libsamba-util.so.0 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 + +PACKAGES += CSWlibsamdb0 +PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1) +PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0 + +PACKAGES += CSWlibsmbclient-raw0 +PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1) +PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0 + +PACKAGES += CSWlibsmbconf0 +PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) +PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0 + + +PACKAGES += CSWlibsmbldap0 +PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0) +PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibsmbldap0 += $(DESCRIPTION), libsmbldap.so.0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0 + +PACKAGES += CSWlibtevent-util0 +PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1) +PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibsamba-util0 + +PACKAGES += CSWlibtorture0 +PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1) +PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-util0 + +# Python package +PACKAGES += CSWsamba4-python +SPKG_DESC_CSWsamba4-python = Samba 4 python files +PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.6/site-packages/.*) +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-6-1-0 + +# winbind daemon, NSS and PAM modules PACKAGES += CSWsamba4-winbind SPKG_DESC_CSWsamba4-winbind = Tools to authenticate users from active directory using winbind +# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-winbind +# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-nss +# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-nss-system-links +# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-pam-system-links +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(bindir),wbinfo) PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so) +PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,nss_winbind.so.1) +PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,libnss_wins.so.2) +PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,winbind_krb5_locator.so) +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd) PKGFILES_CSWsamba4-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo PKGFILES_CSWsamba4-winbind += $(mandir)/man5/pam_winbind\.conf\.5 PKGFILES_CSWsamba4-winbind += $(mandir)/man7/winbind_krb5_locator\.7 PKGFILES_CSWsamba4-winbind += $(mandir)/man8/pam_winbind\.8 -PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd) +PKGFILES_CSWsamba4-winbind += $(mandir)/man1/wbinfo\.1 PKGFILES_CSWsamba4-winbind += $(mandir)/man8/winbindd\.8 -PKGFILES_CSWsamba4-winbind += /etc/opt/csw/init.d/cswwinbind +PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init\.d/cswwinbind4 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibnss-winbind1 -# Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8 -CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWlibnss-winbind1 +PACKAGES += CSWsamba4-nss-system-links +CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links +PKGFILES_CSWsamba4-nss-system-links = /usr/lib/nss_winbind_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/nss_wins_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_wins_csw.so.1 +SPKG_DESC_CSWsamba4-nss-system-links += Samba 4 nss modules links for the system +RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file +ARCHALL_CSWsamba4-nss-system-links = 1 -EXTRA_CFLAGS = -lrt -lintl -lsec -EXTRA_LDFLAGS = -lrt -lintl -lsec +PACKAGES += CSWsamba4-pam-system-links +CATALOGNAME_CSWsamba4-pam-system-links = samba4_pam_system_links +PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so +PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/pam_winbind_csw.so +PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_smbpass_csw.so +PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_winbind_csw.so +PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so +PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_winbind_csw.so +SPKG_DESC_CSWsamba4-pam-system-links += Samba 4 pam modules links for the system +RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSW4samba-winbind +RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSW4samba +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4 +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file +ARCHALL_CSWsamba4-pam-system-links = 1 + +# For checking whether we're missing anything, enable and check when updating. +# Should only catch SWAT stuff which is EOL upstream so we're not packaging it +PACKAGES += CSWsamba4-catchall +SPKG_DESC_CSWsamba4-catchall = Samba 4 catch all + +# The build fails to add the right rpath to at least the public libs +EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect +# EXTRA_LD_OPTIONS = -B direct -z ignore + # At the moment there are errors about python headers missing on 64 bit #BUILD64 = 1 #ISAEXEC = 1 -GARCOMPILER = GNU - -SMBLOCKDIR = $(localstatedir)/samba/locks -SMBLOGDIR = $(localstatedir)/samba/log -SMBPRIVATEDIR = $(sysconfdir)/samba/private -SMBCONFIGDIR = $(sysconfdir)/samba -SMBPRIVATELIB = $(libdir)/samba - CONFIGURE_ARGS += $(DIRPATHS) #Remove exec_prefix from DIRPATHS: NODIRPATHS += --exec_prefix=/opt/csw -#CONFIGURE_ARGS += --enable-shared=yes -#CONFIGURE_ARGS += --enable-static=no -#CONFIGURE_ARGS += --enable-socket-wrapper -#CONFIGURE_ARGS += --enable-nss-wrapper CONFIGURE_ARGS += --with-acl-support CONFIGURE_ARGS += --with-aio-support CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-winbind -CONFIGURE_ARGS += --with-static-modules=vfs_solarisacl -CONFIGURE_ARGS += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex -#CONFIGURE_ARGS += --with-shared-modules=vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex -#CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-shared-modules=$(SMB_MODULES) CONFIGURE_ARGS += --with-ads CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount -#CONFIGURE_ARGS += --with-dnsupdate=no -CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATELIB) +CONFIGURE_ARGS += --enable-cups +CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR) CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR) CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR) CONFIGURE_ARGS += --with-piddir=$(SMBLOCKDIR) -# to stay with the one build with samba 3 build this one private -CONFIGURE_ARGS += --private-libraries=smbclient CONFIGURE_ARGS += --with-privatelibdir=$(SMBPRIVATELIB) - +CONFIGURE_ARGS += --with-modulesdir=$(SMBPRIVATELIB) CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR) +# to stay with the one build with samba 3 build these are private +CONFIGURE_ARGS += --private-libraries=smbclient,smbsharemodes,wbclient +CONFIGURE_ARGS += --bundled-libraries=heimdal,!zlib,!popt,talloc,pytalloc,pytalloc-util,tevent,pytevent,tdb,pytdb,ldb,pyldb -CONFIGURE_ARGS += --enable-cups - -# Can't use fdatasync atm do to linker problems -#CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no -#CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no -#CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no - - - - TEST_TARGET = test # Tests need root @@ -272,20 +557,58 @@ EXTRA_PAX_ARGS += -s "/=/-/g" -INITSMF += /etc/opt/csw/init.d/cswsamba -INITSMF += /etc/opt/csw/init.d/cswwinbind +INITSMF += /etc/opt/csw/init.d/cswsamba4 +INITSMF += /etc/opt/csw/init.d/cswwinbind4 PRESERVECONF += $(sysconfdir)/samba/smb.conf +EXTRA_MERGE_DIRS_isa-extra += /usr/lib/64 /usr/lib/security/64 +MERGEBASE_/usr/lib/64 = /usr/lib +MERGEBASE_/usr/lib/security/64 = /usr/lib/security +EXTRA_PKGFILES_EXCLUDED += /usr/lib/security + include gar/category.mk +# Set the target dir for modules with the proper arch +NSS_MODULE_DIR = /usr/lib +PAM_MODULE_DIR = /usr/lib/security + +ifeq ($(MEMORYMODEL),64) + NSS_MODULE_DIR = /usr/lib/64 + PAM_MODULE_DIR = /usr/lib/security/64 +endif + +# Define the targets for the links +NSS_WINBIND_32 = ../..$(libdir)/nss_winbind.so.1 +NSS_WINS_32 = ../..$(libdir)/libnss_wins.so.2 +NSS_WINBIND_64 = ../../..$(libdir)/nss_winbind.so.1 +NSS_WINS_64 = ../../..$(libdir)/libnss_wins.so.2 + +PAM_WINBIND_32 = ../../..$(libdir)/security/pam_winbind.so +PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so +PAM_WINBIND_64 = ../../../..$(libdir)/security/pam_winbind.so +PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d - ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba - ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind + ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba4 + ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind4 ginstall -d $(DESTDIR)/etc/opt/csw/samba ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf - #ginstall $(WORKSRC)/nsswitch/libnss_winbind.so $(DESTDIR)/$(libdir)/libnss_winbind.so.1 + ginstall -d $(DESTDIR)/etc/opt/csw/openldap/schema + ginstall $(WORKSRC)/examples/LDAP/samba.schema $(DESTDIR)/etc/opt/csw/openldap/schema +# ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1 +# ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1 + # This bit is to install the symlinks to use the NSS modules with the + # system's nsswitch.conf + ginstall -d -m 0755 $(DESTDIR)$(NSS_MODULE_DIR) + gln -s $(NSS_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_winbind_csw.so.1 + gln -s $(NSS_WINS_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_wins_csw.so.1 + # This bit is to install the symlinks to use the PAM modules with the + # system's pam.conf + ginstall -d -m 0755 $(DESTDIR)$(PAM_MODULE_DIR) + gln -s $(PAM_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_winbind_csw.so + gln -s $(PAM_SMBPASS_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so @$(MAKECOOKIE) # python buildtools/bin/waf -v build Added: csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch 2013-09-24 18:49:34 UTC (rev 21993) @@ -0,0 +1,41 @@ +From ce4d161af8431fdb1f46a3d749d34afe968c1cee Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Fri, 23 Aug 2013 19:43:21 +0200 +Subject: [PATCH] Use -R linker flag instead of -rpath on Solaris + +--- + buildtools/wafadmin/Tools/gcc.py | 5 +++++ + buildtools/wafadmin/Tools/suncc.py | 1 + + 2 files changed, 6 insertions(+) + +diff --git a/buildtools/wafadmin/Tools/gcc.py b/buildtools/wafadmin/Tools/gcc.py +index 420b44f..c3b6b1b 100644 +--- a/buildtools/wafadmin/Tools/gcc.py ++++ b/buildtools/wafadmin/Tools/gcc.py +@@ -114,6 +114,11 @@ def gcc_modifier_aix(conf): + v['SHLIB_MARKER'] = '' + + @conftest ++def gcc_modifier_sunos(conf): ++ v = conf.env ++ v['RPATH_ST']='-Wl,-R%s' ++ ++ at conftest + def gcc_modifier_platform(conf): + # * set configurations specific for a platform. + # * the destination platform is detected automatically by looking at the macros the compiler predefines, +diff --git a/buildtools/wafadmin/Tools/suncc.py b/buildtools/wafadmin/Tools/suncc.py +index b1a2aad..45d4e69 100644 +--- a/buildtools/wafadmin/Tools/suncc.py ++++ b/buildtools/wafadmin/Tools/suncc.py +@@ -48,6 +48,7 @@ def scc_common_flags(conf): + v['STATICLIB_ST'] = '-l%s' + v['STATICLIBPATH_ST'] = '-L%s' + v['CCDEFINES_ST'] = '-D%s' ++ v['RPATH_ST'] = '-R%s' + + v['SONAME_ST'] = '-Wl,-h -Wl,%s' + v['SHLIB_MARKER'] = '-Bdynamic' +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Sep 24 22:25:39 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 24 Sep 2013 20:25:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21994] csw/mgar/pkg/samba/branches/samba4 Message-ID: Revision: 21994 http://gar.svn.sourceforge.net/gar/?rev=21994&view=rev Author: slowfranklin Date: 2013-09-24 20:25:38 +0000 (Tue, 24 Sep 2013) Log Message: ----------- samba/branches/samba4: Remove surplus parenthesis Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile csw/mgar/pkg/samba/branches/samba4/checksums Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-24 18:49:34 UTC (rev 21993) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-24 20:25:38 UTC (rev 21994) @@ -106,7 +106,7 @@ SPKG_DESC_CSWsamba4-dev = Development files for Samba 4 # OBSOLETED_BY_CSWsamba4-dev += CSWsamba-dev PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWsamba4-dev += $(libdir)/lib.*\.so) +PKGFILES_CSWsamba4-dev += $(libdir)/lib.*\.so RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 Modified: csw/mgar/pkg/samba/branches/samba4/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba4/checksums 2013-09-24 18:49:34 UTC (rev 21993) +++ csw/mgar/pkg/samba/branches/samba4/checksums 2013-09-24 20:25:38 UTC (rev 21994) @@ -1 +1 @@ -db9dc684f167a602c18acc19d3e7e401 samba-4.0.6.tar.gz +f5f2ad0e2aabf024e2e3e2f297a0631a samba-4.0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 09:49:52 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 07:49:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21995] csw/mgar/pkg/lang-python/mako/trunk Message-ID: Revision: 21995 http://gar.svn.sourceforge.net/gar/?rev=21995&view=rev Author: pfelecan Date: 2013-09-25 07:49:50 +0000 (Wed, 25 Sep 2013) Log Message: ----------- lang-python/mako/trunk: - dual package - bump to latest upstream release Modified Paths: -------------- csw/mgar/pkg/lang-python/mako/trunk/Makefile csw/mgar/pkg/lang-python/mako/trunk/checksums Modified: csw/mgar/pkg/lang-python/mako/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mako/trunk/Makefile 2013-09-24 20:25:38 UTC (rev 21994) +++ csw/mgar/pkg/lang-python/mako/trunk/Makefile 2013-09-25 07:49:50 UTC (rev 21995) @@ -1,6 +1,6 @@ # $Id$ NAME = mako -VERSION = 0.4.1 +VERSION = 0.9.0 CATEGORIES = python GARTYPE = v2 @@ -25,6 +25,9 @@ UPSTREAM_MASTER_SITES = http://www.makotemplates.org/download.html +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWpython27-dev + ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/mako/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mako/trunk/checksums 2013-09-24 20:25:38 UTC (rev 21994) +++ csw/mgar/pkg/lang-python/mako/trunk/checksums 2013-09-25 07:49:50 UTC (rev 21995) @@ -1 +1 @@ -c69bceb23c832b74075f438408fea118 Mako-0.4.1.tar.gz +e2627ba5c65f83dfe39d9a0892ae517d Mako-0.9.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 10:36:30 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 08:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21996] csw/mgar/pkg Message-ID: Revision: 21996 http://gar.svn.sourceforge.net/gar/?rev=21996&view=rev Author: pfelecan Date: 2013-09-25 08:36:30 +0000 (Wed, 25 Sep 2013) Log Message: ----------- libxfce4util/trunk: instantiation Added Paths: ----------- csw/mgar/pkg/libxfce4util/ csw/mgar/pkg/libxfce4util/Makefile csw/mgar/pkg/libxfce4util/branches/ csw/mgar/pkg/libxfce4util/tags/ csw/mgar/pkg/libxfce4util/trunk/ csw/mgar/pkg/libxfce4util/trunk/Makefile csw/mgar/pkg/libxfce4util/trunk/checksums csw/mgar/pkg/libxfce4util/trunk/files/ Added: csw/mgar/pkg/libxfce4util/Makefile =================================================================== --- csw/mgar/pkg/libxfce4util/Makefile (rev 0) +++ csw/mgar/pkg/libxfce4util/Makefile 2013-09-25 08:36:30 UTC (rev 21996) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libxfce4util/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libxfce4util/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4util/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libxfce4util/trunk/Makefile 2013-09-25 08:36:30 UTC (rev 21996) @@ -0,0 +1,27 @@ +# $Id$ + +NAME = libxfce4util +VERSION = 4.10.0 +GARTYPE = v2 + +DESCRIPTION = Basic utility library for Xfce4 +define BLURB + Basic utility library for Xfce4. +endef + +MASTER_SITES = http://archive.xfce.org/xfce/4.10/src/ +DISTFILES = $(DISTNAME).tar.bz2 + +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWvim + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --enable-gtk-doc-html +CONFIGURE_ARGS += --enable-gtk-doc-pdf + +GARCOMPILER = GNU + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/libxfce4util/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libxfce4util/trunk/checksums =================================================================== --- csw/mgar/pkg/libxfce4util/trunk/checksums (rev 0) +++ csw/mgar/pkg/libxfce4util/trunk/checksums 2013-09-25 08:36:30 UTC (rev 21996) @@ -0,0 +1 @@ +2e8defcd40cbf6afedde531b27314511 libxfce4util-4.10.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Sep 25 10:45:21 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 25 Sep 2013 08:45:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21997] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 21997 http://gar.svn.sourceforge.net/gar/?rev=21997&view=rev Author: lblume Date: 2013-09-25 08:45:20 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba3: Bump to 3.6.19; move GARCOMPILER lines where they work; add patch to remove spurious errors from the logs Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile csw/mgar/pkg/samba/branches/samba3/checksums Added Paths: ----------- csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-25 08:36:30 UTC (rev 21996) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-09-25 08:45:20 UTC (rev 21997) @@ -2,7 +2,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.18 +VERSION = 3.6.19 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -10,6 +10,8 @@ Tools to access a servers filespace and printers via SMB (server) endef +# GARCOMPILER is set below the include + MASTER_SITES = http://samba.org/samba/ftp/stable/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += cswsamba @@ -27,14 +29,8 @@ PATCHFILES += 0001-nss_winbind.patch PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch PATCHFILES += 0003-rename-nss-modules.patch +PATCHFILES += 0004-illegal-multibyte-error.patch -# Studio 12 is the last supported on Solaris 9 -ifeq ($(shell /usr/bin/uname -r),5.9) - GARCOMPILER = SOS12 -else - GARCOMPILER = SOS12U3 -endif - BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibkrb5-dev @@ -393,6 +389,12 @@ include gar/category.mk +# Studio 12 is the last supported on Solaris 9 +GARCOMPILER_5.9 = SOS12 +GARCOMPILER_5.10 = SOS12U3 +GARCOMPILER_5.11 = SOS12U3 +GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) + # Set the target dir for modules with the proper arch NSS_MODULE_DIR = /usr/lib PAM_MODULE_DIR = /usr/lib/security Modified: csw/mgar/pkg/samba/branches/samba3/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba3/checksums 2013-09-25 08:36:30 UTC (rev 21996) +++ csw/mgar/pkg/samba/branches/samba3/checksums 2013-09-25 08:45:20 UTC (rev 21997) @@ -1 +1 @@ -c7eec3e83fe4c4750240a8a0a214bbd4 samba-3.6.18.tar.gz +afe9c7c590f3093555cd6e870d2532e1 samba-3.6.19.tar.gz Added: csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch 2013-09-25 08:45:20 UTC (rev 21997) @@ -0,0 +1,22 @@ +index 5aafe2f..e1aedf1 100644 +--- a/source3/smbd/mangle_hash2.c ++++ b/source3/smbd/mangle_hash2.c +@@ -626,7 +626,8 @@ static bool is_legal_name(const char *name) + while (*name) { + if (((unsigned int)name[0]) > 128 && (name[1] != 0)) { + /* Possible start of mb character. */ +- char mbc[2]; ++ size_t size = 0; ++ (void)next_codepoint(name, &size); + /* + * Note that if CH_UNIX is utf8 a string may be 3 + * bytes, but this is ok as mb utf8 characters don't +@@ -634,7 +635,7 @@ static bool is_legal_name(const char *name) + * for mb UNIX asian characters like Japanese (SJIS) here. + * JRA. + */ +- if (convert_string(CH_UNIX, CH_UTF16LE, name, 2, mbc, 2, False) == 2) { ++ if (size == 2) { + /* Was a good mb string. */ + name += 2; + continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 11:02:05 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 09:02:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21998] csw/mgar/pkg/libxfce4util/trunk/Makefile Message-ID: Revision: 21998 http://gar.svn.sourceforge.net/gar/?rev=21998&view=rev Author: pfelecan Date: 2013-09-25 09:02:05 +0000 (Wed, 25 Sep 2013) Log Message: ----------- libxfce4util/trunk: split in sub-packages Modified Paths: -------------- csw/mgar/pkg/libxfce4util/trunk/Makefile Modified: csw/mgar/pkg/libxfce4util/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4util/trunk/Makefile 2013-09-25 08:45:20 UTC (rev 21997) +++ csw/mgar/pkg/libxfce4util/trunk/Makefile 2013-09-25 09:02:05 UTC (rev 21998) @@ -22,6 +22,33 @@ GARCOMPILER = GNU +PACKAGES += CSWlibxfce4util +CATALOGNAME_CSWlibxfce4util = libxfce4util +SPKG_DESC_CSWlibxfce4util += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibglib2-0-0 + +PACKAGES += CSWlibxfce4util6 +CATALOGNAME_CSWlibxfce4util6 = libxfce4util6 +PKGFILES_CSWlibxfce4util6 += $(call baseisadirs,$(libdir),libxfce4util\.so\.6\.0\.0) +PKGFILES_CSWlibxfce4util6 += $(call baseisadirs,$(libdir),libxfce4util\.so\.6(\.\d+)*) +SPKG_DESC_CSWlibxfce4util6 += $(DESCRIPTION), libxfce4util.so.6 + +PACKAGES += CSWlibxfce4util-dev +CATALOGNAME_CSWlibxfce4util-dev = libxfce4util_dev +SPKG_DESC_CSWlibxfce4util-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibxfce4util-dev += /opt/csw/lib/libxfce4util.so +PKGFILES_CSWlibxfce4util-dev += $(PKGFILES_DEVEL) +ARCHALL_CSWlibxfce4util-dev = 1 + +PACKAGES += CSWlibxfce4util-doc +CATALOGNAME_CSWlibxfce4util-doc = libxfce4util_doc +SPKG_DESC_CSWlibxfce4util-doc += $(DESCRIPTION), documentation +PKGFILES_CSWlibxfce4util-doc += $(datadir)/gtk-doc/.* +ARCHALL_CSWlibxfce4util-doc = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) 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 25 11:19:55 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 25 Sep 2013 09:19:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21999] csw/mgar/pkg/samba/branches/samba4 Message-ID: Revision: 21999 http://gar.svn.sourceforge.net/gar/?rev=21999&view=rev Author: lblume Date: 2013-09-25 09:19:55 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Add patch to fix incompatible id use Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Added Paths: ----------- csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 09:02:05 UTC (rev 21998) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 09:19:55 UTC (rev 21999) @@ -29,6 +29,8 @@ PATCHFILES += smbd_patch_for_setgroups.patch # From https://bugzilla.samba.org/show_bug.cgi?id=10112 PATCHFILES += 0003-Use-R-linker-flag-instead-of-rpath.patch +# Help the script to find the username +PATCHFILES += 0004-solaris-id-is-not-xpg4.patch # Filesystem layout SMBLOCKDIR = $(localstatedir)/samba/locks @@ -512,7 +514,7 @@ # The build fails to add the right rpath to at least the public libs EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect -# EXTRA_LD_OPTIONS = -B direct -z ignore +EXTRA_LD_OPTIONS = -Bdirect -z ignore -z nolazyload # At the moment there are errors about python headers missing on 64 bit #BUILD64 = 1 Added: csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch 2013-09-25 09:19:55 UTC (rev 21999) @@ -0,0 +1,13 @@ +index eb54f37..e734c44 100755 +--- a/source3/script/build_env.sh ++++ b/source3/script/build_env.sh +@@ -18,7 +18,8 @@ else + if [ ! "x$LOGNAME" = "x" ]; then + whoami=$LOGNAME + else +- whoami=`whoami || id -un` ++ # Solaris id does not like -u ++ whoami 2> /dev/null || id -a 2> /dev/null || /usr/xpg4/bin/id -un + fi + fi + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 11:25:17 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 09:25:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[22000] csw/mgar/pkg/libxfce4util/trunk Message-ID: Revision: 22000 http://gar.svn.sourceforge.net/gar/?rev=22000&view=rev Author: pfelecan Date: 2013-09-25 09:25:17 +0000 (Wed, 25 Sep 2013) Log Message: ----------- libxfce4util/trunk: - fine tune dependencies - correct fallback directory when searching pixmaps Modified Paths: -------------- csw/mgar/pkg/libxfce4util/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch Modified: csw/mgar/pkg/libxfce4util/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4util/trunk/Makefile 2013-09-25 09:19:55 UTC (rev 21999) +++ csw/mgar/pkg/libxfce4util/trunk/Makefile 2013-09-25 09:25:17 UTC (rev 22000) @@ -11,6 +11,7 @@ MASTER_SITES = http://archive.xfce.org/xfce/4.10/src/ DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES += 0001-search-fallback-for-pixmaps.patch BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWvim @@ -26,22 +27,26 @@ CATALOGNAME_CSWlibxfce4util = libxfce4util SPKG_DESC_CSWlibxfce4util += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibxfce4util6 -RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibxfce4util += CSWlibglib2-0-0 -PACKAGES += CSWlibxfce4util6 -CATALOGNAME_CSWlibxfce4util6 = libxfce4util6 -PKGFILES_CSWlibxfce4util6 += $(call baseisadirs,$(libdir),libxfce4util\.so\.6\.0\.0) -PKGFILES_CSWlibxfce4util6 += $(call baseisadirs,$(libdir),libxfce4util\.so\.6(\.\d+)*) -SPKG_DESC_CSWlibxfce4util6 += $(DESCRIPTION), libxfce4util.so.6 +PACKAGES += CSWlibxfce4util6 +CATALOGNAME_CSWlibxfce4util6 = libxfce4util6 +PKGFILES_CSWlibxfce4util6 += $(call baseisadirs,$(libdir),libxfce4util\.so\.6\.0\.0) +PKGFILES_CSWlibxfce4util6 += $(call baseisadirs,$(libdir),libxfce4util\.so\.6(\.\d+)*) +SPKG_DESC_CSWlibxfce4util6 += $(DESCRIPTION), libxfce4util.so.6 +RUNTIME_DEP_PKGS_CSWlibxfce4util6 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxfce4util6 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxfce4util6 += CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWlibxfce4util6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libxfce4util.so.6.0.0 +CHECKPKG_OVERRIDES_CSWlibxfce4util6 += file-with-bad-content|/usr/share|root/opt/csw/lib/libxfce4util.so.6.0.0 -PACKAGES += CSWlibxfce4util-dev -CATALOGNAME_CSWlibxfce4util-dev = libxfce4util_dev -SPKG_DESC_CSWlibxfce4util-dev += $(DESCRIPTION), development files -PKGFILES_CSWlibxfce4util-dev += /opt/csw/lib/libxfce4util.so -PKGFILES_CSWlibxfce4util-dev += $(PKGFILES_DEVEL) -ARCHALL_CSWlibxfce4util-dev = 1 +PACKAGES += CSWlibxfce4util-dev +CATALOGNAME_CSWlibxfce4util-dev = libxfce4util_dev +SPKG_DESC_CSWlibxfce4util-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibxfce4util-dev += /opt/csw/lib/libxfce4util.so +PKGFILES_CSWlibxfce4util-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibxfce4util-dev += CSWlibxfce4util6 +ARCHALL_CSWlibxfce4util-dev = 1 +CHECKPKG_OVERRIDES_CSWlibxfce4util-dev += archall-devel-package PACKAGES += CSWlibxfce4util-doc CATALOGNAME_CSWlibxfce4util-doc = libxfce4util_doc Added: csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch =================================================================== --- csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch (rev 0) +++ csw/mgar/pkg/libxfce4util/trunk/files/0001-search-fallback-for-pixmaps.patch 2013-09-25 09:25:17 UTC (rev 22000) @@ -0,0 +1,25 @@ +From aac5b289ecb8f46d8fc71ecd4c1501422e3c3bad Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 25 Sep 2013 11:13:43 +0200 +Subject: [PATCH] search fallback for pixmaps + +--- + libxfce4util/xfce-resource.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libxfce4util/xfce-resource.c b/libxfce4util/xfce-resource.c +index d39e6ad..92d6e9e 100644 +--- a/libxfce4util/xfce-resource.c ++++ b/libxfce4util/xfce-resource.c +@@ -243,7 +243,7 @@ _res_init (void) + _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], "/usr/share/pixmaps"); + + /* fallback for system which that don't install everything in /usr */ +- _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], "/usr/local/share/pixmaps"); ++ _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], "/opt/csw/share/pixmaps"); + _list[XFCE_RESOURCE_ICONS] = g_slist_append (_list[XFCE_RESOURCE_ICONS], DATADIR "/share/pixmaps"); + + /* +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Sep 25 11:33:04 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 25 Sep 2013 09:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[22001] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22001 http://gar.svn.sourceforge.net/gar/?rev=22001&view=rev Author: slowfranklin Date: 2013-09-25 09:33:03 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Trying to get deps right Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 09:25:17 UTC (rev 22000) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 09:33:03 UTC (rev 22001) @@ -79,7 +79,6 @@ PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/idmap_.*) PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),mit_samba\.so) PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so) -RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcrypt11 @@ -87,6 +86,10 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 # Package with clients, finished PACKAGES += CSWsamba4-client @@ -98,10 +101,13 @@ SMB_CLIENT_BINS += ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(bindir),$C)) PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent0 # Development package PACKAGES += CSWsamba4-dev @@ -112,7 +118,6 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtorture0 @@ -122,7 +127,6 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-policy0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-winbind RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-krb5pac0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr0 @@ -161,6 +165,9 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibcups2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1 PACKAGES += CSWlibdcerpc-atsvc0 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) @@ -190,7 +197,6 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibsamba-util0 PACKAGES += CSWlibdcerpc-server0 PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) @@ -216,19 +222,10 @@ PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-util0 PACKAGES += CSWlibgensec0 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) @@ -244,41 +241,35 @@ RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 PACKAGES += CSWlibndr-krb5pac0 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0(\.\d+)*) SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0 PACKAGES += CSWlibndr-nbt0 PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0(\.\d+)*) SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0 PACKAGES += CSWlibndr-standard0 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0(\.\d+)*) SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 PACKAGES += CSWlibndr0 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0(\.\d+)*) SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 PACKAGES += CSWlibnetapi0 @@ -286,40 +277,26 @@ PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*) SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0 PACKAGES += CSWlibpdb0 PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0) PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0(\.\d+)*) SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsmbconf0 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-util0 PACKAGES += CSWlibregistry0 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0(\.\d+)*) SPKG_DESC_CSWlibregistry0 += $(DESCRIPTION), libregistry.so.0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0 PACKAGES += CSWlibsamba-credentials0 PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1) @@ -348,7 +325,6 @@ SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0 @@ -360,7 +336,6 @@ PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1) PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-util0 += $(DESCRIPTION), libsamba-util.so.0 -RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 @@ -381,17 +356,10 @@ PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1) PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0 PACKAGES += CSWlibsmbconf0 PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) @@ -399,13 +367,13 @@ SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 PACKAGES += CSWlibsmbldap0 @@ -436,20 +404,19 @@ PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0(\.\d+)*) SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-util0 # Python package PACKAGES += CSWsamba4-python SPKG_DESC_CSWsamba4-python = Samba 4 python files PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.6/site-packages/.*) -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1 # winbind daemon, NSS and PAM modules PACKAGES += CSWsamba4-winbind @@ -471,11 +438,13 @@ PKGFILES_CSWsamba4-winbind += $(mandir)/man1/wbinfo\.1 PKGFILES_CSWsamba4-winbind += $(mandir)/man8/winbindd\.8 PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init\.d/cswwinbind4 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 PACKAGES += CSWsamba4-nss-system-links CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links @@ -499,11 +468,7 @@ PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_winbind_csw.so SPKG_DESC_CSWsamba4-pam-system-links += Samba 4 pam modules links for the system -RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSW4samba-winbind -RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSW4samba - -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4 -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4-winbind +RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file ARCHALL_CSWsamba4-pam-system-links = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Sep 25 11:49:15 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 25 Sep 2013 09:49:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[22002] csw/mgar/pkg/silctoolkit/trunk/Makefile Message-ID: Revision: 22002 http://gar.svn.sourceforge.net/gar/?rev=22002&view=rev Author: lblume Date: 2013-09-25 09:49:15 +0000 (Wed, 25 Sep 2013) Log Message: ----------- silctoolkit/trunk: Add warning Modified Paths: -------------- csw/mgar/pkg/silctoolkit/trunk/Makefile Modified: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-09-25 09:33:03 UTC (rev 22001) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-09-25 09:49:15 UTC (rev 22002) @@ -6,6 +6,10 @@ SILC Project develops the Secure Internet Live Conferencing protocol, which provides secure conferencing services. endef +### +# client.h collides with Samba and has to be somehow dealt with +### + MASTER_SITES = http://silcnet.org/download/toolkit/sources/ DISTFILES += $(DISTNAME).tar.bz2 PATCHFILES += function.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Sep 25 12:19:17 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 25 Sep 2013 10:19:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[22003] csw/mgar/pkg/samba/branches/samba4/files/ 0004-solaris-id-is-not-xpg4.patch Message-ID: Revision: 22003 http://gar.svn.sourceforge.net/gar/?rev=22003&view=rev Author: lblume Date: 2013-09-25 10:19:16 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Typo in the patch Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch Modified: csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch 2013-09-25 09:49:15 UTC (rev 22002) +++ csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch 2013-09-25 10:19:16 UTC (rev 22003) @@ -7,7 +7,7 @@ else - whoami=`whoami || id -un` + # Solaris id does not like -u -+ whoami 2> /dev/null || id -a 2> /dev/null || /usr/xpg4/bin/id -un ++ whoami 2> /dev/null || id -un 2> /dev/null || /usr/xpg4/bin/id -un fi fi 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 25 12:41:40 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Sep 2013 10:41:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[22004] csw/mgar/pkg/rdesktop/trunk/Makefile Message-ID: Revision: 22004 http://gar.svn.sourceforge.net/gar/?rev=22004&view=rev Author: dmichelsen Date: 2013-09-25 10:41:40 +0000 (Wed, 25 Sep 2013) Log Message: ----------- rdesktop/trunk: Try adding explicit linkage against kerberos libs Modified Paths: -------------- csw/mgar/pkg/rdesktop/trunk/Makefile Modified: csw/mgar/pkg/rdesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/rdesktop/trunk/Makefile 2013-09-25 10:19:16 UTC (rev 22003) +++ csw/mgar/pkg/rdesktop/trunk/Makefile 2013-09-25 10:41:40 UTC (rev 22004) @@ -28,6 +28,11 @@ RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibgssglue0 +RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibgssapi-krb5-2 +CHECKPKG_OVERRIDES_CSWrdesktop += soname-unused + BUILD64 = 1 ISAEXEC = 1 @@ -37,6 +42,9 @@ # We don't have that framework CONFIGURE_ARGS += --disable-smartcard +LINKER_IGNORE = +EXTRA_LINKER_FLAGS += -lkrb5 -lkrb5support -lgssapi_krb5 + # No test/check target provided by rdesktop TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Sep 25 12:54:53 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 25 Sep 2013 10:54:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22005] csw/mgar/pkg/samba/branches/samba4 Message-ID: Revision: 22005 http://gar.svn.sourceforge.net/gar/?rev=22005&view=rev Author: slowfranklin Date: 2013-09-25 10:54:52 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Add missing assignment to whoami variable, also add a final fallback Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 10:41:40 UTC (rev 22004) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 10:54:52 UTC (rev 22005) @@ -90,6 +90,7 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 +CHECKPKG_OVERRIDES_CSWsamba4 += soname-unused # Package with clients, finished PACKAGES += CSWsamba4-client @@ -108,6 +109,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-client += soname-unused # Development package PACKAGES += CSWsamba4-dev @@ -143,6 +145,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += soname-unused # Package CSWsamba4 libraries PACKAGES += CSWsamba4-libs @@ -168,6 +171,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1 +CHECKPKG_OVERRIDES_CSWsamba4-libs += soname-unused PACKAGES += CSWlibdcerpc-atsvc0 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) @@ -177,6 +181,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += soname-unused PACKAGES += CSWlibdcerpc-binding0 PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1) @@ -189,6 +194,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += soname-unused PACKAGES += CSWlibdcerpc-samr0 PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1) @@ -197,6 +203,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += soname-unused PACKAGES += CSWlibdcerpc-server0 PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) @@ -217,6 +224,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += soname-unused PACKAGES += CSWlibdcerpc0 PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) @@ -226,6 +234,7 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibdcerpc0 += soname-unused PACKAGES += CSWlibgensec0 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) @@ -242,6 +251,7 @@ RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 +CHECKPKG_OVERRIDES_CSWlibgensec0 += soname-unused PACKAGES += CSWlibndr-krb5pac0 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) @@ -249,6 +259,7 @@ SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += soname-unused PACKAGES += CSWlibndr-nbt0 PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) @@ -256,6 +267,7 @@ SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += soname-unused PACKAGES += CSWlibndr-standard0 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) @@ -263,6 +275,7 @@ SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibndr-standard0 += soname-unused PACKAGES += CSWlibndr0 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) @@ -271,6 +284,7 @@ RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibndr0 += soname-unused PACKAGES += CSWlibnetapi0 PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0) @@ -280,6 +294,7 @@ RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibnetapi0 += soname-unused PACKAGES += CSWlibpdb0 PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0) @@ -289,6 +304,7 @@ RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 +CHECKPKG_OVERRIDES_CSWlibpdb0 += soname-unused PACKAGES += CSWlibregistry0 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) @@ -297,6 +313,7 @@ RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibregistry0 += soname-unused PACKAGES += CSWlibsamba-credentials0 PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1) @@ -308,6 +325,7 @@ RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += soname-unused PACKAGES += CSWlibsamba-hostconfig0 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1) @@ -318,6 +336,7 @@ RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += soname-unused PACKAGES += CSWlibsamba-policy0 PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1) @@ -331,6 +350,7 @@ RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += soname-unused PACKAGES += CSWlibsamba-util0 PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1) @@ -339,6 +359,7 @@ RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWlibsamba-util0 += soname-unused PACKAGES += CSWlibsamdb0 PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1) @@ -351,6 +372,7 @@ RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibsamdb0 += soname-unused PACKAGES += CSWlibsmbclient-raw0 PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1) @@ -360,6 +382,7 @@ RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += soname-unused PACKAGES += CSWlibsmbconf0 PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) @@ -374,8 +397,8 @@ RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibsmbconf0 += soname-unused - PACKAGES += CSWlibsmbldap0 PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0) PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0(\.\d+)*) @@ -387,6 +410,7 @@ RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibsmbldap0 += soname-unused PACKAGES += CSWlibtevent-util0 PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1) @@ -398,6 +422,7 @@ RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWlibtevent-util0 += soname-unused PACKAGES += CSWlibtorture0 PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1) @@ -405,6 +430,7 @@ SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWlibtorture0 += soname-unused # Python package PACKAGES += CSWsamba4-python @@ -417,6 +443,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1 +CHECKPKG_OVERRIDES_CSWsamba4-python += soname-unused # winbind daemon, NSS and PAM modules PACKAGES += CSWsamba4-winbind @@ -445,6 +472,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-unused PACKAGES += CSWsamba4-nss-system-links CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links Modified: csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch 2013-09-25 10:41:40 UTC (rev 22004) +++ csw/mgar/pkg/samba/branches/samba4/files/0004-solaris-id-is-not-xpg4.patch 2013-09-25 10:54:52 UTC (rev 22005) @@ -7,7 +7,7 @@ else - whoami=`whoami || id -un` + # Solaris id does not like -u -+ whoami 2> /dev/null || id -un 2> /dev/null || /usr/xpg4/bin/id -un ++ whoami=`whoami 2> /dev/null || id -un 2> /dev/null || /usr/xpg4/bin/id -un || echo unknown` fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 14:03:22 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 12:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[22006] csw/mgar/pkg Message-ID: Revision: 22006 http://gar.svn.sourceforge.net/gar/?rev=22006&view=rev Author: pfelecan Date: 2013-09-25 12:03:21 +0000 (Wed, 25 Sep 2013) Log Message: ----------- xfconf/trunk: instatiation Added Paths: ----------- csw/mgar/pkg/xfconf/ csw/mgar/pkg/xfconf/Makefile csw/mgar/pkg/xfconf/branches/ csw/mgar/pkg/xfconf/tags/ csw/mgar/pkg/xfconf/trunk/ csw/mgar/pkg/xfconf/trunk/Makefile csw/mgar/pkg/xfconf/trunk/checksums csw/mgar/pkg/xfconf/trunk/files/ csw/mgar/pkg/xfconf/trunk/files/0001-use-bash-in-test-drivers.patch Added: csw/mgar/pkg/xfconf/Makefile =================================================================== --- csw/mgar/pkg/xfconf/Makefile (rev 0) +++ csw/mgar/pkg/xfconf/Makefile 2013-09-25 12:03:21 UTC (rev 22006) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/xfconf/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/xfconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfconf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-25 12:03:21 UTC (rev 22006) @@ -0,0 +1,35 @@ +# $Id$ + +NAME = xfconf +VERSION = 4.10.0 +GARTYPE = v2 + +DESCRIPTION = Manage settings in Xfce +define BLURB + Manage settings in Xfce +endef + +MASTER_SITES = http://archive.xfce.org/xfce/4.10/src/ +DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES += 0001-use-bash-in-test-drivers.patch + +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWvim + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-gtk-doc +CONFIGURE_ARGS += --enable-gtk-doc-html +CONFIGURE_ARGS += --enable-gtk-doc-pdf + +GARCOMPILER = GNU + +TEST_SCRIPTS = custom + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +# abicheck.sh fails for incocuous reasons and the ABI is not in question: +test-custom: + cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) VERBOSE=true && $(MAKE) -i -k -C $(OBJDIR) check + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/xfconf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/xfconf/trunk/checksums =================================================================== --- csw/mgar/pkg/xfconf/trunk/checksums (rev 0) +++ csw/mgar/pkg/xfconf/trunk/checksums 2013-09-25 12:03:21 UTC (rev 22006) @@ -0,0 +1 @@ +4ed48150a03fb5f42b455494307b7f28 xfconf-4.10.0.tar.bz2 Added: csw/mgar/pkg/xfconf/trunk/files/0001-use-bash-in-test-drivers.patch =================================================================== --- csw/mgar/pkg/xfconf/trunk/files/0001-use-bash-in-test-drivers.patch (rev 0) +++ csw/mgar/pkg/xfconf/trunk/files/0001-use-bash-in-test-drivers.patch 2013-09-25 12:03:21 UTC (rev 22006) @@ -0,0 +1,22 @@ +From 8d213e97a8589ebe040d87977276766c79f9f5c8 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 25 Sep 2013 12:11:27 +0200 +Subject: [PATCH] use bash in test drivers + +--- + tests/test-template.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test-template.sh.in b/tests/test-template.sh.in +index 2e638a8..fe621a3 100644 +--- a/tests/test-template.sh.in ++++ b/tests/test-template.sh.in +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + + cleanup() { + if [ "$XFCONFD_PID" ]; then +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 25 16:53:17 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 25 Sep 2013 14:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[22007] csw/mgar/pkg/lzlib/trunk Message-ID: Revision: 22007 http://gar.svn.sourceforge.net/gar/?rev=22007&view=rev Author: dmichelsen Date: 2013-09-25 14:53:17 +0000 (Wed, 25 Sep 2013) Log Message: ----------- lzlib/trunk: Update to 1.5 Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch Removed Paths: ------------- csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2013-09-25 12:03:21 UTC (rev 22006) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2013-09-25 14:53:17 UTC (rev 22007) @@ -1,5 +1,5 @@ NAME = lzlib -VERSION = 1.2 +VERSION = 1.5 GARTYPE = v2 DESCRIPTION = A lossless data compression library based on the LZMA algorithm @@ -10,9 +10,9 @@ endef MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-gcc-to-sunstudio.patch -PATCHFILES += 0002-gcc-to-sunstudio-2.patch +DISTFILES += $(DISTNAME).tar.lz +PATCHFILES += 0001-Use-Sun-Studio-syntax-for-shared-libs.patch +PATCHFILES += 0001-sh-does-not-support-e.patch VENDOR_URL = http://www.nongnu.org/lzip/lzlib.html @@ -26,6 +26,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWliblz-dev = CSWliblz1 +EXTRA_CFLAGS = -xc99=all EXTRA_CXXFLAGS = -xcode=pic32 EXTRA_LINKER_FLAGS = -lCrun -norunpath @@ -33,9 +34,9 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += CXX="$(CXX)" +CONFIGURE_ARGS += CC="$(CC)" CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" -CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ARGS += CFLAGS="$(CFLAGS)" CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)" INSTALL_OVERRIDE_VARS = INSTALL LDCONFIG @@ -44,8 +45,3 @@ INSTALL_OVERRIDE_VAR_LDCONFIG = echo include gar/category.mk - -post-install-modulated: - gln -s liblz.so.1 $(DESTDIR)$(libdir)/liblz.so - @$(MAKECOOKIE) - Modified: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums 2013-09-25 12:03:21 UTC (rev 22006) +++ csw/mgar/pkg/lzlib/trunk/checksums 2013-09-25 14:53:17 UTC (rev 22007) @@ -1 +1 @@ -7a77358000929bb0a31ad6b68a139b9d lzlib-1.2.tar.gz +6378ea07986891b6fb4d7f55c14de60f lzlib-1.5.tar.lz Added: csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0001-Use-Sun-Studio-syntax-for-shared-libs.patch 2013-09-25 14:53:17 UTC (rev 22007) @@ -0,0 +1,25 @@ +From 0a4382b02f30efcebf1f3337722d012ae79e8fe7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 5 Aug 2013 13:29:27 +0200 +Subject: [PATCH] Use Sun Studio syntax for shared libs + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 7be45f7..3d0e4df 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -21,7 +21,7 @@ lib$(libname).a : lzlib.o + $(AR) -rcs $@ $< + + lib$(libname).so.$(pkgversion) : lzlib_sh.o +- $(CC) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $< ++ $(CC) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o $@ $< + + $(progname) : $(objs) lib$(libname).a + $(CC) $(LDFLAGS) -o $@ $(objs) lib$(libname).a +-- +1.8.3.1 + Deleted: csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch 2013-09-25 12:03:21 UTC (rev 22006) +++ csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch 2013-09-25 14:53:17 UTC (rev 22007) @@ -1,135 +0,0 @@ -From b1bae1c247333427284ee2e4a318a2769d6f3022 Mon Sep 17 00:00:00 2001 -From: THURNER rupert -Date: Wed, 5 Jan 2011 12:14:58 -0600 -Subject: [PATCH] gcc-to-sunstudio - -change buildflags and include types. ---- - Makefile.in | 4 ++-- - configure | 2 +- - decoder.cc | 2 +- - encoder.cc | 2 +- - lzcheck.cc | 2 +- - lzlib.cc | 2 +- - main.cc | 3 ++- - testsuite/check.sh | 3 +++ - 8 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 94e0114..65aee48 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -23,7 +23,7 @@ lib$(libname).a: $(lib_objs) - $(AR) -rcs $@ $^ - - lib$(libname).so.$(pkgversion) : $(sh_lib_objs) -- $(CXX) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $^ -+ $(CXX) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs) - - $(progname) : $(objs) lib$(libname).a - $(CXX) $(LDFLAGS) -o $@ $^ -@@ -96,7 +96,7 @@ install : all install-info - $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" - if [ -n "$(progname_shared)" ] ; then \ - $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ -- if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ -+ if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ - run_ldconfig=no ; rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ - else run_ldconfig=yes ; \ - fi ; \ -diff --git a/configure b/configure -index ca758e4..fffae27 100755 ---- a/configure -+++ b/configure -@@ -32,7 +32,7 @@ mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - CXX= - CPPFLAGS= --CXXFLAGS='-Wall -W -O2' -+CXXFLAGS= - LDFLAGS= - - # Loop over all args -diff --git a/decoder.cc b/decoder.cc -index 0d8d4d5..4622a4e 100644 ---- a/decoder.cc -+++ b/decoder.cc -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include "lzlib.h" - #include "lzip.h" -diff --git a/encoder.cc b/encoder.cc -index a0001c1..193ece9 100644 ---- a/encoder.cc -+++ b/encoder.cc -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include "lzlib.h" - #include "lzip.h" -diff --git a/lzcheck.cc b/lzcheck.cc -index ce53a41..3ccf1d7 100644 ---- a/lzcheck.cc -+++ b/lzcheck.cc -@@ -18,7 +18,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "lzlib.h" -diff --git a/lzlib.cc b/lzlib.cc -index 4a4b77b..5172a15 100644 ---- a/lzlib.cc -+++ b/lzlib.cc -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - - #include "lzlib.h" - #include "lzip.h" -diff --git a/main.cc b/main.cc -index afcabfe..1665c61 100644 ---- a/main.cc -+++ b/main.cc -@@ -33,7 +33,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - #include -diff --git a/testsuite/check.sh b/testsuite/check.sh -index be6204b..f7dc03a 100755 ---- a/testsuite/check.sh -+++ b/testsuite/check.sh -@@ -5,6 +5,9 @@ - # This script is free software: you have unlimited permission - # to copy, distribute and modify it. - -+PATH=/usr/ucb:$PATH -+export PATH -+ - LC_ALL=C - export LC_ALL - objdir=`pwd` --- -1.7.3.2 - Added: csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0001-sh-does-not-support-e.patch 2013-09-25 14:53:17 UTC (rev 22007) @@ -0,0 +1,31 @@ +From 0afe0e4a52cd6b0e8db4e5c3c48aaf3346d8151d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Sep 2013 16:01:48 +0200 +Subject: [PATCH] sh does not support -e + +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 3d0e4df..1cab86e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -86,12 +86,12 @@ install-bin : all + $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" + if [ -n "$(progname_shared)" ] ; then \ + $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ +- if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ ++ if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ + rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ + run_ldconfig=no ; \ + else run_ldconfig=yes ; \ + fi ; \ +- if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so" ] ; then \ ++ if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so" ] ; then \ + rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" ; \ + fi ; \ + cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so ; \ +-- +1.8.3.4 + Deleted: csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch 2013-09-25 12:03:21 UTC (rev 22006) +++ csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch 2013-09-25 14:53:17 UTC (rev 22007) @@ -1,25 +0,0 @@ -From 68db975872497081807f900e60d1bbb159b82f51 Mon Sep 17 00:00:00 2001 -From: THURNER rupert -Date: Wed, 5 Jan 2011 12:26:50 -0600 -Subject: [PATCH] gcc-to-sunstudio-2 - ---- - bbexample.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/bbexample.cc b/bbexample.cc -index df91300..1b65bf7 100644 ---- a/bbexample.cc -+++ b/bbexample.cc -@@ -17,7 +17,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "lzlib.h" --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 17:27:55 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 15:27:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[22008] csw/mgar/pkg/xfconf/trunk/Makefile Message-ID: Revision: 22008 http://gar.svn.sourceforge.net/gar/?rev=22008&view=rev Author: pfelecan Date: 2013-09-25 15:27:55 +0000 (Wed, 25 Sep 2013) Log Message: ----------- xfconf/trunk: tentative split in sub-packages Modified Paths: -------------- csw/mgar/pkg/xfconf/trunk/Makefile Modified: csw/mgar/pkg/xfconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-25 14:53:17 UTC (rev 22007) +++ csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-25 15:27:55 UTC (rev 22008) @@ -15,6 +15,7 @@ BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWvim +BUILD_DEP_PKGS += CSWlibxfce4util-dev CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-gtk-doc @@ -25,6 +26,35 @@ TEST_SCRIPTS = custom +PACKAGES += CSWxfconf +CATALOGNAME_CSWxfconf = xfconf +SPKG_DESC_CSWxfconf += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibxfconf0-2 + +PACKAGES += CSWlibxfconf0-2 +CATALOGNAME_CSWlibxfconf0-2 = libxfconf0_2 +PKGFILES_CSWlibxfconf0-2 += $(call baseisadirs,$(libdir),libxfconf-0\.so\.2\.0\.0) +PKGFILES_CSWlibxfconf0-2 += $(call baseisadirs,$(libdir),libxfconf-0\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibxfconf0-2 += $(DESCRIPTION), libxfconf-0.so.2 +RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibglib2-0-0 + +PACKAGES += CSWxfconf-dev +CATALOGNAME_CSWxfconf-dev = xfconf_dev +SPKG_DESC_CSWxfconf-dev += $(DESCRIPTION), development files +PKGFILES_CSWxfconf-dev += /opt/csw/lib/libxfconf-0.so +PKGFILES_CSWxfconf-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWxfconf-dev += CSWlibxfconf0-2 +ARCHALL_CSWxfconf-dev = 1 +CHECKPKG_OVERRIDES_CSWxfconf-dev += archall-devel-package + +PACKAGES += CSWxfconf-doc +CATALOGNAME_CSWxfconf-doc = xfconf_doc +SPKG_DESC_CSWxfconf-doc += $(DESCRIPTION), documentation +PKGFILES_CSWxfconf-doc += $(datadir)/gtk-doc/.* +ARCHALL_CSWxfconf-doc = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Sep 25 17:46:29 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 25 Sep 2013 15:46:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[22009] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22009 http://gar.svn.sourceforge.net/gar/?rev=22009&view=rev Author: slowfranklin Date: 2013-09-25 15:46:29 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Add overrides Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 15:27:55 UTC (rev 22008) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 15:46:29 UTC (rev 22009) @@ -79,6 +79,7 @@ PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/idmap_.*) PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),mit_samba\.so) PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so) +RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcrypt11 @@ -86,11 +87,19 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 +# We seem not to be able to get rid of these even though using -z ignore -B direct CHECKPKG_OVERRIDES_CSWsamba4 += soname-unused +# Silence conflicts with CSWsamba +CHECKPKG_OVERRIDES_CSWsamba4 += file-collision +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture +CHECKPKG_OVERRIDES_CSWsamba4 += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4 += missing-dependency|CSWsamba +CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-libs +INCOMPATIBLE_PKGS_CSWsamba4 += CSWsamba # Package with clients, finished PACKAGES += CSWsamba4-client @@ -108,8 +117,37 @@ RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs CHECKPKG_OVERRIDES_CSWsamba4-client += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-client += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-client += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtree.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbget|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtar.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbcquotas|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/nmblookup.1|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/rpcclient.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbcacls.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbclient|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/nmblookup|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbrestore|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/sharesec.1|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbta-util|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbtool|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/rpcclient|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbpasswd|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbclient.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbcacls|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbspool|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbdump|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbcquotas.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/sharesec|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbtar|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/dbwrap_tool.1|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbtree|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbbackup|CSWsamba|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbget.1|CSWsamba-client|CSWsamba4-client +INCOMPATIBLE_PKGS_CSWsamba4-client += CSWsamba-client # Development package PACKAGES += CSWsamba4-dev @@ -139,13 +177,48 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbldap0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 CHECKPKG_OVERRIDES_CSWsamba4-dev += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/winbind_krb5_locator.so|CSWsamba4-dev|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libnetapi.so|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/mit_samba.so|CSWsamba4|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/libsmbclient.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev +CHECKPKG_OVERRIDES_CSWsamba4-dev += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbconf0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibpdb0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibgensec0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbldap0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibndr-nbt0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-credentials0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-util0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibndr0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibregistry0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbclient-raw0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibndr-krb5pac0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamdb0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-hostconfig0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-binding0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-policy0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-samr0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibnetapi0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-atsvc0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibtorture0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibtevent-util0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-server0 +CHECKPKG_OVERRIDES_CSWsamba4-dev += missing-dependency|CSWlibtevent0 +INCOMPATIBLE_PKGS_CSWsamba4-dev += CSWsamba-dev # Package CSWsamba4 libraries PACKAGES += CSWsamba4-libs @@ -169,9 +242,14 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1 CHECKPKG_OVERRIDES_CSWsamba4-libs += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/share/man/man7/libsmbclient.7|CSWlibsmbclient0|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-libs += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWsamba4-libs += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += surplus-dependency|CSWsamba4-libs +INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 CSWlibsmbsharemodes0 PACKAGES += CSWlibdcerpc-atsvc0 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) @@ -180,21 +258,17 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += soname-unused PACKAGES += CSWlibdcerpc-binding0 PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1) PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0 -CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibdcerpc-samr0 PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1) @@ -209,22 +283,13 @@ PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibdcerpc0 PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) @@ -232,26 +297,23 @@ SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibdcerpc0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibdcerpc0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibgensec0 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 CHECKPKG_OVERRIDES_CSWlibgensec0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibgensec0 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibgensec0 += missing-dependency|CSWlibtevent0 PACKAGES += CSWlibndr-krb5pac0 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) @@ -259,7 +321,6 @@ SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibndr-krb5pac0 += soname-unused PACKAGES += CSWlibndr-nbt0 PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) @@ -267,7 +328,6 @@ SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibndr-nbt0 += soname-unused PACKAGES += CSWlibndr-standard0 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) @@ -275,7 +335,6 @@ SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibndr-standard0 += soname-unused PACKAGES += CSWlibndr0 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) @@ -283,8 +342,6 @@ SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0 -CHECKPKG_OVERRIDES_CSWlibndr0 += soname-unused PACKAGES += CSWlibnetapi0 PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0) @@ -305,6 +362,7 @@ RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 CHECKPKG_OVERRIDES_CSWlibpdb0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibpdb0 += missing-dependency|CSWlibwbclient0 PACKAGES += CSWlibregistry0 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) @@ -320,11 +378,8 @@ PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-credentials0 += $(DESCRIPTION), libsamba-credentials.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += soname-unused PACKAGES += CSWlibsamba-hostconfig0 @@ -332,24 +387,15 @@ PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-hostconfig0 += $(DESCRIPTION), libsamba-hostconfig.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0 -CHECKPKG_OVERRIDES_CSWlibsamba-hostconfig0 += soname-unused PACKAGES += CSWlibsamba-policy0 PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1) PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += soname-unused PACKAGES += CSWlibsamba-util0 @@ -359,19 +405,14 @@ RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWlibsamba-util0 += soname-unused PACKAGES += CSWlibsamdb0 PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1) PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibsamdb0 += soname-unused PACKAGES += CSWlibsmbclient-raw0 @@ -380,24 +421,24 @@ SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibsmbconf0 PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibsmbconf0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsmbconf0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibsmbconf0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibsmbldap0 PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0) @@ -406,11 +447,11 @@ RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibsmbldap0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsmbldap0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibsmbldap0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibtevent-util0 PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1) @@ -418,11 +459,10 @@ SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWlibtevent-util0 += soname-unused +CHECKPKG_OVERRIDES_CSWlibtevent-util0 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibtevent-util0 += surplus-dependency|CSWsamba4-libs PACKAGES += CSWlibtorture0 PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1) @@ -430,7 +470,6 @@ SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibtorture0 += soname-unused # Python package PACKAGES += CSWsamba4-python @@ -441,17 +480,21 @@ RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2 -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1 CHECKPKG_OVERRIDES_CSWsamba4-python += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/provision/backend.py +CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py +CHECKPKG_OVERRIDES_CSWsamba4-python += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWsamba4-python += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-part-of-filename +CHECKPKG_OVERRIDES_CSWsamba4-python += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-python += surplus-dependency|CSWsamba4-libs # winbind daemon, NSS and PAM modules PACKAGES += CSWsamba4-winbind SPKG_DESC_CSWsamba4-winbind = Tools to authenticate users from active directory using winbind -# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-winbind -# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-nss -# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-nss-system-links -# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-pam-system-links +INCOMPATIBLE_PKGS_CSWsamba4-winbind += CSWsamba-nss CSWsamba-winbind PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(bindir),wbinfo) PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so) PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,nss_winbind.so.1) @@ -464,31 +507,42 @@ PKGFILES_CSWsamba4-winbind += $(mandir)/man8/pam_winbind\.8 PKGFILES_CSWsamba4-winbind += $(mandir)/man1/wbinfo\.1 PKGFILES_CSWsamba4-winbind += $(mandir)/man8/winbindd\.8 -PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init\.d/cswwinbind4 +PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init.d/cswwinbind4 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-collision +CHECKPKG_OVERRIDES_CSWsamba4-winbind += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-winbind += missing-dependency|CSWlibwbclient0 PACKAGES += CSWsamba4-nss-system-links +ARCHALL_CSWsamba4-nss-system-links = 1 CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links +INCOMPATIBLE_PKGS_CSWsamba4-nss-system-links += CSWsamba-nss-system-links PKGFILES_CSWsamba4-nss-system-links = /usr/lib/nss_winbind_csw.so.1 -PKGFILES_CSWsamba4-nss-system-links += /usr/lib/nss_wins_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/nss_wins_csw.so.2 PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1 -PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.2 PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1 -PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_wins_csw.so.1 +PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_wins_csw.so.2 SPKG_DESC_CSWsamba4-nss-system-links += Samba 4 nss modules links for the system RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file -ARCHALL_CSWsamba4-nss-system-links = 1 +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += file-collision +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += missing-dependency|CSWsamba-nss-system-links|or|CSWsamba-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += missing-dependency|CSWsamba-nss PACKAGES += CSWsamba4-pam-system-links +ARCHALL_CSWsamba4-pam-system-links = 1 CATALOGNAME_CSWsamba4-pam-system-links = samba4_pam_system_links +INCOMPATIBLE_PKGS_CSWsamba4-pam-system-links += CSWsamba-pam-system-links PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/pam_winbind_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_smbpass_csw.so @@ -496,14 +550,24 @@ PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_winbind_csw.so SPKG_DESC_CSWsamba4-pam-system-links += Samba 4 pam modules links for the system +RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4 RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file -ARCHALL_CSWsamba4-pam-system-links = 1 +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_winbind_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_smbpass_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += missing-dependency|CSWsamba-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += missing-dependency|CSWsamba-winbind +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += missing-dependency|CSWsamba +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4 # For checking whether we're missing anything, enable and check when updating. # Should only catch SWAT stuff which is EOL upstream so we're not packaging it -PACKAGES += CSWsamba4-catchall +# PACKAGES += CSWsamba4-catchall SPKG_DESC_CSWsamba4-catchall = Samba 4 catch all +RUNTIME_DEP_PKGS_CSWsamba4-catchall += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-catchall += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-catchall += CSWlibpopt0 # The build fails to add the right rpath to at least the public libs EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect @@ -592,13 +656,11 @@ ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf ginstall -d $(DESTDIR)/etc/opt/csw/openldap/schema ginstall $(WORKSRC)/examples/LDAP/samba.schema $(DESTDIR)/etc/opt/csw/openldap/schema -# ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1 -# ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1 # This bit is to install the symlinks to use the NSS modules with the # system's nsswitch.conf ginstall -d -m 0755 $(DESTDIR)$(NSS_MODULE_DIR) gln -s $(NSS_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_winbind_csw.so.1 - gln -s $(NSS_WINS_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_wins_csw.so.1 + gln -s $(NSS_WINS_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_wins_csw.so.2 # This bit is to install the symlinks to use the PAM modules with the # system's pam.conf ginstall -d -m 0755 $(DESTDIR)$(PAM_MODULE_DIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Sep 25 17:56:05 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 25 Sep 2013 15:56:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[22010] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22010 http://gar.svn.sourceforge.net/gar/?rev=22010&view=rev Author: slowfranklin Date: 2013-09-25 15:56:04 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Remove unused override Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 15:46:29 UTC (rev 22009) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 15:56:04 UTC (rev 22010) @@ -248,7 +248,6 @@ CHECKPKG_OVERRIDES_CSWsamba4-libs += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1 CHECKPKG_OVERRIDES_CSWsamba4-libs += missing-dependency|CSWlibwbclient0 CHECKPKG_OVERRIDES_CSWsamba4-libs += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += surplus-dependency|CSWsamba4-libs INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 CSWlibsmbsharemodes0 PACKAGES += CSWlibdcerpc-atsvc0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 18:03:37 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 16:03:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[22011] csw/mgar/pkg Message-ID: Revision: 22011 http://gar.svn.sourceforge.net/gar/?rev=22011&view=rev Author: pfelecan Date: 2013-09-25 16:03:37 +0000 (Wed, 25 Sep 2013) Log Message: ----------- libxfce4ui/trunk: instantiate and tentative split in sub-packages Added Paths: ----------- csw/mgar/pkg/libxfce4ui/ csw/mgar/pkg/libxfce4ui/Makefile csw/mgar/pkg/libxfce4ui/branches/ csw/mgar/pkg/libxfce4ui/tags/ csw/mgar/pkg/libxfce4ui/trunk/ csw/mgar/pkg/libxfce4ui/trunk/Makefile csw/mgar/pkg/libxfce4ui/trunk/checksums csw/mgar/pkg/libxfce4ui/trunk/files/ Added: csw/mgar/pkg/libxfce4ui/Makefile =================================================================== --- csw/mgar/pkg/libxfce4ui/Makefile (rev 0) +++ csw/mgar/pkg/libxfce4ui/Makefile 2013-09-25 16:03:37 UTC (rev 22011) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libxfce4ui/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libxfce4ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4ui/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-25 16:03:37 UTC (rev 22011) @@ -0,0 +1,64 @@ +# $Id$ + +NAME = libxfce4ui +VERSION = 4.10.0 +GARTYPE = v2 + +DESCRIPTION = Common Xfce widgets +define BLURB + Library used to share commonly used Xfce widgets amoung the Xfce applications. +endef + +MASTER_SITES = http://archive.xfce.org/xfce/4.10/src/ +DISTFILES = $(DISTNAME).tar.bz2 + +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWvim +BUILD_DEP_PKGS += CSWxfconf-dev + +CONFIGURE_ARGS = $(DIRPATHS) + +GARCOMPILER = GNU + +TEST_SCRIPTS = custom + +PACKAGES += CSWlibxfce4ui +CATALOGNAME_CSWlibxfce4ui = libxfce4ui +SPKG_DESC_CSWlibxfce4ui += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibxfce4ui1-0 + +PACKAGES += CSWlibxfce4ui1-0 +CATALOGNAME_CSWlibxfce4ui1-0 = libxfce4ui1-0 +PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4ui\-1.so\.0\.0\.0) +PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4ui\-1.so\.0(\.\d+)*) +PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfcekbd-private\-2.so\.0\.0\.0) +PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private\-2.so\.0(\.\d+)*) +SPKG_DESC_CSWlibxfce4ui1-0 += $(DESCRIPTION), libxfce4ui-1.so.0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibglib2-0-0 + +PACKAGES += CSWlibxfce4ui-dev +CATALOGNAME_CSWlibxfce4ui-dev = libxfce4ui_dev +SPKG_DESC_CSWlibxfce4ui-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibxfce4ui-dev += /opt/csw/lib/libxfce4ui-1.so +PKGFILES_CSWlibxfce4ui-dev += /opt/csw/lib/libxfce4kbd-private-2.so +PKGFILES_CSWlibxfce4ui-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibxfce4ui-dev += CSWlibxfce4ui1-0 +ARCHALL_CSWlibxfce4ui-dev = 1 +CHECKPKG_OVERRIDES_CSWlibxfce4ui-dev += archall-devel-package + +PACKAGES += CSWlibxfce4ui-doc +CATALOGNAME_CSWlibxfce4ui-doc = libxfce4ui_doc +SPKG_DESC_CSWlibxfce4ui-doc += $(DESCRIPTION), documentation +PKGFILES_CSWlibxfce4ui-doc += $(datadir)/gtk-doc/.* +ARCHALL_CSWlibxfce4ui-doc = 1 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +# abicheck.sh fails for innocuous reasons and the ABI is not in question: +test-custom: + cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) VERBOSE=true && $(MAKE) -i -k -C $(OBJDIR) check + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/libxfce4ui/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libxfce4ui/trunk/checksums =================================================================== --- csw/mgar/pkg/libxfce4ui/trunk/checksums (rev 0) +++ csw/mgar/pkg/libxfce4ui/trunk/checksums 2013-09-25 16:03:37 UTC (rev 22011) @@ -0,0 +1 @@ +6df1ce474a3d4885aee31cda9dbc9192 libxfce4ui-4.10.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Sep 25 18:31:11 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 25 Sep 2013 16:31:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[22012] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22012 http://gar.svn.sourceforge.net/gar/?rev=22012&view=rev Author: slowfranklin Date: 2013-09-25 16:31:10 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Don't use PKGFILES_DEVEL in -dev package, it picks up unversioned libs Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 16:03:37 UTC (rev 22011) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 16:31:10 UTC (rev 22012) @@ -56,7 +56,6 @@ # Main package CSWsamba4 PACKAGES += CSWsamba4 SPKG_DESC_CSWsamba4 = $(DESCRIPTION) -# OBSOLETED_BY_CSWsamba4 += CSWsamba SMB_BINS = eventlogadm gentest locktest masktest ndrdump net ntlm_auth pdbedit pidl SMB_BINS += profiles samba-tool smbcontrol smbstatus smbtorture testparm SMB_SBINS = smbd nmbd samba samba_dnsupdate samba_kcc samba_spnupdate samba_upgradedns @@ -104,7 +103,6 @@ # Package with clients, finished PACKAGES += CSWsamba4-client SPKG_DESC_CSWsamba4-client = Samba 4 clients -# OBSOLETED_BY_CSWsamba4-client += CSWsamba-client SMB_CLIENT_BINS = cifsdd dbwrap_tool nmblookup nmblookup4 oLschema2ldif regdiff regpatch regshell regtree rpcclient SMB_CLIENT_BINS += samba-regedit sharesec smbcacls smbclient smbclient4 smbcquotas smbget smbpasswd smbprint SMB_CLIENT_BINS += smbspool smbta-util smbtar smbtree tdbbackup tdbdump tdbrestore tdbtool @@ -152,9 +150,11 @@ # Development package PACKAGES += CSWsamba4-dev SPKG_DESC_CSWsamba4-dev = Development files for Samba 4 -# OBSOLETED_BY_CSWsamba4-dev += CSWsamba-dev -PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWsamba4-dev += $(includedir)/.*\.h PKGFILES_CSWsamba4-dev += $(libdir)/lib.*\.so +PKGFILES_CSWsamba4-dev += $(libdir)/pkgconfig/.*\.pc +PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3 +PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3perl RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 @@ -182,17 +182,13 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev -CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/winbind_krb5_locator.so|CSWsamba4-dev|CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libnetapi.so|CSWsamba-dev|CSWsamba4-dev -CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/mit_samba.so|CSWsamba4|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/libsmbclient.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev -CHECKPKG_OVERRIDES_CSWsamba4-dev += missing-dependency|CSWlibwbclient0 CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbconf0 CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibpdb0 CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibgensec0 @@ -217,7 +213,6 @@ CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibtorture0 CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibtevent-util0 CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-server0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += missing-dependency|CSWlibtevent0 INCOMPATIBLE_PKGS_CSWsamba4-dev += CSWsamba-dev # Package CSWsamba4 libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 18:52:09 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 16:52:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[22013] csw/mgar/pkg Message-ID: Revision: 22013 http://gar.svn.sourceforge.net/gar/?rev=22013&view=rev Author: pfelecan Date: 2013-09-25 16:52:09 +0000 (Wed, 25 Sep 2013) Log Message: ----------- exo/trunk: instantiate and tentative split in sub-packages Added Paths: ----------- csw/mgar/pkg/exo/ csw/mgar/pkg/exo/Makefile csw/mgar/pkg/exo/branches/ csw/mgar/pkg/exo/tags/ csw/mgar/pkg/exo/trunk/ csw/mgar/pkg/exo/trunk/Makefile csw/mgar/pkg/exo/trunk/checksums csw/mgar/pkg/exo/trunk/files/ Added: csw/mgar/pkg/exo/Makefile =================================================================== --- csw/mgar/pkg/exo/Makefile (rev 0) +++ csw/mgar/pkg/exo/Makefile 2013-09-25 16:52:09 UTC (rev 22013) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/exo/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/exo/trunk/Makefile =================================================================== --- csw/mgar/pkg/exo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/exo/trunk/Makefile 2013-09-25 16:52:09 UTC (rev 22013) @@ -0,0 +1,57 @@ +# $Id$ + +NAME = exo +VERSION = 0.8.0 +GARTYPE = v2 + +DESCRIPTION = An extension library to Xfce +define BLURB + An extension library to Xfce, developed by os-cillation. While Xfce + comes with quite a few libraries that are targeted at desktop + development, libexo is targeted at application development. +endef + +MASTER_SITES = http://archive.xfce.org/xfce/4.10/src/ +DISTFILES = $(DISTNAME).tar.bz2 + +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWvim +BUILD_DEP_PKGS += CSWlibxfce4util-dev +BUILD_DEP_PKGS += CSWlibxfce4ui-dev + +CONFIGURE_ARGS = $(DIRPATHS) + +GARCOMPILER = GNU + +PACKAGES += CSWexo +CATALOGNAME_CSWexo = exo +SPKG_DESC_CSWexo += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWexo += CSWlibexo1-0 + +PACKAGES += CSWlibexo1-0 +CATALOGNAME_CSWlibexo1-0 = libexo1_0 +PKGFILES_CSWlibexo1-0 += $(call baseisadirs,$(libdir),libexo-1\.so\.0\.0\.0) +PKGFILES_CSWlibexo1-0 += $(call baseisadirs,$(libdir),libexo-1\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibexo1-0 += $(DESCRIPTION), libexo-1.so.0 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibglib2-0-0 + +PACKAGES += CSWexo-dev +CATALOGNAME_CSWexo-dev = exo_dev +SPKG_DESC_CSWexo-dev += $(DESCRIPTION), development files +PKGFILES_CSWexo-dev += /opt/csw/lib/libexo-1.so +PKGFILES_CSWexo-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWexo-dev += CSWlibexo1-0 +ARCHALL_CSWexo-dev = 1 +CHECKPKG_OVERRIDES_CSWexo-dev += archall-devel-package + +PACKAGES += CSWexo-doc +CATALOGNAME_CSWexo-doc = exo_doc +SPKG_DESC_CSWexo-doc += $(DESCRIPTION), documentation +PKGFILES_CSWexo-doc += $(datadir)/gtk-doc/.* +ARCHALL_CSWexo-doc = 1 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/exo/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/exo/trunk/checksums =================================================================== --- csw/mgar/pkg/exo/trunk/checksums (rev 0) +++ csw/mgar/pkg/exo/trunk/checksums 2013-09-25 16:52:09 UTC (rev 22013) @@ -0,0 +1 @@ +189bd19210e1d7d8601be1cdf27bf259 exo-0.8.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 18:53:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 16:53:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[22014] csw/mgar/pkg/xfconf/trunk/Makefile Message-ID: Revision: 22014 http://gar.svn.sourceforge.net/gar/?rev=22014&view=rev Author: pfelecan Date: 2013-09-25 16:53:26 +0000 (Wed, 25 Sep 2013) Log Message: ----------- xfconf/trunk: orthographic correction Modified Paths: -------------- csw/mgar/pkg/xfconf/trunk/Makefile Modified: csw/mgar/pkg/xfconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-25 16:52:09 UTC (rev 22013) +++ csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-25 16:53:26 UTC (rev 22014) @@ -59,7 +59,7 @@ PATH := /opt/csw/gnu:$(PATH) -# abicheck.sh fails for incocuous reasons and the ABI is not in question: +# abicheck.sh fails for innocuous reasons and the ABI is not in question: test-custom: cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) VERBOSE=true && $(MAKE) -i -k -C $(OBJDIR) check $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Sep 25 19:07:37 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 25 Sep 2013 17:07:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[22015] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22015 http://gar.svn.sourceforge.net/gar/?rev=22015&view=rev Author: slowfranklin Date: 2013-09-25 17:07:36 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: Remove deps from samba4-dev Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 16:53:26 UTC (rev 22014) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 17:07:36 UTC (rev 22015) @@ -156,7 +156,6 @@ PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3 PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3perl RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0 @@ -165,7 +164,6 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-util0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient-raw0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-policy0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamdb0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-winbind RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-krb5pac0 @@ -180,7 +178,6 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbldap0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 19:31:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 17:31:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[22016] csw/mgar/pkg/lang-python/calibre/trunk/Makefile Message-ID: Revision: 22016 http://gar.svn.sourceforge.net/gar/?rev=22016&view=rev Author: pfelecan Date: 2013-09-25 17:31:06 +0000 (Wed, 25 Sep 2013) Log Message: ----------- lang-python/calibre/trunk: addition of the required dependency to get help Modified Paths: -------------- csw/mgar/pkg/lang-python/calibre/trunk/Makefile Modified: csw/mgar/pkg/lang-python/calibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-09-25 17:07:36 UTC (rev 22015) +++ csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-09-25 17:31:06 UTC (rev 22016) @@ -53,6 +53,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +RUNTIME_DEP_PKGS = CSWexo + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Sep 25 19:47:42 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 25 Sep 2013 17:47:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[22017] csw/mgar/pkg/xfce/libxfce4util/ Message-ID: Revision: 22017 http://gar.svn.sourceforge.net/gar/?rev=22017&view=rev Author: pfelecan Date: 2013-09-25 17:47:42 +0000 (Wed, 25 Sep 2013) Log Message: ----------- xfce/libxfce4util/trunk: removed as there is now a new recipe at the root of the repository; if xfce is reinstated, please use the new one. Removed Paths: ------------- csw/mgar/pkg/xfce/libxfce4util/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Sep 25 21:24:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 25 Sep 2013 19:24:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[22018] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22018 http://gar.svn.sourceforge.net/gar/?rev=22018&view=rev Author: chninkel Date: 2013-09-25 19:24:47 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: add some build dependencies missing Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 17:47:42 UTC (rev 22017) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 19:24:47 UTC (rev 22018) @@ -22,6 +22,8 @@ GARCOMPILER = GNU PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 BUILD_DEP_PKGS += CSWlibtalloc-dev +BUILD_DEP_PKGS += CSWlibpopt-dev +BUILD_DEP_PKGS += CSWlibgamin-dev PATCHFILES += 0001-fix-xml.patch # From https://bugzilla.samba.org/show_bug.cgi?id=7588 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Sep 25 21:25:13 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 25 Sep 2013 19:25:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[22019] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22019 http://gar.svn.sourceforge.net/gar/?rev=22019&view=rev Author: chninkel Date: 2013-09-25 19:25:13 +0000 (Wed, 25 Sep 2013) Log Message: ----------- samba/branches/samba4: remove an unecessary override (thanks to a bug being fixed in checkpkg/elf code) Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 19:24:47 UTC (rev 22018) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-25 19:25:13 UTC (rev 22019) @@ -91,8 +91,6 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 -# We seem not to be able to get rid of these even though using -z ignore -B direct -CHECKPKG_OVERRIDES_CSWsamba4 += soname-unused # Silence conflicts with CSWsamba CHECKPKG_OVERRIDES_CSWsamba4 += file-collision CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Sep 25 22:43:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Sep 2013 20:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[22020] csw/mgar/pkg/opencsw-manual/trunk Message-ID: Revision: 22020 http://gar.svn.sourceforge.net/gar/?rev=22020&view=rev Author: wahwah Date: 2013-09-25 20:43:17 +0000 (Wed, 25 Sep 2013) Log Message: ----------- opencsw-manual/trunk: Buildfarm setup docs consolidation, step 1 Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2013-09-25 19:25:13 UTC (rev 22019) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2013-09-25 20:43:17 UTC (rev 22020) @@ -14,9 +14,8 @@ VERSION = 0.1 GARTYPE = v2 DESCRIPTION = OpenCSW manual -define BLURB -endef -SPKG_SOURCEURL = http://www.opencsw.org + +VENDOR_URL = http://www.opencsw.org MASTER_SITES = http://www.gnu.org/licenses/ DISTFILES = fdl-1.3.txt CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-09-25 19:25:13 UTC (rev 22019) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-09-25 20:43:17 UTC (rev 22020) @@ -8,6 +8,10 @@ .. _pkgutil: http://pkgutil.net +Solaris 10 +^^^^^^^^^^ + + On a Solaris 10 system, you can use the capacity of ``pkgadd`` to download and install it via http in one step:: @@ -16,6 +20,9 @@ You may need to specify a proxy with ``-x :``, be aware that there are known issues with Squid and possibly other proxies. +Solaris 8 and 9 +^^^^^^^^^^^^^^^ + On Solaris 8 and 9 (or 10 if you have issues with the above ``pkgadd``) you need to download the package manually (e.g. using wget) and then install it:: @@ -50,7 +57,7 @@ ------------------ -Selecting catalog and mirror +Selecting your mirror and the catalog release ------------------ Now that you are about to install lots of stuff it may be a good time to select @@ -65,7 +72,8 @@ mirror=http://mirror.opencsw.org/opencsw/unstable By default, ``pkgutil`` is configured to use the ``testing`` catalog. You might -change it to ``unstable`` if you want to use newer versions of packages. +change it to ``unstable`` on your development hosts to catch any issues before +they hit the ``testing`` catalog. You can verify the setting with ``pkgutil -V``:: @@ -134,52 +142,3 @@ Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C 9A3C 05F4 2D66 9306 CC77 ==> 3173 packages loaded from /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 ... - - --------------------- -Package dependencies --------------------- - -The OpenCSW packages have been compiled to allow easy forward migration and -crossgrades/mixing between SPARC and x86_64 CPUs. That means the same version of the -package is available for Solaris 10 and 11 for both SPARC and x86. There are -some exceptions where the software is absolutely not available or has a version -mismatch (e.g. acroread). To allow this, there are usually no dependencies on -SUNW packages. This sometimes leads to large dependency chains (and people -thinking of OpenCSW packages as bloated) but that is the price to pay for -the interoperability and we feel that in times of ever growing disks the -flexibility is worth more than the saved bytes. - -Package dependencies are modeled in the OpenCSW catalogs to allow automatic -dependency resolution via pkgutil. To view the current dependencies for a -package you can use:: - - pkgutil --deptree - - --------------------------------------------------------------- -Creating a .pkg file for a host without an Internet connection --------------------------------------------------------------- - -If you need to install a package with multiple dependencies on a host with no -Internet access, you can use ``pkgutil`` to prepare a ``.pkg`` file with the -whole dependency chain. This is much easier than copying dependencies one by -one:: - - pkgutil \ - --stream \ - --target=sparc:5.10 \ - --output imagemagick-and-others.pkg \ - --yes \ - --download \ - imagemagick coreutils vim ggrep gsed - -At the end of the run, ``pkgutil`` displays the correct order to install the -packages in. - -The resulting package stream will be placed in the ``~/.pkgutil/packages`` -directory. - -This topic is also `discussed`_ on the community site. - -.. _discussed: http://www.opencsw.org/community/questions/92/installing-without-a-direct-internet-access Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-09-25 19:25:13 UTC (rev 22019) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-09-25 20:43:17 UTC (rev 22020) @@ -9,6 +9,7 @@ introduction getting-started + installing-en-masse configuring-services mirror-setup Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2013-09-25 20:43:17 UTC (rev 22020) @@ -0,0 +1,51 @@ +========================== +Installing packages en masse +========================== + +-------------------- +Package dependencies +-------------------- + +The OpenCSW packages have been compiled to allow easy forward migration and +crossgrades/mixing between SPARC and x86_64 CPUs. That means the same version of the +package is available for Solaris 10 and 11 for both SPARC and x86. There are +some exceptions where the software is absolutely not available or has a version +mismatch (e.g. acroread). To allow this, there are usually no dependencies on +SUNW packages. This sometimes leads to large dependency chains (and people +thinking of OpenCSW packages as bloated) but that is the price to pay for +the interoperability and we feel that in times of ever growing disks the +flexibility is worth more than the saved bytes. + +Package dependencies are modeled in the OpenCSW catalogs to allow automatic +dependency resolution via pkgutil. To view the current dependencies for a +package you can use:: + + pkgutil --deptree + + +-------------------------------------------------------------- +Creating a .pkg file for a host without an Internet connection +-------------------------------------------------------------- + +If you need to install a package with multiple dependencies on a host with no +Internet access, you can use ``pkgutil`` to prepare a ``.pkg`` file with the +whole dependency chain. This is much easier than copying dependencies one by +one:: + + pkgutil \ + --stream \ + --target=sparc:5.10 \ + --output imagemagick-and-others.pkg \ + --yes \ + --download \ + imagemagick coreutils vim ggrep gsed + +At the end of the run, ``pkgutil`` displays the correct order to install the +packages in. + +The resulting package stream will be placed in the ``~/.pkgutil/packages`` +directory. + +This topic is also `discussed`_ on the community site. + +.. _discussed: http://www.opencsw.org/community/questions/92/installing-without-a-direct-internet-access Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 19:25:13 UTC (rev 22019) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 20:43:17 UTC (rev 22020) @@ -4,28 +4,164 @@ .. highlight:: text -Packages released by OpenCSW must be built on the OpenCSW buildfarm, but if -you want to experiment, or build in-house packages, you might want to set up -your own build farm, or at least a build host. +Buildfarm is a set of hosts where you can build Solaris packages. You can +connect Intel and SPARC and build a set of packages with one shell command. -Core setup ----------- +If you prefer a video tutorial instead of a written document, there is +a `packaging video tutorial`_ available. It covers all the steps from a fresh +Solaris 10 install to a built package. It takes about 2-3h to complete. -The following setup is sufficient to create packages using the OpenCSW build -system. You can set up a small virtual machine on a home server, or build -a set of custom packages in your company. +Prerequisites +------------- * `basic OpenCSW installation`_, as you would do on any Solaris host where you're using OpenCSW packages. -* `GAR setup`_, including subversion checkout of build recipes. This is the - core part of the package building system, -A `packaging video tutorial`_ is available. It covers all the steps from -a fresh Solaris 10 install to a built package. It takes about 2-3h to complete -it (but YMMV). +Core setup +---------- + +The core setup is enough to build packages but does not allow to automatically +check your packages for errors. + +:: + + sudo pkgutil -y -i vim gar_dev mgar gcc4core gcc4g++ sudo + +Oracle Solaris Studio Compiler +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +You need a compiler. Most of the packages built by OpenCSW use Oracle Solaris +Studio (historically called 'SOS'), which you can `download from Oracle`_. You +want to go with the packaged (non-tar) version. In case you have access to an +Oracle Solaris development tools support contract, please make sure to also +install `the latest Oracle Solaris Studio compiler patches`_. The compilers +should be installed at the following locations: + +* Sun Studio 11: ``/opt/studio/SOS11`` +* Sun Studio 12: ``/opt/studio/SOS12`` +* Sun Studio 12u1: ``/opt/studio/sunstudio12.1`` +* Solaris Studio 12u2: ``/opt/solstudio12.2`` +* Solaris Studio 12u3: ``/opt/solarisstudio12.3`` + +You can install multiple versions of SOS on one system. If you have your +compiler installed at a different location you can set it in your ``~/.garrc`` +with the following lines: + +:: + + SOS11_CC_HOME = /opt/SUNWspro + SOS12_CC_HOME = /opt/studio12/SUNWspro + + +Installing Oracle Solaris Studio 12 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +:: + + cd ss12 + ./batch_installer -d /opt/studio/SOS12 --accept-sla + +Installing Oracle Solaris Studio 12u3 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +:: + + sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp + +Patching the installed compilers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Remember to patch the compilers, with PCA or manually (requires a software +service contract from Oracle). + +Setup ``~/.garrc`` +^^^^^^^^^^^^^^^^^^ + +Finally, you need to create your personal ``~/.garrc`` configuration file. It +contains your name and e-mail adress, both of which are included in the +metadata of built packages. Further, GAR needs to know where to store +downloaded sources and generated packages. + +Here's an example: + +:: + + # Data for pkginfo + SPKG_PACKAGER = Dagobert Michelsen + SPKG_EMAIL = dam at example.com + # + # Where to store generated packages + SPKG_EXPORT = /home/dam/pkgs + # + # Where to store downloaded sources + GARCHIVEDIR = /home/dam/src + # + # Disable package sanity checks by checkpkg if you are building on your + # own host (checkpkg depends on OpenCSW buildfarm infrastructure) + ENABLE_CHECK = 0 + +In case you are sitting behind a proxy, you would also want to configure this in ~/.garrc. + +:: + + http_proxy = http://proxy[:port] + +You can customize several other things in ``~/.garrc`` which we'll see later. +Do not customize anything which makes the build dependent on your +``~/.garrc``-settings! This includes changing compilers flags, ``PATH``, etc. +This is equally true for ``gar.conf.mk`` - please don't modify it! If you feel +it needs change please subscribe to the `users mailing list`_ and discuss your +change there. + +Basic git configuration +^^^^^^^^^^^^^^^^^^^^^^^ + +Git will be installed as one of dependencies. It is used by GAR to make source +patching easier. Provide basic configuration for git: + +:: + + git config --global user.email "you at example.com" + git config --global user.name "Your Name" + +You also need to set up the EDITOR command, because git's expectations don't +match up with the behavior of ``/bin/vi``. Here's an example how to set it to +use vim: + +:: + + sudo pkgutil -y -i vim + echo "export EDITOR=/opt/csw/bin/vim" >> ~/.bashrc + +Of course, it can be your editor of choice. + +Initialize the source tree +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +As regular user (do not use ``root`` for safety reasons) to be used for +building init your local repository: + +:: + + mgar init [] (defaults to ~/opencsw) + +Please make yourself familiar with `mgar`_. + +Fetch all the build recipes: + +:: + + mgar up --all + +Done! +^^^^^ + +Congratulations, you now have all pre-requisites in place to continue to learn +building packages with GAR. + Advanced setup --------------- +^^^^^^^^^^^^^^ The following components are not required, but are quite useful. @@ -71,3 +207,16 @@ .. _Catalog signing daemon source code: http://sourceforge.net/p/opencsw/code/HEAD/tree/catalog_signatures/ + +.. _download from Oracle: +.. _Oracle Solaris Studio: + http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.html + +.. _the latest Oracle Solaris Studio compiler patches: + http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index-jsp-136213.html + +.. _users mailing list: + https://lists.opencsw.org/mailman/listinfo/users + +.. _mgar: + http://wiki.opencsw.org/gar-wrapper This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 26 00:39:30 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Sep 2013 22:39:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[22021] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22021 http://gar.svn.sourceforge.net/gar/?rev=22021&view=rev Author: wahwah Date: 2013-09-25 22:39:30 +0000 (Wed, 25 Sep 2013) Log Message: ----------- opencsw-manual/trunk: Content moved from the wiki. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 20:43:17 UTC (rev 22020) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 22:39:30 UTC (rev 22021) @@ -16,12 +16,15 @@ * `basic OpenCSW installation`_, as you would do on any Solaris host where you're using OpenCSW packages. +* You need a `local catalog mirror`_ which will allow you to quickly access + all packages that are in any of OpenCSW catalogs for any Solaris version. + A typical location is ``/export/mirror/opencsw``. -Core setup +Base setup ---------- -The core setup is enough to build packages but does not allow to automatically +The base setup is enough to build packages but does not allow to automatically check your packages for errors. :: @@ -154,21 +157,119 @@ mgar up --all -Done! -^^^^^ +checkpkg database +----------------- -Congratulations, you now have all pre-requisites in place to continue to learn -building packages with GAR. +You can use any database engine supported by sqlobject. MySQL and sqlite have +been tested. +When using MySQL, you need to create the database and a user which has access +to that database (not covered here). + +max_allowed_packet problem in MySQL +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Since checkpkg stores objects in JSON, it sometimes stores values way bigger +than the default allowed 1MB. For this to work with MySQL, the following +needs to be present in ``/etc/opt/csw/my.cnf``:: + + [mysqld] + max_allowed_packet=64M + +There are packages which require data structures larger than 32MB, hence the +64MB value. + +case-insensitive string comparison in MySQL +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. _C.5.5.1. Case Sensitivity in String Searches: + http://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html + +MySQL documentation in section `C.5.5.1. Case Sensitivity in String Searches`_ +says: + + For nonbinary strings (CHAR, VARCHAR, TEXT), string searches use the + collation of the comparison operands. For binary strings (BINARY, VARBINARY, + BLOB), comparisons use the numeric values of the bytes in the operands; this + means that for alphabetic characters, comparisons will be case sensitive. + +In SQLObject, the UnicodeCol column type is translated into VARCHAR, which +results in case-insensitive comparisons. This makes checkpkg throw file +collision errors between files such as "Zcat.1" and "zcat.1". In order to +work around this, a case-sensitive collation needs to be used; for example, +latin1_bin. Collation setting can be altered for certain columns, as +follows:: + + ALTER TABLE csw_file MODIFY COLUMN path VARCHAR(900) NOT NULL COLLATE latin1_bin; + ALTER TABLE csw_file MODIFY COLUMN basename VARCHAR(255) NOT NULL COLLATE latin1_bin; + +Before applying these changes, make sure that you're using the same column +settings as the ones in the database. + +Configuration +^^^^^^^^^^^^^ + +The database access configuration is held in ``~/.checkpkg/checkpkg.ini`` or, +in the shared config scenario, in ``/etc/opt/csw/checkpkg.ini``. The format +is as follows:: + + [database] + + type = mysql + name = checkpkg + host = mysql + user = checkpkg + password = yourpassword + + +Initializing tables and indexes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The next step is creating the tables in the database. + +:: + + bin/pkgdb initdb + +System files indexing +^^^^^^^^^^^^^^^^^^^^^ + +The following commands will index and import files on the filesystem. Please +note that you might need to change 'SunOS5.10' and 'sparc' to match your file. + +:: + + bin/pkgdb system-files-to-file + bin/pkgdb import-system-file install-contents-SunOS5.10-sparc.marshal + +You can notice that there are separate steps: collecting the data and saving +as a file, and importing the data. Why are they separate? You need to collect +data on the host that contains them, but you might import the data on +a different host. + +OpenCSW catalog indexing +^^^^^^^^^^^^^^^^^^^^^^^^ + +Next step, import your OpenCSW catalog mirror:: + + bin/pkgdb sync-catalogs-from-tree unstable /home/mirror/opencsw/unstable + +Importing the whole catalog takes time, and depending on the speed of your +machine, it can take anything from a few hours to a few days. The good news +is that you only need to import each package once, and once catalog updates +come in, pkgdb only imports the new packages. + +You will need to perform this operation each time the OpenCSW catalog is +updated. Otherwise your packages will be checked against an old state of the +catalog. + +Your database is now ready. + Advanced setup -^^^^^^^^^^^^^^ +-------------- The following components are not required, but are quite useful. -* `local catalog mirror`_ will allow you to quickly access all packages that - are in any of OpenCSW catalogs for any Solaris version. -* `checkpkg database`_ will allow you to check packages for common problems, - for example library dependencies. * pkgdb-web (with Apache) is a web app on which you can browse your package database and inspect package metadata without having to unpack and examine packages in the terminal. Information such as list of files, pkginfo content @@ -190,9 +291,6 @@ .. _GAR setup: http://sourceforge.net/apps/trac/gar/wiki/GarSetup -.. _checkpkg database: - http://wiki.opencsw.org/checkpkg#toc2 - .. _Additional setup documented on the wiki: http://wiki.opencsw.org/buildfarm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 26 01:06:24 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Sep 2013 23:06:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[22022] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22022 http://gar.svn.sourceforge.net/gar/?rev=22022&view=rev Author: wahwah Date: 2013-09-25 23:06:24 +0000 (Wed, 25 Sep 2013) Log Message: ----------- opencsw-manual/trunk: Moved content from the 'buildfarm' article on the wiki. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 22:39:30 UTC (rev 22021) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 23:06:24 UTC (rev 22022) @@ -265,6 +265,196 @@ Your database is now ready. +Multi-host setup +---------------- + +How to set up hosts allowing you to build for both Intel and SPARC +architectures. At least three servers are needed: + +* Solaris 9 Sparc to build 32 bit and 64 bit Sparc binaries +* Solaris 9 x86 to build 32 bit build x86 binaries +* Solaris 10 x86 to build 64 bit x86 binaries + +Servers with Solaris 10 Sparc are optional for most of the packages. However, +there may be packages which rely on private kernel data (like "top") which +needs to be build for each and every Solaris version to run on. + +The user homes should be in ``/home/`` and the home directory should be +shared between the build machines. This is important for building x86 packages +as the 32 bit part needs to be build on Solaris 9 and the 64 bit part on +Solaris 10. + +Under ``/home/experimental//`` are project-specific directories with +permissions 0755 which are accessible via +``http://buildfarm.opencsw.org/experimental.html``. ``experimental/`` itself +is 01755 and users are free to create new projects as needed. + +The installed packages are listed on http://buildfarm.opencsw.org/versionmatrix.html. + +Installing Software +^^^^^^^^^^^^^^^^^^^ + +All software is archived and available from ``/home/farm`` on the bo +Buildfarm. Make sure you deinstall ``SUNWgmake``. That version is outdated +and misses functions needed by GAR (e.g. abspath). + +Install Java Package +++++++++++++++++++++ + +There are versions of JDK and JRE between Java 1.3 and Java 6 installed in ``/usr``. + +* Solaris 9 Sparc: ``cd /usr; for F in java/*sparc*; do sh $F; done`` +* Solaris 9 x86: ``cd /usr; for F in java/*i586*; do sh $F; done`` +* Solaris 10 Sparc: ``cd /usr; for F in java/*sparc*; do sh $F; done`` +* Solaris 10 x86: ``cd /usr; for F in java/*i586* java/*amd64* java/*x64*; do sh $F; done`` + +Install Sun Studio Compiler ++++++++++++++++++++++++++++ + +On Solaris 8 the Sun Studio 11 Compiler is installed, on Solaris 9 and 10 both +Sun Studio 11 and 12 is installed. Solaris 10 has also Sun Studio 12u1 +installed. + +Sun Studio 11 ++++++++++++++ + +:: + + cd ss11 + cd /CD1 # Sparc only + PATH=/usr/j2re1.4.2_17/bin:$PATH ./batch_installer -d /opt/studio/SOS11 + +Uninstall:: + + cd /var/sadm/prod/com.sun.studio_11 + ./batch_uninstall_all + +Please note: If you have also Sun Studio 12 installed the installer will +erranously remove some packages from Sun Studio 12 so you may need to +reinstall it after SOS 11 removal. + +Sun Studio 12 ++++++++++++++ + +:: + + cd ss12 + ./batch_installer -d /opt --accept-sla + +Uninstall:: + + export PATH=/usr/jre1.6.0_20/bin:$PATH + cd /opt + java -cp . uninstall_Sun_Studio_12 -nodisplay -noconsole + +Please note: If you have also Sun Studio 11 installed the installer will +erranously remove some packages from Sun Studio 11 so you may need to +reinstall it after SOS 12 removal. + +Sun Studio 12u1 ++++++++++++++++ + +Headless installation is a bit more complicated, see +http://docs.sun.com/app/docs/doc/820-7601/gemyt?a=view for details. + +Sun Studio Compilers for OpenSolaris +++++++++++++++++++++++++++++++++++++ + +* Sun Studio 12u1 +* Sun Studio Express 11/08 +* Sun Studio Express 3/09 + +See http://developers.sun.com/sunstudio/downloads/opensolaris/index.jsp for details. + +Don't forget to patch the compilers, with `PCA`_ or `manually`_. + +.. _PCA: + http://www.opencsw.org/packages/pca + +.. _manually: + http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index-jsp-136213.html + +Sun Studio for Solaris 11 ++++++++++++++++++++++++++ + + +Adding Users +^^^^^^^^^^^^ + +From here on in (Jan 2009), we are trying to keep userids in sync across all +machines. www.opencsw.org is consider the "master". If a user exists on www, +then an account created from them on other machines, should be made to match +up userids. + +There are some older, legacy, nonmatchedup accounts. To make it easier to +identify between newer and older accounts, "cleanly" created accounts are +created in the range 17100-18000. Older accounts may be migrated/synced into +the range 17000-17099 if desired. + +thus, if there is an account created on non-www machines, that is desired to +be non-synced, it should be OUTSIDE the range of 17000-18000 + +The normal process for creating accounts across all machines, is that Phil +runs a script on www, which in turn calls scripts maintained by Ihsan and +Dagobert, to create accounts on www and buildfarm machines, respectively. + +SSH Agent for each user +^^^^^^^^^^^^^^^^^^^^^^^ + +It is advised to use a passphrase for the SSH key. This can easily be done by +using the following steps: + +1. Set passphrase on the key:: + + ssh-keygen -p -f .ssh/id_dsa + +2. Add this to your .zshrc (or the respective file for your favorite shell):: + + # executed for interactive shells + if [ "x$HOSTNAME" = "xlogin" ]; then + if [ -f ~/.ssh-agent ]; then + source ~/.ssh-agent + fi + + if [ -z "$SSH_AUTH_SOCK" -o ! -w "$SSH_AUTH_SOCK" ]; then + if read -q '?Start ssh-agent? (y/n) '; then + ssh-agent -s >~/.ssh-agent && \ + source ~/.ssh-agent && \ + ssh-add + fi + fi + fi + +3. Make sure the ssh agent information is forwarded to trusted machines:: + + (echo "Host current*"; echo "\tForwardAgent yes") >> ~/.ssh/config + +There are similar methods with keychain available: +* http://lists.opencsw.org/pipermail/maintainers/2009-December/010732.html GPG, agent, pinentry and keychain + +Installing DB2 client +^^^^^^^^^^^^^^^^^^^^^ + +:: + + useradd -u 1007 -g csw -c "DB2 Instance User" -d /export/db2inst1 -s /bin/sh db2inst1 + mkdir /export/db2inst1 + chown db2inst1:csw /export/db2inst1 + cd /opt/IBM/db2/V8.1/instance + ./db2icrt -s client db2inst1 + +Installing IBM Informix Client SDK +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +:: + + cd clientsdk.4.10.FC1DE.SOL + ./installclientsdk + (accept default everywhere) + Default Install Folder: /opt/IBM/informix + +It seems the 32 bit and 64 bit clients can not be installed in the same directory. + Advanced setup -------------- @@ -276,24 +466,11 @@ and /usr/ccs/bin/dump output are available on that page. * system garrc is useful when you have multiple users, for example colleagues at work who also want to build packages. -* `Additional setup documented on the wiki`_ - - * Java setup - * Solaris Studio setup if you want to build software with that compiler. - Many of existing build recipes at OpenCSW use this compiler, not GCC. - * ssh agent setup for paswordless logins - * catalog signing daemon is useful if you wish to build package catalogs locally and sign them with a GPG key. * `Catalog signing daemon source code`_ -.. _GAR setup: - http://sourceforge.net/apps/trac/gar/wiki/GarSetup - -.. _Additional setup documented on the wiki: - http://wiki.opencsw.org/buildfarm - .. _local catalog mirror: ../for-administrators/mirror-setup.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 26 01:12:16 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 25 Sep 2013 23:12:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[22023] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22023 http://gar.svn.sourceforge.net/gar/?rev=22023&view=rev Author: wahwah Date: 2013-09-25 23:12:15 +0000 (Wed, 25 Sep 2013) Log Message: ----------- opencsw-manual/trunk: Style changes Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 23:06:24 UTC (rev 22022) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-25 23:12:15 UTC (rev 22023) @@ -404,11 +404,11 @@ It is advised to use a passphrase for the SSH key. This can easily be done by using the following steps: -1. Set passphrase on the key:: +Set passphrase on the key:: ssh-keygen -p -f .ssh/id_dsa -2. Add this to your .zshrc (or the respective file for your favorite shell):: +Add this to your .zshrc (or the respective file for your favorite shell):: # executed for interactive shells if [ "x$HOSTNAME" = "xlogin" ]; then @@ -425,11 +425,12 @@ fi fi -3. Make sure the ssh agent information is forwarded to trusted machines:: +Make sure the ssh agent information is forwarded to trusted machines:: (echo "Host current*"; echo "\tForwardAgent yes") >> ~/.ssh/config There are similar methods with keychain available: + * http://lists.opencsw.org/pipermail/maintainers/2009-December/010732.html GPG, agent, pinentry and keychain Installing DB2 client This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 26 09:37:34 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Sep 2013 07:37:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[22024] csw/mgar/pkg/xfconf/trunk Message-ID: Revision: 22024 http://gar.svn.sourceforge.net/gar/?rev=22024&view=rev Author: pfelecan Date: 2013-09-26 07:37:33 +0000 (Thu, 26 Sep 2013) Log Message: ----------- xfconf/trunk: run-time dependencies addition and patch perl manual destination Modified Paths: -------------- csw/mgar/pkg/xfconf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xfconf/trunk/files/0002-set-manual-pages-destination.patch Modified: csw/mgar/pkg/xfconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-25 23:12:15 UTC (rev 22023) +++ csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-26 07:37:33 UTC (rev 22024) @@ -12,6 +12,7 @@ MASTER_SITES = http://archive.xfce.org/xfce/4.10/src/ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES += 0001-use-bash-in-test-drivers.patch +PATCHFILES += 0002-set-manual-pages-destination.patch BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWvim @@ -30,6 +31,12 @@ CATALOGNAME_CSWxfconf = xfconf SPKG_DESC_CSWxfconf += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWxfconf += CSWlibxfconf0-2 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWxfconf += CSWperl +RUNTIME_DEP_PKGS_CSWxfconf += CSWlibdbus1-3 PACKAGES += CSWlibxfconf0-2 CATALOGNAME_CSWlibxfconf0-2 = libxfconf0_2 @@ -39,6 +46,8 @@ RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibdbus-glib1-2 PACKAGES += CSWxfconf-dev CATALOGNAME_CSWxfconf-dev = xfconf_dev Added: csw/mgar/pkg/xfconf/trunk/files/0002-set-manual-pages-destination.patch =================================================================== --- csw/mgar/pkg/xfconf/trunk/files/0002-set-manual-pages-destination.patch (rev 0) +++ csw/mgar/pkg/xfconf/trunk/files/0002-set-manual-pages-destination.patch 2013-09-26 07:37:33 UTC (rev 22024) @@ -0,0 +1,27 @@ +From 7e2c29b5f96c0301bada42592da5e61509746610 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 26 Sep 2013 09:28:37 +0200 +Subject: [PATCH] set manual pages destination + +taken from the set of patches made by William Bonnet +--- + xfconf-perl/Makefile.PL.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xfconf-perl/Makefile.PL.in b/xfconf-perl/Makefile.PL.in +index c16a453..374fb11 100644 +--- a/xfconf-perl/Makefile.PL.in ++++ b/xfconf-perl/Makefile.PL.in +@@ -95,6 +95,9 @@ WriteMakefile( + ABSTRACT_FROM => 'Xfconf.pm', + PREREQ_PM => \%pre_reqs, + XSPROTOARG => '-noprototypes', ++ INSTALLSITEMAN1DIR => '/opt/csw/share/man1', ++ INSTALLSITEMAN2DIR => '/opt/csw/share/man2', ++ INSTALLSITEMAN3DIR => '/opt/csw/share/man3', + $xfconf->get_makefile_vars, + ); + +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 26 10:01:18 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Sep 2013 08:01:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[22025] csw/mgar/pkg/xfconf/trunk/Makefile Message-ID: Revision: 22025 http://gar.svn.sourceforge.net/gar/?rev=22025&view=rev Author: pfelecan Date: 2013-09-26 08:01:17 +0000 (Thu, 26 Sep 2013) Log Message: ----------- xfconf/trunk: - remove uneeded run-time dependency - exclude perl local pod Modified Paths: -------------- csw/mgar/pkg/xfconf/trunk/Makefile Modified: csw/mgar/pkg/xfconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-26 07:37:33 UTC (rev 22024) +++ csw/mgar/pkg/xfconf/trunk/Makefile 2013-09-26 08:01:17 UTC (rev 22025) @@ -27,6 +27,8 @@ TEST_SCRIPTS = custom +EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/perl/5.10.1/perllocal.pod + PACKAGES += CSWxfconf CATALOGNAME_CSWxfconf = xfconf SPKG_DESC_CSWxfconf += $(DESCRIPTION) @@ -43,7 +45,6 @@ PKGFILES_CSWlibxfconf0-2 += $(call baseisadirs,$(libdir),libxfconf-0\.so\.2\.0\.0) PKGFILES_CSWlibxfconf0-2 += $(call baseisadirs,$(libdir),libxfconf-0\.so\.2(\.\d+)*) SPKG_DESC_CSWlibxfconf0-2 += $(DESCRIPTION), libxfconf-0.so.2 -RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibxfconf0-2 += CSWlibgobject2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu Sep 26 13:11:20 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 26 Sep 2013 11:11:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[22026] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22026 http://gar.svn.sourceforge.net/gar/?rev=22026&view=rev Author: slowfranklin Date: 2013-09-26 11:11:19 +0000 (Thu, 26 Sep 2013) Log Message: ----------- samba/branches/samba4: Seperate necessary overides for 5.10 and 5.11 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-26 08:01:17 UTC (rev 22025) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-26 11:11:19 UTC (rev 22026) @@ -83,7 +83,7 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl @@ -91,13 +91,40 @@ RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsmbldap0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibtorture0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibdcerpc-server0 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) # Silence conflicts with CSWsamba CHECKPKG_OVERRIDES_CSWsamba4 += file-collision CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture -CHECKPKG_OVERRIDES_CSWsamba4 += missing-dependency|CSWlibwbclient0 -CHECKPKG_OVERRIDES_CSWsamba4 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWsamba4 += missing-dependency|CSWsamba -CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/mit_samba.so|soname=mit_samba.so|pkgname=CSWsamba4|expected=CSWmit-samba +CHECKPKG_OVERRIDES_CSWsamba4 += soname-equals-filename|file=/opt/csw/lib/mit_samba.so +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWsamba +CHECKPKG_OVERRIDES_CSWsamba4_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4 += $(CHECKPKG_OVERRIDES_CSWsamba4_$(GAROSREL)) + INCOMPATIBLE_PKGS_CSWsamba4 += CSWsamba # Package with clients, finished @@ -109,16 +136,31 @@ SMB_CLIENT_BINS += ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(bindir),$C)) PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient0 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWsamba4-client += soname-unused -CHECKPKG_OVERRIDES_CSWsamba4-client += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWsamba4-client += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += surplus-dependency|CSWsamba4-libs CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtree.1|CSWsamba-client|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbget|CSWsamba-client|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtar.1|CSWsamba-client|CSWsamba4-client @@ -145,6 +187,7 @@ CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbtree|CSWsamba-client|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/tdbbackup|CSWsamba|CSWsamba4-client CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbget.1|CSWsamba-client|CSWsamba4-client +CHECKPKG_OVERRIDES_CSWsamba4-client += $(CHECKPKG_OVERRIDES_CSWsamba4-client_$(GAROSREL)) INCOMPATIBLE_PKGS_CSWsamba4-client += CSWsamba-client # Development package @@ -155,7 +198,6 @@ PKGFILES_CSWsamba4-dev += $(libdir)/pkgconfig/.*\.pc PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3 PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3perl -RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0 @@ -179,6 +221,9 @@ RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-dev_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-dev_5.11 += CSWsamba4 +RUNTIME_DEP_PKGS_CSWsamba4-dev += $(RUNTIME_DEP_PKGS_CSWsamba4-dev_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/lib/libnetapi.so|CSWsamba-dev|CSWsamba4-dev @@ -186,30 +231,8 @@ CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbconf0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibpdb0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibgensec0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbldap0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibndr-nbt0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-credentials0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-util0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibndr0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibregistry0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsmbclient-raw0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4-winbind -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibndr-krb5pac0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamdb0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-hostconfig0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-binding0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibsamba-policy0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-samr0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibnetapi0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-atsvc0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibtorture0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibtevent-util0 -CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWlibdcerpc-server0 +CHECKPKG_OVERRIDES_CSWsamba4-dev_5.11 += surplus-dependency +CHECKPKG_OVERRIDES_CSWsamba4-dev += $(CHECKPKG_OVERRIDES_CSWsamba4-dev_$(GAROSREL)) INCOMPATIBLE_PKGS_CSWsamba4-dev += CSWsamba-dev # Package CSWsamba4 libraries @@ -235,21 +258,46 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1 -CHECKPKG_OVERRIDES_CSWsamba4-libs += soname-unused +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsmbldap0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibdcerpc-server0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += $(RUNTIME_DEP_PKGS_CSWsamba4-libs_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/share/man/man7/libsmbclient.7|CSWlibsmbclient0|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWsamba4-libs += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1 -CHECKPKG_OVERRIDES_CSWsamba4-libs += missing-dependency|CSWlibwbclient0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1 +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += $(CHECKPKG_OVERRIDES_CSWsamba4-libs_$(GAROSREL)) INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 CSWlibsmbsharemodes0 PACKAGES += CSWlibdcerpc-atsvc0 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1) PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc-atsvc0 += $(DESCRIPTION), libdcerpc-atsvc.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_5.11 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_$(GAROSREL)) PACKAGES += CSWlibdcerpc-binding0 PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1) @@ -258,17 +306,24 @@ RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_$(GAROSREL)) PACKAGES += CSWlibdcerpc-samr0 PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1) PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc-samr0 += $(DESCRIPTION), libdcerpc-samr.so.0 -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_5.11 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_$(GAROSREL)) PACKAGES += CSWlibdcerpc-server0 PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1) @@ -276,35 +331,69 @@ SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_$(GAROSREL)) PACKAGES += CSWlibdcerpc0 PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1) PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*) SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibdcerpc0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibdcerpc0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibdcerpc0 += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibdcerpc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibdcerpc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc0_$(GAROSREL)) PACKAGES += CSWlibgensec0 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1) PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0 -RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2 -CHECKPKG_OVERRIDES_CSWlibgensec0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibgensec0 += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWlibgensec0 += missing-dependency|CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibgensec += $(CHECKPKG_OVERRIDES_CSWlibgensec_$(GAROSREL)) PACKAGES += CSWlibndr-krb5pac0 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1) @@ -312,6 +401,11 @@ SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += $(RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_$(GAROSREL)) PACKAGES += CSWlibndr-nbt0 PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1) @@ -319,6 +413,10 @@ SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibndr-nbt0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += $(RUNTIME_DEP_PKGS_CSWlibndr-nbt0_$(GAROSREL)) PACKAGES += CSWlibndr-standard0 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1) @@ -326,6 +424,10 @@ SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr-standard0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr-standard0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibndr-standard0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibndr-standard0 += $(RUNTIME_DEP_PKGS_CSWlibndr-standard0_$(GAROSREL)) PACKAGES += CSWlibndr0 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1) @@ -333,16 +435,27 @@ SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibndr0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibndr0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibndr0 += $(RUNTIME_DEP_PKGS_CSWlibndr0_$(GAROSREL)) PACKAGES += CSWlibnetapi0 PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0) PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*) SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.11 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.11 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibnetapi0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += $(RUNTIME_DEP_PKGS_CSWlibnetapi0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibnetapi0 += $(CHECKPKG_OVERRIDES_CSWlibnetapi0_$(GAROSREL)) PACKAGES += CSWlibpdb0 PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0) @@ -350,28 +463,50 @@ SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibpdb0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1 -CHECKPKG_OVERRIDES_CSWlibpdb0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibpdb0 += missing-dependency|CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibpdb0 += $(RUNTIME_DEP_PKGS_CSWlibpdb0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWlibpdb0 += $(CHECKPKG_OVERRIDES_CSWlibpdb0_$(GAROSREL)) PACKAGES += CSWlibregistry0 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1) PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0(\.\d+)*) SPKG_DESC_CSWlibregistry0 += $(DESCRIPTION), libregistry.so.0 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibregistry0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibregistry0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibregistry0 += $(RUNTIME_DEP_PKGS_CSWlibregistry0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibregistry0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibregistry0 += $(CHECKPKG_OVERRIDES_CSWlibregistry0_$(GAROSREL)) PACKAGES += CSWlibsamba-credentials0 PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1) PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-credentials0 += $(DESCRIPTION), libsamba-credentials.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_$(GAROSREL)) PACKAGES += CSWlibsamba-hostconfig0 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1) @@ -379,15 +514,26 @@ SPKG_DESC_CSWlibsamba-hostconfig0 += $(DESCRIPTION), libsamba-hostconfig.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_$(GAROSREL)) PACKAGES += CSWlibsamba-policy0 PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1) PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-policy0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibsamba-policy0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-policy0_$(GAROSREL)) PACKAGES += CSWlibsamba-util0 PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1) @@ -396,40 +542,66 @@ RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibsamba-util0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamba-util0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-util0_$(GAROSREL)) PACKAGES += CSWlibsamdb0 PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1) PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsamdb0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibsamdb0 += soname-unused +RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsamdb0 += $(RUNTIME_DEP_PKGS_CSWlibsamdb0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsamdb0 += $(CHECKPKG_OVERRIDES_CSWlibsamdb0_$(GAROSREL)) PACKAGES += CSWlibsmbclient-raw0 PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1) PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += $(RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += $(CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_$(GAROSREL)) PACKAGES += CSWlibsmbconf0 PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0) PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0(\.\d+)*) SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibsmbconf0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibsmbconf0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibsmbconf0 += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWlibsmbconf0 += $(RUNTIME_DEP_PKGS_CSWlibsmbconf0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbconf0 += $(CHECKPKG_OVERRIDES_CSWlibsmbconf0_$(GAROSREL)) PACKAGES += CSWlibsmbldap0 PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0) @@ -437,12 +609,17 @@ SPKG_DESC_CSWlibsmbldap0 += $(DESCRIPTION), libsmbldap.so.0 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibsmbldap0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibsmbldap0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibsmbldap0 += surplus-dependency|CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.10 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWlibsmbldap0 += $(RUNTIME_DEP_PKGS_CSWlibsmbldap0_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibsmbldap0 += $(CHECKPKG_OVERRIDES_CSWlibsmbldap0_$(GAROSREL)) PACKAGES += CSWlibtevent-util0 PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1) @@ -451,9 +628,10 @@ RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWlibtevent-util0 += soname-unused -CHECKPKG_OVERRIDES_CSWlibtevent-util0 += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWlibtevent-util0 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused +CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWlibtevent-util0 += $(CHECKPKG_OVERRIDES_CSWlibtevent-util0_$(GAROSREL)) PACKAGES += CSWlibtorture0 PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1) @@ -461,26 +639,49 @@ SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtorture0_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWlibtorture0_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWlibtorture0_5.10 += CSWsamba4-libs +RUNTIME_DEP_PKGS_CSWlibtorture0 += $(RUNTIME_DEP_PKGS_CSWlibtorture0_$(GAROSREL)) # Python package PACKAGES += CSWsamba4-python SPKG_DESC_CSWsamba4-python = Samba 4 python files PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.6/site-packages/.*) -RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1 -CHECKPKG_OVERRIDES_CSWsamba4-python += soname-unused +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibdcerpc0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr-nbt0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-credentials0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-policy0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamdb0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibregistry0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsmbclient-raw0 +RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr-krb5pac0 +RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/provision/backend.py CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py CHECKPKG_OVERRIDES_CSWsamba4-python += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWsamba4-python += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-part-of-filename -CHECKPKG_OVERRIDES_CSWsamba4-python += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWsamba4-python += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-python += $(CHECKPKG_OVERRIDES_CSWsamba4-python_$(GAROSREL)) # winbind daemon, NSS and PAM modules PACKAGES += CSWsamba4-winbind @@ -506,11 +707,28 @@ RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 -CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-unused +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibndr-standard0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibsamba-util0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibsmbconf0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibpdb0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibsamba-hostconfig0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibgensec0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibtevent-util0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibdcerpc-binding0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibndr0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-collision -CHECKPKG_OVERRIDES_CSWsamba4-winbind += missing-dependency|CSWlibtevent0 -CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWsamba4-libs -CHECKPKG_OVERRIDES_CSWsamba4-winbind += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibtevent0 +CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += surplus-dependency|CSWsamba4-libs +CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWliblber2-4-2 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnss_wins.so.2|soname=libnss_wins.so|pkgname=CSWsamba4-winbind|expected=CSWlibnss-wins +CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/nss_winbind.so.1|soname=nss_winbind.so.1|pkgname=CSWsamba4-winbind|expected=CSWnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/winbind_krb5_locator.so|soname=winbind_krb5_locator.so|pkgname=CSWsamba4-winbind|expected=CSWwinbind-krb5locator +CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so +CHECKPKG_OVERRIDES_CSWsamba4-winbind += $(CHECKPKG_OVERRIDES_CSWsamba4-winbind_$(GAROSREL)) PACKAGES += CSWsamba4-nss-system-links ARCHALL_CSWsamba4-nss-system-links = 1 @@ -526,9 +744,10 @@ RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += file-collision -CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += surplus-dependency|CSWsamba4-winbind -CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += missing-dependency|CSWsamba-nss-system-links|or|CSWsamba-pam-system-links -CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += missing-dependency|CSWsamba-nss +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5.11 += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5,11 += missing-dependency|CSWsamba-nss-system-links|or|CSWsamba-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5.11 += missing-dependency|CSWsamba-nss +CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_$(GAROSREL)) PACKAGES += CSWsamba4-pam-system-links ARCHALL_CSWsamba4-pam-system-links = 1 @@ -546,11 +765,12 @@ CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_winbind_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_smbpass_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += missing-dependency|CSWsamba-pam-system-links -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += missing-dependency|CSWsamba-winbind -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += missing-dependency|CSWsamba -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4-winbind -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4 +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += missing-dependency|CSWsamba-pam-system-links +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += missing-dependency|CSWsamba-winbind +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += missing-dependency|CSWsamba +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4-winbind +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4 +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_$(GAROSREL)) # For checking whether we're missing anything, enable and check when updating. # Should only catch SWAT stuff which is EOL upstream so we're not packaging it 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 26 14:15:55 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Sep 2013 12:15:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[22027] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 22027 http://gar.svn.sourceforge.net/gar/?rev=22027&view=rev Author: dmichelsen Date: 2013-09-26 12:15:55 +0000 (Thu, 26 Sep 2013) Log Message: ----------- xapian-core/trunk: More patches towards 1.3.1 Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch Removed Paths: ------------- csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-26 11:11:19 UTC (rev 22026) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-26 12:15:55 UTC (rev 22027) @@ -17,7 +17,8 @@ # Use patch until this is fixed: # http://trac.xapian.org/ticket/626 -PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch +#PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch +# PATCHFILES += 0001-Do-not-make-uuid_unparse_lower-inline.patch # This is strange and needs further examination PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch @@ -26,7 +27,11 @@ # http://trac.xapian.org/ticket/627 PATCHFILES += 0003-log-is-ambigous-to-float-and-double.patch +PATCHFILES += 0001-Force-float-to-disambiguise-float-double-invocation-.patch +#GARCOMPILER = GNU + + VENDOR_URL = http://xapian.org/ PACKAGES += CSWxapian @@ -48,12 +53,15 @@ PKGFILES_CSWlibxapian-dev += .*\.cmake RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian22 -EXTRA_LD_FLAGS += -norunpath -lCrun +# EXTRA_LD_FLAGS += -norunpath -lCrun # We don't need it and if defined the test breaks -LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +# LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) +# EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +# libuuid.so must be searched in /opt/csw/lib +EXTRA_CXXFLAGS += -L$(libdir) + BUILD64 = 1 ISAEXEC = 1 @@ -62,6 +70,6 @@ include gar/category.mk -post-patch: - cd $(WORKSRC) && autoreconf -fi - @$(MAKECOOKIE) +#post-patch: +# cd $(WORKSRC) && autoreconf -fi +# @$(MAKECOOKIE) Deleted: csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch 2013-09-26 11:11:19 UTC (rev 22026) +++ csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch 2013-09-26 12:15:55 UTC (rev 22027) @@ -1,26 +0,0 @@ -From 83506df0b040989eda490611936319f6c9e80cf3 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 20 Sep 2013 21:10:21 +0200 -Subject: [PATCH] Check for explicit value or HAVE_UUID_UNPARSE_LOWER will - always be set - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e12b6a0..6542546 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -721,7 +721,7 @@ case $enable_backend_chert$enable_backend_brass in - dnl Older versions of libuuid (such as that on CentOS 4.7) don't have - dnl uuid_unparse_lower(), only uuid_unparse(). - AC_LINK_IFELSE([AC_LANG_CALL([], [uuid_unparse_lower])], [found=true], [found=false]) -- if $found ; then -+ if test $found = "true"; then - AC_DEFINE([HAVE_UUID_UNPARSE_LOWER], [1], - [Define to 1 if you have the 'uuid_unparse_lower' function.]) - fi --- -1.8.3.4 - Added: csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch 2013-09-26 12:15:55 UTC (rev 22027) @@ -0,0 +1,45 @@ +From faeb07f303894b6be6234c7988fc7b358fd6d02f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 25 Sep 2013 15:21:43 +0200 +Subject: [PATCH] Force float to disambiguise float/double invocation of log + +--- + tests/api_weight.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/api_weight.cc b/tests/api_weight.cc +index 792a7ae..b03d8c5 100644 +--- a/tests/api_weight.cc ++++ b/tests/api_weight.cc +@@ -141,7 +141,7 @@ DEFINE_TESTCASE(tfidfweight3, backend) { + TEST_EQUAL(mset.size(), 2); + // doc 2 should have higher weight than 4 as only tf(wdf) will dominate. + mset_expect_order(mset, 2, 4); +- TEST_EQUAL_DOUBLE(mset[0].get_weight(), (8 * log(6 / 2))); ++ TEST_EQUAL_DOUBLE(mset[0].get_weight(), (8 * log((double)6.0 / 2))); + + // Check for "bnn" and for both branches of 'b'. + enquire.set_query(Xapian::Query("test")); +@@ -157,7 +157,7 @@ DEFINE_TESTCASE(tfidfweight3, backend) { + mset = enquire.get_mset(0, 10); + TEST_EQUAL(mset.size(), 2); + mset_expect_order(mset, 2, 4); +- TEST_EQUAL_DOUBLE(mset[0].get_weight(), (1 + log(8))); // idfn=1 and so wt=tfn=1+log(tf) ++ TEST_EQUAL_DOUBLE(mset[0].get_weight(), (1 + log((double)8.0))); // idfn=1 and so wt=tfn=1+log(tf) + TEST_EQUAL_DOUBLE(mset[1].get_weight(), 1.0); // idfn=1 and wt=tfn=1+log(tf)=1+log(1)=1 + + // Check for "snn" +@@ -194,8 +194,8 @@ DEFINE_TESTCASE(tfidfweight3, backend) { + mset = enquire.get_mset(0, 10); + TEST_EQUAL(mset.size(), 2); + mset_expect_order(mset, 2, 4); +- TEST_EQUAL_DOUBLE(mset[0].get_weight(), 8 * log((6 - 2) / 2)); +- TEST_EQUAL_DOUBLE(mset[1].get_weight(), 1 * log((6 - 2) / 2)); ++ TEST_EQUAL_DOUBLE(mset[0].get_weight(), 8 * log(((double)6.0 - 2) / 2)); ++ TEST_EQUAL_DOUBLE(mset[1].get_weight(), 1 * log(((double)6.0 - 2) / 2)); + + return true; + } +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 26 14:31:03 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Sep 2013 12:31:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[22028] csw/mgar/pkg/libxfce4ui/trunk/Makefile Message-ID: Revision: 22028 http://gar.svn.sourceforge.net/gar/?rev=22028&view=rev Author: pfelecan Date: 2013-09-26 12:31:03 +0000 (Thu, 26 Sep 2013) Log Message: ----------- libxfce4ui/trunk: - create a new sub-package - adjust the dependencies Modified Paths: -------------- csw/mgar/pkg/libxfce4ui/trunk/Makefile Modified: csw/mgar/pkg/libxfce4ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-26 12:15:55 UTC (rev 22027) +++ csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-26 12:31:03 UTC (rev 22028) @@ -26,17 +26,37 @@ CATALOGNAME_CSWlibxfce4ui = libxfce4ui SPKG_DESC_CSWlibxfce4ui += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibxfce4ui1-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgtk-x11-2-0-0 +# this is private to Xfce but not to libxfce4ui... +PACKAGES += CSWlibxfce4kbd-private2-0 +CATALOGNAME_CSWlibxfce4kbd-private2-0 = libxfce4kbd_private2_0 +PKGFILES_CSWlibxfce4kbd-private2-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private-2\.so\.0\.0\.0) +PKGFILES_CSWlibxfce4kbd-private2-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private-2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibxfce4kbd-private2-0 += $(DESCRIPTION), libxfce4kbd-private-2.so.0 + PACKAGES += CSWlibxfce4ui1-0 -CATALOGNAME_CSWlibxfce4ui1-0 = libxfce4ui1-0 +CATALOGNAME_CSWlibxfce4ui1-0 = libxfce4ui1_0 PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4ui\-1.so\.0\.0\.0) PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4ui\-1.so\.0(\.\d+)*) PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfcekbd-private\-2.so\.0\.0\.0) PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private\-2.so\.0(\.\d+)*) SPKG_DESC_CSWlibxfce4ui1-0 += $(DESCRIPTION), libxfce4ui-1.so.0 -RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibxfce4kbd-private2-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWstartupnotif +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibxfconf0-2 PACKAGES += CSWlibxfce4ui-dev CATALOGNAME_CSWlibxfce4ui-dev = libxfce4ui_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 26 14:45:49 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Sep 2013 12:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[22029] csw/mgar/pkg/libxfce4ui/trunk/Makefile Message-ID: Revision: 22029 http://gar.svn.sourceforge.net/gar/?rev=22029&view=rev Author: pfelecan Date: 2013-09-26 12:45:49 +0000 (Thu, 26 Sep 2013) Log Message: ----------- libxfce4ui/trunk: fix main library sub-package content collect Modified Paths: -------------- csw/mgar/pkg/libxfce4ui/trunk/Makefile Modified: csw/mgar/pkg/libxfce4ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-26 12:31:03 UTC (rev 22028) +++ csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-26 12:45:49 UTC (rev 22029) @@ -42,8 +42,6 @@ CATALOGNAME_CSWlibxfce4ui1-0 = libxfce4ui1_0 PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4ui\-1.so\.0\.0\.0) PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4ui\-1.so\.0(\.\d+)*) -PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfcekbd-private\-2.so\.0\.0\.0) -PKGFILES_CSWlibxfce4ui1-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private\-2.so\.0(\.\d+)*) SPKG_DESC_CSWlibxfce4ui1-0 += $(DESCRIPTION), libxfce4ui-1.so.0 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibglib2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 26 14:51:58 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Sep 2013 12:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[22030] csw/mgar/pkg/lbzip2/trunk Message-ID: Revision: 22030 http://gar.svn.sourceforge.net/gar/?rev=22030&view=rev Author: dmichelsen Date: 2013-09-26 12:51:57 +0000 (Thu, 26 Sep 2013) Log Message: ----------- lbzip2/trunk: Update to 2.3 Modified Paths: -------------- csw/mgar/pkg/lbzip2/trunk/Makefile csw/mgar/pkg/lbzip2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lbzip2/trunk/files/0001-Add-include-for-index-prototype.patch Modified: csw/mgar/pkg/lbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lbzip2/trunk/Makefile 2013-09-26 12:45:49 UTC (rev 22029) +++ csw/mgar/pkg/lbzip2/trunk/Makefile 2013-09-26 12:51:57 UTC (rev 22030) @@ -1,16 +1,23 @@ NAME = lbzip2 -VERSION = 2.1 +VERSION = 2.3 GARTYPE = v2 DESCRIPTION = Parallel BZIP2 Data Compression Software define BLURB endef -MASTER_SITES = http://github.com/downloads/kjn/lbzip2/ -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://archive.lbzip2.org/ +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += 0001-Add-include-for-index-prototype.patch + +VENDOR_URL = http://lbzip2.org + +BUILD64 = 1 +ISAEXEC = 1 + # Only use lbzip2 etc. and not the corresponding pbzip2 etc. programs -EXTRA_MERGE_EXCLUDE_FILES += .*/p[^/]* +# EXTRA_MERGE_EXCLUDE_FILES += .*/p[^/]* # Otherwise pthread_create with an "Unknown error" EXTRA_CFLAGS += -mt Modified: csw/mgar/pkg/lbzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/lbzip2/trunk/checksums 2013-09-26 12:45:49 UTC (rev 22029) +++ csw/mgar/pkg/lbzip2/trunk/checksums 2013-09-26 12:51:57 UTC (rev 22030) @@ -1 +1 @@ -180c17fd09bbe6eeb189ffaabdc3fc4e lbzip2-2.1.tar.gz +f9cc0371b0af485d7539295c302b5a5d lbzip2-2.3.tar.gz Added: csw/mgar/pkg/lbzip2/trunk/files/0001-Add-include-for-index-prototype.patch =================================================================== --- csw/mgar/pkg/lbzip2/trunk/files/0001-Add-include-for-index-prototype.patch (rev 0) +++ csw/mgar/pkg/lbzip2/trunk/files/0001-Add-include-for-index-prototype.patch 2013-09-26 12:51:57 UTC (rev 22030) @@ -0,0 +1,24 @@ +From a6fb7080461d3dfa7719a1fd8560beda9e3a6e55 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 23 Sep 2013 14:49:53 +0200 +Subject: [PATCH] Add include for index() prototype + +--- + src/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.c b/src/main.c +index 3721e17..f6e02a9 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -27,6 +27,7 @@ + #include /* va_list */ + #include /* vfprintf() */ + #include /* strcpy() */ ++#include /* index() */ + #include /* lstat() */ + #include /* open() */ + +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 26 15:00:04 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Sep 2013 13:00:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[22031] csw/mgar/pkg/libxfce4ui/trunk/Makefile Message-ID: Revision: 22031 http://gar.svn.sourceforge.net/gar/?rev=22031&view=rev Author: pfelecan Date: 2013-09-26 13:00:04 +0000 (Thu, 26 Sep 2013) Log Message: ----------- libxfce4ui/trunk: fix dependencies Modified Paths: -------------- csw/mgar/pkg/libxfce4ui/trunk/Makefile Modified: csw/mgar/pkg/libxfce4ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-26 12:51:57 UTC (rev 22030) +++ csw/mgar/pkg/libxfce4ui/trunk/Makefile 2013-09-26 13:00:04 UTC (rev 22031) @@ -32,11 +32,19 @@ RUNTIME_DEP_PKGS_CSWlibxfce4ui += CSWlibgtk-x11-2-0-0 # this is private to Xfce but not to libxfce4ui... -PACKAGES += CSWlibxfce4kbd-private2-0 -CATALOGNAME_CSWlibxfce4kbd-private2-0 = libxfce4kbd_private2_0 -PKGFILES_CSWlibxfce4kbd-private2-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private-2\.so\.0\.0\.0) -PKGFILES_CSWlibxfce4kbd-private2-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private-2\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibxfce4kbd-private2-0 += $(DESCRIPTION), libxfce4kbd-private-2.so.0 +PACKAGES += CSWlibxfce4kbd-private2-0 +CATALOGNAME_CSWlibxfce4kbd-private2-0 = libxfce4kbd_private2_0 +PKGFILES_CSWlibxfce4kbd-private2-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private-2\.so\.0\.0\.0) +PKGFILES_CSWlibxfce4kbd-private2-0 += $(call baseisadirs,$(libdir),libxfce4kbd-private-2\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibxfce4kbd-private2-0 += $(DESCRIPTION), libxfce4kbd-private-2.so.0 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibxfce4ui1-0 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibxfce4kbd-private2-0 += CSWlibxfconf0-2 PACKAGES += CSWlibxfce4ui1-0 CATALOGNAME_CSWlibxfce4ui1-0 = libxfce4ui1_0 @@ -45,7 +53,6 @@ SPKG_DESC_CSWlibxfce4ui1-0 += $(DESCRIPTION), libxfce4ui-1.so.0 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibxfce4kbd-private2-0 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibxfce4util6 @@ -54,7 +61,6 @@ RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWpango RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibxfce4ui1-0 += CSWlibxfconf0-2 PACKAGES += CSWlibxfce4ui-dev CATALOGNAME_CSWlibxfce4ui-dev = libxfce4ui_dev @@ -63,6 +69,7 @@ PKGFILES_CSWlibxfce4ui-dev += /opt/csw/lib/libxfce4kbd-private-2.so PKGFILES_CSWlibxfce4ui-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibxfce4ui-dev += CSWlibxfce4ui1-0 +RUNTIME_DEP_PKGS_CSWlibxfce4ui-dev += CSWlibxfce4kbd-private2-0 ARCHALL_CSWlibxfce4ui-dev = 1 CHECKPKG_OVERRIDES_CSWlibxfce4ui-dev += archall-devel-package 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 26 16:31:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 26 Sep 2013 14:31:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[22032] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 22032 http://gar.svn.sourceforge.net/gar/?rev=22032&view=rev Author: dmichelsen Date: 2013-09-26 14:31:34 +0000 (Thu, 26 Sep 2013) Log Message: ----------- xapian-core/trunk: Cleanup, fix dependencies Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-26 13:00:04 UTC (rev 22031) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-26 14:31:34 UTC (rev 22032) @@ -10,16 +10,10 @@ endef MASTER_SITES = http://oligarchy.co.uk/xapian/$(VERSION)/ +DISTFILES += $(NAME)-$(VERSION).tar.gz -DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch -# PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch - -# Use patch until this is fixed: -# http://trac.xapian.org/ticket/626 -#PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch -# PATCHFILES += 0001-Do-not-make-uuid_unparse_lower-inline.patch - # This is strange and needs further examination PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch @@ -29,36 +23,30 @@ PATCHFILES += 0001-Force-float-to-disambiguise-float-double-invocation-.patch -#GARCOMPILER = GNU - - VENDOR_URL = http://xapian.org/ PACKAGES += CSWxapian SPKG_DESC_CSWxapian = Xapian search engine binaries # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian22 +RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian1-3-1 RUNTIME_DEP_PKGS_CSWxapian += CSWlibstlport1 -PACKAGES += CSWlibxapian22 -SPKG_DESC_CSWlibxapian22 = An open source search engine library, libxapian.so.22 -PKGFILES_CSWlibxapian22 = $(call pkgfiles_lib,libxapian.so.22) -RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWlibstlport1 -RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWlibz1 +PACKAGES += CSWlibxapian1-3-1 +SPKG_DESC_CSWlibxapian1-3-1 = An open source search engine library, libxapian-1.3.so.1 +PKGFILES_CSWlibxapian1-3-1 = $(call pkgfiles_lib,libxapian-1.3.so.1) +RUNTIME_DEP_PKGS_CSWlibxapian1-3-1 += CSWlibstlport1 +RUNTIME_DEP_PKGS_CSWlibxapian1-3-1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibxapian1-3-1 += CSWlibuuid1 PACKAGES += CSWlibxapian-dev -SPKG_DESC_CSWlibxapian-dev = Xapian development files for libxapian.so.22 +SPKG_DESC_CSWlibxapian-dev = Xapian development files for libxapian-1.3.so.1 PKGFILES_CSWlibxapian-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibxapian-dev += $(docdir)/xapian-core/apidoc/.* PKGFILES_CSWlibxapian-dev += .*\.cmake -RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian22 +RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian1-3-1 -# EXTRA_LD_FLAGS += -norunpath -lCrun +EXTRA_LD_FLAGS += -norunpath -# We don't need it and if defined the test breaks -# LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) -# EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - # libuuid.so must be searched in /opt/csw/lib EXTRA_CXXFLAGS += -L$(libdir) @@ -69,7 +57,3 @@ CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html include gar/category.mk - -#post-patch: -# cd $(WORKSRC) && autoreconf -fi -# @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Sep 26 17:00:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 26 Sep 2013 15:00:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[22033] csw/mgar/pkg/exo/trunk/Makefile Message-ID: Revision: 22033 http://gar.svn.sourceforge.net/gar/?rev=22033&view=rev Author: pfelecan Date: 2013-09-26 15:00:06 +0000 (Thu, 26 Sep 2013) Log Message: ----------- exo/trunk: add new dependencies Modified Paths: -------------- csw/mgar/pkg/exo/trunk/Makefile Modified: csw/mgar/pkg/exo/trunk/Makefile =================================================================== --- csw/mgar/pkg/exo/trunk/Makefile 2013-09-26 14:31:34 UTC (rev 22032) +++ csw/mgar/pkg/exo/trunk/Makefile 2013-09-26 15:00:06 UTC (rev 22033) @@ -27,6 +27,17 @@ CATALOGNAME_CSWexo = exo SPKG_DESC_CSWexo += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWexo += CSWlibexo1-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibxfce4ui1-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWexo += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWexo += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWexo += CSWpango +RUNTIME_DEP_PKGS_CSWexo += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWexo += CSWlibglib2-0-0 PACKAGES += CSWlibexo1-0 CATALOGNAME_CSWlibexo1-0 = libexo1_0 @@ -36,6 +47,14 @@ RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibxfce4util6 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibexo1-0 += CSWlibgtk-x11-2-0-0 PACKAGES += CSWexo-dev CATALOGNAME_CSWexo-dev = exo_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 26 21:27:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 26 Sep 2013 19:27:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[22034] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22034 http://gar.svn.sourceforge.net/gar/?rev=22034&view=rev Author: wahwah Date: 2013-09-26 19:27:56 +0000 (Thu, 26 Sep 2013) Log Message: ----------- opencsw-manual/trunk: Minor reorganization of content on the page Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-26 15:00:06 UTC (rev 22033) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-26 19:27:56 UTC (rev 22034) @@ -16,7 +16,8 @@ * `basic OpenCSW installation`_, as you would do on any Solaris host where you're using OpenCSW packages. -* You need a `local catalog mirror`_ which will allow you to quickly access + +* `local catalog mirror`_ which will allow you to quickly access all packages that are in any of OpenCSW catalogs for any Solaris version. A typical location is ``/export/mirror/opencsw``. @@ -29,7 +30,7 @@ :: - sudo pkgutil -y -i vim gar_dev mgar gcc4core gcc4g++ sudo + sudo pkgutil -y -i vim gar_dev mgar gcc4core gcc4g++ sudo Oracle Solaris Studio Compiler ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -53,8 +54,8 @@ :: - SOS11_CC_HOME = /opt/SUNWspro - SOS12_CC_HOME = /opt/studio12/SUNWspro + SOS11_CC_HOME = /opt/SUNWspro + SOS12_CC_HOME = /opt/studio12/SUNWspro Installing Oracle Solaris Studio 12 @@ -62,15 +63,15 @@ :: - cd ss12 - ./batch_installer -d /opt/studio/SOS12 --accept-sla + cd ss12 + ./batch_installer -d /opt/studio/SOS12 --accept-sla Installing Oracle Solaris Studio 12u3 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: - sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp + sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp Patching the installed compilers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -90,25 +91,25 @@ :: - # Data for pkginfo - SPKG_PACKAGER = Dagobert Michelsen - SPKG_EMAIL = dam at example.com - # - # Where to store generated packages - SPKG_EXPORT = /home/dam/pkgs - # - # Where to store downloaded sources - GARCHIVEDIR = /home/dam/src - # - # Disable package sanity checks by checkpkg if you are building on your - # own host (checkpkg depends on OpenCSW buildfarm infrastructure) - ENABLE_CHECK = 0 + # Data for pkginfo + SPKG_PACKAGER = Dagobert Michelsen + SPKG_EMAIL = dam at example.com + # + # Where to store generated packages + SPKG_EXPORT = /home/dam/pkgs + # + # Where to store downloaded sources + GARCHIVEDIR = /home/dam/src + # + # Disable package sanity checks by checkpkg if you are building on your + # own host (checkpkg depends on OpenCSW buildfarm infrastructure) + ENABLE_CHECK = 0 In case you are sitting behind a proxy, you would also want to configure this in ~/.garrc. :: - http_proxy = http://proxy[:port] + http_proxy = http://proxy[:port] You can customize several other things in ``~/.garrc`` which we'll see later. Do not customize anything which makes the build dependent on your @@ -125,8 +126,8 @@ :: - git config --global user.email "you at example.com" - git config --global user.name "Your Name" + git config --global user.email "you at example.com" + git config --global user.name "Your Name" You also need to set up the EDITOR command, because git's expectations don't match up with the behavior of ``/bin/vi``. Here's an example how to set it to @@ -134,8 +135,8 @@ :: - sudo pkgutil -y -i vim - echo "export EDITOR=/opt/csw/bin/vim" >> ~/.bashrc + sudo pkgutil -y -i vim + echo "export EDITOR=/opt/csw/bin/vim" >> ~/.bashrc Of course, it can be your editor of choice. @@ -147,7 +148,7 @@ :: - mgar init [] (defaults to ~/opencsw) + mgar init [] (defaults to ~/opencsw) Please make yourself familiar with `mgar`_. @@ -155,7 +156,7 @@ :: - mgar up --all + mgar up --all checkpkg database ----------------- @@ -289,14 +290,61 @@ ``http://buildfarm.opencsw.org/experimental.html``. ``experimental/`` itself is 01755 and users are free to create new projects as needed. -The installed packages are listed on http://buildfarm.opencsw.org/versionmatrix.html. +There is a `matrix of packages installed on the buildfarm`_. +.. _matrix of packages installed on the buildfarm: + http://buildfarm.opencsw.org/versionmatrix.html + +System-wide garrc +^^^^^^^^^^^^^^^^^ + +System-wide ``garrc`` is useful when you have multiple users, for example +colleagues at work who also build packages. It can also contain information +about which hosts are used to build packages for which architectures. Create +the ``/etc/opt/csw/garrc`` file with appropriate content. For example:: + + GARCHIVEDIR = /home/src + GARCHIVEPATH = /home/src + + SPKG_EXPERIMENTAL = /home/experimental + + BUILDHOST_platform-solaris9-sparc-32 = unstable9s + BUILDHOST_platform-solaris9-sparc-64 = unstable9s + BUILDHOST_platform-solaris10-sparc-32 = unstable10s + BUILDHOST_platform-solaris10-sparc-64 = unstable10s + BUILDHOST_platform-solaris11-sparc-32 = unstable11s + BUILDHOST_platform-solaris11-sparc-64 = unstable11s + BUILDHOST_platform-solaris9-i386-32 = unstable9x + BUILDHOST_platform-solaris9-i386-64 = unstable10x + BUILDHOST_platform-solaris10-i386-32 = unstable10x + BUILDHOST_platform-solaris10-i386-64 = unstable10x + BUILDHOST_platform-solaris11-i386-32 = unstable11x + BUILDHOST_platform-solaris11-i386-64 = unstable11x + + define modulation2host + $(BUILDHOST_platform-$(GAR_PLATFORM)-$(MEMORYMODEL_$(ISA))) + endef + + PACKAGING_HOST_solaris9-sparc = unstable9s + PACKAGING_HOST_solaris9-i386 = unstable9x + PACKAGING_HOST_solaris10-sparc = unstable10s + PACKAGING_HOST_solaris10-i386 = unstable10x + PACKAGING_HOST_solaris11-sparc = unstable11s + PACKAGING_HOST_solaris11-i386 = unstable11x + + http_proxy = http://proxy:3128 + frp_proxy = http://proxy:3128 + GIT_USE_PROXY = 1 + + SOS12_CC_HOME = /opt/SUNWspro + + Installing Software ^^^^^^^^^^^^^^^^^^^ -All software is archived and available from ``/home/farm`` on the bo -Buildfarm. Make sure you deinstall ``SUNWgmake``. That version is outdated -and misses functions needed by GAR (e.g. abspath). +All software is archived and available from ``/home/farm`` on the buildfarm. +Make sure you deinstall ``SUNWgmake``. That version is outdated and misses +functions needed by GAR (e.g. abspath). Install Java Package ++++++++++++++++++++ @@ -377,24 +425,25 @@ Sun Studio for Solaris 11 +++++++++++++++++++++++++ +TODO Adding Users ^^^^^^^^^^^^ From here on in (Jan 2009), we are trying to keep userids in sync across all -machines. www.opencsw.org is consider the "master". If a user exists on www, -then an account created from them on other machines, should be made to match -up userids. +machines. www.opencsw.org is considered the "master". If a user exists on +www, then an account created from them on other machines, should be made to +match up userids. -There are some older, legacy, nonmatchedup accounts. To make it easier to -identify between newer and older accounts, "cleanly" created accounts are +There are some older, legacy, non-matched-up accounts. To make it easier to +identify between newer and older accounts, cleanly created accounts are created in the range 17100-18000. Older accounts may be migrated/synced into the range 17000-17099 if desired. thus, if there is an account created on non-www machines, that is desired to -be non-synced, it should be OUTSIDE the range of 17000-18000 +be non-synced, it should be outside the range of 17000-18000 -The normal process for creating accounts across all machines, is that Phil +The normal process for creating accounts across all machines, is that Ben runs a script on www, which in turn calls scripts maintained by Ihsan and Dagobert, to create accounts on www and buildfarm machines, respectively. @@ -431,8 +480,11 @@ There are similar methods with keychain available: -* http://lists.opencsw.org/pipermail/maintainers/2009-December/010732.html GPG, agent, pinentry and keychain +* `GPG, agent, pinentry and keychain`_ +.. _GPG, agent, pinentry and keychain: + http://lists.opencsw.org/pipermail/maintainers/2009-December/010732.html + Installing DB2 client ^^^^^^^^^^^^^^^^^^^^^ @@ -456,22 +508,22 @@ It seems the 32 bit and 64 bit clients can not be installed in the same directory. -Advanced setup --------------- +Buildfarm web app +----------------- -The following components are not required, but are quite useful. +pkgdb-web is a web app on which you can browse your package database and +inspect package metadata without having to unpack and examine packages in the +terminal. Information such as list of files, pkginfo content and information +about binaries output are available on that page. -* pkgdb-web (with Apache) is a web app on which you can browse your package - database and inspect package metadata without having to unpack and examine - packages in the terminal. Information such as list of files, pkginfo content - and /usr/ccs/bin/dump output are available on that page. -* system garrc is useful when you have multiple users, for example colleagues - at work who also want to build packages. -* catalog signing daemon is useful if you wish to build package catalogs - locally and sign them with a GPG key. +Catalog signing daemon +---------------------- - * `Catalog signing daemon source code`_ +Catalog signing daemon is useful if you wish to build package catalogs locally +and automatically sign them with a GPG key. +* `Catalog signing daemon source code`_ + .. _local catalog mirror: ../for-administrators/mirror-setup.html 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 27 01:22:48 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Thu, 26 Sep 2013 23:22:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[22035] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 22035 http://gar.svn.sourceforge.net/gar/?rev=22035&view=rev Author: jake_goerzen Date: 2013-09-26 23:22:47 +0000 (Thu, 26 Sep 2013) Log Message: ----------- dovecot: update to version 2.2.6 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-09-26 19:27:56 UTC (rev 22034) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-09-26 23:22:47 UTC (rev 22035) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.2.5 +VERSION = 2.2.6 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2013-09-26 19:27:56 UTC (rev 22034) +++ csw/mgar/pkg/dovecot/trunk/checksums 2013-09-26 23:22:47 UTC (rev 22035) @@ -1 +1 @@ -0096442e2a1739b1b7997a833248a263 dovecot-2.2.5.tar.gz +db65988ef2e6889dd8b49c132b21fc8f dovecot-2.2.6.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 Fri Sep 27 10:26:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Sep 2013 08:26:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[22036] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22036 http://gar.svn.sourceforge.net/gar/?rev=22036&view=rev Author: wahwah Date: 2013-09-27 08:26:55 +0000 (Fri, 27 Sep 2013) Log Message: ----------- opencsw-manual/trunk: More information about web apps and catalog generation Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-26 23:22:47 UTC (rev 22035) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-27 08:26:55 UTC (rev 22036) @@ -514,13 +514,34 @@ pkgdb-web is a web app on which you can browse your package database and inspect package metadata without having to unpack and examine packages in the terminal. Information such as list of files, pkginfo content and information -about binaries output are available on that page. +about binaries are available on that page. +The checkpkg database also holds information about catalogs. + +* Live app on the OpenCSW buildfarm http://buildfarm.opencsw.org/pkgdb/ +* Source code: + * Browse http://gar.svn.sourceforge.net/viewvc/gar/csw/mgar/gar/v2/lib/web + * Checkout: + http://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/web + +There are specifically two web apps: One is read-only (``pkgdb_web.py``) and +one is read-write (``releases_web.py``). + +Catalog generation +------------------ + +Once you have the buildfarm database, you can generate your own package +catalogs. The main entry point which you can add to cron is the +``opencsw-future-update`` script. + +* Source code: + https://sourceforge.net/p/opencsw/code/HEAD/tree/buildfarm/bin/ + Catalog signing daemon ---------------------- -Catalog signing daemon is useful if you wish to build package catalogs locally -and automatically sign them with a GPG key. +Catalog signing daemon is useful if you wish to automatically sign your built +catalogs with a GPG key. * `Catalog signing daemon source code`_ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 27 10:59:02 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Sep 2013 08:59:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[22037] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 22037 http://gar.svn.sourceforge.net/gar/?rev=22037&view=rev Author: dmichelsen Date: 2013-09-27 08:59:01 +0000 (Fri, 27 Sep 2013) Log Message: ----------- pcre/trunk: Update to 8.33 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2013-09-27 08:26:55 UTC (rev 22036) +++ csw/mgar/pkg/pcre/trunk/Makefile 2013-09-27 08:59:01 UTC (rev 22037) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.32 +VERSION = 8.33 GARTYPE = v2 DESCRIPTION = Perl-compatible regular expression tools Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2013-09-27 08:26:55 UTC (rev 22036) +++ csw/mgar/pkg/pcre/trunk/checksums 2013-09-27 08:59:01 UTC (rev 22037) @@ -1 +1 @@ -62f02a76bb57a40bc66681760ed511d5 pcre-8.32.tar.bz2 +21514018448ac10062ece7a668fca949 pcre-8.33.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Sep 27 11:16:41 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 27 Sep 2013 09:16:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[22038] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22038 http://gar.svn.sourceforge.net/gar/?rev=22038&view=rev Author: slowfranklin Date: 2013-09-27 09:16:41 +0000 (Fri, 27 Sep 2013) Log Message: ----------- samba/branches/samba4: Remove overrides, needs investigation and fix Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-27 08:59:01 UTC (rev 22037) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-27 09:16:41 UTC (rev 22038) @@ -745,8 +745,6 @@ CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += file-collision CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5.11 += surplus-dependency|CSWsamba4-winbind -CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5,11 += missing-dependency|CSWsamba-nss-system-links|or|CSWsamba-pam-system-links -CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5.11 += missing-dependency|CSWsamba-nss CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_$(GAROSREL)) PACKAGES += CSWsamba4-pam-system-links @@ -765,9 +763,6 @@ CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_winbind_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += file-collision|/usr/lib/security/pam_smbpass_csw.so|CSWsamba-pam-system-links|CSWsamba4-pam-system-links -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += missing-dependency|CSWsamba-pam-system-links -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += missing-dependency|CSWsamba-winbind -CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += missing-dependency|CSWsamba CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4 CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_$(GAROSREL)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 27 11:20:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Sep 2013 09:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[22039] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 22039 http://gar.svn.sourceforge.net/gar/?rev=22039&view=rev Author: dmichelsen Date: 2013-09-27 09:20:10 +0000 (Fri, 27 Sep 2013) Log Message: ----------- gcc4/trunk: Fix alternatives for java, add alterntives for ada/gnat Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-27 09:16:41 UTC (rev 22038) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-27 09:20:10 UTC (rev 22039) @@ -395,23 +395,22 @@ # The following list could be probably expanded from $(JAVA_BINARIES) ALTERNATIVES_$(PKG_BASENAME)java += $(PKG_VERSION_TOKEN)java -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/aot-compile gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) +ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/aot-compile gcc_gjava $(bindir)/aot-compile$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gappletviewer gcc_gjava $(bindir)/gappletviewer$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gc-analyze gcc_gjava $(bindir)/gc-analyze$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcj gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcj gcc_gjava $(bindir)/gcj$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcj-dbtool gcc_gjava $(bindir)/gcj-dbtool$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gcjh gcc_gjava $(bindir)/gcjh$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gij gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gij gcc_gjava $(bindir)/gij$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gjar gcc_gjava $(bindir)/gjar$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gjarsigner gcc_gjava $(bindir)/gjarsigner$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gjavah gcc_gjava $(bindir)/gjavah$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gkeytool gcc_gjava $(bindir)/gkeytool$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gnative2ascii gcc_gjava $(bindir)/$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gnative2ascii gcc_gjava $(bindir)/gnative2ascii$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gorbd gcc_gjava $(bindir)/gorbd$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmic gcc_gjava $(bindir)/grmic$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmid gcc_gjava $(bindir)/grmid$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmregistry gcc_gjava $(bindir)/grmregistry$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmregistry gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gserialver gcc_gjava $(bindir)/gserialver$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gtnameserv gcc_gjava $(bindir)/gtnameserv$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/jcf-dump gcc_gjava $(bindir)/jcf-dump$(PROGRAM_SUFFIX) @@ -464,6 +463,20 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 +ALTERNATIVES_$(PKG_BASENAME)ada += $(PKG_VERSION_TOKEN)ada +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnat gcc_ada $(bindir)/gnat$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatbind gcc_ada $(bindir)/gnatbind$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatchop gcc_ada $(bindir)/gnatchop$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatclean gcc_ada $(bindir)/gnatclean$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatfind gcc_ada $(bindir)/gnatfind$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatkr gcc_ada $(bindir)/gnatkr$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatlink gcc_ada $(bindir)/gnatlink$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatls gcc_ada $(bindir)/gnatls$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatmake gcc_ada $(bindir)/gnatmake$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatname gcc_ada $(bindir)/gnatname$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatprep gcc_ada $(bindir)/gnatprep$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnatxref gcc_ada $(bindir)/gnatxref$(PROGRAM_SUFFIX) + # This is an obsolete package. Nothing depends on it, so we can remove it. INCOMPATIBLE_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 27 12:45:39 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Sep 2013 10:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[22040] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 22040 http://gar.svn.sourceforge.net/gar/?rev=22040&view=rev Author: dmichelsen Date: 2013-09-27 10:45:38 +0000 (Fri, 27 Sep 2013) Log Message: ----------- gcc4/trunk: Remove unneded overrides Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-27 09:20:10 UTC (rev 22039) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-27 10:45:38 UTC (rev 22040) @@ -138,9 +138,6 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += file-with-bad-content CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += file-with-bad-content CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += file-with-bad-content -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-with-bad-content CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += file-with-bad-content # Due to complex regular expressions @@ -154,9 +151,6 @@ # Only man pages, so not a big problem. Alternatives could be used, but it # requires rebuilding libffi. -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_call.3|$(PKG_BASENAME)core|CSWlibffi-dev -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi.3|$(PKG_BASENAME)core|CSWlibffi-dev -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_prep_cif.3|$(PKG_BASENAME)core|CSWlibffi-dev CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|/opt/csw/share/info/libffi.info|$(PKG_BASENAME)core|CSWlibffi-dev # The .a files are necessary @@ -166,19 +160,6 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += discouraged-path-in-pkgmap -# From the 'hopeless errors' department: -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libffi.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcc_s.so|CSWgcc3core|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcj.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libffi.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libgcj.so|CSWgcc3javart|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)core -CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc -CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core - # Some static libraries are required to build binaries with gcc, for example # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found MERGE_EXCLUDE_LIBTOOL = @@ -515,16 +496,12 @@ #Direct binding is disabled to to problem with amd64 libs CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += no-direct-binding -CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += soname-unused CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += no-direct-binding -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += soname-unused CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += no-direct-binding CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += no-direct-binding CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += no-direct-binding -CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += soname-unused CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += no-direct-binding CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += no-direct-binding -CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += soname-unused CHECKPKG_OVERRIDES_CSWlibatomic1 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += no-direct-binding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 27 13:32:57 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 27 Sep 2013 11:32:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[22041] csw/mgar/pkg/xdg-utils/trunk/Makefile Message-ID: Revision: 22041 http://gar.svn.sourceforge.net/gar/?rev=22041&view=rev Author: pfelecan Date: 2013-09-27 11:32:56 +0000 (Fri, 27 Sep 2013) Log Message: ----------- xdg-utils/trunk: add new build dependency Modified Paths: -------------- csw/mgar/pkg/xdg-utils/trunk/Makefile Modified: csw/mgar/pkg/xdg-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-09-27 10:45:38 UTC (rev 22040) +++ csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-09-27 11:32:56 UTC (rev 22041) @@ -16,12 +16,14 @@ PATCHFILES += 0001-adapt-to-available-utilities-set.patch BUILD_DEP_PKGS += CSWxmlto +BUILD_DEP_PKGS += CSWexo-dev GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = custom +RUNTIME_DEP_PKGS = CSWexo ARCHALL = 1 REINPLACE_WHEN_USRLOCAL = postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 27 14:17:21 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 27 Sep 2013 12:17:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[22042] csw/mgar/pkg/xdg-utils/trunk/Makefile Message-ID: Revision: 22042 http://gar.svn.sourceforge.net/gar/?rev=22042&view=rev Author: pfelecan Date: 2013-09-27 12:17:20 +0000 (Fri, 27 Sep 2013) Log Message: ----------- xdg-utils/trunk: the run-time dependency cannot be detected easily; consequently, an override is necessary. Modified Paths: -------------- csw/mgar/pkg/xdg-utils/trunk/Makefile Modified: csw/mgar/pkg/xdg-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-09-27 11:32:56 UTC (rev 22041) +++ csw/mgar/pkg/xdg-utils/trunk/Makefile 2013-09-27 12:17:20 UTC (rev 22042) @@ -25,6 +25,7 @@ RUNTIME_DEP_PKGS = CSWexo ARCHALL = 1 +CHECKPKG_OVERRIDES_CSWxdg-utils += surplus-dependency|CSWexo REINPLACE_WHEN_USRLOCAL = postinstall REINPLACE_USRLOCAL += /opt/csw/bin/xdg-mime This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Sep 27 19:50:20 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 27 Sep 2013 17:50:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[22043] csw/mgar/pkg/lang-python/calibre/trunk/Makefile Message-ID: Revision: 22043 http://gar.svn.sourceforge.net/gar/?rev=22043&view=rev Author: pfelecan Date: 2013-09-27 17:50:19 +0000 (Fri, 27 Sep 2013) Log Message: ----------- lang-python/calibre/trunk: add indetectable run-time dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/calibre/trunk/Makefile Modified: csw/mgar/pkg/lang-python/calibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-09-27 12:17:20 UTC (rev 22042) +++ csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-09-27 17:50:19 UTC (rev 22043) @@ -53,8 +53,8 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -RUNTIME_DEP_PKGS = CSWexo - +RUNTIME_DEP_PKGS_CSWcalibre = CSWxdg-utils +CHECKPKG_OVERRIDES_CSWcalibre += surplus-dependency|CSWxdg-utils include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 27 21:12:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 27 Sep 2013 19:12:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22044] csw/mgar/pkg/tcl-itcl/trunk Message-ID: Revision: 22044 http://gar.svn.sourceforge.net/gar/?rev=22044&view=rev Author: dmichelsen Date: 2013-09-27 19:12:52 +0000 (Fri, 27 Sep 2013) Log Message: ----------- tcl-itcl/trunk: Update to 3.4.1 Modified Paths: -------------- csw/mgar/pkg/tcl-itcl/trunk/Makefile csw/mgar/pkg/tcl-itcl/trunk/checksums Modified: csw/mgar/pkg/tcl-itcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl-itcl/trunk/Makefile 2013-09-27 17:50:19 UTC (rev 22043) +++ csw/mgar/pkg/tcl-itcl/trunk/Makefile 2013-09-27 19:12:52 UTC (rev 22044) @@ -1,25 +1,22 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # + NAME = itcl -PACKAGES = CSWtclitcl -CATALOGNAME_CSWtclitcl = tcl-itcl -VERSION = 3.4 -GARTYPE = v2 -LICENSE = license.terms -DEPENDS = CSWtcl +VERSION = 3.4.1 + +SF_PROJECT = incrtcl +MASTER_SITES = $(SF_MIRRORS) DISTNAME = $(NAME)$(VERSION) +DISTFILES += $(DISTNAME).tar.gz -DESCRIPTION = [incr Tcl] is a Tcl extension that provides object-oriented features +DESCRIPTION = IncrTcl is a Tcl extension that provides object-oriented features -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(DISTNAME)b1.tar.gz +LICENSE = license.terms -# This package requires the soure code of Tcl to be available on -# the system at the location defined in -# /opt/csw/lib/tclConfig.sh: -# TCL_SRC_DIR='/opt/csw/src/tcl' +PACKAGES = CSWtcl-itcl +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = Modified: csw/mgar/pkg/tcl-itcl/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl-itcl/trunk/checksums 2013-09-27 17:50:19 UTC (rev 22043) +++ csw/mgar/pkg/tcl-itcl/trunk/checksums 2013-09-27 19:12:52 UTC (rev 22044) @@ -1 +1 @@ -e4c97750c08ab47e960b91911fdd0132 itcl3.4b1.tar.gz +e7c98e0f69df1a675073ddd3344f0b7f itcl3.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Sep 27 22:16:07 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 27 Sep 2013 20:16:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[22045] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: Revision: 22045 http://gar.svn.sourceforge.net/gar/?rev=22045&view=rev Author: slowfranklin Date: 2013-09-27 20:16:07 +0000 (Fri, 27 Sep 2013) Log Message: ----------- samba/branches/samba4: Add build deps Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-27 19:12:52 UTC (rev 22044) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-27 20:16:07 UTC (rev 22045) @@ -24,6 +24,12 @@ BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWlibpopt-dev BUILD_DEP_PKGS += CSWlibgamin-dev +BUILD_DEP_PKGS += CSWlibintl8 +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWdocbookxsl +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev PATCHFILES += 0001-fix-xml.patch # From https://bugzilla.samba.org/show_bug.cgi?id=7588 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 28 01:25:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 27 Sep 2013 23:25:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[22046] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22046 http://gar.svn.sourceforge.net/gar/?rev=22046&view=rev Author: wahwah Date: 2013-09-27 23:25:41 +0000 (Fri, 27 Sep 2013) Log Message: ----------- opencsw-manual/trunk: A list of parts to set up, style changes Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-27 20:16:07 UTC (rev 22045) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-09-27 23:25:41 UTC (rev 22046) @@ -4,13 +4,25 @@ .. highlight:: text -Buildfarm is a set of hosts where you can build Solaris packages. You can -connect Intel and SPARC and build a set of packages with one shell command. + If you prefer a video tutorial instead of a written document, there is + a `packaging video tutorial`_ available. It covers a subset of this document, + starting from a fresh Solaris 10 install and ends with a built package. It + takes about 2-3h to complete. -If you prefer a video tutorial instead of a written document, there is -a `packaging video tutorial`_ available. It covers all the steps from a fresh -Solaris 10 install to a built package. It takes about 2-3h to complete. +A buildfarm is a set of hosts where you can build Solaris packages. You can +connect Intel and SPARC hosts together to build a set of packages with one +shell command. +There is a few separate parts which you can set up (in no particular order): + +* mgar (builds packages) +* checkpkg (checks packages for errors) +* web app (for browsing package metadata and manipulating catalogs) +* catalog generation (to generate your own catalogs) +* signing daemon (to automatically add GPG signatures to your catalogs) +* platforms (multi-architecture builds, e.g. intel+sparc) +* additional software: Solaris Studio compiler, Java, etc. + Prerequisites ------------- @@ -196,9 +208,9 @@ In SQLObject, the UnicodeCol column type is translated into VARCHAR, which results in case-insensitive comparisons. This makes checkpkg throw file -collision errors between files such as "Zcat.1" and "zcat.1". In order to +collision errors between files such as ``Zcat.1`` and ``zcat.1``. In order to work around this, a case-sensitive collation needs to be used; for example, -latin1_bin. Collation setting can be altered for certain columns, as +``latin1_bin``. Collation setting can be altered for certain columns, as follows:: ALTER TABLE csw_file MODIFY COLUMN path VARCHAR(900) NOT NULL COLLATE latin1_bin; @@ -210,9 +222,9 @@ Configuration ^^^^^^^^^^^^^ -The database access configuration is held in ``~/.checkpkg/checkpkg.ini`` or, -in the shared config scenario, in ``/etc/opt/csw/checkpkg.ini``. The format -is as follows:: +The database access configuration is held in ``/etc/opt/csw/checkpkg.ini``. +You can also use a per-user file: ``~/.checkpkg/checkpkg.ini``. The format is +as follows:: [database] @@ -226,28 +238,26 @@ Initializing tables and indexes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The next step is creating the tables in the database. +The next step is creating the tables in the database:: -:: - bin/pkgdb initdb System files indexing ^^^^^^^^^^^^^^^^^^^^^ -The following commands will index and import files on the filesystem. Please -note that you might need to change 'SunOS5.10' and 'sparc' to match your file. +The following commands will index and import files on the filesystem:: -:: - bin/pkgdb system-files-to-file - bin/pkgdb import-system-file install-contents-SunOS5.10-sparc.marshal + bin/pkgdb import-system-file install-contents-SunOS$(uname -r)-$(uname -p).marshal -You can notice that there are separate steps: collecting the data and saving -as a file, and importing the data. Why are they separate? You need to collect -data on the host that contains them, but you might import the data on -a different host. +You can notice that there are two separate steps: +1. collecting the data and saving as a file +2. importing the data + +Why are they separate? You need to collect data on the host that contains +them, but you might import the data on a different host. + OpenCSW catalog indexing ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -261,7 +271,7 @@ come in, pkgdb only imports the new packages. You will need to perform this operation each time the OpenCSW catalog is -updated. Otherwise your packages will be checked against an old state of the +updated. Otherwise your packages will be checked against an old state of the catalog. Your database is now ready. @@ -285,10 +295,10 @@ as the 32 bit part needs to be build on Solaris 9 and the 64 bit part on Solaris 10. -Under ``/home/experimental//`` are project-specific directories with -permissions 0755 which are accessible via -``http://buildfarm.opencsw.org/experimental.html``. ``experimental/`` itself -is 01755 and users are free to create new projects as needed. +There are project specific directories under +``/home/experimental//``, with permissions 0755 which are accessible +via ``http://buildfarm.opencsw.org/experimental.html``. The ``experimental/`` +directory is 01755 and users are free to create new projects as needed. There is a `matrix of packages installed on the buildfarm`_. @@ -431,7 +441,7 @@ ^^^^^^^^^^^^ From here on in (Jan 2009), we are trying to keep userids in sync across all -machines. www.opencsw.org is considered the "master". If a user exists on +machines. ``www.opencsw.org`` is considered the master. If a user exists on www, then an account created from them on other machines, should be made to match up userids. @@ -443,9 +453,9 @@ thus, if there is an account created on non-www machines, that is desired to be non-synced, it should be outside the range of 17000-18000 -The normal process for creating accounts across all machines, is that Ben -runs a script on www, which in turn calls scripts maintained by Ihsan and -Dagobert, to create accounts on www and buildfarm machines, respectively. +The normal process for creating accounts across all machines, is that Ben runs +a script on www, which in turn calls scripts maintained by Ihsan and Dagobert, +to create accounts on www and buildfarm machines, respectively. SSH Agent for each user ^^^^^^^^^^^^^^^^^^^^^^^ @@ -520,6 +530,7 @@ * Live app on the OpenCSW buildfarm http://buildfarm.opencsw.org/pkgdb/ * Source code: + * Browse http://gar.svn.sourceforge.net/viewvc/gar/csw/mgar/gar/v2/lib/web * Checkout: http://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/web This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Sep 28 10:09:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 28 Sep 2013 08:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[22047] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 22047 http://gar.svn.sourceforge.net/gar/?rev=22047&view=rev Author: pfelecan Date: 2013-09-28 08:09:46 +0000 (Sat, 28 Sep 2013) Log Message: ----------- lang-python/pyqt/trunk: don't fail if a directory doesn't exist Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-27 23:25:41 UTC (rev 22046) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-28 08:09:46 UTC (rev 22047) @@ -110,7 +110,7 @@ ggrep -v '^[.]/pyqtconfig.py$$' | \ xargs rm \ && \ - rmdir \ + rmdir -f \ ./phonon \ ./Qt \ ./QtCore \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Sep 28 10:22:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 28 Sep 2013 08:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[22048] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 22048 http://gar.svn.sourceforge.net/gar/?rev=22048&view=rev Author: pfelecan Date: 2013-09-28 08:22:46 +0000 (Sat, 28 Sep 2013) Log Message: ----------- lang-python/pyqt/trunk: why use rmdir? Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-28 08:09:46 UTC (rev 22047) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-28 08:22:46 UTC (rev 22048) @@ -110,7 +110,7 @@ ggrep -v '^[.]/pyqtconfig.py$$' | \ xargs rm \ && \ - rmdir -f \ + rm -r -f \ ./phonon \ ./Qt \ ./QtCore \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Sep 28 17:55:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 28 Sep 2013 15:55:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[22049] csw/mgar/pkg/lang-python/pyqt/trunk Message-ID: Revision: 22049 http://gar.svn.sourceforge.net/gar/?rev=22049&view=rev Author: pfelecan Date: 2013-09-28 15:55:47 +0000 (Sat, 28 Sep 2013) Log Message: ----------- lang-python/pyqt/trunk: the script engine is not supported on SPARC architecture Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pyqt/trunk/files/0003-disable-ocsw-unsupported-modules-on-SPARC.patch Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-28 08:22:46 UTC (rev 22048) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-28 15:55:47 UTC (rev 22049) @@ -22,6 +22,7 @@ LICENSE = LICENSE.GPL3 PATCHFILES += 0001-disable-ocsw-unsupported-modules.patch PATCHFILES += 0002-force-xpg6-where-not-set-by-configure.patch +PATCHFILES_isa-sparcv8plus-python_version-2_7 += 0003-disable-ocsw-unsupported-modules-on-SPARC.patch BUILD_DEP_PKGS += CSWqt4-dev BUILD_DEP_PKGS += CSWpy-sip Added: csw/mgar/pkg/lang-python/pyqt/trunk/files/0003-disable-ocsw-unsupported-modules-on-SPARC.patch =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/files/0003-disable-ocsw-unsupported-modules-on-SPARC.patch (rev 0) +++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0003-disable-ocsw-unsupported-modules-on-SPARC.patch 2013-09-28 15:55:47 UTC (rev 22049) @@ -0,0 +1,46 @@ +From aebe5bd0345de68adc904a5e450fd18f75f3b85f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Sat, 28 Sep 2013 17:47:18 +0200 +Subject: [PATCH] disable ocsw unsupported modules on SPARC + +--- + configure-ng.py | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/configure-ng.py b/configure-ng.py +index 5781614..1505d6d 100644 +--- a/configure-ng.py ++++ b/configure-ng.py +@@ -88,8 +88,6 @@ QT4_MODULES = { + 'QtNetwork': ModuleMetadata(qmake_QT=['network', '-gui']), + 'QtOpenGL': ModuleMetadata(qmake_QT=['opengl'], + qpy_lib='qpyopengl'), +- 'QtScript': ModuleMetadata(qmake_QT=['script', '-gui']), +- 'QtScriptTools': ModuleMetadata(qmake_QT=['scripttools', 'script']), + 'QtSql': ModuleMetadata(qmake_QT=['sql']), + 'QtSvg': ModuleMetadata(qmake_QT=['svg']), + 'QtTest': ModuleMetadata(qmake_QT=['testlib']), +@@ -120,9 +118,6 @@ QT5_MODULES = { + 'QtNetwork': ModuleMetadata(qmake_QT=['network', '-gui']), + 'QtOpenGL': ModuleMetadata(qmake_QT=['opengl'], + qpy_lib='qpyopengl'), +- 'QtScript': ModuleMetadata(qmake_QT=['script', '-gui']), +- 'QtScriptTools': ModuleMetadata( +- qmake_QT=['scripttools', 'script', 'widgets']), + 'QtSql': ModuleMetadata(qmake_QT=['sql', 'widgets']), + 'QtSvg': ModuleMetadata(qmake_QT=['svg']), + 'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']), +@@ -935,10 +930,6 @@ def check_modules(target_config, verbose): + 'new QDeclarativeView()') + check_module(target_config, verbose, 'QtOpenGL', 'qgl.h', + 'new QGLWidget()') +- check_module(target_config, verbose, 'QtScript', 'qscriptengine.h', +- 'new QScriptEngine()') +- check_module(target_config, verbose, 'QtScriptTools', +- 'qscriptenginedebugger.h', 'new QScriptEngineDebugger()') + check_module(target_config, verbose, 'QtSql', 'qsqldatabase.h', + 'new QSqlDatabase()') + check_module(target_config, verbose, 'QtSvg', 'qsvgwidget.h', +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Sep 28 18:03:31 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 28 Sep 2013 16:03:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[22050] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 22050 http://gar.svn.sourceforge.net/gar/?rev=22050&view=rev Author: guengel Date: 2013-09-28 16:03:29 +0000 (Sat, 28 Sep 2013) Log Message: ----------- cfengine3/trunk: New upstream release. Package now built using GCC 4.8. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0000-Disable-acceptance-test.patch csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch Removed Paths: ------------- csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,11 +1,11 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.4.4 +VERSION = 3.5.2 GARTYPE = v2 -GARCOMPILER = SOS12U2 +GARCOMPILER = GCC4 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 DESCRIPTION = Open source configuration management system define BLURB @@ -38,12 +38,8 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# See comment in patch -PATCHFILES += 0000-Do-not-perform-acceptance-test.patch -# Make build and tests work -PATCHFILES += 0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch -PATCHFILES += 0003-Fix-empty-initializer.-Add-mkdtemp.patch -PATCHFILES += 0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch +PATCHFILES += 0000-evalfunction-unittest-needs-z-interpose-when-linking.patch +PATCHFILES += 0000-Disable-acceptance-test.patch # # CUSTOM VARIABLES @@ -59,9 +55,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibtokyocabinet9 RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1 -CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils -CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/CoreBase/failsafe/failsafe.cf -CHECKPKG_OVERRIDES_CSW$(NAME)utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/$(NAME)_utils/ChangeLog OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt CATALOGNAME_CSWlibpromises1 = libpromises1_stub CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub @@ -77,7 +70,6 @@ PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-runagent.* PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW -CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server PACKAGES += CSW$(NAME)client CATALOGNAME_CSW$(NAME)client = $(NAME)_client @@ -96,7 +88,6 @@ PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfexecd PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW -CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client # CFEngine provides three daemons # - cf-execd (client) @@ -129,10 +120,6 @@ CONFIGURE_ARGS += --without-postgresql CONFIGURE_ARGS += --without-mysql -EXTRA_CPPFLAGS = -xc99=all -# -features=extensions is needed since some void functions return values... -EXTRA_CFLAGS = -xc99=all -features=extensions - # We use this because libpromises will be moved to this private # directory (see also move-libpromises:) EXTRA_LDFLAGS += -R$(libdir)/$(NAME) @@ -142,7 +129,7 @@ include gar/category.mk -post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises move-binaries +post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc move-libpromises move-binaries @$(MAKECOOKIE) rename-cfengine-dir: @@ -182,24 +169,11 @@ install-cfengine3-csw-doc: rename-cfengine-dir ginstall -m 644 $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)_utils/ -fix-paths-in-files: rename-cfengine-dir - for d in $(DESTDIR)$(docdir)/$(NAME)_utils/example_config $(DESTDIR)$(docdir)/$(NAME)_utils/examples $(DESTDIR)$(docdir)/$(NAME)_utils/CoreBase; do \ - if test -d $$d ; then \ - for f in $${d}/*.cf ; do \ - sed -e 's|/var/cfengine/|/var/opt/csw/$(NAME)/|g' \ - -e 's|_var_cfengine_|_var_opt_csw_$(NAME)_|g' \ - -e 's|/usr/local/|/opt/csw/|g' \ - -e 's|_usr_local_|_opt_csw_|g' $$f > $${f}.tmp ;\ - mv $${f}.tmp $$f ; \ - done ; \ - fi ; \ - done - -# We move libpromises to a prive directory, since there is no publicly +# We move libpromises to a private directory, since there is no publicly # available API. Please note, the rpath has to be set appropriately move-libpromises: ginstall -d $(DESTDIR)$(libdir)/$(NAME) - if test -f $(DESTDIR)$(libdir)/libpromises.so.1.0.0 ; then \ + if test -f $(DESTDIR)$(libdir)/libpromises.so ; then \ mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/ ; \ fi Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2013-09-28 16:03:29 UTC (rev 22050) @@ -1 +1 @@ -81d574a6d68f3f0a91f0803349a8b8f5 cfengine-3.4.4.tar.gz +fa5a5270803fa24e9ab662aae6f73b4a cfengine-3.5.2.tar.gz Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Disable-acceptance-test.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Disable-acceptance-test.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Disable-acceptance-test.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -0,0 +1,26 @@ +From 4e30aaf0a0122218639f4232424d3e3b4877f2b7 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 28 Sep 2013 17:26:48 +0200 +Subject: [PATCH] Disable acceptance test. + +Tried to make it work, but didn't succeed, so I gave up... +--- + tests/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index fe93e76..b12df55 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + workdir = @workdir@ +-SUBDIRS = unit load acceptance ++SUBDIRS = unit load + all: all-recursive + + .SUFFIXES: +-- +1.8.3.4 + Deleted: csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,37 +0,0 @@ -From b90694842d4649a191c43dd004e4052786389fda Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 17 Jun 2012 11:30:48 +0200 -Subject: [PATCH] Do not perform acceptance test - -Why? Accpetance tests are using CFEngine's $(WORKDIR) which is set to /var/opt/csw/cfengine3 and regular users, i.e. the guy who is building CFEngine does not have rw access to it, nor can it be created by non-root users. Thus, all tests fail. - -Having CFEngine running on several Sol10 machines, I guess this counts as test. ---- - tests/Makefile.am | 2 +- - tests/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 7e9bf2c..ed152e7 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1 +1 @@ --SUBDIRS = unit load acceptance -\ No newline at end of file -+SUBDIRS = unit load -diff --git a/tests/Makefile.in b/tests/Makefile.in -index 8f67654..76974c4 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -276,7 +276,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - workdir = @workdir@ --SUBDIRS = unit load acceptance -+SUBDIRS = unit load - all: all-recursive - - .SUFFIXES: --- -1.7.10.3 - Added: csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-evalfunction-unittest-needs-z-interpose-when-linking.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -0,0 +1,25 @@ +From 861b9272653520866f07cee72b1a9277ab4410f3 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 28 Sep 2013 16:53:23 +0200 +Subject: [PATCH] evalfunction unittest needs `-z interpose' when linking. + +--- + tests/unit/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in +index 05df581..1bfaa6d 100644 +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -205,7 +205,7 @@ domainname_test_DEPENDENCIES = ../../libpromises/libpromises.la \ + libtest.la + evalfunction_test_SOURCES = evalfunction_test.c + evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) +-evalfunction_test_LDADD = $(LDADD) ++evalfunction_test_LDADD = $(LDADD) -z interpose + evalfunction_test_DEPENDENCIES = ../../libpromises/libpromises.la \ + libtest.la + am_exec_config_test_OBJECTS = exec-config-test.$(OBJEXT) \ +-- +1.8.3.4 + Deleted: csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/files/0001-Fix-preprocessor-macro-FUNC_DEPRECATED-to-avoid-synt.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,26 +0,0 @@ -From 6301179ba982f8a6f4d0f28e8dd70952d449ca54 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 9 Dec 2012 12:23:07 +0100 -Subject: [PATCH] Fix preprocessor macro FUNC_DEPRECATED to avoid syntax - errors - ---- - src/compiler.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compiler.h b/src/compiler.h -index 16987c7..32db658 100644 ---- a/src/compiler.h -+++ b/src/compiler.h -@@ -49,7 +49,7 @@ - # define FUNC_DEPRECATED \ - __attribute__((deprecated)) - #else --# define FUNC_DEPRECATED(warning_text) -+# define FUNC_DEPRECATED - #endif - - #endif --- -1.8.0 - Deleted: csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/files/0002-Remove-unsupported-compiler-flags.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,39 +0,0 @@ -From c7e663d95a14ce859c5475d36db52127ffdc75f4 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 9 Dec 2012 13:15:36 +0100 -Subject: [PATCH] Remove unsupported compiler flags - ---- - tests/unit/Makefile.am | 2 +- - tests/unit/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index a136082..a29890d 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -88,7 +88,7 @@ xml_writer_test_LDADD = libtest.la libstr.la - # instrumentation code uses fclose(3). - # - file_writer_test_SOURCES = file_writer_test.c gcov-stub.c --file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage -+file_writer_test_CFLAGS = $(AM_CFLAGS) - file_writer_test_LDADD = libstr.la - file_writer_test_LDLFAGS = - -diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in -index 59b91dd..77df470 100644 ---- a/tests/unit/Makefile.in -+++ b/tests/unit/Makefile.in -@@ -601,7 +601,7 @@ xml_writer_test_LDADD = libtest.la libstr.la - # instrumentation code uses fclose(3). - # - file_writer_test_SOURCES = file_writer_test.c gcov-stub.c --file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage -+file_writer_test_CFLAGS = $(AM_CFLAGS) - file_writer_test_LDADD = libstr.la - file_writer_test_LDLFAGS = - db_test_SOURCES = db_test.c --- -1.8.0 - Deleted: csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Fix-empty-initializer.-Add-mkdtemp.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,330 +0,0 @@ -From 8e25bfc31a6342071ba7a483ca333211491160c0 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 9 Dec 2012 13:49:49 +0100 -Subject: [PATCH] Fix empty initializer. Add mkdtemp(). - ---- - tests/load/db_load.c | 20 ++++++++++++++++++-- - tests/load/lastseen_load.c | 22 +++++++++++++++++++--- - tests/unit/db_test.c | 20 ++++++++++++++++++-- - tests/unit/dbm_migration_bundles_test.c | 20 ++++++++++++++++++-- - tests/unit/files_interfaces_test.c | 16 ++++++++++++++++ - tests/unit/files_lib_test.c | 16 ++++++++++++++++ - tests/unit/lastseen_migration_test.c | 22 +++++++++++++++++++--- - tests/unit/lastseen_test.c | 22 +++++++++++++++++++--- - tests/unit/persistent_lock_test.c | 16 ++++++++++++++++ - 9 files changed, 159 insertions(+), 15 deletions(-) - -diff --git a/tests/load/db_load.c b/tests/load/db_load.c -index 1860ae6..8998bff 100644 ---- a/tests/load/db_load.c -+++ b/tests/load/db_load.c -@@ -2,6 +2,22 @@ - #include "dbm_api.h" - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - #define MAX_THREADS 10000 - #define DB_ID dbid_classes - -@@ -347,5 +363,5 @@ int ThreadUnlock(pthread_mutex_t *t) - pthread_mutex_t *cft_dbhandle; - #endif - --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; -+const char *DAY_TEXT[] = {NULL}; -+const char *MONTH_TEXT[] = {NULL}; -diff --git a/tests/load/lastseen_load.c b/tests/load/lastseen_load.c -index 22d4cf3..07c718d 100644 ---- a/tests/load/lastseen_load.c -+++ b/tests/load/lastseen_load.c -@@ -2,6 +2,22 @@ - #include "dbm_api.h" - #include "lastseen.h" - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - char CFWORKDIR[CF_BUFSIZE] = "/tmp"; - - -@@ -59,9 +75,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - } - - enum cfhashes CF_DEFAULT_DIGEST; --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; --const char *SHIFT_TEXT[] = {}; -+const char *DAY_TEXT[] = {NULL}; -+const char *MONTH_TEXT[] = {NULL}; -+const char *SHIFT_TEXT[] = {NULL}; - pthread_mutex_t *cft_output; - char VIPADDRESS[18]; - RSA *PUBKEY; -diff --git a/tests/unit/db_test.c b/tests/unit/db_test.c -index 40c8957..c94a3a7 100644 ---- a/tests/unit/db_test.c -+++ b/tests/unit/db_test.c -@@ -3,6 +3,22 @@ - #include "cf3.defs.h" - #include "dbm_api.h" - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - char CFWORKDIR[CF_BUFSIZE]; - - void tests_setup(void) -@@ -148,6 +164,6 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - fprintf(stderr, "\n"); - } - --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; -+const char *DAY_TEXT[] = {NULL}; -+const char *MONTH_TEXT[] = {NULL}; - -diff --git a/tests/unit/dbm_migration_bundles_test.c b/tests/unit/dbm_migration_bundles_test.c -index 279ce45..c7afc92 100644 ---- a/tests/unit/dbm_migration_bundles_test.c -+++ b/tests/unit/dbm_migration_bundles_test.c -@@ -6,6 +6,22 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - char CFWORKDIR[CF_BUFSIZE]; - - static void tests_setup(void) -@@ -166,8 +182,8 @@ int main() - } - - /* STUBS */ --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; -+const char *DAY_TEXT[] = {NULL}; -+const char *MONTH_TEXT[] = {NULL}; - - void FatalError(char *s, ...) - { -diff --git a/tests/unit/files_interfaces_test.c b/tests/unit/files_interfaces_test.c -index c2f5266..605f42a 100644 ---- a/tests/unit/files_interfaces_test.c -+++ b/tests/unit/files_interfaces_test.c -@@ -1,6 +1,22 @@ - #include "test.h" - #include "files_interfaces.h" - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - #define FILE_SIZE (sizeof(FILE_CONTENTS) - 1) - #define FILE_LINE "some garbage!" - #define FILE_CORRUPTED_LINE "some \0 , gar\0bage!" -diff --git a/tests/unit/files_lib_test.c b/tests/unit/files_lib_test.c -index 642d073..0f24d71 100644 ---- a/tests/unit/files_lib_test.c -+++ b/tests/unit/files_lib_test.c -@@ -6,6 +6,22 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - #define FILE_CONTENTS "8aysd9a8ydhsdkjnaldn12lk\njndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljew\nnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1l\rkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1\r\nlkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn38aysd9a8ydhsdkjnaldn12lkjndl1jndljewnbfdhwjebfkjhbnkjdn1lkdjn1lkjn3" - #define FILE_SIZE (sizeof(FILE_CONTENTS) - 1) - -diff --git a/tests/unit/lastseen_migration_test.c b/tests/unit/lastseen_migration_test.c -index f0f285f..79c0f42 100644 ---- a/tests/unit/lastseen_migration_test.c -+++ b/tests/unit/lastseen_migration_test.c -@@ -6,6 +6,22 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - typedef struct - { - char address[128]; -@@ -258,9 +274,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - } - - enum cfhashes CF_DEFAULT_DIGEST; --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; --const char *SHIFT_TEXT[] = {}; -+const char *DAY_TEXT[] = {NULL}; -+const char *MONTH_TEXT[] = {NULL}; -+const char *SHIFT_TEXT[] = {NULL}; - pthread_mutex_t *cft_output; - char VIPADDRESS[18]; - RSA *PUBKEY; -diff --git a/tests/unit/lastseen_test.c b/tests/unit/lastseen_test.c -index 27f7b96..e91d675 100644 ---- a/tests/unit/lastseen_test.c -+++ b/tests/unit/lastseen_test.c -@@ -6,6 +6,22 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - char CFWORKDIR[CF_BUFSIZE]; - - void UpdateLastSawHost(const char *hostkey, const char *address, -@@ -200,9 +216,9 @@ void CfOut(enum cfreport level, const char *errstr, const char *fmt, ...) - } - - enum cfhashes CF_DEFAULT_DIGEST; --const char *DAY_TEXT[] = {}; --const char *MONTH_TEXT[] = {}; --const char *SHIFT_TEXT[] = {}; -+const char *DAY_TEXT[] = {NULL}; -+const char *MONTH_TEXT[] = {NULL}; -+const char *SHIFT_TEXT[] = {NULL}; - pthread_mutex_t *cft_output; - char VIPADDRESS[18]; - RSA *PUBKEY; -diff --git a/tests/unit/persistent_lock_test.c b/tests/unit/persistent_lock_test.c -index 71219e8..b556555 100644 ---- a/tests/unit/persistent_lock_test.c -+++ b/tests/unit/persistent_lock_test.c -@@ -5,6 +5,22 @@ - #include - #include - -+#include -+#include -+ -+static char* mkdtemp(char *template) { -+ char *tmp; -+ int retval; -+ -+ tmp = mktemp(template); -+ if (tmp == NULL) return NULL; -+ -+ if ( !(retval = mkdir(tmp, S_IRWXU)) ) -+ return NULL; -+ -+ return tmp; -+} -+ - static void tests_setup(void) - { - snprintf(CFWORKDIR, CF_BUFSIZE, "/tmp/persistent_lock_test.XXXXXX"); --- -1.8.0 - Deleted: csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Remove-unsupported-compiler-flags.-Add-z-interpose-w.patch 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,58 +0,0 @@ -From d90241098cefd342803b862c301757e222883404 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 9 Dec 2012 14:49:02 +0100 -Subject: [PATCH] Remove unsupported compiler flags. Add -z interpose where - necessary - ---- - tests/unit/Makefile.am | 2 +- - tests/unit/Makefile.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index a136082..a29890d 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -88,7 +88,7 @@ xml_writer_test_LDADD = libtest.la libstr.la - # instrumentation code uses fclose(3). - # - file_writer_test_SOURCES = file_writer_test.c gcov-stub.c --file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage -+file_writer_test_CFLAGS = $(AM_CFLAGS) - file_writer_test_LDADD = libstr.la - file_writer_test_LDLFAGS = - -diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in -index 59b91dd..926d960 100644 ---- a/tests/unit/Makefile.in -+++ b/tests/unit/Makefile.in -@@ -151,7 +151,7 @@ domainname_test_LDADD = $(LDADD) - domainname_test_DEPENDENCIES = ../../src/libpromises.la libtest.la - evalfunction_test_SOURCES = evalfunction_test.c - evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) --evalfunction_test_LDADD = $(LDADD) -+evalfunction_test_LDADD = $(LDADD) -z interpose - evalfunction_test_DEPENDENCIES = ../../src/libpromises.la libtest.la - file_name_test_SOURCES = file_name_test.c - file_name_test_OBJECTS = file_name_test.$(OBJEXT) -@@ -199,7 +199,7 @@ lastseen_test_OBJECTS = $(am_lastseen_test_OBJECTS) - lastseen_test_DEPENDENCIES = libdb.la - logging_test_SOURCES = logging_test.c - logging_test_OBJECTS = logging_test.$(OBJEXT) --logging_test_LDADD = $(LDADD) -+logging_test_LDADD = $(LDADD) -z interpose - logging_test_DEPENDENCIES = ../../src/libpromises.la libtest.la - map_test_SOURCES = map_test.c - map_test_OBJECTS = map_test.$(OBJEXT) -@@ -601,7 +601,7 @@ xml_writer_test_LDADD = libtest.la libstr.la - # instrumentation code uses fclose(3). - # - file_writer_test_SOURCES = file_writer_test.c gcov-stub.c --file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage -+file_writer_test_CFLAGS = $(AM_CFLAGS) - file_writer_test_LDADD = libstr.la - file_writer_test_LDLFAGS = - db_test_SOURCES = db_test.c --- -1.8.0 - Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2013-09-28 15:55:47 UTC (rev 22049) +++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2013-09-28 16:03:29 UTC (rev 22050) @@ -1,3 +1,12 @@ +cfengine3 (3.5.2,REV=2013.09.28) + + * New upstream release 3.5.2. + + * Built using GCC 4.8. + + -- Rafael Ostertag Sat, 28 Sep 2013 17:57:13 +0200 + + cfengine3 (3.4.4,REV=2013.03.26) * New upstream release 3.4.4. @@ -4,6 +13,7 @@ -- Rafael Ostertag Tue, 26 Mar 2013 11:24:16 +0100 + cfengine3 (3.4.1,REV=2012.12.09) * New upstream release 3.4.1. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Sep 28 18:27:20 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 28 Sep 2013 16:27:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[22051] csw/mgar/pkg/cfengine3/trunk/Makefile Message-ID: Revision: 22051 http://gar.svn.sourceforge.net/gar/?rev=22051&view=rev Author: guengel Date: 2013-09-28 16:27:20 +0000 (Sat, 28 Sep 2013) Log Message: ----------- cfengine3/trunk: Fixed some dependencies. Some chkpkg complaints overridden. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-09-28 16:03:29 UTC (rev 22050) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-09-28 16:27:20 UTC (rev 22051) @@ -55,9 +55,11 @@ RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibtokyocabinet9 RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibgcc-s1 OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt CATALOGNAME_CSWlibpromises1 = libpromises1_stub CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub +CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils PACKAGES += CSW$(NAME)server CATALOGNAME_CSW$(NAME)server = $(NAME)_server @@ -70,11 +72,11 @@ PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-runagent.* PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW +CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server PACKAGES += CSW$(NAME)client CATALOGNAME_CSW$(NAME)client = $(NAME)_client SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibxml2-2 @@ -88,6 +90,7 @@ PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfexecd PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW +CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client # CFEngine provides three daemons # - cf-execd (client) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Sep 29 14:57:53 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 29 Sep 2013 12:57:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22052] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 22052 http://gar.svn.sourceforge.net/gar/?rev=22052&view=rev Author: guengel Date: 2013-09-29 12:57:51 +0000 (Sun, 29 Sep 2013) Log Message: ----------- cfengine3/trunk: Added patch for Solaris 11 (enum name clash in system header). Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2013-09-28 16:27:20 UTC (rev 22051) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2013-09-29 12:57:51 UTC (rev 22052) @@ -40,6 +40,9 @@ PATCHFILES += 0000-evalfunction-unittest-needs-z-interpose-when-linking.patch PATCHFILES += 0000-Disable-acceptance-test.patch +# Patch has been generated by using +# find work/solaris11-sparc/build-isa-sparcv8plus/cfengine-3.5.2/ -type f \( -name \*.c -o -name \*.h -o -name \*.y \) -exec gsed -i.bak 's/DATA_TYPE_/CF_DATA_TYPE_/g' \{\} \; +PATCHFILES += 0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch # # CUSTOM VARIABLES Added: csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0003-Solaris-11-DATA_TYPE_-name-clash-patch.patch 2013-09-29 12:57:51 UTC (rev 22052) @@ -0,0 +1,3747 @@ +From 2b6e0b6cd2e733b488c9d2bf5db8e0c7c4299e3b Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 29 Sep 2013 14:50:15 +0200 +Subject: [PATCH] Solaris 11 DATA_TYPE_* name clash patch. + +--- + cf-agent/cf-agent.c | 12 +- + cf-agent/files_editline.c | 2 +- + cf-agent/files_editxml.c | 2 +- + cf-agent/vercmp.c | 4 +- + cf-agent/verify_environments.c | 2 +- + cf-agent/verify_exec.c | 2 +- + cf-agent/verify_files.c | 4 +- + cf-agent/verify_files_utils.c | 2 +- + cf-agent/verify_methods.c | 2 +- + cf-agent/verify_packages.c | 24 +- + cf-agent/verify_processes.c | 2 +- + cf-agent/verify_services.c | 10 +- + cf-execd/cf-execd.c | 2 +- + cf-gendoc/export_xml.c | 40 +- + cf-gendoc/manual.c | 8 +- + cf-monitord/verify_measurements.c | 10 +- + libpromises/attributes.c | 4 +- + libpromises/bootstrap.c | 6 +- + libpromises/cf3.defs.h | 32 +- + libpromises/cf3parse.c | 14 +- + libpromises/cf3parse.y | 14 +- + libpromises/conversion.c | 40 +- + libpromises/env_context.c | 12 +- + libpromises/evalfunction.c | 984 +++++++++++++++++++------------------- + libpromises/expand.c | 46 +- + libpromises/generic_agent.c | 4 +- + libpromises/iteration.c | 2 +- + libpromises/policy.c | 40 +- + libpromises/promises.c | 2 +- + libpromises/rlist.c | 32 +- + libpromises/scope.c | 34 +- + libpromises/syntax.c | 74 +-- + libpromises/syntax.h | 32 +- + libpromises/sysinfo.c | 100 ++-- + libpromises/unix.c | 28 +- + libpromises/vars.c | 10 +- + libpromises/verify_reports.c | 2 +- + libpromises/verify_vars.c | 6 +- + tests/unit/assoc_test.c | 2 +- + tests/unit/exec-config-test.c | 2 +- + tests/unit/expand_test.c | 30 +- + tests/unit/scope_test.c | 6 +- + tests/unit/set_domainname_test.c | 2 +- + 43 files changed, 844 insertions(+), 844 deletions(-) + +diff --git a/cf-agent/cf-agent.c b/cf-agent/cf-agent.c +index be3cf9a..c63f233 100644 +--- a/cf-agent/cf-agent.c ++++ b/cf-agent/cf-agent.c +@@ -1311,9 +1311,9 @@ static void DefaultVarPromise(EvalContext *ctx, const Promise *pp) + + switch (dt) + { +- case DATA_TYPE_STRING: +- case DATA_TYPE_INT: +- case DATA_TYPE_REAL: ++ case CF_DATA_TYPE_STRING: ++ case CF_DATA_TYPE_INT: ++ case CF_DATA_TYPE_REAL: + + if (regex && !FullTextMatch(regex,rval.item)) + { +@@ -1327,9 +1327,9 @@ static void DefaultVarPromise(EvalContext *ctx, const Promise *pp) + + break; + +- case DATA_TYPE_STRING_LIST: +- case DATA_TYPE_INT_LIST: +- case DATA_TYPE_REAL_LIST: ++ case CF_DATA_TYPE_STRING_LIST: ++ case CF_DATA_TYPE_INT_LIST: ++ case CF_DATA_TYPE_REAL_LIST: + + if (regex) + { +diff --git a/cf-agent/files_editline.c b/cf-agent/files_editline.c +index 24ad1ae..7786981 100644 +--- a/cf-agent/files_editline.c ++++ b/cf-agent/files_editline.c +@@ -113,7 +113,7 @@ int ScheduleEditLineOperations(EvalContext *ctx, Bundle *bp, Attributes a, const + return false; + } + +- ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, CF_DATA_TYPE_STRING); + + for (pass = 1; pass < CF_DONEPASSES; pass++) + { +diff --git a/cf-agent/files_editxml.c b/cf-agent/files_editxml.c +index ebe953e..f861ccb 100644 +--- a/cf-agent/files_editxml.c ++++ b/cf-agent/files_editxml.c +@@ -160,7 +160,7 @@ int ScheduleEditXmlOperations(EvalContext *ctx, Bundle *bp, Attributes a, const + return false; + } + +- ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "edit", "filename", edcontext->filename, CF_DATA_TYPE_STRING); + + for (pass = 1; pass < CF_DONEPASSES; pass++) + { +diff --git a/cf-agent/vercmp.c b/cf-agent/vercmp.c +index 8515826..2be84da 100644 +--- a/cf-agent/vercmp.c ++++ b/cf-agent/vercmp.c +@@ -64,8 +64,8 @@ static VersionCmpResult RunCmpCommand(EvalContext *ctx, const char *command, con + char expanded_command[CF_EXPANDSIZE]; + + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v1" }, (Rval) { v1, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v2" }, (Rval) { v2, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v1" }, (Rval) { v1, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "v2" }, (Rval) { v2, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context", command, expanded_command); + + ScopeClear("cf_pack_context"); +diff --git a/cf-agent/verify_environments.c b/cf-agent/verify_environments.c +index 6a87431..0ff582e 100644 +--- a/cf-agent/verify_environments.c ++++ b/cf-agent/verify_environments.c +@@ -134,7 +134,7 @@ void VerifyEnvironmentsPromise(EvalContext *ctx, Promise *pp) + } + + PromiseBanner(pp); +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); + + pexp = ExpandDeRefPromise(ctx, "this", pp); + VerifyEnvironments(ctx, a, pp); +diff --git a/cf-agent/verify_exec.c b/cf-agent/verify_exec.c +index 1dd7a86..51051af 100644 +--- a/cf-agent/verify_exec.c ++++ b/cf-agent/verify_exec.c +@@ -64,7 +64,7 @@ void VerifyExecPromise(EvalContext *ctx, Promise *pp) + + a = GetExecAttributes(ctx, pp); + +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); + + if (!SyntaxCheckExec(a, pp)) + { +diff --git a/cf-agent/verify_files.c b/cf-agent/verify_files.c +index d117529..45ae46a 100644 +--- a/cf-agent/verify_files.c ++++ b/cf-agent/verify_files.c +@@ -196,7 +196,7 @@ static void VerifyFilePromise(EvalContext *ctx, char *path, Promise *pp) + } + + ScopeDeleteSpecial("this", "promiser"); +- ScopeNewSpecial(ctx, "this", "promiser", path, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", path, CF_DATA_TYPE_STRING); + + thislock = AcquireLock(ctx, path, VUQNAME, CFSTARTTIME, a.transaction, pp, false); + +@@ -588,7 +588,7 @@ static void FindFilePromiserObjects(EvalContext *ctx, Promise *pp) + if (literal) + { + // Prime the promiser temporarily, may override later +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); + VerifyFilePromise(ctx, pp->promiser, pp); + } + else // Default is to expand regex paths +diff --git a/cf-agent/verify_files_utils.c b/cf-agent/verify_files_utils.c +index 21f195c..c16b965 100644 +--- a/cf-agent/verify_files_utils.c ++++ b/cf-agent/verify_files_utils.c +@@ -124,7 +124,7 @@ int VerifyFileLeaf(EvalContext *ctx, char *path, struct stat *sb, Attributes att + /* We still need to augment the scope of context "this" for commands */ + + ScopeDeleteSpecial("this", "promiser"); +- ScopeNewSpecial(ctx, "this", "promiser", path, DATA_TYPE_STRING); // Parameters may only be scalars ++ ScopeNewSpecial(ctx, "this", "promiser", path, CF_DATA_TYPE_STRING); // Parameters may only be scalars + + if (attr.transformer != NULL) + { +diff --git a/cf-agent/verify_methods.c b/cf-agent/verify_methods.c +index 14296e2..e652609 100644 +--- a/cf-agent/verify_methods.c ++++ b/cf-agent/verify_methods.c +@@ -227,7 +227,7 @@ static void GetReturnValue(EvalContext *ctx, char *scope, Promise *pp) + snprintf(newname, CF_BUFSIZE, "%s", result); + } + +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(pp)->name, newname }, assoc->rval, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(pp)->name, newname }, assoc->rval, CF_DATA_TYPE_STRING); + } + } + +diff --git a/cf-agent/verify_packages.c b/cf-agent/verify_packages.c +index 1e4ec7e..bcdbfcf 100644 +--- a/cf-agent/verify_packages.c ++++ b/cf-agent/verify_packages.c +@@ -948,9 +948,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + + if ((a.packages.package_name_convention) || (a.packages.package_delete_convention)) + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { version, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { version, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + + if ((a.packages.package_delete_convention) && (a.packages.package_policy == PACKAGE_ACTION_DELETE)) + { +@@ -1013,9 +1013,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + ((a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GT) || (a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GE))) + { + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context_anyver", a.packages.package_name_convention, refAnyVer); + + ScopeClear("cf_pack_context_anyver"); +@@ -1134,9 +1134,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + ((a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GT) || (a.packages.package_select == PACKAGE_VERSION_COMPARATOR_GE))) + { + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "version" }, (Rval) { "(.*)", RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context_anyver", "arch" }, (Rval) { arch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context_anyver", a.packages.package_name_convention, refAnyVer); + + ScopeClear("cf_pack_context_anyver"); +@@ -1199,9 +1199,9 @@ static void SchedulePackageOp(EvalContext *ctx, const char *name, const char *ve + } + + { +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { instVer, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); +- EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { instArch, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "name" }, (Rval) { name, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "version" }, (Rval) { instVer, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, "cf_pack_context", "arch" }, (Rval) { instArch, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + ExpandScalar(ctx, "cf_pack_context", a.packages.package_delete_convention, reference2); + id_del = reference2; + +diff --git a/cf-agent/verify_processes.c b/cf-agent/verify_processes.c +index ebd9975..a593aae 100644 +--- a/cf-agent/verify_processes.c ++++ b/cf-agent/verify_processes.c +@@ -124,7 +124,7 @@ static void VerifyProcesses(EvalContext *ctx, Attributes a, Promise *pp) + } + + ScopeDeleteSpecial("this", "promiser"); +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); + PromiseBanner(pp); + VerifyProcessOp(ctx, PROCESSTABLE, a, pp); + ScopeDeleteSpecial("this", "promiser"); +diff --git a/cf-agent/verify_services.c b/cf-agent/verify_services.c +index 9adb726..25562b4 100644 +--- a/cf-agent/verify_services.c ++++ b/cf-agent/verify_services.c +@@ -163,7 +163,7 @@ void VerifyServices(EvalContext *ctx, Attributes a, Promise *pp) + return; + } + +- ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, CF_DATA_TYPE_STRING); + PromiseBanner(pp); + + if (strcmp(a.service.service_type, "windows") == 0) +@@ -229,21 +229,21 @@ static void DoVerifyServices(EvalContext *ctx, Attributes a, Promise *pp) + switch (a.service.service_policy) + { + case SERVICE_POLICY_START: +- ScopeNewSpecial(ctx, "this", "service_policy", "start", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "start", CF_DATA_TYPE_STRING); + break; + + case SERVICE_POLICY_RESTART: +- ScopeNewSpecial(ctx, "this", "service_policy", "restart", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "restart", CF_DATA_TYPE_STRING); + break; + + case SERVICE_POLICY_RELOAD: +- ScopeNewSpecial(ctx, "this", "service_policy", "reload", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "reload", CF_DATA_TYPE_STRING); + break; + + case SERVICE_POLICY_STOP: + case SERVICE_POLICY_DISABLE: + default: +- ScopeNewSpecial(ctx, "this", "service_policy", "stop", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "service_policy", "stop", CF_DATA_TYPE_STRING); + break; + } + +diff --git a/cf-execd/cf-execd.c b/cf-execd/cf-execd.c +index 3cc5d43..4776904 100644 +--- a/cf-execd/cf-execd.c ++++ b/cf-execd/cf-execd.c +@@ -534,7 +534,7 @@ static bool ScheduleRun(EvalContext *ctx, Policy **policy, GenericAgentConfig *c + free(existing_policy_server); + } + +- ScopeNewSpecial(ctx, "sys", "policy_hub", POLICY_SERVER, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "policy_hub", POLICY_SERVER, CF_DATA_TYPE_STRING); + + GetNameInfo3(ctx, AGENT_TYPE_EXECUTOR); + GetInterfacesInfo(ctx, AGENT_TYPE_EXECUTOR); +diff --git a/cf-gendoc/export_xml.c b/cf-gendoc/export_xml.c +index e8699ff..3e5c195 100644 +--- a/cf-gendoc/export_xml.c ++++ b/cf-gendoc/export_xml.c +@@ -355,10 +355,10 @@ void XmlExportConstraint(Writer *writer, const ConstraintSyntax *bs) + + switch (bs->dtype) + { +- case DATA_TYPE_BODY: +- case DATA_TYPE_BUNDLE: +- case DATA_TYPE_NONE: +- case DATA_TYPE_COUNTER: ++ case CF_DATA_TYPE_BODY: ++ case CF_DATA_TYPE_BUNDLE: ++ case CF_DATA_TYPE_NONE: ++ case CF_DATA_TYPE_COUNTER: + /* NO ADDITIONAL INFO */ + break; + +@@ -394,17 +394,17 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn + + switch (constraint_syntax->dtype) + { +- case DATA_TYPE_BODY: ++ case CF_DATA_TYPE_BODY: + /* EXPORT CONSTRAINTS */ + XmlExportConstraints(writer, constraint_syntax->range.body_type_syntax->constraints); + break; + +- case DATA_TYPE_INT: +- case DATA_TYPE_REAL: +- case DATA_TYPE_INT_LIST: +- case DATA_TYPE_REAL_LIST: +- case DATA_TYPE_INT_RANGE: +- case DATA_TYPE_REAL_RANGE: ++ case CF_DATA_TYPE_INT: ++ case CF_DATA_TYPE_REAL: ++ case CF_DATA_TYPE_INT_LIST: ++ case CF_DATA_TYPE_REAL_LIST: ++ case CF_DATA_TYPE_INT_RANGE: ++ case CF_DATA_TYPE_REAL_RANGE: + if (constraint_syntax->range.validation_string != NULL) + { + /* START XML ELEMENT -- RANGE */ +@@ -433,8 +433,8 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn + break; + } + +- case DATA_TYPE_OPTION: +- case DATA_TYPE_OPTION_LIST: ++ case CF_DATA_TYPE_OPTION: ++ case CF_DATA_TYPE_OPTION_LIST: + if (constraint_syntax->range.validation_string != NULL) + { + /* START XML ELEMENT -- OPTIONS */ +@@ -454,10 +454,10 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn + break; + } + +- case DATA_TYPE_STRING: +- case DATA_TYPE_STRING_LIST: +- case DATA_TYPE_CONTEXT: +- case DATA_TYPE_CONTEXT_LIST: ++ case CF_DATA_TYPE_STRING: ++ case CF_DATA_TYPE_STRING_LIST: ++ case CF_DATA_TYPE_CONTEXT: ++ case CF_DATA_TYPE_CONTEXT_LIST: + /* XML ELEMENT -- ACCEPTED-VALUES */ + if (strlen(constraint_syntax->range.validation_string) == 0) + { +@@ -470,9 +470,9 @@ static void XmlExportType(Writer *writer, const ConstraintSyntax *constraint_syn + + break; + +- case DATA_TYPE_BUNDLE: +- case DATA_TYPE_NONE: +- case DATA_TYPE_COUNTER: ++ case CF_DATA_TYPE_BUNDLE: ++ case CF_DATA_TYPE_NONE: ++ case CF_DATA_TYPE_COUNTER: + /* NONE */ + break; + } +diff --git a/cf-gendoc/manual.c b/cf-gendoc/manual.c +index f1096ee..c1ad823 100644 +--- a/cf-gendoc/manual.c ++++ b/cf-gendoc/manual.c +@@ -249,7 +249,7 @@ void TexinfoManual(EvalContext *ctx, const char *source_dir, const char *output_ + + // scopes const and sys + +- ScopeNewSpecial(ctx, "edit", "filename", "x", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "edit", "filename", "x", CF_DATA_TYPE_STRING); + + ScopePutMatch(0, "x"); + +@@ -481,7 +481,7 @@ static void TexinfoBodyParts(const char *source_dir, FILE *fout, const Constrain + fprintf(fout, "\n\n at node %s in %s\n at subsection @code{%s}\n\n at b{Type}: %s (Separate Bundle) \n", bs[i].lval, + context, bs[i].lval, DataTypeToString(bs[i].dtype)); + } +- else if (bs[i].dtype == DATA_TYPE_BODY) ++ else if (bs[i].dtype == CF_DATA_TYPE_BODY) + { + fprintf(fout, "\n\n at node %s in %s\n at subsection @code{%s} (body template)\n at noindent @b{Type}: %s\n\n", + bs[i].lval, context, bs[i].lval, DataTypeToString(bs[i].dtype)); +@@ -613,7 +613,7 @@ static void TexinfoShowRange(FILE *fout, const char *s, DataType type) + return; + } + +- if ((type == DATA_TYPE_OPTION) || (type == DATA_TYPE_OPTION_LIST)) ++ if ((type == CF_DATA_TYPE_OPTION) || (type == CF_DATA_TYPE_OPTION_LIST)) + { + list = RlistFromSplitString(s, ','); + fprintf(fout, "@noindent @b{Allowed input range}: @*\n at example"); +@@ -656,7 +656,7 @@ static void TexinfoSubBodyParts(const char *source_dir, FILE *fout, const Constr + fprintf(fout, "@item @code{%s}\n at b{Type}: %s\n (Separate Bundle) \n\n", bs[i].lval, + DataTypeToString(bs[i].dtype)); + } +- else if (bs[i].dtype == DATA_TYPE_BODY) ++ else if (bs[i].dtype == CF_DATA_TYPE_BODY) + { + fprintf(fout, "@item @code{%s}\n at b{Type}: %s\n\n", bs[i].lval, DataTypeToString(bs[i].dtype)); + TexinfoSubBodyParts(source_dir, fout, bs[i].range.body_type_syntax->constraints); +diff --git a/cf-monitord/verify_measurements.c b/cf-monitord/verify_measurements.c +index 1c35a16..2a659e4 100644 +--- a/cf-monitord/verify_measurements.c ++++ b/cf-monitord/verify_measurements.c +@@ -85,7 +85,7 @@ static bool CheckMeasureSanity(Measurement m, Promise *pp) + retval = false; + } + +- if (m.data_type == DATA_TYPE_NONE) ++ if (m.data_type == CF_DATA_TYPE_NONE) + { + Log(LOG_LEVEL_ERR, "The promiser '%s' did not specify a data type", pp->promiser); + PromiseRef(LOG_LEVEL_ERR, pp); +@@ -97,10 +97,10 @@ static bool CheckMeasureSanity(Measurement m, Promise *pp) + { + switch (m.data_type) + { +- case DATA_TYPE_COUNTER: +- case DATA_TYPE_STRING: +- case DATA_TYPE_INT: +- case DATA_TYPE_REAL: ++ case CF_DATA_TYPE_COUNTER: ++ case CF_DATA_TYPE_STRING: ++ case CF_DATA_TYPE_INT: ++ case CF_DATA_TYPE_REAL: + break; + + default: +diff --git a/libpromises/attributes.c b/libpromises/attributes.c +index 3b8e1f4..9213c61 100644 +--- a/libpromises/attributes.c ++++ b/libpromises/attributes.c +@@ -1606,9 +1606,9 @@ Measurement GetMeasurementConstraint(const EvalContext *ctx, const Promise *pp) + value = ConstraintGetRvalValue(ctx, "data_type", pp, RVAL_TYPE_SCALAR); + m.data_type = DataTypeFromString(value); + +- if (m.data_type == DATA_TYPE_NONE) ++ if (m.data_type == CF_DATA_TYPE_NONE) + { +- m.data_type = DATA_TYPE_STRING; ++ m.data_type = CF_DATA_TYPE_STRING; + } + + m.history_type = ConstraintGetRvalValue(ctx, "history_type", pp, RVAL_TYPE_SCALAR); +diff --git a/libpromises/bootstrap.c b/libpromises/bootstrap.c +index b06ee35..30f4253 100644 +--- a/libpromises/bootstrap.c ++++ b/libpromises/bootstrap.c +@@ -113,12 +113,12 @@ void SetPolicyServer(EvalContext *ctx, const char *new_policy_server) + if (new_policy_server) + { + snprintf(POLICY_SERVER, CF_MAX_IP_LEN, "%s", new_policy_server); +- ScopeNewSpecial(ctx, "sys", "policy_hub", new_policy_server, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "policy_hub", new_policy_server, CF_DATA_TYPE_STRING); + } + else + { + POLICY_SERVER[0] = '\0'; +- ScopeNewSpecial(ctx, "sys", "policy_hub", "undefined", DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "policy_hub", "undefined", CF_DATA_TYPE_STRING); + } + + // Get the timestamp on policy update +@@ -137,7 +137,7 @@ void SetPolicyServer(EvalContext *ctx, const char *new_policy_server) + char timebuf[26]; + cf_strtimestamp_local(sb.st_mtime, timebuf); + +- ScopeNewSpecial(ctx, "sys", "last_policy_update", timebuf, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "sys", "last_policy_update", timebuf, CF_DATA_TYPE_STRING); + } + + static char *PolicyServerFilename(const char *workdir) +diff --git a/libpromises/cf3.defs.h b/libpromises/cf3.defs.h +index c04c2a1..45faeee 100644 +--- a/libpromises/cf3.defs.h ++++ b/libpromises/cf3.defs.h +@@ -428,22 +428,22 @@ typedef struct FnCall_ FnCall; + + typedef enum + { +- DATA_TYPE_STRING, +- DATA_TYPE_INT, +- DATA_TYPE_REAL, +- DATA_TYPE_STRING_LIST, +- DATA_TYPE_INT_LIST, +- DATA_TYPE_REAL_LIST, +- DATA_TYPE_OPTION, +- DATA_TYPE_OPTION_LIST, +- DATA_TYPE_BODY, +- DATA_TYPE_BUNDLE, +- DATA_TYPE_CONTEXT, +- DATA_TYPE_CONTEXT_LIST, +- DATA_TYPE_INT_RANGE, +- DATA_TYPE_REAL_RANGE, +- DATA_TYPE_COUNTER, +- DATA_TYPE_NONE ++ CF_DATA_TYPE_STRING, ++ CF_DATA_TYPE_INT, ++ CF_DATA_TYPE_REAL, ++ CF_DATA_TYPE_STRING_LIST, ++ CF_DATA_TYPE_INT_LIST, ++ CF_DATA_TYPE_REAL_LIST, ++ CF_DATA_TYPE_OPTION, ++ CF_DATA_TYPE_OPTION_LIST, ++ CF_DATA_TYPE_BODY, ++ CF_DATA_TYPE_BUNDLE, ++ CF_DATA_TYPE_CONTEXT, ++ CF_DATA_TYPE_CONTEXT_LIST, ++ CF_DATA_TYPE_INT_RANGE, ++ CF_DATA_TYPE_REAL_RANGE, ++ CF_DATA_TYPE_COUNTER, ++ CF_DATA_TYPE_NONE + } DataType; + + /*************************************************************************/ +diff --git a/libpromises/cf3parse.c b/libpromises/cf3parse.c +index f382919..a516083 100644 +--- a/libpromises/cf3parse.c ++++ b/libpromises/cf3parse.c +@@ -3120,7 +3120,7 @@ static bool LvalWantsBody(char *stype, char *lval) + { + if (strcmp(bs[l].lval, lval) == 0) + { +- if (bs[l].dtype == DATA_TYPE_BODY) ++ if (bs[l].dtype == CF_DATA_TYPE_BODY) + { + return true; + } +@@ -3151,11 +3151,11 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const + { + if (strcmp(lval, bs[l].lval) == 0) + { +- if (bs[l].dtype == DATA_TYPE_BODY) ++ if (bs[l].dtype == CF_DATA_TYPE_BODY) + { + return SYNTAX_TYPE_MATCH_OK; + } +- else if (bs[l].dtype == DATA_TYPE_BUNDLE) ++ else if (bs[l].dtype == CF_DATA_TYPE_BUNDLE) + { + return SYNTAX_TYPE_MATCH_OK; + } +@@ -3190,7 +3190,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const + + for (int l = 0; bs[l].lval != NULL; l++) + { +- if (bs[l].dtype == DATA_TYPE_BODY) ++ if (bs[l].dtype == CF_DATA_TYPE_BODY) + { + const ConstraintSyntax *bs2 = bs[l].range.body_type_syntax->constraints; + +@@ -3199,7 +3199,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const + continue; + } + +- for (int k = 0; bs2[k].dtype != DATA_TYPE_NONE; k++) ++ for (int k = 0; bs2[k].dtype != CF_DATA_TYPE_NONE; k++) + { + /* Either module defined or common */ + +@@ -3249,8 +3249,8 @@ static SyntaxTypeMatch CheckConstraint(const char *type, const char *lval, Rval + + /* For bodies and bundles definitions can be elsewhere, so + they are checked in PolicyCheckRunnable(). */ +- if (bs[l].dtype != DATA_TYPE_BODY && +- bs[l].dtype != DATA_TYPE_BUNDLE) ++ if (bs[l].dtype != CF_DATA_TYPE_BODY && ++ bs[l].dtype != CF_DATA_TYPE_BUNDLE) + { + return CheckConstraintTypeMatch(lval, rval, bs[l].dtype, bs[l].range.validation_string, 0); + } +diff --git a/libpromises/cf3parse.y b/libpromises/cf3parse.y +index 24c4f55..98aa36c 100644 +--- a/libpromises/cf3parse.y ++++ b/libpromises/cf3parse.y +@@ -1279,7 +1279,7 @@ static bool LvalWantsBody(char *stype, char *lval) + { + if (strcmp(bs[l].lval, lval) == 0) + { +- if (bs[l].dtype == DATA_TYPE_BODY) ++ if (bs[l].dtype == CF_DATA_TYPE_BODY) + { + return true; + } +@@ -1310,11 +1310,11 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const + { + if (strcmp(lval, bs[l].lval) == 0) + { +- if (bs[l].dtype == DATA_TYPE_BODY) ++ if (bs[l].dtype == CF_DATA_TYPE_BODY) + { + return SYNTAX_TYPE_MATCH_OK; + } +- else if (bs[l].dtype == DATA_TYPE_BUNDLE) ++ else if (bs[l].dtype == CF_DATA_TYPE_BUNDLE) + { + return SYNTAX_TYPE_MATCH_OK; + } +@@ -1349,7 +1349,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const + + for (int l = 0; bs[l].lval != NULL; l++) + { +- if (bs[l].dtype == DATA_TYPE_BODY) ++ if (bs[l].dtype == CF_DATA_TYPE_BODY) + { + const ConstraintSyntax *bs2 = bs[l].range.body_type_syntax->constraints; + +@@ -1358,7 +1358,7 @@ static SyntaxTypeMatch CheckSelection(const char *type, const char *name, const + continue; + } + +- for (int k = 0; bs2[k].dtype != DATA_TYPE_NONE; k++) ++ for (int k = 0; bs2[k].dtype != CF_DATA_TYPE_NONE; k++) + { + /* Either module defined or common */ + +@@ -1408,8 +1408,8 @@ static SyntaxTypeMatch CheckConstraint(const char *type, const char *lval, Rval + + /* For bodies and bundles definitions can be elsewhere, so + they are checked in PolicyCheckRunnable(). */ +- if (bs[l].dtype != DATA_TYPE_BODY && +- bs[l].dtype != DATA_TYPE_BUNDLE) ++ if (bs[l].dtype != CF_DATA_TYPE_BODY && ++ bs[l].dtype != CF_DATA_TYPE_BUNDLE) + { + return CheckConstraintTypeMatch(lval, rval, bs[l].dtype, bs[l].range.validation_string, 0); + } +diff --git a/libpromises/conversion.c b/libpromises/conversion.c +index 04c22b7..764556e 100644 +--- a/libpromises/conversion.c ++++ b/libpromises/conversion.c +@@ -274,27 +274,27 @@ FileComparator FileComparatorFromString(const char *s) + + static const char *datatype_strings[] = + { +- [DATA_TYPE_STRING] = "string", +- [DATA_TYPE_INT] = "int", +- [DATA_TYPE_REAL] = "real", +- [DATA_TYPE_STRING_LIST] = "slist", +- [DATA_TYPE_INT_LIST] = "ilist", +- [DATA_TYPE_REAL_LIST] = "rlist", +- [DATA_TYPE_OPTION] = "option", +- [DATA_TYPE_OPTION_LIST] = "olist", +- [DATA_TYPE_BODY] = "body", +- [DATA_TYPE_BUNDLE] = "bundle", +- [DATA_TYPE_CONTEXT] = "context", +- [DATA_TYPE_CONTEXT_LIST] = "clist", +- [DATA_TYPE_INT_RANGE] = "irange", +- [DATA_TYPE_REAL_RANGE] = "rrange", +- [DATA_TYPE_COUNTER] = "counter", +- [DATA_TYPE_NONE] = "none" ++ [CF_DATA_TYPE_STRING] = "string", ++ [CF_DATA_TYPE_INT] = "int", ++ [CF_DATA_TYPE_REAL] = "real", ++ [CF_DATA_TYPE_STRING_LIST] = "slist", ++ [CF_DATA_TYPE_INT_LIST] = "ilist", ++ [CF_DATA_TYPE_REAL_LIST] = "rlist", ++ [CF_DATA_TYPE_OPTION] = "option", ++ [CF_DATA_TYPE_OPTION_LIST] = "olist", ++ [CF_DATA_TYPE_BODY] = "body", ++ [CF_DATA_TYPE_BUNDLE] = "bundle", ++ [CF_DATA_TYPE_CONTEXT] = "context", ++ [CF_DATA_TYPE_CONTEXT_LIST] = "clist", ++ [CF_DATA_TYPE_INT_RANGE] = "irange", ++ [CF_DATA_TYPE_REAL_RANGE] = "rrange", ++ [CF_DATA_TYPE_COUNTER] = "counter", ++ [CF_DATA_TYPE_NONE] = "none" + }; + + DataType DataTypeFromString(const char *name) + { +- for (int i = 0; i < DATA_TYPE_NONE; i++) ++ for (int i = 0; i < CF_DATA_TYPE_NONE; i++) + { + if (strcmp(datatype_strings[i], name) == 0) + { +@@ -302,12 +302,12 @@ DataType DataTypeFromString(const char *name) + } + } + +- return DATA_TYPE_NONE; ++ return CF_DATA_TYPE_NONE; + } + + const char *DataTypeToString(DataType type) + { +- assert(type < DATA_TYPE_NONE); ++ assert(type < CF_DATA_TYPE_NONE); + return datatype_strings[type]; + } + +@@ -323,7 +323,7 @@ DataType ConstraintSyntaxGetDataType(const ConstraintSyntax *body_syntax, const + } + } + +- return DATA_TYPE_NONE; ++ return CF_DATA_TYPE_NONE; + } + + /****************************************************************************/ +diff --git a/libpromises/env_context.c b/libpromises/env_context.c +index db85f53..4203cee 100644 +--- a/libpromises/env_context.c ++++ b/libpromises/env_context.c +@@ -1194,7 +1194,7 @@ char *EvalContextStackPath(const EvalContext *ctx) + + bool EvalContextVariablePut(EvalContext *ctx, VarRef lval, Rval rval, DataType type) + { +- assert(type != DATA_TYPE_NONE); ++ assert(type != CF_DATA_TYPE_NONE); + + if (lval.lval == NULL || lval.scope == NULL) + { +@@ -1320,7 +1320,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, + } + if (type_out) + { +- *type_out = DATA_TYPE_NONE; ++ *type_out = CF_DATA_TYPE_NONE; + } + return false; + } +@@ -1345,7 +1345,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, + } + if (type_out) + { +- *type_out = DATA_TYPE_NONE; ++ *type_out = CF_DATA_TYPE_NONE; + } + return false; + } +@@ -1386,7 +1386,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, + } + if (type_out) + { +- *type_out = DATA_TYPE_NONE; ++ *type_out = CF_DATA_TYPE_NONE; + } + return false; + } +@@ -1400,7 +1400,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, + } + if (type_out) + { +- *type_out = DATA_TYPE_NONE; ++ *type_out = CF_DATA_TYPE_NONE; + } + return false; + } +@@ -1412,7 +1412,7 @@ bool EvalContextVariableGet(const EvalContext *ctx, VarRef lval, Rval *rval_out, + if (type_out) + { + *type_out = assoc->dtype; +- assert(*type_out != DATA_TYPE_NONE); ++ assert(*type_out != CF_DATA_TYPE_NONE); + } + + return true; +diff --git a/libpromises/evalfunction.c b/libpromises/evalfunction.c +index a1773dc..1d314cb 100644 +--- a/libpromises/evalfunction.c ++++ b/libpromises/evalfunction.c +@@ -227,7 +227,7 @@ static FnCallResult FnCallAnd(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -634,7 +634,7 @@ static FnCallResult FnCallConcat(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -683,7 +683,7 @@ static FnCallResult FnCallIfElse(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -1610,7 +1610,7 @@ static FnCallResult FnCallGetFields(EvalContext *ctx, FnCall *fp, Rlist *finalar + for (rp = newlist; rp != NULL; rp = rp->next) + { + snprintf(name, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, vcount); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, name }, (Rval) { RlistScalarValue(rp), RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, name }, (Rval) { RlistScalarValue(rp), RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + Log(LOG_LEVEL_VERBOSE, "getfields: defining '%s' => '%s'", name, RlistScalarValue(rp)); + vcount++; + } +@@ -1794,12 +1794,12 @@ static FnCallResult FnCallMapArray(EvalContext *ctx, FnCall *fp, Rlist *finalarg + + if (strlen(index) > 0) + { +- ScopeNewSpecial(ctx, "this", "k", index, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "k", index, CF_DATA_TYPE_STRING); + + switch (assoc->rval.type) + { + case RVAL_TYPE_SCALAR: +- ScopeNewSpecial(ctx, "this", "v", assoc->rval.item, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "v", assoc->rval.item, CF_DATA_TYPE_STRING); + ExpandScalar(ctx, PromiseGetBundle(fp->caller)->name, map, expbuf); + + if (strstr(expbuf, "$(this.k)") || strstr(expbuf, "${this.k}") || +@@ -1818,7 +1818,7 @@ static FnCallResult FnCallMapArray(EvalContext *ctx, FnCall *fp, Rlist *finalarg + case RVAL_TYPE_LIST: + for (rp = assoc->rval.item; rp != NULL; rp = rp->next) + { +- ScopeNewSpecial(ctx, "this", "v", rp->item, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "v", rp->item, CF_DATA_TYPE_STRING); + ExpandScalar(ctx, PromiseGetBundle(fp->caller)->name, map, expbuf); + + if (strstr(expbuf, "$(this.k)") || strstr(expbuf, "${this.k}") || +@@ -1896,13 +1896,13 @@ static FnCallResult FnCallMapList(EvalContext *ctx, FnCall *fp, Rlist *finalargs + return (FnCallResult) { FNCALL_FAILURE }; + } + +- retype = DATA_TYPE_NONE; ++ retype = CF_DATA_TYPE_NONE; + if (!EvalContextVariableGet(ctx, (VarRef) { NULL, scopeid, lval }, &rval, &retype)) + { + return (FnCallResult) { FNCALL_FAILURE }; + } + +- if (retype != DATA_TYPE_STRING_LIST && retype != DATA_TYPE_INT_LIST && retype != DATA_TYPE_REAL_LIST) ++ if (retype != CF_DATA_TYPE_STRING_LIST && retype != CF_DATA_TYPE_INT_LIST && retype != CF_DATA_TYPE_REAL_LIST) + { + return (FnCallResult) { FNCALL_FAILURE }; + } +@@ -1910,7 +1910,7 @@ static FnCallResult FnCallMapList(EvalContext *ctx, FnCall *fp, Rlist *finalargs + for (const Rlist *rp = RvalRlistValue(rval); rp != NULL; rp = rp->next) + { + const char *current_value = RlistScalarValue(rp); +- ScopeNewSpecial(ctx, "this", "this", current_value, DATA_TYPE_STRING); ++ ScopeNewSpecial(ctx, "this", "this", current_value, CF_DATA_TYPE_STRING); + + ExpandScalar(ctx, "this", map, expbuf); + +@@ -2050,7 +2050,7 @@ static FnCallResult FnCallSelectServers(EvalContext *ctx, FnCall *fp, Rlist *fin + { + Log(LOG_LEVEL_VERBOSE, "Host '%s' is alive and responding correctly", RlistScalarValue(rp)); + snprintf(buffer, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, count); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + count++; + } + } +@@ -2058,7 +2058,7 @@ static FnCallResult FnCallSelectServers(EvalContext *ctx, FnCall *fp, Rlist *fin + { + Log(LOG_LEVEL_VERBOSE, "Host '%s' is alive", RlistScalarValue(rp)); + snprintf(buffer, CF_MAXVARSIZE - 1, "%s[%d]", array_lval, count); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, buffer }, (Rval) { rp->item, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + + if (IsDefinedClass(ctx, CanonifyName(rp->item), PromiseGetNamespace(fp->caller))) + { +@@ -2091,14 +2091,14 @@ static FnCallResult FnCallShuffle(EvalContext *ctx, FnCall *fp, Rlist *finalargs + const char *seed_str = RlistScalarValue(finalargs->next); + + Rval list_rval; +- DataType list_dtype = DATA_TYPE_NONE; ++ DataType list_dtype = CF_DATA_TYPE_NONE; + + if (!GetListReferenceArgument(ctx, fp, RlistScalarValue(finalargs), &list_rval, &list_dtype)) + { + return (FnCallResult) { FNCALL_FAILURE }; + } + +- if (list_dtype != DATA_TYPE_STRING_LIST) ++ if (list_dtype != CF_DATA_TYPE_STRING_LIST) + { + Log(LOG_LEVEL_ERR, "Function '%s' expected a variable that resolves to a string list, got '%s'", fp->name, DataTypeToString(list_dtype)); + return (FnCallResult) { FNCALL_FAILURE }; +@@ -2716,7 +2716,7 @@ static FnCallResult FnCallSort(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + { + VarRef list_var_lval = VarRefParseFromBundle(RlistScalarValue(finalargs), PromiseGetBundle(fp->caller)); + Rval list_var_rval; +- DataType list_var_dtype = DATA_TYPE_NONE; ++ DataType list_var_dtype = CF_DATA_TYPE_NONE; + + if (!EvalContextVariableGet(ctx, list_var_lval, &list_var_rval, &list_var_dtype)) + { +@@ -2726,7 +2726,7 @@ static FnCallResult FnCallSort(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + + VarRefDestroy(list_var_lval); + +- if (list_var_dtype != DATA_TYPE_STRING_LIST) ++ if (list_var_dtype != CF_DATA_TYPE_STRING_LIST) + { + return (FnCallResult) { FNCALL_FAILURE }; + } +@@ -2747,7 +2747,7 @@ static FnCallResult FnCallFormat(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (const Rlist *arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -3550,7 +3550,7 @@ static FnCallResult FnCallRegExtract(EvalContext *ctx, FnCall *fp, Rlist *finala + else + { + snprintf(var, CF_MAXVARSIZE - 1, "%s[%s]", arrayname, assoc->lval); +- EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, var }, assoc->rval, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, PromiseGetBundle(fp->caller)->name, var }, assoc->rval, CF_DATA_TYPE_STRING); + } + } + } +@@ -3760,14 +3760,14 @@ static FnCallResult FnCallRRange(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + static FnCallResult FnCallReverse(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + { + Rval list_rval; +- DataType list_dtype = DATA_TYPE_NONE; ++ DataType list_dtype = CF_DATA_TYPE_NONE; + + if (!GetListReferenceArgument(ctx, fp, RlistScalarValue(finalargs), &list_rval, &list_dtype)) + { + return (FnCallResult) { FNCALL_FAILURE }; + } + +- if (list_dtype != DATA_TYPE_STRING_LIST) ++ if (list_dtype != CF_DATA_TYPE_STRING_LIST) + { + Log(LOG_LEVEL_ERR, "Function '%s' expected a variable that resolves to a string list, got '%s'", fp->name, DataTypeToString(list_dtype)); + return (FnCallResult) { FNCALL_FAILURE }; +@@ -3837,7 +3837,7 @@ static FnCallResult FnCallOr(EvalContext *ctx, FnCall *fp, Rlist *finalargs) + /* We need to check all the arguments, ArgTemplate does not check varadic functions */ + for (arg = finalargs; arg; arg = arg->next) + { +- SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, DATA_TYPE_STRING, "", 1); ++ SyntaxTypeMatch err = CheckConstraintTypeMatch(id, (Rval) {arg->item, arg->type}, CF_DATA_TYPE_STRING, "", 1); + if (err != SYNTAX_TYPE_MATCH_OK && err != SYNTAX_TYPE_MATCH_ERROR_UNEXPANDED) + { + FatalError(ctx, "in %s: %s", id, SyntaxTypeMatchToString(err)); +@@ -4117,10 +4117,10 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat + + switch (type) + { +- case DATA_TYPE_STRING: ++ case CF_DATA_TYPE_STRING: + break; + +- case DATA_TYPE_INT: ++ case CF_DATA_TYPE_INT: + for (rp = newlist; rp != NULL; rp = rp->next) + { + if (IntFromString(RlistScalarValue(rp)) == CF_NOINT) +@@ -4132,7 +4132,7 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat + } + break; + +- case DATA_TYPE_REAL: ++ case CF_DATA_TYPE_REAL: + for (rp = newlist; rp != NULL; rp = rp->next) + { + double real_value = 0; +@@ -4164,17 +4164,17 @@ static FnCallResult ReadList(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Dat + + static FnCallResult FnCallReadStringList(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadList(ctx, fp, args, DATA_TYPE_STRING); ++ return ReadList(ctx, fp, args, CF_DATA_TYPE_STRING); + } + + static FnCallResult FnCallReadIntList(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadList(ctx, fp, args, DATA_TYPE_INT); ++ return ReadList(ctx, fp, args, CF_DATA_TYPE_INT); + } + + static FnCallResult FnCallReadRealList(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadList(ctx, fp, args, DATA_TYPE_REAL); ++ return ReadList(ctx, fp, args, CF_DATA_TYPE_REAL); + } + + /*********************************************************************/ +@@ -4229,9 +4229,9 @@ static FnCallResult ReadArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Da + + switch (type) + { +- case DATA_TYPE_STRING: +- case DATA_TYPE_INT: +- case DATA_TYPE_REAL: ++ case CF_DATA_TYPE_STRING: ++ case CF_DATA_TYPE_INT: ++ case CF_DATA_TYPE_REAL: + break; + + default: +@@ -4250,28 +4250,28 @@ static FnCallResult ReadArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, Da + + static FnCallResult FnCallReadStringArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadArray(ctx, fp, args, DATA_TYPE_STRING, false); ++ return ReadArray(ctx, fp, args, CF_DATA_TYPE_STRING, false); + } + + /*********************************************************************/ + + static FnCallResult FnCallReadStringArrayIndex(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadArray(ctx, fp, args, DATA_TYPE_STRING, true); ++ return ReadArray(ctx, fp, args, CF_DATA_TYPE_STRING, true); + } + + /*********************************************************************/ + + static FnCallResult FnCallReadIntArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadArray(ctx, fp, args, DATA_TYPE_INT, false); ++ return ReadArray(ctx, fp, args, CF_DATA_TYPE_INT, false); + } + + /*********************************************************************/ + + static FnCallResult FnCallReadRealArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ReadArray(ctx, fp, args, DATA_TYPE_REAL, false); ++ return ReadArray(ctx, fp, args, CF_DATA_TYPE_REAL, false); + } + + /*********************************************************************/ +@@ -4328,9 +4328,9 @@ static FnCallResult ParseArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, D + + switch (type) + { +- case DATA_TYPE_STRING: +- case DATA_TYPE_INT: +- case DATA_TYPE_REAL: ++ case CF_DATA_TYPE_STRING: ++ case CF_DATA_TYPE_INT: ++ case CF_DATA_TYPE_REAL: + break; + + default: +@@ -4349,28 +4349,28 @@ static FnCallResult ParseArray(EvalContext *ctx, FnCall *fp, Rlist *finalargs, D + + static FnCallResult FnCallParseStringArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ParseArray(ctx, fp, args, DATA_TYPE_STRING, false); ++ return ParseArray(ctx, fp, args, CF_DATA_TYPE_STRING, false); + } + + /*********************************************************************/ + + static FnCallResult FnCallParseStringArrayIndex(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ParseArray(ctx, fp, args, DATA_TYPE_STRING, true); ++ return ParseArray(ctx, fp, args, CF_DATA_TYPE_STRING, true); + } + + /*********************************************************************/ + + static FnCallResult FnCallParseIntArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ParseArray(ctx, fp, args, DATA_TYPE_INT, false); ++ return ParseArray(ctx, fp, args, CF_DATA_TYPE_INT, false); + } + + /*********************************************************************/ + + static FnCallResult FnCallParseRealArray(EvalContext *ctx, FnCall *fp, Rlist *args) + { +- return ParseArray(ctx, fp, args, DATA_TYPE_REAL, false); ++ return ParseArray(ctx, fp, args, CF_DATA_TYPE_REAL, false); + } + + /*********************************************************************/ +@@ -4855,16 +4855,16 @@ static int BuildLineArray(EvalContext *ctx, const Bundle *bundle, char *array_lv + + switch (type) + { +- case DATA_TYPE_STRING: ++ case CF_DATA_TYPE_STRING: + strncpy(this_rval, rp->item, CF_MAXVARSIZE - 1); + break; + +- case DATA_TYPE_INT: ++ case CF_DATA_TYPE_INT: + ival = IntFromString(rp->item); + snprintf(this_rval, CF_MAXVARSIZE, "%d", (int) ival); + break; + +- case DATA_TYPE_REAL: ++ case CF_DATA_TYPE_REAL: + { + double real_value = 0; + if (!DoubleFromString(rp->item, &real_value)) +@@ -5029,7 +5029,7 @@ void ModuleProtocol(EvalContext *ctx, char *command, char *line, int print, cons + if (CheckID(name)) + { + Log(LOG_LEVEL_VERBOSE, "Defined variable '%s' in context '%s' with value '%s'", name, context, content); +- EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { content, RVAL_TYPE_SCALAR }, DATA_TYPE_STRING); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { content, RVAL_TYPE_SCALAR }, CF_DATA_TYPE_STRING); + } + break; + +@@ -5044,7 +5044,7 @@ void ModuleProtocol(EvalContext *ctx, char *command, char *line, int print, cons + list = RlistParseString(content); + Log(LOG_LEVEL_VERBOSE, "Defined variable '%s' in context '%s' with value '%s'", name, context, content); + +- EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { list, RVAL_TYPE_LIST }, DATA_TYPE_STRING_LIST); ++ EvalContextVariablePut(ctx, (VarRef) { NULL, context, name }, (Rval) { list, RVAL_TYPE_LIST }, CF_DATA_TYPE_STRING_LIST); + } + break; + +@@ -5096,728 +5096,728 @@ FnCallResult CallFunction(EvalContext *ctx, const FnCallType *function, FnCall * + + FnCallArg ACCESSEDBEFORE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer filename"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older filename"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Newer filename"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Older filename"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg ACCUM_ARGS[] = + { +- {"0,1000", DATA_TYPE_INT, "Years"}, +- {"0,1000", DATA_TYPE_INT, "Months"}, +- {"0,1000", DATA_TYPE_INT, "Days"}, +- {"0,1000", DATA_TYPE_INT, "Hours"}, +- {"0,1000", DATA_TYPE_INT, "Minutes"}, +- {"0,40000", DATA_TYPE_INT, "Seconds"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {"0,1000", CF_DATA_TYPE_INT, "Years"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Months"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Days"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Hours"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Minutes"}, ++ {"0,40000", CF_DATA_TYPE_INT, "Seconds"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg AND_ARGS[] = + { +- {NULL, DATA_TYPE_NONE, NULL} ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg AGO_ARGS[] = + { +- {"0,1000", DATA_TYPE_INT, "Years"}, +- {"0,1000", DATA_TYPE_INT, "Months"}, +- {"0,1000", DATA_TYPE_INT, "Days"}, +- {"0,1000", DATA_TYPE_INT, "Hours"}, +- {"0,1000", DATA_TYPE_INT, "Minutes"}, +- {"0,40000", DATA_TYPE_INT, "Seconds"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {"0,1000", CF_DATA_TYPE_INT, "Years"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Months"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Days"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Hours"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Minutes"}, ++ {"0,40000", CF_DATA_TYPE_INT, "Seconds"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LATERTHAN_ARGS[] = + { +- {"0,1000", DATA_TYPE_INT, "Years"}, +- {"0,1000", DATA_TYPE_INT, "Months"}, +- {"0,1000", DATA_TYPE_INT, "Days"}, +- {"0,1000", DATA_TYPE_INT, "Hours"}, +- {"0,1000", DATA_TYPE_INT, "Minutes"}, +- {"0,40000", DATA_TYPE_INT, "Seconds"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {"0,1000", CF_DATA_TYPE_INT, "Years"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Months"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Days"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Hours"}, ++ {"0,1000", CF_DATA_TYPE_INT, "Minutes"}, ++ {"0,40000", CF_DATA_TYPE_INT, "Seconds"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg CANONIFY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "String containing non-identifier characters"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "String containing non-identifier characters"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg CHANGEDBEFORE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer filename"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older filename"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Newer filename"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Older filename"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg CLASSIFY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input string"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg CLASSMATCH_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg CONCAT_ARGS[] = + { +- {NULL, DATA_TYPE_NONE, NULL} ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg COUNTCLASSESMATCHING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg COUNTLINESMATCHING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Filename"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg DIRNAME_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "File path"}, +- {NULL, DATA_TYPE_NONE, NULL}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "File path"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL}, + }; + + FnCallArg DISKFREE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File system directory"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File system directory"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg ESCAPE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address or string to escape"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "IP address or string to escape"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg EXECRESULT_ARGS[] = + { +- {CF_PATHRANGE, DATA_TYPE_STRING, "Fully qualified command path"}, +- {"useshell,noshell,powershell", DATA_TYPE_OPTION, "Shell encapsulation option"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_PATHRANGE, CF_DATA_TYPE_STRING, "Fully qualified command path"}, ++ {"useshell,noshell,powershell", CF_DATA_TYPE_OPTION, "Shell encapsulation option"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + // fileexists, isdir,isplain,islink + + FnCallArg FILESTAT_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File object name"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File object name"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg FILESTAT_DETAIL_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File object name"}, +- {"size,gid,uid,ino,nlink,ctime,atime,mtime,mode,modeoct,permstr,permoct,type,devno,dev_minor,dev_major,basename,dirname", DATA_TYPE_OPTION, "stat() field to get"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File object name"}, ++ {"size,gid,uid,ino,nlink,ctime,atime,mtime,mode,modeoct,permstr,permoct,type,devno,dev_minor,dev_major,basename,dirname", CF_DATA_TYPE_OPTION, "stat() field to get"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg FILESEXIST_ARGS[] = + { +- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "Array identifier containing list"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_NAKEDLRANGE, CF_DATA_TYPE_STRING, "Array identifier containing list"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg FILTER_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression or string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {CF_BOOL, DATA_TYPE_OPTION, "Match as regular expression if true, as exact string otherwise"}, +- {CF_BOOL, DATA_TYPE_OPTION, "Invert matches"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of matches to return"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression or string"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_BOOL, CF_DATA_TYPE_OPTION, "Match as regular expression if true, as exact string otherwise"}, ++ {CF_BOOL, CF_DATA_TYPE_OPTION, "Invert matches"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of matches to return"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETFIELDS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to match line"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename to read"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to split fields"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Return array name"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression to match line"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Filename to read"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression to split fields"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Return array name"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETINDICES_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine array identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine array identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETUSERS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comma separated list of User names"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comma separated list of UserID numbers"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comma separated list of User names"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comma separated list of UserID numbers"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETENV_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Name of environment variable"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of characters to read "}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Name of environment variable"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of characters to read "}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETGID_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Group name in text"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Group name in text"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GETUID_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "User name in text"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "User name in text"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GREP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg GROUPEXISTS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Group name or identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Group name or identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HASH_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input text"}, +- {"md5,sha1,sha256,sha512,sha384,crypt", DATA_TYPE_OPTION, "Hash or digest algorithm"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input text"}, ++ {"md5,sha1,sha256,sha512,sha384,crypt", CF_DATA_TYPE_OPTION, "Hash or digest algorithm"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HASHMATCH_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Filename to hash"}, +- {"md5,sha1,crypt,cf_sha224,cf_sha256,cf_sha384,cf_sha512", DATA_TYPE_OPTION, "Hash or digest algorithm"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "ASCII representation of hash for comparison"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Filename to hash"}, ++ {"md5,sha1,crypt,cf_sha224,cf_sha256,cf_sha384,cf_sha512", CF_DATA_TYPE_OPTION, "Hash or digest algorithm"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "ASCII representation of hash for comparison"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOST2IP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Host name in ascii"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Host name in ascii"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg IP2HOST_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address (IPv4 or IPv6)"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "IP address (IPv4 or IPv6)"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOSTINNETGROUP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Netgroup name"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Netgroup name"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOSTRANGE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Hostname prefix"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Enumerated range"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Hostname prefix"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Enumerated range"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOSTSSEEN_ARGS[] = + { +- {CF_VALRANGE, DATA_TYPE_INT, "Horizon since last seen in hours"}, +- {"lastseen,notseen", DATA_TYPE_OPTION, "Complements for selection policy"}, +- {"name,address", DATA_TYPE_OPTION, "Type of return value desired"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Horizon since last seen in hours"}, ++ {"lastseen,notseen", CF_DATA_TYPE_OPTION, "Complements for selection policy"}, ++ {"name,address", CF_DATA_TYPE_OPTION, "Type of return value desired"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HOSTSWITHCLASS_ARGS[] = + { +- {"[a-zA-Z0-9_]+", DATA_TYPE_STRING, "Class name to look for"}, +- {"name,address", DATA_TYPE_OPTION, "Type of return value desired"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {"[a-zA-Z0-9_]+", CF_DATA_TYPE_STRING, "Class name to look for"}, ++ {"name,address", CF_DATA_TYPE_OPTION, "Type of return value desired"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg IFELSE_ARGS[] = + { +- {NULL, DATA_TYPE_NONE, NULL} ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg IPRANGE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "IP address range syntax"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "IP address range syntax"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg IRANGE_ARGS[] = + { +- {CF_INTRANGE, DATA_TYPE_INT, "Integer"}, +- {CF_INTRANGE, DATA_TYPE_INT, "Integer"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_INTRANGE, CF_DATA_TYPE_INT, "Integer"}, ++ {CF_INTRANGE, CF_DATA_TYPE_INT, "Integer"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISGREATERTHAN_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Larger string or value"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Smaller string or value"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Larger string or value"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Smaller string or value"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISLESSTHAN_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Smaller string or value"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Larger string or value"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Smaller string or value"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Larger string or value"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISNEWERTHAN_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Newer file name"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Older file name"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Newer file name"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Older file name"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg ISVARIABLE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Variable identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg JOIN_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Join glue-string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Join glue-string"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LASTNODE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Link separator, e.g. /,:"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input string"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Link separator, e.g. /,:"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LDAPARRAY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Array name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, +- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Array name"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, ++ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, ++ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LDAPLIST_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, +- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, +- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Record name"}, ++ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, ++ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LDAPVALUE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, +- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, +- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Record name"}, ++ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, ++ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LSDIRLIST_ARGS[] = + { +- {CF_PATHRANGE, DATA_TYPE_STRING, "Path to base directory"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression to match files or blank"}, +- {CF_BOOL, DATA_TYPE_OPTION, "Include the base path in the list"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_PATHRANGE, CF_DATA_TYPE_STRING, "Path to base directory"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression to match files or blank"}, ++ {CF_BOOL, CF_DATA_TYPE_OPTION, "Include the base path in the list"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg MAPLIST_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Pattern based on $(this) as original text"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "The name of the list variable to map"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Pattern based on $(this) as original text"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "The name of the list variable to map"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg MAPARRAY_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Pattern based on $(this.k) and $(this.v) as original text"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "The name of the array variable to map"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Pattern based on $(this.k) and $(this.v) as original text"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "The name of the array variable to map"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg NOT_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Class value"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Class value"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg NOW_ARGS[] = + { +- {NULL, DATA_TYPE_NONE, NULL} ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg OR_ARGS[] = + { +- {NULL, DATA_TYPE_NONE, NULL} ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SUM_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "A list of arbitrary real values"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "A list of arbitrary real values"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg PRODUCT_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "A list of arbitrary real values"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "A list of arbitrary real values"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg DATE_ARGS[] = + { +- {"1970,3000", DATA_TYPE_INT, "Year"}, +- {"1,12", DATA_TYPE_INT, "Month"}, +- {"1,31", DATA_TYPE_INT, "Day"}, +- {"0,23", DATA_TYPE_INT, "Hour"}, +- {"0,59", DATA_TYPE_INT, "Minute"}, +- {"0,59", DATA_TYPE_INT, "Second"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {"1970,3000", CF_DATA_TYPE_INT, "Year"}, ++ {"1,12", CF_DATA_TYPE_INT, "Month"}, ++ {"1,31", CF_DATA_TYPE_INT, "Day"}, ++ {"0,23", CF_DATA_TYPE_INT, "Hour"}, ++ {"0,59", CF_DATA_TYPE_INT, "Minute"}, ++ {"0,59", CF_DATA_TYPE_INT, "Second"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg PEERS_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name of host list"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comment regex pattern"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Peer group size"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg PEERLEADER_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name of host list"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comment regex pattern"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Peer group size"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg PEERLEADERS_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name of host list"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Comment regex pattern"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Peer group size"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name of host list"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Comment regex pattern"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Peer group size"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg RANDOMINT_ARGS[] = + { +- {CF_INTRANGE, DATA_TYPE_INT, "Lower inclusive bound"}, +- {CF_INTRANGE, DATA_TYPE_INT, "Upper inclusive bound"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_INTRANGE, CF_DATA_TYPE_INT, "Lower inclusive bound"}, ++ {CF_INTRANGE, CF_DATA_TYPE_INT, "Upper inclusive bound"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg READFILE_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg READSTRINGARRAY_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name to read"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name to read"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg PARSESTRINGARRAY_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "A string to parse for input data"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg READSTRINGARRAYIDX_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "A string to parse for input data"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg PARSESTRINGARRAYIDX_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Array identifier to populate"}, +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "A string to parse for input data"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Array identifier to populate"}, ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "A string to parse for input data"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg READSTRINGLIST_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "File name to read"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex matching comments"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split data"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of entries to read"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "File name to read"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex matching comments"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split data"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of entries to read"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg READTCP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Host name or IP address of server socket"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Port number"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Protocol query string"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Host name or IP address of server socket"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Port number"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Protocol query string"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of bytes to read"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGARRAY_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine array identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine array identifier"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGCMP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Match string"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Match string"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGEXTRACT_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Match string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "Identifier for back-references"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Match string"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Identifier for back-references"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGISTRYVALUE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Windows registry key"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Windows registry value-id"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Windows registry key"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Windows registry value-id"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGLINE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filename to search"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filename to search"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGLIST_ARGS[] = + { +- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_NAKEDLRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REGLDAP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "URI"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Distinguished name"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Filter"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Record name"}, +- {"subtree,onelevel,base", DATA_TYPE_OPTION, "Search scope policy"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to match results"}, +- {"none,ssl,sasl", DATA_TYPE_OPTION, "Security level"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "URI"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Distinguished name"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Filter"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Record name"}, ++ {"subtree,onelevel,base", CF_DATA_TYPE_OPTION, "Search scope policy"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to match results"}, ++ {"none,ssl,sasl", CF_DATA_TYPE_OPTION, "Security level"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REMOTESCALAR_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Hostname or IP address of server"}, +- {CF_BOOL, DATA_TYPE_OPTION, "Use enryption"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Variable identifier"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Hostname or IP address of server"}, ++ {CF_BOOL, CF_DATA_TYPE_OPTION, "Use enryption"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg HUB_KNOWLEDGE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "Variable identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Variable identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REMOTECLASSESMATCHING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Server name or address"}, +- {CF_BOOL, DATA_TYPE_OPTION, "Use encryption"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "Return class prefix"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Server name or address"}, ++ {CF_BOOL, CF_DATA_TYPE_OPTION, "Use encryption"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Return class prefix"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg RETURNSZERO_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Fully qualified command path"}, +- {"useshell,noshell,powershell", DATA_TYPE_OPTION, "Shell encapsulation option"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Fully qualified command path"}, ++ {"useshell,noshell,powershell", CF_DATA_TYPE_OPTION, "Shell encapsulation option"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg RRANGE_ARGS[] = + { +- {CF_REALRANGE, DATA_TYPE_REAL, "Real number"}, +- {CF_REALRANGE, DATA_TYPE_REAL, "Real number"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_REALRANGE, CF_DATA_TYPE_REAL, "Real number"}, ++ {CF_REALRANGE, CF_DATA_TYPE_REAL, "Real number"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SELECTSERVERS_ARGS[] = + { +- {CF_NAKEDLRANGE, DATA_TYPE_STRING, "The identifier of a cfengine list of hosts or addresses to contact"}, +- {CF_VALRANGE, DATA_TYPE_INT, "The port number"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "A query string"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "A regular expression to match success"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of bytes to read from server"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "Name for array of results"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_NAKEDLRANGE, CF_DATA_TYPE_STRING, "The identifier of a cfengine list of hosts or addresses to contact"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "The port number"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A query string"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A regular expression to match success"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of bytes to read from server"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "Name for array of results"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SPLAYCLASS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Input string for classification"}, +- {"daily,hourly", DATA_TYPE_OPTION, "Splay time policy"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Input string for classification"}, ++ {"daily,hourly", CF_DATA_TYPE_OPTION, "Splay time policy"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SPLITSTRING_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "A data string"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regex to split on"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of pieces"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A data string"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regex to split on"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of pieces"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg STRCMP_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "String"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "String"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "String"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "String"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg STRFTIME_ARGS[] = + { +- {"gmtime,localtime", DATA_TYPE_OPTION, "Use GMT or local time"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "A format string"}, +- {CF_VALRANGE, DATA_TYPE_INT, "The time as a Unix epoch offset"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {"gmtime,localtime", CF_DATA_TYPE_OPTION, "Use GMT or local time"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "A format string"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "The time as a Unix epoch offset"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SUBLIST_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {"head,tail", DATA_TYPE_OPTION, "Whether to return elements from the head or from the tail of the list"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Maximum number of elements to return"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {"head,tail", CF_DATA_TYPE_OPTION, "Whether to return elements from the head or from the tail of the list"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Maximum number of elements to return"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg TRANSLATEPATH_ARGS[] = + { +- {CF_ABSPATHRANGE, DATA_TYPE_STRING, "Unix style path"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ABSPATHRANGE, CF_DATA_TYPE_STRING, "Unix style path"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg USEMODULE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Name of module command"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Argument string for the module"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Name of module command"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Argument string for the module"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg UNIQUE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg NTH_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {CF_VALRANGE, DATA_TYPE_INT, "Offset of element to return"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_VALRANGE, CF_DATA_TYPE_INT, "Offset of element to return"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg EVERY_SOME_NONE_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "Regular expression or string"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Regular expression or string"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg USEREXISTS_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "User name or identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "User name or identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SORT_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {"lex", DATA_TYPE_STRING, "Sorting method: lex"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {"lex", CF_DATA_TYPE_STRING, "Sorting method: lex"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg REVERSE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SHUFFLE_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {CF_ANYSTRING, DATA_TYPE_STRING, "Any seed string"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "Any seed string"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg LENGTH_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg SETOP_ARGS[] = + { +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine base list identifier"}, +- {CF_IDRANGE, DATA_TYPE_STRING, "CFEngine filter list identifier"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine base list identifier"}, ++ {CF_IDRANGE, CF_DATA_TYPE_STRING, "CFEngine filter list identifier"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + FnCallArg FORMAT_ARGS[] = + { +- {CF_ANYSTRING, DATA_TYPE_STRING, "CFEngine format string"}, +- {NULL, DATA_TYPE_NONE, NULL} ++ {CF_ANYSTRING, CF_DATA_TYPE_STRING, "CFEngine format string"}, ++ {NULL, CF_DATA_TYPE_NONE, NULL} + }; + + /*********************************************************/ +@@ -5828,119 +5828,119 @@ FnCallArg FORMAT_ARGS[] = + + const FnCallType CF_FNCALL_TYPES[] = + { +- FnCallTypeNew("accessedbefore", DATA_TYPE_CONTEXT, ACCESSEDBEFORE_ARGS, &FnCallIsAccessedBefore, "True if arg1 was accessed before arg2 (atime)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("accumulated", DATA_TYPE_INT, ACCUM_ARGS, &FnCallAccumulatedDate, "Convert an accumulated amount of time into a system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("ago", DATA_TYPE_INT, AGO_ARGS, &FnCallAgoDate, "Convert a time relative to now to an integer system representation", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("and", DATA_TYPE_STRING, AND_ARGS, &FnCallAnd, "Calculate whether all arguments evaluate to true", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("canonify", DATA_TYPE_STRING, CANONIFY_ARGS, &FnCallCanonify, "Convert an abitrary string into a legal class name", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("concat", DATA_TYPE_STRING, CONCAT_ARGS, &FnCallConcat, "Concatenate all arguments into string", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("changedbefore", DATA_TYPE_CONTEXT, CHANGEDBEFORE_ARGS, &FnCallIsChangedBefore, "True if arg1 was changed before arg2 (ctime)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("classify", DATA_TYPE_CONTEXT, CLASSIFY_ARGS, &FnCallClassify, "True if the canonicalization of the argument is a currently defined class", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("classmatch", DATA_TYPE_CONTEXT, CLASSMATCH_ARGS, &FnCallClassMatch, "True if the regular expression matches any currently defined class", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("classesmatching", DATA_TYPE_STRING_LIST, CLASSMATCH_ARGS, &FnCallClassesMatching, "List the defined classes matching regex arg1", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("countclassesmatching", DATA_TYPE_INT, COUNTCLASSESMATCHING_ARGS, &FnCallCountClassesMatching, "Count the number of defined classes matching regex arg1", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("countlinesmatching", DATA_TYPE_INT, COUNTLINESMATCHING_ARGS, &FnCallCountLinesMatching, "Count the number of lines matching regex arg1 in file arg2", false, FNCALL_CATEGORY_IO, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("difference", DATA_TYPE_STRING_LIST, SETOP_ARGS, &FnCallSetop, "Returns all the unique elements of list arg1 that are not in list arg2", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("dirname", DATA_TYPE_STRING, DIRNAME_ARGS, &FnCallDirname, "Return the parent directory name for given path", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("diskfree", DATA_TYPE_INT, DISKFREE_ARGS, &FnCallDiskFree, "Return the free space (in KB) available on the directory's current partition (0 if not found)", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("escape", DATA_TYPE_STRING, ESCAPE_ARGS, &FnCallEscape, "Escape regular expression characters in a string", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("every", DATA_TYPE_CONTEXT, EVERY_SOME_NONE_ARGS, &FnCallEverySomeNone, "True if every element in the named list matches the given regular expression", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("execresult", DATA_TYPE_STRING, EXECRESULT_ARGS, &FnCallExecResult, "Execute named command and assign output to variable", false, FNCALL_CATEGORY_UTILS, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("fileexists", DATA_TYPE_CONTEXT, FILESTAT_ARGS, &FnCallFileStat, "True if the named file can be accessed", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("filesexist", DATA_TYPE_CONTEXT, FILESEXIST_ARGS, &FnCallFileSexist, "True if the named list of files can ALL be accessed", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("filesize", DATA_TYPE_INT, FILESTAT_ARGS, &FnCallFileStat, "Returns the size in bytes of the file", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("filestat", DATA_TYPE_STRING, FILESTAT_DETAIL_ARGS, &FnCallFileStatDetails, "Returns stat() details of the file", false, FNCALL_CATEGORY_FILES, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("filter", DATA_TYPE_STRING_LIST, FILTER_ARGS, &FnCallFilter, "Similarly to grep(), filter the list arg2 for matches to arg2. The matching can be as a regular expression or exactly depending on arg3. The matching can be inverted with arg4. A maximum on the number of matches returned can be set with arg5.", false, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("format", DATA_TYPE_STRING, FORMAT_ARGS, &FnCallFormat, "Applies a list of string values in arg2,arg3... to a string format in arg1 with sprintf() rules", true, FNCALL_CATEGORY_DATA, SYNTAX_STATUS_NORMAL), +- FnCallTypeNew("getenv", DATA_TYPE_STRING, GETENV_ARGS, &FnCallGetEnv, "Return the environment variable named arg1, truncated at arg2 characters", false, FNCALL_CATEGORY_SYSTEM, SYNTAX_STATUS_NORMAL), @@ 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 guengel at users.sourceforge.net Sun Sep 29 15:12:23 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 29 Sep 2013 13:12:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[22053] csw/mgar/pkg/postgresql/branches/postgresql-9.2/ Message-ID: Revision: 22053 http://gar.svn.sourceforge.net/gar/?rev=22053&view=rev Author: guengel Date: 2013-09-29 13:12:22 +0000 (Sun, 29 Sep 2013) Log Message: ----------- postgresql/branches/postgresql-9.2: Branched trunk to postgresql-9.2 Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Sep 29 15:12:58 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 29 Sep 2013 13:12:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[22054] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 22054 http://gar.svn.sourceforge.net/gar/?rev=22054&view=rev Author: guengel Date: 2013-09-29 13:12:58 +0000 (Sun, 29 Sep 2013) Log Message: ----------- postgresql/trunk: Started working on Postgresql 9.3. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-09-29 13:12:22 UTC (rev 22053) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-09-29 13:12:58 UTC (rev 22054) @@ -87,12 +87,13 @@ # maintainers to use `pg_config'. NAME = postgresql -BASE_VERSION = 9.2 +BASE_VERSION = 9.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 4 +PATCHLEVEL = 0 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 +GARCOMPILER = SOS12U3 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2013-09-29 13:12:22 UTC (rev 22053) +++ csw/mgar/pkg/postgresql/trunk/checksums 2013-09-29 13:12:58 UTC (rev 22054) @@ -1 +1 @@ -6ee5bb53b97da7c6ad9cb0825d3300dd postgresql-9.2.4.tar.bz2 +09aee56f3a15ce4a7ea32044fb845b53 postgresql-9.3.0.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 30 08:54:47 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 30 Sep 2013 06:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[22055] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 22055 http://gar.svn.sourceforge.net/gar/?rev=22055&view=rev Author: lblume Date: 2013-09-30 06:54:46 +0000 (Mon, 30 Sep 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.34 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 2013-09-29 13:12:58 UTC (rev 22054) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-09-30 06:54:46 UTC (rev 22055) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 33 +PATCHLEVEL = 34 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 2013-09-29 13:12:58 UTC (rev 22054) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-09-30 06:54:46 UTC (rev 22055) @@ -1 +1 @@ -68e235f472718d0aaf2fc755f498a714 mysql-5.5.33.tar.gz +930970a42d51e48599deb7fe01778a4a mysql-5.5.34.tar.gz 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 30 10:35:42 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 30 Sep 2013 08:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[22056] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 22056 http://gar.svn.sourceforge.net/gar/?rev=22056&view=rev Author: pfelecan Date: 2013-09-30 08:35:42 +0000 (Mon, 30 Sep 2013) Log Message: ----------- qt4-gcc/trunk: specific SPARC post installation rule for script headers Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 06:54:46 UTC (rev 22055) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 08:35:42 UTC (rev 22056) @@ -454,3 +454,72 @@ cd $(WORKSRC) && gtar --create --file=- src/corelib/*/*_p.h src/declarative/*/*_p.h src/gui/*/*_p.h src/script/*/*_p.h | gtar --directory=$(DESTDIR)$(includedir) --extract --file=- rm -rf $(DESTDIR)/$(prefix)/tests $(MAKECOOKIE) + +# For the moment the scripting (QtScript) is not supported on the +# SPARC architecture but QtWebKit includes, unconditionally, headers +# from QtScript. Consequently, we must supply the headers such as +# projects using QtWebKit can be compiled, even if they don't use the +# scripting module. +# origin: +post-install-isa-sparcv8plus: sODir = $(WORKSRC)/include/QtScript +post-install-isa-sparcv8plus: stODir = $(WORKSRC)/include/QtScriptTools/QtScriptTools +post-install-isa-sparcv8plus: ODir = $(WORKSRC)/src/script/api +post-install-isa-sparcv8plus: dODir = $(WORKSRC)/src/scripttools/debugging +# destination: +post-install-isa-sparcv8plus: sDDir = $(DESTDIR)/$(includedir)QtScript +post-install-isa-sparcv8plus: stDDir = $(DESTDIR)/$(includedir)/QtScriptTools +post-install-isa-sparcv8plus: DDir = $(DESTDIR)/$(includedir)/Qt +post-install-isa-sparcv8plus: + ginstall --directory --mode=u=rwx,go=rx $(sDDir) + ginstall --directory --mode=u=rwx,go=rx $(stDDir) + ginstall --directory --mode=u=rwx,go=rx $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QtScript $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptClass $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptClassPropertyIterator $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptContext $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptContextInfo $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptContextInfoList $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptEngine $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptEngineAgent $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptExtensionInterface $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptExtensionPlugin $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptProgram $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptString $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptSyntaxCheckResult $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptValue $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptValueIterator $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptValueList $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptable $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QtScript $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptable.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclass.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclasspropertyiterator.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontext.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontextinfo.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengine.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengineagent.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensioninterface.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensionplugin.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptprogram.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptstring.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalue.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalueiterator.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptable.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclass.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclasspropertyiterator.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontext.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontextinfo.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengine.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengineagent.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensioninterface.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensionplugin.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptprogram.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptstring.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalue.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalueiterator.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QtScriptTools $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QScriptEngineDebugger $(stDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QtScriptTools $(stDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(dODir)/qscriptenginedebugger.h $(DDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptenginedebugger.h $(stDDir) + $(MAKECOOKIE) 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 30 11:09:12 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 30 Sep 2013 09:09:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[22057] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 22057 http://gar.svn.sourceforge.net/gar/?rev=22057&view=rev Author: pfelecan Date: 2013-09-30 09:09:12 +0000 (Mon, 30 Sep 2013) Log Message: ----------- qt4-gcc/trunk: correct script tools origin directory for the specific SPARC post installation rule for script headers Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 08:35:42 UTC (rev 22056) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 09:09:12 UTC (rev 22057) @@ -462,7 +462,7 @@ # scripting module. # origin: post-install-isa-sparcv8plus: sODir = $(WORKSRC)/include/QtScript -post-install-isa-sparcv8plus: stODir = $(WORKSRC)/include/QtScriptTools/QtScriptTools +post-install-isa-sparcv8plus: stODir = $(WORKSRC)/include/QtScriptTools post-install-isa-sparcv8plus: ODir = $(WORKSRC)/src/script/api post-install-isa-sparcv8plus: dODir = $(WORKSRC)/src/scripttools/debugging # destination: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Sep 30 11:19:29 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 30 Sep 2013 09:19:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[22058] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 22058 http://gar.svn.sourceforge.net/gar/?rev=22058&view=rev Author: cgrzemba Date: 2013-09-30 09:19:29 +0000 (Mon, 30 Sep 2013) Log Message: ----------- librecad/trunk: add checkpkg error override Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2013-09-30 09:09:12 UTC (rev 22057) +++ csw/mgar/pkg/librecad/trunk/Makefile 2013-09-30 09:19:29 UTC (rev 22058) @@ -58,6 +58,7 @@ # RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4 # CHECKPKG_OVERRIDES_CSWlibrecad += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad OBSOLETED_BY_CSWlibrecad = CSWLibreCAD +CHECKPKG_OVERRIDES_CSWLibreCAD += catalogname-not-lowercase CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Sep 30 11:35:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 30 Sep 2013 09:35:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[22059] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 22059 http://gar.svn.sourceforge.net/gar/?rev=22059&view=rev Author: pfelecan Date: 2013-09-30 09:35:06 +0000 (Mon, 30 Sep 2013) Log Message: ----------- qt4-gcc/trunk: correct another script tools origin directory for the specific SPARC post installation rule for script headers Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 09:19:29 UTC (rev 22058) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 09:35:06 UTC (rev 22059) @@ -521,5 +521,5 @@ ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QScriptEngineDebugger $(stDDir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QtScriptTools $(stDDir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(dODir)/qscriptenginedebugger.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptenginedebugger.h $(stDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(dDir)/qscriptenginedebugger.h $(stDDir) $(MAKECOOKIE) 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 30 11:51:19 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 30 Sep 2013 09:51:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[22060] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 22060 http://gar.svn.sourceforge.net/gar/?rev=22060&view=rev Author: pfelecan Date: 2013-09-30 09:51:19 +0000 (Mon, 30 Sep 2013) Log Message: ----------- qt4-gcc/trunk: correct typo in previous commit Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 09:35:06 UTC (rev 22059) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 09:51:19 UTC (rev 22060) @@ -521,5 +521,5 @@ ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QScriptEngineDebugger $(stDDir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QtScriptTools $(stDDir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(dODir)/qscriptenginedebugger.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(dDir)/qscriptenginedebugger.h $(stDDir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(dODir)/qscriptenginedebugger.h $(stDDir) $(MAKECOOKIE) 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 30 14:50:13 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 30 Sep 2013 12:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[22061] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 22061 http://gar.svn.sourceforge.net/gar/?rev=22061&view=rev Author: pfelecan Date: 2013-09-30 12:50:12 +0000 (Mon, 30 Sep 2013) Log Message: ----------- qt4-gcc/trunk: - correct one of the destination directories - change the access rights for the additional files Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 09:51:19 UTC (rev 22060) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 12:50:12 UTC (rev 22061) @@ -466,60 +466,60 @@ post-install-isa-sparcv8plus: ODir = $(WORKSRC)/src/script/api post-install-isa-sparcv8plus: dODir = $(WORKSRC)/src/scripttools/debugging # destination: -post-install-isa-sparcv8plus: sDDir = $(DESTDIR)/$(includedir)QtScript +post-install-isa-sparcv8plus: sDDir = $(DESTDIR)/$(includedir)/QtScript post-install-isa-sparcv8plus: stDDir = $(DESTDIR)/$(includedir)/QtScriptTools post-install-isa-sparcv8plus: DDir = $(DESTDIR)/$(includedir)/Qt post-install-isa-sparcv8plus: ginstall --directory --mode=u=rwx,go=rx $(sDDir) ginstall --directory --mode=u=rwx,go=rx $(stDDir) ginstall --directory --mode=u=rwx,go=rx $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QtScript $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptClass $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptClassPropertyIterator $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptContext $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptContextInfo $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptContextInfoList $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptEngine $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptEngineAgent $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptExtensionInterface $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptExtensionPlugin $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptProgram $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptString $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptSyntaxCheckResult $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptValue $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptValueIterator $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptValueList $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QScriptable $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(sODir)/QtScript $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptable.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclass.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclasspropertyiterator.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontext.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontextinfo.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengine.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengineagent.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensioninterface.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensionplugin.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptprogram.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptstring.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalue.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalueiterator.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptable.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclass.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptclasspropertyiterator.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontext.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptcontextinfo.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengine.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptengineagent.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensioninterface.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptextensionplugin.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptprogram.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptstring.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalue.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(ODir)/qscriptvalueiterator.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QtScriptTools $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QScriptEngineDebugger $(stDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(stODir)/QtScriptTools $(stDDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(dODir)/qscriptenginedebugger.h $(DDir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(dODir)/qscriptenginedebugger.h $(stDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QtScript $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptClass $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptClassPropertyIterator $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptContext $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptContextInfo $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptContextInfoList $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptEngine $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptEngineAgent $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptExtensionInterface $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptExtensionPlugin $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptProgram $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptString $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptSyntaxCheckResult $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptValue $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptValueIterator $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptValueList $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptable $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QtScript $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptable.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclass.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclasspropertyiterator.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontext.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontextinfo.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengine.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengineagent.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensioninterface.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensionplugin.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptprogram.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptstring.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalue.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalueiterator.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptable.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclass.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclasspropertyiterator.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontext.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontextinfo.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengine.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengineagent.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensioninterface.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensionplugin.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptprogram.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptstring.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalue.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalueiterator.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(stODir)/QtScriptTools $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(stODir)/QScriptEngineDebugger $(stDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(stODir)/QtScriptTools $(stDDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(dODir)/qscriptenginedebugger.h $(DDir) + ginstall --preserve-timestamps --mode=u=rx,go=r $(dODir)/qscriptenginedebugger.h $(stDDir) $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 30 15:24:01 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Sep 2013 13:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[22062] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 22062 http://gar.svn.sourceforge.net/gar/?rev=22062&view=rev Author: dmichelsen Date: 2013-09-30 13:24:00 +0000 (Mon, 30 Sep 2013) Log Message: ----------- gcc4/trunk: More fixes for alternatives Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-30 12:50:12 UTC (rev 22061) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-30 13:24:00 UTC (rev 22062) @@ -132,6 +132,9 @@ ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcc gcc_core $(bindir)/gcc$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcov gcc_core $(bindir)/gcov$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gccgo gcc_core $(bindir)/gccgo$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcc-ar gcc_core $(bindir)/gcc-ar$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcc-nm gcc_core $(bindir)/gcc-nm$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcc-ranlib gcc_core $(bindir)/gcc-ranlib$(PROGRAM_SUFFIX) # Because I can. CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-with-bad-content @@ -301,6 +304,7 @@ ALTERNATIVES_$(PKG_BASENAME)g++ += $(PKG_VERSION_TOKEN)g++ ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) +ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/c++ gcc_gplusplus $(bindir)/c++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += CSWlibgcc-s1 @@ -391,7 +395,7 @@ ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gorbd gcc_gjava $(bindir)/gorbd$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmic gcc_gjava $(bindir)/grmic$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmid gcc_gjava $(bindir)/grmid$(PROGRAM_SUFFIX) -ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmregistry gcc_gjava $(bindir)/grmregistry$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/grmiregistry gcc_gjava $(bindir)/grmiregistry$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gserialver gcc_gjava $(bindir)/gserialver$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/gtnameserv gcc_gjava $(bindir)/gtnameserv$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)java += $(bindir)/jcf-dump gcc_gjava $(bindir)/jcf-dump$(PROGRAM_SUFFIX) @@ -465,9 +469,9 @@ CORE_BINARIES = cpp gcc gcov CXX_BINARIES = g\+\+ c\+\+ FORTRAN_BINARIES = gfortran -JAVA_BINARIES = gcj gij aot-compile grmiregistry +JAVA_BINARIES = gcj gij aot-compile JAVA_BINARIES += gappletviewer gc-analyze gcj-dbtool gcjh gjar gjarsigner gjavah -JAVA_BINARIES += gkeytool gnative2ascii gorbd grmic grmid grmregistry +JAVA_BINARIES += gkeytool gnative2ascii gorbd grmic grmid grmiregistry JAVA_BINARIES += gserialver gtnameserv jcf-dump jv-convert rebuild-gcj-db # GCC-4.7 contains assembler specific to sparcv9, incompatible with sparcv8. 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 30 16:50:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 30 Sep 2013 14:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[22063] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 22063 http://gar.svn.sourceforge.net/gar/?rev=22063&view=rev Author: dmichelsen Date: 2013-09-30 14:50:25 +0000 (Mon, 30 Sep 2013) Log Message: ----------- gcc4/trunk: Fix erranous alterntive Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-30 13:24:00 UTC (rev 22062) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-09-30 14:50:25 UTC (rev 22063) @@ -304,7 +304,7 @@ ALTERNATIVES_$(PKG_BASENAME)g++ += $(PKG_VERSION_TOKEN)g++ ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) -ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/c++ gcc_gplusplus $(bindir)/c++$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) +ALTERNATIVE_$(PKG_VERSION_TOKEN)g++ += $(bindir)/c++ gcc_gplusplus $(bindir)/c++$(PROGRAM_SUFFIX) RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += CSWlibgcc-s1 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 30 17:18:26 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 30 Sep 2013 15:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[22064] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 22064 http://gar.svn.sourceforge.net/gar/?rev=22064&view=rev Author: pfelecan Date: 2013-09-30 15:18:26 +0000 (Mon, 30 Sep 2013) Log Message: ----------- qt4-gcc/trunk: correct the access rights for the additional files Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 14:50:25 UTC (rev 22063) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-09-30 15:18:26 UTC (rev 22064) @@ -473,53 +473,53 @@ ginstall --directory --mode=u=rwx,go=rx $(sDDir) ginstall --directory --mode=u=rwx,go=rx $(stDDir) ginstall --directory --mode=u=rwx,go=rx $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QtScript $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptClass $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptClassPropertyIterator $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptContext $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptContextInfo $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptContextInfoList $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptEngine $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptEngineAgent $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptExtensionInterface $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptExtensionPlugin $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptProgram $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptString $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptSyntaxCheckResult $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptValue $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptValueIterator $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptValueList $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QScriptable $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(sODir)/QtScript $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptable.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclass.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclasspropertyiterator.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontext.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontextinfo.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengine.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengineagent.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensioninterface.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensionplugin.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptprogram.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptstring.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalue.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalueiterator.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptable.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclass.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptclasspropertyiterator.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontext.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptcontextinfo.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengine.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptengineagent.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensioninterface.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptextensionplugin.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptprogram.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptstring.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalue.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(ODir)/qscriptvalueiterator.h $(sDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(stODir)/QtScriptTools $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(stODir)/QScriptEngineDebugger $(stDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(stODir)/QtScriptTools $(stDDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(dODir)/qscriptenginedebugger.h $(DDir) - ginstall --preserve-timestamps --mode=u=rx,go=r $(dODir)/qscriptenginedebugger.h $(stDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QtScript $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptClass $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptClassPropertyIterator $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptContext $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptContextInfo $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptContextInfoList $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptEngine $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptEngineAgent $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptExtensionInterface $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptExtensionPlugin $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptProgram $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptString $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptSyntaxCheckResult $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptValue $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptValueIterator $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptValueList $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QScriptable $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(sODir)/QtScript $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptable.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptclass.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptclasspropertyiterator.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptcontext.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptcontextinfo.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptengine.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptengineagent.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptextensioninterface.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptextensionplugin.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptprogram.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptstring.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptvalue.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptvalueiterator.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptable.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptclass.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptclasspropertyiterator.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptcontext.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptcontextinfo.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptengine.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptengineagent.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptextensioninterface.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptextensionplugin.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptprogram.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptstring.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptvalue.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(ODir)/qscriptvalueiterator.h $(sDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(stODir)/QtScriptTools $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(stODir)/QScriptEngineDebugger $(stDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(stODir)/QtScriptTools $(stDDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(dODir)/qscriptenginedebugger.h $(DDir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(dODir)/qscriptenginedebugger.h $(stDDir) $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.