pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby18-base - Security fix for CVE-2006-3694 (JVN...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/297353e22df5
branches:  trunk
changeset: 516874:297353e22df5
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jul 30 23:12:49 2006 +0000

description:
- Security fix for CVE-2006-3694 (JVN#13947696 and JVN#83768862).
- Import yaml problem and fix document generation for ri(1).
- minor clean up to pkgsrc.

Bump PKGREVISION.

diffstat:

 lang/ruby18-base/Makefile         |    15 +-
 lang/ruby18-base/PLIST            |  2795 +++++++++++++++++++++++++++++++++---
 lang/ruby18-base/distinfo         |    12 +-
 lang/ruby18-base/patches/patch-ad |    41 +-
 lang/ruby18-base/patches/patch-cc |     6 +-
 lang/ruby18-base/patches/patch-ck |    34 +
 lang/ruby18-base/patches/patch-cl |    52 +
 lang/ruby18-base/patches/patch-cm |    32 +
 lang/ruby18-base/patches/patch-cn |    21 +
 lang/ruby18-base/patches/patch-co |    52 +
 10 files changed, 2741 insertions(+), 319 deletions(-)

diffs (truncated from 4501 to 300 lines):

diff -r 3b1608707470 -r 297353e22df5 lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Sun Jul 30 20:29:09 2006 +0000
+++ b/lang/ruby18-base/Makefile Sun Jul 30 23:12:49 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2006/03/22 23:05:39 taca Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/30 23:12:49 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
@@ -97,16 +97,9 @@
        ${RM} -f ${WRKSRC}/ext/tcltklib/extconf.rb
        ${RM} -f ${WRKSRC}/ext/tk/extconf.rb
 
-pre-build:
-       @${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
+pre-install:
+       cd ${WRKSRC}; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;
 
-#
-# XXX: Ruby 1.8.3 create extra directories.
-#
-post-build:
-       @cd ${WRKSRC}/.ext; \
-               ${FIND} . -depth -type d -print \
-                       -exec ${RMDIR} {} \; > /dev/null 2>&1; ${TRUE}
 post-install:
        ${STRIP} ${RUBY}
        ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
diff -r 3b1608707470 -r 297353e22df5 lang/ruby18-base/PLIST
--- a/lang/ruby18-base/PLIST    Sun Jul 30 20:29:09 2006 +0000
+++ b/lang/ruby18-base/PLIST    Sun Jul 30 23:12:49 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/01/03 14:37:24 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/07/30 23:12:49 taca Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -20,17 +20,13 @@
 ${RUBY_LIBDIR}/bigdecimal/math.rb
 ${RUBY_LIBDIR}/bigdecimal/newton.rb
 ${RUBY_LIBDIR}/bigdecimal/util.rb
-@dirrm ${RUBY_LIBDIR}/bigdecimal
 ${RUBY_LIBDIR}/cgi/session/pstore.rb
-@dirrm ${RUBY_LIBDIR}/cgi/session
 ${RUBY_LIBDIR}/cgi/session.rb
-@dirrm ${RUBY_LIBDIR}/cgi
 ${RUBY_LIBDIR}/cgi-lib.rb
 ${RUBY_LIBDIR}/cgi.rb
 ${RUBY_LIBDIR}/complex.rb
 ${RUBY_LIBDIR}/csv.rb
 ${RUBY_LIBDIR}/date/format.rb
-@dirrm ${RUBY_LIBDIR}/date
 ${RUBY_LIBDIR}/date.rb
 ${RUBY_LIBDIR}/date2.rb
 ${RUBY_LIBDIR}/debug.rb
@@ -39,7 +35,6 @@
 ${RUBY_LIBDIR}/dl/struct.rb
 ${RUBY_LIBDIR}/dl/types.rb
 ${RUBY_LIBDIR}/dl/win32.rb
-@dirrm ${RUBY_LIBDIR}/dl
 ${RUBY_LIBDIR}/drb/acl.rb
 ${RUBY_LIBDIR}/drb/drb.rb
 ${RUBY_LIBDIR}/drb/eq.rb
@@ -51,7 +46,6 @@
 ${RUBY_LIBDIR}/drb/ssl.rb
 ${RUBY_LIBDIR}/drb/timeridconv.rb
 ${RUBY_LIBDIR}/drb/unix.rb
-@dirrm ${RUBY_LIBDIR}/drb
 ${RUBY_LIBDIR}/drb.rb
 ${RUBY_LIBDIR}/e2mmap.rb
 ${RUBY_LIBDIR}/erb.rb
@@ -75,7 +69,6 @@
 ${RUBY_ARCHLIBDIR}/digest/rmd160.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/sha1.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/sha2.${RUBY_DLEXT}
-@dirrm ${RUBY_ARCHLIBDIR}/digest
 ${RUBY_ARCHLIBDIR}/dl.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/dl.h
 ${RUBY_ARCHLIBDIR}/dlconfig.h
@@ -86,14 +79,12 @@
 ${RUBY_ARCHLIBDIR}/fcntl.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/intern.h
 ${HAS_IO}${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT}
-${HAS_IO}@dirrm ${RUBY_ARCHLIBDIR}/io
 ${RUBY_ARCHLIBDIR}/missing.h
 ${RUBY_ARCHLIBDIR}/nkf.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/node.h
 ${RUBY_ARCHLIBDIR}/openssl.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/pty.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/racc/cparse.${RUBY_DLEXT}
-@dirrm ${RUBY_ARCHLIBDIR}/racc
 ${RUBY_ARCHLIBDIR}/rbconfig.rb
 ${RUBY_ARCHLIBDIR}/re.h
 ${RUBY_ARCHLIBDIR}/regex.h
@@ -110,14 +101,9 @@
 ${RUBY_ARCHLIBDIR}/util.h
 ${RUBY_ARCHLIBDIR}/version.h
 ${RUBY_ARCHLIBDIR}/zlib.${RUBY_DLEXT}
-@dirrm ${RUBY_ARCHLIBDIR}
 @exec ${MKDIR} %D/${RUBY_SITEARCHLIBDIR}
-@dirrm ${RUBY_SITEARCHLIBDIR}
-@dirrm ${RUBY_SITELIBDIR}
-@unexec ${RMDIR} %D/lib/ruby/site_ruby 2>/dev/null || ${TRUE}
 ${RUBY_LIBDIR}/importenv.rb
 ${HAS_IO}${RUBY_LIBDIR}/io/nonblock.rb
-${HAS_IO}@dirrm ${RUBY_LIBDIR}/io
 ${RUBY_LIBDIR}/ipaddr.rb
 ${RUBY_LIBDIR}/irb/cmd/chws.rb
 ${RUBY_LIBDIR}/irb/cmd/fork.rb
@@ -126,7 +112,6 @@
 ${RUBY_LIBDIR}/irb/cmd/nop.rb
 ${RUBY_LIBDIR}/irb/cmd/pushws.rb
 ${RUBY_LIBDIR}/irb/cmd/subirb.rb
-@dirrm ${RUBY_LIBDIR}/irb/cmd
 ${RUBY_LIBDIR}/irb/completion.rb
 ${RUBY_LIBDIR}/irb/context.rb
 ${RUBY_LIBDIR}/irb/ext/change-ws.rb
@@ -139,7 +124,6 @@
 ${RUBY_LIBDIR}/irb/ext/use-loader.rb
 ${RUBY_LIBDIR}/irb/ext/workspaces.rb
 ${RUBY_LIBDIR}/irb/extend-command.rb
-@dirrm ${RUBY_LIBDIR}/irb/ext
 ${RUBY_LIBDIR}/irb/frame.rb
 ${RUBY_LIBDIR}/irb/help.rb
 ${RUBY_LIBDIR}/irb/init.rb
@@ -148,8 +132,6 @@
 ${RUBY_LIBDIR}/irb/lc/help-message
 ${RUBY_LIBDIR}/irb/lc/ja/error.rb
 ${RUBY_LIBDIR}/irb/lc/ja/help-message
-@dirrm ${RUBY_LIBDIR}/irb/lc/ja
-@dirrm ${RUBY_LIBDIR}/irb/lc
 ${RUBY_LIBDIR}/irb/locale.rb
 ${RUBY_LIBDIR}/irb/notifier.rb
 ${RUBY_LIBDIR}/irb/output-method.rb
@@ -160,7 +142,6 @@
 ${RUBY_LIBDIR}/irb/workspace.rb
 ${RUBY_LIBDIR}/irb/ws-for-case-2.rb
 ${RUBY_LIBDIR}/irb/xmp.rb
-@dirrm ${RUBY_LIBDIR}/irb
 ${RUBY_LIBDIR}/irb.rb
 ${RUBY_LIBDIR}/jcode.rb
 ${RUBY_LIBDIR}/kconv.rb
@@ -182,7 +163,6 @@
 ${RUBY_LIBDIR}/net/smtp.rb
 ${RUBY_LIBDIR}/net/telnet.rb
 ${RUBY_LIBDIR}/net/telnets.rb
-@dirrm ${RUBY_LIBDIR}/net
 ${RUBY_LIBDIR}/observer.rb
 ${RUBY_LIBDIR}/open-uri.rb
 ${RUBY_LIBDIR}/open3.rb
@@ -193,13 +173,11 @@
 ${RUBY_LIBDIR}/openssl/digest.rb
 ${RUBY_LIBDIR}/openssl/ssl.rb
 ${RUBY_LIBDIR}/openssl/x509.rb
-@dirrm ${RUBY_LIBDIR}/openssl
 ${RUBY_LIBDIR}/optparse/date.rb
 ${RUBY_LIBDIR}/optparse/shellwords.rb
 ${RUBY_LIBDIR}/optparse/time.rb
 ${RUBY_LIBDIR}/optparse/uri.rb
 ${RUBY_LIBDIR}/optparse/version.rb
-@dirrm ${RUBY_LIBDIR}/optparse
 ${RUBY_LIBDIR}/optparse.rb
 ${RUBY_LIBDIR}/ostruct.rb
 ${RUBY_LIBDIR}/parsearg.rb
@@ -212,32 +190,24 @@
 ${RUBY_LIBDIR}/profiler.rb
 ${RUBY_LIBDIR}/pstore.rb
 ${RUBY_LIBDIR}/racc/parser.rb
-@dirrm ${RUBY_LIBDIR}/racc
 ${RUBY_LIBDIR}/rational.rb
 ${RUBY_LIBDIR}/rdoc/code_objects.rb
 ${RUBY_LIBDIR}/rdoc/diagram.rb
 ${RUBY_LIBDIR}/rdoc/dot/dot.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/dot
 ${RUBY_LIBDIR}/rdoc/generators/chm_generator.rb
 ${RUBY_LIBDIR}/rdoc/generators/html_generator.rb
 ${RUBY_LIBDIR}/rdoc/generators/ri_generator.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/chm/chm.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/generators/template/chm
 ${RUBY_LIBDIR}/rdoc/generators/template/html/hefss.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/html.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/kilmer.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/old_html.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/html/one_page_html.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/generators/template/html
 ${RUBY_LIBDIR}/rdoc/generators/template/xml/rdf.rb
 ${RUBY_LIBDIR}/rdoc/generators/template/xml/xml.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/generators/template/xml
-@dirrm ${RUBY_LIBDIR}/rdoc/generators/template
 ${RUBY_LIBDIR}/rdoc/generators/xml_generator.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/generators
 ${RUBY_LIBDIR}/rdoc/markup/sample/rdoc2latex.rb
 ${RUBY_LIBDIR}/rdoc/markup/sample/sample.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/markup/sample
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup/fragments.rb
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup/inline.rb
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup/lines.rb
@@ -245,20 +215,16 @@
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup/to_flow.rb
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup/to_html.rb
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup/to_latex.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/markup/simple_markup
 ${RUBY_LIBDIR}/rdoc/markup/simple_markup.rb
 ${RUBY_LIBDIR}/rdoc/markup/test/AllTests.rb
 ${RUBY_LIBDIR}/rdoc/markup/test/TestInline.rb
 ${RUBY_LIBDIR}/rdoc/markup/test/TestParse.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/markup/test
-@dirrm ${RUBY_LIBDIR}/rdoc/markup
 ${RUBY_LIBDIR}/rdoc/options.rb
 ${RUBY_LIBDIR}/rdoc/parsers/parse_c.rb
 ${RUBY_LIBDIR}/rdoc/parsers/parse_f95.rb
 ${RUBY_LIBDIR}/rdoc/parsers/parse_rb.rb
 ${RUBY_LIBDIR}/rdoc/parsers/parse_simple.rb
 ${RUBY_LIBDIR}/rdoc/parsers/parserfactory.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/parsers
 ${RUBY_LIBDIR}/rdoc/rdoc.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_cache.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_descriptions.rb
@@ -270,11 +236,9 @@
 ${RUBY_LIBDIR}/rdoc/ri/ri_reader.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_util.rb
 ${RUBY_LIBDIR}/rdoc/ri/ri_writer.rb
-@dirrm ${RUBY_LIBDIR}/rdoc/ri
 ${RUBY_LIBDIR}/rdoc/template.rb
 ${RUBY_LIBDIR}/rdoc/tokenstream.rb
 ${RUBY_LIBDIR}/rdoc/usage.rb
-@dirrm ${RUBY_LIBDIR}/rdoc
 ${RUBY_LIBDIR}/readbytes.rb
 ${RUBY_LIBDIR}/resolv-replace.rb
 ${RUBY_LIBDIR}/resolv.rb
@@ -290,7 +254,6 @@
 ${RUBY_LIBDIR}/rexml/dtd/elementdecl.rb
 ${RUBY_LIBDIR}/rexml/dtd/entitydecl.rb
 ${RUBY_LIBDIR}/rexml/dtd/notationdecl.rb
-@dirrm ${RUBY_LIBDIR}/rexml/dtd
 ${RUBY_LIBDIR}/rexml/element.rb
 ${RUBY_LIBDIR}/rexml/encoding.rb
 ${RUBY_LIBDIR}/rexml/encodings/CP-1252.rb
@@ -304,12 +267,10 @@
 ${RUBY_LIBDIR}/rexml/encodings/US-ASCII.rb
 ${RUBY_LIBDIR}/rexml/encodings/UTF-16.rb
 ${RUBY_LIBDIR}/rexml/encodings/UTF-8.rb
-@dirrm ${RUBY_LIBDIR}/rexml/encodings
 ${RUBY_LIBDIR}/rexml/entity.rb
 ${RUBY_LIBDIR}/rexml/functions.rb
 ${RUBY_LIBDIR}/rexml/instruction.rb
 ${RUBY_LIBDIR}/rexml/light/node.rb
-@dirrm ${RUBY_LIBDIR}/rexml/light
 ${RUBY_LIBDIR}/rexml/namespace.rb
 ${RUBY_LIBDIR}/rexml/node.rb
 ${RUBY_LIBDIR}/rexml/output.rb
@@ -323,7 +284,6 @@
 ${RUBY_LIBDIR}/rexml/parsers/treeparser.rb
 ${RUBY_LIBDIR}/rexml/parsers/ultralightparser.rb
 ${RUBY_LIBDIR}/rexml/parsers/xpathparser.rb
-@dirrm ${RUBY_LIBDIR}/rexml/parsers
 ${RUBY_LIBDIR}/rexml/quickpath.rb
 ${RUBY_LIBDIR}/rexml/rexml.rb
 ${RUBY_LIBDIR}/rexml/sax2listener.rb
@@ -334,16 +294,13 @@
 ${RUBY_LIBDIR}/rexml/validation/relaxng.rb
 ${RUBY_LIBDIR}/rexml/validation/validation.rb
 ${RUBY_LIBDIR}/rexml/validation/validationexception.rb
-@dirrm ${RUBY_LIBDIR}/rexml/validation
 ${RUBY_LIBDIR}/rexml/xmldecl.rb
 ${RUBY_LIBDIR}/rexml/xmltokens.rb
 ${RUBY_LIBDIR}/rexml/xpath.rb
 ${RUBY_LIBDIR}/rexml/xpath_parser.rb
-@dirrm ${RUBY_LIBDIR}/rexml
 ${RUBY_LIBDIR}/rinda/rinda.rb
 ${RUBY_LIBDIR}/rinda/ring.rb
 ${RUBY_LIBDIR}/rinda/tuplespace.rb
-@dirrm ${RUBY_LIBDIR}/rinda
 ${RUBY_LIBDIR}/rss.rb
 ${RUBY_LIBDIR}/rss/0.9.rb
 ${RUBY_LIBDIR}/rss/1.0.rb
@@ -361,7 +318,6 @@
 ${RUBY_LIBDIR}/rss/maker/image.rb
 ${RUBY_LIBDIR}/rss/maker/syndication.rb
 ${RUBY_LIBDIR}/rss/maker/trackback.rb
-@dirrm ${RUBY_LIBDIR}/rss/maker
 ${RUBY_LIBDIR}/rss/maker.rb
 ${RUBY_LIBDIR}/rss/parser.rb
 ${RUBY_LIBDIR}/rss/rexmlparser.rb
@@ -373,17 +329,14 @@
 ${RUBY_LIBDIR}/rss/xml-stylesheet.rb
 ${RUBY_LIBDIR}/rss/xmlparser.rb
 ${RUBY_LIBDIR}/rss/xmlscanner.rb
-@dirrm ${RUBY_LIBDIR}/rss
 ${RUBY_LIBDIR}/rubyunit.rb
 ${RUBY_LIBDIR}/runit/assert.rb
 ${RUBY_LIBDIR}/runit/cui/testrunner.rb
-@dirrm ${RUBY_LIBDIR}/runit/cui
 ${RUBY_LIBDIR}/runit/error.rb



Home | Main Index | Thread Index | Old Index