From chninkel at users.sourceforge.net Sat Sep 1 08:12:19 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 01 Sep 2012 06:12:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19131] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 19131 http://gar.svn.sourceforge.net/gar/?rev=19131&view=rev Author: chninkel Date: 2012-09-01 06:12:19 +0000 (Sat, 01 Sep 2012) Log Message: ----------- bash/trunk: Added the map file in the DISTFILES Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2012-08-31 09:25:13 UTC (rev 19130) +++ csw/mgar/pkg/bash/trunk/Makefile 2012-09-01 06:12:19 UTC (rev 19131) @@ -54,6 +54,7 @@ DISTNAME = $(NAME)-$(BASH_VERSION) DISTFILES = $(NAME)-$(BASH_VERSION).tar.gz DISTFILES += changelog.CSW +DISTFILES += map.bash PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION)) PATCHDIRLEVEL = 0 @@ -84,7 +85,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_LDOPTIONS = -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.bash)" +EXTRA_LD_OPTIONS = -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.bash)" include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Sep 1 14:52:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 01 Sep 2012 12:52:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19132] csw/mgar/pkg/git/branches Message-ID: Revision: 19132 http://gar.svn.sourceforge.net/gar/?rev=19132&view=rev Author: bdwalton Date: 2012-09-01 12:52:22 +0000 (Sat, 01 Sep 2012) Log Message: ----------- git/branches/dublin: update the dublin branch to match unstable Added Paths: ----------- csw/mgar/pkg/git/branches/dublin/ csw/mgar/pkg/git/branches/dublin/Makefile csw/mgar/pkg/git/branches/dublin/checksums csw/mgar/pkg/git/branches/dublin/files/0010-t1304-improve-setfacl-prerequisite-setup.patch csw/mgar/pkg/git/branches/dublin/files/0011-Use-getpassphrase-instead-of-getpass-when-prompting-.patch Removed Paths: ------------- csw/mgar/pkg/git/branches/dublin/Makefile csw/mgar/pkg/git/branches/dublin/checksums csw/mgar/pkg/git/branches/dublin/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch Deleted: csw/mgar/pkg/git/branches/dublin/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-06-14 22:10:51 UTC (rev 18416) +++ csw/mgar/pkg/git/branches/dublin/Makefile 2012-09-01 12:52:22 UTC (rev 19132) @@ -1,250 +0,0 @@ -NAME = git -VERSION = 1.7.10.3 -#PATCHLEVEL = rc4 -DISTNAME = $(NAME)-$(VERSION) -CATEGORIES = devel -GARTYPE = v2 - -VENDOR_URL = http://git-scm.org/ - -NO_SVN_TESTS=YesPlease -GIT_TEST_OPTS=-i -v -d -EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS - -# disable tests until next version bump (at the top so it stands out) -# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is -# detected as the first available utf8 locale. the failure is -# harmless though. -# TEST_SCRIPTS = -TEST_TARGET = test - -PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs -PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev - -OBSOLETED_BY_CSWgit-gui = CSWgitgui -CATALOGNAME_CSWgitgui = git_gui_stub -OBSOLETED_BY_CSWgit-svn = CSWgitsvn -CATALOGNAME_CSWgitsvn = git_svn_stub -OBSOLETED_BY_CSWgit-emacs = CSWgitemacs -CATALOGNAME_CSWgitemacs = git_emacs_stub -OBSOLETED_BY_CSWgit-doc = CSWgitdoc -CATALOGNAME_CSWgitdoc = git_doc_stub -OBSOLETED_BY_CSWgit-completion = CSWgitcompletion -CATALOGNAME_CSWgitcompletion = git_completion_stub -OBSOLETED_BY_CSWgit-dev = CSWgitdevel -CATALOGNAME_CSWgitdevel = git_devel_stub -OBSOLETED_BY_CSWgit-cvs = CSWgitcvs -CATALOGNAME_CSWgitcvs = git_cvs_stub - -CATALOGNAME_CSWgit = git -CATALOGNAME_CSWgit-cvs = git_cvs -CATALOGNAME_CSWgit-svn = git_svn -CATALOGNAME_CSWgit-emacs = git_emacs -CATALOGNAME_CSWgit-gui = git_gui -CATALOGNAME_CSWgit-doc = git_doc -CATALOGNAME_CSWgitk = gitk -CATALOGNAME_CSWgit-completion = git_completion -CATALOGNAME_CSWgit-dev = git_dev - -ARCHALL_CSWgit-svn = 1 -ARCHALL_CSWgit-cvs = 1 -ARCHALL_CSWgitk = 1 -ARCHALL_CSWgit-gui = 1 -ARCHALL_CSWgit-emacs = 1 -ARCHALL_CSWgit-doc = 1 -ARCHALL_CSWgit-completion = 1 - -BUILD_DEP_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWlibcurl-dev -BUILD_DEP_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat -BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs -BUILD_DEP_PKGS += CSWpython - -RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWgit += CSWosshclient CSWlibiconv2 CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWgit += CSWbash CSWpmerror CSWpmtermreadkey -RUNTIME_DEP_PKGS_CSWgit += CSWpmnetsmtpssl CSWless -RUNTIME_DEP_PKGS_CSWgit += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0 - -RUNTIME_DEP_PKGS_CSWgitk = CSWgit CSWtk - -RUNTIME_DEP_PKGS_CSWgit-gui = CSWgit CSWtk - -RUNTIME_DEP_PKGS_CSWgit-svn = CSWgit CSWpmsvn - -RUNTIME_DEP_PKGS_CSWgit-cvs = CSWgit CSWcvs CSWcvsps - -RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacscommon - -RUNTIME_DEP_PKGS_CSWgit-doc = CSWgit - -RUNTIME_DEP_PKGS_CSWgit-dev = CSWgit - -# We include bash here even though git itself depends on it because in theory -# git could use any other POSIX compliant shell and drop the dependency... -RUNTIME_DEP_PKGS_CSWgit-completion = CSWgit CSWbash CSWbashcmplt - -LICENSE = COPYING - -DESCRIPTION = Fast Version Control System -define BLURB - Git is a popular version control system designed to handle - very large projects with speed and efficiency; it is used - mainly for various open source projects, most notably the Linux kernel. -endef - -SPKG_DESC_CSWgit = Fast Version Control System -SPKG_DESC_CSWgitk = Git revision tree visualiser -SPKG_DESC_CSWgit-gui = Git GUI tool -SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories -SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories -SPKG_DESC_CSWgit-doc = Documentation for Git -SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs -SPKG_DESC_CSWgit-completion = Bash completion support for Git -SPKG_DESC_CSWgit-dev = Headers and static libraries for Git - -MASTER_SITES = http://git-core.googlecode.com/files/ -DISTFILES += $(DISTNAME).tar.gz -DISTFILES += CSWgit.postinstall - -PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch -PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch -PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch -PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch -# this patch is required on current9s (not necessarily all sparc boxes) due -# to the selection of available utf8 locales. -PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch -PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch -PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch -PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch - -fdirs = $(bindir_install) $(mandir) $(libexecdir_install) -define _git_files -$(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* -endef - -PKGFILES_CSWgit-svn = $(call _git_files,git-svn) -PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool) -PKGFILES_CSWgitk = $(call _git_files,gitk) -PKGFILES_CSWgit-cvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) -PKGFILES_CSWgit-emacs = .*emacs.* -PKGFILES_CSWgit-doc = $(docdir)/git-doc.* -PKGFILES_CSWgit-completion = .*/bash_completion.d/.* -PKGFILES_CSWgit-dev = $(includedir)/.* $(libdir)/.* - -# We define upstream file regex so we can be notifed of new upstream -# software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw -#set bashconfdir to sysconfdir when bash changes -bashconfdir = /opt/csw/etc/ - -CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash -CONFIGURE_ARGS += --with-perl=$(bindir)/perl -CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish -CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-iconv=$(prefix) -CONFIGURE_ARGS += --with-openssl=$(prefix) -CONFIGURE_ARGS += --with-expat=$(prefix) -CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" -CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig -CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less -CONFIGURE_ARGS += --without-python - -BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ - ASCIIDOC_NO_ROFF=YesPlease \ - all - -INSTALL_ARGS = INSTALLDIRS=vendor \ - install-man install-html - -# We want static libs installed for our devel package -MERGE_EXCLUDE_STATICLIBS = - -ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services - -CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash -CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt -CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-doc += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-doc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a -CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a -CHECKPKG_OVERRIDES_CSWgit-dev += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmerror -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWosshclient -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmnetsmtpssl -CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmtermreadkey -CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/git-config.1 -CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email -CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/share/gitweb/gitweb.cgi -CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb -CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk -CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps -CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs -CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk -CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit -CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpmsvn - -include gar/category.mk - -# for tail -n and to override things like, etc with the gnu counterparts -# gnu must come first so xpg4/sed isn't found first. -PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) - -post-configure-modulated: - @echo "Forcing GIT_TEST_CMP tool" - @( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak ) - @$(MAKECOOKIE) - -# force the elisp extension to be built too. -post-build-modulated: - @echo Builing Emacs Git extension - @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) - -post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(NAME) -post-install-modulated: CONTHOOKS=$(GD)/contrib/hooks -post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d -post-install-modulated: ID=$(DESTDIR)/$(includedir)/git -post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git -post-install-modulated: - @echo Installing /etc/services definitions file - @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWgit/; \ - echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \ - echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); ) - @echo Cleaning up perl stuff - @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* - @rm -rf $(DESTDIR)/$(perllib)/ - @chmod 644 $(DESTDIR)/$(datadir)/perl/csw/*pm - @echo Installing Emacs Git extension - @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ - emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) - @echo Installing devel files - @( cd $(WORKSRC); \ - ginstall -c -m 0755 -d $(ID) $(LD); \ - for f in `find . -name "*.h"`; do \ - dn=`dirname $$f`; \ - ginstall -c -m 0755 -d $(ID)/$$dn; \ - ginstall -c -m 0644 $$f $(ID)/$$dn; \ - done; \ - ginstall -c -m 0444 libgit.a $(LD)/; \ - ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a ) - @echo Installing Bash Completion files - @( cd $(WORKSRC); \ - ginstall -c -m 0755 -d $(BD); \ - cp contrib/completion/* \ - $(BD)/ ) - @( cd $(WORKSRC)/contrib/hooks; \ - perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email; \ - ginstall -c -d -m 0755 $(CONTHOOKS); \ - ginstall -c -m 0644 post-receive-email $(CONTHOOKS) ) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/git/branches/dublin/Makefile (from rev 18875, csw/mgar/pkg/git/trunk/Makefile) =================================================================== --- csw/mgar/pkg/git/branches/dublin/Makefile (rev 0) +++ csw/mgar/pkg/git/branches/dublin/Makefile 2012-09-01 12:52:22 UTC (rev 19132) @@ -0,0 +1,253 @@ +NAME = git +VERSION = 1.7.11 +DISTNAME = $(NAME)-$(VERSION) +CATEGORIES = devel +GARTYPE = v2 + +WORKDIR = $(WORKROOTDIR)/ + +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + +VENDOR_URL = http://git-scm.org/ + +NO_SVN_TESTS=YesPlease +GIT_TEST_OPTS=-i -v -d +EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS + +# disable tests until next version bump (at the top so it stands out) +# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is +# detected as the first available utf8 locale. the failure is +# harmless though. +# TEST_SCRIPTS = +TEST_TARGET = test + +PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs +PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev + +OBSOLETED_BY_CSWgit-gui = CSWgitgui +CATALOGNAME_CSWgitgui = git_gui_stub +OBSOLETED_BY_CSWgit-svn = CSWgitsvn +CATALOGNAME_CSWgitsvn = git_svn_stub +OBSOLETED_BY_CSWgit-emacs = CSWgitemacs +CATALOGNAME_CSWgitemacs = git_emacs_stub +OBSOLETED_BY_CSWgit-doc = CSWgitdoc +CATALOGNAME_CSWgitdoc = git_doc_stub +OBSOLETED_BY_CSWgit-completion = CSWgitcompletion +CATALOGNAME_CSWgitcompletion = git_completion_stub +OBSOLETED_BY_CSWgit-dev = CSWgitdevel +CATALOGNAME_CSWgitdevel = git_devel_stub +OBSOLETED_BY_CSWgit-cvs = CSWgitcvs +CATALOGNAME_CSWgitcvs = git_cvs_stub + +CATALOGNAME_CSWgit = git +CATALOGNAME_CSWgit-cvs = git_cvs +CATALOGNAME_CSWgit-svn = git_svn +CATALOGNAME_CSWgit-emacs = git_emacs +CATALOGNAME_CSWgit-gui = git_gui +CATALOGNAME_CSWgit-doc = git_doc +CATALOGNAME_CSWgitk = gitk +CATALOGNAME_CSWgit-completion = git_completion +CATALOGNAME_CSWgit-dev = git_dev + +ARCHALL_CSWgit-svn = 1 +ARCHALL_CSWgit-cvs = 1 +ARCHALL_CSWgitk = 1 +ARCHALL_CSWgit-gui = 1 +ARCHALL_CSWgit-emacs = 1 +ARCHALL_CSWgit-doc = 1 +ARCHALL_CSWgit-completion = 1 + +BUILD_DEP_PKGS = CSWasciidoc CSWlibssl-dev CSWxmlto CSWbash CSWlibcurl-dev +BUILD_DEP_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat +BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs +BUILD_DEP_PKGS += CSWpython + +RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWgit += CSWosshclient CSWlibiconv2 CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgit += CSWbash CSWpmerror CSWpmtermreadkey +RUNTIME_DEP_PKGS_CSWgit += CSWpmnetsmtpssl CSWless +RUNTIME_DEP_PKGS_CSWgit += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgit += CSWlibssl0-9-8 + +RUNTIME_DEP_PKGS_CSWgitk = CSWgit CSWtk + +RUNTIME_DEP_PKGS_CSWgit-gui = CSWgit CSWtk + +RUNTIME_DEP_PKGS_CSWgit-svn = CSWgit CSWpmsvn + +RUNTIME_DEP_PKGS_CSWgit-cvs = CSWgit CSWcvs CSWcvsps + +RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacscommon + +RUNTIME_DEP_PKGS_CSWgit-doc = CSWgit + +RUNTIME_DEP_PKGS_CSWgit-dev = CSWgit + +# We include bash here even though git itself depends on it because in theory +# git could use any other POSIX compliant shell and drop the dependency... +RUNTIME_DEP_PKGS_CSWgit-completion = CSWgit CSWbash CSWbashcmplt + +LICENSE = COPYING + +DESCRIPTION = Fast Version Control System +define BLURB + Git is a popular version control system designed to handle + very large projects with speed and efficiency; it is used + mainly for various open source projects, most notably the Linux kernel. +endef + +SPKG_DESC_CSWgit = Fast Version Control System +SPKG_DESC_CSWgitk = Git revision tree visualiser +SPKG_DESC_CSWgit-gui = Git GUI tool +SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories +SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories +SPKG_DESC_CSWgit-doc = Documentation for Git +SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs +SPKG_DESC_CSWgit-completion = Bash completion support for Git +SPKG_DESC_CSWgit-dev = Headers and static libraries for Git + +MASTER_SITES = http://git-core.googlecode.com/files/ +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += CSWgit.postinstall + +PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch +PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch +PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch +PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch +# this patch is required on current9s (not necessarily all sparc boxes) due +# to the selection of available utf8 locales. +PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch +PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch +PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch + +fdirs = $(bindir_install) $(mandir) $(libexecdir_install) +define _git_files +$(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).* +endef + +PKGFILES_CSWgit-svn = $(call _git_files,git-svn) +PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool) +PKGFILES_CSWgitk = $(call _git_files,gitk) +PKGFILES_CSWgit-cvs = $(foreach d,$(fdirs),$(d)/.*cvs.*) +PKGFILES_CSWgit-emacs = .*emacs.* +PKGFILES_CSWgit-doc = $(docdir)/git-doc.* +PKGFILES_CSWgit-completion = .*/bash_completion.d/.* +PKGFILES_CSWgit-dev = $(includedir)/.* $(libdir)/.* + +# We define upstream file regex so we can be notifed of new upstream +# software release +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 + +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw +#set bashconfdir to sysconfdir when bash changes +bashconfdir = /opt/csw/etc/ + +CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash +CONFIGURE_ARGS += --with-perl=$(bindir)/perl +CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-iconv=$(prefix) +CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-expat=$(prefix) +CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" +CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig +CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less +CONFIGURE_ARGS += --without-python + +BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ + ASCIIDOC_NO_ROFF=YesPlease \ + all + +INSTALL_ARGS = INSTALLDIRS=vendor \ + install-man install-html + +# We want static libs installed for our devel package +MERGE_EXCLUDE_STATICLIBS = + +ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services + +CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt +CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-doc += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-doc += file-with-bad-content +CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a +CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a +CHECKPKG_OVERRIDES_CSWgit-dev += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmerror +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWosshclient +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmnetsmtpssl +CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmtermreadkey +CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/git-config.1 +CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email +CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/share/gitweb/gitweb.cgi +CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb +CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps +CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs +CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit +CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpmsvn + +include gar/category.mk + +# for tail -n and to override things like, etc with the gnu counterparts +# gnu must come first so xpg4/sed isn't found first. +PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) + +post-configure-modulated: + @echo "Forcing GIT_TEST_CMP tool" + @( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak ) + @( cd $(WORKSRC); echo 'EXTLIBS += -lintl' > config.mak ) + @$(MAKECOOKIE) + +# force the elisp extension to be built too. +post-build-modulated: + @echo Builing Emacs Git extension + @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) + +post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(NAME) +post-install-modulated: CONTHOOKS=$(GD)/contrib/hooks +post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d +post-install-modulated: ID=$(DESTDIR)/$(includedir)/git +post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git +post-install-modulated: + @echo Installing /etc/services definitions file + @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWgit/; \ + echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \ + echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); ) + @echo Cleaning up perl stuff + @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* + @rm -rf $(DESTDIR)/$(perllib)/ + @chmod 644 $(DESTDIR)/$(datadir)/perl/csw/*pm + @echo Installing Emacs Git extension + @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ + emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) + @echo Installing devel files + @( cd $(WORKSRC); \ + ginstall -c -m 0755 -d $(ID) $(LD); \ + for f in `find . -name "*.h"`; do \ + dn=`dirname $$f`; \ + ginstall -c -m 0755 -d $(ID)/$$dn; \ + ginstall -c -m 0644 $$f $(ID)/$$dn; \ + done; \ + ginstall -c -m 0444 libgit.a $(LD)/; \ + ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a ) + @echo Installing Bash Completion files + @( cd $(WORKSRC); \ + ginstall -c -m 0755 -d $(BD); \ + cp contrib/completion/* \ + $(BD)/ ) + @( cd $(WORKSRC)/contrib/hooks; \ + perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email; \ + ginstall -c -d -m 0755 $(CONTHOOKS); \ + ginstall -c -m 0644 post-receive-email $(CONTHOOKS) ) + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/git/branches/dublin/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-06-14 22:10:51 UTC (rev 18416) +++ csw/mgar/pkg/git/branches/dublin/checksums 2012-09-01 12:52:22 UTC (rev 19132) @@ -1 +0,0 @@ -549d1863eaf9f680c81f471ff8abcc1a git-1.7.10.3.tar.gz Copied: csw/mgar/pkg/git/branches/dublin/checksums (from rev 18868, csw/mgar/pkg/git/trunk/checksums) =================================================================== --- csw/mgar/pkg/git/branches/dublin/checksums (rev 0) +++ csw/mgar/pkg/git/branches/dublin/checksums 2012-09-01 12:52:22 UTC (rev 19132) @@ -0,0 +1 @@ +0beee35ec7d11756f51ca1d3ec5c0e16 git-1.7.11.tar.gz Deleted: csw/mgar/pkg/git/branches/dublin/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch 2012-06-14 22:10:51 UTC (rev 18416) +++ csw/mgar/pkg/git/branches/dublin/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch 2012-09-01 12:52:22 UTC (rev 19132) @@ -1,31 +0,0 @@ -From 108e986bc5da901b6447afb3ce9687384ad90249 Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Sat, 24 Mar 2012 22:10:17 -0400 -Subject: [PATCH 2/2] Makefile: Set EXTRA_CPPFLAGS during the compilation of - run-command - -When building run-command.o, we want to pass in a define for -SHELL_PATH to ensure that the shell configured at build time is used -at run time when spawning external commands. - -Signed-off-by: Ben Walton ---- - Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/Makefile b/Makefile -index be1957a..344e2e0 100644 ---- a/Makefile -+++ b/Makefile -@@ -1913,6 +1913,8 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ - '-DGIT_MAN_PATH="$(mandir_SQ)"' \ - '-DGIT_INFO_PATH="$(infodir_SQ)"' - -+run-command.o: EXTRA_CPPFLAGS = -DSHELL_PATH='"$(SHELL_PATH)"' -+ - $(BUILT_INS): git$X - $(QUIET_BUILT_IN)$(RM) $@ && \ - ln git$X $@ 2>/dev/null || \ --- -1.7.5.4 - Copied: csw/mgar/pkg/git/branches/dublin/files/0010-t1304-improve-setfacl-prerequisite-setup.patch (from rev 18653, csw/mgar/pkg/git/trunk/files/0010-t1304-improve-setfacl-prerequisite-setup.patch) =================================================================== --- csw/mgar/pkg/git/branches/dublin/files/0010-t1304-improve-setfacl-prerequisite-setup.patch (rev 0) +++ csw/mgar/pkg/git/branches/dublin/files/0010-t1304-improve-setfacl-prerequisite-setup.patch 2012-09-01 12:52:22 UTC (rev 19132) @@ -0,0 +1,66 @@ +From a14ad109115b29483b6e37d18159d850e2752c72 Mon Sep 17 00:00:00 2001 +From: Jeff King +Date: Wed, 6 Jun 2012 09:28:24 -0400 +Subject: [PATCH] t1304: improve setfacl prerequisite setup + +t1304 first runs setfacl as an experiment to see whether the +filesystem supports ACLs, and skips the remaining tests if +it does not. However, our setfacl run did not exercise the +ACLs very well, and some filesystems may support our initial +setfacl, but not the rest of the test. + +In particular, some versions of ecryptfs will erroneously +apply the umask on top of an inherited directory ACL, +causing our tests to fail. Let's be more careful and make +sure both that we can read back the user ACL we set, and +that the inherited ACL is propagated correctly. The latter +catches the ecryptfs bug, but may also catch other bugs +(e.g., an implementation which does not handle inherited +ACLs at all). + +Since we're making the setup more complex, let's move it +into its own test. This will hide the output for us unless +the user wants to run "-v" to see it (and we don't need to +bother printing anything about setfacl failing; the +remaining tests will properly print "skip" due to the +missing prerequisite). + +Signed-off-by: Jeff King +Signed-off-by: Junio C Hamano +--- + t/t1304-default-acl.sh | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh +index 2b962cf..79045ab 100755 +--- a/t/t1304-default-acl.sh ++++ b/t/t1304-default-acl.sh +@@ -14,16 +14,15 @@ umask 077 + # We need an arbitrary other user give permission to using ACLs. root + # is a good candidate: exists on all unices, and it has permission + # anyway, so we don't create a security hole running the testsuite. +- +-setfacl_out="$(setfacl -m u:root:rwx . 2>&1)" +-setfacl_ret=$? +- +-if test $setfacl_ret != 0 +-then +- say "Unable to use setfacl (output: '$setfacl_out'; return code: '$setfacl_ret')" +-else +- test_set_prereq SETFACL +-fi ++test_expect_success 'checking for a working acl setup' ' ++ if setfacl -m d:m:rwx -m u:root:rwx . && ++ getfacl . | grep user:root:rwx && ++ touch should-have-readable-acl && ++ getfacl should-have-readable-acl | egrep "mask::?rw-" ++ then ++ test_set_prereq SETFACL ++ fi ++' + + if test -z "$LOGNAME" + then +-- +1.7.9.5 + Copied: csw/mgar/pkg/git/branches/dublin/files/0011-Use-getpassphrase-instead-of-getpass-when-prompting-.patch (from rev 18875, csw/mgar/pkg/git/trunk/files/0011-Use-getpassphrase-instead-of-getpass-when-prompting-.patch) =================================================================== --- csw/mgar/pkg/git/branches/dublin/files/0011-Use-getpassphrase-instead-of-getpass-when-prompting-.patch (rev 0) +++ csw/mgar/pkg/git/branches/dublin/files/0011-Use-getpassphrase-instead-of-getpass-when-prompting-.patch 2012-09-01 12:52:22 UTC (rev 19132) @@ -0,0 +1,33 @@ +From fe054b8cbe161d01a66637976c1cabad0ce1c973 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 30 Jul 2012 18:13:23 +0200 +Subject: [PATCH] Use getpassphrase instead of getpass when prompting for + passwords + +The legacy getpass function returns at most 9 characters, including +null termination which means an 8-character password. Instead, use +getpassphrase which allows up to 257 characters. + +Mantis ID 4943 + +Signed-off-by: Ben Walton +--- + compat/terminal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compat/terminal.c b/compat/terminal.c +index 6d16c8f..2585436 100644 +--- a/compat/terminal.c ++++ b/compat/terminal.c +@@ -75,7 +75,7 @@ char *git_terminal_prompt(const char *prompt, int echo) + + char *git_terminal_prompt(const char *prompt, int echo) + { +- return getpass(prompt); ++ return getpassphrase(prompt); + } + + #endif +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 2 04:13:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 02 Sep 2012 02:13:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19133] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 19133 http://gar.svn.sourceforge.net/gar/?rev=19133&view=rev Author: bdwalton Date: 2012-09-02 02:13:58 +0000 (Sun, 02 Sep 2012) Log Message: ----------- cas_crontab: futher corrections to umask and permission handling - force ownership on temp file when cleaning out old entries Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2012-09-01 12:52:22 UTC (rev 19132) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcrontab 2012-09-02 02:13:58 UTC (rev 19133) @@ -35,6 +35,7 @@ state=1 rm -f "${cron_file}" touch "${cron_file}" + chown "${USERNAME}" "${cron_file}" while read LINE; do if [ ${state} -eq 1 ]; then if echo "${LINE}" | grep "^# ${crontab_tag} ${cron_id}\$" >/dev/null; then Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2012-09-01 12:52:22 UTC (rev 19132) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcrontab 2012-09-02 02:13:58 UTC (rev 19133) @@ -35,6 +35,7 @@ state=1 rm -f "${cron_file}" touch "${cron_file}" + chown "${USERNAME}" "${cron_file}" while read LINE; do if [ ${state} -eq 1 ]; then if echo "${LINE}" | grep "^# ${crontab_tag} ${cron_id}\$" >/dev/null; then @@ -65,7 +66,7 @@ USERNAME=`/usr/bin/basename $dest` TMPFILE=/tmp/cswcrontab.${PKGINST}.$$ - umask 600 + umask 177 /usr/bin/crontab -l ${USERNAME} | remove_cron_lines "${PKGINST}" "${TMPFILE}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Sep 2 08:22:33 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 02 Sep 2012 06:22:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19134] csw/mgar/pkg/munin/trunk Message-ID: Revision: 19134 http://gar.svn.sourceforge.net/gar/?rev=19134&view=rev Author: j_arndt Date: 2012-09-02 06:22:32 +0000 (Sun, 02 Sep 2012) Log Message: ----------- munin/trunk: update to 2.0.6 Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2012-09-02 02:13:58 UTC (rev 19133) +++ csw/mgar/pkg/munin/trunk/Makefile 2012-09-02 06:22:32 UTC (rev 19134) @@ -1,7 +1,7 @@ -NAME = munin -VERSION = 2.0.4 -CATEGORIES = apps -GARTYPE = v2 +NAME = munin +VERSION = 2.0.6 +CATEGORIES = apps +GARTYPE = v2 define BLURB Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. @@ -19,8 +19,8 @@ PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch -PATCHFILES += 0005-Expand-paths-with-DESTDIR.patch -PATCHFILES += 0006-paths-in-Makefile.config.patch +PATCHFILES += 0006-Expand-paths-with-DESTDIR.patch +PATCHFILES += 0008-paths-in-Makefile.config.patch # # Reinplacements Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2012-09-02 02:13:58 UTC (rev 19133) +++ csw/mgar/pkg/munin/trunk/checksums 2012-09-02 06:22:32 UTC (rev 19134) @@ -1 +1 @@ -5efd93a070159f4554242a0ba38eb0b1 munin-2.0.4.tar.gz +a64e7d3d7a7736f3959092145886ce88 munin-2.0.6.tar.gz Deleted: csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch 2012-09-02 02:13:58 UTC (rev 19133) +++ csw/mgar/pkg/munin/trunk/files/0005-Expand-paths-with-DESTDIR.patch 2012-09-02 06:22:32 UTC (rev 19134) @@ -1,371 +0,0 @@ -From c4dbc877ec6bbc288bc584f8d0d13acd35a2e12b Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sat, 28 Jul 2012 08:19:03 +0200 -Subject: [PATCH 5/6] Expand paths with DESTDIR - ---- - Makefile | 230 +++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 116 insertions(+), 114 deletions(-) - -diff --git a/Makefile b/Makefile -index 7ec659f..8388447 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,6 +9,8 @@ - DEFAULTS = Makefile.config - CONFIG = Makefile.config - -+DESTDIR = -+ - include $(DEFAULTS) - include $(CONFIG) - -@@ -55,8 +57,8 @@ uninstall: - # This removes the installed config so that the next install-pass installs - # a new config. Target _only_ suitable for maintainers. - unconfig: -- rm -f $(HTMLDIR)/.htaccess -- rm -f $(CONFDIR)/munin.conf -+ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess -+ rm -f $(DESTDIR)$(CONFDIR)/munin.conf - - tags: - -rm -f TAGS -@@ -68,63 +70,63 @@ install: install-master-prime install-common-prime install-node-prime install-pl - - install-pre: Makefile Makefile.config - @$(CHECKUSER) -- mkdir -p $(LOGDIR) -- mkdir -p $(STATEDIR) -- mkdir -p $(SPOOLDIR) -- mkdir -p $(CONFDIR) -- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) -+ mkdir -p $(DESTDIR)$(LOGDIR) -+ mkdir -p $(DESTDIR)$(STATEDIR) -+ mkdir -p $(DESTDIR)$(SPOOLDIR) -+ mkdir -p $(DESTDIR)$(CONFDIR) -+ #$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) - - install-master-prime: $(INFILES_MASTER) install-pre install-master -- mkdir -p $(CONFDIR)/templates -- mkdir -p $(CONFDIR)/static -- mkdir -p $(CONFDIR)/templates/partial -- mkdir -p $(CONFDIR)/munin-conf.d -- mkdir -p $(LIBDIR) -- mkdir -p $(BINDIR) -- mkdir -p $(PERLLIB) -- mkdir -p $(PERLLIB)/Munin/Master -- mkdir -p $(HTMLDIR) -- mkdir -p $(DBDIR) -- mkdir -p $(DBDIR)/cgi-tmp -- mkdir -p $(CGIDIR) -- -- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) -- $(CHMOD) 0755 $(DBDIR) -- -- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp -- $(CHMOD) 0755 $(DBDIR)/cgi-tmp -+ mkdir -p $(DESTDIR)$(CONFDIR)/templates -+ mkdir -p $(DESTDIR)$(CONFDIR)/static -+ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial -+ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d -+ mkdir -p $(DESTDIR)$(LIBDIR) -+ mkdir -p $(DESTDIR)$(BINDIR) -+ mkdir -p $(DESTDIR)$(PERLLIB) -+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master -+ mkdir -p $(DESTDIR)$(HTMLDIR) -+ mkdir -p $(DESTDIR)$(DBDIR) -+ mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp -+ mkdir -p $(DESTDIR)$(CGIDIR) -+ -+ #$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) -+ $(CHMOD) 0755 $(DESTDIR)$(DBDIR) -+ -+ #$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp -+ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)/cgi-tmp - - for p in master/www/*.tmpl ; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ - done - - for p in master/static/* ; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \ - done - - for p in master/www/partial/*.tmpl; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ - done - -- $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ -- $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ -+ $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0644 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/ - -- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ -+ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess -+ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ - -- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph -- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html -+ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph -+ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html - - # Not ready to be installed yet --# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -+# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/ - - # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE - # GENERIC ONES -@@ -139,29 +141,29 @@ endif - install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config - @$(CHECKGROUP) - -- mkdir -p $(CONFDIR)/plugins -- mkdir -p $(CONFDIR)/plugin-conf.d -- mkdir -p $(LIBDIR)/plugins -- mkdir -p $(PLUGSTATE) -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d -+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(PLUGSTATE) - -- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) -+ #$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) - # using g+rwxs, so plugins can create and modify their state file without help -- $(CHMOD) 02775 $(PLUGSTATE) -- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d -+ #$(CHMOD) 02775 $(PLUGSTATE) -+ #$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d - - for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ - if test -f "$$p" ; then \ - echo Installing $$p; \ -- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ -+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ - fi \ - done -- $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR) -- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ -- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ -+ $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ -+ $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ - - install-plugins-java: build-plugins-java -- mkdir -p $(JAVALIBDIR) -- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ -+ mkdir -p $(DESTDIR)$(JAVALIBDIR) -+ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ - mkdir -p $(LIBDIR)/plugins - for p in build/plugins/node.d.java/*; do \ - if test -f "$$p" ; then \ -@@ -175,37 +177,37 @@ install-plugins-java: build-plugins-java - # or the packager. - - install-async-prime: -- mkdir -p $(LIBDIR) -- $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/ -- $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/ -+ mkdir -p $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/ - - install-node-prime: install-node-pre install-node - - install-node-pre: build/node/munin-node.conf install-pre -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ -+ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ - - - install-common-prime: build-common install-common - - - install-man: build-man Makefile Makefile.config -- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 -- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ -- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ -- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/ -+ mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 -+ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ -+ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ -+ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/ - - - install-doc: build-doc - mkdir -p $(DOCDIR)/resources -- $(INSTALL) -m 0644 README $(DOCDIR)/ -- $(INSTALL) -m 0644 COPYING $(DOCDIR)/ -- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources -+ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/ -+ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ -+ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources - - ###################################################################### - -@@ -218,29 +220,29 @@ build/%: %.in - @echo "$< -> $@" - @mkdir -p build/`dirname $<` - @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ -- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ -- -e 's|@@BINDIR@@|$(BINDIR)|g' \ -- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ -- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ -- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \ -- -e 's|@@MANDIR@@|$(MANDIR)|g' \ -- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \ -- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \ -- -e 's|@@DBDIR@@|$(DBDIR)|g' \ -- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \ -- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \ -+ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \ -+ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \ -+ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \ -+ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \ -+ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \ -+ -e 's|@@MANDIR@@|$(DESTDIR)$(MANDIR)|g' \ -+ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \ -+ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \ -+ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \ -+ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \ -+ -e 's|@@SPOOLDIR@@|$(DESTDIR)$(SPOOLDIR)|g' \ - -e 's|@@PERL@@|$(PERL)|g' \ -- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \ -+ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \ - -e 's|@@PYTHON@@|$(PYTHON)|g' \ - -e 's|@@RUBY@@|$(RUBY)|g' \ - -e 's|@@JAVARUN@@|$(JAVARUN)|g' \ -- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \ -+ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \ - -e 's|@@OSTYPE@@|$(OSTYPE)|g' \ - -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \ - -e 's|@@MKTEMP@@|$(MKTEMP)|g' \ - -e 's|@@VERSION@@|$(VERSION)|g' \ -- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \ -- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \ -+ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \ -+ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \ - -e 's|@@USER@@|$(USER)|g' \ - -e 's|@@GROUP@@|$(GROUP)|g' \ - -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \ -@@ -258,17 +260,17 @@ build-common-pre: common/Build - common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre - rm -f common/blib/lib/Munin/Common/Defaults.pm - $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \ -- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \ -- s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \ -- s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \ -- s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \ -- s{(LIBDIR \s+=\s).*}{\1q{$(LIBDIR)};}x; \ -- s{(MANDIR \s+=\s).*}{\1q{$(MANDIR)};}x; \ -- s{(LOGDIR \s+=\s).*}{\1q{$(LOGDIR)};}x; \ -- s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \ -- s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \ -- s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \ -- s{(SPOOLDIR \s+=\s).*}{\1q{$(SPOOLDIR)};}x; \ -+ s{(CONFDIR \s+=\s).*}{\1q{$(DESTDIR)$(CONFDIR)};}x; \ -+ s{(BINDIR \s+=\s).*}{\1q{$(DESTDIR)$(BINDIR)};}x; \ -+ s{(SBINDIR \s+=\s).*}{\1q{$(DESTDIR)$(SBINDIR)};}x; \ -+ s{(DOCDIR \s+=\s).*}{\1q{$(DESTDIR)$(DOCDIR)};}x; \ -+ s{(LIBDIR \s+=\s).*}{\1q{$(DESTDIR)$(LIBDIR)};}x; \ -+ s{(MANDIR \s+=\s).*}{\1q{$(DESTDIR)$(MANDIR)};}x; \ -+ s{(LOGDIR \s+=\s).*}{\1q{$(DESTDIR)$(LOGDIR)};}x; \ -+ s{(HTMLDIR \s+=\s).*}{\1q{$(DESTDIR)$(HTMLDIR)};}x; \ -+ s{(DBDIR \s+=\s).*}{\1q{$(DESTDIR)$(DBDIR)};}x; \ -+ s{(STATEDIR \s+=\s).*}{\1q{$(DESTDIR)$(STATEDIR)};}x; \ -+ s{(SPOOLDIR \s+=\s).*}{\1q{$(DESTDIR)$(SPOOLDIR)};}x; \ - s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \ - s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \ - s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \ -@@ -277,8 +279,8 @@ common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm bu - s{(HOSTNAME \s+=\s).*}{\1q{$(HOSTNAME)};}x; \ - s{(MKTEMP \s+=\s).*}{\1q{$(MKTEMP)};}x; \ - s{(VERSION \s+=\s).*}{\1q{$(VERSION)};}x; \ -- s{(PLUGSTATE \s+=\s).*}{\1q{$(PLUGSTATE)};}x; \ -- s{(CGIDIR \s+=\s).*}{\1q{$(CGIDIR)};}x; \ -+ s{(PLUGSTATE \s+=\s).*}{\1q{$(DESTDIR)$(PLUGSTATE)};}x; \ -+ s{(CGIDIR \s+=\s).*}{\1q{$(DESTDIR)$(CGIDIR)};}x; \ - s{(USER \s+=\s).*}{\1q{$(USER)};}x; \ - s{(GROUP \s+=\s).*}{\1q{$(GROUP)};}x; \ - s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ -@@ -384,7 +386,7 @@ old-test: t/*.t - $(MAKE) $@ CONFIG=t/Makefile.config - else - test_plugins = id_default id_root env --old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) -+old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) - @for test in t/*.t; do \ - echo -n "$$test: "; \ - PERL5LIB=$(PERLLIB) $(PERL) $$test;\ -@@ -392,12 +394,12 @@ old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) - endif - - node-monkeywrench: install-node -- rm -rf $(CONFDIR)/plugins -- rm -rf $(LIBDIR)/plugins -- mkdir -p $(LIBDIR)/plugins -- mkdir -p $(CONFDIR)/plugins -- cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ -- $(SBINDIR)/munin-node-configure --suggest -+ rm -rf $(DESTDIR)$(CONFDIR)/plugins -+ rm -rf $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins -+ cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/ -+ $(DESTDIR)$(SBINDIR)/munin-node-configure --suggest - echo 'Done?' - - t/install: -@@ -419,12 +421,12 @@ build-common: common/Build - # can't seem to find a way to persuade it to write otherwhere. - install-%: %/Build - cd $* && $(PERL) Build install \ -- --install_path lib=$(PERLLIB) \ -- --install_path bin=$(BINDIR) \ -- --install_path script=$(BINDIR) \ -- --install_path sbin=$(SBINDIR) \ -- --install_path bindoc=$(MANDIR)/man1 \ -- --install_path libdoc=$(MANDIR)/man3 \ -+ --install_path lib=$(DESTDIR)$(PERLLIB) \ -+ --install_path bin=$(DESTDIR)$(BINDIR) \ -+ --install_path script=$(DESTDIR)$(BINDIR) \ -+ --install_path sbin=$(DESTDIR)$(SBINDIR) \ -+ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \ -+ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \ - - test-%: %/Build - cd $* && $(PERL) Build test --verbose=0 || true --- -1.7.10.3 - Deleted: csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch 2012-09-02 02:13:58 UTC (rev 19133) +++ csw/mgar/pkg/munin/trunk/files/0006-paths-in-Makefile.config.patch 2012-09-02 06:22:32 UTC (rev 19134) @@ -1,120 +0,0 @@ -From c8297f1d1b8d35e75932c9a43060b8dabb7afc54 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sat, 28 Jul 2012 08:25:46 +0200 -Subject: [PATCH 6/6] paths in Makefile.config - ---- - Makefile.config | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/Makefile.config b/Makefile.config -index 5bb6d18..7abbec8 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -17,10 +17,10 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+PREFIX = /opt/csw - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR = /etc/opt/csw/munin - - # Server only - where to put munin-cron - BINDIR = $(PREFIX)/bin -@@ -29,20 +29,20 @@ BINDIR = $(PREFIX)/bin - SBINDIR = $(PREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(PREFIX)/share/doc/munin - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(PREFIX)/share/man - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(PREFIX)/libexec/munin - - # Server only - Output directory --HTMLDIR = $(PREFIX)/www/docs --CGIDIR = $(PREFIX)/www/cgi -+HTMLDIR = /var/opt/csw/munin/www -+CGIDIR = /var/opt/csw/munin/www/cgi-bin - - # Where to put RRD files and other internal data, both master and node --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = /var/opt/csw/munin/db - - # Client only - Where the spool files are written. Must be writable by - # group "munin", and should be preserved between reboots -@@ -53,17 +53,17 @@ SPOOLDIR = $(DBDIR)/spool - PLUGSTATE = $(DBDIR)/plugin-state - - # Where Munin should place its logs. --LOGDIR = $(PREFIX)/log/munin -+LOGDIR = /var/opt/csw/munin/log - - # Location of PID files and other statefiles. On the server, must be - # writable by the user "munin". --STATEDIR = $(DESTDIR)/var/run/munin -+STATEDIR = /var/opt/csw/munin/run - - # The perl interpreter to use --PERL := $(shell which perl) -+PERL := /opt/csw/bin/perl - - # The python interpreter to use (used by some plugins) --PYTHON := /usr/bin/env python -+PYTHON := /opt/csw/bin/python - - # The ruby interpreter to use (used by some plugins) - RUBY := /usr/bin/env ruby -@@ -89,11 +89,11 @@ JAVALIBDIR = $(LIBDIR) - GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` sh -c 'type sh | sed "s/.* //"') - - # Path of bash for bash specific plugins --BASH := /bin/bash -+BASH := /usr/bin/bash - - # Server only - Where to install the perl libraries - PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) --PERLLIB = $(DESTDIR)$(PERLSITELIB) -+PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) - - # Client only - Install plugins for this architecture - # the LANG=C makes tr work as expected, not regarding any locale it -@@ -108,7 +108,7 @@ HOSTNAME := $(shell hostname) - # What is the safest way to create a tempfile. - # Default is to figure it out by testing various methods. - # Replace this with a known platform-specific method --MKTEMP := $(shell ./test-mktemp) -+MKTEMP := $(shell mktemp) - - # Munin version number. - VERSION := $(shell ./getversion) -@@ -126,9 +126,9 @@ CGIUSER := nobody - # Which command to use to check if the USER and GROUP to run Munin as, exists. - # These will work on most modern OSes: - # --GETENT := $(shell which getent || which true 2>/dev/null) --CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) --CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) -+#GETENT := $(shell which getent || which true 2>/dev/null) -+#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - # For OSX, comment out the previous two lines and comment in these - # -@@ -163,4 +163,4 @@ JAR := jar - JCVALID = $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") - - # Check whether setruid functionality can be used --HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) -+HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) --- -1.7.10.3 - Added: csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0007-Expand-paths-with-DESTDIR.patch 2012-09-02 06:22:32 UTC (rev 19134) @@ -0,0 +1,378 @@ +From f99d35160dbf93410d9d542d412be5a84f746d28 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 1 Sep 2012 14:11:45 +0200 +Subject: [PATCH 7/8] Expand-paths-with-DESTDIR + +--- + Makefile | 236 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 119 insertions(+), 117 deletions(-) + +diff --git a/Makefile b/Makefile +index 6a90e53..6e8354d 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,6 +9,8 @@ + DEFAULTS = Makefile.config + CONFIG = Makefile.config + ++DESTDIR = ++ + include $(DEFAULTS) + include $(CONFIG) + +@@ -55,8 +57,8 @@ uninstall: + # This removes the installed config so that the next install-pass installs + # a new config. Target _only_ suitable for maintainers. + unconfig: +- rm -f $(HTMLDIR)/.htaccess +- rm -f $(CONFDIR)/munin.conf ++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess ++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf + + tags: + -rm -f TAGS +@@ -68,63 +70,63 @@ install: install-master-prime install-common-prime install-node-prime install-pl + + install-pre: Makefile Makefile.config + @$(CHECKUSER) +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(SPOOLDIR) +- mkdir -p $(CONFDIR) +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) ++ mkdir -p $(DESTDIR)$(LOGDIR) ++ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(SPOOLDIR) ++ mkdir -p $(DESTDIR)$(CONFDIR) ++ #$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) + + install-master-prime: $(INFILES_MASTER) install-pre install-master +- mkdir -p $(CONFDIR)/templates +- mkdir -p $(CONFDIR)/static +- mkdir -p $(CONFDIR)/templates/partial +- mkdir -p $(CONFDIR)/munin-conf.d +- mkdir -p $(LIBDIR) +- mkdir -p $(BINDIR) +- mkdir -p $(PERLLIB) +- mkdir -p $(PERLLIB)/Munin/Master +- mkdir -p $(HTMLDIR) +- mkdir -p $(DBDIR) +- mkdir -p $(DBDIR)/cgi-tmp +- mkdir -p $(CGIDIR) +- +- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) +- $(CHMOD) 0755 $(DBDIR) +- +- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp +- $(CHMOD) 0755 $(DBDIR)/cgi-tmp ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates ++ mkdir -p $(DESTDIR)$(CONFDIR)/static ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial ++ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) ++ mkdir -p $(DESTDIR)$(PERLLIB) ++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master ++ mkdir -p $(DESTDIR)$(HTMLDIR) ++ mkdir -p $(DESTDIR)$(DBDIR) ++ mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp ++ mkdir -p $(DESTDIR)$(CGIDIR) ++ ++ #$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) ++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR) ++ ++ #$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp ++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)/cgi-tmp + + for p in master/www/*.tmpl ; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ + done + + for p in master/static/* ; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \ + done + + for p in master/www/partial/*.tmpl; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ + done + +- $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ +- $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ ++ $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0644 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/ + +- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ ++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess ++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ + +- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph +- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html ++ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph ++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html + + # Not ready to be installed yet +-# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ ++# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/ + + # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE + # GENERIC ONES +@@ -139,33 +141,33 @@ endif + install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config + @$(CHECKGROUP) + +- mkdir -p $(CONFDIR)/plugins +- mkdir -p $(CONFDIR)/plugin-conf.d +- mkdir -p $(LIBDIR)/plugins +- mkdir -p $(PLUGSTATE) ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(PLUGSTATE) + +- $(CHOWN) root:root $(PLUGSTATE) +- $(CHMOD) 0755 $(PLUGSTATE) +- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d ++ #$(CHOWN) root:root $(PLUGSTATE) ++ #$(CHMOD) 0755 $(DESTDIR)$(PLUGSTATE) ++ #$(CHMOD) 0755 $(DESTDIR)$(CONFDIR)/plugin-conf.d + + for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ + if test -f "$$p" ; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ + done +- $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR) +- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ +- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ ++ $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ ++ $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ + + install-plugins-java: build-plugins-java +- mkdir -p $(JAVALIBDIR) +- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ +- mkdir -p $(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(JAVALIBDIR) ++ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins + for p in build/plugins/node.d.java/*; do \ + if test -f "$$p" ; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ + done + +@@ -175,36 +177,36 @@ install-plugins-java: build-plugins-java + + install-async-prime: + mkdir -p $(LIBDIR) +- $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/ +- $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/ ++ $(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/ + + install-node-prime: install-node-pre install-node + + install-node-pre: build/node/munin-node.conf install-pre +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ ++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ + + + install-common-prime: build-common install-common + + + install-man: build-man Makefile Makefile.config +- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 +- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ +- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ +- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/ ++ mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 ++ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ ++ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ ++ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/ + + + install-doc: build-doc +- mkdir -p $(DOCDIR)/resources +- $(INSTALL) -m 0644 README $(DOCDIR)/ +- $(INSTALL) -m 0644 COPYING $(DOCDIR)/ +- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources ++ mkdir -p $(DESTDIR)$(DOCDIR)/resources ++ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources + + ###################################################################### + +@@ -217,29 +219,29 @@ build/%: %.in + @echo "$< -> $@" + @mkdir -p build/`dirname $<` + @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ +- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ +- -e 's|@@BINDIR@@|$(BINDIR)|g' \ +- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ +- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ +- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \ +- -e 's|@@MANDIR@@|$(MANDIR)|g' \ +- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \ +- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \ +- -e 's|@@DBDIR@@|$(DBDIR)|g' \ +- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \ +- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \ ++ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \ ++ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \ ++ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \ ++ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \ ++ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \ ++ -e 's|@@MANDIR@@|$(DESTDIR)$(MANDIR)|g' \ ++ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \ ++ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \ ++ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \ ++ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \ ++ -e 's|@@SPOOLDIR@@|$(DESTDIR)$(SPOOLDIR)|g' \ + -e 's|@@PERL@@|$(PERL)|g' \ +- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \ ++ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \ + -e 's|@@PYTHON@@|$(PYTHON)|g' \ + -e 's|@@RUBY@@|$(RUBY)|g' \ + -e 's|@@JAVARUN@@|$(JAVARUN)|g' \ +- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \ ++ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \ + -e 's|@@OSTYPE@@|$(OSTYPE)|g' \ + -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \ + -e 's|@@MKTEMP@@|$(MKTEMP)|g' \ + -e 's|@@VERSION@@|$(VERSION)|g' \ +- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \ +- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \ ++ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \ ++ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \ + -e 's|@@USER@@|$(USER)|g' \ + -e 's|@@GROUP@@|$(GROUP)|g' \ + -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \ +@@ -257,27 +259,27 @@ build-common-pre: common/Build + common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre + rm -f common/blib/lib/Munin/Common/Defaults.pm + $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \ +- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \ +- s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \ +- s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \ +- s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \ +- s{(LIBDIR \s+=\s).*}{\1q{$(LIBDIR)};}x; \ +- s{(MANDIR \s+=\s).*}{\1q{$(MANDIR)};}x; \ +- s{(LOGDIR \s+=\s).*}{\1q{$(LOGDIR)};}x; \ +- s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \ +- s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \ +- s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \ +- s{(SPOOLDIR \s+=\s).*}{\1q{$(SPOOLDIR)};}x; \ ++ s{(CONFDIR \s+=\s).*}{\1q{$(DESTDIR)$(CONFDIR)};}x; \ ++ s{(BINDIR \s+=\s).*}{\1q{$(DESTDIR)$(BINDIR)};}x; \ ++ s{(SBINDIR \s+=\s).*}{\1q{$(DESTDIR)$(SBINDIR)};}x; \ ++ s{(DOCDIR \s+=\s).*}{\1q{$(DESTDIR)$(DOCDIR)};}x; \ ++ s{(LIBDIR \s+=\s).*}{\1q{$(DESTDIR)$(LIBDIR)};}x; \ ++ s{(MANDIR \s+=\s).*}{\1q{$(DESTDIR)$(MANDIR)};}x; \ ++ s{(LOGDIR \s+=\s).*}{\1q{$(DESTDIR)$(LOGDIR)};}x; \ ++ s{(HTMLDIR \s+=\s).*}{\1q{$(DESTDIR)$(HTMLDIR)};}x; \ ++ s{(DBDIR \s+=\s).*}{\1q{$(DESTDIR)$(DBDIR)};}x; \ ++ s{(STATEDIR \s+=\s).*}{\1q{$(DESTDIR)$(STATEDIR)};}x; \ ++ s{(SPOOLDIR \s+=\s).*}{\1q{$(DESTDIR)$(SPOOLDIR)};}x; \ + s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \ +- s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \ ++ s{(PERLLIB \s+=\s).*}{\1q{$(DESTDIR)$(PERLLIB)};}x; \ + s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \ + s{(RUBY \s+=\s).*}{\1q{$(RUBY)};}x; \ + s{(OSTYPE \s+=\s).*}{\1q{$(OSTYPE)};}x; \ + s{(HOSTNAME \s+=\s).*}{\1q{$(HOSTNAME)};}x; \ + s{(MKTEMP \s+=\s).*}{\1q{$(MKTEMP)};}x; \ + s{(VERSION \s+=\s).*}{\1q{$(VERSION)};}x; \ +- s{(PLUGSTATE \s+=\s).*}{\1q{$(PLUGSTATE)};}x; \ +- s{(CGIDIR \s+=\s).*}{\1q{$(CGIDIR)};}x; \ ++ s{(PLUGSTATE \s+=\s).*}{\1q{$(DESTDIR)$(PLUGSTATE)};}x; \ ++ s{(CGIDIR \s+=\s).*}{\1q{$(DESTDIR)$(CGIDIR)};}x; \ + s{(USER \s+=\s).*}{\1q{$(USER)};}x; \ + s{(GROUP \s+=\s).*}{\1q{$(GROUP)};}x; \ + s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ +@@ -383,7 +385,7 @@ old-test: t/*.t + $(MAKE) $@ CONFIG=t/Makefile.config + else + test_plugins = id_default id_root env +-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) ++old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) + @for test in t/*.t; do \ + echo -n "$$test: "; \ + PERL5LIB=$(PERLLIB) $(PERL) $$test;\ +@@ -391,12 +393,12 @@ old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) + endif + + node-monkeywrench: install-node +- rm -rf $(CONFDIR)/plugins +- rm -rf $(LIBDIR)/plugins +- mkdir -p $(LIBDIR)/plugins +- mkdir -p $(CONFDIR)/plugins +- cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ +- $(SBINDIR)/munin-node-configure --suggest ++ rm -rf $(DESTDIR)$(CONFDIR)/plugins ++ rm -rf $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins ++ cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/ ++ $(DESTDIR)$(SBINDIR)/munin-node-configure --suggest + echo 'Done?' + + t/install: +@@ -418,12 +420,12 @@ build-common: common/Build + # can't seem to find a way to persuade it to write otherwhere. + install-%: %/Build + cd $* && $(PERL) Build install \ +- --install_path lib=$(PERLLIB) \ +- --install_path bin=$(BINDIR) \ +- --install_path script=$(BINDIR) \ +- --install_path sbin=$(SBINDIR) \ +- --install_path bindoc=$(MANDIR)/man1 \ +- --install_path libdoc=$(MANDIR)/man3 \ ++ --install_path lib=$(DESTDIR)$(PERLLIB) \ ++ --install_path bin=$(DESTDIR)$(BINDIR) \ ++ --install_path script=$(DESTDIR)$(BINDIR) \ ++ --install_path sbin=$(DESTDIR)$(SBINDIR) \ ++ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \ ++ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \ + + test-%: %/Build + cd $* && $(PERL) Build test --verbose=0 || true +-- +1.7.11.3 + Added: csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0008-paths-in-Makefile.config.patch 2012-09-02 06:22:32 UTC (rev 19134) @@ -0,0 +1,124 @@ +From d9e20050b6a2536ca454bdfbe358651168bfb04f Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sat, 1 Sep 2012 14:19:33 +0200 +Subject: [PATCH 8/8] paths in Makefile.config + +--- + Makefile.config | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/Makefile.config b/Makefile.config +index 9a762fa..d36b37e 100644 +--- a/Makefile.config ++++ b/Makefile.config +@@ -17,10 +17,10 @@ + # + # the base of the Munin installation. + # +-PREFIX = $(DESTDIR)/opt/munin ++PREFIX = /opt/csw + + # Where Munin keeps its configurations (server.conf, client.conf, ++) +-CONFDIR = $(DESTDIR)/etc/opt/munin ++CONFDIR = /etc/opt/csw/munin + + # Server only - where to put munin-cron + BINDIR = $(PREFIX)/bin +@@ -29,23 +29,23 @@ BINDIR = $(PREFIX)/bin + SBINDIR = $(PREFIX)/sbin + + # Where to put text and html documentation +-DOCDIR = $(PREFIX)/doc ++DOCDIR = $(PREFIX)/share/doc/munin + + # Where to put man pages +-MANDIR = $(PREFIX)/man ++MANDIR = $(PREFIX)/share/man + + # Where to put internal binaries and plugin repository +-LIBDIR = $(PREFIX)/lib ++LIBDIR = $(PREFIX)/libexec/munin + + # Server only - Output directory +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi ++HTMLDIR = /var/opt/csw/munin/www ++CGIDIR = /var/opt/csw/munin/www/cgi-bin + + # Where to put internal data for master (RRD, internal files, ...) +-DBDIR = $(DESTDIR)/var/opt/munin ++DBDIR = /var/opt/csw/munin/db + + # Where to put internal data for node (plugin state, ...) +-DBDIRNODE = $(DESTDIR)/var/opt/munin-node ++DBDIRNODE = /var/opt/csw/db/munin-node + + # Client only - Where the spool files are written. Must be writable by + # group "munin", and should be preserved between reboots +@@ -56,17 +56,17 @@ SPOOLDIR = $(DBDIR)/spool + PLUGSTATE = $(DBDIRNODE)/plugin-state + + # Where Munin should place its logs. +-LOGDIR = $(PREFIX)/log/munin ++LOGDIR = /var/opt/csw/munin/log + + # Location of PID files and other statefiles. On the server, must be + # writable by the user "munin". +-STATEDIR = $(DESTDIR)/var/run/munin ++STATEDIR = /var/opt/csw/munin/run + + # The perl interpreter to use +-PERL := $(shell which perl) ++PERL := /opt/csw/bin/perl + + # The python interpreter to use (used by some plugins) +-PYTHON := /usr/bin/env python ++PYTHON := /opt/csw/bin/python + + # The ruby interpreter to use (used by some plugins) + RUBY := /usr/bin/env ruby +@@ -92,11 +92,11 @@ JAVALIBDIR = $(LIBDIR) + GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` sh -c 'type sh | sed "s/.* //"') + + # Path of bash for bash specific plugins +-BASH := /bin/bash ++BASH := /usr/bin/bash + + # Server only - Where to install the perl libraries + PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) +-PERLLIB = $(DESTDIR)$(PERLSITELIB) ++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) + + # Client only - Install plugins for this architecture + # the LANG=C makes tr work as expected, not regarding any locale it +@@ -111,7 +111,7 @@ HOSTNAME := $(shell hostname) + # What is the safest way to create a tempfile. + # Default is to figure it out by testing various methods. + # Replace this with a known platform-specific method +-MKTEMP := $(shell ./test-mktemp) ++MKTEMP := $(shell mktemp) + + # Munin version number. + VERSION := $(shell ./getversion) +@@ -129,9 +129,9 @@ CGIUSER := nobody + # Which command to use to check if the USER and GROUP to run Munin as, exists. + # These will work on most modern OSes: + # +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++#GETENT := $(shell which getent || which true 2>/dev/null) ++#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) ++#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) + + # For OSX, comment out the previous two lines and comment in these + # +@@ -169,4 +169,4 @@ JAR := jar + JCVALID = $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") + + # Check whether setruid functionality can be used +-HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) ++HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) +-- +1.7.11.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Sep 2 08:29:22 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 02 Sep 2012 06:29:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19135] csw/mgar/pkg/munin/trunk/Makefile Message-ID: Revision: 19135 http://gar.svn.sourceforge.net/gar/?rev=19135&view=rev Author: j_arndt Date: 2012-09-02 06:29:21 +0000 (Sun, 02 Sep 2012) Log Message: ----------- munin/trunk: fixed typo Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2012-09-02 06:22:32 UTC (rev 19134) +++ csw/mgar/pkg/munin/trunk/Makefile 2012-09-02 06:29:21 UTC (rev 19135) @@ -19,7 +19,7 @@ PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch -PATCHFILES += 0006-Expand-paths-with-DESTDIR.patch +PATCHFILES += 0007-Expand-paths-with-DESTDIR.patch PATCHFILES += 0008-paths-in-Makefile.config.patch # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Sep 2 15:51:54 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 02 Sep 2012 13:51:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19136] csw/mgar/pkg/git/branches/dublin/Makefile Message-ID: Revision: 19136 http://gar.svn.sourceforge.net/gar/?rev=19136&view=rev Author: bdwalton Date: 2012-09-02 13:51:54 +0000 (Sun, 02 Sep 2012) Log Message: ----------- git/branches/dublin: correct version in dublin build Modified Paths: -------------- csw/mgar/pkg/git/branches/dublin/Makefile Modified: csw/mgar/pkg/git/branches/dublin/Makefile =================================================================== --- csw/mgar/pkg/git/branches/dublin/Makefile 2012-09-02 06:29:21 UTC (rev 19135) +++ csw/mgar/pkg/git/branches/dublin/Makefile 2012-09-02 13:51:54 UTC (rev 19136) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.11 +VERSION = 1.7.12 DISTNAME = $(NAME)-$(VERSION) CATEGORIES = devel GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Sep 4 02:14:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 04 Sep 2012 00:14:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19137] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 19137 http://gar.svn.sourceforge.net/gar/?rev=19137&view=rev Author: bdwalton Date: 2012-09-04 00:14:25 +0000 (Tue, 04 Sep 2012) Log Message: ----------- git/trunk: add libiconv_dev as a build dependency Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-09-02 13:51:54 UTC (rev 19136) +++ csw/mgar/pkg/git/trunk/Makefile 2012-09-04 00:14:25 UTC (rev 19137) @@ -64,6 +64,7 @@ BUILD_DEP_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs BUILD_DEP_PKGS += CSWpython +BUILD_DEP_PKGS += CSWlibiconv-dev RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgit += CSWosshclient CSWlibiconv2 CSWlibexpat1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Sep 4 02:15:54 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 04 Sep 2012 00:15:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19138] csw/mgar/pkg/git/branches/dublin Message-ID: Revision: 19138 http://gar.svn.sourceforge.net/gar/?rev=19138&view=rev Author: bdwalton Date: 2012-09-04 00:15:54 +0000 (Tue, 04 Sep 2012) Log Message: ----------- git/branches/dublin: remove WORKDIR setting, add libiconv_dev build dep, drop another old patch, update makesums Modified Paths: -------------- csw/mgar/pkg/git/branches/dublin/Makefile csw/mgar/pkg/git/branches/dublin/checksums Modified: csw/mgar/pkg/git/branches/dublin/Makefile =================================================================== --- csw/mgar/pkg/git/branches/dublin/Makefile 2012-09-04 00:14:25 UTC (rev 19137) +++ csw/mgar/pkg/git/branches/dublin/Makefile 2012-09-04 00:15:54 UTC (rev 19138) @@ -4,8 +4,6 @@ CATEGORIES = devel GARTYPE = v2 -WORKDIR = $(WORKROOTDIR)/ - PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc VENDOR_URL = http://git-scm.org/ @@ -61,6 +59,7 @@ BUILD_DEP_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs BUILD_DEP_PKGS += CSWpython +BUILD_DEP_PKGS += CSWlibiconv-dev RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgit += CSWosshclient CSWlibiconv2 CSWlibexpat1 @@ -118,7 +117,6 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch -PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/branches/dublin/checksums =================================================================== --- csw/mgar/pkg/git/branches/dublin/checksums 2012-09-04 00:14:25 UTC (rev 19137) +++ csw/mgar/pkg/git/branches/dublin/checksums 2012-09-04 00:15:54 UTC (rev 19138) @@ -1 +1 @@ -0beee35ec7d11756f51ca1d3ec5c0e16 git-1.7.11.tar.gz +ceb1a6b17a3e33bbc70eadf8fce5876c git-1.7.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at users.sourceforge.net Tue Sep 4 10:45:10 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Tue, 04 Sep 2012 08:45:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19139] csw/mgar/pkg/lang-python/salt/trunk Message-ID: Revision: 19139 http://gar.svn.sourceforge.net/gar/?rev=19139&view=rev Author: romeotheriault Date: 2012-09-04 08:45:10 +0000 (Tue, 04 Sep 2012) Log Message: ----------- lang-python/salt/trunk: Added template config files and also init/smf scripts Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 00:15:54 UTC (rev 19138) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 08:45:10 UTC (rev 19139) @@ -1,5 +1,3 @@ -#TODO: -# * Create init scripts NAME = salt VERSION = 0.10.2 GARTYPE = v2 @@ -11,7 +9,9 @@ endef MASTER_SITES = https://github.com/downloads/saltstack/salt/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += cswsalt-minion +DISTFILES += cswsalt-master RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-yaml RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-m2crypto @@ -20,7 +20,7 @@ RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack-python -#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted +CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-m2crypto CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-yaml @@ -47,6 +47,11 @@ TEST_SCRIPTS = +INITSMF += $(sysconfdir)/init.d/cswsalt-minion +INITSMF += $(sysconfdir)/init.d/cswsalt-master +PRESERVECONF += $(sysconfdir)/salt/minion +PRESERVECONF += $(sysconfdir)/salt/master + include gar/category.mk post-install-modulated: CONFDEST = $(DESTDIR)$(sysconfdir)/salt @@ -56,6 +61,15 @@ # Copy config files (upstream) ginstall -d $(CONFDEST) cp $(addprefix $(WORKSRC)/conf/,$(CONFS)) $(CONFDEST) + gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/master.template + gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/minion.template + gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/master.template + gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/minion.template + mv $(CONFDEST)/minion.template $(CONFDEST)/minion + mv $(CONFDEST)/master.template $(CONFDEST)/master + # Copy init script in place + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/cswsalt-minion $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/cswsalt-master $(DESTDIR)$(sysconfdir)/init.d @$(MAKECOOKIE) - Added: csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master (rev 0) +++ csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master 2012-09-04 08:45:10 UTC (rev 19139) @@ -0,0 +1,41 @@ +#!/bin/sh +# +#AUTOENABLE no +# + +PATH=/opt/csw/bin:$PATH +export PATH +CONF_FILE=/etc/opt/csw/salt/master +PIDFILE=/var/run/salt-master.pid +SALTMASTER=/opt/csw/bin/salt-master + +[ ! -f ${CONF_FILE} ] && exit $CONF_FILE + +start_service() { + /bin/rm -f ${PIDFILE} + $SALTMASTER -d -c ${CONF_FILE} 2>&1 +} + +stop_service() { + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` + fi +} + +case "$1" in +start) + start_service + ;; +stop) + stop_service + ;; +restart) + stop_service + sleep 1 + start_service + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac Added: csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion (rev 0) +++ csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion 2012-09-04 08:45:10 UTC (rev 19139) @@ -0,0 +1,41 @@ +#!/bin/sh +# +#AUTOENABLE no +# + +PATH=/opt/csw/bin:$PATH +export PATH +CONF_FILE=/etc/opt/csw/salt/minion +PIDFILE=/var/run/salt-minion.pid +SALTMINION=/opt/csw/bin/salt-minion + +[ ! -f ${CONF_FILE} ] && exit $CONF_FILE + +start_service() { + /bin/rm -f ${PIDFILE} + $SALTMINION -d -c ${CONF_FILE} 2>&1 +} + +stop_service() { + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` + fi +} + +case "$1" in +start) + start_service + ;; +stop) + stop_service + ;; +restart) + stop_service + sleep 1 + start_service + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at users.sourceforge.net Tue Sep 4 10:47:12 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Tue, 04 Sep 2012 08:47:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19140] csw/mgar/pkg/lang-python/salt/trunk/Makefile Message-ID: Revision: 19140 http://gar.svn.sourceforge.net/gar/?rev=19140&view=rev Author: romeotheriault Date: 2012-09-04 08:47:12 +0000 (Tue, 04 Sep 2012) Log Message: ----------- lang-python/salt/trunk: Comment out uncommited line Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 08:45:10 UTC (rev 19139) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 08:47:12 UTC (rev 19140) @@ -20,7 +20,7 @@ RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack-python -CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted +#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-m2crypto CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-yaml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 4 14:45:19 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Sep 2012 12:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19141] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 19141 http://gar.svn.sourceforge.net/gar/?rev=19141&view=rev Author: janholzh Date: 2012-09-04 12:45:19 +0000 (Tue, 04 Sep 2012) Log Message: ----------- sudo/trunk: Update to 1.8.6 rebuild on all platforms for least priv support add -Bdirect Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-09-04 08:47:12 UTC (rev 19140) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-09-04 12:45:19 UTC (rev 19141) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.5p3 +VERSION = 1.8.6 CATEGORIES = utils GARTYPE = v2 @@ -25,6 +25,9 @@ VENDOR_URL = http://www.sudo.ws +# To have least Priv Support for Solaris 10 build on all Platforms +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 + PACKAGES += CSWsudo SPKG_DESC_CSWsudo = Provides limited super user privileges # PKGFILES is catchall @@ -97,7 +100,7 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_LDAP-$(LDAP)) -EXTRA_LINKER_FLAGS = -z ignore +EXTRA_LINKER_FLAGS = -Bdirect -z ignore FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2012-09-04 08:47:12 UTC (rev 19140) +++ csw/mgar/pkg/sudo/trunk/checksums 2012-09-04 12:45:19 UTC (rev 19141) @@ -1 +1 @@ -aa50e0a9ca02ac35d1020881bd3a221f sudo-1.8.5p3.tar.gz +ffa2720ea09bc70023c4ad4cd3d0667d sudo-1.8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 4 15:08:30 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Sep 2012 13:08:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19142] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 19142 http://gar.svn.sourceforge.net/gar/?rev=19142&view=rev Author: janholzh Date: 2012-09-04 13:08:30 +0000 (Tue, 04 Sep 2012) Log Message: ----------- sudo/trunk: add mapfile to link against older libc Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sudo/trunk/files/map.sudo Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-09-04 12:45:19 UTC (rev 19141) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-09-04 13:08:30 UTC (rev 19142) @@ -20,6 +20,7 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += sudo.conf.CSW +DISTFILES += map.sudo LICENSE = doc/LICENSE @@ -100,7 +101,7 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_LDAP-$(LDAP)) -EXTRA_LINKER_FLAGS = -Bdirect -z ignore +EXTRA_LINKER_FLAGS = -Bdirect -z ignore -M "$(abspath $(WORKDIR)/map.sudo)" FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) Added: csw/mgar/pkg/sudo/trunk/files/map.sudo =================================================================== --- csw/mgar/pkg/sudo/trunk/files/map.sudo (rev 0) +++ csw/mgar/pkg/sudo/trunk/files/map.sudo 2012-09-04 13:08:30 UTC (rev 19142) @@ -0,0 +1,2 @@ +libc.so - SUNW_1.22.5 SUNWprivate_1.1; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 4 15:17:50 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Sep 2012 13:17:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19143] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 19143 http://gar.svn.sourceforge.net/gar/?rev=19143&view=rev Author: janholzh Date: 2012-09-04 13:17:50 +0000 (Tue, 04 Sep 2012) Log Message: ----------- sudo/trunk: use mapfile only on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-09-04 13:08:30 UTC (rev 19142) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-09-04 13:17:50 UTC (rev 19143) @@ -101,8 +101,12 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_LDAP-$(LDAP)) -EXTRA_LINKER_FLAGS = -Bdirect -z ignore -M "$(abspath $(WORKDIR)/map.sudo)" +EXTRA_LINKER_FLAGS = -Bdirect -z ignore +# Add Mapfile for Solaris10 +EXTRA_LINKER_FLAGS_5.10 = -M "$(abspath $(WORKDIR)/map.sudo)" +EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GAROSREL)) + FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) PROTOTYPE_MODIFIERS += sudo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 4 16:27:37 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 04 Sep 2012 14:27:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19144] csw/mgar/pkg/tomcat7/trunk Message-ID: Revision: 19144 http://gar.svn.sourceforge.net/gar/?rev=19144&view=rev Author: janholzh Date: 2012-09-04 14:27:37 +0000 (Tue, 04 Sep 2012) Log Message: ----------- tomcat7/trunk: update to Version 7.0.29 Modified Paths: -------------- csw/mgar/pkg/tomcat7/trunk/Makefile csw/mgar/pkg/tomcat7/trunk/checksums Modified: csw/mgar/pkg/tomcat7/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat7/trunk/Makefile 2012-09-04 13:17:50 UTC (rev 19143) +++ csw/mgar/pkg/tomcat7/trunk/Makefile 2012-09-04 14:27:37 UTC (rev 19144) @@ -1,5 +1,5 @@ NAME = tomcat7 -VERSION = 7.0.27 +VERSION = 7.0.29 CATEGORIES = server GARTYPE = v2 @@ -9,7 +9,7 @@ endef VENDOR_URL = http://tomcat.apache.org/ -MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/v$(VERSION)/bin/ +MASTER_SITES = http://apache.mirror.digionline.de/tomcat/tomcat-7/v$(VERSION)/bin/ UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-7/v$(VERSION)/bin/ DISTFILES = apache-tomcat-$(VERSION).tar.gz PKGDIST = apache-tomcat-$(VERSION).tar.gz Modified: csw/mgar/pkg/tomcat7/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat7/trunk/checksums 2012-09-04 13:17:50 UTC (rev 19143) +++ csw/mgar/pkg/tomcat7/trunk/checksums 2012-09-04 14:27:37 UTC (rev 19144) @@ -1 +1 @@ -486769ec1094fb45f000d30f237b3643 apache-tomcat-7.0.27.tar.gz +307076fa3827e19fa9b03f3ef7cf1f3f apache-tomcat-7.0.29.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Sep 4 18:57:26 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 4 Sep 2012 17:57:26 +0100 Subject: [csw-devel] SF.net SVN: gar:[19140] csw/mgar/pkg/lang-python/salt/trunk/Makefile In-Reply-To: References: Message-ID: 2012/9/4 : > Revision: 19140 > http://gar.svn.sourceforge.net/gar/?rev=19140&view=rev > Author: romeotheriault > Date: 2012-09-04 08:47:12 +0000 (Tue, 04 Sep 2012) > Log Message: > ----------- > lang-python/salt/trunk: Comment out uncommited line > > Modified Paths: > -------------- > csw/mgar/pkg/lang-python/salt/trunk/Makefile > > Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 08:45:10 UTC (rev 19139) > +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 08:47:12 UTC (rev 19140) > @@ -20,7 +20,7 @@ > RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq > RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack-python > > -CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted > +#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted What was the reason you were adding this override? From maciej at opencsw.org Tue Sep 4 19:03:01 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 4 Sep 2012 18:03:01 +0100 Subject: [csw-devel] SF.net SVN: gar:[19097] csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile In-Reply-To: References: Message-ID: 2012/8/26 : > # For GNU gettext > -PATH := /opt/csw/gnu:$(PATH) > +CONFIGURE_ENV += XGETTEXT=/opt/csw/gnu/xgettext > +CONFIGURE_ENV += MSGMERGE=/opt/csw/gnu/msgmerge > +CONFIGURE_ENV += MSGFMT=/opt/csw/gnu/msgfmt I was curious if there wasn't a more specific GAR abstraction for this, e.g. extra env flags that GAR would put together for you. From maciej at opencsw.org Tue Sep 4 19:04:02 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 4 Sep 2012 18:04:02 +0100 Subject: [csw-devel] SF.net SVN: gar:[19095] csw/mgar/pkg/lang-python/salt/trunk In-Reply-To: References: Message-ID: 2012/8/26 : > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/states/pkgng.py > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pkgng.py > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/poudriere.py > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cassandra.py Instead of all these specific overrides, you can add one general one: CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content It will apply to all files in the package. From romeotheriault at opencsw.org Tue Sep 4 22:34:21 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Tue, 04 Sep 2012 10:34:21 -1000 Subject: [csw-devel] SF.net SVN: gar:[19095] csw/mgar/pkg/lang-python/salt/trunk In-Reply-To: References: Message-ID: On Tue, Sep 4, 2012 at 7:04 AM, Maciej (Matchek) Blizi?ski < maciej at opencsw.org> wrote: > 2012/8/26 : > > +CHECKPKG_OVERRIDES_CSWpy-salt += > file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/states/pkgng.py > > +CHECKPKG_OVERRIDES_CSWpy-salt += > file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pkgng.py > > +CHECKPKG_OVERRIDES_CSWpy-salt += > file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/poudriere.py > > +CHECKPKG_OVERRIDES_CSWpy-salt += > file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cassandra.py > > Instead of all these specific overrides, you can add one general one: > > CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content > > It will apply to all files in the package. > Ahh, cool! Great to know. Thanks. Romeo -------------- next part -------------- An HTML attachment was scrubbed... URL: From romeotheriault at opencsw.org Tue Sep 4 22:39:14 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Tue, 04 Sep 2012 10:39:14 -1000 Subject: [csw-devel] Fwd: SF.net SVN: gar:[19140] csw/mgar/pkg/lang-python/salt/trunk/Makefile In-Reply-To: References: Message-ID: On Tue, Sep 4, 2012 at 6:57 AM, Maciej (Matchek) Blizi?ski < maciej at opencsw.org> wrote: > 2012/9/4 : > > -CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted > > +#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted > > What was the reason you were adding this override? > Basically, so I can test a full build process before I commit to make sure I have everything working correctly before I commit. Romeo -------------- next part -------------- An HTML attachment was scrubbed... URL: From romeotheriault at users.sourceforge.net Tue Sep 4 22:48:32 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Tue, 04 Sep 2012 20:48:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19145] csw/mgar/pkg/lang-python/salt/trunk/Makefile Message-ID: Revision: 19145 http://gar.svn.sourceforge.net/gar/?rev=19145&view=rev Author: romeotheriault Date: 2012-09-04 20:48:32 +0000 (Tue, 04 Sep 2012) Log Message: ----------- lang-python/salt/trunk: add a global file-with-bad-content over-ride Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 14:27:37 UTC (rev 19144) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 20:48:32 UTC (rev 19145) @@ -29,17 +29,7 @@ CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-pyzmq CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-msgpack-python -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/share/man/man7/salt.7 -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cron.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/rvm.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/freebsdservice.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/brew.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pip.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/salt/modules/tomcat.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/states/pkgng.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pkgng.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/poudriere.py -CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cassandra.py +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content ARCHALL_CSWpy-salt = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Tue Sep 4 22:53:51 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Tue, 04 Sep 2012 20:53:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19146] csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Message-ID: Revision: 19146 http://gar.svn.sourceforge.net/gar/?rev=19146&view=rev Author: guillomovitch Date: 2012-09-04 20:53:51 +0000 (Tue, 04 Sep 2012) Log Message: ----------- use /etc/opt/csw/fusioninventory as configuration directory Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-04 20:48:32 UTC (rev 19145) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-04 20:53:51 UTC (rev 19146) @@ -40,7 +40,7 @@ RUNTIME_DEP_PKGS += CSWmemconf PATCHFILES += 0001-don-t-install-a-private-memconf-copy.patch -CONFIGURE_ARGS = PREFIX=/opt/csw SYSCONFDIR=/etc/opt/csw +CONFIGURE_ARGS = PREFIX=/opt/csw SYSCONFDIR=/etc/opt/csw/fusioninventory # skip tests SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Sep 5 01:31:37 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 5 Sep 2012 00:31:37 +0100 Subject: [csw-devel] SF.net SVN: gar:[19140] csw/mgar/pkg/lang-python/salt/trunk/Makefile In-Reply-To: References: Message-ID: 2012/9/4 Romeo Theriault > On Tue, Sep 4, 2012 at 6:57 AM, Maciej (Matchek) Blizi?ski < > maciej at opencsw.org> wrote: > >> 2012/9/4 : >> > -CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted >> > +#CHECKPKG_OVERRIDES_CSWpy-salt += >> pkginfo-opencsw-repository-uncommitted >> >> What was the reason you were adding this override? >> > > Basically, so I can test a full build process before I commit to make sure > I have everything working correctly before I commit. > This error tag informs you that you haven't committed the recipe (which you know anyway most of the time, but humanum est errare). You can work until the pkginfo-opencsw-repository-uncommitted is the only error tag you see. Then you commit, run "mgar repackage" once more and all the error tags are gone ? which is what you want. This is the safest way, highly recommended. Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From romeotheriault at opencsw.org Wed Sep 5 01:56:37 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Tue, 04 Sep 2012 13:56:37 -1000 Subject: [csw-devel] SF.net SVN: gar:[19140] csw/mgar/pkg/lang-python/salt/trunk/Makefile In-Reply-To: References: Message-ID: On Tue, Sep 4, 2012 at 1:31 PM, Maciej (Matchek) Blizi?ski < maciej at opencsw.org> wrote: > 2012/9/4 Romeo Theriault > >> On Tue, Sep 4, 2012 at 6:57 AM, Maciej (Matchek) Blizi?ski < >> maciej at opencsw.org> wrote: >> >>> 2012/9/4 : >>> > -CHECKPKG_OVERRIDES_CSWpy-salt += >>> pkginfo-opencsw-repository-uncommitted >>> > +#CHECKPKG_OVERRIDES_CSWpy-salt += >>> pkginfo-opencsw-repository-uncommitted >>> >>> What was the reason you were adding this override? >>> >> >> Basically, so I can test a full build process before I commit to make >> sure I have everything working correctly before I commit. >> > > This error tag informs you that you haven't committed the recipe (which > you know anyway most of the time, but humanum est errare). You can work > until the pkginfo-opencsw-repository-uncommitted is the only error tag you > see. Then you commit, run "mgar repackage" once more and all the error tags > are gone ? which is what you want. This is the safest way, highly > recommended. > Makes sense. I'll give that a try. Thanks. Romeo -------------- next part -------------- An HTML attachment was scrubbed... URL: From romeotheriault at users.sourceforge.net Wed Sep 5 04:44:52 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Wed, 05 Sep 2012 02:44:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[19147] csw/mgar/pkg/lang-python/salt/trunk Message-ID: Revision: 19147 http://gar.svn.sourceforge.net/gar/?rev=19147&view=rev Author: romeotheriault Date: 2012-09-05 02:44:51 +0000 (Wed, 05 Sep 2012) Log Message: ----------- lang-python/salt/trunk: change smf names and remove uncommited line Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion Removed Paths: ------------- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 20:53:51 UTC (rev 19146) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-05 02:44:51 UTC (rev 19147) @@ -10,8 +10,8 @@ MASTER_SITES = https://github.com/downloads/saltstack/salt/ DISTFILES += $(DISTNAME).tar.gz -DISTFILES += cswsalt-minion -DISTFILES += cswsalt-master +DISTFILES += salt-minion +DISTFILES += salt-master RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-yaml RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-m2crypto @@ -20,8 +20,6 @@ RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack-python -#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted - CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-m2crypto CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-yaml CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-crypto @@ -37,8 +35,8 @@ TEST_SCRIPTS = -INITSMF += $(sysconfdir)/init.d/cswsalt-minion -INITSMF += $(sysconfdir)/init.d/cswsalt-master +INITSMF += $(sysconfdir)/init.d/salt-minion +INITSMF += $(sysconfdir)/init.d/salt-master PRESERVECONF += $(sysconfdir)/salt/minion PRESERVECONF += $(sysconfdir)/salt/master @@ -59,7 +57,7 @@ mv $(CONFDEST)/master.template $(CONFDEST)/master # Copy init script in place ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 755 $(DOWNLOADDIR)/cswsalt-minion $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 755 $(DOWNLOADDIR)/cswsalt-master $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/salt-minion $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/salt-master $(DESTDIR)$(sysconfdir)/init.d @$(MAKECOOKIE) Deleted: csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master 2012-09-04 20:53:51 UTC (rev 19146) +++ csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master 2012-09-05 02:44:51 UTC (rev 19147) @@ -1,41 +0,0 @@ -#!/bin/sh -# -#AUTOENABLE no -# - -PATH=/opt/csw/bin:$PATH -export PATH -CONF_FILE=/etc/opt/csw/salt/master -PIDFILE=/var/run/salt-master.pid -SALTMASTER=/opt/csw/bin/salt-master - -[ ! -f ${CONF_FILE} ] && exit $CONF_FILE - -start_service() { - /bin/rm -f ${PIDFILE} - $SALTMASTER -d -c ${CONF_FILE} 2>&1 -} - -stop_service() { - if [ -f "$PIDFILE" ]; then - /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` - fi -} - -case "$1" in -start) - start_service - ;; -stop) - stop_service - ;; -restart) - stop_service - sleep 1 - start_service - ;; -*) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac Deleted: csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion 2012-09-04 20:53:51 UTC (rev 19146) +++ csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion 2012-09-05 02:44:51 UTC (rev 19147) @@ -1,41 +0,0 @@ -#!/bin/sh -# -#AUTOENABLE no -# - -PATH=/opt/csw/bin:$PATH -export PATH -CONF_FILE=/etc/opt/csw/salt/minion -PIDFILE=/var/run/salt-minion.pid -SALTMINION=/opt/csw/bin/salt-minion - -[ ! -f ${CONF_FILE} ] && exit $CONF_FILE - -start_service() { - /bin/rm -f ${PIDFILE} - $SALTMINION -d -c ${CONF_FILE} 2>&1 -} - -stop_service() { - if [ -f "$PIDFILE" ]; then - /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` - fi -} - -case "$1" in -start) - start_service - ;; -stop) - stop_service - ;; -restart) - stop_service - sleep 1 - start_service - ;; -*) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac Added: csw/mgar/pkg/lang-python/salt/trunk/files/salt-master =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master (rev 0) +++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-master 2012-09-05 02:44:51 UTC (rev 19147) @@ -0,0 +1,41 @@ +#!/bin/sh +# +#AUTOENABLE no +# + +PATH=/opt/csw/bin:$PATH +export PATH +CONF_FILE=/etc/opt/csw/salt/master +PIDFILE=/var/run/salt-master.pid +SALTMASTER=/opt/csw/bin/salt-master + +[ ! -f ${CONF_FILE} ] && exit $CONF_FILE + +start_service() { + /bin/rm -f ${PIDFILE} + $SALTMASTER -d -c ${CONF_FILE} 2>&1 +} + +stop_service() { + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` + fi +} + +case "$1" in +start) + start_service + ;; +stop) + stop_service + ;; +restart) + stop_service + sleep 1 + start_service + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac Added: csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion (rev 0) +++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion 2012-09-05 02:44:51 UTC (rev 19147) @@ -0,0 +1,41 @@ +#!/bin/sh +# +#AUTOENABLE no +# + +PATH=/opt/csw/bin:$PATH +export PATH +CONF_FILE=/etc/opt/csw/salt/minion +PIDFILE=/var/run/salt-minion.pid +SALTMINION=/opt/csw/bin/salt-minion + +[ ! -f ${CONF_FILE} ] && exit $CONF_FILE + +start_service() { + /bin/rm -f ${PIDFILE} + $SALTMINION -d -c ${CONF_FILE} 2>&1 +} + +stop_service() { + if [ -f "$PIDFILE" ]; then + /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE` + fi +} + +case "$1" in +start) + start_service + ;; +stop) + stop_service + ;; +restart) + stop_service + sleep 1 + start_service + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Wed Sep 5 11:10:05 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 5 Sep 2012 11:10:05 +0200 Subject: [csw-devel] SF.net SVN: gar:[19097] csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile In-Reply-To: References: Message-ID: <5C363E08-63E4-4C44-9325-D2B91A28D437@opencsw.org> Hi Maciej, Am 04.09.2012 um 19:03 schrieb Maciej (Matchek) Blizi?ski : > 2012/8/26 : >> # For GNU gettext >> -PATH := /opt/csw/gnu:$(PATH) >> +CONFIGURE_ENV += XGETTEXT=/opt/csw/gnu/xgettext >> +CONFIGURE_ENV += MSGMERGE=/opt/csw/gnu/msgmerge >> +CONFIGURE_ENV += MSGFMT=/opt/csw/gnu/msgfmt > > I was curious if there wasn't a more specific GAR abstraction for > this, e.g. extra env flags that GAR would put together for you. Indeed, you could use EXTRA_CONFIGURE_EXPORTS += XGETTEXT MSGMERGE MSGFMT CONFIGURE_ENV_XGETTEXT = /opt/csw/gnu/xgettext CONFIGURE_ENV_MSGMERGE = /opt/csw/gnu/msgmerge CONFIGURE_ENV_MSGFMT = /opt/csw/gnu/msgfmt 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 dam at opencsw.org Wed Sep 5 11:11:06 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 5 Sep 2012 11:11:06 +0200 Subject: [csw-devel] SF.net SVN: gar:[19095] csw/mgar/pkg/lang-python/salt/trunk In-Reply-To: References: Message-ID: <6B29EAEC-79AA-4A31-8FC4-B339CE2FFD8B@opencsw.org> Hi Romeo, Am 04.09.2012 um 22:34 schrieb Romeo Theriault : > On Tue, Sep 4, 2012 at 7:04 AM, Maciej (Matchek) Blizi?ski wrote: > 2012/8/26 : > > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/states/pkgng.py > > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/pkgng.py > > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/poudriere.py > > +CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/salt/modules/cassandra.py > > Instead of all these specific overrides, you can add one general one: > > CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content > > It will apply to all files in the package. > > Ahh, cool! Great to know. Thanks. I suggest to also add a comment why it is safe to override, like # The occurrences of /usr/local are in example sections only or such. 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 -------------- An HTML attachment was scrubbed... URL: -------------- 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 Wed Sep 5 11:20:43 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 09:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19148] csw/mgar/pkg/less/trunk Message-ID: Revision: 19148 http://gar.svn.sourceforge.net/gar/?rev=19148&view=rev Author: dmichelsen Date: 2012-09-05 09:20:43 +0000 (Wed, 05 Sep 2012) Log Message: ----------- less/trunk: Update to 451 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 2012-09-05 02:44:51 UTC (rev 19147) +++ csw/mgar/pkg/less/trunk/Makefile 2012-09-05 09:20:43 UTC (rev 19148) @@ -1,5 +1,5 @@ NAME = less -VERSION = 444 +VERSION = 451 CATEGORIES = utils GARTYPE = v2 @@ -14,20 +14,23 @@ LICENSE = LICENSE -RUNTIME_DEP_PKGS_CSWless += CSWncurses -RUNTIME_DEP_PKGS_CSWless += CSWlibintl8 +PACKAGES += CSWless +SPKG_DESC_CSWless = A free open-source file pager +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWless += CSWlibncursesw5 NOISALIST = 1 +REINPLACEMENTS += sysless +REINPLACE_MATCH_sysless = /usr/local/etc/sysless +REINPLACE_WITH_sysless = $(sysconfdir)/sysless +REINPLACE_FILES_sysless += less.man + # There is no testsuite TEST_TARGET = -# We replaced the problematic occurrence of sysless in post-install, the remaining one is just +# We reinplaced the problematic occurrence of sysless, the remaining one is just # a default. CHECKPKG_OVERRIDES_CSWless += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/less.1 include gar/category.mk - -post-install-modulated: - perl -pi -e 's,/usr/local/etc/sysless,$(sysconfdir)/sysless,g' \ - $(DESTDIR)$(mandir)/man1/less.1 Modified: csw/mgar/pkg/less/trunk/checksums =================================================================== --- csw/mgar/pkg/less/trunk/checksums 2012-09-05 02:44:51 UTC (rev 19147) +++ csw/mgar/pkg/less/trunk/checksums 2012-09-05 09:20:43 UTC (rev 19148) @@ -1 +1 @@ -56f9f76ffe13f70155f47f6b3c87d421 less-444.tar.gz +765f082658002b2b46b86af4a0da1842 less-451.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 5 11:24:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 09:24:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19149] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 19149 http://gar.svn.sourceforge.net/gar/?rev=19149&view=rev Author: dmichelsen Date: 2012-09-05 09:24:41 +0000 (Wed, 05 Sep 2012) Log Message: ----------- msmtp/trunk: Update to 1.4.29 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2012-09-05 09:20:43 UTC (rev 19148) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2012-09-05 09:24:41 UTC (rev 19149) @@ -1,5 +1,5 @@ NAME = msmtp -VERSION = 1.4.27 +VERSION = 1.4.29 CATEGORIES = net GARTYPE = v2 Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2012-09-05 09:20:43 UTC (rev 19148) +++ csw/mgar/pkg/msmtp/trunk/checksums 2012-09-05 09:24:41 UTC (rev 19149) @@ -1 +1 @@ -2d6d10d9c59ed2b2635554ed35fb9226 msmtp-1.4.27.tar.bz2 +87cc6f37cb7a163ceb89382932e41535 msmtp-1.4.29.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 5 12:41:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 10:41:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19150] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 19150 http://gar.svn.sourceforge.net/gar/?rev=19150&view=rev Author: dmichelsen Date: 2012-09-05 10:41:43 +0000 (Wed, 05 Sep 2012) Log Message: ----------- tcl85/trunk: Update to 8.5.12, add files to lib package, remove alternatives Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile csw/mgar/pkg/tcl85/trunk/checksums Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 09:24:41 UTC (rev 19149) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 10:41:43 UTC (rev 19150) @@ -1,5 +1,5 @@ NAME = tcl8.5 -VERSION = 8.5.11 +VERSION = 8.5.12 CATEGORIES = lang GARTYPE = v2 @@ -45,20 +45,17 @@ PACKAGES += CSWlibtcl8-5-0 SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0) +PKGFILES_CSWlibtcl8-5-0 += $(libdir)/tcl8/.* +PKGFILES_CSWlibtcl8-5-0 += $(libdir)/tcl8.5/.* RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH)) PACKAGES += CSWtcl-dev SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files PKGFILES_CSWtcl-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh) RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0 -ALTERNATIVES_PRIO = 850 - -ALTERNATIVES_CSWtcl8_5 += tcl8_5 -ALTERNATIVE_tcl8_5 += $(bindir)/tclsh $(ALTERNATIVES_PRIO) -ALTERNATIVE_tcl8_5 += $(libdir)/tclConfig.sh $(ALTERNATIVES_PRIO) - CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl Modified: csw/mgar/pkg/tcl85/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl85/trunk/checksums 2012-09-05 09:24:41 UTC (rev 19149) +++ csw/mgar/pkg/tcl85/trunk/checksums 2012-09-05 10:41:43 UTC (rev 19150) @@ -1 +1 @@ -b01a9691c83990b3db0ce62d1012ca67 tcl8.5.11-src.tar.gz +174b2b4c619ba8f96875d8a051917703 tcl8.5.12-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Wed Sep 5 14:52:19 2012 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 05 Sep 2012 08:52:19 -0400 Subject: [csw-devel] SF.net SVN: gar:[19095] csw/mgar/pkg/lang-python/salt/trunk In-Reply-To: <6B29EAEC-79AA-4A31-8FC4-B339CE2FFD8B@opencsw.org> References: <6B29EAEC-79AA-4A31-8FC4-B339CE2FFD8B@opencsw.org> Message-ID: <1346849482-sup-3163@pinkfloyd.chass.utoronto.ca> > I suggest to also add a comment why it is safe to override, like > # The occurrences of /usr/local are in example sections only > or such. Also, a blanket exclusion like this means that you should periodically check what's being overridden at future updates to make sure the net isn't suddently cast too wide. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Wed Sep 5 15:45:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 13:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19151] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 19151 http://gar.svn.sourceforge.net/gar/?rev=19151&view=rev Author: dmichelsen Date: 2012-09-05 13:45:46 +0000 (Wed, 05 Sep 2012) Log Message: ----------- tcl85/trunk: Fix shared library naming, try DTrace again on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 10:41:43 UTC (rev 19150) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 13:45:46 UTC (rev 19151) @@ -42,6 +42,10 @@ RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) +# This is to find zoneinfo +CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n +CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n + PACKAGES += CSWlibtcl8-5-0 SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0) @@ -50,17 +54,16 @@ RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH)) +# This is to find zoneinfo +CHECKPKG_OVERRIDES_CSWlibtcl8-5-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl +CHECKPKG_OVERRIDES_CSWlibtcl8-5-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl + PACKAGES += CSWtcl-dev SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files PKGFILES_CSWtcl-dev += $(PKGFILES_DEVEL) PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh) RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0 -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl - BUILD64 = 1 INCLUDE_FLAGS = @@ -75,10 +78,12 @@ # against symbol offset in file # st 0x634 tclDTrace.o # ld: fatal: relocations remain against allocatable but non-writable sections -#CONFIGURE_ARGS += --enable-dtrace +CONFIGURE_ARGS-5.10 += --enable-dtrace -INSTALL_ARGS = install install-private-headers install-tzdata install-msgs +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) +INSTALL_ARGS = install install-libraries install-private-headers install-tzdata install-msgs + # tk need the static tclstub library for some reason MERGE_EXCLUDE_STATICLIBS = @@ -86,13 +91,11 @@ include gar/category.mk - -# CFLAGS := $(filter-out -I%,$(CFLAGS)) DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) pre-configure-modulated: @echo " ==> Regenerating build tools..." - (cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) + #(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) @$(MAKECOOKIE) pre-test-modulated: @@ -106,8 +109,9 @@ post-install-modulated: @# Need to manually create symlink to latest version - it will be handled by alternatives @echo Creating tclsh link - ln -s $(REN_TCLSH) $(INSTALLISADIR)/$(bindir)/tclsh - perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(libdir)/tclConfig.sh - perl -pi -e "s|/usr/local|$(prefix)|g" $(INSTALLISADIR)/$(prefix)/share/man/man1/tclsh.1 + ln -s $(REN_TCLSH) $(DESTDIR)$(bindir)/tclsh + cd $(DESTDIR)$(libdir) && mv $(REN_LIBTCL) $(REN_LIBTCL).0 && ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) + perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(libdir)/tclConfig.sh + perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(mandir)/man1/tclsh.1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 5 18:25:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 16:25:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19152] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 19152 http://gar.svn.sourceforge.net/gar/?rev=19152&view=rev Author: dmichelsen Date: 2012-09-05 16:25:40 +0000 (Wed, 05 Sep 2012) Log Message: ----------- tcl85/trunk: Rejuvenate patches, remove legacy binary libs Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch Removed Paths: ------------- csw/mgar/pkg/tcl85/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tcl85/trunk/files/8.4.sparc.tar.xz csw/mgar/pkg/tcl85/trunk/files/soname.diff Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 13:45:46 UTC (rev 19151) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 16:25:40 UTC (rev 19152) @@ -27,7 +27,7 @@ REN_TCLSH = tclsh8.5 PATCHDIR = $(WORKDIR)/$(DISTNAME) -PATCHFILES = soname.diff +PATCHFILES = 0001-Enable-SONAME-in-library.patch PATCHFILES += tcl.m4.patch # PATCHFILES += tcl-dtrace.patch @@ -95,7 +95,7 @@ pre-configure-modulated: @echo " ==> Regenerating build tools..." - #(cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) + (cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) @$(MAKECOOKIE) pre-test-modulated: Added: csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch (rev 0) +++ csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch 2012-09-05 16:25:40 UTC (rev 19152) @@ -0,0 +1,40 @@ +From ceab3487bb09c08ca527ca41d94bea68f1370ac7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 Sep 2012 15:55:32 +0200 +Subject: [PATCH] Enable SONAME in library + +--- + unix/Makefile.in | 4 +++- + unix/tcl.m4 | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/unix/Makefile.in b/unix/Makefile.in +index a527bf0..3659916 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -722,7 +722,9 @@ install-binaries: binaries + fi + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" + @@INSTALL_LIB@ +- @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) ++ @mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ++ @ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) ++ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 + @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" + @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ + @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index 3974753..cb31f50 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -1989,6 +1989,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + use_sunmath=no + ]) + ]) ++ TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" +-- +1.7.10.3 + Deleted: csw/mgar/pkg/tcl85/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/tcl85/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/tcl85/trunk/files/soname.diff =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/soname.diff 2012-09-05 13:45:46 UTC (rev 19151) +++ csw/mgar/pkg/tcl85/trunk/files/soname.diff 2012-09-05 16:25:40 UTC (rev 19152) @@ -1,23 +0,0 @@ ---- tcl8.5.10/unix/tcl.m4 2011-06-23 15:18:36.000000000 +0200 -+++ tcl8.5.10/unix/tcl.m4 2011-09-07 17:11:05.737368554 +0200 -@@ -1968,6 +1968,7 @@ - use_sunmath=no - ]) - ]) -+ TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" ---- tcl8.5.10/unix/Makefile.in 2011-06-23 15:18:36.000000000 +0200 -+++ tcl8.5.10/unix/Makefile.in 2011-09-07 17:12:48.393545884 +0200 -@@ -719,7 +719,9 @@ - fi - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@INSTALL_LIB@ -- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) -+ mv "$(LIB_INSTALL_DIR)"/$(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 -+ ln -sf $(LIB_FILE).0 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) -+ @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 - @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ - @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" 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 5 19:49:50 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 17:49:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19153] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 19153 http://gar.svn.sourceforge.net/gar/?rev=19153&view=rev Author: dmichelsen Date: 2012-09-05 17:49:49 +0000 (Wed, 05 Sep 2012) Log Message: ----------- tcl85/trunk: Rejuvenate more patches Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch Removed Paths: ------------- csw/mgar/pkg/tcl85/trunk/files/tcl.m4.patch Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 16:25:40 UTC (rev 19152) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 17:49:49 UTC (rev 19153) @@ -27,8 +27,9 @@ REN_TCLSH = tclsh8.5 PATCHDIR = $(WORKDIR)/$(DISTNAME) -PATCHFILES = 0001-Enable-SONAME-in-library.patch -PATCHFILES += tcl.m4.patch +PATCHFILES += 0001-Enable-SONAME-in-library.patch +PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch + # PATCHFILES += tcl-dtrace.patch # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: @@ -110,7 +111,7 @@ @# Need to manually create symlink to latest version - it will be handled by alternatives @echo Creating tclsh link ln -s $(REN_TCLSH) $(DESTDIR)$(bindir)/tclsh - cd $(DESTDIR)$(libdir) && mv $(REN_LIBTCL) $(REN_LIBTCL).0 && ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) + #cd $(DESTDIR)$(libdir) && mv $(REN_LIBTCL) $(REN_LIBTCL).0 && ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(libdir)/tclConfig.sh perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(mandir)/man1/tclsh.1 @$(MAKECOOKIE) Added: csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch (rev 0) +++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2012-09-05 17:49:49 UTC (rev 19153) @@ -0,0 +1,59 @@ +From bb82b6ee8a1ed4bd1f3c0df9656d9554a38d18b7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 Sep 2012 11:44:36 -0500 +Subject: [PATCH] Fix linking issues and enable building on Solaris 9 and + earlier + +--- + unix/tcl.m4 | 9 +++++---- + 1 Datei ge?ndert, 5 Zeilen hinzugef?gt(+), 4 Zeilen entfernt(-) + +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index cb31f50..84a738c 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -1961,6 +1961,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + ], [ + do64bit_ok=yes + case $system in ++# Non functional check, m64/xarch depends on compiler not os version + SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) + CFLAGS="$CFLAGS -m64" + LDFLAGS="$LDFLAGS -m64";; +@@ -1979,7 +1980,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + AS_IF([test "$GCC" = yes],[use_sunmath=no],[ + arch=`isainfo` + AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) +- AS_IF([test "$arch" = "amd64 i386"], [ ++ AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ + AC_MSG_RESULT([yes]) + MATH_LIBS="-lsunmath $MATH_LIBS" + AC_CHECK_HEADER(sunmath.h) +@@ -2013,13 +2014,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + ], [ + AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) + case $system in +- SunOS-5.[[1-9]][[0-9]]*) ++ SunOS-5.[[1-9]][[0-9]]*|SunOS-5.[[7-9]]) + SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; + *) + SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; + esac + CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' ++ LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' + ]) + ;; + UNIX_SV* | UnixWare-5*) +@@ -2104,7 +2105,7 @@ dnl # preprocessing tests use only CPPFLAGS. + + AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ + LIB_SUFFIX=${SHARED_LIB_SUFFIX} +- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' ++ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' + AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' + DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" +-- +1.7.11.3 + Deleted: csw/mgar/pkg/tcl85/trunk/files/tcl.m4.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/tcl.m4.patch 2012-09-05 16:25:40 UTC (rev 19152) +++ csw/mgar/pkg/tcl85/trunk/files/tcl.m4.patch 2012-09-05 17:49:49 UTC (rev 19153) @@ -1,44 +0,0 @@ ---- tcl8.5.7/unix/tcl.m4.orig 2009-04-15 21:30:05.000000000 +0200 -+++ tcl8.5.7/unix/tcl.m4 2010-02-07 05:15:17.410781569 +0100 -@@ -1933,6 +1933,7 @@ - ], [ - do64bit_ok=yes - case $system in -+# Non functional check, m64/xarch depends on compiler not os version - SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) - CFLAGS="$CFLAGS -m64" - LDFLAGS="$LDFLAGS -m64";; -@@ -1951,7 +1952,7 @@ - AS_IF([test "$GCC" = yes],[use_sunmath=no],[ - arch=`isainfo` - AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) -- AS_IF([test "$arch" = "amd64 i386"], [ -+ AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ - AC_MSG_RESULT([yes]) - MATH_LIBS="-lsunmath $MATH_LIBS" - AC_CHECK_HEADER(sunmath.h) -@@ -1989,13 +1990,13 @@ - ], [ - AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) - case $system in -- SunOS-5.[[1-9]][[0-9]]*) -+ SunOS-5.[[1-9]][[0-9]]*|SunOS-5.[[7-9]]) - SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; - *) - SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; - esac - CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' -- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' -+ LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' - ]) - ;; - UNIX_SV* | UnixWare-5*) -@@ -2078,7 +2079,7 @@ - - AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' - ], [ - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} 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 5 20:57:44 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Sep 2012 18:57:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19154] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 19154 http://gar.svn.sourceforge.net/gar/?rev=19154&view=rev Author: dmichelsen Date: 2012-09-05 18:57:44 +0000 (Wed, 05 Sep 2012) Log Message: ----------- tcl85/trunk: Disable DTrace again for now Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 17:49:49 UTC (rev 19153) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-05 18:57:44 UTC (rev 19154) @@ -79,7 +79,7 @@ # against symbol offset in file # st 0x634 tclDTrace.o # ld: fatal: relocations remain against allocatable but non-writable sections -CONFIGURE_ARGS-5.10 += --enable-dtrace +# CONFIGURE_ARGS-5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Sep 6 00:25:27 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Sep 2012 22:25:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19155] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 19155 http://gar.svn.sourceforge.net/gar/?rev=19155&view=rev Author: chninkel Date: 2012-09-05 22:25:27 +0000 (Wed, 05 Sep 2012) Log Message: ----------- elinks/trunk: added a mapfile to force linking against SUNW_1.22 Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/elinks/trunk/files/map.elinks Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2012-09-05 18:57:44 UTC (rev 19154) +++ csw/mgar/pkg/elinks/trunk/Makefile 2012-09-05 22:25:27 UTC (rev 19155) @@ -51,6 +51,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += changelog.CSW +DISTFILES += map.bash # Debian security path for CVE-2007-2027 PATCHFILES += elinks-417789.diff @@ -73,7 +74,7 @@ # CONFIGURE_ARGS += --enable-sm-scripting CONFIGURE_ARGS += --disable-sm-scripting -EXTRA_LDFLAGS = -z ignore -Bdirect +EXTRA_LD_OPTIONS = -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.elinks)" TEST_SCRIPTS = Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2012-09-05 18:57:44 UTC (rev 19154) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2012-09-05 22:25:27 UTC (rev 19155) @@ -1,3 +1,10 @@ +elinks (0.11.7,REV=2012.09.96) unstable + + * * Added a mapfile to force linking against interface SUNW_1.22 + of libc.so.1 so we don't work only on last solaris release. + + -- Yann Rouillard Thu, 06 Sep 2012 00:22:15 +0200 + elinks (0.11.7,REV=2012.08.24) unstable * Enabled direct binding. Added: csw/mgar/pkg/elinks/trunk/files/map.elinks =================================================================== --- csw/mgar/pkg/elinks/trunk/files/map.elinks (rev 0) +++ csw/mgar/pkg/elinks/trunk/files/map.elinks 2012-09-05 22:25:27 UTC (rev 19155) @@ -0,0 +1,2 @@ +libc.so - SUNW_1.22.5 SUNWprivate_1.1; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Sep 6 00:31:49 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Sep 2012 22:31:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19156] csw/mgar/pkg/elinks/trunk/Makefile Message-ID: Revision: 19156 http://gar.svn.sourceforge.net/gar/?rev=19156&view=rev Author: chninkel Date: 2012-09-05 22:31:48 +0000 (Wed, 05 Sep 2012) Log Message: ----------- elinks/trunk: fixed map filename mistake Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2012-09-05 22:25:27 UTC (rev 19155) +++ csw/mgar/pkg/elinks/trunk/Makefile 2012-09-05 22:31:48 UTC (rev 19156) @@ -51,7 +51,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += changelog.CSW -DISTFILES += map.bash +DISTFILES += map.elinks # Debian security path for CVE-2007-2027 PATCHFILES += elinks-417789.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at opencsw.org Thu Sep 6 10:15:45 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Wed, 05 Sep 2012 22:15:45 -1000 Subject: [csw-devel] SF.net SVN: gar:[19095] csw/mgar/pkg/lang-python/salt/trunk In-Reply-To: <1346849482-sup-3163@pinkfloyd.chass.utoronto.ca> References: <6B29EAEC-79AA-4A31-8FC4-B339CE2FFD8B@opencsw.org> <1346849482-sup-3163@pinkfloyd.chass.utoronto.ca> Message-ID: On Wed, Sep 5, 2012 at 2:52 AM, Ben Walton wrote: > > > I suggest to also add a comment why it is safe to override, like > > # The occurrences of /usr/local are in example sections only > > or such. > > Also, a blanket exclusion like this means that you should periodically > check what's being overridden at future updates to make sure the net > isn't suddently cast too wide. > Both good suggestions that I'll make use of. Thanks, Romeo -------------- next part -------------- An HTML attachment was scrubbed... URL: From romeotheriault at users.sourceforge.net Thu Sep 6 10:23:55 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Thu, 06 Sep 2012 08:23:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19157] csw/mgar/pkg/lang-python/salt/trunk/Makefile Message-ID: Revision: 19157 http://gar.svn.sourceforge.net/gar/?rev=19157&view=rev Author: romeotheriault Date: 2012-09-06 08:23:55 +0000 (Thu, 06 Sep 2012) Log Message: ----------- lang-python/salt/trunk: Added a comment to explain global use of file-with-bad-content over-ride Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-05 22:31:48 UTC (rev 19156) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-06 08:23:55 UTC (rev 19157) @@ -27,6 +27,7 @@ CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-pyzmq CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-msgpack-python +# This is to over-ride /usr/local path statements in example files and documentation. CHECKPKG_OVERRIDES_CSWpy-salt += file-with-bad-content ARCHALL_CSWpy-salt = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Sep 6 15:19:45 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 06 Sep 2012 13:19:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19158] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ cswmysql5.tpl Message-ID: Revision: 19158 http://gar.svn.sourceforge.net/gar/?rev=19158&view=rev Author: wilbury Date: 2012-09-06 13:19:45 +0000 (Thu, 06 Sep 2012) Log Message: ----------- Fix default datadir in svc-cswmysql5 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-09-06 08:23:55 UTC (rev 19157) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-09-06 13:19:45 UTC (rev 19158) @@ -69,7 +69,7 @@ bindir=@bindir@ if test -z "$datadir" then - datadir=@localstatedir@/mysql5 + datadir=@localstatedir@ fi sbindir=@prefix@/libexec libexecdir=@prefix@/libexec 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 6 15:35:59 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 06 Sep 2012 13:35:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19159] csw/mgar/pkg/gsl/trunk/Makefile Message-ID: Revision: 19159 http://gar.svn.sourceforge.net/gar/?rev=19159&view=rev Author: pfelecan Date: 2012-09-06 13:35:59 +0000 (Thu, 06 Sep 2012) Log Message: ----------- gsl/trunk: remove unused declaration of architecture neutrality Modified Paths: -------------- csw/mgar/pkg/gsl/trunk/Makefile Modified: csw/mgar/pkg/gsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsl/trunk/Makefile 2012-09-06 13:19:45 UTC (rev 19158) +++ csw/mgar/pkg/gsl/trunk/Makefile 2012-09-06 13:35:59 UTC (rev 19159) @@ -35,7 +35,6 @@ PKGFILES_CSWlibgslcblas0 += $(call baseisadirs,$(libdir),libgslcblas\.so\.0\.0\.0) PKGFILES_CSWlibgslcblas0 += $(call baseisadirs,$(libdir),libgslcblas\.so\.0(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibgslcblas0 += CSWlibgcc-s1 -ARCHALL_CSWgslrt = 1 PACKAGES += CSWgsl-dev CATALOGNAME_CSWgsl-dev = gsl_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 6 15:37:38 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 06 Sep 2012 13:37:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19160] csw/mgar/pkg/texlive/trunk Message-ID: Revision: 19160 http://gar.svn.sourceforge.net/gar/?rev=19160&view=rev Author: pfelecan Date: 2012-09-06 13:37:38 +0000 (Thu, 06 Sep 2012) Log Message: ----------- texlive/trunk: split in sub-packages taking as model the Debian way. Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/texlive/trunk/files/README.CSW Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-09-06 13:35:59 UTC (rev 19159) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-09-06 13:37:38 UTC (rev 19160) @@ -25,6 +25,7 @@ TEXMFAR = $(TEXMFARPREFIX).tar.xz DISTFILES += $(TEXMFAR) NOEXTRACT += $(TEXMFAR) +DISTFILES += README.CSW PATCHFILES += 0001-Fix-lacheck-buffer-overflow.patch PATCHFILES += 0002-Fix-ICU-link-edit.patch PATCHFILES += 0003-Adapt-texmf-configuration.patch @@ -86,8 +87,4510 @@ RUNTIME_DEP_PKGS += CSWps2eps -# EXTRA_MERGE_EXCLUDE_FILES += +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/doc/info/dir +# these are provided by CSWasymptote +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/asymptote/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/doc/info/asymptote.info +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/tex/context/asymptote/colo-asy.tex +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/tex/latex/asymptote/* +# these are provided by tex_devnag package +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/devnag +# these are provided by tex4ht package +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/t4ht +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/bin/tex4ht +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/generic/tex4ht/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/scripts/tex4ht/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/generic/tex4ht/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex4ht/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/scripts/tex4ht/* +# these are provided by tex_devnag_common package +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/generic/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/fonts/afm/public/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/fonts/map/dvips/velthuis/dvng.map +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/fonts/source/public/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/fonts/tfm/public/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/fonts/type1/public/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/generic/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/latex/velthuis/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/plain/velthuis/dnmacs.tex +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/xelatex/velthuis/hindicaptions.sty +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/ls-R +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf/ls-R +# provided by tex_rcsinfo package: +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/doc/latex/rcsinfo/* +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/latex/rcsinfo/* +# provided by the tex_dirtree package +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/texmf-dist/tex/generic/dirtree/* +DEBUG_PACKAGING = 1 +SPKG_TMPDIR = $(HOME)/ocswtmp + +# this catches everything not in the other packages: +PACKAGES += CSWtexlive-common +CATALOGNAME_CSWtexlive-common = texlive_common +SPKG_DESC_CSWtexlive-common += $(DESCRIPTION), common +OBSOLETED_BY_CSWtexlive-common = CSWtetex +ARCHALL_CSWtexlive-common = 1 + +PACKAGES += CSWtexlive-dev +CATALOGNAME_CSWtexlive-dev += texlive_dev +SPKG_DESC_CSWtexlive-dev = $(DESCRIPTION), development files +OBSOLETED_BY_CSWtexlive-dev = CSWtetex +PKGFILES_CSWtexlive-dev += /opt/csw/lib/libkpathsea.so +PKGFILES_CSWtexlive-dev += /opt/csw/lib/libptexenc.so +PKGFILES_CSWtexlive-dev += $(PKGFILES_DEVEL) +ARCHALL_CSWtexlive-dev = 1 +CHECKPKG_OVERRIDES_CSWtexlive-dev += archall-devel-package + +PACKAGES += CSWlibkpathsea6 +CATALOGNAME_CSWlibkpathsea6 = libkpathsea6 +SPKG_DESC_CSWlibkpathsea6 += $(DESCRIPTION), libkpathsea.so.6 +OBSOLETED_BY_CSWlibkpathsea6 = CSWtetex +PKGFILES_CSWlibkpathsea6 += $(call baseisadirs,$(libdir),libkpathsea\.so\.6\.1\.0) +PKGFILES_CSWlibkpathsea6 += $(call baseisadirs,$(libdir),libkpathsea\.so\.6(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibkpathsea6 += CSWlibgcc-s1 + +PACKAGES += CSWlibptexenc1 +CATALOGNAME_CSWlibptexenc1 = libptexenc1 +SPKG_DESC_CSWlibptexenc1 += $(DESCRIPTION), libptexenc1.so.0 +PKGFILES_CSWlibptexenc1 += $(call baseisadirs,$(libdir),libptexenc\.so\.1\.3\.0) +PKGFILES_CSWlibptexenc1 += $(call baseisadirs,$(libdir),libptexenc\.so\.1(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibptexenc1 += CSWlibgcc-s1 + +PACKAGES += CSWtexlive-base +CATALOGNAME_CSWtexlive-base = texlive_base +SPKG_DESC_CSWtexlive-base += $(DESCRIPTION), base +OBSOLETED_BY_CSWtexlive-base = CSWtetex +PKGFILES_CSWtexlive-base += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-base += /opt/csw/bin/dviluatex +PKGFILES_CSWtexlive-base += /opt/csw/bin/simpdftex +PKGFILES_CSWtexlive-base += /opt/csw/bin/texdoc +PKGFILES_CSWtexlive-base += /opt/csw/bin/texdoctk +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/bibtex/bib/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/bibtex/bst/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/bibtex/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/etex/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/fonts/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/fonts/cm/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/generic/enctex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/generic/hyph-utf8/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/generic/ifxetex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/latex/etex-pkg/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/latex/oberdiek/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/pdftex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/doc/support/makeindex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/dvips/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/afm/hoekwater/mflogo/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/afm/public/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/enc/dvips/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/map/dvips/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/map/dvips/cm/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/map/dvips/mflogo/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/pk/ljfour/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/source/public/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/source/public/cm/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/source/public/mflogo/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/source/public/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/tfm/public/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/tfm/public/cm/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/tfm/public/mflogo/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/tfm/public/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/type1/hoekwater/mflogo/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/fonts/type1/public/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/makeindex/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/makeindex/plain/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/metafont/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/metafont/config/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/metafont/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/omega/ocp/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/omega/otp/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/dvips/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/enctex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/hyph-utf8/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/ifxetex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/generic/oberdiek/ifluatex.sty +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/dvipdfmx-def/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/etex-pkg/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/latex/mflogo/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/plain/amsfonts/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/plain/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/plain/config/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/plain/etex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/tex/plain/misc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf-dist/texdoc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/dvipdfm/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/dvips/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/info/dir +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/kpathsea/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/tetex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/texdoc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/doc/web2c/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/dvips/base/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/dvips/gsftopk/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/dvips/tetex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/fonts/cmap/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/fonts/enc/dvips/tetex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/fonts/map/dvipdfmx/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/fonts/map/dvips/tetex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/fonts/map/dvips/updmap/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/fonts/map/pdftex/updmap/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/scripts/simpdftex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/scripts/tetex/texdoctk. +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/scripts/tetex/updmap.pl +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/scripts/texdoc/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/generic/config/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/generic/hyphen/dumyhyph.tex +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/generic/hyphen/hyphen.tex +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/generic/hyphen/hypht1.tex +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/generic/hyphen/zerohyph.tex +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/generic/pdftex/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/tex/latex/dvipdfm/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/texconfig/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/texdoctk/.* +PKGFILES_CSWtexlive-base += /opt/csw/share/texmf/web2c/.* +ARCHALL_CSWtexlive-base = 1 + +PACKAGES += CSWtexlive-bibtex-extra +CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra +SPKG_DESC_CSWtexlive-bibtex-extra += $(DESCRIPTION), bibtex extra +OBSOLETED_BY_CSWtexlive-bibtex-extra = CSWtetex +PKGFILES_CSWtexlive-bibtex-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/amsrefs/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/beebe/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/dk-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/harvard/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bib/jurabib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/aichej/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/amsrefs/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/apacite/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/apalike2/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/beebe/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/cell/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/chembst/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/chicago-annote/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/chicago/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/din1505/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/dk-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/fbs/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/figbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/harvard/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/ijqc/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/inlinebib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/iopart-num/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/jneurosci/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/jurabib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/multibib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/munich/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/perception/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/rsc/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/sort-by-letters/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/bst/urlbst/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/bibtex/csf/dk-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/bibtex/bibhtml/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/bibtex/chicago-annote/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/bibtex/ijqc/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/bibtex/iopart-num/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/amsrefs/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/bibarts/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/biblist/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/bibtopic/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/bibtopicprefix/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/bibunits/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/cell/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/chembst/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/collref/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/custom-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/din1505/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/dk-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/doipubmed/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/figbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/footbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/harvard/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/jneurosci/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/jurabib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/margbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/multibib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/munich/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/notes2bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/perception/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/rsc/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/sort-by-letters/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/latex/splitbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/doc/plain/harvmac/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/makeindex/bibarts/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/makeindex/multibib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/amsrefs/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/apacite/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/bibarts/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/biblist/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/bibtopic/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/bibtopicprefix/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/bibunits/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/cell/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/chicago/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/collref/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/compactbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/custom-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/dk-bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/doipubmed/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/figbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/footbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/harvard/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/inlinebib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/jneurosci/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/jurabib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/listbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/margbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/multibib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/notes2bib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/rsc/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/latex/splitbib/.* +PKGFILES_CSWtexlive-bibtex-extra += /opt/csw/share/texmf-dist/tex/plain/harvmac/.* +ARCHALL_CSWtexlive-bibtex-extra = 1 + +PACKAGES += CSWtexlive-binaries +CATALOGNAME_CSWtexlive-binaries = texlive_binaries +SPKG_DESC_CSWtexlive-binaries += $(DESCRIPTION), binaries +OBSOLETED_BY_CSWtexlive-binaries = CSWtetex +PKGFILES_CSWtexlive-binaries += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/afm2pl +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/afm2tfm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/aleph +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/allcm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/allec +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/allneeded +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/bibtex8 +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ctangle +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ctie +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/cweave +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/detex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/disdvi +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dt2dv +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dv2dt +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvi2fax +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvi2tty +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvibook +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dviconcat +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvicopy +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvihp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj2p +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj4 +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj4l +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj6 +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvilj +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipdfm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipdfmx +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipdft +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvipos +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvips +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvired +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dviselect +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvitodvi +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvitomp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/dvitype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ebb +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/etex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/extractbb +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fmtutil-sys +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fmtutil +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/fontinst +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gftodvi +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gftopk +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gftype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/gsftopk +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpseaccess +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsepath +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsereadlink +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsestat +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsetool +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsewhere +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsewhich +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/kpsexpand +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mag +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/makeindex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mf-nowin +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mft +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mkindex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mkocp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mkofm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktexfmt +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktexlsr +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktexmf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktexpk +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mktextfm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/mpost +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/odvicopy +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/odvitype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ofm2opl +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/omfonts +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/opl2ofm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/otangle +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/otp2ocp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/outocp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ovf2ovp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ovp2ovf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/patgen +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfclose +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfetex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdfopen +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdftex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pdftosrc +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pfb2pfa +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pk2bm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pktogf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pktype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pltotf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pooltype +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ps2frag +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ps2pk +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/pslatex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/rubibtex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/rumakeindex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/synctex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tangle +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/teckit_compile +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig-dialog +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig-sys +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texconfig +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texhash +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/texlinks +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tftopl +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tie +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/tpic2pdftex +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttf2afm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttf2pk +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttf2tfm +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/ttfdump +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updmap-sys +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/updmap +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/vftovp +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/vlna +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/vptovf +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/weave +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvi-xaw +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvi +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xdvipdfmx +PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xetex +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgcc-s1 + +PACKAGES += CSWtexlive-doc-base +CATALOGNAME_CSWtexlive-doc-base = texlive_doc_base +SPKG_DESC_CSWtexlive-doc-base += $(DESCRIPTION), doc base +OBSOLETED_BY_CSWtexlive-doc-base = CSWtetex +PKGFILES_CSWtexlive-doc-base += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-base += /opt/csw/share/texmf/doc/texlive/texlive-en/.* +ARCHALL_CSWtexlive-doc-base = 1 + +PACKAGES += CSWtexlive-doc-bg +CATALOGNAME_CSWtexlive-doc-bg = texlive_doc_bg +SPKG_DESC_CSWtexlive-doc-bg += $(DESCRIPTION), doc bg +OBSOLETED_BY_CSWtexlive-doc-bg = CSWtetex +PKGFILES_CSWtexlive-doc-bg += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-bg += /opt/csw/share/texmf-dist/doc/latex/lshort-bulgarian/.* +ARCHALL_CSWtexlive-doc-bg = 1 + +PACKAGES += CSWtexlive-doc-cs+sk +CATALOGNAME_CSWtexlive-doc-cs+sk = texlive_doc_cs+sk +SPKG_DESC_CSWtexlive-doc-cs+sk += $(DESCRIPTION), doc cs+sk +OBSOLETED_BY_CSWtexlive-doc-cs+sk = CSWtetex +PKGFILES_CSWtexlive-doc-cs_sk += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-cs+sk += /opt/csw/share/texmf-dist/doc/latex/lshort-slovak/.* +PKGFILES_CSWtexlive-doc-cs+sk += /opt/csw/share/texmf/doc/texlive/texlive-cz/.* +ARCHALL_CSWtexlive-doc-cs+sk = 1 + +PACKAGES += CSWtexlive-doc-de +CATALOGNAME_CSWtexlive-doc-de = texlive_doc_de +SPKG_DESC_CSWtexlive-doc-de += $(DESCRIPTION), doc de +OBSOLETED_BY_CSWtexlive-doc-de = CSWtetex +PKGFILES_CSWtexlive-doc-de += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/generic/voss-de/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/kopka/uebungen/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/l2picfaq/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/l2tabu/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/lshort-german/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/templates-fenn/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf-dist/doc/latex/templates-sommer/.* +PKGFILES_CSWtexlive-doc-de += /opt/csw/share/texmf/doc/texlive/texlive-de/.* +ARCHALL_CSWtexlive-doc-de = 1 + +PACKAGES += CSWtexlive-doc-en +CATALOGNAME_CSWtexlive-doc-en = texlive_doc_en +SPKG_DESC_CSWtexlive-doc-en += $(DESCRIPTION), doc en +OBSOLETED_BY_CSWtexlive-doc-en = CSWtetex +PKGFILES_CSWtexlive-doc-en += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/bibtex/tamethebeast/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/fonts/Type1fonts/README +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.pdf +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/fonts/memdesign/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/fonts/metafont-beginners/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/FAQ-en/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/around-the-bend/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/components-of-TeX/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/knuth/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/pstricks-tutorial/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/tds/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/generic/tex-refs/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/MemoirChapStyles/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/amslatex-primer/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/comprehensive/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/dtxtut/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/first-latex-doc/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/guide-to-latex/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/intro-scientific/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/l2tabu-english/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latex-course/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latex-doc-ptr/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latex-graphics-companion/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latex-veryshortguide/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latex-web-companion/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latex2e-help-texinfo/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/latexcheat/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/lshort-english/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/mathmode/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/titlepages/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/tlc2/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/visualfaq/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/latex/webguide/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/metapost/metapost-examples/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/gentle/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/impatient/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/plain-doc/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/plain/texbytopic/.* +PKGFILES_CSWtexlive-doc-en += /opt/csw/share/texmf-dist/doc/xetex/xetexref/.* +ARCHALL_CSWtexlive-doc-en = 1 + +PACKAGES += CSWtexlive-doc-es +CATALOGNAME_CSWtexlive-doc-es = texlive_doc_es +SPKG_DESC_CSWtexlive-doc-es += $(DESCRIPTION), doc es +OBSOLETED_BY_CSWtexlive-doc-es = CSWtetex +PKGFILES_CSWtexlive-doc-es += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/generic/es-tex-faq/.* +PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/l2tabu-spanish/.* +PKGFILES_CSWtexlive-doc-es += /opt/csw/share/texmf-dist/doc/latex/lshort-spanish/.* +ARCHALL_CSWtexlive-doc-es = 1 + +PACKAGES += CSWtexlive-doc-fi +CATALOGNAME_CSWtexlive-doc-fi = texlive_doc_fi +SPKG_DESC_CSWtexlive-doc-fi += $(DESCRIPTION), doc fi +OBSOLETED_BY_CSWtexlive-doc-fi = CSWtetex +PKGFILES_CSWtexlive-doc-fi += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-fi += /opt/csw/share/texmf-dist/doc/latex/lshort-finnish/.* +ARCHALL_CSWtexlive-doc-fi = 1 + +PACKAGES += CSWtexlive-doc-fr +CATALOGNAME_CSWtexlive-doc-fr = texlive_doc_fr +SPKG_DESC_CSWtexlive-doc-fr += $(DESCRIPTION), doc fr +OBSOLETED_BY_CSWtexlive-doc-fr = CSWtetex +PKGFILES_CSWtexlive-doc-fr += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/latex/epslatex-fr/.* +PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/latex/l2tabu-french/.* +PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/latex/lshort-french/.* +PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf-dist/doc/plain/impatient-fr/.* +PKGFILES_CSWtexlive-doc-fr += /opt/csw/share/texmf/doc/texlive/texlive-fr/.* +ARCHALL_CSWtexlive-doc-fr = 1 + +PACKAGES += CSWtexlive-doc-it +CATALOGNAME_CSWtexlive-doc-it = texlive_doc_it +SPKG_DESC_CSWtexlive-doc-it += $(DESCRIPTION), doc it +OBSOLETED_BY_CSWtexlive-doc-it = CSWtetex +PKGFILES_CSWtexlive-doc-it += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/amsldoc-it/.* +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/amsmath-it/.* +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/amsthdoc-it/.* +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/fancyhdr-it/.* +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/lshort-italian/.* +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf-dist/doc/latex/psfrag-italian/.* +PKGFILES_CSWtexlive-doc-it += /opt/csw/share/texmf/doc/texlive/texlive-it/.* +ARCHALL_CSWtexlive-doc-it = 1 + +PACKAGES += CSWtexlive-doc-ja +CATALOGNAME_CSWtexlive-doc-ja = texlive_doc_ja +SPKG_DESC_CSWtexlive-doc-ja += $(DESCRIPTION), doc ja +OBSOLETED_BY_CSWtexlive-doc-ja = CSWtetex +PKGFILES_CSWtexlive-doc-ja += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-ja += /opt/csw/share/texmf-dist/doc/latex/lshort-japanese/.* +ARCHALL_CSWtexlive-doc-ja = 1 + +PACKAGES += CSWtexlive-doc-ko +CATALOGNAME_CSWtexlive-doc-ko = texlive_doc_ko +SPKG_DESC_CSWtexlive-doc-ko += $(DESCRIPTION), doc ko +OBSOLETED_BY_CSWtexlive-doc-ko = CSWtetex +PKGFILES_CSWtexlive-doc-ko += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-ko += /opt/csw/share/texmf-dist/doc/latex/lshort-korean/.* +ARCHALL_CSWtexlive-doc-ko = 1 + +PACKAGES += CSWtexlive-doc-mn +CATALOGNAME_CSWtexlive-doc-mn = texlive_doc_mn +SPKG_DESC_CSWtexlive-doc-mn += $(DESCRIPTION), doc mn +OBSOLETED_BY_CSWtexlive-doc-mn = CSWtetex +PKGFILES_CSWtexlive-doc-mn += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-mn += /opt/csw/share/texmf-dist/doc/latex/lshort-mongol/.* +ARCHALL_CSWtexlive-doc-mn = 1 + +PACKAGES += CSWtexlive-doc-nl +CATALOGNAME_CSWtexlive-doc-nl = texlive_doc_nl +SPKG_DESC_CSWtexlive-doc-nl += $(DESCRIPTION), doc nl +OBSOLETED_BY_CSWtexlive-doc-nl = CSWtetex +PKGFILES_CSWtexlive-doc-nl += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-nl += /opt/csw/share/texmf-dist/doc/latex/lshort-dutch/.* +ARCHALL_CSWtexlive-doc-nl = 1 + +PACKAGES += CSWtexlive-doc-pl +CATALOGNAME_CSWtexlive-doc-pl = texlive_doc_pl +SPKG_DESC_CSWtexlive-doc-pl += $(DESCRIPTION), doc pl +OBSOLETED_BY_CSWtexlive-doc-pl = CSWtetex +PKGFILES_CSWtexlive-doc-pl += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf-dist/doc/generic/tex-virtual-academy-pl/.* +PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf-dist/doc/latex/lshort-polish/.* +PKGFILES_CSWtexlive-doc-pl += /opt/csw/share/texmf/doc/texlive/texlive-pl/.* +ARCHALL_CSWtexlive-doc-pl = 1 + +PACKAGES += CSWtexlive-doc-pt +CATALOGNAME_CSWtexlive-doc-pt = texlive_doc_pt +SPKG_DESC_CSWtexlive-doc-pt += $(DESCRIPTION), doc pt +OBSOLETED_BY_CSWtexlive-doc-pt = CSWtetex +PKGFILES_CSWtexlive-doc-pt += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/generic/xypic-tut-pt/.* +PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/beamer-tut-pt/.* +PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/cursolatex/README +PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/cursolatex/cursolatex.pdf +PKGFILES_CSWtexlive-doc-pt += /opt/csw/share/texmf-dist/doc/latex/latexcheat-ptbr/.* +ARCHALL_CSWtexlive-doc-pt = 1 + +PACKAGES += CSWtexlive-doc-ru +CATALOGNAME_CSWtexlive-doc-ru = texlive_doc_ru +SPKG_DESC_CSWtexlive-doc-ru += $(DESCRIPTION), doc ru +OBSOLETED_BY_CSWtexlive-doc-ru = CSWtetex +PKGFILES_CSWtexlive-doc-ru += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf-dist/doc/latex/lshort-russian/.* +PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf-dist/doc/metapost/mpman-ru/.* +PKGFILES_CSWtexlive-doc-ru += /opt/csw/share/texmf/doc/texlive/texlive-ru/.* +ARCHALL_CSWtexlive-doc-ru = 1 + +PACKAGES += CSWtexlive-doc-si +CATALOGNAME_CSWtexlive-doc-si = texlive_doc_si +SPKG_DESC_CSWtexlive-doc-si += $(DESCRIPTION), doc si +OBSOLETED_BY_CSWtexlive-doc-si = CSWtetex +PKGFILES_CSWtexlive-doc-si += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-si += /opt/csw/share/texmf-dist/doc/latex/lshort-slovenian/.* +ARCHALL_CSWtexlive-doc-si = 1 + +PACKAGES += CSWtexlive-doc-th +CATALOGNAME_CSWtexlive-doc-th = texlive_doc_th +SPKG_DESC_CSWtexlive-doc-th += $(DESCRIPTION), doc th +OBSOLETED_BY_CSWtexlive-doc-th = CSWtetex +PKGFILES_CSWtexlive-doc-th += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-th += /opt/csw/share/texmf-dist/doc/latex/lshort-thai/.* +ARCHALL_CSWtexlive-doc-th = 1 + +PACKAGES += CSWtexlive-doc-tr +CATALOGNAME_CSWtexlive-doc-tr = texlive_doc_tr +SPKG_DESC_CSWtexlive-doc-tr += $(DESCRIPTION), doc tr +OBSOLETED_BY_CSWtexlive-doc-tr = CSWtetex +PKGFILES_CSWtexlive-doc-tr += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-tr += /opt/csw/share/texmf-dist/doc/latex/lshort-turkish/.* +ARCHALL_CSWtexlive-doc-tr = 1 + +PACKAGES += CSWtexlive-doc-uk +CATALOGNAME_CSWtexlive-doc-uk = texlive_doc_uk +SPKG_DESC_CSWtexlive-doc-uk += $(DESCRIPTION), doc uk +OBSOLETED_BY_CSWtexlive-doc-uk = CSWtetex +PKGFILES_CSWtexlive-doc-uk += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-uk += /opt/csw/share/texmf-dist/doc/latex/lshort-ukr/.* +ARCHALL_CSWtexlive-doc-uk = 1 + +PACKAGES += CSWtexlive-doc-vi +CATALOGNAME_CSWtexlive-doc-vi = texlive_doc_vi +SPKG_DESC_CSWtexlive-doc-vi += $(DESCRIPTION), doc vi +OBSOLETED_BY_CSWtexlive-doc-vi = CSWtetex +PKGFILES_CSWtexlive-doc-vi += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-vi += /opt/csw/share/texmf-dist/doc/latex/amsldoc-vn/.* +PKGFILES_CSWtexlive-doc-vi += /opt/csw/share/texmf-dist/doc/latex/lshort-vietnamese/.* +PKGFILES_CSWtexlive-doc-vi += /opt/csw/share/texmf-dist/doc/latex/ntheorem-vn/.* +ARCHALL_CSWtexlive-doc-vi = 1 + +PACKAGES += CSWtexlive-doc-zh +CATALOGNAME_CSWtexlive-doc-zh = texlive_doc_zh +SPKG_DESC_CSWtexlive-doc-zh += $(DESCRIPTION), doc zh +OBSOLETED_BY_CSWtexlive-doc-zh = CSWtetex +PKGFILES_CSWtexlive-doc-zh += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/generic/latex-notes-zh-cn/.* +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/latex/ctex-faq/.* +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/latex/lshort-chinese/.* +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/support/asymptote-by-example-zh-cn/.* +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/support/asymptote-faq-zh-cn/.* +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf-dist/doc/support/asymptote-manual-zh-cn/.* +PKGFILES_CSWtexlive-doc-zh += /opt/csw/share/texmf/doc/texlive/texlive-zh-cn/.* +ARCHALL_CSWtexlive-doc-zh = 1 + +PACKAGES += CSWtexlive-extra-utils +CATALOGNAME_CSWtexlive-extra-utils = texlive_extra_utils +SPKG_DESC_CSWtexlive-extra-utils += $(DESCRIPTION), extra utils +OBSOLETED_BY_CSWtexlive-extra-utils = CSWtetex +PKGFILES_CSWtexlive-extra-utils += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/a2ping +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/dviasm +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/e2pall +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/findhyph +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/latex2man +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/mkjobtexmf +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pdfcrop +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pkfix-helper +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/pkfix +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/rpdfcrop +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texcount +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texdiff +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texdirflatten +PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/texloganalyser +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/bibtex/csf/base/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/bibtex/csf/polish-csf/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/generic/mkjobtexmf/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/latex/listings-ext/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/plain/cweb/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/findhyph/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/latex2man/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/pdfcrop/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/pkfix-helper/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/pkfix/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/texcount/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/texdiff/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/doc/support/texloganalyser/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/dviasm/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/findhyph/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/latex2man/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/listings-ext/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/mkjobtexmf/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/pdfcrop/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/pkfix-helper/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/pkfix/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/texcount/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/texdiff/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/texdirflatten/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/scripts/texloganalyser/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/tex/generic/hyphenex/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/tex/latex/latex2man/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/tex/latex/listings-ext/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf-dist/tex/plain/cweb/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/doc/bibtex8/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/doc/tpic2pdftex/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/scripts/a2ping/.* +PKGFILES_CSWtexlive-extra-utils += /opt/csw/share/texmf/scripts/tetex/e2pall.pl +ARCHALL_CSWtexlive-extra-utils = 1 + +PACKAGES += CSWtexlive-font-utils +CATALOGNAME_CSWtexlive-font-utils = texlive_font_utils +SPKG_DESC_CSWtexlive-font-utils += $(DESCRIPTION), font utils +OBSOLETED_BY_CSWtexlive-font-utils = CSWtetex +PKGFILES_CSWtexlive-font-utils += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/afm2afm +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/autoinst +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/epstopdf +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/mkt1font +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/ot2kpx +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/vpl2ovp +PKGFILES_CSWtexlive-font-utils += /opt/csw/bin/vpl2vpl +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/doc/fonts/accfonts/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/doc/fonts/fontinst/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/doc/support/fontools/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/dvips/dvipsconfig/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/fonts/enc/dvips/fontools/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/fonts/sfd/ttf2pk/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/mft/base/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/scripts/accfonts/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/scripts/epstopdf/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/scripts/fontools/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/base/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/latinetx/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/latinmtx/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/mathetx/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/mathmtx/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/misc/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/smbletx/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/fontinst/smblmtx/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/latex/accfonts/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf-dist/tex/latex/fontinst/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/doc/ttf2pk/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/fonts/enc/dvips/afm2pl/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/fonts/enc/ttf2pk/base/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/fonts/lig/afm2pl/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/tex/fontinst/afm2pl/.* +PKGFILES_CSWtexlive-font-utils += /opt/csw/share/texmf/ttf2pk/.* +ARCHALL_CSWtexlive-font-utils = 1 + +PACKAGES += CSWtexlive-fonts-extra +CATALOGNAME_CSWtexlive-fonts-extra = texlive_fonts_extra +SPKG_DESC_CSWtexlive-fonts-extra += $(DESCRIPTION), fonts extra +OBSOLETED_BY_CSWtexlive-fonts-extra = CSWtetex +PKGFILES_CSWtexlive-fonts-extra += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/initials/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/dvips/mathdesign/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/arkandis/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/itc/psafm/stonesan/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/mathdesign/mdbch/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/mathdesign/mdput/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/mathdesign/mdugm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/archaic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/augie/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/auncial-new/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/aurical/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/bera/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/carolmin-ps/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/cryst/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/dictsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/fonetika/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/fourier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/fouriernc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/hfbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/initials/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/linearA/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/public/trajan/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/urw/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/afm/urw/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/hfbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/libris/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/dvips/tengwarscript/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/enc/pdftex/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/allrunes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/archaic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/ascii/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/augie/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/auncial-new/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/aurical/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/belleek/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/bera/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/carolmin-ps/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/cmll/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/dictsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/doublestroke/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/esvect/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/fge/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/foekfont/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/fonetika/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/fourier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/hfbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/initials/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/iwona/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/kurier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/libris/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/linearA/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/lxfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/ly1/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/mathdesign/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/pigpen/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/recycle/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/staves/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/tengwarscript/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/trajan/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/venturis/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/venturis2/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/venturisold/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/venturissans/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/dvips/venturissans2/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/map/vtex/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ofm/public/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ofm/public/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ofm/public/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/Asana-Math/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/opentype/public/umtypewriter/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ovf/public/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ovf/public/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ovf/public/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/ovp/public/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/allrunes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/archaic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/astro/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/aurical/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/barcodes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/bbding/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/bbm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/bbold/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/boisik/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/bookhands/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/calligra/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/cherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/cmbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/cmll/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/cmpica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/cryst/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/dancers/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/dice/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/dingbat/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/doublestroke/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/duerer/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/ecc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/eiad-ltx/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/eiad/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/elvish/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/esvect/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/euxm/euxm10.mf +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/euxm/euxm5.mf +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/euxm/euxm7.mf +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/euxm/euxmch.mf +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/feyn/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/fge/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/frcursive/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/genealogy/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/greenpoint/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/hands/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/ifsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/kixfont/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/knuthotherfonts/committee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/knuthotherfonts/halftone/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/knuthotherfonts/mfbook/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/lfb/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/lxfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/mathabx/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/nkarta/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/ogham/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/orkhun/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/pacioli/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/phonetic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/pigpen/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/punk/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/recycle/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/sauter/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/skull/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/tapir/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/universa/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/source/public/wsuipa/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/arkandis/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/mathdesign/mdbch/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/mathdesign/mdput/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/mathdesign/mdugm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/archaic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/ascii/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/astro/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/augie/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/auncial-new/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/aurical/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/barcodes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/bbding/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/bbm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/bbold/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/bera/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/blacklettert1/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/boisik/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/calligra/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cmbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cmll/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cmpica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cryst/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/dancers/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/dice/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/dictsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/dingbat/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/doublestroke/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/duerer/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/ecc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/eco/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/eiad/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/elvish/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/esvect/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/eulervm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/euxm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/feyn/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/fge/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/foekfont/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/fonetika/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/fourier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/fouriernc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/frcursive/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/genealogy/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/greenpoint/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/hands/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/hfoldsty/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/ifsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/initials/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/kixfont/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/lfb/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/linearA/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/lxfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/mathabx/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/nkarta/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/ogham/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/orkhun/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/pacioli/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/phonetic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/pigpen/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/punk/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/recycle/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/staves/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/tengwarscript/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/trajan/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/universa/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/public/wsuipa/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/urw/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/tfm/urw/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/truetype/public/Asana-Math/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/truetype/public/belleek/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/truetype/public/junicode/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/arkandis/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/mathdesign/mdbch/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/mathdesign/mdput/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/mathdesign/mdugm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/allrunes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/archaic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/ascii/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/augie/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/auncial-new/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/aurical/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/belleek/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/bera/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/carolmin-ps/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/cmll/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/cryst/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/dictsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/doublestroke/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/esvect/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/fge/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/foekfont/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/fonetika/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/fourier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/hfbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/initials/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/linearA/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/lxfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/pigpen/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/recycle/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/staves/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/tapir/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/public/trajan/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/urw/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/type1/urw/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/arkandis/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/mathdesign/mdbch/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/mathdesign/mdput/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/mathdesign/mdugm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/augie/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/bera/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/blacklettert1/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/eco/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/eulervm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/fourier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/fouriernc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/gothic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/hfoldsty/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/public/tengwarscript/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/urw/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/fonts/vf/urw/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/metapost/nkarta/nkarta.mp +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/omega/ocp/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/omega/ocp/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/omega/otp/ocherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/context/third/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/generic/ean/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/generic/mathabx/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/lambda/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/allrunes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/archaic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/arev/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/ascii/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/augie/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/auncial-new/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/aurical/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/barcodes/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/bbding/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/bbm-macros/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/bbold/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/bera/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/blacklettert1/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/boisik/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/bookhands/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/braille/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/cherokee/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/cmbright/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/cmll/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/courier-scaled/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/dictsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/dingbat/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/doublestroke/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/duerer-latex/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/eco/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/eiad-ltx/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/eiad/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/epsdice/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/esvect/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/eulervm/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/feyn/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/fge/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/foekfont/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/fonetika/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/fourier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/fouriernc/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/frcursive/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/hfoldsty/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/ifsym/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/initials/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/iwona/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/kurier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/libris/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/linearA/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/lxfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/ly1/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/mathdesign/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/pacioli/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/phonetic/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/pigpen/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/recycle/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/sauterfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/skull/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/staves/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/tengwarscript/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/trajan/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/universa/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/venturis/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/venturis2/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/venturisadf/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/venturisold/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/venturissans/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/venturissans2/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/wsuipa/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/latex/yfonts/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/plain/antt/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/plain/iwona/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/plain/kurier/.* +PKGFILES_CSWtexlive-fonts-extra += /opt/csw/share/texmf-dist/tex/plain/semaphor/.* +ARCHALL_CSWtexlive-fonts-extra = 1 + +PACKAGES += CSWtexlive-fonts-extra-doc +CATALOGNAME_CSWtexlive-fonts-extra-doc = texlive_fonts_extra_doc +SPKG_DESC_CSWtexlive-fonts-extra-doc += $(DESCRIPTION), fonts extra doc +OBSOLETED_BY_CSWtexlive-fonts-extra-doc = CSWtetex +PKGFILES_CSWtexlive-fonts-extra-doc += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/allrunes/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/antiqua/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/antt/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/archaic/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/arev/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/ascii/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/astro/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/auncial-new/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/bbm/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/belleek/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/bera/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/blacklettert1/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/boisik/README +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/boisik/example/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/bookhands/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/carolmin-ps/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/cmll/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/cyklop/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/dice/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/dictsym/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/dingbat/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/doublestroke/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/dozenal/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/ecc/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/eco/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/eiad/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/elvish/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/epigrafica/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/feyn/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/fge/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/fonetika/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/fourier/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/fouriernc/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/frcursive/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/genealogy/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gfsartemisia/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gfsbodoni/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gfscomplutum/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gfsdidot/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gfsneohellenic/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gfssolomos/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/gothic/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/greenpoint/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/grotesq/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/hfbright/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/ifsym/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/inconsolata/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/initials/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/iwona/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/junicode/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/kixfont/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/kpfonts/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/kurier/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/lfb/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/libris/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/linearA/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/lxfonts/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/mathabx/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/nkarta/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/oinuit/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/orkhun/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/pacioli/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/phaistos/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/phonetic/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/recycle/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/semaphor/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/staves/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/universa/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/fonts/venturisadf/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/augie/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/aurical/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/barcodes/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/bbding/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/bbold/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/braille/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/brushscr/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/calligra/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/cm-lgc/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/cmpica/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/cryst/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/duerer-latex/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/eiad-ltx/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/epsdice/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/esvect/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/eulervm/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/foekfont/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/mathdesign/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/mnsymbol/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/pigpen/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/sauterfonts/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/tengwarscript/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/trajan/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/latex/yfonts/.* +PKGFILES_CSWtexlive-fonts-extra-doc += /opt/csw/share/texmf-dist/doc/omega/ocherokee/.* +ARCHALL_CSWtexlive-fonts-extra-doc = 1 + +PACKAGES += CSWtexlive-fonts-recommended +CATALOGNAME_CSWtexlive-fonts-recommended = texlive_fonts_recommended +SPKG_DESC_CSWtexlive-fonts-recommended += $(DESCRIPTION), fonts recommended +OBSOLETED_BY_CSWtexlive-fonts-recommended = CSWtetex +PKGFILES_CSWtexlive-fonts-recommended += $(PKGFILES_DOC) +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/avantgar/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/bookman/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/courier/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/helvetic/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/ncntrsbk/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/palatino/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/symbol/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/times/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/zapfchan/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/dvips/zapfding/.* +PKGFILES_CSWtexlive-fonts-recommended += /opt/csw/share/texmf-dist/fonts/afm/adobe/avantgar/.* @@ 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 wilbury at users.sourceforge.net Thu Sep 6 16:32:06 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 06 Sep 2012 14:32:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19161] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 19161 http://gar.svn.sourceforge.net/gar/?rev=19161&view=rev Author: wilbury Date: 2012-09-06 14:32:06 +0000 (Thu, 06 Sep 2012) Log Message: ----------- Polish postinstall and cswmysql5 template as well. Patches from Laurent Blume. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-09-06 13:37:38 UTC (rev 19160) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-09-06 14:32:06 UTC (rev 19161) @@ -308,11 +308,11 @@ post-configure-modulated: gsed \ - -e 's+ at prefix@+$(prefix)+' \ - -e 's+ at localstatedir@+$(localstatedir)+' \ - -e 's+ at sysconfdir@+$(sysconfdir)+' \ - -e 's+ at bindir@+$(bindir)+' \ - -e 's+ at BASE_VERSION@+$(BASE_VERSION)+' \ + -e 's+ at prefix@+$(prefix)+g' \ + -e 's+ at localstatedir@+$(localstatedir)+g' \ + -e 's+ at sysconfdir@+$(sysconfdir)+g' \ + -e 's+ at bindir@+$(bindir)+g' \ + -e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \ < $(WORKDIR)/csw$(NAME).tpl \ > $(WORKDIR)/csw$(NAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2012-09-06 13:37:38 UTC (rev 19160) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2012-09-06 14:32:06 UTC (rev 19161) @@ -87,19 +87,6 @@ echo "Please ignore references to starting mysqld_safe in the messages above." echo " These messages are from mysql_install_db. See the following" echo " for starting CSWmysql5." -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi -if [ $smf = yes ] -then - echo "Running \`svcadm enable cswmysql5\` start to start the database." - # First, we clear the status, since it's likely to be 'maintenance'. - svcadm disable cswmysql5 - svcadm clear cswmysql5 - svcadm enable cswmysql5 -else - echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." - /etc/opt/csw/init.d/cswmysql start -fi exit 0 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-09-06 13:37:38 UTC (rev 19160) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-09-06 14:32:06 UTC (rev 19161) @@ -11,27 +11,19 @@ # When this is done the mysql server will be started when the machine is # started and shut down when the systems goes down. -# Comments to support chkconfig on RedHat Linux -# chkconfig: 2345 64 36 -# description: A very fast and reliable SQL database engine. +# Comments for OpenCSW's CAS scripts +#RC_KNUM 01 +#RC_SNUM 99 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#FMRI network +#AUTOENABLE no -# Comments to support LSB init script conventions -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $local_fs $network $remote_fs -# Should-Start: ypbind nscd ldap ntpd xntpd -# Required-Stop: $local_fs $network $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop MySQL -# Description: MySQL is a very fast and reliable SQL database engine. -### END INIT INFO - -# If you install MySQL on some other places than /opt/mysql-5.5.19, then you +# If you install MySQL on some other places than @prefix@, then you # have to do one of the following things for this script to work: # # - Run this script from within the MySQL installation directory -# - Create a /etc/my.cnf file with the following information: +# - Create a @sysconfdir@/my.cnf file with the following information: # [mysqld] # basedir= # - Add the above to any other configuration file (for example ~/.my.ini) @@ -40,7 +32,7 @@ # below. # # If you want to affect other MySQL variables, you should make your changes -# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files. +# in the @sysconfdir@/my.cnf, ~/.my.cnf or other MySQL configuration files. # If you change base dir, you must also change datadir. These may get # overwritten by settings in the MySQL configuration files. @@ -200,6 +192,48 @@ fi } +### START OPENCSW ARCHITECTURE SELECTION +# Source the configuration +# This is used to define the binary architeture to run + +# Check the old location first +[ -r @prefix@/etc/csw.conf ] && . @prefix@/etc/csw.conf + +# Check the current location, its content overrides the previous one +[ -r @sysconfdir@/csw.conf ] && . @sysconfdir@/csw.conf + +# If the package-specific variable is not set, try the default +if [ -z "$mysql5_arch" ]; then + if [ -n "$default_arch" ]; then + mysql5_arch="$default_arch" + fi +else + # In that specific case, by default, there is no subdir + if [ "$mysql5_arch" = "i386" -o "$mysql5_arch" = "sparc" ]; then + mysql5_arch="" + fi +fi + +# If a value was found +if [ -n "$mysql5_arch" ]; then + if [ "$mysql5_arch" = "kernel" ]; then + # Use the system's default arch + mysql5_arch=`isainfo -k` + fi + + # Add the architecture suffix to the executables' directories, if it exists + # The binaries themselves are tested below, so the script should fail + # mostly gracefully if a non-present arch is set up. + if [ -d "$bindir/$mysql5_arch" -a \ + + -d "$sbindir/$mysql5_arch" -a \ + + -d "$libexecdir/$mysql5_arch" ]; then + bindir="$bindir/$mysql5_arch" + sbindir="$sbindir/$mysql5_arch" + libexecdir="$libexecdir/$mysql5_arch" + fi +fi +### END OPENCSW ARCHITECTURE SELECTION + # Get arguments from the my.cnf file, # the only group, which is read from now on is [mysqld] if test -x ./bin/my_print_defaults @@ -275,7 +309,9 @@ # Start daemon # Safeguard (relative paths, core dumps..) - cd $basedir + # Changed to /opt for OpenCSW to avoid mysqld_safe picking the 32 bit + # binary in libexec/ + cd /opt echo $echo_n "Starting MySQL" if test -x $bindir/mysqld_safe 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 6 22:25:19 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Sep 2012 20:25:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19162] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 19162 http://gar.svn.sourceforge.net/gar/?rev=19162&view=rev Author: dmichelsen Date: 2012-09-06 20:25:18 +0000 (Thu, 06 Sep 2012) Log Message: ----------- tcl85/trunk: Split off tclmodules in tcl8/ and switch back to native soname Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-06 14:32:06 UTC (rev 19161) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-06 20:25:18 UTC (rev 19162) @@ -27,7 +27,7 @@ REN_TCLSH = tclsh8.5 PATCHDIR = $(WORKDIR)/$(DISTNAME) -PATCHFILES += 0001-Enable-SONAME-in-library.patch +#PATCHFILES += 0001-Enable-SONAME-in-library.patch PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch # PATCHFILES += tcl-dtrace.patch @@ -39,7 +39,7 @@ PACKAGES = CSWtcl SPKG_DESC_CSWtcl = Tcl programming language 8.5 -RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5-0 +RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) @@ -47,23 +47,34 @@ CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n -PACKAGES += CSWlibtcl8-5-0 -SPKG_DESC_CSWlibtcl8-5-0 = $(DESCRIPTION), libraries -PKGFILES_CSWlibtcl8-5-0 += $(call pkgfiles_lib,libtcl8.5.so.0) -PKGFILES_CSWlibtcl8-5-0 += $(libdir)/tcl8/.* -PKGFILES_CSWlibtcl8-5-0 += $(libdir)/tcl8.5/.* -RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-i386 += CSWsunmath -RUNTIME_DEP_PKGS_CSWlibtcl8-5-0 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-0-$(GARCH)) +PACKAGES += CSWlibtcl8-5 +SPKG_DESC_CSWlibtcl8-5 = $(DESCRIPTION), libraries +PKGFILES_CSWlibtcl8-5 += $(call pkgfiles_lib,libtcl8.5.so) +PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.* +# This dependency can not be tracked by checkpkg +RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules +CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules +RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386 += CSWsunmath +RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH)) +# This is correct, the soname with *.so is really the one to use +CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename + +PACKAGES += CSWtcl8-tclmodules +SPKG_DESC_CSWtcl8-tclmodules = Modules common to TCL 8.x +PKGFILES_CSWtcl8-tclmodules += $(libdir)/tcl8/.* + # This is to find zoneinfo -CHECKPKG_OVERRIDES_CSWlibtcl8-5-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl -CHECKPKG_OVERRIDES_CSWlibtcl8-5-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl +CHECKPKG_OVERRIDES_CSWlibtcl8-5 += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl +CHECKPKG_OVERRIDES_CSWlibtcl8-5 += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl PACKAGES += CSWtcl-dev SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files +# Indeed, the *.so is the real library and belongs to CSWlibtcl8-5 +PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWtcl-dev += $(PKGFILES_DEVEL) PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh) -RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5-0 +RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5 BUILD64 = 1 @@ -102,9 +113,9 @@ pre-test-modulated: @# Need to manually create symlink to latest version @echo Creating symlinks for libtcl8.5.so - (cd $(WORKSRC) ; \ - mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \ - ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) ) + #(cd $(WORKSRC) ; \ + # mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \ + # ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) ) @$(MAKECOOKIE) post-install-modulated: 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 7 11:19:35 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Sep 2012 09:19:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19163] csw/mgar/pkg/tcl84/trunk/Makefile Message-ID: Revision: 19163 http://gar.svn.sourceforge.net/gar/?rev=19163&view=rev Author: dmichelsen Date: 2012-09-07 09:19:34 +0000 (Fri, 07 Sep 2012) Log Message: ----------- tcl84/trunk: Skip soname with .0, relayout packages Modified Paths: -------------- csw/mgar/pkg/tcl84/trunk/Makefile Modified: csw/mgar/pkg/tcl84/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl84/trunk/Makefile 2012-09-06 20:25:18 UTC (rev 19162) +++ csw/mgar/pkg/tcl84/trunk/Makefile 2012-09-07 09:19:34 UTC (rev 19163) @@ -22,36 +22,57 @@ REN_TCLSH = tclsh8.4 PATCHDIR = $(WORKDIR)/$(DISTNAME) -PATCHFILES = soname.diff +# PATCHFILES = soname.diff PATCHFILES += tcl-dtrace.patch -PACKAGES = CSWtcl -PACKAGES += CSWtcl8-4 -PACKAGES += CSWlibtcl8-4-0 -PACKAGES += CSWtcl8-4-dev - ALTERNATIVES_PRIO = 840 +PACKAGES = CSWtcl +SPKG_DESC_CSWtcl = $(DESCRIPTION), backwards compatibility package +# Make sure CSWtcl remains empty, it's just for backwards compatibility: +PKGFILES_CSWtcl = NOFILES +ARCHALL_CSWtcl = 1 RUNTIME_DEP_PKGS_CSWtcl = CSWtcl8-4 -RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-4-0 +RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-4 RUNTIME_DEP_PKGS_CSWtcl += CSWtcl8-4-dev -RUNTIME_DEP_PKGS_CSWtcl8-4 = CSWlibtcl8-4-0 -RUNTIME_DEP_PKGS_CSWtcl8-4-dev = CSWlibtcl8-4-0 -SPKG_DESC_CSWtcl = $(DESCRIPTION), backwards compatibility package -SPKG_DESC_CSWtcl8-4 = $(DESCRIPTION) -SPKG_DESC_CSWlibtcl8-4-0 = $(DESCRIPTION), libraries -SPKG_DESC_CSWtcl8-4-dev = $(DESCRIPTION), development files +# This can not be tracked from checkpkg +CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWlibtcl8-4 +CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWtcl8-4-dev -# Make sure CSWtcl remains empty, it's just for backwards compatibility: -PKGFILES_CSWtcl = NOFILES -PKGFILES_CSWlibtcl8-4-0 = $(call pkgfiles_lib,libtcl8.4.so.0) -PKGFILES_CSWtcl8-4-dev = $(PKGFILES_DEVEL) +# This is ok as libtcl is already properly versioned +CHECKPKG_OVERRIDES_CSWlibtcl8-4 += soname-equals-filename + +PACKAGES += CSWtcl8-4 +SPKG_DESC_CSWtcl8-4 = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWtcl8-4 += CSWlibtcl8-4 # catchall, so nothing here. # PKGFILES_CSWtcl8-4 -ARCHALL_CSWtcl = 1 +PACKAGES += CSWtcl8-4-dev +SPKG_DESC_CSWtcl8-4-dev = $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWtcl8-4-dev = CSWlibtcl8-4 +# This can not be tracked by checkpkg +CHECKPKG_OVERRIDES_CSWtcl8-4-dev += surplus-dependency|CSWlibtcl8-4 + +PACKAGES += CSWlibtcl8-4 +SPKG_DESC_CSWlibtcl8-4 = $(DESCRIPTION), libraries +PKGFILES_CSWlibtcl8-4 += $(call pkgfiles_lib,libtcl8.4.so) +PKGFILES_CSWlibtcl8-4 += $(libdir)/tcl8.4/.* + +# Indeed, the *.so is the real library and belongs to CSWlibtcl8-5 +PKGFILES_DEVEL_SHAREDLIBLINK = +PKGFILES_CSWtcl8-4-dev = $(PKGFILES_DEVEL) + +# This has not been released yet and is built from TCL 8.5 +FOREIGN_PACKAGES += CSWtcl8-tclmodules + +# This dependency can not be tracked by checkpkg +RUNTIME_DEP_PKGS_CSWlibtcl8-4 += CSWtcl8-tclmodules +CHECKPKG_OVERRIDES_CSWlibtcl8-4 += surplus-dependency|CSWtcl8-tclmodules +CHECKPKG_OVERRIDES_CSWlibtcl8-4 += unidentified-dependency|CSWtcl8-tclmodules + ALTERNATIVES_CSWtcl8-4 += tcl8_4 ALTERNATIVE_tcl8_4 += $(bindir)/tclsh $(ALTERNATIVES_PRIO) ALTERNATIVE_tcl8_4 += $(libdir)/tclConfig.sh $(ALTERNATIVES_PRIO) @@ -88,10 +109,10 @@ pre-test-modulated: @# Need to manually create symlink to latest version - @echo Creating symlinks for libtcl8.5.so - @(cd $(WORKSRC) ; \ - mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \ - ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) ) + #@echo Creating symlinks for libtcl8.5.so + #@(cd $(WORKSRC) ; \ + # mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \ + # ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) ) @$(MAKECOOKIE) post-install-modulated: 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 7 12:45:19 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Sep 2012 10:45:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19164] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 19164 http://gar.svn.sourceforge.net/gar/?rev=19164&view=rev Author: dmichelsen Date: 2012-09-07 10:45:19 +0000 (Fri, 07 Sep 2012) Log Message: ----------- tcl85/trunk: Add legacy dependency from CSWtcl to CSWlibtcl8-4 until all legacy packages have been rebuild Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-07 09:19:34 UTC (rev 19163) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-07 10:45:19 UTC (rev 19164) @@ -43,6 +43,12 @@ RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) +# There are legacy packages depending on CSWtcl which require libtcl 8.4 +FOREIGN_PACKAGES += CSWlibtcl8-4 +RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-4 +CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWlibtcl8-4 +CHECKPKG_OVERRIDES_CSWtcl += unidentified-dependency|CSWlibtcl8-4 + # This is to find zoneinfo CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n 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 7 13:21:23 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 07 Sep 2012 11:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19165] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 19165 http://gar.svn.sourceforge.net/gar/?rev=19165&view=rev Author: cgrzemba Date: 2012-09-07 11:21:22 +0000 (Fri, 07 Sep 2012) Log Message: ----------- netsnmp/trunk: add build 64bit libs Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2012-09-07 10:45:19 UTC (rev 19164) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2012-09-07 11:21:22 UTC (rev 19165) @@ -30,6 +30,7 @@ VENDOR_URL = http://www.net-snmp.org/ +GARCOMPILER = SOS12U3 BUILD_DEP_PKGS = CSWpysetuptools PACKAGING_PLATFORMS += Solaris10-sparc Solaris10-i386 @@ -120,6 +121,7 @@ CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert # BUILD64 = 1 +BUILD64_LIBS_ONLY = 1 NOISALIST = 1 # The -I/opt/csw/include pulls in installed version before built version and breaks testsuite @@ -134,8 +136,11 @@ CONFIGURE_ARGS_mm-32 += --with-python-modules=yes # Enable Perl for 64 bit later # -# CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules -CONFIGURE_ARGS_mm-64 = --enable-embedded-perl --with-perl-modules +# we have no perl64 nr python64 +CONFIGURE_ARGS_mm-64 = --disable-embedded-perl +# CONFIGURE_ARGS_mm-64 = --enable-embedded-perl +# CONFIGURE_ARGS_mm-64 += --with-perl-modules +CONFIGURE_ARGS_mm-64 += --without-perl-modules CONFIGURE_ARGS_mm-64 += --without-python-modules CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Sep 7 16:46:10 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 07 Sep 2012 14:46:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19166] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 19166 http://gar.svn.sourceforge.net/gar/?rev=19166&view=rev Author: phipsy Date: 2012-09-07 14:46:10 +0000 (Fri, 07 Sep 2012) Log Message: ----------- puppet: version ramp, plus user lock. mantis tickets 4998 and 4997 respectively Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/cswusergroup Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2012-09-07 11:21:22 UTC (rev 19165) +++ csw/mgar/pkg/puppet/trunk/Makefile 2012-09-07 14:46:10 UTC (rev 19166) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.18 +VERSION = 2.7.19 CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2012-09-07 11:21:22 UTC (rev 19165) +++ csw/mgar/pkg/puppet/trunk/checksums 2012-09-07 14:46:10 UTC (rev 19166) @@ -15,3 +15,4 @@ 8062f371cc7ec5c7e5cd5f4b6c3f9278 puppet-2.7.13.tar.gz a505a02e23975464fcf4a2c0cb0b3b59 puppet-2.7.14.tar.gz 210725704692a0ca7b8ffc312471796e puppet-2.7.18.tar.gz +ba76fa7831df53db7424a8d523465ef5 puppet-2.7.19.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswusergroup 2012-09-07 11:21:22 UTC (rev 19165) +++ csw/mgar/pkg/puppet/trunk/files/cswusergroup 2012-09-07 14:46:10 UTC (rev 19166) @@ -1 +1 @@ -puppet:puppet:Puppet configuration management:/var/opt/csw/puppet:/bin/false:: +puppet:puppet:Puppet configuration management:/var/lib/puppet:/bin/false:::NP This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 7 17:48:37 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 07 Sep 2012 15:48:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19167] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 19167 http://gar.svn.sourceforge.net/gar/?rev=19167&view=rev Author: rthurner Date: 2012-09-07 15:48:37 +0000 (Fri, 07 Sep 2012) Log Message: ----------- mercurial, upgrade to hg-2.3.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 2012-09-07 14:46:10 UTC (rev 19166) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-09-07 15:48:37 UTC (rev 19167) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.3 +VERSION = 2.3.1 CATEGORIES = python GARTYPE = v2 @@ -13,7 +13,7 @@ PACKAGES = CSWmercurial SPKG_DESC_CSWmercurial = Mercurial -RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWmercurial += CSWlibpython2-6-1-0 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2012-09-07 14:46:10 UTC (rev 19166) +++ csw/mgar/pkg/mercurial/trunk/checksums 2012-09-07 15:48:37 UTC (rev 19167) @@ -1 +1 @@ -8d9f776e432239571dfab2b5f88b3675 mercurial-2.3.tar.gz +22a46a3ae64a5d625f068e588b4d6ec2 mercurial-2.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 7 18:52:51 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 07 Sep 2012 16:52:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19168] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 19168 http://gar.svn.sourceforge.net/gar/?rev=19168&view=rev Author: rthurner Date: 2012-09-07 16:52:51 +0000 (Fri, 07 Sep 2012) Log Message: ----------- cmake-2.8.9 upgrade Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2012-09-07 15:48:37 UTC (rev 19167) +++ csw/mgar/pkg/cmake/trunk/Makefile 2012-09-07 16:52:51 UTC (rev 19168) @@ -1,7 +1,7 @@ # $Id$ NAME = cmake -VERSION = 2.8.8 +VERSION = 2.8.9 CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2012-09-07 15:48:37 UTC (rev 19167) +++ csw/mgar/pkg/cmake/trunk/checksums 2012-09-07 16:52:51 UTC (rev 19168) @@ -1 +1 @@ -ba74b22c788a0c8547976b880cd02b17 cmake-2.8.8.tar.gz +801f4c87f8b604f727df5bf1f05a59e7 cmake-2.8.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Sep 7 20:59:09 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 07 Sep 2012 18:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[19169] csw/mgar/pkg/cmake/trunk/Makefile Message-ID: Revision: 19169 http://gar.svn.sourceforge.net/gar/?rev=19169&view=rev Author: rthurner Date: 2012-09-07 18:59:09 +0000 (Fri, 07 Sep 2012) Log Message: ----------- cmake, patch not needed any more Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2012-09-07 16:52:51 UTC (rev 19168) +++ csw/mgar/pkg/cmake/trunk/Makefile 2012-09-07 18:59:09 UTC (rev 19169) @@ -21,7 +21,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz LICENSE = Copyright.txt # temporary for cmake-2.8.8, see http://public.kitware.com/Bug/view.php?id=13199 -PATCHFILES += 0001-bootstrap-Port-back-to-old-shells-13199.patch +#PATCHFILES += 0001-bootstrap-Port-back-to-old-shells-13199.patch PACKAGES = CSWcmake CATALOGNAME_CSWcmake = cmake 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 7 21:23:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Sep 2012 19:23:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19170] csw/mgar/pkg/tcl84/trunk/Makefile Message-ID: Revision: 19170 http://gar.svn.sourceforge.net/gar/?rev=19170&view=rev Author: dmichelsen Date: 2012-09-07 19:23:45 +0000 (Fri, 07 Sep 2012) Log Message: ----------- tcl84/trunk: Do not depend TCL 8.4 against tcl8-modules Modified Paths: -------------- csw/mgar/pkg/tcl84/trunk/Makefile Modified: csw/mgar/pkg/tcl84/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl84/trunk/Makefile 2012-09-07 18:59:09 UTC (rev 19169) +++ csw/mgar/pkg/tcl84/trunk/Makefile 2012-09-07 19:23:45 UTC (rev 19170) @@ -65,14 +65,6 @@ PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWtcl8-4-dev = $(PKGFILES_DEVEL) -# This has not been released yet and is built from TCL 8.5 -FOREIGN_PACKAGES += CSWtcl8-tclmodules - -# This dependency can not be tracked by checkpkg -RUNTIME_DEP_PKGS_CSWlibtcl8-4 += CSWtcl8-tclmodules -CHECKPKG_OVERRIDES_CSWlibtcl8-4 += surplus-dependency|CSWtcl8-tclmodules -CHECKPKG_OVERRIDES_CSWlibtcl8-4 += unidentified-dependency|CSWtcl8-tclmodules - ALTERNATIVES_CSWtcl8-4 += tcl8_4 ALTERNATIVE_tcl8_4 += $(bindir)/tclsh $(ALTERNATIVES_PRIO) ALTERNATIVE_tcl8_4 += $(libdir)/tclConfig.sh $(ALTERNATIVES_PRIO) 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 7 21:39:32 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Sep 2012 19:39:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19171] csw/mgar/pkg/tk/trunk Message-ID: Revision: 19171 http://gar.svn.sourceforge.net/gar/?rev=19171&view=rev Author: dmichelsen Date: 2012-09-07 19:39:32 +0000 (Fri, 07 Sep 2012) Log Message: ----------- tk/trunk: General rework of recipe matching tcl 8.5 build Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile csw/mgar/pkg/tk/trunk/checksums Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2012-09-07 19:23:45 UTC (rev 19170) +++ csw/mgar/pkg/tk/trunk/Makefile 2012-09-07 19:39:32 UTC (rev 19171) @@ -1,5 +1,5 @@ NAME = tk -VERSION = 8.5.8 +VERSION = 8.5.12 CATEGORIES = lang GARTYPE = v2 @@ -16,21 +16,41 @@ PATCHFILES = Makefile.in.diff PATCHDIR = $(WORKDIR)/$(DISTNAME) -DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl -DEP_PKGS_CSWtk += CSWlibxext -DEP_PKGS_CSWtk += CSWlibxscrnsaver -DEP_PKGS_CSWtk += CSWsunmath +#DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl +#DEP_PKGS_CSWtk += CSWlibxext +#DEP_PKGS_CSWtk += CSWlibxscrnsaver +#DEP_PKGS_CSWtk += CSWsunmath VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtkstub8.4.a -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tk -CHECKPKG_OVERRIDES_CSWtk += linked-against-discouraged-library|libtk8.4.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWtk += surplus-dependency|CSWsunmath -CHECKPKG_OVERRIDES_CSWtk += soname-not-found|libm.so.2 +PACKAGES += CSWtk +SPKG_DESC_CSWtk = GUI toolkit for tcl +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWtk += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWtk += CSWlibtk8-5 +# Leave the manpage for now +CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/wish.1 + +PACKAGES += CSWlibtk8-5 +SPKG_DESC_CSWlibtk8-5 = GUI toolkit library for tcl, libtk8.5.so +PKGFILES_CSWlibtk8-5 += $(call pkgfiles_lib,libtk8.5.so) +PKGFILES_CSWlibtk8-5 += $(call baseisadirs,$(libdir),tk8.5/.*) + +# This is correct, the soname with *.so is really the one to use +CHECKPKG_OVERRIDES_CSWlibtk8-5 += soname-equals-filename +# This is just a demo +CHECKPKG_OVERRIDES_CSWlibtk8-5 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.5/demos/tcolor + +PACKAGES += CSWtk-dev +SPKG_DESC_CSWtk-dev = Development files for libtk8.5.so +# Indeed, the *.so is the real library and belongs to CSWlibtcl8-5 +PKGFILES_DEVEL_SHAREDLIBLINK = +PKGFILES_CSWtk-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWtk-dev += $(call baseisadirs,$(libdir),tkConfig.sh) +RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtk8-5 + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 UPSTREAM_USE_SF = 1 @@ -38,18 +58,9 @@ BUILD64 = 1 -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - WORKSRC = $(WORKDIR)/$(DISTNAME)/unix -# INCLUDE_FLAGS = - CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # tk need the static tclstub library for some reason MERGE_EXCLUDE_STATICLIBS = @@ -69,8 +80,8 @@ post-install-isa-i386: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also - @echo Installing legacy files - @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) + #@echo Installing legacy files + #@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) @# Need to manually create symlink to latest version @echo Creating link to wish8.5 @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish @@ -85,8 +96,8 @@ post-install-isa-sparcv8: @# Install legacy libs @# Building them with version modulations would be hard as that would require a full legacy tcl also - @echo Installing legacy files - @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) + #@echo Installing legacy files + #@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) @# Need to manually create symlink to latest version @echo Creating link to wish8.5 @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish Modified: csw/mgar/pkg/tk/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2012-09-07 19:23:45 UTC (rev 19170) +++ csw/mgar/pkg/tk/trunk/checksums 2012-09-07 19:39:32 UTC (rev 19171) @@ -1,2 +1 @@ -5db325a0c9285adb2f2d8a7157dc132a Makefile.in.diff -13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz +a01640176845c1f654a412cfc9bab13b tk8.5.12-src.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 Sat Sep 8 09:13:29 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 08 Sep 2012 07:13:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19172] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19172 http://gar.svn.sourceforge.net/gar/?rev=19172&view=rev Author: pfelecan Date: 2012-09-08 07:13:29 +0000 (Sat, 08 Sep 2012) Log Message: ----------- texlive/trunk: addition of build dependencies Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-09-07 19:39:32 UTC (rev 19171) +++ csw/mgar/pkg/texlive/trunk/Makefile 2012-09-08 07:13:29 UTC (rev 19172) @@ -35,7 +35,9 @@ PACKAGING_PLATFORMS += solaris10-i386 BUILD_DEP_PKGS += CSWpoppler-dev -BUILD_DEP_PKGS += CSWpoppler-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibgd-dev BUILD_DEP_PKGS += CSWclisp # when this is installed, raises undefined symbols when linking # tools/genrb; this is the reason form 0002-Fix-ICU-link-edit.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 8 22:34:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 08 Sep 2012 20:34:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19173] csw/mgar/pkg Message-ID: Revision: 19173 http://gar.svn.sourceforge.net/gar/?rev=19173&view=rev Author: dmichelsen Date: 2012-09-08 20:34:29 +0000 (Sat, 08 Sep 2012) Log Message: ----------- tk84: Rework Tk 8.4 from legacy contents Modified Paths: -------------- csw/mgar/pkg/tk84/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tk84/trunk/files/8.4.sparc.tar.xz Added Paths: ----------- csw/mgar/pkg/tk84/ csw/mgar/pkg/tk84/trunk/Makefile csw/mgar/pkg/tk84/trunk/checksums csw/mgar/pkg/tk84/trunk/files/license.terms Removed Paths: ------------- csw/mgar/pkg/tk84/trunk/Makefile csw/mgar/pkg/tk84/trunk/checksums csw/mgar/pkg/tk84/trunk/files/Makefile.in.diff Deleted: csw/mgar/pkg/tk84/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/tk84/trunk/Makefile 2012-09-08 20:34:29 UTC (rev 19173) @@ -1,99 +0,0 @@ -NAME = tk -VERSION = 8.5.8 -CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = GUI toolkit for tcl -define BLURB -endef - -SF_PROJ = tcl -MASTER_SITES = $(SF_MIRRORS) - -DISTNAME = $(NAME)$(VERSION) -DISTFILES = $(DISTNAME)-src.tar.gz - -PATCHFILES = Makefile.in.diff -PATCHDIR = $(WORKDIR)/$(DISTNAME) - -DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl -DEP_PKGS_CSWtk += CSWlibxext -DEP_PKGS_CSWtk += CSWlibxscrnsaver -DEP_PKGS_CSWtk += CSWsunmath - -VENDOR_URL = http://www.tcl.tk/ -LICENSE = license.terms - -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtkstub8.4.a -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tk -CHECKPKG_OVERRIDES_CSWtk += linked-against-discouraged-library|libtk8.4.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWtk += surplus-dependency|CSWsunmath -CHECKPKG_OVERRIDES_CSWtk += soname-not-found|libm.so.2 - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz - -BUILD64 = 1 - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -WORKSRC = $(WORKDIR)/$(DISTNAME)/unix - -# INCLUDE_FLAGS = - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -# tk need the static tclstub library for some reason -MERGE_EXCLUDE_STATICLIBS = - -TEST_TARGET = - -include gar/category.mk - -#CFLAGS := $(filter-out -I%,$(CFLAGS)) -#DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) - - -pre-configure-modulated: - @(cd $(WORKSRC) ; cp -p ../license.terms .) - @$(MAKECOOKIE) - -post-install-isa-i386: - @# Install legacy libs - @# Building them with version modulations would be hard as that would require a full legacy tcl also - @echo Installing legacy files - @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-amd64: - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-sparcv8: - @# Install legacy libs - @# Building them with version modulations would be hard as that would require a full legacy tcl also - @echo Installing legacy files - @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-sparcv9: - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) Copied: csw/mgar/pkg/tk84/trunk/Makefile (from rev 19171, csw/mgar/pkg/tk/trunk/Makefile) =================================================================== --- csw/mgar/pkg/tk84/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tk84/trunk/Makefile 2012-09-08 20:34:29 UTC (rev 19173) @@ -0,0 +1,45 @@ +NAME = tk +VERSION = 8.4.15 +CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = GUI toolkit for tcl +define BLURB +endef + +SF_PROJ = tcl +MASTER_SITES = $(SF_MIRRORS) + +DISTFILES += 8.4.i386.tar.xz +DISTFILES += 8.4.sparc.tar.xz +DISTFILES += license.terms + +NOEXTRACT += 8.4.i386.tar.xz +NOEXTRACT += 8.4.sparc.tar.xz + +VENDOR_URL = http://www.tcl.tk/ +LICENSE = license.terms + +PACKAGES += CSWlibtk8-4 +SPKG_DESC_CSWlibtk8-4 = GUI toolkit library for tcl, libtk8.4.so +# PKGFILES is catchall + +# This is correct, the soname with *.so is really the one to use +CHECKPKG_OVERRIDES_CSWlibtk8-4 += soname-equals-filename + +# These are legacy files, just leave them for now +CHECKPKG_OVERRIDES_CSWlibtk8-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.4/demos/tcolor +CHECKPKG_OVERRIDES_CSWlibtk8-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.4/demos/README +CHECKPKG_OVERRIDES_CSWlibtk8-4 += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR) + xz -c -d $(FILEDIR)/8.4.$(GARCH).tar.xz | (cd $(DESTDIR) && tar xf -) + Deleted: csw/mgar/pkg/tk84/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/tk84/trunk/checksums 2012-09-08 20:34:29 UTC (rev 19173) @@ -1,2 +0,0 @@ -5db325a0c9285adb2f2d8a7157dc132a Makefile.in.diff -13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz Copied: csw/mgar/pkg/tk84/trunk/checksums (from rev 19171, csw/mgar/pkg/tk/trunk/checksums) =================================================================== Modified: csw/mgar/pkg/tk84/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Modified: csw/mgar/pkg/tk84/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/tk84/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/tk/trunk/files/Makefile.in.diff 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/tk84/trunk/files/Makefile.in.diff 2012-09-08 20:34:29 UTC (rev 19173) @@ -1,27 +0,0 @@ ---- tk8.5.8/unix/Makefile.in.orig 2009-11-13 19:38:48.000000000 +0100 -+++ tk8.5.8/unix/Makefile.in 2010-03-28 15:44:27.880721334 +0200 -@@ -326,20 +326,20 @@ - - CC = @CC@ - --CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -+CC_SWITCHES_NO_STUBS = ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ - -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ - -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} ${AC_FLAGS} \ - ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ --${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ -+${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} - - CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} - - APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@ - --DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ -+DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ - -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} \ - ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ --${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ -+${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} - - WISH_OBJS = tkAppInit.o - Added: csw/mgar/pkg/tk84/trunk/files/license.terms =================================================================== --- csw/mgar/pkg/tk84/trunk/files/license.terms (rev 0) +++ csw/mgar/pkg/tk84/trunk/files/license.terms 2012-09-08 20:34:29 UTC (rev 19173) @@ -0,0 +1,39 @@ +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., and other parties. The following +terms apply to all files associated with the software unless explicitly +disclaimed in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 8 23:53:56 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 08 Sep 2012 21:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19174] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 19174 http://gar.svn.sourceforge.net/gar/?rev=19174&view=rev Author: dmichelsen Date: 2012-09-08 21:53:56 +0000 (Sat, 08 Sep 2012) Log Message: ----------- tcl85: Remove old files, enable isaexec Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-08 20:34:29 UTC (rev 19173) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-08 21:53:56 UTC (rev 19174) @@ -83,6 +83,7 @@ RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5 BUILD64 = 1 +ISAEXEC = 1 INCLUDE_FLAGS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Sep 9 00:09:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 08 Sep 2012 22:09:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19175] csw/mgar/pkg Message-ID: Revision: 19175 http://gar.svn.sourceforge.net/gar/?rev=19175&view=rev Author: dmichelsen Date: 2012-09-08 22:09:05 +0000 (Sat, 08 Sep 2012) Log Message: ----------- tk85: Rename from tk, rework Added Paths: ----------- csw/mgar/pkg/tk85/ csw/mgar/pkg/tk85/trunk/Makefile csw/mgar/pkg/tk85/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/tk/ csw/mgar/pkg/tk85/trunk/Makefile csw/mgar/pkg/tk85/trunk/checksums csw/mgar/pkg/tk85/trunk/files/8.4.i386.tar.xz csw/mgar/pkg/tk85/trunk/files/8.4.sparc.tar.xz Deleted: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/tk85/trunk/Makefile 2012-09-08 22:09:05 UTC (rev 19175) @@ -1,99 +0,0 @@ -NAME = tk -VERSION = 8.5.8 -CATEGORIES = lang -GARTYPE = v2 - -DESCRIPTION = GUI toolkit for tcl -define BLURB -endef - -SF_PROJ = tcl -MASTER_SITES = $(SF_MIRRORS) - -DISTNAME = $(NAME)$(VERSION) -DISTFILES = $(DISTNAME)-src.tar.gz - -PATCHFILES = Makefile.in.diff -PATCHDIR = $(WORKDIR)/$(DISTNAME) - -DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl -DEP_PKGS_CSWtk += CSWlibxext -DEP_PKGS_CSWtk += CSWlibxscrnsaver -DEP_PKGS_CSWtk += CSWsunmath - -VENDOR_URL = http://www.tcl.tk/ -LICENSE = license.terms - -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtkstub8.4.a -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tk -CHECKPKG_OVERRIDES_CSWtk += linked-against-discouraged-library|libtk8.4.so|libX11.so.4 -CHECKPKG_OVERRIDES_CSWtk += surplus-dependency|CSWsunmath -CHECKPKG_OVERRIDES_CSWtk += soname-not-found|libm.so.2 - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz - -BUILD64 = 1 - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -WORKSRC = $(WORKDIR)/$(DISTNAME)/unix - -# INCLUDE_FLAGS = - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -# tk need the static tclstub library for some reason -MERGE_EXCLUDE_STATICLIBS = - -TEST_TARGET = - -include gar/category.mk - -#CFLAGS := $(filter-out -I%,$(CFLAGS)) -#DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) - - -pre-configure-modulated: - @(cd $(WORKSRC) ; cp -p ../license.terms .) - @$(MAKECOOKIE) - -post-install-isa-i386: - @# Install legacy libs - @# Building them with version modulations would be hard as that would require a full legacy tcl also - @echo Installing legacy files - @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -) - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-amd64: - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-sparcv8: - @# Install legacy libs - @# Building them with version modulations would be hard as that would require a full legacy tcl also - @echo Installing legacy files - @( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -) - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-sparcv9: - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) Copied: csw/mgar/pkg/tk85/trunk/Makefile (from rev 19171, csw/mgar/pkg/tk/trunk/Makefile) =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tk85/trunk/Makefile 2012-09-08 22:09:05 UTC (rev 19175) @@ -0,0 +1,109 @@ +NAME = tk +VERSION = 8.5.12 +CATEGORIES = lang +GARTYPE = v2 + +DESCRIPTION = GUI toolkit for tcl +define BLURB +endef + +SF_PROJ = tcl +MASTER_SITES = $(SF_MIRRORS) + +DISTNAME = $(NAME)$(VERSION) +DISTFILES = $(DISTNAME)-src.tar.gz + +PATCHFILES = Makefile.in.diff +PATCHDIR = $(WORKDIR)/$(DISTNAME) + +#DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl +#DEP_PKGS_CSWtk += CSWlibxext +#DEP_PKGS_CSWtk += CSWlibxscrnsaver +#DEP_PKGS_CSWtk += CSWsunmath + +# libsunmath support on Solaris 9 i386 is broken +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +VENDOR_URL = http://www.tcl.tk/ +LICENSE = license.terms + +PACKAGES += CSWtk +SPKG_DESC_CSWtk = GUI toolkit for tcl +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWtk += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWtk += CSWlibtk8-5 + +RUNTIME_DEP_PKGS_CSWtk-i386 += CSWsunmath +RUNTIME_DEP_PKGS_CSWtk += $(RUNTIME_DEP_PKGS_CSWtk-$(GARCH)) + +# Leave the manpage for now +CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/wish.1 + +PACKAGES += CSWlibtk8-5 +SPKG_DESC_CSWlibtk8-5 = GUI toolkit library for tcl, libtk8.5.so +PKGFILES_CSWlibtk8-5 += $(call pkgfiles_lib,libtk8.5.so) +PKGFILES_CSWlibtk8-5 += $(call baseisadirs,$(libdir),tk8.5/.*) + +RUNTIME_DEP_PKGS_CSWlibtk8-5-i386 += CSWsunmath +RUNTIME_DEP_PKGS_CSWlibtk8-5 += $(RUNTIME_DEP_PKGS_CSWlibtk8-5-$(GARCH)) + +# This is correct, the soname with *.so is really the one to use +CHECKPKG_OVERRIDES_CSWlibtk8-5 += soname-equals-filename +# This is just a demo +CHECKPKG_OVERRIDES_CSWlibtk8-5 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.5/demos/tcolor + +PACKAGES += CSWtk-dev +SPKG_DESC_CSWtk-dev = Development files for libtk8.5.so +# Indeed, the *.so is the real library and belongs to CSWlibtcl8-5 +PKGFILES_DEVEL_SHAREDLIBLINK = +PKGFILES_CSWtk-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWtk-dev += $(call baseisadirs,$(libdir),tkConfig.sh) +RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtk8-5 + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz + +BUILD64 = 1 + +WORKSRC = $(WORKDIR)/$(DISTNAME)/unix + +CONFIGURE_ARGS = $(DIRPATHS) + +# tk need the static tclstub library for some reason +MERGE_EXCLUDE_STATICLIBS = + +TEST_TARGET = + +include gar/category.mk + +#CFLAGS := $(filter-out -I%,$(CFLAGS)) +#DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) + + +pre-configure-modulated: + @(cd $(WORKSRC) ; cp -p ../license.terms .) + @$(MAKECOOKIE) + +post-install-isa-i386: + @echo Creating link to wish8.5 + ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + @$(MAKECOOKIE) + +post-install-isa-amd64: + @# Need to manually create symlink to latest version + @echo Creating link to wish8.5 + ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + @$(MAKECOOKIE) + +post-install-isa-sparcv8: + @echo Creating link to wish8.5 + ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + @$(MAKECOOKIE) + +post-install-isa-sparcv9: + @# Need to manually create symlink to latest version + @echo Creating link to wish8.5 + ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/tk85/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/tk85/trunk/checksums 2012-09-08 22:09:05 UTC (rev 19175) @@ -1,2 +0,0 @@ -5db325a0c9285adb2f2d8a7157dc132a Makefile.in.diff -13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz Copied: csw/mgar/pkg/tk85/trunk/checksums (from rev 19171, csw/mgar/pkg/tk/trunk/checksums) =================================================================== --- csw/mgar/pkg/tk85/trunk/checksums (rev 0) +++ csw/mgar/pkg/tk85/trunk/checksums 2012-09-08 22:09:05 UTC (rev 19175) @@ -0,0 +1 @@ +a01640176845c1f654a412cfc9bab13b tk8.5.12-src.tar.gz Deleted: csw/mgar/pkg/tk85/trunk/files/8.4.i386.tar.xz =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/tk85/trunk/files/8.4.sparc.tar.xz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 10 13:44:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 11:44:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19176] csw/mgar/pkg/tk85/trunk/Makefile Message-ID: Revision: 19176 http://gar.svn.sourceforge.net/gar/?rev=19176&view=rev Author: dmichelsen Date: 2012-09-10 11:44:06 +0000 (Mon, 10 Sep 2012) Log Message: ----------- tk85/trunk: Fix symlink to wish, enable isaexec Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2012-09-08 22:09:05 UTC (rev 19175) +++ csw/mgar/pkg/tk85/trunk/Makefile 2012-09-10 11:44:06 UTC (rev 19176) @@ -66,6 +66,7 @@ UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz BUILD64 = 1 +ISAEXEC = 1 WORKSRC = $(WORKDIR)/$(DISTNAME)/unix @@ -83,27 +84,10 @@ pre-configure-modulated: - @(cd $(WORKSRC) ; cp -p ../license.terms .) + (cd $(WORKSRC) ; cp -p ../license.terms .) @$(MAKECOOKIE) -post-install-isa-i386: +post-install-modulated: @echo Creating link to wish8.5 - ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish + ln -s wish8.5 $(DESTDIR)$(bindir)/wish @$(MAKECOOKIE) - -post-install-isa-amd64: - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-sparcv8: - @echo Creating link to wish8.5 - ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(MAKECOOKIE) - -post-install-isa-sparcv9: - @# Need to manually create symlink to latest version - @echo Creating link to wish8.5 - ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish - @$(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 10 14:03:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 12:03:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19177] csw/mgar/pkg/tk84/trunk/Makefile Message-ID: Revision: 19177 http://gar.svn.sourceforge.net/gar/?rev=19177&view=rev Author: dmichelsen Date: 2012-09-10 12:03:08 +0000 (Mon, 10 Sep 2012) Log Message: ----------- tk84/trunk: Restrict to Solaris 10 only Modified Paths: -------------- csw/mgar/pkg/tk84/trunk/Makefile Modified: csw/mgar/pkg/tk84/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk84/trunk/Makefile 2012-09-10 11:44:06 UTC (rev 19176) +++ csw/mgar/pkg/tk84/trunk/Makefile 2012-09-10 12:03:08 UTC (rev 19177) @@ -17,6 +17,9 @@ NOEXTRACT += 8.4.i386.tar.xz NOEXTRACT += 8.4.sparc.tar.xz +# Tk in general is only rebuilt on Solaris 10, to avoid collisions we must also only do Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms 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 10 16:12:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 14:12:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19178] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 19178 http://gar.svn.sourceforge.net/gar/?rev=19178&view=rev Author: dmichelsen Date: 2012-09-10 14:12:16 +0000 (Mon, 10 Sep 2012) Log Message: ----------- openldap/trunk: Update to 2.4.32 and ICU 4.9 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-09-10 12:03:08 UTC (rev 19177) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-09-10 14:12:16 UTC (rev 19178) @@ -1,7 +1,7 @@ # $Id$ NAME = openldap -VERSION = 2.4.30 +VERSION = 2.4.32 GARTYPE = v2 CATEGORIES = server @@ -52,8 +52,8 @@ SPKG_DESC_CSWopenldap = OpenLDAP server for Lightweight Directory Access Protocol # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata49 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc49 RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2012-09-10 12:03:08 UTC (rev 19177) +++ csw/mgar/pkg/openldap/trunk/checksums 2012-09-10 14:12:16 UTC (rev 19178) @@ -1 +1 @@ -4f210937cf87e3467a536dd3fed1b8b4 openldap-2.4.30.tgz +6a3e85cf61860ca5e8a1eba6753dd9d0 openldap-2.4.32.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 10 16:35:13 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 14:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19179] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ cswmysql5.tpl Message-ID: Revision: 19179 http://gar.svn.sourceforge.net/gar/?rev=19179&view=rev Author: dmichelsen Date: 2012-09-10 14:35:13 +0000 (Mon, 10 Sep 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: Fix erranous + from patch in startscript Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-09-10 14:12:16 UTC (rev 19178) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql5.tpl 2012-09-10 14:35:13 UTC (rev 19179) @@ -225,8 +225,8 @@ # The binaries themselves are tested below, so the script should fail # mostly gracefully if a non-present arch is set up. if [ -d "$bindir/$mysql5_arch" -a \ - + -d "$sbindir/$mysql5_arch" -a \ - + -d "$libexecdir/$mysql5_arch" ]; then + -d "$sbindir/$mysql5_arch" -a \ + -d "$libexecdir/$mysql5_arch" ]; then bindir="$bindir/$mysql5_arch" sbindir="$sbindir/$mysql5_arch" libexecdir="$libexecdir/$mysql5_arch" 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 10 16:39:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 14:39:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19180] csw/mgar/pkg/openldap/trunk/files/cswopenldap Message-ID: Revision: 19180 http://gar.svn.sourceforge.net/gar/?rev=19180&view=rev Author: dmichelsen Date: 2012-09-10 14:39:23 +0000 (Mon, 10 Sep 2012) Log Message: ----------- openldap/trunk: Add ISA selection code from lblume Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/files/cswopenldap Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap =================================================================== --- csw/mgar/pkg/openldap/trunk/files/cswopenldap 2012-09-10 14:35:13 UTC (rev 19179) +++ csw/mgar/pkg/openldap/trunk/files/cswopenldap 2012-09-10 14:39:23 UTC (rev 19180) @@ -30,17 +30,62 @@ # arbitrary flags to slapd. RETVAL=0 -SLAPD=@libexecdir@/slapd -SLURPD=@libexecdir@/slurpd # Source startup options [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh -[ -r /opt/csw/etc/openldaprc ] && . /opt/csw/etc/openldaprc -[ -r /etc/opt/csw/openldaprc ] && . /etc/opt/csw/openldaprc +bindir="@bindir@" +sbindir="@sbindir@" +libexecdir="@libexecdir@" + +### START OPENCSW ARCHITECTURE SELECTION +# Source the configuration +# This is used to define the binary architeture to run + +# Check the old location first +[ -r @prefix@/etc/csw.conf ] && . @prefix@/etc/csw.conf + +# Check the current location, its content overrides the previous one +[ -r @sysconfdir@/csw.conf ] && . @sysconfdir@/csw.conf + +# If the package-specific variable is not set, try the default +if [ -z "$openldap_arch" ]; then + if [ -n "$default_arch" ]; then + openldap_arch="$default_arch" + fi +else + # In that specific case, by default, there is no subdir + if [ "$openldap_arch" = "i386" -o "$openldap_arch" = "sparc" ]; then + openldap_arch="" + fi +fi + +# If a value was found +if [ -n "$openldap_arch" ]; then + if [ "$openldap_arch" = "kernel" ]; then + # Use the system's default arch + openldap_arch=`isainfo -k` + fi + + # Add the architecture suffix to the executables' directories, if it exists + # The binaries themselves are tested below, so the script should fail + # mostly gracefully if a non-present arch is set up. + if [ -d "$bindir/$openldap_arch" -a \ + -d "$sbindir/$openldap_arch" -a \ + -d "$libexecdir/$openldap_arch" ]; then + bindir="$bindir/$openldap_arch" + sbindir="$sbindir/$openldap_arch" + libexecdir="$libexecdir/$openldap_arch" + fi +fi +### END OPENCSW ARCHITECTURE SELECTION + +SLAPD=$libexecdir/slapd +SLURPD=$libexecdir/slurpd + # Make sure required vars are set. Actually these are the compiled defaults -DEF_SLAPD_CONFIG_FILE=/etc/opt/csw/openldap/slapd.conf -DEF_SLAPD_CONFIG_DIR=/etc/opt/csw/openldap/slapd.d +DEF_SLAPD_CONFIG_FILE=@sysconfdir@/openldap/slapd.conf +DEF_SLAPD_CONFIG_DIR=@sysconfdir@/openldap/slapd.d # If a conf file has been created, assume we should start up. 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 10 19:53:57 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 17:53:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19181] csw/mgar/pkg/openldap/trunk/files/cswopenldap Message-ID: Revision: 19181 http://gar.svn.sourceforge.net/gar/?rev=19181&view=rev Author: dmichelsen Date: 2012-09-10 17:53:57 +0000 (Mon, 10 Sep 2012) Log Message: ----------- openldap/trunk: Use adjustable filedescriptors and remove slurpd in rc script Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/files/cswopenldap Modified: csw/mgar/pkg/openldap/trunk/files/cswopenldap =================================================================== --- csw/mgar/pkg/openldap/trunk/files/cswopenldap 2012-09-10 14:39:23 UTC (rev 19180) +++ csw/mgar/pkg/openldap/trunk/files/cswopenldap 2012-09-10 17:53:57 UTC (rev 19181) @@ -1,6 +1,6 @@ #!/bin/sh # Start script for CSW www.blastwave.org package of Openldap. -# slapd and slurpd can be started by this script. +# slapd can be started by this script. # For either daemon to start, the minimum requirement is that # /opt/csw/etc/openldap/slapd.conf must exist. It does not # exist after the initial package installation, since you may @@ -15,11 +15,8 @@ # mkdir -p /etc/opt/csw # cp /opt/csw/share/doc/openldap/openldaprc /etc/opt/csw/ # -# If no openldaprc file is available, the daemon starts with defaults -# and slurpd is not started. +# If no openldaprc file is available, the daemon starts with defaults. # -# To start slurpd, set SLURPD_START=true in openldaprc -# # 2005-08-11 Applied patch from Martin Foster to fix the problem # when multiple uri are on the -h option. # 2006-06-11 Included patch from Ben Klang. This update allows you @@ -81,7 +78,6 @@ ### END OPENCSW ARCHITECTURE SELECTION SLAPD=$libexecdir/slapd -SLURPD=$libexecdir/slurpd # Make sure required vars are set. Actually these are the compiled defaults DEF_SLAPD_CONFIG_FILE=@sysconfdir@/openldap/slapd.conf @@ -117,6 +113,7 @@ if [ -n "$SLAPD_SYNTAX_CHECK" ] ; then START="$START -t"; fi if [ -n "$SLAPD_USER" ] ; then START="$START -u $SLAPD_USER"; fi if [ -n "$SLAPD_EXTRA" ] ; then START="$START $SLAPD_EXTRA"; fi + if [ -n "$SLAPD_MAXFDS" ] ; then ulimit -n "$SLAPD_MAXFDS"; fi # Run it sh -c "$START" @@ -129,31 +126,6 @@ return 1 fi - [ -z "$SLURPD_START" ] && return 0 - - if kill -0 `pgrep -x slurpd` > /dev/null 2>&1 ; then - echo "openldap-slurpd (`pgrep -x slurpd`) seems to be running." - return 1 - fi - - printf "%-60s" "Starting openldap-slurpd: " - $SLURPD \ - `[ -n "$SLURPD_DEBUG_LEVEL" ] && echo "-d $SLURPD_DEBUG_LEVEL"` \ - `[ -n "$SLURPD_SYSLOG_LEVEL" ] && echo "-s $SLURPD_SYSLOG_LEVEL"` \ - `[ -n "$SLURPD_CONFIG_FILE" ] && echo "-f $SLURPD_CONFIG_FILE"` \ - `[ -n "$SLURPD_REPL_LOG_FILE" ] && echo "-r $SLURPD_REPL_LOG_FILE"` \ - `[ -n "$SLURPD_TMP_DIR" ] && echo "-t $SLURPD_TMP_DIR"` \ - `[ -n "$SLURPD_ONE_SHOT" ] && echo "-o"` \ - `[ -n "$SLURPD_SERVICE_NAME" ] && echo "-n $SLURPD_SERVICE_NAME"` \ - >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - return 1 - fi - return 0 } @@ -174,22 +146,7 @@ echo "[FAILED]" fi - [ -z "$SLURPD_START" ] && return 0 - printf "%-60s" "Shutting down openldap-slurpd: " - if test -n "`pgrep -x slurpd`" ; then - kill `pgrep -x slurpd` >/dev/null 2>&1 - RETVAL=$? - else - RETVAL=1 - fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" - else - echo "[FAILED]" - fi - - echo "" - return 0 + return $RETVAL } case $1 in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 10 22:17:15 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Sep 2012 20:17:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[19182] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 19182 http://gar.svn.sourceforge.net/gar/?rev=19182&view=rev Author: dmichelsen Date: 2012-09-10 20:17:15 +0000 (Mon, 10 Sep 2012) Log Message: ----------- openldap/trunk: Finer grained package split Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-09-10 17:53:57 UTC (rev 19181) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-09-10 20:17:15 UTC (rev 19182) @@ -51,27 +51,25 @@ PACKAGES += CSWopenldap SPKG_DESC_CSWopenldap = OpenLDAP server for Lightweight Directory Access Protocol # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata49 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc49 RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 # We do not want that dependency. # RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet # RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWperl OBSOLETED_BY_CSWopenldap += CSWoldap CATALOGNAME_CSWoldap = openldap_stub # Evaluate later CHECKPKG_OVERRIDES_CSWopenldap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/slapd.8 +# This is most certainly a false positive +CHECKPKG_OVERRIDES_CSWopenldap += missing-dependency|CSWopenldap-back-bdb + PACKAGES += CSWopenldap-client SPKG_DESC_CSWopenldap-client = OpenLDAP client executables PKGFILES_CSWopenldap-client += $(bindir)/.* @@ -79,7 +77,6 @@ RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl1-0-0 OBSOLETED_BY_CSWopenldap-client += CSWoldapclient CATALOGNAME_CSWoldapclient = openldap_client_stub @@ -93,6 +90,37 @@ OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel CATALOGNAME_CSWoldapdevel = openldap_devel_stub +PACKAGES += CSWopenldap-back-perl +SPKG_DESC_CSWopenldap-back-perl = OpenLDAP Perl backend +PKGFILES_CSWopenldap-back-perl += $(call baseisadirs,$(libexecdir),openldap/back_perl.*) +PKGFILES_CSWopenldap-back-perl += $(mandir)/man5/slapd-perl.5 +RUNTIME_DEP_PKGS_CSWopenldap-back-perl += CSWperl +RUNTIME_DEP_PKGS_CSWopenldap-back-perl += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-back-perl += CSWlibldap-r2-4-2 + +PACKAGES += CSWopenldap-back-bdb +SPKG_DESC_CSWopenldap-back-bdb = OpenLDAP BerkerleyDB bdb backend +PKGFILES_CSWopenldap-back-bdb += $(call baseisadirs,$(libexecdir),openldap/back_bdb.*) +PKGFILES_CSWopenldap-back-bdb += $(mandir)/man5/slapd-bdb.5 +RUNTIME_DEP_PKGS_CSWopenldap-back-bdb += CSWbdb48 +RUNTIME_DEP_PKGS_CSWopenldap-back-bdb += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-back-bdb += CSWlibldap-r2-4-2 + +PACKAGES += CSWopenldap-back-hdb +SPKG_DESC_CSWopenldap-back-hdb = OpenLDAP BerkerleyDB hdb backend +PKGFILES_CSWopenldap-back-hdb += $(call baseisadirs,$(libexecdir),openldap/back_hdb.*) +RUNTIME_DEP_PKGS_CSWopenldap-back-hdb += CSWbdb48 +RUNTIME_DEP_PKGS_CSWopenldap-back-hdb += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-back-hdb += CSWlibldap-r2-4-2 + +PACKAGES += CSWopenldap-back-sql +SPKG_DESC_CSWopenldap-back-sql = OpenLDAP SQL backend +PKGFILES_CSWopenldap-back-sql += $(call baseisadirs,$(libexecdir),openldap/back_sql.*) +PKGFILES_CSWopenldap-back-sql += $(mandir)/man5/slapd-sql.5 +RUNTIME_DEP_PKGS_CSWopenldap-back-sql += CSWlibodbc2 +RUNTIME_DEP_PKGS_CSWopenldap-back-sql += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-back-sql += CSWlibldap-r2-4-2 + PACKAGES += CSWliblber2-4-2 SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) @@ -146,7 +174,7 @@ # https://www.opencsw.org/mantis/view.php?id=4555 NOISALIST = 1 LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -z ignore NODIRPATHS = --docdir 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 11 11:15:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Sep 2012 09:15:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19183] csw/mgar/pkg/cpptest/trunk Message-ID: Revision: 19183 http://gar.svn.sourceforge.net/gar/?rev=19183&view=rev Author: dmichelsen Date: 2012-09-11 09:15:41 +0000 (Tue, 11 Sep 2012) Log Message: ----------- cpptest/trunk: Add patch to fix 64 bit libcpptest.pc Modified Paths: -------------- csw/mgar/pkg/cpptest/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpptest/trunk/files/0001-Do-not-guess-libdir-in-pkgconfig-file.patch Modified: csw/mgar/pkg/cpptest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpptest/trunk/Makefile 2012-09-10 20:17:15 UTC (rev 19182) +++ csw/mgar/pkg/cpptest/trunk/Makefile 2012-09-11 09:15:41 UTC (rev 19183) @@ -12,6 +12,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Keep-norunpath-during-linking.patch +PATCHFILES += 0001-Do-not-guess-libdir-in-pkgconfig-file.patch PACKAGES = CSWlibcpptest0 SPKG_DESC_CSWlibcpptest0 = Unit testing framework for handling automated tests in C++, libcpptest.so.0 Added: csw/mgar/pkg/cpptest/trunk/files/0001-Do-not-guess-libdir-in-pkgconfig-file.patch =================================================================== --- csw/mgar/pkg/cpptest/trunk/files/0001-Do-not-guess-libdir-in-pkgconfig-file.patch (rev 0) +++ csw/mgar/pkg/cpptest/trunk/files/0001-Do-not-guess-libdir-in-pkgconfig-file.patch 2012-09-11 09:15:41 UTC (rev 19183) @@ -0,0 +1,27 @@ +From fba5ed9500918fa75ae069fa426246d9fadebc59 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 11 Sep 2012 11:05:47 +0200 +Subject: [PATCH] Do not guess libdir in pkgconfig file + +--- + libcpptest.pc.in | 6 +++--- + 1 Datei ge?ndert, 3 Zeilen hinzugef?gt(+), 3 Zeilen entfernt(-) + +diff --git a/libcpptest.pc.in b/libcpptest.pc.in +index 9b9ccb4..0ee8a13 100644 +--- a/libcpptest.pc.in ++++ b/libcpptest.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/lib +-includedir=${prefix}/include ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: libcpptest + Description: C++ test suite +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 11 11:33:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Sep 2012 09:33:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19184] csw/mgar/pkg/liburiparser/trunk Message-ID: Revision: 19184 http://gar.svn.sourceforge.net/gar/?rev=19184&view=rev Author: dmichelsen Date: 2012-09-11 09:33:19 +0000 (Tue, 11 Sep 2012) Log Message: ----------- liburiparser/trunk: Update to 0.7.7 and sanitize _dev package name Modified Paths: -------------- csw/mgar/pkg/liburiparser/trunk/Makefile csw/mgar/pkg/liburiparser/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch Modified: csw/mgar/pkg/liburiparser/trunk/Makefile =================================================================== --- csw/mgar/pkg/liburiparser/trunk/Makefile 2012-09-11 09:15:41 UTC (rev 19183) +++ csw/mgar/pkg/liburiparser/trunk/Makefile 2012-09-11 09:33:19 UTC (rev 19184) @@ -1,6 +1,6 @@ # $Id$ NAME = liburiparser -VERSION = 0.7.5 +VERSION = 0.7.7 CATEGORIES = lib GARTYPE = v2 @@ -11,33 +11,26 @@ SF_PROJ = uriparser MASTER_SITES = $(SF_MIRROR) DISTNAME = $(SF_PROJ)-$(VERSION) -DISTFILES = $(DISTNAME).tar.lzma +DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = 0001-Remove-superflous-extension-breaking-install-with-th.patch - # File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -BUILD_DEP_PKGS = CSWlibcpptestdevel +BUILD_DEP_PKGS = CSWlibcpptest-dev -PACKAGES = CSWliburiparser1 CSWliburiparserdevel +PACKAGES += CSWliburiparser1 +SPKG_DESC_CSWliburiparser1 = RFC 3986 compliant URI parsing library, liburiparser.so.1 +PKGFILES_CSWliburiparser1 += $(call pkgfiles_lib,liburiparser.so.1) -CATALOGNAME_CSWliburiparser1 = liburiparser1 -CATALOGNAME_CSWliburiparserdevel = liburiparser_devel +PACKAGES += CSWliburiparser-dev +SPKG_DESC_CSWliburiparser-dev = Development files for liburiparser.so.1 +RUNTIME_DEP_PKGS_CSWliburiparser-dev += CSWliburiparser1 +OBSOLETED_BY_CSWliburiparser-dev += CSWliburiparserdevel +CATALOGNAME_CSWliburiparserdevel = liburiparser_devel_stub -SPKG_DESC_CSWliburiparser1 = $(DESCRIPTION) Runtime -SPKG_DESC_CSWliburiparserdevel = $(DESCRIPTION) Development Files - -RUNTIME_DEP_PKGS_CSWliburiparserdevel = CSWliburiparser1 -CHECKPKG_OVERRIDES_CSWliburiparserdevel += surplus-dependency|CSWliburiparser1 - BUILD64_LIBS_ONLY = 1 -CONFIGURE_SCRIPTS = $(WORKSRC)/configure -CONFIGURE_SCRIPTS += $(WORKSRC)/doc/configure CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --docdir=$(docdir)/$(NAME) -PKGFILES_CSWliburiparser1 = $(PKGFILES_RT) - include gar/category.mk Modified: csw/mgar/pkg/liburiparser/trunk/checksums =================================================================== --- csw/mgar/pkg/liburiparser/trunk/checksums 2012-09-11 09:15:41 UTC (rev 19183) +++ csw/mgar/pkg/liburiparser/trunk/checksums 2012-09-11 09:33:19 UTC (rev 19184) @@ -1 +1 @@ -a87b79caa1258cf9f232b55fce66ff22 uriparser-0.7.5.tar.lzma +2da950ef006be5a842dcc383cbbeaa78 uriparser-0.7.7.tar.bz2 Deleted: csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch =================================================================== --- csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch 2012-09-11 09:15:41 UTC (rev 19183) +++ csw/mgar/pkg/liburiparser/trunk/files/0001-Remove-superflous-extension-breaking-install-with-th.patch 2012-09-11 09:33:19 UTC (rev 19184) @@ -1,25 +0,0 @@ -From b53c60334676b2dcbf5f4d3de3ead8a391b8a43c Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 21 Oct 2010 14:12:56 +0200 -Subject: [PATCH] Remove superflous extension breaking install with the shell - ---- - doc/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/doc/Makefile.in b/doc/Makefile.in -index 63b4893..4393def 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -344,7 +344,7 @@ distclean-local: - - install-data-local: - $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local -- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/" -+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" - - uninstall-local: - -rm -Rf "$(DESTDIR)$(docdir)/html" --- -1.7.2.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 11 11:37:47 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Sep 2012 09:37:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19185] csw/mgar/pkg/cpptest/trunk/Makefile Message-ID: Revision: 19185 http://gar.svn.sourceforge.net/gar/?rev=19185&view=rev Author: dmichelsen Date: 2012-09-11 09:37:46 +0000 (Tue, 11 Sep 2012) Log Message: ----------- cpptest/trunk: Add comment about bug location Modified Paths: -------------- csw/mgar/pkg/cpptest/trunk/Makefile Modified: csw/mgar/pkg/cpptest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpptest/trunk/Makefile 2012-09-11 09:33:19 UTC (rev 19184) +++ csw/mgar/pkg/cpptest/trunk/Makefile 2012-09-11 09:37:46 UTC (rev 19185) @@ -12,6 +12,9 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Keep-norunpath-during-linking.patch + +# Use patch until this is fixed +# https://sourceforge.net/tracker/?func=detail&aid=3566605&group_id=77564&atid=550611 PATCHFILES += 0001-Do-not-guess-libdir-in-pkgconfig-file.patch PACKAGES = CSWlibcpptest0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue Sep 11 12:20:16 2012 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 11 Sep 2012 10:20:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19186] csw/mgar/pkg/facter/trunk Message-ID: Revision: 19186 http://gar.svn.sourceforge.net/gar/?rev=19186&view=rev Author: phipsy Date: 2012-09-11 10:20:16 +0000 (Tue, 11 Sep 2012) Log Message: ----------- facter: 1.6.12 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2012-09-11 09:37:46 UTC (rev 19185) +++ csw/mgar/pkg/facter/trunk/Makefile 2012-09-11 10:20:16 UTC (rev 19186) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.6.11 +VERSION = 1.6.12 CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2012-09-11 09:37:46 UTC (rev 19185) +++ csw/mgar/pkg/facter/trunk/checksums 2012-09-11 10:20:16 UTC (rev 19186) @@ -5,3 +5,4 @@ bd7224e2f5b3743c3a81fb7680c26729 facter-1.6.4.tar.gz 47670a59301d6c3e31a1c68747b139c8 facter-1.6.6.tar.gz 945a332e46ccc59663b09fc7d3ce1086 facter-1.6.11.tar.gz +573bf01ff662f4a3391a7e558b91d65d facter-1.6.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 11 12:37:53 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Sep 2012 10:37:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19187] csw/mgar/pkg/libxspf/trunk Message-ID: Revision: 19187 http://gar.svn.sourceforge.net/gar/?rev=19187&view=rev Author: dmichelsen Date: 2012-09-11 10:37:52 +0000 (Tue, 11 Sep 2012) Log Message: ----------- libxspf/trunk: Sanitize package name Modified Paths: -------------- csw/mgar/pkg/libxspf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch Modified: csw/mgar/pkg/libxspf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxspf/trunk/Makefile 2012-09-11 10:20:16 UTC (rev 19186) +++ csw/mgar/pkg/libxspf/trunk/Makefile 2012-09-11 10:37:52 UTC (rev 19187) @@ -12,26 +12,28 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.lzma +PATCHFILES += 0001-Keep-norunpath-during-linkage.patch + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.lzma -PACKAGES = CSWlibxspf4 CSWlibxspfdevel +PACKAGES += CSWlibxspf4 +SPKG_DESC_CSWlibxspf4 = XSPF playlist reading and writing support for C++ applications, libxspf.so.4 +PKGFILES_CSWlibxspf4 += $(call pkgfiles_lib,libxspf.so.4) +RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWliburiparser1 +RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWlibexpat1 -CATALOGNAME_CSWlibxspf4 = libxspf4 -CATALOGNAME_CSWlibxspfdevel = libxspf_devel +PACKAGES += CSWlibxspf-dev +SPKG_DESC_CSWlibxspf-dev = Development files for libxspf.so.4 +RUNTIME_DEP_PKGS_CSWlibxspf-dev += CSWlibxspf4 +RUNTIME_DEP_PKGS_CSWlibxspf-dev += CSWliburiparser1 +RUNTIME_DEP_PKGS_CSWlibxspf-dev += CSWlibexpat1 +OBSOLETED_BY_CSWlibxspf-dev += CSWlibxspfdevel +CATALOGNAME_CSWlibxspfdevel = libxspf_devel_stub -SPKG_DESC_CSWlibxspf4 = $(DESCRIPTION) Runtime Libraries -SPKG_DESC_CSWlibxspfdevel = $(DESCRIPTION) Development Files +EXTRA_LINKER_FLAGS += -norunpath -RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWliburiparser1 -RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWexpat -RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWlibxspf4 -RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWliburiparser1 -RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWexpat - BUILD64_LIBS_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibxspf4 = $(PKGFILES_RT) - include gar/category.mk Added: csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch =================================================================== --- csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch (rev 0) +++ csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch 2012-09-11 10:37:52 UTC (rev 19187) @@ -0,0 +1,25 @@ +From 1d9434d46cafd3e4e2ce434bb5e4791e20ca1b8d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 11 Sep 2012 11:40:11 +0200 +Subject: [PATCH] Keep -norunpath during linkage + +--- + build-aux/ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh +index e589475..c03c27f 100644 +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -1690,7 +1690,7 @@ EOF + # -F/path gives path to uninstalled frameworks, gcc on darwin + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 11 17:39:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Sep 2012 15:39:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19188] csw/mgar/pkg/tcsh/trunk Message-ID: Revision: 19188 http://gar.svn.sourceforge.net/gar/?rev=19188&view=rev Author: dmichelsen Date: 2012-09-11 15:39:19 +0000 (Tue, 11 Sep 2012) Log Message: ----------- tcsh/trunk: Update to 6.18.01 Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile csw/mgar/pkg/tcsh/trunk/checksums Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2012-09-11 10:37:52 UTC (rev 19187) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2012-09-11 15:39:19 UTC (rev 19188) @@ -1,5 +1,5 @@ NAME = tcsh -VERSION = 6.17.00 +VERSION = 6.18.01 CATEGORIES = apps GARTYPE = v2 @@ -11,15 +11,21 @@ spelling correction, a history mechanism, job control and a C-like syntax. endef -MASTER_SITES = ftp://ftp.astron.com/pub/tcsh/ -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES += ftp://ftp.astron.com/pub/tcsh/ +# Only the most recent version is in the directory above, everything else is in old/ +MASTER_SITES += ftp://ftp.astron.com/pub/tcsh/old/ +DISTFILES += $(DISTNAME).tar.gz + +VENDOR_URL = http://www.tcsh.org/ + LICENSE = Copyright -RUNTIME_DEP_PKGS = CSWiconv +PACKAGES += CSWtcsh +SPKG_DESC_CSWtcsh = Enhanced version of the Berkeley C shell (csh) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWtcsh += CSWlibiconv2 -VENDOR_URL = http://www.tcsh.org/ - EXTRA_CPPFLAGS += -D_FILE_OFFSET_BITS=64 # As documented in README, this overrides the setting in pathnames.h EXTRA_CPPFLAGS += -D_PATH_LOCAL=\'\"$(bindir)\"\' @@ -27,7 +33,7 @@ # Skip tests until this one is fixed: # http://bugs.gw.com/view.php?id=87 -SKIPTEST = 1 +SKIPTEST ?= 1 INSTALL_ARGS = install.man Modified: csw/mgar/pkg/tcsh/trunk/checksums =================================================================== --- csw/mgar/pkg/tcsh/trunk/checksums 2012-09-11 10:37:52 UTC (rev 19187) +++ csw/mgar/pkg/tcsh/trunk/checksums 2012-09-11 15:39:19 UTC (rev 19188) @@ -1,3 +1 @@ -241bfedfd51c5a02581dc60caba3386d download/CSWtcsh.postinstall -9400adc4cb0311fd60635399760926bb download/CSWtcsh.postremove -c47de903e3d52f6824c8dd0c91eeb477 download/tcsh-6.17.00.tar.gz +6eed09dbd4223ab5b6955378450d228a tcsh-6.18.01.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 11 17:48:20 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Sep 2012 15:48:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19189] csw/mgar/pkg/tcsh/trunk/Makefile Message-ID: Revision: 19189 http://gar.svn.sourceforge.net/gar/?rev=19189&view=rev Author: dmichelsen Date: 2012-09-11 15:48:20 +0000 (Tue, 11 Sep 2012) Log Message: ----------- tcsh/trunk: Add one more override Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2012-09-11 15:39:19 UTC (rev 19188) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2012-09-11 15:48:20 UTC (rev 19189) @@ -46,4 +46,7 @@ # #define DEFAULTLIST ":/usr/man/cat1:/usr/man/cat8:/usr/man/cat6:/usr/local/man/cat1:/usr/local/man/cat8:/usr/local/man/cat6" /* if no HPATH */ CHECKPKG_OVERRIDES_CSWtcsh += file-with-bad-content|/usr/local|root/opt/csw/bin/tcsh +# This is for /usr/share/locale +CHECKPKG_OVERRIDES_CSWtcsh += file-with-bad-content|/usr/share|root/opt/csw/bin/tcsh + 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 Wed Sep 12 11:04:46 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 12 Sep 2012 09:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19190] csw/mgar/pkg/bind/trunk Message-ID: Revision: 19190 http://gar.svn.sourceforge.net/gar/?rev=19190&view=rev Author: bonivart Date: 2012-09-12 09:04:46 +0000 (Wed, 12 Sep 2012) Log Message: ----------- bind/trunk: update to 9.8.4rc1 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 2012-09-11 15:48:20 UTC (rev 19189) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-09-12 09:04:46 UTC (rev 19190) @@ -2,17 +2,18 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.8.3 +VERSION = 9.8.4 #VERSION = 9.9.0 CATEGORIES = net GARTYPE = v2 # Enable these for Px-releases -#RELEASE = rc2 -RELEASE = P2 +RELEASE = rc1 +#RELEASE = P2 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)$(RELEASE) WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation @@ -24,7 +25,8 @@ endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)$(RELEASE)/ DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases @@ -115,12 +117,12 @@ CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils 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.80.0.5|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.81.6.1|soname=libdns.so.81|pkgname=CSWlibbind|expected=CSWlibdns81 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.83.0.5|soname=libisc.so.83|pkgname=CSWlibbind|expected=CSWlibisc83 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.1|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.2|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.2|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.80.0.7|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.88.1.0|soname=libdns.so.88|pkgname=CSWlibbind|expected=CSWlibdns88 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.84.0.1|soname=libisc.so.84|pkgname=CSWlibbind|expected=CSWlibisc84 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.2|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.3|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.3|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80 include gar/category.mk Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-09-11 15:48:20 UTC (rev 19189) +++ csw/mgar/pkg/bind/trunk/checksums 2012-09-12 09:04:46 UTC (rev 19190) @@ -1 +1 @@ -90217a82d08e7d2513d4d9f3fa32a517 bind-9.8.3-P2.tar.gz +ab9c898035472aab226e0894a9af7ebd bind-9.8.4rc1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Sep 12 12:17:20 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 12 Sep 2012 10:17:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19191] csw/mgar/pkg/hwloc/trunk Message-ID: Revision: 19191 http://gar.svn.sourceforge.net/gar/?rev=19191&view=rev Author: igalic Date: 2012-09-12 10:17:19 +0000 (Wed, 12 Sep 2012) Log Message: ----------- hwloc: bump version to 1.5 Modified Paths: -------------- csw/mgar/pkg/hwloc/trunk/Makefile csw/mgar/pkg/hwloc/trunk/checksums Modified: csw/mgar/pkg/hwloc/trunk/Makefile =================================================================== --- csw/mgar/pkg/hwloc/trunk/Makefile 2012-09-12 09:04:46 UTC (rev 19190) +++ csw/mgar/pkg/hwloc/trunk/Makefile 2012-09-12 10:17:19 UTC (rev 19191) @@ -1,7 +1,7 @@ # $Id$ # NAME = hwloc -VERSION = 1.4.2 +VERSION = 1.5 GARTYPE = v2 CATEGORIES = devel @@ -10,7 +10,7 @@ The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information. It primarily aims at helping applications with gathering information about modern computing hardware so as to exploit it accordingly and efficiently. endef -MASTER_SITES = http://www.open-mpi.org/software/hwloc/v1.4/downloads/ +MASTER_SITES = http://www.open-mpi.org/software/hwloc/v1.5/downloads/ DISTFILES = $(DISTNAME).tar.gz PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc Modified: csw/mgar/pkg/hwloc/trunk/checksums =================================================================== --- csw/mgar/pkg/hwloc/trunk/checksums 2012-09-12 09:04:46 UTC (rev 19190) +++ csw/mgar/pkg/hwloc/trunk/checksums 2012-09-12 10:17:19 UTC (rev 19191) @@ -1 +1 @@ -e09bc6bf2d7ebea18c6a33bda1ea6b75 hwloc-1.4.2.tar.gz +1fd9b3d864f4f3f74d0c49bda267c6ff hwloc-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 12 14:26:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Sep 2012 12:26:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19192] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 19192 http://gar.svn.sourceforge.net/gar/?rev=19192&view=rev Author: dmichelsen Date: 2012-09-12 12:26:07 +0000 (Wed, 12 Sep 2012) Log Message: ----------- tcl85/trunk: Overall cleanup Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch Removed Paths: ------------- csw/mgar/pkg/tcl85/trunk/files/configure.patch csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-12 10:17:19 UTC (rev 19191) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2012-09-12 12:26:07 UTC (rev 19192) @@ -19,19 +19,12 @@ VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms -## Fix for finding libsunmath on i386 and amd64 -#PATCHFILES = configure.patch -#PATCHFILES += tclInt.h.patch +REN_TCLSH = tclsh8.5 -REN_LIBTCL = libtcl8.5.so -REN_TCLSH = tclsh8.5 - PATCHDIR = $(WORKDIR)/$(DISTNAME) #PATCHFILES += 0001-Enable-SONAME-in-library.patch -PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch +#PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch -# PATCHFILES += tcl-dtrace.patch - # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: # # # On Solaris 5.x i386 with the sunpro compiler we need to link @@ -66,14 +59,14 @@ # This is correct, the soname with *.so is really the one to use CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename -PACKAGES += CSWtcl8-tclmodules -SPKG_DESC_CSWtcl8-tclmodules = Modules common to TCL 8.x -PKGFILES_CSWtcl8-tclmodules += $(libdir)/tcl8/.* - # This is to find zoneinfo CHECKPKG_OVERRIDES_CSWlibtcl8-5 += file-with-bad-content|/usr/local|root/opt/csw/lib/tcl8.5/clock.tcl CHECKPKG_OVERRIDES_CSWlibtcl8-5 += file-with-bad-content|/usr/share|root/opt/csw/lib/tcl8.5/clock.tcl +PACKAGES += CSWtcl8-tclmodules +SPKG_DESC_CSWtcl8-tclmodules = Modules common to TCL 8.x +PKGFILES_CSWtcl8-tclmodules += $(libdir)/tcl8/.* + PACKAGES += CSWtcl-dev SPKG_DESC_CSWtcl-dev = $(DESCRIPTION), development files # Indeed, the *.so is the real library and belongs to CSWlibtcl8-5 @@ -110,26 +103,9 @@ include gar/category.mk -DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) - -pre-configure-modulated: - @echo " ==> Regenerating build tools..." - (cd $(WORKSRC) ; cp -p ../license.terms .; $(prefix)/bin/autoreconf -if ) - @$(MAKECOOKIE) - -pre-test-modulated: - @# Need to manually create symlink to latest version - @echo Creating symlinks for libtcl8.5.so - #(cd $(WORKSRC) ; \ - # mv $(REN_LIBTCL) $(REN_LIBTCL).0 ; \ - # ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) ) - @$(MAKECOOKIE) - post-install-modulated: - @# Need to manually create symlink to latest version - it will be handled by alternatives @echo Creating tclsh link ln -s $(REN_TCLSH) $(DESTDIR)$(bindir)/tclsh - #cd $(DESTDIR)$(libdir) && mv $(REN_LIBTCL) $(REN_LIBTCL).0 && ln -sf $(REN_LIBTCL).0 $(REN_LIBTCL) perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(libdir)/tclConfig.sh perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(mandir)/man1/tclsh.1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2012-09-12 10:17:19 UTC (rev 19191) +++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2012-09-12 12:26:07 UTC (rev 19192) @@ -40,20 +40,10 @@ SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; esac CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' -- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' -+ LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' ]) ;; UNIX_SV* | UnixWare-5*) -@@ -2104,7 +2105,7 @@ dnl # preprocessing tests use only CPPFLAGS. - - AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' - AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' - DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" -- 1.7.11.3 Deleted: csw/mgar/pkg/tcl85/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/configure.patch 2012-09-12 10:17:19 UTC (rev 19191) +++ csw/mgar/pkg/tcl85/trunk/files/configure.patch 2012-09-12 12:26:07 UTC (rev 19192) @@ -1,36 +0,0 @@ ---- tcl8.5.7/unix/configure.orig 2009-04-15 21:30:05.000000000 +0200 -+++ tcl8.5.7/unix/configure 2010-02-07 05:09:00.015791294 +0100 -@@ -8475,7 +8475,7 @@ - arch=`isainfo` - echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 - echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 -- if test "$arch" = "amd64 i386"; then -+ if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -@@ -8679,13 +8679,13 @@ - fi - - case $system in -- SunOS-5.[1-9][0-9]*) -+ SunOS-5.[1-9][0-9]*|SunOS-5.[7-9]) - SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; - *) - SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; - esac - CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' -- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' -+ LD_SEARCH_FLAGS='-L ${LIB_RUNTIME_DIR} -R ${LIB_RUNTIME_DIR}' - - fi - -@@ -8855,7 +8855,7 @@ - if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then - - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' - - else Deleted: csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff 2012-09-12 10:17:19 UTC (rev 19191) +++ csw/mgar/pkg/tcl85/trunk/files/patch-libsunmath-amd64.diff 2012-09-12 12:26:07 UTC (rev 19192) @@ -1,60 +0,0 @@ -diff -Naur tcl8.5.7.orig/unix/configure tcl8.5.7.patched/unix/configure ---- tcl8.5.7.orig/unix/configure 2009-04-15 21:30:05.000000000 +0200 -+++ tcl8.5.7.patched/unix/configure 2009-08-19 17:28:51.563281904 +0200 -@@ -8424,7 +8424,7 @@ - - - else -- if test "$arch" = "amd64 i386"; then -+ if test "$arch" = "amd64"; then - - if test "$GCC" = yes; then - -@@ -8475,7 +8475,7 @@ - arch=`isainfo` - echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 - echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 -- if test "$arch" = "amd64 i386"; then -+ if test "$arch" = "amd64" -o "$arch" = "i386"; then - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -@@ -8658,7 +8658,7 @@ - #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" - - else -- if test "$arch" = "amd64 i386"; then -+ if test "$arch" = "amd64"; then - - SHLIB_LD="$SHLIB_LD -m64 -static-libgcc" - -diff -Naur tcl8.5.7.orig/unix/tcl.m4 tcl8.5.7.patched/unix/tcl.m4 ---- tcl8.5.7.orig/unix/tcl.m4 2009-04-15 21:30:05.000000000 +0200 -+++ tcl8.5.7.patched/unix/tcl.m4 2009-08-19 17:30:12.073868365 +0200 -@@ -1920,7 +1920,7 @@ - # Solaris 64 uses this as well - #LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64" - ]) -- ], [AS_IF([test "$arch" = "amd64 i386"], [ -+ ], [AS_IF([test "$arch" = "amd64"], [ - AS_IF([test "$GCC" = yes], [ - case $system in - SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) -@@ -1951,7 +1951,7 @@ - AS_IF([test "$GCC" = yes],[use_sunmath=no],[ - arch=`isainfo` - AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) -- AS_IF([test "$arch" = "amd64 i386"], [ -+ AS_IF([test "$arch" = "amd64" -o "$arch" = "i386"], [ - AC_MSG_RESULT([yes]) - MATH_LIBS="-lsunmath $MATH_LIBS" - AC_CHECK_HEADER(sunmath.h) -@@ -1982,7 +1982,7 @@ - # path, remove so name and append 'sparcv9' - #v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..." - #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" -- ], [AS_IF([test "$arch" = "amd64 i386"], [ -+ ], [AS_IF([test "$arch" = "amd64"], [ - SHLIB_LD="$SHLIB_LD -m64 -static-libgcc" - ])]) - ]) Deleted: csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch 2012-09-12 10:17:19 UTC (rev 19191) +++ csw/mgar/pkg/tcl85/trunk/files/tcl-dtrace.patch 2012-09-12 12:26:07 UTC (rev 19192) @@ -1,72 +0,0 @@ ---- a/generic/tclDTrace.d -+++ b/generic/tclDTrace.d -@@ -24,7 +24,7 @@ provider tcl { - * arg1: number of arguments (int) - * arg2: array of proc argument objects (Tcl_Obj**) - */ -- probe proc__entry(char* name, int objc, Tcl_Obj **objv); -+ probe proc__entry(char* name, int objc, struct Tcl_Obj **objv); - /* - * tcl*:::proc-return probe - * triggered immediately after proc bytecode execution -@@ -40,7 +40,7 @@ provider tcl { - * arg2: proc result (string) - * arg3: proc result object (Tcl_Obj*) - */ -- probe proc__result(char* name, int code, char* result, Tcl_Obj *resultobj); -+ probe proc__result(char* name, int code, char* result, struct Tcl_Obj *resultobj); - /* - * tcl*:::proc-args probe - * triggered before proc-entry probe, gives access to string -@@ -73,7 +73,7 @@ provider tcl { - * arg1: number of arguments (int) - * arg2: array of command argument objects (Tcl_Obj**) - */ -- probe cmd__entry(char* name, int objc, Tcl_Obj **objv); -+ probe cmd__entry(char* name, int objc, struct Tcl_Obj **objv); - /* - * tcl*:::cmd-return probe - * triggered immediately after commmand execution -@@ -89,7 +89,7 @@ provider tcl { - * arg2: command result (string) - * arg3: command result object (Tcl_Obj*) - */ -- probe cmd__result(char* name, int code, char* result, Tcl_Obj *resultobj); -+ probe cmd__result(char* name, int code, char* result, struct Tcl_Obj *resultobj); - /* - * tcl*:::cmd-args probe - * triggered before cmd-entry probe, gives access to string -@@ -122,7 +122,7 @@ provider tcl { - * arg1: depth of stack (int) - * arg2: top of stack (Tcl_Obj**) - */ -- probe inst__start(char* name, int depth, Tcl_Obj **stack); -+ probe inst__start(char* name, int depth, struct Tcl_Obj **stack); - /* - * tcl*:::inst-done probe - * triggered immediately after execution of a bytecode -@@ -130,7 +130,7 @@ provider tcl { - * arg1: depth of stack (int) - * arg2: top of stack (Tcl_Obj**) - */ -- probe inst__done(char* name, int depth, Tcl_Obj **stack); -+ probe inst__done(char* name, int depth, struct Tcl_Obj **stack); - - /***************************** obj probes ******************************/ - /* -@@ -138,13 +138,13 @@ provider tcl { - * triggered immediately after a new Tcl_Obj has been created - * arg0: object created (Tcl_Obj*) - */ -- probe obj__create(Tcl_Obj* obj); -+ probe obj__create(struct Tcl_Obj* obj); - /* - * tcl*:::obj-free probe - * triggered immediately before a Tcl_Obj is freed - * arg0: object to be freed (Tcl_Obj*) - */ -- probe obj__free(Tcl_Obj* obj); -+ probe obj__free(struct Tcl_Obj* obj); - - /***************************** tcl probes ******************************/ - /* Deleted: csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch 2012-09-12 10:17:19 UTC (rev 19191) +++ csw/mgar/pkg/tcl85/trunk/files/tclInt.h.patch 2012-09-12 12:26:07 UTC (rev 19192) @@ -1,11 +0,0 @@ ---- ../build-isa-sparcv8-garversion-8.5.8/tcl8.5.8/generic/tclInt.h 2009-10-18 13:21:38.000000000 +0200 -+++ tcl8.5.8/generic/tclInt.h 2010-03-19 19:06:24.590674715 +0100 -@@ -60,7 +60,7 @@ - #else - #include - #endif --#ifdef STDC_HEADERS -+#if defined(STDC_HEADERS) || defined(__sun) - #include - #else - typedef int ptrdiff_t; 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 12 19:58:38 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 12 Sep 2012 17:58:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19193] csw/mgar/pkg/bind/trunk Message-ID: Revision: 19193 http://gar.svn.sourceforge.net/gar/?rev=19193&view=rev Author: bonivart Date: 2012-09-12 17:58:38 +0000 (Wed, 12 Sep 2012) Log Message: ----------- bind/trunk: update to 9.8.3-P3 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 2012-09-12 12:26:07 UTC (rev 19192) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-09-12 17:58:38 UTC (rev 19193) @@ -2,18 +2,18 @@ # owner/group for device files? (root:sys) NAME = bind -VERSION = 9.8.4 +VERSION = 9.8.3 #VERSION = 9.9.0 CATEGORIES = net GARTYPE = v2 # Enable these for Px-releases -RELEASE = rc1 -#RELEASE = P2 +#RELEASE = rc1 +RELEASE = P3 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)$(RELEASE) WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation @@ -25,8 +25,8 @@ endef # Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)$(RELEASE)/ +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)$(RELEASE)/ DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases @@ -117,12 +117,12 @@ CHECKPKG_OVERRIDES_CSWbindutils += catalogname-does-not-match-pkgname|pkgname=CSWbindutils|catalogname=bind_utils|expected-catalogname=bindutils 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.80.0.7|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.88.1.0|soname=libdns.so.88|pkgname=CSWlibbind|expected=CSWlibdns88 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.84.0.1|soname=libisc.so.84|pkgname=CSWlibbind|expected=CSWlibisc84 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.2|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.3|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.3|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.80.0.5|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.81.6.1|soname=libdns.so.81|pkgname=CSWlibbind|expected=CSWlibdns81 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.83.0.5|soname=libisc.so.83|pkgname=CSWlibbind|expected=CSWlibisc83 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.1|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.2|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.2|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80 include gar/category.mk Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-09-12 12:26:07 UTC (rev 19192) +++ csw/mgar/pkg/bind/trunk/checksums 2012-09-12 17:58:38 UTC (rev 19193) @@ -1 +1 @@ -ab9c898035472aab226e0894a9af7ebd bind-9.8.4rc1.tar.gz +86f72cf1a99c4d7d1978c201a92fb3f3 bind-9.8.3-P3.tar.gz 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 12 21:15:46 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 12 Sep 2012 19:15:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19194] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 19194 http://gar.svn.sourceforge.net/gar/?rev=19194&view=rev Author: bonivart Date: 2012-09-12 19:15:45 +0000 (Wed, 12 Sep 2012) Log Message: ----------- dhcp/trunk: update to 4.2.4-P2 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2012-09-12 17:58:38 UTC (rev 19193) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2012-09-12 19:15:45 UTC (rev 19194) @@ -2,7 +2,7 @@ VERSION = 4.2.4 # Enable these for Px-releases -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2012-09-12 17:58:38 UTC (rev 19193) +++ csw/mgar/pkg/dhcp/trunk/checksums 2012-09-12 19:15:45 UTC (rev 19194) @@ -1 +1 @@ -0ca7181024651f6323951d5498c8020b dhcp-4.2.4-P1.tar.gz +fe36056f2d274fa4b82a5422f192e65f dhcp-4.2.4-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 13 08:23:08 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 13 Sep 2012 06:23:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19195] csw/mgar/pkg Message-ID: Revision: 19195 http://gar.svn.sourceforge.net/gar/?rev=19195&view=rev Author: cgrzemba Date: 2012-09-13 06:23:08 +0000 (Thu, 13 Sep 2012) Log Message: ----------- tuxpaint/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/tuxpaint/ csw/mgar/pkg/tuxpaint/Makefile csw/mgar/pkg/tuxpaint/branches/ csw/mgar/pkg/tuxpaint/tags/ csw/mgar/pkg/tuxpaint/trunk/ csw/mgar/pkg/tuxpaint/trunk/Makefile csw/mgar/pkg/tuxpaint/trunk/checksums csw/mgar/pkg/tuxpaint/trunk/files/ Added: csw/mgar/pkg/tuxpaint/Makefile =================================================================== --- csw/mgar/pkg/tuxpaint/Makefile (rev 0) +++ csw/mgar/pkg/tuxpaint/Makefile 2012-09-13 06:23:08 UTC (rev 19195) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tuxpaint/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tuxpaint/trunk/Makefile =================================================================== --- csw/mgar/pkg/tuxpaint/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tuxpaint/trunk/Makefile 2012-09-13 06:23:08 UTC (rev 19195) @@ -0,0 +1,34 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tuxpaint +VERSION = 0.9.21 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Simple drwaing program +define BLURB + Tux Paint is a free, award-winning drawing program for children ages 3 to 12 (for example, preschool and K-6). Tux Paint is used in schools around the world as a computer literacy drawing activity. It combines an easy-to-use interface, fun sound effects, and an encouraging cartoon mascot who guides children as they use the program. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GCC4 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = + +BUILD_ARGS += PREFIX=$(prefix) + +include gar/category.mk + Property changes on: csw/mgar/pkg/tuxpaint/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tuxpaint/trunk/checksums =================================================================== --- csw/mgar/pkg/tuxpaint/trunk/checksums (rev 0) +++ csw/mgar/pkg/tuxpaint/trunk/checksums 2012-09-13 06:23:08 UTC (rev 19195) @@ -0,0 +1 @@ +a88401d1860648098eeed819cff038fa tuxpaint-0.9.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 13 10:48:06 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 13 Sep 2012 08:48:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[19196] csw/mgar/pkg/hylafax Message-ID: Revision: 19196 http://gar.svn.sourceforge.net/gar/?rev=19196&view=rev Author: dmichelsen Date: 2012-09-13 08:48:05 +0000 (Thu, 13 Sep 2012) Log Message: ----------- hylafax: Tag away legacy build Added Paths: ----------- csw/mgar/pkg/hylafax/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/hylafax/trunk/hylafax-old/ 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 13 10:52:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 13 Sep 2012 08:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19197] csw/mgar/pkg Message-ID: Revision: 19197 http://gar.svn.sourceforge.net/gar/?rev=19197&view=rev Author: dmichelsen Date: 2012-09-13 08:52:36 +0000 (Thu, 13 Sep 2012) Log Message: ----------- leptonica/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/leptonica/ csw/mgar/pkg/leptonica/branches/ csw/mgar/pkg/leptonica/tags/ csw/mgar/pkg/leptonica/trunk/ csw/mgar/pkg/leptonica/trunk/Makefile csw/mgar/pkg/leptonica/trunk/checksums csw/mgar/pkg/leptonica/trunk/files/ Property changes on: csw/mgar/pkg/leptonica/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/leptonica/trunk/Makefile =================================================================== --- csw/mgar/pkg/leptonica/trunk/Makefile (rev 0) +++ csw/mgar/pkg/leptonica/trunk/Makefile 2012-09-13 08:52:36 UTC (rev 19197) @@ -0,0 +1,55 @@ +NAME = leptonica +VERSION = 1.69 +CATEGORIES = devel +GARTYPE = v2 + +DESCRIPTION = An open source C library for efficient image processing and image analysis operations + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +LICENSE = README.html +# *Sigh* +CHECKPKG_OVERRIDES_CSWliblept-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblept_dev/license +CHECKPKG_OVERRIDES_CSWleptonica += file-with-bad-content|/usr/local|root/opt/csw/share/doc/leptonica/license +CHECKPKG_OVERRIDES_CSWliblept3 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblept3/license + +PACKAGES += CSWliblept3 +SPKG_DESC_CSWliblept3 = An open source C library for efficient image processing and image analysis operations, liblept.so.3 +PKGFILES_CSWliblept3 += $(call pkgfiles_lib,liblept.so.3) +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibwebp0 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWliblept3 += CSWlibgif4 + +PACKAGES += CSWliblept-dev +SPKG_DESC_CSWliblept-dev = Development files for liblept.so.3 +PKGFILES_CSWliblept-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWliblept-dev += CSWliblept3 + +PACKAGES += CSWleptonica +SPKG_DESC_CSWleptonica = Tools for efficient image processing and image analysis operations +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWleptonica += CSWliblept3 +RUNTIME_DEP_PKGS_CSWleptonica += CSWlibwebp0 +RUNTIME_DEP_PKGS_CSWleptonica += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWleptonica += CSWlibz1 +RUNTIME_DEP_PKGS_CSWleptonica += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWleptonica += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWleptonica += CSWlibgif4 + +# This is used in the sourcecode, but not set anywhere +EXTRA_CPPFLAGS += -D__SOLARIS__ + +# We need this for stdbool.h +EXTRA_CFLAGS += -xc99=all + +BUILD64 = 1 +ISAEXEC = 1 + +include gar/category.mk + Added: csw/mgar/pkg/leptonica/trunk/checksums =================================================================== --- csw/mgar/pkg/leptonica/trunk/checksums (rev 0) +++ csw/mgar/pkg/leptonica/trunk/checksums 2012-09-13 08:52:36 UTC (rev 19197) @@ -0,0 +1 @@ +274c921dcc47a97637ecc49c9e4a7b50 leptonica-1.69.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Sep 13 12:00:56 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 13 Sep 2012 10:00:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19198] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 19198 http://gar.svn.sourceforge.net/gar/?rev=19198&view=rev Author: janholzh Date: 2012-09-13 10:00:56 +0000 (Thu, 13 Sep 2012) Log Message: ----------- sudo/trunk: update to Version 1.8.6p1 Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-09-13 08:52:36 UTC (rev 19197) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-09-13 10:00:56 UTC (rev 19198) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.6 +VERSION = 1.8.6p1 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2012-09-13 08:52:36 UTC (rev 19197) +++ csw/mgar/pkg/sudo/trunk/checksums 2012-09-13 10:00:56 UTC (rev 19198) @@ -1 +1 @@ -ffa2720ea09bc70023c4ad4cd3d0667d sudo-1.8.6.tar.gz +036314b442491474f66e69289cc3ef55 sudo-1.8.6p1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 13 15:11:31 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 13 Sep 2012 13:11:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19199] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 19199 http://gar.svn.sourceforge.net/gar/?rev=19199&view=rev Author: cgrzemba Date: 2012-09-13 13:11:31 +0000 (Thu, 13 Sep 2012) Log Message: ----------- nspr/trunk: bump version 4.9.2 Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/nspr/trunk/checksums Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2012-09-13 10:00:56 UTC (rev 19198) +++ csw/mgar/pkg/nspr/trunk/Makefile 2012-09-13 13:11:31 UTC (rev 19199) @@ -8,7 +8,7 @@ NAME = nspr MAJOR_VERSION = 4 -MIN_VERSION = 8.9 +MIN_VERSION = 9.2 VERSION = $(MAJOR_VERSION).$(MIN_VERSION) CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2012-09-13 10:00:56 UTC (rev 19198) +++ csw/mgar/pkg/nspr/trunk/checksums 2012-09-13 13:11:31 UTC (rev 19199) @@ -1 +1 @@ -60770d45dc08c0f181b22cdfce5be3e8 nspr-4.8.9.tar.gz +1a8cad110e0ae94f538610a00f595b33 nspr-4.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 13 15:37:18 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 13 Sep 2012 13:37:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19200] csw/mgar/pkg/nss/trunk Message-ID: Revision: 19200 http://gar.svn.sourceforge.net/gar/?rev=19200&view=rev Author: cgrzemba Date: 2012-09-13 13:37:18 +0000 (Thu, 13 Sep 2012) Log Message: ----------- nss/trunk: bump version 3.13.6 Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/checksums csw/mgar/pkg/nss/trunk/files/nss.pc Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2012-09-13 13:11:31 UTC (rev 19199) +++ csw/mgar/pkg/nss/trunk/Makefile 2012-09-13 13:37:18 UTC (rev 19200) @@ -24,8 +24,8 @@ NAME = nss MAJOR_VERSION = 3 -MINOR_VERSION = 12 -PATCHLEVEL = 11 +MINOR_VERSION = 13 +PATCHLEVEL = 6 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) CATEGORIES = lib GARTYPE = v2 @@ -143,7 +143,7 @@ RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssdbm3 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssckbi RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl3 -OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel +# OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel PACKAGES += CSWlibnss3-tools CATALOGNAME_CSWlibnss3-tools = libnss3_tools @@ -245,8 +245,7 @@ LD_OPTIONS = # NSS_LD_OPTIONS = -R'$$ORIGIN' -# CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl| -CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch +# CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2012-09-13 13:11:31 UTC (rev 19199) +++ csw/mgar/pkg/nss/trunk/checksums 2012-09-13 13:37:18 UTC (rev 19200) @@ -1 +1 @@ -ca0ca058380be200cf247ea2496b5352 nss-3.12.11.tar.gz +15ea0e3b63cd0d18b5b75619afc46c3e nss-3.13.6.tar.gz Modified: csw/mgar/pkg/nss/trunk/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss.pc 2012-09-13 13:11:31 UTC (rev 19199) +++ csw/mgar/pkg/nss/trunk/files/nss.pc 2012-09-13 13:37:18 UTC (rev 19200) @@ -5,7 +5,7 @@ Name: NSS Description: Network Security Services -Version: 3.12.11 +Version: 3.13.6 Requires: nspr >= 4.8.9 Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir} Cflags: -I${includedir} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 13 15:51:13 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 13 Sep 2012 13:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19201] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 19201 http://gar.svn.sourceforge.net/gar/?rev=19201&view=rev Author: cgrzemba Date: 2012-09-13 13:51:13 +0000 (Thu, 13 Sep 2012) Log Message: ----------- nss/trunk: reorder overrides Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2012-09-13 13:37:18 UTC (rev 19200) +++ csw/mgar/pkg/nss/trunk/Makefile 2012-09-13 13:51:13 UTC (rev 19201) @@ -56,6 +56,9 @@ RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplc4 +CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/libnss3.so +CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnss3.so +CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnss3.so PACKAGES += CSWlibnssckbi CATALOGNAME_CSWlibnssckbi = libnssckbi @@ -76,6 +79,9 @@ RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplc4 +CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so +CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so +CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssdbm3.so PACKAGES += CSWlibnssutil3 CATALOGNAME_CSWlibnssutil3 = libnssutil3 @@ -85,6 +91,9 @@ RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplc4 +CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/libnssutil3.so +CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssutil3.so +CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssutil3.so PACKAGES += CSWlibsmime3 CATALOGNAME_CSWlibsmime3 = libsmime3 @@ -96,6 +105,9 @@ RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplc4 +CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/libsmime3.so +CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsmime3.so +CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/amd64/libsmime3.so PACKAGES += CSWlibsoftokn3 CATALOGNAME_CSWlibsoftokn3 = libsoftokn3 @@ -108,6 +120,9 @@ RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnssutil3 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplds4 +CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/libsoftokn3.so +CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsoftokn3.so +CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/amd64/libsoftokn3.so PACKAGES += CSWlibssl3 CATALOGNAME_CSWlibssl3 = libssl3 @@ -118,6 +133,9 @@ RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnssutil3 +CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/libssl3.so +CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssl3.so +CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/amd64/libssl3.so PACKAGES += CSWlibfreebl3 CATALOGNAME_CSWlibfreebl3 = libfreebl3 @@ -127,6 +145,15 @@ PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.chk) RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4 +CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/amd64/libfreebl3.so +CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl3.so PACKAGES += CSWlibnss-dev CATALOGNAME_CSWlibnss-dev = libnss_dev @@ -143,6 +170,9 @@ RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssdbm3 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssckbi RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl3 +CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/libnssckbi.so +CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssckbi.so +CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/amd64/libnssckbi.so # OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel PACKAGES += CSWlibnss3-tools @@ -245,36 +275,6 @@ LD_OPTIONS = # NSS_LD_OPTIONS = -R'$$ORIGIN' -# CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/amd64/libfreebl3.so -CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl3.so -CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/libnss3.so -CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnss3.so -CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnss3.so -CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/libnssutil3.so -CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssutil3.so -CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssutil3.so -CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/libsoftokn3.so -CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsoftokn3.so -CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/amd64/libsoftokn3.so -CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/libssl3.so -CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssl3.so -CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/amd64/libssl3.so -CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/libsmime3.so -CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsmime3.so -CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/amd64/libsmime3.so -CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/libnssckbi.so -CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssckbi.so -CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/amd64/libnssckbi.so -CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so -CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so -CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssdbm3.so include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 13 15:54:47 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 13 Sep 2012 13:54:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19202] csw/mgar/pkg/nspr/trunk/Makefile Message-ID: Revision: 19202 http://gar.svn.sourceforge.net/gar/?rev=19202&view=rev Author: cgrzemba Date: 2012-09-13 13:54:47 +0000 (Thu, 13 Sep 2012) Log Message: ----------- nspr/trunk: remove trailing space Modified Paths: -------------- csw/mgar/pkg/nspr/trunk/Makefile Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2012-09-13 13:51:13 UTC (rev 19201) +++ csw/mgar/pkg/nspr/trunk/Makefile 2012-09-13 13:54:47 UTC (rev 19202) @@ -35,11 +35,11 @@ # PKGFILES_CSWnspr-dev += .*compile-et\.pl RUNTIME_DEP_PKGS_CSWnspr-dev = CSWlibnspr4 RUNTIME_DEP_PKGS_CSWnspr-dev += CSWperl -OBSOLETED_BY_CSWnspr-dev = CSWnspr-devel -OBSOLETED_BY_CSWnspr-dev += CSWmozilla -OBSOLETED_BY_CSWnspr-dev += CSWsunbird -INCOMPATIBLE_PKGS_CSWnspr-dev = CSWmozilla -INCOMPATIBLE_PKGS_CSWnspr-dev += CSWsunbird +# OBSOLETED_BY_CSWnspr-dev = CSWnspr-devel +# OBSOLETED_BY_CSWnspr-dev += CSWmozilla +# OBSOLETED_BY_CSWnspr-dev += CSWsunbird +# INCOMPATIBLE_PKGS_CSWnspr-dev = CSWmozilla +# INCOMPATIBLE_PKGS_CSWnspr-dev += CSWsunbird # Library splits @@ -140,7 +140,7 @@ ginstall -m 755 $(WORKSRC)/build/config/nspr-config \ $(DESTDIR)$(bindir) ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig - ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ + ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ $(DESTDIR)$(libdir)/pkgconfig if [ $(MEMORYMODEL) = 64 ]; then \ gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nspr.pc ; \ 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 14 09:56:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 Sep 2012 07:56:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19203] csw/mgar/pkg/tcsh/trunk/Makefile Message-ID: Revision: 19203 http://gar.svn.sourceforge.net/gar/?rev=19203&view=rev Author: dmichelsen Date: 2012-09-14 07:56:28 +0000 (Fri, 14 Sep 2012) Log Message: ----------- tcsh: Cleanup Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2012-09-13 13:54:47 UTC (rev 19202) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2012-09-14 07:56:28 UTC (rev 19203) @@ -29,7 +29,6 @@ EXTRA_CPPFLAGS += -D_FILE_OFFSET_BITS=64 # As documented in README, this overrides the setting in pathnames.h EXTRA_CPPFLAGS += -D_PATH_LOCAL=\'\"$(bindir)\"\' -# EXTRA_CPPFLAGS += -D_PATH_TCSHELL=\"$(bindir)/tcsh\" # Skip tests until this one is fixed: # http://bugs.gw.com/view.php?id=87 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 14 11:36:23 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 14 Sep 2012 09:36:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19204] csw/mgar/pkg/389-ds-base/trunk Message-ID: Revision: 19204 http://gar.svn.sourceforge.net/gar/?rev=19204&view=rev Author: cgrzemba Date: 2012-09-14 09:36:23 +0000 (Fri, 14 Sep 2012) Log Message: ----------- 389-ds-base/trunk: bump version 1.2.11.14 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile csw/mgar/pkg/389-ds-base/trunk/checksums csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch Added Paths: ----------- csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-09-14 07:56:28 UTC (rev 19203) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-09-14 09:36:23 UTC (rev 19204) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-ds-base -VERSION = 1.2.10.7 +VERSION = 1.2.11.14 GARTYPE = v2 CATEGORIES = server @@ -28,9 +28,12 @@ PATCHFILES += 0005-smf-autoenable-no.patch PATCHFILES += 0005-add-var-run-create-initconfig.in.patch # until Red Hat Bugzilla Bug 773617 is open do it yourself -PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch +# PATCHFILES += 0006-add-i386-platform-in-configure.ac.patch PATCHFILES += 0007-fixup-Makefile.am.patch # PATCHFILES += 0007-fixup-plugin_syntax.c.patch +PATCHFILES += 0008-mntent-daemon.c.patch +PATCHFILES += 0009-mozldap-pw.c.patch +PATCHFILES += 0010-mntent-config.ac.patch BUILD_DEP_PKGS += CSWautoconf BUILD_DEP_PKGS += CSWautomake Modified: csw/mgar/pkg/389-ds-base/trunk/checksums =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/checksums 2012-09-14 07:56:28 UTC (rev 19203) +++ csw/mgar/pkg/389-ds-base/trunk/checksums 2012-09-14 09:36:23 UTC (rev 19204) @@ -1 +1 @@ -7971e67278785a824cfb41f95a0dbab5 389-ds-base-1.2.10.7.tar.bz2 +d7e7969be34e18e5c8e1e40f3b9d5124 389-ds-base-1.2.11.14.tar.bz2 Modified: csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch 2012-09-14 07:56:28 UTC (rev 19203) +++ csw/mgar/pkg/389-ds-base/trunk/files/0007-fixup-Makefile.am.patch 2012-09-14 09:36:23 UTC (rev 19204) @@ -20,25 +20,7 @@ # We need to make sure that libpthread is linked before libc on HP-UX. if HPUX AM_LDFLAGS = -lpthread -@@ -696,7 +696,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \ - $(libavl_a_SOURCES) - - libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@ --if SOLARIS -+if SPARC - libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S - endif - -@@ -886,7 +886,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \ - ldap/servers/plugins/collation/config.c \ - ldap/servers/plugins/collation/orfilter.c - --libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS) -+libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ - libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN) - libcollation_plugin_la_LDFLAGS = -avoid-version - libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version -@@ -1439,7 +1439,7 @@ fixupcmd = sed \ +@@ -1475,7 +1475,7 @@ fixupcmd = sed \ -e 's, at systemdsystemconfdir\@,$(systemdsystemconfdir),g' \ -e 's, at systemdgroupname\@,$(systemdgroupname),g' else @@ -47,7 +29,7 @@ -e 's, at bindir\@,$(bindir),g' \ -e 's, at sbindir\@,$(sbindir),g' \ -e 's, at libdir\@,$(libdir),g' \ -@@ -1519,7 +1519,7 @@ endif +@@ -1564,7 +1564,7 @@ endif if SYSTEMD $(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@ else @@ -56,7 +38,7 @@ $(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@ endif -@@ -1528,7 +1528,7 @@ endif +@@ -1555,7 +1555,7 @@ endif if SYSTEMD $(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile format - see man systemd.exec/' > $@ else Added: csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0008-mntent-daemon.c.patch 2012-09-14 09:36:23 UTC (rev 19204) @@ -0,0 +1,38 @@ +--- a/ldap/servers/slapd/daemon.c ++++ b/ldap/servers/slapd/daemon.c +@@ -59,7 +59,9 @@ + #include + #include + #include +-#include ++#if defined(HAVE_MNTENT_H) ++# include ++# endif + #endif + #include + #include +@@ -80,6 +82,7 @@ + #endif /* NEED_FILIO */ + #endif /* !defined( _WIN32 ) */ + /* for some reason, linux tty stuff defines CTIME */ ++#include + #ifdef LINUX + #undef CTIME + #include +@@ -92,7 +95,6 @@ + #include "snmp_collator.h" + #include + #include +-#include + #include "fe.h" + + #if defined(ENABLE_LDAPI) +@@ -495,7 +497,7 @@ disk_mon_get_mount_point(char *dir) + + dev_id = s.st_dev; + +- while((mnt = getmntent(fp))){ ++ while(0 == getmntent(fp,mnt)){ + if (stat(mnt->mnt_mountp, &s) != 0) { + continue; + } Added: csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0009-mozldap-pw.c.patch 2012-09-14 09:36:23 UTC (rev 19204) @@ -0,0 +1,12 @@ +--- a/ldap/servers/slapd/pw.c ++++ b/ldap/servers/slapd/pw.c +@@ -61,6 +61,9 @@ + #if defined( _WIN32 ) + #undef LDAPDebug + #endif /* _WIN32 */ ++#if defined( USE_MOZLDAP ) ++#define LDAP_MOD_OP (0x0007) ++#endif /* USE_MOZLDAP */ + + #include "slap.h" + Added: csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0010-mntent-config.ac.patch 2012-09-14 09:36:23 UTC (rev 19204) @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_HEADER_STDC + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/socket.h sys/time.h unistd.h inttypes.h]) ++AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/socket.h sys/time.h unistd.h inttypes.h mntent.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STAT 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 14 12:57:10 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 14 Sep 2012 10:57:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19205] csw/mgar/pkg/389-ds-base/trunk/Makefile Message-ID: Revision: 19205 http://gar.svn.sourceforge.net/gar/?rev=19205&view=rev Author: cgrzemba Date: 2012-09-14 10:57:10 +0000 (Fri, 14 Sep 2012) Log Message: ----------- 389-ds-base/trunk: adjust runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-09-14 09:36:23 UTC (rev 19204) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-09-14 10:57:10 UTC (rev 19205) @@ -64,12 +64,12 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata49 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWbdb48 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc49 +RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n49 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3 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 14 15:40:35 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 14 Sep 2012 13:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19206] csw/mgar/pkg Message-ID: Revision: 19206 http://gar.svn.sourceforge.net/gar/?rev=19206&view=rev Author: dmichelsen Date: 2012-09-14 13:40:35 +0000 (Fri, 14 Sep 2012) Log Message: ----------- tesseract/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/tesseract/ csw/mgar/pkg/tesseract/Makefile csw/mgar/pkg/tesseract/branches/ csw/mgar/pkg/tesseract/tags/ csw/mgar/pkg/tesseract/trunk/ csw/mgar/pkg/tesseract/trunk/Makefile csw/mgar/pkg/tesseract/trunk/checksums csw/mgar/pkg/tesseract/trunk/files/ Added: csw/mgar/pkg/tesseract/Makefile =================================================================== --- csw/mgar/pkg/tesseract/Makefile (rev 0) +++ csw/mgar/pkg/tesseract/Makefile 2012-09-14 13:40:35 UTC (rev 19206) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tesseract/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tesseract/trunk/Makefile =================================================================== --- csw/mgar/pkg/tesseract/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tesseract/trunk/Makefile 2012-09-14 13:40:35 UTC (rev 19206) @@ -0,0 +1,62 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tesseract +VERSION = 3.02 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = An OCR engine + +GOOGLE_PROJECT = tesseract-ocr +MASTER_SITES = $(GOOGLE_MIRROR) +#DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME)-dam.tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +VENDOR_URL = http://code.google.com/p/tesseract-ocr/ + +BUILD_DEP_PKGS += CSWliblept-dev + +PACKAGES += CSWlibtesseract3 +SPKG_DESC_CSWlibtesseract3 = Tesseract OCR engine library, libtesseract.so.3 +PKGFILES_CSWlibtesseract3 += $(call pkgfiles_lib,libtesseract.so.3) +RUNTIME_DEP_PKGS_CSWlibtesseract3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtesseract3 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibtesseract3 += CSWliblept3 + +PACKAGES += CSWlibtesseract-dev +SPKG_DESC_CSWlibtesseract-dev = Development files for libtesseract.so.3 +PKGFILES_CSWlibtesseract-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibtesseract-dev += CSWlibtesseract3 + +PACKAGES += CSWtesseract +SPKG_DESC_CSWtesseract = Tesseract OCR engine +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibtesseract += CSWlibtesseract3 +RUNTIME_DEP_PKGS_CSWtesseract += CSWlibtesseract3 +RUNTIME_DEP_PKGS_CSWtesseract += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtesseract += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWtesseract += CSWliblept3 + +GARCOMPILER = GCC4 + +BUILD64 = 1 +ISAEXEC = 1 + +EXTRA_CONFIGURE_EXPORTS += LIBLEPT_HEADERSDIR +CONFIGURE_ENV_LIBLEPT_HEADERSDIR = $(includedir) + +CONFIGURE_ARGS = $(DIRPATHS) + +# The tarball does not contain the languages +#INSTALL_ARGS += install-langs + +include gar/category.mk + +post-extract-modulated: + @# Yes, the tarball must be bootstrapped + @# http://code.google.com/p/tesseract-ocr/issues/detail?id=756 + -cd $(WORKSRC) && ./autogen.sh + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/tesseract/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tesseract/trunk/checksums =================================================================== --- csw/mgar/pkg/tesseract/trunk/checksums (rev 0) +++ csw/mgar/pkg/tesseract/trunk/checksums 2012-09-14 13:40:35 UTC (rev 19206) @@ -0,0 +1 @@ +cf04c27e9e1e0e708e4cf45ac5380353 tesseract-3.02-dam.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 14 17:37:49 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 14 Sep 2012 15:37:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19207] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 19207 http://gar.svn.sourceforge.net/gar/?rev=19207&view=rev Author: wahwah Date: 2012-09-14 15:37:49 +0000 (Fri, 14 Sep 2012) Log Message: ----------- checkpkg_lib: Replace tabs with spaces We should have a linter to do that. Or maybe we already have one? 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 2012-09-14 13:40:35 UTC (rev 19206) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2012-09-14 15:37:49 UTC (rev 19207) @@ -247,8 +247,8 @@ continue tag_info=e.tag_info if tag_info is not None: - if not isinstance(tag_info, unicode): - tag_info=unicode(tag_info, "utf-8") + if not isinstance(tag_info, unicode): + tag_info=unicode(tag_info, "utf-8") error_tag_in_db = m.CheckpkgErrorTag( srv4_file=db_stat_objs_by_pkgname[e.pkgname], pkgname=e.pkgname, 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 15 16:41:51 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 15 Sep 2012 14:41:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19208] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 19208 http://gar.svn.sourceforge.net/gar/?rev=19208&view=rev Author: guengel Date: 2012-09-15 14:41:51 +0000 (Sat, 15 Sep 2012) Log Message: ----------- cfengine3/trunk: added a mapfile to force linking against interface SUNW_1.22.5. enabled direct binding. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-09-14 15:37:49 UTC (rev 19207) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-09-15 14:41:51 UTC (rev 19208) @@ -26,6 +26,7 @@ DISTFILES += csw$(NAME)-cfserverd DISTFILES += README.CSW DISTFILES += changelog.CSW +DISTFILES += map.cfengine3 VENDOR_URL = http://www.cfengine.com/community UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz @@ -68,9 +69,7 @@ PACKAGES += CSW$(NAME)server CATALOGNAME_CSW$(NAME)server = $(NAME)_server SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibtokyocabinet9 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent @@ -83,9 +82,7 @@ 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 += CSWlibtokyocabinet9 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd @@ -134,7 +131,7 @@ # We use this because libpromises will be moved to this private # directory (see also move-libpromises:) -EXTRA_LDFLAGS += -R$(libdir)/$(NAME) +EXTRA_LDFLAGS += -R$(libdir)/$(NAME) -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.cfengine3)" # Those libs are used by configure to detect getaddrinfo() EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl" Added: csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 2012-09-15 14:41:51 UTC (rev 19208) @@ -0,0 +1 @@ +libc.so - SUNW_1.22.5 SUNWprivate_1.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 15 16:51:10 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 15 Sep 2012 14:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19209] csw/mgar/pkg/spamass-milter/trunk Message-ID: Revision: 19209 http://gar.svn.sourceforge.net/gar/?rev=19209&view=rev Author: guengel Date: 2012-09-15 14:51:09 +0000 (Sat, 15 Sep 2012) Log Message: ----------- spamass-milter/trunk: Added patch in order to allow bypassing checks for authenticated users when using with postfix Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/Makefile csw/mgar/pkg/spamass-milter/trunk/files/README.CSW csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW Added Paths: ----------- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter-0.3.1-authuser.patch Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-09-15 14:41:51 UTC (rev 19208) +++ csw/mgar/pkg/spamass-milter/trunk/Makefile 2012-09-15 14:51:09 UTC (rev 19209) @@ -3,11 +3,15 @@ CATEGORIES = net GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = Plugin for the Sendmail Milter library for SpamAssassin define BLURB Plugin for the Sendmail Milter library for SpamAssassin endef + + MASTER_SITES = http://download.savannah.gnu.org/releases/spamass-milt/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += cswspamass-milter @@ -18,6 +22,12 @@ DISTFILES += spamass-milter.m4 PATCHFILES = 0000-Workaround-for-missing-paths.h.patch +# This patch has been extracted from +# +# http://download.fedoraproject.org/pub/fedora/linux/releases/17/Everything/source/SRPMS/spamass-milter-0.3.2-6.fc17.src.rpm +# +# retrieved on 2012-09-14. +PATCHFILES += spamass-milter-0.3.1-authuser.patch INITSMF = $(sysconfdir)/init.d/cswspamass-milter PRESERVECONF = $(sysconfdir)/spamass-milter Modified: csw/mgar/pkg/spamass-milter/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-09-15 14:41:51 UTC (rev 19208) +++ csw/mgar/pkg/spamass-milter/trunk/files/README.CSW 2012-09-15 14:51:09 UTC (rev 19209) @@ -75,4 +75,22 @@ In any case, the filter will be called `spamass-milter'. + +Postfix +------- + +This release of spamass-milter has been patched in order to support +bypassing checks for authenticated users. To enable the bypass, edit + + /etc/opt/csw/spamass-milter + +or + + /opt/csw/etc/spamass-milter + +and set + + POSTFIX_IGNORE_AUTH_USER=yes + + Direct comments and/or suggestions to raos at opencsw.org. Modified: csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-09-15 14:41:51 UTC (rev 19208) +++ csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-09-15 14:51:09 UTC (rev 19209) @@ -1,3 +1,13 @@ +spamass-milter (0.3.2,REV=2012.09.15) + + * Dropped support for Solaris 9 + + * Added command line option to bypass checks for authenticated users + when using postfix + + -- Rafael Ostertag Sat, 15 Sep 2012 14:58:7 +0200 + + spamass-milter (0.3.2,REV=2012.06.16) * Fixed comments spamass-milter.m4 in order to avoid recursive Modified: csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter 2012-09-15 14:41:51 UTC (rev 19208) +++ csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter 2012-09-15 14:51:09 UTC (rev 19209) @@ -218,6 +218,20 @@ ;; esac fi +if [ -n "${POSTFIX_IGNORE_AUTH_USER}" ] +then + case "${POSTFIX_IGNORE_AUTH_USER}" in + 'yes') + ARGS="${ARGS} -I" + ;; + 'no') + : + ;; + *) + warning "${POSTFIX_IGNORE_AUTH_USER} is not a valid value for POSTFIX_IGNORE_AUTH_USER. Assuming 'no'." + ;; + esac +fi if [ -n "${SPAMC_FLAGS}" ] then ARGS="${ARGS} -- ${SPAMC_FLAGS}" Added: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter-0.3.1-authuser.patch =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter-0.3.1-authuser.patch (rev 0) +++ csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter-0.3.1-authuser.patch 2012-09-15 14:51:09 UTC (rev 19209) @@ -0,0 +1,91 @@ +diff -up spamass-milter-0.3.1/spamass-milter.cpp.authuser spamass-milter-0.3.1/spamass-milter.cpp +--- spamass-milter-0.3.1/spamass-milter.cpp.authuser 2010-03-23 21:04:56.976920217 +0000 ++++ spamass-milter-0.3.1/spamass-milter.cpp 2010-03-23 21:07:12.508020535 +0000 +@@ -172,6 +172,7 @@ char *spambucket; + bool flag_full_email = false; /* pass full email address to spamc */ + bool flag_expand = false; /* alias/virtusertable expansion */ + bool warnedmacro = false; /* have we logged that we couldn't fetch a macro? */ ++bool ignore_authenticated_senders = false; /* authenticated users bypass spam checks */ + + // {{{ main() + +@@ -179,7 +180,7 @@ int + main(int argc, char* argv[]) + { + int c, err = 0; +- const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x"; ++ const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:x"; + char *sock = NULL; + bool dofork = false; + char *pidfilename = NULL; +@@ -211,6 +212,10 @@ main(int argc, char* argv[]) + debug(D_MISC, "Parsing ignore list"); + parse_networklist(optarg, &ignorenets); + break; ++ case 'I': ++ debug(D_MISC, "Ignore authenticated senders"); ++ ignore_authenticated_senders = true; ++ break; + case 'm': + dontmodifyspam = true; + smfilter.xxfi_flags &= ~SMFIF_CHGBODY; +@@ -278,7 +283,7 @@ main(int argc, char* argv[]) + cout << PACKAGE_NAME << " - Version " << PACKAGE_VERSION << endl; + cout << "SpamAssassin Sendmail Milter Plugin" << endl; + cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl; +- cout << " [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl; ++ cout << " [-e defaultdomain] [-f] [-i networks] [-I] [-m] [-M]" << endl; + cout << " [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl; + cout << " [-- spamc args ]" << endl; + cout << " -p socket: path to create socket" << endl; +@@ -292,6 +297,7 @@ main(int argc, char* argv[]) + cout << " -f: fork into background" << endl; + cout << " -i: skip (ignore) checks from these IPs or netblocks" << endl; + cout << " example: -i 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0" << endl; ++ cout << " -I: skip (ignore) checks if sender is authenticated" << endl; + cout << " -m: don't modify body, Content-type: or Subject:" << endl; + cout << " -M: don't modify the message at all" << endl; + cout << " -P pidfile: Put processid in pidfile" << endl; +@@ -746,6 +752,22 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro + } + /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */ + ++ if (ignore_authenticated_senders) ++ { ++ char *auth_authen; ++ ++ auth_authen = smfi_getsymval(ctx, const_cast("{auth_authen}")); ++ debug(D_MISC, "auth_authen=%s", auth_authen ? auth_authen : ""); ++ ++ if (auth_authen) ++ { ++ debug(D_MISC, "sender authenticated (%s) - accepting message", ++ auth_authen); ++ debug(D_FUNC, "mlfi_envfrom: exit ignore"); ++ return SMFIS_ACCEPT; ++ } ++ } ++ + debug(D_FUNC, "mlfi_envfrom: enter"); + try { + // launch new SpamAssassin +diff -up spamass-milter-0.3.1/spamass-milter.1.in.authuser spamass-milter-0.3.1/spamass-milter.1.in +--- spamass-milter-0.3.1/spamass-milter.1.in.authuser 2004-03-18 18:37:08.000000000 +0000 ++++ spamass-milter-0.3.1/spamass-milter.1.in 2010-03-23 21:06:27.148897685 +0000 +@@ -14,6 +14,7 @@ + .Op Fl e Ar defaultdomain + .Op Fl f + .Op Fl i Ar networks ++.Op Fl I + .Op Fl m + .Op Fl M + .Op Fl P Ar pidfile +@@ -119,6 +120,8 @@ Multiple + flags will append to the list. + For example, if you list all your internal networks, no outgoing emails + will be filtered. ++.It Fl I ++Ignores messages if the sender has authenticated via SMTP AUTH. + .It Fl m + Disables modification of the + .Ql Subject: Modified: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW 2012-09-15 14:41:51 UTC (rev 19208) +++ csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.CSW 2012-09-15 14:51:09 UTC (rev 19209) @@ -1,3 +1,4 @@ +# -*- sh -*-* # This is a shell script fragment. It will be sourced by # /etc/opt/csw/init.d/cswspamass-milter. # @@ -89,9 +90,19 @@ # Default: no #MAILADDR_EXPANSION=no +# This is mainly for postfix users. It instructs spamass-milter to NOT +# check mails from authenticated users. +# +# This is switch is not available in the stock spamass-milter. +# +# Values: yes,no (yes: -I) +# +# Default: no +#POSTFIX_IGNORE_AUTH_USER=yes + # Pass flags to spamc. # # Equivalent to: -- # # Default: none -#SPAMC_FLAGS= \ No newline at end of file +#SPAMC_FLAGS= 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 16 10:03:49 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 16 Sep 2012 08:03:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19210] csw/mgar/pkg/postgresql/branches/postgresql-9.1/ Message-ID: Revision: 19210 http://gar.svn.sourceforge.net/gar/?rev=19210&view=rev Author: guengel Date: 2012-09-16 08:03:49 +0000 (Sun, 16 Sep 2012) Log Message: ----------- postgresql/branches/postgresql-9.1: Branched since new upstream release 9.2 is out Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.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 Sun Sep 16 15:28:59 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 16 Sep 2012 13:28:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19211] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 19211 http://gar.svn.sourceforge.net/gar/?rev=19211&view=rev Author: guengel Date: 2012-09-16 13:28:58 +0000 (Sun, 16 Sep 2012) Log Message: ----------- postgresql/trunk: New upstream release 9.2.0 Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch Removed Paths: ------------- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2012-09-16 08:03:49 UTC (rev 19210) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2012-09-16 13:28:58 UTC (rev 19211) @@ -87,10 +87,10 @@ # maintainers to use `pg_config'. NAME = postgresql -BASE_VERSION = 9.1 +BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 5 +PATCHLEVEL = 0 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps GARTYPE = v2 @@ -126,11 +126,15 @@ # This variable has been introduced for using in EXPANDVARS files PGNAME_VERSIONED = $(NAME)-$(BASE_VERSION_NODOT) # Those BIN_NAMES_* are used both, for package creation and alternatives. +# +# The distinction between server and client binaries is taken from the +# FreeBSD postgresql port. +# # 8.4 has removed ipcclean -BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres +BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog pg_receivexlog pg_basebackup postmaster postgres BIN_NAMES_DEVEL = ecpg pg_config -BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb pg_basebackup clusterdb -BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync +BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb clusterdb +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync pg_test_timing # These are shared objects used by the server. Please note, contrib installs # also shared object in the same place, so make sure you don't mix up things SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so @@ -155,7 +159,7 @@ SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so dummy_seclabel.so -SO_NAMES_CONTRIB += auth_delay.so file_fdw.so +SO_NAMES_CONTRIB += auth_delay.so file_fdw.so tcn.so # Those are the extension provided by contrib. # # This has been introduced with 9.1 @@ -172,7 +176,7 @@ EXT_NAMES_CONTRIB += earthdistance--1.0.sql earthdistance.control earthdistance--unpackaged--1.0.sql EXT_NAMES_CONTRIB += file_fdw--1.0.sql file_fdw.control EXT_NAMES_CONTRIB += fuzzystrmatch--1.0.sql fuzzystrmatch.control fuzzystrmatch--unpackaged--1.0.sql -EXT_NAMES_CONTRIB += hstore--1.0.sql hstore.control hstore--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += hstore--1.0--1.1.sql hstore--1.1.sql hstore.control hstore--unpackaged--1.0.sql EXT_NAMES_CONTRIB += insert_username--1.0.sql insert_username.control insert_username--unpackaged--1.0.sql EXT_NAMES_CONTRIB += intagg--1.0.sql intagg.control intagg--unpackaged--1.0.sql EXT_NAMES_CONTRIB += intarray--1.0.sql intarray.control intarray--unpackaged--1.0.sql @@ -185,7 +189,7 @@ EXT_NAMES_CONTRIB += pgcrypto--1.0.sql pgcrypto.control pgcrypto--unpackaged--1.0.sql EXT_NAMES_CONTRIB += pg_freespacemap--1.0.sql pg_freespacemap.control pg_freespacemap--unpackaged--1.0.sql EXT_NAMES_CONTRIB += pgrowlocks--1.0.sql pgrowlocks.control pgrowlocks--unpackaged--1.0.sql -EXT_NAMES_CONTRIB += pg_stat_statements--1.0.sql pg_stat_statements.control pg_stat_statements--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pg_stat_statements--1.1.sql pg_stat_statements--1.0--1.1.sql pg_stat_statements.control pg_stat_statements--unpackaged--1.0.sql EXT_NAMES_CONTRIB += pgstattuple--1.0.sql pgstattuple.control pgstattuple--unpackaged--1.0.sql EXT_NAMES_CONTRIB += pg_trgm--1.0.sql pg_trgm.control pg_trgm--unpackaged--1.0.sql EXT_NAMES_CONTRIB += refint--1.0.sql refint.control refint--unpackaged--1.0.sql @@ -197,6 +201,7 @@ EXT_NAMES_CONTRIB += tsearch2--1.0.sql tsearch2.control tsearch2--unpackaged--1.0.sql EXT_NAMES_CONTRIB += unaccent--1.0.sql unaccent.control unaccent--unpackaged--1.0.sql EXT_NAMES_CONTRIB += xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += tcn.control tcn--1.0.sql # Miscellaneous files MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql @@ -269,13 +274,13 @@ # This patch will replace /usr/local/include by /opt/csw/include in # ecpg.c and thus silence a checkpkg error. -PATCHFILES += 0000-ecpg-usr-local-include-replacement.patch +PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch # Test running on a NFS may fail. Thus we let the test run in -# /var/tmp/pgsql/tmp_check -PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch +# /var/tmp/pgsql92/tmp_check +PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld -PATCHFILES += 0000-Use-plain-rpath.patch +PATCHFILES += 0002-Use-plain-rpath.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) @@ -525,7 +530,13 @@ @echo " ===> Adjusting pkglibdir in $(WORKSRC)/src/Makefile.global.in" @if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \ + else \ + echo "$(WORKSRC)/src/Makefile.global.in not found. Aborting" ; \ + exit 1 ; \ fi + @echo " ===> Setting temp-install dir in $(WORKSRC)/src/Makefile.global.in" + gsed -i -r -e 's|\./tmp_check|/var/tmp/pgsql$(BASE_VERSION_NODOT)/tmp_check|g' -e 's|tmp_check/|/var/tmp/pgsql$(BASE_VERSION_NODOT)/tmp_check|g' \ + $(WORKSRC)/src/Makefile.global.in @$(MAKECOOKIE) post-build-modulated: Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2012-09-16 08:03:49 UTC (rev 19210) +++ csw/mgar/pkg/postgresql/trunk/checksums 2012-09-16 13:28:58 UTC (rev 19211) @@ -1 +1 @@ -c784decb60615aa94c6a31601bc6ffd2 postgresql-9.1.5.tar.bz2 +8c4c32a4abe8cf61b02c8366181ede50 postgresql-9.2.0.tar.bz2 Deleted: csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-09-16 08:03:49 UTC (rev 19210) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-09-16 13:28:58 UTC (rev 19211) @@ -1,62 +0,0 @@ -From 051eb505448cba2f98aa5926ef3bfe0eed50d74c Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Fri, 30 Dec 2011 20:32:11 +0100 -Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check - ---- - src/Makefile.global.in | 4 ++-- - src/test/regress/GNUmakefile | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 3bf658d..69523de 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -438,10 +438,10 @@ endif - - pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE) - --pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) -+pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) - pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags) - --pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/ -+pg_regress_clean_files = results/ regression.diffs regression.out /var/tmp/pgsql/tmp_check log/ - - - ########################################################################## -diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile -index 90aea6c..99c3905 100644 ---- a/src/test/regress/GNUmakefile -+++ b/src/test/regress/GNUmakefile -@@ -135,6 +135,7 @@ tablespace-setup: - REGRESS_OPTS = --dlpath=. - - check: all tablespace-setup -+ install -d /var/tmp/pgsql/tmp_check - $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS) - - installcheck: all tablespace-setup -@@ -144,6 +145,7 @@ installcheck-parallel: all tablespace-setup - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) - - standbycheck: all -+ install -d /var/tmp/pgsql/tmp_check - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing - - # old interfaces follow... -@@ -153,9 +155,11 @@ runtest: installcheck - runtest-parallel: installcheck-parallel - - bigtest: all tablespace-setup -+ install -d /var/tmp/pgsql/tmp_check - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big - - bigcheck: all tablespace-setup -+ install -d /var/tmp/pgsql/tmp_check - $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big - - --- -1.7.6.1 - Added: csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch 2012-09-16 13:28:58 UTC (rev 19211) @@ -0,0 +1,44 @@ +From e02c1f65cb7bb300e5ce926b6d96d391f51c8c3b Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 16 Sep 2012 10:56:57 +0200 +Subject: [PATCH 0/2] Run tests in /var/tmp/pgsql92/tmp_check + +--- + src/test/regress/GNUmakefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile +index 0239b6f..376631c 100644 +--- a/src/test/regress/GNUmakefile ++++ b/src/test/regress/GNUmakefile +@@ -135,6 +135,7 @@ tablespace-setup: + REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS) + + check: all tablespace-setup ++ install -d /var/tmp/pgsql92/tmp_check + $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS) + + installcheck: all tablespace-setup +@@ -144,6 +145,7 @@ installcheck-parallel: all tablespace-setup + $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) + + standbycheck: all ++ install -d /var/tmp/pgsql92/tmp_check + $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing + + # old interfaces follow... +@@ -153,9 +155,11 @@ runtest: installcheck + runtest-parallel: installcheck-parallel + + bigtest: all tablespace-setup ++ install -d /var/tmp/pgsql92/tmp_check + $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big + + bigcheck: all tablespace-setup ++ install -d /var/tmp/pgsql92/tmp_check + $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big + + +-- +1.7.12 + Deleted: csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch 2012-09-16 08:03:49 UTC (rev 19210) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch 2012-09-16 13:28:58 UTC (rev 19211) @@ -1,25 +0,0 @@ -From 3e5748b6bc287f4036c2f619c143b9e467b84c29 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 1 Jan 2012 17:35:00 +0100 -Subject: [PATCH] Use plain rpath - ---- - src/makefiles/Makefile.solaris | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris -index bb56830..89d83df 100644 ---- a/src/makefiles/Makefile.solaris -+++ b/src/makefiles/Makefile.solaris -@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes) - export_dynamic = -Wl,-E - rpath = -Wl,-rpath,'$(rpathdir)' - else --rpath = -Wl,-R'$(rpathdir)' -+rpath = -R$(rpathdir) - endif - - DLSUFFIX = .so --- -1.7.6.1 - Deleted: csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch 2012-09-16 08:03:49 UTC (rev 19210) +++ csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch 2012-09-16 13:28:58 UTC (rev 19211) @@ -1,25 +0,0 @@ -From dec1e5ffd2ec2e58d185f6e4753e38ff5a0af1cd Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Fri, 30 Dec 2011 16:27:27 +0100 -Subject: [PATCH] ecpg /usr/local/include replacement - ---- - src/interfaces/ecpg/preproc/ecpg.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c -index db52bf5..05cad72 100644 ---- a/src/interfaces/ecpg/preproc/ecpg.c -+++ b/src/interfaces/ecpg/preproc/ecpg.c -@@ -253,7 +253,7 @@ main(int argc, char *const argv[]) - } - - add_include_path("."); -- add_include_path("/usr/local/include"); -+ add_include_path("/opt/csw/include"); - get_include_path(my_exec_path, include_path); - add_include_path(include_path); - add_include_path("/usr/include"); --- -1.7.6.1 - Added: csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch 2012-09-16 13:28:58 UTC (rev 19211) @@ -0,0 +1,25 @@ +From 3d38c6e422081129b880bf5bdd7ff8a7c370025a Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 16 Sep 2012 11:01:47 +0200 +Subject: [PATCH 1/2] ecpg /usr/local/include replacement + +--- + src/interfaces/ecpg/preproc/ecpg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c +index 7e7bae3..2e9b28c 100644 +--- a/src/interfaces/ecpg/preproc/ecpg.c ++++ b/src/interfaces/ecpg/preproc/ecpg.c +@@ -253,7 +253,7 @@ main(int argc, char *const argv[]) + } + + add_include_path("."); +- add_include_path("/usr/local/include"); ++ add_include_path("/opt/csw/include"); + get_include_path(my_exec_path, include_path); + add_include_path(include_path); + add_include_path("/usr/include"); +-- +1.7.12 + Added: csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch 2012-09-16 13:28:58 UTC (rev 19211) @@ -0,0 +1,25 @@ +From 127f64d1db4caf7674c739574abf5b3fbf72e784 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 16 Sep 2012 11:04:08 +0200 +Subject: [PATCH 2/2] Use plain rpath + +--- + src/makefiles/Makefile.solaris | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris +index e459de3..8729ee8 100644 +--- a/src/makefiles/Makefile.solaris ++++ b/src/makefiles/Makefile.solaris +@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes) + export_dynamic = -Wl,-E + rpath = -Wl,-rpath,'$(rpathdir)' + else +-rpath = -Wl,-R'$(rpathdir)' ++rpath = -R$(rpathdir) + endif + + DLSUFFIX = .so +-- +1.7.12 + Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-09-16 08:03:49 UTC (rev 19210) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-09-16 13:28:58 UTC (rev 19211) @@ -1,26 +1,5 @@ -postgresql91 (9.1.5,REV=2012.08.22) +postgresql92 (9.2.0,REV=2012.09.16) - * New upstream release 9.1.5. + * New upstream release 9.2.0 - -- Rafael Ostertag Wed, 22 Aug 2012 08:27:06+0200 - - -postgresql91 (9.1.4,REV=2012.06.13) - - * New upstream release 9.1.4. - - * Dropped support for Solaris 9 - - * Include changelog.CSW in all packages, thus removing the clustering of - changelog.CSW files in CSWpostgresql - - -- Rafael Ostertag Wed, 13 June 2012 15:46:57+0200 - - -postgresql91 (9.1.3,REV=2012.05.01) - - * New upstream release 9.1.3. - - * Updated libssl dependencies. - - -- Rafael Ostertag Tue, 01 May 2012 08:48:19 +0200 + -- Rafael Ostertag Sun, 16 Sep 2012 14:55:51 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 09:30:14 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 07:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19212] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: Revision: 19212 http://gar.svn.sourceforge.net/gar/?rev=19212&view=rev Author: guillomovitch Date: 2012-09-17 07:30:14 +0000 (Mon, 17 Sep 2012) 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 2012-09-16 13:28:58 UTC (rev 19211) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 07:30:14 UTC (rev 19212) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.2.5 +VERSION = 2.2.6 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2012-09-16 13:28:58 UTC (rev 19211) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2012-09-17 07:30:14 UTC (rev 19212) @@ -1 +1 @@ -73e8fd45a9f17e9ced4b94574b6c7a55 FusionInventory-Agent-2.2.5.tar.gz +b7063b857bbf180562614b314196bc49 FusionInventory-Agent-2.2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 10:04:44 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 08:04:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19213] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: Revision: 19213 http://gar.svn.sourceforge.net/gar/?rev=19213&view=rev Author: guillomovitch Date: 2012-09-17 08:04:44 +0000 (Mon, 17 Sep 2012) Log Message: ----------- fusioninventory-agent/trunk: ship a minimal cron task Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 07:30:14 UTC (rev 19212) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 08:04:44 UTC (rev 19213) @@ -18,6 +18,8 @@ MODDIST = DISTNAME = FusionInventory-Agent-$(VERSION) DISTFILES = $(DISTNAME).tar.gz +DISTFILES += fusioninventory-agent.cron +DISTFILES += fusioninventory-agent.csw LICENSE = LICENSE @@ -56,4 +58,10 @@ DOCLIST = LICENSE Changes README THANKS +CRONTABS = /etc/opt/csw/pkg/CSWfusioninventory-agent/crontabs/root + +post-install-modulated: + /opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.cron $(DESTDIR)/etc/opt/csw/pkg/CSWfusioninventory-agent/crontabs/root + /opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.csw $(DESTDIR)/etc/opt/csw/fusioninventory-agent + include gar/category.mk Added: csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron (rev 0) +++ csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron 2012-09-17 08:04:44 UTC (rev 19213) @@ -0,0 +1 @@ +40 3 * * * . /etc/opt/csw/fusioninventory-agent && /opt/csw/bin/fusioninventory-agent $OPTIONS > /dev/null 2>&1 Added: csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw (rev 0) +++ csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw 2012-09-17 08:04:44 UTC (rev 19213) @@ -0,0 +1,2 @@ +# fusioninventory agent options +OPTIONS="" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 11:09:26 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 09:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19214] csw/mgar/pkg/rsyslog/trunk Message-ID: Revision: 19214 http://gar.svn.sourceforge.net/gar/?rev=19214&view=rev Author: guillomovitch Date: 2012-09-17 09:09:25 +0000 (Mon, 17 Sep 2012) Log Message: ----------- rsyslog/trunk: new version Modified Paths: -------------- csw/mgar/pkg/rsyslog/trunk/Makefile csw/mgar/pkg/rsyslog/trunk/checksums Modified: csw/mgar/pkg/rsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsyslog/trunk/Makefile 2012-09-17 08:04:44 UTC (rev 19213) +++ csw/mgar/pkg/rsyslog/trunk/Makefile 2012-09-17 09:09:25 UTC (rev 19214) @@ -1,5 +1,5 @@ NAME = rsyslog -VERSION = 5.8.6 +VERSION = 5.8.13 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/rsyslog/trunk/checksums =================================================================== --- csw/mgar/pkg/rsyslog/trunk/checksums 2012-09-17 08:04:44 UTC (rev 19213) +++ csw/mgar/pkg/rsyslog/trunk/checksums 2012-09-17 09:09:25 UTC (rev 19214) @@ -1 +1 @@ -c46db0496066b82faf735bd4222208d7 rsyslog-5.8.6.tar.gz +8d228a8b622f90b320c95f38be7fc5bb rsyslog-5.8.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Sep 17 11:22:43 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 17 Sep 2012 09:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19215] csw/mgar/pkg/samba/trunk Message-ID: Revision: 19215 http://gar.svn.sourceforge.net/gar/?rev=19215&view=rev Author: janholzh Date: 2012-09-17 09:22:43 +0000 (Mon, 17 Sep 2012) Log Message: ----------- samba/trunk: update to Version 3.6.8 Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-09-17 09:09:25 UTC (rev 19214) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-09-17 09:22:43 UTC (rev 19215) @@ -4,7 +4,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.7 +VERSION = 3.6.8 CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2012-09-17 09:09:25 UTC (rev 19214) +++ csw/mgar/pkg/samba/trunk/checksums 2012-09-17 09:22:43 UTC (rev 19215) @@ -1 +1 @@ -b23be56c15dd52f64eb7ba54c0ea1ed5 samba-3.6.7.tar.gz +fbb245863eeef2fffe172df779a217be samba-3.6.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Sep 17 11:46:03 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 17 Sep 2012 09:46:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19216] csw/mgar/pkg/samba/trunk Message-ID: Revision: 19216 http://gar.svn.sourceforge.net/gar/?rev=19216&view=rev Author: janholzh Date: 2012-09-17 09:46:03 +0000 (Mon, 17 Sep 2012) Log Message: ----------- samba/trunk: add mapfile Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/samba/trunk/files/map.samba Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-09-17 09:22:43 UTC (rev 19215) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-09-17 09:46:03 UTC (rev 19216) @@ -331,7 +331,7 @@ # Tests need root SKIPTEST ?= 1 -EXTRA_LINKER_FLAGS = -z ignore +EXTRA_LINKER_FLAGS = -z ignore -M "$(abspath $(WORKDIR)/map.samba)" INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile Added: csw/mgar/pkg/samba/trunk/files/map.samba =================================================================== --- csw/mgar/pkg/samba/trunk/files/map.samba (rev 0) +++ csw/mgar/pkg/samba/trunk/files/map.samba 2012-09-17 09:46:03 UTC (rev 19216) @@ -0,0 +1,2 @@ +libc.so - SUNW_1.22.5 SUNWprivate_1.1; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 14:37:41 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 12:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19217] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: Revision: 19217 http://gar.svn.sourceforge.net/gar/?rev=19217&view=rev Author: guillomovitch Date: 2012-09-17 12:37:40 +0000 (Mon, 17 Sep 2012) Log Message: ----------- fusioninventory-agent/trunk: use /etc/opt/csw/default for storing package-specific configuration Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron Added Paths: ----------- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.default Removed Paths: ------------- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 09:46:03 UTC (rev 19216) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 12:37:40 UTC (rev 19217) @@ -19,7 +19,7 @@ DISTNAME = FusionInventory-Agent-$(VERSION) DISTFILES = $(DISTNAME).tar.gz DISTFILES += fusioninventory-agent.cron -DISTFILES += fusioninventory-agent.csw +DISTFILES += fusioninventory-agent.default LICENSE = LICENSE @@ -62,6 +62,6 @@ post-install-modulated: /opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.cron $(DESTDIR)/etc/opt/csw/pkg/CSWfusioninventory-agent/crontabs/root - /opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.csw $(DESTDIR)/etc/opt/csw/fusioninventory-agent + /opt/csw/gnu/install -D -m 644 $(WORKDIR)/fusioninventory-agent.default $(DESTDIR)/etc/opt/csw/default/fusioninventory-agent include gar/category.mk Modified: csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron 2012-09-17 09:46:03 UTC (rev 19216) +++ csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.cron 2012-09-17 12:37:40 UTC (rev 19217) @@ -1 +1 @@ -40 3 * * * . /etc/opt/csw/fusioninventory-agent && /opt/csw/bin/fusioninventory-agent $OPTIONS > /dev/null 2>&1 +40 3 * * * . /etc/opt/csw/default/fusioninventory-agent && /opt/csw/bin/fusioninventory-agent $OPTIONS > /dev/null 2>&1 Deleted: csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw 2012-09-17 09:46:03 UTC (rev 19216) +++ csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw 2012-09-17 12:37:40 UTC (rev 19217) @@ -1,2 +0,0 @@ -# fusioninventory agent options -OPTIONS="" Copied: csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.default (from rev 19216, csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.csw) =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.default (rev 0) +++ csw/mgar/pkg/fusioninventory-agent/trunk/files/fusioninventory-agent.default 2012-09-17 12:37:40 UTC (rev 19217) @@ -0,0 +1,2 @@ +# fusioninventory agent options +OPTIONS="" 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 17 15:31:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Sep 2012 13:31:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19218] csw/mgar/gar/v2/lib/python Message-ID: Revision: 19218 http://gar.svn.sourceforge.net/gar/?rev=19218&view=rev Author: dmichelsen Date: 2012-09-17 13:31:31 +0000 (Mon, 17 Sep 2012) Log Message: ----------- mGAR v2: Default to OpenCSW Python Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-09-17 12:37:40 UTC (rev 19217) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-09-17 13:31:31 UTC (rev 19218) @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.6 +#!/opt/csw/bin/python2.6 # # checkpkg # Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2012-09-17 12:37:40 UTC (rev 19217) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2012-09-17 13:31:31 UTC (rev 19218) @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.6 +#!/opt/csw/bin/python2.6 """csw_upload_pkg.py - uploads packages to the database. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 17 15:42:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Sep 2012 13:42:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19219] csw/mgar/gar/v2 Message-ID: Revision: 19219 http://gar.svn.sourceforge.net/gar/?rev=19219&view=rev Author: dmichelsen Date: 2012-09-17 13:42:17 +0000 (Mon, 17 Sep 2012) Log Message: ----------- mGAR v2: Add default linker map for Solaris 10u8, direct linkage and ignore extra libs Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2/lib/map.solaris10u8 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-09-17 13:31:31 UTC (rev 19218) +++ csw/mgar/gar/v2/gar.conf.mk 2012-09-17 13:42:17 UTC (rev 19219) @@ -690,6 +690,12 @@ RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) endif +LINKER_MAP_RELEASE ?= solaris10u8 + +LINKER_MAPS ?= $(foreach MAP,$(LINKER_MAP_RELEASE) $(EXTRA_LINKER_MAPS),-M $(abspath $(GARDIR)/lib/map.$(LINKER_MAP_RELEASE))) +LINKER_DIRECT ?= -B direct +LINKER_IGNORE ?= -z ignore + # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one # with $ISALIST if it exists in RUNPATH_ISALIST, then append remaining dirs from RUNPATH_ISALIST RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS) @@ -720,7 +726,7 @@ SOS12U2_LD_OPTIONS = $(EXTRA_SOS12U2_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12U3_LD_OPTIONS = $(EXTRA_SOS12U3_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) -LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) +LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, Copied: csw/mgar/gar/v2/lib/map.solaris10u8 (from rev 19072, csw/mgar/pkg/krb5-lib/trunk/mapfile) =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10u8 (rev 0) +++ csw/mgar/gar/v2/lib/map.solaris10u8 2012-09-17 13:42:17 UTC (rev 19219) @@ -0,0 +1,7 @@ +# Stick to Solaris 10u8 +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 +libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers +libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers +libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Sep 17 16:14:03 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Sep 2012 14:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19220] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 19220 http://gar.svn.sourceforge.net/gar/?rev=19220&view=rev Author: dmichelsen Date: 2012-09-17 14:14:03 +0000 (Mon, 17 Sep 2012) Log Message: ----------- mGAR v2: Enable solaris 10 linker map only on Solaris 10 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-09-17 13:42:17 UTC (rev 19219) +++ csw/mgar/gar/v2/gar.conf.mk 2012-09-17 14:14:03 UTC (rev 19220) @@ -690,9 +690,10 @@ RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) endif -LINKER_MAP_RELEASE ?= solaris10u8 +LINKER_MAP_RELEASE-5.10 ?= solaris10u8 +LINKER_MAP_RELEASE ?= $(LINKER_MAP_RELEASE-$(GAROSREL)) -LINKER_MAPS ?= $(foreach MAP,$(LINKER_MAP_RELEASE) $(EXTRA_LINKER_MAPS),-M $(abspath $(GARDIR)/lib/map.$(LINKER_MAP_RELEASE))) +LINKER_MAPS ?= $(foreach MAP,$(LINKER_MAP_RELEASE) $(EXTRA_LINKER_MAPS) $(EXTRA_LINKER_MAPS-$(GAROSREL)),-M $(abspath $(GARDIR)/lib/map.$(LINKER_MAP_RELEASE))) LINKER_DIRECT ?= -B direct LINKER_IGNORE ?= -z ignore This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 17:27:45 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 15:27:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19221] csw/mgar/pkg/rsyslog/trunk Message-ID: Revision: 19221 http://gar.svn.sourceforge.net/gar/?rev=19221&view=rev Author: guillomovitch Date: 2012-09-17 15:27:45 +0000 (Mon, 17 Sep 2012) Log Message: ----------- - add a default configuration file - ensure default configuration file location is /etc/opt/csw/rsyslog.conf - add an init script Modified Paths: -------------- csw/mgar/pkg/rsyslog/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rsyslog/trunk/files/rsyslog.conf csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default csw/mgar/pkg/rsyslog/trunk/files/rsyslog.init Modified: csw/mgar/pkg/rsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsyslog/trunk/Makefile 2012-09-17 14:14:03 UTC (rev 19220) +++ csw/mgar/pkg/rsyslog/trunk/Makefile 2012-09-17 15:27:45 UTC (rev 19221) @@ -10,6 +10,9 @@ MASTER_SITES = http://rsyslog.com/files/download/rsyslog/ DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += rsyslog.init +DISTFILES += rsyslog.default +DISTFILES += rsyslog.conf RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibz1 @@ -20,7 +23,15 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-imsolaris +EXTRA_CPPFLAGS+= -D_PATH_LOGCONF=\\\"$(sysconfdir)/rsyslog.conf\\\" CHECKPKG_OVERRIDES_CSWrsyslog += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/rsyslogd.8 +INITSMF = /etc/opt/csw/init.d/cswrsyslog + +post-install-modulated: + /opt/csw/gnu/install -D -m 644 $(WORKDIR)/rsyslog.conf $(DESTDIR)/etc/opt/csw/rsyslog.conf + /opt/csw/gnu/install -D -m 644 $(WORKDIR)/rsyslog.default $(DESTDIR)/etc/opt/csw/default/rsyslog + /opt/csw/gnu/install -D -m 755 $(WORKDIR)/rsyslog.init $(DESTDIR)/etc/opt/csw/init.d/cswrsyslog + include gar/category.mk Added: csw/mgar/pkg/rsyslog/trunk/files/rsyslog.conf =================================================================== --- csw/mgar/pkg/rsyslog/trunk/files/rsyslog.conf (rev 0) +++ csw/mgar/pkg/rsyslog/trunk/files/rsyslog.conf 2012-09-17 15:27:45 UTC (rev 19221) @@ -0,0 +1,57 @@ +# rsyslog v5 configuration file + +# if you experience problems, check +# http://www.rsyslog.com/troubleshoot for assistance + +$ModLoad immark # provides --MARK-- message capability +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.info;mail.none;authpriv.none;cron.none -/var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* -/var/log/cron + +# Everybody gets emergency messages +*.emerg * + +# Save news errors of level crit and higher in a special file. +uucp,news.crit -/var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + +# Remote Logging (we use TCP for reliable delivery) +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$WorkDirectory /rsyslog/spool # where to place spool files +#$ActionQueueFileName uniqName # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +#*.* @@remote-host:514 + + +# ######### Receiving Messages from Remote Hosts ########## +# TCP Syslog Server: +# provides TCP syslog reception and GSS-API (if compiled to support it) +#$ModLoad imtcp.so # load module +#$InputTCPServerRun 514 # start up TCP listener at port 514 + +# UDP Syslog Server: +#$ModLoad imudp.so # provides UDP syslog reception +#$UDPServerRun 514 # start a UDP syslog server at standard port 514 Added: csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default =================================================================== --- csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default (rev 0) +++ csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default 2012-09-17 15:27:45 UTC (rev 19221) @@ -0,0 +1,2 @@ +# rsyslogd options +OPTIONS="-c 5" Added: csw/mgar/pkg/rsyslog/trunk/files/rsyslog.init =================================================================== --- csw/mgar/pkg/rsyslog/trunk/files/rsyslog.init (rev 0) +++ csw/mgar/pkg/rsyslog/trunk/files/rsyslog.init 2012-09-17 15:27:45 UTC (rev 19221) @@ -0,0 +1,91 @@ +#!/bin/sh +# +# $Id: cswrsyslogd 17679 2012-04-14 18:58:06Z phipsy $ +# +# /etc/opt/csw/init.d/cswrsyslog + +# Check if we're on 10; therefore SMF +if [ -x /usr/sbin/svcadm ]; then + . /lib/svc/share/smf_include.sh +fi + +if [ -f /etc/opt/csw/default/rsyslog ]; then + . /etc/opt/csw/default/rsyslog +fi + +pidfile=/var/run/rsyslogd.pid + +start_rsyslogd() { + /opt/csw/sbin/rsyslogd $SYSLOGD_OPTIONS +} + +reload_rsyslogd() { + if [ -r $pidfile ]; then + kill -HUP `cat $pidfile` + fi +} + +stop_rsyslogd() { + if [ -r $pidfile ]; then + kill $pid `cat $pidfile` + fi +} + +get_current_pid() { + if [ -x /usr/bin/zonename ]; then + zone=`/usr/bin/zonename` + zoneopts="-z $zone" + else + zoneopts="" + fi + pgrep $zoneopts rsyslogd +} + +case "$1" in + start) + printf "Starting rsyslog daemon:" + start_rsyslogd + printf " rsyslogd" + echo "" + ;; + stop) + printf "Stopping rsyslog daemon:" + stop_rsyslogd + printf " rsyslogd" + echo "" + ;; + restart) + printf "Restarting rsyslog daemon:" + stop_rsyslogd + start_rsyslogd + printf " rsyslogd" + echo "" + ;; + reload) + printf "Reloading rsyslog daemon:" + reload_rsyslogd + printf " rsyslogd" + echo "" + ;; + status) + if [ -f $pidfile ]; then + pid=`cat $pidfile` + curpid=`get_current_pid` + if [ "$pid" -eq "$curpid" ]; then + echo "rsyslogd is running" + exit 0 + else + echo "rsyslogd is not running" + exit 1 + fi + else + echo "rsyslogd is not running" + exit 1 + fi + ;; + *) + printf "Usage: %s {start|stop|restart|reload|status}\n" "$0" + exit 1 + ;; +esac +exit 0 Property changes on: csw/mgar/pkg/rsyslog/trunk/files/rsyslog.init ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 17:45:49 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 15:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19222] csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default Message-ID: Revision: 19222 http://gar.svn.sourceforge.net/gar/?rev=19222&view=rev Author: guillomovitch Date: 2012-09-17 15:45:49 +0000 (Mon, 17 Sep 2012) Log Message: ----------- rsyslog/trunk: rename sysconfig options to match other distributions Modified Paths: -------------- csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default Modified: csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default =================================================================== --- csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default 2012-09-17 15:27:45 UTC (rev 19221) +++ csw/mgar/pkg/rsyslog/trunk/files/rsyslog.default 2012-09-17 15:45:49 UTC (rev 19222) @@ -1,2 +1,2 @@ # rsyslogd options -OPTIONS="-c 5" +SYSLOGD_OPTIONS="-c 5" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Mon Sep 17 18:15:14 2012 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Mon, 17 Sep 2012 16:15:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19223] csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Message-ID: Revision: 19223 http://gar.svn.sourceforge.net/gar/?rev=19223&view=rev Author: guillomovitch Date: 2012-09-17 16:15:14 +0000 (Mon, 17 Sep 2012) Log Message: ----------- fusioninventory-agent/trunk: use /var/opt/csw/fusioninventory-agent as local state directory Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 15:45:49 UTC (rev 19222) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2012-09-17 16:15:14 UTC (rev 19223) @@ -42,7 +42,7 @@ RUNTIME_DEP_PKGS += CSWmemconf PATCHFILES += 0001-don-t-install-a-private-memconf-copy.patch -CONFIGURE_ARGS = PREFIX=/opt/csw SYSCONFDIR=/etc/opt/csw/fusioninventory +CONFIGURE_ARGS = PREFIX=/opt/csw SYSCONFDIR=/etc/opt/csw/fusioninventory LOCALSTATEDIR=/var/opt/csw/fusioninventory # skip tests SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Sep 17 20:25:24 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 17 Sep 2012 19:25:24 +0100 Subject: [csw-devel] SF.net SVN: gar:[19218] csw/mgar/gar/v2/lib/python In-Reply-To: References: Message-ID: 2012/9/17 > Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py > =================================================================== > --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-09-17 12:37:40 UTC > (rev 19217) > +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2012-09-17 13:31:31 UTC > (rev 19218) > @@ -1,4 +1,4 @@ > -#!/usr/bin/env python2.6 > +#!/opt/csw/bin/python2.6 > There are also the unit tests. You're supposed to run them before you commit code. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bonivart at users.sourceforge.net Tue Sep 18 01:08:47 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 17 Sep 2012 23:08:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19224] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 19224 http://gar.svn.sourceforge.net/gar/?rev=19224&view=rev Author: bonivart Date: 2012-09-17 23:08:47 +0000 (Mon, 17 Sep 2012) Log Message: ----------- clamav/trunk: update to 0.97.6 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 2012-09-17 16:15:14 UTC (rev 19223) +++ csw/mgar/pkg/clamav/trunk/Makefile 2012-09-17 23:08:47 UTC (rev 19224) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.97.5 +VERSION = 0.97.6 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest CATEGORIES = apps @@ -26,10 +26,7 @@ SPKG_DESC_CSWclamav = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 RUNTIME_DEP_PKGS_CSWclamav += CSWlibz1 -RUNTIME_DEP_PKGS_CSWclamav += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWclamav += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWclamav += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWclamav += CSWlibiconv2 PACKAGES += CSWlibclam6 CATALOGNAME_CSWlibclam6 = libclam6 @@ -51,7 +48,8 @@ PATCHFILES += CSWclamav.clamd.conf.p PATCHFILES += CSWclamav.clamav-milter.conf.p PATCHFILES += CSWclamav.optparser.c.p -PATCHFILES += CSWclamav.scanners.c.p +# Not needed with 0.97.6 +#PATCHFILES += CSWclamav.scanners.c.p # Must have 64-bit libmilter for this to work #BUILD64 = 1 @@ -121,9 +119,9 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html # We don't split to three separate packages -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.14|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.14|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.14|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.15|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.15|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.15|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 include gar/category.mk Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2012-09-17 16:15:14 UTC (rev 19223) +++ csw/mgar/pkg/clamav/trunk/checksums 2012-09-17 23:08:47 UTC (rev 19224) @@ -1 +1 @@ -4d4b93243a5add0216acc4f24f43a895 clamav-0.97.5.tar.gz +1dbdd803b37c0d9d222e4316049f46a2 clamav-0.97.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 18 09:32:08 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 18 Sep 2012 07:32:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19225] csw/mgar/pkg/samba/trunk Message-ID: Revision: 19225 http://gar.svn.sourceforge.net/gar/?rev=19225&view=rev Author: janholzh Date: 2012-09-18 07:32:08 +0000 (Tue, 18 Sep 2012) Log Message: ----------- samba/trunk: revert to 3.6.7 because .8 does not build, add few fixes to build against older libc, remove flags now in gar Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-09-17 23:08:47 UTC (rev 19224) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-09-18 07:32:08 UTC (rev 19225) @@ -4,7 +4,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.8 +VERSION = 3.6.7 CATEGORIES = apps GARTYPE = v2 @@ -306,7 +306,7 @@ CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount CONFIGURE_ARGS += --with-dnsupdate=no -# CONFIGURE_ARGS += --with-krb5=$(prefix) +CONFIGURE_ARGS += --with-krb5=$(prefix) CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR) @@ -319,10 +319,13 @@ CONFIGURE_ARGS-64 += --disable-cups CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -# These are in a too recent libc SUNW_1.22.6 requiring Solaris10u9 -CONFIGURE_ARGS += ac_cv_func_utimensat=no -CONFIGURE_ARGS += ac_cv_func_futimens=no +# 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 + + BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile TEST_SCRIPTS = $(WORKSRC)/source3/Makefile @@ -331,7 +334,6 @@ # Tests need root SKIPTEST ?= 1 -EXTRA_LINKER_FLAGS = -z ignore -M "$(abspath $(WORKDIR)/map.samba)" INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2012-09-17 23:08:47 UTC (rev 19224) +++ csw/mgar/pkg/samba/trunk/checksums 2012-09-18 07:32:08 UTC (rev 19225) @@ -1 +1 @@ -fbb245863eeef2fffe172df779a217be samba-3.6.8.tar.gz +b23be56c15dd52f64eb7ba54c0ea1ed5 samba-3.6.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 18 10:28:08 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 18 Sep 2012 08:28:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19226] csw/mgar/pkg/samba/trunk/Makefile Message-ID: Revision: 19226 http://gar.svn.sourceforge.net/gar/?rev=19226&view=rev Author: janholzh Date: 2012-09-18 08:28:08 +0000 (Tue, 18 Sep 2012) Log Message: ----------- samba/trunk: fix krb5-conf Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-09-18 07:32:08 UTC (rev 19225) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-09-18 08:28:08 UTC (rev 19226) @@ -306,7 +306,8 @@ CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount CONFIGURE_ARGS += --with-dnsupdate=no -CONFIGURE_ARGS += --with-krb5=$(prefix) +# Do not set krb5 this is handeled in gar. Otherwise 64bit will not build +#CONFIGURE_ARGS += --with-krb5=$(prefix) CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 18 10:58:03 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 18 Sep 2012 08:58:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19227] csw/mgar/pkg/samba/trunk/Makefile Message-ID: Revision: 19227 http://gar.svn.sourceforge.net/gar/?rev=19227&view=rev Author: janholzh Date: 2012-09-18 08:58:03 +0000 (Tue, 18 Sep 2012) Log Message: ----------- samba/trunk: remove unused deps Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-09-18 08:28:08 UTC (rev 19226) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-09-18 08:58:03 UTC (rev 19227) @@ -77,7 +77,6 @@ RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibkrb5-3 @@ -114,7 +113,6 @@ PKGFILES_CSWlibsmbclient0 += $(mandir)/man7/libsmbclient\.7 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibldap2-4-2 @@ -139,19 +137,16 @@ PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWlibtdb1 += CSWlibintl8 PACKAGES += CSWlibwbclient0 PKGFILES_CSWlibwbclient0 += $(call pkgfiles_lib,libwbclient.so.0) SPKG_DESC_CSWlibwbclient0 += Samba client library, libwbclient.so.0 -RUNTIME_DEP_PKGS_CSWlibwbclient0 += CSWlibintl8 PACKAGES += CSWlibnetapi0 PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0) SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibk5crypto3 @@ -165,7 +160,6 @@ PACKAGES += CSWlibsmbsharemodes0 PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0 -RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibtdb1 PACKAGES += CSWlibtdb1 @@ -193,7 +187,6 @@ RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibkrb5-3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Sep 18 11:57:43 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 18 Sep 2012 09:57:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19228] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 19228 http://gar.svn.sourceforge.net/gar/?rev=19228&view=rev Author: bonivart Date: 2012-09-18 09:57:43 +0000 (Tue, 18 Sep 2012) Log Message: ----------- clamav/trunk: added missing db dir Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2012-09-18 08:58:03 UTC (rev 19227) +++ csw/mgar/pkg/clamav/trunk/Makefile 2012-09-18 09:57:43 UTC (rev 19228) @@ -151,5 +151,6 @@ @ginstall -d $(DOCDEST)/html @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html @chmod 600 $(DESTDIR)$(sysconfdir)/freshclam.conf - rm -f $(DESTDIR)/var/opt/csw/$(NAME)/db/* +# rm -f $(DESTDIR)/var/opt/csw/$(NAME)/db/* + @ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/db @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Sep 18 14:26:37 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 18 Sep 2012 12:26:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19229] csw/mgar/pkg/libpng/branches/libpng3 Message-ID: Revision: 19229 http://gar.svn.sourceforge.net/gar/?rev=19229&view=rev Author: bonivart Date: 2012-09-18 12:26:36 +0000 (Tue, 18 Sep 2012) Log Message: ----------- libpng/branches/libpng3: update to 1.2.50 Modified Paths: -------------- csw/mgar/pkg/libpng/branches/libpng3/Makefile csw/mgar/pkg/libpng/branches/libpng3/checksums Modified: csw/mgar/pkg/libpng/branches/libpng3/Makefile =================================================================== --- csw/mgar/pkg/libpng/branches/libpng3/Makefile 2012-09-18 09:57:43 UTC (rev 19228) +++ csw/mgar/pkg/libpng/branches/libpng3/Makefile 2012-09-18 12:26:36 UTC (rev 19229) @@ -10,11 +10,13 @@ # pentium_pro NAME = libpng -VERSION = 1.2.49 +VERSION = 1.2.50 CATEGORIES = lib + DESCRIPTION = The official library for Portable Network Graphics format (PNG) define BLURB endef + VENDOR_URL = http://www.libpng.org/pub/png/libpng.html MASTER_SITES = $(SF_MIRROR) MASTER_SITES += ftp://ftp.simplesystems.org/pub/libpng/png/src/ Modified: csw/mgar/pkg/libpng/branches/libpng3/checksums =================================================================== --- csw/mgar/pkg/libpng/branches/libpng3/checksums 2012-09-18 09:57:43 UTC (rev 19228) +++ csw/mgar/pkg/libpng/branches/libpng3/checksums 2012-09-18 12:26:36 UTC (rev 19229) @@ -1 +1 @@ -39a35257cd888d29f1d000c2ffcc79eb libpng-1.2.49.tar.gz +fedd8c66d106c28f8d527f9397c265a2 libpng-1.2.50.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jamessthompson at users.sourceforge.net Tue Sep 18 15:07:55 2012 From: jamessthompson at users.sourceforge.net (jamessthompson at users.sourceforge.net) Date: Tue, 18 Sep 2012 13:07:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19230] csw/mgar/pkg Message-ID: Revision: 19230 http://gar.svn.sourceforge.net/gar/?rev=19230&view=rev Author: jamessthompson Date: 2012-09-18 13:07:55 +0000 (Tue, 18 Sep 2012) Log Message: ----------- initial check-in of a GLPI build config Added Paths: ----------- csw/mgar/pkg/glpi/ csw/mgar/pkg/glpi/Makefile csw/mgar/pkg/glpi/branches/ csw/mgar/pkg/glpi/tags/ csw/mgar/pkg/glpi/trunk/ csw/mgar/pkg/glpi/trunk/Makefile csw/mgar/pkg/glpi/trunk/checksums csw/mgar/pkg/glpi/trunk/files/ csw/mgar/pkg/glpi/trunk/files/README.CSW Added: csw/mgar/pkg/glpi/Makefile =================================================================== --- csw/mgar/pkg/glpi/Makefile (rev 0) +++ csw/mgar/pkg/glpi/Makefile 2012-09-18 13:07:55 UTC (rev 19230) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/glpi/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/glpi/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/glpi/trunk/Makefile 2012-09-18 13:07:55 UTC (rev 19230) @@ -0,0 +1,67 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = glpi +VERSION = 0.83.4 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Inventory-Resource system for computer equipment +define BLURB +GLPI is the Information Resource-Manager with an additional Administration- Inte +rface. You can use it to build up a database with an inventory for your company +(computer, software, printers...). It has enhanced functions to make the daily l +ife for the administrators easier, like a job-tracking-system with mail-notifica +tion and methods to build a database with basic information about your network-t +opology. +endef + +VENDOR_URL = http://www.glpi-project.org/ + +MASTER_SITES = https://forge.indepnet.net/attachments/download/1253/ +DISTFILES = $(DISTNAME)-$(VERSION).tar.gz +DISTFILES += README.CSW +DISTNAME=glpi +LICENSE=COPYING.txt + +NOGITPATCH = 1 + +POSTMSG = /opt/csw/share/doc/glpi/README.CSW + +RUNTIME_DEP_PKGS_CSWglpi += CSWap2-modphp5 +RUNTIME_DEP_PKGS_CSWglpi += CSWapache2 +RUNTIME_DEP_PKGS_CSWglpi += CSWphp5-mysql +RUNTIME_DEP_PKGS_CSWglpi += CSWphp5-json + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +REINPLACE_USRSHARE += /config/based_config.php + +# checkpkg cannot track this +CHECKPKG_OVERRIDES_CSWglpi += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWglpi += surplus-dependency|CSWap2-modphp5 +CHECKPKG_OVERRIDES_CSWglpi += surplus-dependency|CSWphp5-mysql +CHECKPKG_OVERRIDES_CSWglpi += surplus-dependency|CSWphp5-json + + +ARCHALL = 1 +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 + +#PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc solaris10-i386 solaris10-sparc solaris11-i386 solaris11-sparc + + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(NAME) (custom)" + @rm -rf $(DESTDIR)$(prefix)/share/www/glpi + @ginstall -d $(DESTDIR)$(prefix)/share/www/glpi + @cp -R $(WORKSRC) $(DESTDIR)$(prefix)/share/www + @ginstall -d $(DESTDIR)$(docdir)/glpi + @cp $(WORKSRC)/COPYING.txt $(DESTDIR)$(docdir)/glpi/license + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/glpi/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/glpi/trunk/checksums =================================================================== --- csw/mgar/pkg/glpi/trunk/checksums (rev 0) +++ csw/mgar/pkg/glpi/trunk/checksums 2012-09-18 13:07:55 UTC (rev 19230) @@ -0,0 +1,2 @@ +33d96058f7b52794fe8dd34fa4f37a80 README.CSW +1248ab829b71be67453979ac40578a18 glpi-0.83.4.tar.gz Added: csw/mgar/pkg/glpi/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/glpi/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/glpi/trunk/files/README.CSW 2012-09-18 13:07:55 UTC (rev 19230) @@ -0,0 +1,6 @@ +Post installation you will find GLPI installed into /opt/csw/share/www/glpi + +To complete installation you will need to follow the setup instructions +in the installation guide located at http://www.glpi-project.org/ starting +with the section on setting the permissions on the files and config +directories This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Sep 18 15:30:40 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 18 Sep 2012 13:30:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[19231] csw/mgar/pkg/mod_wsgi/trunk/Makefile Message-ID: Revision: 19231 http://gar.svn.sourceforge.net/gar/?rev=19231&view=rev Author: wilbury Date: 2012-09-18 13:30:39 +0000 (Tue, 18 Sep 2012) Log Message: ----------- mod_wsgi/trunk: Version bump and build against python 2.6.8 Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/Makefile Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2012-09-18 13:07:55 UTC (rev 19230) +++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2012-09-18 13:30:39 UTC (rev 19231) @@ -1,7 +1,7 @@ # $Id$ NAME = mod_wsgi -VERSION = 3.3 +VERSION = 3.4 CATEGORIES = lib GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Sep 18 15:32:14 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 18 Sep 2012 13:32:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19232] csw/mgar/pkg/mod_wsgi/trunk/checksums Message-ID: Revision: 19232 http://gar.svn.sourceforge.net/gar/?rev=19232&view=rev Author: wilbury Date: 2012-09-18 13:32:14 +0000 (Tue, 18 Sep 2012) Log Message: ----------- mod_wsgi/trunk: Correct checksums file Modified Paths: -------------- csw/mgar/pkg/mod_wsgi/trunk/checksums Modified: csw/mgar/pkg/mod_wsgi/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_wsgi/trunk/checksums 2012-09-18 13:30:39 UTC (rev 19231) +++ csw/mgar/pkg/mod_wsgi/trunk/checksums 2012-09-18 13:32:14 UTC (rev 19232) @@ -1 +1 @@ -6172bb2bbabcd0c25867c2bc06f99dbb mod_wsgi-3.3.tar.gz +f42d69190ea0c337ef259cbe8d94d985 mod_wsgi-3.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Sep 18 20:59:44 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 18 Sep 2012 18:59:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19233] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 19233 http://gar.svn.sourceforge.net/gar/?rev=19233&view=rev Author: bonivart Date: 2012-09-18 18:59:44 +0000 (Tue, 18 Sep 2012) Log Message: ----------- clamav/trunk: enable llvm, build only on solaris 10 Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2012-09-18 13:32:14 UTC (rev 19232) +++ csw/mgar/pkg/clamav/trunk/Makefile 2012-09-18 18:59:44 UTC (rev 19233) @@ -36,6 +36,7 @@ RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibclam6 += CSWlibstdc++6 INCOMPATIBLE_PKGS_CSWlibclam6 = CSWlibclamav PACKAGES += CSWlibclam6-dev @@ -54,9 +55,9 @@ # Must have 64-bit libmilter for this to work #BUILD64 = 1 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GNU @@ -74,7 +75,7 @@ CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(NAME) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) CONFIGURE_ARGS += --enable-milter -CONFIGURE_ARGS += --disable-llvm +#CONFIGURE_ARGS += --disable-llvm #CONFIGURE_ARGS += --enable-check CONFIGURE_ARGS += --enable-clamdtop @@ -117,6 +118,7 @@ CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node56.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node24.html CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html +CHECKPKG_OVERRIDES_CSWlibclam6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libclamav.so.6.1.15 # We don't split to three separate packages CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.15|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Sep 19 08:23:14 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 19 Sep 2012 08:23:14 +0200 Subject: [csw-devel] [csw-maintainers] Checkpkg test for direct binding In-Reply-To: References: Message-ID: 2012/9/6 Yann Rouillard > --- dependency_checks.py (revision 19130) > +++ dependency_checks.py (working copy) > @@ -39,6 +39,24 @@ > > PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) > > [...] > + > +ALLOWED_VERSION_DEPENDENCIES = { "libc.so.1": [ 'SYSVABI_1.3', > 'SUNWprivate_1.1', 'SUNW_1.22.6', 'SUNW_1.22.5', > If you can, limit line width to 80 chars. > + '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' ] } > + > + > > @@ -147,6 +165,57 @@ > error_mgr, > pkgname, messenger) > orphan_sonames.extend(orphan_sonames_tmp) > + > + > + ldd_info = pkg_data['ldd_info'][binary_info["path"]] > + for ldd_response in ldd_info: > + if ldd_response['state'] == 'soname-unused' and > ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES: > + messenger.Message( > + "Binary %s links to library %s but doesn't seem to use any of > its symbols. " > + "It usually happens because superfluous libraries were added to > the linker options, " > + "either because of the configure script itself or because of the > \"pkg-config --libs\"" > + " output of one the dependency." > + % ("/" + binary_info["path"], ldd_response['soname'])) > + error_mgr.ReportError( > + pkgname, "soname-unused", > + "%s is needed by %s but never used" % > (ldd_response['soname'], "/" + binary_info["path"])) > + > + # Even when direct binding is enabled, some symbols might not be > + # directly bound because the library explicitely requested the symbol > + # not to be drectly bound to. > + # For example, libc.so.1 does it for symbol sigaction, free, malloc > and realloc > + # So we consider that direct binding is enabled if at least one > symbol is directly > + # bound to because that definitely means that -B direct or -z direct > was used. > + directly_binded = set() > 'To bind' is an irregular verb, past tense for bind is bound. http://forum.wordreference.com/showthread.php?t=600594 + for syminfo in > pkg_data["binaries_elf_info"][binary_info["path"]]['symbol table']: > + if syminfo['external'] and syminfo['flags'] and 'D' in > syminfo['flags'] and 'B' in syminfo['flags']: > + directly_binded.add(syminfo['soname']) > + not_directly_binded = > directly_binded.symmetric_difference(binary_info["needed sonames"]) > + > + if not_directly_binded: > + messenger.Message( > + "No symbol of binary %s is directly binded against the following > libraries: %s. " > + "Please make sure the binaries are compiled using the > \"-Bdirect\" linker option." > + % ("/" + binary_info["path"], ", ".join(not_directly_binded))) > + for soname in not_directly_binded: > + error_mgr.ReportError( > + pkgname, "no-direct-binding", > + "%s is not directly binded to soname %s" % ("/" + > binary_info["path"], soname)) > + > + > + for version_dep in > pkg_data["binaries_elf_info"][binary_info["path"]]['version needed']: > + if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and > + not version_dep['version'] in > ALLOWED_VERSION_DEPENDENCIES[version_dep['soname']]): > + messenger.Message( > + "Binary %s requires interface version %s in library %s which is > only available " > + "in recent Solaris releases." > + % ("/" + binary_info["path"], version_dep['version'], > version_dep['soname'])) > + error_mgr.ReportError( > + pkgname, "forbidden-version-interface-dependencies", > + "%s requires forbidden interface version %s in library %s" > + % ("/" + binary_info["path"], version_dep['version'], > version_dep['soname'])) > + > + > orphan_sonames = set(orphan_sonames) > for soname, binary_path in orphan_sonames: > if soname not in ALLOWED_ORPHAN_SONAMES: > > > --- inspective_package.py (revision 19130) > +++ inspective_package.py (working copy) > @@ -229,17 +229,132 @@ > > return defined_symbols > > + > + def GetBinaryElfInfo(self): > + """Returns various informations symbol and version present in elf > header > + > + To do this we parse output lines from elfdump -syv, it's the > + only command that will give us all informations we need on symbols > and versions. > + We will analyse 3 sections: > + - version section: contains soname needed, version interface > required for each soname, > + and version definition > + - symbol table section: contains list of symbol and soname/version > interface providing it > + (the latter is an index in the version > section) > + - syminfo section: contains special linking flags for each symbol > + """ > + binaries = self.ListBinaries() > + binaries_elf_info = {} > + > + for binary in binaries: > + binary_abspath = os.path.join(self.directory, "root", binary) > + # elfdump is the only tool that give us all informations > + args = ["/usr/ccs/bin/elfdump", "-svy", binary_abspath] > + elfdump_proc = subprocess.Popen( > + args, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE) > + stdout, stderr = elfdump_proc.communicate() > + retcode = elfdump_proc.wait() > + if retcode or stderr: > + logging.error("%s returned one or more errors: %s", args, > stderr.splitlines()[0]) > + continue > + elfdump_out = stdout.splitlines() > It's weird that we don't have a function to wrap shelling out. Okay, we can refactor it another time. > + > + symbols = {} > + binary_info = { 'version definition': [], > + 'version needed': [], > + 'symbol table': [] } > + # we will merge syminfo and symbol table information in one list > + # so the syminfo list is the same as the symbol table one > + binary_info['syminfo'] = binary_info['symbol table'] > + > + # The list of fields we want to retrieve in the elfdump output by > section > + # if the field is a tuple, it means we will map the original field > name > + # to another name in the final data structure > + elf_fields = { 'version defined': [ 'version', 'dependency' ], > + 'version needed': [ ('file', 'soname'), 'version' ], > + 'symbol table': [ ('name', 'symbol'), ('ver', 'version'), > + 'bind', ('shndx', 'external') ], > + 'syminfo': [ ('library', 'soname'), 'symbol', 'flags' ] } > + > + cur_section = None > + for line in elfdump_out: > + > + elfdump_data, cur_section = self._ParseElfdumpLine(line, > cur_section) > + > + # header or blank line contains no information > + if not elfdump_data: > Or, if you want to distinguish between an empty data structure (empty dict) and None, you can write: if elfdump_data is None: ... It might not matter in this case, but it's generally a good thing to distinguish between None and False. > + continue > + > + elf_info = {} > + for field in elf_fields[cur_section]: > + if type(field) == tuple: > + elf_info[field[1]] = elfdump_data[field[0]] > + else: > + elf_info[field] = elfdump_data[field] > This bit looks weird. Is there something wrong with the data? > + > + # we merge symbol table and syminfo informations so we have to > check > + # if the symbol has not already been added > + if cur_section in ('symbol table', 'syminfo'): > + if elf_info['symbol'] in symbols: > + symbols[elf_info['symbol']].update(elf_info) > + continue > Is the indentation good? I see "symbols" and "continue" at the same level. + else: > + symbols[elf_info['symbol']] = elf_info > + > + binary_info[cur_section].append(elf_info) > + > + # elfdump doesn't repeat the name of the soname in the version > section > + # if it's the same on two contiguous line, so we have to make sure > + # the information is present in each entry > + for i, version in enumerate(binary_info['version needed'][1:]): > + if not version['soname']: > + version['soname'] = binary_info['version needed'][i]['soname'] > + > + # if it exists, the first "version definition" entry is the base > soname > + # we don't need this information > + if binary_info['version definition']: > + binary_info['version definition'].pop(0) > + > + # To not rely of the section order output of elfdump, we resolve > symbol version > + # informations here after having parsed all elfdump output > + nb_versions_definition = len(binary_info['version definition']) > + for sym_info in binary_info['symbol table']: > + version_index = int(sym_info['version']) - 2 > + if version_index > 1: > + if version_index < nb_versions_definition: > + version = binary_info['version definition'][version_index] > + else: > + version = binary_info['version needed'][version_index - > nb_versions_definition] > + sym_info['version'] = version['version'] > + sym_info['soname'] = version['soname'] > + else: > + sym_info['version'] = None > + > + if sym_info['external'] == 'UNDEF': > + sym_info['external'] = True > + else: > + sym_info['external'] = False > + > + # we make sure the field are present even if the syminfo section > is not > + sym_info.setdefault('soname') > + sym_info.setdefault('flags') > + > + binaries_elf_info[binary] = binary_info > + > + return binaries_elf_info > There's a lot of if-else logic in this section of code. Do you have unit tests to make sure it does what it's supposed to? It would be helpful to see the elfdump outputs and corresponding parsed data structures. + > + > > @@ -263,7 +390,38 @@ > sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } > return sym > > - def _ParseLddDashRline(self, line): > + > + def _ParseElfdumpLine(self, line, section = None): > + > + headers_re = (r'(?P
Version Needed|Version Definition|Symbol > Table|Syminfo) Section:\s+(?:\.SUNW_version|\.dynsym|\.SUNW_syminfo)\s*$|' > + '\s*(?:index\s+)?version\s+dependency\s*$|' > + '\s*(?:index\s+)?file\s+version\s*$|' > + > '\s*index\s*value\s+size\s+type\s+bind\s+oth\s+ver\s+shndx\s+name\s*$|' > + '\s*index\s+flags\s+bound to\s+symbol\s*$|' > + '\s*$') > For these style regular expressions, it's a good idea to use the verbose regex syntax, as described here: http://www.diveintopython.net/regular_expressions/verbose.html It allows you to split the regex into parts and provide inline comments where appropriate. > + > + re_by_section = { 'version definition': > (r'\s*(?:\[(?P\d+)\]\s+)?(?P.*\S)\s+(?P\S+)?\s*$'), > + 'version needed': > (r'\s*(?:\[(?P\d+)\]\s+)?(?:(?P\S+)\s+(?!\[ (?:INFO|WEAK) > \]))?(?P\S+)(?:\s+\[ (?:INFO|WEAK) \])?\s*$'), > + 'symbol table': > (r'\s*\[\d+\]\s+0x[0-9a-f]+\s+0x[0-9a-f]+\s+\S+\s+(?P\S+)\s+\S+\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)?\s*$'), > + 'syminfo': > (r'\s*\[\d+\]\s+(?P[ABCDFILNPS]+)\s+(?:(?:\[\d+\]\s+(?P.*\S)|)\s+)?(?P.*\S)\s*') > } > The same comment about verbose regex syntax. > + > + if section: > + m = re.match(re_by_section[section], line) > + if m: > + elfdump_data = m.groupdict() > + return elfdump_data, section > + > + m = re.match(headers_re, line) > + if not m: > + raise package.StdoutSyntaxError("Could not parse %s" % (repr(line))) > I like it that you split the matching into separate sections instead of cramming everything into one regex. > + > + if m.lastindex: > + section = m.group('section').lower() > + > + return None, section > One overall comment is that some functions are really big. This means that they are messy and hard to test. You could split out some of the operations into separate functions and write simple unit tests for them. This way the whole code will be more manageable. It'll also allow you to give operations meaningful names. Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From janholzh at users.sourceforge.net Wed Sep 19 10:07:33 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 19 Sep 2012 08:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19234] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 19234 http://gar.svn.sourceforge.net/gar/?rev=19234&view=rev Author: janholzh Date: 2012-09-19 08:07:32 +0000 (Wed, 19 Sep 2012) Log Message: ----------- sudo/trunk: update to Version 1.8.6p1 remove stuff now in gar Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sudo/trunk/files/map.sudo Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-09-19 08:07:32 UTC (rev 19234) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.6p1 +VERSION = 1.8.6p3 CATEGORIES = utils GARTYPE = v2 @@ -20,7 +20,6 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += sudo.conf.CSW -DISTFILES += map.sudo LICENSE = doc/LICENSE @@ -101,12 +100,6 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_LDAP-$(LDAP)) -EXTRA_LINKER_FLAGS = -Bdirect -z ignore - -# Add Mapfile for Solaris10 -EXTRA_LINKER_FLAGS_5.10 = -M "$(abspath $(WORKDIR)/map.sudo)" -EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GAROSREL)) - FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir) PROTOTYPE_MODIFIERS += sudo Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/pkg/sudo/trunk/checksums 2012-09-19 08:07:32 UTC (rev 19234) @@ -1 +1 @@ -036314b442491474f66e69289cc3ef55 sudo-1.8.6p1.tar.gz +a7b5c39a904721956eccddd30689250f sudo-1.8.6p3.tar.gz Deleted: csw/mgar/pkg/sudo/trunk/files/map.sudo =================================================================== --- csw/mgar/pkg/sudo/trunk/files/map.sudo 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/pkg/sudo/trunk/files/map.sudo 2012-09-19 08:07:32 UTC (rev 19234) @@ -1,2 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jamessthompson at users.sourceforge.net Wed Sep 19 17:18:05 2012 From: jamessthompson at users.sourceforge.net (jamessthompson at users.sourceforge.net) Date: Wed, 19 Sep 2012 15:18:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19235] csw/mgar/pkg/glpi/trunk/Makefile Message-ID: Revision: 19235 http://gar.svn.sourceforge.net/gar/?rev=19235&view=rev Author: jamessthompson Date: 2012-09-19 15:18:05 +0000 (Wed, 19 Sep 2012) Log Message: ----------- removed unneeded lines Modified Paths: -------------- csw/mgar/pkg/glpi/trunk/Makefile Modified: csw/mgar/pkg/glpi/trunk/Makefile =================================================================== --- csw/mgar/pkg/glpi/trunk/Makefile 2012-09-19 08:07:32 UTC (rev 19234) +++ csw/mgar/pkg/glpi/trunk/Makefile 2012-09-19 15:18:05 UTC (rev 19235) @@ -48,13 +48,7 @@ ARCHALL = 1 -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 -#PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc solaris10-i386 solaris10-sparc solaris11-i386 solaris11-sparc - - include gar/category.mk install-custom: 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 19 22:06:11 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 20:06:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19236] csw/mgar/gar Message-ID: Revision: 19236 http://gar.svn.sourceforge.net/gar/?rev=19236&view=rev Author: chninkel Date: 2012-09-19 20:06:10 +0000 (Wed, 19 Sep 2012) Log Message: ----------- yann's branch Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py csw/mgar/gar/v2-yann/lib/python/package.py csw/mgar/gar/v2-yann/lib/python/package_checks_test.py csw/mgar/gar/v2-yann/lib/python/package_stats.py csw/mgar/gar/v2-yann/lib/python/package_stats_test.py csw/mgar/gar/v2-yann/lib/python/testdata/apr_util_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/libnet_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/mercurial_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/neon_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py Added Paths: ----------- csw/mgar/gar/v2-yann/ csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py Modified: csw/mgar/gar/v2-yann/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -39,6 +39,24 @@ PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) +BASE_SOLARIS_LIBRARIES = ( + "libsocket.so.1", "libnsl.so.1", "libdl.so.1", "librt.so.1", "libresolv.so.2", "libpthread.so.1", + # linked by default with C++, see "Default C++ Libraries" in Solaris Studio C++ User'sGuide + "libCstd.so.1", "libCrun.so.1", "libm.so.1", "libm.so.2", "libw.so.1", "libcx.so.1", "libc.so.1", "libC.so.3", "libC.so.5" +) + +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' ] } + + def ProcessSoname( ldd_emulator, soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger, @@ -147,6 +165,57 @@ error_mgr, pkgname, messenger) orphan_sonames.extend(orphan_sonames_tmp) + + + ldd_info = pkg_data['ldd_info'][binary_info["path"]] + for ldd_response in ldd_info: + if ldd_response['state'] == 'soname-unused' and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES: + messenger.Message( + "Binary %s links to library %s but doesn't seem to use any of its symbols. " + "It usually happens because superfluous libraries were added to the linker options, " + "either because of the configure script itself or because of the \"pkg-config --libs\"" + " output of one the dependency." + % ("/" + binary_info["path"], ldd_response['soname'])) + error_mgr.ReportError( + pkgname, "soname-unused", + "%s is needed by %s but never used" % (ldd_response['soname'], "/" + binary_info["path"])) + + # Even when direct binding is enabled, some symbols might not be + # directly bound because the library explicitely requested the symbol + # not to be drectly bound to. + # For example, libc.so.1 does it for symbol sigaction, free, malloc and realloc + # So we consider that direct binding is enabled if at least one symbol is directly + # bound to because that definitely means that -B direct or -z direct was used. + directly_binded = set() + for syminfo in pkg_data["binaries_elf_info"][binary_info["path"]]['symbol table']: + if syminfo['external'] and syminfo['flags'] and 'D' in syminfo['flags'] and 'B' in syminfo['flags']: + directly_binded.add(syminfo['soname']) + not_directly_binded = directly_binded.symmetric_difference(binary_info["needed sonames"]) + + if not_directly_binded: + messenger.Message( + "No symbol of binary %s is directly binded against the following libraries: %s. " + "Please make sure the binaries are compiled using the \"-Bdirect\" linker option." + % ("/" + binary_info["path"], ", ".join(not_directly_binded))) + for soname in not_directly_binded: + error_mgr.ReportError( + pkgname, "no-direct-binding", + "%s is not directly binded to soname %s" % ("/" + binary_info["path"], soname)) + + + for version_dep in pkg_data["binaries_elf_info"][binary_info["path"]]['version needed']: + if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and + not version_dep['version'] in ALLOWED_VERSION_DEPENDENCIES[version_dep['soname']]): + messenger.Message( + "Binary %s requires interface version %s in library %s which is only available " + "in recent Solaris releases." + % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) + error_mgr.ReportError( + pkgname, "forbidden-version-interface-dependencies", + "%s requires forbidden interface version %s in library %s" + % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) + + orphan_sonames = set(orphan_sonames) for soname, binary_path in orphan_sonames: if soname not in ALLOWED_ORPHAN_SONAMES: Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -229,17 +229,134 @@ return defined_symbols + + def GetBinaryElfInfo(self): + """Returns various informations symbol and version present in elf header + + To do this we parse output lines from elfdump -syv, it's the + only command that will give us all informations we need on symbols and versions. + We will analyse 3 sections: + - version section: contains soname needed, version interface required for each soname, + and version definition + - symbol table section: contains list of symbol and soname/version interface providing it + (the latter is an index in the version section) + - syminfo section: contains special linking flags for each symbol + """ + binaries = self.ListBinaries() + binaries_elf_info = {} + + for binary in binaries: + binary_abspath = os.path.join(self.directory, "root", binary) + # elfdump is the only tool that give us all informations + args = ["/usr/ccs/bin/elfdump", "-svy", binary_abspath] + elfdump_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = elfdump_proc.communicate() + retcode = elfdump_proc.wait() + if retcode or stderr: + logging.error("%s returned one or more errors: %s", args, stderr.splitlines()[0]) + continue + elfdump_out = stdout.splitlines() + + symbols = {} + binary_info = { 'version definition': [], + 'version needed': [], + 'symbol table': [] } + # we will merge syminfo and symbol table information in one list + # so the syminfo list is the same as the symbol table one + binary_info['syminfo'] = binary_info['symbol table'] + + # The list of fields we want to retrieve in the elfdump output by section + # if the field is a tuple, it means we will map the original field name + # to another name in the final data structure + elf_fields = { 'version definition': [ 'version', 'dependency' ], + 'version needed': [ ('file', 'soname'), 'version' ], + 'symbol table': [ ('name', 'symbol'), ('ver', 'version'), + 'bind', ('shndx', 'external') ], + 'syminfo': [ ('library', 'soname'), 'symbol', 'flags' ] } + + cur_section = None + for line in elfdump_out: + + elfdump_data, cur_section = self._ParseElfdumpLine(line, cur_section) + + # header or blank line contains no information + if not elfdump_data: + continue + + elf_info = {} + for field in elf_fields[cur_section]: + if type(field) == tuple: + elf_info[field[1]] = elfdump_data[field[0]] + else: + elf_info[field] = elfdump_data[field] + + # we merge symbol table and syminfo informations so we have to check + # if the symbol has not already been added + if cur_section in ('symbol table', 'syminfo'): + if not elf_info['symbol']: + continue + if elf_info['symbol'] in symbols: + symbols[elf_info['symbol']].update(elf_info) + continue + else: + symbols[elf_info['symbol']] = elf_info + + binary_info[cur_section].append(elf_info) + + # elfdump doesn't repeat the name of the soname in the version section + # if it's the same on two contiguous line, so we have to make sure + # the information is present in each entry + for i, version in enumerate(binary_info['version needed'][1:]): + if not version['soname']: + version['soname'] = binary_info['version needed'][i]['soname'] + + # if it exists, the first "version definition" entry is the base soname + # we don't need this information + if binary_info['version definition']: + binary_info['version definition'].pop(0) + + # To not rely of the section order output of elfdump, we resolve symbol version + # informations here after having parsed all elfdump output + nb_versions_definition = len(binary_info['version definition']) + for sym_info in binary_info['symbol table']: + version_index = int(sym_info['version']) - 2 + if version_index > 1: + if version_index < nb_versions_definition: + version = binary_info['version definition'][version_index] + else: + version = binary_info['version needed'][version_index - nb_versions_definition] + sym_info['version'] = version['version'] + sym_info['soname'] = version['soname'] + else: + sym_info['version'] = None + + if sym_info['external'] == 'UNDEF': + sym_info['external'] = True + else: + sym_info['external'] = False + + # we make sure the field are present even if the syminfo section is not + sym_info.setdefault('soname') + sym_info.setdefault('flags') + + binaries_elf_info[binary] = binary_info + + return binaries_elf_info + + def GetLddMinusRlines(self): """Returns ldd -r output.""" - dir_pkg = self.GetInspectivePkg() - binaries = dir_pkg.ListBinaries() + binaries = self.ListBinaries() ldd_output = {} for binary in binaries: - binary_abspath = os.path.join(dir_pkg.directory, "root", binary) + binary_abspath = os.path.join(self.directory, "root", binary) # this could be potentially moved into the DirectoryFormatPackage class. # ldd needs the binary to be executable os.chmod(binary_abspath, 0755) - args = ["ldd", "-r", binary_abspath] + args = ["ldd", "-Ur", binary_abspath] ldd_proc = subprocess.Popen( args, stdout=subprocess.PIPE, @@ -247,10 +364,22 @@ stdout, stderr = ldd_proc.communicate() retcode = ldd_proc.wait() if retcode: - logging.error("%s returned an error: %s", args, stderr) + uname_info = os.uname() + if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and + '/amd64/' in binary_abspath and 'has wrong class or data encoding' in stderr): + # we are trying to analyze a 64 bits binary on a Solaris 9 x86 + # which exists only in 32 bits, that's not possible + # we ignore the error and return no information as it is likely + # that the ldd infos will be the same on the 32 bits binaries analyzed + return {} + else: + logging.error("%s returned an error: %s", args, stderr) + ldd_info = [] for line in stdout.splitlines(): - ldd_info.append(self._ParseLddDashRline(line)) + result = self._ParseLddDashRline(line, binary_abspath) + if result: + ldd_info.append(result) ldd_output[binary] = ldd_info return ldd_output @@ -263,7 +392,38 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym - def _ParseLddDashRline(self, line): + + def _ParseElfdumpLine(self, line, section = None): + + headers_re = (r'(?P
Version Needed|Version Definition|Symbol Table|Syminfo) Section:\s+(?:\.SUNW_version|\.dynsym|\.SUNW_syminfo|.symtab)\s*$|' + '\s*(?:index\s+)?version\s+dependency\s*$|' + '\s*(?:index\s+)?file\s+version\s*$|' + '\s*index\s*value\s+size\s+type\s+bind\s+oth\s+ver\s+shndx\s+name\s*$|' + '\s*index\s+flags\s+bound to\s+symbol\s*$|' + '\s*$') + + re_by_section = { 'version definition': (r'\s*(?:\[(?P\d+)\]\s+)?(?P.*\S)\s+(?P\S+)?\s*$'), + 'version needed': (r'\s*(?:\[(?P\d+)\]\s+)?(?:(?P\S+)\s+(?!\[ (?:INFO|WEAK) \]))?(?P\S+)(?:\s+\[ (?:INFO|WEAK) \])?\s*$'), + 'symbol table': (r'\s*\[\d+\]\s+(?:0x[0-9a-f]+|REG_G\d+)\s+0x[0-9a-f]+\s+\S+\s+(?P\S+)\s+\S+\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)?\s*$'), + 'syminfo': (r'\s*\[\d+\]\s+(?P[ABCDFILNPS]+)\s+(?:(?:\[\d+\]\s+(?P.*\S)|)\s+)?(?P.*\S)\s*') } + + elfdump_data = None + m = re.match(headers_re, line) + if m: + if m.lastindex: + section = m.group('section').lower() + elif section: + m = re.match(re_by_section[section], line) + if m: + elfdump_data = m.groupdict() + + if not m: + raise package.StdoutSyntaxError("Could not parse %s" % (repr(line))) + + return elfdump_data, section + + + def _ParseLddDashRline(self, line, binary=None): found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" symbol_not_found_re = (r"^\tsymbol not found:\s(?P\S+)\s+" r"\((?P\S+)\)") @@ -280,12 +440,17 @@ r'file (?P\S+) size=(?P0x\w+)\)$') sizes_one_used = (r'^\t\t(?P\S+) size used; ' r'possible insufficient data copied$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" - % (found_re, symbol_not_found_re, only_so, version_so, - stv_protected, sizes_differ, sizes_info, sizes_one_used)) + unreferenced_object = (r'^\s*unreferenced object=(?P.*); unused dependency of (?P.*)$') + unused_object = (r'^\s*unused object=.*$') + unused_search_path = (r'^\s*unused search path=.* \(RUNPATH/RPATH from file .*\)$') + blank_line = (r'^\s*$') + common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" + % (found_re, symbol_not_found_re, only_so, version_so, stv_protected, sizes_differ, sizes_info, + sizes_one_used, unreferenced_object, unused_object, unused_search_path, blank_line)) m = re.match(common_re, line) - response = {} + response = None if m: + response = {} d = m.groupdict() if "soname" in d and d["soname"]: # it was found @@ -298,6 +463,11 @@ response["soname"] = None response["path"] = d["path_not_found"] response["symbol"] = d["symbol"] + elif "binary" in d and d["binary"] and binary == d["binary"]: + response["state"] = "soname-unused" + response["soname"] = os.path.basename(d["object"]) + response["path"] = None + response["symbol"] = None elif d["path_only"]: response["state"] = "OK" response["soname"] = None @@ -328,12 +498,11 @@ response["soname"] = None response["path"] = "%s" % (d["sizediffused_file"]) response["symbol"] = None - else: - raise StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) + else: - raise StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) + raise package.StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) + return response def GetDependencies(self): Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -74,6 +74,47 @@ def setUp(self): self.ip = inspective_package.InspectivePackage("/fake/path/CSWfoo") + def test_ParseElfdumpLineSectionHeader(self): + line = 'Symbol Table Section: .dynsym' + self.assertEqual((None, "symbol table"), self.ip._ParseElfdumpLine(line, None)) + + def test_ParseElfdumpLineVersionNeeded(self): + line = '[13] SUNW_0.9 [ INFO ]' + expected = { + 'index': '13', + 'version': 'SUNW_0.9', + 'file': None + } + self.assertEqual((expected, "version needed"), self.ip._ParseElfdumpLine(line, 'version needed')) + + def test_ParseElfdumpLineSymbolTable(self): + line = ' [9] 0x000224b8 0x0000001c FUNC GLOB D 1 .text vsf_log_line' + expected = { + 'bind': 'GLOB', + 'shndx': '.text', + 'name': 'vsf_log_line', + 'ver': '1' + } + self.assertEqual((expected, 'symbol table'), self.ip._ParseElfdumpLine(line, 'symbol table')) + + def test_ParseElfdumpLineNeededSymbol(self): + line = ' [152] DB [4] libc.so.1 strlen' + expected = { + 'flags': 'DB', + 'library': 'libc.so.1', + 'symbol': 'strlen', + } + self.assertEqual((expected, "syminfo"), self.ip._ParseElfdumpLine(line, "syminfo")) + + def test_ParseElfdumpLineExportedSymbol(self): + line = ' [116] DB environ' + expected = { + 'flags': 'DB', + 'library': None, + 'symbol': 'environ', + } + self.assertEqual((expected, "syminfo"), self.ip._ParseElfdumpLine(line, "syminfo")) + def test_ParseNmSymLineGoodLine(self): line = '0000097616 T aliases_lookup' expected = { Modified: csw/mgar/gar/v2-yann/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/package.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -42,6 +42,8 @@ class PackageError(Error): pass +class StdoutSyntaxError(Error): + pass class CswSrv4File(shell.ShellMixin, object): """Represents a package in the srv4 format (pkg).""" Modified: csw/mgar/gar/v2-yann/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/package_checks_test.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -25,6 +25,8 @@ from testdata.neon_stats import pkgstats as neon_stats from testdata.bdb48_stats import pkgstat_objs as bdb48_stats from testdata.mercurial_stats import pkgstat_objs as mercurial_stats +from testdata.cadaver_stats import pkgstats as cadaver_stats +from testdata.vsftpd_stats import pkgstats as vsftpd_stats from testdata import stubs DEFAULT_PKG_STATS = None @@ -498,6 +500,13 @@ binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] self.pkg_data["depends"] = (("CSWfoo", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + ] + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/lib': [u'CSWfoo'], u'/opt/csw/lib/sparcv9': [u'CSWfoo'], @@ -526,6 +535,13 @@ binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + ] + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/bdb47/lib': [u'CSWbad'], u'/opt/csw/bdb47lib/sparcv9': [u'CSWbad'], @@ -554,6 +570,15 @@ binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"] self.pkg_data["depends"] = (("CSWbad", None),(u"CSWcommon", "")) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [{ 'symbol': 'foo', + 'soname': 'libdb-4.7.so', + 'bind': 'GLOB', + 'external': True, + 'flags': 'DBL' }], + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ u'/opt/csw/bdb47/lib': [u'CSWbad'], u'/opt/csw/bdb47lib/sparcv9': [u'CSWbad'], @@ -591,6 +616,15 @@ binaries_dump_info[0]["needed sonames"] = ["libm.so.2"] self.pkg_data["depends"] = ((u"CSWcommon", ""),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/bin/sparcv8/rsync': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn({ }) self.error_mgr_mock.GetPkgByPath( @@ -634,6 +668,15 @@ }], 'depends': (('CSWlibfoo', None),), 'isalist': (), + 'ldd_info': { 'opt/csw/bin/bar': [] }, + 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ] + } + }, 'pkgmap': [], 'files_metadata': [ {'endian': 'Little endian', @@ -650,6 +693,7 @@ 'binaries_dump_info': [], 'depends': [], 'isalist': (), + 'ldd_info': {}, 'pkgmap': [], } @@ -687,6 +731,20 @@ # 'depends': (), 'depends': ((u"CSWcommon", ""),), 'isalist': ('foo'), + 'ldd_info': { 'opt/csw/bin/bar': [], 'opt/csw/lib/libfoo.so.1': []}, + 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ] + }, + 'opt/csw/lib/libfoo.so.1': { + 'version definition': [], + 'version needed': [], + 'symbol table': [], + } + }, 'pkgmap': [ { 'path': '/opt/csw/lib/libfoo.so.1', }, { 'path': '/opt/csw/bin/bar', }, @@ -712,6 +770,16 @@ binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so' self.pkg_data["depends"] = ((u"CSWcommon", "This one provides directories"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["ldd_info"] = { 'opt/csw/lib/python/site-packages/foo.so': [] } + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/lib/python/site-packages/foo.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libbar.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libbar.so').AndReturn({ u'/opt/csw/lib': [u'CSWlibbar'], u'/opt/csw/lib/sparcv9': [u'CSWlibbar'], @@ -738,6 +806,16 @@ binaries_dump_info[0]["path"] = 'opt/csw/lib/foo.so' self.pkg_data["depends"] = ((u"CSWcommon","This is needed"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] + self.pkg_data["ldd_info"] = { 'opt/csw/lib/foo.so': [] } + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/lib/foo.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libnotfound.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename( 'libnotfound.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath( @@ -1332,8 +1410,175 @@ for i in range(27): self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(unicode), mox.IsA(str)) + +class TestCheckUnusedSoname(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def testUnusedSoname(self): + self.pkg_data = cadaver_stats + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcurses.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libexpat.so.1').AndReturn({ + "/opt/csw/lib": [u'CSWexpat'], u'/opt/csw/lib/sparcv9': [u'CSWexpat']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libiconv.so.2').AndReturn({ + "/opt/csw/lib": [u'CSWlibiconv2'], u'/opt/csw/lib/sparcv9': [u'CSWlibiconv2']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libintl.so.8').AndReturn({ + "/opt/csw/lib": (u"CSWggettextrt",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn( + {'/lib': [u'SUNWlibmsr'], + '/lib/sparcv9': [u'SUNWlibmsr'], + '/usr/lib': [u'SUNWlibms'], + '/usr/lib/sparcv9': [u'SUNWlibms']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libmd.so.1').AndReturn( + {'/lib': [u'SUNWclsr'], + '/lib/sparcv9': [u'SUNWclsr'], + '/usr/lib': [u'SUNWcls'], + '/usr/lib/sparcv9': [u'SUNWcls']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libmp.so.2').AndReturn( + {'/lib': [u'SUNWclsr'], + '/lib/sparcv9': [u'SUNWclsr'], + '/usr/lib': [u'SUNWcls'], + '/usr/lib/sparcv9': [u'SUNWcls']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libncurses.so.5').AndReturn({ + "/opt/csw/lib": [u'CSWlibncurses5'], u'/opt/csw/lib/sparcv9': [u'CSWlibncurses5']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libneon.so.27').AndReturn({ + "/opt/csw/lib": [u'CSWlibneon27'], u'/opt/csw/lib/sparcv9': [u'CSWlibneon27']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libreadline.so.6').AndReturn({ + "/opt/csw/lib": [u'CSWlibreadline6'], u'/opt/csw/lib/sparcv9': [u'CSWlibreadline6']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libz.so.1').AndReturn({ + "/opt/csw/lib": (u"CSWlibz1",), + "/opt/csw/lib/sparcv9": (u"CSWlibz1",), + "/usr/lib": (u"SUNWzlib")}) + + for common_path in ["/opt/csw/share/locale/it/LC_MESSAGES", "/opt/csw/bin", + "/opt/csw/share/locale/en at quot/LC_MESSAGES", "/opt/csw/share/man", + "/opt/csw/share/doc", "/opt/csw/share/locale/es/LC_MESSAGES"]: + self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) + + for i in range(21): + self.error_mgr_mock.NeedFile( + mox.IsA(str), mox.IsA(str), mox.IsA(str)) + + for soname in [ 'libcurses.so.1', 'libz.so.1', 'libssl.so.1.0.0', + 'libcrypto.so.1.0.0', 'libexpat.so.1' ]: + self.error_mgr_mock.ReportError( + 'CSWcadaver', 'soname-unused', + soname + ' is needed by /opt/csw/bin/cadaver but never used') + +class TestCheckDirectBinding(CheckTestHelper, unittest.TestCase): + FUNCTION_NAME = 'SetCheckLibraries' + def testDirectBinding(self): + self.pkg_data = vsftpd_stats + + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libpam.so.1').AndReturn({ + "/usr/dt/lib": (u"SUNWdtbas",), + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"), + }) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('librt.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsendfile.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + + for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", + "/opt/csw/share/doc", "/etc/opt/csw"]: + self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) + + for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libc.so.1' ]: + self.error_mgr_mock.NeedFile( + mox.IsA(str), mox.IsA(str), mox.IsA(str)) + + self.error_mgr_mock.ReportError( + 'CSWvsftpd', + 'no-direct-binding', + '/opt/csw/sbin/vsftpd is not directly binded to soname ' + soname) + + def testDirectBindingNoSyminfo(self): + self.pkg_data = vsftpd_stats + self.pkg_data[0]['binaries_elf_info']['opt/csw/sbin/vsftpd'] = { + 'version definition': [], + 'version needed': [], + 'symbol table': [] } + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libpam.so.1').AndReturn({ + "/usr/dt/lib": (u"SUNWdtbas",), + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"), + }) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('librt.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsendfile.so.1').AndReturn({ + '/usr/lib': [u'SUNWcsl'], + '/usr/lib/sparcv9': [u'SUNWcslx']}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsocket.so.1').AndReturn({ + "/usr/lib": (u"SUNWcsl",), + "/usr/lib/sparcv9": (u"SUNWcslx"),}) + self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ + "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) + + for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", + "/opt/csw/share/doc", "/etc/opt/csw"]: + self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) + + for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libc.so.1' ]: + self.error_mgr_mock.NeedFile( + mox.IsA(str), mox.IsA(str), mox.IsA(str)) + + for soname in [ 'libpam.so.1', 'libnsl.so.1', 'libcrypto.so.1.0.0', + 'librt.so.1', 'libsendfile.so.1', 'libssl.so.1.0.0', + 'libsocket.so.1', 'libc.so.1' ]: + self.error_mgr_mock.ReportError( + 'CSWvsftpd', + 'no-direct-binding', + '/opt/csw/sbin/vsftpd is not directly binded to soname ' + soname) + + class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckWrongArchitecture' def testSparcBinariesInIntelPackage(self): Modified: csw/mgar/gar/v2-yann/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/package_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -208,6 +208,8 @@ "basic_stats": basic_stats, "files_metadata": dir_pkg.GetFilesMetadata(), "mtime": self.GetMtime(), + "ldd_info": dir_pkg.GetLddMinusRlines(), + "binaries_elf_info": dir_pkg.GetBinaryElfInfo(), } self.SaveStats(pkg_stats) logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname)) Modified: csw/mgar/gar/v2-yann/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/package_stats_test.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -60,6 +60,8 @@ mock_dirpkg.GetFilesContaining(mox.IsA(tuple)).AndReturn([]) mock_dirpkg.GetFilesMetadata().AndReturn([]) mock_srv4.GetMtime().AndReturn(datetime.datetime(2010, 12, 8, 7, 52, 54)) + mock_dirpkg.GetLddMinusRlines().AndReturn({}) + mock_dirpkg.GetBinaryElfInfo().AndReturn({}) pkgstats = package_stats.PackageStats(mock_srv4) self.mox.ReplayAll() data_structure = pkgstats._CollectStats(True) Modified: csw/mgar/gar/v2-yann/lib/python/testdata/apr_util_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/apr_util_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -207,6 +207,40 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so': [], + 'opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so': [], + 'opt/csw/lib/apr-util-1/apr_dbm_db-1.so': [], + 'opt/csw/lib/apr-util-1/apr_ldap-1.so': [], + 'opt/csw/lib/libaprutil-1.so.0.3.9': []}, + 'binaries_elf_info': {'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/apr-util-1/apr_dbm_db-1.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/apr-util-1/apr_ldap-1.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/libaprutil-1.so.0.3.9': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + }, + 'binaries_dump_info': [{'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'apr_dbd_odbc-1.so', + 'needed sonames': ('libodbc.so.1', 'libc.so.1'), + 'path': 'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so', + 'runpath': ('/opt/csw/bdb47/lib', '/opt/csw/lib'), + 'soname': 'apr_dbd_odbc-1.so'}, 'mtime': datetime.datetime(2010, 8, 27, 11, 0, 10), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/bdb48_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -745,6 +745,68 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {'opt/csw/bdb48/bin/db_archive': [], + 'opt/csw/bdb48/bin/db_checkpoint': [], + 'opt/csw/bdb48/bin/db_deadlock': [], + 'opt/csw/bdb48/bin/db_dump': [], + 'opt/csw/bdb48/bin/db_hotbackup': [], + 'opt/csw/bdb48/bin/db_load': [], + 'opt/csw/bdb48/bin/db_printlog': [], + 'opt/csw/bdb48/bin/db_recover': [], + 'opt/csw/bdb48/bin/db_sql': [], + 'opt/csw/bdb48/bin/db_stat': [], + 'opt/csw/bdb48/bin/db_upgrade': [], + 'opt/csw/bdb48/bin/db_verify': [], + 'opt/csw/bdb48/bin/sparcv9/db_archive': [], + 'opt/csw/bdb48/bin/sparcv9/db_checkpoint': [], + 'opt/csw/bdb48/bin/sparcv9/db_deadlock': [], + 'opt/csw/bdb48/bin/sparcv9/db_dump': [], + 'opt/csw/bdb48/bin/sparcv9/db_hotbackup': [], + 'opt/csw/bdb48/bin/sparcv9/db_load': [], + 'opt/csw/bdb48/bin/sparcv9/db_printlog': [], + 'opt/csw/bdb48/bin/sparcv9/db_recover': [], + 'opt/csw/bdb48/bin/sparcv9/db_sql': [], + 'opt/csw/bdb48/bin/sparcv9/db_stat': [], + 'opt/csw/bdb48/bin/sparcv9/db_upgrade': [], + 'opt/csw/bdb48/bin/sparcv9/db_verify': [], + 'opt/csw/bdb48/lib/libdb-4.8.so': [], + 'opt/csw/bdb48/lib/libdb_cxx-4.8.so': [], + 'opt/csw/bdb48/lib/libdb_java-4.8.so': [], + 'opt/csw/bdb48/lib/libdb_tcl-4.8.so': [], + 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so': [], + 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so': [], + 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so': []}, + 'ldd_info': {'opt/csw/bdb48/bin/db_archive': {}, + 'opt/csw/bdb48/bin/db_checkpoint': {}, + 'opt/csw/bdb48/bin/db_deadlock': {}, + 'opt/csw/bdb48/bin/db_dump': {}, + 'opt/csw/bdb48/bin/db_hotbackup': {}, + 'opt/csw/bdb48/bin/db_load': {}, + 'opt/csw/bdb48/bin/db_printlog': {}, + 'opt/csw/bdb48/bin/db_recover': {}, + 'opt/csw/bdb48/bin/db_sql': {}, + 'opt/csw/bdb48/bin/db_stat': {}, + 'opt/csw/bdb48/bin/db_upgrade': {}, + 'opt/csw/bdb48/bin/db_verify': {}, + 'opt/csw/bdb48/bin/sparcv9/db_archive': {}, + 'opt/csw/bdb48/bin/sparcv9/db_checkpoint': {}, + 'opt/csw/bdb48/bin/sparcv9/db_deadlock': {}, + 'opt/csw/bdb48/bin/sparcv9/db_dump': {}, + 'opt/csw/bdb48/bin/sparcv9/db_hotbackup': {}, + 'opt/csw/bdb48/bin/sparcv9/db_load': {}, + 'opt/csw/bdb48/bin/sparcv9/db_printlog': {}, + 'opt/csw/bdb48/bin/sparcv9/db_recover': {}, + 'opt/csw/bdb48/bin/sparcv9/db_sql': {}, + 'opt/csw/bdb48/bin/sparcv9/db_stat': {}, + 'opt/csw/bdb48/bin/sparcv9/db_upgrade': {}, + 'opt/csw/bdb48/bin/sparcv9/db_verify': {}, + 'opt/csw/bdb48/lib/libdb-4.8.so': {}, + 'opt/csw/bdb48/lib/libdb_cxx-4.8.so': {}, + 'opt/csw/bdb48/lib/libdb_java-4.8.so': {}, + 'opt/csw/bdb48/lib/libdb_tcl-4.8.so': {}, + 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so': {}, + 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so': {}, + 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so': {}}, 'mtime': datetime.datetime(2010, 3, 2, 18, 9, 30), 'overrides': [], 'pkgchk': {'return_code': 0, Added: csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py (rev 0) +++ csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -0,0 +1,208 @@ +import datetime +pkgstats = [{'bad_paths': {}, + 'basic_stats': {'catalogname': 'cadaver', + 'md5_sum': 'd74a2f65ef0caff0bdde7310007764a8', + 'parsed_basename': {'arch': 'i386', + 'catalogname': 'cadaver', + 'full_version_string': '0.23.3,REV=2012.06.06', + 'osrel': 'SunOS5.10', + 'revision_info': {'REV': '2012.06.06'}, + 'vendortag': 'CSW', + 'version': '0.23.3', + 'version_info': {'major version': '0', + 'minor version': '23', + 'patchlevel': '3'}}, + 'pkg_basename': 'neon-0.29.0,REV=2009.09.14-SunOS5.8-i386-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_3Wy60k/cadaver-0.23.3,REV=2012.06.06-i386-CSW.pkg.gz', + 'pkgname': 'CSWcadaver', + 'size': 215040L, + 'stats_version': 10L}, + 'binaries': ['opt/csw/bin/cadaver'], + 'binaries_dump_info': [{'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'cadaver', + 'needed sonames': ('libreadline.so.6', + 'libcurses.so.1', + 'libintl.so.8', + 'libneon.so.27', + 'libnsl.so.1', + 'libsocket.so.1', + 'libz.so.1', + 'libssl.so.1.0.0', + 'libcrypto.so.1.0.0', + 'libdl.so.1', + 'libexpat.so.1', + 'libc.so.1', + 'libncurses.so.5', + 'libiconv.so.2', + 'libmp.so.2', + 'libmd.so.1', + 'libm.so.2'), + 'path': 'opt/csw/bin/cadaver', + 'runpath': ('/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/lib', + '/opt/csw/lib/'), + 'soname': None}], + 'depends': [('CSWcommon', + 'CSWcommon common - common files and dirs for CSW packages'), + ('CSWlibssl1-0-0', + 'libssl1_0_0 - Openssl 1.0 runtime libraries'), + ('CSWlibintl8', + 'libintl8 - GNU locale utilities, libintl.so.8'), + ('CSWlibneon27', + 'libneon27 - Neon HTTP and WebDAV client library, libneon.so.27'), + ('CSWlibreadline6', + 'libreadline6 - GNU readline library, libreadline.so.6'), + ('CSWlibexpat1', + 'libexpat1 - XML parser toolkit, libexpat.so.1'), + ('CSWlibz1', + 'libz1 - Zlib data compression library, libz.so.1')], + 'isalist': frozenset(['amd64', + 'i386', + 'i486', + 'i86', + 'pentium', + 'pentium+mmx', + 'pentium_pro', + 'pentium_pro+mmx']), + 'ldd_info': {'opt/csw/bin/cadaver': [ { 'soname': 'libcurses.so.1', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libnsl.so.1', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libsocket.so.1', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libz.so.1', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libssl.so.1.0.0', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libcrypto.so.1.0.0', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libdl.so.1', 'state': 'soname-unused', 'path': None, 'symbol': None }, + { 'soname': 'libexpat.so.1', 'state': 'soname-unused', 'path': None, 'symbol': None } ]}, + 'binaries_elf_info': {'opt/csw/bin/cadaver': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libcurses.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libz.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libssl.so.1.0.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libcrypto.so.1.0.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libreadline.so.6', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libneon.so.27', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libncurses.so.5', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libmp.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libmd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libexpat.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + ]}}, + 'mtime': datetime.datetime(2012, 6, 6, 20, 21, 14), + 'overrides': [], + 'pkgmap': [{'class': None, + 'group': None, + 'line': ': 1 458', + 'mode': None, + 'path': None, + 'target': None, + 'type': '1', + 'user': None}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/bin/cadaver', + 'mode': '0755', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/bin/cadaver 0755 root bin 127432 5422 1339017365'}, + {'type': 'd', + 'class': None, + 'path': '/opt/csw/share/doc/cadaver', + 'mode': '0755', + 'user': 'root', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/cadaver 0755 root bin'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/doc/cadaver/changelog.CSW', + 'mode': '0755', + 'user': 'root', + 'group': 'bin 1791 7810 1339017366', + 'line': '1 f none /opt/csw/share/doc/cadaver/changelog.CSW 0755 root bin 1791 7810 1339017366'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/doc/cadaver/license', + 'mode': '0644', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/cadaver/license 0644 root bin 17982 28433 1339017365'}, + {'type': 'd', + 'class': None, + 'path': '/opt/csw/share/doc/cadaver_stub', + 'mode': '0755', + 'user': 'root', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/cadaver_stub 0755 root bin'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/doc/cadaver_stub/changelog.CSW', + 'mode': '0644', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/cadaver_stub/changelog.CSW 0644 root bin 1791 7810 1339017366'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/locale/en at quot/LC_MESSAGES/cadaver.mo', + 'mode': '0644', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/locale/en at quot/LC_MESSAGES/cadaver.mo 0644 root bin 32658 7633 1339017365'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/locale/es/LC_MESSAGES/cadaver.mo', + 'mode': '0644', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/locale/es/LC_MESSAGES/cadaver.mo 0644 root bin 13554 44368 1339017365'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/locale/it/LC_MESSAGES/cadaver.mo', + 'mode': '0644', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/locale/it/LC_MESSAGES/cadaver.mo 0644 root bin 13689 56410 1339017365'}, + {'type': 'd', + 'class': None, + 'path': '/opt/csw/share/man/man1', + 'mode': '0755', + 'user': 'root', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/man/man1 0755 root bin'}, + {'type': 'f', + 'class': None, + 'path': '/opt/csw/share/man/man1/cadaver.1', + 'mode': '0644', + 'user': 'root', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/man/man1/cadaver.1 0644 root bin 4586 7373 1339017365'}, + {'type': 'i', + 'class': None, + 'path': None, + 'mode': None, + 'user': None, + 'group': None, + 'line': '1 i copyright 71 6651 1339017365'}, + {'type': 'i', + 'class': None, + 'path': None, + 'mode': None, + 'user': None, + 'group': None, + 'line': '1 i depend 452 39068 1339017371'}, + {'type': 'i', + 'class': None, + 'path': None, + 'mode': None, + 'user': None, + 'group': None, + 'line': '1 i pkginfo 552 45244 1339017374'}], +}] Modified: csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -111,6 +111,47 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {'opt/csw/lib/libdjvulibre.so.15': [], + 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0': [], + 'opt/csw/lib/libdjvulibre.so.21.1.0': [] }, + 'binaries_elf_info': {'opt/csw/lib/libdjvulibre.so.15': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libjpeg.so.62', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ], + }, + 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libjpeg.so.7', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ], + }, + 'opt/csw/lib/libdjvulibre.so.21.1.0': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libjpeg.so.7', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ], + }, + }, 'overrides': [], 'pkginfo': {'ARCH': 'sparc', 'CATEGORY': 'application', Modified: csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -56,6 +56,21 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {'opt/csw/bin/comdraw': [], + 'opt/csw/lib/libComUnidraw.so.1.1.3': []}, + 'binaries_elf_info': {'opt/csw/bin/comdraw': { + 'version definition': [], + 'version needed' : [], + 'symbol table': [ + { 'soname': 'libComUnidraw.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } , + ], + }, + 'opt/csw/lib/libComUnidraw.so.1.1.3': { + 'version definition': [], + 'version needed' : [], + 'symbol table': [] + } + }, 'overrides': [], 'pkgchk': {'return_code': 0, 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', Modified: csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -86,6 +86,39 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {'opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0': []}, + 'binaries_elf_info': { 'opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_repos-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_client-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_wc-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_ra-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_delta-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_diff-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_subr-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsvn_fs-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libaprutil-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libldap-2.4.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'liblber-2.4.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libexpat.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libapr-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libuuid.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsendfile.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'librt.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libneon.so.27', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ]} + }, 'mtime': datetime.datetime(2010, 7, 12, 19, 6, 15), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/libnet_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -31,6 +31,8 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {}, + 'binaries_elf_info': {}, 'mtime': datetime.datetime(2008, 8, 20, 10, 26, 15), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/mercurial_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/mercurial_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -703,6 +703,37 @@ 'sparcv9', 'sparcv9+vis', 'sparcv9+vis2']), + 'ldd_info': { 'opt/csw/lib/python/site-packages/mercurial/base85.so': [], + 'opt/csw/lib/python/site-packages/mercurial/bdiff.so': [], + 'opt/csw/lib/python/site-packages/mercurial/diffhelpers.so': [], + 'opt/csw/lib/python/site-packages/mercurial/mpatch.so': [], + 'opt/csw/lib/python/site-packages/mercurial/osutil.so': [], + 'opt/csw/lib/python/site-packages/mercurial/parsers.so': [],}, + 'binaries_elf_info': { 'opt/csw/lib/python/site-packages/mercurial/base85.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/python/site-packages/mercurial/bdiff.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/python/site-packages/mercurial/diffhelpers.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/python/site-packages/mercurial/mpatch.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/python/site-packages/mercurial/osutil.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/python/site-packages/mercurial/parsers.so': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + }, 'mtime': datetime.datetime(2011, 2, 15, 7, 46, 49), 'overrides': [{'pkgname': 'CSWmercurial', 'tag_info': None, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/neon_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -163,6 +163,27 @@ 'pentium+mmx', 'pentium_pro', 'pentium_pro+mmx']), + 'ldd_info': {'opt/csw/lib/libneon.so.26.0.4': [], + 'opt/csw/lib/libneon.so.27.2.0': [], + 'opt/csw/lib/sparcv9/libneon.so.26.0.4': [], + 'opt/csw/lib/sparcv9/libneon.so.27.2.0': []}, + 'binaries_elf_info': { 'opt/csw/lib/libneon.so.26.0.4': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/libneon.so.27.2.0': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/sparcv9/libneon.so.26.0.4': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + 'opt/csw/lib/sparcv9/libneon.so.27.2.0': { + 'version definition': [], + 'version needed': [], + 'symbol table': [] }, + }, 'mtime': datetime.datetime(2009, 9, 23, 20, 21, 14), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -74,17 +74,45 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': { 'opt/csw/bin/sparcv8/rsync': [], + 'opt/csw/bin/sparcv9/rsync': [] }, + 'binaries_elf_info': { + 'opt/csw/bin/sparcv8/rsync': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libpopt.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsec.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ] + }, + 'opt/csw/bin/sparcv9/rsync': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libpopt.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsec.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ] + } + }, 'overrides': [], 'pkgchk': {'return_code': 0, - 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', - '/var/tmp/aaacuaqYV/CSWrsync'], - 'stdout_lines': ['Checking uninstalled stream format package from ', - '## Checking control scripts.', - '## Checking package objects.', - '## Checking is complete.']}, + 'stderr_lines': ['rm: cannot remove any directory in the path of the current working directory', + '/var/tmp/aaacuaqyv/cswrsync'], + 'stdout_lines': ['checking uninstalled stream format package from ', + '## checking control scripts.', + '## checking package objects.', + '## checking is complete.']}, 'pkginfo': {'ARCH': 'sparc', 'CATEGORY': 'application', - 'CLASSES': 'none', + 'CLASSES': 'None', 'EMAIL': 'maciej at opencsw.org', 'HOTLINE': 'http://www.opencsw.org/bugtrack/', 'NAME': 'rsync - utility which provides fast incremental file transfer', @@ -93,8 +121,8 @@ 'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at 8611', 'PKG': 'CSWrsync', 'PSTAMP': 'maciej at build8s-20100217094608', - 'VENDOR': 'http://rsync.samba.org/ packaged for CSW by Maciej Blizinski', - 'VERSION': '3.0.7,REV=2010.02.17', + 'VENDOR': 'http://rsync.samba.org/ packaged for csw by maciej blizinski', + 'VERSION': '3.0.7,rev=2010.02.17', 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, 'pkgmap': [{'class': None, 'group': None, @@ -103,65 +131,65 @@ 'path': None, 'type': '1', 'user': None}, - {'class': 'none', + {'class': 'None', 'group': None, - 'line': '1 l none /opt/csw/bin/rsync=/opt/csw/bin/isaexec', + 'line': '1 l None /opt/csw/bin/rsync=/opt/csw/bin/isaexec', 'mode': None, 'path': '/opt/csw/bin/rsync', 'type': 'l', 'user': None}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 f none /opt/csw/bin/sparcv8/rsync 0755 root bin 585864 12576 1266395028', + 'line': '1 f None /opt/csw/bin/sparcv8/rsync 0755 root bin 585864 12576 1266395028', 'mode': '0755', 'path': '/opt/csw/bin/sparcv8/rsync', 'type': 'f', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin 665520 60792 1266395239', + 'line': '1 f None /opt/csw/bin/sparcv9/rsync 0755 root bin 665520 60792 1266395239', 'mode': '0755', 'path': '/opt/csw/bin/sparcv9/rsync', 'type': 'f', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 d none /opt/csw/share/doc/rsync 0755 root bin', + 'line': '1 d None /opt/csw/share/doc/rsync 0755 root bin', 'mode': '0755', 'path': '/opt/csw/share/doc/rsync', 'type': 'd', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 f none /opt/csw/share/doc/rsync/license 0644 root bin 35147 30328 1266396366', + 'line': '1 f None /opt/csw/share/doc/rsync/license 0644 root bin 35147 30328 1266396366', 'mode': '0644', 'path': '/opt/csw/share/doc/rsync/license', 'type': 'f', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 d none /opt/csw/share/man/man1 0755 root bin', + 'line': '1 d None /opt/csw/share/man/man1 0755 root bin', 'mode': '0755', 'path': '/opt/csw/share/man/man1', 'type': 'd', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 f none /opt/csw/share/man/man1/rsync.1 0644 root bin 159739 65016 1266395027', + 'line': '1 f None /opt/csw/share/man/man1/rsync.1 0644 root bin 159739 65016 1266395027', 'mode': '0644', 'path': '/opt/csw/share/man/man1/rsync.1', 'type': 'f', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 d none /opt/csw/share/man/man5 0755 root bin', + 'line': '1 d None /opt/csw/share/man/man5 0755 root bin', 'mode': '0755', 'path': '/opt/csw/share/man/man5', 'type': 'd', 'user': 'root'}, - {'class': 'none', + {'class': 'None', 'group': 'bin', - 'line': '1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 root bin 36372 24688 1266395027', + 'line': '1 f None /opt/csw/share/man/man5/rsyncd.conf.5 0644 root bin 36372 24688 1266395027', 'mode': '0644', 'path': '/opt/csw/share/man/man5/rsyncd.conf.5', 'type': 'f', Modified: csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -71,317 +71,349 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), + 'ldd_info': {'opt/csw/libexec/sudo_noexec.so': [], + 'opt/csw/sbin/visudo': []}, + 'binaries_elf_info': {'opt/csw/libexec/sudo_noexec.so': { + 'version needed': [], + 'version definition': [], + 'symbol table': [ { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } ], + }, + 'opt/csw/sbin/visudo': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ], + } + }, 'mtime': datetime.datetime(2010, 3, 2, 22, 34, 40), 'overrides': [], 'pkgchk': {'return_code': 0, - 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', - '/var/tmp/aaajqaOvt/CSWsudo-common'], - 'stdout_lines': ['Checking uninstalled stream format package from ', - '## Checking control scripts.', - '## Checking package objects.', - '## Checking is complete.']}, - 'pkginfo': {'ARCH': 'sparc', - 'CATEGORY': 'application', - 'CLASSES': 'none', - 'EMAIL': 'maciej at opencsw.org', - 'HOTLINE': 'http://www.opencsw.org/bugtrack/', - 'NAME': 'sudo_common - Common files for sudo', - 'OPENCSW_CATALOGNAME': 'sudo_common', - 'OPENCSW_MODE64': '32', - 'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/sudo/trunk at 8935', - 'PKG': 'CSWsudo-common', - 'PSTAMP': 'maciej at build8s-20100302104744', - 'VENDOR': 'ftp://ftp.sudo.ws/pub/sudo/ packaged for CSW by Maciej Blizinski', - 'VERSION': '1.7.2p5,REV=2010.03.02', - 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, - 'pkgmap': [{'class': None, - 'group': None, - 'line': ': 1 557', - 'mode': None, - 'path': None, - 'type': '1', - 'user': None}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/etc/sudoers.CSW 0644 root bin 715 61323 1267522149', - 'mode': '0644', - 'path': '/opt/csw/etc/sudoers.CSW', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /opt/csw/libexec 0755 root bin', - 'mode': '0755', - 'path': '/opt/csw/libexec', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/libexec/sudo_noexec.so 0755 root bin 5996 42161 1267522148', - 'mode': '0755', - 'path': '/opt/csw/libexec/sudo_noexec.so', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/sbin/visudo 0755 root bin 146604 53853 1267522152', - 'mode': '0755', - 'path': '/opt/csw/sbin/visudo', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /opt/csw/share/doc/sudo_common 0755 root bin', - 'mode': '0755', - 'path': '/opt/csw/share/doc/sudo_common', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/share/doc/sudo_common/license 0644 root bin 4423 15997 1267523256', - 'mode': '0644', - 'path': '/opt/csw/share/doc/sudo_common/license', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /opt/csw/share/man/man1m 0755 root bin', - 'mode': '0755', - 'path': '/opt/csw/share/man/man1m', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/share/man/man1m/sudo.1m 0644 root bin 33335 56127 1267522150', - 'mode': '0644', - 'path': '/opt/csw/share/man/man1m/sudo.1m', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': None, - 'line': '1 l none /opt/csw/share/man/man1m/sudoedit.1m=/opt/csw/share/man/man1m/sudo.1m', - 'mode': None, - 'path': '/opt/csw/share/man/man1m/sudoedit.1m', - 'type': 'l', - 'user': None}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/share/man/man1m/visudo.1m 0644 root bin 12144 63550 1267522150', - 'mode': '0644', - 'path': '/opt/csw/share/man/man1m/visudo.1m', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /opt/csw/share/man/man4 0755 root bin', - 'mode': '0755', - 'path': '/opt/csw/share/man/man4', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/share/man/man4/sudoers.4 0644 root bin 71819 39000 1267522151', - 'mode': '0644', - 'path': '/opt/csw/share/man/man4/sudoers.4', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /var/opt/csw/log 0755 root bin', - 'mode': '0755', - 'path': '/var/opt/csw/log', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /var/opt/csw/log/sudo 0755 root bin', - 'mode': '0755', - 'path': '/var/opt/csw/log/sudo', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /var/opt/csw/log/sudo/logs 0755 root bin', - 'mode': '0755', - 'path': '/var/opt/csw/log/sudo/logs', - 'type': 'd', - 'user': 'root'}, - {'class': None, - 'group': None, - 'line': '1 i copyright 75 7112 1267523256', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}, - {'class': None, - 'group': None, - 'line': '1 i depend 110 9928 1267523264', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}, - {'class': None, - 'group': None, - 'line': '1 i pkginfo 491 41276 1267523267', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}, - {'class': None, - 'group': None, - 'line': '1 i postinstall 321 26084 1237750445', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}]}, - {'bad_paths': {}, - 'basic_stats': {'catalogname': 'sudo', - 'md5_sum': 'dce7f8da0edbb80ec4bdf697ccfc1846', - 'parsed_basename': {'arch': 'sparc', - 'catalogname': 'sudo', - 'full_version_string': '1.7.2p5,REV=2010.03.02', - 'osrel': 'SunOS5.8', - 'revision_info': {'REV': '2010.03.02'}, - 'vendortag': 'CSW', - 'version': '1.7.2p5', - 'version_info': {'major version': '1', - 'minor version': '7', - 'patchlevel': '2p5'}}, - 'pkg_basename': 'sudo-1.7.2p5,REV=2010.03.02-SunOS5.8-sparc-CSW.pkg.gz', - 'pkg_path': '/tmp/pkg_CGJ5ja/sudo-1.7.2p5,REV=2010.03.02-SunOS5.8-sparc-CSW.pkg.gz', - 'pkgname': 'CSWsudo', - 'stats_version': 9L}, - 'binaries': ['opt/csw/bin/sudo.minimal'], - 'binaries_dump_info': [{'RPATH set': True, - 'RUNPATH RPATH the same': True, - 'RUNPATH set': True, - 'base_name': 'sudo.minimal', - 'needed sonames': ('libpam.so.1', - 'libdl.so.1', - 'libintl.so.8', - 'libsocket.so.1', - 'libnsl.so.1', - 'libc.so.1'), - 'path': 'opt/csw/bin/sudo.minimal', - 'runpath': ('/opt/csw/lib/$ISALIST', - '/opt/csw/lib')}], - 'depends': [('CSWalternatives', - 'CSWalternatives alternatives - Alternatives engine from Red Hat chkconfig-1.3.30c '), - ('CSWcommon', - 'CSWcommon common - common files and dirs for CSW packages '), - ('CSWsudo-common', - 'CSWsudo-common sudo_common - Common files for sudo '), - ('CSWggettextrt', - 'CSWggettextrt ggettextrt - GNU locale utilities ')], - 'files_metadata': [{'endian': 'Big endian', - 'machine_id': 2, - 'mime_type': 'application/x-executable; charset=binary', - 'mime_type_by_hachoir': u'application/x-executable', - 'path': 'opt/csw/bin/sudo.minimal'}, - {'mime_type': 'text/plain; charset=us-ascii', - 'path': 'opt/csw/share/alternatives/sudo'}, - {'mime_type': 'text/plain; charset=us-ascii', - 'path': 'opt/csw/share/doc/sudo/license'}], - 'isalist': ('sparcv9+vis2', - 'sparcv9+vis', - 'sparcv9', - 'sparcv8plus+vis2', - 'sparcv8plus+vis', - 'sparcv8plus', - 'sparcv8', - 'sparcv8-fsmuld', - 'sparcv7', - 'sparc'), + 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', + '/var/tmp/aaajqaOvt/CSWsudo-common'], + 'stdout_lines': ['Checking uninstalled stream format package from ', + '## Checking control scripts.', + '## Checking package objects.', + '## Checking is complete.']}, + 'pkginfo': {'ARCH': 'sparc', + 'CATEGORY': 'application', + 'CLASSES': 'none', + 'EMAIL': 'maciej at opencsw.org', + 'HOTLINE': 'http://www.opencsw.org/bugtrack/', + 'NAME': 'sudo_common - Common files for sudo', + 'OPENCSW_CATALOGNAME': 'sudo_common', + 'OPENCSW_MODE64': '32', + 'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/sudo/trunk at 8935', + 'PKG': 'CSWsudo-common', + 'PSTAMP': 'maciej at build8s-20100302104744', + 'VENDOR': 'ftp://ftp.sudo.ws/pub/sudo/ packaged for CSW by Maciej Blizinski', + 'VERSION': '1.7.2p5,REV=2010.03.02', + 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, + 'pkgmap': [{'class': None, + 'group': None, + 'line': ': 1 557', + 'mode': None, + 'path': None, + 'type': '1', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/etc/sudoers.CSW 0644 root bin 715 61323 1267522149', + 'mode': '0644', + 'path': '/opt/csw/etc/sudoers.CSW', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/libexec 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/libexec', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/libexec/sudo_noexec.so 0755 root bin 5996 42161 1267522148', + 'mode': '0755', + 'path': '/opt/csw/libexec/sudo_noexec.so', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/sbin/visudo 0755 root bin 146604 53853 1267522152', + 'mode': '0755', + 'path': '/opt/csw/sbin/visudo', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/sudo_common 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/doc/sudo_common', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/sudo_common/license 0644 root bin 4423 15997 1267523256', + 'mode': '0644', + 'path': '/opt/csw/share/doc/sudo_common/license', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/man/man1m 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/man/man1m', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/man/man1m/sudo.1m 0644 root bin 33335 56127 1267522150', + 'mode': '0644', + 'path': '/opt/csw/share/man/man1m/sudo.1m', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 l none /opt/csw/share/man/man1m/sudoedit.1m=/opt/csw/share/man/man1m/sudo.1m', + 'mode': None, + 'path': '/opt/csw/share/man/man1m/sudoedit.1m', + 'type': 'l', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/man/man1m/visudo.1m 0644 root bin 12144 63550 1267522150', + 'mode': '0644', + 'path': '/opt/csw/share/man/man1m/visudo.1m', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/man/man4 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/man/man4', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/man/man4/sudoers.4 0644 root bin 71819 39000 1267522151', + 'mode': '0644', + 'path': '/opt/csw/share/man/man4/sudoers.4', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /var/opt/csw/log 0755 root bin', + 'mode': '0755', + 'path': '/var/opt/csw/log', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /var/opt/csw/log/sudo 0755 root bin', + 'mode': '0755', + 'path': '/var/opt/csw/log/sudo', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /var/opt/csw/log/sudo/logs 0755 root bin', + 'mode': '0755', + 'path': '/var/opt/csw/log/sudo/logs', + 'type': 'd', + 'user': 'root'}, + {'class': None, + 'group': None, + 'line': '1 i copyright 75 7112 1267523256', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i depend 110 9928 1267523264', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i pkginfo 491 41276 1267523267', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i postinstall 321 26084 1237750445', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}]}, + {'bad_paths': {}, + 'basic_stats': {'catalogname': 'sudo', + 'md5_sum': 'dce7f8da0edbb80ec4bdf697ccfc1846', + 'parsed_basename': {'arch': 'sparc', + 'catalogname': 'sudo', + 'full_version_string': '1.7.2p5,REV=2010.03.02', + 'osrel': 'SunOS5.8', + 'revision_info': {'REV': '2010.03.02'}, + 'vendortag': 'CSW', + 'version': '1.7.2p5', + 'version_info': {'major version': '1', + 'minor version': '7', + 'patchlevel': '2p5'}}, + 'pkg_basename': 'sudo-1.7.2p5,REV=2010.03.02-SunOS5.8-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_CGJ5ja/sudo-1.7.2p5,REV=2010.03.02-SunOS5.8-sparc-CSW.pkg.gz', + 'pkgname': 'CSWsudo', + 'stats_version': 9L}, + 'binaries': ['opt/csw/bin/sudo.minimal'], + 'binaries_dump_info': [{'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'sudo.minimal', + 'needed sonames': ('libpam.so.1', + 'libdl.so.1', + 'libintl.so.8', + 'libsocket.so.1', + 'libnsl.so.1', + 'libc.so.1'), + 'path': 'opt/csw/bin/sudo.minimal', + 'runpath': ('/opt/csw/lib/$ISALIST', + '/opt/csw/lib')}], + 'depends': [('CSWalternatives', + 'CSWalternatives alternatives - Alternatives engine from Red Hat chkconfig-1.3.30c '), + ('CSWcommon', + 'CSWcommon common - common files and dirs for CSW packages '), + ('CSWsudo-common', + 'CSWsudo-common sudo_common - Common files for sudo '), + ('CSWggettextrt', + 'CSWggettextrt ggettextrt - GNU locale utilities ')], + 'files_metadata': [{'endian': 'Big endian', + 'machine_id': 2, + 'mime_type': 'application/x-executable; charset=binary', + 'mime_type_by_hachoir': u'application/x-executable', + 'path': 'opt/csw/bin/sudo.minimal'}, + {'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/alternatives/sudo'}, + {'mime_type': 'text/plain; charset=us-ascii', + 'path': 'opt/csw/share/doc/sudo/license'}], + 'isalist': ('sparcv9+vis2', + 'sparcv9+vis', + 'sparcv9', + 'sparcv8plus+vis2', + 'sparcv8plus+vis', + 'sparcv8plus', + 'sparcv8', + 'sparcv8-fsmuld', + 'sparcv7', + 'sparc'), + 'ldd_info': {'opt/csw/bin/sudo.minimal': []}, + 'binaries_elf_info': { 'opt/csw/bin/sudo.minimal': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { 'soname': 'libpam.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + ] + } + }, 'mtime': datetime.datetime(2010, 3, 2, 22, 34, 39), 'overrides': [], 'pkgchk': {'return_code': 0, - 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', - '/var/tmp/aaaJFaizt/CSWsudo'], - 'stdout_lines': ['Checking uninstalled stream format package from ', - '## Checking control scripts.', - '## Checking package objects.', - '## Checking is complete.']}, - 'pkginfo': {'ARCH': 'sparc', - 'CATEGORY': 'application', - 'CLASSES': 'none cswalternatives', - 'EMAIL': 'maciej at opencsw.org', - 'HOTLINE': 'http://www.opencsw.org/bugtrack/', - 'NAME': 'sudo - Provides limited super user privileges', - 'OPENCSW_CATALOGNAME': 'sudo', - 'OPENCSW_MODE64': '32', - 'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/sudo/trunk at 8935', - 'PKG': 'CSWsudo', - 'PSTAMP': 'maciej at build8s-20100302104739', - 'VENDOR': 'ftp://ftp.sudo.ws/pub/sudo/ packaged for CSW by Maciej Blizinski', - 'VERSION': '1.7.2p5,REV=2010.03.02', - 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, - 'pkgmap': [{'class': None, - 'group': None, - 'line': ': 1 461', - 'mode': None, - 'path': None, - 'type': '1', - 'user': None}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/bin/sudo.minimal 4755 root bin 224092 24233 1267522152', - 'mode': '4755', - 'path': '/opt/csw/bin/sudo.minimal', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': None, - 'line': '1 l none /opt/csw/bin/sudoedit.minimal=/opt/csw/bin/sudo.minimal', - 'mode': None, - 'path': '/opt/csw/bin/sudoedit.minimal', - 'type': 'l', - 'user': None}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /opt/csw/share/alternatives 0755 root bin', - 'mode': '0755', - 'path': '/opt/csw/share/alternatives', - 'type': 'd', - 'user': 'root'}, - {'class': 'cswalternatives', - 'group': 'bin', - 'line': '1 f cswalternatives /opt/csw/share/alternatives/sudo 0644 root bin 125 10881 1267522155', - 'mode': '0644', - 'path': '/opt/csw/share/alternatives/sudo', - 'type': 'f', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 d none /opt/csw/share/doc/sudo 0755 root bin', - 'mode': '0755', - 'path': '/opt/csw/share/doc/sudo', - 'type': 'd', - 'user': 'root'}, - {'class': 'none', - 'group': 'bin', - 'line': '1 f none /opt/csw/share/doc/sudo/license 0644 root bin 4423 15997 1267523256', - 'mode': '0644', - 'path': '/opt/csw/share/doc/sudo/license', - 'type': 'f', - 'user': 'root'}, - {'class': None, - 'group': None, - 'line': '1 i copyright 68 6368 1267523256', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}, - {'class': None, - 'group': None, - 'line': '1 i depend 247 22297 1267523258', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}, - {'class': None, - 'group': None, - 'line': '1 i pkginfo 503 42551 1267523262', - 'mode': None, - 'path': None, - 'type': 'i', - 'user': None}]}] + 'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory', + '/var/tmp/aaaJFaizt/CSWsudo'], + 'stdout_lines': ['Checking uninstalled stream format package from ', + '## Checking control scripts.', + '## Checking package objects.', + '## Checking is complete.']}, + 'pkginfo': {'ARCH': 'sparc', + 'CATEGORY': 'application', + 'CLASSES': 'none cswalternatives', + 'EMAIL': 'maciej at opencsw.org', + 'HOTLINE': 'http://www.opencsw.org/bugtrack/', + 'NAME': 'sudo - Provides limited super user privileges', + 'OPENCSW_CATALOGNAME': 'sudo', + 'OPENCSW_MODE64': '32', + 'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/sudo/trunk at 8935', + 'PKG': 'CSWsudo', + 'PSTAMP': 'maciej at build8s-20100302104739', + 'VENDOR': 'ftp://ftp.sudo.ws/pub/sudo/ packaged for CSW by Maciej Blizinski', + 'VERSION': '1.7.2p5,REV=2010.03.02', + 'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'}, + 'pkgmap': [{'class': None, + 'group': None, + 'line': ': 1 461', + 'mode': None, + 'path': None, + 'type': '1', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/bin/sudo.minimal 4755 root bin 224092 24233 1267522152', + 'mode': '4755', + 'path': '/opt/csw/bin/sudo.minimal', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': None, + 'line': '1 l none /opt/csw/bin/sudoedit.minimal=/opt/csw/bin/sudo.minimal', + 'mode': None, + 'path': '/opt/csw/bin/sudoedit.minimal', + 'type': 'l', + 'user': None}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/alternatives 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/alternatives', + 'type': 'd', + 'user': 'root'}, + {'class': 'cswalternatives', + 'group': 'bin', + 'line': '1 f cswalternatives /opt/csw/share/alternatives/sudo 0644 root bin 125 10881 1267522155', + 'mode': '0644', + 'path': '/opt/csw/share/alternatives/sudo', + 'type': 'f', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/sudo 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/doc/sudo', + 'type': 'd', + 'user': 'root'}, + {'class': 'none', + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/sudo/license 0644 root bin 4423 15997 1267523256', + 'mode': '0644', + 'path': '/opt/csw/share/doc/sudo/license', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': None, + 'line': '1 i copyright 68 6368 1267523256', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i depend 247 22297 1267523258', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i pkginfo 503 42551 1267523262', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}]}] Modified: csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2012-09-18 18:59:44 UTC (rev 19233) +++ csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py 2012-09-19 20:06:10 UTC (rev 19236) @@ -47,6 +47,17 @@ 'sparcv9', 'sparcv9+vis', 'sparcv9+vis2']), + 'ldd_info': {'opt/csw/bin/tree': [] }, + 'binaries_elf_info': { 'opt/csw/bin/tree': { 'version definition': [], + 'version needed': [], + 'symbol table': [ { 'flags': 'DBL', + 'soname': 'libc.so.1', + 'symbol': 'environ', + 'external': True, + 'version': None + } ] + } + }, 'mtime': datetime.datetime(2010, 7, 5, 23, 48, 10), 'overrides': [], 'pkgchk': {'return_code': 0, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Sep 19 22:26:17 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 19 Sep 2012 20:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19237] csw/mgar/pkg/postfix/trunk Message-ID: Revision: 19237 http://gar.svn.sourceforge.net/gar/?rev=19237&view=rev Author: wilbury Date: 2012-09-19 20:26:16 +0000 (Wed, 19 Sep 2012) Log Message: ----------- postfix/trunk: Upgrade to 2.9.4, relink against OpenSSL 1.0.0 Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/postfix/trunk/checksums Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-09-19 20:06:10 UTC (rev 19236) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-09-19 20:26:16 UTC (rev 19237) @@ -30,7 +30,7 @@ # $Id$ # NAME = postfix -VERSION = 2.8.9 +VERSION = 2.9.4 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/postfix/trunk/checksums =================================================================== --- csw/mgar/pkg/postfix/trunk/checksums 2012-09-19 20:06:10 UTC (rev 19236) +++ csw/mgar/pkg/postfix/trunk/checksums 2012-09-19 20:26:16 UTC (rev 19237) @@ -1 +1 @@ -512e2d13da6d25ba64fdf3a1c62190a1 postfix-2.8.9.tar.gz +230bc3c00c051946eccd850058d75f6c postfix-2.9.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Sep 19 23:00:37 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 21:00:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19238] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19238 http://gar.svn.sourceforge.net/gar/?rev=19238&view=rev Author: chninkel Date: 2012-09-19 21:00:37 +0000 (Wed, 19 Sep 2012) Log Message: ----------- some pep8 compliance fixes Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-19 20:26:16 UTC (rev 19237) +++ csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-19 21:00:37 UTC (rev 19238) @@ -39,22 +39,24 @@ PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) -BASE_SOLARIS_LIBRARIES = ( +BASE_SOLARIS_LIBRARIES = ( "libsocket.so.1", "libnsl.so.1", "libdl.so.1", "librt.so.1", "libresolv.so.2", "libpthread.so.1", # linked by default with C++, see "Default C++ Libraries" in Solaris Studio C++ User'sGuide - "libCstd.so.1", "libCrun.so.1", "libm.so.1", "libm.so.2", "libw.so.1", "libcx.so.1", "libc.so.1", "libC.so.3", "libC.so.5" + "libCstd.so.1", "libCrun.so.1", "libm.so.1", "libm.so.2", "libw.so.1", "libcx.so.1", "libc.so.1", "libC.so.3", "libC.so.5", ) -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' ] } +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'], +} def ProcessSoname( @@ -173,8 +175,8 @@ messenger.Message( "Binary %s links to library %s but doesn't seem to use any of its symbols. " "It usually happens because superfluous libraries were added to the linker options, " - "either because of the configure script itself or because of the \"pkg-config --libs\"" - " output of one the dependency." + "either because of the configure script itself or because of the \"pkg-config --libs\"" + " output of one the dependency." % ("/" + binary_info["path"], ldd_response['soname'])) error_mgr.ReportError( pkgname, "soname-unused", @@ -194,7 +196,7 @@ if not_directly_binded: messenger.Message( - "No symbol of binary %s is directly binded against the following libraries: %s. " + "No symbol of binary %s is directly binded against the following libraries: %s. " "Please make sure the binaries are compiled using the \"-Bdirect\" linker option." % ("/" + binary_info["path"], ", ".join(not_directly_binded))) for soname in not_directly_binded: @@ -204,18 +206,18 @@ for version_dep in pkg_data["binaries_elf_info"][binary_info["path"]]['version needed']: - if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and + if (version_dep['soname'] in ALLOWED_VERSION_DEPENDENCIES and not version_dep['version'] in ALLOWED_VERSION_DEPENDENCIES[version_dep['soname']]): messenger.Message( "Binary %s requires interface version %s in library %s which is only available " - "in recent Solaris releases." + "in recent Solaris releases." % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) error_mgr.ReportError( pkgname, "forbidden-version-interface-dependencies", - "%s requires forbidden interface version %s in library %s" - % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) - - + "%s requires forbidden interface version %s in library %s" + % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) + + orphan_sonames = set(orphan_sonames) for soname, binary_path in orphan_sonames: if soname not in ALLOWED_ORPHAN_SONAMES: Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 20:26:16 UTC (rev 19237) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 21:00:37 UTC (rev 19238) @@ -229,14 +229,13 @@ return defined_symbols - def GetBinaryElfInfo(self): """Returns various informations symbol and version present in elf header - To do this we parse output lines from elfdump -syv, it's the + To do this we parse output lines from elfdump -syv, it's the only command that will give us all informations we need on symbols and versions. We will analyse 3 sections: - - version section: contains soname needed, version interface required for each soname, + - version section: contains soname needed, version interface required for each soname, and version definition - symbol table section: contains list of symbol and soname/version interface providing it (the latter is an index in the version section) @@ -261,9 +260,9 @@ elfdump_out = stdout.splitlines() symbols = {} - binary_info = { 'version definition': [], - 'version needed': [], - 'symbol table': [] } + binary_info = {'version definition': [], + 'version needed': [], + 'symbol table': []} # we will merge syminfo and symbol table information in one list # so the syminfo list is the same as the symbol table one binary_info['syminfo'] = binary_info['symbol table'] @@ -271,39 +270,39 @@ # The list of fields we want to retrieve in the elfdump output by section # if the field is a tuple, it means we will map the original field name # to another name in the final data structure - elf_fields = { 'version definition': [ 'version', 'dependency' ], - 'version needed': [ ('file', 'soname'), 'version' ], - 'symbol table': [ ('name', 'symbol'), ('ver', 'version'), - 'bind', ('shndx', 'external') ], - 'syminfo': [ ('library', 'soname'), 'symbol', 'flags' ] } + elf_fields = {'version definition': ['version', 'dependency'], + 'version needed': [('file', 'soname'), 'version'], + 'symbol table': [('name', 'symbol'), ('ver', 'version'), + 'bind', ('shndx', 'external')], + 'syminfo': [('library', 'soname'), 'symbol', 'flags']} cur_section = None for line in elfdump_out: - + elfdump_data, cur_section = self._ParseElfdumpLine(line, cur_section) - # header or blank line contains no information - if not elfdump_data: + # header or blank line contains no information + if not elfdump_data: continue elf_info = {} - for field in elf_fields[cur_section]: + for field in elf_fields[cur_section]: if type(field) == tuple: elf_info[field[1]] = elfdump_data[field[0]] else: elf_info[field] = elfdump_data[field] - + # we merge symbol table and syminfo informations so we have to check - # if the symbol has not already been added - if cur_section in ('symbol table', 'syminfo'): + # if the symbol has not already been added + if cur_section in ('symbol table', 'syminfo'): if not elf_info['symbol']: continue - if elf_info['symbol'] in symbols: - symbols[elf_info['symbol']].update(elf_info) - continue + if elf_info['symbol'] in symbols: + symbols[elf_info['symbol']].update(elf_info) + continue else: - symbols[elf_info['symbol']] = elf_info - + symbols[elf_info['symbol']] = elf_info + binary_info[cur_section].append(elf_info) # elfdump doesn't repeat the name of the soname in the version section @@ -313,23 +312,23 @@ if not version['soname']: version['soname'] = binary_info['version needed'][i]['soname'] - # if it exists, the first "version definition" entry is the base soname + # if it exists, the first "version definition" entry is the base soname # we don't need this information if binary_info['version definition']: - binary_info['version definition'].pop(0) + binary_info['version definition'].pop(0) # To not rely of the section order output of elfdump, we resolve symbol version # informations here after having parsed all elfdump output nb_versions_definition = len(binary_info['version definition']) for sym_info in binary_info['symbol table']: version_index = int(sym_info['version']) - 2 - if version_index > 1: - if version_index < nb_versions_definition: - version = binary_info['version definition'][version_index] + if version_index > 1: + if version_index < nb_versions_definition: + version = binary_info['version definition'][version_index] else: - version = binary_info['version needed'][version_index - nb_versions_definition] - sym_info['version'] = version['version'] - sym_info['soname'] = version['soname'] + version = binary_info['version needed'][version_index - nb_versions_definition] + sym_info['version'] = version['version'] + sym_info['soname'] = version['soname'] else: sym_info['version'] = None @@ -346,7 +345,6 @@ return binaries_elf_info - def GetLddMinusRlines(self): """Returns ldd -r output.""" binaries = self.ListBinaries() @@ -365,26 +363,27 @@ retcode = ldd_proc.wait() if retcode: uname_info = os.uname() - if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and - '/amd64/' in binary_abspath and 'has wrong class or data encoding' in stderr): + if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and + '/amd64/' in binary_abspath and 'has wrong class or data encoding' in stderr): # we are trying to analyze a 64 bits binary on a Solaris 9 x86 - # which exists only in 32 bits, that's not possible - # we ignore the error and return no information as it is likely - # that the ldd infos will be the same on the 32 bits binaries analyzed - return {} + # which exists only in 32 bits, that's not possible + # we ignore the error and return no information as it is likely + # that the ldd infos will be the same on the 32 bits binaries analyzed + return {} else: logging.error("%s returned an error: %s", args, stderr) ldd_info = [] for line in stdout.splitlines(): - result = self._ParseLddDashRline(line, binary_abspath) - if result: + result = self._ParseLddDashRline(line, binary_abspath) + if result: ldd_info.append(result) - ldd_output[binary] = ldd_info - return ldd_output + ldd_output[binary] = ldd_info + return ldd_output + def _ParseNmSymLine(self, line): - re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') + re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') m = re_defined_symbol.match(line) if not m: return None @@ -392,20 +391,19 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym + def _ParseElfdumpLine(self, line, section=None): - def _ParseElfdumpLine(self, line, section = None): - headers_re = (r'(?P
Version Needed|Version Definition|Symbol Table|Syminfo) Section:\s+(?:\.SUNW_version|\.dynsym|\.SUNW_syminfo|.symtab)\s*$|' '\s*(?:index\s+)?version\s+dependency\s*$|' '\s*(?:index\s+)?file\s+version\s*$|' '\s*index\s*value\s+size\s+type\s+bind\s+oth\s+ver\s+shndx\s+name\s*$|' '\s*index\s+flags\s+bound to\s+symbol\s*$|' - '\s*$') + '\s*$') re_by_section = { 'version definition': (r'\s*(?:\[(?P\d+)\]\s+)?(?P.*\S)\s+(?P\S+)?\s*$'), - 'version needed': (r'\s*(?:\[(?P\d+)\]\s+)?(?:(?P\S+)\s+(?!\[ (?:INFO|WEAK) \]))?(?P\S+)(?:\s+\[ (?:INFO|WEAK) \])?\s*$'), - 'symbol table': (r'\s*\[\d+\]\s+(?:0x[0-9a-f]+|REG_G\d+)\s+0x[0-9a-f]+\s+\S+\s+(?P\S+)\s+\S+\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)?\s*$'), - 'syminfo': (r'\s*\[\d+\]\s+(?P[ABCDFILNPS]+)\s+(?:(?:\[\d+\]\s+(?P.*\S)|)\s+)?(?P.*\S)\s*') } + 'version needed': (r'\s*(?:\[(?P\d+)\]\s+)?(?:(?P\S+)\s+(?!\[ (?:INFO|WEAK) \]))?(?P\S+)(?:\s+\[ (?:INFO|WEAK) \])?\s*$'), + 'symbol table': (r'\s*\[\d+\]\s+(?:0x[0-9a-f]+|REG_G\d+)\s+0x[0-9a-f]+\s+\S+\s+(?P\S+)\s+\S+\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)?\s*$'), + 'syminfo': (r'\s*\[\d+\]\s+(?P[ABCDFILNPS]+)\s+(?:(?:\[\d+\]\s+(?P.*\S)|)\s+)?(?P.*\S)\s*') } elfdump_data = None m = re.match(headers_re, line) @@ -422,7 +420,6 @@ return elfdump_data, section - def _ParseLddDashRline(self, line, binary=None): found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" symbol_not_found_re = (r"^\tsymbol not found:\s(?P\S+)\s+" @@ -446,7 +443,7 @@ blank_line = (r'^\s*$') common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" % (found_re, symbol_not_found_re, only_so, version_so, stv_protected, sizes_differ, sizes_info, - sizes_one_used, unreferenced_object, unused_object, unused_search_path, blank_line)) + sizes_one_used, unreferenced_object, unused_object, unused_search_path, blank_line)) m = re.match(common_re, line) response = None if m: 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 19 23:05:13 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 21:05:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19239] csw/mgar/gar/v2-yann/lib/python/package_checks_test .py Message-ID: Revision: 19239 http://gar.svn.sourceforge.net/gar/?rev=19239&view=rev Author: chninkel Date: 2012-09-19 21:05:12 +0000 (Wed, 19 Sep 2012) Log Message: ----------- tab/space indentations fixes Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2-yann/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/package_checks_test.py 2012-09-19 21:00:37 UTC (rev 19238) +++ csw/mgar/gar/v2-yann/lib/python/package_checks_test.py 2012-09-19 21:05:12 UTC (rev 19239) @@ -573,10 +573,10 @@ self.pkg_data["binaries_elf_info"]['opt/csw/bin/sparcv8/rsync'] = { 'version definition': [], 'version needed': [], - 'symbol table': [{ 'symbol': 'foo', - 'soname': 'libdb-4.7.so', + 'symbol table': [{ 'symbol': 'foo', + 'soname': 'libdb-4.7.so', 'bind': 'GLOB', - 'external': True, + 'external': True, 'flags': 'DBL' }], } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ @@ -616,8 +616,8 @@ binaries_dump_info[0]["needed sonames"] = ["libm.so.2"] self.pkg_data["depends"] = ((u"CSWcommon", ""),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] - self.pkg_data["binaries_elf_info"] = { - 'opt/csw/bin/sparcv8/rsync': { + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/bin/sparcv8/rsync': { 'version definition': [], 'version needed': [], 'symbol table': [ @@ -669,7 +669,7 @@ 'depends': (('CSWlibfoo', None),), 'isalist': (), 'ldd_info': { 'opt/csw/bin/bar': [] }, - 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'binaries_elf_info': { 'opt/csw/bin/bar': { 'version definition': [], 'version needed': [], 'symbol table': [ @@ -732,7 +732,7 @@ 'depends': ((u"CSWcommon", ""),), 'isalist': ('foo'), 'ldd_info': { 'opt/csw/bin/bar': [], 'opt/csw/lib/libfoo.so.1': []}, - 'binaries_elf_info': { 'opt/csw/bin/bar': { + 'binaries_elf_info': { 'opt/csw/bin/bar': { 'version definition': [], 'version needed': [], 'symbol table': [ @@ -771,8 +771,8 @@ self.pkg_data["depends"] = ((u"CSWcommon", "This one provides directories"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["ldd_info"] = { 'opt/csw/lib/python/site-packages/foo.so': [] } - self.pkg_data["binaries_elf_info"] = { - 'opt/csw/lib/python/site-packages/foo.so': { + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/lib/python/site-packages/foo.so': { 'version definition': [], 'version needed': [], 'symbol table': [ @@ -807,8 +807,8 @@ self.pkg_data["depends"] = ((u"CSWcommon","This is needed"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] self.pkg_data["ldd_info"] = { 'opt/csw/lib/foo.so': [] } - self.pkg_data["binaries_elf_info"] = { - 'opt/csw/lib/foo.so': { + self.pkg_data["binaries_elf_info"] = { + 'opt/csw/lib/foo.so': { 'version definition': [], 'version needed': [], 'symbol table': [ @@ -1410,7 +1410,7 @@ for i in range(27): self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(unicode), mox.IsA(str)) - + class TestCheckUnusedSoname(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'SetCheckLibraries' def testUnusedSoname(self): @@ -1419,7 +1419,7 @@ self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ - "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib": (u"CSWlibssl1-0-0",), "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcurses.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) @@ -1459,10 +1459,10 @@ "/usr/lib": (u"SUNWcsl",), "/usr/lib/sparcv9": (u"SUNWcslx"),}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ - "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib": (u"CSWlibssl1-0-0",), "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libz.so.1').AndReturn({ - "/opt/csw/lib": (u"CSWlibz1",), + "/opt/csw/lib": (u"CSWlibz1",), "/opt/csw/lib/sparcv9": (u"CSWlibz1",), "/usr/lib": (u"SUNWzlib")}) @@ -1479,7 +1479,7 @@ for soname in [ 'libcurses.so.1', 'libz.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', 'libexpat.so.1' ]: self.error_mgr_mock.ReportError( - 'CSWcadaver', 'soname-unused', + 'CSWcadaver', 'soname-unused', soname + ' is needed by /opt/csw/bin/cadaver but never used') class TestCheckDirectBinding(CheckTestHelper, unittest.TestCase): @@ -1490,7 +1490,7 @@ self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ - "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib": (u"CSWlibssl1-0-0",), "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",), @@ -1501,7 +1501,7 @@ "/usr/lib/sparcv9": (u"SUNWcslx"), }) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('librt.so.1').AndReturn({ - '/usr/lib': [u'SUNWcsl'], + '/usr/lib': [u'SUNWcsl'], '/usr/lib/sparcv9': [u'SUNWcslx']}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsendfile.so.1').AndReturn({ '/usr/lib': [u'SUNWcsl'], @@ -1510,15 +1510,15 @@ "/usr/lib": (u"SUNWcsl",), "/usr/lib/sparcv9": (u"SUNWcslx"),}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ - "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib": (u"CSWlibssl1-0-0",), "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", "/opt/csw/share/doc", "/etc/opt/csw"]: self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) - for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', - 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', 'libc.so.1' ]: self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) @@ -1526,7 +1526,7 @@ self.error_mgr_mock.ReportError( 'CSWvsftpd', 'no-direct-binding', - '/opt/csw/sbin/vsftpd is not directly binded to soname ' + soname) + '/opt/csw/sbin/vsftpd is not directly bound to soname ' + soname) def testDirectBindingNoSyminfo(self): self.pkg_data = vsftpd_stats @@ -1537,7 +1537,7 @@ self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libcrypto.so.1.0.0').AndReturn({ - "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib": (u"CSWlibssl1-0-0",), "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libnsl.so.1').AndReturn({ "/usr/lib": (u"SUNWcsl",), @@ -1548,7 +1548,7 @@ "/usr/lib/sparcv9": (u"SUNWcslx"), }) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('librt.so.1').AndReturn({ - '/usr/lib': [u'SUNWcsl'], + '/usr/lib': [u'SUNWcsl'], '/usr/lib/sparcv9': [u'SUNWcslx']}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libsendfile.so.1').AndReturn({ '/usr/lib': [u'SUNWcsl'], @@ -1557,20 +1557,20 @@ "/usr/lib": (u"SUNWcsl",), "/usr/lib/sparcv9": (u"SUNWcslx"),}) self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libssl.so.1.0.0').AndReturn({ - "/opt/csw/lib": (u"CSWlibssl1-0-0",), + "/opt/csw/lib": (u"CSWlibssl1-0-0",), "/opt/csw/lib/sparcv9": (u"CSWlibssl1-0-0",)}) for common_path in ["/opt/csw/share/man", "/var/opt/csw", "/opt/csw/sbin", "/opt/csw/share/doc", "/etc/opt/csw"]: self.error_mgr_mock.GetPkgByPath(common_path).AndReturn([u"CSWcommon"]) - for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', - 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + for soname in [ 'libnsl.so.1', 'libpam.so.1', 'libsocket.so.1', 'librt.so.1', + 'libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', 'libc.so.1' ]: self.error_mgr_mock.NeedFile( mox.IsA(str), mox.IsA(str), mox.IsA(str)) - for soname in [ 'libpam.so.1', 'libnsl.so.1', 'libcrypto.so.1.0.0', + for soname in [ 'libpam.so.1', 'libnsl.so.1', 'libcrypto.so.1.0.0', 'librt.so.1', 'libsendfile.so.1', 'libssl.so.1.0.0', 'libsocket.so.1', 'libc.so.1' ]: self.error_mgr_mock.ReportError( 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 19 23:06:26 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 21:06:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19240] csw/mgar/gar/v2-yann/lib/python/dependency_checks. py Message-ID: Revision: 19240 http://gar.svn.sourceforge.net/gar/?rev=19240&view=rev Author: chninkel Date: 2012-09-19 21:06:25 +0000 (Wed, 19 Sep 2012) Log Message: ----------- 'I should go back to school to study english' fix Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2-yann/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-19 21:05:12 UTC (rev 19239) +++ csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-19 21:06:25 UTC (rev 19240) @@ -188,21 +188,21 @@ # For example, libc.so.1 does it for symbol sigaction, free, malloc and realloc # So we consider that direct binding is enabled if at least one symbol is directly # bound to because that definitely means that -B direct or -z direct was used. - directly_binded = set() + directly_bound = set() for syminfo in pkg_data["binaries_elf_info"][binary_info["path"]]['symbol table']: if syminfo['external'] and syminfo['flags'] and 'D' in syminfo['flags'] and 'B' in syminfo['flags']: - directly_binded.add(syminfo['soname']) - not_directly_binded = directly_binded.symmetric_difference(binary_info["needed sonames"]) + directly_bound.add(syminfo['soname']) + not_directly_bound = directly_bound.symmetric_difference(binary_info["needed sonames"]) - if not_directly_binded: + if not_directly_bound: messenger.Message( - "No symbol of binary %s is directly binded against the following libraries: %s. " + "No symbol of binary %s is directly bound against the following libraries: %s. " "Please make sure the binaries are compiled using the \"-Bdirect\" linker option." - % ("/" + binary_info["path"], ", ".join(not_directly_binded))) - for soname in not_directly_binded: + % ("/" + binary_info["path"], ", ".join(not_directly_bound))) + for soname in not_directly_bound: error_mgr.ReportError( pkgname, "no-direct-binding", - "%s is not directly binded to soname %s" % ("/" + binary_info["path"], soname)) + "%s is not directly bound to soname %s" % ("/" + binary_info["path"], soname)) for version_dep in pkg_data["binaries_elf_info"][binary_info["path"]]['version needed']: 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 19 23:59:22 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 21:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19241] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19241 http://gar.svn.sourceforge.net/gar/?rev=19241&view=rev Author: chninkel Date: 2012-09-19 21:59:21 +0000 (Wed, 19 Sep 2012) Log Message: ----------- more verbose regexp Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 21:06:25 UTC (rev 19240) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 21:59:21 UTC (rev 19241) @@ -393,25 +393,67 @@ def _ParseElfdumpLine(self, line, section=None): - headers_re = (r'(?P
Version Needed|Version Definition|Symbol Table|Syminfo) Section:\s+(?:\.SUNW_version|\.dynsym|\.SUNW_syminfo|.symtab)\s*$|' - '\s*(?:index\s+)?version\s+dependency\s*$|' - '\s*(?:index\s+)?file\s+version\s*$|' - '\s*index\s*value\s+size\s+type\s+bind\s+oth\s+ver\s+shndx\s+name\s*$|' - '\s*index\s+flags\s+bound to\s+symbol\s*$|' - '\s*$') + headers_re = ( + r""" + (?P
Version\sNeeded|Symbol\sTable # Section header + |Version\sDefinition|Syminfo) + \sSection: + \s+(?:\.SUNW_version|\.dynsym + |\.SUNW_syminfo|.symtab)\s*$ + |\s*(?:index\s+)?version\s+dependency\s*$ # Version needed header + |\s*(?:index\s+)?file\s+version\s*$ # Version definition header + |\s*index\s*value\s+size\s+type\s+bind # Symbol table header + \s+oth\s+ver\s+shndx\s+name\s*$ + |\s*index\s+flags\s+bound to\s+symbol\s*$ # Syminfo header + |\s*$ # There is always a blank + # line before a new section + """) - re_by_section = { 'version definition': (r'\s*(?:\[(?P\d+)\]\s+)?(?P.*\S)\s+(?P\S+)?\s*$'), - 'version needed': (r'\s*(?:\[(?P\d+)\]\s+)?(?:(?P\S+)\s+(?!\[ (?:INFO|WEAK) \]))?(?P\S+)(?:\s+\[ (?:INFO|WEAK) \])?\s*$'), - 'symbol table': (r'\s*\[\d+\]\s+(?:0x[0-9a-f]+|REG_G\d+)\s+0x[0-9a-f]+\s+\S+\s+(?P\S+)\s+\S+\s+(?P\S+)\s+(?P\S+)\s+(?P\S+)?\s*$'), - 'syminfo': (r'\s*\[\d+\]\s+(?P[ABCDFILNPS]+)\s+(?:(?:\[\d+\]\s+(?P.*\S)|)\s+)?(?P.*\S)\s*') } + re_by_section = { + 'version definition': (r""" + \s*(?:\[(?P\d+)\]\s+)? # index might be not present + # if no version binding is enabled + (?P.*\S) + \s+(?P\S+)?\s*$ + """), + 'version needed': (r""" + \s*(?:\[(?P\d+)\]\s+)? # index might be not present + # if no version binding is enabled + (?:(?P\S+)\s+ # file can be absent if the same as + (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, we make sure + # version is not confused with file + # in that case + (?P\S+) + (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # + """), + 'symbol table': (r""" + \s*\[\d+\] + \s+(?:0x[0-9a-f]+|REG_G\d+) + \s+0x[0-9a-f]+ + \s+\S+ + \s+(?P\S+) + \s+\S+ + \s+(?P\S+) + \s+(?P\S+) + \s+(?P\S+)?\s*$ + """), + 'syminfo': (r""" + \s*\[\d+\] + \s+(?P[ABCDFILNPS]+) + \s+(?:(?:\[\d+\] # some kind of library index + \s+(?P.*\S)|)\s+)? # library is not present + # for external symbols not + # directly bound + (?P.*\S)\s* + """)} elfdump_data = None - m = re.match(headers_re, line) + m = re.match(headers_re, line, re.VERBOSE) if m: if m.lastindex: section = m.group('section').lower() elif section: - m = re.match(re_by_section[section], line) + m = re.match(re_by_section[section], line, re.VERBOSE) if m: elfdump_data = m.groupdict() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Sep 20 00:17:15 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 22:17:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[19242] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19242 http://gar.svn.sourceforge.net/gar/?rev=19242&view=rev Author: chninkel Date: 2012-09-19 22:17:14 +0000 (Wed, 19 Sep 2012) Log Message: ----------- fixed a forgotten space in a verbose regexp Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 21:59:21 UTC (rev 19241) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 22:17:14 UTC (rev 19242) @@ -404,7 +404,7 @@ |\s*(?:index\s+)?file\s+version\s*$ # Version definition header |\s*index\s*value\s+size\s+type\s+bind # Symbol table header \s+oth\s+ver\s+shndx\s+name\s*$ - |\s*index\s+flags\s+bound to\s+symbol\s*$ # Syminfo header + |\s*index\s+flags\s+bound\sto\s+symbol\s*$ # Syminfo header |\s*$ # There is always a blank # line before a new section """) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Sep 20 00:18:13 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 19 Sep 2012 22:18:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19243] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19243 http://gar.svn.sourceforge.net/gar/?rev=19243&view=rev Author: chninkel Date: 2012-09-19 22:18:13 +0000 (Wed, 19 Sep 2012) Log Message: ----------- fixed bad indentation mistake Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 22:17:14 UTC (rev 19242) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-19 22:18:13 UTC (rev 19243) @@ -327,8 +327,8 @@ version = binary_info['version definition'][version_index] else: version = binary_info['version needed'][version_index - nb_versions_definition] - sym_info['version'] = version['version'] - sym_info['soname'] = version['soname'] + sym_info['version'] = version['version'] + sym_info['soname'] = version['soname'] else: sym_info['version'] = None This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 20 01:55:02 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 19 Sep 2012 23:55:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[19244] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 19244 http://gar.svn.sourceforge.net/gar/?rev=19244&view=rev Author: wahwah Date: 2012-09-19 23:55:02 +0000 (Wed, 19 Sep 2012) Log Message: ----------- lang-python/python/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-09-19 22:18:13 UTC (rev 19243) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-09-19 23:55:02 UTC (rev 19244) @@ -160,8 +160,8 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-4 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk BUILD_DEP_PKGS += CSWlibffi-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 20 02:09:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Sep 2012 00:09:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19245] csw/mgar/pkg/syslog_ng/trunk/Makefile Message-ID: Revision: 19245 http://gar.svn.sourceforge.net/gar/?rev=19245&view=rev Author: wahwah Date: 2012-09-20 00:09:28 +0000 (Thu, 20 Sep 2012) Log Message: ----------- update deps; openssl-1.0.0 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-09-19 23:55:02 UTC (rev 19244) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-09-20 00:09:28 UTC (rev 19245) @@ -61,7 +61,7 @@ RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1 # Specifying different dependencies for 5.9 and 5.10. 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 20 02:14:56 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Sep 2012 00:14:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19246] csw/mgar/pkg/syslog_ng/trunk/Makefile Message-ID: Revision: 19246 http://gar.svn.sourceforge.net/gar/?rev=19246&view=rev Author: wahwah Date: 2012-09-20 00:14:56 +0000 (Thu, 20 Sep 2012) Log Message: ----------- different deps for 5.9 and 5.10 separately Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-09-20 00:09:28 UTC (rev 19245) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2012-09-20 00:14:56 UTC (rev 19246) @@ -61,15 +61,16 @@ RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1 # Specifying different dependencies for 5.9 and 5.10. RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWglib2 +RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWsyslog-ng += $(RUNTIME_DEP_PKGS_CSWsyslog-ng_$(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 Thu Sep 20 12:03:16 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 20 Sep 2012 10:03:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19247] csw/mgar/pkg/cpan Message-ID: Revision: 19247 http://gar.svn.sourceforge.net/gar/?rev=19247&view=rev Author: dmichelsen Date: 2012-09-20 10:03:15 +0000 (Thu, 20 Sep 2012) Log Message: ----------- cpan/File-RelDir/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/cpan/File-RelDir/ csw/mgar/pkg/cpan/File-RelDir/branches/ csw/mgar/pkg/cpan/File-RelDir/tags/ csw/mgar/pkg/cpan/File-RelDir/trunk/ csw/mgar/pkg/cpan/File-RelDir/trunk/Makefile csw/mgar/pkg/cpan/File-RelDir/trunk/checksums csw/mgar/pkg/cpan/File-RelDir/trunk/files/ Property changes on: csw/mgar/pkg/cpan/File-RelDir/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/File-RelDir/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-RelDir/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-RelDir/trunk/Makefile 2012-09-20 10:03:15 UTC (rev 19247) @@ -0,0 +1,20 @@ +NAME = File-RelDir +VERSION = 0.1 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = DROBERTS + +DESCRIPTION = Determine the relative path between two directory names +define BLURB +endef + +CATALOG_RELEASE = unstable + +LICENSE_TEXT = This module is licensed under the unknown license + +PACKAGES += CSWpm-file-reldir +CATALOGNAME_CSWpm-file-reldir = pm_file_reldir +SPKG_DESC_CSWpm-file-reldir = Determine the relative path between two directory names +ARCHALL_CSWpm-file-reldir = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-RelDir/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-RelDir/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-RelDir/trunk/checksums 2012-09-20 10:03:15 UTC (rev 19247) @@ -0,0 +1 @@ +8f97dd55089e354c95052cc90c3c2cb8 File-RelDir-0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Sep 20 13:17:22 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 20 Sep 2012 11:17:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19248] csw/mgar/pkg/resiprocate/trunk/Makefile Message-ID: Revision: 19248 http://gar.svn.sourceforge.net/gar/?rev=19248&view=rev Author: d_pocock Date: 2012-09-20 11:17:22 +0000 (Thu, 20 Sep 2012) Log Message: ----------- resiprocate: update for 1.8.5. Add download URL Modified Paths: -------------- csw/mgar/pkg/resiprocate/trunk/Makefile Modified: csw/mgar/pkg/resiprocate/trunk/Makefile =================================================================== --- csw/mgar/pkg/resiprocate/trunk/Makefile 2012-09-20 10:03:15 UTC (rev 19247) +++ csw/mgar/pkg/resiprocate/trunk/Makefile 2012-09-20 11:17:22 UTC (rev 19248) @@ -1,9 +1,12 @@ NAME = resiprocate -VERSION = 1.8.0 +VERSION = 1.8.5 CATEGORIES = utils +MASTER_SITES = https://www.resiprocate.org/files/pub/reSIProcate/releases/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 + #PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 DESCRIPTION = full-featured reference implementation of SIP in C++ define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Sep 20 13:20:03 2012 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 20 Sep 2012 11:20:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19249] csw/mgar/pkg/resiprocate/trunk/checksums Message-ID: Revision: 19249 http://gar.svn.sourceforge.net/gar/?rev=19249&view=rev Author: d_pocock Date: 2012-09-20 11:20:03 +0000 (Thu, 20 Sep 2012) Log Message: ----------- resiprocate: update for 1.8.5 MD5 hash Modified Paths: -------------- csw/mgar/pkg/resiprocate/trunk/checksums Modified: csw/mgar/pkg/resiprocate/trunk/checksums =================================================================== --- csw/mgar/pkg/resiprocate/trunk/checksums 2012-09-20 11:17:22 UTC (rev 19248) +++ csw/mgar/pkg/resiprocate/trunk/checksums 2012-09-20 11:20:03 UTC (rev 19249) @@ -1 +1 @@ -839d70c0340297499cec4acdb524e704 resiprocate-1.8.0.tar.gz +70754747edf22cfd752a39eb81f0d2a1 resiprocate-1.8.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Sep 20 17:11:35 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Sep 2012 15:11:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19250] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 19250 http://gar.svn.sourceforge.net/gar/?rev=19250&view=rev Author: wahwah Date: 2012-09-20 15:11:35 +0000 (Thu, 20 Sep 2012) Log Message: ----------- lang-python/python/trunk: The Solaris 9 build segfaults Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-09-20 11:20:03 UTC (rev 19249) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-09-20 15:11:35 UTC (rev 19250) @@ -36,7 +36,9 @@ DISTFILES = $(DISTNAME).tar.bz2 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +# There is a segfault happening on Solaris 9 i386. I'm disabling the Solaris +# 9 until we debug it or the upstream fixes it. +# PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 # Some features are missing on Solaris 9, e.g. functionality required for the # multiprocessing support. # http://osdir.com/ml/opensolaris-discuss/2009-07/msg00865.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 20 17:33:23 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 20 Sep 2012 15:33:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19251] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 19251 http://gar.svn.sourceforge.net/gar/?rev=19251&view=rev Author: wahwah Date: 2012-09-20 15:33:23 +0000 (Thu, 20 Sep 2012) Log Message: ----------- lang-python/python/trunk: adjust dependencies for Solaris 10 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-09-20 15:11:35 UTC (rev 19250) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2012-09-20 15:33:23 UTC (rev 19251) @@ -153,7 +153,7 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 @@ -161,9 +161,9 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtk8-5 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-4 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk BUILD_DEP_PKGS += CSWlibffi-dev 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 21 09:05:29 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 07:05:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19252] csw/mgar/pkg/gtk2/trunk Message-ID: Revision: 19252 http://gar.svn.sourceforge.net/gar/?rev=19252&view=rev Author: cgrzemba Date: 2012-09-21 07:05:28 +0000 (Fri, 21 Sep 2012) Log Message: ----------- gtk2/trunk: bump version 2.24.12 Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/checksums Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2012-09-20 15:33:23 UTC (rev 19251) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2012-09-21 07:05:28 UTC (rev 19252) @@ -1,11 +1,11 @@ # $Id$ NAME = gtk2 -VERSION = 2.24.8 +VERSION = 2.24.12 CATEGORIES = lib GARTYPE = v2 -GARCOMPILER = SOS12U1 +GARCOMPILER = SOS12U3 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development @@ -20,7 +20,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTNAME = gtk+-$(VERSION) -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz DISTFILES += CSWgtk2.postinstall DISTFILES += README.CSW Modified: csw/mgar/pkg/gtk2/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk2/trunk/checksums 2012-09-20 15:33:23 UTC (rev 19251) +++ csw/mgar/pkg/gtk2/trunk/checksums 2012-09-21 07:05:28 UTC (rev 19252) @@ -1 +1 @@ -0413187f7e596aef00ccd1b54776ff03 gtk+-2.24.8.tar.bz2 +af16f167ac870bf4b0804e06f8b5cbbf gtk+-2.24.12.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 Fri Sep 21 09:07:13 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 07:07:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19253] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 19253 http://gar.svn.sourceforge.net/gar/?rev=19253&view=rev Author: cgrzemba Date: 2012-09-21 07:07:12 +0000 (Fri, 21 Sep 2012) Log Message: ----------- glib2/trunk: set GARCOMPILER = SOS12U3 Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2012-09-21 07:05:28 UTC (rev 19252) +++ csw/mgar/pkg/glib2/trunk/Makefile 2012-09-21 07:07:12 UTC (rev 19253) @@ -11,7 +11,7 @@ VERSION = 2.32.4 CATEGORIES = lib GARTYPE = v2 -GARCOMPILER = SOS12U1 +GARCOMPILER = SOS12U3 DESCRIPTION = The GLib library of C routines. define BLURB 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 21 10:40:26 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 08:40:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19254] csw/mgar/pkg/babl/trunk Message-ID: Revision: 19254 http://gar.svn.sourceforge.net/gar/?rev=19254&view=rev Author: cgrzemba Date: 2012-09-21 08:40:25 +0000 (Fri, 21 Sep 2012) Log Message: ----------- babl/trunk: bump version 0.1.10 Modified Paths: -------------- csw/mgar/pkg/babl/trunk/Makefile csw/mgar/pkg/babl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/babl/trunk/files/0002-include-iso-limits-babl-palette.c.patch Modified: csw/mgar/pkg/babl/trunk/Makefile =================================================================== --- csw/mgar/pkg/babl/trunk/Makefile 2012-09-21 07:07:12 UTC (rev 19253) +++ csw/mgar/pkg/babl/trunk/Makefile 2012-09-21 08:40:25 UTC (rev 19254) @@ -1,5 +1,5 @@ NAME = babl -VERSION = 0.1.6 +VERSION = 0.1.10 CATEGORIES = gnome GARTYPE = v2 @@ -12,9 +12,12 @@ MASTER_SITES = http://ftp.gtk.org/pub/babl/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ DISTFILES += $(NAME)-$(VERSION).tar.bz2 +GARCOMPILER = SOS12U3 + # Use patch until this is fixed: # https://bugzilla.gnome.org/show_bug.cgi?id=664800 PATCHFILES += 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch +PATCHFILES += 0002-include-iso-limits-babl-palette.c.patch VENDOR_URL = http://gegl.org/babl/ @@ -42,4 +45,8 @@ # https://bugzilla.gnome.org/show_bug.cgi?id=664800 SKIPTEST ?= 1 +# wrong option for SolarisStudio Compiler +CONFIGURE_ARGS += --enable-mmx=no +# CONFIGURE_ARGS += --disable-sse + include gar/category.mk Modified: csw/mgar/pkg/babl/trunk/checksums =================================================================== --- csw/mgar/pkg/babl/trunk/checksums 2012-09-21 07:07:12 UTC (rev 19253) +++ csw/mgar/pkg/babl/trunk/checksums 2012-09-21 08:40:25 UTC (rev 19254) @@ -1 +1 @@ -dc960981a5ec5330fc1c177be9f59068 babl-0.1.6.tar.bz2 +9e1542ab5c0b12ea3af076a9a2f02d79 babl-0.1.10.tar.bz2 Added: csw/mgar/pkg/babl/trunk/files/0002-include-iso-limits-babl-palette.c.patch =================================================================== --- csw/mgar/pkg/babl/trunk/files/0002-include-iso-limits-babl-palette.c.patch (rev 0) +++ csw/mgar/pkg/babl/trunk/files/0002-include-iso-limits-babl-palette.c.patch 2012-09-21 08:40:25 UTC (rev 19254) @@ -0,0 +1,10 @@ +--- a/babl/babl-palette.c ++++ b/babl/babl-palette.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "config.h" + #include "babl-internal.h" + #include "babl.h" 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 21 11:50:56 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Sep 2012 09:50:56 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[625] buildfarm/bin/rest-interface/getcatalog Message-ID: Revision: 625 http://opencsw.svn.sourceforge.net/opencsw/?rev=625&view=rev Author: dmichelsen Date: 2012-09-21 09:50:56 +0000 (Fri, 21 Sep 2012) Log Message: ----------- depgraph-catalog generation: Add monitoring Modified Paths: -------------- buildfarm/bin/rest-interface/getcatalog Modified: buildfarm/bin/rest-interface/getcatalog =================================================================== --- buildfarm/bin/rest-interface/getcatalog 2012-07-24 02:32:36 UTC (rev 624) +++ buildfarm/bin/rest-interface/getcatalog 2012-09-21 09:50:56 UTC (rev 625) @@ -10,6 +10,8 @@ use Parallel::ForkManager; use LWP::UserAgent; +my $start = time; + my $ua = LWP::UserAgent->new; $ua->timeout(600); @@ -57,7 +59,7 @@ # }; -my $pm = new Parallel::ForkManager(10, '/home/web/rest-interface/tmp' ); +my $pm = new Parallel::ForkManager(10, '/home/web/bin/rest-interface/tmp' ); # data structure retrieval and handling $pm -> run_on_finish ( # called BEFORE the first call to start() @@ -75,6 +77,8 @@ } ); +my ($having, $retreiving) = (0, 0); + # Retreive the missing data foreach my $pkg (@$catalog_data) { my $md5 = $pkg->{md5_sum}; @@ -82,8 +86,10 @@ my $url = "http://buildfarm.opencsw.org/pkgdb/rest/srv4/${md5}/pkg-stats/"; if( exists $md5cache{$md5} ) { + $having++; print "Having $md5\n"; } else { + $retreiving++; $pm->start() and next; print "Retreiving $md5\n"; @@ -116,3 +122,9 @@ unlink( "catalog" ); link( "catalog.new", "catalog" ); unlink( "catalog.new" ); + +my $runtime = time - $start; + +open S, "| /opt/csw/nagios/bin/send_nsca -H 192.168.1.50 -d ';' -c /etc/opt/csw/nagios/send_nsca.cfg"; +print S "buildfarm.opencsw.org;DEPGRAPH-CATALOG;0;Read $having from cache and retreived $retreiving in $runtime seconds\n"; +close S; 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 21 11:52:08 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 09:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19255] csw/mgar/pkg/babl/trunk/Makefile Message-ID: Revision: 19255 http://gar.svn.sourceforge.net/gar/?rev=19255&view=rev Author: cgrzemba Date: 2012-09-21 09:52:08 +0000 (Fri, 21 Sep 2012) Log Message: ----------- babl/trunk: fix dirpaths Modified Paths: -------------- csw/mgar/pkg/babl/trunk/Makefile Modified: csw/mgar/pkg/babl/trunk/Makefile =================================================================== --- csw/mgar/pkg/babl/trunk/Makefile 2012-09-21 08:40:25 UTC (rev 19254) +++ csw/mgar/pkg/babl/trunk/Makefile 2012-09-21 09:52:08 UTC (rev 19255) @@ -12,6 +12,7 @@ MASTER_SITES = http://ftp.gtk.org/pub/babl/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ DISTFILES += $(NAME)-$(VERSION).tar.bz2 +PACKAGING_PLATFORMS += Solaris10-sparc Solaris10-i386 GARCOMPILER = SOS12U3 # Use patch until this is fixed: @@ -27,10 +28,10 @@ PKGFILES_CSWlibbabl0-1-0 += $(call baseisadirs,$(libdir),babl-0.1/.*) OBSOLETED_BY_CSWlibbabl0-1-0 += CSWlibbabl -PACKAGES += CSWlibbabl-dev -SPKG_DESC_CSWlibbabl-dev = Development files for libbabl-0.1.so.0 +# PACKAGES += CSWlibbabl-dev +# SPKG_DESC_CSWlibbabl-dev = Development files for libbabl-0.1.so.0 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0 +# RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0 BUILD64_LIBS_ONLY = 1 @@ -46,7 +47,7 @@ SKIPTEST ?= 1 # wrong option for SolarisStudio Compiler +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-mmx=no -# CONFIGURE_ARGS += --disable-sse include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Sep 21 12:07:04 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 10:07:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19256] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 19256 http://gar.svn.sourceforge.net/gar/?rev=19256&view=rev Author: cgrzemba Date: 2012-09-21 10:07:03 +0000 (Fri, 21 Sep 2012) Log Message: ----------- glib2/trunk: add SKIPTEST Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2012-09-21 09:52:08 UTC (rev 19255) +++ csw/mgar/pkg/glib2/trunk/Makefile 2012-09-21 10:07:03 UTC (rev 19256) @@ -314,6 +314,8 @@ # DTrace compilation fails, disable for now CONFIGURE_ARGS += --disable-dtrace +SKIPTEST = 1 + # Those are to make the checks work EXTRA_COMMON_EXPORTS = TZ EXTRA_COMMON_EXPORTS += DISPLAY 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 21 12:21:43 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 10:21:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19257] csw/mgar/pkg/libsoup2/trunk Message-ID: Revision: 19257 http://gar.svn.sourceforge.net/gar/?rev=19257&view=rev Author: cgrzemba Date: 2012-09-21 10:21:43 +0000 (Fri, 21 Sep 2012) Log Message: ----------- libsoup2/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile csw/mgar/pkg/libsoup2/trunk/checksums Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:07:03 UTC (rev 19256) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:21:43 UTC (rev 19257) @@ -1,5 +1,5 @@ NAME = libsoup -VERSION = 2.26.3 +VERSION = 2.33.92 CATEGORIES = lib GARTYPE = v2 @@ -41,7 +41,9 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = $(DIRPATHS) --disable-static +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --disable-tls-check # Test disabled because of missing Apache stuff TEST_TARGET = Modified: csw/mgar/pkg/libsoup2/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup2/trunk/checksums 2012-09-21 10:07:03 UTC (rev 19256) +++ csw/mgar/pkg/libsoup2/trunk/checksums 2012-09-21 10:21:43 UTC (rev 19257) @@ -1 +1 @@ -19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 +1999f4541d62b8eced6a5996339799da libsoup-2.33.92.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 Fri Sep 21 12:53:43 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 10:53:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19258] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 19258 http://gar.svn.sourceforge.net/gar/?rev=19258&view=rev Author: cgrzemba Date: 2012-09-21 10:53:43 +0000 (Fri, 21 Sep 2012) Log Message: ----------- libsoup2/trunk: rework packaging Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:21:43 UTC (rev 19257) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:53:43 UTC (rev 19258) @@ -10,34 +10,56 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWlibsoup2 -PACKAGES += CSWlibsoup2dev -SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME -SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files +PACKAGES += CSWlibsoup2-4-1 +CATALOGNAME_CSWlibsoup2-4-1 = libsoup2_4_1 +PKGFILES_CSWlibsoup2-4-1 += $(call baseisadirs,$(libdir),libsoup-2\.4\.so\.1\.3\.0) +PKGFILES_CSWlibsoup2-4-1 += $(call baseisadirs,$(libdir),libsoup-2\.4\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibsoup2-4-1 += $(DESCRIPTION), libsoup-2.4.so.1 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgio2-0-0 +OBSOLTED_BY_CSWlibsoup2-4-1 = CSWlibsoup -RUNTIME_DEP_PKGS_CSWlibsoup2 = CSWgconf2 -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgcrypt -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgnutls -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgpgerr -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibproxy -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWsqlite3rt +PACKAGES += CSWlibsoup-gnome2-4-1 +CATALOGNAME_CSWlibsoup-gnome2-4-1 = libsoup_gnome2_4_1 +PKGFILES_CSWlibsoup-gnome2-4-1 += $(call baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1\.3\.0) +PKGFILES_CSWlibsoup-gnome2-4-1 += $(call baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibsoup-gnome2-4-1 += $(DESCRIPTION), libsoup-gnome-2.4.so.1 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibsoup2-4-1 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibglib2-0-0 +OBSOLTED_BY_CSWlibsoup-gnome2-4-1 = CSWlibsoup -RUNTIME_DEP_PKGS_CSWlibsoup2dev += CSWlibsoup2 +PACKAGES += CSWlibsoup2-dev +CATALOGNAME_CSWlibsoup2-dev = libsoup2_dev +SPKG_DESC_CSWlibsoup2-dev += $(DESCRIPTION), development files +# PKGFILES_CSWlibsoup2-dev += /opt/csw/lib/libsoup-2.4.so +PKGFILES_CSWlibsoup2-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup2-4-1 +RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup-gnome2-4-1 +OBSOLETED_BY_CSWlibsoup2-dev = CSWlibsoupdevel +CATALOGNAME_CSWlibsoupdevel = libsoup_devel_stub - -PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/.* -PKGFILES_CSWlibsoup2dev += /opt/csw/include/.* - - -EXTRA_INC = /opt/csw/X11/include -EXTRA_LIB = /opt/csw/X11/lib +# EXTRA_INC = /opt/csw/X11/include +# EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Sep 21 13:10:51 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 11:10:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19259] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 19259 http://gar.svn.sourceforge.net/gar/?rev=19259&view=rev Author: cgrzemba Date: 2012-09-21 11:10:51 +0000 (Fri, 21 Sep 2012) Log Message: ----------- libsoup2/trunk: keep doc package Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:53:43 UTC (rev 19258) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 11:10:51 UTC (rev 19259) @@ -28,7 +28,7 @@ RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgio2-0-0 -OBSOLTED_BY_CSWlibsoup2-4-1 = CSWlibsoup +OBSOLETED_BY_CSWlibsoup2-4-1 = CSWlibsoup PACKAGES += CSWlibsoup-gnome2-4-1 CATALOGNAME_CSWlibsoup-gnome2-4-1 = libsoup_gnome2_4_1 @@ -46,8 +46,13 @@ RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibglib2-0-0 -OBSOLTED_BY_CSWlibsoup-gnome2-4-1 = CSWlibsoup +OBSOLETED_BY_CSWlibsoup-gnome2-4-1 = CSWlibsoup +PACKAGES += CSWlibsoupdoc +SPKG_DESC_CSWlibsoupdoc += $(DESCRIPTION), documentation +PKGFILES_CSWlibsoupdoc += $(sharedstatedir)/gtk-doc/.* +ARCHALL_CSWlibsoupdoc = 1 + PACKAGES += CSWlibsoup2-dev CATALOGNAME_CSWlibsoup2-dev = libsoup2_dev SPKG_DESC_CSWlibsoup2-dev += $(DESCRIPTION), development files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at opencsw.org Fri Sep 21 13:12:38 2012 From: wilbury at opencsw.org (Juraj Lutter) Date: Fri, 21 Sep 2012 13:12:38 +0200 Subject: [csw-devel] SF.net SVN: gar:[19258] csw/mgar/pkg/libsoup2/trunk/Makefile In-Reply-To: References: Message-ID: <505C4BA6.9080608@opencsw.org> On 09/21/2012 12:53 PM, cgrzemba at users.sourceforge.net wrote: > +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 This should be ``solaris10-'' with lowercase ``s'', afaik. -- Juraj Lutter From cgrzemba at users.sourceforge.net Fri Sep 21 15:03:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 13:03:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19260] csw/mgar/pkg/babl/trunk/Makefile Message-ID: Revision: 19260 http://gar.svn.sourceforge.net/gar/?rev=19260&view=rev Author: cgrzemba Date: 2012-09-21 13:03:43 +0000 (Fri, 21 Sep 2012) Log Message: ----------- babl/trunk: activate devel package Modified Paths: -------------- csw/mgar/pkg/babl/trunk/Makefile Modified: csw/mgar/pkg/babl/trunk/Makefile =================================================================== --- csw/mgar/pkg/babl/trunk/Makefile 2012-09-21 11:10:51 UTC (rev 19259) +++ csw/mgar/pkg/babl/trunk/Makefile 2012-09-21 13:03:43 UTC (rev 19260) @@ -28,10 +28,10 @@ PKGFILES_CSWlibbabl0-1-0 += $(call baseisadirs,$(libdir),babl-0.1/.*) OBSOLETED_BY_CSWlibbabl0-1-0 += CSWlibbabl -# PACKAGES += CSWlibbabl-dev -# SPKG_DESC_CSWlibbabl-dev = Development files for libbabl-0.1.so.0 +PACKAGES += CSWlibbabl-dev +SPKG_DESC_CSWlibbabl-dev = Development files for libbabl-0.1.so.0 # PKGFILES is catchall -# RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0 +RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0 BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Sep 21 15:41:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 13:41:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19261] csw/mgar/pkg/gobject-introspection/trunk Message-ID: Revision: 19261 http://gar.svn.sourceforge.net/gar/?rev=19261&view=rev Author: cgrzemba Date: 2012-09-21 13:41:44 +0000 (Fri, 21 Sep 2012) Log Message: ----------- gobject-introspection/trunk: bump version 1.29.17 Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile csw/mgar/pkg/gobject-introspection/trunk/checksums Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-09-21 13:03:43 UTC (rev 19260) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-09-21 13:41:44 UTC (rev 19261) @@ -1,5 +1,5 @@ NAME = gobject-introspection -VERSION = 0.10.8 +VERSION = 1.29.17 CATEGORIES = gnome GARTYPE = v2 @@ -41,6 +41,7 @@ PACKAGES += CSWgobject-introspection-dev CATALOGNAME_CSWgobject-introspection-dev = gobject_introspection_dev SPKG_DESC_CSWgobject-introspection-dev += $(DESCRIPTION), development files +PKGFILES_CSWgobject-introspection-dev += $(PKGFILES_DEVEL) PKGFILES_CSWgobject-introspection-dev += /opt/csw/lib/libgirepository-1.0.so RUNTIME_DEP_PKGS_CSWgobject-introspection-dev += CSWlibgirepository1-0-1 @@ -130,6 +131,8 @@ BUILD_OVERRIDE_VARS = V BUILD_OVERRIDE_VARS_V = 1 +EXTRA_LINKER_FLAGS += -lgmodule-2.0 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += --enable-gtk-doc Modified: csw/mgar/pkg/gobject-introspection/trunk/checksums =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/checksums 2012-09-21 13:03:43 UTC (rev 19260) +++ csw/mgar/pkg/gobject-introspection/trunk/checksums 2012-09-21 13:41:44 UTC (rev 19261) @@ -1 +1 @@ -b5da58a5327d13b4d1e08b8e42b2456d gobject-introspection-0.10.8.tar.bz2 +0870718ff9c7071875cb9ee604271283 gobject-introspection-1.29.17.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 Fri Sep 21 15:58:33 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 21 Sep 2012 13:58:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19262] csw/mgar/pkg/gobject-introspection/trunk/Makefile Message-ID: Revision: 19262 http://gar.svn.sourceforge.net/gar/?rev=19262&view=rev Author: cgrzemba Date: 2012-09-21 13:58:33 +0000 (Fri, 21 Sep 2012) Log Message: ----------- gobject-introspection/trunk: dirty hack for linking gmodule-2.0 Modified Paths: -------------- csw/mgar/pkg/gobject-introspection/trunk/Makefile Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-09-21 13:41:44 UTC (rev 19261) +++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-09-21 13:58:33 UTC (rev 19262) @@ -131,7 +131,8 @@ BUILD_OVERRIDE_VARS = V BUILD_OVERRIDE_VARS_V = 1 -EXTRA_LINKER_FLAGS += -lgmodule-2.0 +# this has not helped, I have added -lgmodule-2.0 in glib-2.0.pc (dirty hack) +# EXTRA_LINKER_FLAGS += -lgmodule-2.0 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-silent-rules 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 22 00:52:12 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 21 Sep 2012 22:52:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19263] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19263 http://gar.svn.sourceforge.net/gar/?rev=19263&view=rev Author: chninkel Date: 2012-09-21 22:52:11 +0000 (Fri, 21 Sep 2012) Log Message: ----------- some simplification Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-21 13:58:33 UTC (rev 19262) +++ csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-21 22:52:11 UTC (rev 19263) @@ -190,7 +190,8 @@ # bound to because that definitely means that -B direct or -z direct was used. directly_bound = set() for syminfo in pkg_data["binaries_elf_info"][binary_info["path"]]['symbol table']: - if syminfo['external'] and syminfo['flags'] and 'D' in syminfo['flags'] and 'B' in syminfo['flags']: + if (syminfo['shndx'] == 'UNDEF' and syminfo['flags'] + and 'D' in syminfo['flags'] and 'B' in syminfo['flags']): directly_bound.add(syminfo['soname']) not_directly_bound = directly_bound.symmetric_difference(binary_info["needed sonames"]) Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-21 13:58:33 UTC (rev 19262) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-21 22:52:11 UTC (rev 19263) @@ -268,12 +268,12 @@ binary_info['syminfo'] = binary_info['symbol table'] # The list of fields we want to retrieve in the elfdump output by section - # if the field is a tuple, it means we will map the original field name + # If the field is a tuple, it means we will map the original field name # to another name in the final data structure elf_fields = {'version definition': ['version', 'dependency'], 'version needed': [('file', 'soname'), 'version'], 'symbol table': [('name', 'symbol'), ('ver', 'version'), - 'bind', ('shndx', 'external')], + 'bind', 'shndx'], 'syminfo': [('library', 'soname'), 'symbol', 'flags']} cur_section = None @@ -295,16 +295,10 @@ # we merge symbol table and syminfo informations so we have to check # if the symbol has not already been added if cur_section in ('symbol table', 'syminfo'): - if not elf_info['symbol']: - continue - if elf_info['symbol'] in symbols: - symbols[elf_info['symbol']].update(elf_info) - continue - else: - symbols[elf_info['symbol']] = elf_info + symbols.setdefault(elf_info['symbol'], {}).update(elf_info) + else: + binary_info[cur_section].append(elf_info) - binary_info[cur_section].append(elf_info) - # elfdump doesn't repeat the name of the soname in the version section # if it's the same on two contiguous line, so we have to make sure # the information is present in each entry @@ -319,28 +313,8 @@ # To not rely of the section order output of elfdump, we resolve symbol version # informations here after having parsed all elfdump output - nb_versions_definition = len(binary_info['version definition']) - for sym_info in binary_info['symbol table']: - version_index = int(sym_info['version']) - 2 - if version_index > 1: - if version_index < nb_versions_definition: - version = binary_info['version definition'][version_index] - else: - version = binary_info['version needed'][version_index - nb_versions_definition] - sym_info['version'] = version['version'] - sym_info['soname'] = version['soname'] - else: - sym_info['version'] = None + binary_info['symbol table'] = self._ResolveSymbolsVersionInfo (symbols.values(), binary_info) - if sym_info['external'] == 'UNDEF': - sym_info['external'] = True - else: - sym_info['external'] = False - - # we make sure the field are present even if the syminfo section is not - sym_info.setdefault('soname') - sym_info.setdefault('flags') - binaries_elf_info[binary] = binary_info return binaries_elf_info @@ -391,6 +365,24 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym + def _ResolveSymbolsVersionInfo(self, symbols, binary_info): + + version_info = binary_info['version definition'] + binary_info['version needed'] + + for sym_info in symbols: + version_index = int(sym_info['version']) - 2 + if version_index > 1: + version = version_info[version_index] + sym_info['version'] = version['version'] + sym_info['soname'] = version['soname'] + + # we make sure the field are present even if the syminfo section is not + sym_info.setdefault('version') + sym_info.setdefault('soname') + sym_info.setdefault('flags') + + return symbols + def _ParseElfdumpLine(self, line, section=None): headers_re = ( @@ -419,6 +411,7 @@ 'version needed': (r""" \s*(?:\[(?P\d+)\]\s+)? # index might be not present # if no version binding is enabled + (?:(?P\S+)\s+ # file can be absent if the same as (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, we make sure # version is not confused with file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Sep 22 10:34:05 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 22 Sep 2012 09:34:05 +0100 Subject: [csw-devel] SF.net SVN: gar:[19258] csw/mgar/pkg/libsoup2/trunk/Makefile In-Reply-To: References: Message-ID: Hi Carsten, Overall, it looks like you've submitted the change without testing if the build works and produces the output you want. If you can, try to build and review first, and submit second, so that you don't submit things like silly typos. More comments below. 2012/9/21 > Revision: 19258 > http://gar.svn.sourceforge.net/gar/?rev=19258&view=rev > Author: cgrzemba > Date: 2012-09-21 10:53:43 +0000 (Fri, 21 Sep 2012) > Log Message: > ----------- > libsoup2/trunk: rework packaging > > Modified Paths: > -------------- > csw/mgar/pkg/libsoup2/trunk/Makefile > > Modified: csw/mgar/pkg/libsoup2/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:21:43 UTC > (rev 19257) > +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-21 10:53:43 UTC > (rev 19258) > @@ -10,34 +10,56 @@ > MASTER_SITES = $(GNOME_MIRROR) > DISTFILES = $(NAME)-$(VERSION).tar.bz2 > > +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 > > # We define upstream file regex so we can be notifed of new upstream > software release > UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 > The above line is not necessary any more, there's a function that constructs these regexes on the fly. > > -PACKAGES = CSWlibsoup2 > -PACKAGES += CSWlibsoup2dev > -SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME > -SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files > +PACKAGES += CSWlibsoup2-4-1 > +CATALOGNAME_CSWlibsoup2-4-1 = libsoup2_4_1 > +PKGFILES_CSWlibsoup2-4-1 += $(call > baseisadirs,$(libdir),libsoup-2\.4\.so\.1\.3\.0) > +PKGFILES_CSWlibsoup2-4-1 += $(call > baseisadirs,$(libdir),libsoup-2\.4\.so\.1(\.\d+)*) > You only need one line of the two lines above. Checkpkg shows both, and it's your job to choose which one you really need. I'd say, throw away the first one. > +SPKG_DESC_CSWlibsoup2-4-1 += $(DESCRIPTION), libsoup-2.4.so.1 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgthread2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgmodule2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibz1 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibintl8 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgobject2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibglib2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibxml2-2 > +RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgio2-0-0 > +OBSOLTED_BY_CSWlibsoup2-4-1 = CSWlibsoup > Typo, should be OBSOLETED_BY. > > -RUNTIME_DEP_PKGS_CSWlibsoup2 = CSWgconf2 > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgcrypt > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWggettextrt > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWglib2 > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgnutls > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWgpgerr > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibproxy > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWlibxml2 > -RUNTIME_DEP_PKGS_CSWlibsoup2 += CSWsqlite3rt > +PACKAGES += CSWlibsoup-gnome2-4-1 > +CATALOGNAME_CSWlibsoup-gnome2-4-1 = libsoup_gnome2_4_1 > The CATALOGNAME line is not necessary, gar guesses that dashes should be substituted by underscores. > +PKGFILES_CSWlibsoup-gnome2-4-1 += $(call > baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1\.3\.0) > +PKGFILES_CSWlibsoup-gnome2-4-1 += $(call > baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1(\.\d+)*) > Same comment, only one line needed. > +SPKG_DESC_CSWlibsoup-gnome2-4-1 += $(DESCRIPTION), libsoup-gnome-2.4.so.1 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgthread2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibsqlite3-0 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgmodule2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibz1 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibintl8 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgnome-keyring0 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibsoup2-4-1 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgobject2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgio2-0-0 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibxml2-2 > +RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibglib2-0-0 > +OBSOLTED_BY_CSWlibsoup-gnome2-4-1 = CSWlibsoup > The same typo. > > -RUNTIME_DEP_PKGS_CSWlibsoup2dev += CSWlibsoup2 > +PACKAGES += CSWlibsoup2-dev > +CATALOGNAME_CSWlibsoup2-dev = libsoup2_dev > Not necessary. > +SPKG_DESC_CSWlibsoup2-dev += $(DESCRIPTION), development files > +# PKGFILES_CSWlibsoup2-dev += /opt/csw/lib/libsoup-2.4.so > +PKGFILES_CSWlibsoup2-dev += $(PKGFILES_DEVEL) > +RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup2-4-1 > +RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup-gnome2-4-1 > +OBSOLETED_BY_CSWlibsoup2-dev = CSWlibsoupdevel > +CATALOGNAME_CSWlibsoupdevel = libsoup_devel_stub > > - > -PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/.* > -PKGFILES_CSWlibsoup2dev += /opt/csw/include/.* > - > - > -EXTRA_INC = /opt/csw/X11/include > -EXTRA_LIB = /opt/csw/X11/lib > +# EXTRA_INC = /opt/csw/X11/include > +# EXTRA_LIB = /opt/csw/X11/lib > EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib > STRIP_LIBTOOL = 1 > > > 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 > -------------- next part -------------- An HTML attachment was scrubbed... URL: From chninkel at users.sourceforge.net Sat Sep 22 11:37:37 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 09:37:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19264] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19264 http://gar.svn.sourceforge.net/gar/?rev=19264&view=rev Author: chninkel Date: 2012-09-22 09:37:37 +0000 (Sat, 22 Sep 2012) Log Message: ----------- separate function for shell + more simplification Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-21 22:52:11 UTC (rev 19263) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 09:37:37 UTC (rev 19264) @@ -69,7 +69,18 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info +def ShellCommand(args, env=None): + logging.debug("Running: %s", args) + proc = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env) + stdout, stderr = proc.communicate() + retcode = proc.wait() + return retcode, stdout, stderr + + class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -176,11 +187,7 @@ binary_in_tmp_dir = binary_in_tmp_dir.lstrip("/") binary_abs_path = os.path.join(self.directory, self.GetFilesDir(), binary_in_tmp_dir) binary_base_name = os.path.basename(binary_in_tmp_dir) - args = [common_constants.DUMP_BIN, "-Lv", binary_abs_path] - logging.debug("Running: %s", args) - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() + retcode, stdout, stderr = ShellCommand([common_constants.DUMP_BIN, "-Lv", binary_abs_path], env) binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary if basedir: @@ -230,7 +237,7 @@ return defined_symbols def GetBinaryElfInfo(self): - """Returns various informations symbol and version present in elf header + """Returns various informations symbol and versions present in elf header To do this we parse output lines from elfdump -syv, it's the only command that will give us all informations we need on symbols and versions. @@ -247,34 +254,38 @@ for binary in binaries: binary_abspath = os.path.join(self.directory, "root", binary) # elfdump is the only tool that give us all informations - args = ["/usr/ccs/bin/elfdump", "-svy", binary_abspath] - elfdump_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = elfdump_proc.communicate() - retcode = elfdump_proc.wait() + retcode, stdout, stderr = ShellCommand(["/usr/ccs/bin/elfdump", "-svy", binary_abspath]) if retcode or stderr: - logging.error("%s returned one or more errors: %s", args, stderr.splitlines()[0]) + logging.error("%s returned one or more errors: %s", args, stderr) continue elfdump_out = stdout.splitlines() symbols = {} binary_info = {'version definition': [], - 'version needed': [], - 'symbol table': []} - # we will merge syminfo and symbol table information in one list - # so the syminfo list is the same as the symbol table one - binary_info['syminfo'] = binary_info['symbol table'] + 'version needed': []} # The list of fields we want to retrieve in the elfdump output by section - # If the field is a tuple, it means we will map the original field name - # to another name in the final data structure - elf_fields = {'version definition': ['version', 'dependency'], - 'version needed': [('file', 'soname'), 'version'], - 'symbol table': [('name', 'symbol'), ('ver', 'version'), - 'bind', 'shndx'], - 'syminfo': [('library', 'soname'), 'symbol', 'flags']} + # the key is the original field name and the value the destination field name + elf_fields = {'version definition': { + 'version': 'version', + 'dependency': 'dependancy', + }, + 'version needed': { + 'file': 'soname', + 'version': 'version', + }, + 'symbol table': { + 'name': 'symbol', + 'ver': 'version', + 'bind': 'bind', + 'shndx': 'shndx', + }, + 'syminfo': { + 'library': 'soname', + 'symbol': 'symbol', + 'flags': 'flags', + } + } cur_section = None for line in elfdump_out: @@ -286,14 +297,11 @@ continue elf_info = {} - for field in elf_fields[cur_section]: - if type(field) == tuple: - elf_info[field[1]] = elfdump_data[field[0]] - else: - elf_info[field] = elfdump_data[field] + for src_field, dest_field in elf_fields[cur_section].items(): + elf_info[dest_field] = elfdump_data[src_field] - # we merge symbol table and syminfo informations so we have to check - # if the symbol has not already been added + # symbol table and syminfo section store various informations + # about the same symbols, we merge them in a dict if cur_section in ('symbol table', 'syminfo'): symbols.setdefault(elf_info['symbol'], {}).update(elf_info) else: @@ -311,9 +319,10 @@ if binary_info['version definition']: binary_info['version definition'].pop(0) + binary_info['symbol table'] = symbols.values() # To not rely of the section order output of elfdump, we resolve symbol version # informations here after having parsed all elfdump output - binary_info['symbol table'] = self._ResolveSymbolsVersionInfo (symbols.values(), binary_info) + self._ResolveSymbolsVersionInfo (binary_info) binaries_elf_info[binary] = binary_info @@ -328,13 +337,7 @@ # this could be potentially moved into the DirectoryFormatPackage class. # ldd needs the binary to be executable os.chmod(binary_abspath, 0755) - args = ["ldd", "-Ur", binary_abspath] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() + retcode, stdout, stderr = ShellCommand(["ldd", "-Ur", binary_abspath]) if retcode: uname_info = os.uname() if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and @@ -345,7 +348,7 @@ # that the ldd infos will be the same on the 32 bits binaries analyzed return {} else: - logging.error("%s returned an error: %s", args, stderr) + logging.error("%s returned an error: %s", args, stderr.splitlines()[0].splitlines()[0]) ldd_info = [] for line in stdout.splitlines(): @@ -365,23 +368,25 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym - def _ResolveSymbolsVersionInfo(self, symbols, binary_info): + def _ResolveSymbolsVersionInfo(self, binary_info): version_info = binary_info['version definition'] + binary_info['version needed'] - for sym_info in symbols: + for sym_info in binary_info['symbol table']: + # version index is an 1-based index on the version information table + # from which we also removed the first entry which was the + # base library/binary itself version_index = int(sym_info['version']) - 2 - if version_index > 1: + if version_index >= 0: version = version_info[version_index] sym_info['version'] = version['version'] sym_info['soname'] = version['soname'] - # we make sure the field are present even if the syminfo section is not + # we make sure these fields are present even if the syminfo section is not sym_info.setdefault('version') sym_info.setdefault('soname') sym_info.setdefault('flags') - return symbols def _ParseElfdumpLine(self, line, section=None): 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 22 11:38:33 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 09:38:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19265] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19265 http://gar.svn.sourceforge.net/gar/?rev=19265&view=rev Author: chninkel Date: 2012-09-22 09:38:33 +0000 (Sat, 22 Sep 2012) Log Message: ----------- fixed logging stderr mistake Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 09:37:37 UTC (rev 19264) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 09:38:33 UTC (rev 19265) @@ -348,7 +348,7 @@ # that the ldd infos will be the same on the 32 bits binaries analyzed return {} else: - logging.error("%s returned an error: %s", args, stderr.splitlines()[0].splitlines()[0]) + logging.error("%s returned an error: %s", args, stderr) ldd_info = [] for line in stdout.splitlines(): 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 22 15:05:00 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:05:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19266] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19266 http://gar.svn.sourceforge.net/gar/?rev=19266&view=rev Author: chninkel Date: 2012-09-22 13:05:00 +0000 (Sat, 22 Sep 2012) Log Message: ----------- added unit test + some fixes Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/common_constants.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2-yann/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/common_constants.py 2012-09-22 09:38:33 UTC (rev 19265) +++ csw/mgar/gar/v2-yann/lib/python/common_constants.py 2012-09-22 13:05:00 UTC (rev 19266) @@ -34,6 +34,7 @@ DEFAULT_INSTALL_CONTENTS_FILE = "/var/sadm/install/contents" DUMP_BIN = "/usr/ccs/bin/dump" +ELFDUMP_BIN = "/usr/ccs/bin/elfdump" OWN_PKGNAME_PREFIXES = frozenset(["CSW"]) Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 09:38:33 UTC (rev 19265) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 13:05:00 UTC (rev 19266) @@ -254,7 +254,8 @@ for binary in binaries: binary_abspath = os.path.join(self.directory, "root", binary) # elfdump is the only tool that give us all informations - retcode, stdout, stderr = ShellCommand(["/usr/ccs/bin/elfdump", "-svy", binary_abspath]) + args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] + retcode, stdout, stderr = ShellCommand(args) if retcode or stderr: logging.error("%s returned one or more errors: %s", args, stderr) continue @@ -268,7 +269,7 @@ # the key is the original field name and the value the destination field name elf_fields = {'version definition': { 'version': 'version', - 'dependency': 'dependancy', + 'dependency': 'dependency', }, 'version needed': { 'file': 'soname', @@ -277,6 +278,7 @@ 'symbol table': { 'name': 'symbol', 'ver': 'version', + 'type': 'type', 'bind': 'bind', 'shndx': 'shndx', }, @@ -320,6 +322,7 @@ binary_info['version definition'].pop(0) binary_info['symbol table'] = symbols.values() + binary_info['symbol table'].sort(key=lambda m: m['symbol']) # To not rely of the section order output of elfdump, we resolve symbol version # informations here after having parsed all elfdump output self._ResolveSymbolsVersionInfo (binary_info) @@ -337,7 +340,8 @@ # this could be potentially moved into the DirectoryFormatPackage class. # ldd needs the binary to be executable os.chmod(binary_abspath, 0755) - retcode, stdout, stderr = ShellCommand(["ldd", "-Ur", binary_abspath]) + args = ["ldd", "-Ur", binary_abspath] + retcode, stdout, stderr = ShellCommand(args) if retcode: uname_info = os.uname() if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and @@ -373,17 +377,21 @@ version_info = binary_info['version definition'] + binary_info['version needed'] for sym_info in binary_info['symbol table']: - # version index is an 1-based index on the version information table - # from which we also removed the first entry which was the - # base library/binary itself + # sym_info version field is an 1-based index on the version information table + # we don't care about 0 and 1 values: + # 0 is for external symbol with no version information available + # 1 is for a symbol defined by the binary and not binded to a version interface + # but we removed that (useless) entry from the version definition table version_index = int(sym_info['version']) - 2 if version_index >= 0: version = version_info[version_index] sym_info['version'] = version['version'] - sym_info['soname'] = version['soname'] + if 'soname' in version: + sym_info['soname'] = version['soname'] + else: + sym_info['version'] = None # we make sure these fields are present even if the syminfo section is not - sym_info.setdefault('version') sym_info.setdefault('soname') sym_info.setdefault('flags') @@ -410,8 +418,9 @@ 'version definition': (r""" \s*(?:\[(?P\d+)\]\s+)? # index might be not present # if no version binding is enabled - (?P.*\S) - \s+(?P\S+)?\s*$ + (?P\S+) + (?:\s+(?P\S+))? + (?:\s+\[\s(?:BASE)\s\])?\s*$ # """), 'version needed': (r""" \s*(?:\[(?P\d+)\]\s+)? # index might be not present @@ -428,21 +437,21 @@ \s*\[\d+\] \s+(?:0x[0-9a-f]+|REG_G\d+) \s+0x[0-9a-f]+ - \s+\S+ + \s+(?P\S+) \s+(?P\S+) \s+\S+ \s+(?P\S+) \s+(?P\S+) - \s+(?P\S+)?\s*$ + (?:\s+(?P\S+))?\s*$ """), 'syminfo': (r""" \s*\[\d+\] \s+(?P[ABCDFILNPS]+) \s+(?:(?:\[\d+\] # some kind of library index - \s+(?P.*\S)|)\s+)? # library is not present + \s+(?P\S+)|)\s+)? # library is not present # for external symbols not # directly bound - (?P.*\S)\s* + (?P\S+)\s* """)} elfdump_data = None Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-22 09:38:33 UTC (rev 19265) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-22 13:05:00 UTC (rev 19266) @@ -6,6 +6,7 @@ import hachoir_parser import magic import os +import common_constants LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 \tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) @@ -69,6 +70,89 @@ self.assertEqual([u'/fake/path/CSWfoo/root/foo-file'], ip.ListBinaries()) + + + def testGetBinaryElfInfo(self): + + fake_binary = 'opt/csw/lib/libssl.so.1.0.0' + fake_package_path = '/fake/path/CSWfoo' + fake_elfdump_output = ''' +Version Definition Section: .SUNW_version + index version dependency + [1] libssl.so.1.0.0 [ BASE ] + [2] OPENSSL_1.0.0 + [3] OPENSSL_1.0.1 OPENSSL_1.0.0 + +Version Needed Section: .SUNW_version + index file version + [4] libcrypto.so.1.0.0 OPENSSL_1.0.0 [ INFO ] + [5] OPENSSL_1.0.1 + [6] libnsl.so.1 SUNW_1.9.1 + +Symbol Table Section: .dynsym + index value size type bind oth ver shndx name + [0] 0x00000000 0x00000000 NOTY LOCL D 0 UNDEF + [1] 0x00000000 0x00000000 FUNC GLOB D 4 UNDEF EVP_DigestSignFinal + [2] 0x0003ead4 0x000000dc FUNC GLOB P 2 .text SSL_get_shared_ciphers + [3] 0x0004f8f8 0x00000014 FUNC GLOB P 3 .text SSL_CTX_set_srp_client_pwd_callback + [4] 0x00000000 0x00000000 FUNC GLOB D 5 UNDEF SRP_Calc_client_key + [5] 0x000661a0 0x00000000 OBJT GLOB P 1 .got _GLOBAL_OFFSET_TABLE_ + +Syminfo Section: .SUNW_syminfo + index flags bound to symbol + [1] DBL [1] libcrypto.so.1.0.0 EVP_DigestSignFinal + [2] DB SSL_get_shared_ciphers + [3] DB SSL_CTX_set_srp_client_pwd_callback + [4] DBL [1] libcrypto.so.1.0.0 SRP_Calc_client_key + [5] DB _GLOBAL_OFFSET_TABLE_ +''' + fake_binary_elfinfo = {'opt/csw/lib/libssl.so.1.0.0': { + 'symbol table': [ + {'shndx': 'UNDEF', 'soname': None, 'bind': 'LOCL', + 'symbol': None, 'version': None, 'flags': None, 'type': 'NOTY'}, + {'shndx': 'UNDEF', 'soname': 'libcrypto.so.1.0.0', 'bind': 'GLOB', + 'symbol': 'EVP_DigestSignFinal', 'version': 'OPENSSL_1.0.0', + 'flags': 'DBL', 'type': 'FUNC'}, + {'shndx': 'UNDEF', 'soname': 'libcrypto.so.1.0.0', 'bind': 'GLOB', + 'symbol': 'SRP_Calc_client_key', 'version': 'OPENSSL_1.0.1', + 'flags': 'DBL', 'type': 'FUNC'}, + {'shndx': '.text', 'soname': None, 'bind': 'GLOB', + 'symbol': 'SSL_CTX_set_srp_client_pwd_callback', + 'version': 'OPENSSL_1.0.1', 'flags': 'DB', 'type': 'FUNC'}, + {'shndx': '.text', 'soname': None, 'bind': 'GLOB', + 'symbol': 'SSL_get_shared_ciphers', 'version': 'OPENSSL_1.0.0', + 'flags': 'DB', 'type': 'FUNC'}, + {'shndx': '.got', 'soname': None, 'bind': 'GLOB', + 'symbol': '_GLOBAL_OFFSET_TABLE_', 'version': None, + 'flags': 'DB', 'type': 'OBJT'}, + ], + 'version definition': [ + {'dependency': None, 'version': 'OPENSSL_1.0.0'}, + {'dependency': 'OPENSSL_1.0.0', 'version': 'OPENSSL_1.0.1'}, + ], + 'version needed': [ + {'version': 'OPENSSL_1.0.0', 'soname': 'libcrypto.so.1.0.0'}, + {'version': 'OPENSSL_1.0.1', 'soname': 'libcrypto.so.1.0.0'}, + {'version': 'SUNW_1.9.1', 'soname': 'libnsl.so.1'}, + ] + } + } + + ip = inspective_package.InspectivePackage(fake_package_path) + self.mox.StubOutWithMock(ip, 'ListBinaries') + ip.ListBinaries().AndReturn([fake_binary]) + + self.mox.StubOutWithMock(inspective_package, 'ShellCommand') + args = [common_constants.ELFDUMP_BIN, + '-svy', + os.path.join(fake_package_path, "root", fake_binary)] + inspective_package.ShellCommand(args).AndReturn((0, fake_elfdump_output, "")) + self.mox.ReplayAll() + + self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) + + + class PackageStatsUnitTest(unittest.TestCase): def setUp(self): @@ -80,7 +164,7 @@ def test_ParseElfdumpLineVersionNeeded(self): line = '[13] SUNW_0.9 [ INFO ]' - expected = { + expected = { 'index': '13', 'version': 'SUNW_0.9', 'file': None @@ -89,11 +173,12 @@ def test_ParseElfdumpLineSymbolTable(self): line = ' [9] 0x000224b8 0x0000001c FUNC GLOB D 1 .text vsf_log_line' - expected = { - 'bind': 'GLOB', - 'shndx': '.text', - 'name': 'vsf_log_line', - 'ver': '1' + expected = { + 'bind': 'GLOB', + 'shndx': '.text', + 'name': 'vsf_log_line', + 'ver': '1', + 'type': 'FUNC', } self.assertEqual((expected, 'symbol table'), self.ip._ParseElfdumpLine(line, 'symbol table')) 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 22 15:07:07 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19267] csw/mgar/gar/v2-yann/lib/python/ inspective_package_test.py Message-ID: Revision: 19267 http://gar.svn.sourceforge.net/gar/?rev=19267&view=rev Author: chninkel Date: 2012-09-22 13:07:06 +0000 (Sat, 22 Sep 2012) Log Message: ----------- fixed testListBinaries test Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-22 13:05:00 UTC (rev 19266) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-22 13:07:06 UTC (rev 19267) @@ -67,7 +67,7 @@ ip.pkginfo_dict = { "BASEDIR": "", } - self.assertEqual([u'/fake/path/CSWfoo/root/foo-file'], ip.ListBinaries()) + self.assertEqual([u'foo-file'], ip.ListBinaries()) 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 22 15:07:45 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:07:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19268] csw/mgar/pkg/vsftpd/trunk/Makefile Message-ID: Revision: 19268 http://gar.svn.sourceforge.net/gar/?rev=19268&view=rev Author: chninkel Date: 2012-09-22 13:07:45 +0000 (Sat, 22 Sep 2012) Log Message: ----------- vsftpd/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2012-09-22 13:07:06 UTC (rev 19267) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2012-09-22 13:07:45 UTC (rev 19268) @@ -118,8 +118,6 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_LDFLAGS = -z ignore -Bdirect - CONFIGURE_SCRIPTS = 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 22 15:11:38 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:11:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19269] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 19269 http://gar.svn.sourceforge.net/gar/?rev=19269&view=rev Author: chninkel Date: 2012-09-22 13:11:38 +0000 (Sat, 22 Sep 2012) Log Message: ----------- openssh/trunk: removed '-z ignore' and '-Bdirect' and map LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/map.openssh Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2012-09-22 13:07:45 UTC (rev 19268) +++ csw/mgar/pkg/openssh/trunk/Makefile 2012-09-22 13:11:38 UTC (rev 19269) @@ -116,8 +116,6 @@ DISTFILES += THIS_LOCATION_IS_DEPRECATED -DISTFILES += map.openssh - LICENSE = LICENCE # The GSSAPI key exchange patch @@ -167,8 +165,6 @@ CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-privsep-path=$(localstatedir)/empty -EXTRA_LDFLAGS = -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.openssh)" - TEST_SCRIPTS = Deleted: csw/mgar/pkg/openssh/trunk/files/map.openssh =================================================================== --- csw/mgar/pkg/openssh/trunk/files/map.openssh 2012-09-22 13:07:45 UTC (rev 19268) +++ csw/mgar/pkg/openssh/trunk/files/map.openssh 2012-09-22 13:11:38 UTC (rev 19269) @@ -1,2 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 22 15:13:44 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:13:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19270] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 19270 http://gar.svn.sourceforge.net/gar/?rev=19270&view=rev Author: chninkel Date: 2012-09-22 13:13:43 +0000 (Sat, 22 Sep 2012) Log Message: ----------- elinks/trunk: removed '-z ignore' and '-Bdirect' and map LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/elinks/trunk/files/map.elinks Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2012-09-22 13:11:38 UTC (rev 19269) +++ csw/mgar/pkg/elinks/trunk/Makefile 2012-09-22 13:13:43 UTC (rev 19270) @@ -51,7 +51,6 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += changelog.CSW -DISTFILES += map.elinks # Debian security path for CVE-2007-2027 PATCHFILES += elinks-417789.diff @@ -74,8 +73,6 @@ # CONFIGURE_ARGS += --enable-sm-scripting CONFIGURE_ARGS += --disable-sm-scripting -EXTRA_LD_OPTIONS = -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.elinks)" - TEST_SCRIPTS = include gar/category.mk Deleted: csw/mgar/pkg/elinks/trunk/files/map.elinks =================================================================== --- csw/mgar/pkg/elinks/trunk/files/map.elinks 2012-09-22 13:11:38 UTC (rev 19269) +++ csw/mgar/pkg/elinks/trunk/files/map.elinks 2012-09-22 13:13:43 UTC (rev 19270) @@ -1,2 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 22 15:13:52 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:13:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[19271] csw/mgar/pkg/lftp/trunk/Makefile Message-ID: Revision: 19271 http://gar.svn.sourceforge.net/gar/?rev=19271&view=rev Author: chninkel Date: 2012-09-22 13:13:52 +0000 (Sat, 22 Sep 2012) Log Message: ----------- lftp/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2012-09-22 13:13:43 UTC (rev 19270) +++ csw/mgar/pkg/lftp/trunk/Makefile 2012-09-22 13:13:52 UTC (rev 19271) @@ -75,8 +75,6 @@ # Requested see https://www.opencsw.org/mantis/view.php?id=4481 CONFIGURE_ARGS += --with-socksdante -EXTRA_LDFLAGS = -z ignore -Bdirect - # No test suite here 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 22 15:27:01 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:27:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19272] csw/mgar/pkg/cadaver/trunk/Makefile Message-ID: Revision: 19272 http://gar.svn.sourceforge.net/gar/?rev=19272&view=rev Author: chninkel Date: 2012-09-22 13:27:01 +0000 (Sat, 22 Sep 2012) Log Message: ----------- cadaver/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2012-09-22 13:13:52 UTC (rev 19271) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2012-09-22 13:27:01 UTC (rev 19272) @@ -56,8 +56,6 @@ CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-expat -EXTRA_LDFLAGS = -z ignore -Bdirect - TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 22 15:28:41 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:28:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19273] csw/mgar/pkg/imapproxy/trunk/Makefile Message-ID: Revision: 19273 http://gar.svn.sourceforge.net/gar/?rev=19273&view=rev Author: chninkel Date: 2012-09-22 13:28:41 +0000 (Sat, 22 Sep 2012) Log Message: ----------- imapproxy/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/imapproxy/trunk/Makefile Modified: csw/mgar/pkg/imapproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapproxy/trunk/Makefile 2012-09-22 13:27:01 UTC (rev 19272) +++ csw/mgar/pkg/imapproxy/trunk/Makefile 2012-09-22 13:28:41 UTC (rev 19273) @@ -82,8 +82,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libwrap=no -EXTRA_LDFLAGS = -z ignore -Bdirect - TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 22 15:39:39 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:39:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19274] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19274 http://gar.svn.sourceforge.net/gar/?rev=19274&view=rev Author: chninkel Date: 2012-09-22 13:39:39 +0000 (Sat, 22 Sep 2012) Log Message: ----------- fixed indentation mistake and amd64 on 5.9 special case Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-22 13:28:41 UTC (rev 19273) +++ csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-22 13:39:39 UTC (rev 19274) @@ -168,7 +168,6 @@ pkgname, messenger) orphan_sonames.extend(orphan_sonames_tmp) - ldd_info = pkg_data['ldd_info'][binary_info["path"]] for ldd_response in ldd_info: if ldd_response['state'] == 'soname-unused' and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES: Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 13:28:41 UTC (rev 19273) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 13:39:39 UTC (rev 19274) @@ -350,7 +350,8 @@ # which exists only in 32 bits, that's not possible # we ignore the error and return no information as it is likely # that the ldd infos will be the same on the 32 bits binaries analyzed - return {} + ldd_output[binary] = [] + continue else: logging.error("%s returned an error: %s", args, stderr) @@ -361,7 +362,7 @@ ldd_info.append(result) ldd_output[binary] = ldd_info - return ldd_output + return ldd_output def _ParseNmSymLine(self, line): re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') 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 22 15:46:13 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 13:46:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19275] csw/mgar/pkg/screen/trunk/Makefile Message-ID: Revision: 19275 http://gar.svn.sourceforge.net/gar/?rev=19275&view=rev Author: chninkel Date: 2012-09-22 13:46:13 +0000 (Sat, 22 Sep 2012) Log Message: ----------- screen/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2012-09-22 13:39:39 UTC (rev 19274) +++ csw/mgar/pkg/screen/trunk/Makefile 2012-09-22 13:46:13 UTC (rev 19275) @@ -82,8 +82,6 @@ CONFIGURE_ARGS += --with-sys-screenrc=/etc$(prefix)/screenrc CONFIGURE_ARGS += --with-socket-dir=/var$(prefix)/run/screen -EXTRA_LDFLAGS = -z ignore -Bdirect - include gar/category.mk # we must recreate configure as we modified configure.in 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 22 18:15:20 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 16:15:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19276] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19276 http://gar.svn.sourceforge.net/gar/?rev=19276&view=rev Author: chninkel Date: 2012-09-22 16:15:20 +0000 (Sat, 22 Sep 2012) Log Message: ----------- pep8 compliance fixes Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-22 13:46:13 UTC (rev 19275) +++ csw/mgar/gar/v2-yann/lib/python/dependency_checks.py 2012-09-22 16:15:20 UTC (rev 19276) @@ -29,10 +29,11 @@ ) DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl$", (u"CSWperl",)), - (r".*\.pm$", (u"CSWperl",)), - (r".*\.py$", (u"CSWpython",)), - (r".*\.rb$", (u"CSWruby", u"CSWruby18", u"CSWruby191", u"CSWlibruby1-9-1-1")), + (r".*\.pl$", (u"CSWperl",)), + (r".*\.pm$", (u"CSWperl",)), + (r".*\.py$", (u"CSWpython",)), + (r".*\.rb$", (u"CSWruby", u"CSWruby18", + u"CSWruby191", u"CSWlibruby1-9-1-1")), (r".*\.elc?$", (u"CSWemacscommon",)), (r"/opt/csw/apache2/", (u"CSWapache2",)), ) @@ -40,9 +41,12 @@ PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) BASE_SOLARIS_LIBRARIES = ( - "libsocket.so.1", "libnsl.so.1", "libdl.so.1", "librt.so.1", "libresolv.so.2", "libpthread.so.1", - # linked by default with C++, see "Default C++ Libraries" in Solaris Studio C++ User'sGuide - "libCstd.so.1", "libCrun.so.1", "libm.so.1", "libm.so.2", "libw.so.1", "libcx.so.1", "libc.so.1", "libC.so.3", "libC.so.5", + "libsocket.so.1", "libnsl.so.1", "libdl.so.1", "librt.so.1", + "libresolv.so.2", "libpthread.so.1", + # linked by default with C++, see "Default C++ Libraries" + # in Solaris Studio C++ User's Guide + "libCstd.so.1", "libCrun.so.1", "libm.so.1", "libm.so.2", + "libw.so.1", "libcx.so.1", "libc.so.1", "libC.so.3", "libC.so.5", ) ALLOWED_VERSION_DEPENDENCIES = { @@ -61,8 +65,8 @@ def ProcessSoname( ldd_emulator, - soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger, - error_mgr, + soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, + logger, error_mgr, pkgname, messenger): """This is not an ideal name for this function. @@ -163,59 +167,69 @@ for soname in binary_info["needed sonames"]: orphan_sonames_tmp = ProcessSoname( ldd_emulator, - soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, logger, - error_mgr, + soname, path_and_pkg_by_basename, binary_info, isalist, binary_path, + logger, error_mgr, pkgname, messenger) orphan_sonames.extend(orphan_sonames_tmp) ldd_info = pkg_data['ldd_info'][binary_info["path"]] for ldd_response in ldd_info: - if ldd_response['state'] == 'soname-unused' and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES: + if (ldd_response['state'] == 'soname-unused' + and ldd_response['soname'] not in BASE_SOLARIS_LIBRARIES): messenger.Message( - "Binary %s links to library %s but doesn't seem to use any of its symbols. " - "It usually happens because superfluous libraries were added to the linker options, " - "either because of the configure script itself or because of the \"pkg-config --libs\"" - " output of one the dependency." + "Binary %s links to library %s but doesn't seem to use any" + " of its symbols. It usually happens because superfluous" + " libraries were added to the linker options, either because" + " of the configure script itself or because of the" + " \"pkg-config --libs\" output of one the dependency." % ("/" + binary_info["path"], ldd_response['soname'])) error_mgr.ReportError( pkgname, "soname-unused", - "%s is needed by %s but never used" % (ldd_response['soname'], "/" + binary_info["path"])) + "%s is needed by %s but never used" + % (ldd_response['soname'], "/" + binary_info["path"])) # Even when direct binding is enabled, some symbols might not be # directly bound because the library explicitely requested the symbol # not to be drectly bound to. - # For example, libc.so.1 does it for symbol sigaction, free, malloc and realloc - # So we consider that direct binding is enabled if at least one symbol is directly - # bound to because that definitely means that -B direct or -z direct was used. - directly_bound = set() - for syminfo in pkg_data["binaries_elf_info"][binary_info["path"]]['symbol table']: + # For example, libc.so.1 does it for symbol sigaction, free, malloc... + # So we consider that direct binding is enabled if at least one + # symbol is directly bound to because that definitely means that + # -B direct or -z direct was used. + binary_elf_info = pkg_data["binaries_elf_info"][binary_info["path"]] + db_libs = set() + for syminfo in binary_elf_info['symbol table']: if (syminfo['shndx'] == 'UNDEF' and syminfo['flags'] and 'D' in syminfo['flags'] and 'B' in syminfo['flags']): - directly_bound.add(syminfo['soname']) - not_directly_bound = directly_bound.symmetric_difference(binary_info["needed sonames"]) + db_libs.add(syminfo['soname']) + no_db_libs = db_libs.symmetric_difference(binary_info["needed sonames"]) - if not_directly_bound: + if no_db_libs: messenger.Message( - "No symbol of binary %s is directly bound against the following libraries: %s. " - "Please make sure the binaries are compiled using the \"-Bdirect\" linker option." - % ("/" + binary_info["path"], ", ".join(not_directly_bound))) - for soname in not_directly_bound: + "No symbol of binary %s is directly bound against the following" + " libraries: %s. Please make sure the binaries are compiled using" + " the \"-Bdirect\" linker option." + % ("/" + binary_info["path"], ", ".join(no_db_libs))) + for soname in no_db_libs: error_mgr.ReportError( pkgname, "no-direct-binding", - "%s is not directly bound to soname %s" % ("/" + binary_info["path"], soname)) + "%s is not directly bound to soname %s" + % ("/" + binary_info["path"], soname)) - for version_dep in pkg_data["binaries_elf_info"][binary_info["path"]]['version needed']: + 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']]): + not version_dep['version'] in + ALLOWED_VERSION_DEPENDENCIES[version_dep['soname']]): messenger.Message( - "Binary %s requires interface version %s in library %s which is only available " - "in recent Solaris releases." - % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) + "Binary %s requires interface version %s in library %s which is" + " only available in recent Solaris releases." + % ("/" + binary_info["path"], version_dep['version'], + version_dep['soname'])) error_mgr.ReportError( pkgname, "forbidden-version-interface-dependencies", "%s requires forbidden interface version %s in library %s" - % ("/" + binary_info["path"], version_dep['version'], version_dep['soname'])) + % ("/" + binary_info["path"], version_dep['version'], + version_dep['soname'])) orphan_sonames = set(orphan_sonames) @@ -262,8 +276,8 @@ needed_dirs.add(base_dir) for needed_dir in needed_dirs: reason_group = [] - # TODO: The preferred directory providers should not depend on other packages to - # provide directories. + # TODO: The preferred directory providers should not depend on other + # packages to provide directories. if pkgname not in PREFERRED_DIRECTORY_PROVIDERS: # If the path is provided by CSWcommon or other preferred package, don't # mention other packages. @@ -277,7 +291,8 @@ if not pkg_by_path[needed_dir]: # There's no sense in reporting '/' and ''. if needed_dir and needed_dir != '/': - error_mgr.ReportError(pkgname, "base-dir-not-found", repr(needed_dir)) + error_mgr.ReportError(pkgname, "base-dir-not-found", + repr(needed_dir)) elif len(pkg_by_path[needed_dir]) < 5: pkgs_to_mention = pkg_by_path[needed_dir] else: @@ -289,7 +304,8 @@ if reason_group: req_pkgs_reasons.append(reason_group) else: - error_mgr.ReportError(pkgname, "base-dir-not-provided-by-any-package", needed_dir) + error_mgr.ReportError(pkgname, "base-dir-not-provided-by-any-package", + needed_dir) return req_pkgs_reasons @@ -303,6 +319,7 @@ error_mgr.GetPathsAndPkgnamesByBasename(basename)) return path_and_pkg_by_basename + def GetPkgByFullPath(error_mgr, logger, paths_to_verify, pkg_by_path): """Resolves a list of paths to a mapping between paths and packages. @@ -313,11 +330,13 @@ for path in paths_to_verify: if path not in pkg_by_path: result = error_mgr.GetPkgByPath(path) - # logger.warning("error_mgr.GetPkgByPath(%s) => %s", repr(path), repr(result)) + # logger.warning("error_mgr.GetPkgByPath(%s) => %s", repr(path), + # repr(result)) pkg_by_path[path] = result # logger.warning("New paths: %s" % pprint.pformat(pkg_by_path)) return pkg_by_path + def SuggestLibraryPackage(error_mgr, messenger, pkgname, catalogname, description, Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 13:46:13 UTC (rev 19275) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 16:15:20 UTC (rev 19276) @@ -35,7 +35,7 @@ return {} file_info = { "path": StripRe(file_path, ROOT_RE), - "mime_type": file_magic.GetFileMimeType(full_path) + "mime_type": file_magic.GetFileMimeType(full_path), } if base_dir: file_info["path"] = os.path.join(base_dir, file_info["path"]) @@ -69,16 +69,17 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info + def ShellCommand(args, env=None): - logging.debug("Running: %s", args) - proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - env=env) - stdout, stderr = proc.communicate() - retcode = proc.wait() + logging.debug("Running: %s", args) + proc = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env) + stdout, stderr = proc.communicate() + retcode = proc.wait() - return retcode, stdout, stderr + return retcode, stdout, stderr class InspectivePackage(package.DirectoryFormatPackage): @@ -164,7 +165,8 @@ return os.path.exists(os.path.join(self.directory, "reloc")) def GetFilesDir(self): - """Returns the subdirectory in which files, are either "reloc" or "root".""" + """Returns the subdirectory in which files are, + either "reloc" or "root".""" if self.RelocPresent(): return "reloc" else: @@ -185,9 +187,11 @@ if basedir: binary_in_tmp_dir = binary_in_tmp_dir[len(basedir):] binary_in_tmp_dir = binary_in_tmp_dir.lstrip("/") - binary_abs_path = os.path.join(self.directory, self.GetFilesDir(), binary_in_tmp_dir) + binary_abs_path = os.path.join(self.directory, self.GetFilesDir(), + binary_in_tmp_dir) binary_base_name = os.path.basename(binary_in_tmp_dir) - retcode, stdout, stderr = ShellCommand([common_constants.DUMP_BIN, "-Lv", binary_abs_path], env) + args = [common_constants.DUMP_BIN, "-Lv", binary_abs_path] + retcode, stdout, stderr = ShellCommand(args, env) binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary if basedir: @@ -240,12 +244,14 @@ """Returns various informations symbol and versions present in elf header To do this we parse output lines from elfdump -syv, it's the - only command that will give us all informations we need on symbols and versions. + only command that will give us all informations we need on + symbols and versions. + We will analyse 3 sections: - - version section: contains soname needed, version interface required for each soname, - and version definition - - symbol table section: contains list of symbol and soname/version interface providing it - (the latter is an index in the version section) + - version section: contains soname needed, version interface required + for each soname, and version definition + - symbol table section: contains list of symbol and soname/version + interface providing it - syminfo section: contains special linking flags for each symbol """ binaries = self.ListBinaries() @@ -266,7 +272,8 @@ 'version needed': []} # The list of fields we want to retrieve in the elfdump output by section - # the key is the original field name and the value the destination field name + # the key is the original field name + # the value is the destination field name elf_fields = {'version definition': { 'version': 'version', 'dependency': 'dependency', @@ -323,9 +330,9 @@ binary_info['symbol table'] = symbols.values() binary_info['symbol table'].sort(key=lambda m: m['symbol']) - # To not rely of the section order output of elfdump, we resolve symbol version - # informations here after having parsed all elfdump output - self._ResolveSymbolsVersionInfo (binary_info) + # To not rely of the section order output of elfdump, we resolve + # symbol version informations here after having parsed all output + self._ResolveSymbolsVersionInfo(binary_info) binaries_elf_info[binary] = binary_info @@ -345,11 +352,13 @@ if retcode: uname_info = os.uname() if (uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and - '/amd64/' in binary_abspath and 'has wrong class or data encoding' in stderr): + '/amd64/' in binary_abspath and + 'has wrong class or data encoding' in stderr): # we are trying to analyze a 64 bits binary on a Solaris 9 x86 # which exists only in 32 bits, that's not possible # we ignore the error and return no information as it is likely - # that the ldd infos will be the same on the 32 bits binaries analyzed + # that the ldd infos will be the same on the 32 bits binaries + # analyzed ldd_output[binary] = [] continue else: @@ -370,19 +379,21 @@ if not m: return None fields = line.split() - sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } + sym = {'address': fields[0], 'type': fields[1], 'name': fields[2]} return sym def _ResolveSymbolsVersionInfo(self, binary_info): - version_info = binary_info['version definition'] + binary_info['version needed'] + version_info = (binary_info['version definition'] + + binary_info['version needed']) for sym_info in binary_info['symbol table']: - # sym_info version field is an 1-based index on the version information table + # sym_info version field is an 1-based index on the version + # information table # we don't care about 0 and 1 values: # 0 is for external symbol with no version information available - # 1 is for a symbol defined by the binary and not binded to a version interface - # but we removed that (useless) entry from the version definition table + # 1 is for a symbol defined by the binary and not binded + # to a version interface version_index = int(sym_info['version']) - 2 if version_index >= 0: version = version_info[version_index] @@ -392,27 +403,32 @@ else: sym_info['version'] = None - # we make sure these fields are present even if the syminfo section is not + # we make sure these fields are present + # even if the syminfo section is not sym_info.setdefault('soname') sym_info.setdefault('flags') - def _ParseElfdumpLine(self, line, section=None): headers_re = ( r""" - (?P
Version\sNeeded|Symbol\sTable # Section header + (?P
Version\sNeeded|Symbol\sTable # Section header |Version\sDefinition|Syminfo) \sSection: \s+(?:\.SUNW_version|\.dynsym |\.SUNW_syminfo|.symtab)\s*$ - |\s*(?:index\s+)?version\s+dependency\s*$ # Version needed header - |\s*(?:index\s+)?file\s+version\s*$ # Version definition header - |\s*index\s*value\s+size\s+type\s+bind # Symbol table header + + |\s*(?:index\s+)?version\s+dependency\s*$ # Version needed header + + |\s*(?:index\s+)?file\s+version\s*$ # Version definition header + + |\s*index\s*value\s+size\s+type\s+bind # Symbol table header \s+oth\s+ver\s+shndx\s+name\s*$ - |\s*index\s+flags\s+bound\sto\s+symbol\s*$ # Syminfo header - |\s*$ # There is always a blank - # line before a new section + + |\s*index\s+flags\s+bound\sto\s+symbol\s*$ # Syminfo header + + |\s*$ # There is always a blank + # line before a new section """) re_by_section = { @@ -483,17 +499,22 @@ r'with STV_PROTECTED visibility$') sizes_differ = (r'^\trelocation \S+ sizes differ: ' r'(?P\S+)$') - sizes_info = (r'^\t\t\(file (?P\S+) size=(?P0x\w+); ' + sizes_info = (r'^\t\t\(file (?P\S+)' + ' size=(?P0x\w+); ' r'file (?P\S+) size=(?P0x\w+)\)$') sizes_one_used = (r'^\t\t(?P\S+) size used; ' r'possible insufficient data copied$') - unreferenced_object = (r'^\s*unreferenced object=(?P.*); unused dependency of (?P.*)$') + unreferenced_object = (r'^\s*unreferenced object=(?P.*);' + ' unused dependency of (?P.*)$') unused_object = (r'^\s*unused object=.*$') - unused_search_path = (r'^\s*unused search path=.* \(RUNPATH/RPATH from file .*\)$') + unused_search_path = (r'^\s*unused search path=.*' + ' \(RUNPATH/RPATH from file .*\)$') blank_line = (r'^\s*$') common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" - % (found_re, symbol_not_found_re, only_so, version_so, stv_protected, sizes_differ, sizes_info, - sizes_one_used, unreferenced_object, unused_object, unused_search_path, blank_line)) + % (found_re, symbol_not_found_re, only_so, version_so, + stv_protected, sizes_differ, sizes_info, + sizes_one_used, unreferenced_object, unused_object, + unused_search_path, blank_line)) m = re.match(common_re, line) response = None if m: @@ -526,7 +547,8 @@ response["path"] = None response["symbol"] = None elif d["relocation_symbol"]: - response["state"] = 'relocation-bound-to-a-symbol-with-STV_PROTECTED-visibility' + response["state"] = ("relocation-bound-to-a-symbol" + "-with-STV_PROTECTED-visibility") response["soname"] = None response["path"] = d["relocation_path"] response["symbol"] = d["relocation_symbol"] @@ -618,9 +640,9 @@ pkgname, catalogname = fields[0:2] obsoleted_by.append((pkgname, catalogname)) - return { "syntax_ok": obsoleted_syntax_ok, - "obsoleted_by": obsoleted_by, - "has_obsolete_info": has_obsolete_info } + return {"syntax_ok": obsoleted_syntax_ok, + "obsoleted_by": obsoleted_by, + "has_obsolete_info": has_obsolete_info} class FileMagic(object): @@ -655,7 +677,7 @@ for i in xrange(10): mime = self.magic_cookie.file(full_path) if mime: - break; + break else: # Returned mime is null. Re-initializing the cookie and trying again. logging.error("magic_cookie.file(%s) returned None. Retrying.", @@ -675,6 +697,7 @@ # The presence of this method makes it explicit that we want an inspective # version of the directory format package. + def GetInspectivePkg(self): return self.GetDirFormatPkg() 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 22 18:26:08 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 16:26:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19277] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19277 http://gar.svn.sourceforge.net/gar/?rev=19277&view=rev Author: chninkel Date: 2012-09-22 16:26:07 +0000 (Sat, 22 Sep 2012) Log Message: ----------- updated test data set to follow symbol info modification Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/package_checks_test.py csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py Modified: csw/mgar/gar/v2-yann/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/package_checks_test.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/package_checks_test.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -504,7 +504,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ] } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ @@ -539,7 +539,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + { 'soname': 'libdb-4.7.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ] } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ @@ -576,7 +576,7 @@ 'symbol table': [{ 'symbol': 'foo', 'soname': 'libdb-4.7.so', 'bind': 'GLOB', - 'external': True, + 'shndx': 'UNDEF', 'flags': 'DBL' }], } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({ @@ -621,7 +621,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ] } } @@ -673,7 +673,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ] } }, @@ -736,7 +736,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libfoo.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ] }, 'opt/csw/lib/libfoo.so.1': { @@ -776,7 +776,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libbar.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + { 'soname': 'libbar.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ] } } @@ -812,7 +812,7 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libnotfound.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + { 'soname': 'libnotfound.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ] } } @@ -1576,7 +1576,7 @@ self.error_mgr_mock.ReportError( 'CSWvsftpd', 'no-direct-binding', - '/opt/csw/sbin/vsftpd is not directly binded to soname ' + soname) + '/opt/csw/sbin/vsftpd is not directly bound to soname ' + soname) class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): Modified: csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -79,23 +79,23 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libcurses.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libz.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libssl.so.1.0.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libcrypto.so.1.0.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libreadline.so.6', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libneon.so.27', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libncurses.so.5', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libmp.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libmd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libexpat.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } + { 'soname': 'libcurses.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libz.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libssl.so.1.0.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libcrypto.so.1.0.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libreadline.so.6', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libneon.so.27', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libncurses.so.5', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libmp.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libmd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libm.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libexpat.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ]}}, 'mtime': datetime.datetime(2012, 6, 6, 20, 21, 14), 'overrides': [], Modified: csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -118,37 +118,37 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libjpeg.so.62', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libjpeg.so.62', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ], }, 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0': { 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libjpeg.so.7', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libjpeg.so.7', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ], }, 'opt/csw/lib/libdjvulibre.so.21.1.0': { 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libjpeg.so.7', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libjpeg.so.7', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libm.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ], }, }, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/ivtools_stats.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -62,7 +62,7 @@ 'version definition': [], 'version needed' : [], 'symbol table': [ - { 'soname': 'libComUnidraw.so', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } , + { 'soname': 'libComUnidraw.so', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } , ], }, 'opt/csw/lib/libComUnidraw.so.1.1.3': { Modified: csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/javasvn_stats.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -91,32 +91,32 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_repos-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_client-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_wc-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_ra-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_delta-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_diff-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_subr-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsvn_fs-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libaprutil-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libldap-2.4.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'liblber-2.4.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libexpat.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libapr-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libuuid.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsendfile.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'librt.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libneon.so.27', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_repos-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_client-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_wc-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_ra-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_delta-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_diff-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_subr-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsvn_fs-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libaprutil-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libldap-2.4.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'liblber-2.4.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libexpat.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libapr-1.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libuuid.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsendfile.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'librt.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libpthread.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libneon.so.27', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCstd.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libCrun.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ]} }, 'mtime': datetime.datetime(2010, 7, 12, 19, 6, 15), Modified: csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/rsync_pkg_stats.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -81,24 +81,24 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libpopt.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsec.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpopt.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsec.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ] }, 'opt/csw/bin/sparcv9/rsync': { 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libpopt.so.0', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsec.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpopt.so.0', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsec.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libiconv.so.2', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ] } }, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/sudo_stats.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -76,16 +76,16 @@ 'binaries_elf_info': {'opt/csw/libexec/sudo_noexec.so': { 'version needed': [], 'version definition': [], - 'symbol table': [ { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' } ], + 'symbol table': [ { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' } ], }, 'opt/csw/sbin/visudo': { 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ], } }, @@ -315,12 +315,12 @@ 'version definition': [], 'version needed': [], 'symbol table': [ - { 'soname': 'libpam.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, - { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'external': True, 'bind': 'GLOB' }, + { 'soname': 'libpam.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libdl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libintl.so.8', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libsocket.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libnsl.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, + { 'soname': 'libc.so.1', 'symbol': 'foo', 'flags': 'DBL', 'shndx': 'UNDEF', 'bind': 'GLOB' }, ] } }, Modified: csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py 2012-09-22 16:15:20 UTC (rev 19276) +++ csw/mgar/gar/v2-yann/lib/python/testdata/tree_stats.py 2012-09-22 16:26:07 UTC (rev 19277) @@ -53,7 +53,7 @@ 'symbol table': [ { 'flags': 'DBL', 'soname': 'libc.so.1', 'symbol': 'environ', - 'external': True, + 'shndx': 'UNDEF', 'version': None } ] } 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 22 18:38:28 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 16:38:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19278] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 19278 http://gar.svn.sourceforge.net/gar/?rev=19278&view=rev Author: chninkel Date: 2012-09-22 16:38:28 +0000 (Sat, 22 Sep 2012) Log Message: ----------- simplified elf_info parsing Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 16:26:07 UTC (rev 19277) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 16:38:28 UTC (rev 19278) @@ -271,46 +271,17 @@ binary_info = {'version definition': [], 'version needed': []} - # The list of fields we want to retrieve in the elfdump output by section - # the key is the original field name - # the value is the destination field name - elf_fields = {'version definition': { - 'version': 'version', - 'dependency': 'dependency', - }, - 'version needed': { - 'file': 'soname', - 'version': 'version', - }, - 'symbol table': { - 'name': 'symbol', - 'ver': 'version', - 'type': 'type', - 'bind': 'bind', - 'shndx': 'shndx', - }, - 'syminfo': { - 'library': 'soname', - 'symbol': 'symbol', - 'flags': 'flags', - } - } - cur_section = None for line in elfdump_out: - elfdump_data, cur_section = self._ParseElfdumpLine(line, cur_section) + elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) # header or blank line contains no information - if not elfdump_data: + if not elf_info: continue - elf_info = {} - for src_field, dest_field in elf_fields[cur_section].items(): - elf_info[dest_field] = elfdump_data[src_field] - # symbol table and syminfo section store various informations - # about the same symbols, we merge them in a dict + # about the same symbols, so we merge them in a dict if cur_section in ('symbol table', 'syminfo'): symbols.setdefault(elf_info['symbol'], {}).update(elf_info) else: @@ -433,22 +404,22 @@ re_by_section = { 'version definition': (r""" - \s*(?:\[(?P\d+)\]\s+)? # index might be not present + \s*(?:\[\d+\]\s+)? # index might be not present # if no version binding is enabled (?P\S+) (?:\s+(?P\S+))? - (?:\s+\[\s(?:BASE)\s\])?\s*$ # + (?:\s+\[\s(?:BASE)\s\])?\s*$ """), 'version needed': (r""" - \s*(?:\[(?P\d+)\]\s+)? # index might be not present + \s*(?:\[\d+\]\s+)? # index might be not present # if no version binding is enabled - (?:(?P\S+)\s+ # file can be absent if the same as + (?:(?P\S+)\s+ # file can be absent if the same as (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, we make sure # version is not confused with file # in that case (?P\S+) - (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # + (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ """), 'symbol table': (r""" \s*\[\d+\] @@ -457,15 +428,15 @@ \s+(?P\S+) \s+(?P\S+) \s+\S+ - \s+(?P\S+) + \s+(?P\S+) \s+(?P\S+) - (?:\s+(?P\S+))?\s*$ + (?:\s+(?P\S+))?\s*$ """), 'syminfo': (r""" \s*\[\d+\] \s+(?P[ABCDFILNPS]+) \s+(?:(?:\[\d+\] # some kind of library index - \s+(?P\S+)|)\s+)? # library is not present + \s+(?P\S+)|)\s+)? # library is not present # for external symbols not # directly bound (?P\S+)\s* Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-22 16:26:07 UTC (rev 19277) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package_test.py 2012-09-22 16:38:28 UTC (rev 19278) @@ -165,9 +165,8 @@ def test_ParseElfdumpLineVersionNeeded(self): line = '[13] SUNW_0.9 [ INFO ]' expected = { - 'index': '13', - 'version': 'SUNW_0.9', - 'file': None + 'version': 'SUNW_0.9', + 'soname': None } self.assertEqual((expected, "version needed"), self.ip._ParseElfdumpLine(line, 'version needed')) @@ -176,8 +175,8 @@ expected = { 'bind': 'GLOB', 'shndx': '.text', - 'name': 'vsf_log_line', - 'ver': '1', + 'symbol': 'vsf_log_line', + 'version': '1', 'type': 'FUNC', } self.assertEqual((expected, 'symbol table'), self.ip._ParseElfdumpLine(line, 'symbol table')) @@ -186,7 +185,7 @@ line = ' [152] DB [4] libc.so.1 strlen' expected = { 'flags': 'DB', - 'library': 'libc.so.1', + 'soname': 'libc.so.1', 'symbol': 'strlen', } self.assertEqual((expected, "syminfo"), self.ip._ParseElfdumpLine(line, "syminfo")) @@ -195,7 +194,7 @@ line = ' [116] DB environ' expected = { 'flags': 'DB', - 'library': None, + 'soname': None, 'symbol': 'environ', } self.assertEqual((expected, "syminfo"), self.ip._ParseElfdumpLine(line, "syminfo")) 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 22 18:57:32 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 22 Sep 2012 16:57:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19279] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19279 http://gar.svn.sourceforge.net/gar/?rev=19279&view=rev Author: chninkel Date: 2012-09-22 16:57:32 +0000 (Sat, 22 Sep 2012) Log Message: ----------- more verbose comments for regexes Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 16:38:28 UTC (rev 19278) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2012-09-22 16:57:32 UTC (rev 19279) @@ -404,42 +404,42 @@ re_by_section = { 'version definition': (r""" - \s*(?:\[\d+\]\s+)? # index might be not present - # if no version binding is enabled - (?P\S+) - (?:\s+(?P\S+))? + \s*(?:\[\d+\]\s+)? # index: might be not present if + # no version binding is enabled + (?P\S+) # version + (?:\s+(?P\S+))? # dependency (?:\s+\[\s(?:BASE)\s\])?\s*$ """), 'version needed': (r""" - \s*(?:\[\d+\]\s+)? # index might be not present - # if no version binding is enabled - - (?:(?P\S+)\s+ # file can be absent if the same as - (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, we make sure - # version is not confused with file - # in that case - (?P\S+) - (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ + \s*(?:\[\d+\]\s+)? # index: might be not present if + # no version binding is enabled + (?:(?P\S+)\s+ # file: can be absent if the same as + (?!\[\s(?:INFO|WEAK)\s\]))? # the previous line, + # we make sure there is no + # confusion with version + (?P\S+) # version + (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # """), 'symbol table': (r""" - \s*\[\d+\] - \s+(?:0x[0-9a-f]+|REG_G\d+) - \s+0x[0-9a-f]+ - \s+(?P\S+) - \s+(?P\S+) - \s+\S+ - \s+(?P\S+) - \s+(?P\S+) - (?:\s+(?P\S+))?\s*$ + \s*\[\d+\] # index + \s+(?:0x[0-9a-f]+|REG_G\d+) # value + \s+(?:0x[0-9a-f]+) # size + \s+(?P\S+) # type + \s+(?P\S+) # bind + \s+(?:\S+) # oth + \s+(?P\S+) # ver + \s+(?P\S+) # shndx + (?:\s+(?P\S+))?\s*$ # name """), 'syminfo': (r""" - \s*\[\d+\] - \s+(?P[ABCDFILNPS]+) - \s+(?:(?:\[\d+\] # some kind of library index - \s+(?P\S+)|)\s+)? # library is not present - # for external symbols not - # directly bound - (?P\S+)\s* + \s*(?:\[\d+\]) # index + \s+(?P[ABCDFILNPS]+) # flags + + \s+(?:(?:\[\d+\] # bound to: contains a library index + \s+(?P\S+)|)\s+)? # and the library name + # or fon non external + # symbols + (?P\S+)\s* # symbol """)} elfdump_data = None 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 24 08:30:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 24 Sep 2012 06:30:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19280] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 19280 http://gar.svn.sourceforge.net/gar/?rev=19280&view=rev Author: cgrzemba Date: 2012-09-24 06:30:43 +0000 (Mon, 24 Sep 2012) Log Message: ----------- apply reviewer hints Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-22 16:57:32 UTC (rev 19279) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2012-09-24 06:30:43 UTC (rev 19280) @@ -12,12 +12,7 @@ PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 - PACKAGES += CSWlibsoup2-4-1 -CATALOGNAME_CSWlibsoup2-4-1 = libsoup2_4_1 -PKGFILES_CSWlibsoup2-4-1 += $(call baseisadirs,$(libdir),libsoup-2\.4\.so\.1\.3\.0) PKGFILES_CSWlibsoup2-4-1 += $(call baseisadirs,$(libdir),libsoup-2\.4\.so\.1(\.\d+)*) SPKG_DESC_CSWlibsoup2-4-1 += $(DESCRIPTION), libsoup-2.4.so.1 RUNTIME_DEP_PKGS_CSWlibsoup2-4-1 += CSWlibgthread2-0-0 @@ -31,8 +26,6 @@ OBSOLETED_BY_CSWlibsoup2-4-1 = CSWlibsoup PACKAGES += CSWlibsoup-gnome2-4-1 -CATALOGNAME_CSWlibsoup-gnome2-4-1 = libsoup_gnome2_4_1 -PKGFILES_CSWlibsoup-gnome2-4-1 += $(call baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1\.3\.0) PKGFILES_CSWlibsoup-gnome2-4-1 += $(call baseisadirs,$(libdir),libsoup-gnome-2\.4\.so\.1(\.\d+)*) SPKG_DESC_CSWlibsoup-gnome2-4-1 += $(DESCRIPTION), libsoup-gnome-2.4.so.1 RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibgthread2-0-0 @@ -48,15 +41,14 @@ RUNTIME_DEP_PKGS_CSWlibsoup-gnome2-4-1 += CSWlibglib2-0-0 OBSOLETED_BY_CSWlibsoup-gnome2-4-1 = CSWlibsoup +# keep this package with the old name PACKAGES += CSWlibsoupdoc SPKG_DESC_CSWlibsoupdoc += $(DESCRIPTION), documentation PKGFILES_CSWlibsoupdoc += $(sharedstatedir)/gtk-doc/.* ARCHALL_CSWlibsoupdoc = 1 PACKAGES += CSWlibsoup2-dev -CATALOGNAME_CSWlibsoup2-dev = libsoup2_dev SPKG_DESC_CSWlibsoup2-dev += $(DESCRIPTION), development files -# PKGFILES_CSWlibsoup2-dev += /opt/csw/lib/libsoup-2.4.so PKGFILES_CSWlibsoup2-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup2-4-1 RUNTIME_DEP_PKGS_CSWlibsoup2-dev += CSWlibsoup-gnome2-4-1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From grzemba at contac-dt.de Mon Sep 24 11:17:58 2012 From: grzemba at contac-dt.de (Carsten Grzemba) Date: Mon, 24 Sep 2012 11:17:58 +0200 Subject: [csw-devel] lib package names Message-ID: <74a0f56e4dfd.50604166@contac-dt.de> How I? have to handle package names of lib in this kind: CSWlibgegl0_1_0 if I update the package to version 0.2.0 Have I submit a new package CSWlibgegl0_2_0 ? there are checks in ckeckpkg for that? -- Carsten Grzemba -------------- next part -------------- An HTML attachment was scrubbed... URL: From cgrzemba at users.sourceforge.net Mon Sep 24 13:04:20 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 24 Sep 2012 11:04:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19281] csw/mgar/pkg/libgegl/trunk Message-ID: Revision: 19281 http://gar.svn.sourceforge.net/gar/?rev=19281&view=rev Author: cgrzemba Date: 2012-09-24 11:04:20 +0000 (Mon, 24 Sep 2012) Log Message: ----------- libgegl/trunk: bump version 0.2.0 Modified Paths: -------------- csw/mgar/pkg/libgegl/trunk/Makefile csw/mgar/pkg/libgegl/trunk/checksums Modified: csw/mgar/pkg/libgegl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgegl/trunk/Makefile 2012-09-24 06:30:43 UTC (rev 19280) +++ csw/mgar/pkg/libgegl/trunk/Makefile 2012-09-24 11:04:20 UTC (rev 19281) @@ -1,5 +1,5 @@ NAME = gegl -VERSION = 0.1.8 +VERSION = 0.2.0 CATEGORIES = gnome GARTYPE = v2 @@ -17,47 +17,69 @@ VENDOR_URL = http://gegl.org/ +GARCOMPILER = SOS12U3 + BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibrsvg-dev BUILD_DEP_PKGS += CSWlibsdl-dev BUILD_DEP_PKGS += CSWasciidoc BUILD_DEP_PKGS += CSWlua -PACKAGES += CSWlibgegl0-1-0 -SPKG_DESC_CSWlibgegl0-1-0 = A graph based image processing framework library, libgegl-0.1.so.0 -PKGFILES_CSWlibgegl0-1-0 += $(call pkgfiles_lib,libgegl-0.1.so.0) -PKGFILES_CSWlibgegl0-1-0 += $(call baseisadirs,$(libdir),gegl-0.1/.*) -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibbabl0-1-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWjasper -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibrsvg2-2 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWilmbase -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWpango -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWopenexrrt -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgio2-0-0 -OBSOLETED_BY_CSWlibgegl0-1-0 += CSWlibgegl +PACKAGES += CSWlibgegl0-2-0 +CATALOGNAME_CSWlibgegl0-2-0 = libgegl0_2_0 +PKGFILES_CSWlibgegl0-2-0 += $(call baseisadirs,$(libdir),libgegl-0\.2\.so\.0(\.\d+)*) +PKGFILES_CSWlibgegl0-2-0 += $(call baseisadirs,$(libdir),gegl-0.2/.*) +SPKG_DESC_CSWlibgegl0-2-0 += $(DESCRIPTION), libgegl-0.2.so.0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibbabl0-1-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibavformat54 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibavcodec54 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibgio2-0-0 +# PACKAGES += CSWlibgegl0-1-0 +# SPKG_DESC_CSWlibgegl0-1-0 = A graph based image processing framework library, libgegl-0.1.so.0 +# PKGFILES_CSWlibgegl0-1-0 += $(call pkgfiles_lib,libgegl-0.1.so.0) +# PKGFILES_CSWlibgegl0-1-0 += $(call baseisadirs,$(libdir),gegl-0.1/.*) +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibpng12-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibsdl1-2-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibintl8 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibbabl0-1-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWjasper +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWgtk2 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibjpeg7 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgthread2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibrsvg2-2 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgmodule2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibz1 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWilmbase +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibcairo2 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgobject2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibglib2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWpango +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWopenexrrt +# RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgio2-0-0 +# OBSOLETED_BY_CSWlibgegl0-1-0 += CSWlibgegl + PACKAGES += CSWlibgegl-dev SPKG_DESC_CSWlibgegl-dev = Development files for # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibgegl-dev += CSWlibgegl0-1-0 +RUNTIME_DEP_PKGS_CSWlibgegl-dev += CSWlibgegl0-2-0 PACKAGES += CSWgegl SPKG_DESC_CSWgegl = The gegl image processing utility PKGFILES_CSWgegl += $(call baseisadirs,$(bindir),gegl) -RUNTIME_DEP_PKGS_CSWgegl += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgegl += CSWlibbabl0-1-0 -RUNTIME_DEP_PKGS_CSWgegl += CSWlibgegl0-1-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibgegl0-2-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibgobject2-0-0 @@ -78,6 +100,13 @@ BUILD64 = 1 ISAEXEC = 1 +# for System X11, be sure that xrender.pc find xproto and renderproto and this use Solaris X11 +PKG_CONFIG_DIRS += /opt/csw/lib +PKG_CONFIG_DIRS += /usr/lib + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-mmx=no + include gar/category.mk # For diff option --report-identical-files Modified: csw/mgar/pkg/libgegl/trunk/checksums =================================================================== --- csw/mgar/pkg/libgegl/trunk/checksums 2012-09-24 06:30:43 UTC (rev 19280) +++ csw/mgar/pkg/libgegl/trunk/checksums 2012-09-24 11:04:20 UTC (rev 19281) @@ -1 +1 @@ -c8279b86b3d584ee4f503839fc500425 gegl-0.1.8.tar.bz2 +32b00002f1f1e316115c4ed922e1dec8 gegl-0.2.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Mon Sep 24 13:30:45 2012 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 24 Sep 2012 07:30:45 -0400 Subject: [csw-devel] lib package names In-Reply-To: <74a0f56e4dfd.50604166@contac-dt.de> References: <74a0f56e4dfd.50604166@contac-dt.de> Message-ID: Hi Carsten, The package name it's based on the soname and will change when the library version does. The software version may not match the soname and that is ok. Thanks -Ben On Sep 24, 2012 5:18 AM, "Carsten Grzemba" wrote: > How I have to handle package names of lib in this kind: > CSWlibgegl0_1_0 > > if I update the package to version 0.2.0 > > Have I submit a new package > CSWlibgegl0_2_0 ? > > there are checks in ckeckpkg for that? > -- > Carsten Grzemba > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > -------------- next part -------------- An HTML attachment was scrubbed... URL: From cgrzemba at users.sourceforge.net Mon Sep 24 14:02:54 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 24 Sep 2012 12:02:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19282] csw/mgar/pkg/gdk-pixbuf/trunk Message-ID: Revision: 19282 http://gar.svn.sourceforge.net/gar/?rev=19282&view=rev Author: cgrzemba Date: 2012-09-24 12:02:54 +0000 (Mon, 24 Sep 2012) Log Message: ----------- gdk-pixbuf/trunk: bump minor version2.24.1 Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile csw/mgar/pkg/gdk-pixbuf/trunk/checksums Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-09-24 11:04:20 UTC (rev 19281) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-09-24 12:02:54 UTC (rev 19282) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = gdk-pixbuf -VERSION = 2.24.0 +VERSION = 2.24.1 GARTYPE = v2 CATEGORIES = gnome Modified: csw/mgar/pkg/gdk-pixbuf/trunk/checksums =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/checksums 2012-09-24 11:04:20 UTC (rev 19281) +++ csw/mgar/pkg/gdk-pixbuf/trunk/checksums 2012-09-24 12:02:54 UTC (rev 19282) @@ -1 +1 @@ -bd7c2a9d23b573db467e39833f12103d gdk-pixbuf-2.24.0.tar.xz +72f39b34b20f68148c1609bd27415412 gdk-pixbuf-2.24.1.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 Mon Sep 24 16:07:29 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 24 Sep 2012 14:07:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19283] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 19283 http://gar.svn.sourceforge.net/gar/?rev=19283&view=rev Author: cgrzemba Date: 2012-09-24 14:07:29 +0000 (Mon, 24 Sep 2012) Log Message: ----------- gdk-pixbuf/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-09-24 12:02:54 UTC (rev 19282) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-09-24 14:07:29 UTC (rev 19283) @@ -18,18 +18,18 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +REINPLACE_USRSHARE += docs/reference/gdk-pixbuf/html/*.html + PACKAGES += CSWgdkpixbuf # To retain backwards compatibility with gdk pixbuf package 0.22 CATALOGNAME_CSWgdkpixbuf = gdk_pixbuf SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk-pixbuf2-0-0 +PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call pkgfiles_lib,gdk-pixbuf-2.0/.*) +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibtiff3 @@ -48,26 +48,24 @@ PACKAGES += CSWlibgdk-pixbuf2-0-0 SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 -PKGFILES_CSWlibgdk-pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0) +PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call baseisadirs,$(libdir),libgdk_pixbuf-2\.0\.so\.0(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 = CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibintl8 PACKAGES += CSWlibgdk-pixbuf-xlib2-0-0 SPKG_DESC_CSWlibgdk-pixbuf-xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0 PKGFILES_CSWlibgdk-pixbuf-xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 = CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 +# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0 +# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 +# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 PACKAGES += CSWlibgdk-pixbuf-dev SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION) @@ -90,8 +88,9 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-libiconv-prefix -CONFIGURE_ARGS += --with-libintl-prefix +CONFIGURE_ARGS += --with-x11 +# CONFIGURE_ARGS += --with-libiconv-prefix +# CONFIGURE_ARGS += --with-libintl-prefix include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Sep 25 08:53:18 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 25 Sep 2012 06:53:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19284] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 19284 http://gar.svn.sourceforge.net/gar/?rev=19284&view=rev Author: guengel Date: 2012-09-25 06:53:18 +0000 (Tue, 25 Sep 2012) Log Message: ----------- pgadmin3/trunk: New upstream release Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-09-24 14:07:29 UTC (rev 19283) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-09-25 06:53:18 UTC (rev 19284) @@ -3,7 +3,7 @@ # $Id$ NAME = pgadmin3 -VERSION = 1.14.3 +VERSION = 1.16.0 CATEGORIES = apps GARTYPE = v2 GARCOMPILER = SOS12U1 @@ -18,6 +18,7 @@ SPKG_SOURCEURL = http://www.pgadmin.org/ MASTER_SITES = http://ftp.postgresql.org/pub/pgadmin3/release/v$(VERSION)/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += changelog.CSW UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # Ignore them for now Modified: csw/mgar/pkg/pgadmin3/trunk/checksums =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/checksums 2012-09-24 14:07:29 UTC (rev 19283) +++ csw/mgar/pkg/pgadmin3/trunk/checksums 2012-09-25 06:53:18 UTC (rev 19284) @@ -1 +1 @@ -0669074fda039f5128abb40f63948ff5 pgadmin3-1.14.3.tar.gz +30ba5470a625176995a21099a9ae3058 pgadmin3-1.16.0.tar.gz Added: csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW 2012-09-25 06:53:18 UTC (rev 19284) @@ -0,0 +1,5 @@ +pgadmin3 (1.16.0,REV=2012.09.25) + + * New upstream release 1.16.0. + + -- Rafael Ostertag Mon, 25 Sep 2012 14:35:07 +0200 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 25 10:42:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 25 Sep 2012 08:42:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19285] csw/mgar/pkg/pango/trunk Message-ID: Revision: 19285 http://gar.svn.sourceforge.net/gar/?rev=19285&view=rev Author: cgrzemba Date: 2012-09-25 08:42:44 +0000 (Tue, 25 Sep 2012) Log Message: ----------- pango/trunk: bump version 1.29.5 Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pango/trunk/checksums Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2012-09-25 06:53:18 UTC (rev 19284) +++ csw/mgar/pkg/pango/trunk/Makefile 2012-09-25 08:42:44 UTC (rev 19285) @@ -1,5 +1,5 @@ NAME = pango -VERSION = 1.28.4 +VERSION = 1.29.5 CATEGORIES = lib GARTYPE = v2 @@ -20,7 +20,7 @@ PATCHFILES += 0001-Do-not-use-gcc-specific-flags-unconditionally.patch # Use patch unless this is fixed: # https://bugzilla.gnome.org/show_bug.cgi?id=652227 -PATCHFILES += 0002-Use-inttypes.h-when-stdint.h-is-not-available.patch +# PATCHFILES += 0002-Use-inttypes.h-when-stdint.h-is-not-available.patch VENDOR_URL = http://www.pango.org/ @@ -28,13 +28,14 @@ CATALOGNAME_CSWpango = libpango CHECKPKG_OVERRIDES_CSWpango += catalogname-does-not-match-pkgname|pkgname=CSWpango|catalogname=libpango|expected-catalogname=pango SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text -RUNTIME_DEP_PKGS_CSWpango += CSWlibintl8 RUNTIME_DEP_PKGS_CSWpango += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWpango += CSWglib2 RUNTIME_DEP_PKGS_CSWpango += CSWlibxrender -RUNTIME_DEP_PKGS_CSWpango += CSWftype2 -RUNTIME_DEP_PKGS_CSWpango += CSWfconfig RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWpango += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWpango += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpango += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpango += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpango += CSWlibfontconfig1 # No split for now as it is unclear how the plugins depend on each one CHECKPKG_OVERRIDES_CSWpango += shared-lib-pkgname-mismatch @@ -90,7 +91,7 @@ BUILD_DEP_PKGS += CSWgtk-doc BUILD_DEP_PKGS += CSWlibxslt BUILD_DEP_PKGS += CSWglib2devel -BUILD_DEP_PKGS += CSWlibxft2devel +# BUILD_DEP_PKGS += CSWlibxft2devel BUILD64 = 1 Modified: csw/mgar/pkg/pango/trunk/checksums =================================================================== --- csw/mgar/pkg/pango/trunk/checksums 2012-09-25 06:53:18 UTC (rev 19284) +++ csw/mgar/pkg/pango/trunk/checksums 2012-09-25 08:42:44 UTC (rev 19285) @@ -1 +1 @@ -3f3989700f04e9117d30544a9078b3a0 pango-1.28.4.tar.bz2 +7a1f293a47d19ed3b91c7bd5e96c134c pango-1.29.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Sep 25 13:34:59 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 25 Sep 2012 11:34:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19286] csw/mgar/gar/v2 Message-ID: Revision: 19286 http://gar.svn.sourceforge.net/gar/?rev=19286&view=rev Author: janholzh Date: 2012-09-25 11:34:59 +0000 (Tue, 25 Sep 2012) Log Message: ----------- change default map file for Solaris 10 to use older version of libc (1.22.2) Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2/lib/map.solaris10 Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-09-25 08:42:44 UTC (rev 19285) +++ csw/mgar/gar/v2/gar.conf.mk 2012-09-25 11:34:59 UTC (rev 19286) @@ -690,7 +690,7 @@ RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install) endif -LINKER_MAP_RELEASE-5.10 ?= solaris10u8 +LINKER_MAP_RELEASE-5.10 ?= solaris10 LINKER_MAP_RELEASE ?= $(LINKER_MAP_RELEASE-$(GAROSREL)) LINKER_MAPS ?= $(foreach MAP,$(LINKER_MAP_RELEASE) $(EXTRA_LINKER_MAPS) $(EXTRA_LINKER_MAPS-$(GAROSREL)),-M $(abspath $(GARDIR)/lib/map.$(LINKER_MAP_RELEASE))) Copied: csw/mgar/gar/v2/lib/map.solaris10 (from rev 19260, csw/mgar/gar/v2/lib/map.solaris10u8) =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 (rev 0) +++ csw/mgar/gar/v2/lib/map.solaris10 2012-09-25 11:34:59 UTC (rev 19286) @@ -0,0 +1,7 @@ +# Solaris 10 mapfile with libc Version 1.22.2 which is Update?? Kernel Version +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 +libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.2; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers +libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers +libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 25 15:16:24 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Sep 2012 13:16:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19287] csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk Message-ID: Revision: 19287 http://gar.svn.sourceforge.net/gar/?rev=19287&view=rev Author: dmichelsen Date: 2012-09-25 13:16:24 +0000 (Tue, 25 Sep 2012) Log Message: ----------- cpan/ExtUtils-XSBuilder/trunk: Update to makemake Modified Paths: -------------- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.depend csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.gspec csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.prototype Modified: csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/Makefile 2012-09-25 11:34:59 UTC (rev 19286) +++ csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/Makefile 2012-09-25 13:16:24 UTC (rev 19287) @@ -4,19 +4,20 @@ GARTYPE = v2 AUTHOR = GRICHTER -DESCRIPTION = parse C header files and create XS glue code -define BLURB - ExtUtils::XSBuilder is a set modules to parse C header files and create XS - glue code and documentation out of it. Idealy this allows to "write" an - interface to a C library without coding a line. Since no C-API is ideal, - some adjuments are necessary most of the time. So to use this module you - must still be familar with C and XS programming, but it removes a lot of - stupid work and copy&paste from you. Also when the C API changes, most of - the time you only have to rerun XSBuilder to get your new Perl API. -endef +DESCRIPTION = Automatic Perl XS glue code generation -DISTFILES = $(call admfiles,CSWpmextutxsbld,depend prototype) +CATALOG_RELEASE = unstable -DEPENDS += cpan/Parse-RecDescent cpan/Tie-IxHash +LICENSE_TEXT = This module is licensed under the license +PACKAGES += CSWpm-extutils-xsbuilder +CATALOGNAME_CSWpm-extutils-xsbuilder = pm_extutils_xsbuilder +SPKG_DESC_CSWpm-extutils-xsbuilder = Automatic Perl XS glue code generation +# There was no information if this is pure Perl or not. Please remove if necessary. +ARCHALL_CSWpm-extutils-xsbuilder = 1 +RUNTIME_DEP_PKGS_CSWpm-extutils-xsbuilder += CSWpm-tie-ixhash +RUNTIME_DEP_PKGS_CSWpm-extutils-xsbuilder += CSWpm-parse-recdescent +OBSOLETED_BY_CSWpm-extutils-xsbuilder += CSWpmextutxsbld +CATALOGNAME_CSWpmextutxsbld = pm_extutxsbld_stub + include gar/category.mk Deleted: csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.depend =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.depend 2012-09-25 11:34:59 UTC (rev 19286) +++ csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.depend 2012-09-25 13:16:24 UTC (rev 19287) @@ -1,2 +0,0 @@ -P CSWpmparserecdescent pm_parserecdescent - generate recursive-descent parsers -P CSWpmtieixhash pm_tieixhash - ordered associative arrays for Perl Deleted: csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.gspec =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.gspec 2012-09-25 11:34:59 UTC (rev 19286) +++ csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.gspec 2012-09-25 13:16:24 UTC (rev 19287) @@ -1,14 +0,0 @@ -%var bitname pm_extutxsbld -%var pkgname CSWpmextutxsbld -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2000-2001 Doug MacEachern -Copyright (c) 2001-2004 Gerald Richter / ecos gmbh (www.ecos.de) - -You may distribute under the terms of either the GNU General Public -License or the Artistic License, as specified in the Perl README file. - -THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. Deleted: csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.prototype =================================================================== --- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.prototype 2012-09-25 11:34:59 UTC (rev 19286) +++ csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/files/CSWpmextutxsbld.prototype 2012-09-25 13:16:24 UTC (rev 19287) @@ -1,28 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto/ 0755 root bin -d none /opt/csw/lib/perl/csw/auto/ExtUtils 0755 root bin -d none /opt/csw/lib/perl/csw/auto/ExtUtils/XSBuilder 0755 root bin -f none /opt/csw/lib/perl/csw/auto/ExtUtils/XSBuilder/.packlist 0444 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/ExtUtils::XSBuilder.3perl 0444 root bin -f none /opt/csw/share/man/man3/ExtUtils::XSBuilder::PODTemplate.3perl 0444 root bin -f none /opt/csw/share/man/man3/ExtUtils::xsbuilder.osc2002.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/ExtUtils 0755 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder.pm 0555 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder.pod 0555 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/C/grammar.pm 0444 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/CallbackMap.pm 0555 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/FunctionMap.pm 0444 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/MapUtil.pm 0555 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/PODTemplate.pm 0444 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/ParseSource.pm 0555 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/StructureMap.pm 0555 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/TypeMap.pm 0444 root bin -f none /opt/csw/share/perl/csw/ExtUtils/XSBuilder/WrapXS.pm 0444 root bin -f none /opt/csw/share/perl/csw/ExtUtils/xsbuilder.osc2002.pod 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 25 16:22:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Sep 2012 14:22:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19288] csw/mgar/pkg/krb5-lib/branches Message-ID: Revision: 19288 http://gar.svn.sourceforge.net/gar/?rev=19288&view=rev Author: dmichelsen Date: 2012-09-25 14:22:54 +0000 (Tue, 25 Sep 2012) Log Message: ----------- krb5-lib/branches/krb5-1.9.2-solaris9: Adjust Solaris 9 build Added Paths: ----------- csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/files/ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile Removed Paths: ------------- csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/files/ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-09-20 15:33:23 UTC (rev 19251) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile 2012-09-25 14:22:54 UTC (rev 19288) @@ -1,182 +0,0 @@ -# $Id$ -# -# ! The build links against the version of libkdb5 installed in the system, -# instead of the one built. -# - -NAME = krb5 -VERSION = 1.9.2 -CATEGORIES = server -GARTYPE = v2 - -DESCRIPTION = MIT Kerberos 5 core libraries -define BLURB - Kerberos is a network authentication protocol. It is designed to - provide strong authentication for client/server applications by - using secret-key cryptography. A free implementation of this protocol - is available from the Massachusetts Institute of Technology. - Kerberos is available in many commercial products as well. -endef - -MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ -DISTFILES = $(NAME)-$(VERSION)-signed.tar - -PATCHFILES = patch-man2html-perl.patch -PATCHFILES += 0002-libintl-for-kproplog.patch -# PATCHFILES += 0003-local-libraries-first-when-linking.patch -PATCHFILES += 0004-libkdb_ldap-isblank-define.patch -PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch -# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch -PATCHFILES += 0005-krb5_set_password_using_ccache.patch - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -BUILD_DEP_PKGS = CSWtcl - -# Uncomment for a better view of file-package allocations. -# PACKAGES = CSWdo-not-use -# SPKG_DESC_CSWdo-not-use = Do not use this catch all package - -# These packages are not part of the krb5libs build, but only the main server -#PACKAGES += CSWkrb5doc -PKGFILES_CSWkrb5doc = NOFILES -SPKG_DESC_CSWkrb5doc = Unused package 1 -#PACKAGES += CSWkrb5user -PKGFILES_CSWkrb5user = NOFILES -SPKG_DESC_CSWkrb5user = Unused package 2 -#PACKAGES += CSWkrb5kdc -PKGFILES_CSWkrb5kdc = NOFILES -SPKG_DESC_CSWkrb5kdc = Unused package 3 -#PACKAGES += CSWkrb5adminserver -PKGFILES_CSWkrb5adminserver = NOFILES -SPKG_DESC_CSWkrb5adminserver = Unused package 4 - -PACKAGES += CSWlibkrb5-dev -SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries -RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv -PKGFILES_CSWlibkrb5-dev = $(mandir)/man8/sserver.8 -PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 -PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) -PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) -OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev -CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub -# /usr/local in a manpage is OK. -CHECKPKG_OVERRIDES_CSWlibkrb5-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sserver.8 - -PACKAGES += CSWlibcom-err3 -CATALOGNAME_CSWlibcom-err3 = libcom_err3 -PKGFILES_CSWlibcom-err3 += $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3 -OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0 - -PACKAGES += CSWlibgssapi-krb5-2 -CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 -PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 -OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0 - -PACKAGES += CSWlibk5crypto3 -CATALOGNAME_CSWlibk5crypto3 = libk5crypto3 -PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3 -RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0 -OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib - -PACKAGES += CSWlibkrb5-priv -SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) -# Private libraries in one common package. -CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 -CHECKPKG_OVERRIDES_CSWlibkrb5-priv += non-uniform-lib-versions-in-package - -PACKAGES += CSWlibkrb5-3 -CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 -PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3 -OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 - -PACKAGES += CSWlibkrb5support0 -CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 -PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 -OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib - -LICENSE = doc/copyright.texinfo - -EXTRA_LD_OPTIONS += -M $(abspath mapfile) - -EXTRA_CPPFLAGS += -D__EXTENSIONS__ - -CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure - -BUILD64_LIBS_ONLY = 1 - -# We turn off almost everything as we are just interested in the library. -NODIRPATHS = --docdir -CONFIGURE_ARGS = $(DIRPATHS) -# --enable-ipv6 is deprecated and autodetected -#CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm -#CONFIGURE_ARGS += --disable-thread-support -CONFIGURE_ARGS += --enable-thread-support -CONFIGURE_ARGS += --disable-static --disable-profiled -CONFIGURE_ARGS += --without-ldap - -CONFIGURE_ARGS-32 += --with-tcl=$(prefix) -CONFIGURE_ARGS-64 += --without-tcl -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - -BUILD_SCRIPTS = $(WORKSRC)/src/Makefile - -TEST_SCRIPTS = $(WORKSRC)/src/Makefile - -# Some tests are failing: -# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin -# Running pass `tcp' ... -# server didn't start in 30 secondscan't read "expect_out(buffer)": no such -# variable -# while executing -# "verbose $expect_out(buffer) 1" -SKIPTEST ?= 1 - -INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile - -# This name is so old that there it is not recognized as devel-package -CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWkrb5lib - -# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib -CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname -CATALOGNAME_CSWkrb5lib = krb5_lib_stub - -include gar/category.mk - -post-extract-modulated: - @# TODO: Check signature - cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -) - @# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path - perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \ - $(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in - @$(MAKECOOKIE) Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile (from rev 19072, csw/mgar/pkg/krb5-lib/trunk/Makefile) =================================================================== --- csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile (rev 0) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/Makefile 2012-09-25 14:22:54 UTC (rev 19288) @@ -0,0 +1,183 @@ +# $Id$ +# +# ! The build links against the version of libkdb5 installed in the system, +# instead of the one built. +# + +NAME = krb5 +VERSION = 1.9.2 +CATEGORIES = server +GARTYPE = v2 + +DESCRIPTION = MIT Kerberos 5 core libraries +define BLURB + Kerberos is a network authentication protocol. It is designed to + provide strong authentication for client/server applications by + using secret-key cryptography. A free implementation of this protocol + is available from the Massachusetts Institute of Technology. + Kerberos is available in many commercial products as well. +endef + +MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ +DISTFILES = $(NAME)-$(VERSION)-signed.tar + +PATCHFILES = patch-man2html-perl.patch +PATCHFILES += 0002-libintl-for-kproplog.patch +# PATCHFILES += 0003-local-libraries-first-when-linking.patch +PATCHFILES += 0004-libkdb_ldap-isblank-define.patch +PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch +# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch +PATCHFILES += 0005-krb5_set_password_using_ccache.patch + +# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD_DEP_PKGS = CSWtcl + +# Uncomment for a better view of file-package allocations. +# PACKAGES = CSWdo-not-use +# SPKG_DESC_CSWdo-not-use = Do not use this catch all package + +# These packages are not part of the krb5libs build, but only the main server +#PACKAGES += CSWkrb5doc +PKGFILES_CSWkrb5doc = NOFILES +SPKG_DESC_CSWkrb5doc = Unused package 1 +#PACKAGES += CSWkrb5user +PKGFILES_CSWkrb5user = NOFILES +SPKG_DESC_CSWkrb5user = Unused package 2 +#PACKAGES += CSWkrb5kdc +PKGFILES_CSWkrb5kdc = NOFILES +SPKG_DESC_CSWkrb5kdc = Unused package 3 +#PACKAGES += CSWkrb5adminserver +PKGFILES_CSWkrb5adminserver = NOFILES +SPKG_DESC_CSWkrb5adminserver = Unused package 4 + +PACKAGES += CSWlibkrb5-dev +SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries +RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv +PKGFILES_CSWlibkrb5-dev = $(mandir)/man8/sserver.8 +PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 +PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) +PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) +OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub +# /usr/local in a manpage is OK. +CHECKPKG_OVERRIDES_CSWlibkrb5-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sserver.8 + +PACKAGES += CSWlibcom-err3 +CATALOGNAME_CSWlibcom-err3 = libcom_err3 +PKGFILES_CSWlibcom-err3 += $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3 +OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0 + +PACKAGES += CSWlibgssapi-krb5-2 +CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 +PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 +OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0 + +PACKAGES += CSWlibk5crypto3 +CATALOGNAME_CSWlibk5crypto3 = libk5crypto3 +PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3 +RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0 +OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib + +PACKAGES += CSWlibkrb5-priv +SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) +# Private libraries in one common package. +CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 +CHECKPKG_OVERRIDES_CSWlibkrb5-priv += non-uniform-lib-versions-in-package + +PACKAGES += CSWlibkrb5-3 +CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3 +OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 + +PACKAGES += CSWlibkrb5support0 +CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 +PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 +OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib + +LICENSE = doc/copyright.texinfo + +# EXTRA_LD_OPTIONS += -M $(abspath mapfile) + +EXTRA_CPPFLAGS += -D__EXTENSIONS__ + +CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure + +BUILD64_LIBS_ONLY = 1 + +# We turn off almost everything as we are just interested in the library. +NODIRPATHS = --docdir +CONFIGURE_ARGS = $(DIRPATHS) +# --enable-ipv6 is deprecated and autodetected +#CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm +#CONFIGURE_ARGS += --disable-thread-support +CONFIGURE_ARGS += --enable-thread-support +CONFIGURE_ARGS += --disable-static --disable-profiled +CONFIGURE_ARGS += --without-ldap + +#CONFIGURE_ARGS-32 += --with-tcl=$(prefix) +CONFIGURE_ARGS-32 += --without-tcl +CONFIGURE_ARGS-64 += --without-tcl +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +BUILD_SCRIPTS = $(WORKSRC)/src/Makefile + +TEST_SCRIPTS = $(WORKSRC)/src/Makefile + +# Some tests are failing: +# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin +# Running pass `tcp' ... +# server didn't start in 30 secondscan't read "expect_out(buffer)": no such +# variable +# while executing +# "verbose $expect_out(buffer) 1" +SKIPTEST ?= 1 + +INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile + +# This name is so old that there it is not recognized as devel-package +CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWkrb5lib + +# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib +CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname +CATALOGNAME_CSWkrb5lib = krb5_lib_stub + +include gar/category.mk + +post-extract-modulated: + @# TODO: Check signature + cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -) + @# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path + perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \ + $(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/checksums 2012-09-20 15:33:23 UTC (rev 19251) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums 2012-09-25 14:22:54 UTC (rev 19288) @@ -1 +0,0 @@ -8de1e9111612f0af0b0560789ae11cb9 krb5-1.9.2-signed.tar Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums (from rev 18981, csw/mgar/pkg/krb5-lib/trunk/checksums) =================================================================== --- csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums (rev 0) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/checksums 2012-09-25 14:22:54 UTC (rev 19288) @@ -0,0 +1 @@ +8de1e9111612f0af0b0560789ae11cb9 krb5-1.9.2-signed.tar Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/mapfile 2012-09-20 15:33:23 UTC (rev 19251) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile 2012-09-25 14:22:54 UTC (rev 19288) @@ -1,3 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; -libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; -libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile (from rev 19072, csw/mgar/pkg/krb5-lib/trunk/mapfile) =================================================================== --- csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile (rev 0) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9.2-solaris9/mapfile 2012-09-25 14:22:54 UTC (rev 19288) @@ -0,0 +1,3 @@ +#libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; +libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; +libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 25 18:24:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Sep 2012 16:24:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19289] csw/mgar/pkg/cpan/Apache-Test/trunk Message-ID: Revision: 19289 http://gar.svn.sourceforge.net/gar/?rev=19289&view=rev Author: dmichelsen Date: 2012-09-25 16:24:42 +0000 (Tue, 25 Sep 2012) Log Message: ----------- cpan/Apache-Test/trunk: Update to 1.38, sanitize package name Modified Paths: -------------- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile csw/mgar/pkg/cpan/Apache-Test/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.depend csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.gspec csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.prototype Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2012-09-25 14:22:54 UTC (rev 19288) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2012-09-25 16:24:42 UTC (rev 19289) @@ -1,25 +1,27 @@ NAME = Apache-Test -VERSION = 1.30 +VERSION = 1.38 CATEGORIES = cpan GARTYPE = v2 AUTHOR = PHRED DESCRIPTION = Test.pm wrapper with helpers for testing Apache define BLURB - Apache::Test is a wrapper around the standard Test.pm with helpers for - testing an Apache server. endef -# depends -RUNTIME_DEP_PKGS = CSWap2prefork -BUILD_DEP_PKGS = CSWap2prefork +CATALOG_RELEASE = unstable -PACKAGES = CSWpmapachetst -CATALOGNAME = pm_apachetst +LICENSE = LICENSE -ARCHALL = 1 +PACKAGES += CSWpm-apache-test +CATALOGNAME_CSWpm-apache-test = pm_apache_test +SPKG_DESC_CSWpm-apache-test = Test.pm wrapper with helpers for testing Apache +ARCHALL_CSWpm-apache-test = 1 +OBSOLETED_BY_CSWpm-apache-test += CSWap2modperl +CATALOGNAME_CSWap2modperl = ap2_modperl_stub -APACHE_TEST_HTTPD = $(prefix)/apache2/sbin/httpd -export APACHE_TEST_HTTPD +# These are probably ok +CHECKPKG_OVERRIDES_CSWpm-apache-test += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Apache::TestMB.3perl +CHECKPKG_OVERRIDES_CSWpm-apache-test += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Apache/TestBuild.pm +CHECKPKG_OVERRIDES_CSWpm-apache-test += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Apache/TestMB.pm include gar/category.mk Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/checksums 2012-09-25 14:22:54 UTC (rev 19288) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/checksums 2012-09-25 16:24:42 UTC (rev 19289) @@ -1 +1 @@ -f4e34be218a25048def5a4f797ae7cb9 Apache-Test-1.30.tar.gz +dc7edf358dfea5bcf6ef4cdfe81e5dad Apache-Test-1.38.tar.gz Deleted: csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.gspec =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.gspec 2012-09-25 14:22:54 UTC (rev 19288) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.gspec 2012-09-25 16:24:42 UTC (rev 19289) @@ -1,5 +0,0 @@ -%var bitname pm_apachetst -%var pkgname CSWpmapachetst -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.prototype =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.prototype 2012-09-25 14:22:54 UTC (rev 19288) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/files/CSWpmapachetst.prototype 2012-09-25 16:24:42 UTC (rev 19289) @@ -1,60 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Apache 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Apache/Test 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Apache/Test/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Apache::Test.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestConfig.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestMB.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestMM.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestReport.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestRequest.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestRun.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestRunPHP.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestRunPerl.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestSmoke.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestTrace.3perl 0444 root bin -f none /opt/csw/share/man/man3/Apache::TestUtil.3perl 0444 root bin -f none /opt/csw/share/man/man3/Bundle::ApacheTest.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Apache 0755 root bin -f none /opt/csw/share/perl/csw/Apache/Test.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/Test5005compat.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestBuild.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestClient.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestCommon.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestCommonPost.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestConfig.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestConfigC.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestConfigPHP.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestConfigParrot.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestConfigParse.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestConfigPerl.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestHandler.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestHarness.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestHarnessPHP.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestMB.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestMM.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestPerlDB.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestReport.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestReportPerl.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestRequest.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestRun.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestRunPHP.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestRunParrot.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestRunPerl.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestSSLCA.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestServer.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestSmoke.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestSmokePerl.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestSort.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestTrace.pm 0444 root bin -f none /opt/csw/share/perl/csw/Apache/TestUtil.pm 0444 root bin -d none /opt/csw/share/perl/csw/Bundle 0755 root bin -f none /opt/csw/share/perl/csw/Bundle/ApacheTest.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 25 18:32:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Sep 2012 16:32:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19290] csw/mgar/pkg/cpan/libapreq2/trunk Message-ID: Revision: 19290 http://gar.svn.sourceforge.net/gar/?rev=19290&view=rev Author: dmichelsen Date: 2012-09-25 16:32:00 +0000 (Tue, 25 Sep 2012) Log Message: ----------- cpan/libapreq2/trunk: Update to 2.13, general rework Modified Paths: -------------- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile csw/mgar/pkg/cpan/libapreq2/trunk/checksums Modified: csw/mgar/pkg/cpan/libapreq2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2012-09-25 16:24:42 UTC (rev 19289) +++ csw/mgar/pkg/cpan/libapreq2/trunk/Makefile 2012-09-25 16:32:00 UTC (rev 19290) @@ -1,10 +1,10 @@ NAME = libapreq2 -VERSION = 2.12 +VERSION = 2.13 CATEGORIES = cpan GARTYPE = v2 AUTHOR = JOESUF -DESCRIPTION = methods for dealing with Apache request data +DESCRIPTION = Methods for dealing with Apache request data define BLURB Apache::Request is a subclass of the Apache class, which adds methods for parsing GET requests and POST requests where Content-type is one of @@ -12,48 +12,59 @@ manpage for more details. endef -PACKAGES = CSWlibapreq2 CSWlibapreq2-devel CSWap2modapreq2 CSWpmapreq2 -# individual packages below -CATALOGNAME_CSWlibapreq2 = libapreq2 -SPKG_DESC_CSWlibapreq2 = Apache Request Library -PKGFILES_CSWlibapreq2 = /opt/csw/apache2/lib/libapreq2.so.* -RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWiconv -RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWapache2rt -RUNTIME_DEP_PKGS_CSWlibapreq2 += CSWbdb47 +LICENSE = LICENSE -CATALOGNAME_CSWlibapreq2-devel = libapreq2_devel -SPKG_DESC_CSWlibapreq2-devel = Apache Request Library development support -PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/bin/apreq2-config -PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/include/apreq2/.* -PKGFILES_CSWlibapreq2-devel += /opt/csw/apache2/lib/libapreq2.a -RUNTIME_DEP_PKGS_CSWlibapreq2-devel += CSWlibapreq2 +PACKAGES += CSWlibapreq2-3 +SPKG_DESC_CSWlibapreq2-3 = Apache Request Library +PKGFILES_CSWlibapreq2-3 += $(call pkgfiles_lib,libapreq2.so.3) +RUNTIME_DEP_PKGS_CSWlibapreq2-3 += CSWbdb48 +RUNTIME_DEP_PKGS_CSWlibapreq2-3 += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWlibapreq2-3 += CSWlibaprutil1-0 +OBSOLETED_BY_CSWlibapreq2-3 += CSWlibapreq2 +PACKAGES += CSWlibapreq2-dev +SPKG_DESC_CSWlibapreq2-dev = Apache Request Library development support for libapreq2.so.3 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibapreq2-dev += CSWlibapreq2-3 +RUNTIME_DEP_PKGS_CSWlibapreq2-dev += CSWapache2 +OBSOLETED_BY_CSWlibapreq2-dev += CSWlibapreq2-devel + +# This is just for the path +CHECKPKG_OVERRIDES_CSWlibapreq2-dev += file-with-bad-content|/usr/local|root/opt/csw/bin/apreq2-config + +PACKAGES += CSWap2modapreq2 CATALOGNAME_CSWap2modapreq2 = ap2_modapreq2 -SPKG_DESC_CSWap2modapreq2 = libapreq2 filter module for Apache 2 -PKGFILES_CSWap2modapreq2 = /opt/csw/apache2/libexec/mod_apreq2.so -RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWiconv -RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWapache2rt -RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapreq2 +# Keep the package name for now until all apache naming has been sanitized +CHECKPKG_OVERRIDES_CSWap2modapreq2 += catalogname-does-not-match-pkgname|pkgname=CSWap2modapreq2|catalogname=ap2_modapreq2|expected-catalogname=ap2modapreq2 +SPKG_DESC_CSWap2modapreq2 = Apache 2 filter module libapreq2 +PKGFILES_CSWap2modapreq2 += /opt/csw/apache2/libexec/mod_apreq2.so +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapreq2-3 +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWap2modapreq2 += CSWapache2 -CATALOGNAME_CSWpmapreq2 = pm_apreq2 -SPKG_DESC_CSWpmapreq2 = libapreq2 Perl language bindings -PKGFILES_CSWpmapreq2 += /opt/csw/lib/perl/.* -PKGFILES_CSWpmapreq2 += /opt/csw/share/man/.* -RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWap2modperl -RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWpmapachetst -RUNTIME_DEP_PKGS_CSWpmapreq2 += CSWpmextutxsbld +PACKAGES += CSWpm-apr-request2 +SPKG_DESC_CSWpm-apr-request2 = libapreq2 Perl language bindings +PKGFILES_CSWpm-apr-request2 += /opt/csw/lib/perl/.* +PKGFILES_CSWpm-apr-request2 += /opt/csw/share/man/.* +RUNTIME_DEP_PKGS_CSWpm-apr-request2 += CSWap2modperl +# This is part of CSWap2modperl +# RUNTIME_DEP_PKGS_CSWpm-apr-request2 += CSWpmapachetst +RUNTIME_DEP_PKGS_CSWpm-apr-request2 += CSWpm-extutils-xsbuilder +OBSOLETED_BY_CSWpm-apr-request2 += CSWpmapreq2 +CATALOGNAME_CSWpmapreq2 = pm_apreq2_stub # Ensure args are requestrecs PATCHFILES += requestrec.diff -# BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWbdb47-devel +# BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWbdb48-devel AP2_ROOT = $(prefix)/apache2 CONFIGURE_ARGS = --enable-perl-glue CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-apache2-apxs=$(AP2_ROOT)/sbin/apxs -CONFIGURE_ARGS += --with-apr-config=$(AP2_ROOT)/bin/apr-config -CONFIGURE_ARGS += --with-apu-config=$(AP2_ROOT)/bin/apu-config +CONFIGURE_ARGS += --with-apr-config=$(bindir)/apr-1-config +CONFIGURE_ARGS += --with-apu-config=$(bindir)/apu-1-config CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --with-mm-opts="INSTALLDIRS=vendor" @@ -62,12 +73,12 @@ FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/apache2/lib STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec -EXTRA_INC = $(prefix)/bdb47/include -EXTRA_LIB = $(prefix)/bdb47/lib $(prefix)/apache2/lib +EXTRA_INC = $(prefix)/bdb48/include +EXTRA_LIB = $(prefix)/bdb48/lib $(prefix)/apache2/lib -SKIPTEST = 1 +SKIPTEST ?= 1 # apache2 is not yet libtool free -STRIP_LIBTOOL = 1 +# STRIP_LIBTOOL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/libapreq2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libapreq2/trunk/checksums 2012-09-25 16:24:42 UTC (rev 19289) +++ csw/mgar/pkg/cpan/libapreq2/trunk/checksums 2012-09-25 16:32:00 UTC (rev 19290) @@ -1,2 +1 @@ -76e2acde0d82246dea6f2565f3746eec libapreq2-2.12.tar.gz -500218b67e41bd8ed189b3cb5f031e98 requestrec.diff +c11fb0861aa84dcc6cd0f0798b045eee libapreq2-2.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Sep 25 22:51:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 25 Sep 2012 20:51:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19291] csw/mgar/pkg/nasm/trunk Message-ID: Revision: 19291 http://gar.svn.sourceforge.net/gar/?rev=19291&view=rev Author: dmichelsen Date: 2012-09-25 20:51:28 +0000 (Tue, 25 Sep 2012) Log Message: ----------- nasm/trunk: Update to 2.10.05 Modified Paths: -------------- csw/mgar/pkg/nasm/trunk/Makefile csw/mgar/pkg/nasm/trunk/checksums Modified: csw/mgar/pkg/nasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/nasm/trunk/Makefile 2012-09-25 16:32:00 UTC (rev 19290) +++ csw/mgar/pkg/nasm/trunk/Makefile 2012-09-25 20:51:28 UTC (rev 19291) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = nasm -VERSION = 2.09.04 +VERSION = 2.10.05 CATEGORIES = utils GARTYPE = v2 @@ -20,6 +20,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = test + INSTALL_ARGS = INSTALLROOT=$(DESTDIR) include gar/category.mk Modified: csw/mgar/pkg/nasm/trunk/checksums =================================================================== --- csw/mgar/pkg/nasm/trunk/checksums 2012-09-25 16:32:00 UTC (rev 19290) +++ csw/mgar/pkg/nasm/trunk/checksums 2012-09-25 20:51:28 UTC (rev 19291) @@ -1 +1 @@ -c11f083a501adae843d0bc3e7c106c73 nasm-2.09.04.tar.bz2 +d3c50875fd923b782749f883294336ed nasm-2.10.05.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Sep 25 23:20:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 25 Sep 2012 21:20:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19292] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 19292 http://gar.svn.sourceforge.net/gar/?rev=19292&view=rev Author: wahwah Date: 2012-09-25 21:20:45 +0000 (Tue, 25 Sep 2012) Log Message: ----------- gcc4/trunk: version upgrade Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-09-25 20:51:28 UTC (rev 19291) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-09-25 21:20:45 UTC (rev 19292) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.7.1 +VERSION = 4.7.2 CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') @@ -18,6 +18,7 @@ DISTFILES = $(DISTNAME).tar.bz2 MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ +MASTER_SITES += http://ftp.heanet.ie/mirrors/gnu/gcc/$(NAME)-$(VERSION)/ LIBOBJC = 4 Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2012-09-25 20:51:28 UTC (rev 19291) +++ csw/mgar/pkg/gcc4/trunk/checksums 2012-09-25 21:20:45 UTC (rev 19292) @@ -1 +1 @@ -933e6f15f51c031060af64a9e14149ff gcc-4.7.1.tar.bz2 +cc308a0891e778cfda7a151ab8a6e762 gcc-4.7.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Sep 26 10:15:21 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 26 Sep 2012 08:15:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19293] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 19293 http://gar.svn.sourceforge.net/gar/?rev=19293&view=rev Author: wahwah Date: 2012-09-26 08:15:21 +0000 (Wed, 26 Sep 2012) Log Message: ----------- gcc4/trunk: remove the Ada fix patch, it's been applied upstream Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-09-25 21:20:45 UTC (rev 19292) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-09-26 08:15:21 UTC (rev 19293) @@ -27,9 +27,6 @@ # PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -# http://gcc.gnu.org/ml/gcc-help/2012-06/msg00158.html -PATCHFILES += Append-PICFLAG_FOR_TARGET.patch - # GIT init takes a long time. NOGITPATCH ?= 1 Deleted: csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch 2012-09-25 21:20:45 UTC (rev 19292) +++ csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch 2012-09-26 08:15:21 UTC (rev 19293) @@ -1,41 +0,0 @@ -From 176ff0f9a1016553978d6cf41770703e2ad90958 Mon Sep 17 00:00:00 2001 -From: jakub -Date: Thu, 14 Jun 2012 17:45:53 +0000 -Subject: [PATCH] * gcc-interface/Makefile.in (gnatlib-shared-default): Append - $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch at 188623 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - gcc/ada/ChangeLog | 5 +++++ - gcc/ada/gcc-interface/Makefile.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog -index 7e3195a..072a3f2 100644 ---- a/gcc/ada/ChangeLog -+++ b/gcc/ada/ChangeLog -@@ -1,3 +1,8 @@ -+2012-06-14 Jakub Jelinek -+ -+ * gcc-interface/Makefile.in (gnatlib-shared-default): Append -+ $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. -+ - 2012-06-14 Release Manager - - * GCC 4.7.1 released. -diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in -index ee8db38..f9e7eda 100644 ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -2597,7 +2597,7 @@ gnatlib-shared-default: - $(MAKE) $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \ -- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \ -+ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \ - MULTISUBDIR="$(MULTISUBDIR)" \ - THREAD_KIND="$(THREAD_KIND)" \ - gnatlib --- -1.7.3.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Wed Sep 26 11:00:49 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Wed, 26 Sep 2012 09:00:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19294] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 19294 http://gar.svn.sourceforge.net/gar/?rev=19294&view=rev Author: wilbury Date: 2012-09-26 09:00:49 +0000 (Wed, 26 Sep 2012) Log Message: ----------- ffmpeg/trunk: Version bump, try #1 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-09-26 08:15:21 UTC (rev 19293) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-09-26 09:00:49 UTC (rev 19294) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 0.11.1 +VERSION = 0.11.2 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-09-26 08:15:21 UTC (rev 19293) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-09-26 09:00:49 UTC (rev 19294) @@ -1 +1 @@ -ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2 +93c1908022567b321df74db7214da6ac ffmpeg-0.11.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Sep 26 11:36:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 26 Sep 2012 09:36:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19295] csw/mgar/pkg/krb5-lib/trunk Message-ID: Revision: 19295 http://gar.svn.sourceforge.net/gar/?rev=19295&view=rev Author: dmichelsen Date: 2012-09-26 09:36:51 +0000 (Wed, 26 Sep 2012) Log Message: ----------- krb5-lib/trunk: Try other linkmap Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile csw/mgar/pkg/krb5-lib/trunk/mapfile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-09-26 09:00:49 UTC (rev 19294) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2012-09-26 09:36:51 UTC (rev 19295) @@ -29,7 +29,7 @@ # PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch PATCHFILES += 0005-krb5_set_password_using_ccache.patch -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 BUILD_DEP_PKGS = CSWtcl Modified: csw/mgar/pkg/krb5-lib/trunk/mapfile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/mapfile 2012-09-26 09:00:49 UTC (rev 19294) +++ csw/mgar/pkg/krb5-lib/trunk/mapfile 2012-09-26 09:36:51 UTC (rev 19295) @@ -1,3 +1,3 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; -libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; -libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; +#libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; +libresolv.so - SUNW_2.2; +#libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Sep 26 18:03:01 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 26 Sep 2012 16:03:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19296] csw/mgar/pkg/lang-python/pytz/trunk Message-ID: Revision: 19296 http://gar.svn.sourceforge.net/gar/?rev=19296&view=rev Author: opk Date: 2012-09-26 16:03:01 +0000 (Wed, 26 Sep 2012) Log Message: ----------- lang-python/pytz/trunk: update to 2012f Modified Paths: -------------- csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/checksums Modified: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2012-09-26 09:36:51 UTC (rev 19295) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2012-09-26 16:03:01 UTC (rev 19296) @@ -1,6 +1,6 @@ # $Id$ NAME = pytz -VERSION = 2012c +VERSION = 2012f CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/pytz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/checksums 2012-09-26 09:36:51 UTC (rev 19295) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2012-09-26 16:03:01 UTC (rev 19296) @@ -1 +1 @@ -660e0cee7f6c419ca2665db460f65131 pytz-2012c.tar.bz2 +176a00c875b5a8356f12cd96276bdcd5 pytz-2012f.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 27 10:06:29 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Sep 2012 08:06:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19297] csw/mgar/pkg/libdshconfig/trunk/Makefile Message-ID: Revision: 19297 http://gar.svn.sourceforge.net/gar/?rev=19297&view=rev Author: dmichelsen Date: 2012-09-27 08:06:29 +0000 (Thu, 27 Sep 2012) Log Message: ----------- libdshconfig/trunk: Split packages Modified Paths: -------------- csw/mgar/pkg/libdshconfig/trunk/Makefile Modified: csw/mgar/pkg/libdshconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdshconfig/trunk/Makefile 2012-09-26 16:03:01 UTC (rev 19296) +++ csw/mgar/pkg/libdshconfig/trunk/Makefile 2012-09-27 08:06:29 UTC (rev 19297) @@ -6,13 +6,23 @@ GARTYPE = v2 CATEGORIES = devel -DESCRIPTION = Library for parsing dsh-style configuration files. +DESCRIPTION = Library for parsing dsh-style configuration files -MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/libdshconfig-0.20.9.tar.gz +MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/ +DISTFILES += $(DISTNAME).tar.gz -DISTFILES = $(DISTNAME).tar.gz +VENDOR_URL = http://www.netfort.gr.jp/~dancer/software/dsh.html.en -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES += CSWlibdshconfig1 +SPKG_DESC_CSWlibdshconfig1 = Library for parsing dsh-style configuration files, libdshconfig.so.1 +PKGFILES_CSWlibdshconfig1 += $(call pkgfiles_lib,libdshconfig.so.1) +PACKAGES += CSWlibdshconfig-dev +SPKG_DESC_CSWlibdshconfig-dev = Development files for libdshconfig.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibdshconfig-dev += CSWlibdshconfig1 + +BUILD64 = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 27 10:43:36 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Sep 2012 08:43:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19298] csw/mgar/pkg/gimp/trunk Message-ID: Revision: 19298 http://gar.svn.sourceforge.net/gar/?rev=19298&view=rev Author: cgrzemba Date: 2012-09-27 08:43:36 +0000 (Thu, 27 Sep 2012) Log Message: ----------- gimp/trunk: bumb version 2.8.2 Modified Paths: -------------- csw/mgar/pkg/gimp/trunk/Makefile csw/mgar/pkg/gimp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gimp/trunk/files/ csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch Modified: csw/mgar/pkg/gimp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gimp/trunk/Makefile 2012-09-27 08:06:29 UTC (rev 19297) +++ csw/mgar/pkg/gimp/trunk/Makefile 2012-09-27 08:43:36 UTC (rev 19298) @@ -1,5 +1,5 @@ NAME = gimp -VERSION = 2.6.11 +VERSION = 2.8.2 GARTYPE = v2 CATEGORIES = gnome @@ -20,52 +20,61 @@ VENDOR_URL = http://www.gimp.org/ +PATCHFILES += 0001-studio-compiler-flags-configure.ac.patch +PATCHFILES += 0002-skip-backtrace-base-utils.c.patch +PATCHFILES += 0003-no-gcc-flags-Makefile.am.patch +PATCHFILES += 0004-no-gcc-flags-Makefile.am.patch +PATCHFILES += 0005-usr-local-sanity.c.patch + +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/lib/gimp/2.0/python/.*py[co] + PACKAGES += CSWgimp SPKG_DESC_CSWgimp = The GNU Image Manipulation Program # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWgimp += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmflite0-2-7 -RUNTIME_DEP_PKGS_CSWgimp += CSWgtk2 +# RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmflite0-2-7 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpconfig2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpbase2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpmath2-0-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibexif12 +# RUNTIME_DEP_PKGS_CSWgimp += CSWlibexif12 RUNTIME_DEP_PKGS_CSWgimp += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpcolor2-0-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibgegl0-1-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmf0-2-7 +# RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWgimp += CSWxpm RUNTIME_DEP_PKGS_CSWgimp += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWgimp += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWgimp += CSWfconfig RUNTIME_DEP_PKGS_CSWgimp += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibz1 RUNTIME_DEP_PKGS_CSWgimp += CSWpython RUNTIME_DEP_PKGS_CSWgimp += CSWlibbabl0-1-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWpango RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpui2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpmodule2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpwidgets2-0-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWliblcms1 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibrsvg2-2 +# RUNTIME_DEP_PKGS_CSWgimp += CSWliblcms1 RUNTIME_DEP_PKGS_CSWgimp += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgimp += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWgimp += CSWftype2 RUNTIME_DEP_PKGS_CSWgimp += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWgimp += CSWaalib +# RUNTIME_DEP_PKGS_CSWgimp += CSWaalib RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpthumb2-0-0 -OBSOLETED_BY_CSWgimp += CSWgimpminimal -OBSOLETED_BY_CSWgimp += CSWgimpi18n -OBSOLETED_BY_CSWgimp += CSWgimplibsdoc +RUNTIME_DEP_PKGS_CSWgimp += CSWjasper +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWgs +RUNTIME_DEP_PKGS_CSWgimp += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgegl0-2-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimp2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibxpm4 +# OBSOLETED_BY_CSWgimp += CSWgimpminimal +# OBSOLETED_BY_CSWgimp += CSWgimpi18n +# OBSOLETED_BY_CSWgimp += CSWgimplibsdoc + PACKAGES += CSWlibgimp-dev SPKG_DESC_CSWlibgimp-dev = Development files for libgimp*-2.0.so.0 libraries PKGFILES_CSWlibgimp-dev += $(PKGFILES_DEVEL) @@ -78,34 +87,41 @@ RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpwidgets2-0-0 RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWgimp +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimp2-0-0 +OBSOLETED_BY_CSWgimp-dev += CSWgimplibs PACKAGES += CSWlibgimp2-0-0 SPKG_DESC_CSWlibgimp2-0-0 = GIMP library, libgimp-2.0.so.0 PKGFILES_CSWlibgimp2-0-0 += $(call pkgfiles_lib,libgimp-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgimpconfig2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgimpcolor2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp2-0-0 += CSWlibgimpbase2-0-0 OBSOLETED_BY_CSWlibgimp2-0-0 += CSWgimplibs PACKAGES += CSWlibgimpbase2-0-0 SPKG_DESC_CSWlibgimpbase2-0-0 = GIMP library, libgimpbase-2.0.so.0 PKGFILES_CSWlibgimpbase2-0-0 += $(call pkgfiles_lib,libgimpbase-2.0.so.0) -OBSOLETED_BY_CSWlibgimpbase2-0-0 += CSWgimplibs RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibgimpbase2-0-0 += CSWgimplibs PACKAGES += CSWlibgimpcolor2-0-0 SPKG_DESC_CSWlibgimpcolor2-0-0 = GIMP library, libgimpcolor-2.0.so.0 PKGFILES_CSWlibgimpcolor2-0-0 += $(call pkgfiles_lib,libgimpcolor-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibcairo2 OBSOLETED_BY_CSWlibgimpcolor2-0-0 += CSWgimplibs PACKAGES += CSWlibgimpconfig2-0-0 SPKG_DESC_CSWlibgimpconfig2-0-0 = GIMP library, libgimpconfig-2.0.so.0 PKGFILES_CSWlibgimpconfig2-0-0 += $(call pkgfiles_lib,libgimpconfig-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgimpbase2-0-0 @@ -117,8 +133,6 @@ PACKAGES += CSWlibgimpmath2-0-0 SPKG_DESC_CSWlibgimpmath2-0-0 = GIMP library, libgimpmath-2.0.so.0 PKGFILES_CSWlibgimpmath2-0-0 += $(call pkgfiles_lib,libgimpmath-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibglib2-0-0 OBSOLETED_BY_CSWlibgimpmath2-0-0 += CSWgimplibs @@ -126,7 +140,6 @@ PACKAGES += CSWlibgimpmodule2-0-0 SPKG_DESC_CSWlibgimpmodule2-0-0 = GIMP library, libgimpmodule-2.0.so.0 PKGFILES_CSWlibgimpmodule2-0-0 += $(call pkgfiles_lib,libgimpmodule-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgobject2-0-0 @@ -137,65 +150,53 @@ PACKAGES += CSWlibgimpthumb2-0-0 SPKG_DESC_CSWlibgimpthumb2-0-0 = GIMP library, libgimpthumb-2.0.so.0 PKGFILES_CSWlibgimpthumb2-0-0 += $(call pkgfiles_lib,libgimpthumb-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibglib2-0-0 -OBSOLETED_BY_CSWlibgimpthumb2-0-0 += CSWgimplibs +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgdk-pixbuf2-0-0 +# OBSOLETED_BY_CSWlibgimpthumb2-0-0 += CSWgimplibs PACKAGES += CSWlibgimpui2-0-0 SPKG_DESC_CSWlibgimpui2-0-0 = GIMP library, libgimpui-2.0.so.0 PKGFILES_CSWlibgimpui2-0-0 += $(call pkgfiles_lib,libgimpui-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpcolor2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpbase2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWftype2 RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWpango RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWgimp RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpwidgets2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimp2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibintl8 OBSOLETED_BY_CSWlibgimpui2-0-0 += CSWgimplibs PACKAGES += CSWlibgimpwidgets2-0-0 SPKG_DESC_CSWlibgimpwidgets2-0-0 = GIMP library, libgimpwidgets-2.0.so.0 PKGFILES_CSWlibgimpwidgets2-0-0 += $(call pkgfiles_lib,libgimpwidgets-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpcolor2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpbase2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpconfig2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWpango -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgdk-x11-2-0-0 OBSOLETED_BY_CSWlibgimpwidgets2-0-0 += CSWgimplibs BUILD64 = 1 ISAEXEC = 1 CONFIGURE_ARGS += $(DIRPATHS) - # No 64 bit Python yet CONFIGURE_ARGS-64 += --disable-python - CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +CONFIGURE_ARGS += --enable-mmx=no +CONFIGURE_ARGS += --enable-sse=no CONFFILES += controllerrc CONFFILES += gimprc @@ -213,5 +214,13 @@ include gar/category.mk +pre-configure-modulated: + cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force + cd $(WORKSRC) && aclocal + cd $(WORKSRC) && autoconf --force + cd $(WORKSRC) && automake -a -c -f + cd $(WORKSRC) && autoheader + $(MAKECOOKIE) + # For /opt/csw/gnu/xgettext PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gimp/trunk/checksums =================================================================== --- csw/mgar/pkg/gimp/trunk/checksums 2012-09-27 08:06:29 UTC (rev 19297) +++ csw/mgar/pkg/gimp/trunk/checksums 2012-09-27 08:43:36 UTC (rev 19298) @@ -1 +1 @@ -bb2939fe13e54fc7255cef5d097bb5dd gimp-2.6.11.tar.bz2 +b542138820ca3a41cbd63fc331907955 gimp-2.8.2.tar.bz2 Added: csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch =================================================================== --- csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch (rev 0) +++ csw/mgar/pkg/gimp/trunk/files/0001-studio-compiler-flags-configure.ac.patch 2012-09-27 08:43:36 UTC (rev 19298) @@ -0,0 +1,40 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -361,19 +361,19 @@ CFLAGS="$CFLAGS $extra_warnings" + GIMP_DETECT_CFLAGS(extra_warnings, '-Wformat-non-literal') + CFLAGS="$CFLAGS $extra_warnings" + +-GIMP_DETECT_CFLAGS(extra_warnings, '-fno-common') +-CFLAGS="$CFLAGS $extra_warnings" ++# GIMP_DETECT_CFLAGS(extra_warnings, '-fno-common') ++# CFLAGS="$CFLAGS $extra_warnings" + +-GIMP_DETECT_CFLAGS(extra_warnings, '-fdiagnostics-show-option') +-CFLAGS="$CFLAGS $extra_warnings" ++# GIMP_DETECT_CFLAGS(extra_warnings, '-fdiagnostics-show-option') ++# CFLAGS="$CFLAGS $extra_warnings" + + + # Extra optimization flags for super performance +-GIMP_DETECT_CFLAGS(extra_warnings, '--omg-optimized') +-CFLAGS="$CFLAGS $extra_warnings" +- +-GIMP_DETECT_CFLAGS(extra_warnings, '--disable-instructions') +-CFLAGS="$CFLAGS $extra_warnings" ++# GIMP_DETECT_CFLAGS(extra_warnings, '--omg-optimized') ++# CFLAGS="$CFLAGS $extra_warnings" ++# ++# GIMP_DETECT_CFLAGS(extra_warnings, '--disable-instructions') ++# CFLAGS="$CFLAGS $extra_warnings" + + + # Ensure MSVC-compatible struct packing convention is used when +@@ -1801,8 +1801,6 @@ if test "x$enable_python" != xno; then + AC_SUBST(PYGTK_DEFSDIR) + AC_MSG_RESULT($PYGTK_DEFSDIR) + +- GIMP_DETECT_CFLAGS(PYGIMP_EXTRA_CFLAGS, '-fno-strict-aliasing') +- AC_SUBST(PYGIMP_EXTRA_CFLAGS) + fi + AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno) + Added: csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch =================================================================== --- csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch (rev 0) +++ csw/mgar/pkg/gimp/trunk/files/0002-skip-backtrace-base-utils.c.patch 2012-09-27 08:43:36 UTC (rev 19298) @@ -0,0 +1,20 @@ +--- a/app/base/base-utils.c ++++ b/app/base/base-utils.c +@@ -29,7 +29,7 @@ + #include + #endif + +-#ifdef G_OS_UNIX ++#ifdef XXX_G_OS_UNIX + /* For get_backtrace() */ + #include + #include +@@ -112,7 +112,7 @@ get_physical_memory_size (void) + char * + get_backtrace (void) + { +-#ifdef G_OS_UNIX ++#ifdef XXX_G_OS_UNIX + void *functions[MAX_FUNC]; + char **function_names; + int n_functions; Added: csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch =================================================================== --- csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch (rev 0) +++ csw/mgar/pkg/gimp/trunk/files/0003-no-gcc-flags-Makefile.am.patch 2012-09-27 08:43:36 UTC (rev 19298) @@ -0,0 +1,10 @@ +--- a/plug-ins/file-fits/Makefile.am ++++ b/plug-ins/file-fits/Makefile.am +@@ -18,7 +18,6 @@ file_fits_RC = file-fits.rc.o + endif + + AM_LDFLAGS = $(mwindows) +-AM_CFLAGS = -fno-strict-aliasing + + libexecdir = $(gimpplugindir)/plug-ins + Added: csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch =================================================================== --- csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch (rev 0) +++ csw/mgar/pkg/gimp/trunk/files/0004-no-gcc-flags-Makefile.am.patch 2012-09-27 08:43:36 UTC (rev 19298) @@ -0,0 +1,10 @@ +--- a/plug-ins/common/Makefile.am ++++ b/plug-ins/common/Makefile.am +@@ -1071,7 +1071,6 @@ file_desktop_link_LDADD = \ + $(INTLLIBS) \ + $(file_desktop_link_RC) + +-file_dicom_CFLAGS = -fno-strict-aliasing + + file_dicom_SOURCES = \ + file-dicom.c Added: csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch =================================================================== --- csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch (rev 0) +++ csw/mgar/pkg/gimp/trunk/files/0005-usr-local-sanity.c.patch 2012-09-27 08:43:36 UTC (rev 19298) @@ -0,0 +1,11 @@ +--- a/app/sanity.c ++++ b/app/sanity.c +@@ -118,7 +118,7 @@ sanity_check_gimp (void) + "The GIMP binary cannot run with a libgimp version\n" + "other than its own. This is GIMP %d.%d.%d, but the\n" + "libgimp version is %d.%d.%d.\n\n" +- "Maybe you have GIMP versions in both /usr and /usr/local ?", ++ "Maybe you have GIMP versions in both /usr and /opt/csw ?", + GIMP_MAJOR_VERSION, GIMP_MINOR_VERSION, GIMP_MICRO_VERSION, + gimp_major_version, gimp_minor_version, gimp_micro_version); + } 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 27 11:26:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Sep 2012 09:26:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19299] csw/mgar/pkg/dsh/trunk Message-ID: Revision: 19299 http://gar.svn.sourceforge.net/gar/?rev=19299&view=rev Author: dmichelsen Date: 2012-09-27 09:26:12 +0000 (Thu, 27 Sep 2012) Log Message: ----------- dsh/trunk: Rework build recipe Modified Paths: -------------- csw/mgar/pkg/dsh/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch Modified: csw/mgar/pkg/dsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/dsh/trunk/Makefile 2012-09-27 08:43:36 UTC (rev 19298) +++ csw/mgar/pkg/dsh/trunk/Makefile 2012-09-27 09:26:12 UTC (rev 19299) @@ -5,22 +5,35 @@ VERSION = 0.25.9 GARTYPE = v2 CATEGORIES = devel -RUNTIME_DEP_PKGS_CSWdsh = CSWlibdshconfig -BUILD_DEP_PKGS = CSWlibdshconfig -DESCRIPTION = Distributed shell. Runs command through rsh or ssh on a cluster of machines. +DESCRIPTION = Distributed shell which command through rsh or ssh on a cluster of machines -MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/dsh-0.25.9.tar.gz -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/ +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += 0001-Use-bash-where-applicable.patch + +VENDOR_URL = http://www.netfort.gr.jp/~dancer/software/dsh.html.en + +BUILD_DEP_PKGS += CSWlibdshconfig-dev + +PACKAGES += CSWdsh +SPKG_DESC_CSWdsh = Distributed shell which command through rsh or ssh on a cluster of machines +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWdsh += CSWlibdshconfig1 +RUNTIME_DEP_PKGS_CSWdsh += CSWlibintl8 + # for libintl_gettext, libintl_textdomain, libintl_bindtextdomain EXTRA_LINKER_FLAGS = -lintl +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +PRESERVECONF += $(sysconfdir)/dsh.conf -TEST_TARGET = +# There are still some tests sporadically failing, disable for now +SKIPTEST ?= 1 include gar/category.mk Added: csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch =================================================================== --- csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch (rev 0) +++ csw/mgar/pkg/dsh/trunk/files/0001-Use-bash-where-applicable.patch 2012-09-27 09:26:12 UTC (rev 19299) @@ -0,0 +1,44 @@ +From 749371b5f5ff26b3cfa3a5a6e13d02f5fe0ebe7d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 27 Sep 2012 10:26:58 +0200 +Subject: [PATCH] Use bash where applicable + +--- + tests/news-okay.sh | 2 +- + tests/param-F-invalid.sh | 2 +- + tests/param-i.sh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/news-okay.sh b/tests/news-okay.sh +index 5592f07..e2c7a7a 100755 +--- a/tests/news-okay.sh ++++ b/tests/news-okay.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # check if NEWS is updated + set -e + +diff --git a/tests/param-F-invalid.sh b/tests/param-F-invalid.sh +index 74c0bff..a0e0773 100755 +--- a/tests/param-F-invalid.sh ++++ b/tests/param-F-invalid.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # test to check that -F parameter fails properly. + ./dsh -recho -M -m 1,2 -F 10 -c + case $? in +diff --git a/tests/param-i.sh b/tests/param-i.sh +index 89b4085..e0d6543 100755 +--- a/tests/param-i.sh ++++ b/tests/param-i.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # test whether the -i option works. + + set -e +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Sep 27 11:39:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Sep 2012 09:39:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19300] csw/mgar/pkg/clusterit/trunk/Makefile Message-ID: Revision: 19300 http://gar.svn.sourceforge.net/gar/?rev=19300&view=rev Author: dmichelsen Date: 2012-09-27 09:39:51 +0000 (Thu, 27 Sep 2012) Log Message: ----------- clusterit/trunk: Remove /opt/csw/bin/dsh as it belongs to the CSWdsh package Modified Paths: -------------- csw/mgar/pkg/clusterit/trunk/Makefile Modified: csw/mgar/pkg/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2012-09-27 09:26:12 UTC (rev 19299) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2012-09-27 09:39:51 UTC (rev 19300) @@ -28,7 +28,8 @@ BINS += barrier BINS += barrierd BINS += clustersed -BINS += dsh +# CSWdsh package (other tool) +COLLIDING_BINS += dsh BINS += dshbak BINS += dtop BINS += dvt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Sep 27 12:08:16 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Sep 2012 10:08:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19301] csw/mgar/pkg/gimp/trunk/Makefile Message-ID: Revision: 19301 http://gar.svn.sourceforge.net/gar/?rev=19301&view=rev Author: cgrzemba Date: 2012-09-27 10:08:15 +0000 (Thu, 27 Sep 2012) Log Message: ----------- gimp/trunk: add checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/gimp/trunk/Makefile Modified: csw/mgar/pkg/gimp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gimp/trunk/Makefile 2012-09-27 09:39:51 UTC (rev 19300) +++ csw/mgar/pkg/gimp/trunk/Makefile 2012-09-27 10:08:15 UTC (rev 19301) @@ -71,6 +71,11 @@ RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimp2-0-0 RUNTIME_DEP_PKGS_CSWgimp += CSWlibxpm4 +# cant find /usr/share in the bins +CHECKPKG_OVERRIDES_CSWgimp += file-with-bad-content|/usr/share|root/opt/csw/bin/amd64/gimp-2.8 +CHECKPKG_OVERRIDES_CSWgimp += file-with-bad-content|/usr/share|root/opt/csw/bin/pentium_pro/gimp-2.8 +CHECKPKG_OVERRIDES_CSWgimp += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gimp-2.8.1 + # OBSOLETED_BY_CSWgimp += CSWgimpminimal # OBSOLETED_BY_CSWgimp += CSWgimpi18n # OBSOLETED_BY_CSWgimp += CSWgimplibsdoc 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 27 12:16:08 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 27 Sep 2012 11:16:08 +0100 Subject: [csw-devel] SF.net SVN: gar:[19301] csw/mgar/pkg/gimp/trunk/Makefile In-Reply-To: References: Message-ID: 2012/9/27 > Revision: 19301 > http://gar.svn.sourceforge.net/gar/?rev=19301&view=rev > Author: cgrzemba > Date: 2012-09-27 10:08:15 +0000 (Thu, 27 Sep 2012) > Log Message: > ----------- > gimp/trunk: add checkpkg overrides > I would suggest outlining in the commit description, what was it exactly that was overridden. For example "binaries contain the /usr/share string, but it's okay". -------------- next part -------------- An HTML attachment was scrubbed... URL: From khabermann at users.sourceforge.net Thu Sep 27 13:27:21 2012 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Thu, 27 Sep 2012 11:27:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19302] csw/mgar/pkg Message-ID: Revision: 19302 http://gar.svn.sourceforge.net/gar/?rev=19302&view=rev Author: khabermann Date: 2012-09-27 11:27:21 +0000 (Thu, 27 Sep 2012) Log Message: ----------- initial package creation Added Paths: ----------- csw/mgar/pkg/tkimg/ csw/mgar/pkg/tkimg/Makefile csw/mgar/pkg/tkimg/branches/ csw/mgar/pkg/tkimg/tags/ csw/mgar/pkg/tkimg/trunk/ csw/mgar/pkg/tkimg/trunk/Makefile csw/mgar/pkg/tkimg/trunk/checksums csw/mgar/pkg/tkimg/trunk/files/ Copied: csw/mgar/pkg/tkimg/Makefile (from rev 15409, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/tkimg/Makefile (rev 0) +++ csw/mgar/pkg/tkimg/Makefile 2012-09-27 11:27:21 UTC (rev 19302) @@ -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) Property changes on: csw/mgar/pkg/tkimg/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/tkimg/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkimg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tkimg/trunk/Makefile 2012-09-27 11:27:21 UTC (rev 19302) @@ -0,0 +1,40 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tkimg +VERSION = 1.4 +GARTYPE = v2 +CATEGORIES = lang +LICENSE = license.terms +DEPENDS = CSWtcl +DISTNAME = $(NAME)$(VERSION) + +DESCRIPTION = The "Img" package adds a lot of image formats to Tcl/Tk + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.bz2 + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +LINKER_MAPS = + +CONFIGURE_ARGS = $(DIRPATHS) + +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +TEST_TARGET = + +install-custom: + gmake -C $(WORKSRC) INSTALL_ROOT=$(DESTDIR) install + $(MAKECOOKIE) + +include gar/category.mk Property changes on: csw/mgar/pkg/tkimg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tkimg/trunk/checksums =================================================================== --- csw/mgar/pkg/tkimg/trunk/checksums (rev 0) +++ csw/mgar/pkg/tkimg/trunk/checksums 2012-09-27 11:27:21 UTC (rev 19302) @@ -0,0 +1 @@ +7d7ce00b1ae08a78f06c1c2cc761a155 tkimg1.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Sep 27 14:54:55 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 27 Sep 2012 12:54:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19303] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 19303 http://gar.svn.sourceforge.net/gar/?rev=19303&view=rev Author: guengel Date: 2012-09-27 12:54:55 +0000 (Thu, 27 Sep 2012) Log Message: ----------- pgadmin3/trunk: Removed obsolete dependencies since direct binding is in place Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-09-27 11:27:21 UTC (rev 19302) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-09-27 12:54:55 UTC (rev 19303) @@ -23,41 +23,24 @@ # Ignore them for now CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/zh_TW/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/connect.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/extend.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/pgagent-install.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/hints/instrumentation.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/zh_CN/hints/instrumentation.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/sl_SI/hints/instrumentation.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/es_ES/hints/instrumentation.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fi_FI/hints/instrumentation.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/de_DE/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/extend.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/connect.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/extend.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/connect.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/pgagent-install.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/cs_CZ/pgagent-install.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/extend.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/fr_FR/pgagent-install.html RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetscommon RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetsgtk2 -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWsunmath RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibiconv2 -BUILD_DEP_PKGS = CSWlibncurses-dev -BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev BUILD_DEP_PKGS += CSWpostgresql-dev Modified: csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW 2012-09-27 11:27:21 UTC (rev 19302) +++ csw/mgar/pkg/pgadmin3/trunk/files/changelog.CSW 2012-09-27 12:54:55 UTC (rev 19303) @@ -1,3 +1,10 @@ +pgadmin3 (1.16.0,REV=2012.09.27) + + * Removed obsolete dependencies since direct binding is in place. + + -- Rafael Ostertag Thu, 27 Sep 2012 14:52:06 +0200 + + pgadmin3 (1.16.0,REV=2012.09.25) * New upstream release 1.16.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 27 17:27:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 27 Sep 2012 15:27:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19304] csw/mgar/pkg/libksba/trunk Message-ID: Revision: 19304 http://gar.svn.sourceforge.net/gar/?rev=19304&view=rev Author: dmichelsen Date: 2012-09-27 15:27:24 +0000 (Thu, 27 Sep 2012) Log Message: ----------- libksba/trunk: Update to 1.3.0 Modified Paths: -------------- csw/mgar/pkg/libksba/trunk/Makefile csw/mgar/pkg/libksba/trunk/checksums Modified: csw/mgar/pkg/libksba/trunk/Makefile =================================================================== --- csw/mgar/pkg/libksba/trunk/Makefile 2012-09-27 12:54:55 UTC (rev 19303) +++ csw/mgar/pkg/libksba/trunk/Makefile 2012-09-27 15:27:24 UTC (rev 19304) @@ -1,5 +1,5 @@ NAME = libksba -VERSION = 1.2.0 +VERSION = 1.3.0 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libksba/trunk/checksums =================================================================== --- csw/mgar/pkg/libksba/trunk/checksums 2012-09-27 12:54:55 UTC (rev 19303) +++ csw/mgar/pkg/libksba/trunk/checksums 2012-09-27 15:27:24 UTC (rev 19304) @@ -1 +1 @@ -e797f370b69b4dc776499d6a071ae137 libksba-1.2.0.tar.bz2 +cd86fad9c9d360b2cf80449f8a4a4075 libksba-1.3.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Sep 28 10:59:43 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 28 Sep 2012 08:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19305] csw/mgar/pkg/ldns_drill/trunk/Makefile Message-ID: Revision: 19305 http://gar.svn.sourceforge.net/gar/?rev=19305&view=rev Author: idogan23 Date: 2012-09-28 08:59:43 +0000 (Fri, 28 Sep 2012) Log Message: ----------- ldnsdrill: bump version to 1.6.13 Modified Paths: -------------- csw/mgar/pkg/ldns_drill/trunk/Makefile Modified: csw/mgar/pkg/ldns_drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/Makefile 2012-09-27 15:27:24 UTC (rev 19304) +++ csw/mgar/pkg/ldns_drill/trunk/Makefile 2012-09-28 08:59:43 UTC (rev 19305) @@ -1,5 +1,5 @@ NAME = ldns_drill -VERSION = 1.6.12 +VERSION = 1.6.13 CATEGORIES = utils GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Sep 28 11:02:00 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 28 Sep 2012 09:02:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19306] csw/mgar/pkg/ldns_drill/trunk/Makefile Message-ID: Revision: 19306 http://gar.svn.sourceforge.net/gar/?rev=19306&view=rev Author: idogan23 Date: 2012-09-28 09:02:00 +0000 (Fri, 28 Sep 2012) Log Message: ----------- ldnsdrill: switch to Solaris 10 only builds Modified Paths: -------------- csw/mgar/pkg/ldns_drill/trunk/Makefile Modified: csw/mgar/pkg/ldns_drill/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldns_drill/trunk/Makefile 2012-09-28 08:59:43 UTC (rev 19305) +++ csw/mgar/pkg/ldns_drill/trunk/Makefile 2012-09-28 09:02:00 UTC (rev 19306) @@ -14,7 +14,7 @@ PACKAGES = CSWldnsdrill -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Sep 28 11:19:22 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 28 Sep 2012 09:19:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19307] csw/mgar/pkg/nsd/trunk/Makefile Message-ID: Revision: 19307 http://gar.svn.sourceforge.net/gar/?rev=19307&view=rev Author: idogan23 Date: 2012-09-28 09:19:21 +0000 (Fri, 28 Sep 2012) Log Message: ----------- nsd: bump version to 3.2.13 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2012-09-28 09:02:00 UTC (rev 19306) +++ csw/mgar/pkg/nsd/trunk/Makefile 2012-09-28 09:19:21 UTC (rev 19307) @@ -1,5 +1,5 @@ NAME = nsd -VERSION = 3.2.10 +VERSION = 3.2.13 CATEGORIES = server GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Sep 28 11:23:39 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 28 Sep 2012 09:23:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19308] csw/mgar/pkg/nsd/trunk/Makefile Message-ID: Revision: 19308 http://gar.svn.sourceforge.net/gar/?rev=19308&view=rev Author: idogan23 Date: 2012-09-28 09:23:39 +0000 (Fri, 28 Sep 2012) Log Message: ----------- nsd: Switch to Solaris 10 only builds Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2012-09-28 09:19:21 UTC (rev 19307) +++ csw/mgar/pkg/nsd/trunk/Makefile 2012-09-28 09:23:39 UTC (rev 19308) @@ -23,7 +23,7 @@ RUNTIME_DEP_PKGS = CSWlibssl0-9-8 CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 LICENSE = LICENSE DISTFILES = $(NAME)-$(VERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Sep 28 12:03:42 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 28 Sep 2012 10:03:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19309] csw/mgar/pkg/tuxpaint/trunk Message-ID: Revision: 19309 http://gar.svn.sourceforge.net/gar/?rev=19309&view=rev Author: cgrzemba Date: 2012-09-28 10:03:42 +0000 (Fri, 28 Sep 2012) Log Message: ----------- tuxpaint/trunk: Initial commit Modified Paths: -------------- csw/mgar/pkg/tuxpaint/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tuxpaint/trunk/files/0001-prefix-Makefile.patch Modified: csw/mgar/pkg/tuxpaint/trunk/Makefile =================================================================== --- csw/mgar/pkg/tuxpaint/trunk/Makefile 2012-09-28 09:23:39 UTC (rev 19308) +++ csw/mgar/pkg/tuxpaint/trunk/Makefile 2012-09-28 10:03:42 UTC (rev 19309) @@ -14,21 +14,85 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = docs/COPYING.txt -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - GARCOMPILER = GCC4 +REINPLACE_USRLOCAL += docs/* docs/*/* src/tuxpaint-import.sh src/tuxpaint.conf docs/*/html/* +REINPLACE_USRSHARE += docs/* docs/*/* docs/html/* docs/*/html/* fonts/locale/*/README.txt magic/docs/html/* +PATCHFILES += 0001-prefix-Makefile.patch + +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWpython +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibpaper +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWsdlttf +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWsdlimage +RUNTIME_DEP_PKGS_CSWtuxpaint += CSWsdlmixer + +# cannot find any /usr/local in plugins! +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/alien.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/blocks_chalk_drip.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/blur.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/bricks.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/calligraphy.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/cartoon.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/confetti.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/distortion.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/emboss.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/fade_darken.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/fill.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/fisheye.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/flower.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/foam.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/fold.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/glasstile.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/grass.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/kalidescope.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/light.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/metalpaint.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/mirror_flip.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/mosaic.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/negative.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/noise.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/rails.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/rain.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/rainbow.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/realrainbow.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/ripples.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/rosette.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/sharpen.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/shift.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/smudge.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/snow.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/string.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/tint.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/toothpaste.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/tornado.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/tv.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/lib/tuxpaint/plugins/waves.so +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/share|root/opt/csw/bin/tuxpaint +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/share|root/opt/csw/share/doc/tuxpaint-dev/README.txt +CHECKPKG_OVERRIDES_CSWtuxpaint += file-with-bad-content|/usr/local|root/opt/csw/include/tuxpaint/tp_magic_api.h + +CHECKPKG_OVERRIDES_CSWtuxpaint += gzipped-manpage-in-pkgmap|/opt/csw/share/man/man1/tp-magic-config.1.gz +CHECKPKG_OVERRIDES_CSWtuxpaint += gzipped-manpage-in-pkgmap|/opt/csw/share/man/man1/tuxpaint-import.1.gz +CHECKPKG_OVERRIDES_CSWtuxpaint += gzipped-manpage-in-pkgmap|/opt/csw/share/man/man1/tuxpaint.1.gz + + +EXTRA_LINKER_FLAGS = -lpng12 -lsocket CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = +SKIPTEST = 1 -BUILD_ARGS += PREFIX=$(prefix) +BUILD_ARGS += PREFIX=$(prefix) SOL_LDFLAGS="$(EXTRA_LINKER_FLAGS)" include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/tuxpaint/trunk/files/0001-prefix-Makefile.patch =================================================================== --- csw/mgar/pkg/tuxpaint/trunk/files/0001-prefix-Makefile.patch (rev 0) +++ csw/mgar/pkg/tuxpaint/trunk/files/0001-prefix-Makefile.patch 2012-09-28 10:03:42 UTC (rev 19309) @@ -0,0 +1,29 @@ +--- a/Makefile ++++ b/Makefile +@@ -93,7 +93,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS) + windows_PREFIX:=/usr/local + osx_PREFIX:=/usr/local + beos_PREFIX:=/boot/apps/Games/TuxPaint +-linux_PREFIX:=/usr/local ++linux_PREFIX:=/opt/csw + PREFIX:=$($(OS)_PREFIX) + + +@@ -139,7 +139,7 @@ endif + + # Icons and launchers: + ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps +-X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps ++X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps + GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null) + KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null) + KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null) +@@ -834,7 +834,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \ + @echo "...Linking Tux Paint..." + $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ + -o tuxpaint $^ \ +- $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) ++ $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) $(SOL_LDFLAGS) + @$(RSRC_CMD) + @$(MIMESET_CMD) + 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 28 12:55:56 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 28 Sep 2012 10:55:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19310] csw/mgar/pkg/tuxpaint/trunk Message-ID: Revision: 19310 http://gar.svn.sourceforge.net/gar/?rev=19310&view=rev Author: cgrzemba Date: 2012-09-28 10:55:56 +0000 (Fri, 28 Sep 2012) Log Message: ----------- tuxpaint/trunk: add puzzle.c.patch Modified Paths: -------------- csw/mgar/pkg/tuxpaint/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tuxpaint/trunk/files/0002-fix-r1.9-puzzle.c.patch Modified: csw/mgar/pkg/tuxpaint/trunk/Makefile =================================================================== --- csw/mgar/pkg/tuxpaint/trunk/Makefile 2012-09-28 10:03:42 UTC (rev 19309) +++ csw/mgar/pkg/tuxpaint/trunk/Makefile 2012-09-28 10:55:56 UTC (rev 19310) @@ -20,7 +20,9 @@ REINPLACE_USRLOCAL += docs/* docs/*/* src/tuxpaint-import.sh src/tuxpaint.conf docs/*/html/* REINPLACE_USRSHARE += docs/* docs/*/* docs/html/* docs/*/html/* fonts/locale/*/README.txt magic/docs/html/* + PATCHFILES += 0001-prefix-Makefile.patch +PATCHFILES += 0002-fix-r1.9-puzzle.c.patch RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWtuxpaint += CSWlibpng12-0 Added: csw/mgar/pkg/tuxpaint/trunk/files/0002-fix-r1.9-puzzle.c.patch =================================================================== --- csw/mgar/pkg/tuxpaint/trunk/files/0002-fix-r1.9-puzzle.c.patch (rev 0) +++ csw/mgar/pkg/tuxpaint/trunk/files/0002-fix-r1.9-puzzle.c.patch 2012-09-28 10:55:56 UTC (rev 19310) @@ -0,0 +1,194 @@ +--- a/magic/src/puzzle.c ++++ b/magic/src/puzzle.c +@@ -6,7 +6,7 @@ + + Author: Adam 'foo-script' Rakowski ; foo-script at o2.pl + +- Copyright (c) 2002-2008 by Bill Kendrick and others; see AUTHORS.txt ++ Copyright (c) 2002-2009 by Bill Kendrick and others; see AUTHORS.txt + bill at newbreedsoftware.com + http://www.tuxpaint.org/ + +@@ -26,7 +26,7 @@ + (See COPYING.txt) + */ + +-/* ++ + #include //for time() + #include "tp_magic_api.h" + #include "SDL_image.h" +@@ -42,8 +42,35 @@ + + static Mix_Chunk * puzzle_snd; + static int puzzle_gcd=0; //length of side of each rectangle; 0 is temporary value. +-static int puzzle_rect_q=4; //quantity of rectangles when using paint mode. Must be an odd value - but it's even! ++// static int puzzle_rect_q=4; //quantity of rectangles when using paint mode. Must be an odd value - but it's even! + static int rects_w, rects_h; ++SDL_Surface * canvas_backup; ++ ++Uint32 puzzle_api_version(void) ; ++int puzzle_init(magic_api * api); ++int puzzle_get_tool_count(magic_api * api); ++SDL_Surface * puzzle_get_icon(magic_api * api, int which); ++char * puzzle_get_name(magic_api * api, int which); ++char * puzzle_get_description(magic_api * api, int which, int mode); ++void puzzle_release(magic_api * api, int which, ++ SDL_Surface * canvas, SDL_Surface * last, ++ int x, int y, SDL_Rect * update_rect); ++void puzzle_shutdown(magic_api * api); ++void puzzle_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); ++int puzzle_requires_colors(magic_api * api, int which); ++void puzzle_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); ++void puzzle_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); ++int puzzle_modes(magic_api * api, int which); ++static void puzzle_draw(void * ptr, int which_tool, ++ SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y); ++void puzzle_drag(magic_api * api, int which, SDL_Surface * canvas, ++ SDL_Surface * last, int ox, int oy, int x, int y, ++ SDL_Rect * update_rect); ++ ++void puzzle_click(magic_api * api, int which, int mode, ++ SDL_Surface * canvas, SDL_Surface * last, ++ int x, int y, SDL_Rect * update_rect); ++int gcd(int a, int b); + + Uint32 puzzle_api_version(void) { return(TP_MAGIC_API_VERSION); } + +@@ -58,12 +85,12 @@ int puzzle_init(magic_api * api) + return 1 ; + } + +-int puzzle_get_tool_count(magic_api * api) ++int puzzle_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) + { + return 1; + } + +-SDL_Surface * puzzle_get_icon(magic_api * api, int which) ++SDL_Surface * puzzle_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) + { + char fname[1024]; + +@@ -73,37 +100,37 @@ SDL_Surface * puzzle_get_icon(magic_api * api, int which) + return(IMG_Load(fname)); + } + +-char * puzzle_get_name(magic_api * api, int which) ++char * puzzle_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) + { + return(strdup(gettext_noop("Puzzle"))); + } + + +-char * puzzle_get_description(magic_api * api, int which, int mode) ++char * puzzle_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode) + { + if (mode==MODE_PAINT) + return strdup(gettext_noop("Click the part of your picture where would you like a puzzle.")); + return strdup(gettext_noop("Click to make a puzzle in fullscreen mode.")); + } + +-void puzzle_release(magic_api * api, int which, +- SDL_Surface * canvas, SDL_Surface * last, +- int x, int y, SDL_Rect * update_rect) ++void puzzle_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, ++ SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, ++ int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) + { + api->playsound(puzzle_snd, 128, 255); + } + +-void puzzle_shutdown(magic_api * api) ++void puzzle_shutdown(magic_api * api ATTRIBUTE_UNUSED) + { + if (puzzle_snd != NULL) + Mix_FreeChunk(puzzle_snd); + } + +-void puzzle_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b) ++void puzzle_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) + { + } + +-int puzzle_requires_colors(magic_api * api, int which) ++int puzzle_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) + { + return 0; + } +@@ -114,33 +141,36 @@ int gcd(int a, int b) //greatest common divisor + return gcd(b, a%b); + } + +-void puzzle_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas) ++void puzzle_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas) + { + puzzle_gcd=RATIO*gcd(canvas->w, canvas->h); + rects_w=(unsigned int)canvas->w/puzzle_gcd; + rects_h=(unsigned int)canvas->h/puzzle_gcd; ++ canvas_backup = SDL_CreateRGBSurface(SDL_ANYFORMAT,canvas->w, canvas->h, canvas->format->BitsPerPixel, canvas->format->Rmask, canvas->format->Gmask, canvas->format->Bmask, canvas->format->Amask); + } + +-void puzzle_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas) ++void puzzle_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) + { ++ SDL_FreeSurface(canvas_backup); ++ canvas_backup = NULL; + } + +-int puzzle_modes(magic_api * api, int which) ++int puzzle_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) + { + return(MODE_PAINT); + } + +-static void puzzle_draw(void * ptr, int which_tool, +- SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y) ++static void puzzle_draw(void * ptr, int which_tool ATTRIBUTE_UNUSED, ++ SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y) + { + + + magic_api * api = (magic_api *) ptr; + +- Uint8 i, j, r; //r - random value ++ Uint8 r; //r - random value + SDL_Rect rect_this, rect_that; + +- SDL_BlitSurface(canvas, NULL, snapshot, NULL); ++ SDL_BlitSurface(canvas, NULL, canvas_backup, NULL); + + x = (x / puzzle_gcd) * puzzle_gcd; + y = (y / puzzle_gcd) * puzzle_gcd; +@@ -181,14 +211,15 @@ static void puzzle_draw(void * ptr, int which_tool, + rect_this.y=y; + rect_this.h=rect_this.w=puzzle_gcd; + rect_that.h=rect_that.w=puzzle_gcd; +- } ++ + + SDL_BlitSurface(canvas, &rect_this, canvas, &rect_that); +- SDL_BlitSurface(snapshot, &rect_that, canvas, &rect_this); ++ SDL_BlitSurface(canvas_backup, &rect_that, canvas, &rect_this); ++ } + } + + void puzzle_drag(magic_api * api, int which, SDL_Surface * canvas, +- SDL_Surface * last, int ox, int oy, int x, int y, ++ SDL_Surface * last, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, + SDL_Rect * update_rect) + { + puzzle_draw(api, which, canvas, last, x-puzzle_gcd/2, y-puzzle_gcd/2); +@@ -204,10 +235,10 @@ void puzzle_drag(magic_api * api, int which, SDL_Surface * canvas, + update_rect->w=canvas->w; + } + +-void puzzle_click(magic_api * api, int which, int mode, ++void puzzle_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas, SDL_Surface * last, + int x, int y, SDL_Rect * update_rect) + { + puzzle_drag(api, which, canvas, last, x, y, x, y, update_rect); + } +-*/ ++ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Sep 28 13:01:34 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 28 Sep 2012 11:01:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19311] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 19311 http://gar.svn.sourceforge.net/gar/?rev=19311&view=rev Author: idogan23 Date: 2012-09-28 11:01:33 +0000 (Fri, 28 Sep 2012) Log Message: ----------- nsd: drop Solaris 9 support Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2012-09-28 10:55:56 UTC (rev 19310) +++ csw/mgar/pkg/nsd/trunk/Makefile 2012-09-28 11:01:33 UTC (rev 19311) @@ -20,7 +20,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWnsd -RUNTIME_DEP_PKGS = CSWlibssl0-9-8 +RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2012-09-28 10:55:56 UTC (rev 19310) +++ csw/mgar/pkg/nsd/trunk/checksums 2012-09-28 11:01:33 UTC (rev 19311) @@ -1 +1 @@ -befbacb3d57b7aac5b6af477c8ee75e3 nsd-3.2.10.tar.gz +b6494ffadf4ce72ff367a7c3f00498c1 nsd-3.2.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Sep 28 14:09:08 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 28 Sep 2012 12:09:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19312] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 19312 http://gar.svn.sourceforge.net/gar/?rev=19312&view=rev Author: idogan23 Date: 2012-09-28 12:09:07 +0000 (Fri, 28 Sep 2012) Log Message: ----------- unbound: bump version to 1.4.18 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2012-09-28 11:01:33 UTC (rev 19311) +++ csw/mgar/pkg/unbound/trunk/Makefile 2012-09-28 12:09:07 UTC (rev 19312) @@ -1,5 +1,5 @@ NAME = unbound -VERSION = 1.4.17 +VERSION = 1.4.18 CATEGORIES = server GARTYPE = v2 DESCRIPTION = A validating, recursive, and caching DNS resolver @@ -25,12 +25,19 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +#CONFIGURE_ARGS = $(DIRPATHS) +#CONFIGUTE_ARGS += --with-solaris-threads +#CONFIGURE_ARGS += --with-ldns=/opt/csw +#CONFIGURE_ARGS += --with-ssl=/opt/csw +CONFIGURE_ARGS += --with-libevent=/opt/csw +CONFIGURE_ARGS += --with-libexpat=/opt/csw +#CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid +#CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) CONFIGUTE_ARGS += --with-solaris-threads -CONFIGURE_ARGS += --with-ldns=/opt/csw -CONFIGURE_ARGS += --with-ssl=/opt/csw -CONFIGURE_ARGS += --with-libevent=/opt/csw -CONFIGURE_ARGS += --with-libexpat=/opt/csw +CONFIGURE_ARGS += --with-ldns +CONFIGURE_ARGS += --with-ssl CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2012-09-28 11:01:33 UTC (rev 19311) +++ csw/mgar/pkg/unbound/trunk/checksums 2012-09-28 12:09:07 UTC (rev 19312) @@ -1 +1 @@ -812d49064a78c92765970a1364736da7 unbound-1.4.17.tar.gz +2cad65b6a2d08bb6e0210ea92156ca4b unbound-1.4.18.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 28 21:40:34 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Sep 2012 19:40:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19313] csw/mgar/pkg/lang-python Message-ID: Revision: 19313 http://gar.svn.sourceforge.net/gar/?rev=19313&view=rev Author: dmichelsen Date: 2012-09-28 19:40:34 +0000 (Fri, 28 Sep 2012) Log Message: ----------- lang-python/argparse: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/argparse/trunk/Makefile csw/mgar/pkg/lang-python/argparse/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/argparse/ Modified: csw/mgar/pkg/lang-python/argparse/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/Makefile 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/lang-python/argparse/trunk/Makefile 2012-09-28 19:40:34 UTC (rev 19313) @@ -1,20 +1,20 @@ -# Copyright 2009 OpenCSW +# Copyright 2012 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = chardet -VERSION = 1.0.1 +NAME = argparse +VERSION = 1.2.1 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Universal encoding detector +DESCRIPTION = Python command-line parsing library -MASTER_SITES = $(PYPI_MIRROR) +MASTER_SITES = http://argparse.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.gz -VENDOR_URL = http://pypi.python.org/pypi/chardet +VENDOR_URL = http://pypi.python.org/pypi/argparse -PACKAGES = CSWpy-chardet -ARCHALL_CSWpy-chardet = 1 +PACKAGES = CSWpy-argparse +ARCHALL_CSWpy-argparse = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/argparse/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/checksums 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/lang-python/argparse/trunk/checksums 2012-09-28 19:40:34 UTC (rev 19313) @@ -1 +1 @@ -7c28b02bca7847c13bebedaf4df6c5a3 chardet-1.0.1.tar.gz +2fbef8cb61e506c706957ab6e135840c argparse-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Sep 28 21:48:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Sep 2012 19:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19314] csw/mgar/pkg/lang-python/pylxml/trunk Message-ID: Revision: 19314 http://gar.svn.sourceforge.net/gar/?rev=19314&view=rev Author: dmichelsen Date: 2012-09-28 19:48:57 +0000 (Fri, 28 Sep 2012) Log Message: ----------- lang-python/pylxml/trunk: Update to 2.3.6 Modified Paths: -------------- csw/mgar/pkg/lang-python/pylxml/trunk/Makefile csw/mgar/pkg/lang-python/pylxml/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/pylxml/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lang-python/pylxml/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pylxml/trunk/Makefile 2012-09-28 19:40:34 UTC (rev 19313) +++ csw/mgar/pkg/lang-python/pylxml/trunk/Makefile 2012-09-28 19:48:57 UTC (rev 19314) @@ -2,7 +2,7 @@ # - Move this to a pymodules/ subdirectory with the rest of the # python modules (similar to the cpan directory). NAME = pylxml -VERSION = 2.2.4 +VERSION = 2.3.6 CATEGORIES = python GARTYPE = v2 @@ -24,18 +24,17 @@ LICENSE = doc/licenses/BSD.txt PACKAGES = CSWpy-lxml -CATALOGNAME = py_lxml +SPKG_DESC_CSWpy-lxml = Easy to use and powerful libxml2/libxslt binding for Python +RUNTIME_DEP_PKGS_CSWpy-lxml += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWpy-lxml += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-lxml += CSWlibexslt0 +RUNTIME_DEP_PKGS_CSWpy-lxml += CSWlibxml2-2 -RUNTIME_DEP_PKGS = CSWlibxml2 CSWlibxslt CSWzlib - -EXTRA_PAX_ARGS = '-s,CHANGES.txt,changelog,p' - include gar/category.mk post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME) -post-install-modulated: DOCS=CHANGES.txt CREDITS.txt IDEAS.txt +post-install-modulated: DOCS=CHANGES.txt CREDITS.txt post-install-modulated: ginstall -d $(DOCDEST) - cp $(FILEDIR)/changelog.CSW $(DOCDEST) cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/pylxml/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pylxml/trunk/checksums 2012-09-28 19:40:34 UTC (rev 19313) +++ csw/mgar/pkg/lang-python/pylxml/trunk/checksums 2012-09-28 19:48:57 UTC (rev 19314) @@ -1 +1 @@ -077841e74ee728e7746b65d8483274be lxml-2.2.4.tar.gz +d5d886088e78b1bdbfd66d328fc2d0bc lxml-2.3.6.tar.gz Deleted: csw/mgar/pkg/lang-python/pylxml/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/pylxml/trunk/files/changelog.CSW 2012-09-28 19:40:34 UTC (rev 19313) +++ csw/mgar/pkg/lang-python/pylxml/trunk/files/changelog.CSW 2012-09-28 19:48:57 UTC (rev 19314) @@ -1,5 +0,0 @@ -pylxml (2.2.4,REV=2010.03.05) - - * Initial release. - - -- Sebastian Kayser Fri, 5 Mar 2010 00:04:26 +0100 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 28 21:51:50 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Sep 2012 19:51:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19315] csw/mgar/pkg/lang-python Message-ID: Revision: 19315 http://gar.svn.sourceforge.net/gar/?rev=19315&view=rev Author: dmichelsen Date: 2012-09-28 19:51:50 +0000 (Fri, 28 Sep 2012) Log Message: ----------- lang-python/dpkt: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/dpkt/trunk/Makefile csw/mgar/pkg/lang-python/dpkt/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/dpkt/ Removed Paths: ------------- csw/mgar/pkg/lang-python/dpkt/trunk/files/COPYING csw/mgar/pkg/lang-python/dpkt/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lang-python/dpkt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyboto/trunk/Makefile 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/lang-python/dpkt/trunk/Makefile 2012-09-28 19:51:50 UTC (rev 19315) @@ -1,38 +1,23 @@ -NAME = pyboto -VERSION = 1.9b +NAME = dpkt +VERSION = 1.7 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Python interfaces to Amazon Web Services -define BLURB - An integrated interface to current and future infrastructural services - offered by Amazon Web Services. The goal of boto is to provide a very - simple, easy to use, lightweight wrapper around the Amazon services. -endef +DESCRIPTION = Python packet creation and parsing library -PACKAGES = CSWpy-boto -CATALOGNAME = py_boto +PACKAGES = CSWpy-dpkt -VENDOR_URL = http://code.google.com/p/boto/ -MASTER_SITES = $(GOOGLE_MIRROR) -GOOGLE_PROJECT = boto -DISTNAME = $(GOOGLE_PROJECT)-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz -UFILES_REGEX = $(GOOGLE_PROJECT)-(\d+(?:\.\d+)*).tar.gz +MASTER_SITES += $(GOOGLE_MIRROR) +DISTFILES += $(DISTNAME).tar.gz +UFILES_REGEX = $(GOOGLE_PROJECT)-(\d+(?:\.\d+)*).tar.gz -LICENSE = files/COPYING +VENDOR_URL = http://code.google.com/p/dpkt/ + +LICENSE = LICENSE ARCHALL = 1 +# There is no testsuite +TEST_SCRIPTS = + include gar/category.mk -post-install-modulated: - ginstall -D $(WORKSRC)/README \ - $(DESTDIR)$(docdir)/$(CATALOGNAME)/README - @$(MAKECOOKIE) - -# Install changelog.CSW -post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) -install-changelog-%: - ginstall -D $(FILEDIR)/changelog.CSW \ - $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/dpkt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyboto/trunk/checksums 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/lang-python/dpkt/trunk/checksums 2012-09-28 19:51:50 UTC (rev 19315) @@ -1 +1 @@ -4fc2fd7b70a971b1363f8465aafe7091 boto-1.9b.tar.gz +0baa25fd5d87066cf6189a66cf452ac0 dpkt-1.7.tar.gz Deleted: csw/mgar/pkg/lang-python/dpkt/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/lang-python/pyboto/trunk/files/COPYING 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/lang-python/dpkt/trunk/files/COPYING 2012-09-28 19:51:50 UTC (rev 19315) @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. Deleted: csw/mgar/pkg/lang-python/dpkt/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/pyboto/trunk/files/changelog.CSW 2012-08-16 19:31:59 UTC (rev 18981) +++ csw/mgar/pkg/lang-python/dpkt/trunk/files/changelog.CSW 2012-09-28 19:51:50 UTC (rev 19315) @@ -1,5 +0,0 @@ -py_boto (1.9b,REV=2010.05.26) - - * Initial release. - - -- Sebastian Kayser Wed, 26 May 2010 09:44:57 +0200 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 28 22:28:43 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 28 Sep 2012 20:28:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19316] csw/mgar/pkg/lang-python Message-ID: Revision: 19316 http://gar.svn.sourceforge.net/gar/?rev=19316&view=rev Author: dmichelsen Date: 2012-09-28 20:28:42 +0000 (Fri, 28 Sep 2012) Log Message: ----------- lang-python/ordereddict: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/ordereddict/trunk/Makefile csw/mgar/pkg/lang-python/ordereddict/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/ordereddict/ Modified: csw/mgar/pkg/lang-python/ordereddict/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/argparse/trunk/Makefile 2012-09-28 19:40:34 UTC (rev 19313) +++ csw/mgar/pkg/lang-python/ordereddict/trunk/Makefile 2012-09-28 20:28:42 UTC (rev 19316) @@ -2,19 +2,22 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = argparse -VERSION = 1.2.1 +NAME = ordereddict +VERSION = 1.1 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Python command-line parsing library +DESCRIPTION = A drop-in substitute for Py2.7's new collections -MASTER_SITES = http://argparse.googlecode.com/files/ +MASTER_SITES = $(PYPI_MIRROR) DISTFILES = $(DISTNAME).tar.gz -VENDOR_URL = http://pypi.python.org/pypi/argparse +VENDOR_URL = http://pypi.python.org/pypi/ordereddict/1.1 -PACKAGES = CSWpy-argparse -ARCHALL_CSWpy-argparse = 1 +PACKAGES = CSWpy-ordereddict +ARCHALL_CSWpy-ordereddict = 1 +# There is no testsuite +TEST_SCRIPTS = + include gar/category.mk Modified: csw/mgar/pkg/lang-python/ordereddict/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/argparse/trunk/checksums 2012-09-28 19:40:34 UTC (rev 19313) +++ csw/mgar/pkg/lang-python/ordereddict/trunk/checksums 2012-09-28 20:28:42 UTC (rev 19316) @@ -1 +1 @@ -2fbef8cb61e506c706957ab6e135840c argparse-1.2.1.tar.gz +a0ed854ee442051b249bfad0f638bbec ordereddict-1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 29 12:43:54 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 10:43:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19317] csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Message-ID: Revision: 19317 http://gar.svn.sourceforge.net/gar/?rev=19317&view=rev Author: chninkel Date: 2012-09-29 10:43:53 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/gnomevfs2/trunk: better way to change configure environment Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-09-28 20:28:42 UTC (rev 19316) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-09-29 10:43:53 UTC (rev 19317) @@ -73,6 +73,11 @@ # STRIP_LIBTOOL = 1 +EXTRA_CONFIGURE_EXPORTS += XGETTEXT MSGMERGE MSGFMT +CONFIGURE_ENV_XGETTEXT = /opt/csw/gnu/xgettext +CONFIGURE_ENV_MSGMERGE = /opt/csw/gnu/msgmerge +CONFIGURE_ENV_MSGFMT = /opt/csw/gnu/msgfmt + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc @@ -83,9 +88,4 @@ include gar/category.mk -# For GNU gettext -CONFIGURE_ENV += XGETTEXT=/opt/csw/gnu/xgettext -CONFIGURE_ENV += MSGMERGE=/opt/csw/gnu/msgmerge -CONFIGURE_ENV += MSGFMT=/opt/csw/gnu/msgfmt - 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 29 12:44:35 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 10:44:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19318] csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Message-ID: Revision: 19318 http://gar.svn.sourceforge.net/gar/?rev=19318&view=rev Author: chninkel Date: 2012-09-29 10:44:35 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/gnomevfs2/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-09-29 10:43:53 UTC (rev 19317) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-09-29 10:44:35 UTC (rev 19318) @@ -82,8 +82,6 @@ CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc -EXTRA_LD_OPTIONS = -Bdirect -z ignore - TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 29 12:45:16 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 10:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19319] csw/mgar/pkg/gnome-base/libgnomeprint/trunk/ Makefile Message-ID: Revision: 19319 http://gar.svn.sourceforge.net/gar/?rev=19319&view=rev Author: chninkel Date: 2012-09-29 10:45:16 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomeprint/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 10:44:35 UTC (rev 19318) +++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 10:45:16 UTC (rev 19319) @@ -83,8 +83,6 @@ CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -EXTRA_LD_OPTIONS = -z ignore -Bdirect - 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 chninkel at users.sourceforge.net Sat Sep 29 12:49:35 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 10:49:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19320] csw/mgar/pkg/gnome-base/libgnomeprint/trunk/ Makefile Message-ID: Revision: 19320 http://gar.svn.sourceforge.net/gar/?rev=19320&view=rev Author: chninkel Date: 2012-09-29 10:49:35 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomeprint/trunk: we need GNU gettext Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 10:45:16 UTC (rev 19319) +++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 10:49:35 UTC (rev 19320) @@ -77,6 +77,11 @@ STRIP_LIBTOOL = 1 +EXTRA_CONFIGURE_EXPORTS += XGETTEXT MSGMERGE MSGFMT +CONFIGURE_ENV_XGETTEXT = /opt/csw/gnu/xgettext +CONFIGURE_ENV_MSGMERGE = /opt/csw/gnu/msgmerge +CONFIGURE_ENV_MSGFMT = /opt/csw/gnu/msgfmt + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc @@ -84,5 +89,3 @@ CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) 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 chninkel at users.sourceforge.net Sat Sep 29 13:01:35 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 11:01:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19321] csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile Message-ID: Revision: 19321 http://gar.svn.sourceforge.net/gar/?rev=19321&view=rev Author: chninkel Date: 2012-09-29 11:01:35 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomecups/trunk: removed '-z ignore' and '-Bdirect' LD flags as it now the default Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile 2012-09-29 10:49:35 UTC (rev 19320) +++ csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile 2012-09-29 11:01:35 UTC (rev 19321) @@ -41,7 +41,5 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_LD_OPTIONS = -z ignore -Bdirect - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 29 13:16:20 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 11:16:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19322] csw/mgar/pkg/gnome-base/libgnomecups/trunk Message-ID: Revision: 19322 http://gar.svn.sourceforge.net/gar/?rev=19322&view=rev Author: chninkel Date: 2012-09-29 11:16:19 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomecups/trunk: updated to 0.2.3 Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile csw/mgar/pkg/gnome-base/libgnomecups/trunk/checksums csw/mgar/pkg/gnome-base/libgnomecups/trunk/files/0001-cups-config-bug-workaround.patch Modified: csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile 2012-09-29 11:01:35 UTC (rev 19321) +++ csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile 2012-09-29 11:16:19 UTC (rev 19322) @@ -1,5 +1,5 @@ NAME = libgnomecups -VERSION = 0.1.13 +VERSION = 0.2.3 CATEGORIES = gnome GARTYPE = v2 @@ -39,6 +39,12 @@ STRIP_LIBTOOL = 1 +# Gnome want GNU gettext +EXTRA_CONFIGURE_EXPORTS += XGETTEXT MSGMERGE MSGFMT +CONFIGURE_ENV_XGETTEXT = /opt/csw/gnu/xgettext +CONFIGURE_ENV_MSGMERGE = /opt/csw/gnu/msgmerge +CONFIGURE_ENV_MSGFMT = /opt/csw/gnu/msgfmt + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/gnome-base/libgnomecups/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecups/trunk/checksums 2012-09-29 11:01:35 UTC (rev 19321) +++ csw/mgar/pkg/gnome-base/libgnomecups/trunk/checksums 2012-09-29 11:16:19 UTC (rev 19322) @@ -1 +1 @@ -0103893afb7bf0d78f6c6a196990b52d libgnomecups-0.1.13.tar.bz2 +dc4920c15c9f886f73ea74fbff0ae48b libgnomecups-0.2.3.tar.bz2 Modified: csw/mgar/pkg/gnome-base/libgnomecups/trunk/files/0001-cups-config-bug-workaround.patch =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecups/trunk/files/0001-cups-config-bug-workaround.patch 2012-09-29 11:01:35 UTC (rev 19321) +++ csw/mgar/pkg/gnome-base/libgnomecups/trunk/files/0001-cups-config-bug-workaround.patch 2012-09-29 11:16:19 UTC (rev 19322) @@ -1,39 +1,39 @@ -From f685faacd8d45d2c4c6c732014ba7d164e2760c5 Mon Sep 17 00:00:00 2001 +From 71a55d17ec7133480fe78d129b1edeb740a83a61 Mon Sep 17 00:00:00 2001 From: Yann Rouillard -Date: Sat, 14 Jul 2012 22:32:47 +0200 +Date: Sat, 29 Sep 2012 13:07:16 +0200 Subject: [PATCH] cups-config bug workaround --- - Makefile.in | 2 +- - libgnomecups/Makefile.in | 2 +- - 2 file changed, 2 insertion(+), 2 deletion(-) + Makefile.in | 2 +- + libgnomecups/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index c9cba11..1108a33 100644 +index 34bde8e..1d5101c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -65,7 +65,7 @@ CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ +@@ -100,7 +100,7 @@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ CUPS_CFLAGS = @CUPS_CFLAGS@ + CUPS_CONFIG = @CUPS_CONFIG@ -CUPS_LIBS = @CUPS_LIBS@ +CUPS_LIBS = -L$(libdir) @CUPS_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ - DATADIRNAME = @DATADIRNAME@ --- -1.7.10.3 - + CXXDEPMODE = @CXXDEPMODE@ diff --git a/libgnomecups/Makefile.in b/libgnomecups/Makefile.in -index 611973c..555bb33 100644 +index 79c9c70..ec95f80 100644 --- a/libgnomecups/Makefile.in +++ b/libgnomecups/Makefile.in -@@ -65,7 +65,7 @@ CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ +@@ -100,7 +100,7 @@ CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ CUPS_CFLAGS = @CUPS_CFLAGS@ + CUPS_CONFIG = @CUPS_CONFIG@ -CUPS_LIBS = @CUPS_LIBS@ +CUPS_LIBS = -L$(libdir) @CUPS_LIBS@ CXX = @CXX@ CXXCPP = @CXXCPP@ - DATADIRNAME = @DATADIRNAME@ + CXXDEPMODE = @CXXDEPMODE@ +-- +1.7.12 + 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 29 15:30:01 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 13:30:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19323] csw/mgar/pkg/lang-python/python-ldap/trunk Message-ID: Revision: 19323 http://gar.svn.sourceforge.net/gar/?rev=19323&view=rev Author: chninkel Date: 2012-09-29 13:30:01 +0000 (Sat, 29 Sep 2012) Log Message: ----------- updated to 2.3.13 and rebuilt against libssl1.0.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile csw/mgar/pkg/lang-python/python-ldap/trunk/checksums Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2012-09-29 11:16:19 UTC (rev 19322) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2012-09-29 13:30:01 UTC (rev 19323) @@ -1,6 +1,6 @@ # $Id$ NAME = python-ldap -VERSION = 2.3.12 +VERSION = 2.3.13 CATEGORIES = python GARTYPE = v2 PACKAGES = CSWpy-ldap @@ -14,12 +14,14 @@ for that purpose. endef -BUILD_DEP_PKGS = CSWpython-devel CSWoldapdevel CSWossldevel -RUNTIME_DEP_PKGS_CSWpy-ldap += CSWsasl -RUNTIME_DEP_PKGS_CSWpy-ldap += CSWosslrt -RUNTIME_DEP_PKGS_CSWpy-ldap += CSWoldaprt +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD_DEP_PKGS = CSWpython-dev CSWopenldap-dev +RUNTIME_DEP_PKGS_CSWpy-ldap += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibpython2-6-1-0 + MASTER_SITE_DIR = $(shell echo $(NAME) | cut -c 1) MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(NAME)/ DISTFILES = $(NAME)-$(VERSION).tar.gz Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2012-09-29 11:16:19 UTC (rev 19322) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/checksums 2012-09-29 13:30:01 UTC (rev 19323) @@ -1,2 +1 @@ -2dadc521b2c2590d9b033894ba5c6f31 python-ldap-2.3.12.tar.gz -e6a99d92ac8869ff77754331f6673200 0000-openldap-path.patch +895223d32fa10bbc29aa349bfad59175 python-ldap-2.3.13.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 29 16:38:11 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 14:38:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19324] csw/mgar/gar/v2/bin/stripbin Message-ID: Revision: 19324 http://gar.svn.sourceforge.net/gar/?rev=19324&view=rev Author: chninkel Date: 2012-09-29 14:38:11 +0000 (Sat, 29 Sep 2012) Log Message: ----------- stripbin must use SUN strip and never GNU strip Modified Paths: -------------- csw/mgar/gar/v2/bin/stripbin Modified: csw/mgar/gar/v2/bin/stripbin =================================================================== --- csw/mgar/gar/v2/bin/stripbin 2012-09-29 13:30:01 UTC (rev 19323) +++ csw/mgar/gar/v2/bin/stripbin 2012-09-29 14:38:11 UTC (rev 19324) @@ -28,7 +28,7 @@ my $perm = (stat $file)[2] & 07777; print "making file temporarily writable ... " unless( $perm & 0200 ); chmod($perm | 0200, $file); - system "strip", $file and die "Failed."; + system "/usr/ccs/bin/strip", $file and die "Failed."; chmod($perm, $file); print "Done.\n"; } 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 29 18:08:21 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 16:08:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19325] csw/mgar/pkg/gnome-base/libgnomeprint/trunk/ Makefile Message-ID: Revision: 19325 http://gar.svn.sourceforge.net/gar/?rev=19325&view=rev Author: chninkel Date: 2012-09-29 16:08:21 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomeprint/trunk: force gnu gettext usage Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 14:38:11 UTC (rev 19324) +++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 16:08:21 UTC (rev 19325) @@ -27,6 +27,8 @@ #BUILD_DEP_PKGS += CSWlibgnomeprint #BUILD_DEP_PKGS += CSWlibgnomecanvas BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev +BUILD_DEP_PKGS += CSWggettext RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibz1 @@ -77,10 +79,13 @@ STRIP_LIBTOOL = 1 -EXTRA_CONFIGURE_EXPORTS += XGETTEXT MSGMERGE MSGFMT -CONFIGURE_ENV_XGETTEXT = /opt/csw/gnu/xgettext -CONFIGURE_ENV_MSGMERGE = /opt/csw/gnu/msgmerge -CONFIGURE_ENV_MSGFMT = /opt/csw/gnu/msgfmt +EXTRA_COMMON_EXPORTS += XGETTEXT MSGMERGE MSGFMT +CONFIGURE_ENV_XGETTEXT = /opt/csw/bin/gxgettext +CONFIGURE_ENV_MSGMERGE = /opt/csw/bin/gmsgmerge +CONFIGURE_ENV_MSGFMT = /opt/csw/bin/gmsgfmt +BUILD_ENV_XGETTEXT = /opt/csw/bin/gxgettext +BUILD_ENV_MSGMERGE = /opt/csw/bin/gmsgmerge +BUILD_ENV_MSGFMT = /opt/csw/bin/gmsgfmt CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no 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 29 18:32:46 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 16:32:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19326] csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile Message-ID: Revision: 19326 http://gar.svn.sourceforge.net/gar/?rev=19326&view=rev Author: chninkel Date: 2012-09-29 16:32:45 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomecups/trunk: added freetype as build dependency Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile 2012-09-29 16:08:21 UTC (rev 19325) +++ csw/mgar/pkg/gnome-base/libgnomecups/trunk/Makefile 2012-09-29 16:32:45 UTC (rev 19326) @@ -18,6 +18,8 @@ SPKG_SOURCEURL = http://ftp.gnome.org/pub/GNOME/sources/libgnomecups/ +BUILD_DEP_PKGS += CSWlibfreetype-dev + RUNTIME_DEP_PKGS_CSWlibgnomecups += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomecups += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgnomecups += CSWlibgobject2-0-0 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 29 20:08:40 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 18:08:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[19327] csw/mgar/pkg/gnome-base/libgnomeprint/trunk/ Makefile Message-ID: Revision: 19327 http://gar.svn.sourceforge.net/gar/?rev=19327&view=rev Author: chninkel Date: 2012-09-29 18:08:40 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomeprint/trunk: added several build dependencies Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 16:32:45 UTC (rev 19326) +++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 18:08:40 UTC (rev 19327) @@ -29,6 +29,15 @@ BUILD_DEP_PKGS += CSWlibgtk2-dev BUILD_DEP_PKGS += CSWlibgpg-error-dev BUILD_DEP_PKGS += CSWggettext +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWbison +BUILD_DEP_PKGS += CSWcups-dev +# It should not be needed I think +# probably a dependency with an incorrect +# pkg-config --libs output +BUILD_DEP_PKGS += CSWlibkrb5-dev RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgnomeprint += CSWlibz1 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 29 21:08:53 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 19:08:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19328] csw/mgar/pkg/gnome-base/libgnomeprint/trunk/ Makefile Message-ID: Revision: 19328 http://gar.svn.sourceforge.net/gar/?rev=19328&view=rev Author: chninkel Date: 2012-09-29 19:08:53 +0000 (Sat, 29 Sep 2012) Log Message: ----------- gnome-base/libgnomeprint/trunk: disabled papi module Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 18:08:40 UTC (rev 19327) +++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile 2012-09-29 19:08:53 UTC (rev 19328) @@ -101,5 +101,9 @@ CONFIGURE_ARGS += --enable-gtk-doc CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# gnomeprint papi module was not present in the previous package and +# it seems papi library is not available under Solaris 11 base installation +# so let's not fight for it +CONFIGURE_ARGS += --without-papi include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Sep 29 21:19:33 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 19:19:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19329] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 19329 http://gar.svn.sourceforge.net/gar/?rev=19329&view=rev Author: chninkel Date: 2012-09-29 19:19:33 +0000 (Sat, 29 Sep 2012) Log Message: ----------- ffmpeg/trunk: removed GNU ld specific options Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-09-29 19:08:53 UTC (rev 19328) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-09-29 19:19:33 UTC (rev 19329) @@ -24,6 +24,7 @@ PATCHFILES += 0001-fix-version.sh.patch PATCHFILES += 0003-change-linker-flags.patch PATCHFILES += 0003-fix_a_few_shells.patch +PATCHFILES += 0004-remove-GNU-ld-specific-options.patch LICENSE = COPYING.GPLv3 Added: csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch 2012-09-29 19:19:33 UTC (rev 19329) @@ -0,0 +1,24 @@ +From 38f1e7dee2711117bc6f9cde25ab2a31531cb5e6 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Sat, 29 Sep 2012 17:19:27 +0200 +Subject: [PATCH] Remove GNU ld specific options + +--- + configure | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure b/configure +index fa6e845..505508e 100755 +--- a/configure ++++ b/configure +@@ -3372,7 +3372,6 @@ enabled extra_warnings && check_cflags -Winline + + # add some linker flags + check_ldflags -Wl,--warn-common +-check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample + test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic + + enabled xmm_clobber_test && \ +-- +1.7.12 + 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 29 21:20:51 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 29 Sep 2012 19:20:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19330] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19330 http://gar.svn.sourceforge.net/gar/?rev=19330&view=rev Author: chninkel Date: 2012-09-29 19:20:50 +0000 (Sat, 29 Sep 2012) Log Message: ----------- ffmpeg/trunk: forces the usage of SUN strip instead of GNU strip Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-09-29 19:19:33 UTC (rev 19329) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-09-29 19:20:50 UTC (rev 19330) @@ -282,6 +282,10 @@ CONFIGURE_ARGS += --enable-libvorbis CONFIGURE_ARGS += --enable-libx264 +# We don't want to use GNU strip as +# it corrupts a SUN specific elf section +CONFIGURE_ARGS += --strip=/usr/ccs/bin/strip + # Tests only work with static build #SKIPTEST-SHARED-yes = 1 #SKIPTEST ?= $(SKIPTEST-SHARED-$(SHARED)) 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 29 22:52:02 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 Sep 2012 20:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[19331] csw/mgar/pkg Message-ID: Revision: 19331 http://gar.svn.sourceforge.net/gar/?rev=19331&view=rev Author: dmichelsen Date: 2012-09-29 20:52:02 +0000 (Sat, 29 Sep 2012) Log Message: ----------- lang-python/progressbar: Move down from pkg/ Added Paths: ----------- csw/mgar/pkg/lang-python/progressbar/ Removed Paths: ------------- csw/mgar/pkg/progressbar/ 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 29 23:04:30 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 Sep 2012 21:04:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19332] csw/mgar/pkg/lang-python/progressbar/trunk Message-ID: Revision: 19332 http://gar.svn.sourceforge.net/gar/?rev=19332&view=rev Author: dmichelsen Date: 2012-09-29 21:04:29 +0000 (Sat, 29 Sep 2012) Log Message: ----------- lang-python/progressbar/trunk: Update to 2.3, some reformatting Modified Paths: -------------- csw/mgar/pkg/lang-python/progressbar/trunk/Makefile csw/mgar/pkg/lang-python/progressbar/trunk/checksums Modified: csw/mgar/pkg/lang-python/progressbar/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/progressbar/trunk/Makefile 2012-09-29 20:52:02 UTC (rev 19331) +++ csw/mgar/pkg/lang-python/progressbar/trunk/Makefile 2012-09-29 21:04:29 UTC (rev 19332) @@ -3,20 +3,23 @@ # $Id$ NAME = progressbar -VERSION = 2.2 +VERSION = 2.3 CATEGORIES = python GARTYPE = v2 + DESCRIPTION = Text progressbar library for Python -define BLURB -endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/progressbar -MASTER_SITES = http://pypi.python.org/packages/source/p/progressbar/ -DISTFILES = $(NAME)-$(VERSION).tar.gz + +GOOGLE_PROJECT = python-progressbar +MASTER_SITES += $(GOOGLE_MIRROR) +DISTFILES += $(DISTNAME).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -LICENSE = LICENSE -TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) + +VENDOR_URL = http://pypi.python.org/pypi/progressbar +LICENSE = LICENSE.txt + +#TEST_SCRIPTS = + PACKAGES = CSWpy-progressbar -CATALOGNAME_CSWpy-progressbar = py_progressbar ARCHALL_CSWpy-progressbar = 1 + include gar/category.mk Modified: csw/mgar/pkg/lang-python/progressbar/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/progressbar/trunk/checksums 2012-09-29 20:52:02 UTC (rev 19331) +++ csw/mgar/pkg/lang-python/progressbar/trunk/checksums 2012-09-29 21:04:29 UTC (rev 19332) @@ -1 +1 @@ -8ea4e2c17a8ec9e7d153767c5f2a7b28 progressbar-2.2.tar.gz +4f904e94b783b4c6e71aa74fd2432c59 progressbar-2.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 29 23:16:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 Sep 2012 21:16:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19333] csw/mgar/pkg/lang-python/twisted/trunk Message-ID: Revision: 19333 http://gar.svn.sourceforge.net/gar/?rev=19333&view=rev Author: dmichelsen Date: 2012-09-29 21:16:17 +0000 (Sat, 29 Sep 2012) Log Message: ----------- lang-python/twisted/trunk: Update to 12.2.0 and some cleanup Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile csw/mgar/pkg/lang-python/twisted/trunk/checksums Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2012-09-29 21:04:29 UTC (rev 19332) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2012-09-29 21:16:17 UTC (rev 19333) @@ -3,7 +3,7 @@ # $Id$ NAME = twisted -MAJ_VERSION = 12.0 +MAJ_VERSION = 12.2 PATCHLEVEL = 0 VERSION = $(MAJ_VERSION).$(PATCHLEVEL) CATEGORIES = python @@ -15,19 +15,18 @@ mail servers, and more. endef -UPSTREAM_NAME = Twisted -DISTNAME = $(UPSTREAM_NAME)-$(VERSION) -MASTER_SITES = http://pypi.python.org/packages/source/T/Twisted/ -DISTFILES = $(DISTNAME).tar.bz2 -TEST_SCRIPTS = -LICENSE = LICENSE +PYPI_PROJECT = Twisted +MASTER_SITES += $(PYPI_MIRROR) +DISTNAME = $(PYPI_PROJECT)-$(VERSION) +DISTFILES += $(DISTNAME).tar.bz2 +# TEST_SCRIPTS = -PACKAGES = CSWpy-twisted +LICENSE = LICENSE + +PACKAGES += CSWpy-twisted +SPKG_DESC_CSWpy-twisted = An event-driven networking engine RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface -SPKG_DESC_CSWpy-twisted = An event-driven networking engine -CATALOGNAME_CSWpy-twisted = py_twisted - OBSOLETED_BY_CSWpy-twisted = CSWtwisted ARCHALL_CSWtwisted = 1 @@ -37,7 +36,6 @@ CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpy-twisted CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/python/_twisted_zsh_stub CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/tap/ftp.py CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/unix.py CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/openssh_compat/factory.py Modified: csw/mgar/pkg/lang-python/twisted/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/checksums 2012-09-29 21:04:29 UTC (rev 19332) +++ csw/mgar/pkg/lang-python/twisted/trunk/checksums 2012-09-29 21:16:17 UTC (rev 19333) @@ -1 +1 @@ -cf49a8676c21c50faf1b42b528049471 Twisted-12.0.0.tar.bz2 +9a321b904d01efd695079f8484b37861 Twisted-12.2.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 29 23:31:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 Sep 2012 21:31:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19334] csw/mgar/pkg Message-ID: Revision: 19334 http://gar.svn.sourceforge.net/gar/?rev=19334&view=rev Author: dmichelsen Date: 2012-09-29 21:31:59 +0000 (Sat, 29 Sep 2012) Log Message: ----------- scapy/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/scapy/ csw/mgar/pkg/scapy/Makefile csw/mgar/pkg/scapy/branches/ csw/mgar/pkg/scapy/tags/ csw/mgar/pkg/scapy/trunk/ csw/mgar/pkg/scapy/trunk/Makefile csw/mgar/pkg/scapy/trunk/checksums csw/mgar/pkg/scapy/trunk/files/ Added: csw/mgar/pkg/scapy/Makefile =================================================================== --- csw/mgar/pkg/scapy/Makefile (rev 0) +++ csw/mgar/pkg/scapy/Makefile 2012-09-29 21:31:59 UTC (rev 19334) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/scapy/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/scapy/trunk/Makefile =================================================================== --- csw/mgar/pkg/scapy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scapy/trunk/Makefile 2012-09-29 21:31:59 UTC (rev 19334) @@ -0,0 +1,44 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = scapy +VERSION = 2.2.0 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = A powerful interactive packet manipulation program + +MASTER_SITES += http://www.secdev.org/projects/scapy/files/ +DISTFILES += $(DISTNAME).tar.gz + +VENDOR_URL = http://www.secdev.org/projects/scapy/ + +PACKAGES += CSWpy-scapy +SPKG_DESC_CSWmypkg = A powerful interactive packet manipulation program +# PKGFILES is catchall +# We need this for share/wireshark/manuf +RUNTIME_DEP_PKGS_CSWpy-scapy += CSWwireshark +CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWwireshark +# We need this for share/nmap/nmap-os-fingerprints +RUNTIME_DEP_PKGS_CSWpy-scapy += CSWnmap +CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWnmap + +REINPLACEMENTS += wireshark-manuf +REINPLACE_MATCH_wireshark-manuf = /usr/share/wireshark/wireshark/manuf +REINPLACE_WITH_wireshark-manuf = /opt/csw/share/wireshark/manuf +REINPLACE_FILES_wireshark-manuf += scapy/data.py +REINPLACE_FILES_wireshark-manuf += scapy/utils6.py + +REINPLACEMENTS += nmap-os-fingerprints +REINPLACE_MATCH_nmap-os-fingerprints = /usr/share/nmap/nmap-os-fingerprints +REINPLACE_WITH_nmap-os-fingerprints = /opt/csw/share/nmap/nmap-os-fingerprints +REINPLACE_FILES_nmap-os-fingerprints += scapy/modules/nmap.py + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: + -gunzip $(DESTDIR)$(mandir)/man1/scapy.1.gz + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/scapy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/scapy/trunk/checksums =================================================================== --- csw/mgar/pkg/scapy/trunk/checksums (rev 0) +++ csw/mgar/pkg/scapy/trunk/checksums 2012-09-29 21:31:59 UTC (rev 19334) @@ -0,0 +1 @@ +406990bd8da1f4958b354b4b6fc4b3eb scapy-2.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Sep 29 23:33:45 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 29 Sep 2012 21:33:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19335] csw/mgar/pkg/scapy/trunk/Makefile Message-ID: Revision: 19335 http://gar.svn.sourceforge.net/gar/?rev=19335&view=rev Author: dmichelsen Date: 2012-09-29 21:33:45 +0000 (Sat, 29 Sep 2012) Log Message: ----------- scapy/trunk: Make ARCHALL Modified Paths: -------------- csw/mgar/pkg/scapy/trunk/Makefile Modified: csw/mgar/pkg/scapy/trunk/Makefile =================================================================== --- csw/mgar/pkg/scapy/trunk/Makefile 2012-09-29 21:31:59 UTC (rev 19334) +++ csw/mgar/pkg/scapy/trunk/Makefile 2012-09-29 21:33:45 UTC (rev 19335) @@ -16,6 +16,7 @@ PACKAGES += CSWpy-scapy SPKG_DESC_CSWmypkg = A powerful interactive packet manipulation program # PKGFILES is catchall +ARCHALL_CSWpy-scapy = 1 # We need this for share/wireshark/manuf RUNTIME_DEP_PKGS_CSWpy-scapy += CSWwireshark CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWwireshark 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 30 15:36:39 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 30 Sep 2012 13:36:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19336] csw/mgar/pkg/lang-python/virtualenv/trunk Message-ID: Revision: 19336 http://gar.svn.sourceforge.net/gar/?rev=19336&view=rev Author: wahwah Date: 2012-09-30 13:36:39 +0000 (Sun, 30 Sep 2012) Log Message: ----------- lang-python/virtualenv/trunk: version bump to 1.8.2 Modified Paths: -------------- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile csw/mgar/pkg/lang-python/virtualenv/trunk/checksums Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2012-09-29 21:33:45 UTC (rev 19335) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2012-09-30 13:36:39 UTC (rev 19336) @@ -3,7 +3,7 @@ # $Id$ NAME = virtualenv -VERSION = 1.5.1 +VERSION = 1.8.2 PACKAGES = CSWpy-virtualenv CATALOGNAME_CSWpy-virtualenv = py_virtualenv CATEGORIES = python @@ -14,8 +14,7 @@ endef SPKG_SOURCEURL = http://pypi.python.org/pypi/virtualenv MASTER_SITES = http://pypi.python.org/packages/source/v/virtualenv/ -# virtualenv-1.5.1.tar.gz#md5=3daa1f449d5d2ee03099484cecb1c2b7 DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -LICENSE = PKG-INFO +LICENSE = PKG-INFO include gar/category.mk Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/virtualenv/trunk/checksums 2012-09-29 21:33:45 UTC (rev 19335) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/checksums 2012-09-30 13:36:39 UTC (rev 19336) @@ -1 +1 @@ -3daa1f449d5d2ee03099484cecb1c2b7 virtualenv-1.5.1.tar.gz +174ca075c6b1a42c685415692ec4ce2e virtualenv-1.8.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Sep 30 15:43:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 30 Sep 2012 13:43:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19337] csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile Message-ID: Revision: 19337 http://gar.svn.sourceforge.net/gar/?rev=19337&view=rev Author: wahwah Date: 2012-09-30 13:43:31 +0000 (Sun, 30 Sep 2012) Log Message: ----------- lang-python/virtualenv/trunk: /usr/share references are fine Modified Paths: -------------- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2012-09-30 13:36:39 UTC (rev 19336) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2012-09-30 13:43:31 UTC (rev 19337) @@ -15,6 +15,7 @@ SPKG_SOURCEURL = http://pypi.python.org/pypi/virtualenv MASTER_SITES = http://pypi.python.org/packages/source/v/virtualenv/ DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = PKG-INFO +# /usr/share references are fine, these are docstrings. +CHECKPKG_OVERRIDES_CSWpy-virtualenv += file-with-bad-content include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Sep 30 22:41:45 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 30 Sep 2012 20:41:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19338] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 19338 http://gar.svn.sourceforge.net/gar/?rev=19338&view=rev Author: chninkel Date: 2012-09-30 20:41:45 +0000 (Sun, 30 Sep 2012) Log Message: ----------- openssh/trunk: disables lazyload as it causes problem with chroot Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2012-09-30 13:43:31 UTC (rev 19337) +++ csw/mgar/pkg/openssh/trunk/Makefile 2012-09-30 20:41:45 UTC (rev 19338) @@ -165,6 +165,10 @@ CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-privsep-path=$(localstatedir)/empty +# We don't want to use lazy load because of +# the chroot usage by sshd +EXTRA_LD_OPTIONS = -z nolazyload + 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 Sun Sep 30 23:25:33 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 30 Sep 2012 21:25:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19339] csw/mgar/pkg/openssh/trunk/files/changelog.CSW Message-ID: Revision: 19339 http://gar.svn.sourceforge.net/gar/?rev=19339&view=rev Author: chninkel Date: 2012-09-30 21:25:33 +0000 (Sun, 30 Sep 2012) Log Message: ----------- openssh/trunk: updated changelog Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2012-09-30 20:41:45 UTC (rev 19338) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2012-09-30 21:25:33 UTC (rev 19339) @@ -1,3 +1,10 @@ +openssh (6.0p1,REV=2012.09.30) unstable + + * Explicitly disabled lazyloading as it causes + problem with chrooting (Closes: #5006). + + -- Yann Rouillard Sun, 30 Sep 2012 23:22:42 +0200 + openssh (6.0p1,REV=2012.08.24) unstable * Enabled direct binding during build. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.