From pfelecan at users.sourceforge.net Tue Jan 1 15:24:39 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Jan 2013 14:24:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19987] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19987 http://gar.svn.sourceforge.net/gar/?rev=19987&view=rev Author: pfelecan Date: 2013-01-01 14:24:39 +0000 (Tue, 01 Jan 2013) Log Message: ----------- texlive/trunk: in place replacement cruft elimination and one collision solved Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2012-12-31 17:24:50 UTC (rev 19986) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-01 14:24:39 UTC (rev 19987) @@ -4757,6 +4757,9 @@ SPKG_DESC_CSWtexlive-pstricks += $(DESCRIPTION), pstricks OBSOLETED_BY_CSWtexlive-pstricks = CSWtetex OBSOLETED_BY_CSWtexlive-pstricks += CSWtex-pdftricks +CATALOGNAME_CSWtex-pdftricks = tex_pdftricks_stub +OBSOLETED_BY_CSWtexlive-pstricks += CSWtexpdftricks +CATALOGNAME_CSWtexpdftricks = tex_pdftricks_old_stub PKGFILES_CSWtexlive-pstricks += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks)/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pedigree PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pst2pdf @@ -5446,191 +5449,161 @@ $(MAKECOOKIE) REINPLACE_WHEN_USRLOCAL = postinstall -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/generic/tds/Makefile -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/concrete/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/dvips -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/luatex -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/mktexlsr -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/pdftex -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/pdftosrc -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/xdvi-xaw -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/bin/xetex -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/include/kpathsea/types.h -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/info/kpathsea.info -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/info/web2c.info -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/man/man1/texmfstart.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/man/man1/xdvi.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phaip.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phcpc.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phiaea.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phjcp.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phnf.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phnflet.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phpf.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phppcf.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phreport.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/phrmp.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/beebe/plainyr.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/alphaurl.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/plainurl.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/bibtex/bst/urlbst/unsrturl.bst -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/Makefile.in -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/concmath-fonts/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/fontname/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/tipaman1.tex -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/fonts/wsuipa/compilefonts -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/aiaa/pre2004/aiaa.dtx -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/confproc/buildpapers.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/cweb-latex/examples/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/emp/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/latexdiff/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/latexdiff/contrib/latexdiff.spec -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/montex/mfinput/bithe/testfont.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/montex/testfont.sh -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/plain/js-misc/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/support/lua-alt-getopt/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/Pedigree/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagdc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagkc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbkdc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbklc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrbc8u.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrrc8u.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvbc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvrc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncbc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncrv8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmbc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmrc8z.vf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/metafont/misc/modes.mf -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/context/ruby/texmfstart.rb -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/latexmk/latexmk.pl -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/pdfjam/pdfjam -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/fonts/blacklettert1/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/captcont/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/circ/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/concmath/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/crossword/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/esk/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/feynmf/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/footnpag/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/frankenstein/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/mcite/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/mflogo/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/plari/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/plweb/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/qsymbols/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/rcs/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/rcs/src/test/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/source/latex/subfigure/Makefile -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/tex/latex/base/ltxcheck.tex -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf-dist/tex/latex/base/texsys.cfg -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/info/tds.info -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/info/web2c.info -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/install-tl.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/latexmk.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/texmfstart.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/doc/man/man1/xdvi.1 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/dvipdfm/config/config-win32 -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/scripts/simpdftex/simpdftex -REINPLACE_USRLOCAL += /usr/local|root/opt/csw/share/texmf/web2c/texmf.cnf -REINPLACE_USRLOCAL += /opt/csw/share/man/man1/xdvi.1 -REINPLACE_USRLOCAL += /opt/csw/share/man/man1/texmfstart.1 -REINPLACE_USRLOCAL += /opt/csw/share/info/web2c.info +# until finding a better way: +REINPLACE_USRLOCAL += /opt/csw/bin/dvips +REINPLACE_USRLOCAL += /opt/csw/bin/luatex +REINPLACE_USRLOCAL += /opt/csw/bin/mktexlsr +REINPLACE_USRLOCAL += /opt/csw/bin/pdftex +REINPLACE_USRLOCAL += /opt/csw/bin/pdftosrc +REINPLACE_USRLOCAL += /opt/csw/bin/xdvi-xaw +REINPLACE_USRLOCAL += /opt/csw/bin/xetex +REINPLACE_USRLOCAL += /opt/csw/include/kpathsea/types.h REINPLACE_USRLOCAL += /opt/csw/share/info/kpathsea.info +REINPLACE_USRLOCAL += /opt/csw/share/info/web2c.info +REINPLACE_USRLOCAL += /opt/csw/share/man/man1/texmfstart.1 +REINPLACE_USRLOCAL += /opt/csw/share/man/man1/xdvi.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phaip.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phcpc.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phiaea.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phjcp.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phnf.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phnflet.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phpf.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phppcf.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phreport.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/phrmp.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/beebe/plainyr.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/abbrvhtml.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtml.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/alphahtmldater.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtml.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldate.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/plainhtmldater.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/bibhtml/unsrthtml.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/urlbst/alphaurl.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/urlbst/plainurl.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/bibtex/bst/urlbst/unsrturl.bst +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/bibtex/urlbst/Makefile.in +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/concmath-fonts/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/concrete/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/fontname/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/tipa/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/tipa/tipaman1.tex +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/wsuipa/compilefonts +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/generic/tds/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/aiaa/pre2004/aiaa.dtx +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/confproc/buildpapers.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/cweb-latex/examples/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/emp/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/latexdiff/contrib/latexdiff.spec +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/latexdiff/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/montex/mfinput/bithe/testfont.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/montex/testfont.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/plain/js-misc/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/support/lua-alt-getopt/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/support/pedigree-perl/Pedigree/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagdc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/avantgar/pagkc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbkdc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/bookman/pbklc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrbc8u.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/courier/pcrrc8u.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvbc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/helvetic/phvrc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncbc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/ncntrsbk/pncrv8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplbc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/palatino/pplrc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmbc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/fonts/vf/cspsfonts-adobe/times/ptmrc8z.vf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/metafont/misc/modes.mf +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/context/ruby/texmfstart.rb +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/latexmk/latexmk.pl +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/pdfjam/pdfjam +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/fonts/berenisadf/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/fonts/blacklettert1/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/captcont/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/circ/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/concmath/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/crossword/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/esk/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/feynmf/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/footnpag/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/frankenstein/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/mcite/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/mflogo/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/plari/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/plweb/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/qsymbols/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/rcs/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/rcs/src/test/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/source/latex/subfigure/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/tex/latex/base/ltxcheck.tex +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/tex/latex/base/texsys.cfg REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/info/tds.info REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/info/web2c.info +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/install-tl.1 REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/latexmk.1 REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/pdfjam.1 -REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/xdvi.1 -REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/install-tl.1 REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/texmfstart.1 -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/scripts/context/ruby/texmfstart.rb +REINPLACE_USRLOCAL += /opt/csw/share/texmf/doc/man/man1/xdvi.1 +REINPLACE_USRLOCAL += /opt/csw/share/texmf/dvipdfm/config/config-win32 REINPLACE_USRLOCAL += /opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg REINPLACE_USRLOCAL += /opt/csw/share/texmf/scripts/simpdftex/simpdftex -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.sh -# until finding a better way: -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl -REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh +REINPLACE_USRLOCAL += /opt/csw/share/texmf/web2c/texmf.cnf +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/generic/epsf/Makefile REINPLACE_WHEN_USRshare = postinstall -REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/tex/latex/susy/susy.sty -REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/luatex -REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/pdftex -REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/pdftosrc -REINPLACE_USRSHARE += /usr/share|root/opt/csw/bin/xetex -REINPLACE_USRSHARE += /usr/share|root/opt/csw/include/kpathsea/paths.h -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/info/dvips.info -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/man/man1/chktex.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/man/man1/chkweb.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/bibtex/bst/minitoc/en-mtc.bst -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/bigints/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/dashundergaps/doc/tex/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/disser/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/disser/templates/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/plantslabels/doc/tex/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/pdfjam/pdfjam -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/source/latex/sf298/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf-dist/source/latex/subfig/Makefile -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/info/dvips.info -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/info/eplain.info -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/arlatex.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/chktex.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/chkweb.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/doc/man/man1/purifyeps.1 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/texconfig/v/vt100 -REINPLACE_USRSHARE += /usr/share|root/opt/csw/share/texmf/web2c/texmf.cnf -REINPLACE_USRSHARE += /usr/local|root/opt/csw/share/texmf-dist/doc/generic/epsf/Makefile -REINPLACE_USRSHARE += /opt/csw/share/man/man1/chkweb.1 -REINPLACE_USRSHARE += /opt/csw/share/man/man1/chktex.1 +REINPLACE_USRSHARE += /opt/csw/bin/luatex +REINPLACE_USRSHARE += /opt/csw/bin/pdftex +REINPLACE_USRSHARE += /opt/csw/bin/pdftosrc +REINPLACE_USRSHARE += /opt/csw/bin/xetex +REINPLACE_USRSHARE += /opt/csw/include/kpathsea/paths.h REINPLACE_USRSHARE += /opt/csw/share/info/dvips.info -REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/info/eplain.info +REINPLACE_USRSHARE += /opt/csw/share/man/man1/chktex.1 +REINPLACE_USRSHARE += /opt/csw/share/man/man1/chkweb.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/bibtex/bst/minitoc/en-mtc.bst +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/bigints/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/dashundergaps/doc/tex/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/disser/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/disser/templates/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/listings-ext/listings-ext.mk +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/pdfcprot/Makefile.unx +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/plantslabels/doc/tex/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/bundledoc/arlatex +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/pax/pdfannotextractor.pl +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/pdfjam/pdfjam +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/source/latex/koma-script/Makefile.baseinit +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/source/latex/sf298/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/source/latex/subfig/Makefile +REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/tex/latex/susy/susy.sty REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/info/dvips.info -REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/pdfjam.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/info/eplain.info +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/arlatex.1 REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/chktex.1 -REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/purifyeps.1 REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/chkweb.1 -REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/arlatex.1 -REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/pdfjam.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/doc/man/man1/purifyeps.1 +REINPLACE_USRSHARE += /opt/csw/share/texmf/texconfig/v/vt100 +REINPLACE_USRSHARE += /opt/csw/share/texmf/web2c/texmf.cnf # the texlive-common package is bigger than a trivially sized /tmp pre-package: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jan 1 16:51:51 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Jan 2013 15:51:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19988] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 19988 http://gar.svn.sourceforge.net/gar/?rev=19988&view=rev Author: pfelecan Date: 2013-01-01 15:51:50 +0000 (Tue, 01 Jan 2013) Log Message: ----------- texlive/trunk: adapted descriptive blurb Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-01 14:24:39 UTC (rev 19987) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-01 15:51:50 UTC (rev 19988) @@ -8,10 +8,9 @@ DESCRIPTION = TeX Live define BLURB TeX Live is an easy way to get up and running with the TeX document - production system. It provides a comprehensive TeX system with binaries - for most flavors of Unix, including GNU/Linux, and also Windows. It includes - all the major TeX-related programs, macro packages, and fonts that are free - software, including support for many languages around the world. + production system. It includes all the major TeX-related programs, + macro packages, and fonts that are free software, including support + for many languages around the world. endef VENDOR_URL = http://www.tug.org/texlive/ 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 Jan 1 17:19:04 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 01 Jan 2013 16:19:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19989] csw/mgar/pkg/git/trunk Message-ID: Revision: 19989 http://gar.svn.sourceforge.net/gar/?rev=19989&view=rev Author: bdwalton Date: 2013-01-01 16:19:04 +0000 (Tue, 01 Jan 2013) Log Message: ----------- git/trunk: version bump to 1.8.1 Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-01-01 15:51:50 UTC (rev 19988) +++ csw/mgar/pkg/git/trunk/Makefile 2013-01-01 16:19:04 UTC (rev 19989) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.8.0 +VERSION = 1.8.1 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2013-01-01 15:51:50 UTC (rev 19988) +++ csw/mgar/pkg/git/trunk/checksums 2013-01-01 16:19:04 UTC (rev 19989) @@ -1 +1 @@ -12f4d20f34ae37086d86dd3b9d037bba git-1.8.0.tar.gz +a2c6f4404c5e432b47474d246ca83c7e git-1.8.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 Tue Jan 1 18:43:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 17:43:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19990] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 19990 http://gar.svn.sourceforge.net/gar/?rev=19990&view=rev Author: dmichelsen Date: 2013-01-01 17:43:52 +0000 (Tue, 01 Jan 2013) Log Message: ----------- geolitedb/trunk: Update add add GeoIPv6.dat Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2013-01-01 16:19:04 UTC (rev 19989) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2013-01-01 17:43:52 UTC (rev 19990) @@ -8,6 +8,7 @@ MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/ MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/ DISTFILES += GeoIP.dat.gz +DISTFILES += GeoIPv6.dat.gz DISTFILES += GeoLiteCity.dat.xz DISTFILES += GeoLiteCityv6.dat.gz DISTFILES += COPYING @@ -27,6 +28,7 @@ @echo " ==> Installing $(NAME)" ginstall -d $(DESTDIR)/opt/csw/share/GeoIP ginstall $(WORKDIR)/GeoIP.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIP.dat + ginstall $(WORKDIR)/GeoIPv6.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPv6.dat ginstall $(WORKDIR)/GeoLiteCity.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPCity.dat ginstall $(WORKDIR)/GeoLiteCityv6.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPCityv6.dat @$(MAKECOOKIE) Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2013-01-01 16:19:04 UTC (rev 19989) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2013-01-01 17:43:52 UTC (rev 19990) @@ -1,3 +1,4 @@ -98ba2a5c177cdfa8da6f9fab524e948d GeoIP.dat.gz -90b509c3f108c06f6d95adbd443f1429 GeoLiteCity.dat.xz -40a9d4ab91284e4dac157acbf4ba16a2 GeoLiteCityv6.dat.gz +ab0f52a35128d1aced906ac4cbfbed9c GeoIP.dat.gz +91b661fee55eb76543ce00732f1e2b3e GeoIPv6.dat.gz +7f25d84d9246b2b4c1f1a4fc4ffa5d59 GeoLiteCity.dat.xz +e40e816465c25b1494280ad6d25598d1 GeoLiteCityv6.dat.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 Jan 1 20:08:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 19:08:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19991] csw/mgar/pkg/libevent2/trunk Message-ID: Revision: 19991 http://gar.svn.sourceforge.net/gar/?rev=19991&view=rev Author: dmichelsen Date: 2013-01-01 19:08:09 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libevent2/trunk: Update to 2.0.21 Modified Paths: -------------- csw/mgar/pkg/libevent2/trunk/Makefile csw/mgar/pkg/libevent2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch Modified: csw/mgar/pkg/libevent2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent2/trunk/Makefile 2013-01-01 17:43:52 UTC (rev 19990) +++ csw/mgar/pkg/libevent2/trunk/Makefile 2013-01-01 19:08:09 UTC (rev 19991) @@ -1,5 +1,5 @@ NAME = libevent -VERSION = 2.0.16 +VERSION = 2.0.21 GARTYPE = v2 DESCRIPTION = Event notification library @@ -14,14 +14,10 @@ DISTNAME = $(NAME)-$(VERSION)-stable DISTFILES += $(DISTNAME).tar.gz -# This is the same fix as reported in -# http://sourceforge.net/tracker/?func=detail&aid=3452589&group_id=50884&atid=461322 -PATCHFILES += 0001-Do-not-return-value-in-void-function.patch - VENDOR_URL = http://www.monkey.org/~provos/libevent/ LICENSE = LICENSE -BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibssl-dev PACKAGES += CSWlibevent2-0-5 SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent-2.0.so.5 @@ -38,7 +34,7 @@ PACKAGES += CSWlibevent-openssl2-0-5 SPKG_DESC_CSWlibevent-openssl2-0-5 = Event notification library 2.0, libevent_openssl-2.0.so.5 PKGFILES_CSWlibevent-openssl2-0-5 = $(call pkgfiles_lib,libevent_openssl-2.0.so.5) -RUNTIME_DEP_PKGS_CSWlibevent-openssl2-0-5 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibevent-openssl2-0-5 += CSWlibssl1-0-0 PACKAGES += CSWlibevent-pthreads2-0-5 SPKG_DESC_CSWlibevent-pthreads2-0-5 = Event notification library 2.0, libevent_pthreads-2.0.so.5 @@ -54,25 +50,19 @@ RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWpython OBSOLETED_BY_CSWlibevent-dev += CSWlibevent-devel +REINPLACEMENTS += bash +REINPLACE_MATCH_bash = \#!/bin/sh +REINPLACE_WITH_bash = \#!/bin/bash +REINPLACE_FILES_bash += test/test.sh + # We don't need it and if defined the test breaks NOISALIST = 1 LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -# Pass incudes via CFLAGS until this is fixed: -# http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322 -CPPFLAGS = -EXTRA_CFLAGS += $(INCLUDE_FLAGS) - BUILD64_LIBS_ONLY = 1 TEST_TARGET = verify -# This is a unified package with all libraries in there -CHECKPKG_OVERRIDES_CSWlibevent2-0-5 += shared-lib-pkgname-mismatch - include gar/category.mk -post-extract-modulated: - -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh - @$(MAKECOOKIE) Modified: csw/mgar/pkg/libevent2/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent2/trunk/checksums 2013-01-01 17:43:52 UTC (rev 19990) +++ csw/mgar/pkg/libevent2/trunk/checksums 2013-01-01 19:08:09 UTC (rev 19991) @@ -1 +1 @@ -899efcffccdb3d5111419df76e7dc8df libevent-2.0.16-stable.tar.gz +b2405cc9ebf264aa47ff615d9de527a2 libevent-2.0.21-stable.tar.gz Deleted: csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch =================================================================== --- csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch 2013-01-01 17:43:52 UTC (rev 19990) +++ csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch 2013-01-01 19:08:09 UTC (rev 19991) @@ -1,26 +0,0 @@ -From 5cb574becae82337673dbd093176ed87b0de4be1 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 19 Jan 2012 16:18:24 +0100 -Subject: [PATCH] Do not return value in void function - ---- - test/regress_dns.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/test/regress_dns.c b/test/regress_dns.c -index b2ca47c..24eb6b7 100644 ---- a/test/regress_dns.c -+++ b/test/regress_dns.c -@@ -1665,7 +1665,8 @@ static void - cnt_free(void *ptr) - { - allocated_chunks -= 1; -- return free(ptr); -+ free(ptr); -+ return; - } - - struct testleak_env_t { --- -1.7.8.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 Jan 1 20:55:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 19:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19992] csw/mgar/pkg/libemf/trunk Message-ID: Revision: 19992 http://gar.svn.sourceforge.net/gar/?rev=19992&view=rev Author: dmichelsen Date: 2013-01-01 19:55:24 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libemf/trunk: Update to 1.0.7, restructure Makefile Modified Paths: -------------- csw/mgar/pkg/libemf/trunk/Makefile csw/mgar/pkg/libemf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch Removed Paths: ------------- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch Modified: csw/mgar/pkg/libemf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libemf/trunk/Makefile 2013-01-01 19:08:09 UTC (rev 19991) +++ csw/mgar/pkg/libemf/trunk/Makefile 2013-01-01 19:55:24 UTC (rev 19992) @@ -1,6 +1,6 @@ # $Id$ NAME = libemf -VERSION = 1.0.4 +VERSION = 1.0.7 GARTYPE = v2 DESCRIPTION = Library implementation of ECMA-234 API for the generation of enhanced metafiles @@ -11,44 +11,38 @@ DISTNAME = libEMF-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = 0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch -PATCHFILES += 0002-Remove-unneeded-definition-causing-link-errors.patch -PATCHFILES += 0003-Always-use-csw-libtool.patch -PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch +PATCHFILES += 0001-Use-__sparc-and-__i386-for-Solaris.patch +PATCHFILES += 0003-Keep-norunpath-during-libtool.patch -PACKAGES = CSWlibemf CSWlibemf1 CSWlibemf-devel +#PATCHFILES += 0002-Remove-unneeded-definition-causing-link-errors.patch +#PATCHFILES += 0003-Always-use-csw-libtool.patch +#PATCHFILES += 0004-Do-not-use-link-against-libstdc.patch -CATALOGNAME_CSWlibemf = libemf -CAtALOGNAME_CSWlibemf1 = libemf1 -CATALOGNAME_CSWlibemf-devel = libemf_devel - +PACKAGES += CSWlibemf SPKG_DESC_CSWlibemf = $(DESCRIPTION) -SPKG_DESC_CSWlibemf1 = Runtime library for libEMF 1.x -SPKG_DESC_CSWlibemf-devel = Development files for libEMF +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibemf += CSWlibemf1 -RUNTIME_DEP_PKGS_CSWlibemf = CSWlibemf1 CSWlibemf-devel -RUNTIME_DEP_PKGS_CSWlibemf-devel = CSWlibemf1 +PACKAGES += CSWlibemf1 +SPKG_DESC_CSWlibemf1 = Runtime library libEMF.so.1 +PKGFILES_CSWlibemf1 += $(call pkgfiles_lib,libEMF.so.1) +PACKAGES += CSWlibemf-dev +SPKG_DESC_CSWlibemf-dev = Development files for libEMF.so.1 +PKGFILES_CSWlibemf-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibemf-dev = CSWlibemf1 +OBSOLETED_BY_CSWlibemf-dev += CSWlibemf-devel + VENDOR_URL = http://libemf.sourceforge.net/ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# *We* can do 64 bit, but the tests dump core in CSWglib2 2.23.5,REV=2010.03.09 -# Re-enable when glib2 gets refreshed. -# BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS += -norunpath -PKGFILES_CSWlibemf1 = $(PKGFILES_RT) -PKGFILES_CSWlibemf-devel = $(PKGFILES_DEVEL) +# 64 bit on Sparc is problematic as documented in include/libEMF/wine/winnt.h: +# * This structure is valid only for 32-bit SPARC architectures, not for 64-bit SPARC. +BUILD64_LIBS_ONLY = 1 -CHECKPKG_OVERRIDES_CSWlibemf += surplus-dependency|CSWlibemf-devel - -# This needs a fixed libtool first -CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/lib|opt/csw/lib/libEMF.so.1.0.0 -CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libEMF.so.1.0.0 -CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libEMF.so.1.0.0 -CHECKPKG_OVERRIDES_CSWlibemf1 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libEMF.so.1.0.0 - include gar/category.mk Modified: csw/mgar/pkg/libemf/trunk/checksums =================================================================== --- csw/mgar/pkg/libemf/trunk/checksums 2013-01-01 19:08:09 UTC (rev 19991) +++ csw/mgar/pkg/libemf/trunk/checksums 2013-01-01 19:55:24 UTC (rev 19992) @@ -1 +1 @@ -23effe03c1b2eeb5229f14e461204198 libEMF-1.0.4.tar.gz +f1011f5cc254aa228be78704fe5f9960 libEMF-1.0.7.tar.gz Deleted: csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2013-01-01 19:08:09 UTC (rev 19991) +++ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch 2013-01-01 19:55:24 UTC (rev 19992) @@ -1,103 +0,0 @@ -From 1df10ad110f4661217c2f68bbfbdcaa7b1cde2cf Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 23 Nov 2010 14:37:55 +0100 -Subject: [PATCH] Add __sparc and __i386 in addition to __*__ - ---- - include/libEMF/wine/winnt.h | 21 +++++++++++---------- - 1 files changed, 11 insertions(+), 10 deletions(-) - -diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h -index a455290..b052679 100644 ---- a/include/libEMF/wine/winnt.h -+++ b/include/libEMF/wine/winnt.h -@@ -29,11 +29,11 @@ - - /* Architecture dependent settings. */ - /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */ --#if defined(__i386__) -+#if defined(__i386__) || defined(__i386) - # undef WORDS_BIGENDIAN - # undef BITFIELDS_BIGENDIAN - # define ALLOW_UNALIGNED_ACCESS --#elif defined(__sparc__) -+#elif defined(__sparc__) || defined(__sparc) - # define WORDS_BIGENDIAN - # define BITFIELDS_BIGENDIAN - # undef ALLOW_UNALIGNED_ACCESS -@@ -48,7 +48,7 @@ - - /* Calling conventions definitions */ - --#ifdef __i386__ -+#if defined(__i386__) || defined(__i386) - # ifndef _X86_ - # define _X86_ - # endif -@@ -56,7 +56,8 @@ - # define __stdcall __attribute__((__stdcall__)) - # define __cdecl __attribute__((__cdecl__)) - # else --# error You need gcc >= 2.7 to build Wine on a 386 -+# define __stdcall -+# define __cdecl - # endif /* __GNUC__ */ - #else /* __i386__ */ - # define __stdcall -@@ -639,7 +640,7 @@ typedef struct _CONTEXT86 - #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) - - /* i386 context definitions */ --#ifdef __i386__ -+#if defined(__i386__) || defined(__i386) - - #define CONTEXT_CONTROL CONTEXT86_CONTROL - #define CONTEXT_INTEGER CONTEXT86_INTEGER -@@ -969,7 +970,7 @@ typedef struct _STACK_FRAME_HEADER - - #endif /* __PPC__ */ - --#ifdef __sparc__ -+#if defined(__sparc__) || defined(__sparc) - - /* - * FIXME: -@@ -1138,7 +1139,7 @@ typedef CONTEXT *PCONTEXT; - - #endif /* __i386__ */ - --#ifdef __sparc__ -+#if defined(__sparc__) || defined(__sparc) - /* FIXME: use getcontext() to retrieve full context */ - #define _GET_CONTEXT \ - CONTEXT context; \ -@@ -1204,7 +1205,7 @@ typedef CONTEXT *PCONTEXT; - static void func(void) __attribute__((constructor)); \ - static void func(void) - #else /* __GNUC__ */ --# ifdef __i386__ -+# if defined(__i386__) || defined(__i386) - # define DECL_GLOBAL_CONSTRUCTOR(func) \ - static void __dummy_init_##func(void) { \ - asm(".section .init,\"ax\"\n\t" \ -@@ -1218,7 +1219,7 @@ typedef CONTEXT *PCONTEXT; - - /* Segment register access */ - --#ifdef __i386__ -+#if defined(__i386__) || defined(__i386) - # ifdef __GNUC__ - # define __DEFINE_GET_SEG(seg) \ - extern inline unsigned short __get_##seg(void) \ -@@ -2347,7 +2348,7 @@ typedef struct _NT_TIB - - struct _TEB; - --#if defined(__i386__) && defined(__GNUC__) && !defined(__CHECKER__) -+#if (defined(__i386__) || defined(__i386)) && defined(__GNUC__) && !defined(__CHECKER__) - extern inline struct _TEB WINAPI *NtCurrentTeb(void); - extern inline struct _TEB WINAPI *NtCurrentTeb(void) - { --- -1.7.3 - Added: csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch (rev 0) +++ csw/mgar/pkg/libemf/trunk/files/0001-Use-__sparc-and-__i386-for-Solaris.patch 2013-01-01 19:55:24 UTC (rev 19992) @@ -0,0 +1,58 @@ +From 023a228660a6cdb955db4d4a5b3da3b5edfcde30 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 1 Jan 2013 19:18:22 +0100 +Subject: [PATCH] Use __sparc and __i386 for Solaris + +--- + include/libEMF/wine/winnt.h | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h +index f76c08a..3a8d6f2 100644 +--- a/include/libEMF/wine/winnt.h ++++ b/include/libEMF/wine/winnt.h +@@ -29,7 +29,11 @@ + + /* Architecture dependent settings. */ + /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */ +-#if defined(__i386__) ++#if defined(__i386) ++# undef WORDS_BIGENDIAN ++# undef BITFIELDS_BIGENDIAN ++# define ALLOW_UNALIGNED_ACCESS ++#elif defined(__i386__) + # undef WORDS_BIGENDIAN + # undef BITFIELDS_BIGENDIAN + # define ALLOW_UNALIGNED_ACCESS +@@ -45,6 +49,10 @@ + # undef WORDS_BIGENDIAN + # undef BITFIELDS_BIGENDIAN + # undef ALLOW_UNALIGNED_ACCESS ++#elif defined(__sparc) ++# define WORDS_BIGENDIAN ++# define BITFIELDS_BIGENDIAN ++# undef ALLOW_UNALIGNED_ACCESS + #elif defined(__sparc__) + # define WORDS_BIGENDIAN + # define BITFIELDS_BIGENDIAN +@@ -676,7 +684,7 @@ typedef struct _CONTEXT86 + #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) + + /* i386 context definitions */ +-#ifdef __i386__ ++#if defined(__i386__) || defined(__i386) + + #define CONTEXT_CONTROL CONTEXT86_CONTROL + #define CONTEXT_INTEGER CONTEXT86_INTEGER +@@ -1225,7 +1233,7 @@ typedef struct _STACK_FRAME_HEADER + + #endif /* __PPC__ */ + +-#ifdef __sparc__ ++#if defined(__sparc__) || defined(__sparc) + + /* + * FIXME: +-- +1.8.0 + Deleted: csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch 2013-01-01 19:08:09 UTC (rev 19991) +++ csw/mgar/pkg/libemf/trunk/files/0003-Always-use-csw-libtool.patch 2013-01-01 19:55:24 UTC (rev 19992) @@ -1,25 +0,0 @@ -From 36faee190243cdb3e44b3f9a6f2898fb54eba387 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 22 Nov 2010 15:56:47 +0100 -Subject: [PATCH 3/3] Always use csw libtool - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index d419f8f..6a8cc02 100755 ---- a/configure -+++ b/configure -@@ -8419,7 +8419,7 @@ fi - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) /usr/bin/libtool' -+LIBTOOL='$(SHELL) /opt/csw/bin/libtool' - - - --- -1.7.3 - Added: csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch =================================================================== --- csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch (rev 0) +++ csw/mgar/pkg/libemf/trunk/files/0003-Keep-norunpath-during-libtool.patch 2013-01-01 19:55:24 UTC (rev 19992) @@ -0,0 +1,25 @@ +From 5f2b03954cc134a3cfaef09b358ff3fdbcb417a0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 1 Jan 2013 20:43:14 +0100 +Subject: [PATCH] Keep -norunpath during libtool + +--- + config/ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/ltmain.sh b/config/ltmain.sh +index a72f2fd..6b8bee1 100644 +--- a/config/ltmain.sh ++++ b/config/ltmain.sh +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @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) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.8.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 Tue Jan 1 20:56:34 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 19:56:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19993] csw/mgar/pkg/libemf/trunk/Makefile Message-ID: Revision: 19993 http://gar.svn.sourceforge.net/gar/?rev=19993&view=rev Author: dmichelsen Date: 2013-01-01 19:56:33 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libemf/trunk: Disable tests for now Modified Paths: -------------- csw/mgar/pkg/libemf/trunk/Makefile Modified: csw/mgar/pkg/libemf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libemf/trunk/Makefile 2013-01-01 19:55:24 UTC (rev 19992) +++ csw/mgar/pkg/libemf/trunk/Makefile 2013-01-01 19:56:33 UTC (rev 19993) @@ -42,6 +42,7 @@ # 64 bit on Sparc is problematic as documented in include/libEMF/wine/winnt.h: # * This structure is valid only for 32-bit SPARC architectures, not for 64-bit SPARC. +SKIPTEST ?= 1 BUILD64_LIBS_ONLY = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 1 21:42:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 20:42:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19994] csw/mgar/pkg/xz/trunk Message-ID: Revision: 19994 http://gar.svn.sourceforge.net/gar/?rev=19994&view=rev Author: dmichelsen Date: 2013-01-01 20:42:15 +0000 (Tue, 01 Jan 2013) Log Message: ----------- xz/trunk: Update to 5.0.4 Modified Paths: -------------- csw/mgar/pkg/xz/trunk/Makefile csw/mgar/pkg/xz/trunk/checksums Modified: csw/mgar/pkg/xz/trunk/Makefile =================================================================== --- csw/mgar/pkg/xz/trunk/Makefile 2013-01-01 19:56:33 UTC (rev 19993) +++ csw/mgar/pkg/xz/trunk/Makefile 2013-01-01 20:42:15 UTC (rev 19994) @@ -1,5 +1,5 @@ NAME = xz -VERSION = 5.0.3 +VERSION = 5.0.4 GARTYPE = v2 DESCRIPTION = XZ Utils is free data compression software with high compression ratio @@ -30,7 +30,8 @@ PKGFILES_CSWliblzma-dev += $(docdir)/xz/.*-file-format.txt RUNTIME_DEP_PKGS_CSWliblzma-dev += CSWliblzma5 -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) # This test fails as SOS12 cc is not real c99 (stdbool.h is missing) Modified: csw/mgar/pkg/xz/trunk/checksums =================================================================== --- csw/mgar/pkg/xz/trunk/checksums 2013-01-01 19:56:33 UTC (rev 19993) +++ csw/mgar/pkg/xz/trunk/checksums 2013-01-01 20:42:15 UTC (rev 19994) @@ -1 +1 @@ -8d900b742b94fa9e708ca4f5a4b29003 xz-5.0.3.tar.bz2 +741cd3a5f64b23b7bac56ec5b2258715 xz-5.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jan 1 21:43:55 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 01 Jan 2013 20:43:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19995] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 19995 http://gar.svn.sourceforge.net/gar/?rev=19995&view=rev Author: chninkel Date: 2013-01-01 20:43:54 +0000 (Tue, 01 Jan 2013) Log Message: ----------- gar/v2-yann: raise an exception when elfdump or ldd triggers an unexpected error 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 2013-01-01 20:42:15 UTC (rev 19994) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2013-01-01 20:43:54 UTC (rev 19995) @@ -294,8 +294,8 @@ stderr = re.sub(ignored_error_re, "", stderr) if stderr: - logging.error("%s returned one or more errors: %s", args, stderr) - continue + msg = "%s returned one or more errors: %s" % (args, stderr) + raise package.Error(msg) elfdump_out = stdout.splitlines() symbols = {} @@ -382,7 +382,7 @@ ldd_output[binary] = [] continue - logging.error("%s returned an error: %s", args, stderr) + raise package.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 dmichelsen at users.sourceforge.net Tue Jan 1 22:03:18 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:03:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19996] csw/mgar/pkg Message-ID: Revision: 19996 http://gar.svn.sourceforge.net/gar/?rev=19996&view=rev Author: dmichelsen Date: 2013-01-01 21:03:17 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libicu50: Initial commit Modified Paths: -------------- csw/mgar/pkg/libicu50/trunk/Makefile csw/mgar/pkg/libicu50/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libicu50/ Modified: csw/mgar/pkg/libicu50/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu49/trunk/Makefile 2012-12-24 04:53:12 UTC (rev 19956) +++ csw/mgar/pkg/libicu50/trunk/Makefile 2013-01-01 21:03:17 UTC (rev 19996) @@ -1,6 +1,6 @@ # $Id$ NAME = libicu -VERSION = 49.1.2 +VERSION = 50.1.1 GARTYPE = v2 DESCRIPTION = International Components for Unicode Modified: csw/mgar/pkg/libicu50/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu49/trunk/checksums 2012-12-24 04:53:12 UTC (rev 19956) +++ csw/mgar/pkg/libicu50/trunk/checksums 2013-01-01 21:03:17 UTC (rev 19996) @@ -1 +1 @@ -bbc609fe5237202d7abf016141012a45 icu4c-49_1_2-src.tgz +c721c2e0c8f86975ccea620d09aedc81 icu4c-50_1_1-src.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 Tue Jan 1 22:05:44 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:05:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19997] csw/mgar/pkg/libthai/trunk Message-ID: Revision: 19997 http://gar.svn.sourceforge.net/gar/?rev=19997&view=rev Author: dmichelsen Date: 2013-01-01 21:05:43 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libthai/trunk: Update to 0.1.18 Modified Paths: -------------- csw/mgar/pkg/libthai/trunk/Makefile csw/mgar/pkg/libthai/trunk/checksums Modified: csw/mgar/pkg/libthai/trunk/Makefile =================================================================== --- csw/mgar/pkg/libthai/trunk/Makefile 2013-01-01 21:03:17 UTC (rev 19996) +++ csw/mgar/pkg/libthai/trunk/Makefile 2013-01-01 21:05:43 UTC (rev 19997) @@ -1,5 +1,5 @@ NAME = libthai -VERSION = 0.1.17 +VERSION = 0.1.18 GARTYPE = v2 DESCRIPTION = Thai language support routines Modified: csw/mgar/pkg/libthai/trunk/checksums =================================================================== --- csw/mgar/pkg/libthai/trunk/checksums 2013-01-01 21:03:17 UTC (rev 19996) +++ csw/mgar/pkg/libthai/trunk/checksums 2013-01-01 21:05:43 UTC (rev 19997) @@ -1 +1 @@ -d94ddbf5e5a09a911c459f0a4ad1c041 libthai-0.1.17.tar.gz +0250fc5255c1e62b23f88c2d6b1d6262 libthai-0.1.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 Tue Jan 1 22:08:38 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:08:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19998] csw/mgar/pkg/automake/trunk Message-ID: Revision: 19998 http://gar.svn.sourceforge.net/gar/?rev=19998&view=rev Author: dmichelsen Date: 2013-01-01 21:08:37 +0000 (Tue, 01 Jan 2013) Log Message: ----------- automake/trunk: Update to 1.11.5, 1.12.6 and 1.13.1 Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile csw/mgar/pkg/automake/trunk/checksums Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2013-01-01 21:05:43 UTC (rev 19997) +++ csw/mgar/pkg/automake/trunk/Makefile 2013-01-01 21:08:37 UTC (rev 19998) @@ -1,9 +1,9 @@ NAME = automake -VERSION = 1.12 +VERSION = 1.13.1 GARTYPE = v2 EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.5 1.12 +MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.6 1.12.6 1.13.1 DESCRIPTION = A tool for automatically generating Makefiles. define BLURB @@ -19,13 +19,22 @@ endef MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += ftp://alpha.gnu.org/gnu/automake/ SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz) +#SOURCEFILES += $(NAME)-$(VERSION).tar.xz DISTFILES = $(SOURCEFILES) POSTMSG = $(docdir)/automake/CSWautomake.postmsg DISTFILES += $(notdir $(POSTMSG)) NOCHECKSUM = $(notdir $(POSTMSG)) NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz, $(SOURCEFILES)) +# The testsuite explicitly calls gcc, as we compile with sun studio the linker flags +# may be wrong and hence break tests. Do not pass compiler specific link flags for now. +SOS12_LD_FLAGS = +SOS12U1_LD_FLAGS = +SOS12U2_LD_FLAGS = +SOS12U3_LD_FLAGS = + VENDOR_URL = http://www.gnu.org/software/automake/ RUNTIME_DEP_PKGS = CSWperl @@ -34,11 +43,13 @@ CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.10 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.11 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.12 +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.13 # These are just docs, override for now CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.9/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.10/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.11/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.12/py-compile +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.13/py-compile CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.6/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.7/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.8/INSTALL @@ -46,12 +57,14 @@ CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.12/INSTALL +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.13/INSTALL CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/info/automake.info-1 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-1 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-2 CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/texinfo.tex CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/texinfo.tex CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.12/texinfo.tex +CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.13/texinfo.tex # Lots of test fail on Solaris, but they are safe to ignore for now: # @@ -73,11 +86,11 @@ # There are 5 of 542 tests failed in 1.10.3 SKIPTEST-1.10.3 ?= 1 -# There are 7 of 804 tests failed in 1.11.5 -SKIPTEST-1.11.5 ?= 1 +# There are 7 of 804 tests failed in 1.11.6 +SKIPTEST-1.11.6 ?= 1 # There are 172 of 2968 tests failed in 1.12 -SKIPTEST-1.12 ?= 1 +# SKIPTEST-1.12 ?= 1 SKIPTEST = $(SKIPTEST-$(VERSION)) @@ -91,13 +104,13 @@ EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.12 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.12.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* # alternatives [options] --install link name path priority [- # -slave link name path]... [--initscript service] -ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11 1.12 +ALTERNATIVES = 1.6 1.7 1.8 1.9 1.10 1.11 1.12 1.13 ALTERNATIVE_1.6 = $(bindir)/automake automake $(bindir)/automake-1.6 60 ALTERNATIVE_1.6 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.6 ALTERNATIVE_1.7 = $(bindir)/automake automake $(bindir)/automake-1.7 70 @@ -112,6 +125,8 @@ ALTERNATIVE_1.11 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.11 ALTERNATIVE_1.12 = $(bindir)/automake automake $(bindir)/automake-1.12 120 ALTERNATIVE_1.12 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.12 +ALTERNATIVE_1.13 = $(bindir)/automake automake $(bindir)/automake-1.13 130 +ALTERNATIVE_1.13 += $(bindir)/aclocal aclocal $(bindir)/aclocal-1.13 include gar/category.mk Modified: csw/mgar/pkg/automake/trunk/checksums =================================================================== --- csw/mgar/pkg/automake/trunk/checksums 2013-01-01 21:05:43 UTC (rev 19997) +++ csw/mgar/pkg/automake/trunk/checksums 2013-01-01 21:08:37 UTC (rev 19998) @@ -1,6 +1,7 @@ 03bc9ebfa805f9ee5635f1f53fa1fa5f automake-1.10.3.tar.gz -bf6548f750693e195367d0339c893ff3 automake-1.11.5.tar.gz -d8a8f6bd898a6b34a874728cd1e47a95 automake-1.12.tar.gz +0286dc30295b62985ca51919202ecfcc automake-1.11.6.tar.gz +199d39ece2e6070d64ac20d45ac86026 automake-1.12.6.tar.gz +78a0ef8216b0556b44508e7b5b0c0847 automake-1.13.1.tar.gz 2bd506db63b6d10458cb644b6171ce93 automake-1.6.3.tar.gz eb25355e3cf00aac83c580dde970a0b4 automake-1.7.9.tar.gz ce0662da5df68014eb1683c184c47a8e automake-1.8.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 1 22:12:31 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:12:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19999] csw/mgar/pkg/fftw/trunk Message-ID: Revision: 19999 http://gar.svn.sourceforge.net/gar/?rev=19999&view=rev Author: dmichelsen Date: 2013-01-01 21:12:30 +0000 (Tue, 01 Jan 2013) Log Message: ----------- fftw/trunk: Update to 3.3.3 Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile csw/mgar/pkg/fftw/trunk/checksums Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2013-01-01 21:08:37 UTC (rev 19998) +++ csw/mgar/pkg/fftw/trunk/Makefile 2013-01-01 21:12:30 UTC (rev 19999) @@ -1,5 +1,5 @@ NAME = fftw -VERSION = 3.3 +VERSION = 3.3.3 GARTYPE = v2 DESCRIPTION = Library for computing the discrete Fourier transform (DFT) Modified: csw/mgar/pkg/fftw/trunk/checksums =================================================================== --- csw/mgar/pkg/fftw/trunk/checksums 2013-01-01 21:08:37 UTC (rev 19998) +++ csw/mgar/pkg/fftw/trunk/checksums 2013-01-01 21:12:30 UTC (rev 19999) @@ -1 +1 @@ -0728ab3ec0ebb06631ab3b80a5c3d130 fftw-3.3.tar.gz +0a05ca9c7b3bfddc8278e7c40791a1c2 fftw-3.3.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 Tue Jan 1 22:13:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:13:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[20000] csw/mgar/pkg/freeradius/trunk Message-ID: Revision: 20000 http://gar.svn.sourceforge.net/gar/?rev=20000&view=rev Author: dmichelsen Date: 2013-01-01 21:13:25 +0000 (Tue, 01 Jan 2013) Log Message: ----------- freeradius/trunk: Update to 2.2.0 Modified Paths: -------------- csw/mgar/pkg/freeradius/trunk/Makefile csw/mgar/pkg/freeradius/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeradius/trunk/files/0001-Include-ltdl.h-for-various-defintions.patch Modified: csw/mgar/pkg/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile 2013-01-01 21:12:30 UTC (rev 19999) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2013-01-01 21:13:25 UTC (rev 20000) @@ -1,5 +1,5 @@ NAME = freeradius -VERSION = 2.1.12 +VERSION = 2.2.0 GARTYPE = v2 DESCRIPTION = A free RADIUS server implementation @@ -13,6 +13,8 @@ DISTFILES += ca.pem DISTNAME = $(NAME)-server-$(VERSION) +PATCHFILES += 0001-Include-ltdl.h-for-various-defintions.patch + VENDOR_URL = http://freeradius.org/ LICENSE = LICENSE @@ -52,7 +54,7 @@ PKGFILES_CSWfreeradius-krb5 += $(raddbdir)/modules/krb5.CSW PKGFILES_CSWfreeradius-krb5 += $(docdir)/rlm_krb5 PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5\.so -PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.1\.[0-9]+\.so +PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.2\.[0-9]+\.so RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibcom-err3 @@ -67,7 +69,7 @@ PKGFILES_CSWfreeradius-ldap += $(docdir)/rlm_ldap PKGFILES_CSWfreeradius-ldap += $(docdir)/examples/openldap.schema PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap\.so -PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.1\.[0-9]+\.so +PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.2\.[0-9]+\.so RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWfreeradius @@ -93,7 +95,7 @@ PACKAGES += CSWfreeradius-postgresql SPKG_DESC_CSWfreeradius-postgresql = PostgreSQL Module rlm_sql_postgresql for FreeRADIUS PKGFILES_CSWfreeradius-postgresql += /opt/csw/lib/freeradius/rlm_sql_postgresql\.so -PKGFILES_CSWfreeradius-postgresql += /opt/csw/lib/freeradius/rlm_sql_postgresql-2\.1\.[0-9]+\.so +PKGFILES_CSWfreeradius-postgresql += /opt/csw/lib/freeradius/rlm_sql_postgresql-2\.2\.[0-9]+\.so PKGFILES_CSWfreeradius-postgresql += $(raddbdir)/sql/postgresql PKGFILES_CSWfreeradius-postgresql += $(raddbdir)/sql/postgresql/.* RUNTIME_DEP_PKGS_CSWfreeradius-postgresql += CSWlibpq5 @@ -106,7 +108,7 @@ PACKAGES += CSWfreeradius-mysql SPKG_DESC_CSWfreeradius-mysql = MySQL Module rlm_sql_mysql for FreeRADIUS PKGFILES_CSWfreeradius-mysql += /opt/csw/lib/freeradius/rlm_sql_mysql\.so -PKGFILES_CSWfreeradius-mysql += /opt/csw/lib/freeradius/rlm_sql_mysql-2\.1\.[0-9]+\.so +PKGFILES_CSWfreeradius-mysql += /opt/csw/lib/freeradius/rlm_sql_mysql-2\.2\.[0-9]+\.so PKGFILES_CSWfreeradius-mysql += $(raddbdir)/sql/mysql PKGFILES_CSWfreeradius-mysql += $(raddbdir)/sql/mysql/.* RUNTIME_DEP_PKGS_CSWfreeradius-mysql += CSWlibssl1-0-0 Modified: csw/mgar/pkg/freeradius/trunk/checksums =================================================================== --- csw/mgar/pkg/freeradius/trunk/checksums 2013-01-01 21:12:30 UTC (rev 19999) +++ csw/mgar/pkg/freeradius/trunk/checksums 2013-01-01 21:13:25 UTC (rev 20000) @@ -1 +1 @@ -dcbaed16df8ccff672ba132a08bf8510 freeradius-server-2.1.12.tar.gz +2e45d3c0d22ab14c560c7c3029893a8a freeradius-server-2.2.0.tar.gz Added: csw/mgar/pkg/freeradius/trunk/files/0001-Include-ltdl.h-for-various-defintions.patch =================================================================== --- csw/mgar/pkg/freeradius/trunk/files/0001-Include-ltdl.h-for-various-defintions.patch (rev 0) +++ csw/mgar/pkg/freeradius/trunk/files/0001-Include-ltdl.h-for-various-defintions.patch 2013-01-01 21:13:25 UTC (rev 20000) @@ -0,0 +1,25 @@ +From 46df47d212e10685fc2a9dc610ae3b9f74c18d44 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 1 Jan 2013 21:47:41 +0100 +Subject: [PATCH] Include ltdl.h for various defintions + +--- + src/main/modules.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/main/modules.c b/src/main/modules.c +index 378a0eb..2a907ef 100644 +--- a/src/main/modules.c ++++ b/src/main/modules.c +@@ -25,6 +25,8 @@ + #include + RCSID("$Id$") + ++#include ++ + #include + #include + #include +-- +1.8.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 Tue Jan 1 22:17:12 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:17:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[20001] csw/mgar/pkg/freeradius/trunk/Makefile Message-ID: Revision: 20001 http://gar.svn.sourceforge.net/gar/?rev=20001&view=rev Author: dmichelsen Date: 2013-01-01 21:17:12 +0000 (Tue, 01 Jan 2013) Log Message: ----------- freeradius/trunk: Remove deps no longer needed due to -z ignore Modified Paths: -------------- csw/mgar/pkg/freeradius/trunk/Makefile Modified: csw/mgar/pkg/freeradius/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeradius/trunk/Makefile 2013-01-01 21:13:25 UTC (rev 20000) +++ csw/mgar/pkg/freeradius/trunk/Makefile 2013-01-01 21:17:12 UTC (rev 20001) @@ -56,7 +56,6 @@ PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5\.so PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.2\.[0-9]+\.so RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWfreeradius @@ -111,8 +110,6 @@ PKGFILES_CSWfreeradius-mysql += /opt/csw/lib/freeradius/rlm_sql_mysql-2\.2\.[0-9]+\.so PKGFILES_CSWfreeradius-mysql += $(raddbdir)/sql/mysql PKGFILES_CSWfreeradius-mysql += $(raddbdir)/sql/mysql/.* -RUNTIME_DEP_PKGS_CSWfreeradius-mysql += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWfreeradius-mysql += CSWlibz1 RUNTIME_DEP_PKGS_CSWfreeradius-mysql += CSWlibmysqlclient18 radius_user = radius 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 Jan 1 22:56:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 21:56:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[20002] csw/mgar/pkg/libicu50/trunk Message-ID: Revision: 20002 http://gar.svn.sourceforge.net/gar/?rev=20002&view=rev Author: dmichelsen Date: 2013-01-01 21:56:35 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libicu50/trunk: Fix dependencies for 50.1.1 Modified Paths: -------------- csw/mgar/pkg/libicu50/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libicu50/trunk/files/0001-Add-workaround-for-echo-n.patch Modified: csw/mgar/pkg/libicu50/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu50/trunk/Makefile 2013-01-01 21:17:12 UTC (rev 20001) +++ csw/mgar/pkg/libicu50/trunk/Makefile 2013-01-01 21:56:35 UTC (rev 20002) @@ -15,72 +15,66 @@ LICENSE = license.html -PACKAGES += CSWlibicudata49 -SPKG_DESC_CSWlibicudata49 = International Components for Unicode, libicudata.so.49 -PKGFILES_CSWlibicudata49 += $(call pkgfiles_lib,libicudata.so.49) +PACKAGES += CSWlibicudata50 +SPKG_DESC_CSWlibicudata50 = International Components for Unicode, libicudata.so.50 +PKGFILES_CSWlibicudata50 += $(call pkgfiles_lib,libicudata.so.50) -PACKAGES += CSWlibicui18n49 -SPKG_DESC_CSWlibicui18n49 = International Components for Unicode, libicui18n.so.49 -PKGFILES_CSWlibicui18n49 += $(call pkgfiles_lib,libicui18n.so.49) -RUNTIME_DEP_PKGS_CSWlibicui18n49 += CSWlibicuuc49 -RUNTIME_DEP_PKGS_CSWlibicui18n49 += CSWlibicudata49 +PACKAGES += CSWlibicui18n50 +SPKG_DESC_CSWlibicui18n50 = International Components for Unicode, libicui18n.so.50 +PKGFILES_CSWlibicui18n50 += $(call pkgfiles_lib,libicui18n.so.50) +RUNTIME_DEP_PKGS_CSWlibicui18n50 += CSWlibicuuc50 -PACKAGES += CSWlibicuio49 -SPKG_DESC_CSWlibicuio49 = International Components for Unicode, libicuio.so.49 -PKGFILES_CSWlibicuio49 += $(call pkgfiles_lib,libicuio.so.49) -RUNTIME_DEP_PKGS_CSWlibicuio49 += CSWlibicudata49 -RUNTIME_DEP_PKGS_CSWlibicuio49 += CSWlibicui18n49 -RUNTIME_DEP_PKGS_CSWlibicuio49 += CSWlibicuuc49 +PACKAGES += CSWlibicuio50 +SPKG_DESC_CSWlibicuio50 = International Components for Unicode, libicuio.so.50 +PKGFILES_CSWlibicuio50 += $(call pkgfiles_lib,libicuio.so.50) +RUNTIME_DEP_PKGS_CSWlibicuio50 += CSWlibicui18n50 +RUNTIME_DEP_PKGS_CSWlibicuio50 += CSWlibicuuc50 -PACKAGES += CSWlibicule49 -SPKG_DESC_CSWlibicule49 = International Components for Unicode, libicule.so.49 -PKGFILES_CSWlibicule49 += $(call pkgfiles_lib,libicule.so.49) -RUNTIME_DEP_PKGS_CSWlibicule49 += CSWlibicuuc49 -RUNTIME_DEP_PKGS_CSWlibicule49 += CSWlibicudata49 +PACKAGES += CSWlibicule50 +SPKG_DESC_CSWlibicule50 = International Components for Unicode, libicule.so.50 +PKGFILES_CSWlibicule50 += $(call pkgfiles_lib,libicule.so.50) +RUNTIME_DEP_PKGS_CSWlibicule50 += CSWlibicuuc50 -PACKAGES += CSWlibiculx49 -SPKG_DESC_CSWlibiculx49 = International Components for Unicode, libiculx.so.49 -PKGFILES_CSWlibiculx49 += $(call pkgfiles_lib,libiculx.so.49) -RUNTIME_DEP_PKGS_CSWlibiculx49 += CSWlibicuuc49 -RUNTIME_DEP_PKGS_CSWlibiculx49 += CSWlibicudata49 -RUNTIME_DEP_PKGS_CSWlibiculx49 += CSWlibicule49 +PACKAGES += CSWlibiculx50 +SPKG_DESC_CSWlibiculx50 = International Components for Unicode, libiculx.so.50 +PKGFILES_CSWlibiculx50 += $(call pkgfiles_lib,libiculx.so.50) +RUNTIME_DEP_PKGS_CSWlibiculx50 += CSWlibicuuc50 +RUNTIME_DEP_PKGS_CSWlibiculx50 += CSWlibicule50 -PACKAGES += CSWlibicutest49 -SPKG_DESC_CSWlibicutest49 = International Components for Unicode, libicutest.so.49 -PKGFILES_CSWlibicutest49 += $(call pkgfiles_lib,libicutest.so.49) -RUNTIME_DEP_PKGS_CSWlibicutest49 += CSWlibicudata49 -RUNTIME_DEP_PKGS_CSWlibicutest49 += CSWlibicui18n49 -RUNTIME_DEP_PKGS_CSWlibicutest49 += CSWlibicutu49 -RUNTIME_DEP_PKGS_CSWlibicutest49 += CSWlibicuuc49 +PACKAGES += CSWlibicutest50 +SPKG_DESC_CSWlibicutest50 = International Components for Unicode, libicutest.so.50 +PKGFILES_CSWlibicutest50 += $(call pkgfiles_lib,libicutest.so.50) +RUNTIME_DEP_PKGS_CSWlibicutest50 += CSWlibicutu50 +RUNTIME_DEP_PKGS_CSWlibicutest50 += CSWlibicuuc50 -PACKAGES += CSWlibicutu49 -SPKG_DESC_CSWlibicutu49 = International Components for Unicode, libicutu.so.49 -PKGFILES_CSWlibicutu49 += $(call pkgfiles_lib,libicutu.so.49) -RUNTIME_DEP_PKGS_CSWlibicutu49 += CSWlibicuuc49 -RUNTIME_DEP_PKGS_CSWlibicutu49 += CSWlibicudata49 -RUNTIME_DEP_PKGS_CSWlibicutu49 += CSWlibicui18n49 +PACKAGES += CSWlibicutu50 +SPKG_DESC_CSWlibicutu50 = International Components for Unicode, libicutu.so.50 +PKGFILES_CSWlibicutu50 += $(call pkgfiles_lib,libicutu.so.50) +RUNTIME_DEP_PKGS_CSWlibicutu50 += CSWlibicuuc50 +RUNTIME_DEP_PKGS_CSWlibicutu50 += CSWlibicui18n50 -PACKAGES += CSWlibicuuc49 -SPKG_DESC_CSWlibicuuc49 = International Components for Unicode, libicuuc.so.49 -PKGFILES_CSWlibicuuc49 += $(call pkgfiles_lib,libicuuc.so.49) -RUNTIME_DEP_PKGS_CSWlibicuuc49 += CSWlibicudata49 +PACKAGES += CSWlibicuuc50 +SPKG_DESC_CSWlibicuuc50 = International Components for Unicode, libicuuc.so.50 +PKGFILES_CSWlibicuuc50 += $(call pkgfiles_lib,libicuuc.so.50) +RUNTIME_DEP_PKGS_CSWlibicuuc50 += CSWlibicudata50 PACKAGES += CSWlibicu-dev -SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.49 +SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.50 # This package is PKGFILES catchall -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu49 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc49 -OBSOLETED_BY_CSWlibicu-dev += CSWlibicu-devel +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu50 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc50 DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source +REINPLACE_USRLOCAL += config/icu-config-bottom + # Using -I/opt/csw/include here puts it before the include of the newly built # software which breaks definitions, so make sure it is empty. CPPFLAGS = @@ -94,7 +88,3 @@ NOISALIST = 1 include gar/category.mk - -post-extract-modulated: - -perl -pi -e 's,/usr/local,$(prefix),' \ - $(WORKSRC)/config/icu-config-bottom Deleted: csw/mgar/pkg/libicu50/trunk/files/0001-Add-workaround-for-echo-n.patch =================================================================== --- csw/mgar/pkg/libicu50/trunk/files/0001-Add-workaround-for-echo-n.patch 2013-01-01 21:17:12 UTC (rev 20001) +++ csw/mgar/pkg/libicu50/trunk/files/0001-Add-workaround-for-echo-n.patch 2013-01-01 21:56:35 UTC (rev 20002) @@ -1,26 +0,0 @@ -From b437f073e7437c657eb5525c6df7dc08e624e0c6 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 17 Jun 2010 11:53:59 +0200 -Subject: [PATCH] Add workaround for echo -n - ---- - config/icu-config-top | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/config/icu-config-top b/config/icu-config-top -index 874a3ab..f3dce7b 100644 ---- a/config/icu-config-top -+++ b/config/icu-config-top -@@ -9,6 +9,9 @@ - # This script is designed to aid configuration of ICU. - # rpath links a library search path right into the binaries. - -+# Make sure we understand "echo -n" until this is fixed: -+# http://bugs.icu-project.org/trac/ticket/7768 -+PATH=/usr/ucb:$PATH - - ### END of icu-config-top - --- -1.7.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 1 23:02:44 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 22:02:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20003] csw/mgar/pkg/libkate/trunk Message-ID: Revision: 20003 http://gar.svn.sourceforge.net/gar/?rev=20003&view=rev Author: dmichelsen Date: 2013-01-01 22:02:44 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libkate/trunk: Update to 0.4.1 Modified Paths: -------------- csw/mgar/pkg/libkate/trunk/Makefile csw/mgar/pkg/libkate/trunk/checksums Modified: csw/mgar/pkg/libkate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libkate/trunk/Makefile 2013-01-01 21:56:35 UTC (rev 20002) +++ csw/mgar/pkg/libkate/trunk/Makefile 2013-01-01 22:02:44 UTC (rev 20003) @@ -1,6 +1,6 @@ # $Id$ NAME = libkate -VERSION = 0.3.8 +VERSION = 0.4.1 GARTYPE = v2 DESCRIPTION = A karaoke and text codec for embedding in ogg @@ -12,11 +12,11 @@ # Skip NUL test until this is fixed: # http://code.google.com/p/libkate/issues/detail?id=21 -PATCHFILES += 0001-Reformat-null-test-string.patch +#PATCHFILES += 0001-Reformat-null-test-string.patch # Use inttypes.h if stdint.h is not available until this is fixed: # http://code.google.com/p/libkate/issues/detail?id=19 -PATCHFILES += 0002-Use-inttypes-when-stdint-is-not-available.patch +#PATCHFILES += 0002-Use-inttypes-when-stdint-is-not-available.patch VENDOR_URL = http://code.google.com/p/libkate/ @@ -45,7 +45,7 @@ PKGFILES_CSWlibkate-utils += $(bindir)/.* PKGFILES_CSWlibkate-utils += $(mandir)/man1/.* RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWpng +RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWlibkate1 RUNTIME_DEP_PKGS_CSWlibkate-utils += CSWliboggkate1 @@ -57,6 +57,8 @@ RUNTIME_DEP_PKGS_CSWpy-libkate += CSWpython PYCOMPILE = 1 +REINPLACE_USRLOCAL += tools/KateDJ/kdj/tools.py + BUILD64_LIBS_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -66,12 +68,3 @@ include gar/category.mk -post-configure-modulated: - @# Replace gcc-specific flags until this is fixed: - @# http://code.google.com/p/libkate/issues/detail?id=18 - perl -pi -e 's,-Wall -W,,g' \ - $(WORKSRC)/Makefile \ - $(WORKSRC)/tools/Makefile - perl -pi -e 's,/usr/local,$(prefix),g' \ - $(WORKSRC)/tools/KateDJ/kdj/tools.py - @$(MAKECOOKIE) Modified: csw/mgar/pkg/libkate/trunk/checksums =================================================================== --- csw/mgar/pkg/libkate/trunk/checksums 2013-01-01 21:56:35 UTC (rev 20002) +++ csw/mgar/pkg/libkate/trunk/checksums 2013-01-01 22:02:44 UTC (rev 20003) @@ -1 +1 @@ -7489ddebedf8d9888a05496dedf83c71 libkate-0.3.8.tar.gz +1dfdbdeb2fa5d07063cf5b8261111fca libkate-0.4.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 Tue Jan 1 23:09:29 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Jan 2013 22:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20004] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 20004 http://gar.svn.sourceforge.net/gar/?rev=20004&view=rev Author: dmichelsen Date: 2013-01-01 22:09:29 +0000 (Tue, 01 Jan 2013) Log Message: ----------- libidn/trunk: Update to 1.26 Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2013-01-01 22:02:44 UTC (rev 20003) +++ csw/mgar/pkg/libidn/trunk/Makefile 2013-01-01 22:09:29 UTC (rev 20004) @@ -1,5 +1,5 @@ NAME = libidn -VERSION = 1.24 +VERSION = 1.26 GARTYPE = v2 DESCRIPTION = GNU IDN Library Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2013-01-01 22:02:44 UTC (rev 20003) +++ csw/mgar/pkg/libidn/trunk/checksums 2013-01-01 22:09:29 UTC (rev 20004) @@ -1 +1 @@ -764d7258eeb273941680499fab2c7367 libidn-1.24.tar.gz +7533d14fbbb6c026a1a9eaa2179ccb69 libidn-1.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 2 10:09:38 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Jan 2013 09:09:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[20005] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: Revision: 20005 http://gar.svn.sourceforge.net/gar/?rev=20005&view=rev Author: dmichelsen Date: 2013-01-02 09:09:37 +0000 (Wed, 02 Jan 2013) Log Message: ----------- fftw/trunk: Adjust dependencies Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2013-01-01 22:09:29 UTC (rev 20004) +++ csw/mgar/pkg/fftw/trunk/Makefile 2013-01-02 09:09:37 UTC (rev 20005) @@ -41,10 +41,12 @@ PACKAGES += CSWlibfftw3threads3 SPKG_DESC_CSWlibfftw3threads3 = Library for computing the discrete Fourier transform (DFT), libfftw3_threads.so.3 PKGFILES_CSWlibfftw3threads3 = $(call pkgfiles_lib,libfftw3_threads.so.3) +RUNTIME_DEP_PKGS_CSWlibfftw3threads3 += CSWlibfftw3-3 PACKAGES-5.10 += CSWlibfftw3l-threads3 SPKG_DESC_CSWlibfftw3l-threads3 = Library for computing the discrete Fourier transform (DFT) in long double, libfftw3_threads.so.3 PKGFILES_CSWlibfftw3l-threads3 = $(call pkgfiles_lib,libfftw3l_threads.so.3) +RUNTIME_DEP_PKGS_CSWlibfftw3l-threads3 += CSWlibfftw3l3 PACKAGES += CSWlibfftw-dev SPKG_DESC_CSWlibfftw-dev = Development files for libfftw3.so.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 2 10:32:05 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 02 Jan 2013 09:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[20006] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 20006 http://gar.svn.sourceforge.net/gar/?rev=20006&view=rev Author: rthurner Date: 2013-01-02 09:32:04 +0000 (Wed, 02 Jan 2013) Log Message: ----------- mercurial: upgrade to hg-2.4.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2013-01-02 09:09:37 UTC (rev 20005) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-01-02 09:32:04 UTC (rev 20006) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.4 +VERSION = 2.4.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-01-02 09:09:37 UTC (rev 20005) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-01-02 09:32:04 UTC (rev 20006) @@ -1 +1 @@ -c1fc9bec6951dd3c913092c3c72da014 mercurial-2.4.tar.gz +ffae81c0366c13ae852e9fdc26fc3690 mercurial-2.4.2.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 Jan 2 10:43:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Jan 2013 09:43:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[20007] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 20007 http://gar.svn.sourceforge.net/gar/?rev=20007&view=rev Author: dmichelsen Date: 2013-01-02 09:43:59 +0000 (Wed, 02 Jan 2013) Log Message: ----------- mGAR v2: Allow csw-upload-pkg on packages not being in any catalog Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-01-02 09:32:04 UTC (rev 20006) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-01-02 09:43:59 UTC (rev 20007) @@ -22,8 +22,8 @@ import file_set_checker import sys import getpass +import urllib2 - BASE_URL = "http://buildfarm.opencsw.org" RELEASES_APP = "/releases" DEFAULT_CATREL = "unstable" @@ -240,8 +240,11 @@ for osrel in osrels: logging.debug("%s %s %s", catrel, arch, osrel) cat_key = (catrel, arch, osrel) - srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( - catrel, arch, osrel, catalogname) + try: + srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( + catrel, arch, osrel, catalogname) + except urllib2.HTTPError, e: + srv4_in_catalog = None if srv4_in_catalog: logging.debug("Catalog %s %s contains version %s of the %s package", arch, osrel, srv4_in_catalog["osrel"], catalogname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jan 2 13:51:02 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Jan 2013 12:51:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[20008] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20008 http://gar.svn.sourceforge.net/gar/?rev=20008&view=rev Author: pfelecan Date: 2013-01-02 12:51:01 +0000 (Wed, 02 Jan 2013) Log Message: ----------- texlive/trunk: all the obsoleted packages are architecture neutral and a specific catalog name Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-02 09:43:59 UTC (rev 20007) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-02 12:51:01 UTC (rev 20008) @@ -153,7 +153,9 @@ CATALOGNAME_CSWtexlive-common = texlive_common SPKG_DESC_CSWtexlive-common += $(DESCRIPTION), common OBSOLETED_BY_CSWtexlive-common = CSWtetex -ARCHALL_CSWtexlive-common = 1 +CATALOGNAME_CSWtetex = tetex_stub +ARCHALL_CSWtetex = 1 +ARCHALL_CSWtexlive-common = 1 RUNTIME_DEP_PKGS_CSWtexlive-common += CSWpython RUNTIME_DEP_PKGS_CSWtexlive-common += CSWemacscommon RUNTIME_DEP_PKGS_CSWtexlive-common += CSWruby @@ -1212,6 +1214,8 @@ SPKG_DESC_CSWtexlive-extra-utils += $(DESCRIPTION), extra utils OBSOLETED_BY_CSWtexlive-extra-utils = CSWtetex OBSOLETED_BY_CSWtexlive-extra-utils += CSWpdfjam +CATALOGNAME_CSWpdfjam = pdfjam_stub +ARCHALL_CSWpdfjam = 1 PKGFILES_CSWtexlive-extra-utils += $(docdir)/$(CATALOGNAME_CSWtexlive-extra-utils)/.* PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/a2ping PKGFILES_CSWtexlive-extra-utils += /opt/csw/bin/cfftot1 @@ -4757,8 +4761,10 @@ OBSOLETED_BY_CSWtexlive-pstricks = CSWtetex OBSOLETED_BY_CSWtexlive-pstricks += CSWtex-pdftricks CATALOGNAME_CSWtex-pdftricks = tex_pdftricks_stub +ARCHALL_CSWtex-pdftricks = 1 OBSOLETED_BY_CSWtexlive-pstricks += CSWtexpdftricks CATALOGNAME_CSWtexpdftricks = tex_pdftricks_old_stub +ARCHALL_CSWtexpdftricks = 1 PKGFILES_CSWtexlive-pstricks += $(docdir)/$(CATALOGNAME_CSWtexlive-pstricks)/.* PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pedigree PKGFILES_CSWtexlive-pstricks += /opt/csw/bin/pst2pdf 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 Jan 2 15:56:18 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Jan 2013 14:56:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[20009] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/mirror-setup.rst Message-ID: Revision: 20009 http://gar.svn.sourceforge.net/gar/?rev=20009&view=rev Author: wahwah Date: 2013-01-02 14:56:18 +0000 (Wed, 02 Jan 2013) Log Message: ----------- opencsw-manual/trunk: correct the link syntax Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2013-01-02 12:51:01 UTC (rev 20008) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2013-01-02 14:56:18 UTC (rev 20009) @@ -11,13 +11,17 @@ To set up the mirror you should use ``rsync`` as it can update your local copy quickly and with low bandwidth use and also preserves hardlinks. Not all mirrors provide access via the ``rsync`` protocol, please consult -[our list of mirrors](http://www.opencsw.org/get-it/mirrors/). +`our list of mirrors`_. To make a full copy of the OpenCSW repository:: - pkgutil -y -i rsync - mkdir /export/opencsw-mirror - rsync -aH --delete rsync://rsync.opencsw.org/opencsw/ /export/opencsw-mirror + MIRROR_DIR=/export/mirror/opencsw + sudo pkgutil -y -i rsync + sudo mkdir -p "${MIRROR_DIR}" + sudo rsync -aH --delete rsync://rsync.opencsw.org/opencsw/ "${MIRROR_DIR}" The directory ``opencsw-mirror`` can either be shared via HTTP or via NFS to the ``pkgutil`` clients. Use ``http://myserver/opencsw-mirror/`` for HTTP and ``file:///myserver/opencsw-mirror`` for NFS as mirror option in ``pkgutil``. + +.. _our list of mirrors: + http://www.opencsw.org/get-it/mirrors/ 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 Jan 2 23:38:44 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 02 Jan 2013 22:38:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20010] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 20010 http://gar.svn.sourceforge.net/gar/?rev=20010&view=rev Author: chninkel Date: 2013-01-02 22:38:43 +0000 (Wed, 02 Jan 2013) Log Message: ----------- gar/v2-yann: added a timeout option to shell command execution 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 2013-01-02 14:56:18 UTC (rev 20009) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2013-01-02 22:38:43 UTC (rev 20010) @@ -10,6 +10,7 @@ import subprocess import ldd_emul import configuration as c +import time """This file isolates code dependent on hachoir parser. @@ -76,13 +77,30 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info +class TimeoutExpired(Exception): + pass -def ShellCommand(args, env=None): +def ShellCommand(args, env=None, timeout=None): logging.debug("Running: %s", args) proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) + # Python 3.3 have the timeout option + # we have to roughly emulate it with python 2.x + if timeout: + max_time = time.time() + timeout + while True: + proc.poll() + if proc.returncode is None: + time.sleep(0.1) + if time.time() >= max_time: + proc.kill() + msg = "Process %s killed after timeout expiration" % args + raise TimeoutExpired(msg) + else: + break + stdout, stderr = proc.communicate() retcode = proc.wait() @@ -360,7 +378,9 @@ # ldd needs the binary to be executable os.chmod(binary_abspath, 0755) args = ["ldd", "-Ur", binary_abspath] - retcode, stdout, stderr = ShellCommand(args) + # ldd can be stuck while ran on a some binaries, so we define + # a timeout (problem encountered with uconv) + retcode, stdout, stderr = ShellCommand(args, timeout=10) if retcode: # There three cases where we will ignore an ldd error # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 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 Jan 3 09:44:18 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Jan 2013 08:44:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[20011] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20011 http://gar.svn.sourceforge.net/gar/?rev=20011&view=rev Author: pfelecan Date: 2013-01-03 08:44:17 +0000 (Thu, 03 Jan 2013) Log Message: ----------- texlive/trunk: tweaking again the 'file-wit-bad-content' overrides and struggling with REINPLACE. Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-02 22:38:43 UTC (rev 20010) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-03 08:44:17 UTC (rev 20011) @@ -582,6 +582,7 @@ CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/metafont/misc/modes.mf CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/web2c/texmf.cnf CHECKPKG_OVERRIDES_CSWtexlive-base += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/web2c/texmf.cnf +CHECKPKG_OVERRIDES_CSWtexlive-latex-base += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/tex/latex/base/texsys.cfg PACKAGES += CSWtexlive-bibtex-extra CATALOGNAME_CSWtexlive-bibtex-extra = texlive_bibtex_extra @@ -911,6 +912,11 @@ RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibxpm4 CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/dvips +# mime.types and mailcap file search path; as far as I searched, we +# don't supply that kind of files in /opt/csw/etc: +CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/xdvi-xaw +# only documentation section which can be easily deduced: +CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/mktexlsr PACKAGES += CSWtexlive-doc-base CATALOGNAME_CSWtexlive-doc-base = texlive_doc_base @@ -4414,6 +4420,9 @@ RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibkpathsea6 RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibgcc-s1 +# TODO hopefully this is innocuous; otherwise it needs a thoughtfully +# exploration: +CHECKPKG_OVERRIDES_CSWtexlive-luatex += file-with-bad-content|/usr/local|root/opt/csw/bin/luatex PACKAGES += CSWtexlive-math-extra CATALOGNAME_CSWtexlive-math-extra = texlive_math_extra @@ -5454,14 +5463,6 @@ $(MAKECOOKIE) REINPLACE_WHEN_USRLOCAL = postinstall -# until finding a better way: -REINPLACE_USRLOCAL += /opt/csw/bin/dvips -REINPLACE_USRLOCAL += /opt/csw/bin/luatex -REINPLACE_USRLOCAL += /opt/csw/bin/mktexlsr -REINPLACE_USRLOCAL += /opt/csw/bin/pdftex -REINPLACE_USRLOCAL += /opt/csw/bin/pdftosrc -REINPLACE_USRLOCAL += /opt/csw/bin/xdvi-xaw -REINPLACE_USRLOCAL += /opt/csw/bin/xetex REINPLACE_USRLOCAL += /opt/csw/include/kpathsea/types.h REINPLACE_USRLOCAL += /opt/csw/share/info/kpathsea.info REINPLACE_USRLOCAL += /opt/csw/share/info/web2c.info @@ -5570,7 +5571,7 @@ REINPLACE_USRLOCAL += /opt/csw/share/texmf/dvipdfmx/dvipdfmx.cfg REINPLACE_USRLOCAL += /opt/csw/share/texmf/scripts/simpdftex/simpdftex REINPLACE_USRLOCAL += /opt/csw/share/texmf/web2c/texmf.cnf -REINPLACE_USRSHARE += /opt/csw/share/texmf-dist/doc/generic/epsf/Makefile +REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/generic/epsf/Makefile REINPLACE_WHEN_USRshare = postinstall REINPLACE_USRSHARE += /opt/csw/bin/luatex 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 Jan 3 10:13:00 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Jan 2013 09:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[20012] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20012 http://gar.svn.sourceforge.net/gar/?rev=20012&view=rev Author: pfelecan Date: 2013-01-03 09:13:00 +0000 (Thu, 03 Jan 2013) Log Message: ----------- texlive/trunk: correct /usr/share reinplace phase --- it used the default one because of a misspelling of the variable. Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-03 08:44:17 UTC (rev 20011) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-03 09:13:00 UTC (rev 20012) @@ -5573,7 +5573,7 @@ REINPLACE_USRLOCAL += /opt/csw/share/texmf/web2c/texmf.cnf REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/generic/epsf/Makefile -REINPLACE_WHEN_USRshare = postinstall +REINPLACE_WHEN_USRSHARE = postinstall REINPLACE_USRSHARE += /opt/csw/bin/luatex REINPLACE_USRSHARE += /opt/csw/bin/pdftex REINPLACE_USRSHARE += /opt/csw/bin/pdftosrc 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 Jan 3 11:58:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 03 Jan 2013 10:58:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[20013] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 20013 http://gar.svn.sourceforge.net/gar/?rev=20013&view=rev Author: dmichelsen Date: 2013-01-03 10:58:11 +0000 (Thu, 03 Jan 2013) Log Message: ----------- mGAR v2: Dynamically generated rules must not be commented out. This leads to just the target line being commented out and the remaining lines being appended to the previous rule Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2013-01-03 09:13:00 UTC (rev 20012) +++ csw/mgar/gar/v2/gar.mk 2013-01-03 10:58:11 UTC (rev 20013) @@ -157,7 +157,6 @@ $(call _modulate_target_nocookie,reset-test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) $(call _modulate_target_nocookie,reset-install,$(2),$(4)) -#$(call _modulate_target,merge,$(2),$(4)) $(call _modulate_merge,,$(2),$(4)) $(call _modulate_target_nocookie,reset-merge,$(2),$(4)) $(call _modulate_target_nocookie,clean,$(2),$(4)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 3 13:53:07 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 03 Jan 2013 12:53:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[20014] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 20014 http://gar.svn.sourceforge.net/gar/?rev=20014&view=rev Author: dmichelsen Date: 2013-01-03 12:53:07 +0000 (Thu, 03 Jan 2013) Log Message: ----------- mGAR v2: Use basic pre-/post- instead of -modulated, do not call pre-/post-extract in global modulation Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2013-01-03 10:58:11 UTC (rev 20013) +++ csw/mgar/gar/v2/gar.mk 2013-01-03 12:53:07 UTC (rev 20014) @@ -427,7 +427,7 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract +extract: checksum $(COOKIEDIR) $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) @$(DONADA) extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) @@ -437,7 +437,7 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \ + $(if $(filter-out global,$(MODULATION)),pre-extract) pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated $(if $(filter-out global,$(MODULATION)),post-extract) \ $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-extract-gitsnap)) \ $(foreach FILE,$(EXPANDVARS),expandvars-$(FILE)) \ $(foreach REINPLACEMENT,$(POSTEXTRACT_REINPLACEMENTS),\ @@ -509,10 +509,10 @@ # patch - Apply any provided patches to the source. PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) -patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch +patch: $(addprefix patch-,$(MODULATIONS)) @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated post-patch @$(DONADA) # returns true if patch has completed successfully, false @@ -604,12 +604,12 @@ #CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) endif -configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure +configure: $(addprefix configure-,$(MODULATIONS)) @$(DONADA) configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if $(STRIP_LIBTOOL),strip-libtool) + pre-configure pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated post-configure $(if $(STRIP_LIBTOOL),strip-libtool) @$(DONADA) strip-libtool: @@ -625,7 +625,7 @@ @rm -f $(COOKIEDIR)/configure reset-configure-modulated: - @rm -f $(foreach C,pre-configure-modulated configure-modulated post-configure-modulated,$(COOKIEDIR)/$C) + @rm -f $(foreach C,pre-configure pre-configure-modulated configure-modulated post-configure-modulated post-configure,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-configure-$(MODULATION) $(COOKIEDIR)/post-configure-$(MODULATION) @rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) @@ -637,7 +637,7 @@ # build - Actually compile the sources. BUILD_TARGETS = $(addprefix build-,$(BUILD_CHECK_SCRIPTS)) $(addprefix build-,$(BUILD_SCRIPTS)) -build: pre-build $(addprefix build-,$(MODULATIONS)) post-build +build: $(addprefix build-,$(MODULATIONS)) $(DONADA) # Build for a specific architecture @@ -646,7 +646,7 @@ $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ ) -build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated +build-modulated: verify-isa configure-modulated pre-build pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated post-build @$(MAKECOOKIE) .PHONY: reset-build reset-build-modulated @@ -655,9 +655,8 @@ reset-build: $(addprefix reset-build-,$(MODULATIONS)) rm -f $(COOKIEDIR)/build -# XXX: pre-*, post-* reset-build-modulated: $(patsubst build-%,clean-%,$(BUILD_TARGETS)) - rm -f $(addprefix $(COOKIEDIR)/,pre-build-modulated $(BUILD_TAGRETS) post-build-modulated)) + rm -f $(addprefix $(COOKIEDIR)/,pre-build pre-build-modulated $(BUILD_TAGRETS) post-build-modulated post-build)) # returns true if build has completed successfully, false # otherwise @@ -666,10 +665,10 @@ TEST_TARGETS = $(addprefix test-,$(TEST_SCRIPTS)) -test: pre-test $(addprefix test-,$(MODULATIONS)) post-test +test: $(addprefix test-,$(MODULATIONS)) $(DONADA) -test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated +test-modulated: build-modulated pre-test pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated post-test $(DONADA) # XXX: retest @@ -703,13 +702,13 @@ # install - Test and install the results of a build. INSTALL_TARGETS = $(addprefix install-,$(INSTALL_SCRIPTS)) -install: pre-install $(addprefix install-,$(MODULATIONS)) post-install +install: $(addprefix install-,$(MODULATIONS)) $(DONADA) install-modulated: build-modulated $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test-modulated $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) \ - pre-install-modulated pre-install-$(MODULATION) \ + pre-install pre-install-modulated pre-install-$(MODULATION) \ $(INSTALL_TARGETS) \ - post-install-$(MODULATION) post-install-modulated \ + post-install-$(MODULATION) post-install-modulated post-install \ $(POST_INSTALL_TARGETS) \ $(foreach REINPLACEMENT,$(POSTINSTALL_REINPLACEMENTS),\ post-install-reinplace-$(REINPLACEMENT) \ @@ -740,7 +739,7 @@ reset-install-modulated: @$(call _pmod,Reset install state) @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work - @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) + @rm -f $(foreach C,pre-install pre-install-modulated install-modulated post-install-modulated post-install,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) @@ -877,7 +876,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge +merge: checksum merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) @banner merge @$(MAKECOOKIE) @@ -919,7 +918,7 @@ @$(MAKECOOKIE) # This merges the -merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated +merge-modulated: install-modulated pre-merge pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated post-merge @$(MAKECOOKIE) # Copy the whole tree verbatim @@ -967,13 +966,12 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src - rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge + rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge rm -rf $(PKGROOT) reset-merge-modulated: @$(call _pmod,Reset merge state) - echo rm -f $(COOKIEDIR)/merge-* - rm -f $(COOKIEDIR)/merge-* + rm -f $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge-* # The clean rule. It must be run if you want to re-download a # file after a successful checksum (or just remove the checksum 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 Jan 3 16:46:38 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 03 Jan 2013 15:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[20015] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: Revision: 20015 http://gar.svn.sourceforge.net/gar/?rev=20015&view=rev Author: wahwah Date: 2013-01-03 15:46:37 +0000 (Thu, 03 Jan 2013) Log Message: ----------- opencsw-manual/trunk: correct warnings and errors Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-01-03 12:53:07 UTC (rev 20014) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-01-03 15:46:37 UTC (rev 20015) @@ -10,9 +10,7 @@ introduction getting-started configuring-services - pkgutil-reference mirror-setup - glossary .. [#dagosscrapbook] `Dago's Scrapbook`_ Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst 2013-01-03 12:53:07 UTC (rev 20014) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst 2013-01-03 15:46:37 UTC (rev 20015) @@ -23,5 +23,6 @@ .. [#shared-opt-csw] `Shared /opt/csw configuration files`_ -.. Shared /opt/csw configuration files: + +.. _Shared /opt/csw configuration files: http://wiki.opencsw.org/shared-opt-csw-setup Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst 2013-01-03 12:53:07 UTC (rev 20014) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst 2013-01-03 15:46:37 UTC (rev 20015) @@ -146,9 +146,9 @@ binaries link to them. Private shared libraries can be bundled with the main package, without splitting them off. -================================================================================ ============ -file linkable? -================================================================================ ============ +================================================================================== ============ +file linkable? +================================================================================== ============ ``/opt/csw/lib/libfoo.so.0.2`` Yes ``/opt/csw/lib/sparcv9/libfoo.so.0.2`` Yes ``/opt/csw/lib/sparcv8plus+vis/libfoo.so.0.2`` Yes @@ -160,7 +160,7 @@ ``/opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib/libcrypto.so.0.9.6`` No ``/opt/csw/customprefix/lib/libfoo.so.0.2`` Yes ``/opt/csw/boost-gcc/lib/libboost_wserialization.so.1.44.0`` Yes -================================================================================ ============ +================================================================================== ============ Example implementation and its unit tests can be found in checkpkg sources [#is-library-linkable-implementation]_ and corresponding unit @@ -256,7 +256,7 @@ - ``CSWlibfoo`` (empty) ? ``CSWlibfoo2`` (``libfoo.so.2``) Potential problems -================== +------------------ Potential collisions in package naming would include ``libfoo.so.1`` and ``libfoo-1.so`` both resolving to ``CSWlibfoo1``. If this case ever occurs, @@ -269,7 +269,7 @@ limits. Footnotes -========= +--------- .. [#discussion] `An idea for a shared libraries policy`_ - mailing list discussion 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 Jan 3 20:28:34 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 03 Jan 2013 19:28:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20016] csw/mgar/gar/v2-yann Message-ID: Revision: 20016 http://gar.svn.sourceforge.net/gar/?rev=20016&view=rev Author: chninkel Date: 2013-01-03 19:28:34 +0000 (Thu, 03 Jan 2013) Log Message: ----------- gar/v2-yann: merge last changes from the main branch Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py Property Changed: ---------------- csw/mgar/gar/v2-yann/ Property changes on: csw/mgar/gar/v2-yann ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,19234-19981 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678,19234-20010 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py 2013-01-03 15:46:37 UTC (rev 20015) +++ csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py 2013-01-03 19:28:34 UTC (rev 20016) @@ -22,8 +22,8 @@ import file_set_checker import sys import getpass +import urllib2 - BASE_URL = "http://buildfarm.opencsw.org" RELEASES_APP = "/releases" DEFAULT_CATREL = "unstable" @@ -309,8 +309,11 @@ for osrel in osrels: logging.debug("%s %s %s", catrel, arch, osrel) cat_key = (catrel, arch, osrel) - srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( - catrel, arch, osrel, catalogname) + try: + srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname( + catrel, arch, osrel, catalogname) + except urllib2.HTTPError, e: + srv4_in_catalog = None if srv4_in_catalog: logging.debug("Catalog %s %s contains version %s of the %s package", arch, osrel, srv4_in_catalog["osrel"], catalogname) 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 Jan 3 20:50:52 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 03 Jan 2013 19:50:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20017] csw/mgar/gar/v2-yann/lib/python/inspective_package. py Message-ID: Revision: 20017 http://gar.svn.sourceforge.net/gar/?rev=20017&view=rev Author: chninkel Date: 2013-01-03 19:50:51 +0000 (Thu, 03 Jan 2013) Log Message: ----------- gar/v2-yann: also kill the children of the process launched when a timeout occurred 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 2013-01-03 19:28:34 UTC (rev 20016) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2013-01-03 19:50:51 UTC (rev 20017) @@ -11,6 +11,7 @@ import ldd_emul import configuration as c import time +import signal """This file isolates code dependent on hachoir parser. @@ -85,7 +86,8 @@ proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env=env) + env=env, + preexec_fn=os.setsid) # Python 3.3 have the timeout option # we have to roughly emulate it with python 2.x if timeout: @@ -95,7 +97,9 @@ if proc.returncode is None: time.sleep(0.1) if time.time() >= max_time: - proc.kill() + # we will all processes from the same process group + # in case the process spawned some children + os.kill(-proc.pid, signal.SIGKILL) msg = "Process %s killed after timeout expiration" % args raise TimeoutExpired(msg) else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jan 3 21:16:06 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 03 Jan 2013 20:16:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[20018] csw/mgar/gar/v2-yann Message-ID: Revision: 20018 http://gar.svn.sourceforge.net/gar/?rev=20018&view=rev Author: chninkel Date: 2013-01-03 20:16:05 +0000 (Thu, 03 Jan 2013) Log Message: ----------- gar/v2-yann: merge last changes from the main branch Modified Paths: -------------- csw/mgar/gar/v2-yann/gar.mk Property Changed: ---------------- csw/mgar/gar/v2-yann/ Property changes on: csw/mgar/gar/v2-yann ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,19234-20010 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678,19234-20017 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/v2-yann/gar.mk =================================================================== --- csw/mgar/gar/v2-yann/gar.mk 2013-01-03 19:50:51 UTC (rev 20017) +++ csw/mgar/gar/v2-yann/gar.mk 2013-01-03 20:16:05 UTC (rev 20018) @@ -157,7 +157,6 @@ $(call _modulate_target_nocookie,reset-test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) $(call _modulate_target_nocookie,reset-install,$(2),$(4)) -#$(call _modulate_target,merge,$(2),$(4)) $(call _modulate_merge,,$(2),$(4)) $(call _modulate_target_nocookie,reset-merge,$(2),$(4)) $(call _modulate_target_nocookie,clean,$(2),$(4)) @@ -428,7 +427,7 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -extract: checksum $(COOKIEDIR) pre-extract $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract +extract: checksum $(COOKIEDIR) $(if $(NOGITPATCH),,pre-extract-git-check) extract-modulated $(addprefix extract-,$(MODULATIONS)) @$(DONADA) extract-global: $(if $(filter global,$(MODULATION)),extract-modulated) @@ -438,7 +437,7 @@ extract-modulated: checksum-modulated $(EXTRACTDIR) $(COOKIEDIR) \ $(addprefix dep-$(GARDIR)/,$(EXTRACTDEPS)) \ announce-modulation \ - pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated \ + $(if $(filter-out global,$(MODULATION)),pre-extract) pre-extract-modulated pre-extract-$(MODULATION) $(EXTRACT_TARGETS) post-extract-$(MODULATION) post-extract-modulated $(if $(filter-out global,$(MODULATION)),post-extract) \ $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-extract-gitsnap)) \ $(foreach FILE,$(EXPANDVARS),expandvars-$(FILE)) \ $(foreach REINPLACEMENT,$(POSTEXTRACT_REINPLACEMENTS),\ @@ -510,10 +509,10 @@ # patch - Apply any provided patches to the source. PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES) $(PATCHFILES_$(MODULATION))) -patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch +patch: $(addprefix patch-,$(MODULATIONS)) @$(DONADA) -patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated +patch-modulated: extract-modulated $(WORKSRC) pre-patch pre-patch-modulated pre-patch-$(MODULATION) $(PATCH_TARGETS) $(if $(filter global,$(MODULATION)),,$(if $(NOGITPATCH),,post-patch-gitsnap)) post-patch-$(MODULATION) post-patch-modulated post-patch @$(DONADA) # returns true if patch has completed successfully, false @@ -605,12 +604,12 @@ #CONFIGURE_BUILDDEPS = $(addprefix $(GARDIR)/,$(addsuffix /$(COOKIEROOTDIR)/build.d/install,$(BUILDDEPS))) endif -configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure +configure: $(addprefix configure-,$(MODULATIONS)) @$(DONADA) configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ - pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated $(if $(STRIP_LIBTOOL),strip-libtool) + pre-configure pre-configure-modulated pre-configure-$(MODULATION) $(CONFIGURE_TARGETS) post-configure-$(MODULATION) post-configure-modulated post-configure $(if $(STRIP_LIBTOOL),strip-libtool) @$(DONADA) strip-libtool: @@ -626,7 +625,7 @@ @rm -f $(COOKIEDIR)/configure reset-configure-modulated: - @rm -f $(foreach C,pre-configure-modulated configure-modulated post-configure-modulated,$(COOKIEDIR)/$C) + @rm -f $(foreach C,pre-configure pre-configure-modulated configure-modulated post-configure-modulated post-configure,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-configure-$(MODULATION) $(COOKIEDIR)/post-configure-$(MODULATION) @rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) @@ -638,7 +637,7 @@ # build - Actually compile the sources. BUILD_TARGETS = $(addprefix build-,$(BUILD_CHECK_SCRIPTS)) $(addprefix build-,$(BUILD_SCRIPTS)) -build: pre-build $(addprefix build-,$(MODULATIONS)) post-build +build: $(addprefix build-,$(MODULATIONS)) $(DONADA) # Build for a specific architecture @@ -647,7 +646,7 @@ $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ ) -build-modulated: verify-isa configure-modulated pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated +build-modulated: verify-isa configure-modulated pre-build pre-build-modulated pre-build-$(MODULATION) $(BUILD_TARGETS) post-build-$(MODULATION) post-build-modulated post-build @$(MAKECOOKIE) .PHONY: reset-build reset-build-modulated @@ -656,9 +655,8 @@ reset-build: $(addprefix reset-build-,$(MODULATIONS)) rm -f $(COOKIEDIR)/build -# XXX: pre-*, post-* reset-build-modulated: $(patsubst build-%,clean-%,$(BUILD_TARGETS)) - rm -f $(addprefix $(COOKIEDIR)/,pre-build-modulated $(BUILD_TAGRETS) post-build-modulated)) + rm -f $(addprefix $(COOKIEDIR)/,pre-build pre-build-modulated $(BUILD_TAGRETS) post-build-modulated post-build)) # returns true if build has completed successfully, false # otherwise @@ -667,10 +665,10 @@ TEST_TARGETS = $(addprefix test-,$(TEST_SCRIPTS)) -test: pre-test $(addprefix test-,$(MODULATIONS)) post-test +test: $(addprefix test-,$(MODULATIONS)) $(DONADA) -test-modulated: build-modulated pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated +test-modulated: build-modulated pre-test pre-test-modulated pre-test-$(MODULATION) $(TEST_TARGETS) post-test-$(MODULATION) post-test-modulated post-test $(DONADA) # XXX: retest @@ -704,13 +702,13 @@ # install - Test and install the results of a build. INSTALL_TARGETS = $(addprefix install-,$(INSTALL_SCRIPTS)) -install: pre-install $(addprefix install-,$(MODULATIONS)) post-install +install: $(addprefix install-,$(MODULATIONS)) $(DONADA) install-modulated: build-modulated $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test-modulated $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) \ - pre-install-modulated pre-install-$(MODULATION) \ + pre-install pre-install-modulated pre-install-$(MODULATION) \ $(INSTALL_TARGETS) \ - post-install-$(MODULATION) post-install-modulated \ + post-install-$(MODULATION) post-install-modulated post-install \ $(POST_INSTALL_TARGETS) \ $(foreach REINPLACEMENT,$(POSTINSTALL_REINPLACEMENTS),\ post-install-reinplace-$(REINPLACEMENT) \ @@ -741,7 +739,7 @@ reset-install-modulated: @$(call _pmod,Reset install state) @rm -rf $(INSTALLISADIR) $(COOKIEDIR)/install-work - @rm -f $(foreach C,pre-install-modulated install-modulated post-install-modulated,$(COOKIEDIR)/$C) + @rm -f $(foreach C,pre-install pre-install-modulated install-modulated post-install-modulated post-install,$(COOKIEDIR)/$C) @rm -f $(COOKIEDIR)/pre-install-$(MODULATION) $(COOKIEDIR)/post-install-$(MODULATION) @rm -f $(COOKIEDIR)/strip @rm -f $(foreach S,$(INSTALL_TARGETS),$(COOKIEDIR)/$S) @@ -878,7 +876,7 @@ # The basic merge merges the compiles for all ISAs on the current architecture -merge: checksum pre-merge merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) post-merge +merge: checksum merge-do merge-license merge-classutils merge-checkpkgoverrides merge-alternatives $(if $(COMPILE_ELISP),compile-elisp) $(if $(NOSOURCEPACKAGE),,merge-src) merge-distfile-README.CSW merge-distfile-changelog.CSW merge-obsolete $(if $(AP2_MODS),post-merge-ap2mod) $(if $(PHP5_EXT),post-merge-php5ext) @banner merge @$(MAKECOOKIE) @@ -920,7 +918,7 @@ @$(MAKECOOKIE) # This merges the -merge-modulated: install-modulated pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated +merge-modulated: install-modulated pre-merge pre-merge-modulated pre-merge-$(MODULATION) $(MERGE_TARGETS) post-merge-$(MODULATION) post-merge-modulated post-merge @$(MAKECOOKIE) # Copy the whole tree verbatim @@ -968,13 +966,12 @@ remerge: reset-merge merge reset-merge: reset-package $(addprefix reset-merge-,$(MODULATIONS)) reset-merge-license reset-merge-classutils reset-merge-checkpkgoverrides reset-merge-alternatives reset-merge-distfile-README.CSW reset-merge-distfile-changelog.CSW reset-merge-obsolete reset-merge-ap2mod reset-merge-php5ext reset-merge-src - rm -f $(COOKIEDIR)/pre-merge $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge $(COOKIEDIR)/post-merge + rm -f $(foreach M,$(MODULATIONS),$(COOKIEDIR)/merge-$M) $(COOKIEDIR)/merge rm -rf $(PKGROOT) reset-merge-modulated: @$(call _pmod,Reset merge state) - echo rm -f $(COOKIEDIR)/merge-* - rm -f $(COOKIEDIR)/merge-* + rm -f $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge-* # The clean rule. It must be run if you want to re-download a # file after a successful checksum (or just remove the checksum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jan 4 09:09:20 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 04 Jan 2013 08:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[20019] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20019 http://gar.svn.sourceforge.net/gar/?rev=20019&view=rev Author: pfelecan Date: 2013-01-04 08:09:19 +0000 (Fri, 04 Jan 2013) Log Message: ----------- texlive/trunk: hopefully last adjustments, for this cycle, suggested by checkpkg and coping with the mess in reinplace. Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-03 20:16:05 UTC (rev 20018) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-04 08:09:19 UTC (rev 20019) @@ -444,6 +444,18 @@ CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/chkweb.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/chktex.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/chkweb.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/chktex.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/purifyeps.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/arlatex.1 +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/info/eplain.info +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/info/dvips.info +# this is needed even though is mentioned in the corresponding reinplace rule: +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps + # I don't know what to do with this: CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/scripts/latexmk/latexmk.pl @@ -909,8 +921,6 @@ RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibxpm4 CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/dvips # mime.types and mailcap file search path; as far as I searched, we # don't supply that kind of files in /opt/csw/etc: @@ -4415,11 +4425,6 @@ PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/luatex/luamplib/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/luatex/luaotfload/.* RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWtexlive-common -RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibz1 -RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibkpathsea6 -RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibgcc-s1 # TODO hopefully this is innocuous; otherwise it needs a thoughtfully # exploration: CHECKPKG_OVERRIDES_CSWtexlive-luatex += file-with-bad-content|/usr/local|root/opt/csw/bin/luatex 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 Jan 4 10:59:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Jan 2013 09:59:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20020] csw/mgar/pkg/fftw/trunk/Makefile Message-ID: Revision: 20020 http://gar.svn.sourceforge.net/gar/?rev=20020&view=rev Author: dmichelsen Date: 2013-01-04 09:59:43 +0000 (Fri, 04 Jan 2013) Log Message: ----------- fftw/trunk: Just build the defaults Modified Paths: -------------- csw/mgar/pkg/fftw/trunk/Makefile Modified: csw/mgar/pkg/fftw/trunk/Makefile =================================================================== --- csw/mgar/pkg/fftw/trunk/Makefile 2013-01-04 08:09:19 UTC (rev 20019) +++ csw/mgar/pkg/fftw/trunk/Makefile 2013-01-04 09:59:43 UTC (rev 20020) @@ -27,8 +27,8 @@ SKIP_MODULATIONS-5.9 += isa-i386-longdouble-yes isa-amd64-longdouble-no isa-amd64-longdouble-yes SKIP_MODULATIONS = $(SKIP_MODULATIONS-$(GAROSREL)) -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGES += CSWlibfftw3-3 SPKG_DESC_CSWlibfftw3-3 = Library for computing the discrete Fourier transform (DFT), libfftw3.so.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 Fri Jan 4 11:27:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Jan 2013 10:27:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20021] csw/mgar/pkg/file/trunk Message-ID: Revision: 20021 http://gar.svn.sourceforge.net/gar/?rev=20021&view=rev Author: dmichelsen Date: 2013-01-04 10:27:41 +0000 (Fri, 04 Jan 2013) Log Message: ----------- file/trunk: Update to 5.12 Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2013-01-04 09:59:43 UTC (rev 20020) +++ csw/mgar/pkg/file/trunk/Makefile 2013-01-04 10:27:41 UTC (rev 20021) @@ -1,7 +1,7 @@ # $Id$ NAME = file -VERSION = 5.11 +VERSION = 5.12 GARTYPE = v2 define BLURB @@ -25,7 +25,6 @@ PKGFILES_CSWgfile += $(mandir)/man1/gfile\.1 PKGFILES_CSWgfile += $(prefix)/gnu/file RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic1 -# EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] PACKAGES += CSWpy-libmagic SPKG_DESC_CSWpy-libmagic = Python extension for libmagic @@ -33,8 +32,6 @@ ARCHALL_CSWpy-libmagic = 1 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 -# libmagic1 is dlopened -CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1 PACKAGES += CSWlibmagic-data SPKG_DESC_CSWlibmagic-data = Database for libmagic @@ -76,13 +73,13 @@ include gar/category.mk -post-build-modulated: +post-build: # This fails for a mysterious reason. Can't find libmagic (-lmagic). (cd $(WORKSRC)/python && python setup.py build --compiler=unix) ###(cd $(WORKSRC)/python && python setup.py build) @$(MAKECOOKIE) -post-install-modulated: +post-install: (cd $(WORKSRC)/python && \ $(BUILD_ENV) python setup.py install --root=$(DESTDIR) --prefix=$(prefix)) (cd $(DESTDIR) && \ Modified: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums 2013-01-04 09:59:43 UTC (rev 20020) +++ csw/mgar/pkg/file/trunk/checksums 2013-01-04 10:27:41 UTC (rev 20021) @@ -1 +1 @@ -16a407bd66d6c7a832f3a5c0d609c27b file-5.11.tar.gz +1d7d85cb9354f79e5e351deef36be6ba file-5.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 4 17:57:42 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Jan 2013 16:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20022] csw/mgar/gar/v2-yann/lib/python Message-ID: Revision: 20022 http://gar.svn.sourceforge.net/gar/?rev=20022&view=rev Author: chninkel Date: 2013-01-04 16:57:41 +0000 (Fri, 04 Jan 2013) Log Message: ----------- gar/v2-yann: make the shell timeout option more reliable Modified Paths: -------------- csw/mgar/gar/v2-yann/lib/python/database.py csw/mgar/gar/v2-yann/lib/python/inspective_package.py Modified: csw/mgar/gar/v2-yann/lib/python/database.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/database.py 2013-01-04 10:27:41 UTC (rev 20021) +++ csw/mgar/gar/v2-yann/lib/python/database.py 2013-01-04 16:57:41 UTC (rev 20022) @@ -10,7 +10,7 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 7L +DB_SCHEMA_VERSION = 8L TABLES_THAT_NEED_UPDATES = (m.CswFile,) TABLES = TABLES_THAT_NEED_UPDATES + ( m.Architecture, @@ -159,8 +159,8 @@ except sqlobject.dberrors.OperationalError, e: logging.error("Could not create table %r: %s", table, e) raise - + def InitialDataImport(self): """Imports initial data into the db. Modified: csw/mgar/gar/v2-yann/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2013-01-04 10:27:41 UTC (rev 20021) +++ csw/mgar/gar/v2-yann/lib/python/inspective_package.py 2013-01-04 16:57:41 UTC (rev 20022) @@ -81,6 +81,9 @@ class TimeoutExpired(Exception): pass +def TimeoutHandler(signum, frame): + raise TimeoutExpired + def ShellCommand(args, env=None, timeout=None): logging.debug("Running: %s", args) proc = subprocess.Popen(args, @@ -91,23 +94,18 @@ # Python 3.3 have the timeout option # we have to roughly emulate it with python 2.x if timeout: - max_time = time.time() + timeout - while True: - proc.poll() - if proc.returncode is None: - time.sleep(0.1) - if time.time() >= max_time: - # we will all processes from the same process group - # in case the process spawned some children - os.kill(-proc.pid, signal.SIGKILL) - msg = "Process %s killed after timeout expiration" % args - raise TimeoutExpired(msg) - else: - break + signal.signal(signal.SIGALRM, TimeoutHandler) + signal.alarm(timeout) - stdout, stderr = proc.communicate() - retcode = proc.wait() + try: + stdout, stderr = proc.communicate() + signal.alarm(0) + except TimeoutExpired: + os.kill(-proc.pid, signal.SIGKILL) + msg = "Process %s killed after timeout expiration" % args + raise TimeoutExpired(msg) + retcode = proc.wait() return retcode, stdout, stderr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 4 18:00:15 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Jan 2013 17:00:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20023] csw/mgar/gar/v2-yann/ Message-ID: Revision: 20023 http://gar.svn.sourceforge.net/gar/?rev=20023&view=rev Author: chninkel Date: 2013-01-04 17:00:14 +0000 (Fri, 04 Jan 2013) Log Message: ----------- gar/v2-yann: merge last changes from the main branch Property Changed: ---------------- csw/mgar/gar/v2-yann/ Property changes on: csw/mgar/gar/v2-yann ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,19234-20017 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678,19234-20022 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 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 Jan 4 18:32:32 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Jan 2013 17:32:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[20024] csw/mgar/gar/v2/lib/web/pkgdb_web.py Message-ID: Revision: 20024 http://gar.svn.sourceforge.net/gar/?rev=20024&view=rev Author: wahwah Date: 2013-01-04 17:32:32 +0000 (Fri, 04 Jan 2013) Log Message: ----------- pkgdb-web: Return HTTP bad request When the 'basename' parameter is required but missing, return 'bad request' instead of throwing an exception and failing with a 500. Modified Paths: -------------- csw/mgar/gar/v2/lib/web/pkgdb_web.py Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py =================================================================== --- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-01-04 17:00:14 UTC (rev 20023) +++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-01-04 17:32:32 UTC (rev 20024) @@ -310,7 +310,10 @@ class PkgnamesAndPathsByBasename(object): def GET(self, catrel, arch, osrel): user_data = web.input() - basename = user_data.basename + try: + basename = user_data.basename + except AttributeError, e: + raise web.badrequest() send_filename = ( '%s-%s-%s-%s-packages.txt' % (catrel, arch, osrel, basename.replace('/', '-'))) 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 Jan 4 18:32:58 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Jan 2013 17:32:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20025] csw/mgar/gar/v2/lib/python/safe_remove_package.py Message-ID: Revision: 20025 http://gar.svn.sourceforge.net/gar/?rev=20025&view=rev Author: wahwah Date: 2013-01-04 17:32:58 +0000 (Fri, 04 Jan 2013) Log Message: ----------- safe-remove-package: Handle missing Handle an exception when retrieving an URL via REST. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-01-04 17:32:32 UTC (rev 20024) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-01-04 17:32:58 UTC (rev 20025) @@ -19,6 +19,7 @@ import sys import os import cjson +import urllib2 USAGE = """%prog --os-releases=SunOS5.10,SunOS5.11 -c @@ -114,7 +115,12 @@ logging.info("%s is an obsolete OS release. Skipping.", osrel) continue for arch in common_constants.PHYSICAL_ARCHITECTURES: - pkg_simple = rest_client.Srv4ByCatalogAndCatalogname(UNSTABLE, arch, osrel, catalogname) + try: + pkg_simple = rest_client.Srv4ByCatalogAndCatalogname(UNSTABLE, arch, osrel, catalogname) + except urllib2.HTTPError, e: + logging.warning("could not fetch %r from %s/%s: %s", + catalogname, arch, osrel, e) + pkg_simple = None if not pkg_simple: # Maybe we were given a pkgname instead of a catalogname? We can try # that before failing. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Jan 4 18:39:29 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Fri, 4 Jan 2013 17:39:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20019] csw/mgar/pkg/texlive/trunk/Makefile In-Reply-To: References: Message-ID: 2013/1/4 : > Revision: 20019 > http://gar.svn.sourceforge.net/gar/?rev=20019&view=rev > Author: pfelecan > Date: 2013-01-04 08:09:19 +0000 (Fri, 04 Jan 2013) > Log Message: > ----------- > texlive/trunk: hopefully last adjustments, for this cycle, suggested > by checkpkg and coping with the mess in reinplace. > > Modified Paths: > -------------- > csw/mgar/pkg/texlive/trunk/Makefile > > Modified: csw/mgar/pkg/texlive/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-03 20:16:05 UTC (rev 20018) > +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-04 08:09:19 UTC (rev 20019) > @@ -444,6 +444,18 @@ > CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile > CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex > CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/chkweb.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/chktex.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/chkweb.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/chktex.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/purifyeps.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/arlatex.1 > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/info/eplain.info > +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/info/dvips.info Is there a need to list each file separately in this case? You could just write: CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content ...and that would match all the file-with-bad-content error tags in texlive-common. From wahwah at users.sourceforge.net Fri Jan 4 18:55:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Jan 2013 17:55:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20026] csw/mgar/pkg/lang-python/python/branches/python-3.3 / Message-ID: Revision: 20026 http://gar.svn.sourceforge.net/gar/?rev=20026&view=rev Author: wahwah Date: 2013-01-04 17:55:36 +0000 (Fri, 04 Jan 2013) Log Message: ----------- python: A branch for 3.3.x versions Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-3.3/ Property changes on: csw/mgar/pkg/lang-python/python/branches/python-3.3 ___________________________________________________________________ Added: svn:ignore + gar work Added: svn:mergeinfo + /csw/mgar/pkg/python/branches/python-2.6.4+patch7242:8407-9385 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 4 20:40:06 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Jan 2013 19:40:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[20027] csw/mgar/gar/v2 Message-ID: Revision: 20027 http://gar.svn.sourceforge.net/gar/?rev=20027&view=rev Author: chninkel Date: 2013-01-04 19:40:05 +0000 (Fri, 04 Jan 2013) Log Message: ----------- gar/v2: added new checkpkg tests: soname-unused, no-direct-binding and forbidden-version-interface-dependencies Modified Paths: -------------- csw/mgar/gar/v2/lib/map.solaris10u8 csw/mgar/gar/v2/lib/python/common_constants.py csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/pkgdb.py csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py csw/mgar/gar/v2/lib/python/testdata/neon_stats.py csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2/lib/python/testdata/tree_stats.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py Removed Paths: ------------- csw/mgar/gar/v2/lib/map.solaris10 Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 /csw/mgar/gar/v2-yann:19236-20023 Deleted: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/map.solaris10 2013-01-04 19:40:05 UTC (rev 20027) @@ -1,7 +0,0 @@ -# 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.2 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.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.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; Modified: csw/mgar/gar/v2/lib/map.solaris10u8 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10u8 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/map.solaris10u8 2013-01-04 19:40:05 UTC (rev 20027) @@ -2,6 +2,6 @@ # 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; +libresolv.so - SUNW_2.2.1 SUNWprivate_2.1 $ADDVERS=SUNW_2.2.1; # 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; Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 """csw_upload_pkg.py - uploads packages to the database. @@ -55,6 +55,15 @@ {{dublin,unstable,kiel,bratislava}}x{{sparc,i386}}x{{5.8,5.9.5.10,5.11}} += Removing packages from the catalog = + +The --remove option works the same way as the regular use, except that it +removes assignments of a given package to catalogs, instead of adding them. + +When removing packages from catalogs, files on disk are passed as arguments. +On the buildfarm, all files are available under the /home/mirror/opencsw +directory. + For more information, see: http://wiki.opencsw.org/automated-release-process#toc0 """ @@ -177,7 +186,7 @@ planned_modifications.append( (filename, md5_sum, arch, osrel, cat_arch, cat_osrel)) - # The plan: + # The plan: # - Create groups of files to be inserted into each of the catalogs # - Invoke checkpkg to check every target catalog checkpkg_sets = self._CheckpkgSets(planned_modifications) @@ -190,6 +199,66 @@ file_metadata = metadata_by_md5[md5_sum] self._InsertIntoCatalog(filename, arch, osrel, file_metadata) + def Remove(self): + for filename in self.filenames: + self._RemoveFile(filename) + + def _RemoveFile(self, filename): + md5_sum = self._GetFileMd5sum(filename) + file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) + if not file_metadata: + logging.warning("Could not find metadata for file %s", repr(filename)) + return + osrel = file_metadata['osrel'] + arch = file_metadata['arch'] + catalogs = self._MatchSrv4ToCatalogs( + filename, DEFAULT_CATREL, arch, osrel, md5_sum) + for unused_catrel, cat_arch, cat_osrel in sorted(catalogs): + self._RemoveFromCatalog(filename, cat_arch, cat_osrel, file_metadata) + + def _RemoveFromCatalog(self, filename, arch, osrel, file_metadata): + print("Removing %s (%s %s) from catalog %s %s %s" + % (file_metadata["catalogname"], + file_metadata["arch"], + file_metadata["osrel"], + DEFAULT_CATREL, arch, osrel)) + md5_sum = self._GetFileMd5sum(filename) + basename = os.path.basename(filename) + parsed_basename = opencsw.ParsePackageFileName(basename) + # TODO: Move this bit to a separate class (RestClient) + url = ( + "%s%s/catalogs/%s/%s/%s/%s/" + % (self.rest_url, + RELEASES_APP, + DEFAULT_CATREL, + arch, + osrel, + md5_sum)) + logging.debug("DELETE @ URL: %s %s", type(url), url) + c = pycurl.Curl() + d = StringIO() + h = StringIO() + c.setopt(pycurl.URL, str(url)) + c.setopt(pycurl.CUSTOMREQUEST, "DELETE") + c.setopt(pycurl.WRITEFUNCTION, d.write) + c.setopt(pycurl.HEADERFUNCTION, h.write) + c.setopt(pycurl.HTTPHEADER, ["Expect:"]) # Fixes the HTTP 417 error + c = self._SetAuth(c) + if self.debug: + c.setopt(c.VERBOSE, 1) + c.perform() + http_code = c.getinfo(pycurl.HTTP_CODE) + logging.debug( + "DELETE curl getinfo: %s %s %s", + type(http_code), + http_code, + c.getinfo(pycurl.EFFECTIVE_URL)) + c.close() + if not (http_code >= 200 and http_code <= 299): + raise RestCommunicationError( + "%s - HTTP code: %s, content: %s" + % (url, http_code, d.getvalue())) + def _GetFileMd5sum(self, filename): if filename not in self.md5_by_filename: logging.debug("_GetFileMd5sum(%s): Reading the file", filename) @@ -453,6 +522,10 @@ parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true") + parser.add_option("--remove", + dest="remove", + default=False, action="store_true", + help="Remove packages from catalogs instead of adding them") parser.add_option("--os-release", dest="os_release", help="If specified, only uploads to the specified OS release. " @@ -513,4 +586,7 @@ username=username, password=password, catrel=options.catrel) - uploader.Upload() + if options.remove: + uploader.Remove() + else: + uploader.Upload() Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/database.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -10,7 +10,7 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 7L +DB_SCHEMA_VERSION = 8L TABLES_THAT_NEED_UPDATES = (m.CswFile,) TABLES = TABLES_THAT_NEED_UPDATES + ( m.Architecture, @@ -159,8 +159,8 @@ except sqlobject.dberrors.OperationalError, e: logging.error("Could not create table %r: %s", table, e) raise - + def InitialDataImport(self): """Imports initial data into the db. @@ -289,7 +289,7 @@ logging.warning("Could not get file mtime: %s", e) d_mtime = time.gmtime(int(d_mtime_epoch)) logging.debug("IsDatabaseUpToDate: f_mtime %s, d_time: %s", f_mtime, d_mtime) - # Rounding up to integer seconds. There is a race condition: + # Rounding up to integer seconds. There is a race condition: # pkgadd finishes at 100.1 # checkpkg reads /var/sadm/install/contents at 100.2 # new pkgadd runs and finishes at 100.3 Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -29,20 +29,44 @@ ) 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",)), ) 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'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 = { + "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, - 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. @@ -143,10 +167,71 @@ 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): + 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... + # 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']): + db_libs.add(syminfo['soname']) + no_db_libs = db_libs.symmetric_difference(binary_info["needed sonames"]) + + 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(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)) + + + 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']]): + 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: @@ -191,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. @@ -206,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: @@ -218,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 @@ -232,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. @@ -242,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/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -10,6 +10,8 @@ import subprocess import ldd_emul import configuration as c +import time +import signal """This file isolates code dependent on hachoir parser. @@ -35,7 +37,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"]) @@ -76,7 +78,37 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info +class TimeoutExpired(Exception): + pass +def TimeoutHandler(signum, frame): + raise TimeoutExpired + +def ShellCommand(args, env=None, timeout=None): + logging.debug("Running: %s", args) + proc = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env, + preexec_fn=os.setsid) + # Python 3.3 have the timeout option + # we have to roughly emulate it with python 2.x + if timeout: + signal.signal(signal.SIGALRM, TimeoutHandler) + signal.alarm(timeout) + + try: + stdout, stderr = proc.communicate() + signal.alarm(0) + except TimeoutExpired: + os.kill(-proc.pid, signal.SIGKILL) + msg = "Process %s killed after timeout expiration" % args + raise TimeoutExpired(msg) + + retcode = proc.wait() + return retcode, stdout, stderr + + class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -160,7 +192,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: @@ -181,13 +214,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) 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(args, env) binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary if basedir: @@ -211,7 +242,7 @@ defined_symbols = {} for binary in binaries: - binary_abspath = os.path.join(self.directory, "root", binary) + binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] nm_proc = subprocess.Popen( @@ -236,41 +267,268 @@ return defined_symbols + def GetBinaryElfInfo(self): + """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. + + 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 + - 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, self.GetFilesDir(), binary) + # elfdump is the only tool that give us all informations + args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] + retcode, stdout, stderr = ShellCommand(args) + if retcode or stderr: + # we ignore for now these elfdump errors which can be catched + # later by check functions, + ignored_error_re = re.compile( + r"""[^:]+:(\s\.((SUNW_l)?dynsym|symtab):\s + (index\[\d+\]:\s + (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\slies + \swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) + + |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)? + :\ssymbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) + \slies\soutside\sof\scontaining\ssection + + |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) + + |invalid\ssh_link:\s0) + + |\smemory\soverlap\sbetween\ssection\[\d+\]:\s[^:]+:\s + [0-9a-f]+:[0-9a-f]+\sand\ssection\[\d+\]:\s[^:]+: + \s[0-9a-f]+:[0-9a-f]+) + \n""", + re.VERBOSE) + + stderr = re.sub(ignored_error_re, "", stderr) + if stderr: + msg = "%s returned one or more errors: %s" % (args, stderr) + raise package.Error(msg) + elfdump_out = stdout.splitlines() + + symbols = {} + binary_info = {'version definition': [], + 'version needed': []} + + cur_section = None + for line in elfdump_out: + + elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) + + # header or blank line contains no information + if not elf_info: + continue + + # symbol table and syminfo section store various informations + # 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: + 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, e.g.: + # libc.so.1 SUNW_1.1 + # SUNWprivate_1.1 + # 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'] + + # soname version needed are usually displayed sorted by index ... + # but that's not always the case :( so we have to reorder + # the list by index if they are present + if any ( v['index'] for v in binary_info['version needed'] ): + binary_info['version needed'].sort(key=lambda m: int(m['index'])) + for version in binary_info['version needed']: + del version['index'] + + # 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['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 output + self._ResolveSymbolsVersionInfo(binary_info) + + 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, self.GetFilesDir(), 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] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() + args = ["ldd", "-Ur", binary_abspath] + # ldd can be stuck while ran on a some binaries, so we define + # a timeout (problem encountered with uconv) + retcode, stdout, stderr = ShellCommand(args, timeout=10) if retcode: - logging.error("%s returned an error: %s", args, stderr) + # There three cases where we will ignore an ldd error + # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 + # solaris 9 exists only in 32 bits, so we can't do this + # We ignore the error as it is likely that the ldd infos will be + # the same on the 32 bits binaries + # - if we are trying to analyze a binary from another architecture + # we ignore this error as it will be caught by another checkpkg test + # - if we are trying to analyze a statically linked binaries + # we care only about dynamic binary so we ignore the error + # + 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) or + re.search(r'ELF machine type: EM_\w+: ' + r'is incompatible with system', stderr) + or 'file is not a dynamic executable or shared object' in stderr): + ldd_output[binary] = [] + continue + + raise package.Error("%s returned an error: %s" % (args, stderr)) + ldd_info = [] for line in stdout.splitlines(): - ldd_info.append(self._ParseLddDashRline(line)) - ldd_output[binary] = ldd_info + result = self._ParseLddDashRline(line, binary_abspath) + if result: + ldd_info.append(result) + 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 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 _ParseLddDashRline(self, line): + def _ResolveSymbolsVersionInfo(self, binary_info): + + 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 + # 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 + version_index = int(sym_info['version']) - 2 + if version_index >= 0: + version = version_info[version_index] + sym_info['version'] = version['version'] + 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('soname') + sym_info.setdefault('flags') + + def _ParseElfdumpLine(self, line, section=None): + + headers_re = ( + r""" + (?P
Version\sNeeded|Symbol\sTable # Section header + |Version\sDefinition|Syminfo) + \sSection: + \s+(?:\.SUNW_version|\.gnu\.version_[rd] + |\.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\sto\s+symbol\s*$ # Syminfo header + + |\s*$ # There is always a blank + # line before a new section + """) + + re_by_section = { + 'version definition': (r""" + \s*(?:\[\d+\]\s+)? # index: might be not present if no + # version binding is enabled + (?P\S+) # version + (?:\s+(?P\S+))? # dependency + (?:\s+\[\s(?:BASE|WEAK)\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 there is no + # confusion with version + (?P\S+) # version + (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # + """), + 'symbol table': (r""" + \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+\]) # index + \s+(?P[ABCDFILNPS]+) # flags + + \s+(?:(?:\[\d+\] # bound to: contains either + \s+(?P\S+)|)\s+)? # - library index and library name + # - for non external symbols + + (?P\S+)\s* # symbol + """)} + + elfdump_data = None + 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, re.VERBOSE) + 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+)\)") @@ -283,16 +541,35 @@ 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+)' + r' 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$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" + unreferenced_object = (r'^\s*unreferenced object=(?P.*);' + r' unused dependency of (?P.*)$') + unused_object = (r'^\s*unused object=.*$') + unused_search_path = (r'^\s*unused search path=.*' + r' \(RUNPATH/RPATH from file .*\)$') + move_offset_error = (r'^\tmove (?P\d+) offset invalid: ' + r'\(unknown\): offset=(?P0x[0-9a-f]+) ' + 'lies outside memory image; move discarded') + relocation_error = (r'relocation R_(386|AMD64|X86_64|SPARC)_\w+ ' + r'sizes differ: (?P.*)' + r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .*' + r'size=0x(?:[0-9a-f]+)?\)' + r'|\t.* size used; possible data truncation') + blank_line = (r'^\s*$') + common_re = (r"(%s|%s|%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)) + stv_protected, sizes_differ, sizes_info, + sizes_one_used, unreferenced_object, unused_object, + unused_search_path, blank_line, move_offset_error, + relocation_error)) 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 @@ -305,6 +582,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 @@ -316,7 +598,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"] @@ -335,12 +618,23 @@ 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)) + elif d["move_offset"]: + response["state"] = 'move-offset-error' + response["soname"] = None + response["path"] = None + response["symbol"] = None + response["move_offset"] = d['move_offset'] + response["move_index"] = d['move_index'] + elif d["reloc_symbol"]: + response["state"] = 'relocation-issue' + response["soname"] = None + response["path"] = None + response["symbol"] = d['reloc_symbol'] + 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): @@ -409,9 +703,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): @@ -446,7 +740,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.", @@ -466,6 +760,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() Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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,11 +70,136 @@ self.assertEqual([u'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): 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', + 'soname': 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', + 'symbol': 'vsf_log_line', + 'version': '1', + 'type': 'FUNC', + } + 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', + 'soname': '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', + 'soname': 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/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/package.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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).""" @@ -277,7 +279,7 @@ basedir = pkginfo[basedir_id] else: basedir = "" - # The convention in checkpkg is to not include the leading slash in paths. + # The convention in checkpkg is to not include the leading slash in paths. basedir = basedir.lstrip("/") return basedir Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', + 'shndx': 'UNDEF', + '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename( 'libnotfound.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath( @@ -1333,7 +1411,174 @@ 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 bound 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 bound to soname ' + soname) + + class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckWrongArchitecture' def testSparcBinariesInIntelPackage(self): Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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)) @@ -379,7 +381,12 @@ line_u = pkgmap_entry["line"].decode("latin1") f_path, basename = os.path.split( pkgmap_entry["path"].decode('latin1')) + except UnicodeEncodeError, e: + # the line was already in unicode + line_u = pkgmap_entry['line'] + f_path, basename = os.path.split(pkgmap_entry["path"]) # If this fails too, code change will be needed. + f = m.CswFile( basename=basename, path=f_path, Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -84,7 +84,7 @@ "bratislava", ]) CATALOGS_ALLOWED_TO_BE_IMPORTED = frozenset([ - "current", + "unstable", ]) Modified: csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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, Copied: csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py (from rev 20023, csw/mgar/gar/v2-yann/lib/python/testdata/cadaver_stats.py) =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', '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': [], + '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/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', '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', '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', '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' }, + ], + }, + }, 'overrides': [], 'pkginfo': {'ARCH': 'sparc', 'CATEGORY': 'application', Modified: csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', 'shndx': 'UNDEF', '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/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', '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), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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/lib/python/testdata/mercurial_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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/lib/python/testdata/rsync_pkg_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', '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', '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' }, + ] + } + }, '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/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-01-04 17:55:36 UTC (rev 20026) +++ csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-01-04 19:40:05 UTC (rev 20027) @@ -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', 'shndx': 'UNDEF', 'bind': 'GLOB' } ], + }, + 'opt/csw/sbin/visudo': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { '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' }, + ], + } + }, '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', @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 4 22:04:12 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Jan 2013 21:04:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[20028] csw/mgar/gar/v2/lib Message-ID: Revision: 20028 http://gar.svn.sourceforge.net/gar/?rev=20028&view=rev Author: chninkel Date: 2013-01-04 21:04:12 +0000 (Fri, 04 Jan 2013) Log Message: ----------- gar/v2: reverted unwanted changes in last commit Modified Paths: -------------- csw/mgar/gar/v2/lib/map.solaris10u8 csw/mgar/gar/v2/lib/python/csw_upload_pkg.py csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/map.solaris10u8 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10u8 2013-01-04 19:40:05 UTC (rev 20027) +++ csw/mgar/gar/v2/lib/map.solaris10u8 2013-01-04 21:04:12 UTC (rev 20028) @@ -2,6 +2,6 @@ # 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.1 SUNWprivate_2.1 $ADDVERS=SUNW_2.2.1; +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; Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-01-04 19:40:05 UTC (rev 20027) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-01-04 21:04:12 UTC (rev 20028) @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.6 +#!/opt/csw/bin/python2.6 """csw_upload_pkg.py - uploads packages to the database. @@ -55,15 +55,6 @@ {{dublin,unstable,kiel,bratislava}}x{{sparc,i386}}x{{5.8,5.9.5.10,5.11}} -= Removing packages from the catalog = - -The --remove option works the same way as the regular use, except that it -removes assignments of a given package to catalogs, instead of adding them. - -When removing packages from catalogs, files on disk are passed as arguments. -On the buildfarm, all files are available under the /home/mirror/opencsw -directory. - For more information, see: http://wiki.opencsw.org/automated-release-process#toc0 """ @@ -186,7 +177,7 @@ planned_modifications.append( (filename, md5_sum, arch, osrel, cat_arch, cat_osrel)) - # The plan: + # The plan: # - Create groups of files to be inserted into each of the catalogs # - Invoke checkpkg to check every target catalog checkpkg_sets = self._CheckpkgSets(planned_modifications) @@ -199,66 +190,6 @@ file_metadata = metadata_by_md5[md5_sum] self._InsertIntoCatalog(filename, arch, osrel, file_metadata) - def Remove(self): - for filename in self.filenames: - self._RemoveFile(filename) - - def _RemoveFile(self, filename): - md5_sum = self._GetFileMd5sum(filename) - file_in_allpkgs, file_metadata = self._GetSrv4FileMetadata(md5_sum) - if not file_metadata: - logging.warning("Could not find metadata for file %s", repr(filename)) - return - osrel = file_metadata['osrel'] - arch = file_metadata['arch'] - catalogs = self._MatchSrv4ToCatalogs( - filename, DEFAULT_CATREL, arch, osrel, md5_sum) - for unused_catrel, cat_arch, cat_osrel in sorted(catalogs): - self._RemoveFromCatalog(filename, cat_arch, cat_osrel, file_metadata) - - def _RemoveFromCatalog(self, filename, arch, osrel, file_metadata): - print("Removing %s (%s %s) from catalog %s %s %s" - % (file_metadata["catalogname"], - file_metadata["arch"], - file_metadata["osrel"], - DEFAULT_CATREL, arch, osrel)) - md5_sum = self._GetFileMd5sum(filename) - basename = os.path.basename(filename) - parsed_basename = opencsw.ParsePackageFileName(basename) - # TODO: Move this bit to a separate class (RestClient) - url = ( - "%s%s/catalogs/%s/%s/%s/%s/" - % (self.rest_url, - RELEASES_APP, - DEFAULT_CATREL, - arch, - osrel, - md5_sum)) - logging.debug("DELETE @ URL: %s %s", type(url), url) - c = pycurl.Curl() - d = StringIO() - h = StringIO() - c.setopt(pycurl.URL, str(url)) - c.setopt(pycurl.CUSTOMREQUEST, "DELETE") - c.setopt(pycurl.WRITEFUNCTION, d.write) - c.setopt(pycurl.HEADERFUNCTION, h.write) - c.setopt(pycurl.HTTPHEADER, ["Expect:"]) # Fixes the HTTP 417 error - c = self._SetAuth(c) - if self.debug: - c.setopt(c.VERBOSE, 1) - c.perform() - http_code = c.getinfo(pycurl.HTTP_CODE) - logging.debug( - "DELETE curl getinfo: %s %s %s", - type(http_code), - http_code, - c.getinfo(pycurl.EFFECTIVE_URL)) - c.close() - if not (http_code >= 200 and http_code <= 299): - raise RestCommunicationError( - "%s - HTTP code: %s, content: %s" - % (url, http_code, d.getvalue())) - def _GetFileMd5sum(self, filename): if filename not in self.md5_by_filename: logging.debug("_GetFileMd5sum(%s): Reading the file", filename) @@ -522,10 +453,6 @@ parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true") - parser.add_option("--remove", - dest="remove", - default=False, action="store_true", - help="Remove packages from catalogs instead of adding them") parser.add_option("--os-release", dest="os_release", help="If specified, only uploads to the specified OS release. " @@ -586,7 +513,4 @@ username=username, password=password, catrel=options.catrel) - if options.remove: - uploader.Remove() - else: - uploader.Upload() + uploader.Upload() Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-04 19:40:05 UTC (rev 20027) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-04 21:04:12 UTC (rev 20028) @@ -84,7 +84,7 @@ "bratislava", ]) CATALOGS_ALLOWED_TO_BE_IMPORTED = frozenset([ - "unstable", + "current", ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 4 23:13:40 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 04 Jan 2013 22:13:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20029] csw/mgar/gar/v2/lib/map.solaris10 Message-ID: Revision: 20029 http://gar.svn.sourceforge.net/gar/?rev=20029&view=rev Author: chninkel Date: 2013-01-04 22:13:40 +0000 (Fri, 04 Jan 2013) Log Message: ----------- gar/v2: re-added a missing file Added Paths: ----------- csw/mgar/gar/v2/lib/map.solaris10 Added: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 (rev 0) +++ csw/mgar/gar/v2/lib/map.solaris10 2013-01-04 22:13:40 UTC (rev 20029) @@ -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.2 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.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.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 guillomovitch at users.sourceforge.net Sat Jan 5 12:10:48 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Sat, 05 Jan 2013 11:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[20030] csw/mgar/pkg/cpan Message-ID: Revision: 20030 http://gar.svn.sourceforge.net/gar/?rev=20030&view=rev Author: guillomovitch Date: 2013-01-05 11:10:46 +0000 (Sat, 05 Jan 2013) Log Message: ----------- cpan/Parse-EDID/trunk: initial import Added Paths: ----------- csw/mgar/pkg/cpan/Parse-EDID/ csw/mgar/pkg/cpan/Parse-EDID/branches/ csw/mgar/pkg/cpan/Parse-EDID/tags/ csw/mgar/pkg/cpan/Parse-EDID/trunk/ csw/mgar/pkg/cpan/Parse-EDID/trunk/Makefile csw/mgar/pkg/cpan/Parse-EDID/trunk/checksums csw/mgar/pkg/cpan/Parse-EDID/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Parse-EDID/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Parse-EDID/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Parse-EDID/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Parse-EDID/trunk/Makefile 2013-01-05 11:10:46 UTC (rev 20030) @@ -0,0 +1,19 @@ +NAME = Parse-EDID +VERSION = 1.0.4 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GROUSSE + +DESCRIPTION = Extended display identification data (EDID) parser +define BLURB +This module provides some function to parse Extended Display Identification +Data binary data structures. +endef + +LICENSE = LICENSE +PACKAGES = CSWpm-parse-edid +ARCHALL = 1 + +BUILD_DEP_PKGS += CSWpm-yaml + +include gar/category.mk Added: csw/mgar/pkg/cpan/Parse-EDID/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Parse-EDID/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Parse-EDID/trunk/checksums 2013-01-05 11:10:46 UTC (rev 20030) @@ -0,0 +1 @@ +847bb49668291992f5de832a1cd77cc2 Parse-EDID-1.0.4.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 Sat Jan 5 12:22:49 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Sat, 05 Jan 2013 11:22:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[20031] csw/mgar/pkg/cpan Message-ID: Revision: 20031 http://gar.svn.sourceforge.net/gar/?rev=20031&view=rev Author: guillomovitch Date: 2013-01-05 11:22:49 +0000 (Sat, 05 Jan 2013) Log Message: ----------- cpan/Class-Gomor/trunk: initial import Added Paths: ----------- csw/mgar/pkg/cpan/Class-Gomor/ csw/mgar/pkg/cpan/Class-Gomor/branches/ csw/mgar/pkg/cpan/Class-Gomor/tags/ csw/mgar/pkg/cpan/Class-Gomor/trunk/ csw/mgar/pkg/cpan/Class-Gomor/trunk/Makefile csw/mgar/pkg/cpan/Class-Gomor/trunk/checksums csw/mgar/pkg/cpan/Class-Gomor/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Class-Gomor/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Class-Gomor/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Class-Gomor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Class-Gomor/trunk/Makefile 2013-01-05 11:22:49 UTC (rev 20031) @@ -0,0 +1,17 @@ +NAME = Class-Gomor +VERSION = 1.02 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GOMOR + +DESCRIPTION = Another class and object builder +define BLURB +This module is yet another class builder. This one adds parameter checking in +new constructor, that is to check for attributes existence, and definedness. +endef + +LICENSE = LICENSE +PACKAGES = CSWpm-class-gomor +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Class-Gomor/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Class-Gomor/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Class-Gomor/trunk/checksums 2013-01-05 11:22:49 UTC (rev 20031) @@ -0,0 +1 @@ +287c3b3be72fcb4a4089fe232b8b1002 Class-Gomor-1.02.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 Jan 5 12:58:40 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 05 Jan 2013 11:58:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20032] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20032 http://gar.svn.sourceforge.net/gar/?rev=20032&view=rev Author: pfelecan Date: 2013-01-05 11:58:38 +0000 (Sat, 05 Jan 2013) Log Message: ----------- texlive/trunk: following Maciej recommendation, factorized override for files with bad content for texlive-common, the "collect all" huge package... Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-05 11:22:49 UTC (rev 20031) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-05 11:58:38 UTC (rev 20032) @@ -161,300 +161,7 @@ RUNTIME_DEP_PKGS_CSWtexlive-common += CSWruby RUNTIME_DEP_PKGS_CSWtexlive-common += CSWtexlive-binaries RUNTIME_DEP_PKGS_CSWtexlive-common += CSWperl -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/context/data/scite/scite-context-readme.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/prodint/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/notes/troubleshooting.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/TROUBLESHOOTING -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/oldstandard/oldstand-manual.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/fonts/cm-unicode/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/translation-ecv-de/ecvde.dtx.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/jmlr/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/biblatex/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/latex4wp-it/latex4wp-it.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mathspic/README.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/mathspic/mathspic.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/latex4wp/latex4wp.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/tkz-orm/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/chinese/teTeXb5.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/pdfhowto/HOWTO.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/context/third/context-notes-zh-cn/src/basis.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-installation.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/generic/tex4ht/mn38.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/releasenotes.xml -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.xml -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/pdfjam/PDFjam-README.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/fragmaster/README.de -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/fragmaster/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/support/bundledoc/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/ecv/ecv.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/ecv/ecv.ins -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/listings-ext/listings-ext.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/mftinc/mftinc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/documentation/documentation.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/struktex/struktex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tex4ht/mn-unix.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/tex4ht/mn31.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/dosepsbin/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latexmk/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latexmk/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/latexmk/latexmk.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pdfjam/PDFjam-README.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/fragmaster/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/texdef/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/bundledoc/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/plain/js-misc/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/urlbst.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/bibtex/urlbst/urlbst.html.in -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/cweb-latex/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/pdfpages/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/base/ltdirchk.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/base/docstrip.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/marginnote/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/listings-ext/listings-ext.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/splitindex/install.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/splitindex/install.sh -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amscls/install.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/gridset/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/struktex/struktex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/foilhtml/foilhtml.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/fontspec/fontspec.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amsfonts/amsfndoc.ins -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amsrefs/install.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/aiaa/aiaa.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/thailatex/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/thailatex/configure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/sffms/sffms.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/ltxindex/ltxindex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/geschichtsfrkl/geschichtsfrkl.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/decimal/decimal.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/amsmath/install.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/basque-date/basque-date.ins -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/confproc/confproc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews05.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews03.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews04.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/README.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews07.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews06.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/platex/base/plnews08.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/bibtex/urlbst/configure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/configure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/thumbpdf/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/textopo/textopo.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/prosper/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/inputtrc/inputtrc.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/cmll/cmll.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/latex/texshade/texshade.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/configure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/configure.in -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/ChangeLog.thai-ttf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/source/generic/pst-pdgr/pst-pdgr.ins -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/export/home|root/opt/csw/share/texmf-dist/tex/latex/prosper/red-bullet-on-blue.ps -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/export/home|root/opt/csw/share/texmf-dist/tex/latex/prosper/green-bullet-on-blue.ps -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/otherformats/jadetex/base/index.xml -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-sr/texlive-sr.html -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-sr/texlive-sr.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6a.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6b.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/texlive/texlive-common/examples/ex6c.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/bibtexu/00readme.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/prodint/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/tex/texinfo/texinfo.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/fonts-tlwg/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.10.patch -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/cfr.make.public -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/berenisadf/ff-ybd.pe -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/info/eplain.info -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/doc/info/kpathsea.info -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/fonts/universa/uni.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/startex/base/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf/hbf2gf/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/doc/pedigree.ps -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/support/dosepsbin/configure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/support/texdef/texdef.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/generic/mkjobtexmf/configure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/metapost/expressg/expressg.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/doc/pedigree.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/starfont/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/esstix/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/boondox/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/ChangeLog -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/newtx/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/gnu-freefont/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/pedigree-perl/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/chess/makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/chess/installation -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/hfoldsty/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/cm-unicode/FAQ -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/ptex/base/INSTALL.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/bgteubner/Makefile.hhsubfigure -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/bgteubner/installation.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/vpe/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/jamtimes/jamtimes.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/macros2e/macros2e.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/nameauth/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/tipa-de/tipaman1-de.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/foilhtml/readme.v12 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex-swiss-legal/doc_source/biblatex-swiss-legal.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/biblatex/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/presentations/02-04-1.ltxpd -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/mathspic/README.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/hobete/poster-test.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/japanese/japanese.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/japanese/japanese.jis -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/chinese/teTeXb5.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/chinese/READMEb5.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/dvipdfmx.cfg -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/thaifont.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/history.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/CJK.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/TDS.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/INSTALL -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/cjk/doc/fonts.txt -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/latex/filemod/README -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-base-external.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pgf/text-en/pgfmanual-en-installation.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-electricfield/pst-electricfield-docFR.pdf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-electricfield/pst-electricfield-docDE.pdf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-electricfield/pst-electricfield-docEN.pdf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docDE.pdf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docFR.pdf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/pst-magneticfield/pst-magneticfield-docEN.pdf -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/setouterhbox.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfescape.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/stringenc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/telprint.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/scrindex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypdoc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/resizegather.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/grfext.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/auxhook.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/transparent.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifdraft.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/aliascnt.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/enparen.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/alphalph.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/zref.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/intcalc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypcap.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ltxcmds.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hycolor.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/stampinclude.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/makerobust.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/stackrel.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bigintcalc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pagegrid.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hopatch.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/gettitlestring.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/dvipscol.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/grffile.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/mleftright.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/uniquecounter.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/centernot.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/rotchiffre.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/inputenx.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/colonequals.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bmpsize.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/atenddvi.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/flags.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcol.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/twoopt.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifpdf.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/atveryend.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/classlist.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/catchfile.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdflscape.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/attachfile2.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/epstopdf.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifluatex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/listingsutf8.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfrender.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/picture.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hyphsubst.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bookmark.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypbmsec.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/tabularht.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypgotoe.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/tabularkv.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hypdestopt.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/eolgrab.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/fibnum.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/kvoptions.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/iflang.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hobsub.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/holtxdoc.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/atbegshi.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/refcount.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/askinclude.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/selinput.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/magicnum.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/letltxmacro.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/settobox.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/hologo.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/soulutf8.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/chemarr.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/luatex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/bitset.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pagesel.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/accsupp.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/engord.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/ifvtex.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/infwarerr.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/protecteddef.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/luacolor.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/embedfile.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/oberdiek/etexcmds.dtx -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/tipa/tipaman1.tex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/wsuipa/compilefonts -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/concmath-fonts/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/support/lua-alt-getopt/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/mflogo/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/concmath/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/source/latex/qsymbols/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/bigints/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/plantslabels/doc/tex/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/dashundergaps/doc/tex/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/doc/latex/turnthepage/Makefile -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/bundledoc/arlatex -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/fragmaster/fragmaster.pl -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/chkweb.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/chktex.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/chkweb.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/chktex.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/purifyeps.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/pdfjam.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/man/man1/arlatex.1 -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/info/eplain.info -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf/doc/info/dvips.info -# this is needed even though is mentioned in the corresponding reinplace rule: -CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/share|root/opt/csw/share/texmf-dist/scripts/purifyeps/purifyeps +CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content # I don't know what to do with this: CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/scripts/latexmk/latexmk.pl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 5 13:01:21 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Jan 2013 12:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20033] csw/mgar/gar/v2/lib/python/database.py Message-ID: Revision: 20033 http://gar.svn.sourceforge.net/gar/?rev=20033&view=rev Author: wahwah Date: 2013-01-05 12:01:21 +0000 (Sat, 05 Jan 2013) Log Message: ----------- checkpkg: Mention 'mgar up --all' explicitly 'Application sources' was probably too abstract. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-01-05 11:58:38 UTC (rev 20032) +++ csw/mgar/gar/v2/lib/python/database.py 2013-01-05 12:01:21 UTC (rev 20033) @@ -87,7 +87,7 @@ "the application expects: %s. " % (ldm.GetDatabaseSchemaVersion(), DB_SCHEMA_VERSION)) if DB_SCHEMA_VERSION < ldm.GetDatabaseSchemaVersion(): - msg += "Make sure your application sources are up to date." + msg += "When did you last run 'mgar up --all'?." elif DB_SCHEMA_VERSION > ldm.GetDatabaseSchemaVersion(): msg += ("Make sure your database is up to date. " "Re-create it if necessary.") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Jan 5 13:47:14 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 5 Jan 2013 12:47:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[20019] csw/mgar/pkg/texlive/trunk/Makefile In-Reply-To: References: Message-ID: 2013/1/4 Peter FELECAN : >> Is there a need to list each file separately in this case? You could just write: >> >> CHECKPKG_OVERRIDES_CSWtexlive-common += file-with-bad-content >> >> ...and that would match all the file-with-bad-content error tags in >> texlive-common. > > Thank you. This is exactly what I looked after but didn't succeed to > find. Where is this documented? The wiki, section Overrides ? in GAR. http://wiki.opencsw.org/checkpkg#toc7 From maciej at opencsw.org Sat Jan 5 13:51:58 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 5 Jan 2013 12:51:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20027] csw/mgar/gar/v2 In-Reply-To: References: Message-ID: Yann, this change is not a merge, it reverts all the recent changes. Contact me ASAP to get this sorted out. From chninkel at users.sourceforge.net Sat Jan 5 14:25:15 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 05 Jan 2013 13:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20034] csw/mgar/gar/v2 Message-ID: Revision: 20034 http://gar.svn.sourceforge.net/gar/?rev=20034&view=rev Author: chninkel Date: 2013-01-05 13:25:15 +0000 (Sat, 05 Jan 2013) Log Message: ----------- gar/v2: reversed new checkpkgs test commit to be able to re-apply it properly Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py csw/mgar/gar/v2/lib/python/testdata/neon_stats.py csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2/lib/python/testdata/tree_stats.py Added Paths: ----------- csw/mgar/gar/v2/lib/map.solaris10 Removed Paths: ------------- csw/mgar/gar/v2/lib/map.solaris10 csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 /csw/mgar/gar/v2-yann:19236-20023 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Deleted: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/map.solaris10 2013-01-05 13:25:15 UTC (rev 20034) @@ -1,7 +0,0 @@ -# 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.2 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.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.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; Copied: csw/mgar/gar/v2/lib/map.solaris10 (from rev 20026, csw/mgar/gar/v2/lib/map.solaris10) =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 (rev 0) +++ csw/mgar/gar/v2/lib/map.solaris10 2013-01-05 13:25:15 UTC (rev 20034) @@ -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.2 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.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.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; Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -34,7 +34,6 @@ 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/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/database.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -10,7 +10,7 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 8L +DB_SCHEMA_VERSION = 7L TABLES_THAT_NEED_UPDATES = (m.CswFile,) TABLES = TABLES_THAT_NEED_UPDATES + ( m.Architecture, @@ -159,8 +159,8 @@ except sqlobject.dberrors.OperationalError, e: logging.error("Could not create table %r: %s", table, e) raise + - def InitialDataImport(self): """Imports initial data into the db. @@ -289,7 +289,7 @@ logging.warning("Could not get file mtime: %s", e) d_mtime = time.gmtime(int(d_mtime_epoch)) logging.debug("IsDatabaseUpToDate: f_mtime %s, d_time: %s", f_mtime, d_mtime) - # Rounding up to integer seconds. There is a race condition: + # Rounding up to integer seconds. There is a race condition: # pkgadd finishes at 100.1 # checkpkg reads /var/sadm/install/contents at 100.2 # new pkgadd runs and finishes at 100.3 Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -29,44 +29,20 @@ ) 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",)), ) 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'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 = { - "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, 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. @@ -167,71 +143,10 @@ 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): - 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... - # 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']): - db_libs.add(syminfo['soname']) - no_db_libs = db_libs.symmetric_difference(binary_info["needed sonames"]) - - 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(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)) - - - 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']]): - 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: @@ -276,8 +191,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. @@ -291,8 +206,7 @@ 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: @@ -304,8 +218,7 @@ 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 @@ -319,7 +232,6 @@ 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. @@ -330,13 +242,11 @@ 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/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -10,8 +10,6 @@ import subprocess import ldd_emul import configuration as c -import time -import signal """This file isolates code dependent on hachoir parser. @@ -37,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"]) @@ -78,37 +76,7 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info -class TimeoutExpired(Exception): - pass -def TimeoutHandler(signum, frame): - raise TimeoutExpired - -def ShellCommand(args, env=None, timeout=None): - logging.debug("Running: %s", args) - proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - env=env, - preexec_fn=os.setsid) - # Python 3.3 have the timeout option - # we have to roughly emulate it with python 2.x - if timeout: - signal.signal(signal.SIGALRM, TimeoutHandler) - signal.alarm(timeout) - - try: - stdout, stderr = proc.communicate() - signal.alarm(0) - except TimeoutExpired: - os.kill(-proc.pid, signal.SIGKILL) - msg = "Process %s killed after timeout expiration" % args - raise TimeoutExpired(msg) - - retcode = proc.wait() - return retcode, stdout, stderr - - class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -192,8 +160,7 @@ 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: @@ -214,11 +181,13 @@ 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) args = [common_constants.DUMP_BIN, "-Lv", binary_abs_path] - retcode, stdout, stderr = ShellCommand(args, env) + logging.debug("Running: %s", args) + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary if basedir: @@ -242,7 +211,7 @@ defined_symbols = {} for binary in binaries: - binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) + binary_abspath = os.path.join(self.directory, "root", binary) # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] nm_proc = subprocess.Popen( @@ -267,268 +236,41 @@ return defined_symbols - def GetBinaryElfInfo(self): - """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. - - 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 - - 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, self.GetFilesDir(), binary) - # elfdump is the only tool that give us all informations - args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] - retcode, stdout, stderr = ShellCommand(args) - if retcode or stderr: - # we ignore for now these elfdump errors which can be catched - # later by check functions, - ignored_error_re = re.compile( - r"""[^:]+:(\s\.((SUNW_l)?dynsym|symtab):\s - (index\[\d+\]:\s - (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\slies - \swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) - - |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)? - :\ssymbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) - \slies\soutside\sof\scontaining\ssection - - |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) - - |invalid\ssh_link:\s0) - - |\smemory\soverlap\sbetween\ssection\[\d+\]:\s[^:]+:\s - [0-9a-f]+:[0-9a-f]+\sand\ssection\[\d+\]:\s[^:]+: - \s[0-9a-f]+:[0-9a-f]+) - \n""", - re.VERBOSE) - - stderr = re.sub(ignored_error_re, "", stderr) - if stderr: - msg = "%s returned one or more errors: %s" % (args, stderr) - raise package.Error(msg) - elfdump_out = stdout.splitlines() - - symbols = {} - binary_info = {'version definition': [], - 'version needed': []} - - cur_section = None - for line in elfdump_out: - - elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) - - # header or blank line contains no information - if not elf_info: - continue - - # symbol table and syminfo section store various informations - # 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: - 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, e.g.: - # libc.so.1 SUNW_1.1 - # SUNWprivate_1.1 - # 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'] - - # soname version needed are usually displayed sorted by index ... - # but that's not always the case :( so we have to reorder - # the list by index if they are present - if any ( v['index'] for v in binary_info['version needed'] ): - binary_info['version needed'].sort(key=lambda m: int(m['index'])) - for version in binary_info['version needed']: - del version['index'] - - # 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['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 output - self._ResolveSymbolsVersionInfo(binary_info) - - binaries_elf_info[binary] = binary_info - - return binaries_elf_info - def GetLddMinusRlines(self): """Returns ldd -r output.""" - binaries = self.ListBinaries() + dir_pkg = self.GetInspectivePkg() + binaries = dir_pkg.ListBinaries() ldd_output = {} for binary in binaries: - binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) + binary_abspath = os.path.join(dir_pkg.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", "-Ur", binary_abspath] - # ldd can be stuck while ran on a some binaries, so we define - # a timeout (problem encountered with uconv) - retcode, stdout, stderr = ShellCommand(args, timeout=10) + args = ["ldd", "-r", binary_abspath] + ldd_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = ldd_proc.communicate() + retcode = ldd_proc.wait() if retcode: - # There three cases where we will ignore an ldd error - # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 - # solaris 9 exists only in 32 bits, so we can't do this - # We ignore the error as it is likely that the ldd infos will be - # the same on the 32 bits binaries - # - if we are trying to analyze a binary from another architecture - # we ignore this error as it will be caught by another checkpkg test - # - if we are trying to analyze a statically linked binaries - # we care only about dynamic binary so we ignore the error - # - 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) or - re.search(r'ELF machine type: EM_\w+: ' - r'is incompatible with system', stderr) - or 'file is not a dynamic executable or shared object' in stderr): - ldd_output[binary] = [] - continue - - raise package.Error("%s returned an error: %s" % (args, stderr)) - + logging.error("%s returned an error: %s", args, stderr) ldd_info = [] for line in stdout.splitlines(): - result = self._ParseLddDashRline(line, binary_abspath) - if result: - ldd_info.append(result) - ldd_output[binary] = ldd_info - + ldd_info.append(self._ParseLddDashRline(line)) + 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 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']) - - for sym_info in binary_info['symbol 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 - version_index = int(sym_info['version']) - 2 - if version_index >= 0: - version = version_info[version_index] - sym_info['version'] = version['version'] - 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('soname') - sym_info.setdefault('flags') - - def _ParseElfdumpLine(self, line, section=None): - - headers_re = ( - r""" - (?P
Version\sNeeded|Symbol\sTable # Section header - |Version\sDefinition|Syminfo) - \sSection: - \s+(?:\.SUNW_version|\.gnu\.version_[rd] - |\.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\sto\s+symbol\s*$ # Syminfo header - - |\s*$ # There is always a blank - # line before a new section - """) - - re_by_section = { - 'version definition': (r""" - \s*(?:\[\d+\]\s+)? # index: might be not present if no - # version binding is enabled - (?P\S+) # version - (?:\s+(?P\S+))? # dependency - (?:\s+\[\s(?:BASE|WEAK)\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 there is no - # confusion with version - (?P\S+) # version - (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # - """), - 'symbol table': (r""" - \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+\]) # index - \s+(?P[ABCDFILNPS]+) # flags - - \s+(?:(?:\[\d+\] # bound to: contains either - \s+(?P\S+)|)\s+)? # - library index and library name - # - for non external symbols - - (?P\S+)\s* # symbol - """)} - - elfdump_data = None - 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, re.VERBOSE) - 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): + def _ParseLddDashRline(self, line): 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+)\)") @@ -541,35 +283,16 @@ r'with STV_PROTECTED visibility$') sizes_differ = (r'^\trelocation \S+ sizes differ: ' r'(?P\S+)$') - sizes_info = (r'^\t\t\(file (?P\S+)' - r' 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.*);' - r' unused dependency of (?P.*)$') - unused_object = (r'^\s*unused object=.*$') - unused_search_path = (r'^\s*unused search path=.*' - r' \(RUNPATH/RPATH from file .*\)$') - move_offset_error = (r'^\tmove (?P\d+) offset invalid: ' - r'\(unknown\): offset=(?P0x[0-9a-f]+) ' - 'lies outside memory image; move discarded') - relocation_error = (r'relocation R_(386|AMD64|X86_64|SPARC)_\w+ ' - r'sizes differ: (?P.*)' - r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .*' - r'size=0x(?:[0-9a-f]+)?\)' - r'|\t.* size used; possible data truncation') - blank_line = (r'^\s*$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" + 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, unused_object, - unused_search_path, blank_line, move_offset_error, - relocation_error)) + stv_protected, sizes_differ, sizes_info, sizes_one_used)) m = re.match(common_re, line) - response = None + response = {} if m: - response = {} d = m.groupdict() if "soname" in d and d["soname"]: # it was found @@ -582,11 +305,6 @@ 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 @@ -598,8 +316,7 @@ 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,23 +335,12 @@ response["soname"] = None response["path"] = "%s" % (d["sizediffused_file"]) response["symbol"] = None - elif d["move_offset"]: - response["state"] = 'move-offset-error' - response["soname"] = None - response["path"] = None - response["symbol"] = None - response["move_offset"] = d['move_offset'] - response["move_index"] = d['move_index'] - elif d["reloc_symbol"]: - response["state"] = 'relocation-issue' - response["soname"] = None - response["path"] = None - response["symbol"] = d['reloc_symbol'] - + else: + raise StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) else: - raise package.StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) - + raise StdoutSyntaxError("Could not parse %s with %s" + % (repr(line), common_re)) return response def GetDependencies(self): @@ -703,9 +409,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): @@ -740,7 +446,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.", @@ -760,7 +466,6 @@ # 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() Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -6,7 +6,6 @@ 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) @@ -70,136 +69,11 @@ self.assertEqual([u'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): 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', - 'soname': 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', - 'symbol': 'vsf_log_line', - 'version': '1', - 'type': 'FUNC', - } - 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', - 'soname': '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', - 'soname': 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/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/package.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -42,8 +42,6 @@ class PackageError(Error): pass -class StdoutSyntaxError(Error): - pass class CswSrv4File(shell.ShellMixin, object): """Represents a package in the srv4 format (pkg).""" @@ -279,7 +277,7 @@ basedir = pkginfo[basedir_id] else: basedir = "" - # The convention in checkpkg is to not include the leading slash in paths. + # The convention in checkpkg is to not include the leading slash in paths. basedir = basedir.lstrip("/") return basedir Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -25,8 +25,6 @@ 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 @@ -500,13 +498,6 @@ 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', 'shndx': 'UNDEF', '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'], @@ -535,13 +526,6 @@ 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', 'shndx': 'UNDEF', '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'], @@ -570,15 +554,6 @@ 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', - 'shndx': 'UNDEF', - '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'], @@ -616,15 +591,6 @@ 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', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] - } - } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn({ }) self.error_mgr_mock.GetPkgByPath( @@ -668,15 +634,6 @@ }], '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', 'shndx': 'UNDEF', 'bind': 'GLOB' }, - ] - } - }, 'pkgmap': [], 'files_metadata': [ {'endian': 'Little endian', @@ -693,7 +650,6 @@ 'binaries_dump_info': [], 'depends': [], 'isalist': (), - 'ldd_info': {}, 'pkgmap': [], } @@ -731,20 +687,6 @@ # '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', 'shndx': 'UNDEF', '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', }, @@ -770,16 +712,6 @@ 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', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] - } - } self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libbar.so').AndReturn({ u'/opt/csw/lib': [u'CSWlibbar'], u'/opt/csw/lib/sparcv9': [u'CSWlibbar'], @@ -806,16 +738,6 @@ 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', 'shndx': 'UNDEF', 'bind': 'GLOB' } - ] - } - } self.error_mgr_mock.GetPathsAndPkgnamesByBasename( 'libnotfound.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath( @@ -1411,174 +1333,7 @@ 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 bound 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 bound to soname ' + soname) - - class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckWrongArchitecture' def testSparcBinariesInIntelPackage(self): Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -208,8 +208,6 @@ "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)) @@ -381,12 +379,7 @@ line_u = pkgmap_entry["line"].decode("latin1") f_path, basename = os.path.split( pkgmap_entry["path"].decode('latin1')) - except UnicodeEncodeError, e: - # the line was already in unicode - line_u = pkgmap_entry['line'] - f_path, basename = os.path.split(pkgmap_entry["path"]) # If this fails too, code change will be needed. - f = m.CswFile( basename=basename, path=f_path, Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -60,8 +60,6 @@ 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/lib/python/testdata/apr_util_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -207,40 +207,6 @@ '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/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -745,68 +745,6 @@ '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, Deleted: csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -1,208 +0,0 @@ -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', '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': [], - '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/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -111,47 +111,6 @@ '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', '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', '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', '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' }, - ], - }, - }, 'overrides': [], 'pkginfo': {'ARCH': 'sparc', 'CATEGORY': 'application', Modified: csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -56,21 +56,6 @@ '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', 'shndx': 'UNDEF', '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/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -86,39 +86,6 @@ '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', '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), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -31,8 +31,6 @@ '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/lib/python/testdata/mercurial_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -703,37 +703,6 @@ '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/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -163,27 +163,6 @@ '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/lib/python/testdata/rsync_pkg_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -74,45 +74,17 @@ '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', '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', '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' }, - ] - } - }, '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', @@ -121,8 +93,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, @@ -131,65 +103,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/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-01-05 12:01:21 UTC (rev 20033) +++ csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-01-05 13:25:15 UTC (rev 20034) @@ -71,349 +71,317 @@ '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', 'shndx': 'UNDEF', 'bind': 'GLOB' } ], - }, - 'opt/csw/sbin/visudo': { - 'version definition': [], - 'version needed': [], - 'symbol table': [ - { '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' }, - ], - } - }, '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', @@ 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 guillomovitch at users.sourceforge.net Sat Jan 5 15:13:44 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Sat, 05 Jan 2013 14:13:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20035] csw/mgar/pkg/cpan/Socket6/trunk/Makefile Message-ID: Revision: 20035 http://gar.svn.sourceforge.net/gar/?rev=20035&view=rev Author: guillomovitch Date: 2013-01-05 14:13:43 +0000 (Sat, 05 Jan 2013) Log Message: ----------- rename to match current naming policy Modified Paths: -------------- csw/mgar/pkg/cpan/Socket6/trunk/Makefile Modified: csw/mgar/pkg/cpan/Socket6/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Socket6/trunk/Makefile 2013-01-05 13:25:15 UTC (rev 20034) +++ csw/mgar/pkg/cpan/Socket6/trunk/Makefile 2013-01-05 14:13:43 UTC (rev 20035) @@ -4,14 +4,17 @@ GARTYPE = v2 AUTHOR = UMEMOTO -DESCRIPTION = IPv6 related part of the C socket.h defines and structure manipulators +DESCRIPTION = Getaddrinfo/getnameinfo support module define BLURB - This module provides glue routines to the various IPv6 functions. - If you use the Socket6 module, be sure to specify "use Socket" as well - as "use Socket6". +This module provides glue routines to the various IPv6 functions. endef -PACKAGES = CSWpmsocket6 -CATALOGNAME = pm_socket6 +LICENSE_TEXT = The license for this package is unknown +PACKAGES += CSWpm-socket6 +CATALOGNAME_CSWpm-socket6 = pm_socket6 +SPKG_DESC_CSWpm-socket6 = Getaddrinfo/getnameinfo support module +OBSOLETED_BY_CSWpm-socket6 += CSWpmsocket6 +CATALOGNAME_CSWpmsocket6 = pm_socket6_stub + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Sat Jan 5 15:21:58 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Sat, 05 Jan 2013 14:21:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[20036] csw/mgar/pkg/cpan/Net-Pcap/trunk Message-ID: Revision: 20036 http://gar.svn.sourceforge.net/gar/?rev=20036&view=rev Author: guillomovitch Date: 2013-01-05 14:21:58 +0000 (Sat, 05 Jan 2013) Log Message: ----------- new version, renamed to match current naming policy Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2013-01-05 14:13:43 UTC (rev 20035) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2013-01-05 14:21:58 UTC (rev 20036) @@ -1,23 +1,27 @@ NAME = Net-Pcap -VERSION = 0.16 +VERSION = 0.17 CATEGORIES = cpan GARTYPE = v2 AUTHOR = SAPER DESCRIPTION = Interface to pcap(3) LBL packet capture library define BLURB - Net::Pcap is a Perl binding to the LBL pcap(3) library. - The README for libpcap describes itself as: +Net::Pcap is a Perl binding to the LBL pcap(3) library and its Win32 +counterpart, the WinPcap library. Pcap (packet capture) is a portable API to +capture network packet: it allows applications to capture packets at +link-layer, bypassing the normal protocol stack. It also provides +features like kernel-level packet filtering and access to internal +statistics. endef -PACKAGES = CSWpmnetpcap -CATALOGNAME = pm_netpcap +LICENSE_TEXT = This module is licensed under the perl license -# add a proper license - LICENSE = $(FILEDIR)/LICENSE +PACKAGES += CSWpm-net-pcap +CATALOGNAME_CSWpm-net-pcap = pm_net_pcap +SPKG_DESC_CSWpm-net-pcap = Interface to pcap(3) LBL packet capture library +OBSOLETED_BY_CSWpm-net-pcap += CSWpmnetpcap +CATALOGNAME_CSWpmnetpcap = pm_netpcap_stub -# depends -RUNTIME_DEP_PKGS = CSWlibpcap -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibpcapdevel +RUNTIME_DEP_PKGS_CSWpm-net-pcap += CSWlibpcap1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums 2013-01-05 14:13:43 UTC (rev 20035) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums 2013-01-05 14:21:58 UTC (rev 20036) @@ -1 +1 @@ -b150d8e0a40137fad2a7df792d80cab4 Net-Pcap-0.16.tar.gz +fbe911ba5f57d5ba43494434ffb828a0 Net-Pcap-0.17.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 Jan 5 16:35:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 05 Jan 2013 15:35:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20037] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20037 http://gar.svn.sourceforge.net/gar/?rev=20037&view=rev Author: chninkel Date: 2013-01-05 15:35:32 +0000 (Sat, 05 Jan 2013) Log Message: ----------- gar/v2: re-added new checkpkg tests: soname-unused, no-direct-binding and forbidden-version-interface-dependencies Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py csw/mgar/gar/v2/lib/python/database.py csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py csw/mgar/gar/v2/lib/python/testdata/neon_stats.py csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2/lib/python/testdata/tree_stats.py Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/database.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -10,7 +10,7 @@ import system_pkgmap CONFIG_DB_SCHEMA = "db_schema_version" -DB_SCHEMA_VERSION = 7L +DB_SCHEMA_VERSION = 9L TABLES_THAT_NEED_UPDATES = (m.CswFile,) TABLES = TABLES_THAT_NEED_UPDATES + ( m.Architecture, @@ -159,8 +159,8 @@ except sqlobject.dberrors.OperationalError, e: logging.error("Could not create table %r: %s", table, e) raise - + def InitialDataImport(self): """Imports initial data into the db. @@ -289,7 +289,7 @@ logging.warning("Could not get file mtime: %s", e) d_mtime = time.gmtime(int(d_mtime_epoch)) logging.debug("IsDatabaseUpToDate: f_mtime %s, d_time: %s", f_mtime, d_mtime) - # Rounding up to integer seconds. There is a race condition: + # Rounding up to integer seconds. There is a race condition: # pkgadd finishes at 100.1 # checkpkg reads /var/sadm/install/contents at 100.2 # new pkgadd runs and finishes at 100.3 Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -39,6 +39,29 @@ 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'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 = { + "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 +170,67 @@ 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... + # 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']): + db_libs.add(syminfo['soname']) + no_db_libs = db_libs.symmetric_difference(binary_info["needed sonames"]) + + 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(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)) + + + 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']]): + 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/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -10,6 +10,8 @@ import subprocess import ldd_emul import configuration as c +import time +import signal """This file isolates code dependent on hachoir parser. @@ -76,7 +78,37 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info +class TimeoutExpired(Exception): + pass +def TimeoutHandler(signum, frame): + raise TimeoutExpired + +def ShellCommand(args, env=None, timeout=None): + logging.debug("Running: %s", args) + proc = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env, + preexec_fn=os.setsid) + # Python 3.3 have the timeout option + # we have to roughly emulate it with python 2.x + if timeout: + signal.signal(signal.SIGALRM, TimeoutHandler) + signal.alarm(timeout) + + try: + stdout, stderr = proc.communicate() + signal.alarm(0) + except TimeoutExpired: + os.kill(-proc.pid, signal.SIGKILL) + msg = "Process %s killed after timeout expiration" % args + raise TimeoutExpired(msg) + + retcode = proc.wait() + return retcode, stdout, stderr + + class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -184,10 +216,7 @@ 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(args, env) binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary if basedir: @@ -211,7 +240,7 @@ defined_symbols = {} for binary in binaries: - binary_abspath = os.path.join(self.directory, "root", binary) + binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] nm_proc = subprocess.Popen( @@ -236,29 +265,152 @@ return defined_symbols + def GetBinaryElfInfo(self): + """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. + + 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 + - 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, self.GetFilesDir(), binary) + # elfdump is the only tool that give us all informations + args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] + retcode, stdout, stderr = ShellCommand(args) + if retcode or stderr: + # we ignore for now these elfdump errors which can be catched + # later by check functions, + ignored_error_re = re.compile( + r"""[^:]+:(\s\.((SUNW_l)?dynsym|symtab):\s + (index\[\d+\]:\s + (suspicious\s(local|global)\ssymbol\sentry:\s[^:]+:\slies + \swithin\s(local|global)\ssymbol\srange\s\(index\s[<>=]+\s\d+\) + + |bad\ssymbol\sentry:\s[^:]+:\ssection\[\d+\]\ssize:\s0(x[0-9a-f]+)? + :\ssymbol\s\(address\s0x[0-9a-f]+,\ssize\s0x[0-9a-f]+\) + \slies\soutside\sof\scontaining\ssection + + |bad\ssymbol\sentry:\s:\sinvalid\sshndx:\s\d+) + + |invalid\ssh_link:\s0) + + |\smemory\soverlap\sbetween\ssection\[\d+\]:\s[^:]+:\s + [0-9a-f]+:[0-9a-f]+\sand\ssection\[\d+\]:\s[^:]+: + \s[0-9a-f]+:[0-9a-f]+) + \n""", + re.VERBOSE) + + stderr = re.sub(ignored_error_re, "", stderr) + if stderr: + msg = "%s returned one or more errors: %s" % (args, stderr) + raise package.Error(msg) + elfdump_out = stdout.splitlines() + + symbols = {} + binary_info = {'version definition': [], + 'version needed': []} + + cur_section = None + for line in elfdump_out: + + elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) + + # header or blank line contains no information + if not elf_info: + continue + + # symbol table and syminfo section store various informations + # 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: + 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, e.g.: + # libc.so.1 SUNW_1.1 + # SUNWprivate_1.1 + # 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'] + + # soname version needed are usually displayed sorted by index ... + # but that's not always the case :( so we have to reorder + # the list by index if they are present + if any ( v['index'] for v in binary_info['version needed'] ): + binary_info['version needed'].sort(key=lambda m: int(m['index'])) + for version in binary_info['version needed']: + del version['index'] + + # 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['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 output + self._ResolveSymbolsVersionInfo(binary_info) + + 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, self.GetFilesDir(), 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] - ldd_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = ldd_proc.communicate() - retcode = ldd_proc.wait() + args = ["ldd", "-Ur", binary_abspath] + # ldd can be stuck while ran on a some binaries, so we define + # a timeout (problem encountered with uconv) + retcode, stdout, stderr = ShellCommand(args, timeout=10) if retcode: - logging.error("%s returned an error: %s", args, stderr) + # There three cases where we will ignore an ldd error + # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 + # solaris 9 exists only in 32 bits, so we can't do this + # We ignore the error as it is likely that the ldd infos will be + # the same on the 32 bits binaries + # - if we are trying to analyze a binary from another architecture + # we ignore this error as it will be caught by another checkpkg test + # - if we are trying to analyze a statically linked binaries + # we care only about dynamic binary so we ignore the error + # + 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) or + re.search(r'ELF machine type: EM_\w+: ' + r'is incompatible with system', stderr) + or 'file is not a dynamic executable or shared object' in stderr): + ldd_output[binary] = [] + continue + + raise package.Error("%s returned an error: %s" % (args, stderr)) + ldd_info = [] for line in stdout.splitlines(): - ldd_info.append(self._ParseLddDashRline(line)) - ldd_output[binary] = ldd_info + result = self._ParseLddDashRline(line, binary_abspath) + if result: + ldd_info.append(result) + ldd_output[binary] = ldd_info + return ldd_output def _ParseNmSymLine(self, line): @@ -270,7 +422,111 @@ sym = { 'address': fields[0], 'type': fields[1], 'name': fields[2] } return sym - def _ParseLddDashRline(self, line): + def _ResolveSymbolsVersionInfo(self, binary_info): + + 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 + # 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 + version_index = int(sym_info['version']) - 2 + if version_index >= 0: + version = version_info[version_index] + sym_info['version'] = version['version'] + 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('soname') + sym_info.setdefault('flags') + + def _ParseElfdumpLine(self, line, section=None): + + headers_re = ( + r""" + (?P
Version\sNeeded|Symbol\sTable # Section header + |Version\sDefinition|Syminfo) + \sSection: + \s+(?:\.SUNW_version|\.gnu\.version_[rd] + |\.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\sto\s+symbol\s*$ # Syminfo header + + |\s*$ # There is always a blank + # line before a new section + """) + + re_by_section = { + 'version definition': (r""" + \s*(?:\[\d+\]\s+)? # index: might be not present if no + # version binding is enabled + (?P\S+) # version + (?:\s+(?P\S+))? # dependency + (?:\s+\[\s(?:BASE|WEAK)\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 there is no + # confusion with version + (?P\S+) # version + (?:\s+\[\s(?:INFO|WEAK)\s\])?\s*$ # + """), + 'symbol table': (r""" + \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+\]) # index + \s+(?P[ABCDFILNPS]+) # flags + + \s+(?:(?:\[\d+\] # bound to: contains either + \s+(?P\S+)|)\s+)? # - library index and library name + # - for non external symbols + + (?P\S+)\s* # symbol + """)} + + elfdump_data = None + 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, re.VERBOSE) + 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+)\)") @@ -283,16 +539,35 @@ 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+)' + r' 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$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)" + unreferenced_object = (r'^\s*unreferenced object=(?P.*);' + r' unused dependency of (?P.*)$') + unused_object = (r'^\s*unused object=.*$') + unused_search_path = (r'^\s*unused search path=.*' + r' \(RUNPATH/RPATH from file .*\)$') + move_offset_error = (r'^\tmove (?P\d+) offset invalid: ' + r'\(unknown\): offset=(?P0x[0-9a-f]+) ' + 'lies outside memory image; move discarded') + relocation_error = (r'relocation R_(386|AMD64|X86_64|SPARC)_\w+ ' + r'sizes differ: (?P.*)' + r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .*' + r'size=0x(?:[0-9a-f]+)?\)' + r'|\t.* size used; possible data truncation') + blank_line = (r'^\s*$') + common_re = (r"(%s|%s|%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)) + stv_protected, sizes_differ, sizes_info, + sizes_one_used, unreferenced_object, unused_object, + unused_search_path, blank_line, move_offset_error, + relocation_error)) 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 @@ -305,6 +580,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 @@ -335,12 +615,23 @@ 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)) + elif d["move_offset"]: + response["state"] = 'move-offset-error' + response["soname"] = None + response["path"] = None + response["symbol"] = None + response["move_offset"] = d['move_offset'] + response["move_index"] = d['move_index'] + elif d["reloc_symbol"]: + response["state"] = 'relocation-issue' + response["soname"] = None + response["path"] = None + response["symbol"] = d['reloc_symbol'] + 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/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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) @@ -68,12 +69,132 @@ } self.assertEqual([u'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): 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', + 'soname': 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', + 'symbol': 'vsf_log_line', + 'version': '1', + 'type': 'FUNC', + } + 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', + 'soname': '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', + 'soname': 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/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/package.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', + 'shndx': 'UNDEF', + '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', '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', 'shndx': 'UNDEF', 'bind': 'GLOB' } + ] + } + } self.error_mgr_mock.GetPathsAndPkgnamesByBasename( 'libnotfound.so').AndReturn({}) self.error_mgr_mock.GetPkgByPath( @@ -1333,7 +1411,174 @@ 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 bound 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 bound to soname ' + soname) + + class TestCheckWrongArchitecture(CheckTestHelper, unittest.TestCase): FUNCTION_NAME = 'CheckWrongArchitecture' def testSparcBinariesInIntelPackage(self): Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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)) @@ -379,7 +381,12 @@ line_u = pkgmap_entry["line"].decode("latin1") f_path, basename = os.path.split( pkgmap_entry["path"].decode('latin1')) + except UnicodeEncodeError, e: + # the line was already in unicode + line_u = pkgmap_entry['line'] + f_path, basename = os.path.split(pkgmap_entry["path"]) # If this fails too, code change will be needed. + f = m.CswFile( basename=basename, path=f_path, Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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/lib/python/testdata/apr_util_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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, Modified: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -111,6 +111,48 @@ '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', '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', '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', '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' }, + ], + }, + }, 'overrides': [], 'pkginfo': {'ARCH': 'sparc', 'CATEGORY': 'application', Modified: csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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', 'shndx': 'UNDEF', '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/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -86,6 +86,41 @@ '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', '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), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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/lib/python/testdata/mercurial_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -703,6 +703,41 @@ '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/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -163,6 +163,34 @@ '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/lib/python/testdata/rsync_pkg_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -74,6 +74,36 @@ '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', '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', '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' }, + ] + } + }, '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/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -71,6 +71,27 @@ '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', 'shndx': 'UNDEF', 'bind': 'GLOB' } ], + }, + 'opt/csw/sbin/visudo': { + 'version definition': [], + 'version needed': [], + 'symbol table': [ + { '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' }, + ], + } + }, 'mtime': datetime.datetime(2010, 3, 2, 22, 34, 40), 'overrides': [], 'pkgchk': {'return_code': 0, @@ -292,6 +313,21 @@ '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', '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' }, + ] + } + }, 'mtime': datetime.datetime(2010, 3, 2, 22, 34, 39), 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2/lib/python/testdata/tree_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-01-05 14:21:58 UTC (rev 20036) +++ csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-01-05 15:35:32 UTC (rev 20037) @@ -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', + 'shndx': 'UNDEF', + '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 guillomovitch at users.sourceforge.net Sat Jan 5 19:58:55 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Sat, 05 Jan 2013 18:58:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[20038] csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Message-ID: Revision: 20038 http://gar.svn.sourceforge.net/gar/?rev=20038&view=rev Author: guillomovitch Date: 2013-01-05 18:58:55 +0000 (Sat, 05 Jan 2013) Log Message: ----------- set UPSTREAM_MASTER_SITES to forge.fusioninventory.org, as CPAN URL doesn't work Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2013-01-05 15:35:32 UTC (rev 20037) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2013-01-05 18:58:55 UTC (rev 20038) @@ -21,6 +21,8 @@ DISTFILES += fusioninventory-agent.cron DISTFILES += fusioninventory-agent.default +UPSTREAM_MASTER_SITES = http://forge.fusioninventory.org/projects/fusioninventory-agent/files + LICENSE = LICENSE PACKAGES = CSWfusioninventory-agent 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 Jan 6 16:27:51 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 06 Jan 2013 15:27:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20039] csw/mgar/gar/v2/lib/python/testdata Message-ID: Revision: 20039 http://gar.svn.sourceforge.net/gar/?rev=20039&view=rev Author: chninkel Date: 2013-01-06 15:27:51 +0000 (Sun, 06 Jan 2013) Log Message: ----------- gar/v2: added test data for new checkpkg tests Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py Added: csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-01-06 15:27:51 UTC (rev 20039) @@ -0,0 +1,296 @@ +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}], + 'binaries_elf_info': {'opt/csw/bin/cadaver': {'symbol table': [{'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libcurses.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libnsl.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libsocket.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libz.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libdl.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libreadline.so.6', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libintl.so.8', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libneon.so.27', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libncurses.so.5', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libiconv.so.2', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libmp.so.2', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libmd.so.1', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libm.so.2', + 'symbol': 'foo'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libexpat.so.1', + 'symbol': 'foo'}], + 'version definition': [], + 'version needed': []}}, + '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': [{'path': None, + 'soname': 'libcurses.so.1', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libnsl.so.1', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libsocket.so.1', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libz.so.1', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libssl.so.1.0.0', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libcrypto.so.1.0.0', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libdl.so.1', + 'state': 'soname-unused', + 'symbol': None}, + {'path': None, + 'soname': 'libexpat.so.1', + 'state': 'soname-unused', + 'symbol': None}]}, + '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}, + {'class': None, + 'group': 'bin', + 'line': '1 f none /opt/csw/bin/cadaver 0755 root bin 127432 5422 1339017365', + 'mode': '0755', + 'path': '/opt/csw/bin/cadaver', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/cadaver 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/doc/cadaver', + 'type': 'd', + 'user': 'root'}, + {'class': None, + 'group': 'bin 1791 7810 1339017366', + 'line': '1 f none /opt/csw/share/doc/cadaver/changelog.CSW 0755 root bin 1791 7810 1339017366', + 'mode': '0755', + 'path': '/opt/csw/share/doc/cadaver/changelog.CSW', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/cadaver/license 0644 root bin 17982 28433 1339017365', + 'mode': '0644', + 'path': '/opt/csw/share/doc/cadaver/license', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 d none /opt/csw/share/doc/cadaver_stub 0755 root bin', + 'mode': '0755', + 'path': '/opt/csw/share/doc/cadaver_stub', + 'type': 'd', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 f none /opt/csw/share/doc/cadaver_stub/changelog.CSW 0644 root bin 1791 7810 1339017366', + 'mode': '0644', + 'path': '/opt/csw/share/doc/cadaver_stub/changelog.CSW', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 f none /opt/csw/share/locale/en at quot/LC_MESSAGES/cadaver.mo 0644 root bin 32658 7633 1339017365', + 'mode': '0644', + 'path': '/opt/csw/share/locale/en at quot/LC_MESSAGES/cadaver.mo', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 f none /opt/csw/share/locale/es/LC_MESSAGES/cadaver.mo 0644 root bin 13554 44368 1339017365', + 'mode': '0644', + 'path': '/opt/csw/share/locale/es/LC_MESSAGES/cadaver.mo', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': 'bin', + 'line': '1 f none /opt/csw/share/locale/it/LC_MESSAGES/cadaver.mo 0644 root bin 13689 56410 1339017365', + 'mode': '0644', + 'path': '/opt/csw/share/locale/it/LC_MESSAGES/cadaver.mo', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': '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, + 'group': 'bin', + 'line': '1 f none /opt/csw/share/man/man1/cadaver.1 0644 root bin 4586 7373 1339017365', + 'mode': '0644', + 'path': '/opt/csw/share/man/man1/cadaver.1', + 'type': 'f', + 'user': 'root'}, + {'class': None, + 'group': None, + 'line': '1 i copyright 71 6651 1339017365', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i depend 452 39068 1339017371', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}, + {'class': None, + 'group': None, + 'line': '1 i pkginfo 552 45244 1339017374', + 'mode': None, + 'path': None, + 'type': 'i', + 'user': None}]}] Added: csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py 2013-01-06 15:27:51 UTC (rev 20039) @@ -0,0 +1,10482 @@ +import datetime +pkgstats = [{'bad_paths': {'/usr/local': ['root/opt/csw/share/doc/vsftpd/INSTALL', + 'root/opt/csw/share/doc/vsftpd/Changelog', + 'root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd', + 'root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README'], + '/usr/share': ['root/var/opt/csw/svc/manifest/network/cswvsftpd.xml', + 'root/opt/csw/share/doc/vsftpd/INSTALL', + 'root/opt/csw/share/doc/vsftpd/README.ssl']}, + 'basic_stats': {'catalogname': 'vsftpd', + 'md5_sum': '23b5b5b7ca124e77e73489e09db922d4', + 'parsed_basename': {'arch': 'sparc', + 'catalogname': 'vsftpd', + 'full_version_string': '3.0.0,REV=2012.08.25', + 'osrel': 'SunOS5.10', + 'revision_info': {'REV': '2012.08.25'}, + 'vendortag': 'CSW', + 'version': '3.0.0', + 'version_info': {'major version': '3', + 'minor version': '0', + 'patchlevel': '0'}}, + 'pkg_basename': 'vsftpd-3.0.0,REV=2012.08.25-SunOS5.10-sparc-CSW.pkg.gz', + 'pkg_path': '/tmp/pkg_vB6MQU/vsftpd-3.0.0,REV=2012.08.25-SunOS5.10-sparc-CSW.pkg.gz', + 'pkgname': 'CSWvsftpd', + 'size': 142963L, + 'stats_version': 12L}, + 'binaries': ['opt/csw/sbin/vsftpd'], + 'binaries_dump_info': [{'RPATH set': True, + 'RUNPATH RPATH the same': True, + 'RUNPATH set': True, + 'base_name': 'vsftpd', + 'needed sonames': ('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'), + 'path': 'opt/csw/sbin/vsftpd', + 'runpath': ('/opt/csw/lib/$ISALIST', + '/opt/csw/lib')}], + 'binaries_elf_info': {'opt/csw/sbin/vsftpd': {'symbol table': [{'bind': 'LOCL', + 'flags': None, + 'shndx': 'UNDEF', + 'soname': None, + 'symbol': None, + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_two_process_listen', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libsocket.so.1', + 'symbol': '__xnet_bind', + 'version': 'SUNW_1.1'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_locate_text_reverse', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'priv_sock_get_result', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ftp_getline', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_statbuf_get_date', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_read', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_wait_reap_one', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_log_line', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_anon_max_rate', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_load_verify_locations', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_lock_file_write', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_install_async_sighandler', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_get_error', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_seteuid', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'gmtime', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_shutdown_failok', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_use_certificate_chain_file', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_alloc', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_connect_timeout', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_statbuf_get_links', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_equal', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ssl_write_str', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_netfd_write', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_lseek_to', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'setgroups', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_check_pending_actions', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': '.st_double_foreff', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_contains_unprintable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_write_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_readlink', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_dual_log_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_free', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_get_char_at', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_locate_str', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ssl_read', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_ftruncate', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_priv_parent_postlogin', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': '.st_int', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_set_verify', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_send_fd', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'gettimeofday', + 'version': 'SISCD_2.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_activate_noblock', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_set_no_fds', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_statbuf_get_uid', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_seteuid_numeric', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_memclr', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_fchmod', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_allow_writeable_chroot', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_background', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_map_anon_pages', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_ftpdataio_transfer_file', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_ftpdataio_dispose_transfer_fd', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'pututxline', + 'version': 'SUNW_0.7'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_set_getsockopt_validator', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_ls_recurse_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_log_init', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_strict_ssl_write_shutdown', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libsocket.so.1', + 'symbol': 'shutdown', + 'version': 'SISCD_2.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_get_random_byte', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_chroot_local_user', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_set_exit_func', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_read', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_recv_fd', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'getpid', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_strcmp', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'hash_get_bucket', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_unix_stream_socketpair', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_parseconf_load_setting', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_two_process_pasv_active', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'opendir', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libsendfile.so.1', + 'symbol': 'sendfilev64', + 'version': 'SUNW_1.1'}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'sigaction', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'sigemptyset', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_require_ssl_reuse', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'ERR_get_error', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_getdents', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_syslog_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_free', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_activate_reuseaddr', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_ascii_upload_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_getuid', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'putenv', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_unlink', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_wait_get_exitcode', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ssl_read_into_str', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_getpwuid', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_ctrl', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'getgrgid', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_default_sig', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'lstat64', + 'version': 'SUNW_1.1'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libpam.so.1', + 'symbol': 'pam_authenticate', + 'version': 'SUNW_1.1'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_fchown', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_getsockopt', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': '.st_float', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'priv_sock_get_int', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CIPHER_get_name', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'localtime', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_replace_unprintable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'librt.so.1', + 'symbol': 'nanosleep', + 'version': 'SUNW_0.7'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_set_fd', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_dirlist_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_get_rbio', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_geteuid', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_rename', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'atoi', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'fchown', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_ftp_username', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': '_environ', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_make_session_leader', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'setregid', + 'version': 'SUNW_0.9'}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libssl.so.1.0.0', + 'symbol': 'SSL_CTX_set_cipher_list', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_ftruncate', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_bind', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'sigprocmask', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': '.ld_double', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'handle_opts', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_dir_stat', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_user_get_homedir', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'srand', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_append_str', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_ulong_to_str', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'strncpy', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'N', + 'shndx': '.text', + 'soname': None, + 'symbol': '_PROCEDURE_LINKAGE_TABLE_', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'rand', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'endutxent', + 'version': 'SUNW_0.7'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_initgroups', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_lock_file_read', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'priv_sock_get_cmd', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_log_ftp_protocol', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_xferlog_enable', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': '__fsr_init_value', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DL', + 'shndx': 'UNDEF', + 'soname': 'librt.so.1', + 'symbol': 'close', + 'version': 'SUNW_1.2'}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'read', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_cmds_denied', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_cmdio_set_alarm', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'RAND_load_file', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'str_split_text', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_require_cert', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'closelog', + 'version': 'SUNW_0.7'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_connect_timeout', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libsocket.so.1', + 'symbol': 'getsockname', + 'version': 'SISCD_2.3'}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'getpwuid', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_memcmp', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_cmdio_write_str', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'D', + 'shndx': 'UNDEF', + 'soname': 'libc.so.1', + 'symbol': 'strdup', + 'version': 'SYSVABI_1.3'}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_secbuf_alloc', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunables_load_defaults', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'vsf_sysutil_activate_keepalive', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'tunable_rsa_private_key_file', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, + 'symbol': 'ptrace_sandbox_permit_alarm', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DBL', + 'shndx': 'UNDEF', + 'soname': 'libcrypto.so.1.0.0', + 'symbol': 'EVP_sha256', + 'version': None}, + {'bind': 'GLOB', + 'flags': 'DB', + 'shndx': '.text', + 'soname': None, @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 6 17:14:37 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 06 Jan 2013 16:14:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[20040] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20040 http://gar.svn.sourceforge.net/gar/?rev=20040&view=rev Author: chninkel Date: 2013-01-06 16:14:37 +0000 (Sun, 06 Jan 2013) Log Message: ----------- gar/v2: skiped standard Solaris libraries for direct binding check Some solaris standard libraries export non directly bindable symbols (libc.so.1 forbids direct binding to functions free, malloc...) Some libraries, often plugins, are only linked to these symbols which triggers false positives for the direct binding check. We simply skip the check for the solaris standard libraries, this is ok because Sun guarantees the stability of these libraries. Direct binding is mostly important for opencsw provided libraries. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-06 15:27:51 UTC (rev 20039) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-06 16:14:37 UTC (rev 20040) @@ -39,14 +39,14 @@ PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"]) -BASE_SOLARIS_LIBRARIES = ( +BASE_SOLARIS_LIBRARIES = set([ "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 = { "libc.so.1": ['SYSVABI_1.3', 'SUNWprivate_1.1', 'SUNW_1.22.6', @@ -195,12 +195,21 @@ # 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"]] + libs = set(binary_info["needed sonames"]) + + # we skip the standard Solaris libraries: a lot of plugins only + # link to non directly bindable symbols of libc.so.1, librt.so.1 + # which trigger false positives. + # Direct binding really matters for opencsw libraries so it's + # easier and riskless to just skip theses libraries + libs.difference_update(BASE_SOLARIS_LIBRARIES) + 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']): db_libs.add(syminfo['soname']) - no_db_libs = db_libs.symmetric_difference(binary_info["needed sonames"]) + no_db_libs = libs.difference(db_libs) if no_db_libs: messenger.Message( Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-06 15:27:51 UTC (rev 20039) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-06 16:14:37 UTC (rev 20040) @@ -1523,10 +1523,11 @@ 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 bound to soname ' + soname) + for soname in ['libssl.so.1.0.0']: + self.error_mgr_mock.ReportError( + 'CSWvsftpd', + 'no-direct-binding', + '/opt/csw/sbin/vsftpd is not directly bound to soname ' + soname) def testDirectBindingNoSyminfo(self): self.pkg_data = vsftpd_stats @@ -1570,9 +1571,8 @@ 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' ]: + for soname in ['libsendfile.so.1', 'libssl.so.1.0.0', 'libcrypto.so.1.0.0', + 'libpam.so.1']: self.error_mgr_mock.ReportError( 'CSWvsftpd', 'no-direct-binding', Modified: csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py 2013-01-06 15:27:51 UTC (rev 20039) +++ csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py 2013-01-06 16:14:37 UTC (rev 20040) @@ -106,7 +106,7 @@ 'symbol': 'tunable_anon_max_rate', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_load_verify_locations', @@ -148,7 +148,7 @@ 'symbol': 'vsf_sysutil_shutdown_failok', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_use_certificate_chain_file', @@ -238,7 +238,7 @@ 'symbol': 'tunable_dual_log_enable', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_free', @@ -280,7 +280,7 @@ 'symbol': '.st_int', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_verify', @@ -568,7 +568,7 @@ 'symbol': 'vsf_sysutil_getpwuid', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_ctrl', @@ -622,7 +622,7 @@ 'symbol': 'priv_sock_get_int', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CIPHER_get_name', @@ -646,7 +646,7 @@ 'symbol': 'nanosleep', 'version': 'SUNW_0.7'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_set_fd', @@ -658,7 +658,7 @@ 'symbol': 'tunable_dirlist_enable', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_rbio', @@ -712,7 +712,7 @@ 'symbol': 'setregid', 'version': 'SUNW_0.9'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_cipher_list', @@ -1258,7 +1258,7 @@ 'symbol': 'tunable_sslv2', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_read', @@ -1378,7 +1378,7 @@ 'symbol': 'vsf_sysutil_exit', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_error', @@ -1798,7 +1798,7 @@ 'symbol': 'vsf_sysutil_wait', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_shutdown', @@ -2014,7 +2014,7 @@ 'symbol': 'str_right', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_peer_certificate', @@ -2062,7 +2062,7 @@ 'symbol': '_edata', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CIPHER_get_version', @@ -2128,7 +2128,7 @@ 'symbol': 'vsf_sysutil_isspace', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSLv23_server_method', @@ -2158,7 +2158,7 @@ 'symbol': 'vsf_sysutil_setuid', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_wbio', @@ -2230,7 +2230,7 @@ 'symbol': 'vsf_sysutil_getpwnam', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_current_cipher', @@ -2536,13 +2536,13 @@ 'symbol': 'vsf_sysutil_qsort', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_new', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_load_error_strings', @@ -2674,7 +2674,7 @@ 'symbol': 'mkdir', 'version': 'SYSVABI_1.3'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_shutdown', @@ -2806,7 +2806,7 @@ 'symbol': 'tunable_delay_successful_login', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_ctrl', @@ -2848,7 +2848,7 @@ 'symbol': 'vsf_tcp_wrapper_ok', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_accept', @@ -3070,7 +3070,7 @@ 'symbol': '__ctype', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_client_CA_list', @@ -3124,7 +3124,7 @@ 'symbol': 'free', 'version': 'SYSVABI_1.3'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_session_id_context', @@ -3142,7 +3142,7 @@ 'symbol': 'vsf_secbuf_free', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_timeout', @@ -3382,7 +3382,7 @@ 'symbol': 'tunable_pasv_max_port', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_new', @@ -4042,7 +4042,7 @@ 'symbol': 'str_list_get_pstr', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_load_client_CA_file', @@ -4132,7 +4132,7 @@ 'symbol': 'tunable_pasv_address', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_write', @@ -4390,7 +4390,7 @@ 'symbol': 'str_mid_to_end', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_library_init', @@ -4600,7 +4600,7 @@ 'symbol': 'tunable_deny_email_enable', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_peek', @@ -4738,7 +4738,7 @@ 'symbol': 'vsf_sysutil_activate_oobinline', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_use_PrivateKey_file', @@ -4894,7 +4894,7 @@ 'symbol': 'tunable_anon_max_rate', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_load_verify_locations', @@ -4936,7 +4936,7 @@ 'symbol': 'vsf_sysutil_shutdown_failok', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_use_certificate_chain_file', @@ -5026,7 +5026,7 @@ 'symbol': 'tunable_dual_log_enable', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_free', @@ -5068,7 +5068,7 @@ 'symbol': '.st_int', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_verify', @@ -5356,7 +5356,7 @@ 'symbol': 'vsf_sysutil_getpwuid', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_ctrl', @@ -5410,7 +5410,7 @@ 'symbol': 'priv_sock_get_int', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CIPHER_get_name', @@ -5434,7 +5434,7 @@ 'symbol': 'nanosleep', 'version': 'SUNW_0.7'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_set_fd', @@ -5446,7 +5446,7 @@ 'symbol': 'tunable_dirlist_enable', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_rbio', @@ -5500,7 +5500,7 @@ 'symbol': 'setregid', 'version': 'SUNW_0.9'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_cipher_list', @@ -6046,7 +6046,7 @@ 'symbol': 'tunable_sslv2', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_read', @@ -6166,7 +6166,7 @@ 'symbol': 'vsf_sysutil_exit', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_error', @@ -6586,7 +6586,7 @@ 'symbol': 'vsf_sysutil_wait', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_shutdown', @@ -6802,7 +6802,7 @@ 'symbol': 'str_right', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_peer_certificate', @@ -6850,7 +6850,7 @@ 'symbol': '_edata', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CIPHER_get_version', @@ -6916,7 +6916,7 @@ 'symbol': 'vsf_sysutil_isspace', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSLv23_server_method', @@ -6946,7 +6946,7 @@ 'symbol': 'vsf_sysutil_setuid', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_wbio', @@ -7018,7 +7018,7 @@ 'symbol': 'vsf_sysutil_getpwnam', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_current_cipher', @@ -7324,13 +7324,13 @@ 'symbol': 'vsf_sysutil_qsort', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_new', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_load_error_strings', @@ -7462,7 +7462,7 @@ 'symbol': 'mkdir', 'version': 'SYSVABI_1.3'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_get_shutdown', @@ -7594,7 +7594,7 @@ 'symbol': 'tunable_delay_successful_login', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_ctrl', @@ -7636,7 +7636,7 @@ 'symbol': 'vsf_tcp_wrapper_ok', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_accept', @@ -7858,7 +7858,7 @@ 'symbol': '__ctype', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_client_CA_list', @@ -7912,7 +7912,7 @@ 'symbol': 'free', 'version': 'SYSVABI_1.3'}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_session_id_context', @@ -7930,7 +7930,7 @@ 'symbol': 'vsf_secbuf_free', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_set_timeout', @@ -8170,7 +8170,7 @@ 'symbol': 'tunable_pasv_max_port', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_new', @@ -8830,7 +8830,7 @@ 'symbol': 'str_list_get_pstr', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_load_client_CA_file', @@ -8920,7 +8920,7 @@ 'symbol': 'tunable_pasv_address', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_write', @@ -9178,7 +9178,7 @@ 'symbol': 'str_mid_to_end', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_library_init', @@ -9388,7 +9388,7 @@ 'symbol': 'tunable_deny_email_enable', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_peek', @@ -9526,7 +9526,7 @@ 'symbol': 'vsf_sysutil_activate_oobinline', 'version': None}, {'bind': 'GLOB', - 'flags': 'DBL', + 'flags': 'D', 'shndx': 'UNDEF', 'soname': 'libssl.so.1.0.0', 'symbol': 'SSL_CTX_use_PrivateKey_file', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jan 6 17:58:36 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 6 Jan 2013 16:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20039] csw/mgar/gar/v2/lib/python/testdata In-Reply-To: References: Message-ID: So we missed them after all? LOL From wahwah at users.sourceforge.net Mon Jan 7 01:19:23 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Jan 2013 00:19:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[20041] csw/mgar/pkg/libnids/trunk Message-ID: Revision: 20041 http://gar.svn.sourceforge.net/gar/?rev=20041&view=rev Author: wahwah Date: 2013-01-07 00:19:23 +0000 (Mon, 07 Jan 2013) Log Message: ----------- libnids/trunk: Version bump, package split, no more old libnet Modified Paths: -------------- csw/mgar/pkg/libnids/trunk/Makefile csw/mgar/pkg/libnids/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch Property Changed: ---------------- csw/mgar/pkg/libnids/trunk/Makefile Modified: csw/mgar/pkg/libnids/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnids/trunk/Makefile 2013-01-06 16:14:37 UTC (rev 20040) +++ csw/mgar/pkg/libnids/trunk/Makefile 2013-01-07 00:19:23 UTC (rev 20041) @@ -1,13 +1,15 @@ +# $Id$ + NAME = libnids -VERSION = 1.23 +VERSION = 1.24 GARTYPE = v2 -DESCRIPTION = implementation of an e-component of network intrusion detection +DESCRIPTION = E-component of network intrusion detection define BLURB - Libnids is a library that provides a functionality of one of NIDS - (Network Intrusion Detection System) components, namely E-component. It means - that libnids code watches all local network traffic, cooks received datagrams - a bit (quite a bit ;)), and provides convenient information on them to + Libnids is a library that provides a functionality of one of NIDS + (Network Intrusion Detection System) components, namely E-component. It means + that libnids code watches all local network traffic, cooks received datagrams + a bit (quite a bit ;)), and provides convenient information on them to analyzing modules of NIDS. endef @@ -17,22 +19,41 @@ SPKG_SOURCEURL = http://libnids.sourceforge.net/ -RUNTIME_DEP_PKGS += CSWggettextrt CSWglib2 CSWlibnet CSWlibpcap - # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=92215 UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) -PATCHFILES = Makfile.in.diff +# PATCHFILES = Makfile.in.diff PATCHFILES += checksum.c.diff PATCHFILES += configure.diff -PATCHFILES += ip_options.c.diff -PATCHFILES += utils.c.diff +# PATCHFILES += ip_options.c.diff +# PATCHFILES += utils.c.diff +PATCHFILES += 0004-Solaris-linking-in-Makefile.in.patch +PATCHFILES += 0004-Install-into-DESTDIR.patch +PATCHFILES += 0005-Use-LDFLAGS-when-linking.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared -TEST_TARGET = +BUILD64 = 1 +# http://wiki.opencsw.org/project-libnet +EXTRA_LINKER_FLAGS = -L$(libdir)/libnet-new + +PACKAGES += CSWlibnids1-24 +PKGFILES_CSWlibnids1-24 += $(call baseisadirs,$(libdir),libnids\.so\.1\.24(\.\d+)*) +SPKG_DESC_CSWlibnids1-24 += $(DESCRIPTION), libnids.so.1.24 +RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibnet1 +RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWlibnids1-24 += CSWlibglib2-0-0 + +PACKAGES += CSWlibnids-dev +SPKG_DESC_CSWlibnids-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWlibnids-dev += CSWlibnids1-24 + +OBSOLETED_BY_CSWlibnids1-24 = CSWlibnids + +TEST_TARGET = + include gar/category.mk Property changes on: csw/mgar/pkg/libnids/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/libnids/trunk/checksums =================================================================== --- csw/mgar/pkg/libnids/trunk/checksums 2013-01-06 16:14:37 UTC (rev 20040) +++ csw/mgar/pkg/libnids/trunk/checksums 2013-01-07 00:19:23 UTC (rev 20041) @@ -1,6 +1 @@ -af35e8ef403a0ca95df2da94db856428 download/libnids-1.23.tar.gz -5c4890d30fb6d8666f8aa8987d6b4b24 download/Makfile.in.diff -1eb0e1c82b9855f7526d63323741aec6 download/checksum.c.diff -875c511f86f39a0b13131f4d3246a35a download/configure.diff -d98069814fe6b17ea8c07aecc76e4386 download/ip_options.c.diff -276ccbd2caeab913432fe749d6a0c020 download/utils.c.diff +72d37c79c85615ffe158aa524d649610 libnids-1.24.tar.gz Added: csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/0004-Install-into-DESTDIR.patch 2013-01-07 00:19:23 UTC (rev 20041) @@ -0,0 +1,40 @@ +From 80ddd0039f6240bcc557d186be146872bf5269d9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Jan 2013 23:51:34 +0100 +Subject: [PATCH] Install into DESTDIR + +--- + src/Makefile.in | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 236e9ba..33af85f 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -68,15 +68,15 @@ $(LIBSHARED): $(OBJS_SHARED) + $(LD) -G -h $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) + + _install install: $(LIBSTATIC) +- ../mkinstalldirs $(install_prefix)$(libdir) +- ../mkinstalldirs $(install_prefix)$(includedir) +- ../mkinstalldirs $(install_prefix)$(mandir)/man3 +- $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir) +- $(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir) +- $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3 ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir) ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(includedir) ++ ../mkinstalldirs $(DESTDIR)$(install_prefix)$(mandir)/man3 ++ $(INSTALL) -c -m 644 libnids.a $(DESTDIR)$(install_prefix)$(libdir) ++ $(INSTALL) -c -m 644 nids.h $(DESTDIR)$(install_prefix)$(includedir) ++ $(INSTALL) -c -m 644 libnids.3 $(DESTDIR)$(install_prefix)$(mandir)/man3 + _installshared installshared: install $(LIBSHARED) +- $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir) +- ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so ++ $(INSTALL) -c -m 755 $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir) ++ ln -s -f $(LIBSHARED) $(DESTDIR)$(install_prefix)$(libdir)/libnids.so + + clean: + rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED) +-- +1.8.0 + Added: csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/0004-Solaris-linking-in-Makefile.in.patch 2013-01-07 00:19:23 UTC (rev 20041) @@ -0,0 +1,25 @@ +From 3e244c710342d7c2309b6b9205e8273afa6f43fc Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 6 Jan 2013 23:47:57 +0100 +Subject: [PATCH] Solaris linking in Makefile.in + +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 2204c79..236e9ba 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -65,7 +65,7 @@ $(LIBSTATIC): $(OBJS) + ar -cr $@ $(OBJS) + $(RANLIB) $@ + $(LIBSHARED): $(OBJS_SHARED) +- $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) ++ $(LD) -G -h $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) + + _install install: $(LIBSTATIC) + ../mkinstalldirs $(install_prefix)$(libdir) +-- +1.8.0 + Added: csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch =================================================================== --- csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch (rev 0) +++ csw/mgar/pkg/libnids/trunk/files/0005-Use-LDFLAGS-when-linking.patch 2013-01-07 00:19:23 UTC (rev 20041) @@ -0,0 +1,25 @@ +From 0dd8dda4007bc36260c2e294ba58fc4c576984e2 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Jan 2013 01:10:54 +0100 +Subject: [PATCH] Use LDFLAGS when linking + +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 33af85f..d95a5c2 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -65,7 +65,7 @@ $(LIBSTATIC): $(OBJS) + ar -cr $@ $(OBJS) + $(RANLIB) $@ + $(LIBSHARED): $(OBJS_SHARED) +- $(LD) -G -h $(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) ++ $(LD) -G -h $(LIBSHARED) -L/opt/csw/lib/libnet-new -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB) + + _install install: $(LIBSTATIC) + ../mkinstalldirs $(DESTDIR)$(install_prefix)$(libdir) +-- +1.8.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jan 7 09:39:50 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 07 Jan 2013 08:39:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[20042] csw/mgar/pkg/389-ds-base/trunk/Makefile Message-ID: Revision: 20042 http://gar.svn.sourceforge.net/gar/?rev=20042&view=rev Author: cgrzemba Date: 2013-01-07 08:39:49 +0000 (Mon, 07 Jan 2013) Log Message: ----------- 389-ds-base/trunk: - correct configureargs - 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 2013-01-07 00:19:23 UTC (rev 20041) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2013-01-07 08:39:49 UTC (rev 20042) @@ -16,6 +16,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += CSW389-ds-base.postinstall DISTFILES += CSW389-ds-base.postremove + # BUILD64 = 1 PACKAGING_PLATFORMS += solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -59,19 +60,19 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsvrcore0 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnspr4 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnetsnmpmibs25 +# RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnetsnmpmibs25 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnetsnmpagent25 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 += CSWlibicudata49 +# 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 += CSWlibicuuc49 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n49 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3 +# RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsasl2-2 @@ -97,23 +98,23 @@ EXTRA_LINKER_FLAGS = -xnorunpath -norunpath CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv -CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-ldapsdk-bin=/opt/csw/dirsrv/bin -CONFIGURE_ARGS_OPT += --with-db-inc=/opt/csw/bdb48/include -CONFIGURE_ARGS_OPT += --with-db-lib=/opt/csw/bdb48/lib -CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include -CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin -CONFIGURE_ARGS_OPT += --with-netsnmp-inc=/opt/csw/include -CONFIGURE_ARGS_OPT += --with-netsnmp-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl -CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss -CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv +CONFIGURE_ARGS += --with-ldapsdk-lib=$(libdir) +## CONFIGURE_ARGS += --with-ldapsdk-bin=$(abspath $(prefix)/dirsrv/bin/$(MM_BINDIR)) +CONFIGURE_ARGS += --with-ldapsdk-bin=$(bindir) +CONFIGURE_ARGS += --with-db-inc=/opt/csw/bdb48/include +CONFIGURE_ARGS += --with-db-lib=$(abspath $(prefix)/bdb48/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include +CONFIGURE_ARGS += --with-icu-lib=$(libdir) +CONFIGURE_ARGS += --with-icu-bin=/opt/csw/bin +CONFIGURE_ARGS += --with-netsnmp-inc=/opt/csw/include +CONFIGURE_ARGS += --with-netsnmp-lib=$(libdir) +CONFIGURE_ARGS += --with-sasl-inc=/opt/csw/include/sasl +CONFIGURE_ARGS += --with-sasl-lib=$(libdir) +CONFIGURE_ARGS += --with-nss-lib=$(libdir) +CONFIGURE_ARGS += --with-nss-inc=/opt/csw/include/nss +CONFIGURE_ARGS += --with-nspr-lib=$(libdir) +CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr 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 Mon Jan 7 10:49:02 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 07 Jan 2013 09:49:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[20043] csw/mgar/pkg/389-adminutil/trunk/Makefile Message-ID: Revision: 20043 http://gar.svn.sourceforge.net/gar/?rev=20043&view=rev Author: cgrzemba Date: 2013-01-07 09:49:01 +0000 (Mon, 07 Jan 2013) Log Message: ----------- 389-adminutil/trunk: fix mastersites Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2013-01-07 08:39:49 UTC (rev 20042) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2013-01-07 09:49:01 UTC (rev 20043) @@ -13,7 +13,7 @@ LICENSE = LICENSE -MASTER_SITES = http://port389.org/sources +MASTER_SITES = http://port389.org/sources/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 # BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jan 7 11:04:43 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 07 Jan 2013 10:04:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20044] csw/mgar/pkg/389-adminutil/trunk/Makefile Message-ID: Revision: 20044 http://gar.svn.sourceforge.net/gar/?rev=20044&view=rev Author: cgrzemba Date: 2013-01-07 10:04:43 +0000 (Mon, 07 Jan 2013) Log Message: ----------- 389-adminutil/trunk: correct runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-adminutil/trunk/Makefile Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-adminutil/trunk/Makefile 2013-01-07 09:49:01 UTC (rev 20043) +++ csw/mgar/pkg/389-adminutil/trunk/Makefile 2013-01-07 10:04:43 UTC (rev 20044) @@ -27,36 +27,23 @@ PKGFILES_CSWlibadminutil0 += $(call baseisadirs,$(libdir),libadminutil\.so(\.\d+)+) PKGFILES_CSWlibadminutil0 += $(call baseisadirs,$(sharedstatedir),.*\.res) RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibprldap60 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldif60 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssldap60 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicui18n48 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnss3 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldap60 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3 -RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc49 PACKAGES += CSWlibadmsslutil0 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0 SPKG_DESC_CSWlibadmsslutil0 += $(DESCRIPTION), libadmsslutil PKGFILES_CSWlibadmsslutil0 += $(call baseisadirs,$(libdir),libadmsslutil\.so(\.\d+)+) -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibprldap60 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldif60 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssldap60 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicui18n48 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicudata48 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnss3 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldap60 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3 -RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibsasl2-2 PACKAGES += CSW389-adminutil-dev CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_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 Mon Jan 7 11:26:48 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 07 Jan 2013 10:26:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[20045] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20045 http://gar.svn.sourceforge.net/gar/?rev=20045&view=rev Author: pfelecan Date: 2013-01-07 10:26:47 +0000 (Mon, 07 Jan 2013) Log Message: ----------- texlive/trunk: no in place remplacement for binary files as, at least, it troubles exploration tools as ldd &c. Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-07 10:04:43 UTC (rev 20044) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-07 10:26:47 UTC (rev 20045) @@ -632,6 +632,9 @@ # mime.types and mailcap file search path; as far as I searched, we # don't supply that kind of files in /opt/csw/etc: CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/xdvi-xaw +CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/share|root/opt/csw/bin/pdftex +CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/share|root/opt/csw/bin/xetex +CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/share|root/opt/csw/bin/pdftosrc # only documentation section which can be easily deduced: CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/mktexlsr @@ -4135,6 +4138,7 @@ # TODO hopefully this is innocuous; otherwise it needs a thoughtfully # exploration: CHECKPKG_OVERRIDES_CSWtexlive-luatex += file-with-bad-content|/usr/local|root/opt/csw/bin/luatex +CHECKPKG_OVERRIDES_CSWtexlive-luatex += file-with-bad-content|/usr/share|root/opt/csw/bin/luatex PACKAGES += CSWtexlive-math-extra CATALOGNAME_CSWtexlive-math-extra = texlive_math_extra @@ -5286,10 +5290,6 @@ REINPLACE_USRLOCAL += /opt/csw/share/texmf-dist/doc/generic/epsf/Makefile REINPLACE_WHEN_USRSHARE = postinstall -REINPLACE_USRSHARE += /opt/csw/bin/luatex -REINPLACE_USRSHARE += /opt/csw/bin/pdftex -REINPLACE_USRSHARE += /opt/csw/bin/pdftosrc -REINPLACE_USRSHARE += /opt/csw/bin/xetex REINPLACE_USRSHARE += /opt/csw/include/kpathsea/paths.h REINPLACE_USRSHARE += /opt/csw/share/info/dvips.info REINPLACE_USRSHARE += /opt/csw/share/man/man1/chktex.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jan 7 11:41:00 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 07 Jan 2013 10:41:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[20046] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: Revision: 20046 http://gar.svn.sourceforge.net/gar/?rev=20046&view=rev Author: cgrzemba Date: 2013-01-07 10:40:59 +0000 (Mon, 07 Jan 2013) Log Message: ----------- 389-admin/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2013-01-07 10:26:47 UTC (rev 20045) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2013-01-07 10:40:59 UTC (rev 20046) @@ -22,7 +22,7 @@ GARCOMPILER = SOS12U3 -LICENSE = LICENSE LICENSE.GPLv2 +LICENSE = LICENSE # GARFLAVOR=DBG @@ -36,7 +36,6 @@ SPKG_DESC_CSWlibds-admin-serv0 += $(DESCRIPTION), libds-admin-serv.so.0 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibadmsslutil0 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibadminutil0 -RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplds4 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibiconv2 @@ -53,24 +52,15 @@ INITSMF = /etc/opt/csw/init.d/dirsrv-admin RUNTIME_DEP_PKGS_CSW389-admin += CSWap2worker RUNTIME_DEP_PKGS_CSW389-admin += CSWap2modnss -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibprldap60 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicudata49 RUNTIME_DEP_PKGS_CSW389-admin += CSWperl RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadmsslutil0 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplc4 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssldap60 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicuuc49 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicui18n49 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibds-admin-serv0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadminutil0 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplds4 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldap60 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsoftokn3 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsmime3 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibiconv2 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssl3 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnss3 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console 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 Jan 7 12:29:40 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 07 Jan 2013 11:29:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20047] csw/mgar/pkg/389-dsgw/trunk/Makefile Message-ID: Revision: 20047 http://gar.svn.sourceforge.net/gar/?rev=20047&view=rev Author: cgrzemba Date: 2013-01-07 11:29:39 +0000 (Mon, 07 Jan 2013) Log Message: ----------- 389-dsgw/trunk: readjust runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-dsgw/trunk/Makefile Modified: csw/mgar/pkg/389-dsgw/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-dsgw/trunk/Makefile 2013-01-07 10:40:59 UTC (rev 20046) +++ csw/mgar/pkg/389-dsgw/trunk/Makefile 2013-01-07 11:29:39 UTC (rev 20047) @@ -12,7 +12,7 @@ BUNDLE = 389-ds -MASTER_SITES = http://port389.org/sources +MASTER_SITES = http://port389.org/sources/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 # BUILD64 = 1 PACKAGING_PLATFORMS += solaris10-sparc @@ -26,23 +26,15 @@ CPPFLAGS = EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibprldap60 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibldif60 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicudata48 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibadmsslutil0 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibplc4 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibnspr4 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibldap60 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicui18n48 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibadminutil0 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibnss3 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibplds4 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibssldap60 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibsoftokn3 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibsmime3 -RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibssl3 +RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicuuc49 +RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicui18n49 CHECKPKG_OVERRIDES_CSW389-dsgw += file-with-bad-content|/usr/local|root/opt/csw/share/dirsrv/manual/en/dsgw/attribut.htm PATCHFILES += 0001-change-include-path-preferences-in-Makefile.am.patch @@ -58,7 +50,6 @@ CONFIGURE_ARGS += --with-sasl-lib=/opt/csw/lib CONFIGURE_ARGS += --with-nspr-lib=/opt/csw/lib CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 7 12:48:44 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Jan 2013 11:48:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20048] csw/mgar/pkg/lang-python/python/branches/python-3.3 Message-ID: Revision: 20048 http://gar.svn.sourceforge.net/gar/?rev=20048&view=rev Author: wahwah Date: 2013-01-07 11:48:43 +0000 (Mon, 07 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: It builds. Let's test it. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-07 11:29:39 UTC (rev 20047) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-07 11:48:43 UTC (rev 20048) @@ -1,13 +1,12 @@ # $Id$ NAME = Python -VERSION = 3.2.3 -CATEGORIES = lang -VER = 3.2 -DVER = 3-2 -UVER = 3_2 +VERSION = 3.3.0 +VER = 3.3 +DVER = 3-3 +UVER = 3_3 PVER = python$(VER) -CVER = 32 +CVER = 33 # Known issues: # @@ -53,15 +52,16 @@ # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev EXTRA_LIB += $(libdir)/ffi -BASECFLAGS = $(CFLAGS) +# BASECFLAGS = $(CFLAGS) +BASECFLAGS = -g -O2 EXTRA_COMMON_EXPORTS = BASECFLAGS +EXTRA_LINKER_FLAGS = -lsocket -lresolv -lrt NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-unicode=ucs4 -CONFIGURE_ARGS += --without-gcc +# CONFIGURE_ARGS += --without-gcc CONFIGURE_ARGS += --with-signal-module CONFIGURE_ARGS += --with-fpectl CONFIGURE_ARGS += --with-system-ffi @@ -69,15 +69,16 @@ # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc -# use prototype filters to set the class +# use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' + PACKAGES = CSWidle$(CVER) SPKG_DESC_CSWidle$(CVER) = Python IDE CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle ARCHALL_CSWidle$(CVER) = 1 @@ -92,73 +93,80 @@ PACKAGES += CSWpython$(CVER) SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm3 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWliblzma5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)m1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += file-with-bad-content -PACKAGES += CSWpython$(CVER)-test -SPKG_DESC_CSWpython$(CVER)-test = Python Test modules -PKGFILES_CSWpython$(CVER)-test = $(libdir)/$(PVER)/test/.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/bsddb/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/ctypes/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/email/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/distutils/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/json/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/lib2to3/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/sqlite3/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/unittest/test.* -RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) -ARCHALL_CSWpython$(CVER)-test = 1 -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += file-with-bad-content +# Don't merge test files. +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/test/.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/bsddb/test.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/ctypes/test.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/email/test.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/distutils/tests.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/json/tests.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/lib2to3/tests.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/sqlite3/test.* +MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/unittest/test.* PACKAGES += CSWpython$(CVER)-tk SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)m1-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 += CSWtcl -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk + CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) -PACKAGES += CSWlibpython$(DVER)-1-0 -SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) -PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(VER)\.so\.1\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibpython$(DVER)-1-0 += CSWlibintl8 +PACKAGES += CSWlibpython$(DVER)m1-0 +CATALOGNAME_CSWlibpython$(DVER)m1-0 = libpython$(UVER)m1_0 +PKGFILES_CSWlibpython$(DVER)m1-0 += $(call baseisadirs,$(libdir),libpython3\.3m\.so\.1\.0) +PKGFILES_CSWlibpython$(DVER)m1-0 += $(call baseisadirs,$(libdir),libpython3\.3m\.so\.1\.0(\.\d+)*) +SPKG_DESC_CSWlibpython$(DVER)m1-0 += $(DESCRIPTION), libpython$(VER)m.so.1.0 +RUNTIME_DEP_PKGS_CSWlibpython$(DVER)m1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibpython$(DVER)m1-0 += CSWlibgcc-s1 +# This package looks dodgy to me. The soname-equals-filename is something that +# caused us a lot of grief with libnet. +PACKAGES += CSWlibpython3 +PKGFILES_CSWlibpython3 += $(call baseisadirs,$(libdir),libpython3\.so) +SPKG_DESC_CSWlibpython3 += $(DESCRIPTION), libpython3.so +CHECKPKG_OVERRIDES_CSWlibpython3 += soname-equals-filename|file=/opt/csw/lib/libpython3.so +RUNTIME_DEP_PKGS_CSWlibpython3 += CSWlibgcc-s1 + # Devel package -OBSOLETED_BY_CSWpython$(CVER)-dev = CSWpython$(CVER)-devel PACKAGES += CSWpython$(CVER)-dev -SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python +SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python 3.x # /opt/csw/include/python$(VER)/pyconfig.h is necessary for Python to start up PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.* -PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER)m.so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py-$(VER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) -RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)m1-0 CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums 2013-01-07 11:29:39 UTC (rev 20047) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums 2013-01-07 11:48:43 UTC (rev 20048) @@ -1 +1 @@ -cea34079aeb2e21e7b60ee82a0ac286b Python-3.2.3.tar.bz2 +b3b2524f72409d919a4137826a870a8f Python-3.3.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jan 7 15:47:04 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 07 Jan 2013 14:47:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20049] csw/mgar/pkg/mod_nss/trunk/Makefile Message-ID: Revision: 20049 http://gar.svn.sourceforge.net/gar/?rev=20049&view=rev Author: cgrzemba Date: 2013-01-07 14:47:04 +0000 (Mon, 07 Jan 2013) Log Message: ----------- mod_nss/trunk: readjust runtime dependencies Modified Paths: -------------- csw/mgar/pkg/mod_nss/trunk/Makefile Modified: csw/mgar/pkg/mod_nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_nss/trunk/Makefile 2013-01-07 11:48:43 UTC (rev 20048) +++ csw/mgar/pkg/mod_nss/trunk/Makefile 2013-01-07 14:47:04 UTC (rev 20049) @@ -13,7 +13,7 @@ PACKAGES = CSWap2modnss -MASTER_SITES = http://port389.org/sources +MASTER_SITES = http://port389.org/sources/ # MASTER_SITES = http://directory.fedoraproject.org/sources DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWap2modnss.postinstall @@ -46,9 +46,7 @@ RUNTIME_DEP_PKGS_CSWap2modnss += CSWapache2 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibnss3 -RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibplds4 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibplc4 -RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibsmime3 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibssl3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 7 17:59:13 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Jan 2013 16:59:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[20050] csw/mgar/pkg/newpkg-Makefile Message-ID: Revision: 20050 http://gar.svn.sourceforge.net/gar/?rev=20050&view=rev Author: wahwah Date: 2013-01-07 16:59:13 +0000 (Mon, 07 Jan 2013) Log Message: ----------- newpkg-Makefile: We don't use CATEGORIES any more. Also, drop comments that aren't that useful anyway. Modified Paths: -------------- csw/mgar/pkg/newpkg-Makefile Modified: csw/mgar/pkg/newpkg-Makefile =================================================================== --- csw/mgar/pkg/newpkg-Makefile 2013-01-07 14:47:04 UTC (rev 20049) +++ csw/mgar/pkg/newpkg-Makefile 2013-01-07 16:59:13 UTC (rev 20050) @@ -4,25 +4,15 @@ NAME = ${name} VERSION = ${version} GARTYPE = v2 -CATEGORIES = category DESCRIPTION = Brief description define BLURB Long description endef -MASTER_SITES = +MASTER_SITES = 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 = - CONFIGURE_ARGS = $(DIRPATHS) 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 Mon Jan 7 22:38:08 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 07 Jan 2013 21:38:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20051] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 20051 http://gar.svn.sourceforge.net/gar/?rev=20051&view=rev Author: bdwalton Date: 2013-01-07 21:38:08 +0000 (Mon, 07 Jan 2013) Log Message: ----------- cswutils/trunk: version bump; additional overrides Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2013-01-07 16:59:13 UTC (rev 20050) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2013-01-07 21:38:08 UTC (rev 20051) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.24 +VERSION = 1.25 GARTYPE = v2 DESCRIPTION = Utilities for CSW maintainers @@ -66,6 +66,8 @@ CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/usr/local|root/opt/csw/lib/python/csw/testdata/rpaths.py CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/package_checks_test.py CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/medusa|root/opt/csw/lib/python/csw/testdata/rpaths.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/usr/local|root/opt/csw/lib/python/csw/testdata/vsftpd_stats.py +CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/usr/share|root/opt/csw/lib/python/csw/testdata/vsftpd_stats.py ALTERNATIVES_CSWcswutils = legacy python ALTERNATIVE_legacy = /opt/csw/bin/checkpkg checkpkg /opt/csw/bin/checkpkg.legacy 5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jan 8 09:00:21 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 08 Jan 2013 08:00:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20052] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20052 http://gar.svn.sourceforge.net/gar/?rev=20052&view=rev Author: pfelecan Date: 2013-01-08 08:00:21 +0000 (Tue, 08 Jan 2013) Log Message: ----------- texlive/trunk: new dependencies for executable content Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-07 21:38:08 UTC (rev 20051) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-08 08:00:21 UTC (rev 20052) @@ -628,6 +628,8 @@ RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibxpm4 CHECKPKG_OVERRIDES_CSWtexlive-binaries += file-with-bad-content|/usr/local|root/opt/csw/bin/dvips # mime.types and mailcap file search path; as far as I searched, we # don't supply that kind of files in /opt/csw/etc: @@ -4135,6 +4137,11 @@ PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/luatex/luamplib/.* PKGFILES_CSWtexlive-luatex += /opt/csw/share/texmf-dist/tex/luatex/luaotfload/.* RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWtexlive-common +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibkpathsea6 +RUNTIME_DEP_PKGS_CSWtexlive-luatex += CSWlibz1 # TODO hopefully this is innocuous; otherwise it needs a thoughtfully # exploration: CHECKPKG_OVERRIDES_CSWtexlive-luatex += file-with-bad-content|/usr/local|root/opt/csw/bin/luatex 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 Jan 8 10:51:10 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Tue, 08 Jan 2013 09:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[20053] csw/mgar/pkg/cpan Message-ID: Revision: 20053 http://gar.svn.sourceforge.net/gar/?rev=20053&view=rev Author: guillomovitch Date: 2013-01-08 09:51:09 +0000 (Tue, 08 Jan 2013) Log Message: ----------- cpan/Net-Write/trunk: initial import Added Paths: ----------- csw/mgar/pkg/cpan/Net-Write/ csw/mgar/pkg/cpan/Net-Write/branches/ csw/mgar/pkg/cpan/Net-Write/tags/ csw/mgar/pkg/cpan/Net-Write/trunk/ csw/mgar/pkg/cpan/Net-Write/trunk/Makefile csw/mgar/pkg/cpan/Net-Write/trunk/checksums csw/mgar/pkg/cpan/Net-Write/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Write/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/cpan/Net-Write/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Write/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Write/trunk/Makefile 2013-01-08 09:51:09 UTC (rev 20053) @@ -0,0 +1,25 @@ +NAME = Net-Write +VERSION = 1.07 +CATEGORIES = cpan +GARTYPE = v2 +AUTHOR = GOMOR + +DESCRIPTION = A portable interface to open and send raw data to network +define BLURB +Net::Write provides a portable interface to open a network interface, and be +able to write raw data directly to the network. It juste provides three methods +when a Net::Write object has been created for an interface: open, send, close. +endef + +LICENSE = LICENSE +PACKAGES = CSWpm-net-write +ARCHALL = 1 + +BUILD_DEP_PKGS += CSWpm-class-gomor +BUILD_DEP_PKGS += CSWpm-net-pcap +BUILD_DEP_PKGS += CSWpm-socket6 +RUNTIME_DEP_PKGS += CSWpm-class-gomor +RUNTIME_DEP_PKGS += CSWpm-net-pcap +RUNTIME_DEP_PKGS += CSWpm-socket6 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Write/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Write/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Write/trunk/checksums 2013-01-08 09:51:09 UTC (rev 20053) @@ -0,0 +1 @@ +a3310df977446fcd8004fdbb66a782b5 Net-Write-1.07.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jan 8 22:30:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 08 Jan 2013 21:30:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20054] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20054 http://gar.svn.sourceforge.net/gar/?rev=20054&view=rev Author: chninkel Date: 2013-01-08 21:30:33 +0000 (Tue, 08 Jan 2013) Log Message: ----------- openssh/trunk: removed localstatedir and sysconfdir redefinition, the target values are now the default Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 09:51:09 UTC (rev 20053) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:30:33 UTC (rev 20054) @@ -1,8 +1,7 @@ ##################################################################### # OpenCSW build recipe for openssh # -# Copyright 2009 Yann Rouillard -# All rights reserved. Use is subject to license terms. +# Author: Yann Rouillard # # Redistribution and/or use, with or without modification, is # permitted. This software is without warranty of any kind. The @@ -149,13 +148,6 @@ ##### Build and installation information ##### - -# to support shared /opt/csw setup -# see http://wiki.opencsw.org/shared-opt-csw-setup -localstatedir = /var$(prefix) -sysconfdir = /etc$(prefix) - - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-kerberos5=$(prefix) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/ssh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jan 8 22:33:16 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 08 Jan 2013 21:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[20055] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20055 http://gar.svn.sourceforge.net/gar/?rev=20055&view=rev Author: chninkel Date: 2013-01-08 21:33:15 +0000 (Tue, 08 Jan 2013) Log Message: ----------- openssh/trunk: MAKECOOKIE should not be used in custom target Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:30:33 UTC (rev 20054) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:33:15 UTC (rev 20055) @@ -200,6 +200,7 @@ # adding documentation files pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files merge-special-directories + @$(MAKECOOKIE) merge-contrib-files: ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id" @@ -218,7 +219,6 @@ (cd $(PKGROOT)/$(docdir)/$$DOCDIR && chmod -x $(DOCFILES)); \ ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \ done - @$(MAKECOOKIE) merge-config-files: # we change some default value in the server config file @@ -226,7 +226,6 @@ perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup" ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED" - @$(MAKECOOKIE) merge-special-directories: ginstall -d $(PKGROOT)$(localstatedir)/empty This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jan 8 22:36:34 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 08 Jan 2013 21:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20056] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 20056 http://gar.svn.sourceforge.net/gar/?rev=20056&view=rev Author: chninkel Date: 2013-01-08 21:36:33 +0000 (Tue, 08 Jan 2013) Log Message: ----------- openssh/trunk: update to 6.1 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:33:15 UTC (rev 20055) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:36:33 UTC (rev 20056) @@ -12,7 +12,7 @@ ###### Package information ####### NAME = openssh -VERSION = 6.0p1 +VERSION = 6.1p1 GSSKEX_PATCH_VERSION = 5.9p1 GSSKEX_PATCH_DATE = 20110920 GARTYPE = v2 Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2013-01-08 21:33:15 UTC (rev 20055) +++ csw/mgar/pkg/openssh/trunk/checksums 2013-01-08 21:36:33 UTC (rev 20056) @@ -1 +1 @@ -3c9347aa67862881c5da3f3b1c08da7b openssh-6.0p1.tar.gz +3345cbf4efe90ffb06a78670ab2d05d5 openssh-6.1p1.tar.gz Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2013-01-08 21:33:15 UTC (rev 20055) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2013-01-08 21:36:33 UTC (rev 20056) @@ -1,3 +1,9 @@ +openssh (6.1p1,REV=2013.01.08) unstable + + * New upstream release. + + -- Yann Rouillard Tue, 08 Jan 2013 22:35:07 +0100 + openssh (6.0p1,REV=2012.09.30) unstable * Explicitly disabled lazyloading as it causes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jan 8 22:51:00 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 08 Jan 2013 21:51:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[20057] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 20057 http://gar.svn.sourceforge.net/gar/?rev=20057&view=rev Author: chninkel Date: 2013-01-08 21:50:59 +0000 (Tue, 08 Jan 2013) Log Message: ----------- openssh/trunk: renamed package from CSWossh to CSWopenssh Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:36:33 UTC (rev 20056) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:50:59 UTC (rev 20057) @@ -30,39 +30,43 @@ endef -PACKAGES = CSWossh CSWosshclient +PACKAGES = CSWopenssh CSWopensshclient -CATALOGNAME_CSWossh = openssh -SPKG_DESC_CSWossh = OpenSSH Secure Shell server -RUNTIME_DEP_PKGS_CSWossh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWosshclient +CATALOGNAME_CSWopenssh = openssh +SPKG_DESC_CSWopenssh = OpenSSH Secure Shell server +RUNTIME_DEP_PKGS_CSWopenssh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWopensshclient -CATALOGNAME_CSWosshclient = openssh_client -SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client -RUNTIME_DEP_PKGS_CSWosshclient = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2 +OBSOLETED_BY_CSWopenssh = CSWossh +CATALOGNAME_CSWopensshclient = openssh_client +SPKG_DESC_CSWopensshclient = OpenSSH Secure Shell client +RUNTIME_DEP_PKGS_CSWopensshclient = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2 + +OBSOLETED_BY_CSWopensshclient = CSWosshclient + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PKGFILES_CSWossh = $(sbindir)/.* -PKGFILES_CSWossh += $(docdir)/openssh/.* -PKGFILES_CSWossh += $(mandir)/man5/sshd_config.5 -PKGFILES_CSWossh += $(mandir)/man8/sftp-server.8 -PKGFILES_CSWossh += $(mandir)/man8/sshd.8 -PKGFILES_CSWossh += $(libexecdir)/sftp-server -PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW -PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW -PKGFILES_CSWossh += $(localstatedir)/empty -PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh -PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml -PKGFILES_CSWossh += $(prefix)/etc/pkg/CSWossh/cswusergroup +PKGFILES_CSWopenssh = $(sbindir)/.* +PKGFILES_CSWopenssh += $(docdir)/openssh/.* +PKGFILES_CSWopenssh += $(mandir)/man5/sshd_config.5 +PKGFILES_CSWopenssh += $(mandir)/man8/sftp-server.8 +PKGFILES_CSWopenssh += $(mandir)/man8/sshd.8 +PKGFILES_CSWopenssh += $(libexecdir)/sftp-server +PKGFILES_CSWopenssh += $(sysconfdir)/ssh/sshd_config.CSW +PKGFILES_CSWopenssh += $(sysconfdir)/ssh/moduli.CSW +PKGFILES_CSWopenssh += $(localstatedir)/empty +PKGFILES_CSWopenssh += $(sysconfdir)/init.d/cswopenssh +PKGFILES_CSWopenssh += $(localstatedir)/svc/manifest/network/cswopenssh.xml +PKGFILES_CSWopenssh += $(prefix)/etc/pkg/CSWopenssh/cswusergroup -PKGFILES_CSWosshclient = $(bindir)/.* -PKGFILES_CSWosshclient += $(docdir)/openssh_client/.* -PKGFILES_CSWosshclient += $(mandir)/man1/.* -PKGFILES_CSWosshclient += $(mandir)/man5/ssh_config.5 -PKGFILES_CSWosshclient += $(mandir)/man8/ssh-keysign.8 -PKGFILES_CSWosshclient += $(libexecdir)/ssh-keysign -PKGFILES_CSWosshclient += $(sysconfdir)/ssh/ssh_config.CSW -PKGFILES_CSWosshclient += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED +PKGFILES_CSWopensshclient = $(bindir)/.* +PKGFILES_CSWopensshclient += $(docdir)/openssh_client/.* +PKGFILES_CSWopensshclient += $(mandir)/man1/.* +PKGFILES_CSWopensshclient += $(mandir)/man5/ssh_config.5 +PKGFILES_CSWopensshclient += $(mandir)/man8/ssh-keysign.8 +PKGFILES_CSWopensshclient += $(libexecdir)/ssh-keysign +PKGFILES_CSWopensshclient += $(sysconfdir)/ssh/ssh_config.CSW +PKGFILES_CSWopensshclient += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED PROTOTYPE_MODIFIERS = setuid PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign @@ -72,30 +76,26 @@ PRESERVECONF += $(sysconfdir)/ssh/ssh_config PRESERVECONF += $(sysconfdir)/ssh/moduli INITSMF = $(sysconfdir)/init.d/cswopenssh -USERGROUP = $(prefix)/etc/pkg/CSWossh/cswusergroup +USERGROUP = $(prefix)/etc/pkg/CSWopenssh/cswusergroup -MIGRATE_FILES_CSWossh = moduli sshd_config -MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub -MIGRATE_FILES_CSWossh += shosts.equiv -MIGRATE_FILES_CSWossh += sshrc -MIGRATE_FILES_CSWosshclient = ssh_config -MIGRATE_FILES_CSWosshclient += ssh_known_hosts ssh_known_hosts2 -MIGRATE_FILES_CSWosshclient += ssh_prng_cmds +MIGRATE_FILES_CSWopenssh = moduli sshd_config +MIGRATE_FILES_CSWopenssh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub +MIGRATE_FILES_CSWopenssh += shosts.equiv +MIGRATE_FILES_CSWopenssh += sshrc +MIGRATE_FILES_CSWopensshclient = ssh_config +MIGRATE_FILES_CSWopensshclient += ssh_known_hosts ssh_known_hosts2 +MIGRATE_FILES_CSWopensshclient += ssh_prng_cmds MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh MIGRATE_DEST_DIR = $(sysconfdir)/ssh -CHECKPKG_OVERRIDES_CSWosshclient += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL -CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL -CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml +CHECKPKG_OVERRIDES_CSWopensshclient += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL +CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL +CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml -CHECKPKG_OVERRIDES_CSWossh += surplus-dependency|CSWosshclient +CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWopensshclient -# We will not fix this today -CHECKPKG_OVERRIDES_CSWossh += catalogname-does-not-match-pkgname|pkgname=CSWossh|catalogname=openssh|expected-catalogname=ossh -CHECKPKG_OVERRIDES_CSWosshclient += catalogname-does-not-match-pkgname|pkgname=CSWosshclient|catalogname=openssh_client|expected-catalogname=osshclient - ###### Upstream and OpenCSW files information ####### MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/ @@ -105,8 +105,8 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*p\d+).tar.gz DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWossh.checkinstall -DISTFILES += CSWosshlpk.checkinstall +DISTFILES += CSWopenssh.checkinstall +DISTFILES += CSWopensshlpk.checkinstall DISTFILES += changelog.CSW DISTFILES += cswusergroup @@ -170,17 +170,17 @@ # is the same with LPK enabled or not DISTFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch ifdef LPK - PACKAGES = CSWosshlpk - CATALOGNAME_CSWosshlpk = openssh_lpk - SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support - RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt + PACKAGES = CSWopensshlpk + CATALOGNAME_CSWopensshlpk = openssh_lpk + SPKG_DESC_CSWopensshlpk = $(SPKG_DESC_CSWopenssh) with ldap public key support + RUNTIME_DEP_PKGS_CSWopensshlpk = $(RUNTIME_DEP_PKGS_CSWopenssh) CSWoldaprt MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/ PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch CONFIGURE_ARGS += --with-ldap DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk - # we must reset the CSWosshclient description to avoid a bug in the automatic dependancy generation - SPKG_DESC_CSWosshclient = + # we must reset the CSWopensshclient description to avoid a bug in the automatic dependancy generation + SPKG_DESC_CSWopensshclient = endif @@ -224,9 +224,9 @@ # we change some default value in the server config file perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" - ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup" + ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWopenssh/cswusergroup" ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED" merge-special-directories: ginstall -d $(PKGROOT)$(localstatedir)/empty - ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWossh + ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWopenssh Copied: csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall (from rev 20053, csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall) =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall 2013-01-08 21:50:59 UTC (rev 20057) @@ -0,0 +1,24 @@ +#!/bin/sh + +err=0 + +if [ `uname -r` = "5.8" ] ; then + +if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then + echo ERROR: /dev/random must exist + err=1 +fi + +if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then + echo ERROR: /dev/urandom must exist + err=1 +fi + +fi + +if [ "$err" = "1" ] ; then + echo "For solaris 8 sparc, install patch 112438" + echo "For solaris 8 x86, install patch 112439" + exit 1 +fi + Copied: csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall (from rev 20053, csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall) =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall (rev 0) +++ csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall 2013-01-08 21:50:59 UTC (rev 20057) @@ -0,0 +1,24 @@ +#!/bin/sh + +err=0 + +if [ `uname -r` = "5.8" ] ; then + +if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then + echo ERROR: /dev/random must exist + err=1 +fi + +if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then + echo ERROR: /dev/urandom must exist + err=1 +fi + +fi + +if [ "$err" = "1" ] ; then + echo "For solaris 8 sparc, install patch 112438" + echo "For solaris 8 x86, install patch 112439" + exit 1 +fi + Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall 2013-01-08 21:36:33 UTC (rev 20056) +++ csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall 2013-01-08 21:50:59 UTC (rev 20057) @@ -1,24 +0,0 @@ -#!/bin/sh - -err=0 - -if [ `uname -r` = "5.8" ] ; then - -if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then - echo ERROR: /dev/random must exist - err=1 -fi - -if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then - echo ERROR: /dev/urandom must exist - err=1 -fi - -fi - -if [ "$err" = "1" ] ; then - echo "For solaris 8 sparc, install patch 112438" - echo "For solaris 8 x86, install patch 112439" - exit 1 -fi - Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall =================================================================== --- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall 2013-01-08 21:36:33 UTC (rev 20056) +++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall 2013-01-08 21:50:59 UTC (rev 20057) @@ -1,24 +0,0 @@ -#!/bin/sh - -err=0 - -if [ `uname -r` = "5.8" ] ; then - -if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then - echo ERROR: /dev/random must exist - err=1 -fi - -if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then - echo ERROR: /dev/urandom must exist - err=1 -fi - -fi - -if [ "$err" = "1" ] ; then - echo "For solaris 8 sparc, install patch 112438" - echo "For solaris 8 x86, install patch 112439" - exit 1 -fi - Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml =================================================================== --- csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml 2013-01-08 21:36:33 UTC (rev 20056) +++ csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml 2013-01-08 21:50:59 UTC (rev 20057) @@ -1,7 +1,7 @@ - + Revision: 20058 http://gar.svn.sourceforge.net/gar/?rev=20058&view=rev Author: chninkel Date: 2013-01-08 22:10:42 +0000 (Tue, 08 Jan 2013) Log Message: ----------- openssl1/trunk: removed path replacements that not useful anymore Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-01-08 21:50:59 UTC (rev 20057) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-01-08 22:10:42 UTC (rev 20058) @@ -229,10 +229,6 @@ ln -nf $(WORKDIR)/map.openssl.engines $(WORKSRC)/engines/ccgost/map.openssl.libgost @$(MAKECOOKIE) -fix-paths: - gsed -i -e 's,/usr/local/ssl/lib,$(sysconfdir)/ssl,' $(PKGROOT)$(mandir)/man1/ca.1 - gsed -i -e 's,/usr/local/ssl,$(prefix)/ssl,' $(PKGROOT)$(bindir)/c_rehash - install-conf-misc: if [ -f "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ] && [ ! -h "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ]; then \ ginstall -d "$(PKGROOT)$(sysconfdir)/ssl"; \ @@ -250,4 +246,4 @@ done @$(MAKECOOKIE) -post-merge: merge-doc install-conf-misc fix-paths +post-merge: merge-doc install-conf-misc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jan 9 10:06:03 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 09 Jan 2013 09:06:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[20059] csw/mgar/pkg/guile/branches/2.0.7/ Message-ID: Revision: 20059 http://gar.svn.sourceforge.net/gar/?rev=20059&view=rev Author: pfelecan Date: 2013-01-09 09:06:02 +0000 (Wed, 09 Jan 2013) Log Message: ----------- add branch 2.0.7 for upgrade to the latest upstream version Added Paths: ----------- csw/mgar/pkg/guile/branches/2.0.7/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 9 11:53:45 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Jan 2013 10:53:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[20060] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers Message-ID: Revision: 20060 http://gar.svn.sourceforge.net/gar/?rev=20060&view=rev Author: wahwah Date: 2013-01-09 10:53:44 +0000 (Wed, 09 Jan 2013) Log Message: ----------- opencsw-manual/trunk: Peter Felecan's text about contributing to recipes Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst Added Paths: ----------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst (rev 0) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst 2013-01-09 10:53:44 UTC (rev 20060) @@ -0,0 +1,41 @@ +----------------------- +Contributing to recipes +----------------------- + +It often happens that a maintainer wants to make a change or an update to +another maintainer's package. + + +- The maintainer is retired: + + On the maintainers mailing list, announce your intention to work on + the recipe and eventually take up the maintenance. + + When you have a working recipe and generated the package, upload-it + and you became the active maintainer. + +- The maintainer is inactive: + + Contact them before starting your work, and allow them 1 to 2 weeks to + respond. If you don't get an answer, proceed as described above. + +- The maintainer is active, i.e. answers to bug reports, messages sent + on the maintainers mailing list or private messages: + + `Work in a branch`_, and when you obtain satisfying results explain your + changes to the maintainer such as he or she can use what you've done and/or, + if you obtain his or her explicit permission, merge your modifications on + the trunk. + +References +========== + +.. _Work in a branch: + `Working in a branch`_ +.. _[csw-maintainers] reminder on contributing on recipes: + http://lists.opencsw.org/pipermail/maintainers/2013-January/017541.html +.. _Working in a branch: + http://wiki.opencsw.org/branching-from-trunk +.. [#branch] `Working in a branch`_ in OpenCSW wiki +.. [#source] The original post on the maintainers mailing list: + `[csw-maintainers] reminder on contributing on recipes`_ Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2013-01-09 09:06:02 UTC (rev 20059) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/index.rst 2013-01-09 10:53:44 UTC (rev 20060) @@ -8,6 +8,7 @@ .. toctree:: :maxdepth: 2 + contributing-to-recipes filesystem-layout building-a-catalog shared-libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jan 9 12:46:32 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 09 Jan 2013 11:46:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[20061] csw/mgar/pkg/nss/trunk Message-ID: Revision: 20061 http://gar.svn.sourceforge.net/gar/?rev=20061&view=rev Author: cgrzemba Date: 2013-01-09 11:46:32 +0000 (Wed, 09 Jan 2013) Log Message: ----------- nss/trunk: bump minor version 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 2013-01-09 10:53:44 UTC (rev 20060) +++ csw/mgar/pkg/nss/trunk/Makefile 2013-01-09 11:46:32 UTC (rev 20061) @@ -25,10 +25,11 @@ NAME = nss MAJOR_VERSION = 3 MINOR_VERSION = 14 -## PATCHLEVEL = 6 -## VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) -VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) +PATCHLEVEL = 1 +VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL) +# #VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) GARTYPE = v2 + DESCRIPTION = Network Security Services library define BLURB Network Security Services (NSS) is a set of libraries designed to support @@ -39,14 +40,14 @@ endef SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/ # TODO: Generate RTM_NAME from VERSION -## RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_$(PATCHLEVEL)_RTM -RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_RTM +RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_$(PATCHLEVEL)_RTM +## RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_RTM MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += mpl-tri-license-txt -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = SOS12U3 PACKAGES += CSWlibnss3 CATALOGNAME_CSWlibnss3 = libnss3 Modified: csw/mgar/pkg/nss/trunk/checksums =================================================================== --- csw/mgar/pkg/nss/trunk/checksums 2013-01-09 10:53:44 UTC (rev 20060) +++ csw/mgar/pkg/nss/trunk/checksums 2013-01-09 11:46:32 UTC (rev 20061) @@ -1 +1 @@ -3918d5f9eb2996271cf62d52f084fd45 nss-3.14.tar.gz +f6f3a942d1eba3e26aa0382a5b5461d9 nss-3.14.1.tar.gz Modified: csw/mgar/pkg/nss/trunk/files/nss.pc =================================================================== --- csw/mgar/pkg/nss/trunk/files/nss.pc 2013-01-09 10:53:44 UTC (rev 20060) +++ csw/mgar/pkg/nss/trunk/files/nss.pc 2013-01-09 11:46:32 UTC (rev 20061) @@ -5,7 +5,7 @@ Name: NSS Description: Network Security Services -Version: 3.14 +Version: 3.14.1 Requires: nspr >= 4.9.2 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 wahwah at users.sourceforge.net Wed Jan 9 18:14:37 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Jan 2013 17:14:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[20062] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 20062 http://gar.svn.sourceforge.net/gar/?rev=20062&view=rev Author: wahwah Date: 2013-01-09 17:14:37 +0000 (Wed, 09 Jan 2013) Log Message: ----------- lang-python/python/trunk: Disable pyport headers for 64 bits. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/trunk/files/pyport.h Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-01-09 11:46:32 UTC (rev 20061) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-01-09 17:14:37 UTC (rev 20062) @@ -72,9 +72,13 @@ PATCHFILES_5.10 += 0019-Force-multiprocess-to-compile.patch PATCHFILES += $(PATCHFILES_$(GAROSREL)) -# Test for sunaudiodev fails. +# The test for sunaudiodev fails. Not that it's a good practice to skip +# tests. SKIPTEST = 1 +# TODO: Enable the 64-bit build at some point. +# BUILD64 = 1 + EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib @@ -90,7 +94,7 @@ EXTRA_COMMON_EXPORTS = BASECFLAGS NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-unicode=ucs4 @@ -102,13 +106,12 @@ # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc -# use prototype filters to set the class +# use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' PACKAGES = CSWidle$(CVER) PACKAGES += CSWpython$(CVER) PACKAGES += CSWpython$(CVER)-dev -PACKAGES += CSWpython$(CVER)-test PACKAGES += CSWpython$(CVER)-tk PACKAGES += CSWlibpython$(DVER)-1-0 CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 @@ -130,16 +133,7 @@ PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* -ARCHALL_CSWpython$(CVER)-test = 1 ARCHALL_CSWidle$(CVER) = 1 RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) @@ -158,39 +152,44 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 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) +# Don't merge test files. +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/test/.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/bsddb/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/ctypes/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/email/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/distutils/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/json/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/lib2to3/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/sqlite3/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/unittest/test.* + + BUILD_DEP_PKGS += CSWlibffi-dev # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk -# This package is not meant to be released -CHECKPKG_OVERRIDES_CSWpython-test += file-with-bad-content - CATALOGNAME_CSWidle$(CVER) = idle CATALOGNAME_CSWpython$(CVER) = python CATALOGNAME_CSWpython$(CVER)-dev = python$(CVER)_dev CATALOGNAME_CSWpython$(CVER)-tk = python$(CVER)_tk -CATALOGNAME_CSWpython$(CVER)-test = python$(CVER)_test SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython$(CVER)-test = Python Test modules LICENSE = LICENSE # This is an exception, since these are original Python packages. CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- @@ -199,7 +198,11 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ include gar/category.mk +EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" +EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" +EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) + post-configure-modulated: for f in Modules/Setup \ Makefile \ @@ -212,3 +215,9 @@ gsed -i -e 's+/usr/share+/opt/csw/share+g' $(WORKSRC)/$${f}; \ done @$(MAKECOOKIE) + +post-merge-modulated: + echo "This is post-merge-modulated, which should not work. But it does." + ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) + ginstall -m 644 $(FILEDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h + @$(MAKECOOKIE) Added: csw/mgar/pkg/lang-python/python/trunk/files/pyport.h =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/files/pyport.h (rev 0) +++ csw/mgar/pkg/lang-python/python/trunk/files/pyport.h 2013-01-09 17:14:37 UTC (rev 20062) @@ -0,0 +1,9 @@ +/* Allow 32 and 64 bit headers to coexist */ +#if defined __amd64 || defined __x86_64 || defined __sparcv9 +/* + * Eventually, enable this. For now, say we have no headers for 64-bit Python. + * #include "pyport-64.h" + */ +#else +#include "pyport-32.h" +#endif 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 Jan 9 18:17:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Jan 2013 17:17:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[20063] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 20063 http://gar.svn.sourceforge.net/gar/?rev=20063&view=rev Author: wahwah Date: 2013-01-09 17:17:55 +0000 (Wed, 09 Jan 2013) Log Message: ----------- lang-python/python/trunk: fix uwatch for Python 2.6 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 2013-01-09 17:14:37 UTC (rev 20062) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-01-09 17:17:55 UTC (rev 20063) @@ -32,6 +32,7 @@ MASTER_SITES = http://python.org/ftp/python/$(VERSION)/ UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ +UFILES_REGEX = $(VER)\.\d+ DISTFILES = $(DISTNAME).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 Jan 9 20:48:27 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Jan 2013 19:48:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20064] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20064 http://gar.svn.sourceforge.net/gar/?rev=20064&view=rev Author: wahwah Date: 2013-01-09 19:48:27 +0000 (Wed, 09 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: try in 64 bits Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-09 17:17:55 UTC (rev 20063) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-09 19:48:27 UTC (rev 20064) @@ -43,7 +43,10 @@ # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. SKIPTEST = 1 +TEST_TARGET = test +BUILD64_ONLY = 1 + # There is a file name conflict over libffi.so symlink between libffi package # and a gcc-java package. While it will ultimately belong to libffi_dev, the # symlink is currently under a subdirectory. @@ -70,7 +73,8 @@ # PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc # use prototype filters to set the class -PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' +# Do not use 2.6 pycompile for 3.3. +# PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' PACKAGES = CSWidle$(CVER) @@ -94,7 +98,7 @@ SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWliblzma5 @@ -112,15 +116,16 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += file-with-bad-content # Don't merge test files. -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/test/.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/bsddb/test.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/ctypes/test.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/email/test.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/distutils/tests.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/json/tests.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/lib2to3/tests.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/sqlite3/test.* -MERGE_EXCLUDE_FILES += $(libdir)/$(PVER)/unittest/test.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/test +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/test/.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/bsddb/test.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/ctypes/test.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/email/test.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/distutils/tests.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/json/tests.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/lib2to3/tests.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/sqlite3/test.* +MERGE_EXCLUDE_FILES += /opt/csw/lib/$(PVER)/unittest/test.* PACKAGES += CSWpython$(CVER)-tk SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) @@ -151,6 +156,8 @@ PKGFILES_CSWlibpython3 += $(call baseisadirs,$(libdir),libpython3\.so) SPKG_DESC_CSWlibpython3 += $(DESCRIPTION), libpython3.so CHECKPKG_OVERRIDES_CSWlibpython3 += soname-equals-filename|file=/opt/csw/lib/libpython3.so +CHECKPKG_OVERRIDES_CSWlibpython3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libpython3.so +CHECKPKG_OVERRIDES_CSWlibpython3 += soname-equals-filename|file=/opt/csw/lib/amd64/libpython3.so RUNTIME_DEP_PKGS_CSWlibpython3 += CSWlibgcc-s1 # Devel package @@ -160,7 +167,7 @@ PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.* -PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER)m.so +PKGFILES_CSWpython$(CVER)-dev += $(call baseisadirs,$(libdir),libpython$(VER)m.so) # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py-$(VER) @@ -174,6 +181,10 @@ BUILD_DEP_PKGS += CSWlibffi-dev BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev +# Because of /opt/csw/lib/libxtermcap.a +BUILD_DEP_PKGS += CSWschilybase LICENSE = LICENSE @@ -187,6 +198,7 @@ EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' + EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python GARCOMPILER = GNU 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 Jan 9 21:02:34 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Jan 2013 20:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20065] csw/mgar/pkg/libicu48/tags Message-ID: Revision: 20065 http://gar.svn.sourceforge.net/gar/?rev=20065&view=rev Author: dmichelsen Date: 2013-01-09 20:02:34 +0000 (Wed, 09 Jan 2013) Log Message: ----------- libicu48: Tag away old version for SR 3-6627678431 Added Paths: ----------- csw/mgar/pkg/libicu48/tags/SR3-6627678431/ csw/mgar/pkg/libicu48/tags/SR3-6627678431/gar/ 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 Jan 9 21:18:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 09 Jan 2013 20:18:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20066] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 20066 http://gar.svn.sourceforge.net/gar/?rev=20066&view=rev Author: dmichelsen Date: 2013-01-09 20:18:54 +0000 (Wed, 09 Jan 2013) Log Message: ----------- mGAR v2: Make sure to call pre-merge and post-merge again on remerge Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2013-01-09 20:02:34 UTC (rev 20065) +++ csw/mgar/gar/v2/gar.mk 2013-01-09 20:18:54 UTC (rev 20066) @@ -971,7 +971,7 @@ reset-merge-modulated: @$(call _pmod,Reset merge state) - rm -f $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge-* + rm -f $(COOKIEDIR)/pre-merge $(COOKIEDIR)/pre-merge-* $(COOKIEDIR)/merge-* $(COOKIEDIR)/post-merge $(COOKIEDIR)/post-merge-* # The clean rule. It must be run if you want to re-download a # file after a successful checksum (or just remove the checksum 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 Jan 9 23:03:39 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 09 Jan 2013 22:03:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20067] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 20067 http://gar.svn.sourceforge.net/gar/?rev=20067&view=rev Author: bonivart Date: 2013-01-09 22:03:38 +0000 (Wed, 09 Jan 2013) Log Message: ----------- dhcp/trunk: update to 4.2.5 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 2013-01-09 20:18:54 UTC (rev 20066) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2013-01-09 22:03:38 UTC (rev 20067) @@ -1,12 +1,12 @@ NAME = dhcp -VERSION = 4.2.4 +VERSION = 4.2.5 # Enable these for Px-releases -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#RELEASE = P2 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) GARTYPE = v2 @@ -19,10 +19,10 @@ endef # Toggle between these for normal/Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ -MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ +MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ +#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES = $(DISTNAME).tar.gz +#DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2013-01-09 20:18:54 UTC (rev 20066) +++ csw/mgar/pkg/dhcp/trunk/checksums 2013-01-09 22:03:38 UTC (rev 20067) @@ -1 +1 @@ -fe36056f2d274fa4b82a5422f192e65f dhcp-4.2.4-P2.tar.gz +6489e919ac093d17249270ee9be1020e dhcp-4.2.5.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 Jan 9 23:17:06 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 09 Jan 2013 22:17:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[20068] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 20068 http://gar.svn.sourceforge.net/gar/?rev=20068&view=rev Author: chninkel Date: 2013-01-09 22:17:06 +0000 (Wed, 09 Jan 2013) Log Message: ----------- openssh/trunk: updated GSSAPI key exchange patch Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssh/trunk/files/openssh-6.1p1-gsskex-all-20130109.patch Removed Paths: ------------- csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch csw/mgar/pkg/openssh/trunk/files/openssh-5.9p1-gsskex-all-20110920.patch Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-09 22:03:38 UTC (rev 20067) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-09 22:17:06 UTC (rev 20068) @@ -13,8 +13,8 @@ NAME = openssh VERSION = 6.1p1 -GSSKEX_PATCH_VERSION = 5.9p1 -GSSKEX_PATCH_DATE = 20110920 +GSSKEX_PATCH_VERSION = 6.1p1 +GSSKEX_PATCH_DATE = 20130109 GARTYPE = v2 DESCRIPTION = OpenSSH Secure Shell Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch 2013-01-09 22:03:38 UTC (rev 20067) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100901.patch 2013-01-09 22:17:06 UTC (rev 20068) @@ -1,2933 +0,0 @@ -diff -Nur openssh-5.4p1.orig/ChangeLog.gssapi openssh-5.4p1/ChangeLog.gssapi ---- openssh-5.4p1.orig/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.4p1/ChangeLog.gssapi 2010-03-13 00:39:22.276624764 +0100 -@@ -0,0 +1,95 @@ -+20090615 -+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c -+ sshd.c ] -+ Fix issues identified by Greg Hudson following a code review -+ Check return value of gss_indicate_mechs -+ Protect GSSAPI calls in monitor, so they can only be used if enabled -+ Check return values of bignum functions in key exchange -+ Use BN_clear_free to clear other side's DH value -+ Make ssh_gssapi_id_kex more robust -+ Only configure kex table pointers if GSSAPI is enabled -+ Don't leak mechanism list, or gss mechanism list -+ Cast data.length before printing -+ If serverkey isn't provided, use an empty string, rather than NULL -+ -+20090201 -+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h -+ ssh_config.5 sshconnet2.c ] -+ Add support for the GSSAPIClientIdentity option, which allows the user -+ to specify which GSSAPI identity to use to contact a given server -+ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff -Nur openssh-5.4p1.orig/Makefile.in openssh-5.4p1/Makefile.in ---- openssh-5.4p1.orig/Makefile.in 2010-02-24 08:18:51.000000000 +0100 -+++ openssh-5.4p1/Makefile.in 2010-03-13 00:39:54.547584984 +0100 -@@ -74,7 +74,7 @@ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \ - entropy.o gss-genr.o umac.o jpake.o schnorr.o \ -- ssh-pkcs11.o -+ ssh-pkcs11.o kexgssc.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o \ -@@ -88,7 +88,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ - roaming_common.o roaming_serv.o -diff -Nur openssh-5.4p1.orig/auth-krb5.c openssh-5.4p1/auth-krb5.c ---- openssh-5.4p1.orig/auth-krb5.c 2009-12-21 00:49:22.000000000 +0100 -+++ openssh-5.4p1/auth-krb5.c 2010-03-13 00:39:22.287877739 +0100 -@@ -170,8 +170,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -226,15 +231,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - umask(old_umask); -@@ -249,6 +261,7 @@ - return errno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -diff -Nur openssh-5.4p1.orig/auth.h openssh-5.4p1/auth.h ---- openssh-5.4p1.orig/auth.h 2010-03-04 11:53:35.000000000 +0100 -+++ openssh-5.4p1/auth.h 2010-03-13 00:39:22.290248539 +0100 -@@ -53,6 +53,7 @@ - int valid; /* user exists and is allowed to login */ - int attempt; - int failures; -+ int server_caused_failure; - int force_pwchange; - char *user; /* username sent by the client */ - char *service; -diff -Nur openssh-5.4p1.orig/auth2-gss.c openssh-5.4p1/auth2-gss.c ---- openssh-5.4p1.orig/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ openssh-5.4p1/auth2-gss.c 2010-03-13 00:39:22.294875029 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -52,6 +52,40 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -102,6 +136,7 @@ - - if (!present) { - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -109,6 +144,7 @@ - if (ctxt != NULL) - ssh_gssapi_delete_ctx(&ctxt); - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -242,7 +278,8 @@ - - packet_check_eom(); - -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); - - authctxt->postponed = 0; - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); -@@ -277,7 +314,8 @@ - gssbuf.length = buffer_len(&b); - - if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = -+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); - else - logit("GSSAPI MIC check failed"); - -@@ -292,6 +330,12 @@ - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, -diff -Nur openssh-5.4p1.orig/auth2.c openssh-5.4p1/auth2.c ---- openssh-5.4p1.orig/auth2.c 2009-06-22 08:11:07.000000000 +0200 -+++ openssh-5.4p1/auth2.c 2010-03-13 00:39:22.298679511 +0100 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - #ifdef JPAKE -@@ -79,6 +80,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - #ifdef JPAKE -@@ -274,6 +276,7 @@ - #endif - - authctxt->postponed = 0; -+ authctxt->server_caused_failure = 0; - - /* try to authenticate user */ - m = authmethod_lookup(method); -@@ -346,7 +349,8 @@ - } else { - - /* Allow initial try of "none" auth without failure penalty */ -- if (authctxt->attempt > 1 || strcmp(method, "none") != 0) -+ if (!authctxt->server_caused_failure && -+ (authctxt->attempt > 1 || strcmp(method, "none") != 0)) - authctxt->failures++; - if (authctxt->failures >= options.max_authtries) { - #ifdef SSH_AUDIT_EVENTS -diff -Nur openssh-5.4p1.orig/clientloop.c openssh-5.4p1/clientloop.c ---- openssh-5.4p1.orig/clientloop.c 2010-01-30 07:28:35.000000000 +0100 -+++ openssh-5.4p1/clientloop.c 2010-03-13 00:39:22.309033482 +0100 -@@ -111,6 +111,10 @@ - #include "msg.h" - #include "roaming.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - /* import options */ - extern Options options; - -@@ -1431,6 +1435,13 @@ - /* Do channel operations unless rekeying in progress. */ - if (!rekeying) { - channel_after_select(readset, writeset); -+ -+ if (options.gss_renewal_rekey && -+ ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { -+ debug("credentials updated - forcing rekey"); -+ need_rekeying = 1; -+ } -+ - if (need_rekeying || packet_need_rekeying()) { - debug("need rekeying"); - xxx_kex->done = 0; -diff -Nur openssh-5.4p1.orig/configure.ac openssh-5.4p1/configure.ac ---- openssh-5.4p1.orig/configure.ac 2010-03-05 05:04:35.000000000 +0100 -+++ openssh-5.4p1/configure.ac 2010-03-13 00:39:22.319807465 +0100 -@@ -477,6 +477,30 @@ - [Use tunnel device compatibility to OpenBSD]) - AC_DEFINE(SSH_TUN_PREPEND_AF, 1, - [Prepend the address family to IP tunnel traffic]) -+ AC_MSG_CHECKING(if we have the Security Authorization Session API) -+ AC_TRY_COMPILE([#include ], -+ [SessionCreate(0, 0);], -+ [ac_cv_use_security_session_api="yes" -+ AC_DEFINE(USE_SECURITY_SESSION_API, 1, -+ [platform has the Security Authorization Session API]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes)], -+ [ac_cv_use_security_session_api="no" -+ AC_MSG_RESULT(no)]) -+ AC_MSG_CHECKING(if we have an in-memory credentials cache) -+ AC_TRY_COMPILE( -+ [#include ], -+ [cc_context_t c; -+ (void) cc_initialize (&c, 0, NULL, NULL);], -+ [AC_DEFINE(USE_CCAPI, 1, -+ [platform uses an in-memory credentials cache]) -+ LIBS="$LIBS -framework Security" -+ AC_MSG_RESULT(yes) -+ if test "x$ac_cv_use_security_session_api" = "xno"; then -+ AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***) -+ fi], -+ [AC_MSG_RESULT(no)] -+ ) - m4_pattern_allow(AU_IPv) - AC_CHECK_DECL(AU_IPv4, [], - AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records]) -diff -Nur openssh-5.4p1.orig/gss-genr.c openssh-5.4p1/gss-genr.c ---- openssh-5.4p1.orig/gss-genr.c 2009-06-22 08:11:07.000000000 +0200 -+++ openssh-5.4p1/gss-genr.c 2010-03-13 00:39:22.326293909 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-genr.c,v 1.20 2009/06/22 05:39:28 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -39,12 +39,167 @@ - #include "buffer.h" - #include "log.h" - #include "ssh2.h" -+#include "cipher.h" -+#include "key.h" -+#include "kex.h" -+#include - - #include "ssh-gss.h" - - extern u_char *session_id2; - extern u_int session_id2_len; - -+typedef struct { -+ char *encoded; -+ gss_OID oid; -+} ssh_gss_kex_mapping; -+ -+/* -+ * XXX - It would be nice to find a more elegant way of handling the -+ * XXX passing of the key exchange context to the userauth routines -+ */ -+ -+Gssctxt *gss_kex_context = NULL; -+ -+static ssh_gss_kex_mapping *gss_enc2oid = NULL; -+ -+int -+ssh_gssapi_oid_table_ok() { -+ return (gss_enc2oid != NULL); -+} -+ -+/* -+ * Return a list of the gss-group1-sha1 mechanisms supported by this program -+ * -+ * We test mechanisms to ensure that we can use them, to avoid starting -+ * a key exchange with a bad mechanism -+ */ -+ -+char * -+ssh_gssapi_client_mechanisms(const char *host, const char *client) { -+ gss_OID_set gss_supported; -+ OM_uint32 min_status; -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) -+ return NULL; -+ -+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, -+ host, client)); -+} -+ -+char * -+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, -+ const char *host, const char *client) { -+ Buffer buf; -+ size_t i; -+ int oidpos, enclen; -+ char *mechs, *encoded; -+ u_char digest[EVP_MAX_MD_SIZE]; -+ char deroid[2]; -+ const EVP_MD *evp_md = EVP_md5(); -+ EVP_MD_CTX md; -+ -+ if (gss_enc2oid != NULL) { -+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++) -+ xfree(gss_enc2oid[i].encoded); -+ xfree(gss_enc2oid); -+ } -+ -+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * -+ (gss_supported->count + 1)); -+ -+ buffer_init(&buf); -+ -+ oidpos = 0; -+ for (i = 0; i < gss_supported->count; i++) { -+ if (gss_supported->elements[i].length < 128 && -+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) { -+ -+ deroid[0] = SSH_GSS_OIDTYPE; -+ deroid[1] = gss_supported->elements[i].length; -+ -+ EVP_DigestInit(&md, evp_md); -+ EVP_DigestUpdate(&md, deroid, 2); -+ EVP_DigestUpdate(&md, -+ gss_supported->elements[i].elements, -+ gss_supported->elements[i].length); -+ EVP_DigestFinal(&md, digest, NULL); -+ -+ encoded = xmalloc(EVP_MD_size(evp_md) * 2); -+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md), -+ encoded, EVP_MD_size(evp_md) * 2); -+ -+ if (oidpos != 0) -+ buffer_put_char(&buf, ','); -+ -+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ buffer_put_char(&buf, ','); -+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); -+ buffer_append(&buf, encoded, enclen); -+ -+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); -+ gss_enc2oid[oidpos].encoded = encoded; -+ oidpos++; -+ } -+ } -+ gss_enc2oid[oidpos].oid = NULL; -+ gss_enc2oid[oidpos].encoded = NULL; -+ -+ buffer_put_char(&buf, '\0'); -+ -+ mechs = xmalloc(buffer_len(&buf)); -+ buffer_get(&buf, mechs, buffer_len(&buf)); -+ buffer_free(&buf); -+ -+ if (strlen(mechs) == 0) { -+ xfree(mechs); -+ mechs = NULL; -+ } -+ -+ return (mechs); -+} -+ -+gss_OID -+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { -+ int i = 0; -+ -+ switch (kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; -+ break; -+ case KEX_GSS_GEX_SHA1: -+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) -+ return GSS_C_NO_OID; -+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; -+ break; -+ default: -+ return GSS_C_NO_OID; -+ } -+ -+ while (gss_enc2oid[i].encoded != NULL && -+ strcmp(name, gss_enc2oid[i].encoded) != 0) -+ i++; -+ -+ if (gss_enc2oid[i].oid != NULL && ctx != NULL) -+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); -+ -+ return gss_enc2oid[i].oid; -+} -+ - /* Check that the OID in a data stream matches that in the context */ - int - ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) -@@ -197,7 +352,7 @@ - } - - ctx->major = gss_init_sec_context(&ctx->minor, -- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, -+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid, - GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, - 0, NULL, recv_tok, NULL, send_tok, flags, NULL); - -@@ -227,8 +382,42 @@ - } - - OM_uint32 -+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) -+{ -+ gss_buffer_desc gssbuf; -+ gss_name_t gssname; -+ OM_uint32 status; -+ gss_OID_set oidset; -+ -+ gssbuf.value = (void *) name; -+ gssbuf.length = strlen(gssbuf.value); -+ -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ ctx->major = gss_import_name(&ctx->minor, &gssbuf, -+ GSS_C_NT_USER_NAME, &gssname); -+ -+ if (!ctx->major) -+ ctx->major = gss_acquire_cred(&ctx->minor, -+ gssname, 0, oidset, GSS_C_INITIATE, -+ &ctx->client_creds, NULL, NULL); -+ -+ gss_release_name(&status, &gssname); -+ gss_release_oid_set(&status, &oidset); -+ -+ if (ctx->major) -+ ssh_gssapi_error(ctx); -+ -+ return(ctx->major); -+} -+ -+OM_uint32 - ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) - { -+ if (ctx == NULL) -+ return -1; -+ - if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, - GSS_C_QOP_DEFAULT, buffer, hash))) - ssh_gssapi_error(ctx); -@@ -236,6 +425,19 @@ - return (ctx->major); - } - -+/* Priviledged when used by server */ -+OM_uint32 -+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+{ -+ if (ctx == NULL) -+ return -1; -+ -+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -+ gssbuf, gssmic, NULL); -+ -+ return (ctx->major); -+} -+ - void - ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, - const char *context) -@@ -249,11 +451,16 @@ - } - - int --ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) -+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, -+ const char *client) - { - gss_buffer_desc token = GSS_C_EMPTY_BUFFER; - OM_uint32 major, minor; - gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; -+ Gssctxt *intctx = NULL; -+ -+ if (ctx == NULL) -+ ctx = &intctx; - - /* RFC 4462 says we MUST NOT do SPNEGO */ - if (oid->length == spnego_oid.length && -@@ -263,6 +470,10 @@ - ssh_gssapi_build_ctx(ctx); - ssh_gssapi_set_oid(*ctx, oid); - major = ssh_gssapi_import_name(*ctx, host); -+ -+ if (!GSS_ERROR(major) && client) -+ major = ssh_gssapi_client_identity(*ctx, client); -+ - if (!GSS_ERROR(major)) { - major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, - NULL); -@@ -272,10 +483,67 @@ - GSS_C_NO_BUFFER); - } - -- if (GSS_ERROR(major)) -+ if (GSS_ERROR(major) || intctx != NULL) - ssh_gssapi_delete_ctx(ctx); - - return (!GSS_ERROR(major)); - } - -+int -+ssh_gssapi_credentials_updated(Gssctxt *ctxt) { -+ static gss_name_t saved_name = GSS_C_NO_NAME; -+ static OM_uint32 saved_lifetime = 0; -+ static gss_OID saved_mech = GSS_C_NO_OID; -+ static gss_name_t name; -+ static OM_uint32 last_call = 0; -+ OM_uint32 lifetime, now, major, minor; -+ int equal; -+ gss_cred_usage_t usage = GSS_C_INITIATE; -+ -+ now = time(NULL); -+ -+ if (ctxt) { -+ debug("Rekey has happened - updating saved versions"); -+ -+ if (saved_name != GSS_C_NO_NAME) -+ gss_release_name(&minor, &saved_name); -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &saved_name, &saved_lifetime, NULL, NULL); -+ -+ if (!GSS_ERROR(major)) { -+ saved_mech = ctxt->oid; -+ saved_lifetime+= now; -+ } else { -+ /* Handle the error */ -+ } -+ return 0; -+ } -+ -+ if (now - last_call < 10) -+ return 0; -+ -+ last_call = now; -+ -+ if (saved_mech == GSS_C_NO_OID) -+ return 0; -+ -+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, -+ &name, &lifetime, NULL, NULL); -+ if (major == GSS_S_CREDENTIALS_EXPIRED) -+ return 0; -+ else if (GSS_ERROR(major)) -+ return 0; -+ -+ major = gss_compare_name(&minor, saved_name, name, &equal); -+ gss_release_name(&minor, &name); -+ if (GSS_ERROR(major)) -+ return 0; -+ -+ if (equal && (saved_lifetime < lifetime + now - 10)) -+ return 1; -+ -+ return 0; -+} -+ - #endif /* GSSAPI */ -diff -Nur openssh-5.4p1.orig/gss-serv-krb5.c openssh-5.4p1/gss-serv-krb5.c ---- openssh-5.4p1.orig/gss-serv-krb5.c 2006-09-01 07:38:36.000000000 +0200 -+++ openssh-5.4p1/gss-serv-krb5.c 2010-03-13 00:39:22.329666310 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -120,6 +120,7 @@ - krb5_principal princ; - OM_uint32 maj_status, min_status; - int len; -+ const char *new_ccname; - - if (client->creds == NULL) { - debug("No credentials stored"); -@@ -168,11 +169,16 @@ - return; - } - -- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); -+ new_ccname = krb5_cc_get_name(krb_context, ccache); -+ - client->store.envvar = "KRB5CCNAME"; -- len = strlen(client->store.filename) + 6; -- client->store.envval = xmalloc(len); -- snprintf(client->store.envval, len, "FILE:%s", client->store.filename); -+#ifdef USE_CCAPI -+ xasprintf(&client->store.envval, "API:%s", new_ccname); -+ client->store.filename = NULL; -+#else -+ xasprintf(&client->store.envval, "FILE:%s", new_ccname); -+ client->store.filename = xstrdup(new_ccname); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -184,6 +190,71 @@ - return; - } - -+int -+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, -+ ssh_gssapi_client *client) -+{ -+ krb5_ccache ccache = NULL; -+ krb5_principal principal = NULL; -+ char *name = NULL; -+ krb5_error_code problem; -+ OM_uint32 maj_status, min_status; -+ -+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { -+ logit("krb5_cc_resolve(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ return 0; -+ } -+ -+ /* Find out who the principal in this cache is */ -+ if ((problem = krb5_cc_get_principal(krb_context, ccache, -+ &principal))) { -+ logit("krb5_cc_get_principal(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) { -+ logit("krb5_unparse_name(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ -+ if (strcmp(name,client->exportedname.value)!=0) { -+ debug("Name in local credentials cache differs. Not storing"); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ krb5_free_unparsed_name(krb_context, name); -+ return 0; -+ } -+ krb5_free_unparsed_name(krb_context, name); -+ -+ /* Name matches, so lets get on with it! */ -+ -+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { -+ logit("krb5_cc_initialize(): %.100s", -+ krb5_get_err_text(krb_context, problem)); -+ krb5_free_principal(krb_context, principal); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ krb5_free_principal(krb_context, principal); -+ -+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, -+ ccache))) { -+ logit("gss_krb5_copy_ccache() failed. Sorry!"); -+ krb5_cc_close(krb_context, ccache); -+ return 0; -+ } -+ -+ return 1; -+} -+ - ssh_gssapi_mech gssapi_kerberos_mech = { - "toWM5Slw5Ew8Mqkay+al2g==", - "Kerberos", -@@ -191,7 +262,8 @@ - NULL, - &ssh_gssapi_krb5_userok, - NULL, -- &ssh_gssapi_krb5_storecreds -+ &ssh_gssapi_krb5_storecreds, -+ &ssh_gssapi_krb5_updatecreds - }; - - #endif /* KRB5 */ -diff -Nur openssh-5.4p1.orig/gss-serv.c openssh-5.4p1/gss-serv.c ---- openssh-5.4p1.orig/gss-serv.c 2008-05-19 07:05:07.000000000 +0200 -+++ openssh-5.4p1/gss-serv.c 2010-03-13 00:39:22.335213222 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: gss-serv.c,v 1.22 2008/05/08 12:02:23 djm Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -45,15 +45,20 @@ - #include "channels.h" - #include "session.h" - #include "misc.h" -+#include "servconf.h" -+#include "uidswap.h" - - #include "ssh-gss.h" -+#include "monitor_wrap.h" -+ -+extern ServerOptions options; - - static ssh_gssapi_client gssapi_client = - { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, -- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; -+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, {NULL, NULL, NULL}, 0, 0}; - - ssh_gssapi_mech gssapi_null_mech = -- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; -+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; - - #ifdef KRB5 - extern ssh_gssapi_mech gssapi_kerberos_mech; -@@ -81,25 +86,32 @@ - char lname[MAXHOSTNAMELEN]; - gss_OID_set oidset; - -- gss_create_empty_oid_set(&status, &oidset); -- gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ if (options.gss_strict_acceptor) { -+ gss_create_empty_oid_set(&status, &oidset); -+ gss_add_oid_set_member(&status, ctx->oid, &oidset); -+ -+ if (gethostname(lname, MAXHOSTNAMELEN)) { -+ gss_release_oid_set(&status, &oidset); -+ return (-1); -+ } - -- if (gethostname(lname, MAXHOSTNAMELEN)) { -- gss_release_oid_set(&status, &oidset); -- return (-1); -- } -+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { -+ gss_release_oid_set(&status, &oidset); -+ return (ctx->major); -+ } -+ -+ if ((ctx->major = gss_acquire_cred(&ctx->minor, -+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, -+ NULL, NULL))) -+ ssh_gssapi_error(ctx); - -- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { - gss_release_oid_set(&status, &oidset); - return (ctx->major); -+ } else { -+ ctx->name = GSS_C_NO_NAME; -+ ctx->creds = GSS_C_NO_CREDENTIAL; - } -- -- if ((ctx->major = gss_acquire_cred(&ctx->minor, -- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) -- ssh_gssapi_error(ctx); -- -- gss_release_oid_set(&status, &oidset); -- return (ctx->major); -+ return GSS_S_COMPLETE; - } - - /* Privileged */ -@@ -114,6 +126,29 @@ - } - - /* Unprivileged */ -+char * -+ssh_gssapi_server_mechanisms() { -+ gss_OID_set supported; -+ -+ ssh_gssapi_supported_oids(&supported); -+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, -+ NULL, NULL)); -+} -+ -+/* Unprivileged */ -+int -+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, -+ const char *dummy) { -+ Gssctxt *ctx = NULL; -+ int res; -+ -+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); -+ ssh_gssapi_delete_ctx(&ctx); -+ -+ return (res); -+} -+ -+/* Unprivileged */ - void - ssh_gssapi_supported_oids(gss_OID_set *oidset) - { -@@ -123,7 +158,9 @@ - gss_OID_set supported; - - gss_create_empty_oid_set(&min_status, oidset); -- gss_indicate_mechs(&min_status, &supported); -+ -+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported))) -+ return; - - while (supported_mechs[i]->name != NULL) { - if (GSS_ERROR(gss_test_oid_set_member(&min_status, -@@ -247,8 +284,48 @@ - ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) - { - int i = 0; -+ int equal = 0; -+ gss_name_t new_name = GSS_C_NO_NAME; -+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER; -+ -+ if (options.gss_store_rekey && client->used && ctx->client_creds) { -+ if (client->mech->oid.length != ctx->oid->length || -+ (memcmp(client->mech->oid.elements, -+ ctx->oid->elements, ctx->oid->length) !=0)) { -+ debug("Rekeyed credentials have different mechanism"); -+ return GSS_S_COMPLETE; -+ } -+ -+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &new_name, -+ NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ ctx->major = gss_compare_name(&ctx->minor, client->name, -+ new_name, &equal); - -- gss_buffer_desc ename; -+ if (GSS_ERROR(ctx->major)) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ -+ if (!equal) { -+ debug("Rekeyed credentials have different name"); -+ return GSS_S_COMPLETE; -+ } -+ -+ debug("Marking rekeyed credentials for export"); -+ -+ gss_release_name(&ctx->minor, &client->name); -+ gss_release_cred(&ctx->minor, &client->creds); -+ client->name = new_name; -+ client->creds = ctx->client_creds; -+ ctx->client_creds = GSS_C_NO_CREDENTIAL; -+ client->updated = 1; -+ return GSS_S_COMPLETE; -+ } - - client->mech = NULL; - -@@ -263,6 +340,13 @@ - if (client->mech == NULL) - return GSS_S_FAILURE; - -+ if (ctx->client_creds && -+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor, -+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) { -+ ssh_gssapi_error(ctx); -+ return (ctx->major); -+ } -+ - if ((ctx->major = gss_display_name(&ctx->minor, ctx->client, - &client->displayname, NULL))) { - ssh_gssapi_error(ctx); -@@ -280,6 +364,8 @@ - return (ctx->major); - } - -+ gss_release_buffer(&ctx->minor, &ename); -+ - /* We can't copy this structure, so we just move the pointer to it */ - client->creds = ctx->client_creds; - ctx->client_creds = GSS_C_NO_CREDENTIAL; -@@ -327,7 +413,7 @@ - - /* Privileged */ - int --ssh_gssapi_userok(char *user) -+ssh_gssapi_userok(char *user, struct passwd *pw) - { - OM_uint32 lmin; - -@@ -337,9 +423,11 @@ - return 0; - } - if (gssapi_client.mech && gssapi_client.mech->userok) -- if ((*gssapi_client.mech->userok)(&gssapi_client, user)) -+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) { -+ gssapi_client.used = 1; -+ gssapi_client.store.owner = pw; - return 1; -- else { -+ } else { - /* Destroy delegated credentials if userok fails */ - gss_release_buffer(&lmin, &gssapi_client.displayname); - gss_release_buffer(&lmin, &gssapi_client.exportedname); -@@ -352,14 +440,90 @@ - return (0); - } - --/* Privileged */ --OM_uint32 --ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) -+/* These bits are only used for rekeying. The unpriviledged child is running -+ * as the user, the monitor is root. -+ * -+ * In the child, we want to : -+ * *) Ask the monitor to store our credentials into the store we specify -+ * *) If it succeeds, maybe do a PAM update -+ */ -+ -+/* Stuff for PAM */ -+ -+#ifdef USE_PAM -+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, -+ struct pam_response **resp, void *data) - { -- ctx->major = gss_verify_mic(&ctx->minor, ctx->context, -- gssbuf, gssmic, NULL); -+ return (PAM_CONV_ERR); -+} -+#endif - -- return (ctx->major); -+void -+ssh_gssapi_rekey_creds() { -+ int ok; -+ int ret; -+#ifdef USE_PAM -+ pam_handle_t *pamh = NULL; -+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL}; -+ char *envstr; -+#endif -+ -+ if (gssapi_client.store.filename == NULL && -+ gssapi_client.store.envval == NULL && -+ gssapi_client.store.envvar == NULL) -+ return; -+ -+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store)); -+ -+ if (!ok) -+ return; -+ -+ debug("Rekeyed credentials stored successfully"); -+ -+ /* Actually managing to play with the ssh pam stack from here will -+ * be next to impossible. In any case, we may want different options -+ * for rekeying. So, use our own :) -+ */ -+#ifdef USE_PAM -+ if (!use_privsep) { -+ debug("Not even going to try and do PAM with privsep disabled"); -+ return; -+ } -+ -+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name, -+ &pamconv, &pamh); -+ if (ret) -+ return; -+ -+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, -+ gssapi_client.store.envval); -+ -+ ret = pam_putenv(pamh, envstr); -+ if (!ret) -+ pam_setcred(pamh, PAM_REINITIALIZE_CRED); -+ pam_end(pamh, PAM_SUCCESS); -+#endif -+} -+ -+int -+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) { -+ int ok = 0; -+ -+ /* Check we've got credentials to store */ -+ if (!gssapi_client.updated) -+ return 0; -+ -+ gssapi_client.updated = 0; -+ -+ temporarily_use_uid(gssapi_client.store.owner); -+ if (gssapi_client.mech && gssapi_client.mech->updatecreds) -+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client); -+ else -+ debug("No update function for this mechanism"); -+ -+ restore_uid(); -+ -+ return ok; - } - - #endif -diff -Nur openssh-5.4p1.orig/kex.c openssh-5.4p1/kex.c ---- openssh-5.4p1.orig/kex.c 2010-01-08 06:50:41.000000000 +0100 -+++ openssh-5.4p1/kex.c 2010-03-13 00:39:22.339231004 +0100 -@@ -50,6 +50,10 @@ - #include "monitor.h" - #include "roaming.h" - -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+ - #if OPENSSL_VERSION_NUMBER >= 0x00907000L - # if defined(HAVE_EVP_SHA256) - # define evp_ssh_sha256 EVP_sha256 -@@ -326,6 +330,20 @@ - k->kex_type = KEX_DH_GEX_SHA256; - k->evp_md = evp_ssh_sha256(); - #endif -+#ifdef GSSAPI -+ } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID, -+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GEX_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, -+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP1_SHA1; -+ k->evp_md = EVP_sha1(); -+ } else if (strncmp(k->name, KEX_GSS_GRP14_SHA1_ID, -+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1) == 0) { -+ k->kex_type = KEX_GSS_GRP14_SHA1; -+ k->evp_md = EVP_sha1(); -+#endif - } else - fatal("bad kex alg %s", k->name); - } -diff -Nur openssh-5.4p1.orig/kex.h openssh-5.4p1/kex.h ---- openssh-5.4p1.orig/kex.h 2010-02-26 21:55:05.000000000 +0100 -+++ openssh-5.4p1/kex.h 2010-03-13 00:39:22.342872379 +0100 -@@ -67,6 +67,9 @@ - KEX_DH_GRP14_SHA1, - KEX_DH_GEX_SHA1, - KEX_DH_GEX_SHA256, -+ KEX_GSS_GRP1_SHA1, -+ KEX_GSS_GRP14_SHA1, -+ KEX_GSS_GEX_SHA1, - KEX_MAX - }; - -@@ -123,6 +126,12 @@ - sig_atomic_t done; - int flags; - const EVP_MD *evp_md; -+#ifdef GSSAPI -+ int gss_deleg_creds; -+ int gss_trust_dns; -+ char *gss_host; -+ char *gss_client; -+#endif - char *client_version_string; - char *server_version_string; - int (*verify_host_key)(Key *); -@@ -146,6 +155,11 @@ - void kexgex_client(Kex *); - void kexgex_server(Kex *); - -+#ifdef GSSAPI -+void kexgss_client(Kex *); -+void kexgss_server(Kex *); -+#endif -+ - void - kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, - BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); -diff -Nur openssh-5.4p1.orig/kexgssc.c openssh-5.4p1/kexgssc.c ---- openssh-5.4p1.orig/kexgssc.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.4p1/kexgssc.c 2010-03-13 00:39:22.345386953 +0100 -@@ -0,0 +1,334 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include "includes.h" -+ -+#include -+#include -+ -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+ -+#include "ssh-gss.h" -+ -+void -+kexgss_client(Kex *kex) { -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; -+ Gssctxt *ctxt; -+ OM_uint32 maj_status, min_status, ret_flags; -+ u_int klen, kout, slen = 0, hashlen, strlen; -+ DH *dh; -+ BIGNUM *dh_server_pub = NULL; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *p = NULL; -+ BIGNUM *g = NULL; -+ u_char *kbuf, *hash; -+ u_char *serverhostkey = NULL; -+ u_char *empty = ""; -+ char *msg; -+ char *lang; -+ int type = 0; -+ int first = 1; -+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; -+ -+ /* Initialise our GSSAPI world */ -+ ssh_gssapi_build_ctx(&ctxt); -+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) -+ == GSS_C_NO_OID) -+ fatal("Couldn't identify host exchange"); -+ -+ if (ssh_gssapi_import_name(ctxt, kex->gss_host)) -+ fatal("Couldn't import hostname"); -+ -+ if (kex->gss_client && -+ ssh_gssapi_client_identity(ctxt, kex->gss_client)) -+ fatal("Couldn't acquire client credentials"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange\n"); -+ nbits = dh_estimate(kex->we_need * 8); -+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ); -+ packet_put_int(min); -+ packet_put_int(nbits); -+ packet_put_int(max); -+ -+ packet_send(); -+ -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP); -+ -+ if ((p = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(p); -+ if ((g = BN_new()) == NULL) -+ fatal("BN_new() failed"); -+ packet_get_bignum2(g); -+ packet_check_eom(); -+ -+ if (BN_num_bits(p) < min || BN_num_bits(p) > max) -+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", -+ min, BN_num_bits(p), max); -+ -+ dh = dh_new_group(g, p); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ /* Step 1 - e is dh->pub_key */ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ /* This is f, we initialise it now to make life easier */ -+ dh_server_pub = BN_new(); -+ if (dh_server_pub == NULL) -+ fatal("dh_server_pub == NULL"); -+ -+ token_ptr = GSS_C_NO_BUFFER; -+ -+ do { -+ debug("Calling gss_init_sec_context"); -+ -+ maj_status = ssh_gssapi_init_ctx(ctxt, -+ kex->gss_deleg_creds, token_ptr, &send_tok, -+ &ret_flags); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length != 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ fatal("gss_init_context failed"); -+ } -+ -+ /* If we've got an old receive buffer get rid of it */ -+ if (token_ptr != GSS_C_NO_BUFFER) -+ xfree(recv_tok.value); -+ -+ if (maj_status == GSS_S_COMPLETE) { -+ /* If mutual state flag is not true, kex fails */ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual authentication failed"); -+ -+ /* If integ avail flag is not true kex fails */ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity check failed"); -+ } -+ -+ /* -+ * If we have data to send, then the last message that we -+ * received cannot have been a 'complete'. -+ */ -+ if (send_tok.length != 0) { -+ if (first) { -+ packet_start(SSH2_MSG_KEXGSS_INIT); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ packet_put_bignum2(dh->pub_key); -+ first = 0; -+ } else { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, -+ send_tok.length); -+ } -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ -+ /* If we've sent them data, they should reply */ -+ do { -+ type = packet_read(); -+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) { -+ debug("Received KEXGSS_HOSTKEY"); -+ if (serverhostkey) -+ fatal("Server host key received more than once"); -+ serverhostkey = -+ packet_get_string(&slen); -+ } -+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY); -+ -+ switch (type) { -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ debug("Received GSSAPI_CONTINUE"); -+ if (maj_status == GSS_S_COMPLETE) -+ fatal("GSSAPI Continue received from server when complete"); -+ recv_tok.value = packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ break; -+ case SSH2_MSG_KEXGSS_COMPLETE: -+ debug("Received GSSAPI_COMPLETE"); -+ packet_get_bignum2(dh_server_pub); -+ msg_tok.value = packet_get_string(&strlen); -+ msg_tok.length = strlen; -+ -+ /* Is there a token included? */ -+ if (packet_get_char()) { -+ recv_tok.value= -+ packet_get_string(&strlen); -+ recv_tok.length = strlen; -+ /* If we're already complete - protocol error */ -+ if (maj_status == GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: received token when complete"); -+ } else { -+ /* No token included */ -+ if (maj_status != GSS_S_COMPLETE) -+ packet_disconnect("Protocol error: did not receive final token"); -+ } -+ break; -+ case SSH2_MSG_KEXGSS_ERROR: -+ debug("Received Error"); -+ maj_status = packet_get_int(); -+ min_status = packet_get_int(); -+ msg = packet_get_string(NULL); -+ lang = packet_get_string(NULL); -+ fatal("GSSAPI Error: \n%.400s",msg); -+ default: -+ packet_disconnect("Protocol error: didn't expect packet type %d", -+ type); -+ } -+ token_ptr = &recv_tok; -+ } else { -+ /* No data, and not complete */ -+ if (maj_status != GSS_S_COMPLETE) -+ fatal("Not complete, and no token output"); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ /* -+ * We _must_ have received a COMPLETE message in reply from the -+ * server, which will have set dh_server_pub and msg_tok -+ */ -+ -+ if (type != SSH2_MSG_KEXGSS_COMPLETE) -+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); -+ -+ /* Check f in range [1, p-1] */ -+ if (!dh_pub_is_valid(dh, dh_server_pub)) -+ packet_disconnect("bad server public DH value"); -+ -+ /* compute K=f^x mod p */ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_server_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_client: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexdh_client: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ dh->pub_key, /* e */ -+ dh_server_pub, /* f */ -+ shared_secret, /* K */ -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, -+ kex->server_version_string, -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ (serverhostkey ? serverhostkey : empty), slen, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh->pub_key, -+ dh_server_pub, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ /* Verify that the hash matches the MIC we just got. */ -+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) -+ packet_disconnect("Hash's MIC didn't verify"); -+ -+ xfree(msg_tok.value); -+ -+ DH_free(dh); -+ if (serverhostkey) -+ xfree(serverhostkey); -+ BN_clear_free(dh_server_pub); -+ -+ /* save session id */ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ if (kex->gss_deleg_creds) -+ ssh_gssapi_credentials_updated(ctxt); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+} -+ -+#endif /* GSSAPI */ -diff -Nur openssh-5.4p1.orig/kexgsss.c openssh-5.4p1/kexgsss.c ---- openssh-5.4p1.orig/kexgsss.c 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.4p1/kexgsss.c 2010-03-13 00:39:22.347367946 +0100 -@@ -0,0 +1,288 @@ -+/* -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#ifdef GSSAPI -+ -+#include -+ -+#include -+#include -+ -+#include "xmalloc.h" -+#include "buffer.h" -+#include "ssh2.h" -+#include "key.h" -+#include "cipher.h" -+#include "kex.h" -+#include "log.h" -+#include "packet.h" -+#include "dh.h" -+#include "ssh-gss.h" -+#include "monitor_wrap.h" -+#include "servconf.h" -+ -+extern ServerOptions options; -+ -+void -+kexgss_server(Kex *kex) -+{ -+ OM_uint32 maj_status, min_status; -+ -+ /* -+ * Some GSSAPI implementations use the input value of ret_flags (an -+ * output variable) as a means of triggering mechanism specific -+ * features. Initializing it to zero avoids inadvertently -+ * activating this non-standard behaviour. -+ */ -+ -+ OM_uint32 ret_flags = 0; -+ gss_buffer_desc gssbuf, recv_tok, msg_tok; -+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; -+ Gssctxt *ctxt = NULL; -+ u_int slen, klen, kout, hashlen; -+ u_char *kbuf, *hash; -+ DH *dh; -+ int min = -1, max = -1, nbits = -1; -+ BIGNUM *shared_secret = NULL; -+ BIGNUM *dh_client_pub = NULL; -+ int type = 0; -+ gss_OID oid; -+ char *mechs; -+ -+ /* Initialise GSSAPI */ -+ -+ /* If we're rekeying, privsep means that some of the private structures -+ * in the GSSAPI code are no longer available. This kludges them back -+ * into life -+ */ -+ if (!ssh_gssapi_oid_table_ok()) -+ if ((mechs = ssh_gssapi_server_mechanisms())) -+ xfree(mechs); -+ -+ debug2("%s: Identifying %s", __func__, kex->name); -+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); -+ if (oid == GSS_C_NO_OID) -+ fatal("Unknown gssapi mechanism"); -+ -+ debug2("%s: Acquiring credentials", __func__); -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) -+ fatal("Unable to acquire credentials for the server"); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ dh = dh_new_group1(); -+ break; -+ case KEX_GSS_GRP14_SHA1: -+ dh = dh_new_group14(); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ debug("Doing group exchange"); -+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); -+ min = packet_get_int(); -+ nbits = packet_get_int(); -+ max = packet_get_int(); -+ min = MAX(DH_GRP_MIN, min); -+ max = MIN(DH_GRP_MAX, max); -+ packet_check_eom(); -+ if (max < min || nbits < min || max < nbits) -+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d", -+ min, nbits, max); -+ dh = PRIVSEP(choose_dh(min, nbits, max)); -+ if (dh == NULL) -+ packet_disconnect("Protocol error: no matching group found"); -+ -+ packet_start(SSH2_MSG_KEXGSS_GROUP); -+ packet_put_bignum2(dh->p); -+ packet_put_bignum2(dh->g); -+ packet_send(); -+ -+ packet_write_wait(); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ dh_gen_key(dh, kex->we_need * 8); -+ -+ do { -+ debug("Wait SSH2_MSG_GSSAPI_INIT"); -+ type = packet_read(); -+ switch(type) { -+ case SSH2_MSG_KEXGSS_INIT: -+ if (dh_client_pub != NULL) -+ fatal("Received KEXGSS_INIT after initialising"); -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ -+ if ((dh_client_pub = BN_new()) == NULL) -+ fatal("dh_client_pub == NULL"); -+ -+ packet_get_bignum2(dh_client_pub); -+ -+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ -+ break; -+ case SSH2_MSG_KEXGSS_CONTINUE: -+ recv_tok.value = packet_get_string(&slen); -+ recv_tok.length = slen; -+ break; -+ default: -+ packet_disconnect( -+ "Protocol error: didn't expect packet type %d", -+ type); -+ } -+ -+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, -+ &send_tok, &ret_flags)); -+ -+ xfree(recv_tok.value); -+ -+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) -+ fatal("Zero length token output when incomplete"); -+ -+ if (dh_client_pub == NULL) -+ fatal("No client public key"); -+ -+ if (maj_status & GSS_S_CONTINUE_NEEDED) { -+ debug("Sending GSSAPI_CONTINUE"); -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ gss_release_buffer(&min_status, &send_tok); -+ } -+ } while (maj_status & GSS_S_CONTINUE_NEEDED); -+ -+ if (GSS_ERROR(maj_status)) { -+ if (send_tok.length > 0) { -+ packet_start(SSH2_MSG_KEXGSS_CONTINUE); -+ packet_put_string(send_tok.value, send_tok.length); -+ packet_send(); -+ } -+ fatal("accept_ctx died"); -+ } -+ -+ if (!(ret_flags & GSS_C_MUTUAL_FLAG)) -+ fatal("Mutual Authentication flag wasn't set"); -+ -+ if (!(ret_flags & GSS_C_INTEG_FLAG)) -+ fatal("Integrity flag wasn't set"); -+ -+ if (!dh_pub_is_valid(dh, dh_client_pub)) -+ packet_disconnect("bad client public DH value"); -+ -+ klen = DH_size(dh); -+ kbuf = xmalloc(klen); -+ kout = DH_compute_key(kbuf, dh_client_pub, dh); -+ if (kout < 0) -+ fatal("DH_compute_key: failed"); -+ -+ shared_secret = BN_new(); -+ if (shared_secret == NULL) -+ fatal("kexgss_server: BN_new failed"); -+ -+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) -+ fatal("kexgss_server: BN_bin2bn failed"); -+ -+ memset(kbuf, 0, klen); -+ xfree(kbuf); -+ -+ switch (kex->kex_type) { -+ case KEX_GSS_GRP1_SHA1: -+ case KEX_GSS_GRP14_SHA1: -+ kex_dh_hash( -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, /* Change this if we start sending host keys */ -+ dh_client_pub, dh->pub_key, shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ case KEX_GSS_GEX_SHA1: -+ kexgex_hash( -+ kex->evp_md, -+ kex->client_version_string, kex->server_version_string, -+ buffer_ptr(&kex->peer), buffer_len(&kex->peer), -+ buffer_ptr(&kex->my), buffer_len(&kex->my), -+ NULL, 0, -+ min, nbits, max, -+ dh->p, dh->g, -+ dh_client_pub, -+ dh->pub_key, -+ shared_secret, -+ &hash, &hashlen -+ ); -+ break; -+ default: -+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); -+ } -+ -+ BN_clear_free(dh_client_pub); -+ -+ if (kex->session_id == NULL) { -+ kex->session_id_len = hashlen; -+ kex->session_id = xmalloc(kex->session_id_len); -+ memcpy(kex->session_id, hash, kex->session_id_len); -+ } -+ -+ gssbuf.value = hash; -+ gssbuf.length = hashlen; -+ -+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) -+ fatal("Couldn't get MIC"); -+ -+ packet_start(SSH2_MSG_KEXGSS_COMPLETE); -+ packet_put_bignum2(dh->pub_key); -+ packet_put_string(msg_tok.value,msg_tok.length); -+ -+ if (send_tok.length != 0) { -+ packet_put_char(1); /* true */ -+ packet_put_string(send_tok.value, send_tok.length); -+ } else { -+ packet_put_char(0); /* false */ -+ } -+ packet_send(); -+ -+ gss_release_buffer(&min_status, &send_tok); -+ gss_release_buffer(&min_status, &msg_tok); -+ -+ if (gss_kex_context == NULL) -+ gss_kex_context = ctxt; -+ else -+ ssh_gssapi_delete_ctx(&ctxt); -+ -+ DH_free(dh); -+ -+ kex_derive_keys(kex, hash, hashlen, shared_secret); -+ BN_clear_free(shared_secret); -+ kex_finish(kex); -+ -+ /* If this was a rekey, then save out any delegated credentials we -+ * just exchanged. */ -+ if (options.gss_store_rekey) -+ ssh_gssapi_rekey_creds(); -+} -+#endif /* GSSAPI */ -diff -Nur openssh-5.4p1.orig/key.c openssh-5.4p1/key.c ---- openssh-5.4p1.orig/key.c 2010-03-04 11:52:18.000000000 +0100 -+++ openssh-5.4p1/key.c 2010-03-13 00:40:49.216211219 +0100 -@@ -969,7 +969,9 @@ - return KEY_RSA_CERT; - } else if (strcmp(name, "ssh-dss-cert-v00 at openssh.com") == 0) { - return KEY_DSA_CERT; -- } -+ } else if (strcmp(name, "null") == 0) { -+ return KEY_NULL; -+ } - debug2("key_type_from_name: unknown key type '%s'", name); - return KEY_UNSPEC; - } -diff -Nur openssh-5.4p1.orig/key.h openssh-5.4p1/key.h ---- openssh-5.4p1.orig/key.h 2010-02-26 21:55:05.000000000 +0100 -+++ openssh-5.4p1/key.h 2010-03-13 00:40:17.733623904 +0100 -@@ -37,6 +37,7 @@ - KEY_DSA_CERT, - KEY_RSA_CERT_V00, - KEY_DSA_CERT_V00, -+ KEY_NULL, - KEY_UNSPEC - }; - enum fp_type { -diff -Nur openssh-5.4p1.orig/monitor.c openssh-5.4p1/monitor.c ---- openssh-5.4p1.orig/monitor.c 2010-03-07 13:05:17.000000000 +0100 -+++ openssh-5.4p1/monitor.c 2010-03-13 00:39:22.367998455 +0100 -@@ -172,6 +172,8 @@ - int mm_answer_gss_accept_ctx(int, Buffer *); - int mm_answer_gss_userok(int, Buffer *); - int mm_answer_gss_checkmic(int, Buffer *); -+int mm_answer_gss_sign(int, Buffer *); -+int mm_answer_gss_updatecreds(int, Buffer *); - #endif - - #ifdef SSH_AUDIT_EVENTS -@@ -241,6 +243,7 @@ - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, -+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, - #endif - #ifdef JPAKE - {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, -@@ -253,6 +256,12 @@ - }; - - struct mon_table mon_dispatch_postauth20[] = { -+#ifdef GSSAPI -+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, -+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, -+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, -+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds}, -+#endif - {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, - {MONITOR_REQ_SIGN, 0, mm_answer_sign}, - {MONITOR_REQ_PTY, 0, mm_answer_pty}, -@@ -357,6 +366,10 @@ - /* Permit requests for moduli and signatures */ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_proto15; - -@@ -443,6 +456,10 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -+#ifdef GSSAPI -+ /* and for the GSSAPI key exchange */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); -+#endif - } else { - mon_dispatch = mon_dispatch_postauth15; - monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); -@@ -1691,6 +1708,13 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->hostkey_type = buffer_get_int(m); - kex->kex_type = buffer_get_int(m); -@@ -1897,6 +1921,9 @@ - OM_uint32 major; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - goid.elements = buffer_get_string(m, &len); - goid.length = len; - -@@ -1924,6 +1951,9 @@ - OM_uint32 flags = 0; /* GSI needs this */ - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - in.value = buffer_get_string(m, &len); - in.length = len; - major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); -@@ -1941,6 +1971,7 @@ - monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); - monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); - } - return (0); - } -@@ -1952,6 +1983,9 @@ - OM_uint32 ret; - u_int len; - -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ - gssbuf.value = buffer_get_string(m, &len); - gssbuf.length = len; - mic.value = buffer_get_string(m, &len); -@@ -1978,7 +2012,11 @@ - { - int authenticated; - -- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ authenticated = authctxt->valid && -+ ssh_gssapi_userok(authctxt->user, authctxt->pw); - - buffer_clear(m); - buffer_put_int(m, authenticated); -@@ -1991,6 +2029,74 @@ - /* Monitor loop will terminate if authenticated */ - return (authenticated); - } -+ -+int -+mm_answer_gss_sign(int socket, Buffer *m) -+{ -+ gss_buffer_desc data; -+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; -+ OM_uint32 major, minor; -+ u_int len; -+ -+ if (!options.gss_authentication && !options.gss_keyex) -+ fatal("In GSSAPI monitor when GSSAPI is disabled"); -+ -+ data.value = buffer_get_string(m, &len); -+ data.length = len; -+ if (data.length != 20) -+ fatal("%s: data length incorrect: %d", __func__, -+ (int) data.length); -+ -+ /* Save the session ID on the first time around */ -+ if (session_id2_len == 0) { -+ session_id2_len = data.length; -+ session_id2 = xmalloc(session_id2_len); -+ memcpy(session_id2, data.value, session_id2_len); -+ } -+ major = ssh_gssapi_sign(gsscontext, &data, &hash); -+ -+ xfree(data.value); -+ -+ buffer_clear(m); -+ buffer_put_int(m, major); -+ buffer_put_string(m, hash.value, hash.length); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); -+ -+ gss_release_buffer(&minor, &hash); -+ -+ /* Turn on getpwnam permissions */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); -+ -+ /* And credential updating, for when rekeying */ -+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1); -+ -+ return (0); -+} -+ -+int -+mm_answer_gss_updatecreds(int socket, Buffer *m) { -+ ssh_gssapi_ccache store; -+ int ok; -+ -+ store.filename = buffer_get_string(m, NULL); -+ store.envvar = buffer_get_string(m, NULL); -+ store.envval = buffer_get_string(m, NULL); -+ -+ ok = ssh_gssapi_update_creds(&store); -+ -+ xfree(store.filename); -+ xfree(store.envvar); -+ xfree(store.envval); -+ -+ buffer_clear(m); -+ buffer_put_int(m, ok); -+ -+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m); -+ -+ return(0); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff -Nur openssh-5.4p1.orig/monitor.h openssh-5.4p1/monitor.h ---- openssh-5.4p1.orig/monitor.h 2008-11-05 06:20:46.000000000 +0100 -+++ openssh-5.4p1/monitor.h 2010-03-13 00:39:22.370058530 +0100 -@@ -53,6 +53,8 @@ - MONITOR_REQ_GSSSTEP, MONITOR_ANS_GSSSTEP, - MONITOR_REQ_GSSUSEROK, MONITOR_ANS_GSSUSEROK, - MONITOR_REQ_GSSCHECKMIC, MONITOR_ANS_GSSCHECKMIC, -+ MONITOR_REQ_GSSSIGN, MONITOR_ANS_GSSSIGN, -+ MONITOR_REQ_GSSUPCREDS, MONITOR_ANS_GSSUPCREDS, - MONITOR_REQ_PAM_START, - MONITOR_REQ_PAM_ACCOUNT, MONITOR_ANS_PAM_ACCOUNT, - MONITOR_REQ_PAM_INIT_CTX, MONITOR_ANS_PAM_INIT_CTX, -diff -Nur openssh-5.4p1.orig/monitor_wrap.c openssh-5.4p1/monitor_wrap.c ---- openssh-5.4p1.orig/monitor_wrap.c 2010-03-07 13:05:17.000000000 +0100 -+++ openssh-5.4p1/monitor_wrap.c 2010-03-13 00:39:22.375677054 +0100 -@@ -1231,7 +1231,7 @@ - } - - int --mm_ssh_gssapi_userok(char *user) -+mm_ssh_gssapi_userok(char *user, struct passwd *pw) - { - Buffer m; - int authenticated = 0; -@@ -1248,6 +1248,51 @@ - debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); - return (authenticated); - } -+ -+OM_uint32 -+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) -+{ -+ Buffer m; -+ OM_uint32 major; -+ u_int len; -+ -+ buffer_init(&m); -+ buffer_put_string(&m, data->value, data->length); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); -+ -+ major = buffer_get_int(&m); -+ hash->value = buffer_get_string(&m, &len); -+ hash->length = len; -+ -+ buffer_free(&m); -+ -+ return(major); -+} -+ -+int -+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store) -+{ -+ Buffer m; -+ int ok; -+ -+ buffer_init(&m); -+ -+ buffer_put_cstring(&m, store->filename ? store->filename : ""); -+ buffer_put_cstring(&m, store->envvar ? store->envvar : ""); -+ buffer_put_cstring(&m, store->envval ? store->envval : ""); -+ -+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m); -+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m); -+ -+ ok = buffer_get_int(&m); -+ -+ buffer_free(&m); -+ -+ return (ok); -+} -+ - #endif /* GSSAPI */ - - #ifdef JPAKE -diff -Nur openssh-5.4p1.orig/monitor_wrap.h openssh-5.4p1/monitor_wrap.h ---- openssh-5.4p1.orig/monitor_wrap.h 2009-03-05 14:58:22.000000000 +0100 -+++ openssh-5.4p1/monitor_wrap.h 2010-03-13 00:39:22.377770519 +0100 -@@ -57,8 +57,10 @@ - OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); - OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, - gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); --int mm_ssh_gssapi_userok(char *user); -+int mm_ssh_gssapi_userok(char *user, struct passwd *); - OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); -+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); -+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); - #endif - - #ifdef USE_PAM -diff -Nur openssh-5.4p1.orig/readconf.c openssh-5.4p1/readconf.c ---- openssh-5.4p1.orig/readconf.c 2010-02-11 23:21:03.000000000 +0100 -+++ openssh-5.4p1/readconf.c 2010-03-13 00:39:22.384142845 +0100 -@@ -127,6 +127,7 @@ - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, - oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, -@@ -164,10 +165,18 @@ - { "afstokenpassing", oUnsupported }, - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, -+ { "gssapikeyexchange", oGssKeyEx }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, -+ { "gssapiclientidentity", oGssClientIdentity }, -+ { "gssapirenewalforcesrekey", oGssRenewalRekey }, - #else - { "gssapiauthentication", oUnsupported }, -+ { "gssapikeyexchange", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, -+ { "gssapiclientidentity", oUnsupported }, -+ { "gssapirenewalforcesrekey", oUnsupported }, - #endif - { "fallbacktorsh", oDeprecated }, - { "usersh", oDeprecated }, -@@ -456,10 +465,26 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case oGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ -+ case oGssClientIdentity: -+ charptr = &options->gss_client_identity; -+ goto parse_string; -+ -+ case oGssRenewalRekey: -+ intptr = &options->gss_renewal_rekey; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -1015,7 +1040,11 @@ - options->pubkey_authentication = -1; - options->challenge_response_authentication = -1; - options->gss_authentication = -1; -+ options->gss_keyex = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; -+ options->gss_renewal_rekey = -1; -+ options->gss_client_identity = NULL; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -1107,8 +1136,14 @@ - options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; -+ if (options->gss_renewal_rekey == -1) -+ options->gss_renewal_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff -Nur openssh-5.4p1.orig/readconf.h openssh-5.4p1/readconf.h ---- openssh-5.4p1.orig/readconf.h 2010-02-11 23:21:03.000000000 +0100 -+++ openssh-5.4p1/readconf.h 2010-03-13 00:39:22.386055410 +0100 -@@ -44,7 +44,11 @@ - int challenge_response_authentication; - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ -+ int gss_keyex; /* Try GSS key exchange */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ -+ int gss_renewal_rekey; /* Credential renewal forces rekey */ -+ char *gss_client_identity; /* Principal to initiate GSSAPI with */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff -Nur openssh-5.4p1.orig/servconf.c openssh-5.4p1/servconf.c ---- openssh-5.4p1.orig/servconf.c 2010-03-04 11:53:35.000000000 +0100 -+++ openssh-5.4p1/servconf.c 2010-03-13 00:39:22.394208388 +0100 -@@ -93,7 +93,10 @@ - options->kerberos_ticket_cleanup = -1; - options->kerberos_get_afs_token = -1; - options->gss_authentication=-1; -+ options->gss_keyex = -1; - options->gss_cleanup_creds = -1; -+ options->gss_strict_acceptor = -1; -+ options->gss_store_rekey = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->challenge_response_authentication = -1; -@@ -214,8 +217,14 @@ - options->kerberos_get_afs_token = 0; - if (options->gss_authentication == -1) - options->gss_authentication = 0; -+ if (options->gss_keyex == -1) -+ options->gss_keyex = 0; - if (options->gss_cleanup_creds == -1) - options->gss_cleanup_creds = 1; -+ if (options->gss_strict_acceptor == -1) -+ options->gss_strict_acceptor = 1; -+ if (options->gss_store_rekey == -1) -+ options->gss_store_rekey = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -@@ -306,7 +315,9 @@ - sBanner, sUseDNS, sHostbasedAuthentication, - sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, - sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, -- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, -+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, -+ sGssKeyEx, sGssStoreRekey, -+ sAcceptEnv, sPermitTunnel, - sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, - sZeroKnowledgePasswordAuthentication, sHostCertificate, -@@ -369,9 +380,15 @@ - #ifdef GSSAPI - { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, - { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, - #else - { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, - { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, -+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, - #endif - { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, - { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, -@@ -925,10 +942,22 @@ - intptr = &options->gss_authentication; - goto parse_flag; - -+ case sGssKeyEx: -+ intptr = &options->gss_keyex; -+ goto parse_flag; -+ - case sGssCleanupCreds: - intptr = &options->gss_cleanup_creds; - goto parse_flag; - -+ case sGssStrictAcceptor: -+ intptr = &options->gss_strict_acceptor; -+ goto parse_flag; -+ -+ case sGssStoreRekey: -+ intptr = &options->gss_store_rekey; -+ goto parse_flag; -+ - case sPasswordAuthentication: - intptr = &options->password_authentication; - goto parse_flag; -diff -Nur openssh-5.4p1.orig/servconf.h openssh-5.4p1/servconf.h ---- openssh-5.4p1.orig/servconf.h 2010-03-04 11:53:35.000000000 +0100 -+++ openssh-5.4p1/servconf.h 2010-03-13 00:39:22.397236772 +0100 -@@ -94,7 +94,10 @@ - int kerberos_get_afs_token; /* If true, try to get AFS token if - * authenticated with Kerberos. */ - int gss_authentication; /* If true, permit GSSAPI authentication */ -+ int gss_keyex; /* If true, permit GSSAPI key exchange */ - int gss_cleanup_creds; /* If true, destroy cred cache on logout */ -+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ -+ int gss_store_rekey; - int password_authentication; /* If true, permit password - * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ -diff -Nur openssh-5.4p1.orig/ssh-gss.h openssh-5.4p1/ssh-gss.h ---- openssh-5.4p1.orig/ssh-gss.h 2007-06-12 15:40:39.000000000 +0200 -+++ openssh-5.4p1/ssh-gss.h 2010-03-13 00:39:22.400061752 +0100 -@@ -1,6 +1,6 @@ - /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */ - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -60,10 +60,22 @@ - - #define SSH_GSS_OIDTYPE 0x06 - -+#define SSH2_MSG_KEXGSS_INIT 30 -+#define SSH2_MSG_KEXGSS_CONTINUE 31 -+#define SSH2_MSG_KEXGSS_COMPLETE 32 -+#define SSH2_MSG_KEXGSS_HOSTKEY 33 -+#define SSH2_MSG_KEXGSS_ERROR 34 -+#define SSH2_MSG_KEXGSS_GROUPREQ 40 -+#define SSH2_MSG_KEXGSS_GROUP 41 -+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" -+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" -+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" -+ - typedef struct { - char *filename; - char *envvar; - char *envval; -+ struct passwd *owner; - void *data; - } ssh_gssapi_ccache; - -@@ -71,8 +83,11 @@ - gss_buffer_desc displayname; - gss_buffer_desc exportedname; - gss_cred_id_t creds; -+ gss_name_t name; - struct ssh_gssapi_mech_struct *mech; - ssh_gssapi_ccache store; -+ int used; -+ int updated; - } ssh_gssapi_client; - - typedef struct ssh_gssapi_mech_struct { -@@ -83,6 +98,7 @@ - int (*userok) (ssh_gssapi_client *, char *); - int (*localname) (ssh_gssapi_client *, char **); - void (*storecreds) (ssh_gssapi_client *); -+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *); - } ssh_gssapi_mech; - - typedef struct { -@@ -93,10 +109,11 @@ - gss_OID oid; /* client */ - gss_cred_id_t creds; /* server */ - gss_name_t client; /* server */ -- gss_cred_id_t client_creds; /* server */ -+ gss_cred_id_t client_creds; /* both */ - } Gssctxt; - - extern ssh_gssapi_mech *supported_mechs[]; -+extern Gssctxt *gss_kex_context; - - int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); - void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); -@@ -116,16 +133,30 @@ - void ssh_gssapi_delete_ctx(Gssctxt **); - OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); --int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); -+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *); -+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); -+int ssh_gssapi_credentials_updated(Gssctxt *); - - /* In the server */ -+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, -+ const char *); -+char *ssh_gssapi_client_mechanisms(const char *, const char *); -+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, -+ const char *); -+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); -+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, -+ const char *); - OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); --int ssh_gssapi_userok(char *name); -+int ssh_gssapi_userok(char *name, struct passwd *); - OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); - void ssh_gssapi_do_child(char ***, u_int *); - void ssh_gssapi_cleanup_creds(void); - void ssh_gssapi_storecreds(void); - -+char *ssh_gssapi_server_mechanisms(void); -+int ssh_gssapi_oid_table_ok(); -+ -+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store); - #endif /* GSSAPI */ - - #endif /* _SSH_GSS_H */ -diff -Nur openssh-5.4p1.orig/ssh_config openssh-5.4p1/ssh_config ---- openssh-5.4p1.orig/ssh_config 2010-01-12 09:40:27.000000000 +0100 -+++ openssh-5.4p1/ssh_config 2010-03-13 00:39:22.401981567 +0100 -@@ -26,6 +26,8 @@ - # HostbasedAuthentication no - # GSSAPIAuthentication no - # GSSAPIDelegateCredentials no -+# GSSAPIKeyExchange no -+# GSSAPITrustDNS no - # BatchMode no - # CheckHostIP yes - # AddressFamily any -diff -Nur openssh-5.4p1.orig/ssh_config.5 openssh-5.4p1/ssh_config.5 ---- openssh-5.4p1.orig/ssh_config.5 2010-03-05 11:31:12.000000000 +0100 -+++ openssh-5.4p1/ssh_config.5 2010-03-13 00:39:22.405912908 +0100 -@@ -478,11 +478,38 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI may be used. When using -+GSSAPI key exchange the server need not have a host key. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIClientIdentity -+If set, specifies the GSSAPI client identity that ssh should use when -+connecting to the server. The default is unset, which means that the default -+identity will be used. - .It Cm GSSAPIDelegateCredentials - Forward (delegate) credentials to the server. - The default is - .Dq no . --Note that this option applies to protocol version 2 only. -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPIRenewalForcesRekey -+If set to -+.Dq yes -+then renewal of the client's GSSAPI credentials will force the rekeying of the -+ssh connection. With a compatible server, this can delegate the renewed -+credentials to a session on the server. -+The default is -+.Dq no . -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff -Nur openssh-5.4p1.orig/sshconnect2.c openssh-5.4p1/sshconnect2.c ---- openssh-5.4p1.orig/sshconnect2.c 2010-02-26 21:55:06.000000000 +0100 -+++ openssh-5.4p1/sshconnect2.c 2010-03-13 00:39:22.414196262 +0100 -@@ -106,9 +106,34 @@ - { - Kex *kex; - -+#ifdef GSSAPI -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+#endif -+ - xxx_host = host; - xxx_hostaddr = hostaddr; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ /* Add the GSSAPI mechanisms currently supported on this -+ * client to the key exchange algorithm proposal */ -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ if (options.gss_trust_dns) -+ gss_host = (char *)get_canonical_hostname(1); -+ else -+ gss_host = host; -+ -+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); -+ if (gss) { -+ debug("Offering GSSAPI proposal: %s", gss); -+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], -+ "%s,%s", gss, orig); -+ } -+ } -+#endif -+ - if (options.ciphers == (char *)-1) { - logit("No valid ciphers for protocol version 2 given, using defaults."); - options.ciphers = NULL; -@@ -136,6 +161,17 @@ - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = - options.hostkeyalgorithms; - -+#ifdef GSSAPI -+ /* If we've got GSSAPI algorithms, then we also support the -+ * 'null' hostkey, as a last resort */ -+ if (options.gss_keyex && gss) { -+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; -+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], -+ "%s,null", orig); -+ xfree(gss); -+ } -+#endif -+ - if (options.rekey_limit) - packet_set_rekey_limit((u_int32_t)options.rekey_limit); - -@@ -145,10 +181,26 @@ - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; -+ } -+#endif - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; - kex->verify_host_key=&verify_host_key_callback; - -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->gss_deleg_creds = options.gss_deleg_creds; -+ kex->gss_trust_dns = options.gss_trust_dns; -+ kex->gss_client = options.gss_client_identity; -+ kex->gss_host = gss_host; -+ } -+#endif -+ - xxx_kex = kex; - - dispatch_run(DISPATCH_BLOCK, &kex->done, kex); -@@ -243,6 +295,7 @@ - void input_gssapi_hash(int type, u_int32_t, void *); - void input_gssapi_error(int, u_int32_t, void *); - void input_gssapi_errtok(int, u_int32_t, void *); -+int userauth_gsskeyex(Authctxt *authctxt); - #endif - - void userauth(Authctxt *, char *); -@@ -258,6 +311,10 @@ - - Authmethod authmethods[] = { - #ifdef GSSAPI -+ {"gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication, -+ NULL}, - {"gssapi-with-mic", - userauth_gssapi, - NULL, -@@ -564,19 +621,29 @@ - static u_int mech = 0; - OM_uint32 min; - int ok = 0; -+ const char *gss_host; -+ -+ if (options.gss_trust_dns) -+ gss_host = get_canonical_hostname(1); -+ else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ - - if (gss_supported == NULL) -- gss_indicate_mechs(&min, &gss_supported); -+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) { -+ gss_supported = NULL; -+ return 0; -+ } - - /* Check to see if the mechanism is usable before we offer it */ - while (mech < gss_supported->count && !ok) { - /* My DER encoding requires length<128 */ - if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, -- &gss_supported->elements[mech], authctxt->host)) { -+ &gss_supported->elements[mech], gss_host, -+ options.gss_client_identity)) { - ok = 1; /* Mechanism works */ - } else { - mech++; -@@ -673,8 +740,8 @@ - { - Authctxt *authctxt = ctxt; - Gssctxt *gssctxt; -- int oidlen; -- char *oidv; -+ u_int oidlen; -+ u_char *oidv; - - if (authctxt == NULL) - fatal("input_gssapi_response: no authentication context"); -@@ -784,6 +851,48 @@ - xfree(msg); - xfree(lang); - } -+ -+int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ Buffer b; -+ gss_buffer_desc gssbuf; -+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; -+ OM_uint32 ms; -+ -+ static int attempt = 0; -+ if (attempt++ >= 1) -+ return (0); -+ -+ if (gss_kex_context == NULL) { -+ debug("No valid Key exchange context"); -+ return (0); -+ } -+ -+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { -+ buffer_free(&b); -+ return (0); -+ } -+ -+ packet_start(SSH2_MSG_USERAUTH_REQUEST); -+ packet_put_cstring(authctxt->server_user); -+ packet_put_cstring(authctxt->service); -+ packet_put_cstring(authctxt->method->name); -+ packet_put_string(mic.value, mic.length); -+ packet_send(); -+ -+ buffer_free(&b); -+ gss_release_buffer(&ms, &mic); -+ -+ return (1); -+} -+ - #endif /* GSSAPI */ - - int -diff -Nur openssh-5.4p1.orig/sshd.c openssh-5.4p1/sshd.c ---- openssh-5.4p1.orig/sshd.c 2010-03-07 13:05:17.000000000 +0100 -+++ openssh-5.4p1/sshd.c 2010-03-13 00:39:22.423749423 +0100 -@@ -120,6 +120,10 @@ - #include "roaming.h" - #include "version.h" - -+#ifdef USE_SECURITY_SESSION_API -+#include -+#endif -+ - #ifdef LIBWRAP - #include - #include -@@ -1577,10 +1581,13 @@ - logit("Disabling protocol version 1. Could not load host key"); - options.protocol &= ~SSH_PROTO_1; - } -+#ifndef GSSAPI -+ /* The GSSAPI key exchange can run without a host key */ - if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { - logit("Disabling protocol version 2. Could not load host key"); - options.protocol &= ~SSH_PROTO_2; - } -+#endif - if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { - logit("sshd: no hostkeys available -- exiting."); - exit(1); -@@ -1909,6 +1916,60 @@ - /* Log the connection. */ - verbose("Connection from %.500s port %d", remote_ip, remote_port); - -+#ifdef USE_SECURITY_SESSION_API -+ /* -+ * Create a new security session for use by the new user login if -+ * the current session is the root session or we are not launched -+ * by inetd (eg: debugging mode or server mode). We do not -+ * necessarily need to create a session if we are launched from -+ * inetd because Panther xinetd will create a session for us. -+ * -+ * The only case where this logic will fail is if there is an -+ * inetd running in a non-root session which is not creating -+ * new sessions for us. Then all the users will end up in the -+ * same session (bad). -+ * -+ * When the client exits, the session will be destroyed for us -+ * automatically. -+ * -+ * We must create the session before any credentials are stored -+ * (including AFS pags, which happens a few lines below). -+ */ -+ { -+ OSStatus err = 0; -+ SecuritySessionId sid = 0; -+ SessionAttributeBits sattrs = 0; -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("Current Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ -+ if (inetd_flag && !(sattrs & sessionIsRoot)) -+ debug("Running in inetd mode in a non-root session... " -+ "assuming inetd created the session for us."); -+ else { -+ debug("Creating new security session..."); -+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote); -+ if (err) -+ error("SessionCreate() failed with error %.8X", -+ (unsigned) err); -+ -+ err = SessionGetInfo(callerSecuritySession, &sid, -+ &sattrs); -+ if (err) -+ error("SessionGetInfo() failed with error %.8X", -+ (unsigned) err); -+ else -+ debug("New Session ID is %.8X / Session Attributes are %.8X", -+ (unsigned) sid, (unsigned) sattrs); -+ } -+ } -+#endif -+ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is -@@ -2287,12 +2348,61 @@ - - myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - -+#ifdef GSSAPI -+ { -+ char *orig; -+ char *gss = NULL; -+ char *newstr = NULL; -+ orig = myproposal[PROPOSAL_KEX_ALGS]; -+ -+ /* -+ * If we don't have a host key, then there's no point advertising -+ * the other key exchange algorithms -+ */ -+ -+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) -+ orig = NULL; -+ -+ if (options.gss_keyex) -+ gss = ssh_gssapi_server_mechanisms(); -+ else -+ gss = NULL; -+ -+ if (gss && orig) -+ xasprintf(&newstr, "%s,%s", gss, orig); -+ else if (gss) -+ newstr = gss; -+ else if (orig) -+ newstr = orig; -+ -+ /* -+ * If we've got GSSAPI mechanisms, then we've got the 'null' host -+ * key alg, but we can't tell people about it unless its the only -+ * host key algorithm we support -+ */ -+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) -+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; -+ -+ if (newstr) -+ myproposal[PROPOSAL_KEX_ALGS] = newstr; -+ else -+ fatal("No supported key exchange algorithms"); -+ } -+#endif -+ - /* start key exchange */ - kex = kex_setup(myproposal); - kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; - kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; -+#ifdef GSSAPI -+ if (options.gss_keyex) { -+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; -+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; -+ } -+#endif - kex->server = 1; - kex->client_version_string=client_version_string; - kex->server_version_string=server_version_string; -diff -Nur openssh-5.4p1.orig/sshd_config openssh-5.4p1/sshd_config ---- openssh-5.4p1.orig/sshd_config 2009-10-11 12:51:09.000000000 +0200 -+++ openssh-5.4p1/sshd_config 2010-03-13 00:39:22.426530018 +0100 -@@ -71,6 +71,8 @@ - # GSSAPI options - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes -+#GSSAPIStrictAcceptorCheck yes -+#GSSAPIKeyExchange no - - # Set this to 'yes' to enable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will -diff -Nur openssh-5.4p1.orig/sshd_config.5 openssh-5.4p1/sshd_config.5 ---- openssh-5.4p1.orig/sshd_config.5 2010-03-05 00:41:45.000000000 +0100 -+++ openssh-5.4p1/sshd_config.5 2010-03-13 00:39:22.430994501 +0100 -@@ -379,12 +379,40 @@ - The default is - .Dq no . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIKeyExchange -+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange -+doesn't rely on ssh keys to verify host identity. -+The default is -+.Dq no . -+Note that this option applies to protocol version 2 only. - .It Cm GSSAPICleanupCredentials - Specifies whether to automatically destroy the user's credentials cache - on logout. - The default is - .Dq yes . - Note that this option applies to protocol version 2 only. -+.It Cm GSSAPIStrictAcceptorCheck -+Determines whether to be strict about the identity of the GSSAPI acceptor -+a client authenticates against. If -+.Dq yes -+then the client must authenticate against the -+.Pa host -+service on the current hostname. If -+.Dq no -+then the client may authenticate against any service key stored in the -+machine's default store. This facility is provided to assist with operation -+on multi homed machines. -+The default is -+.Dq yes . -+Note that this option applies only to protocol version 2 GSSAPI connections, -+and setting it to -+.Dq no -+may only work with recent Kerberos GSSAPI libraries. -+.It Cm GSSAPIStoreCredentialsOnRekey -+Controls whether the user's GSSAPI credentials should be updated following a -+successful connection rekeying. This option can be used to accepted renewed -+or updated credentials from a compatible client. The default is -+.Dq no . - .It Cm HostbasedAuthentication - Specifies whether rhosts or /etc/hosts.equiv authentication together - with successful public key client host authentication is allowed Deleted: csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch =================================================================== --- csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch 2013-01-09 22:03:38 UTC (rev 20067) +++ csw/mgar/pkg/openssh/trunk/files/openssh-5.6p1-gsskex-all-20100902.patch 2013-01-09 22:17:06 UTC (rev 20068) @@ -1,2933 +0,0 @@ -diff -Nur openssh-5.4p1.orig/ChangeLog.gssapi openssh-5.4p1/ChangeLog.gssapi ---- openssh-5.4p1.orig/ChangeLog.gssapi 1970-01-01 01:00:00.000000000 +0100 -+++ openssh-5.4p1/ChangeLog.gssapi 2010-03-13 00:39:22.276624764 +0100 -@@ -0,0 +1,95 @@ -+20090615 -+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c -+ sshd.c ] -+ Fix issues identified by Greg Hudson following a code review -+ Check return value of gss_indicate_mechs -+ Protect GSSAPI calls in monitor, so they can only be used if enabled -+ Check return values of bignum functions in key exchange -+ Use BN_clear_free to clear other side's DH value -+ Make ssh_gssapi_id_kex more robust -+ Only configure kex table pointers if GSSAPI is enabled -+ Don't leak mechanism list, or gss mechanism list -+ Cast data.length before printing -+ If serverkey isn't provided, use an empty string, rather than NULL -+ -+20090201 -+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h -+ ssh_config.5 sshconnet2.c ] -+ Add support for the GSSAPIClientIdentity option, which allows the user -+ to specify which GSSAPI identity to use to contact a given server -+ -+20080404 -+ - [ gss-serv.c ] -+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow -+ been omitted from a previous version of this patch. Reported by Borislav -+ Stoichkov -+ -+20070317 -+ - [ gss-serv-krb5.c ] -+ Remove C99ism, where new_ccname was being declared in the middle of a -+ function -+ -+20061220 -+ - [ servconf.c ] -+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and -+ documented, behaviour. Reported by Dan Watson. -+ -+20060910 -+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c -+ ssh-gss.h ] -+ add support for gss-group14-sha1 key exchange mechanisms -+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] -+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of -+ acceptor principal checking on multi-homed machines. -+ -+ - [ sshd_config ssh_config ] -+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample -+ configuration files -+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] -+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() -+ Limit length of error messages displayed by client -+ -+20060909 -+ - [ gss-genr.c gss-serv.c ] -+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server -+ only, where they belong -+ -+ -+20060829 -+ - [ gss-serv-krb5.c ] -+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment -+ variable -+ -+20060828 -+ - [ gss-genr.c ] -+ Avoid Heimdal context freeing problem -+ -+ -+20060818 -+ - [ gss-genr.c ssh-gss.h sshconnect2.c ] -+ Make sure that SPENGO is disabled -+ -+ -+20060421 -+ - [ gssgenr.c, sshconnect2.c ] -+ a few type changes (signed versus unsigned, int versus size_t) to -+ fix compiler errors/warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ kexgssc.c, sshconnect2.c ] -+ fix uninitialized variable warnings -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ gssgenr.c ] -+ pass oid to gss_display_status (helpful when using GSSAPI mechglue) -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ gss-serv-krb5.c ] -+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H -+ (from jbasney AT ncsa.uiuc.edu) -+ -+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c -+ add client-side GssapiKeyExchange option -+ (from jbasney AT ncsa.uiuc.edu) -+ - [ sshconnect2.c ] -+ add support for GssapiTrustDns option for gssapi-with-mic -+ (from jbasney AT ncsa.uiuc.edu) -+ -diff -Nur openssh-5.4p1.orig/Makefile.in openssh-5.4p1/Makefile.in ---- openssh-5.4p1.orig/Makefile.in 2010-02-24 08:18:51.000000000 +0100 -+++ openssh-5.4p1/Makefile.in 2010-03-13 00:39:54.547584984 +0100 -@@ -74,7 +74,7 @@ - monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ - kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \ - entropy.o gss-genr.o umac.o jpake.o schnorr.o \ -- ssh-pkcs11.o -+ ssh-pkcs11.o kexgssc.o - - SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ - sshconnect.o sshconnect1.o sshconnect2.o mux.o \ -@@ -88,7 +88,7 @@ - auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ - monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ - auth-krb5.o \ -- auth2-gss.o gss-serv.o gss-serv-krb5.o \ -+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ - loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ - roaming_common.o roaming_serv.o -diff -Nur openssh-5.4p1.orig/auth-krb5.c openssh-5.4p1/auth-krb5.c ---- openssh-5.4p1.orig/auth-krb5.c 2009-12-21 00:49:22.000000000 +0100 -+++ openssh-5.4p1/auth-krb5.c 2010-03-13 00:39:22.287877739 +0100 -@@ -170,8 +170,13 @@ - - len = strlen(authctxt->krb5_ticket_file) + 6; - authctxt->krb5_ccname = xmalloc(len); -+#ifdef USE_CCAPI -+ snprintf(authctxt->krb5_ccname, len, "API:%s", -+ authctxt->krb5_ticket_file); -+#else - snprintf(authctxt->krb5_ccname, len, "FILE:%s", - authctxt->krb5_ticket_file); -+#endif - - #ifdef USE_PAM - if (options.use_pam) -@@ -226,15 +231,22 @@ - #ifndef HEIMDAL - krb5_error_code - ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { -- int tmpfd, ret; -+ int ret; - char ccname[40]; - mode_t old_umask; -+#ifdef USE_CCAPI -+ char cctemplate[] = "API:krb5cc_%d"; -+#else -+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; -+ int tmpfd; -+#endif - - ret = snprintf(ccname, sizeof(ccname), -- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); -+ cctemplate, geteuid()); - if (ret < 0 || (size_t)ret >= sizeof(ccname)) - return ENOMEM; - -+#ifndef USE_CCAPI - old_umask = umask(0177); - tmpfd = mkstemp(ccname + strlen("FILE:")); - umask(old_umask); -@@ -249,6 +261,7 @@ - return errno; - } - close(tmpfd); -+#endif - - return (krb5_cc_resolve(ctx, ccname, ccache)); - } -diff -Nur openssh-5.4p1.orig/auth.h openssh-5.4p1/auth.h ---- openssh-5.4p1.orig/auth.h 2010-03-04 11:53:35.000000000 +0100 -+++ openssh-5.4p1/auth.h 2010-03-13 00:39:22.290248539 +0100 -@@ -53,6 +53,7 @@ - int valid; /* user exists and is allowed to login */ - int attempt; - int failures; -+ int server_caused_failure; - int force_pwchange; - char *user; /* username sent by the client */ - char *service; -diff -Nur openssh-5.4p1.orig/auth2-gss.c openssh-5.4p1/auth2-gss.c ---- openssh-5.4p1.orig/auth2-gss.c 2007-12-02 12:59:45.000000000 +0100 -+++ openssh-5.4p1/auth2-gss.c 2010-03-13 00:39:22.294875029 +0100 -@@ -1,7 +1,7 @@ - /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ - - /* -- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. -+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -52,6 +52,40 @@ - static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); - static void input_gssapi_errtok(int, u_int32_t, void *); - -+/* -+ * The 'gssapi_keyex' userauth mechanism. -+ */ -+static int -+userauth_gsskeyex(Authctxt *authctxt) -+{ -+ int authenticated = 0; -+ Buffer b; -+ gss_buffer_desc mic, gssbuf; -+ u_int len; -+ -+ mic.value = packet_get_string(&len); -+ mic.length = len; -+ -+ packet_check_eom(); -+ -+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, -+ "gssapi-keyex"); -+ -+ gssbuf.value = buffer_ptr(&b); -+ gssbuf.length = buffer_len(&b); -+ -+ /* gss_kex_context is NULL with privsep, so we can't check it here */ -+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, -+ &gssbuf, &mic)))) -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); -+ -+ buffer_free(&b); -+ xfree(mic.value); -+ -+ return (authenticated); -+} -+ - /* - * We only support those mechanisms that we know about (ie ones that we know - * how to check local user kuserok and the like) -@@ -102,6 +136,7 @@ - - if (!present) { - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -109,6 +144,7 @@ - if (ctxt != NULL) - ssh_gssapi_delete_ctx(&ctxt); - xfree(doid); -+ authctxt->server_caused_failure = 1; - return (0); - } - -@@ -242,7 +278,8 @@ - - packet_check_eom(); - -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, -+ authctxt->pw)); - - authctxt->postponed = 0; - dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); -@@ -277,7 +314,8 @@ - gssbuf.length = buffer_len(&b); - - if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) -- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); -+ authenticated = -+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); - else - logit("GSSAPI MIC check failed"); - -@@ -292,6 +330,12 @@ - userauth_finish(authctxt, authenticated, "gssapi-with-mic"); - } - -+Authmethod method_gsskeyex = { -+ "gssapi-keyex", -+ userauth_gsskeyex, -+ &options.gss_authentication -+}; -+ - Authmethod method_gssapi = { - "gssapi-with-mic", - userauth_gssapi, -diff -Nur openssh-5.4p1.orig/auth2.c openssh-5.4p1/auth2.c ---- openssh-5.4p1.orig/auth2.c 2009-06-22 08:11:07.000000000 +0200 -+++ openssh-5.4p1/auth2.c 2010-03-13 00:39:22.298679511 +0100 -@@ -69,6 +69,7 @@ - extern Authmethod method_kbdint; - extern Authmethod method_hostbased; - #ifdef GSSAPI -+extern Authmethod method_gsskeyex; - extern Authmethod method_gssapi; - #endif - #ifdef JPAKE -@@ -79,6 +80,7 @@ - &method_none, - &method_pubkey, - #ifdef GSSAPI -+ &method_gsskeyex, - &method_gssapi, - #endif - #ifdef JPAKE -@@ -274,6 +276,7 @@ - #endif - @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jan 9 23:24:24 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 09 Jan 2013 22:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[20069] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20069 http://gar.svn.sourceforge.net/gar/?rev=20069&view=rev Author: chninkel Date: 2013-01-09 22:24:23 +0000 (Wed, 09 Jan 2013) Log Message: ----------- openssh/trunk: added a missing dash in ssh client package name Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-09 22:17:06 UTC (rev 20068) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-09 22:24:23 UTC (rev 20069) @@ -30,19 +30,19 @@ endef -PACKAGES = CSWopenssh CSWopensshclient +PACKAGES = CSWopenssh CSWopenssh-client CATALOGNAME_CSWopenssh = openssh SPKG_DESC_CSWopenssh = OpenSSH Secure Shell server -RUNTIME_DEP_PKGS_CSWopenssh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWopensshclient +RUNTIME_DEP_PKGS_CSWopenssh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWopenssh-client OBSOLETED_BY_CSWopenssh = CSWossh -CATALOGNAME_CSWopensshclient = openssh_client -SPKG_DESC_CSWopensshclient = OpenSSH Secure Shell client -RUNTIME_DEP_PKGS_CSWopensshclient = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2 +CATALOGNAME_CSWopenssh-client = openssh_client +SPKG_DESC_CSWopenssh-client = OpenSSH Secure Shell client +RUNTIME_DEP_PKGS_CSWopenssh-client = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2 -OBSOLETED_BY_CSWopensshclient = CSWosshclient +OBSOLETED_BY_CSWopenssh-client = CSWosshclient PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -59,14 +59,14 @@ PKGFILES_CSWopenssh += $(localstatedir)/svc/manifest/network/cswopenssh.xml PKGFILES_CSWopenssh += $(prefix)/etc/pkg/CSWopenssh/cswusergroup -PKGFILES_CSWopensshclient = $(bindir)/.* -PKGFILES_CSWopensshclient += $(docdir)/openssh_client/.* -PKGFILES_CSWopensshclient += $(mandir)/man1/.* -PKGFILES_CSWopensshclient += $(mandir)/man5/ssh_config.5 -PKGFILES_CSWopensshclient += $(mandir)/man8/ssh-keysign.8 -PKGFILES_CSWopensshclient += $(libexecdir)/ssh-keysign -PKGFILES_CSWopensshclient += $(sysconfdir)/ssh/ssh_config.CSW -PKGFILES_CSWopensshclient += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED +PKGFILES_CSWopenssh-client = $(bindir)/.* +PKGFILES_CSWopenssh-client += $(docdir)/openssh_client/.* +PKGFILES_CSWopenssh-client += $(mandir)/man1/.* +PKGFILES_CSWopenssh-client += $(mandir)/man5/ssh_config.5 +PKGFILES_CSWopenssh-client += $(mandir)/man8/ssh-keysign.8 +PKGFILES_CSWopenssh-client += $(libexecdir)/ssh-keysign +PKGFILES_CSWopenssh-client += $(sysconfdir)/ssh/ssh_config.CSW +PKGFILES_CSWopenssh-client += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED PROTOTYPE_MODIFIERS = setuid PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign @@ -82,17 +82,17 @@ MIGRATE_FILES_CSWopenssh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub MIGRATE_FILES_CSWopenssh += shosts.equiv MIGRATE_FILES_CSWopenssh += sshrc -MIGRATE_FILES_CSWopensshclient = ssh_config -MIGRATE_FILES_CSWopensshclient += ssh_known_hosts ssh_known_hosts2 -MIGRATE_FILES_CSWopensshclient += ssh_prng_cmds +MIGRATE_FILES_CSWopenssh-client = ssh_config +MIGRATE_FILES_CSWopenssh-client += ssh_known_hosts ssh_known_hosts2 +MIGRATE_FILES_CSWopenssh-client += ssh_prng_cmds MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh MIGRATE_DEST_DIR = $(sysconfdir)/ssh -CHECKPKG_OVERRIDES_CSWopensshclient += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL +CHECKPKG_OVERRIDES_CSWopenssh-client += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml -CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWopensshclient +CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWopenssh-client @@ -179,8 +179,8 @@ CONFIGURE_ARGS += --with-ldap DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk - # we must reset the CSWopensshclient description to avoid a bug in the automatic dependancy generation - SPKG_DESC_CSWopensshclient = + # we must reset the CSWopenssh-client description to avoid a bug in the automatic dependancy generation + SPKG_DESC_CSWopenssh-client = endif 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 Jan 9 23:45:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 09 Jan 2013 22:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20070] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 20070 http://gar.svn.sourceforge.net/gar/?rev=20070&view=rev Author: chninkel Date: 2013-01-09 22:45:46 +0000 (Wed, 09 Jan 2013) Log Message: ----------- openssh/trunk: removed a checkpkg override not useful anymore Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-09 22:24:23 UTC (rev 20069) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-09 22:45:46 UTC (rev 20070) @@ -92,10 +92,8 @@ CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml -CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWopenssh-client - ###### Upstream and OpenCSW files information ####### MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/ 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 Jan 10 11:32:54 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 10 Jan 2013 10:32:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[20071] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 20071 http://gar.svn.sourceforge.net/gar/?rev=20071&view=rev Author: janholzh Date: 2013-01-10 10:32:54 +0000 (Thu, 10 Jan 2013) Log Message: ----------- ffmpeg/trunk: update to 1.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 2013-01-09 22:45:46 UTC (rev 20070) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2013-01-10 10:32:54 UTC (rev 20071) @@ -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 = 1.0.1 +VERSION = 1.1 GARTYPE = v2 DESCRIPTION = Very fast video and audio converter (includes libavcodec) @@ -38,7 +38,7 @@ SPKG_DESC_CSWlibavcodec54 = FFMPEG library libavcodec.so.54 PKGFILES_CSWlibavcodec54 += $(call pkgfiles_lib,libavcodec.so.54) RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter3 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbis0 @@ -55,7 +55,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavformat54 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibogg0 @@ -74,7 +74,7 @@ PKGFILES_CSWlibavfilter3 += $(call pkgfiles_lib,libavfilter.so.3) RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavformat54 RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswresample0 RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibfreetype6 @@ -85,32 +85,32 @@ SPKG_DESC_CSWlibavformat54 = FFMPEG library libavformat.so.54 PKGFILES_CSWlibavformat54 += $(call pkgfiles_lib,libavformat.so.54) RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibgcc-s1 -PACKAGES += CSWlibavutil51 -SPKG_DESC_CSWlibavutil51 = FFMPEG library libavutil.so.51 -PKGFILES_CSWlibavutil51 += $(call pkgfiles_lib,libavutil.so.51) -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibgcc-s1 +PACKAGES += CSWlibavutil52 +SPKG_DESC_CSWlibavutil52 = FFMPEG library libavutil.so.52 +PKGFILES_CSWlibavutil52 += $(call pkgfiles_lib,libavutil.so.52) +RUNTIME_DEP_PKGS_CSWlibavutil52 += CSWlibgcc-s1 PACKAGES += CSWlibpostproc52 SPKG_DESC_CSWlibpostproc52 = FFMPEG library libpostproc.so.52 PKGFILES_CSWlibpostproc52 += $(call pkgfiles_lib,libpostproc.so.52) -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibgcc-s1 PACKAGES += CSWlibswscale2 SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 PKGFILES_CSWlibswscale2 += $(call pkgfiles_lib,libswscale.so.2) -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibgcc-s1 PACKAGES += CSWlibswresample0 SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 PKGFILES_CSWlibswresample0 += $(call pkgfiles_lib,libswresample.so.0) -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibgcc-s1 PACKAGES += CSWffmpeg-dev @@ -120,7 +120,7 @@ RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavdevice54 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter3 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc52 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample0 @@ -131,7 +131,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavformat54 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil52 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice54 @@ -144,6 +144,8 @@ CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffplay.1 CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/ffmpeg.1 CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/ffplay.1 +CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffmpeg-filters.1 +CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/ffmpeg-filters.1 #EXTRA_MODULATORS = SHARED #MODULATIONS_SHARED = yes no Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2013-01-09 22:45:46 UTC (rev 20070) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2013-01-10 10:32:54 UTC (rev 20071) @@ -1 +1 @@ -dbbb88ce5525dea22b24aaa098a9bcc2 ffmpeg-1.0.1.tar.bz2 +578c590a0e996c1fc71acb666c0ed858 ffmpeg-1.1.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 Thu Jan 10 13:24:33 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 12:24:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20072] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20072 http://gar.svn.sourceforge.net/gar/?rev=20072&view=rev Author: wahwah Date: 2013-01-10 12:24:33 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: Try isaexec Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-10 10:32:54 UTC (rev 20071) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-10 12:24:33 UTC (rev 20072) @@ -45,7 +45,8 @@ SKIPTEST = 1 TEST_TARGET = test -BUILD64_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 # There is a file name conflict over libffi.so symlink between libffi package # and a gcc-java package. While it will ultimately belong to libffi_dev, the 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 Jan 10 14:02:52 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 13:02:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[20073] csw/mgar/pkg/lang-python/python/trunk/Makefile Message-ID: Revision: 20073 http://gar.svn.sourceforge.net/gar/?rev=20073&view=rev Author: wahwah Date: 2013-01-10 13:02:52 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/trunk: fix https://www.opencsw.org/mantis/view.php?id=5040 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 2013-01-10 12:24:33 UTC (rev 20072) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-01-10 13:02:52 UTC (rev 20073) @@ -2,7 +2,6 @@ NAME = Python VERSION = 2.6.8 -GARTYPE = v2 VER = 2.6 DVER = 2-6 UVER = 2_6 @@ -35,22 +34,8 @@ UFILES_REGEX = $(VER)\.\d+ DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += pyport.h -# 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 -# http://bugs.python.org/issue3770 -# However, this bug is about better detection of SEM_VALUE_MAX in Solaris -# http://bugs.python.org/issue3110 - -# There are header differences between Solaris 9 and 10. Programs that include -# pyconfig.h from Solaris 9 installed on Solaris 10 can get wrong settings, -# e.g. wrt _X_OPEN_SOURCE. -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 - # Patches PATCHFILES += faqwiz.diff PATCHFILES += makesetup.diff @@ -94,6 +79,17 @@ BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS +# To fix https://www.opencsw.org/mantis/view.php?id=5040 +LINKER_IGNORE = +CHECKPKG_OVERRIDES_CSWpython-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython-tk += no-direct-binding|/opt/csw/lib/python/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 + NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared @@ -218,7 +214,11 @@ @$(MAKECOOKIE) post-merge-modulated: - echo "This is post-merge-modulated, which should not work. But it does." + # Some checks + # Prevent things like https://www.opencsw.org/mantis/view.php?id=5040 + test ! -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket_failed.so + test -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket.so + # This is post-merge-modulated, which should not work. But it does. ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) - ginstall -m 644 $(FILEDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h + ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 10 14:34:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 13:34:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[20074] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20074 http://gar.svn.sourceforge.net/gar/?rev=20074&view=rev Author: wahwah Date: 2013-01-10 13:34:49 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: both libffi libs are necessary Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-10 13:02:52 UTC (rev 20073) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-10 13:34:49 UTC (rev 20074) @@ -99,7 +99,10 @@ SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 +# This seems to be an issue with the 64-bit build. The 32-bit binaries link +# against libffi5, the 64-bit binaries link against libffi4. RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi4 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWliblzma5 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 Jan 10 14:39:55 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 13:39:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[20075] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 20075 http://gar.svn.sourceforge.net/gar/?rev=20075&view=rev Author: wahwah Date: 2013-01-10 13:39:54 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/branches/python-2.7: updated and matched against the 2.6 build recipe Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 13:34:49 UTC (rev 20074) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 13:39:54 UTC (rev 20075) @@ -2,7 +2,6 @@ NAME = Python VERSION = 2.7.3 -CATEGORIES = lang VER = 2.7 DVER = 2-7 UVER = 2_7 @@ -32,11 +31,11 @@ MASTER_SITES = http://python.org/ftp/python/$(VERSION)/ UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ +UFILES_REGEX = $(VER)\.\d+ DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += pyport.h -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - # Patches PATCHFILES += faqwiz.diff PATCHFILES += makesetup.diff @@ -49,15 +48,31 @@ PATCHFILES += setup.diff # PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch -# Test for sunaudiodev fails. +# The test for sunaudiodev fails. Not that it's a good practice to skip +# tests. SKIPTEST = 1 +# TODO: Enable the 64-bit build at some point. +# BUILD64 = 1 +EXTRA_INC += $(prefix)/bdb47/include +EXTRA_LIB += $(prefix)/bdb47/lib + +# There is a file name conflict over libffi.so symlink between libffi package +# and a gcc-java package. While it will ultimately belong to libffi_dev, the +# symlink is currently under a subdirectory. +# pkgchk -L CSWlibffi-dev +# (...) +# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev +EXTRA_LIB += $(libdir)/ffi + BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS +# To fix https://www.opencsw.org/mantis/view.php?id=5040 +LINKER_IGNORE = NOISALIST = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --enable-unicode=ucs4 @@ -69,26 +84,20 @@ # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc -# use prototype filters to set the class +# use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' PACKAGES = CSWidle$(CVER) PACKAGES += CSWpython$(CVER) -PACKAGES += CSWpython$(CVER)-test PACKAGES += CSWpython$(CVER)-tk PACKAGES += CSWlibpython$(DVER)-1-0 -CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 -PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(DVER)\.so\.1\.0(\.\d+)*) -PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/$(PVER)\.so\.([0-9\.]+) -SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) +PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0) +PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0(\.\d+)*) +SPKG_DESC_CSWlibpython$(DVER)-1-0 += $(DESCRIPTION), libpython2.7.so.1.0 -INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils - -# Devel package PACKAGES += CSWpython$(CVER)-dev -CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_dev SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python # /opt/csw/include/python$(VER)/pyconfig.h is necessary for Python to start up PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* @@ -98,6 +107,7 @@ # No idea why would this be in CSWpython, and no good idea for a better package # to put it. PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py-$(VER) + RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += surplus-dependency|CSWpython$(CVER) @@ -109,50 +119,49 @@ PKGFILES_CSWidle$(CVER) += $(bindir)/idle PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython$(CVER)-test = $(libdir)/$(PVER)/test/.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/bsddb/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/ctypes/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/email/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/distutils/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/json/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/lib2to3/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/sqlite3/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/unittest/test.* -ARCHALL_CSWpython$(CVER)-test = 1 ARCHALL_CSWidle$(CVER) = 1 RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWidle$(CVER) += CSWpython$(CVER)-tk -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWgdbm -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWggettextrt -# Was once needed, may need revisiting. -# RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbdb47 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWreadline -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWzlib +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 +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 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 += CSWtcl -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk -RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) +# Don't merge test files. +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/bsddb/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/ctypes/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/email/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/distutils/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/json/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/lib2to3/tests.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/sqlite3/test.* +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/unittest/test.* + +BUILD_DEP_PKGS += CSWlibffi-dev +BUILD_DEP_PKGS += CSWggettext-dev + # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk -CATALOGNAME_CSWidle$(CVER) = idle_$(CVER) -CATALOGNAME_CSWpython$(CVER) = python_$(CVER) -CATALOGNAME_CSWpython$(CVER)-tk = python_$(CVER)_tk -CATALOGNAME_CSWpython$(CVER)-test = python_$(CVER)_test - SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) -SPKG_DESC_CSWpython$(CVER)-test = Python Test modules CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython @@ -166,8 +175,8 @@ # This is an exception, since these are original Python packages. CHECKPKG_OVERRIDES_CSWidle$(CVER) += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- @@ -179,6 +188,8 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm +CHECKPKG_OVERRIDES_CSWpython27 += file-with-bad-content + # To avoid file collisions with CSWpython: EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),' @@ -186,5 +197,28 @@ EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python + +EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" +EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) include gar/category.mk + +post-configure-modulated: + for f in Modules/Setup \ + Makefile \ + Makefile.pre \ + Lib/idlelib/EditorWindow.py \ + Lib/pydoc_topics.py \ + Lib/idlelib/config-main.def \ + ; do \ + gsed -i -e 's+/usr/local+/opt/csw+g' $(WORKSRC)/$${f}; \ + gsed -i -e 's+/usr/share+/opt/csw/share+g' $(WORKSRC)/$${f}; \ + done + @$(MAKECOOKIE) + +post-merge-modulated: + echo "This is post-merge-modulated, which should not work. But it does." + ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER) + ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h + @$(MAKECOOKIE) Copied: csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h (from rev 20062, csw/mgar/pkg/lang-python/python/trunk/files/pyport.h) =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/files/pyport.h 2013-01-10 13:39:54 UTC (rev 20075) @@ -0,0 +1,9 @@ +/* Allow 32 and 64 bit headers to coexist */ +#if defined __amd64 || defined __x86_64 || defined __sparcv9 +/* + * Eventually, enable this. For now, say we have no headers for 64-bit Python. + * #include "pyport-64.h" + */ +#else +#include "pyport-32.h" +#endif 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 Jan 10 15:44:29 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 14:44:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20076] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 20076 http://gar.svn.sourceforge.net/gar/?rev=20076&view=rev Author: wahwah Date: 2013-01-10 14:44:28 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/branches/python-2.7: overrides for the soname-unused and no-direct-binding Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 13:39:54 UTC (rev 20075) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 14:44:28 UTC (rev 20076) @@ -197,11 +197,20 @@ EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python - + EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-32.h,p" EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/python$(VER)/pyport.h$$,.$(includedir)/python$(VER)/pyport-64.h,p" EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) +CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWpython27-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27-tk += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 + include gar/category.mk post-configure-modulated: 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 Jan 10 19:43:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 18:43:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20077] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 20077 http://gar.svn.sourceforge.net/gar/?rev=20077&view=rev Author: wahwah Date: 2013-01-10 18:43:55 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/branches/python-2.7: enable 64-bit build Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 14:44:28 UTC (rev 20076) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 18:43:55 UTC (rev 20077) @@ -52,8 +52,7 @@ # tests. SKIPTEST = 1 -# TODO: Enable the 64-bit build at some point. -# BUILD64 = 1 +BUILD64 = 1 EXTRA_INC += $(prefix)/bdb47/include EXTRA_LIB += $(prefix)/bdb47/lib @@ -64,7 +63,7 @@ # pkgchk -L CSWlibffi-dev # (...) # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -EXTRA_LIB += $(libdir)/ffi +EXTRA_LINKER_FLAGS += $(libdir)/ffi BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -211,6 +210,18 @@ CHECKPKG_OVERRIDES_CSWpython27-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|but|never|used CHECKPKG_OVERRIDES_CSWpython27-tk += no-direct-binding|/opt/csw/lib/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 + +# 64-bit overrides +CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5 +CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1 +CHECKPKG_OVERRIDES_CSWpython27 += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27 += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0 +CHECKPKG_OVERRIDES_CSWpython27 += missing-dependency|CSWlibffi4 +CHECKPKG_OVERRIDES_CSWpython27-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|but|never|used +CHECKPKG_OVERRIDES_CSWpython27-tk += no-direct-binding|/opt/csw/lib/sparcv9/python2.7/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4 + include gar/category.mk post-configure-modulated: 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 Thu Jan 10 20:00:01 2013 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 10 Jan 2013 19:00:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[20078] csw/mgar/pkg/nsca/trunk Message-ID: Revision: 20078 http://gar.svn.sourceforge.net/gar/?rev=20078&view=rev Author: j_arndt Date: 2013-01-10 19:00:00 +0000 (Thu, 10 Jan 2013) Log Message: ----------- nsca/trunk: corrected cswusergroup file, removed dependencies Modified Paths: -------------- csw/mgar/pkg/nsca/trunk/Makefile csw/mgar/pkg/nsca/trunk/files/CSWnsca.cswusergroup Modified: csw/mgar/pkg/nsca/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsca/trunk/Makefile 2013-01-10 18:43:55 UTC (rev 20077) +++ csw/mgar/pkg/nsca/trunk/Makefile 2013-01-10 19:00:00 UTC (rev 20078) @@ -1,6 +1,5 @@ NAME = nsca VERSION = 2.9.1 -CATEGORIES = apps GARTYPE = v2 # @@ -54,11 +53,9 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 RUNTIME_DEP_PKGS_CSWnsca += CSWlibmcrypt4 -RUNTIME_DEP_PKGS_CSWnsca += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWnsca += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWsendnsca += CSWlibmcrypt4 -RUNTIME_DEP_PKGS_CSWsendnsca += CSWlibltdl7 # # files for CSWnsca @@ -114,14 +111,18 @@ PROTOTYPE_USER_ugdirs += nagios PROTOTYPE_GROUP_ugdirs += nagios PROTOTYPE_PERMS_ugdirs += 0755 +PROTOTYPE_CLASS_ugdirs += ugfiles +PROTOTYPE_MODIFIERS += usergroup + +PROTOTYPE_FILES_usergroup += $(NSCA_USERGROUP) $(SEND_NSCA_USERGROUP) +PROTOTYPE_CLASS_usergroup += cswusergroup + # # # INITSMF = $(NSCA_SMF) -USERGROUP_CSWnsca = $(NSCA_USERGROUP) -USERGROUP_CSWsendnsca = $(SEND_NSCA_USERGROUP) # # config migration Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.cswusergroup =================================================================== --- csw/mgar/pkg/nsca/trunk/files/CSWnsca.cswusergroup 2013-01-10 18:43:55 UTC (rev 20077) +++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.cswusergroup 2013-01-10 19:00:00 UTC (rev 20078) @@ -1 +1,2 @@ +nagios:nagios:Nagios user:/opt/csw/nagios:/bin/false:m:r :nagioscm::::: 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 Jan 10 20:38:16 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Jan 2013 19:38:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[20079] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 20079 http://gar.svn.sourceforge.net/gar/?rev=20079&view=rev Author: wahwah Date: 2013-01-10 19:38:15 +0000 (Thu, 10 Jan 2013) Log Message: ----------- lang-python/python/branches/python-2.7: EXTRA_LINKER_FLAGS value fix Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 19:00:00 UTC (rev 20078) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-10 19:38:15 UTC (rev 20079) @@ -63,7 +63,7 @@ # pkgchk -L CSWlibffi-dev # (...) # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -EXTRA_LINKER_FLAGS += $(libdir)/ffi +EXTRA_LINKER_FLAGS += -L$(libdir)/ffi BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 11 00:00:38 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 10 Jan 2013 23:00:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[20080] csw/mgar/pkg/cswpki/trunk Message-ID: Revision: 20080 http://gar.svn.sourceforge.net/gar/?rev=20080&view=rev Author: bdwalton Date: 2013-01-10 23:00:37 +0000 (Thu, 10 Jan 2013) Log Message: ----------- cswpki/trunk: handle variations of Yes when prompting for key install; mantis 5036 Modified Paths: -------------- csw/mgar/pkg/cswpki/trunk/Makefile csw/mgar/pkg/cswpki/trunk/files/cswpki Modified: csw/mgar/pkg/cswpki/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpki/trunk/Makefile 2013-01-10 19:38:15 UTC (rev 20079) +++ csw/mgar/pkg/cswpki/trunk/Makefile 2013-01-10 23:00:37 UTC (rev 20080) @@ -1,6 +1,6 @@ # $Id: Makefile 15522 2011-09-04 16:29:44Z bdwalton $ NAME = cswpki -VERSION = 1.0 +VERSION = 1.1 DESCRIPTION = The OpenCSW PKI Collection define BLURB @@ -41,4 +41,4 @@ done; \ cp $(WORKDIR)/cswpki $(BIN); \ cp $(WORKDIR)/gpl-2.0.txt $(DOC)/license; \ - chmod 700 $(VAR) ) \ No newline at end of file + chmod 700 $(VAR) ) Modified: csw/mgar/pkg/cswpki/trunk/files/cswpki =================================================================== --- csw/mgar/pkg/cswpki/trunk/files/cswpki 2013-01-10 19:38:15 UTC (rev 20079) +++ csw/mgar/pkg/cswpki/trunk/files/cswpki 2013-01-10 23:00:37 UTC (rev 20080) @@ -60,17 +60,20 @@ read install fi - if [ "${install}" = "yes" ]; then - echo - echo "Importing the key used for: ${friendly_name}" - echo - gpg --homedir="${pki_db:-/var/opt/csw/pki/}" --import "$key" - echo - echo - else - echo - echo "Skipping the import of the key used for: ${friendly_name}" - echo - fi + case "${install}" in + [Yy]|[Yy][Ee][Ss]) + echo + echo "Importing the key used for: ${friendly_name}" + echo + gpg --homedir="${pki_db:-/var/opt/csw/pki/}" --import "$key" + echo + echo + ;; + *) + echo + echo "Skipping the import of the key used for: ${friendly_name}" + echo + ;; + esac done fi 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 Jan 11 09:59:47 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Jan 2013 08:59:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[20081] csw/mgar/pkg/nss/trunk Message-ID: Revision: 20081 http://gar.svn.sourceforge.net/gar/?rev=20081&view=rev Author: cgrzemba Date: 2013-01-11 08:59:46 +0000 (Fri, 11 Jan 2013) Log Message: ----------- nss/trunk: rework for direct binding Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch csw/mgar/pkg/nss/trunk/files/ld-options.patch Added Paths: ----------- csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2013-01-10 23:00:37 UTC (rev 20080) +++ csw/mgar/pkg/nss/trunk/Makefile 2013-01-11 08:59:46 UTC (rev 20081) @@ -175,7 +175,6 @@ RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibnspr4 RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibplds4 RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibsmime3 -RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibssl3 RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibnssutil3 # plugins accessed via dlopen RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibsoftokn3 @@ -186,13 +185,15 @@ CHECKPKG_OVERRIDES_CSWnss3-tools += surplus-dependency|CSWlibsoftokn3 OBSOLETED_BY_CSWnss3-tools = CSWlibnss3-tools -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev +BUILD_DEP_PKGS += CSWnspr-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev +# BUILD64 = 1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss INSTALL_SCRIPTS = nss TEST_SCRIPTS = -BUILD64 = 1 MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) @@ -204,7 +205,8 @@ ifneq (DBG,$(GARFLAVOR)) BUILD_OPT = 1 export BUILD_OPT - CONFIGURE_ARGS += --disable-debug --enable-optimize +# no configure target +# CONFIGURE_ARGS += --disable-debug --enable-optimize endif # NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig @@ -234,12 +236,16 @@ endif export NSPR_LIB_DIR +LD_OPTIONS = -z ignore -Bdirect ifeq ($(USE_64),1) -SQLITE_LIB_DIR = /opt/csw/lib/64 + SQLITE_LIB_DIR = /opt/csw/lib/64 + LD_OPTIONS += -R/opt/csw/lib/64/$$$$ISALIST else -SQLITE_LIB_DIR = /opt/csw/lib + SQLITE_LIB_DIR = /opt/csw/lib + LD_OPTIONS += -R/opt/csw/lib/$$$$ISALIST endif export SQLITE_LIB_DIR + SQLITE_INCLUDE_DIR = /opt/csw/include export SQLITE_INCLUDE_DIR @@ -262,21 +268,16 @@ # Required patches. PATCHFILES += include.patch -PATCHFILES += ld-options.patch +# PATCHFILES += ld-options.patch PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch PATCHFILES += 0006-platlibs.mk-linking-bltest.patch PATCHFILES += 0006-config.mk-linking.patch +PATCHFILES += 0005-SunOS5.mk.patch PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html # NOISAEXEC = 1 -CPPFLAGS = -LD_OPTIONS = -# NSS_LD_OPTIONS = -R'$$ORIGIN' - - - include gar/category.mk build-nss: build-coreconf build-dbm build-nss-compile @@ -301,7 +302,7 @@ build-nss-compile: (cd $(WORKSRC)/mozilla/security/nss \ && \ - gmake -j1 RPATH=-R\'/opt/csw/lib/\$$\$$ISALIST\' BUILD_SUN_PKG=1) + gmake -j1 LD_OPTIONS='$(LD_OPTIONS)' BUILD_SUN_PKG=1) @$(MAKECOOKIE) install-nss: Added: csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch (rev 0) +++ csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch 2013-01-11 08:59:46 UTC (rev 20081) @@ -0,0 +1,19 @@ +--- a/mozilla/security/coreconf/SunOS5.mk ++++ b/mozilla/security/coreconf/SunOS5.mk +@@ -125,15 +125,6 @@ endif + + NOSUCHFILE = /solaris-rm-f-sucks + +-ifeq ($(BUILD_SUN_PKG), 1) + # The -R '$ORIGIN' linker option instructs this library to search for its + # dependencies in the same directory where it resides. +-ifeq ($(USE_64), 1) +-RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64' +-else +-RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps' +-endif +-else +-RPATH = -R '$$ORIGIN' ++RPATH = $(LD_OPTIONS) +-endif +- Modified: csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch 2013-01-10 23:00:37 UTC (rev 20080) +++ csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch 2013-01-11 08:59:46 UTC (rev 20081) @@ -5,10 +5,10 @@ ifeq ($(OS_ARCH), SunOS) ifeq ($(USE_64), 1) -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' -+EXTRA_SHARED_LIBS += -R '/opt/csw/lib/64/$$ISALIST' ++EXTRA_SHARED_LIBS += -Bdirect -R '/opt/csw/lib/64/$$ISALIST' else -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' -+EXTRA_SHARED_LIBS += -R '/opt/csw/lib/$$ISALIST' ++EXTRA_SHARED_LIBS += $(LD_OPTIONS) endif endif Modified: csw/mgar/pkg/nss/trunk/files/ld-options.patch =================================================================== --- csw/mgar/pkg/nss/trunk/files/ld-options.patch 2013-01-10 23:00:37 UTC (rev 20080) +++ csw/mgar/pkg/nss/trunk/files/ld-options.patch 2013-01-11 08:59:46 UTC (rev 20081) @@ -5,6 +5,6 @@ endif else -RPATH = -R '$$ORIGIN' -+RPATH = $(LDFLAGS) $(LD_OPTIONS) ++RPATH = $(LD_OPTIONS) endif 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 Jan 11 10:00:39 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Jan 2013 09:00:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20082] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 20082 http://gar.svn.sourceforge.net/gar/?rev=20082&view=rev Author: cgrzemba Date: 2013-01-11 09:00:38 +0000 (Fri, 11 Jan 2013) Log Message: ----------- nss/trunk: reenable build 64 Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2013-01-11 08:59:46 UTC (rev 20081) +++ csw/mgar/pkg/nss/trunk/Makefile 2013-01-11 09:00:38 UTC (rev 20082) @@ -188,7 +188,7 @@ BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWlibsqlite3-dev -# BUILD64 = 1 +BUILD64 = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = nss 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 Jan 11 10:47:15 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Jan 2013 09:47:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[20083] csw/mgar/pkg/collectd/trunk Message-ID: Revision: 20083 http://gar.svn.sourceforge.net/gar/?rev=20083&view=rev Author: wahwah Date: 2013-01-11 09:47:15 +0000 (Fri, 11 Jan 2013) Log Message: ----------- collectd/trunk: Update to 5.2.0, added init script from Favoretti on IRC Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile csw/mgar/pkg/collectd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/collectd/trunk/files/collectd-init-csw Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 09:00:38 UTC (rev 20082) +++ csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 09:47:15 UTC (rev 20083) @@ -1,7 +1,7 @@ # $Id$ # NAME = collectd -VERSION = 5.1.0 +VERSION = 5.2.0 GARTYPE = v2 DESCRIPTION = Collects sistema performance statistics periodically @@ -10,16 +10,18 @@ MASTER_SITES = http://collectd.org/files/ DISTFILES = $(DISTNAME).tar.gz +DISTFILES += collectd-init-csw PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 VENDOR_URL = http://collectd.org/ -PATCHFILES += 0001-work-around-the-s_addr-macro.patch +# PATCHFILES += 0001-work-around-the-s_addr-macro.patch BUILD64 = 1 BUILD_DEP_PKGS += CSWlibgcrypt-dev EXTRA_CPPFLAGS = -DSOLARIS2=10 -D__EXTENSIONS__ +EXTRA_LINKER_FLAGS = -R/opt/csw/lib/collectd -R/usr/openwin/lib -lrt GARCOMPILER = GNU @@ -28,40 +30,47 @@ CONFIGURE_ARGS += --disable-nfs CONFIGURE_ARGS += --disable-zfs_arc -PACKAGES += CSWlibcollectdclient0 -PKGFILES_CSWlibcollectdclient0 += $(call baseisadirs,$(libdir),libcollectdclient\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibcollectdclient0 += $(DESCRIPTION), libcollectdclient.so.0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcollectdclient0 -RUNTIME_DEP_PKGS_CSWlibcollectdclient0 += CSWlibgcc-s1 +PACKAGES += CSWlibcollectdclient1 +PKGFILES_CSWlibcollectdclient1 += $(call baseisadirs,$(libdir),libcollectdclient\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibcollectdclient1 += $(DESCRIPTION), libcollectdclient.so.1 +RUNTIME_DEP_PKGS_CSWlibcollectdclient1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibcollectdclient1 += CSWlibgcrypt11 +PACKAGES += CSWcollectd-dev +CATALOGNAME_CSWcollectd-dev = collectd_dev +SPKG_DESC_CSWcollectd-dev += $(DESCRIPTION), development files +PKGFILES_CSWcollectd-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWcollectd-dev += CSWlibcollectdclient1 + PACKAGES += CSWcollectd SPKG_DESC_CSWcollectd += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcollectdclient1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibganglia0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibdbi1 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibrrd-th4 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibstatgrab6 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWcollectd += CSWperl -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibganglia0 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpq5 CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/collectd.1 CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/collectd-unixsock.5 +INITSMF = $(sysconfdir)/init\.d/collectd + include gar/category.mk post-install-modulated: ginstall -m 755 -d $(DESTDIR)/opt/csw/share/man/man3 cd $(DESTDIR); gmv -v opt/csw/man/man3/* opt/csw/share/man/man3 + grm $(DESTDIR)/opt/csw/lib/perl5/sun4-solaris-thread-multi/perllocal.pod rmdir $(DESTDIR)/opt/csw/man/man3 - grm -v $(DESTDIR)/opt/csw/lib/perl/*/perllocal.pod + ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(WORKDIR)/collectd-init-csw $(DESTDIR)$(sysconfdir)/init.d/collectd $(MAKECOOKIE) Modified: csw/mgar/pkg/collectd/trunk/checksums =================================================================== --- csw/mgar/pkg/collectd/trunk/checksums 2013-01-11 09:00:38 UTC (rev 20082) +++ csw/mgar/pkg/collectd/trunk/checksums 2013-01-11 09:47:15 UTC (rev 20083) @@ -1 +1 @@ -adc58a0d448a359ecf737da9398898c6 collectd-5.1.0.tar.gz +c0b4b94ffc9be540e4392aee64c4a42c collectd-5.2.0.tar.gz Added: csw/mgar/pkg/collectd/trunk/files/collectd-init-csw =================================================================== --- csw/mgar/pkg/collectd/trunk/files/collectd-init-csw (rev 0) +++ csw/mgar/pkg/collectd/trunk/files/collectd-init-csw 2013-01-11 09:47:15 UTC (rev 20083) @@ -0,0 +1,42 @@ +#!/sbin/sh + +PIDFILE=/var/opt/csw/run/collectd.pid +DAEMON=/opt/csw/sbin/collectd + +. /lib/svc/share/smf_include.sh + +case "$1" in + start) + if [ -f $PIDFILE ] ; then + echo "Already running. Stale PID file?" + PID=`cat $PIDFILE` + echo "$PIDFILE contains $PID" + ps -p $PID + exit $SMF_EXIT_ERR_FATAL + fi + $DAEMON + if [ $? -ne 0 ] ; then + echo $DAEMON faild to start + exit $SMF_EXIT_ERR_FATAL + fi + ;; + stop) + PID=`cat $PIDFILE 2>/dev/null` + kill -15 $PID 2>/dev/null + pwait $PID 1> /dev/null 2>/dev/null + ;; + restart) + $0 stop + $0 start + ;; + status) + ps -ef | grep collectd | grep -v status | grep -v grep + ;; + *) + echo "Usage: $0 [ start | stop | restart | status ]" + exit 1 + ;; +esac + + +exit $SMF_EXIT_OK 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 Jan 11 12:55:29 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Jan 2013 11:55:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[20084] csw/mgar/pkg/collectd/trunk/Makefile Message-ID: Revision: 20084 http://gar.svn.sourceforge.net/gar/?rev=20084&view=rev Author: wahwah Date: 2013-01-11 11:55:27 +0000 (Fri, 11 Jan 2013) Log Message: ----------- collectd/trunk: If perllocal.pod doesn't exist, skip over it. Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 09:47:15 UTC (rev 20083) +++ csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 11:55:27 UTC (rev 20084) @@ -69,7 +69,7 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)/opt/csw/share/man/man3 cd $(DESTDIR); gmv -v opt/csw/man/man3/* opt/csw/share/man/man3 - grm $(DESTDIR)/opt/csw/lib/perl5/sun4-solaris-thread-multi/perllocal.pod + grm -f $(DESTDIR)/opt/csw/lib/perl5/sun4-solaris-thread-multi/perllocal.pod rmdir $(DESTDIR)/opt/csw/man/man3 ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/collectd-init-csw $(DESTDIR)$(sysconfdir)/init.d/collectd 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 Jan 11 14:15:27 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Jan 2013 13:15:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[20085] csw/mgar/pkg/collectd/trunk/Makefile Message-ID: Revision: 20085 http://gar.svn.sourceforge.net/gar/?rev=20085&view=rev Author: wahwah Date: 2013-01-11 13:15:27 +0000 (Fri, 11 Jan 2013) Log Message: ----------- collectd/trunk: Adjustments for the intel build Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 11:55:27 UTC (rev 20084) +++ csw/mgar/pkg/collectd/trunk/Makefile 2013-01-11 13:15:27 UTC (rev 20085) @@ -59,6 +59,9 @@ RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWcollectd += CSWperl +RUNTIME_DEP_PKGS_CSWcollectd_i386 += CSWlibmemcached8 +RUNTIME_DEP_PKGS_CSWcollectd += $(RUNTIME_DEP_PKGS_CSWcollectd_$(GARCH)) + CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/collectd.1 CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/collectd-unixsock.5 @@ -70,6 +73,7 @@ ginstall -m 755 -d $(DESTDIR)/opt/csw/share/man/man3 cd $(DESTDIR); gmv -v opt/csw/man/man3/* opt/csw/share/man/man3 grm -f $(DESTDIR)/opt/csw/lib/perl5/sun4-solaris-thread-multi/perllocal.pod + grm -f $(DESTDIR)/opt/csw/lib/perl5/i86pc-solaris-thread-multi/perllocal.pod rmdir $(DESTDIR)/opt/csw/man/man3 ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/collectd-init-csw $(DESTDIR)$(sysconfdir)/init.d/collectd 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 Jan 11 14:26:21 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 11 Jan 2013 13:26:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[20086] csw/mgar/pkg/nspr/trunk Message-ID: Revision: 20086 http://gar.svn.sourceforge.net/gar/?rev=20086&view=rev Author: cgrzemba Date: 2013-01-11 13:26:20 +0000 (Fri, 11 Jan 2013) Log Message: ----------- nspr/trunk: minor version bump 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 2013-01-11 13:15:27 UTC (rev 20085) +++ csw/mgar/pkg/nspr/trunk/Makefile 2013-01-11 13:26:20 UTC (rev 20086) @@ -8,7 +8,7 @@ NAME = nspr MAJOR_VERSION = 4 -MIN_VERSION = 9.3 +MIN_VERSION = 9.4 VERSION = $(MAJOR_VERSION).$(MIN_VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/nspr/trunk/checksums =================================================================== --- csw/mgar/pkg/nspr/trunk/checksums 2013-01-11 13:15:27 UTC (rev 20085) +++ csw/mgar/pkg/nspr/trunk/checksums 2013-01-11 13:26:20 UTC (rev 20086) @@ -1 +1 @@ -8a21b3b6766bde3b5ed2a6a7b725e4aa nspr-4.9.3.tar.gz +cf58772702b3abbdcff14e22014eeeaf nspr-4.9.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 11 15:30:40 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Jan 2013 14:30:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20087] csw/mgar/pkg/php5 Message-ID: Revision: 20087 http://gar.svn.sourceforge.net/gar/?rev=20087&view=rev Author: dmichelsen Date: 2013-01-11 14:30:40 +0000 (Fri, 11 Jan 2013) Log Message: ----------- php5: Move legacy stuff aside Added Paths: ----------- csw/mgar/pkg/php5/tags/legacy-php5-apache/ csw/mgar/pkg/php5/tags/legacy-php5-apache2/ Removed Paths: ------------- csw/mgar/pkg/php5/trunk/legacy/ 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 Jan 11 18:25:20 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Jan 2013 17:25:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[20088] csw/mgar/pkg Message-ID: Revision: 20088 http://gar.svn.sourceforge.net/gar/?rev=20088&view=rev Author: dmichelsen Date: 2013-01-11 17:25:20 +0000 (Fri, 11 Jan 2013) Log Message: ----------- php5_ibm_db2: Initial commit Modified Paths: -------------- csw/mgar/pkg/php5_ibm_db2/trunk/Makefile csw/mgar/pkg/php5_ibm_db2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/php5_ibm_db2/ Modified: csw/mgar/pkg/php5_ibm_db2/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_intl/trunk/Makefile 2013-01-04 22:13:40 UTC (rev 20029) +++ csw/mgar/pkg/php5_ibm_db2/trunk/Makefile 2013-01-11 17:25:20 UTC (rev 20088) @@ -1,24 +1,59 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = php5_intl -DISTNAME = intl-$(VERSION) -VERSION = 1.1.2 +NAME = php5_ibm_db2 +DISTNAME = ibm_db2-$(VERSION) +VERSION = 1.9.5 GARTYPE = v2 -DESCRIPTION = PHP5 Internationalization extension -define BLURB -The Internationalization extension exposes functionality of the ICU library to PHP. -endef +DESCRIPTION = IBM DB2 Extension for PHP MASTER_SITES = http://pecl.php.net/get/ DISTFILES = $(DISTNAME).tgz -# 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 = +VENDOR_URL = http://pecl.php.net/package/ibm_db2 -CONFIGURE_ARGS = $(DIRPATHS) +LICENSE_TEXT = This software is licensed under the Apache 2.0 license +PHP_PREFIX = $(prefix)/php5 +PHP_BIN = $(PHP_PREFIX)/bin + +PHP5_EXT = 1 + +PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) +STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ +STRIP_DIRS += $(PHP5ROOT)/bin + +PACKAGES = CSWphp5-ibm-db2 +SPKG_DESC_CSWphp5-ibm-db2 = IBM DB2 Extension for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-ibm-db2 = CSWphp5 +BUILD_DEP_PKGS += CSWapache2 +BUILD_DEP_PKGS += CSWphp5-dev +CHECKPKG_OVERRIDES_CSWphp5-ibm-db2 += surplus-dependency|CSWphp5 + +# Sorry, we are not allowed to ship that +CHECKPKG_OVERRIDES_CSWphp5-ibm-db2 += bad-rpath-entry|/opt/IBM/db2/V8.1/lib/|opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626/ibm_db2.so +CHECKPKG_OVERRIDES_CSWphp5-ibm-db2 += soname-not-found|libdb2.so.1|is|needed|by|opt/csw/php5/lib/php/extensions/no-debug-non-zts-20090626/ibm_db2.so + +EXTRA_CONFIGURE_EXPORTS += IBM_DB_HOME +CONFIGURE_ENV_IBM_DB_HOME = /opt/IBM/db2/V8.1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config +CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs + +TEST_TARGET = test + +# The tests require a running database +SKIPTEST ?= 1 + +# This thing doesn't use destdir. Export install_root with the same value +EXTRA_INSTALL_EXPORTS = INSTALL_ROOT +INSTALL_ENV_INSTALL_ROOT = $(DESTDIR) + include gar/category.mk +post-extract: + ( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/php5_ibm_db2/trunk/checksums =================================================================== --- csw/mgar/pkg/php5_intl/trunk/checksums 2013-01-04 22:13:40 UTC (rev 20029) +++ csw/mgar/pkg/php5_ibm_db2/trunk/checksums 2013-01-11 17:25:20 UTC (rev 20088) @@ -1 +1 @@ -6e32eb19a8920c48f88571eb2e9d2213 intl-1.1.2.tgz +6aa788bfd6069ff4cd3ad10158a7b6f8 ibm_db2-1.9.5.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 11 18:29:20 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 11 Jan 2013 17:29:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[20089] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 20089 http://gar.svn.sourceforge.net/gar/?rev=20089&view=rev Author: chninkel Date: 2013-01-11 17:29:20 +0000 (Fri, 11 Jan 2013) Log Message: ----------- gar/v2: fixed a bad indentation leading to a bad code flow Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-11 17:25:20 UTC (rev 20088) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-11 17:29:20 UTC (rev 20089) @@ -409,8 +409,9 @@ result = self._ParseLddDashRline(line, binary_abspath) if result: ldd_info.append(result) - ldd_output[binary] = ldd_info + ldd_output[binary] = ldd_info + return ldd_output def _ParseNmSymLine(self, line): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Jan 11 18:51:08 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Fri, 11 Jan 2013 17:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20089] csw/mgar/gar/v2/lib/python/inspective_package.py In-Reply-To: References: Message-ID: 2013/1/11 : > - ldd_output[binary] = ldd_info > > + ldd_output[binary] = ldd_info > + > return ldd_output Could you also include a unit test? From wahwah at users.sourceforge.net Fri Jan 11 23:33:08 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Jan 2013 22:33:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20090] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 20090 http://gar.svn.sourceforge.net/gar/?rev=20090&view=rev Author: wahwah Date: 2013-01-11 22:33:08 +0000 (Fri, 11 Jan 2013) Log Message: ----------- sort out the libffi linking issue Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-11 17:29:20 UTC (rev 20089) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2013-01-11 22:33:08 UTC (rev 20090) @@ -63,7 +63,8 @@ # pkgchk -L CSWlibffi-dev # (...) # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -EXTRA_LINKER_FLAGS += -L$(libdir)/ffi +# EXTRA_LINKER_FLAGS += -L$(libdir)/ffi +# The above doesn't work; we need to put the flag in front of LINKER_FLAGS. BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -224,6 +225,8 @@ include gar/category.mk +LINKER_FLAGS := -L$(libdir)/ffi $(LINKER_FLAGS) + post-configure-modulated: for f in Modules/Setup \ Makefile \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 11 23:33:31 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 11 Jan 2013 22:33:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[20091] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20091 http://gar.svn.sourceforge.net/gar/?rev=20091&view=rev Author: wahwah Date: 2013-01-11 22:33:30 +0000 (Fri, 11 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: sort out the libffi linking issue Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-11 22:33:08 UTC (rev 20090) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-11 22:33:30 UTC (rev 20091) @@ -31,6 +31,7 @@ MASTER_SITES = http://python.org/ftp/python/$(VERSION)/ UPSTREAM_MASTER_SITES = http://python.org/ftp/python/ +UFILES_REGEX = $(VER)\.\d+ DISTFILES = $(DISTNAME).tar.bz2 @@ -54,7 +55,7 @@ # pkgchk -L CSWlibffi-dev # (...) # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev -EXTRA_LIB += $(libdir)/ffi +# EXTRA_LINKER_FLAGS += $(libdir)/ffi # BASECFLAGS = $(CFLAGS) BASECFLAGS = -g -O2 @@ -99,9 +100,6 @@ SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0 -# This seems to be an issue with the 64-bit build. The 32-bit binaries link -# against libffi5, the 64-bit binaries link against libffi4. -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi4 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4 @@ -208,3 +206,5 @@ GARCOMPILER = GNU include gar/category.mk + +LINKER_FLAGS := -L$(libdir)/ffi $(LINKER_FLAGS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 10:42:43 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 09:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20092] csw/mgar/pkg Message-ID: Revision: 20092 http://gar.svn.sourceforge.net/gar/?rev=20092&view=rev Author: wahwah Date: 2013-01-12 09:42:43 +0000 (Sat, 12 Jan 2013) Log Message: ----------- irrtoolset, libicu48: Removed externals Property Changed: ---------------- csw/mgar/pkg/irrtoolset/trunk/ csw/mgar/pkg/libicu48/tags/SR3-6627678431/ Property changes on: csw/mgar/pkg/irrtoolset/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + Property changes on: csw/mgar/pkg/libicu48/tags/SR3-6627678431 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 15:50:45 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 14:50:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[20093] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 20093 http://gar.svn.sourceforge.net/gar/?rev=20093&view=rev Author: wahwah Date: 2013-01-12 14:50:43 +0000 (Sat, 12 Jan 2013) Log Message: ----------- checkpkg: the yaml module is no longer used Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-12 09:42:43 UTC (rev 20092) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-01-12 14:50:43 UTC (rev 20093) @@ -8,7 +8,6 @@ import package_checks as pc import checkpkg import checkpkg_lib -import yaml import os.path import mox import logging This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 15:51:08 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 14:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[20094] csw/mgar/gar/v2/lib/python/database_test.py Message-ID: Revision: 20094 http://gar.svn.sourceforge.net/gar/?rev=20094&view=rev Author: wahwah Date: 2013-01-12 14:51:08 +0000 (Sat, 12 Jan 2013) Log Message: ----------- checkpkg: Add a test if we can create tables in the database Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database_test.py Modified: csw/mgar/gar/v2/lib/python/database_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/database_test.py 2013-01-12 14:50:43 UTC (rev 20093) +++ csw/mgar/gar/v2/lib/python/database_test.py 2013-01-12 14:51:08 UTC (rev 20094) @@ -8,6 +8,18 @@ class DatabaseManagerUnitTest(mox.MoxTestBase): + def testCanCreateTables(self): + # This test succeeds when run with sqlite, but fails with MySQL. + # We don't want to add a dependency on a running MySQL database to run tests, so + # we'll leave it unsolved for now. + dbc = database.CatalogDatabase(uri="sqlite:/:memory:") + dbc.CreateTables() + + def testCanCreateTablesAndImportData(self): + dbc = database.CatalogDatabase(uri="sqlite:/:memory:") + dbc.CreateTables() + dbc.InitialDataImport() + def testNoSystemFiles(self): # This test shows that stubbing out sqlite classes is quite laborious. saved_s = database.m.Srv4FileStats This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 15:51:42 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 14:51:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[20095] csw/mgar/gar/v2/tests/run_tests.py Message-ID: Revision: 20095 http://gar.svn.sourceforge.net/gar/?rev=20095&view=rev Author: wahwah Date: 2013-01-12 14:51:42 +0000 (Sat, 12 Jan 2013) Log Message: ----------- checkpkg: Run database_test by default Modified Paths: -------------- csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2013-01-12 14:51:08 UTC (rev 20094) +++ csw/mgar/gar/v2/tests/run_tests.py 2013-01-12 14:51:42 UTC (rev 20095) @@ -16,6 +16,7 @@ from checkpkg_lib_test import * from checkpkg_test import * from csw_upload_pkg_test import * +from database_test import * from dependency_checks_test import * from inspective_package_test import * from ldd_emul_test import * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 16:14:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 15:14:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20096] csw/mgar/gar/v2/lib/python/database.py Message-ID: Revision: 20096 http://gar.svn.sourceforge.net/gar/?rev=20096&view=rev Author: wahwah Date: 2013-01-12 15:14:36 +0000 (Sat, 12 Jan 2013) Log Message: ----------- pkgdb: Fix the order of tables Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2013-01-12 14:51:42 UTC (rev 20095) +++ csw/mgar/gar/v2/lib/python/database.py 2013-01-12 15:14:36 UTC (rev 20096) @@ -12,21 +12,26 @@ CONFIG_DB_SCHEMA = "db_schema_version" DB_SCHEMA_VERSION = 9L TABLES_THAT_NEED_UPDATES = (m.CswFile,) + +# This list of tables is sensitive to the order in which tables are created. +# After you change the order here, you need to make sure that the tables can +# still be created. TABLES = TABLES_THAT_NEED_UPDATES + ( m.Architecture, m.CatalogRelease, m.CatalogReleaseType, m.CheckpkgErrorTag, - m.CheckpkgOverride, m.CswConfig, m.Host, m.Maintainer, m.OsRelease, m.Pkginst, + m.Srv4FileStatsBlob, + m.Srv4FileStats, + m.CheckpkgOverride, # needs Srv4FileStats m.Srv4DependsOn, m.Srv4FileInCatalog, - m.Srv4FileStatsBlob, - m.Srv4FileStats) +) # Shouldn't this be in common_constants? SYSTEM_PKGMAP = "/var/sadm/install/contents" CONFIG_MTIME = "mtime" 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 Jan 12 16:58:00 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 12 Jan 2013 15:58:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[20097] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20097 http://gar.svn.sourceforge.net/gar/?rev=20097&view=rev Author: pfelecan Date: 2013-01-12 15:57:59 +0000 (Sat, 12 Jan 2013) Log Message: ----------- texlive/trunk: removed redundant re-in-place Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-12 15:14:36 UTC (rev 20096) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-12 15:57:59 UTC (rev 20097) @@ -5186,7 +5186,6 @@ $(MAKECOOKIE) REINPLACE_WHEN_USRLOCAL = postinstall -REINPLACE_USRLOCAL += /opt/csw/include/kpathsea/types.h REINPLACE_USRLOCAL += /opt/csw/share/info/kpathsea.info REINPLACE_USRLOCAL += /opt/csw/share/info/web2c.info REINPLACE_USRLOCAL += /opt/csw/share/man/man1/texmfstart.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 17:07:53 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 16:07:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[20098] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 20098 http://gar.svn.sourceforge.net/gar/?rev=20098&view=rev Author: wahwah Date: 2013-01-12 16:07:53 +0000 (Sat, 12 Jan 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: a fix for mysqld_safe Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-01-12 15:57:59 UTC (rev 20097) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-01-12 16:07:53 UTC (rev 20098) @@ -75,6 +75,7 @@ CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 PATCHFILES += 0003-I-HATE-CMAKE.patch PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch +PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch 2013-01-12 16:07:53 UTC (rev 20098) @@ -0,0 +1,23 @@ +From 58df96577920a495ee5d84680bf8d806c494a46c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 12 Jan 2013 17:03:06 +0100 +Subject: [PATCH] Use bash for mysqld_safe + +/bin/sh on solaris has own 'test' syntax, and fails with what's in the script. +--- + scripts/mysqld_safe.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh +index b5262bf..019be32 100644 +--- a/scripts/mysqld_safe.sh ++++ b/scripts/mysqld_safe.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB + # This file is public domain and comes with NO WARRANTY of any kind + # +-- +1.8.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 17:17:31 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 16:17:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[20099] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20099 http://gar.svn.sourceforge.net/gar/?rev=20099&view=rev Author: wahwah Date: 2013-01-12 16:17:31 +0000 (Sat, 12 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: experiment with setting bindir, but keeping the default for 64 bits Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-12 16:07:53 UTC (rev 20098) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-12 16:17:31 UTC (rev 20099) @@ -46,8 +46,9 @@ SKIPTEST = 1 TEST_TARGET = test -BUILD64 = 1 -ISAEXEC = 1 +BUILD64_ONLY = 1 +bindir = $(prefix)/bin +# ISAEXEC = 1 # There is a file name conflict over libffi.so symlink between libffi package # and a gcc-java package. While it will ultimately belong to libffi_dev, the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 12 21:15:18 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 12 Jan 2013 20:15:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[20100] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20100 http://gar.svn.sourceforge.net/gar/?rev=20100&view=rev Author: wahwah Date: 2013-01-12 20:15:18 +0000 (Sat, 12 Jan 2013) Log Message: ----------- A unit test for the ldd_info bug Context: https://sourceforge.net/apps/trac/gar/changeset/20089 http://lists.opencsw.org/pipermail/maintainers/2013-January/017576.html http://lists.opencsw.org/pipermail/devel/2013-January/025313.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-12 16:17:31 UTC (rev 20099) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-12 20:15:18 UTC (rev 20100) @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.6 +#!/opt/csw/bin/python2.6 import unittest2 as unittest import inspective_package @@ -147,7 +147,23 @@ self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) + def testGetLddMinusRlines(self): + ip = inspective_package.InspectivePackage("/tmp/CSWfake") + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(os, 'chmod') + self.mox.StubOutWithMock(os, 'uname') + os.chmod('/tmp/CSWfake/root/bin/foo', 0755) + os.uname().AndReturn('i86pc') + ip.ListBinaries().AndReturn(['bin/foo']) + self.mox.StubOutWithMock(inspective_package, 'ShellCommand') + inspective_package.ShellCommand( + ['ldd', '-Ur', '/tmp/CSWfake/root/bin/foo'], + timeout=10).AndReturn((0, "", "")) + self.mox.StubOutWithMock(ip, '_ParseLddDashRline') + self.mox.ReplayAll() + self.assertEqual({'bin/foo': []}, ip.GetLddMinusRlines()) + class PackageStatsUnitTest(unittest.TestCase): def setUp(self): Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-12 16:17:31 UTC (rev 20099) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-12 20:15:18 UTC (rev 20100) @@ -337,15 +337,6 @@ for override_dict in pkg_stats["overrides"]: o = m.CheckpkgOverride(srv4_file=db_pkg_stats, **override_dict) - # The ldd -r reporting breaks on bigger packages during yaml saving. - # It might work when yaml is disabled - # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r") - # This check is currently disabled, let's save time by not collecting - # these data. - # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols") - # This one should be last, so that if the collection is interrupted - # in one of the previous runs, the basic_stats.pickle file is not there - # or not updated, and the collection is started again. return db_pkg_stats @classmethod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 12 22:06:39 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 12 Jan 2013 21:06:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[20101] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 20101 http://gar.svn.sourceforge.net/gar/?rev=20101&view=rev Author: bonivart Date: 2013-01-12 21:06:38 +0000 (Sat, 12 Jan 2013) Log Message: ----------- clamav/trunk: rebuild so mapfile is used Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2013-01-12 20:15:18 UTC (rev 20100) +++ csw/mgar/pkg/clamav/trunk/Makefile 2013-01-12 21:06:38 UTC (rev 20101) @@ -48,28 +48,18 @@ PATCHFILES += CSWclamav.clamd.conf.p PATCHFILES += CSWclamav.clamav-milter.conf.p PATCHFILES += CSWclamav.optparser.c.p -# Not needed with 0.97.6 -#PATCHFILES += CSWclamav.scanners.c.p # 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 GARCOMPILER = GNU -# Seems to be a compiler bug forcing us to use -xO2 instead of -xO3 -# http://bugs.sun.com/view_bug.do?bug_id=6683773 -# New bug filed since the above one isn't really solved, no bug id yet -#OPT_FLAGS_SOS = -xO2 - sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-clamav -# unrecognized by 0.95rc1? CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(NAME)/db CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(NAME) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) 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 Jan 13 11:45:41 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 13 Jan 2013 10:45:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20102] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 20102 http://gar.svn.sourceforge.net/gar/?rev=20102&view=rev Author: dmichelsen Date: 2013-01-13 10:45:40 +0000 (Sun, 13 Jan 2013) Log Message: ----------- mGAR v2: Add PREPEND_LINKER_FLAGS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-01-12 21:06:38 UTC (rev 20101) +++ csw/mgar/gar/v2/gar.conf.mk 2013-01-13 10:45:40 UTC (rev 20102) @@ -702,7 +702,7 @@ 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) endif -LINKER_FLAGS ?= $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) +LINKER_FLAGS ?= $(PREPEND_LINKER_FLAGS) $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS) CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) 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 Jan 13 12:21:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 11:21:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[20103] csw/mgar/gar/v2/lib/python/system_pkgmap.py Message-ID: Revision: 20103 http://gar.svn.sourceforge.net/gar/?rev=20103&view=rev Author: wahwah Date: 2013-01-13 11:21:08 +0000 (Sun, 13 Jan 2013) Log Message: ----------- pkgdb: Use marshal instead of pickle for system files The pickle module performs cycle detection, which uses a lot of memory. We know we don't have cycles in our data structure, so we'll use the less resource-hungry marshal module, allowing us to run in a VM with 1GB or RAM. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/system_pkgmap.py Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-01-13 10:45:40 UTC (rev 20102) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-01-13 11:21:08 UTC (rev 20103) @@ -6,7 +6,7 @@ import subprocess import logging import common_constants -import cPickle +import marshal import itertools import progressbar import models as m @@ -98,7 +98,7 @@ if not self.arch: self.arch = self._GetArch() if not self.outfile: - self.outfile = ("install-contents-%s-%s.pickle" + self.outfile = ("install-contents-%s-%s.marshal" % (self.osrel, self.arch)) logging.debug("Indexer(): infile_contents=%s, outfile=%s, osrel=%s, arch=%s", repr(self.infile_contents), repr(self.outfile), repr(self.osrel), @@ -304,7 +304,7 @@ def GetDataStructure(self, srv4_pkgcontent_stream, srv4_pkginfo_stream, ips_pkgcontent_stream, ips_pkginfo_stream, osrel, arch, show_progress=False): - """Gets the data structure to be pickled. + """Gets the data structure to be serialized. Does not interact with the OS. """ @@ -342,7 +342,7 @@ data = self.Index() out_fd = open(self.outfile, "w") logging.debug("IndexAndSave(): pickling the data.") - cPickle.dump(data, out_fd, cPickle.HIGHEST_PROTOCOL) + marshal.dump(data, out_fd) logging.debug("IndexAndSave(): pickling done.") def _GetSrv4PkgcontentStream(self): @@ -401,7 +401,7 @@ return "SUNW" + "-".join(re.findall (ALPHANUMERIC_RE, ips_name)) class InstallContentsImporter(object): - """Responsible for importing a pickled file into the database.""" + """Responsible for importing a serialized file into the database.""" def __init__(self): self.pkginst_cache = {} @@ -442,7 +442,7 @@ def ImportFromFile(self, in_fd, show_progress=False): logging.debug("Unpickling data") - data = cPickle.load(in_fd) + data = marshal.load(in_fd) self.ImportData(data, show_progress) def ImportData(self, data, show_progress=False, include_prefixes=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 Sun Jan 13 12:21:51 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 11:21:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20104] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 20104 http://gar.svn.sourceforge.net/gar/?rev=20104&view=rev Author: wahwah Date: 2013-01-13 11:21:50 +0000 (Sun, 13 Jan 2013) Log Message: ----------- pkgdb: Allow the unstable catalog to be imported. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-13 11:21:08 UTC (rev 20103) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-13 11:21:50 UTC (rev 20104) @@ -84,7 +84,7 @@ "bratislava", ]) CATALOGS_ALLOWED_TO_BE_IMPORTED = frozenset([ - "current", + "unstable", ]) 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 Jan 13 12:36:40 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 11:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20105] csw/mgar/gar/v2/lib/python/inspective_package_test. py Message-ID: Revision: 20105 http://gar.svn.sourceforge.net/gar/?rev=20105&view=rev Author: wahwah Date: 2013-01-13 11:36:40 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Fix a test case; uname is not called Not called when there's no error. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-13 11:21:50 UTC (rev 20104) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-13 11:36:40 UTC (rev 20105) @@ -153,7 +153,6 @@ self.mox.StubOutWithMock(os, 'chmod') self.mox.StubOutWithMock(os, 'uname') os.chmod('/tmp/CSWfake/root/bin/foo', 0755) - os.uname().AndReturn('i86pc') ip.ListBinaries().AndReturn(['bin/foo']) self.mox.StubOutWithMock(inspective_package, 'ShellCommand') inspective_package.ShellCommand( 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 Jan 13 12:37:25 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 11:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20106] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 20106 http://gar.svn.sourceforge.net/gar/?rev=20106&view=rev Author: wahwah Date: 2013-01-13 11:37:25 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: When parsing ldd output fails, log it It's useful to have the complete output from ldd logged. More so, if you're running in screen with a long scrollback buffer which gives you an option to save that output into a file on disk. We could potentially save the ldd output to disk instead of printing to screen. Suggestions are welcome. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 11:36:40 UTC (rev 20105) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 11:37:25 UTC (rev 20106) @@ -1,6 +1,7 @@ import package import os import re +import sys import logging import hachoir_parser import sharedlib_utils @@ -312,7 +313,11 @@ stderr = re.sub(ignored_error_re, "", stderr) if stderr: - msg = "%s returned one or more errors: %s" % (args, stderr) + msg = ("%s returned one or more errors: %s" % (args, stderr) + + "\n\n" + + "ERROR: ldd invocation failed. Please copy this message " + + "and the above messages into your report and send " + + "as path of the error report.") raise package.Error(msg) elfdump_out = stdout.splitlines() @@ -323,7 +328,12 @@ cur_section = None for line in elfdump_out: - elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) + try: + elf_info, cur_section = self._ParseElfdumpLine(line, cur_section) + except package.StdoutSyntaxError as e: + sys.stderr.write("elfdump out:\n") + sys.stderr.write(stdout) + raise # header or blank line contains no information if not elf_info: 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 Jan 13 12:37:44 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 11:37:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20107] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20107 http://gar.svn.sourceforge.net/gar/?rev=20107&view=rev Author: wahwah Date: 2013-01-13 11:37:44 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Use SystemUtilityError when ldd fails Also, add a unit test to ensure that it's actually raised. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 11:37:25 UTC (rev 20106) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 11:37:44 UTC (rev 20107) @@ -412,7 +412,7 @@ ldd_output[binary] = [] continue - raise package.Error("%s returned an error: %s" % (args, stderr)) + raise package.SystemUtilityError("%s returned an error: %s" % (args, stderr)) ldd_info = [] for line in stdout.splitlines(): Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-13 11:37:25 UTC (rev 20106) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-13 11:37:44 UTC (rev 20107) @@ -2,6 +2,7 @@ import unittest2 as unittest import inspective_package +import package import mox import hachoir_parser import magic @@ -162,7 +163,24 @@ self.mox.ReplayAll() self.assertEqual({'bin/foo': []}, ip.GetLddMinusRlines()) + def testGetLddMinusRlinesThrows(self): + ip = inspective_package.InspectivePackage("/tmp/CSWfake") + self.mox.StubOutWithMock(ip, 'ListBinaries') + self.mox.StubOutWithMock(os, 'chmod') + self.mox.StubOutWithMock(os, 'uname') + os.chmod('/tmp/CSWfake/root/bin/foo', 0755) + os.uname().AndReturn('i86pc') + ip.ListBinaries().AndReturn(['bin/foo']) + self.mox.StubOutWithMock(inspective_package, 'ShellCommand') + inspective_package.ShellCommand( + ['ldd', '-Ur', '/tmp/CSWfake/root/bin/foo'], + timeout=10).AndReturn((1, "", "boo")) + self.mox.StubOutWithMock(ip, '_ParseLddDashRline') + self.mox.ReplayAll() + self.assertRaises(package.SystemUtilityError, + ip.GetLddMinusRlines) + class PackageStatsUnitTest(unittest.TestCase): def setUp(self): Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-01-13 11:37:25 UTC (rev 20106) +++ csw/mgar/gar/v2/lib/python/package.py 2013-01-13 11:37:44 UTC (rev 20107) @@ -39,6 +39,9 @@ pass +class SystemUtilityError(Error): + """A problem occurred while running system utility, e.g. ldd.""" + class PackageError(Error): pass This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Jan 13 14:10:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 13 Jan 2013 13:10:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[20108] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 20108 http://gar.svn.sourceforge.net/gar/?rev=20108&view=rev Author: pfelecan Date: 2013-01-13 13:10:06 +0000 (Sun, 13 Jan 2013) Log Message: ----------- texlive/trunk: move re-in-place rules before the inclusion of the gar components. Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-01-13 11:37:44 UTC (rev 20107) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-01-13 13:10:06 UTC (rev 20108) @@ -5111,80 +5111,6 @@ CHECKPKG_OVERRIDES_CSWtexlive-generic-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/fonts/fontname/Makefile CHECKPKG_OVERRIDES_CSWtexlive-generic-recommended += file-with-bad-content|/usr/local|root/opt/csw/share/texmf-dist/doc/generic/epsf/Makefile -include gar/category.mk - -PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) - -# we build in a directory outside the source tree and gather the -# licenses from the extra archive into one file: -pre-configure-modulated: - mkdir -p $(OBJDIR) - cat $(WORKDIR)/$(DISTNAMEPREFIX)-extra/LICENSE.TL $(WORKDIR)/$(DISTNAMEPREFIX)-extra/LICENSE.CTAN > $(WORKSRC)/COPYING - $(MAKECOOKIE) - -# this is necessary to link texk/ptexenc (libtool --mode=install) when -# the kpathsea from teTeX is installed on the build system; this will -# probably go away when teTeX is decommissioned. -pre-install-modulated: - cd $(OBJDIR)/texk/ptexenc && gsed --in-place --expression='s;-L/opt/csw/lib;;g' libptexenc.la - $(MAKECOOKIE) - -# install the texmf and texmf-dist -post-install-modulated: - : merge source and distributed texmf tree - gtar --directory=$(DESTDIR)/$(datadir) --extract --file=$(DOWNLOADDIR)/$(TEXMFAR) - gtar --directory=$(DESTDIR)/$(datadir) --create --file=- texmf texmf-dist | gtar --directory=$(DESTDIR)/$(datadir)/$(TEXMFARPREFIX) --extract --file=- - rm -rf $(DESTDIR)/$(datadir)/texmf $(DESTDIR)/$(datadir)/texmf-dist - mv $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)/texmf $(DESTDIR)/$(datadir) - mv $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)/texmf-dist $(DESTDIR)/$(datadir) - rm -rf $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX) - : create additional hierarchy to reflect texmf.cnf - ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(datadir)/texmf-local - ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(localstatedir)/lib/texmf-var - ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(localstatedir)/cache/texmf-fonts - ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(sysconfdir)/texmf - : create all the available formats: - PATH=$(DESTDIR)/$(bindir):${PATH} LD_LIBRARY_PATH=$(DESTDIR)/$(libdir) fmtutil-sys --all - : create symbolic links for available formats: - cd $(DESTDIR)/$(bindir) && ln -s -f aleph lamed - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex amstex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cslatex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfcslatex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex csplain - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfcsplain - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex eplain - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex jadetex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfjadetex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex latex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdflatex - cd $(DESTDIR)/$(bindir) && ln -s -f luatex dvilualatex - cd $(DESTDIR)/$(bindir) && ln -s -f luatex lualatex - cd $(DESTDIR)/$(bindir) && ln -s -f luatex dviluatex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfmex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex utf8mex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mllatex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mltex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex etex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfetex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyramstex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyrtex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex texsis - cd $(DESTDIR)/$(bindir) && ln -s -f euptex uplatex - cd $(DESTDIR)/$(bindir) && ln -s -f xetex xelatex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex xmltex - cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfxmltex - : replace references to interpreters - : Perl - cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/perl[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/perl[[:space:]]*;#!/usr/bin/env perl ;' {} - : Bourne Shell - cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {} - : patch postinstallation for those files being too expansive to patch in the classic way - gsed --in-place --expression 's;^cmbase=.*cmbase.mf$$;cmbase=/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh - gsed --in-place --expression 's;^LATEXPATH="/usr/texbin/" # TeXLive$$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh - gsed --in-place --expression 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks - $(MAKECOOKIE) - REINPLACE_WHEN_USRLOCAL = postinstall REINPLACE_USRLOCAL += /opt/csw/share/info/kpathsea.info REINPLACE_USRLOCAL += /opt/csw/share/info/web2c.info @@ -5329,6 +5255,80 @@ REINPLACE_USRSHARE += /opt/csw/share/texmf/texconfig/v/vt100 REINPLACE_USRSHARE += /opt/csw/share/texmf/web2c/texmf.cnf +include gar/category.mk + +PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) + +# we build in a directory outside the source tree and gather the +# licenses from the extra archive into one file: +pre-configure-modulated: + mkdir -p $(OBJDIR) + cat $(WORKDIR)/$(DISTNAMEPREFIX)-extra/LICENSE.TL $(WORKDIR)/$(DISTNAMEPREFIX)-extra/LICENSE.CTAN > $(WORKSRC)/COPYING + $(MAKECOOKIE) + +# this is necessary to link texk/ptexenc (libtool --mode=install) when +# the kpathsea from teTeX is installed on the build system; this will +# probably go away when teTeX is decommissioned. +pre-install-modulated: + cd $(OBJDIR)/texk/ptexenc && gsed --in-place --expression='s;-L/opt/csw/lib;;g' libptexenc.la + $(MAKECOOKIE) + +# install the texmf and texmf-dist +post-install-modulated: + : merge source and distributed texmf tree + gtar --directory=$(DESTDIR)/$(datadir) --extract --file=$(DOWNLOADDIR)/$(TEXMFAR) + gtar --directory=$(DESTDIR)/$(datadir) --create --file=- texmf texmf-dist | gtar --directory=$(DESTDIR)/$(datadir)/$(TEXMFARPREFIX) --extract --file=- + rm -rf $(DESTDIR)/$(datadir)/texmf $(DESTDIR)/$(datadir)/texmf-dist + mv $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)/texmf $(DESTDIR)/$(datadir) + mv $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX)/texmf-dist $(DESTDIR)/$(datadir) + rm -rf $(DESTDIR)/$(datadir)/$(TEXMFARPREFIX) + : create additional hierarchy to reflect texmf.cnf + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(datadir)/texmf-local + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(localstatedir)/lib/texmf-var + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(localstatedir)/cache/texmf-fonts + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(sysconfdir)/texmf + : create all the available formats: + PATH=$(DESTDIR)/$(bindir):${PATH} LD_LIBRARY_PATH=$(DESTDIR)/$(libdir) fmtutil-sys --all + : create symbolic links for available formats: + cd $(DESTDIR)/$(bindir) && ln -s -f aleph lamed + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex amstex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cslatex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfcslatex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex csplain + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfcsplain + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex eplain + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex jadetex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfjadetex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex latex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdflatex + cd $(DESTDIR)/$(bindir) && ln -s -f luatex dvilualatex + cd $(DESTDIR)/$(bindir) && ln -s -f luatex lualatex + cd $(DESTDIR)/$(bindir) && ln -s -f luatex dviluatex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfmex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex utf8mex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mllatex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex mltex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex etex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfetex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyramstex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex cyrtex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex texsis + cd $(DESTDIR)/$(bindir) && ln -s -f euptex uplatex + cd $(DESTDIR)/$(bindir) && ln -s -f xetex xelatex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex xmltex + cd $(DESTDIR)/$(bindir) && ln -s -f pdftex pdfxmltex + : replace references to interpreters + : Perl + cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/perl[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/perl[[:space:]]*;#!/usr/bin/env perl ;' {} + : Bourne Shell + cd $(DESTDIR)/$(prefix) && gfind . -type f | xargs ggrep -n '^#![[:space:]]*.*/sh[[:space:]]*' /dev/null | ggrep -v '/env ' | ggrep ':1:' | cut -d : -f 1 | xargs -l -i gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*.*/sh[[:space:]]*;#!/usr/bin/env bash ;' {} + : patch postinstallation for those files being too expansive to patch in the classic way + gsed --in-place --expression 's;^cmbase=.*cmbase.mf$$;cmbase=/opt/csw/share/texmf-dist/fonts/source/public/cm/cmbase.mf;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mktipapk.sh $(DESTDIR)/opt/csw/share/texmf-dist/doc/fonts/tipa/mkxipapk.sh + gsed --in-place --expression 's;^LATEXPATH="/usr/texbin/" # TeXLive$$;LATEXPATH="/opt/csw/bin/" # TeXLive;' $(DESTDIR)/opt/csw/share/texmf-dist/doc/latex/confproc/example/buildpapers.sh + gsed --in-place --expression 's;/usr/local/teTeX/share/texmf.local/scripts/xetex/perl/lib/PDF/Reuse.pm;/opt/csw/share/texmf-dist/scripts/xetex/perl/lib/PDF/Reuse.pm;' $(DESTDIR)/opt/csw/share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks + $(MAKECOOKIE) + # the texlive-common package is bigger than a trivially sized /tmp pre-package: mkdir -p $(SPKG_TMPDIR) 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 Jan 13 18:28:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:28:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20109] csw/mgar/pkg/leveldb/trunk Message-ID: Revision: 20109 http://gar.svn.sourceforge.net/gar/?rev=20109&view=rev Author: wahwah Date: 2013-01-13 17:28:54 +0000 (Sun, 13 Jan 2013) Log Message: ----------- leveldb/trunk: Version bump to 1.9 Modified Paths: -------------- csw/mgar/pkg/leveldb/trunk/Makefile csw/mgar/pkg/leveldb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags-for-v1.9.patch Removed Paths: ------------- csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags.patch Modified: csw/mgar/pkg/leveldb/trunk/Makefile =================================================================== --- csw/mgar/pkg/leveldb/trunk/Makefile 2013-01-13 13:10:06 UTC (rev 20108) +++ csw/mgar/pkg/leveldb/trunk/Makefile 2013-01-13 17:28:54 UTC (rev 20109) @@ -4,12 +4,11 @@ # ! Doesn't build, issue filed: # http://code.google.com/p/leveldb/issues/detail?id=88 NAME = leveldb -VERSION = 1.4.0 +VERSION = 1.9.0 GARTYPE = v2 -DESCRIPTION = Brief description +DESCRIPTION = A fast and lightweight key/value database library by Google define BLURB - Long description endef MASTER_SITES = $(GOOGLE_MIRROR) @@ -17,10 +16,8 @@ UPSTREAM_MASTER_SITES = http://code.google.com/p/leveldb/downloads/list -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PATCHFILES += 0001-Set-Solaris-linker-flags-for-v1.9.patch -PATCHFILES += 0001-Set-Solaris-linker-flags.patch - CONFIGURE_ARGS = $(DIRPATHS) prefix = $(BUILD_PREFIX)/gxx Modified: csw/mgar/pkg/leveldb/trunk/checksums =================================================================== --- csw/mgar/pkg/leveldb/trunk/checksums 2013-01-13 13:10:06 UTC (rev 20108) +++ csw/mgar/pkg/leveldb/trunk/checksums 2013-01-13 17:28:54 UTC (rev 20109) @@ -1 +1 @@ -f5babf2cfe0292608c3665b3f2770376 leveldb-1.4.0.tar.gz +12f11385cb58ae0de66d4bc2cc7f8194 leveldb-1.9.0.tar.gz Added: csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags-for-v1.9.patch =================================================================== --- csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags-for-v1.9.patch (rev 0) +++ csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags-for-v1.9.patch 2013-01-13 17:28:54 UTC (rev 20109) @@ -0,0 +1,24 @@ +From c5be0bc93d025c2d08e1c728afc5bae41b977fd9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= +Date: Sun, 13 Jan 2013 17:14:25 +0000 +Subject: [PATCH] Set Solaris linker flags for v1.9 + +--- + build_detect_platform | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build_detect_platform b/build_detect_platform +index 5801d20..77ec9f7 100755 +--- a/build_detect_platform ++++ b/build_detect_platform +@@ -86,6 +86,7 @@ case "$TARGET_OS" in + PLATFORM=OS_SOLARIS + COMMON_FLAGS="$MEMCMP_FLAG -D_REENTRANT -DOS_SOLARIS" + PLATFORM_LIBS="-lpthread -lrt" ++ PLATFORM_SHARED_LDFLAGS="-shared -Wl,-h -Wl," + PORT_FILE=port/port_posix.cc + ;; + FreeBSD) +-- +1.8.0 + Deleted: csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags.patch =================================================================== --- csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags.patch 2013-01-13 13:10:06 UTC (rev 20108) +++ csw/mgar/pkg/leveldb/trunk/files/0001-Set-Solaris-linker-flags.patch 2013-01-13 17:28:54 UTC (rev 20109) @@ -1,24 +0,0 @@ -From 97e162dcc7466ad14212556a0871b4c4bac81369 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Wed, 9 May 2012 14:10:10 +0200 -Subject: [PATCH] Set Solaris linker flags - ---- - build_detect_platform | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build_detect_platform b/build_detect_platform -index b71bf02..0dee312 100755 ---- a/build_detect_platform -+++ b/build_detect_platform -@@ -59,6 +59,7 @@ case "$TARGET_OS" in - PLATFORM=OS_SOLARIS - COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_SOLARIS" - PLATFORM_LDFLAGS="-lpthread -lrt" -+ PLATFORM_SHARED_LDFLAGS="-shared -Wl,-h -Wl," - PORT_FILE=port/port_posix.cc - ;; - FreeBSD) --- -1.7.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 Sun Jan 13 18:37:19 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:37:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[20110] csw/mgar/gar/v2/lib/python/inspective_package.py Message-ID: Revision: 20110 http://gar.svn.sourceforge.net/gar/?rev=20110&view=rev Author: wahwah Date: 2013-01-13 17:37:18 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Tolerate some libmagic errors Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 17:28:54 UTC (rev 20109) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 17:37:18 UTC (rev 20110) @@ -56,7 +56,11 @@ "You have to restart your process - it " "will probably finish successfully when do you that." % full_path) - raise package.PackageError(msg) + if "/opt/csw/share" in full_path: + file_info["mime_type"] = "application/octet-stream; fallback" + logging.error(msg) + else: + raise package.PackageError(msg) if sharedlib_utils.IsBinary(file_info, check_consistency=False): parser = hachoir_parser.createParser(full_path) if not parser: 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 Jan 13 18:38:22 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:38:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[20111] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20111 http://gar.svn.sourceforge.net/gar/?rev=20111&view=rev Author: wahwah Date: 2013-01-13 17:38:22 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Route shellouts through ShellCommand Many commands were calling Popen in random places. They were all rerouted to a common place. Use ShellCommand Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/package.py csw/mgar/gar/v2/lib/python/pkgdb.py csw/mgar/gar/v2/lib/python/shell.py csw/mgar/gar/v2/lib/python/system_pkgmap.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 17:37:18 UTC (rev 20110) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-01-13 17:38:22 UTC (rev 20111) @@ -8,11 +8,10 @@ import magic import copy import common_constants -import subprocess import ldd_emul import configuration as c import time -import signal +import shell """This file isolates code dependent on hachoir parser. @@ -83,37 +82,6 @@ "Error in hachoir_parser processing %s: %r", file_path, e) return file_info -class TimeoutExpired(Exception): - pass - -def TimeoutHandler(signum, frame): - raise TimeoutExpired - -def ShellCommand(args, env=None, timeout=None): - logging.debug("Running: %s", args) - proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - env=env, - preexec_fn=os.setsid) - # Python 3.3 have the timeout option - # we have to roughly emulate it with python 2.x - if timeout: - signal.signal(signal.SIGALRM, TimeoutHandler) - signal.alarm(timeout) - - try: - stdout, stderr = proc.communicate() - signal.alarm(0) - except TimeoutExpired: - os.kill(-proc.pid, signal.SIGKILL) - msg = "Process %s killed after timeout expiration" % args - raise TimeoutExpired(msg) - - retcode = proc.wait() - return retcode, stdout, stderr - - class InspectivePackage(package.DirectoryFormatPackage): """Extends DirectoryFormatPackage to allow package inspection.""" @@ -221,7 +189,7 @@ 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] - retcode, stdout, stderr = ShellCommand(args, env) + retcode, stdout, stderr = shell.ShellCommand(args, env) binary_data = ldd_emul.ParseDumpOutput(stdout) binary_data["path"] = binary if basedir: @@ -248,14 +216,10 @@ binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) # Get parsable, ld.so.1 relevant SHT_DYNSYM symbol information args = ["/usr/ccs/bin/nm", "-p", "-D", binary_abspath] - nm_proc = subprocess.Popen( - args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = nm_proc.communicate() - retcode = nm_proc.wait() + retcode, stdout, stderr = shell.ShellCommand(args) if retcode: logging.error("%s returned an error: %s", args, stderr) + # Should it just skip over an error? continue nm_out = stdout.splitlines() @@ -291,7 +255,7 @@ binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) # elfdump is the only tool that give us all informations args = [common_constants.ELFDUMP_BIN, "-svy", binary_abspath] - retcode, stdout, stderr = ShellCommand(args) + retcode, stdout, stderr = shell.ShellCommand(args) if retcode or stderr: # we ignore for now these elfdump errors which can be catched # later by check functions, @@ -394,7 +358,7 @@ args = ["ldd", "-Ur", binary_abspath] # ldd can be stuck while ran on a some binaries, so we define # a timeout (problem encountered with uconv) - retcode, stdout, stderr = ShellCommand(args, timeout=10) + retcode, stdout, stderr = shell.ShellCommand(args, timeout=10) if retcode: # There three cases where we will ignore an ldd error # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-01-13 17:37:18 UTC (rev 20110) +++ csw/mgar/gar/v2/lib/python/package.py 2013-01-13 17:38:22 UTC (rev 20111) @@ -113,11 +113,7 @@ src_file, destdir, pkgname ] - pkgtrans_proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = pkgtrans_proc.communicate() - ret = pkgtrans_proc.wait() + ret, stdout, stderr = shell.ShellCommand(args) if ret: logging.error(stdout) logging.error(stderr) @@ -130,9 +126,7 @@ if not self.pkgname: gunzipped_path = self.GetGunzippedPath() args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path] - nawk_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = nawk_proc.communicate() - ret_code = nawk_proc.wait() + ret_code, stdout, stderr = shell.ShellCommand(args) self.pkgname = stdout.strip() logging.debug("GetPkgname(): %s", repr(self.pkgname)) return self.pkgname @@ -204,11 +198,7 @@ def GetPkgchkOutput(self): """Returns: (exit code, stdout, stderr).""" args = ["/usr/sbin/pkgchk", "-d", self.GetGunzippedPath(), "all"] - pkgchk_proc = subprocess.Popen( - args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = pkgchk_proc.communicate() - ret = pkgchk_proc.wait() - return ret, stdout, stderr + return shell.ShellCommand(args) def __del__(self): if self.workdir: @@ -308,13 +298,10 @@ # 4: sum pkginfo_path = os.path.join(self.directory, "pkginfo") args = ["cksum", pkginfo_path] - cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = cksum_process.communicate() - cksum_process.wait() + _, stdout, stderr = shell.ShellCommand(args) size = ws_re.split(stdout)[1] args = ["sum", pkginfo_path] - sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = sum_process.communicate() + _, stdout, stderr = shell.ShellCommand(args) sum_process.wait() sum_value = ws_re.split(stdout)[0] fields[3] = size Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-13 17:37:18 UTC (rev 20110) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-13 17:38:22 UTC (rev 20111) @@ -20,6 +20,7 @@ import package_checks import package_stats import re +import shell import socket import sqlobject import struct_util @@ -326,6 +327,8 @@ "The catalog release %s is not one of the default releases.", repr(catrel)) sqo_catrel = m.CatalogRelease.selectBy(name=catrel).getOne() + _, uname_stdout, _ = shell.ShellCommand(["uname", "-p"]) + current_host_arch = uname_stdout.strip() for osrel in common_constants.OS_RELS: logging.info(" OS release: %s", repr(osrel)) sqo_osrel = m.OsRelease.selectBy(short_name=osrel).getOne() Modified: csw/mgar/gar/v2/lib/python/shell.py =================================================================== --- csw/mgar/gar/v2/lib/python/shell.py 2013-01-13 17:37:18 UTC (rev 20110) +++ csw/mgar/gar/v2/lib/python/shell.py 2013-01-13 17:38:22 UTC (rev 20111) @@ -1,12 +1,20 @@ import logging +import os +import signal import subprocess class Error(Exception): - "Generic error" + """Generic error""" class ShellError(Error): - "Problem running a shell command." + """Problem running a shell command.""" +class TimeoutExpired(Error): + pass + +def TimeoutHandler(signum, frame): + raise TimeoutExpired + class ShellMixin(object): def ShellCommand(self, args, quiet=False): @@ -25,3 +33,30 @@ logging.critical(stderr) raise Error("Running %s has failed." % repr(args)) return retcode + +def ShellCommand(args, env=None, timeout=None): + logging.debug("Running: %s", args) + proc = subprocess.Popen(args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env, + preexec_fn=os.setsid, + close_fds=True) + # Python 3.3 have the timeout option + # we have to roughly emulate it with python 2.x + if timeout: + signal.signal(signal.SIGALRM, TimeoutHandler) + signal.alarm(timeout) + + try: + stdout, stderr = proc.communicate() + signal.alarm(0) + except TimeoutExpired: + os.kill(-proc.pid, signal.SIGKILL) + msg = "Process %s killed after timeout expiration" % args + raise TimeoutExpired(msg) + + retcode = proc.wait() + return retcode, stdout, stderr + + Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-01-13 17:37:18 UTC (rev 20110) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-01-13 17:38:22 UTC (rev 20111) @@ -3,7 +3,6 @@ import re import configuration as c -import subprocess import logging import common_constants import marshal @@ -285,10 +284,7 @@ if uname_option: args.append(uname_option) # TODO: Don't fork during unit tests - uname_proc = subprocess.Popen(args, - stdout=subprocess.PIPE) - stdout, stderr = uname_proc.communicate() - ret = uname_proc.wait() + ret, stdout, unused_stderr = shell.ShellCommand(args) if ret: raise SubprocessError("Running uname has failed.") return stdout.strip() @@ -352,9 +348,7 @@ args = ["pkg", "contents", "-H", "-o", "path,action.name,pkg.name,target,mode,owner,group", "-t", "dir,file,hardlink,link"] - pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = pkg_proc.communicate() - ret = pkg_proc.wait() + ret, stdout, unused_stderr = shell.ShellCommand(args) return stdout.splitlines() def _GetSrv4PkginfosStream(self): @@ -363,18 +357,14 @@ pkginfo_stream = open(self.infile_pkginfo, "r") else: args = ["pkginfo"] - pkginfo_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = pkginfo_proc.communicate() - ret = pkginfo_proc.wait() + ret, stdout, stderr = shell.ShellCommand(args) pkginfo_stream = stdout.splitlines() return pkginfo_stream def _GetIpsPkginfosStream(self): args = ["pkg", "list", "-H", "-s"] - pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = pkg_proc.communicate() - ret = pkg_proc.wait() + ret, stdout, stderr = shell.ShellCommand(args) pkglist_stream = stdout.splitlines() return pkglist_stream 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 Jan 13 18:38:48 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:38:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[20112] csw/mgar/gar/v2/lib/python/package.py Message-ID: Revision: 20112 http://gar.svn.sourceforge.net/gar/?rev=20112&view=rev Author: wahwah Date: 2013-01-13 17:38:48 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Unpack into /var/tmp Instead of /tmp, because some packages may be large. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package.py Modified: csw/mgar/gar/v2/lib/python/package.py =================================================================== --- csw/mgar/gar/v2/lib/python/package.py 2013-01-13 17:38:22 UTC (rev 20111) +++ csw/mgar/gar/v2/lib/python/package.py 2013-01-13 17:38:48 UTC (rev 20112) @@ -70,7 +70,7 @@ def GetWorkDir(self): if not self.workdir: - self.workdir = tempfile.mkdtemp(prefix="pkg_") + self.workdir = tempfile.mkdtemp(prefix="pkg_", dir="/var/tmp") fd = open(os.path.join(self.workdir, "admin"), "w") fd.write(ADMIN_FILE_CONTENT) fd.close() 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 Jan 13 18:39:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:39:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20113] csw/mgar/gar/v2/lib/python/package_stats.py Message-ID: Revision: 20113 http://gar.svn.sourceforge.net/gar/?rev=20113&view=rev Author: wahwah Date: 2013-01-13 17:39:17 +0000 (Sun, 13 Jan 2013) Log Message: ----------- pkgdb: Small logging improvements Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-13 17:38:48 UTC (rev 20112) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-01-13 17:39:17 UTC (rev 20113) @@ -185,7 +185,7 @@ """ dir_pkg = self.GetInspectivePkg() - logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname)) + logging.debug("Collecting %r (%r) package statistics.", dir_pkg, dir_pkg.pkgname) override_dicts = self.GetOverrides() basic_stats = self.GetBasicStats() # This would be better inferred from pkginfo, and not from the filename, but @@ -248,7 +248,8 @@ except sqlobject.main.SQLObjectNotFound, e: filename_arch = m.Architecture( name=pkg_stats["basic_stats"]["parsed_basename"]["arch"]) - parsed_basename = pkg_stats["basic_stats"]["parsed_basename"] + basename = pkg_stats["basic_stats"]["parsed_basename"] + parsed_basename = basename os_rel_name = parsed_basename["osrel"] try: os_rel = m.OsRelease.select( @@ -286,7 +287,8 @@ logging.debug("Cleaning %s before saving it again", db_pkg_stats) db_pkg_stats.DeleteAllDependentObjects() except sqlobject.main.SQLObjectNotFound, e: - logging.debug("Package %s not present in the db, proceeding with insert.") + logging.debug("Package %s not present in the db, proceeding with insert.", + basename) pass # Creating the object in the database. data_obj = m.Srv4FileStatsBlob( 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 Jan 13 18:39:44 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:39:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20114] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 20114 http://gar.svn.sourceforge.net/gar/?rev=20114&view=rev Author: wahwah Date: 2013-01-13 17:39:44 +0000 (Sun, 13 Jan 2013) Log Message: ----------- pkgdb: we can only run ldd if the platform matches Since we're running ldd as part of package metadata collection, we cannot collect sparc metadata in intel and vice versa. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-13 17:39:17 UTC (rev 20113) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2013-01-13 17:39:44 UTC (rev 20114) @@ -333,6 +333,12 @@ logging.info(" OS release: %s", repr(osrel)) sqo_osrel = m.OsRelease.selectBy(short_name=osrel).getOne() for arch in common_constants.PHYSICAL_ARCHITECTURES: + if current_host_arch != arch: + logging.warning( + "Cannot process packages for achitecture %r " + "because we're currently running on architecture %r.", + arch, current_host_arch) + continue logging.info(" Architecture: %s", repr(arch)) sqo_arch = m.Architecture.selectBy(name=arch).getOne() catalog_file = self.ComposeCatalogFilePath(base_dir, osrel, arch) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 13 18:40:13 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 17:40:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[20115] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 20115 http://gar.svn.sourceforge.net/gar/?rev=20115&view=rev Author: wahwah Date: 2013-01-13 17:40:12 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Fix for exception raising for mime Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2013-01-13 17:39:44 UTC (rev 20114) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2013-01-13 17:40:12 UTC (rev 20115) @@ -6,7 +6,12 @@ import os.path import common_constants +class Error(Exception): + """Generic error.""" +class DataError(Error): + """There's a problem with data.""" + # TODO: Merge with common_constants SPARCV8_PATHS = ( 'sparcv8', @@ -234,7 +239,7 @@ if not file_info["mime_type"]: # This should never happen, but it seems to have happened at least once. # TODO: Find the affected data and figure out why. - raise PackageError("file_info is missing mime_type:" % file_info) + raise DataError("file_info is missing mime_type:" % file_info) for mimetype in BIN_MIMETYPES: if mimetype in file_info["mime_type"]: is_a_binary = True 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 Jan 13 19:09:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 18:09:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[20116] csw/mgar/pkg/libicu48/tags/SR3-6627678431/ Message-ID: Revision: 20116 http://gar.svn.sourceforge.net/gar/?rev=20116&view=rev Author: wahwah Date: 2013-01-13 18:09:41 +0000 (Sun, 13 Jan 2013) Log Message: ----------- libicu48/tags/SR3-6627678431: remove externals Property Changed: ---------------- csw/mgar/pkg/libicu48/tags/SR3-6627678431/ Property changes on: csw/mgar/pkg/libicu48/tags/SR3-6627678431 ___________________________________________________________________ Deleted: svn:externals - 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 Jan 13 19:11:32 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 18:11:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[20117] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20117 http://gar.svn.sourceforge.net/gar/?rev=20117&view=rev Author: wahwah Date: 2013-01-13 18:11:31 +0000 (Sun, 13 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: take flags from CFLAGS; LDFLAGS tried, but does not work. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-13 18:09:41 UTC (rev 20116) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-13 18:11:31 UTC (rev 20117) @@ -58,8 +58,9 @@ # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev # EXTRA_LINKER_FLAGS += $(libdir)/ffi -# BASECFLAGS = $(CFLAGS) -BASECFLAGS = -g -O2 +# LDFLAGS += -L$(libdir)/ffi + +BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS EXTRA_LINKER_FLAGS = -lsocket -lresolv -lrt 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 Jan 13 20:49:40 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 13 Jan 2013 19:49:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[20118] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 20118 http://gar.svn.sourceforge.net/gar/?rev=20118&view=rev Author: chninkel Date: 2013-01-13 19:49:39 +0000 (Sun, 13 Jan 2013) Log Message: ----------- gar/v2: doesn't check direct binding on soname which were not really used Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-13 18:11:31 UTC (rev 20117) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-01-13 19:49:39 UTC (rev 20118) @@ -171,10 +171,12 @@ pkgname, messenger) orphan_sonames.extend(orphan_sonames_tmp) + sonames_unused = set() 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): + sonames_unused.add(ldd_response['soname']) messenger.Message( "Binary %s links to library %s but doesn't seem to use any" " of its symbols. It usually happens because superfluous" @@ -211,6 +213,11 @@ db_libs.add(syminfo['soname']) no_db_libs = libs.difference(db_libs) + # no symbol used means no way to detect if direct binding was + # enabled so we must ignore the libraries which were linked + # without being used + no_db_libs.difference_update(sonames_unused) + if no_db_libs: messenger.Message( "No symbol of binary %s is directly bound against the following" 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 Jan 13 21:21:34 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 20:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[20119] csw/mgar/pkg/leveldb/trunk/Makefile Message-ID: Revision: 20119 http://gar.svn.sourceforge.net/gar/?rev=20119&view=rev Author: wahwah Date: 2013-01-13 20:21:34 +0000 (Sun, 13 Jan 2013) Log Message: ----------- leveldb/trunk: version update to 1.9, package split Modified Paths: -------------- csw/mgar/pkg/leveldb/trunk/Makefile Modified: csw/mgar/pkg/leveldb/trunk/Makefile =================================================================== --- csw/mgar/pkg/leveldb/trunk/Makefile 2013-01-13 19:49:39 UTC (rev 20118) +++ csw/mgar/pkg/leveldb/trunk/Makefile 2013-01-13 20:21:34 UTC (rev 20119) @@ -16,6 +16,9 @@ UPSTREAM_MASTER_SITES = http://code.google.com/p/leveldb/downloads/list +# AtomicPointer implementation is lacking for SPARC +PACKAGING_PLATFORMS = solaris10-i386 + PATCHFILES += 0001-Set-Solaris-linker-flags-for-v1.9.patch CONFIGURE_ARGS = $(DIRPATHS) @@ -29,15 +32,26 @@ CONFIGURE_SCRIPTS = INSTALL_SCRIPTS = custom +PACKAGES += CSWlibleveldb1-gxx +PKGFILES_CSWlibleveldb1-gxx += $(call baseisadirs,$(libdir),libleveldb\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibleveldb1-gxx += $(DESCRIPTION), libleveldb.so.1 +RUNTIME_DEP_PKGS_CSWlibleveldb1-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibleveldb1-gxx += CSWlibstdc++6 + +PACKAGES += CSWlibleveldb1-gxx-dev +RUNTIME_DEP_PKGS_CSWleveldb-gxx-dev += CSWlibleveldb1-gxx +SPKG_DESC_CSWlibleveldb1-gxx-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWlibleveldb1-gxx-dev += CSWlibleveldb1-gxx + include gar/category.mk install-custom: ginstall -d -m 755 $(DESTDIR)$(libdir) - for f in $(WORKSRC)/libleveldb.*; do \ - gcp -v $${f} $(DESTDIR)$(libdir); \ - done + rsync -rvl $(WORKSRC)/libleveldb.* $(DESTDIR)$(libdir) ginstall -d -m 755 $(DESTDIR)$(includedir) - rsync -rv $(WORKSRC)/include/ $(DESTDIR)$(includedir) + rsync -rvl $(WORKSRC)/include/ $(DESTDIR)$(includedir) + ginstall -d -m 755 $(DESTDIR)$(docdir) + rsync -rvl $(WORKSRC)/doc/ $(DESTDIR)$(docdir) @$(MAKECOOKIE) PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 13 21:35:04 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 20:35:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[20120] csw/mgar/gar/v2/lib/python Message-ID: Revision: 20120 http://gar.svn.sourceforge.net/gar/?rev=20120&view=rev Author: wahwah Date: 2013-01-13 20:35:03 +0000 (Sun, 13 Jan 2013) Log Message: ----------- checkpkg: Import fixes for unit tests Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/system_pkgmap.py csw/mgar/gar/v2/lib/python/system_pkgmap_test.py Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-13 20:21:34 UTC (rev 20119) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-01-13 20:35:03 UTC (rev 20120) @@ -3,6 +3,7 @@ import unittest2 as unittest import inspective_package import package +import shell import mox import hachoir_parser import magic @@ -139,11 +140,11 @@ self.mox.StubOutWithMock(ip, 'ListBinaries') ip.ListBinaries().AndReturn([fake_binary]) - self.mox.StubOutWithMock(inspective_package, 'ShellCommand') + self.mox.StubOutWithMock(shell, '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, "")) + shell.ShellCommand(args).AndReturn((0, fake_elfdump_output, "")) self.mox.ReplayAll() self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) @@ -155,8 +156,8 @@ self.mox.StubOutWithMock(os, 'uname') os.chmod('/tmp/CSWfake/root/bin/foo', 0755) ip.ListBinaries().AndReturn(['bin/foo']) - self.mox.StubOutWithMock(inspective_package, 'ShellCommand') - inspective_package.ShellCommand( + self.mox.StubOutWithMock(shell, 'ShellCommand') + shell.ShellCommand( ['ldd', '-Ur', '/tmp/CSWfake/root/bin/foo'], timeout=10).AndReturn((0, "", "")) self.mox.StubOutWithMock(ip, '_ParseLddDashRline') @@ -171,8 +172,8 @@ os.chmod('/tmp/CSWfake/root/bin/foo', 0755) os.uname().AndReturn('i86pc') ip.ListBinaries().AndReturn(['bin/foo']) - self.mox.StubOutWithMock(inspective_package, 'ShellCommand') - inspective_package.ShellCommand( + self.mox.StubOutWithMock(shell, 'ShellCommand') + shell.ShellCommand( ['ldd', '-Ur', '/tmp/CSWfake/root/bin/foo'], timeout=10).AndReturn((1, "", "boo")) self.mox.StubOutWithMock(ip, '_ParseLddDashRline') Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-01-13 20:21:34 UTC (rev 20119) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2013-01-13 20:35:03 UTC (rev 20120) @@ -17,6 +17,7 @@ import os.path import mute_progressbar import checkpkg_lib +import shell import sys CONTENT_PKG_RE = r"^\*?(CSW|SUNW)[0-9a-zA-Z\-]?[0-9a-z\-]+$" Modified: csw/mgar/gar/v2/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2013-01-13 20:21:34 UTC (rev 20119) +++ csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2013-01-13 20:35:03 UTC (rev 20120) @@ -1,6 +1,7 @@ #!/usr/bin/env python2.6 import unittest2 as unittest +import shell import system_pkgmap import test_base import models 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 Jan 13 21:38:43 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 20:38:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[20121] csw/mgar/pkg/lang-python/python/branches/python-3.3 Message-ID: Revision: 20121 http://gar.svn.sourceforge.net/gar/?rev=20121&view=rev Author: wahwah Date: 2013-01-13 20:38:43 +0000 (Sun, 13 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: restore some changes from setup.diff Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-13 20:35:03 UTC (rev 20120) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-13 20:38:43 UTC (rev 20121) @@ -40,6 +40,8 @@ PATCHFILES += modules.diff PATCHFILES += multiprocess.diff PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch +PATCHFILES += 0005-Use-opt-csw-lib-for-module-search.patch +PATCHFILES += 0007-Settings-for-Solaris.patch # The test for sunaudiodev fails. Not that it's a good practice to skip # tests. Added: csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0005-Use-opt-csw-lib-for-module-search.patch 2013-01-13 20:38:43 UTC (rev 20121) @@ -0,0 +1,25 @@ +From c133e1a6a5d984f1b010470f5f6fbc3ea53d7ac1 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 13 Jan 2013 20:59:47 +0100 +Subject: [PATCH] Use /opt/csw/lib for module search + +--- + setup.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/setup.py b/setup.py +index 9ddf2e9..e7e262b 100644 +--- a/setup.py ++++ b/setup.py +@@ -459,6 +459,8 @@ class PyBuildExt(build_ext): + # directories (i.e. '.' and 'Include') must be first. See issue + # 10520. + if not cross_compiling: ++ add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') ++ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + # only change this for cross builds for 3.3, issues on Mageia +-- +1.8.0 + Added: csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch 2013-01-13 20:38:43 UTC (rev 20121) @@ -0,0 +1,31 @@ +From 14a318b3e2fb0ccb3792e65ef4f0b361384ddaea Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 13 Jan 2013 21:24:23 +0100 +Subject: [PATCH 7/7] Settings for Solaris + +--- + setup.py | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/setup.py b/setup.py +index e7e262b..62f72cd 100644 +--- a/setup.py ++++ b/setup.py +@@ -1478,6 +1478,14 @@ class PyBuildExt(build_ext): + macros = dict() + libraries = [] + ++ elif platform == 'sunos5': # Solaris ++ macros = dict( ++ HAVE_SEM_OPEN=0, # Not Implemented ++ HAVE_SEM_TIMEDWAIT=0, # Not Implemented ++ HAVE_FD_TRANSFER=1, ++ ) ++ libraries = ['rt'] ++ + else: # Linux and other unices + macros = dict() + libraries = ['rt'] +-- +1.8.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 13 21:44:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 20:44:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20122] csw/mgar/pkg/libffi/trunk/Makefile Message-ID: Revision: 20122 http://gar.svn.sourceforge.net/gar/?rev=20122&view=rev Author: wahwah Date: 2013-01-13 20:44:56 +0000 (Sun, 13 Jan 2013) Log Message: ----------- libffi/trunk: Style changes Modified Paths: -------------- csw/mgar/pkg/libffi/trunk/Makefile Modified: csw/mgar/pkg/libffi/trunk/Makefile =================================================================== --- csw/mgar/pkg/libffi/trunk/Makefile 2013-01-13 20:38:43 UTC (rev 20121) +++ csw/mgar/pkg/libffi/trunk/Makefile 2013-01-13 20:44:56 UTC (rev 20122) @@ -6,13 +6,13 @@ DESCRIPTION = A portable foreign function interface library define BLURB - FFI stands for Foreign Function Interface. A foreign function - interface is the popular name for the interface that allows code - written in one language to call code written in another language. - The libffi library really only provides the lowest, machine - dependent layer of a fully featured foreign function interface. - A layer must exist above libffi that handles type conversions for - values passed between the two languages. + FFI stands for Foreign Function Interface. A foreign function + interface is the popular name for the interface that allows code + written in one language to call code written in another language. + The libffi library really only provides the lowest, machine + dependent layer of a fully featured foreign function interface. + A layer must exist above libffi that handles type conversions for + values passed between the two languages. endef MASTER_SITES = ftp://sourceware.org/pub/libffi/ @@ -34,29 +34,24 @@ OBSOLETED_BY_CSWlibffi5-dev = CSWlibffi INCOMPATIBLE_PKGS_CSWlibffi5 = CSWlibffi +PACKAGES += CSWlibffi5 +PKGFILES_CSWlibffi5 += $(call baseisadirs,$(libdir),libffi\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibffi5 += $(DESCRIPTION), libffi.so.5 + PACKAGES += CSWlibffi-dev -CATALOGNAME_CSWlibffi-dev = libffi_dev SPKG_DESC_CSWlibffi-dev = $(DESCRIPTION) - developer package RUNTIME_DEP_PKGS_CSWlibffi-dev += CSWlibffi5 -PKGFILES_CSWlibffi-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibffi-dev += $(libdir)/(.*/)?ffi/libffi\.so -PKGFILES_CSWlibffi-dev += $(libdir)/.*/include/.* -PKGFILES_CSWlibffi-dev += $(datadir)/.* -PACKAGES += CSWlibffi5 -SPKG_DESC_CSWlibffi5 = $(DESCRIPTION) - libffi.so.5 -PKGFILES_CSWlibffi5 += .*/libffi\.so\.5.* - LICENSE = LICENSE BUILD64_LIBS_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) -# Tests fail since they are written for gcc only +# Tests fail since they are written for gcc only # But they also fails on 64-bit even when using gcc #TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 13 23:57:51 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 22:57:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20123] csw/mgar/pkg/lang-python/python/branches/python-3.3 /files/0007-Settings-for-Solaris.patch Message-ID: Revision: 20123 http://gar.svn.sourceforge.net/gar/?rev=20123&view=rev Author: wahwah Date: 2013-01-13 22:57:50 +0000 (Sun, 13 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: correct a variable name Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch 2013-01-13 20:44:56 UTC (rev 20122) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/files/0007-Settings-for-Solaris.patch 2013-01-13 22:57:50 UTC (rev 20123) @@ -15,7 +15,7 @@ macros = dict() libraries = [] -+ elif platform == 'sunos5': # Solaris ++ elif host_platform == 'sunos5': # Solaris + macros = dict( + HAVE_SEM_OPEN=0, # Not Implemented + HAVE_SEM_TIMEDWAIT=0, # Not Implemented This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 14 00:47:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Jan 2013 23:47:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[20124] csw/mgar/gar/v2/upload-application/ Message-ID: Revision: 20124 http://gar.svn.sourceforge.net/gar/?rev=20124&view=rev Author: wahwah Date: 2013-01-13 23:47:35 +0000 (Sun, 13 Jan 2013) Log Message: ----------- GAR v2: Remove an unused directory Removed Paths: ------------- csw/mgar/gar/v2/upload-application/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jan 14 13:57:31 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 14 Jan 2013 12:57:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[20125] csw/mgar/pkg/guile/branches/2.0.7 Message-ID: Revision: 20125 http://gar.svn.sourceforge.net/gar/?rev=20125&view=rev Author: pfelecan Date: 2013-01-14 12:57:31 +0000 (Mon, 14 Jan 2013) Log Message: ----------- texlive/trunk: packaging without old shared objects Modified Paths: -------------- csw/mgar/pkg/guile/branches/2.0.7/Makefile csw/mgar/pkg/guile/branches/2.0.7/checksums Modified: csw/mgar/pkg/guile/branches/2.0.7/Makefile =================================================================== --- csw/mgar/pkg/guile/branches/2.0.7/Makefile 2013-01-13 23:47:35 UTC (rev 20124) +++ csw/mgar/pkg/guile/branches/2.0.7/Makefile 2013-01-14 12:57:31 UTC (rev 20125) @@ -1,39 +1,110 @@ -# 2009-11-15: The package builds successfully with GCC (not with sun cc). -# The version in the catalog (1.6.7,REV=2005.07.03) includes the .a -# and .la files only, this package include the .so files only. I'm -# not quite sure what's the correct approach here. -# The existing Makefile included the libraries under files/ -# - Trygve - NAME = guile -VERSION = 1.8.7 +VERSION = 2.0.7 GARTYPE = v2 DESCRIPTION = GNU extensibility library define BLURB - Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs. + Guile is a library designed to help programmers create flexible + applications. Using Guile in an application allows programmers to + write plug-ins, or modules (there are many names, but the concept + is essentially the same) and users to use them to have an + application fit their needs. endef -SPKG_DESC_CSWguilelib12 = GNU extensibility library (shared libraries) +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.xz +PREVLIBSAR = guilelib12-$(GARCH)-libs-1.6.7.tar.gz +DISTFILES += $(PREVLIBSAR) -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWlibgmp -RUNTIME_DEP_PKGS += CSWlibtoolrt -RUNTIME_DEP_PKGS += CSWncurses -RUNTIME_DEP_PKGS += CSWreadline +GARCOMPILER = GNU -MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +CONFIGURE_ARGS = $(DIRPATHS) +#CONFIGURE_ARGS += --disable-silent-rules +#GARFLAVOR = DBG -GARCOMPILER = GNU +# runtime dependencies as explicited in the project's README file: +BUILD_DEP_PKGS += CSWlibgmp-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibunistring-dev +BUILD_DEP_PKGS += CSWlibgc-dev +BUILD_DEP_PKGS += CSWlibffi-dev +BUILD_DEP_PKGS += CSWlibreadline-dev -BUILD64_LIBS_ONLY = 1 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-error-on-warning=no +TEST_SCRIPTS = custom -TEST_SCRIPTS = +PACKAGES += CSWguile +CATALOGNAME_CSWguile = guile +SPKG_DESC_CSWguile += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWguile += CSWlibguile2-0-22 +CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-4 +CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-5 +CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-1 +CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/share/info/guile.info-4 +CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/share/info/guile.info-1 +PACKAGES += CSWlibguile2-0-22 +CATALOGNAME_CSWlibguile2-0-22 = libguile2_0_22 +OBSOLETED_BY_CSWlibguile2-0-22 = CSWguilelib12 +CATALOGNAME_CSWguilelib12 = guilelib12_stub +PKGFILES_CSWlibguile2-0-22 += $(call baseisadirs,$(libdir),libguile-2\.0\.so\.22\.6\.0) +PKGFILES_CSWlibguile2-0-22 += $(call baseisadirs,$(libdir),libguile-2\.0\.so\.22(\.\d+)*) +SPKG_DESC_CSWlibguile2-0-22 += $(DESCRIPTION), libguile-2.0.so.22 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibgc1 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibunistring0 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibffi4 + +PACKAGES += CSWlibguilereadline-v18-18 +CATALOGNAME_CSWlibguilereadline-v18-18 = libguilereadline_v18_18 +OBSOLETED_BY_CSWlibguilereadline-v18-18 = CSWguilelib12 +PKGFILES_CSWlibguilereadline-v18-18 += $(call baseisadirs,$(libdir),libguilereadline-v-18\.so\.18\.0\.0) +PKGFILES_CSWlibguilereadline-v18-18 += $(call baseisadirs,$(libdir),libguilereadline-v-18\.so\.18(\.\d+)*) +SPKG_DESC_CSWlibguilereadline-v18-18 += $(DESCRIPTION), libguilereadline-v-18.so.18 +RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18 += CSWlibguile2-0-22 +RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18 += CSWlibunistring0 +RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18 += CSWlibgcc-s1 + +PACKAGES += CSWguile-dev +CATALOGNAME_CSWguile-dev = guile_dev +SPKG_DESC_CSWguile-dev += $(DESCRIPTION), development files +PKGFILES_CSWguile-dev += /opt/csw/lib/libguile-2.0.so +PKGFILES_CSWguile-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWguile-dev += CSWguile +RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguilereadline-v18-18 +RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguile2-0-22 + +REINPLACE_WHEN_USRLOCAL = postinstall +REINPLACE_USRLOCAL += /opt/csw/share/guile/2.0/guile-procedures.txt + +REINPLACE_WHEN_USRSHARE = postinstall +REINPLACE_USRSHARE += /opt/csw/share/guile/2.0/guile-procedures.txt + +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/lib/charset.alias + include gar/category.mk + +PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH) + +# there are failing tests: +# test-with-guile-module: needs more exploration, especially libgc debug +# test-scm-spawn-thread: needs more exploration, especially libgc debug +# test-pthread-create: needs more exploration, especially libgc debug +# check-guile: this fails also on Debian) +# and I choose to ignore them as the remaining ones pass. +test-custom: + cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -i -k -C $(OBJDIR) check + $(MAKECOOKIE) + +# post-install-modulated: +# ginstall $(WORKDIR)/libguile*.so* $(DESTDIR)$(libdir) +# $(MAKECOOKIE) Modified: csw/mgar/pkg/guile/branches/2.0.7/checksums =================================================================== --- csw/mgar/pkg/guile/branches/2.0.7/checksums 2013-01-13 23:47:35 UTC (rev 20124) +++ csw/mgar/pkg/guile/branches/2.0.7/checksums 2013-01-14 12:57:31 UTC (rev 20125) @@ -1 +1 @@ -991b5b3efcbbc3f7507d05bc42f80a5e guile-1.8.7.tar.gz +30ff9e94663a2e2098b52f8ce9d050b9 guile-2.0.7.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 14 14:08:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Jan 2013 13:08:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[20126] csw/mgar/pkg/websvn/trunk Message-ID: Revision: 20126 http://gar.svn.sourceforge.net/gar/?rev=20126&view=rev Author: dmichelsen Date: 2013-01-14 13:08:32 +0000 (Mon, 14 Jan 2013) Log Message: ----------- websvn/trunk: Update to 2.3.3 Modified Paths: -------------- csw/mgar/pkg/websvn/trunk/Makefile csw/mgar/pkg/websvn/trunk/checksums Added Paths: ----------- csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch Removed Paths: ------------- csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch Modified: csw/mgar/pkg/websvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/websvn/trunk/Makefile 2013-01-14 12:57:31 UTC (rev 20125) +++ csw/mgar/pkg/websvn/trunk/Makefile 2013-01-14 13:08:32 UTC (rev 20126) @@ -1,5 +1,5 @@ NAME = websvn -VERSION = 2.2.1 +VERSION = 2.3.3 GARTYPE = v2 DESCRIPTION = PHP based web interface of Subversion repositories @@ -12,16 +12,32 @@ a particular revision. endef -MASTER_SITES = http://websvn.tigris.org/files/documents/1380/45918/ -DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = websvn-csw-config.patch +MASTER_SITES += http://websvn.tigris.org/files/documents/1380/49056/ +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += 0001-Use-CSW-tools.patch -SPKG_SOURCEURL = http://websvn.tigris.org/ +VENDOR_URL = http://websvn.tigris.org/ LICENSE = license.txt -RUNTIME_DEP_PKGS = CSWapache2 CSWdiffutils CSWsvn CSWenscript CSWgsed CSWgtar CSWgzip +RUNTIME_DEP_PKGS += CSWapache2 +RUNTIME_DEP_PKGS += CSWdiffutils +RUNTIME_DEP_PKGS += CSWsvn +RUNTIME_DEP_PKGS += CSWenscript +RUNTIME_DEP_PKGS += CSWgsed +RUNTIME_DEP_PKGS += CSWgtar +RUNTIME_DEP_PKGS += CSWgzip +RUNTIME_DEP_PKGS += CSWzip +# Checkpkg can not check any of these +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWdiffutils +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWsvn +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWenscript +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWgsed +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWgtar +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWgzip +CHECKPKG_OVERRIDES_CSWwebsvn += surplus-dependency|CSWzip + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -41,6 +57,7 @@ @ginstall -d $(DESTDIR)$(sharedstatedir)/www/websvn @cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/websvn/htdocs @find $(DESTDIR)$(prefix) -name .svn -exec rm -rf \{\} \; + @find $(DESTDIR)$(prefix) -name .git -exec rm -rf \{\} \; @rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn @ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs @ln -s $(sharedstatedir)/www/websvn/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn Modified: csw/mgar/pkg/websvn/trunk/checksums =================================================================== --- csw/mgar/pkg/websvn/trunk/checksums 2013-01-14 12:57:31 UTC (rev 20125) +++ csw/mgar/pkg/websvn/trunk/checksums 2013-01-14 13:08:32 UTC (rev 20126) @@ -1,2 +1 @@ -f7eb3d57840aa3d1917bb0c645794601 websvn-2.2.1.tar.gz -c9e2b0372fe02393c2376c0ea707c522 websvn-csw-config.patch +bc1821caf77a3225aa810e8f19400ea6 websvn-2.3.3.tar.gz Added: csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch =================================================================== --- csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch (rev 0) +++ csw/mgar/pkg/websvn/trunk/files/0001-Use-CSW-tools.patch 2013-01-14 13:08:32 UTC (rev 20126) @@ -0,0 +1,52 @@ +From fb48c17024edd5db6ed5181e772724121703815e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 14 Jan 2013 14:04:54 +0100 +Subject: [PATCH] Use CSW tools + +--- + include/distconfig.php | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/distconfig.php b/include/distconfig.php +index bf4e95a..bf34be0 100644 +--- a/include/distconfig.php ++++ b/include/distconfig.php +@@ -33,20 +33,27 @@ + // Configure these lines if your commands aren't on your path. + // + // $config->setSVNCommandPath('Path/to/svn/command/'); // e.g. c:\\program files\\subversion\\bin ++$config->setSVNCommandPath('/opt/csw/bin'); // e.g. c:\\program files\\subversion\\bin + // $config->setDiffPath('Path/to/diff/command/'); ++$config->setDiffPath('/opt/csw/gnu'); + + // For syntax colouring, if option enabled... + // $config->setEnscriptPath('Path/to/enscript/command/'); ++$config->setEnscriptPath('/opt/csw/bin'); + // $config->setSedPath('Path/to/sed/command/'); ++$config->setSedPath('/opt/csw/gnu'); + + // For delivered tarballs, if option enabled... + // $config->setTarPath('Path/to/tar/command/'); ++$config->setTarPath('/opt/csw/gnu'); + + // For delivered GZIP'd files and tarballs, if option enabled... + // $config->setGZipPath('Path/to/gzip/command/'); ++$config->setGZipPath('/opt/csw/bin'); + + // download folder/file zipped ... + // $config->setZipPath('Path/to/zip/command/'); ++$config->setZipPath('/opt/csw/bin'); + + // Uncomment this line to trust server certificates + // This may useful if you use self-signed certificates and have no chance to accept the certificate once via cli +@@ -363,6 +370,7 @@ $config->setMinDownloadLevel(2); + // If you have version 1.6.3 or newer use the following line. + // + // $config->useEnscript(); ++$config->useEnscript(); + // + // If you have version 1.6.2 or older use the following line. + // +-- +1.8.0 + Deleted: csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch =================================================================== --- csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch 2013-01-14 12:57:31 UTC (rev 20125) +++ csw/mgar/pkg/websvn/trunk/files/websvn-csw-config.patch 2013-01-14 13:08:32 UTC (rev 20126) @@ -1,43 +0,0 @@ -diff -Naur 2.0-orig/include/distconfig.php 2.0-patched/include/distconfig.php ---- 2.0-orig/include/distconfig.php 2007-11-07 10:52:53.790976000 +0100 -+++ 2.0-patched/include/distconfig.php 2007-11-07 10:58:37.414630000 +0100 -@@ -33,17 +33,23 @@ - // Configure these lines if your commands aren't on your path. - // - // $config->setSVNCommandPath('Path/to/svn and svnlook/ e.g. c:\\program files\\subversion\\bin'); -+$config->setSVNCommandPath('/opt/csw/bin'); - // $config->setDiffPath('Path/to/diff/command/'); -+$config->setPath($config->diff, '/opt/csw/bin', "gdiff"); - - // For syntax colouring, if option enabled... - // $config->setEnscriptPath('Path/to/enscript/command/'); -+$config->setEnscriptPath('/opt/csw/bin'); - // $config->setSedPath('Path/to/sed/command/'); -+$config->setPath($config->sed, '/opt/csw/bin', "gsed"); - - // For delivered tarballs, if option enabled... - // $config->setTarPath('Path/to/tar/command/'); -+$config->setPath($config->tar, '/opt/csw/bin', "gtar"); - - // For delivered GZIP'd files and tarballs, if option enabled... - // $config->setGZipPath('Path/to/gzip/command/'); -+$config->setGZipPath('/opt/csw/bin'); - - // }}} - -@@ -230,6 +236,7 @@ - // repositories. - // - // $config->allowDownload(); -+$config->allowDownload(); - // - // To change the global option for individual repositories, uncomment and replicate - // the required line below (replacing 'myrep' for the name of the repository to be changed). -@@ -285,6 +292,7 @@ - // Set the path above. - // - // $config->useEnscript(); -+$config->useEnscript(); - - // Enscript need to be told what the contents of a file are so that it can be colourised - // correctly. WebSVN includes a predefined list of mappings from file extension to Enscript This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jan 14 14:08:51 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 14 Jan 2013 13:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[20127] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 20127 http://gar.svn.sourceforge.net/gar/?rev=20127&view=rev Author: guengel Date: 2013-01-14 13:08:50 +0000 (Mon, 14 Jan 2013) Log Message: ----------- libcairo/trunk: Updated runtime dependencies. Use SOS12U3 to compile. Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2013-01-14 13:08:32 UTC (rev 20126) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2013-01-14 13:08:50 UTC (rev 20127) @@ -1,6 +1,7 @@ NAME = cairo VERSION = 1.10.2 GARTYPE = v2 +GARCOMPILER = SOS12U3 DESCRIPTION = The Cairo 2D Graphics Library define BLURB @@ -17,41 +18,34 @@ # https://bugs.freedesktop.org/show_bug.cgi?id=37916 PATCHFILES += 0001-Use-detected-EGREP-instead-of-generic-grep.patch +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PACKAGES += CSWlibcairo2 SPKG_DESC_CSWlibcairo2 = The Cairo 2D Graphics Library, libcairo.so.2 PKGFILES_CSWlibcairo2 = $(call pkgfiles_lib,libcairo.so.2) -RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWpng RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWfconfig RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibfontconfig1 OBSOLETED_BY_CSWlibcairo2 = CSWlibcairo PACKAGES += CSWlibcairo-script-interpreter2 SPKG_DESC_CSWlibcairo-script-interpreter2 = The Cairo 2D Graphics Library, libcairo-script-interpreter.so.2 PKGFILES_CSWlibcairo-script-interpreter2 = $(call pkgfiles_lib,libcairo-script-interpreter.so.2) -RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWpng -RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibxrender RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibz1 OBSOLETED_BY_CSWlibcairo-script-interpreter2 = CSWlibcairo PACKAGES += CSWlibcairo-gobject2 SPKG_DESC_CSWlibcairo-gobject2 = The Cairo 2D Graphics Library, libcairo-gobject.so.2 PKGFILES_CSWlibcairo-gobject2 = $(call pkgfiles_lib,libcairo-gobject.so.2) -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWpng -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibxrender RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibgobject2-0-0 OBSOLETED_BY_CSWlibcairo-gobject2 = CSWlibcairo PACKAGES += CSWlibcairo-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 14 14:20:17 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Jan 2013 13:20:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[20128] csw/mgar/pkg/sox/trunk Message-ID: Revision: 20128 http://gar.svn.sourceforge.net/gar/?rev=20128&view=rev Author: dmichelsen Date: 2013-01-14 13:20:17 +0000 (Mon, 14 Jan 2013) Log Message: ----------- sox/trunk: Update to 14.4.0 Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile csw/mgar/pkg/sox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2013-01-14 13:08:50 UTC (rev 20127) +++ csw/mgar/pkg/sox/trunk/Makefile 2013-01-14 13:20:17 UTC (rev 20128) @@ -1,5 +1,5 @@ NAME = sox -VERSION = 14.3.2 +VERSION = 14.4.0 GARTYPE = v2 DESCRIPTION = Swiss Army Knife of sound processing utilities @@ -10,67 +10,59 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.bz2 # There is a hack in there to rewind pipes when detecting file formats. # As the FILE struct is opaque in 64 bit we must disable this for 64 bit. # But as we only need the library in 64 bit anyway this shouldn't hurt. PATCHFILES = 0001-Disable-stdio-hack-to-rewind-pipes.patch -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-Fix-SunStudio-version-string.patch VENDOR_URL = http://sox.sourceforge.net/ PACKAGES += CSWsox CATALOGNAME_CSWsox = sox SPKG_DESC_CSWsox = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWsox += CSWlibsox1 -RUNTIME_DEP_PKGS_CSWsox += CSWvorbis -RUNTIME_DEP_PKGS_CSWsox += CSWlibogg -RUNTIME_DEP_PKGS_CSWsox += CSWlibmad -RUNTIME_DEP_PKGS_CSWsox += CSWlibid3tag -RUNTIME_DEP_PKGS_CSWsox += CSWflac -RUNTIME_DEP_PKGS_CSWsox += CSWlibao -RUNTIME_DEP_PKGS_CSWsox += CSWlibsndfile -RUNTIME_DEP_PKGS_CSWsox += CSWpng -RUNTIME_DEP_PKGS_CSWsox += CSWwavpack -RUNTIME_DEP_PKGS_CSWsox += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWsox += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWsox += CSWzlib +RUNTIME_DEP_PKGS_CSWsox += CSWlibsox2 -PACKAGES += CSWlibsox1 -CATALOGNAME_CSWlibsox1 = libsox1 -SPKG_DESC_CSWlibsox1 = SOX Library for Audio Processing -PKGFILES_CSWlibsox1 += $(PKGFILES_RT) -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWvorbis -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibogg -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmad -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibid3tag -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWflac -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibao -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibsndfile -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWpng -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWwavpack -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmagic1 -RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmp3lame0 +PACKAGES += CSWlibsox2 +CATALOGNAME_CSWlibsox2 = libsox2 +SPKG_DESC_CSWlibsox2 = SOX Library for audio processing, libsox.so.2 +PKGFILES_CSWlibsox2 += $(call pkgfiles_lib,libsox.so.2) +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibvorbisfile3 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibao4 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibwavpack1 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibgomp1 +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibsndfile +RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibid3tag PACKAGES += CSWlibsox-dev CATALOGNAME_CSWlibsox-dev = libsox_dev -SPKG_DESC_CSWlibsox-dev = SOX Library Development Files +SPKG_DESC_CSWlibsox-dev = SOX library development files, libsox.so.2 PKGFILES_CSWlibsox-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox1 +RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox2 OBSOLETED_BY_CSWlibsox-dev = CSWlibsoxdevel -CATALOGNAME_CSWlibsoxdevel = libsox_devel +CATALOGNAME_CSWlibsoxdevel = libsox_devel_stub BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWsox) BUILD_DEP_PKGS += CSWlibmagic-dev -BUILD_DEP_PKGS += CSWlame-devel +BUILD_DEP_PKGS += CSWlibmp3lame-dev CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-libltdl -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 include gar/category.mk Modified: csw/mgar/pkg/sox/trunk/checksums =================================================================== --- csw/mgar/pkg/sox/trunk/checksums 2013-01-14 13:08:50 UTC (rev 20127) +++ csw/mgar/pkg/sox/trunk/checksums 2013-01-14 13:20:17 UTC (rev 20128) @@ -1 +1 @@ -e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz +813807c6d6fcd4b0af5c995e61f46687 sox-14.4.0.tar.bz2 Added: csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch =================================================================== --- csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch (rev 0) +++ csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch 2013-01-14 13:20:17 UTC (rev 20128) @@ -0,0 +1,25 @@ +From 88191a5b58b89721fcc9d047320f87945ef9554b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 1 Jan 2013 21:34:22 +0100 +Subject: [PATCH] Fix SunStudio version string + +--- + src/libsox.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libsox.c b/src/libsox.c +index 75354e4..75fcd76 100644 +--- a/src/libsox.c ++++ b/src/libsox.c +@@ -79,7 +79,7 @@ sox_version_info_t const * sox_version_info(void) + #elif defined _MSC_VER + "msvc " STRINGIZE(_MSC_FULL_VER), + #elif defined __SUNPRO_C +- fprintf(file, "sun c " STRINGIZE(__SUNPRO_C), ++ "sun c " STRINGIZE(__SUNPRO_C), + #else + NULL, + #endif +-- +1.8.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 14 14:34:44 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Jan 2013 13:34:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[20129] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 20129 http://gar.svn.sourceforge.net/gar/?rev=20129&view=rev Author: wahwah Date: 2013-01-14 13:34:43 +0000 (Mon, 14 Jan 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Add overrides; libmtmalloc is a system library Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-01-14 13:20:17 UTC (rev 20128) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-01-14 13:34:43 UTC (rev 20129) @@ -144,7 +144,14 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL)) CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 +CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/sparcv9/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 +CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/amd64/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 +# An example: +# s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used +CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused + EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 14 14:36:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Jan 2013 13:36:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[20130] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile Message-ID: Revision: 20130 http://gar.svn.sourceforge.net/gar/?rev=20130&view=rev Author: wahwah Date: 2013-01-14 13:36:55 +0000 (Mon, 14 Jan 2013) Log Message: ----------- lang-python/python/branches/python-3.3: disable the 64-bit build until we have an idea what to do Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-14 13:34:43 UTC (rev 20129) +++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile 2013-01-14 13:36:55 UTC (rev 20130) @@ -48,8 +48,8 @@ SKIPTEST = 1 TEST_TARGET = test -BUILD64_ONLY = 1 -bindir = $(prefix)/bin +# There are problems with platform-dependent data in $(prefix)/lib/python3.3 +# BUILD64 = 1 # ISAEXEC = 1 # There is a file name conflict over libffi.so symlink between libffi package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 14 14:54:25 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Jan 2013 13:54:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[20131] csw/mgar/pkg/sox/trunk/Makefile Message-ID: Revision: 20131 http://gar.svn.sourceforge.net/gar/?rev=20131&view=rev Author: dmichelsen Date: 2013-01-14 13:54:24 +0000 (Mon, 14 Jan 2013) Log Message: ----------- sox/trunk: Update build deps Modified Paths: -------------- csw/mgar/pkg/sox/trunk/Makefile Modified: csw/mgar/pkg/sox/trunk/Makefile =================================================================== --- csw/mgar/pkg/sox/trunk/Makefile 2013-01-14 13:36:55 UTC (rev 20130) +++ csw/mgar/pkg/sox/trunk/Makefile 2013-01-14 13:54:24 UTC (rev 20131) @@ -21,6 +21,19 @@ VENDOR_URL = http://sox.sourceforge.net/ +BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWlibmad-dev +BUILD_DEP_PKGS += CSWlibf