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

Bug#772821: marked as done (unblock: ruby-standalone/0.5)

Your message dated Thu, 11 Dec 2014 13:18:45 +0000
with message-id <720a7dd3eb6e93e9274d2bd37559e229@mail.adsl.funky-badger.org>
and subject line Re: Bug#772821: unblock: ruby-standalone/0.5
has caused the Debian Bug report #772821,
regarding unblock: ruby-standalone/0.5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
772821: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772821
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ruby-standalone

This version includes a fix for a major issue on the functionality of
the package, which is just not an RC bug because I found it myself (but
I will report a bug to myself if you ask me to ;-)).

the debdiff against the package in testing is attached.

unblock ruby-standalone/0.5

-- System Information:
Debian Release: 8.0
  APT prefers buildd-unstable
  APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- 
Antonio Terceiro <terceiro@debian.org>

diff -Nru ruby-standalone-0.4/debian/changelog ruby-standalone-0.5/debian/changelog
--- ruby-standalone-0.4/debian/changelog	2014-12-01 13:35:30.000000000 -0200
+++ ruby-standalone-0.5/debian/changelog	2014-12-10 15:20:44.000000000 -0200
@@ -1,3 +1,9 @@
+ruby-standalone (0.5) unstable; urgency=medium
+
+  * Force shebang of installed scripts to use the ruby from ruby-standalone
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 10 Dec 2014 15:20:39 -0200
+
 ruby-standalone (0.4) unstable; urgency=medium
 
   * Change Gem.user_dir to $HOME/.ruby-standalone/gems/ruby/$RUBYVERSION so
diff -Nru ruby-standalone-0.4/debian_ruby_standalone_config.rb.in ruby-standalone-0.5/debian_ruby_standalone_config.rb.in
--- ruby-standalone-0.4/debian_ruby_standalone_config.rb.in	1969-12-31 21:00:00.000000000 -0300
+++ ruby-standalone-0.5/debian_ruby_standalone_config.rb.in	2014-12-10 15:20:44.000000000 -0200
@@ -0,0 +1,5 @@
+class << Gem
+  def ruby
+    '@@prefix@@/lib/ruby-standalone/bin/ruby'
+  end
+end
diff -Nru ruby-standalone-0.4/debian_ruby_standalone.rb ruby-standalone-0.5/debian_ruby_standalone.rb
--- ruby-standalone-0.4/debian_ruby_standalone.rb	2014-12-01 13:35:30.000000000 -0200
+++ ruby-standalone-0.5/debian_ruby_standalone.rb	2014-12-10 15:20:44.000000000 -0200
@@ -32,3 +32,9 @@
     File.join(Gem.orig_default_dir, "specifications", "default")
   end
 end
+
+begin
+  require_relative 'debian_ruby_standalone_config'
+rescue LoadError
+  # nothing
+end
diff -Nru ruby-standalone-0.4/Makefile ruby-standalone-0.5/Makefile
--- ruby-standalone-0.4/Makefile	2014-12-01 13:35:30.000000000 -0200
+++ ruby-standalone-0.5/Makefile	2014-12-10 15:20:44.000000000 -0200
@@ -10,16 +10,17 @@
 BINARIES = ruby $(BINSTUBS)
 EXTRA_BINARIES = rake
 MANPAGES = ruby-standalone.1.gz
+GENERATED = ruby-standalone debian_ruby_standalone_config.rb
 
 include buildflags.mk
 
 CFLAGS += -std=c11 -Wall
 
-all: $(BINARIES) ruby-standalone $(MANPAGES) $(EXTRA_BINARIES)
+all: $(BINARIES) $(GENERATED) $(MANPAGES) $(EXTRA_BINARIES)
 
 $(MANPAGES): %.1.gz: %.1
 	$(RM) $@
-	gzip $<
+	(cat $< | gzip - > $@) || ($(RM) $@; false)
 
 buildflags.mk:
 	dpkg-buildflags --export=make > $@
@@ -28,9 +29,9 @@
 	@printf "#!/usr/bin/env ruby\nload '/usr/bin/$@'\n" > $@ || ($(RM) $@; false)
 	chmod +x $@
 
-ruby-standalone: ruby-standalone.in
+$(GENERATED): % : %.in
 	sed -e 's#@@prefix@@#$(PREFIX)#g' $< > $@ || ($(RM) $@; false)
-	chmod +x $@
+	if [ "$$(basename $@ .rb)" = "$@" ]; then chmod +x $@; fi
 
 ruby-standalone.1: README.md
 	pandoc --standalone --to man \
@@ -50,6 +51,7 @@
 	install -m 0755 $(BINARIES) $(EXTRA_BINARIES) $(DESTDIR)$(PREFIX)/lib/ruby-standalone/bin
 	install -m 0755 ruby-standalone $(DESTDIR)/$(PREFIX)/bin
 	install -m 0644 debian_ruby_standalone.rb $(DESTDIR)$(RUBYLIB)
+	install -m 0644 debian_ruby_standalone_config.rb $(DESTDIR)$(RUBYLIB)
 	install -m 0644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
 
 distclean clean:
diff -Nru ruby-standalone-0.4/run-tests ruby-standalone-0.5/run-tests
--- ruby-standalone-0.4/run-tests	2014-12-01 13:35:30.000000000 -0200
+++ ruby-standalone-0.5/run-tests	2014-12-10 15:20:44.000000000 -0200
@@ -63,4 +63,8 @@
   assertEquals "$(ruby -e 'puts Gem.user_dir'):/var/lib/gems/$(ruby -e 'puts Gem::ConfigMap[:ruby_version]')" "$default_path"
 }
 
+test_shebang() {
+  assertEquals "lib/ruby-standalone/bin/ruby" "$(ruby -e 'puts Gem.ruby.gsub(%r{^/usr(/local)?/}, "")')"
+}
+
 . shunit2

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On 2014-12-11 12:26, Antonio Terceiro wrote:

Please unblock package ruby-standalone

This version includes a fix for a major issue on the functionality of
the package, which is just not an RC bug because I found it myself (but
I will report a bug to myself if you ask me to ;-)).


Unblocked.

Regards,

Adam

--- End Message ---
Reply to: