diff options
| author | taca <taca> | 2013-09-30 03:15:03 +0000 |
|---|---|---|
| committer | taca <taca> | 2013-09-30 03:15:03 +0000 |
| commit | ad0b21b5a1cc6a8fefdeafd929829cf9677ea73f (patch) | |
| tree | 9b0a72030e060450c85cb9c30b83e35dda7b4f25 /lang/ruby193-base | |
| parent | 168be5773a581b4d499b7d072362211a052f81d4 (diff) | |
| download | pkgsrc-ad0b21b5a1cc6a8fefdeafd929829cf9677ea73f.tar.gz | |
Update a patch for CVE-2013-4363 (previous CVE-2013-4287).
Bump PKGREVISION.
Diffstat (limited to 'lang/ruby193-base')
| -rw-r--r-- | lang/ruby193-base/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby193-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby193-base/patches/patch-lib_rubygems_version.rb | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile index 07359fc03bd..7bb5ef86ff4 100644 --- a/lang/ruby193-base/Makefile +++ b/lang/ruby193-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.34 2013/09/10 16:25:51 taca Exp $ +# $NetBSD: Makefile,v 1.35 2013/09/30 03:15:03 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo index b8e5be9f852..fb7f0c4a13d 100644 --- a/lang/ruby193-base/distinfo +++ b/lang/ruby193-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2013/09/10 16:25:51 taca Exp $ +$NetBSD: distinfo,v 1.26 2013/09/30 03:15:03 taca Exp $ SHA1 (ruby-1.9.3-p448.tar.bz2) = 4bd9140bd4760409f771d4dd55138c22d3ff2995 RMD160 (ruby-1.9.3-p448.tar.bz2) = e012b5b506092406a4e35711d57290932ba557c6 @@ -24,7 +24,7 @@ SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112 SHA1 (patch-lib_rubygems_installer.rb) = 5832fd6e8a3d26fe8ae5afc9f8a6fea462d56ccf SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779 SHA1 (patch-lib_rubygems_uninstaller.rb) = bde19710968f80e56760288d09870a08f3a4ec52 -SHA1 (patch-lib_rubygems_version.rb) = ec135b2e4f298c8077f1213b699ebcb4efa98803 +SHA1 (patch-lib_rubygems_version.rb) = 1ebc87bec0af5875dcee6911b75319cb39423202 SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1 SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64 diff --git a/lang/ruby193-base/patches/patch-lib_rubygems_version.rb b/lang/ruby193-base/patches/patch-lib_rubygems_version.rb index 9291752c063..958484a930e 100644 --- a/lang/ruby193-base/patches/patch-lib_rubygems_version.rb +++ b/lang/ruby193-base/patches/patch-lib_rubygems_version.rb @@ -1,19 +1,21 @@ -$NetBSD: patch-lib_rubygems_version.rb,v 1.2 2013/09/10 16:25:51 taca Exp $ +$NetBSD: patch-lib_rubygems_version.rb,v 1.3 2013/09/30 03:15:03 taca Exp $ -* A fix for CVE-2013-4287. +* A fix for CVE-2013-4363. * A small fix from Ruby 2.0.0 and Rubygem 1.8.25. --- lib/rubygems/version.rb.orig 2012-04-19 22:43:16.000000000 +0000 +++ lib/rubygems/version.rb -@@ -145,7 +145,7 @@ class Gem::Version +@@ -145,8 +145,8 @@ class Gem::Version include Comparable - VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc: +- ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc: + VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' # :nodoc: - ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc: ++ ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc: ## + # A string representation of this Version. @@ -187,7 +187,7 @@ class Gem::Version raise ArgumentError, "Malformed version number string #{version}" unless self.class.correct?(version) |