diff options
author | taca <taca> | 2011-02-21 14:44:11 +0000 |
---|---|---|
committer | taca <taca> | 2011-02-21 14:44:11 +0000 |
commit | a755de13b3db6170c87475cf66e81186a5c851a8 (patch) | |
tree | 0305b18b5e26fe45bfa6aa3fb20dbd0c14cfb843 /lang | |
parent | 34e7aa31d5a60342c9a5e2bf64cf0691a33bc19b (diff) | |
download | pkgsrc-a755de13b3db6170c87475cf66e81186a5c851a8.tar.gz |
Update ruby19-base package to 1.9.2pl180 (Ruby 1.9.2 p180).
* The FileUtils Vulnerability
http://www.ruby-lang.org/en/news/2011/02/18/fileutils-is-vulnerable-to-symlink-race-attacks/
* Add a patch r30779 from repository; a bug of utf-8 string handling.
For more detail changes of Ruby 1.9.2pl180, please refer:
http://svn.ruby-lang.org/repos/ruby/tags/v1_9_2_180/ChangeLog
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby19-base/DEINSTALL | 7 | ||||
-rw-r--r-- | lang/ruby19-base/Makefile | 6 | ||||
-rw-r--r-- | lang/ruby19-base/PLIST | 12 | ||||
-rw-r--r-- | lang/ruby19-base/distinfo | 9 | ||||
-rw-r--r-- | lang/ruby19-base/patches/patch-string.c | 15 |
5 files changed, 33 insertions, 16 deletions
diff --git a/lang/ruby19-base/DEINSTALL b/lang/ruby19-base/DEINSTALL index a122542c6f3..03c76235880 100644 --- a/lang/ruby19-base/DEINSTALL +++ b/lang/ruby19-base/DEINSTALL @@ -1,4 +1,4 @@ -# $NetBSD: DEINSTALL,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ +# $NetBSD: DEINSTALL,v 1.2 2011/02/21 14:44:11 taca Exp $ PREFIX="@PREFIX@" RUBY_GEM_BASE="${PREFIX}/@RUBY_GEM_BASE@" @@ -6,7 +6,10 @@ RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@" case ${STAGE} in DEINSTALL) - rm -f ${RUBY_SITERIDIR}/created.rid + ${RM} -f ${RUBY_SITERIDIR}/created.rid + ;; +POST-DEINSTALL) + ${RM} -rf ${RUBY_GEM_BASE} ;; esac exit diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile index ff482383225..22cca74c520 100644 --- a/lang/ruby19-base/Makefile +++ b/lang/ruby19-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2011/02/07 11:15:28 taca Exp $ +# $NetBSD: Makefile,v 1.7 2011/02/21 14:44:11 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX} -PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} #PKGREVISION= @@ -24,7 +23,6 @@ TEST_TARGET= test CONFIGURE_ARGS+= --enable-shared WRKSRC= ${RUBY_WRKSRC} -OWN_DIRS= ${RUBY_LIB_BASE} MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} # @@ -50,10 +48,8 @@ CONFIG_STATUS_OVERRIDE= # empty MAKE_DIRS+= ${RUBY_SITERIDIR} FILES_SUBST+= DATE=${DATE:Q} -REQD_DIRS+= ${GEM_HOME} REQD_DIRS+= ${GEM_HOME}/cache REQD_DIRS+= ${GEM_HOME}/doc -REQD_DIRS+= ${GEM_HOME}/gems SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install diff --git a/lang/ruby19-base/PLIST b/lang/ruby19-base/PLIST index 1bae8261f49..8df3a3abe5e 100644 --- a/lang/ruby19-base/PLIST +++ b/lang/ruby19-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2010/11/17 14:27:10 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2011/02/21 14:44:11 taca Exp $ bin/erb${RUBY_VER} bin/gem${RUBY_VER} bin/irb${RUBY_VER} @@ -686,9 +686,9 @@ ${RUBY_ARCHLIB}/strscan.${RUBY_DLEXT} ${RUBY_ARCHLIB}/syck.${RUBY_DLEXT} ${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT} ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT} -${GEM_HOME}/specifications/minitest.gemspec -${GEM_HOME}/specifications/rake.gemspec -${GEM_HOME}/specifications/rdoc.gemspec +${GEM_HOME}/specifications/rake-0.8.7.gemspec +${GEM_HOME}/specifications/rdoc-2.5.8.gemspec +${GEM_HOME}/specifications/minitest-1.6.0.gemspec man/man1/erb${RUBY_VER}.1 man/man1/irb${RUBY_VER}.1 man/man1/rake${RUBY_VER}.1 @@ -852,9 +852,11 @@ ${RUBY_EG}/webrick/hello.rb ${RUBY_EG}/webrick/httpd.rb ${RUBY_EG}/webrick/httpproxy.rb ${RUBY_EG}/webrick/httpsd.rb +${GEM_HOME}/specifications/minitest-1.6.0.gemspec +${GEM_HOME}/specifications/rake-0.8.7.gemspec +${GEM_HOME}/specifications/rdoc-2.5.8.gemspec @pkgdir ${RUBY_SITEARCHLIB} @pkgdir ${RUBY_VENDORARCHLIB} @pkgdir ${GEM_HOME}/cache @pkgdir ${GEM_HOME}/doc -@pkgdir ${GEM_HOME}/gems @pkgdir ${RUBY_SITERIDIR} diff --git a/lang/ruby19-base/distinfo b/lang/ruby19-base/distinfo index 46861385c1e..bac1ed5709c 100644 --- a/lang/ruby19-base/distinfo +++ b/lang/ruby19-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2011/02/07 11:15:28 taca Exp $ +$NetBSD: distinfo,v 1.4 2011/02/21 14:44:11 taca Exp $ -SHA1 (ruby-1.9.2-p136.tar.bz2) = 3f9023d00be44104d2fef485843f123bb6de6c37 -RMD160 (ruby-1.9.2-p136.tar.bz2) = 91fec5fc667035b5d281a55c268b79c71b4c1277 -Size (ruby-1.9.2-p136.tar.bz2) = 8819324 bytes +SHA1 (ruby-1.9.2-p180.tar.bz2) = 10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5 +RMD160 (ruby-1.9.2-p180.tar.bz2) = a5870eaa18777342e562fdb513c2dd76d2045d78 +Size (ruby-1.9.2-p180.tar.bz2) = 8815756 bytes SHA1 (patch-aa) = 9e1d3cdbe76fc9bcc72e7de6dfc4ce5344d4510d SHA1 (patch-ab) = e76b1fbb42a3a332e65b51a2ed4aab7024fcfc1e SHA1 (patch-ac) = c076c99eb886842dc5ac546e1105b7ef2a3edd68 @@ -24,3 +24,4 @@ SHA1 (patch-ar) = 8a4b8ae18f9bdafc1bfbbd9ec62d18caf890571e SHA1 (patch-as) = 2005d2b5ca10d79188e8615383b881d5c9dfb616 SHA1 (patch-at) = 532eebfda565d78b9d7ab572b7d8539933e431a3 SHA1 (patch-au) = 45073c6d3461ee181e89228beb088d161af3d735 +SHA1 (patch-string.c) = 56c5433a8dd43ca4ee0a21d4d131ce4f662608ed diff --git a/lang/ruby19-base/patches/patch-string.c b/lang/ruby19-base/patches/patch-string.c new file mode 100644 index 00000000000..d7ee9eec03f --- /dev/null +++ b/lang/ruby19-base/patches/patch-string.c @@ -0,0 +1,15 @@ +$NetBSD: patch-string.c,v 1.1 2011/02/21 14:44:11 taca Exp $ + +* Import r30779 from repository. + +--- string.c.orig 2010-12-20 13:22:53.000000000 +0000 ++++ string.c +@@ -1483,7 +1483,7 @@ rb_str_offset(VALUE str, long pos) + static char * + str_utf8_nth(const char *p, const char *e, long nth) + { +- if ((int)SIZEOF_VALUE < e - p && (int)SIZEOF_VALUE * 2 < nth) { ++ if ((int)SIZEOF_VALUE * 2 < e - p && (int)SIZEOF_VALUE * 2 < nth) { + const VALUE *s, *t; + const VALUE lowbits = sizeof(VALUE) - 1; + s = (const VALUE*)(~lowbits & ((VALUE)p + lowbits)); |