[DRE-commits] r1638 - in packages/libgems-ruby/trunk/debian: . patches
daigo at alioth.debian.org
daigo at alioth.debian.org
Sun May 27 02:08:17 UTC 2007
Author: daigo
Date: 2007-05-27 02:08:17 +0000 (Sun, 27 May 2007)
New Revision: 1638
Removed:
packages/libgems-ruby/trunk/debian/control.in
Modified:
packages/libgems-ruby/trunk/debian/changelog
packages/libgems-ruby/trunk/debian/control
packages/libgems-ruby/trunk/debian/gem.1
packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch
packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch
packages/libgems-ruby/trunk/debian/patches/09_installer.dpatch
packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
packages/libgems-ruby/trunk/debian/rules
Log:
* New upstream release. (Closes: #407576)
* Stopped using the "Uploaders rule".
* debian/control
- Bumped up Standards-Version to 3.7.2.
- The rubygems package now depends on ruby1.8 instead of ruby because
shebangs in scripts are /usr/bin/ruby1.8.
- Description 'Homepage:' should preceed 2 spaces. (Closes: #415221)
* The upstream's URL has been changed. (Closes: #413251)
* The shebang of /usr/bin/gem is now "#!/usr/bin/ruby1.8" instead of
"#!/usr/bin/env ruby". (Closes: #416775)
* CVE-2007-0469: RubyGems did not check installation paths for gems
before writing files. (Closes: #408299)
Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/changelog 2007-05-27 02:08:17 UTC (rev 1638)
@@ -1,3 +1,20 @@
+libgems-ruby (0.9.3-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #407576)
+ * Stopped using the "Uploaders rule".
+ * debian/control
+ - Bumped up Standards-Version to 3.7.2.
+ - The rubygems package now depends on ruby1.8 instead of ruby because
+ shebangs in scripts are /usr/bin/ruby1.8.
+ - Description 'Homepage:' should preceed 2 spaces. (Closes: #415221)
+ * The upstream's URL has been changed. (Closes: #413251)
+ * The shebang of /usr/bin/gem is now "#!/usr/bin/ruby1.8" instead of
+ "#!/usr/bin/env ruby". (Closes: #416775)
+ * CVE-2007-0469: RubyGems did not check installation paths for gems
+ before writing files. (Closes: #408299)
+
+ -- Daigo Moriwaki <daigo at debian.org> Sun, 27 May 2007 11:03:02 +0900
+
libgems-ruby (0.9.0-7) UNRELEASED; urgency=low
* NOT RELEASED YET
Modified: packages/libgems-ruby/trunk/debian/control
===================================================================
--- packages/libgems-ruby/trunk/debian/control 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/control 2007-05-27 02:08:17 UTC (rev 1638)
@@ -2,9 +2,9 @@
Section: interpreters
Priority: optional
Maintainer: Daigo Moriwaki <daigo at debian.org>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Antonio S. de A. Terceiro <asaterceiro at inf.ufrgs.br>, David Moreno Garza <damog at debian.org>, David Nusinow <dnusinow at debian.org>, Paul van Tilburg <paulvt at debian.org>, Esteban Manchado Velázquez <zoso at debian.org>, Arnaud Cornet <arnaud.cornet at gmail.com>, Lucas Nussbaum <lucas at lucas-nussbaum.net>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>, Ari Pollak <ari at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends-Indep: dpatch (>= 2.0.10), debhelper (>= 4.0.0), ruby1.8, docbook-to-man, ruby-pkg-tools
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
Package: libgems-ruby1.8
Architecture: all
@@ -22,11 +22,11 @@
This package contains RubyGems' libraries. The commands are included in
`rubygems' package.
.
- Homepage: http://rubygems.rubyforge.org/wiki/wiki.pl
+ Homepage: http://rubygems.org/
Package: rubygems
Architecture: all
-Depends: ruby (>= 1.8), libgems-ruby1.8
+Depends: ruby1.8, libgems-ruby1.8
Description: package management framework for Ruby libraries/applications
This is a way to package Ruby libraries/applications for distribution.
RubyGems provides the ability to manage concurrent versions of libraries and
@@ -38,5 +38,4 @@
.
This package contains RubyGems' commands like /usr/bin/gem.
.
- Homepage: http://rubygems.rubyforge.org/wiki/wiki.pl
-
+ Homepage: http://rubygems.org/
Deleted: packages/libgems-ruby/trunk/debian/control.in
===================================================================
--- packages/libgems-ruby/trunk/debian/control.in 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/control.in 2007-05-27 02:08:17 UTC (rev 1638)
@@ -1,42 +0,0 @@
-Source: libgems-ruby
-Section: interpreters
-Priority: optional
-Maintainer: Daigo Moriwaki <daigo at debian.org>
-Uploaders: @RUBY_EXTRAS_TEAM@
-Build-Depends: dpatch (>= 2.0.10), debhelper (>> 5), ruby1.8, docbook-to-man, ruby-pkg-tools
-Standards-Version: 3.7.2
-
-Package: libgems-ruby1.8
-Architecture: all
-Depends: libruby1.8, rdoc1.8, libopenssl-ruby1.8
-Recommends: rubygems, ruby1.8-dev
-Description: libraries to use RubyGems, a package management framework
- This is a way to package Ruby libraries/applications for distribution.
- RubyGems provides the ability to manage concurrent versions of libraries and
- dependencies between those libraries. Using RubyGems, you can:
- * download and install Ruby libraries easily
- * not worry about libraries A and B depending on different versions of
- library C
- * easily remove libraries you no longer use
- .
- This package contains RubyGems' libraries. The commands are included in
- `rubygems' package.
- .
- Homepage: http://rubygems.rubyforge.org/wiki/wiki.pl
-
-Package: rubygems
-Architecture: all
-Depends: ruby (>= 1.8), libgems-ruby1.8
-Description: package management framework for Ruby libraries/applications
- This is a way to package Ruby libraries/applications for distribution.
- RubyGems provides the ability to manage concurrent versions of libraries and
- dependencies between those libraries. Using RubyGems, you can:
- * download and install Ruby libraries easily
- * not worry about libraries A and B depending on different versions of
- library C
- * easily remove libraries you no longer use
- .
- This package contains RubyGems' commands like /usr/bin/gem.
- .
- Homepage: http://rubygems.rubyforge.org/wiki/wiki.pl
-
Modified: packages/libgems-ruby/trunk/debian/gem.1
===================================================================
--- packages/libgems-ruby/trunk/debian/gem.1 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/gem.1 2007-05-27 02:08:17 UTC (rev 1638)
@@ -30,7 +30,7 @@
.PP
Further information:
.IP
-http://rubygems.rubyforge.org
+http://rubygems.org/
.SH EXAMPLES
.IP
.nf
Modified: packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch 2007-05-27 02:08:17 UTC (rev 1638)
@@ -5,10 +5,10 @@
## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
@DPATCH@
-
---- libgems-ruby-0.8.10.orig/post-install.rb
-+++ libgems-ruby-0.8.10/post-install.rb
-@@ -65,8 +65,15 @@
+diff -urNad trunk~/post-install.rb trunk/post-install.rb
+--- trunk~/post-install.rb 2007-05-11 04:01:45.000000000 +0900
++++ trunk/post-install.rb 2007-05-27 08:17:36.000000000 +0900
+@@ -85,8 +85,15 @@
load "sources.gemspec"
spec = Gem.sources_spec
gem_file = Gem::Builder.new(spec).build
@@ -25,4 +25,13 @@
+ end
end
- install_windows_batch_files
+ def remove_old_rdoc
+@@ -105,7 +112,7 @@
+
+ rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
+
+- doc_dir = File.join Gem.dir, 'doc', rubygems_name
++ doc_dir = File.join "debian/tmp", Gem.dir, 'doc', rubygems_name
+
+ puts "Installing #{rubygems_name} ri..."
+ run_rdoc '--ri', '--op', File.join(doc_dir, 'ri')
Modified: packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch 2007-05-27 02:08:17 UTC (rev 1638)
@@ -1,19 +1,19 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_tighter_search_regex.dpatch by <blair at orcaware.com>
+## 08_tighter_search_regex.dpatch by Daigo Moriwaki <daigo at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.11-1 diff.gz
+## DP: No description.
@DPATCH@
-
---- libgems-ruby-0.8.11.orig/lib/rubygems/source_index.rb.orig
-+++ libgems-ruby-0.8.11/lib/rubygems/source_index.rb
-@@ -116,7 +116,7 @@
+diff -urNad trunk~/lib/rubygems/source_index.rb trunk/lib/rubygems/source_index.rb
+--- trunk~/lib/rubygems/source_index.rb 2007-05-11 04:01:45.000000000 +0900
++++ trunk/lib/rubygems/source_index.rb 2007-05-27 08:33:28.000000000 +0900
+@@ -202,7 +202,7 @@
+ # order. Empty if not found.
#
def search(gem_pattern, version_requirement=Version::Requirement.new(">= 0"))
- #FIXME - remove duplication between this and RemoteInstaller.search
- gem_pattern = /#{ gem_pattern }/i if String === gem_pattern
-+ gem_pattern = /^#{ gem_pattern }$/i if String === gem_pattern
++ gem_pattern = /^#{ gem_pattern }/i if String === gem_pattern
version_requirement = Gem::Version::Requirement.create(version_requirement)
result = []
@gems.each do |full_spec_name, spec|
Modified: packages/libgems-ruby/trunk/debian/patches/09_installer.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/09_installer.dpatch 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/patches/09_installer.dpatch 2007-05-27 02:08:17 UTC (rev 1638)
@@ -2,84 +2,59 @@
## 09_installer.dpatch by Daigo Moriwaki <daigo at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.11-1 diff.gz
+## DP: No description.
@DPATCH@
-
---- libgems-ruby-0.8.11.orig/lib/rubygems/installer.rb.orig
-+++ libgems-ruby-0.8.11/lib/rubygems/installer.rb
-@@ -74,7 +74,15 @@
- end
- end
+diff -urNad trunk~/lib/rubygems/installer.rb trunk/lib/rubygems/installer.rb
+--- trunk~/lib/rubygems/installer.rb 2007-05-11 04:01:45.000000000 +0900
++++ trunk/lib/rubygems/installer.rb 2007-05-27 08:51:33.000000000 +0900
+@@ -84,6 +84,14 @@
+ end
end
--
-+
+
+ if @options[:build_root]
-+ build_root = @options[:build_root]
-+ FileUtils.mkdir_p build_root
-+ raise Gem::FilePermissionError.new(build_root) unless File.writable?(build_root)
-+ install_dir = build_root + install_dir
-+ FileUtils.mkdir_p install_dir
++ build_root = @options[:build_root]
++ FileUtils.mkdir_p build_root
++ raise Gem::FilePermissionError.new(build_root) unless File.writable?(build_root)
++ install_dir = build_root + install_dir
++ FileUtils.mkdir_p install_dir
+ end
+
- raise Gem::FilePermissionError.new(install_dir) unless File.writable?(install_dir)
+ raise Gem::FilePermissionError.new(Pathname.new(install_dir).expand_path) unless File.writable?(install_dir)
# Build spec dir.
-@@ -175,16 +183,25 @@
- # Determines the directory for binaries
+@@ -393,6 +401,7 @@
#
- def bindir(install_dir=Gem.dir)
-- if(install_dir == Gem.default_dir)
-+ if @options[:build_root]
-+ build_root = @options[:build_root]
-+ gem_default_dir = File.join(build_root, install_dir)
-+ else
-+ gem_default_dir = Gem.default_dir
-+ build_root = ""
-+ end
-+
-+ if(install_dir == gem_default_dir)
- # mac framework support
- if defined? RUBY_FRAMEWORK_VERSION
-- File.join(File.dirname(Config::CONFIG["sitedir"]), File.basename(Config::CONFIG["bindir"]))
-+ bin_dir = File.join(File.dirname(Config::CONFIG["sitedir"]), File.basename(Config::CONFIG["bindir"]))
- else # generic install
-- Config::CONFIG['bindir']
-+ bin_dir = Config::CONFIG['bindir']
- end
- else
-- File.join(install_dir, "bin")
-+ bin_dir = File.join(install_dir, "bin")
- end
-+ return bin_dir
- end
-
- def generate_bin(spec, install_dir=Gem.dir)
-@@ -363,6 +380,7 @@
- #
def initialize(gem, options)
@gem = gem
+ @options = options
@version = options[:version] || "> 0"
@force_executables = options[:executables]
@force_all = options[:all]
-@@ -417,9 +435,9 @@
- #
+@@ -447,8 +456,13 @@
def remove_executables(gemspec)
return if gemspec.nil?
-+ bindir = Installer.new(@gem, @options).bindir
if(gemspec.executables.size > 0)
-- raise Gem::FilePermissionError.new(Config::CONFIG['bindir']) unless
-- File.writable?(Config::CONFIG['bindir'])
-+ raise Gem::FilePermissionError.new(bindir) unless File.writable?(bindir)
+- raise Gem::FilePermissionError.new(Gem.bindir) unless
+- File.writable?(Gem.bindir)
++ bindir = Gem.bindir
++ if @options[:build_root]
++ install_dir = File.join(@options[:build_root], Gem.dir)
++ bindir = Gem.bindir(install_dir)
++ end
++ raise Gem::FilePermissionError.new(bindir) unless
++ File.writable?(bindir)
list = Gem.source_index.search(gemspec.name).delete_if { |spec|
- spec.version == gemspec.version
- }
-@@ -438,7 +456,6 @@
- say "Executables and scripts will remain installed."
- return
+ spec.version == gemspec.version
+ }
+@@ -469,8 +483,8 @@
else
-- bindir = Config::CONFIG['bindir']
gemspec.executables.each do |exe_name|
say "Removing #{exe_name}"
- File.unlink(File.join(bindir, exe_name)) rescue nil
+- File.unlink File.join(Gem.bindir, exe_name) rescue nil
+- File.unlink File.join(Gem.bindir, exe_name + ".cmd") rescue nil
++ File.unlink File.join(bindir, exe_name) rescue nil
++ File.unlink File.join(bindir, exe_name + ".cmd") rescue nil
+ end
+ end
+ end
Modified: packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch 2007-05-27 02:08:17 UTC (rev 1638)
@@ -6,28 +6,28 @@
@DPATCH@
diff -urNad trunk~/lib/rubygems/package.rb trunk/lib/rubygems/package.rb
---- trunk~/lib/rubygems/package.rb 2006-06-14 12:39:45.000000000 +0900
-+++ trunk/lib/rubygems/package.rb 2007-01-15 20:30:42.000000000 +0900
-@@ -444,17 +444,17 @@
- size = entry.size
- yield entry
- skip = (512 - (size % 512)) % 512
-- if @io.respond_to? :seek
-- # avoid reading...
-- @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
-- else
-+ #if @io.respond_to? :seek
-+ # # avoid reading...
-+ # @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
-+ #else
- pending = size - entry.bytes_read
- while pending > 0
- bread = @io.read([pending, 4096].min).size
- raise UnexpectedEOF if @io.eof?
- pending -= bread
- end
-- end
-+ #end
- @io.read(skip) # discard trailing zeros
- # make sure nobody can use #read, #getc or #rewind anymore
- entry.close
+--- trunk~/lib/rubygems/package.rb 2007-05-11 04:01:45.000000000 +0900
++++ trunk/lib/rubygems/package.rb 2007-05-27 08:20:23.000000000 +0900
+@@ -447,17 +447,17 @@
+ size = entry.size
+ yield entry
+ skip = (512 - (size % 512)) % 512
+- if @io.respond_to? :seek
+- # avoid reading...
+- @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
+- else
++ #if @io.respond_to? :seek
++ # # avoid reading...
++ # @io.seek(size - entry.bytes_read, IO::SEEK_CUR)
++ #else
+ pending = size - entry.bytes_read
+ while pending > 0
+ bread = @io.read([pending, 4096].min).size
+ raise UnexpectedEOF if @io.eof?
+ pending -= bread
+ end
+- end
++ #end
+ @io.read(skip) # discard trailing zeros
+ # make sure nobody can use #read, #getc or #rewind anymore
+ entry.close
Modified: packages/libgems-ruby/trunk/debian/rules
===================================================================
--- packages/libgems-ruby/trunk/debian/rules 2007-05-27 00:28:36 UTC (rev 1637)
+++ packages/libgems-ruby/trunk/debian/rules 2007-05-27 02:08:17 UTC (rev 1638)
@@ -13,8 +13,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
-
# This has to be exported to make some magic below work.
export DH_OPTIONS
More information about the Pkg-ruby-extras-commits
mailing list