From c83aa95120154ecbcabac6a0adf52fcf64d1f0f9 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 9 Feb 2013 02:07:14 +0900 Subject: [PATCH 001/174] Add debian directory Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 25 +++++++++++++++++++++++++ debian/copyright | 30 ++++++++++++++++++++++++++++++ debian/gbp.conf | 7 +++++++ debian/libmruby-dev.install | 2 ++ debian/mruby.install | 1 + debian/rules | 4 ++++ debian/source/format | 1 + 9 files changed, 76 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/libmruby-dev.install create mode 100644 debian/mruby.install create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000000..6fd69e3bb2 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +mruby (0.0.0~20130209+git94204089-1) experimental; urgency=low + + * Initial release. (Closes: #697835) + + -- Nobuhiro Iwamatsu Sat, 09 Feb 2013 00:15:35 +0900 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000000..aa232b0524 --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: mruby +Section: ruby +Priority: extra +Maintainer: Nobuhiro Iwamatsu +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison +Standards-Version: 3.9.4 + +Package: mruby +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: lightweight implementation of the Ruby language + mruby is the lightweight implementation of the Ruby language complying to + the ISO standard. + This can be linked and embedded within your application. + +Package: libmruby-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: lightweight implementation of the Ruby language (development files) + mruby is the lightweight implementation of the Ruby language complying to + the ISO standard. + This can be linked and embedded within your application. + . + This package contains the development files. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000000..d8cb525a3a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mruby +Source: https://github.com/mruby/mruby + +Files: * +Copyright: Copyright (c) 2012 mruby developers +License: MIT + +Files: debian/* +Copyright: 2013 Nobuhiro Iwamatsu +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000000..cf8376ee7d --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +# the default build command +builder=debuild -i\.git -I.git +# the default branch for upstream sources +upstream-branch=upstream +# the default branch for the debian patch +debian-branch=master diff --git a/debian/libmruby-dev.install b/debian/libmruby-dev.install new file mode 100644 index 0000000000..77924fba3c --- /dev/null +++ b/debian/libmruby-dev.install @@ -0,0 +1,2 @@ +include/* usr/include/ +build/host/lib/*.a usr/lib/ diff --git a/debian/mruby.install b/debian/mruby.install new file mode 100644 index 0000000000..b6b3c13cd6 --- /dev/null +++ b/debian/mruby.install @@ -0,0 +1 @@ +build/host/bin/* usr/bin/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000000..2d33f6ac89 --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) From bfc82201211b9f41b52e497cdbb0dbce8a0ec5ef Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 9 Feb 2013 13:05:39 +0900 Subject: [PATCH 002/174] Add patches/enable_verbose_build.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/enable_verbose_build.patch | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/enable_verbose_build.patch create mode 100644 debian/patches/series diff --git a/debian/patches/enable_verbose_build.patch b/debian/patches/enable_verbose_build.patch new file mode 100644 index 0000000000..5db6a9774a --- /dev/null +++ b/debian/patches/enable_verbose_build.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index d9a3437..02a27a8 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + # We provide a minimalistic version called minirake inside of our + # codebase. + +-RAKE = ruby ./minirake ++RAKE = ruby ./minirake --verbose + + .PHONY : all + all : diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000..7c58b563f6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +enable_verbose_build.patch From 0d75ec5516b4fc0c8a1ca4240cca6940c875aad6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 9 Feb 2013 14:11:28 +0900 Subject: [PATCH 003/174] Add man pages Signed-off-by: Nobuhiro Iwamatsu --- debian/man/mirb.1 | 17 ++++++++++++++++ debian/man/mrbc.1 | 41 +++++++++++++++++++++++++++++++++++++++ debian/man/mruby.1 | 45 +++++++++++++++++++++++++++++++++++++++++++ debian/mruby.manpages | 1 + 4 files changed, 104 insertions(+) create mode 100644 debian/man/mirb.1 create mode 100644 debian/man/mrbc.1 create mode 100644 debian/man/mruby.1 create mode 100644 debian/mruby.manpages diff --git a/debian/man/mirb.1 b/debian/man/mirb.1 new file mode 100644 index 0000000000..dda56596a2 --- /dev/null +++ b/debian/man/mirb.1 @@ -0,0 +1,17 @@ +.TH "MIRB" 1 "2013-02-09" "MIRB" "MIRB" + +.SH NAME +mirb \- Embeddable Interactive Ruby Shell + +.SH SYNOPSIS +.B mirb + +.SH DESCRIPTION +This manual page documents briefly the \fBmirb\fP. + +This is a very early version, please test and report errors. +.PP + +.SH AUTHOR +This manual page was written by Nobuhiro Iwamatsu +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/man/mrbc.1 b/debian/man/mrbc.1 new file mode 100644 index 0000000000..f5900ab24f --- /dev/null +++ b/debian/man/mrbc.1 @@ -0,0 +1,41 @@ +.TH "MRBC" 1 "2013-02-09" "MRBC" "MRBC" + +.SH NAME +mrbc \- mruby compiler + +.SH SYNOPSIS +.B mrbc +[ potions ] programfile + +.SH DESCRIPTION +This manual page documents briefly the \fBmrbc\fP. +. +.PP +.SH OPTIONS +.TP +.B \-c +Check check syntax input programfile. +.TP +.B \-o +Set place the output into . +.TP +.B \-v +Print version number, then trun on verbose mode. +Run in the foreground, printing log messages to stdout and debug +messages to stderr. +.TP +.B \-B +Output binary in C language format. +.TP +.B \-\-verbose +Run at verbose mode. +.TP +.B \-\-version +Print the version. +.TP +.B \-\-copyright +Print the copyright. + +.SH AUTHOR +This manual page was written by Nobuhiro Iwamatsu +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/man/mruby.1 b/debian/man/mruby.1 new file mode 100644 index 0000000000..a77b55141b --- /dev/null +++ b/debian/man/mruby.1 @@ -0,0 +1,45 @@ +.TH "MRUBY" 1 "2013-02-09" "MRUBY" "MRUBY" + +.SH NAME +mruby \- Lightweight implementation of the Ruby language + +.SH SYNOPSIS +.B mruby +[ potions ] programfile + +.SH DESCRIPTION +This manual page documents briefly the \fBmruby\fP. +.B mrbc +. +.PP +.SH OPTIONS +.TP +.B \-b +Load and execute RiteBinary (mrb) file +.TP +.B \-c +Check check syntax input programfile. +.TP +.B \-e 'command' +one line of script +.TP +.B \-v +Print version number, then trun on verbose mode. +Run in the foreground, printing log messages to stdout and debug +messages to stderr. +.TP +.B \-B +Output binary in C language format. +.TP +.B \-\-verbose +Run at verbose mode. +.TP +.B \-\-version +Print the version. +.TP +.B \-\-copyright +Print the copyright. + +.SH AUTHOR +This manual page was written by Nobuhiro Iwamatsu +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/mruby.manpages b/debian/mruby.manpages new file mode 100644 index 0000000000..13cdaf4b24 --- /dev/null +++ b/debian/mruby.manpages @@ -0,0 +1 @@ +debian/man/*.1 From af065ef40ac0af9561921a88f8f15171bf4e44f6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 9 Feb 2013 14:13:13 +0900 Subject: [PATCH 004/174] Add debian's build_config.rb Signed-off-by: Nobuhiro Iwamatsu --- debian/build_config.rb | 13 +++++++++++++ debian/rules | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 debian/build_config.rb diff --git a/debian/build_config.rb b/debian/build_config.rb new file mode 100644 index 0000000000..aa7663dc34 --- /dev/null +++ b/debian/build_config.rb @@ -0,0 +1,13 @@ +MRuby::Build.new do |conf| + + # load specific toolchain settings + toolchain :gcc + conf.cc do |cc| + cc.flags = '-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security' + end + # Linker settings + conf.linker do |linker| + linker.flags = '-Wl,-z,relro' + end + +end diff --git a/debian/rules b/debian/rules index 2d33f6ac89..2f117ac6bc 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,20 @@ #!/usr/bin/make -f +orig_config_exists := $(shell ls | grep build_config.rb.orig) +define evert_config + mv build_config.rb.orig build_config.rb +endef + %: dh $@ + +override_dh_auto_configure: + mv build_config.rb build_config.rb.orig + cp debian/build_config.rb build_config.rb + + dh_auto_configure + +override_dh_auto_clean: + $(if $(orig_config_exists) ,$(evert_config),) + + dh_auto_clean From 6e05b1af72ad1e114616fa0b741f242375076b44 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 9 Feb 2013 14:51:52 +0900 Subject: [PATCH 005/174] Add Akira Mitsui to Uploaders Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index aa232b0524..92c44aba68 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: mruby Section: ruby Priority: extra Maintainer: Nobuhiro Iwamatsu +Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison Standards-Version: 3.9.4 From d5818cf187c8102f8178e298b9d1469885923577 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 9 Feb 2013 14:55:16 +0900 Subject: [PATCH 006/174] Add Vcs-Git and Vcs-Browser field Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 92c44aba68..57a07c79be 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison Standards-Version: 3.9.4 +Vcs-Git: git://github.com/mruby-debian/mruby.git +Vcs-Browser: https://github.com/mruby-debian/mruby Package: mruby Architecture: any From 8c67ab104865a49b9c07a6cb2da314781c11f939 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 13 Feb 2013 12:59:21 +0900 Subject: [PATCH 007/174] Update upstream Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fd69e3bb2..ec246bfb85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mruby (0.0.0~20130209+git94204089-1) experimental; urgency=low +mruby (0.0.0_20130211+git8578cd62-1) experimental; urgency=low * Initial release. (Closes: #697835) - -- Nobuhiro Iwamatsu Sat, 09 Feb 2013 00:15:35 +0900 + -- Nobuhiro Iwamatsu Wed, 13 Feb 2013 12:58:54 +0900 From 193fdf87343033b39d617bce20202ff9408f11c2 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 13 Feb 2013 13:00:08 +0900 Subject: [PATCH 008/174] Fix version Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ec246bfb85..e6a6a957a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (0.0.0_20130211+git8578cd62-1) experimental; urgency=low +mruby (0.0.0~20130211+git8578cd62-1) experimental; urgency=low * Initial release. (Closes: #697835) From 2506f8d69a51aca7e8f35120197ea7683259516e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 23 Feb 2013 08:37:51 +0900 Subject: [PATCH 009/174] Update description Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/control b/debian/control index 57a07c79be..efca9e74e4 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,11 @@ Description: lightweight implementation of the Ruby language mruby is the lightweight implementation of the Ruby language complying to the ISO standard. This can be linked and embedded within your application. + . + This package contains the following tools: + * mirb: Embeddable interactive ruby shell + * mrbc: mruby compiler + * mruby: mruby interpreter Package: libmruby-dev Architecture: any From bcfff11e92016b6a1fece27db2034a29bd45bd06 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 4 Mar 2013 13:51:25 +0900 Subject: [PATCH 010/174] Update upstream to abecb781 Signed-off-by: Nobuhiro Iwamatsu --- Makefile | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d9a3437ad3..02a27a853a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # We provide a minimalistic version called minirake inside of our # codebase. -RAKE = ruby ./minirake +RAKE = ruby ./minirake --verbose .PHONY : all all : diff --git a/debian/changelog b/debian/changelog index e6a6a957a6..7f06d3d070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mruby (0.0.0~20130211+git8578cd62-1) experimental; urgency=low +mruby (0.0.0~20130304+gitabecb781-1) experimental; urgency=low * Initial release. (Closes: #697835) - -- Nobuhiro Iwamatsu Wed, 13 Feb 2013 12:58:54 +0900 + -- Nobuhiro Iwamatsu Mon, 04 Mar 2013 13:50:48 +0900 From f88b0faf076663bd8876c69d92039d7e5a97a8c5 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 5 Apr 2013 13:52:31 +0900 Subject: [PATCH 011/174] Update to 97aee949 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f06d3d070..40edf65f3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mruby (0.0.0~20130304+gitabecb781-1) experimental; urgency=low +mruby (0.0.0~20130405+git97aee949-1) experimental; urgency=low * Initial release. (Closes: #697835) - -- Nobuhiro Iwamatsu Mon, 04 Mar 2013 13:50:48 +0900 + -- Nobuhiro Iwamatsu Fri, 05 Apr 2013 13:51:18 +0900 From 10ffa44abd6cb64e178ce1337b9f3e777cba05fb Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 15 Apr 2013 14:59:28 +0900 Subject: [PATCH 012/174] Update debian's build_config.rb Signed-off-by: Nobuhiro Iwamatsu --- debian/build_config.rb | 118 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 3 deletions(-) diff --git a/debian/build_config.rb b/debian/build_config.rb index aa7663dc34..e248d6b416 100644 --- a/debian/build_config.rb +++ b/debian/build_config.rb @@ -1,13 +1,125 @@ MRuby::Build.new do |conf| - # load specific toolchain settings toolchain :gcc - conf.cc do |cc| + + conf.cc do |cc| cc.flags = '-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security' end # Linker settings conf.linker do |linker| - linker.flags = '-Wl,-z,relro' + linker.flags = '-Wl,-z,relro' end + # Use mrbgems + # conf.gem 'examples/mrbgems/ruby_extension_example' + # conf.gem 'examples/mrbgems/c_extension_example' do |g| + # g.cc.flags << '-g' # append cflags in this gem + # end + # conf.gem 'examples/mrbgems/c_and_ruby_extension_example' + # conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master' + # conf.gem :git => 'git@github.com:masuidrive/mrbgems-example.git', :branch => 'master', :options => '-v' + + # Use standard Kernel#sprintf method + conf.gem "#{root}/mrbgems/mruby-sprintf" + + # Use standard print/puts/p + conf.gem "#{root}/mrbgems/mruby-print" + + # Use standard Math module + conf.gem "#{root}/mrbgems/mruby-math" + + # Use standard Time class + conf.gem "#{root}/mrbgems/mruby-time" + + # Use standard Struct class + conf.gem "#{root}/mrbgems/mruby-struct" + + # Use extensional Enumerable module + conf.gem "#{root}/mrbgems/mruby-enum-ext" + + # Use extensional String class + conf.gem "#{root}/mrbgems/mruby-string-ext" + + # Use extensional Numeric class + conf.gem "#{root}/mrbgems/mruby-numeric-ext" + + # Use extensional Array class + conf.gem "#{root}/mrbgems/mruby-array-ext" + + # Use extensional Hash class + conf.gem "#{root}/mrbgems/mruby-hash-ext" + + # Use Random class + conf.gem "#{root}/mrbgems/mruby-random" + + # No use eval method + # conf.gem "#{root}/mrbgems/mruby-eval" + + + # Generate binaries + # conf.bins = %w(mrbc mruby mirb) + + # C compiler settings + # conf.cc do |cc| + # cc.command = ENV['CC'] || 'gcc' + # cc.flags = [ENV['CFLAGS'] || %w()] + # cc.include_paths = ["#{root}/include"] + # cc.defines = %w(DISABLE_GEMS) + # cc.option_include_path = '-I%s' + # cc.option_define = '-D%s' + # cc.compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}" + # end + + # Linker settings + # conf.linker do |linker| + # linker.command = ENV['LD'] || 'gcc' + # linker.flags = [ENV['LDFLAGS'] || []] + # linker.flags_before_libraries = [] + # linker.libraries = %w() + # linker.flags_after_libraries = [] + # linker.library_paths = [] + # linker.option_library = '-l%s' + # linker.option_library_path = '-L%s' + # linker.link_options = "%{flags} -o %{outfile} %{objs} %{libs}" + # end + + # Archiver settings + # conf.archiver do |archiver| + # archiver.command = ENV['AR'] || 'ar' + # archiver.archive_options = 'rs %{outfile} %{objs}' + # end + + # Parser generator settings + # conf.yacc do |yacc| + # yacc.command = ENV['YACC'] || 'bison' + # yacc.compile_options = '-o %{outfile} %{infile}' + # end + + # gperf settings + # conf.gperf do |gperf| + # gperf.command = 'gperf' + # gperf.compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}' + # end + + # file extensions + # conf.exts do |exts| + # exts.object = '.o' + # exts.executable = '' # '.exe' if Windows + # exts.library = '.a' + # end + + # file separetor + # conf.file_separator = '/' end + +# Define cross build settings +# MRuby::CrossBuild.new('32bit') do |conf| +# toolchain :gcc +# +# conf.cc.flags << "-m32" +# conf.linker.flags << "-m32" +# +# conf.build_mrbtest_lib_only +# +# conf.gem 'examples/mrbgems/c_and_ruby_extension_example' +# end From b6a3df8838f55baea0379545ed305ecdbd41c2c6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 15 Apr 2013 15:44:29 +0900 Subject: [PATCH 013/174] Update debian's build_config.rb Signed-off-by: Nobuhiro Iwamatsu --- debian/build_config.rb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/build_config.rb b/debian/build_config.rb index e248d6b416..b336d3b234 100644 --- a/debian/build_config.rb +++ b/debian/build_config.rb @@ -6,7 +6,7 @@ cc.flags = '-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security' end # Linker settings - conf.linker do |linker| + conf.linker do |linker| linker.flags = '-Wl,-z,relro' end @@ -49,15 +49,25 @@ # Use extensional Hash class conf.gem "#{root}/mrbgems/mruby-hash-ext" + # Use extensional Range class + conf.gem "#{root}/mrbgems/mruby-range-ext" + # Use Random class conf.gem "#{root}/mrbgems/mruby-random" - + # No use eval method # conf.gem "#{root}/mrbgems/mruby-eval" # Generate binaries - # conf.bins = %w(mrbc mruby mirb) + # conf.bins = %w(mrbc) + + # Generate mirb command + conf.gem "#{root}/mrbgems/mruby-bin-mirb" + + # Generate mruby command + conf.gem "#{root}/mrbgems/mruby-bin-mruby" + # C compiler settings # conf.cc do |cc| @@ -122,4 +132,7 @@ # conf.build_mrbtest_lib_only # # conf.gem 'examples/mrbgems/c_and_ruby_extension_example' +# +# conf.test_runner.command = 'env' +# # end From 9992a7db2a50847b5ad4fa9cd6be1183b4853a32 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 15 Apr 2013 15:46:14 +0900 Subject: [PATCH 014/174] Update debian/changelog Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40edf65f3e..c1fa1a5a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mruby (0.0.0~20130405+git97aee949-1) experimental; urgency=low +mruby (0.0.0~20130415+gita06e0ab3-1) experimental; urgency=low * Initial release. (Closes: #697835) - -- Nobuhiro Iwamatsu Fri, 05 Apr 2013 13:51:18 +0900 + -- Nobuhiro Iwamatsu Mon, 15 Apr 2013 15:45:59 +0900 From f143d0b9687924c872fa97222ee50caa269f20af Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 18 Apr 2013 13:06:32 +0900 Subject: [PATCH 015/174] Update debian/copyright. Signed-off-by: Nobuhiro Iwamatsu --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index d8cb525a3a..5584dc78b1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: mruby Source: https://github.com/mruby/mruby Files: * -Copyright: Copyright (c) 2012 mruby developers +Copyright: Copyright (c) 2010-2013 mruby developers License: MIT Files: debian/* From b862ea04110a8b6a0a5f015137fd31e76de69acc Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 20 Apr 2013 12:23:32 +0900 Subject: [PATCH 016/174] Remove build_config.rb from debian directory This fuction was moved to patch. Signed-off-by: Nobuhiro Iwamatsu --- debian/build_config.rb | 138 ----------------------------------------- debian/rules | 16 ----- 2 files changed, 154 deletions(-) delete mode 100644 debian/build_config.rb diff --git a/debian/build_config.rb b/debian/build_config.rb deleted file mode 100644 index b336d3b234..0000000000 --- a/debian/build_config.rb +++ /dev/null @@ -1,138 +0,0 @@ -MRuby::Build.new do |conf| - # load specific toolchain settings - toolchain :gcc - - conf.cc do |cc| - cc.flags = '-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security' - end - # Linker settings - conf.linker do |linker| - linker.flags = '-Wl,-z,relro' - end - - # Use mrbgems - # conf.gem 'examples/mrbgems/ruby_extension_example' - # conf.gem 'examples/mrbgems/c_extension_example' do |g| - # g.cc.flags << '-g' # append cflags in this gem - # end - # conf.gem 'examples/mrbgems/c_and_ruby_extension_example' - # conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master' - # conf.gem :git => 'git@github.com:masuidrive/mrbgems-example.git', :branch => 'master', :options => '-v' - - # Use standard Kernel#sprintf method - conf.gem "#{root}/mrbgems/mruby-sprintf" - - # Use standard print/puts/p - conf.gem "#{root}/mrbgems/mruby-print" - - # Use standard Math module - conf.gem "#{root}/mrbgems/mruby-math" - - # Use standard Time class - conf.gem "#{root}/mrbgems/mruby-time" - - # Use standard Struct class - conf.gem "#{root}/mrbgems/mruby-struct" - - # Use extensional Enumerable module - conf.gem "#{root}/mrbgems/mruby-enum-ext" - - # Use extensional String class - conf.gem "#{root}/mrbgems/mruby-string-ext" - - # Use extensional Numeric class - conf.gem "#{root}/mrbgems/mruby-numeric-ext" - - # Use extensional Array class - conf.gem "#{root}/mrbgems/mruby-array-ext" - - # Use extensional Hash class - conf.gem "#{root}/mrbgems/mruby-hash-ext" - - # Use extensional Range class - conf.gem "#{root}/mrbgems/mruby-range-ext" - - # Use Random class - conf.gem "#{root}/mrbgems/mruby-random" - - # No use eval method - # conf.gem "#{root}/mrbgems/mruby-eval" - - - # Generate binaries - # conf.bins = %w(mrbc) - - # Generate mirb command - conf.gem "#{root}/mrbgems/mruby-bin-mirb" - - # Generate mruby command - conf.gem "#{root}/mrbgems/mruby-bin-mruby" - - - # C compiler settings - # conf.cc do |cc| - # cc.command = ENV['CC'] || 'gcc' - # cc.flags = [ENV['CFLAGS'] || %w()] - # cc.include_paths = ["#{root}/include"] - # cc.defines = %w(DISABLE_GEMS) - # cc.option_include_path = '-I%s' - # cc.option_define = '-D%s' - # cc.compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}" - # end - - # Linker settings - # conf.linker do |linker| - # linker.command = ENV['LD'] || 'gcc' - # linker.flags = [ENV['LDFLAGS'] || []] - # linker.flags_before_libraries = [] - # linker.libraries = %w() - # linker.flags_after_libraries = [] - # linker.library_paths = [] - # linker.option_library = '-l%s' - # linker.option_library_path = '-L%s' - # linker.link_options = "%{flags} -o %{outfile} %{objs} %{libs}" - # end - - # Archiver settings - # conf.archiver do |archiver| - # archiver.command = ENV['AR'] || 'ar' - # archiver.archive_options = 'rs %{outfile} %{objs}' - # end - - # Parser generator settings - # conf.yacc do |yacc| - # yacc.command = ENV['YACC'] || 'bison' - # yacc.compile_options = '-o %{outfile} %{infile}' - # end - - # gperf settings - # conf.gperf do |gperf| - # gperf.command = 'gperf' - # gperf.compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}' - # end - - # file extensions - # conf.exts do |exts| - # exts.object = '.o' - # exts.executable = '' # '.exe' if Windows - # exts.library = '.a' - # end - - # file separetor - # conf.file_separator = '/' -end - -# Define cross build settings -# MRuby::CrossBuild.new('32bit') do |conf| -# toolchain :gcc -# -# conf.cc.flags << "-m32" -# conf.linker.flags << "-m32" -# -# conf.build_mrbtest_lib_only -# -# conf.gem 'examples/mrbgems/c_and_ruby_extension_example' -# -# conf.test_runner.command = 'env' -# -# end diff --git a/debian/rules b/debian/rules index 2f117ac6bc..2d33f6ac89 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,4 @@ #!/usr/bin/make -f -orig_config_exists := $(shell ls | grep build_config.rb.orig) -define evert_config - mv build_config.rb.orig build_config.rb -endef - %: dh $@ - -override_dh_auto_configure: - mv build_config.rb build_config.rb.orig - cp debian/build_config.rb build_config.rb - - dh_auto_configure - -override_dh_auto_clean: - $(if $(orig_config_exists) ,$(evert_config),) - - dh_auto_clean From 1f1500d888ee564762f2d08cb1b78e982c59924f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 20 Apr 2013 12:25:11 +0900 Subject: [PATCH 017/174] Add dep3 header Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/enable_verbose_build.patch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/patches/enable_verbose_build.patch b/debian/patches/enable_verbose_build.patch index 5db6a9774a..ccc07a9490 100644 --- a/debian/patches/enable_verbose_build.patch +++ b/debian/patches/enable_verbose_build.patch @@ -1,3 +1,8 @@ +Description: Enable verbose build +Forwarded: not need +Author: Nobuhiro Iwamatsu +Last-Update: 2013-04-20 + diff --git a/Makefile b/Makefile index d9a3437..02a27a8 100644 --- a/Makefile From 04a9df376dc39ac04362f97e8ee9596472410bc7 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 20 Apr 2013 14:52:37 +0900 Subject: [PATCH 018/174] Change distribution to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c1fa1a5a54..745053aa3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (0.0.0~20130415+gita06e0ab3-1) experimental; urgency=low +mruby (0.0.0~20130415+gita06e0ab3-1) unstable; urgency=low * Initial release. (Closes: #697835) From 3a4d65b1534a3072434bbd7676501050307d5854 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 15 May 2013 07:30:25 +0900 Subject: [PATCH 019/174] Update to 20130515+git95fb1fd8 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 745053aa3b..16387de9c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -mruby (0.0.0~20130415+gita06e0ab3-1) unstable; urgency=low +mruby (0.0.0~20130515+git95fb1fd8-1) experimental; urgency=low * Initial release. (Closes: #697835) - -- Nobuhiro Iwamatsu Mon, 15 Apr 2013 15:45:59 +0900 + -- Nobuhiro Iwamatsu Wed, 15 May 2013 07:29:35 +0900 From 2bfee6c0b6fe444d8cc82dcfe75aa89287d882aa Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 31 May 2013 17:34:09 +0900 Subject: [PATCH 020/174] Update to 20130531+git5c6d2818 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 16387de9c8..cced36ca92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20130531+git5c6d2818-1) experimental; urgency=low + + * New upstream release. + + -- Nobuhiro Iwamatsu Fri, 31 May 2013 17:33:04 +0900 + mruby (0.0.0~20130515+git95fb1fd8-1) experimental; urgency=low * Initial release. (Closes: #697835) From 8dcdda11d47bf72df9de85fdbbda05afc73ff787 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 4 Jul 2013 08:30:03 +0900 Subject: [PATCH 021/174] Update to 0.0.0~20130704+git4c8fd521 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cced36ca92..b62cb6a28c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20130704+git4c8fd521-1) experimental; urgency=low + + * New upstream release. + + -- Nobuhiro Iwamatsu Thu, 04 Jul 2013 08:27:16 +0900 + mruby (0.0.0~20130531+git5c6d2818-1) experimental; urgency=low * New upstream release. From 209c46ec286d3a78018031cdb10a41c601065213 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 1 Aug 2013 07:44:19 +0900 Subject: [PATCH 022/174] Update to 0.0.0~20130801+gitc550a0f8 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b62cb6a28c..3a4ce844f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20130801+gitc550a0f8-1) experimental; urgency=low + + * New upstream release. + + -- Nobuhiro Iwamatsu Thu, 01 Aug 2013 07:43:27 +0900 + mruby (0.0.0~20130704+git4c8fd521-1) experimental; urgency=low * New upstream release. From 3ff89ed30b45c572f0cadfa66b638f9845cdb670 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 3 Sep 2013 07:50:47 +0900 Subject: [PATCH 023/174] Update to 0.0.0~20130903+gitad5c408c Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3a4ce844f5..9b3797daa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20130903+gitad5c408c-1) experimental; urgency=low + + * New upstream release. + + -- Nobuhiro Iwamatsu Tue, 03 Sep 2013 07:49:24 +0900 + mruby (0.0.0~20130801+gitc550a0f8-1) experimental; urgency=low * New upstream release. From 151c754d55cd12dd19eb3d0d7a9f6f2fb4e8495e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 11 Oct 2013 13:37:28 +0900 Subject: [PATCH 024/174] Snapshot, taken from the master (20131011) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9b3797daa3..38f77b0024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mruby (0.0.0~20131011+git480e3297-1) unstable; urgency=low + + * Snapshot, taken from the master (20131011). + * Upload to unstable. + + -- Nobuhiro Iwamatsu Fri, 11 Oct 2013 13:34:59 +0900 + mruby (0.0.0~20130903+gitad5c408c-1) experimental; urgency=low * New upstream release. From c1aed6bc20325a36dfbc3cfe93233c1e64c6fbfc Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 7 Nov 2013 12:24:35 +0900 Subject: [PATCH 025/174] Snapshot, taken from the master (20131107) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 38f77b0024..333b508118 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20131107+gitf80401de-1) unstable; urgency=low + + * Snapshot, taken from the master (20131107). + + -- Nobuhiro Iwamatsu Thu, 07 Nov 2013 12:23:24 +0900 + mruby (0.0.0~20131011+git480e3297-1) unstable; urgency=low * Snapshot, taken from the master (20131011). From cea025e4b9201531a0640ea5eeb93d77db81afa5 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 14 Dec 2013 10:57:27 +0900 Subject: [PATCH 026/174] Update debian/changelog Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 333b508118..6ac625e1a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20131214+git882afdea-1) unstable; urgency=medium + + * Snapshot, taken from the master (20131214). + + -- Nobuhiro Iwamatsu Sat, 14 Dec 2013 10:56:42 +0900 + mruby (0.0.0~20131107+gitf80401de-1) unstable; urgency=low * Snapshot, taken from the master (20131107). From fc3696eae63baab3d1b2b41c2fbc5dd704344892 Mon Sep 17 00:00:00 2001 From: murase_syuka Date: Thu, 2 Jan 2014 14:29:47 +0900 Subject: [PATCH 027/174] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6ac625e1a8..9b40488025 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (0.0.0~20140102+gite8dd8180-1) unstable; urgency=medium + + * Snapshot, taken from the master (20140102). + + -- Akira Mitsui Thu, 2 Jan 2014 14:24:54 +0900 + mruby (0.0.0~20131214+git882afdea-1) unstable; urgency=medium * Snapshot, taken from the master (20131214). From f94125e10dde61a83d56df63994287f6dbd2b689 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 22 Mar 2014 01:30:42 +0900 Subject: [PATCH 028/174] Update to 1.0.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b40488025..30bc5e0467 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -mruby (0.0.0~20140102+gite8dd8180-1) unstable; urgency=medium +mruby (1.0.0-1) unstable; urgency=medium - * Snapshot, taken from the master (20140102). + * Update to 1.0.0. -- Akira Mitsui Thu, 2 Jan 2014 14:24:54 +0900 From 3ada17631908343ad63527e1fc55dc5736ac91f4 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 22 Mar 2014 01:32:55 +0900 Subject: [PATCH 029/174] Update Standards-Version to 3.9.5 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 30bc5e0467..66d33e869e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.0.0-1) unstable; urgency=medium * Update to 1.0.0. + * Update Standards-Version to 3.9.5. -- Akira Mitsui Thu, 2 Jan 2014 14:24:54 +0900 diff --git a/debian/control b/debian/control index efca9e74e4..00b9480ebb 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 3ceb07ab52f9242c67019e172c133fc318a431cf Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 22 Mar 2014 01:33:46 +0900 Subject: [PATCH 030/174] Update debian/changelog Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66d33e869e..63dc08fc40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -mruby (1.0.0-1) unstable; urgency=medium +mruby (1.0.0-1) unstable; urgency=low - * Update to 1.0.0. + * New upstream release(1.0.0). * Update Standards-Version to 3.9.5. -- Akira Mitsui Thu, 2 Jan 2014 14:24:54 +0900 From 8d3597d85cafdd2e38238832d664a5deff1bdd90 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Mon, 23 Jun 2014 18:55:38 +0900 Subject: [PATCH 031/174] Snapshot, taken from the master (20140623) Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 63dc08fc40..8591da641f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.0.0+20140623+gitc938b2f6-1) unstable; urgency=medium + + * Snapshot, taken from the master (20140623). + + -- Akira Mitsui Mon, 23 Jun 2014 18:58:59 +0900 + mruby (1.0.0-1) unstable; urgency=low * New upstream release(1.0.0). From a5e9d967a7cb96b63090e794f274382a146d99ae Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 24 Jun 2014 09:39:28 +0900 Subject: [PATCH 032/174] Remove verbose build By commit bcfff11e, Makefile was set verbose build. This reverts this change. Signed-off-by: Nobuhiro Iwamatsu --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 699092846b..4912f17e1c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # We provide a minimalistic version called minirake inside of our # codebase. -RAKE = ruby ./minirake --verbose +RAKE = ruby ./minirake all : $(RAKE) From 8d29b8e4eb1a05305c9c8bb50e9398fd176c6cd1 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 24 Jun 2014 09:42:01 +0900 Subject: [PATCH 033/174] Update enable_verbose_build.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/enable_verbose_build.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/enable_verbose_build.patch b/debian/patches/enable_verbose_build.patch index ccc07a9490..7b72e338cb 100644 --- a/debian/patches/enable_verbose_build.patch +++ b/debian/patches/enable_verbose_build.patch @@ -4,15 +4,15 @@ Author: Nobuhiro Iwamatsu Last-Update: 2013-04-20 diff --git a/Makefile b/Makefile -index d9a3437..02a27a8 100644 +index 4912f17..6990928 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ - # We provide a minimalistic version called minirake inside of our + # We provide a minimalistic version called minirake inside of our # codebase. -RAKE = ruby ./minirake +RAKE = ruby ./minirake --verbose - .PHONY : all all : + $(RAKE) From 8ad6289ec4beba9877dabaef35e311b7b22e0363 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 19 Sep 2014 08:41:28 +0900 Subject: [PATCH 034/174] Snapshot, taken from the master (20140919) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8591da641f..cf4fa758b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.0.0+20140919+git5f7b0580-1) unstable; urgency=medium + + * Snapshot, taken from the master (20140919). + + -- Nobuhiro Iwamatsu Fri, 19 Sep 2014 08:40:31 +0900 + mruby (1.0.0+20140623+gitc938b2f6-1) unstable; urgency=medium * Snapshot, taken from the master (20140623). From 79e7fd100b72c2baa236eadba2efd11d96fe7df6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 15 Oct 2014 19:50:34 +0900 Subject: [PATCH 035/174] Snapshot, taken from the master (20141015) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cf4fa758b8..1a2fbeec8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.0.0+20141015+gitb4cc962c-1) unstable; urgency=medium + + * Snapshot, taken from the master (20141015). + + -- Nobuhiro Iwamatsu Wed, 15 Oct 2014 19:49:36 +0900 + mruby (1.0.0+20140919+git5f7b0580-1) unstable; urgency=medium * Snapshot, taken from the master (20140919). From 2a5b635716a61711edfc09806fb622625ee1c184 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sun, 9 Nov 2014 23:32:58 +0900 Subject: [PATCH 036/174] Snapshot, taken from the master (20141109) Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1a2fbeec8d..f19d5b7b3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.0.0+20141109+gitfbadd660-1) unstable; urgency=medium + + * Snapshot, taken from the master (20141109). + + -- Akira Mitsui Sun, 09 Nov 2014 23:26:31 +0900 + mruby (1.0.0+20141015+gitb4cc962c-1) unstable; urgency=medium * Snapshot, taken from the master (20141015). From cccbcb5ade832ec408f41a0e0faa2879cc23aee9 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Tue, 25 Nov 2014 22:10:22 +0900 Subject: [PATCH 037/174] Update to 1.1.0 Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f19d5b7b3b..ba05f3c983 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.1.0-1) unstable; urgency=low + + * New upstream release(1.1.0). + + -- Akira Mitsui Tue, 25 Nov 2014 22:06:20 +0900 + mruby (1.0.0+20141109+gitfbadd660-1) unstable; urgency=medium * Snapshot, taken from the master (20141109). From a9464feb5fb394e372c75f82ebc1b3763fc8e864 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Wed, 26 Nov 2014 23:47:25 +0900 Subject: [PATCH 038/174] Use mruby default CFLAGS because mrb debugger build error without -std=gnu99 Signed-off-by: Akira Mitsui --- debian/patches/adhoc_use_default_cflags.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 19 insertions(+) create mode 100644 debian/patches/adhoc_use_default_cflags.patch diff --git a/debian/patches/adhoc_use_default_cflags.patch b/debian/patches/adhoc_use_default_cflags.patch new file mode 100644 index 0000000000..0717cb6258 --- /dev/null +++ b/debian/patches/adhoc_use_default_cflags.patch @@ -0,0 +1,18 @@ +Description: Adhoc Use default CFLAGS +Forwarded: not need +Author: Akira Mitsui +Last-Update: 2014-11-26 + +diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake +index 7edf936..fbc182a 100644 +--- a/tasks/toolchains/gcc.rake ++++ b/tasks/toolchains/gcc.rake +@@ -1,7 +1,7 @@ + MRuby::Toolchain.new(:gcc) do |conf| + [conf.cc, conf.objc, conf.asm].each do |cc| + cc.command = ENV['CC'] || 'gcc' +- cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement)] ++ cc.flags = [%w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement)] + cc.defines = %w(DISABLE_GEMS) + cc.option_include_path = '-I%s' + cc.option_define = '-D%s' diff --git a/debian/patches/series b/debian/patches/series index 7c58b563f6..dce1224173 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ enable_verbose_build.patch +adhoc_use_default_cflags.patch From 23b5794ffabfdad64c581eb06e14d9f53c6affc3 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sat, 29 Nov 2014 18:49:31 +0900 Subject: [PATCH 039/174] Revert "Use mruby default CFLAGS" prefer Debian Default CFLAGS than mruby Default. This reverts commit a9464feb5fb394e372c75f82ebc1b3763fc8e864. --- debian/patches/adhoc_use_default_cflags.patch | 18 ------------------ debian/patches/series | 1 - 2 files changed, 19 deletions(-) delete mode 100644 debian/patches/adhoc_use_default_cflags.patch diff --git a/debian/patches/adhoc_use_default_cflags.patch b/debian/patches/adhoc_use_default_cflags.patch deleted file mode 100644 index 0717cb6258..0000000000 --- a/debian/patches/adhoc_use_default_cflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Adhoc Use default CFLAGS -Forwarded: not need -Author: Akira Mitsui -Last-Update: 2014-11-26 - -diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake -index 7edf936..fbc182a 100644 ---- a/tasks/toolchains/gcc.rake -+++ b/tasks/toolchains/gcc.rake -@@ -1,7 +1,7 @@ - MRuby::Toolchain.new(:gcc) do |conf| - [conf.cc, conf.objc, conf.asm].each do |cc| - cc.command = ENV['CC'] || 'gcc' -- cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement)] -+ cc.flags = [%w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement)] - cc.defines = %w(DISABLE_GEMS) - cc.option_include_path = '-I%s' - cc.option_define = '-D%s' diff --git a/debian/patches/series b/debian/patches/series index dce1224173..7c58b563f6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ enable_verbose_build.patch -adhoc_use_default_cflags.patch From 64af05d852abe3817c9d922228a20d3c6ff7f105 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Tue, 2 Dec 2014 18:38:58 +0900 Subject: [PATCH 040/174] STRTOUL macro is not support non-C99 and non-C11 mode. Therefore, if this was compiled without "-std=gnu99" option, we get the following error. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ---- error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode ---- This fixes syntax of STRTOUL macro. And this changes so that it can be compiled when C99 or C11 mode has not been specified. Signed-off-by: Akira Mitsui --- ...ugger-Fix-compile-without-C99-or-C11.patch | 24 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 25 insertions(+) create mode 100644 debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch diff --git a/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch b/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch new file mode 100644 index 0000000000..e62a5c4b29 --- /dev/null +++ b/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch @@ -0,0 +1,24 @@ +Description: mruby-bin-debugger Fix compile without C99 or C11 +Forwarded: not need +Author: Akira Mitsui +Last-Update: 2014-12-02 + +diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c +index 9764d4e..1a7a63f 100755 +--- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c ++++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c +@@ -58,9 +58,11 @@ print_api_common_error(int32_t error) + } + + #undef STRTOUL +-#define STRTOUL(ul,s) \ +- ul = 0; \ +- for(int i=0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); ++#define STRTOUL(ul,s) { \ ++ int i; \ ++ ul = 0; \ ++ for(i = 0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); \ ++} + + static int32_t + parse_breakpoint_no(char* args) diff --git a/debian/patches/series b/debian/patches/series index 7c58b563f6..ec0a04645b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ enable_verbose_build.patch +mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch From 99f163c89b19c273cf864530db53a221340195ce Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Wed, 3 Dec 2014 21:45:50 +0900 Subject: [PATCH 041/174] fix patch author --- .../mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch b/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch index e62a5c4b29..bcca4ef814 100644 --- a/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch +++ b/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch @@ -1,6 +1,6 @@ Description: mruby-bin-debugger Fix compile without C99 or C11 Forwarded: not need -Author: Akira Mitsui +Author: Nobuhiro Iwamatsu Last-Update: 2014-12-02 diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c From 3d049a2998e222f7f6d00b522f61ab58ae63b910 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Thu, 4 Dec 2014 00:19:09 +0900 Subject: [PATCH 042/174] update mruby bin tools --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 00b9480ebb..0d9caf6a6c 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,8 @@ Description: lightweight implementation of the Ruby language * mirb: Embeddable interactive ruby shell * mrbc: mruby compiler * mruby: mruby interpreter + * mrdb: mruby debugger + * mruby-strip: mruby strip Package: libmruby-dev Architecture: any From 6c22ad78a0dd887fedb256685b79bf4910846cf3 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Mon, 8 Dec 2014 10:25:02 +0900 Subject: [PATCH 043/174] update man pages Signed-off-by: Akira Mitsui --- debian/man/mirb.1 | 14 +++++++++++++- debian/man/mrbc.1 | 9 +++++---- debian/man/mruby.1 | 7 +------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/debian/man/mirb.1 b/debian/man/mirb.1 index dda56596a2..45b8484978 100644 --- a/debian/man/mirb.1 +++ b/debian/man/mirb.1 @@ -5,12 +5,24 @@ mirb \- Embeddable Interactive Ruby Shell .SH SYNOPSIS .B mirb +[ potions ] .SH DESCRIPTION This manual page documents briefly the \fBmirb\fP. -This is a very early version, please test and report errors. .PP +.SH OPTIONS +.B \-v +Print version number, then trun on verbose mode. +.TP +.B \-\-verbose +Run in verbose mode. +.TP +.B \-\-version +Print the version. +.TP +.B \-\-copyright +Print the copyright. .SH AUTHOR This manual page was written by Nobuhiro Iwamatsu diff --git a/debian/man/mrbc.1 b/debian/man/mrbc.1 index f5900ab24f..14846d5bac 100644 --- a/debian/man/mrbc.1 +++ b/debian/man/mrbc.1 @@ -9,7 +9,7 @@ mrbc \- mruby compiler .SH DESCRIPTION This manual page documents briefly the \fBmrbc\fP. -. + .PP .SH OPTIONS .TP @@ -21,14 +21,15 @@ Set place the output into . .TP .B \-v Print version number, then trun on verbose mode. -Run in the foreground, printing log messages to stdout and debug -messages to stderr. +.TP +.B \-g +produce debugging information .TP .B \-B Output binary in C language format. .TP .B \-\-verbose -Run at verbose mode. +Run in verbose mode. .TP .B \-\-version Print the version. diff --git a/debian/man/mruby.1 b/debian/man/mruby.1 index a77b55141b..1af7aac1cd 100644 --- a/debian/man/mruby.1 +++ b/debian/man/mruby.1 @@ -25,14 +25,9 @@ one line of script .TP .B \-v Print version number, then trun on verbose mode. -Run in the foreground, printing log messages to stdout and debug -messages to stderr. -.TP -.B \-B -Output binary in C language format. .TP .B \-\-verbose -Run at verbose mode. +Run in verbose mode. .TP .B \-\-version Print the version. From badfa2ff4a6d5e84275864db86df6034f11ce2bf Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Mon, 8 Dec 2014 10:50:55 +0900 Subject: [PATCH 044/174] add man pages Signed-off-by: Akira Mitsui --- debian/man/mrdb.1 | 30 ++++++++++++++++++++++++++++++ debian/man/mruby-strip.1 | 22 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 debian/man/mrdb.1 create mode 100644 debian/man/mruby-strip.1 diff --git a/debian/man/mrdb.1 b/debian/man/mrdb.1 new file mode 100644 index 0000000000..2465b75cec --- /dev/null +++ b/debian/man/mrdb.1 @@ -0,0 +1,30 @@ +.TH "MRDB" "1" "2014-12-08" "MRDB" "MRDB" + +.SH NAME +mrdb \- mruby debugger + +.SH SYNOPSIS +.B mrdb +[ potions ] programfile + +.SH DESCRIPTION +This manual page documents briefly the \fBmrdb\fP. + +.PP +.SH OPTIONS +.TP +.B \-b +load and execute RiteBinary (mrb) file +.TP +.B \-d +specify source directory +.TP +.B \-\-version +Print the version. +.TP +.B \-\-copyright +Print the copyright. + +.SH AUTHOR +This manual page was written by Akira Mitsui +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/man/mruby-strip.1 b/debian/man/mruby-strip.1 new file mode 100644 index 0000000000..822c01dcaa --- /dev/null +++ b/debian/man/mruby-strip.1 @@ -0,0 +1,22 @@ +.TH "MRUBY-STRIP" 1 "2014-12-08" "MRUBY-STRIP" "MRUBY-STRIP" + +.SH NAME +mruby-strip \- Discard symbols from object files. + +.SH SYNOPSIS +.B mruby-strip +[ potions ] irepfiles + +.SH DESCRIPTION +This manual page documents briefly the \fBmruby-strip\fP. + +.PP +.SH OPTIONS +.TP +.B \-l, \-\-lvar +remove LVAR section too. + +.SH AUTHOR +This manual page was written by Akira Mitsui +for the Debian GNU/Linux system (but may be used by others). + From 164d05c3d56b3a52757dd7f392778908635c7185 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Mon, 8 Dec 2014 11:26:23 +0900 Subject: [PATCH 045/174] fix typo Signed-off-by: Akira Mitsui --- debian/man/mruby.1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/man/mruby.1 b/debian/man/mruby.1 index 1af7aac1cd..00f34ed52f 100644 --- a/debian/man/mruby.1 +++ b/debian/man/mruby.1 @@ -9,8 +9,7 @@ mruby \- Lightweight implementation of the Ruby language .SH DESCRIPTION This manual page documents briefly the \fBmruby\fP. -.B mrbc -. + .PP .SH OPTIONS .TP From d9758dd4786b3f3e3363f79304c492bc36d3201d Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sat, 31 Jan 2015 17:03:22 +0900 Subject: [PATCH 046/174] Update debian/changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ba05f3c983..39150703ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ +mruby (1.1.0+20150131+git089f1f6c-1) unstable; urgency=medium + + * Snapshot, taken from the master (20150131). + + -- Akira Mitsui Sat, 31 Jan 2015 16:58:37 +0900 + mruby (1.1.0-1) unstable; urgency=low * New upstream release(1.1.0). + * Update man pages -- Akira Mitsui Tue, 25 Nov 2014 22:06:20 +0900 From 26f2a9f677c54a7df3aa120706ad3c185c51cd89 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Wed, 11 Feb 2015 13:11:40 +0900 Subject: [PATCH 047/174] rm patch. because it fixed in upstream --- ...ugger-Fix-compile-without-C99-or-C11.patch | 24 ------------------- debian/patches/series | 1 - 2 files changed, 25 deletions(-) delete mode 100644 debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch diff --git a/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch b/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch deleted file mode 100644 index bcca4ef814..0000000000 --- a/debian/patches/mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: mruby-bin-debugger Fix compile without C99 or C11 -Forwarded: not need -Author: Nobuhiro Iwamatsu -Last-Update: 2014-12-02 - -diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c -index 9764d4e..1a7a63f 100755 ---- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c -+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdbreak.c -@@ -58,9 +58,11 @@ print_api_common_error(int32_t error) - } - - #undef STRTOUL --#define STRTOUL(ul,s) \ -- ul = 0; \ -- for(int i=0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); -+#define STRTOUL(ul,s) { \ -+ int i; \ -+ ul = 0; \ -+ for(i = 0; ISDIGIT(s[i]); i++) ul = 10*ul + (s[i] -'0'); \ -+} - - static int32_t - parse_breakpoint_no(char* args) diff --git a/debian/patches/series b/debian/patches/series index ec0a04645b..7c58b563f6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ enable_verbose_build.patch -mruby-bin-debugger-Fix-compile-without-C99-or-C11.patch From 3dce5888afff0eab44a0d871829611f0742a19a0 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Thu, 16 Apr 2015 00:42:02 +0900 Subject: [PATCH 048/174] Update debian/changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39150703ea..9aed7b7603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ +mruby (1.1.0+20150416+gitfa824e32-1) unstable; urgency=medium + + * Snapshot, taken from the master (20150416). + + -- Akira Mitsui Thu, 16 Apr 2015 00:39:10 +0900 + mruby (1.1.0+20150131+git089f1f6c-1) unstable; urgency=medium * Snapshot, taken from the master (20150131). + * rm patch. because it fixed in upstream -- Akira Mitsui Sat, 31 Jan 2015 16:58:37 +0900 From 7d6a0f5d2066297de2dcbfeaa8ea5a1f7084b934 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 1 Jun 2015 14:34:49 +0900 Subject: [PATCH 049/174] Snapshot, taken from the master (20150601). Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9aed7b7603..e4ee653c84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.1.0+20150601+gitbd2686d8-1) unstable; urgency=medium + + * Snapshot, taken from the master (20150601). + + -- Nobuhiro Iwamatsu Mon, 01 Jun 2015 14:33:47 +0900 + mruby (1.1.0+20150416+gitfa824e32-1) unstable; urgency=medium * Snapshot, taken from the master (20150416). From f46be280ee5e41ccdc235f8d9cc0a10a0ebf55bb Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 1 Jun 2015 14:36:58 +0900 Subject: [PATCH 050/174] Bump Standards-Version to 3.9.6 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e4ee653c84..32f526a176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.1.0+20150601+gitbd2686d8-1) unstable; urgency=medium * Snapshot, taken from the master (20150601). + * Bump Standards-Version to 3.9.6. -- Nobuhiro Iwamatsu Mon, 01 Jun 2015 14:33:47 +0900 diff --git a/debian/control b/debian/control index 0d9caf6a6c..8ca08a205a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Git: git://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From c9256a5340f7befb1bbb23ca2cb9a0806b2fbdba Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 7 Aug 2015 07:10:21 +0900 Subject: [PATCH 051/174] Snapshot, taken from the master (20150807). Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 32f526a176..f80ed6b303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.1.0+20150807+git4fdf4922-1) unstable; urgency=medium + + * Snapshot, taken from the master (20150807). (Closes: #793296) + + -- Nobuhiro Iwamatsu Fri, 07 Aug 2015 07:08:54 +0900 + mruby (1.1.0+20150601+gitbd2686d8-1) unstable; urgency=medium * Snapshot, taken from the master (20150601). From 718e1b92fe5278d8605dac8fafa958bea59897c1 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 17 Aug 2015 19:54:26 +0900 Subject: [PATCH 052/174] Snapshot, taken from the master (20150817) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f80ed6b303..f9a44d2028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.1.0+20150817+gita1731254-1) unstable; urgency=medium + + * Snapshot, taken from the master (20150817). + + -- Nobuhiro Iwamatsu Mon, 17 Aug 2015 19:53:07 +0900 + mruby (1.1.0+20150807+git4fdf4922-1) unstable; urgency=medium * Snapshot, taken from the master (20150807). (Closes: #793296) From 7a7e61b986c2173c0d3045dcf73a3e023a8750c1 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 17 Aug 2015 20:05:42 +0900 Subject: [PATCH 053/174] Add patches/change_optimize_O2.patch. (Closes: #795367) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/patches/change_optimize_O2.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 15 insertions(+) create mode 100644 debian/patches/change_optimize_O2.patch diff --git a/debian/changelog b/debian/changelog index f9a44d2028..9af74de53e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.1.0+20150817+gita1731254-1) unstable; urgency=medium * Snapshot, taken from the master (20150817). + * Add patches/change_optimize_O2.patch. (Closes: #795367) -- Nobuhiro Iwamatsu Mon, 17 Aug 2015 19:53:07 +0900 diff --git a/debian/patches/change_optimize_O2.patch b/debian/patches/change_optimize_O2.patch new file mode 100644 index 0000000000..f5bba7053c --- /dev/null +++ b/debian/patches/change_optimize_O2.patch @@ -0,0 +1,13 @@ +diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake +index 9f8b4ed..64384d2 100644 +--- a/tasks/mruby_build.rake ++++ b/tasks/mruby_build.rake +@@ -100,7 +100,7 @@ module MRuby + compilers.each do |c| + c.defines += %w(MRB_DEBUG) + if toolchains.any? { |toolchain| toolchain == "gcc" } +- c.flags += %w(-g3 -O0) ++ c.flags += %w(-g3 -O2) + end + end + @mrbc.compile_options += ' -g' diff --git a/debian/patches/series b/debian/patches/series index 7c58b563f6..01bb2d118d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ enable_verbose_build.patch +change_optimize_O2.patch From 7946668c1b2d03d0bf6540c5c12dc79d1b3bc283 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 17 Aug 2015 20:31:33 +0900 Subject: [PATCH 054/174] Add patches/add_fpic_amd64.patch. (Closes: #795407) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/patches/add_fpic_amd64.patch | 12 ++++++++++++ debian/patches/series | 1 + 3 files changed, 14 insertions(+) create mode 100644 debian/patches/add_fpic_amd64.patch diff --git a/debian/changelog b/debian/changelog index 9af74de53e..a23858e833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mruby (1.1.0+20150817+gita1731254-1) unstable; urgency=medium * Snapshot, taken from the master (20150817). * Add patches/change_optimize_O2.patch. (Closes: #795367) + * Add patches/add_fpic_amd64.patch. (Closes: #795407) -- Nobuhiro Iwamatsu Mon, 17 Aug 2015 19:53:07 +0900 diff --git a/debian/patches/add_fpic_amd64.patch b/debian/patches/add_fpic_amd64.patch new file mode 100644 index 0000000000..13d49aa895 --- /dev/null +++ b/debian/patches/add_fpic_amd64.patch @@ -0,0 +1,12 @@ +diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake +index fb14558..90da985 100644 +--- a/tasks/toolchains/gcc.rake ++++ b/tasks/toolchains/gcc.rake +@@ -2,6 +2,7 @@ MRuby::Toolchain.new(:gcc) do |conf| + [conf.cc, conf.objc, conf.asm].each do |cc| + cc.command = ENV['CC'] || 'gcc' + cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings)] ++ cc.flags += %w(-fPIC) if ENV['DEB_TARGET_ARCH'] == 'amd64' + cc.defines = %w(DISABLE_GEMS) + cc.option_include_path = '-I%s' + cc.option_define = '-D%s' diff --git a/debian/patches/series b/debian/patches/series index 01bb2d118d..42ad968ec6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ enable_verbose_build.patch change_optimize_O2.patch +add_fpic_amd64.patch From fe47a8abe047f41ef12c726105c963e5a91083c2 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sun, 6 Sep 2015 09:59:34 +0900 Subject: [PATCH 055/174] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a23858e833..e94c26ff30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.1.0+20150906+git1cbbb7e1) unstable; urgency=medium + + * Snapshot, taken from the master (20150906). + + -- Akira Mitsui Sun, 06 Sep 2015 09:55:36 +0900 + mruby (1.1.0+20150817+gita1731254-1) unstable; urgency=medium * Snapshot, taken from the master (20150817). From 15ddac011dbdc9a370a595dbaea89853362b5d43 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 12 Sep 2015 13:06:25 +0900 Subject: [PATCH 056/174] Fix debian version Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e94c26ff30..aa6bf697a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (1.1.0+20150906+git1cbbb7e1) unstable; urgency=medium +mruby (1.1.0+20150906+git1cbbb7e1-1) unstable; urgency=medium * Snapshot, taken from the master (20150906). From 2ad9f1e131fcfd3113f27f4d8d1685e857f92ccb Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Wed, 21 Oct 2015 21:22:35 +0900 Subject: [PATCH 057/174] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa6bf697a1..43b82361f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.1.0+20151021+git68ba3862-1) unstable; urgency=medium + + * Snapshot, taken from the master (20151021). + + -- Akira Mitsui Wed, 21 Oct 2015 21:21:18 +0900 + mruby (1.1.0+20150906+git1cbbb7e1-1) unstable; urgency=medium * Snapshot, taken from the master (20150906). From 5ded4d4f95ed6ede7dafe49a347d2edd8c35ff31 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sat, 24 Oct 2015 15:03:20 +0900 Subject: [PATCH 058/174] bugfix for debuild debuild not define $SHELL environment variable. it happen mrbtest error. Signed-off-by: Akira Mitsui --- debian/changelog | 1 + debian/patches/fix_bintest_for_debuild.patch | 28 ++++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 debian/patches/fix_bintest_for_debuild.patch diff --git a/debian/changelog b/debian/changelog index 43b82361f1..f63cba7fed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.1.0+20151021+git68ba3862-1) unstable; urgency=medium * Snapshot, taken from the master (20151021). + * Add patches/fix_bintest_for_debuild.patch. -- Akira Mitsui Wed, 21 Oct 2015 21:21:18 +0900 diff --git a/debian/patches/fix_bintest_for_debuild.patch b/debian/patches/fix_bintest_for_debuild.patch new file mode 100644 index 0000000000..2e2d850b63 --- /dev/null +++ b/debian/patches/fix_bintest_for_debuild.patch @@ -0,0 +1,28 @@ +diff --git a/test/bintest.rb b/test/bintest.rb +index e6d1220..bd60734 100644 +--- a/test/bintest.rb ++++ b/test/bintest.rb +@@ -2,11 +2,21 @@ $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__))) + require 'test/assert.rb' + + def cmd(s) +- ENV['SHELL'] ? "bin/#{s}" : "bin\\#{s}.exe" ++ case RbConfig::CONFIG['host_os'] ++ when /mswin(?!ce)|mingw|cygwin|bccwin/ ++ "bin\\#{s}.exe" ++ else ++ "bin/#{s}" ++ end + end + + def shellquote(s) +- ENV['SHELL'] ? "'#{s}'" : "\"#{s}\"" ++ case RbConfig::CONFIG['host_os'] ++ when /mswin(?!ce)|mingw|cygwin|bccwin/ ++ "\"#{s}\"" ++ else ++ "'#{s}'" ++ end + end + + ARGV.each do |gem| diff --git a/debian/patches/series b/debian/patches/series index 42ad968ec6..0c4e0cdd47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ enable_verbose_build.patch change_optimize_O2.patch add_fpic_amd64.patch +fix_bintest_for_debuild.patch + From bc0a9853f76fab337062761b7af0a0d3c1be08f6 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Tue, 17 Nov 2015 22:48:41 +0900 Subject: [PATCH 059/174] Update to 1.2.0 Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f63cba7fed..7f019c7cf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0-1) unstable; urgency=medium + + * New upstream release(1.2.0). + + -- Akira Mitsui Tue, 17 Nov 2015 22:47:07 +0900 + mruby (1.1.0+20151021+git68ba3862-1) unstable; urgency=medium * Snapshot, taken from the master (20151021). From d1bf4aef8c76af6cd1d85055434478eadafd1c08 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Tue, 17 Nov 2015 23:04:33 +0900 Subject: [PATCH 060/174] Remove patch. because it fixed in upstream Signed-off-by: Akira Mitsui --- debian/changelog | 3 ++- debian/patches/fix_bintest_for_debuild.patch | 28 -------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 debian/patches/fix_bintest_for_debuild.patch diff --git a/debian/changelog b/debian/changelog index 7f019c7cf3..98dbb7d666 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.2.0-1) unstable; urgency=medium * New upstream release(1.2.0). + * Remove patch. because it fixed in upstream -- Akira Mitsui Tue, 17 Nov 2015 22:47:07 +0900 @@ -47,7 +48,7 @@ mruby (1.1.0+20150416+gitfa824e32-1) unstable; urgency=medium mruby (1.1.0+20150131+git089f1f6c-1) unstable; urgency=medium * Snapshot, taken from the master (20150131). - * rm patch. because it fixed in upstream + * Remove patch. because it fixed in upstream -- Akira Mitsui Sat, 31 Jan 2015 16:58:37 +0900 diff --git a/debian/patches/fix_bintest_for_debuild.patch b/debian/patches/fix_bintest_for_debuild.patch deleted file mode 100644 index 2e2d850b63..0000000000 --- a/debian/patches/fix_bintest_for_debuild.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/test/bintest.rb b/test/bintest.rb -index e6d1220..bd60734 100644 ---- a/test/bintest.rb -+++ b/test/bintest.rb -@@ -2,11 +2,21 @@ $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__))) - require 'test/assert.rb' - - def cmd(s) -- ENV['SHELL'] ? "bin/#{s}" : "bin\\#{s}.exe" -+ case RbConfig::CONFIG['host_os'] -+ when /mswin(?!ce)|mingw|cygwin|bccwin/ -+ "bin\\#{s}.exe" -+ else -+ "bin/#{s}" -+ end - end - - def shellquote(s) -- ENV['SHELL'] ? "'#{s}'" : "\"#{s}\"" -+ case RbConfig::CONFIG['host_os'] -+ when /mswin(?!ce)|mingw|cygwin|bccwin/ -+ "\"#{s}\"" -+ else -+ "'#{s}'" -+ end - end - - ARGV.each do |gem| diff --git a/debian/patches/series b/debian/patches/series index 0c4e0cdd47..94749158e4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ enable_verbose_build.patch change_optimize_O2.patch add_fpic_amd64.patch -fix_bintest_for_debuild.patch From 44d4ce8621d99945f3407a0141c25611355111a6 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Wed, 23 Dec 2015 13:36:48 +0900 Subject: [PATCH 061/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 98dbb7d666..43a29303b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20151223+git7e4a7abf-1) unstable; urgency=medium + + * Snapshot, taken from the master (20151223). + + -- Akira Mitsui Wed, 23 Dec 2015 13:32:13 +0900 + mruby (1.2.0-1) unstable; urgency=medium * New upstream release(1.2.0). From 2ac38698d631664e4d85c04f838e10c769a236c0 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sat, 12 Mar 2016 00:28:54 +0900 Subject: [PATCH 062/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43a29303b9..62469c7dff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20160220+gitcf5ca036-1) unstable; urgency=medium + + * Snapshot, taken from the master (20160220). + + -- Akira Mitsui Sat, 12 Mar 2016 00:27:24 +0900 + mruby (1.2.0+20151223+git7e4a7abf-1) unstable; urgency=medium * Snapshot, taken from the master (20151223). From 0e177ce8665e2c41fb65a2148ef20a3a14b86446 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 15 Mar 2016 03:30:52 +0900 Subject: [PATCH 063/174] Snapshot, taken from the master (20160315) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43a29303b9..0b03a42e49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20160315+git4f20d58a-1) unstable; urgency=medium + + * Snapshot, taken from the master (20160315). + + -- Nobuhiro Iwamatsu Tue, 15 Mar 2016 03:29:36 +0900 + mruby (1.2.0+20151223+git7e4a7abf-1) unstable; urgency=medium * Snapshot, taken from the master (20151223). From dc468a07b284ec3e0116e4c7135f6a28ccfe9966 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 15 Mar 2016 03:31:34 +0900 Subject: [PATCH 064/174] Bump Standards-Version to 3.9.7 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b03a42e49..5dd7d1dd7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.2.0+20160315+git4f20d58a-1) unstable; urgency=medium * Snapshot, taken from the master (20160315). + * Bump Standards-Version to 3.9.7. -- Nobuhiro Iwamatsu Tue, 15 Mar 2016 03:29:36 +0900 diff --git a/debian/control b/debian/control index 8ca08a205a..3721558700 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Git: git://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From d2a91f9dfb3c1dce824f59394ba3949b90de5150 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 26 Apr 2016 09:35:34 +0900 Subject: [PATCH 065/174] Snapshot, taken from the master (20160426) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index da90c40d6e..cd2c04f38e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20160426+git8f0c1c7d-1) unstable; urgency=medium + + * Snapshot, taken from the master (20160426). + + -- Nobuhiro Iwamatsu Tue, 26 Apr 2016 09:35:09 +0900 + mruby (1.2.0+20160315+git4f20d58a-1) unstable; urgency=medium * Snapshot, taken from the master (20160315). From 5a71b3d7f5552ec0137a825b631546cb0ab72beb Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Fri, 27 May 2016 00:16:54 +0900 Subject: [PATCH 066/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cd2c04f38e..a217083e64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20160527+git6b0299f7-1) unstable; urgency=medium + + * Snapshot, taken from the master (20160527). + + -- Akira Mitsui Fri, 27 May 2016 00:10:50 +0900 + mruby (1.2.0+20160426+git8f0c1c7d-1) unstable; urgency=medium * Snapshot, taken from the master (20160426). From da4444d1df91febc60637476019e50f547a8bf08 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Thu, 4 Aug 2016 00:29:00 +0900 Subject: [PATCH 067/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a217083e64..e6287f6890 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20160804+git501e1ef2-1) unstable; urgency=medium + + * Snapshot, taken from the master (20160804). + + -- Akira Mitsui Thu, 04 Aug 2016 00:25:55 +0900 + mruby (1.2.0+20160527+git6b0299f7-1) unstable; urgency=medium * Snapshot, taken from the master (20160527). From 17c5ca229c760b6e6609a7f1083695b38e51abb9 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sun, 9 Oct 2016 15:03:05 +0900 Subject: [PATCH 068/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e6287f6890..54bbe4fd9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20161009+git8488425e-1) unstable; urgency=medium + + * Snapshot, taken from the master (20161009). + + -- Akira Mitsui Sun, 09 Oct 2016 15:01:54 +0900 + mruby (1.2.0+20160804+git501e1ef2-1) unstable; urgency=medium * Snapshot, taken from the master (20160804). From 06eb31b4db3dd3c67dad81661e0c7d857fb6aa94 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 15 Oct 2016 06:02:05 +0900 Subject: [PATCH 069/174] Update Standards-Version to 3.9.8 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54bbe4fd9f..7abe4c76e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mruby (1.2.0+20161009+git8488425e-1) unstable; urgency=medium * Snapshot, taken from the master (20161009). + * Update Standards-Version to 3.9.8. - -- Akira Mitsui Sun, 09 Oct 2016 15:01:54 +0900 + -- Nobuhiro Iwamatsu Sat, 15 Oct 2016 06:01:22 +0900 mruby (1.2.0+20160804+git501e1ef2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 3721558700..ef827ee3c4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Git: git://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 11c5d76aa0a04fd69462e8a156b037850ff48fc5 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 28 Dec 2016 06:49:05 +0900 Subject: [PATCH 070/174] Snapshot, taken from the master (20161228) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7abe4c76e5..384746917a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20161228+git30d5424a-1) unstable; urgency=medium + + * Snapshot, taken from the master (20161228). + + -- Nobuhiro Iwamatsu Wed, 28 Dec 2016 06:42:26 +0900 + mruby (1.2.0+20161009+git8488425e-1) unstable; urgency=medium * Snapshot, taken from the master (20161009). From 39bcfe47bd7b72c2e53bfe83ded50aafe325e903 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Mon, 27 Feb 2017 13:30:40 +0900 Subject: [PATCH 071/174] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 384746917a..c5e470f9f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20170226+gitfecbde32-1) unstable; urgency=medium + + * Snapshot, taken from the master (20170226). + + -- Akira Mitsui Mon, 27 Feb 2017 13:28:02 +0900 + mruby (1.2.0+20161228+git30d5424a-1) unstable; urgency=medium * Snapshot, taken from the master (20161228). From f96e67993110ebdc90a4cd2b7cdf019213546dc7 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Thu, 4 May 2017 03:38:47 +0900 Subject: [PATCH 072/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c5e470f9f1..b415764ecb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20170504+git964a02f1-1) unstable; urgency=medium + + * Snapshot, taken from the master (20170504). + + -- Akira Mitsui Thu, 04 May 2017 03:34:02 +0900 + mruby (1.2.0+20170226+gitfecbde32-1) unstable; urgency=medium * Snapshot, taken from the master (20170226). From babc457b6e4a6c255fdf71ba019b65ec27621692 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 2 Jun 2017 10:46:22 +0900 Subject: [PATCH 073/174] Update to 1.2.0+20170601+git51e0e690 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b415764ecb..80e7f12c40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.2.0+20170601+git51e0e690-1) experimental; urgency=medium + + * Snapshot, taken from the master (20170601). + + -- Nobuhiro Iwamatsu Fri, 02 Jun 2017 10:45:38 +0900 + mruby (1.2.0+20170504+git964a02f1-1) unstable; urgency=medium * Snapshot, taken from the master (20170504). From b5d5b26852b9dc45a42ee205d867672e75052777 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Wed, 5 Jul 2017 01:17:56 +0900 Subject: [PATCH 074/174] Update to 1.3.0 Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 80e7f12c40..a3a16aa487 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.3.0-1) UNRELEASED; urgency=medium + + * New upstream release(1.3.0). + + -- Akira Mitsui Wed, 05 Jul 2017 01:11:06 +0900 + mruby (1.2.0+20170601+git51e0e690-1) experimental; urgency=medium * Snapshot, taken from the master (20170601). From 6040d9bcb62837f34477c719759465da38261f4c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 12 Aug 2017 17:42:24 +0900 Subject: [PATCH 075/174] Set to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a3a16aa487..0ed535e84c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (1.3.0-1) UNRELEASED; urgency=medium +mruby (1.3.0-1) unstable; urgency=medium * New upstream release(1.3.0). From f4d37d912202c5e82088bd63c07957bc17410270 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 13 Aug 2017 06:25:59 +0900 Subject: [PATCH 076/174] Update Standards-Version to 4.0.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ed535e84c..7f84f7b65a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.3.0-1) unstable; urgency=medium * New upstream release(1.3.0). + * Update Standards-Version to 4.0.0. -- Akira Mitsui Wed, 05 Jul 2017 01:11:06 +0900 diff --git a/debian/control b/debian/control index ef827ee3c4..a0d69d2971 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Git: git://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 8f9cdde230779f947829c8ae2a29a5f295085266 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 26 Sep 2017 04:23:17 +0900 Subject: [PATCH 077/174] Snapshot, taken from the master (20170925) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7f84f7b65a..4cb7f97635 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.3.0+20170925+git38185028-1) unstable; urgency=medium + + * Snapshot, taken from the master (20170925). + + -- Nobuhiro Iwamatsu Tue, 26 Sep 2017 04:22:21 +0900 + mruby (1.3.0-1) unstable; urgency=medium * New upstream release(1.3.0). From ba3410e547a2ed9bcf37fd3ea3ca8bf909f41bc3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 26 Sep 2017 04:24:38 +0900 Subject: [PATCH 078/174] Update Standards-Version to 4.1.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4cb7f97635..34778c06d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.3.0+20170925+git38185028-1) unstable; urgency=medium * Snapshot, taken from the master (20170925). + * Update Standards-Version to 4.1.0. -- Nobuhiro Iwamatsu Tue, 26 Sep 2017 04:22:21 +0900 diff --git a/debian/control b/debian/control index a0d69d2971..3000eff397 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 4.0.0 +Standards-Version: 4.1.0 Vcs-Git: git://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 21edb1fd059788e12f9ac81630cda0cea02b6f16 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 26 Sep 2017 04:31:07 +0900 Subject: [PATCH 079/174] Update patches/change_optimize_O2.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/change_optimize_O2.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/change_optimize_O2.patch b/debian/patches/change_optimize_O2.patch index f5bba7053c..8835602e51 100644 --- a/debian/patches/change_optimize_O2.patch +++ b/debian/patches/change_optimize_O2.patch @@ -1,8 +1,8 @@ -diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake -index 9f8b4ed..64384d2 100644 ---- a/tasks/mruby_build.rake -+++ b/tasks/mruby_build.rake -@@ -100,7 +100,7 @@ module MRuby +diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb +index 7d6aa49e..e2538204 100644 +--- a/lib/mruby/build.rb ++++ b/lib/mruby/build.rb +@@ -104,7 +104,7 @@ module MRuby compilers.each do |c| c.defines += %w(MRB_DEBUG) if toolchains.any? { |toolchain| toolchain == "gcc" } From 5479c7782838352dcb0377345bd12da63321216e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 30 Oct 2017 18:00:02 +0900 Subject: [PATCH 080/174] Snapshot, taken from the master (20171029) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 34778c06d2..923417c811 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.3.0+20171029+git77edafb0-1) unstable; urgency=medium + + * Snapshot, taken from the master (20171029). + + -- Nobuhiro Iwamatsu Mon, 30 Oct 2017 17:58:41 +0900 + mruby (1.3.0+20170925+git38185028-1) unstable; urgency=medium * Snapshot, taken from the master (20170925). From e06d7d5c26bf4fb54842a4d17176c4bb57321a7b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 13 Nov 2017 09:36:06 +0900 Subject: [PATCH 081/174] Change priority from extra to optional Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 923417c811..323ffdbb91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.3.0+20171029+git77edafb0-1) unstable; urgency=medium * Snapshot, taken from the master (20171029). + * Change priority from extra to optional. -- Nobuhiro Iwamatsu Mon, 30 Oct 2017 17:58:41 +0900 diff --git a/debian/control b/debian/control index 3000eff397..4b9f19074c 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: mruby Section: ruby -Priority: extra +Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison From 9393790b1dcb7864fce1140c6f79882a420a7451 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Fri, 24 Nov 2017 23:26:02 +0900 Subject: [PATCH 082/174] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 323ffdbb91..90bd6de68b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.3.0+20171124+git0ab21a9a-1) unstable; urgency=medium + + * Snapshot, taken from the master (20171124). + + -- Akira Mitsui Fri, 24 Nov 2017 23:23:15 +0900 + mruby (1.3.0+20171029+git77edafb0-1) unstable; urgency=medium * Snapshot, taken from the master (20171029). From 2f03610f3b948284ca74c64f83f4d931e27b0d11 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sun, 4 Feb 2018 11:19:44 +0900 Subject: [PATCH 083/174] Update to 1.4.0 Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 90bd6de68b..67071086cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.4.0-1) unstable; urgency=medium + + * New upstream release(1.4.0). + + -- Akira Mitsui Sun, 04 Feb 2018 11:08:22 +0900 + mruby (1.3.0+20171124+git0ab21a9a-1) unstable; urgency=medium * Snapshot, taken from the master (20171124). From 031880a0d102cbee06fc1671ddec6d5ee2f4f34f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 26 Feb 2018 08:36:49 +0900 Subject: [PATCH 084/174] Change Vcs-Git to use https Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 67071086cc..4a483d18b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mruby (1.4.0-1) unstable; urgency=medium * New upstream release(1.4.0). + * Change Vcs-Git to use https. -- Akira Mitsui Sun, 04 Feb 2018 11:08:22 +0900 diff --git a/debian/control b/debian/control index 4b9f19074c..96c0b3e8c4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison Standards-Version: 4.1.0 -Vcs-Git: git://github.com/mruby-debian/mruby.git +Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby Package: mruby From 06f23651d6cf2d70b0f085c95f2db545bca2717e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 26 Feb 2018 08:39:18 +0900 Subject: [PATCH 085/174] Update secure copyright format URI Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4a483d18b5..3d20b84050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mruby (1.4.0-1) unstable; urgency=medium * New upstream release(1.4.0). * Change Vcs-Git to use https. + * Update secure copyright format URI. -- Akira Mitsui Sun, 04 Feb 2018 11:08:22 +0900 diff --git a/debian/copyright b/debian/copyright index 5584dc78b1..dfaaf65f94 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: mruby Source: https://github.com/mruby/mruby From 74175a0530c60112d43cec79cc134b6c2bd855fb Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 26 Feb 2018 08:41:05 +0900 Subject: [PATCH 086/174] Update License from MIT to Expat Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 +++- debian/copyright | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d20b84050..e32956bc42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ mruby (1.4.0-1) unstable; urgency=medium * New upstream release(1.4.0). * Change Vcs-Git to use https. - * Update secure copyright format URI. + * Update copyright. + - Update secure copyright format URI. + - Update License from MIT to Expat. -- Akira Mitsui Sun, 04 Feb 2018 11:08:22 +0900 diff --git a/debian/copyright b/debian/copyright index dfaaf65f94..68de0d734a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,13 +4,13 @@ Source: https://github.com/mruby/mruby Files: * Copyright: Copyright (c) 2010-2013 mruby developers -License: MIT +License: Expat Files: debian/* Copyright: 2013 Nobuhiro Iwamatsu -License: MIT +License: Expat -License: MIT +License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation From 4244221ff08bd5ec9f86952d9faf64abb37b9f85 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 20 Apr 2018 08:30:32 +0900 Subject: [PATCH 087/174] Update from stable branch(20180418) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e32956bc42..967c573567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.4.0+20180418+git54905e98-1) UNRELEASED; urgency=medium + + * Update from stable branch(20180418). + + -- Nobuhiro Iwamatsu Fri, 20 Apr 2018 08:29:33 +0900 + mruby (1.4.0-1) unstable; urgency=medium * New upstream release(1.4.0). From f26af3d618f53bf857535250d2a79df49d99198a Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 20 Apr 2018 08:48:26 +0900 Subject: [PATCH 088/174] Fix CVE-2018-10191 and Fix CVE-2018-10199 - Fix CVE-2018-10191. (Closes: #896020) - Fix CVE-2018-10199. (Closes: #896021) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 967c573567..ee0b111d7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -mruby (1.4.0+20180418+git54905e98-1) UNRELEASED; urgency=medium +mruby (1.4.0+20180418+git54905e98-1) unstable; urgency=medium * Update from stable branch(20180418). + - Fix CVE-2018-10191 (Closes: #896020) + Use after free caused by integer overflow in environment stack + - Fix CVE-2018-10199.(Closes: #896021) + Use after free in File#initilialize_copy -- Nobuhiro Iwamatsu Fri, 20 Apr 2018 08:29:33 +0900 From 53d6429331fd1c3216573670fa2a906f04b5c124 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 20 Apr 2018 09:28:53 +0900 Subject: [PATCH 089/174] Bump Standards-Version to 4.1.4 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ee0b111d7f..f09ddef939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mruby (1.4.0+20180418+git54905e98-1) unstable; urgency=medium Use after free caused by integer overflow in environment stack - Fix CVE-2018-10199.(Closes: #896021) Use after free in File#initilialize_copy + * Bump Standards-Version to 4.1.4. -- Nobuhiro Iwamatsu Fri, 20 Apr 2018 08:29:33 +0900 diff --git a/debian/control b/debian/control index 96c0b3e8c4..0292bb91cc 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 4.1.0 +Standards-Version: 4.1.4 Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 39b5c10563f09e119d55ddf0b52ea14105bd461d Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 22 Apr 2018 10:39:53 +0900 Subject: [PATCH 090/174] Add patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch Fix Debian bug #896162. mruby FTBFS: RuntimeError: IO#isatty => open /dev/tty (mrbgems: mruby-io) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 8 ++++++ ...mruby-io-test-if-there-is-no-dev-tty.patch | 25 +++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch diff --git a/debian/changelog b/debian/changelog index f09ddef939..22b1c511aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mruby (1.4.0+20180418+git54905e98-2) unstable; urgency=medium + + * Fix FTBFS RuntimeError: IO#isatty => open /dev/tty (mrbgems: mruby-io) + Add patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch. + (Closes: #896162) + + -- Nobuhiro Iwamatsu Sun, 22 Apr 2018 12:17:43 +0900 + mruby (1.4.0+20180418+git54905e98-1) unstable; urgency=medium * Update from stable branch(20180418). diff --git a/debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch b/debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch new file mode 100644 index 0000000000..c27f996a17 --- /dev/null +++ b/debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch @@ -0,0 +1,25 @@ +From cb499ad60c738c2ebe828975517a448a692012b4 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Sun, 22 Apr 2018 10:38:30 +0900 +Subject: [PATCH] Skip mruby io test if there is no /dev/tty + +Signed-off-by: Nobuhiro Iwamatsu +--- + mrbgems/mruby-io/test/io.rb | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb +index e06b1499..07d49539 100644 +--- a/mrbgems/mruby-io/test/io.rb ++++ b/mrbgems/mruby-io/test/io.rb +@@ -344,6 +344,7 @@ end + + assert('IO#isatty') do + skip "isatty is not supported on this platform" if MRubyIOTestUtil.win? ++ skip "Test plathome does not have /dev/tty" if !File.exist?("/dev/tty") + f1 = File.open("/dev/tty") + f2 = File.open($mrbtest_io_rfname) + +-- +2.17.0 + diff --git a/debian/patches/series b/debian/patches/series index 94749158e4..166bf9e875 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ enable_verbose_build.patch change_optimize_O2.patch add_fpic_amd64.patch - +Skip-mruby-io-test-if-there-is-no-dev-tty.patch From 786d38364d301c7e15ff0ac33ef76015a74584a3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 23 Apr 2018 10:26:10 +0900 Subject: [PATCH 091/174] Add patches/Skip-mruby-tty-test-in-io.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 9 +++++++++ ...-no-dev-tty.patch => Skip-mruby-tty-test-in-io.patch} | 8 ++++---- debian/patches/series | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) rename debian/patches/{Skip-mruby-io-test-if-there-is-no-dev-tty.patch => Skip-mruby-tty-test-in-io.patch} (71%) diff --git a/debian/changelog b/debian/changelog index 22b1c511aa..497ab89fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mruby (1.4.0+20180418+git54905e98-3) unstable; urgency=medium + + * Fix FTBFS RuntimeError: IO#isatty => open /dev/tty (mrbgems: mruby-io) + Remove patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch, and + add patches/Skip-mruby-tty-test-in-io.patch. + (Closes: #896162) + + -- Nobuhiro Iwamatsu Mon, 23 Apr 2018 10:27:32 +0900 + mruby (1.4.0+20180418+git54905e98-2) unstable; urgency=medium * Fix FTBFS RuntimeError: IO#isatty => open /dev/tty (mrbgems: mruby-io) diff --git a/debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch b/debian/patches/Skip-mruby-tty-test-in-io.patch similarity index 71% rename from debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch rename to debian/patches/Skip-mruby-tty-test-in-io.patch index c27f996a17..0d4c19d912 100644 --- a/debian/patches/Skip-mruby-io-test-if-there-is-no-dev-tty.patch +++ b/debian/patches/Skip-mruby-tty-test-in-io.patch @@ -1,7 +1,7 @@ -From cb499ad60c738c2ebe828975517a448a692012b4 Mon Sep 17 00:00:00 2001 +From 8eac91a47b7abdedbb416712c2313b11862dd7a4 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 22 Apr 2018 10:38:30 +0900 -Subject: [PATCH] Skip mruby io test if there is no /dev/tty +Subject: [PATCH] Skip mruby tty test in io Signed-off-by: Nobuhiro Iwamatsu --- @@ -9,14 +9,14 @@ Signed-off-by: Nobuhiro Iwamatsu 1 file changed, 1 insertion(+) diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb -index e06b1499..07d49539 100644 +index e06b1499..15f13490 100644 --- a/mrbgems/mruby-io/test/io.rb +++ b/mrbgems/mruby-io/test/io.rb @@ -344,6 +344,7 @@ end assert('IO#isatty') do skip "isatty is not supported on this platform" if MRubyIOTestUtil.win? -+ skip "Test plathome does not have /dev/tty" if !File.exist?("/dev/tty") ++ skip "Ignore this test in Debian" f1 = File.open("/dev/tty") f2 = File.open($mrbtest_io_rfname) diff --git a/debian/patches/series b/debian/patches/series index 166bf9e875..ef4d4be1d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ enable_verbose_build.patch change_optimize_O2.patch add_fpic_amd64.patch -Skip-mruby-io-test-if-there-is-no-dev-tty.patch +Skip-mruby-tty-test-in-io.patch From 06653b219c5171eb8ee07b7ac5648f160e1be9c2 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 8 May 2018 08:08:20 +0900 Subject: [PATCH 092/174] Update to 1.4.1 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 497ab89fec..12aa2f4a5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.4.1-1) unstable; urgency=medium + + * New upstream release (1.4.1). + + -- Nobuhiro Iwamatsu Tue, 08 May 2018 08:07:23 +0900 + mruby (1.4.0+20180418+git54905e98-3) unstable; urgency=medium * Fix FTBFS RuntimeError: IO#isatty => open /dev/tty (mrbgems: mruby-io) From 41538543da527361363cf9bd8aae4334a11bab52 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 08:50:56 +0900 Subject: [PATCH 093/174] Rename from change_optimize_O2.patch to Change-optimize-O2-on-build-system-of-Debian.patch Signed-off-by: Nobuhiro Iwamatsu --- ...ptimize-O2-on-build-system-of-Debian.patch | 26 +++++++++++++++++++ debian/patches/change_optimize_O2.patch | 13 ---------- debian/patches/series | 2 +- 3 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch delete mode 100644 debian/patches/change_optimize_O2.patch diff --git a/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch b/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch new file mode 100644 index 0000000000..d500c6238f --- /dev/null +++ b/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch @@ -0,0 +1,26 @@ +From 0ec9603b9891e00c5de9aeed1aceb123b0338cc5 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 10 May 2018 08:17:17 +0900 +Subject: [PATCH] Change optimize O2 on build system of Debian + +Signed-off-by: Nobuhiro Iwamatsu +--- + lib/mruby/build.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb +index 57bd9c51..f1bc160d 100644 +--- a/lib/mruby/build.rb ++++ b/lib/mruby/build.rb +@@ -104,7 +104,7 @@ module MRuby + compilers.each do |c| + c.defines += %w(MRB_DEBUG) + if toolchains.any? { |toolchain| toolchain == "gcc" } +- c.flags += %w(-g3 -O0) ++ c.flags += %w(-g3 -O2) + end + end + @mrbc.compile_options += ' -g' +-- +2.17.0 + diff --git a/debian/patches/change_optimize_O2.patch b/debian/patches/change_optimize_O2.patch deleted file mode 100644 index 8835602e51..0000000000 --- a/debian/patches/change_optimize_O2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb -index 7d6aa49e..e2538204 100644 ---- a/lib/mruby/build.rb -+++ b/lib/mruby/build.rb -@@ -104,7 +104,7 @@ module MRuby - compilers.each do |c| - c.defines += %w(MRB_DEBUG) - if toolchains.any? { |toolchain| toolchain == "gcc" } -- c.flags += %w(-g3 -O0) -+ c.flags += %w(-g3 -O2) - end - end - @mrbc.compile_options += ' -g' diff --git a/debian/patches/series b/debian/patches/series index ef4d4be1d0..5db7e1b0d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ enable_verbose_build.patch -change_optimize_O2.patch +Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch From 33a4ff975ca2559d52421fc48238df1a5eef591b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 08:51:46 +0900 Subject: [PATCH 094/174] Add Move-function-of-endian-from-Crossbuild-to-build.patch Signed-off-by: Nobuhiro Iwamatsu --- ...n-of-endian-from-Crossbuild-to-build.patch | 87 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 88 insertions(+) create mode 100644 debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch diff --git a/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch b/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch new file mode 100644 index 0000000000..aaaa81eaa3 --- /dev/null +++ b/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch @@ -0,0 +1,87 @@ +From 2ce496c9ef44e47d057f22407204571cce92bcfb Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 10 May 2018 08:22:56 +0900 +Subject: [PATCH] Move function of endian from Crossbuild to build + +Signed-off-by: Nobuhiro Iwamatsu +--- + lib/mruby/build.rb | 43 ++++++++++++++++++++++--------------------- + 1 file changed, 22 insertions(+), 21 deletions(-) + +diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb +index f1bc160d..645aad98 100644 +--- a/lib/mruby/build.rb ++++ b/lib/mruby/build.rb +@@ -89,6 +89,7 @@ module MRuby + @enable_bintest = false + @enable_test = false + @toolchains = [] ++ @endian = nil + + MRuby.targets[@name] = self + end +@@ -110,6 +111,27 @@ module MRuby + @mrbc.compile_options += ' -g' + end + ++ def big_endian ++ if @endian ++ puts "Endian has already specified as #{@endian}." ++ return ++ end ++ @endian = :big ++ @mrbc.compile_options += ' -E' ++ compilers.each do |c| ++ c.defines += %w(MRB_ENDIAN_BIG) ++ end ++ end ++ ++ def little_endian ++ if @endian ++ puts "Endian has already specified as #{@endian}." ++ return ++ end ++ @endian = :little ++ @mrbc.compile_options += ' -e' ++ end ++ + def disable_cxx_exception + if @cxx_exception_enabled or @cxx_abi_enabled + raise "cxx_exception already enabled" +@@ -334,7 +356,6 @@ EOS + attr_accessor :host_target, :build_target + + def initialize(name, build_dir=nil, &block) +- @endian = nil + @test_runner = Command::CrossTestRunner.new(self) + super + end +@@ -354,25 +375,5 @@ EOS + end + end + +- def big_endian +- if @endian +- puts "Endian has already specified as #{@endian}." +- return +- end +- @endian = :big +- @mrbc.compile_options += ' -E' +- compilers.each do |c| +- c.defines += %w(MRB_ENDIAN_BIG) +- end +- end +- +- def little_endian +- if @endian +- puts "Endian has already specified as #{@endian}." +- return +- end +- @endian = :little +- @mrbc.compile_options += ' -e' +- end + end # CrossBuild + end # MRuby +-- +2.17.0 + diff --git a/debian/patches/series b/debian/patches/series index 5db7e1b0d6..b8293754dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ enable_verbose_build.patch Change-optimize-O2-on-build-system-of-Debian.patch +Move-function-of-endian-from-Crossbuild-to-build.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch From 86ffb95fcf34f172ecd58bc64b154d6626c015c3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 08:53:27 +0900 Subject: [PATCH 095/174] Add-check-function-for-endian.patch Signed-off-by: Nobuhiro Iwamatsu --- .../Add-check-function-for-endian.patch | 32 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 33 insertions(+) create mode 100644 debian/patches/Add-check-function-for-endian.patch diff --git a/debian/patches/Add-check-function-for-endian.patch b/debian/patches/Add-check-function-for-endian.patch new file mode 100644 index 0000000000..e677702d28 --- /dev/null +++ b/debian/patches/Add-check-function-for-endian.patch @@ -0,0 +1,32 @@ +From 05f1f448affb3574353a974c0443eaea445b60c2 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 10 May 2018 08:28:10 +0900 +Subject: [PATCH] Add check function for endian + +Signed-off-by: Nobuhiro Iwamatsu +--- + lib/mruby/build.rb | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb +index 645aad98..d0f37237 100644 +--- a/lib/mruby/build.rb ++++ b/lib/mruby/build.rb +@@ -111,6 +111,14 @@ module MRuby + @mrbc.compile_options += ' -g' + end + ++ def set_endian ++ if "\x01\00".unpack('S')[0] == 1 ++ little_endian ++ else ++ big_endian ++ end ++ end ++ + def big_endian + if @endian + puts "Endian has already specified as #{@endian}." +-- +2.17.0 + diff --git a/debian/patches/series b/debian/patches/series index b8293754dd..8e13466867 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ enable_verbose_build.patch Change-optimize-O2-on-build-system-of-Debian.patch Move-function-of-endian-from-Crossbuild-to-build.patch +Add-check-function-for-endian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch From 13d75237d523a811b1e6f3b502c463895d39e6dd Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 08:55:25 +0900 Subject: [PATCH 096/174] Add Add-set_endian-function.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/Add-set_endian-function.patch | 41 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 debian/patches/Add-set_endian-function.patch diff --git a/debian/patches/Add-set_endian-function.patch b/debian/patches/Add-set_endian-function.patch new file mode 100644 index 0000000000..873494c65a --- /dev/null +++ b/debian/patches/Add-set_endian-function.patch @@ -0,0 +1,41 @@ +From a21ccd8f96394a1de3d56066cc64e58aa12a38cb Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 10 May 2018 08:54:18 +0900 +Subject: [PATCH] Add set_endian function + +Signed-off-by: Nobuhiro Iwamatsu +--- + build_config.rb | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/build_config.rb b/build_config.rb +index 1429837b..cb113bd9 100644 +--- a/build_config.rb ++++ b/build_config.rb +@@ -9,6 +9,7 @@ MRuby::Build.new do |conf| + end + + enable_debug ++ set_endian + + # Use mrbgems + # conf.gem 'examples/mrbgems/ruby_extension_example' +@@ -95,6 +96,7 @@ MRuby::Build.new('host-debug') do |conf| + end + + enable_debug ++ set_endian + + # include the default GEMs + conf.gembox 'default' +@@ -118,6 +120,7 @@ MRuby::Build.new('test') do |conf| + end + + enable_debug ++ set_endian + conf.enable_bintest + conf.enable_test + +-- +2.17.0 + diff --git a/debian/patches/series b/debian/patches/series index 8e13466867..ac0d44f43d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,6 @@ enable_verbose_build.patch Change-optimize-O2-on-build-system-of-Debian.patch Move-function-of-endian-from-Crossbuild-to-build.patch Add-check-function-for-endian.patch +Add-set_endian-function.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch From b6775a61edf307e98dcf454eab791ad0a63062ef Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 09:20:11 +0900 Subject: [PATCH 097/174] Add Fix-test-on-big-endian-CPUs.patch Signed-off-by: Nobuhiro Iwamatsu --- .../patches/Fix-test-on-big-endian-CPUs.patch | 35 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 debian/patches/Fix-test-on-big-endian-CPUs.patch diff --git a/debian/patches/Fix-test-on-big-endian-CPUs.patch b/debian/patches/Fix-test-on-big-endian-CPUs.patch new file mode 100644 index 0000000000..a9a1924c2a --- /dev/null +++ b/debian/patches/Fix-test-on-big-endian-CPUs.patch @@ -0,0 +1,35 @@ +From 1bd63241824e707e31f7a23535c0ea10ed7a0807 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 10 May 2018 09:19:20 +0900 +Subject: [PATCH] Fix test on big endian CPUs + +Signed-off-by: Nobuhiro Iwamatsu +--- + mrbgems/mruby-pack/test/pack.rb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mrbgems/mruby-pack/test/pack.rb b/mrbgems/mruby-pack/test/pack.rb +index f518ca4f..1788c2b7 100644 +--- a/mrbgems/mruby-pack/test/pack.rb ++++ b/mrbgems/mruby-pack/test/pack.rb +@@ -129,7 +129,7 @@ assert 'pack/unpack "i"' do + if PACK_IS_LITTLE_ENDIAN + str = "\xC7\xCF" + "\xFF" * (int_size-2) + else +- str = "\xFF" * (int_size-2) + "\xC7\xCF" ++ str = "\xFF" * (int_size-2) + "\xCF\xC7" + end + assert_pack 'i', str, [-12345] + end +@@ -141,7 +141,7 @@ assert 'pack/unpack "I"' do + if PACK_IS_LITTLE_ENDIAN + str = "\x39\x30" + "\0" * (uint_size-2) + else +- str = "\0" * (uint_size-2) + "\x39\x30" ++ str = "\0" * (uint_size-2) + "\x30\x39" + end + assert_pack 'I', str, [12345] + end +-- +2.17.0 + diff --git a/debian/patches/series b/debian/patches/series index ac0d44f43d..cb4755cfdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ Add-check-function-for-endian.patch Add-set_endian-function.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch +Fix-test-on-big-endian-CPUs.patch From a751ecc59c3e098554be3ad9438c2a3a4db4eb5e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 13:16:32 +0900 Subject: [PATCH 098/174] Update changelog Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 12aa2f4a5c..262ef7a601 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mruby (1.4.1-2) unstable; urgency=medium + + * Fix test on big-endian (Closes: #897087) + Add Fix-test-on-big-endian-CPUs.patch, Add-set_endian-function.patch and + Add-check-function-for-endian.patch and + Move-function-of-endian-from-Crossbuild-to-build.patch + + -- Nobuhiro Iwamatsu Thu, 10 May 2018 13:13:40 +0900 + mruby (1.4.1-1) unstable; urgency=medium * New upstream release (1.4.1). From dd153dfd4ba09999c02d12539d44dfaf43271aff Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sun, 27 May 2018 14:53:59 +0900 Subject: [PATCH 099/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 262ef7a601..f7bde87808 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.4.1+20180527+git14c21793-1) unstable; urgency=medium + + * Snapshot, taken from the master (20180527). + + -- Akira Mitsui Sun, 27 May 2018 14:41:01 +0900 + mruby (1.4.1-2) unstable; urgency=medium * Fix test on big-endian (Closes: #897087) From 1449dbb3e2f823053669b7e6ce2e6c5265d0d6c6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 22 Jun 2018 07:54:37 +0900 Subject: [PATCH 100/174] Set UNRELEASED to 1.4.1+20180527+git14c21793-1 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f7bde87808..9fa9e804dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (1.4.1+20180527+git14c21793-1) unstable; urgency=medium +mruby (1.4.1+20180527+git14c21793-1) UNRELEASED; urgency=medium * Snapshot, taken from the master (20180527). From 34acc7fec35743f0eeb542d6a728f67f18e0a038 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 22 Jun 2018 07:59:40 +0900 Subject: [PATCH 101/174] Update to 1.4.1+20180622+git640fca32, Snapshot, taken from the master Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9fa9e804dd..226cf99ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.4.1+20180622+git640fca32-1) unstable; urgency=medium + + * Snapshot, taken from the master (20180622). + + -- Nobuhiro Iwamatsu Fri, 22 Jun 2018 07:59:03 +0900 + mruby (1.4.1+20180527+git14c21793-1) UNRELEASED; urgency=medium * Snapshot, taken from the master (20180527). From c5ec1e797ad0c9cf48f47dab3532e55440e82505 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 22 Jun 2018 08:03:48 +0900 Subject: [PATCH 102/174] Update changelog. add CVE info. Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 226cf99ef7..0529e3b454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mruby (1.4.1+20180622+git640fca32-1) unstable; urgency=medium * Snapshot, taken from the master (20180622). + - Fix CVE-2018-11743, CVE-2018-12249 CVE-2018-12248. + Closes: #900845 #901652 #901653 -- Nobuhiro Iwamatsu Fri, 22 Jun 2018 07:59:03 +0900 From ef64497bbd819eef8d28c51809334243e62ddb12 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 22 Jun 2018 08:05:18 +0900 Subject: [PATCH 103/174] Remove patches/Fix-test-on-big-endian-CPUs.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 ++ .../patches/Fix-test-on-big-endian-CPUs.patch | 35 ------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 debian/patches/Fix-test-on-big-endian-CPUs.patch diff --git a/debian/changelog b/debian/changelog index 0529e3b454..79cab4c998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ mruby (1.4.1+20180622+git640fca32-1) unstable; urgency=medium * Snapshot, taken from the master (20180622). - Fix CVE-2018-11743, CVE-2018-12249 CVE-2018-12248. Closes: #900845 #901652 #901653 + * Remove patches/Fix-test-on-big-endian-CPUs.patch. + Applied to upstream. -- Nobuhiro Iwamatsu Fri, 22 Jun 2018 07:59:03 +0900 diff --git a/debian/patches/Fix-test-on-big-endian-CPUs.patch b/debian/patches/Fix-test-on-big-endian-CPUs.patch deleted file mode 100644 index a9a1924c2a..0000000000 --- a/debian/patches/Fix-test-on-big-endian-CPUs.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1bd63241824e707e31f7a23535c0ea10ed7a0807 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Thu, 10 May 2018 09:19:20 +0900 -Subject: [PATCH] Fix test on big endian CPUs - -Signed-off-by: Nobuhiro Iwamatsu ---- - mrbgems/mruby-pack/test/pack.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mrbgems/mruby-pack/test/pack.rb b/mrbgems/mruby-pack/test/pack.rb -index f518ca4f..1788c2b7 100644 ---- a/mrbgems/mruby-pack/test/pack.rb -+++ b/mrbgems/mruby-pack/test/pack.rb -@@ -129,7 +129,7 @@ assert 'pack/unpack "i"' do - if PACK_IS_LITTLE_ENDIAN - str = "\xC7\xCF" + "\xFF" * (int_size-2) - else -- str = "\xFF" * (int_size-2) + "\xC7\xCF" -+ str = "\xFF" * (int_size-2) + "\xCF\xC7" - end - assert_pack 'i', str, [-12345] - end -@@ -141,7 +141,7 @@ assert 'pack/unpack "I"' do - if PACK_IS_LITTLE_ENDIAN - str = "\x39\x30" + "\0" * (uint_size-2) - else -- str = "\0" * (uint_size-2) + "\x39\x30" -+ str = "\0" * (uint_size-2) + "\x30\x39" - end - assert_pack 'I', str, [12345] - end --- -2.17.0 - diff --git a/debian/patches/series b/debian/patches/series index cb4755cfdd..ac0d44f43d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ Add-check-function-for-endian.patch Add-set_endian-function.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch -Fix-test-on-big-endian-CPUs.patch From 7436ab3aeedc068df03287e7b14b4dad6579995e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 22 Jun 2018 08:10:01 +0900 Subject: [PATCH 104/174] Update patches Signed-off-by: Nobuhiro Iwamatsu --- .../Add-check-function-for-endian.patch | 4 ++-- debian/patches/Add-set_endian-function.patch | 24 +++++++------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/debian/patches/Add-check-function-for-endian.patch b/debian/patches/Add-check-function-for-endian.patch index e677702d28..66982cdbec 100644 --- a/debian/patches/Add-check-function-for-endian.patch +++ b/debian/patches/Add-check-function-for-endian.patch @@ -1,4 +1,4 @@ -From 05f1f448affb3574353a974c0443eaea445b60c2 Mon Sep 17 00:00:00 2001 +From cec602de6c80a1a3cfbcab28478569a2c18d6bae Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 08:28:10 +0900 Subject: [PATCH] Add check function for endian @@ -28,5 +28,5 @@ index 645aad98..d0f37237 100644 if @endian puts "Endian has already specified as #{@endian}." -- -2.17.0 +2.17.1 diff --git a/debian/patches/Add-set_endian-function.patch b/debian/patches/Add-set_endian-function.patch index 873494c65a..8f6dfaaba5 100644 --- a/debian/patches/Add-set_endian-function.patch +++ b/debian/patches/Add-set_endian-function.patch @@ -1,26 +1,18 @@ -From a21ccd8f96394a1de3d56066cc64e58aa12a38cb Mon Sep 17 00:00:00 2001 +From 824156d669df4b8e96c3cd3b7db87293c0e6b879 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 May 2018 08:54:18 +0900 -Subject: [PATCH] Add set_endian function +Subject: [PATCH 2/2] Add set_endian function Signed-off-by: Nobuhiro Iwamatsu --- - build_config.rb | 3 +++ - 1 file changed, 3 insertions(+) + build_config.rb | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/build_config.rb b/build_config.rb -index 1429837b..cb113bd9 100644 +index 7f52b5ee..927afd87 100644 --- a/build_config.rb +++ b/build_config.rb -@@ -9,6 +9,7 @@ MRuby::Build.new do |conf| - end - - enable_debug -+ set_endian - - # Use mrbgems - # conf.gem 'examples/mrbgems/ruby_extension_example' -@@ -95,6 +96,7 @@ MRuby::Build.new('host-debug') do |conf| +@@ -96,6 +96,7 @@ MRuby::Build.new('host-debug') do |conf| end enable_debug @@ -28,7 +20,7 @@ index 1429837b..cb113bd9 100644 # include the default GEMs conf.gembox 'default' -@@ -118,6 +120,7 @@ MRuby::Build.new('test') do |conf| +@@ -119,6 +120,7 @@ MRuby::Build.new('test') do |conf| end enable_debug @@ -37,5 +29,5 @@ index 1429837b..cb113bd9 100644 conf.enable_test -- -2.17.0 +2.17.1 From 026e3a1127821f8535f3542d07e1fa0618360345 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sat, 22 Sep 2018 15:39:54 +0900 Subject: [PATCH 105/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 79cab4c998..8cbbb7b94d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (1.4.1+20180922+git8fc56f06-1) unstable; urgency=medium + + * Snapshot, taken from the master (20180922). + + -- Akira Mitsui Sat, 22 Sep 2018 15:39:05 +0900 + mruby (1.4.1+20180622+git640fca32-1) unstable; urgency=medium * Snapshot, taken from the master (20180622). From fe342e82acf84fa8e73977fe362c4a4b63c887f3 Mon Sep 17 00:00:00 2001 From: Akira Mitsui Date: Sat, 15 Dec 2018 12:01:57 +0900 Subject: [PATCH 106/174] Update debian/changelog Signed-off-by: Akira Mitsui --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8cbbb7b94d..ce07f22b3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (2.0.0-1) unstable; urgency=medium + + * New upstream release (2.0.0). + + -- Akira Mitsui Sat, 15 Dec 2018 11:55:05 +0900 + mruby (1.4.1+20180922+git8fc56f06-1) unstable; urgency=medium * Snapshot, taken from the master (20180922). From 545691d1c07dbf3d2f98d31aadf60414972b4107 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 5 Jan 2019 06:44:18 +0900 Subject: [PATCH 107/174] Update patches Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 +++ .../Add-check-function-for-endian.patch | 18 +++++------ debian/patches/Add-set_endian-function.patch | 12 +++---- ...n-of-endian-from-Crossbuild-to-build.patch | 31 ++++++++++--------- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce07f22b3f..f35c46e4d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ mruby (2.0.0-1) unstable; urgency=medium + [ Akira Mitsui ] * New upstream release (2.0.0). + [ Nobuhiro Iwamatsu ] + * Update patches. + -- Akira Mitsui Sat, 15 Dec 2018 11:55:05 +0900 mruby (1.4.1+20180922+git8fc56f06-1) unstable; urgency=medium diff --git a/debian/patches/Add-check-function-for-endian.patch b/debian/patches/Add-check-function-for-endian.patch index 66982cdbec..83663f9f98 100644 --- a/debian/patches/Add-check-function-for-endian.patch +++ b/debian/patches/Add-check-function-for-endian.patch @@ -1,19 +1,19 @@ -From cec602de6c80a1a3cfbcab28478569a2c18d6bae Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Thu, 10 May 2018 08:28:10 +0900 -Subject: [PATCH] Add check function for endian +From 06dcd89d66f64cb963d9c811d82555caf9b2da85 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Sat, 5 Jan 2019 06:42:09 +0900 +Subject: [PATCH 2/3] Add check function for endian -Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Nobuhiro Iwamatsu --- lib/mruby/build.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb -index 645aad98..d0f37237 100644 +index 64a9269a..310127e8 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb -@@ -111,6 +111,14 @@ module MRuby - @mrbc.compile_options += ' -g' +@@ -119,6 +119,14 @@ module MRuby + @enable_debug = true end + def set_endian @@ -28,5 +28,5 @@ index 645aad98..d0f37237 100644 if @endian puts "Endian has already specified as #{@endian}." -- -2.17.1 +2.20.1 diff --git a/debian/patches/Add-set_endian-function.patch b/debian/patches/Add-set_endian-function.patch index 8f6dfaaba5..6fe6093c5d 100644 --- a/debian/patches/Add-set_endian-function.patch +++ b/debian/patches/Add-set_endian-function.patch @@ -1,9 +1,9 @@ -From 824156d669df4b8e96c3cd3b7db87293c0e6b879 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Thu, 10 May 2018 08:54:18 +0900 -Subject: [PATCH 2/2] Add set_endian function +From 277ba02382cbccce6b3586042a1af150421eb64d Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Sat, 5 Jan 2019 06:43:21 +0900 +Subject: [PATCH 3/3] Add set_endian function -Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Nobuhiro Iwamatsu --- build_config.rb | 2 ++ 1 file changed, 2 insertions(+) @@ -29,5 +29,5 @@ index 7f52b5ee..927afd87 100644 conf.enable_test -- -2.17.1 +2.20.1 diff --git a/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch b/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch index aaaa81eaa3..dc1096c99f 100644 --- a/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch +++ b/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch @@ -1,18 +1,18 @@ -From 2ce496c9ef44e47d057f22407204571cce92bcfb Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Thu, 10 May 2018 08:22:56 +0900 -Subject: [PATCH] Move function of endian from Crossbuild to build +From ec366e9ad70815d96adce0d936bac34c1646e061 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Sat, 5 Jan 2019 06:40:57 +0900 +Subject: [PATCH 1/3] Move function of endian from Crossbuild to build -Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Nobuhiro Iwamatsu --- - lib/mruby/build.rb | 43 ++++++++++++++++++++++--------------------- - 1 file changed, 22 insertions(+), 21 deletions(-) + lib/mruby/build.rb | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb -index f1bc160d..645aad98 100644 +index e2d9fc41..64a9269a 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb -@@ -89,6 +89,7 @@ module MRuby +@@ -91,6 +91,7 @@ module MRuby @enable_bintest = false @enable_test = false @toolchains = [] @@ -20,8 +20,8 @@ index f1bc160d..645aad98 100644 MRuby.targets[@name] = self end -@@ -110,6 +111,27 @@ module MRuby - @mrbc.compile_options += ' -g' +@@ -118,6 +119,27 @@ module MRuby + @enable_debug = true end + def big_endian @@ -48,7 +48,7 @@ index f1bc160d..645aad98 100644 def disable_cxx_exception if @cxx_exception_enabled or @cxx_abi_enabled raise "cxx_exception already enabled" -@@ -334,7 +356,6 @@ EOS +@@ -357,7 +379,6 @@ EOS attr_accessor :host_target, :build_target def initialize(name, build_dir=nil, &block) @@ -56,10 +56,11 @@ index f1bc160d..645aad98 100644 @test_runner = Command::CrossTestRunner.new(self) super end -@@ -354,25 +375,5 @@ EOS +@@ -376,26 +397,5 @@ EOS + @test_runner.run(mrbtest) end end - +- - def big_endian - if @endian - puts "Endian has already specified as #{@endian}." @@ -83,5 +84,5 @@ index f1bc160d..645aad98 100644 end # CrossBuild end # MRuby -- -2.17.0 +2.20.1 From b17097eea94d5cdf0e66b55c2dc1530334a7b65c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 5 Jan 2019 06:49:04 +0900 Subject: [PATCH 108/174] Bump Standards-Version to 4.3.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f35c46e4d6..6690a20bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mruby (2.0.0-1) unstable; urgency=medium [ Nobuhiro Iwamatsu ] * Update patches. + * Bump Standards-Version to 4.3.0. -- Akira Mitsui Sat, 15 Dec 2018 11:55:05 +0900 diff --git a/debian/control b/debian/control index 0292bb91cc..570591c81b 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 537c2d2ca4a2fdfbffd3f551705e57b0d629c5d1 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 4 May 2019 06:40:46 +0900 Subject: [PATCH 109/174] Update to 2.0.1 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6690a20bd0..bcd3e0909a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (2.0.1-1) experimental; urgency=medium + + * New upstream release (2.0.1). + + -- Nobuhiro Iwamatsu Sat, 04 May 2019 06:39:54 +0900 + mruby (2.0.0-1) unstable; urgency=medium [ Akira Mitsui ] From 7a91fbddefcfee8371da7009556bea2aad00b73b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 4 May 2019 06:43:38 +0900 Subject: [PATCH 110/174] Update patches/add_fpic_amd64.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/add_fpic_amd64.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/add_fpic_amd64.patch b/debian/patches/add_fpic_amd64.patch index 13d49aa895..04b12833d2 100644 --- a/debian/patches/add_fpic_amd64.patch +++ b/debian/patches/add_fpic_amd64.patch @@ -1,12 +1,12 @@ diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake -index fb14558..90da985 100644 +index 663fef9e..0450ed23 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake -@@ -2,6 +2,7 @@ MRuby::Toolchain.new(:gcc) do |conf| +@@ -2,6 +2,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| [conf.cc, conf.objc, conf.asm].each do |cc| cc.command = ENV['CC'] || 'gcc' - cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings)] + cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings -Wundef)] + cc.flags += %w(-fPIC) if ENV['DEB_TARGET_ARCH'] == 'amd64' - cc.defines = %w(DISABLE_GEMS) cc.option_include_path = '-I%s' cc.option_define = '-D%s' + cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}' From efb015aec6090ae0e9e25e9e4413bca6277a3e9d Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 4 May 2019 06:47:10 +0900 Subject: [PATCH 111/174] Update patches/Skip-mruby-tty-test-in-io.patch Signed-off-by: Nobuhiro Iwamatsu --- .../patches/Skip-mruby-tty-test-in-io.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/Skip-mruby-tty-test-in-io.patch b/debian/patches/Skip-mruby-tty-test-in-io.patch index 0d4c19d912..c7070ed407 100644 --- a/debian/patches/Skip-mruby-tty-test-in-io.patch +++ b/debian/patches/Skip-mruby-tty-test-in-io.patch @@ -1,25 +1,25 @@ -From 8eac91a47b7abdedbb416712c2313b11862dd7a4 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Sun, 22 Apr 2018 10:38:30 +0900 +From c3f0b088f36b76ab31337890f47bffcdfa54f47c Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Sat, 4 May 2019 06:46:13 +0900 Subject: [PATCH] Skip mruby tty test in io -Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Nobuhiro Iwamatsu --- mrbgems/mruby-io/test/io.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb -index e06b1499..15f13490 100644 +index 85852c17..2aea935e 100644 --- a/mrbgems/mruby-io/test/io.rb +++ b/mrbgems/mruby-io/test/io.rb -@@ -344,6 +344,7 @@ end +@@ -308,6 +308,7 @@ end assert('IO#isatty') do skip "isatty is not supported on this platform" if MRubyIOTestUtil.win? + skip "Ignore this test in Debian" - f1 = File.open("/dev/tty") - f2 = File.open($mrbtest_io_rfname) - + begin + f = File.open("/dev/tty") + rescue RuntimeError => e -- -2.17.0 +2.20.1 From e2f3ee17a5f35a784d16db61c877ab361df6488f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 11 Dec 2019 13:42:00 +0900 Subject: [PATCH 112/174] Update to 2.1.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index bcd3e0909a..bf8e693a50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (2.1.0-1) unstable; urgency=medium + + * New upstream release (2.1.0). + + -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 + mruby (2.0.1-1) experimental; urgency=medium * New upstream release (2.0.1). From 3c78f0092226810202df6a17347faab39ec9026b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 08:42:39 +0900 Subject: [PATCH 113/174] Update to 2.1.2 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf8e693a50..4688622937 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -mruby (2.1.0-1) unstable; urgency=medium +mruby (2.1.2-1) unstable; urgency=medium - * New upstream release (2.1.0). + * New upstream release (2.1.2). -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 From 807e5c274ca7e3e25ccddfcc782ebe13c8c2819d Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 09:08:43 +0900 Subject: [PATCH 114/174] Add BTS number Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4688622937..7c9a520046 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ mruby (2.1.2-1) unstable; urgency=medium - * New upstream release (2.1.2). + * New upstream release (2.1.2). (Closes: #972051) -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 From b86e234a924958ce2879d507c45aeb2b4f9a106f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 09:17:01 +0900 Subject: [PATCH 115/174] d/rules: Enable verbose build Signed-off-by: Nobuhiro Iwamatsu --- debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/rules b/debian/rules index 2d33f6ac89..7507c271ef 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,10 @@ #!/usr/bin/make -f +RAKE="rake --verbose" + %: dh $@ + +override_dh_auto_build: + dh_auto_build -- RAKE=$(RAKE) + From 8d04b1be2abbb39cbaf6e7fca77788f38042e75b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 09:17:06 +0900 Subject: [PATCH 116/174] Remove d/patches/enable_verbose_build.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/enable_verbose_build.patch | 18 ------------------ debian/patches/series | 1 - 2 files changed, 19 deletions(-) delete mode 100644 debian/patches/enable_verbose_build.patch diff --git a/debian/patches/enable_verbose_build.patch b/debian/patches/enable_verbose_build.patch deleted file mode 100644 index 7b72e338cb..0000000000 --- a/debian/patches/enable_verbose_build.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Enable verbose build -Forwarded: not need -Author: Nobuhiro Iwamatsu -Last-Update: 2013-04-20 - -diff --git a/Makefile b/Makefile -index 4912f17..6990928 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,7 +2,7 @@ - # We provide a minimalistic version called minirake inside of our - # codebase. - --RAKE = ruby ./minirake -+RAKE = ruby ./minirake --verbose - - all : - $(RAKE) diff --git a/debian/patches/series b/debian/patches/series index ac0d44f43d..8a29bb7992 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -enable_verbose_build.patch Change-optimize-O2-on-build-system-of-Debian.patch Move-function-of-endian-from-Crossbuild-to-build.patch Add-check-function-for-endian.patch From f52141ea436028daafae350b31f141ced011b40f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 10:21:25 +0900 Subject: [PATCH 117/174] Update d/patches/add_fpic_amd64.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/add_fpic_amd64.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/add_fpic_amd64.patch b/debian/patches/add_fpic_amd64.patch index 04b12833d2..d6e7f810d6 100644 --- a/debian/patches/add_fpic_amd64.patch +++ b/debian/patches/add_fpic_amd64.patch @@ -1,12 +1,12 @@ diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake -index 663fef9e..0450ed23 100644 +index 810f23b7..05707ac4 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake -@@ -2,6 +2,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| - [conf.cc, conf.objc, conf.asm].each do |cc| - cc.command = ENV['CC'] || 'gcc' - cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings -Wundef)] -+ cc.flags += %w(-fPIC) if ENV['DEB_TARGET_ARCH'] == 'amd64' - cc.option_include_path = '-I%s' - cc.option_define = '-D%s' - cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}' +@@ -12,6 +12,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| + compiler.command = ENV['CC'] || default_command + compiler.flags = [c_mandatory_flags, ENV['CFLAGS'] || [compiler_flags, cxx_invalid_flags, %w(-Wwrite-strings)]] + end ++ compiler.flags += %w(-fPIC) if ENV['DEB_TARGET_ARCH'] == 'amd64' + compiler.option_include_path = %q[-I"%s"] + compiler.option_define = '-D%s' + compiler.compile_options = %q[%{flags} -MMD -o "%{outfile}" -c "%{infile}"] From bb69dc66f7f7b14a30e1e6d6ced323b646cf5383 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 13:07:25 +0900 Subject: [PATCH 118/174] Bump Standards-Version to 4.5.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c9a520046..1cd3f3b727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mruby (2.1.2-1) unstable; urgency=medium * New upstream release (2.1.2). (Closes: #972051) + * Update d/control. + - Bump Standards-Version to 4.5.0. -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 diff --git a/debian/control b/debian/control index 570591c81b..df436d577f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From ebb2f3bc65520db52ec407b27dbf1afae8392bb6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 13:10:37 +0900 Subject: [PATCH 119/174] Use debhelper-compat instead of debhelper and compat Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/compat | 1 - debian/control | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 1cd3f3b727..68e7963b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mruby (2.1.2-1) unstable; urgency=medium * New upstream release (2.1.2). (Closes: #972051) * Update d/control. - Bump Standards-Version to 4.5.0. + - Use debhelper-compat instead of debhelper and compat. -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144f6..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index df436d577f..2211586ccf 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: ruby Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui -Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), ruby, bison +Build-Depends: debhelper-compat (= 13), ruby, bison Standards-Version: 4.5.0 Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From e17fea1e88d31edce6f3a921e79460c0d95899aa Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 13:16:28 +0900 Subject: [PATCH 120/174] Disable patches Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/series | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 8a29bb7992..a29ccf9ada 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ Change-optimize-O2-on-build-system-of-Debian.patch -Move-function-of-endian-from-Crossbuild-to-build.patch -Add-check-function-for-endian.patch -Add-set_endian-function.patch +# Move-function-of-endian-from-Crossbuild-to-build.patch +# Add-check-function-for-endian.patch +# Add-set_endian-function.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch From 996c4fa4ba527fa9a1af996cc6a253af1a3f5e5a Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 13:20:57 +0900 Subject: [PATCH 121/174] Remove some debian specific patches Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + .../Add-check-function-for-endian.patch | 32 ------- debian/patches/Add-set_endian-function.patch | 33 ------- ...n-of-endian-from-Crossbuild-to-build.patch | 88 ------------------- debian/patches/series | 3 - 5 files changed, 1 insertion(+), 156 deletions(-) delete mode 100644 debian/patches/Add-check-function-for-endian.patch delete mode 100644 debian/patches/Add-set_endian-function.patch delete mode 100644 debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch diff --git a/debian/changelog b/debian/changelog index 68e7963b5c..45bdd289d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mruby (2.1.2-1) unstable; urgency=medium * Update d/control. - Bump Standards-Version to 4.5.0. - Use debhelper-compat instead of debhelper and compat. + * Remove some debian specific patches. -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 diff --git a/debian/patches/Add-check-function-for-endian.patch b/debian/patches/Add-check-function-for-endian.patch deleted file mode 100644 index 83663f9f98..0000000000 --- a/debian/patches/Add-check-function-for-endian.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 06dcd89d66f64cb963d9c811d82555caf9b2da85 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Sat, 5 Jan 2019 06:42:09 +0900 -Subject: [PATCH 2/3] Add check function for endian - -Signed-off-by: Nobuhiro Iwamatsu ---- - lib/mruby/build.rb | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb -index 64a9269a..310127e8 100644 ---- a/lib/mruby/build.rb -+++ b/lib/mruby/build.rb -@@ -119,6 +119,14 @@ module MRuby - @enable_debug = true - end - -+ def set_endian -+ if "\x01\00".unpack('S')[0] == 1 -+ little_endian -+ else -+ big_endian -+ end -+ end -+ - def big_endian - if @endian - puts "Endian has already specified as #{@endian}." --- -2.20.1 - diff --git a/debian/patches/Add-set_endian-function.patch b/debian/patches/Add-set_endian-function.patch deleted file mode 100644 index 6fe6093c5d..0000000000 --- a/debian/patches/Add-set_endian-function.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 277ba02382cbccce6b3586042a1af150421eb64d Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Sat, 5 Jan 2019 06:43:21 +0900 -Subject: [PATCH 3/3] Add set_endian function - -Signed-off-by: Nobuhiro Iwamatsu ---- - build_config.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/build_config.rb b/build_config.rb -index 7f52b5ee..927afd87 100644 ---- a/build_config.rb -+++ b/build_config.rb -@@ -96,6 +96,7 @@ MRuby::Build.new('host-debug') do |conf| - end - - enable_debug -+ set_endian - - # include the default GEMs - conf.gembox 'default' -@@ -119,6 +120,7 @@ MRuby::Build.new('test') do |conf| - end - - enable_debug -+ set_endian - conf.enable_bintest - conf.enable_test - --- -2.20.1 - diff --git a/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch b/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch deleted file mode 100644 index dc1096c99f..0000000000 --- a/debian/patches/Move-function-of-endian-from-Crossbuild-to-build.patch +++ /dev/null @@ -1,88 +0,0 @@ -From ec366e9ad70815d96adce0d936bac34c1646e061 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Sat, 5 Jan 2019 06:40:57 +0900 -Subject: [PATCH 1/3] Move function of endian from Crossbuild to build - -Signed-off-by: Nobuhiro Iwamatsu ---- - lib/mruby/build.rb | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb -index e2d9fc41..64a9269a 100644 ---- a/lib/mruby/build.rb -+++ b/lib/mruby/build.rb -@@ -91,6 +91,7 @@ module MRuby - @enable_bintest = false - @enable_test = false - @toolchains = [] -+ @endian = nil - - MRuby.targets[@name] = self - end -@@ -118,6 +119,27 @@ module MRuby - @enable_debug = true - end - -+ def big_endian -+ if @endian -+ puts "Endian has already specified as #{@endian}." -+ return -+ end -+ @endian = :big -+ @mrbc.compile_options += ' -E' -+ compilers.each do |c| -+ c.defines += %w(MRB_ENDIAN_BIG) -+ end -+ end -+ -+ def little_endian -+ if @endian -+ puts "Endian has already specified as #{@endian}." -+ return -+ end -+ @endian = :little -+ @mrbc.compile_options += ' -e' -+ end -+ - def disable_cxx_exception - if @cxx_exception_enabled or @cxx_abi_enabled - raise "cxx_exception already enabled" -@@ -357,7 +379,6 @@ EOS - attr_accessor :host_target, :build_target - - def initialize(name, build_dir=nil, &block) -- @endian = nil - @test_runner = Command::CrossTestRunner.new(self) - super - end -@@ -376,26 +397,5 @@ EOS - @test_runner.run(mrbtest) - end - end -- -- def big_endian -- if @endian -- puts "Endian has already specified as #{@endian}." -- return -- end -- @endian = :big -- @mrbc.compile_options += ' -E' -- compilers.each do |c| -- c.defines += %w(MRB_ENDIAN_BIG) -- end -- end -- -- def little_endian -- if @endian -- puts "Endian has already specified as #{@endian}." -- return -- end -- @endian = :little -- @mrbc.compile_options += ' -e' -- end - end # CrossBuild - end # MRuby --- -2.20.1 - diff --git a/debian/patches/series b/debian/patches/series index a29ccf9ada..81c068c03b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ Change-optimize-O2-on-build-system-of-Debian.patch -# Move-function-of-endian-from-Crossbuild-to-build.patch -# Add-check-function-for-endian.patch -# Add-set_endian-function.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch From 3489dd5d04e47f709ed7e142bc44ad4dfdeece2d Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 9 Dec 2020 13:25:18 +0900 Subject: [PATCH 122/174] Fix date Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 45bdd289d4..1f2175103d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ mruby (2.1.2-1) unstable; urgency=medium - Use debhelper-compat instead of debhelper and compat. * Remove some debian specific patches. - -- Nobuhiro Iwamatsu Wed, 11 Dec 2019 13:41:28 +0900 + -- Nobuhiro Iwamatsu Wed, 09 Dec 2020 13:24:45 +0900 mruby (2.0.1-1) experimental; urgency=medium From 1f65282cd2851a2451a06d8e76f38eeb886f0781 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 10 Dec 2020 17:28:51 +0900 Subject: [PATCH 123/174] Add d/upstream/metadata Signed-off-by: Nobuhiro Iwamatsu --- debian/upstream/metadata | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000000..dde74f0d28 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Name: mruby +Repository: https://github.com/mruby/mruby.git +Repository-Browse: ihttps://github.com/mruby/mruby +Bug-Database: https://github.com/mruby/mruby/issues +Bug-Submit: ttps://github.com/mruby/mruby/issues/new From 64c5cf35b08385316b6d9d62b328dc4ebd05be25 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 27 Dec 2020 14:15:10 +0900 Subject: [PATCH 124/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1f2175103d..5e4cf74dbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (2.1.2-2) unstable; urgency=medium + + * Add d/upstream/metadata. + + -- Nobuhiro Iwamatsu Sun, 27 Dec 2020 14:14:43 +0900 + mruby (2.1.2-1) unstable; urgency=medium * New upstream release (2.1.2). (Closes: #972051) From eee61a0c2c0152c6c032a4614c1e35c0409e03e4 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 12 Jul 2021 16:21:19 +0900 Subject: [PATCH 125/174] Fix CVE-2020-36401 Applied 97319697c8f9f6ff27b32589947e1918e3015503 and 9cdf439db52b66447b4e37c61179d54fad6c8f33 from upstream. Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 8 +++ debian/patches/Fix-CVE-2020-36401.patch | 71 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 80 insertions(+) create mode 100644 debian/patches/Fix-CVE-2020-36401.patch diff --git a/debian/changelog b/debian/changelog index 5e4cf74dbf..4adef5f2a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mruby (2.1.2-3) unstable; urgency=medium + + * Fix CVE-2020-36401. + Fixed the use-after-free problem. Add d/patches/Fix-CVE-2020-36401.patch. + This patch is included 9cdf439db5 and 97319697c8 from upstream. + + -- Nobuhiro Iwamatsu Mon, 12 Jul 2021 16:23:01 +0900 + mruby (2.1.2-2) unstable; urgency=medium * Add d/upstream/metadata. diff --git a/debian/patches/Fix-CVE-2020-36401.patch b/debian/patches/Fix-CVE-2020-36401.patch new file mode 100644 index 0000000000..ad0e5221a5 --- /dev/null +++ b/debian/patches/Fix-CVE-2020-36401.patch @@ -0,0 +1,71 @@ +Description: Fix the use-after-free problem +Author: "Yukihiro \"Matz\" Matsumoto" +Origin: upstream, https://github.com/mruby/mruby/commit/9cdf439db52b66447b4e37c61179d54fad6c8f33 + https://github.com/mruby/mruby/commit/97319697c8f9f6ff27b32589947e1918e3015503 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990540 +Last-Update: 2021-07-12 + +From 9cdf439db52b66447b4e37c61179d54fad6c8f33 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Tue, 23 Jun 2020 13:19:10 +0900 +Subject: [PATCH] Free the original pointer if `realloc` failed. + +The POSIX `realloc` keep the original pointer untouched, so it can +easily leads to memory leakage. `mrb_realloc()` should handle those +bookkeeping, while `mrb_realloc_simple()` keeps the original `realloc` +behavior. +--- + src/gc.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/src/gc.c b/src/gc.c +index 03c561d35..6c83911d5 100644 +--- a/src/gc.c ++++ b/src/gc.c +@@ -225,14 +225,9 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len) + p2 = mrb_realloc_simple(mrb, p, len); + if (len == 0) return p2; + if (p2 == NULL) { +- if (mrb->gc.out_of_memory) { +- mrb_raise_nomemory(mrb); +- /* mrb_panic(mrb); */ +- } +- else { +- mrb->gc.out_of_memory = TRUE; +- mrb_raise_nomemory(mrb); +- } ++ mrb_free(mrb, p); ++ mrb->gc.out_of_memory = TRUE; ++ mrb_raise_nomemory(mrb); + } + else { + mrb->gc.out_of_memory = FALSE; +-- +2.32.0 + +From 97319697c8f9f6ff27b32589947e1918e3015503 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Thu, 2 Jul 2020 10:41:03 +0900 +Subject: [PATCH] Cancel 9cdf439 + +Should not free the pointer in `realloc` since it can cause +use-after-free problem. +--- + src/gc.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/gc.c b/src/gc.c +index 6c83911d5..e1892080f 100644 +--- a/src/gc.c ++++ b/src/gc.c +@@ -225,7 +225,6 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len) + p2 = mrb_realloc_simple(mrb, p, len); + if (len == 0) return p2; + if (p2 == NULL) { +- mrb_free(mrb, p); + mrb->gc.out_of_memory = TRUE; + mrb_raise_nomemory(mrb); + } +-- +2.32.0 + diff --git a/debian/patches/series b/debian/patches/series index 81c068c03b..aaa6dbd334 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch +Fix-CVE-2020-36401.patch From ebb6d6b92feb89a39386a750ce0f16ddd4c3f626 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:32:16 +0900 Subject: [PATCH 126/174] Update to 3.0.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4adef5f2a7..383d5a367a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.0.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Nobuhiro Iwamatsu Thu, 23 Sep 2021 06:31:51 +0900 + mruby (2.1.2-3) unstable; urgency=medium * Fix CVE-2020-36401. From 678d2bd9373be30b06bf83f43f56a497f90163e5 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:33:20 +0900 Subject: [PATCH 127/174] d/control: Bump Standards-Version to 4.6.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2211586ccf..5924243bf2 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper-compat (= 13), ruby, bison -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 1c350f5b7bd1a5231096f53473117322876a39c9 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:35:15 +0900 Subject: [PATCH 128/174] d/gbp.conf: Set debian-branch to debian/sid for DEP-14 conformance Signed-off-by: Nobuhiro Iwamatsu --- debian/gbp.conf | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index cf8376ee7d..03fc40b621 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,4 @@ [DEFAULT] -# the default build command -builder=debuild -i\.git -I.git -# the default branch for upstream sources -upstream-branch=upstream -# the default branch for the debian patch -debian-branch=master +debian-branch = debian/sid +dist = DEP14 +pristine-tar = True From b99ddb85da928dd33db6e96506945385bf0337c9 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:37:31 +0900 Subject: [PATCH 129/174] d/patches/add_fpic_amd64.patch: Update to latest version Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/add_fpic_amd64.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/add_fpic_amd64.patch b/debian/patches/add_fpic_amd64.patch index d6e7f810d6..e608f78c8a 100644 --- a/debian/patches/add_fpic_amd64.patch +++ b/debian/patches/add_fpic_amd64.patch @@ -1,12 +1,12 @@ diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake -index 810f23b7..05707ac4 100644 +index 51bda6517..fc20fef2f 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake -@@ -12,6 +12,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| +@@ -13,6 +13,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| compiler.command = ENV['CC'] || default_command compiler.flags = [c_mandatory_flags, ENV['CFLAGS'] || [compiler_flags, cxx_invalid_flags, %w(-Wwrite-strings)]] end + compiler.flags += %w(-fPIC) if ENV['DEB_TARGET_ARCH'] == 'amd64' compiler.option_include_path = %q[-I"%s"] compiler.option_define = '-D%s' - compiler.compile_options = %q[%{flags} -MMD -o "%{outfile}" -c "%{infile}"] + compiler.compile_options = "-MMD -c #{compile_opt}" From dd98c5a03555ebd3fbd6071193401e43b9f28473 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:38:43 +0900 Subject: [PATCH 130/174] Drop unnecessary patches Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/Fix-CVE-2020-36401.patch | 71 ------------------------- debian/patches/series | 1 - 2 files changed, 72 deletions(-) delete mode 100644 debian/patches/Fix-CVE-2020-36401.patch diff --git a/debian/patches/Fix-CVE-2020-36401.patch b/debian/patches/Fix-CVE-2020-36401.patch deleted file mode 100644 index ad0e5221a5..0000000000 --- a/debian/patches/Fix-CVE-2020-36401.patch +++ /dev/null @@ -1,71 +0,0 @@ -Description: Fix the use-after-free problem -Author: "Yukihiro \"Matz\" Matsumoto" -Origin: upstream, https://github.com/mruby/mruby/commit/9cdf439db52b66447b4e37c61179d54fad6c8f33 - https://github.com/mruby/mruby/commit/97319697c8f9f6ff27b32589947e1918e3015503 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990540 -Last-Update: 2021-07-12 - -From 9cdf439db52b66447b4e37c61179d54fad6c8f33 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Tue, 23 Jun 2020 13:19:10 +0900 -Subject: [PATCH] Free the original pointer if `realloc` failed. - -The POSIX `realloc` keep the original pointer untouched, so it can -easily leads to memory leakage. `mrb_realloc()` should handle those -bookkeeping, while `mrb_realloc_simple()` keeps the original `realloc` -behavior. ---- - src/gc.c | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/src/gc.c b/src/gc.c -index 03c561d35..6c83911d5 100644 ---- a/src/gc.c -+++ b/src/gc.c -@@ -225,14 +225,9 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len) - p2 = mrb_realloc_simple(mrb, p, len); - if (len == 0) return p2; - if (p2 == NULL) { -- if (mrb->gc.out_of_memory) { -- mrb_raise_nomemory(mrb); -- /* mrb_panic(mrb); */ -- } -- else { -- mrb->gc.out_of_memory = TRUE; -- mrb_raise_nomemory(mrb); -- } -+ mrb_free(mrb, p); -+ mrb->gc.out_of_memory = TRUE; -+ mrb_raise_nomemory(mrb); - } - else { - mrb->gc.out_of_memory = FALSE; --- -2.32.0 - -From 97319697c8f9f6ff27b32589947e1918e3015503 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Thu, 2 Jul 2020 10:41:03 +0900 -Subject: [PATCH] Cancel 9cdf439 - -Should not free the pointer in `realloc` since it can cause -use-after-free problem. ---- - src/gc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/gc.c b/src/gc.c -index 6c83911d5..e1892080f 100644 ---- a/src/gc.c -+++ b/src/gc.c -@@ -225,7 +225,6 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len) - p2 = mrb_realloc_simple(mrb, p, len); - if (len == 0) return p2; - if (p2 == NULL) { -- mrb_free(mrb, p); - mrb->gc.out_of_memory = TRUE; - mrb_raise_nomemory(mrb); - } --- -2.32.0 - diff --git a/debian/patches/series b/debian/patches/series index aaa6dbd334..81c068c03b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch -Fix-CVE-2020-36401.patch From 5eab2895e991d14e75aab0a1f2075642d1cb6bd4 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:41:18 +0900 Subject: [PATCH 131/174] d/rules: Remove whitespace Signed-off-by: Nobuhiro Iwamatsu --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 7507c271ef..e59e940e78 100755 --- a/debian/rules +++ b/debian/rules @@ -7,4 +7,3 @@ RAKE="rake --verbose" override_dh_auto_build: dh_auto_build -- RAKE=$(RAKE) - From 7ee6254abf11086de4fddb06f72344057fea3520 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:43:10 +0900 Subject: [PATCH 132/174] d/control: Add "Rules-Requires-Root: no" Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 5924243bf2..e5cd5a0aad 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper-compat (= 13), ruby, bison Standards-Version: 4.6.0 Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby +Rules-Requires-Root: no Package: mruby Architecture: any From 4e8b01b4bcd5c6f66360c1737e3cda35295b6e5a Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:44:44 +0900 Subject: [PATCH 133/174] d/control: Add Homepage field Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index e5cd5a0aad..3e9d8cbe06 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper-compat (= 13), ruby, bison Standards-Version: 4.6.0 +Homepage: https://mruby.org/ Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby Rules-Requires-Root: no From 4501c515aca364157c48c20c17a2bdbca805a97a Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 06:49:31 +0900 Subject: [PATCH 134/174] d/patches: Add Fix-typo.patch Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/Fix-typo.patch | 28 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 29 insertions(+) create mode 100644 debian/patches/Fix-typo.patch diff --git a/debian/patches/Fix-typo.patch b/debian/patches/Fix-typo.patch new file mode 100644 index 0000000000..366678cb62 --- /dev/null +++ b/debian/patches/Fix-typo.patch @@ -0,0 +1,28 @@ +From 33940d9e90645174c62b102181d7a0bcc9e86883 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 23 Sep 2021 06:47:56 +0900 +Subject: [PATCH] Fix typo + +Fix from parenthesed to parenthesized. + +Signed-off-by: Nobuhiro Iwamatsu +--- + test/t/syntax.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/t/syntax.rb b/test/t/syntax.rb +index 3b6de6c18..24f52fef0 100644 +--- a/test/t/syntax.rb ++++ b/test/t/syntax.rb +@@ -416,7 +416,7 @@ assert('External command execution.') do + true + end + +-assert('parenthesed do-block in cmdarg') do ++assert('parenthesized do-block in cmdarg') do + class ParenDoBlockCmdArg + def test(block) + block.call +-- +2.33.0 + diff --git a/debian/patches/series b/debian/patches/series index 81c068c03b..94b4bc6640 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch +Fix-typo.patch From ca8566c412f66a333acf6a3e6a838319827159a3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 07:03:08 +0900 Subject: [PATCH 135/174] d/copyright: Update Signed-off-by: Nobuhiro Iwamatsu --- debian/copyright | 57 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 68de0d734a..e9d78165e1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,32 @@ Upstream-Name: mruby Source: https://github.com/mruby/mruby Files: * -Copyright: Copyright (c) 2010-2013 mruby developers +Copyright: Copyright (c) 2010-2021, mruby developers +License: Expat + +Files: ./mrbgems/mruby-io/README.md + ./mrbgems/mruby-pack/README.md + ./mrbgems/mruby-socket/README.md +Copyright: 2012, Internet Initiative Japan Inc. + 2013, Internet Initiative Japan Inc. + 2017, mruby developers +License: Expat + +Files: ./src/fmt_fp.c +Copyright: 2005-2014, Rich Felker, et al. +License: Expat + +Files: ./mrbgems/mruby-sleep/src/mrb_sleep.c +Copyright: mod_mruby developers 2012 + mruby developers 2018 +License: Expat + +Files: ./mrbgems/mruby-compiler/core/y.tab.c +Copyright: 1984, 1989-1990, 2000-2015, 2018-2020, Free Software Foundation, +License: GPL-3+ with Bison-2.2 exception + +Files: ./doc/guides/debugger.md +Copyright: 2014, Specified Non-Profit Corporation mruby Forum License: Expat Files: debian/* @@ -28,3 +53,33 @@ License: Expat LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: GPL-3+ with Bison-2.2 exception + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + . + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. From 451ec5fdb09c398e6cb82098391661e595272cb9 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 23 Sep 2021 07:14:24 +0900 Subject: [PATCH 136/174] Update d/changelog Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 383d5a367a..4b3ee73079 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,21 @@ -mruby (3.0.0-1) UNRELEASED; urgency=medium +mruby (3.0.0-1) unstable; urgency=medium * New upstream release. - - -- Nobuhiro Iwamatsu Thu, 23 Sep 2021 06:31:51 +0900 + * Update d/control + - Bump Standards-Version to 4.6.0. + - Add "Rules-Requires-Root: no". + - Add Homepage field. + * Update d/gbp.conf + - Set debian-branch to debian/sid for DEP-14 conformance. + * Update d/patches + - add_fpic_amd64.patch: Update to latest version. + - Drop unnecessary patches. + - Add Fix-typo.patch. + * Update d/rules + - Remove whitespace + * Update d/copyright. + + -- Nobuhiro Iwamatsu Thu, 23 Sep 2021 07:12:02 +0900 mruby (2.1.2-3) unstable; urgency=medium From db82f83da0ba8346209df80866c45bcb82d9eaba Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 6 Jan 2022 10:51:01 +0900 Subject: [PATCH 137/174] Fix vulnerable to NULL Pointer Dereference. (CVE-2021-4110) (Closes: #1001768) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 7 ++ debian/patches/CVE-2021-4110.patch | 101 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 109 insertions(+) create mode 100644 debian/patches/CVE-2021-4110.patch diff --git a/debian/changelog b/debian/changelog index 4b3ee73079..4ad3f857f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mruby (3.0.0-2) unstable; urgency=medium + + * Fix vulnerable to NULL Pointer Dereference (Fix CVE-2021-4110). + Add d/patches/CVE-2021-4110.patch. (Closes: #1001768) + + -- Nobuhiro Iwamatsu Thu, 06 Jan 2022 10:46:45 +0900 + mruby (3.0.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/CVE-2021-4110.patch b/debian/patches/CVE-2021-4110.patch new file mode 100644 index 0000000000..89f2b0ff4a --- /dev/null +++ b/debian/patches/CVE-2021-4110.patch @@ -0,0 +1,101 @@ +From 3d33e7b86e45f5a57957c04020c27ea769174185 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Tue, 14 Dec 2021 13:35:18 +0900 +Subject: [PATCH] proc.c: add `mrb_state` argument to `mrb_proc_copy()`. + +The function may invoke the garbage collection and it requires +`mrb_state` to run. + +(cherry picked from commit f5e10c5a79a17939af763b1dcf5232ce47e24a34) +Signed-off-by: Nobuhiro Iwamatsu +Reference: CVE-2021-4110 +Bug-Debian: http://bugs.debian.org/1001768 +Origin: https://github.com/mruby/mruby/commit/f5e10c5a79a17939af763b1dcf5232ce47e24a34 +--- + include/mruby/proc.h | 2 +- + src/class.c | 2 +- + src/proc.c | 12 ++++++------ + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/include/mruby/proc.h b/include/mruby/proc.h +index 0edd3e1f1..2593c8a9a 100644 +--- a/include/mruby/proc.h ++++ b/include/mruby/proc.h +@@ -90,7 +90,7 @@ struct RProc *mrb_proc_new(mrb_state*, const mrb_irep*); + struct RProc *mrb_closure_new(mrb_state*, const mrb_irep*); + MRB_API struct RProc *mrb_proc_new_cfunc(mrb_state*, mrb_func_t); + MRB_API struct RProc *mrb_closure_new_cfunc(mrb_state *mrb, mrb_func_t func, int nlocals); +-void mrb_proc_copy(struct RProc *a, struct RProc *b); ++void mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b); + mrb_int mrb_proc_arity(const struct RProc *p); + + /* following functions are defined in mruby-proc-ext so please include it when using */ +diff --git a/src/class.c b/src/class.c +index 09e52d24a..6d03aa462 100644 +--- a/src/class.c ++++ b/src/class.c +@@ -2511,7 +2511,7 @@ mrb_mod_define_method_m(mrb_state *mrb, struct RClass *c) + mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given"); + } + p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class); +- mrb_proc_copy(p, mrb_proc_ptr(blk)); ++ mrb_proc_copy(mrb, p, mrb_proc_ptr(blk)); + p->flags |= MRB_PROC_STRICT; + MRB_METHOD_FROM_PROC(m, p); + mrb_define_method_raw(mrb, c, mid, m); +diff --git a/src/proc.c b/src/proc.c +index 870d5ea16..b72463617 100644 +--- a/src/proc.c ++++ b/src/proc.c +@@ -184,7 +184,7 @@ mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx) + } + + void +-mrb_proc_copy(struct RProc *a, struct RProc *b) ++mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b) + { + if (a->body.irep) { + /* already initialized proc */ +@@ -192,10 +192,10 @@ mrb_proc_copy(struct RProc *a, struct RProc *b) + } + a->flags = b->flags; + a->body = b->body; ++ a->upper = b->upper; + if (!MRB_PROC_CFUNC_P(a) && a->body.irep) { +- mrb_irep_incref(NULL, (mrb_irep*)a->body.irep); ++ mrb_irep_incref(mrb, (mrb_irep*)a->body.irep); + } +- a->upper = b->upper; + a->e.env = b->e.env; + /* a->e.target_class = a->e.target_class; */ + } +@@ -210,7 +210,7 @@ mrb_proc_s_new(mrb_state *mrb, mrb_value proc_class) + /* Calling Proc.new without a block is not implemented yet */ + mrb_get_args(mrb, "&!", &blk); + p = (struct RProc *)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class)); +- mrb_proc_copy(p, mrb_proc_ptr(blk)); ++ mrb_proc_copy(mrb, p, mrb_proc_ptr(blk)); + proc = mrb_obj_value(p); + mrb_funcall_with_block(mrb, proc, MRB_SYM(initialize), 0, NULL, proc); + if (!MRB_PROC_STRICT_P(p) && +@@ -228,7 +228,7 @@ mrb_proc_init_copy(mrb_state *mrb, mrb_value self) + if (!mrb_proc_p(proc)) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc"); + } +- mrb_proc_copy(mrb_proc_ptr(self), mrb_proc_ptr(proc)); ++ mrb_proc_copy(mrb, mrb_proc_ptr(self), mrb_proc_ptr(proc)); + return self; + } + +@@ -264,7 +264,7 @@ proc_lambda(mrb_state *mrb, mrb_value self) + p = mrb_proc_ptr(blk); + if (!MRB_PROC_STRICT_P(p)) { + struct RProc *p2 = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, p->c); +- mrb_proc_copy(p2, p); ++ mrb_proc_copy(mrb, p2, p); + p2->flags |= MRB_PROC_STRICT; + return mrb_obj_value(p2); + } +-- +2.34.1 + diff --git a/debian/patches/series b/debian/patches/series index 94b4bc6640..74c8f39b49 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch Fix-typo.patch +CVE-2021-4110.patch From 32ee623bb8914927a66d9ae18bbe3c2f91ae3ac0 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 6 Jan 2022 11:04:38 +0900 Subject: [PATCH 138/174] Update d/copyright Get rid of lintian 'superfluous-file-pattern', and update copyright year. Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 ++ debian/copyright | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ad3f857f2..b72586bb23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ mruby (3.0.0-2) unstable; urgency=medium * Fix vulnerable to NULL Pointer Dereference (Fix CVE-2021-4110). Add d/patches/CVE-2021-4110.patch. (Closes: #1001768) + * Update d/copyright + - Get rid of lintian 'superfluous-file-pattern'. -- Nobuhiro Iwamatsu Thu, 06 Jan 2022 10:46:45 +0900 diff --git a/debian/copyright b/debian/copyright index e9d78165e1..295c3d3667 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,33 +6,33 @@ Files: * Copyright: Copyright (c) 2010-2021, mruby developers License: Expat -Files: ./mrbgems/mruby-io/README.md - ./mrbgems/mruby-pack/README.md - ./mrbgems/mruby-socket/README.md +Files: mrbgems/mruby-io/README.md + mrbgems/mruby-pack/README.md + mrbgems/mruby-socket/README.md Copyright: 2012, Internet Initiative Japan Inc. 2013, Internet Initiative Japan Inc. 2017, mruby developers License: Expat -Files: ./src/fmt_fp.c +Files: src/fmt_fp.c Copyright: 2005-2014, Rich Felker, et al. License: Expat -Files: ./mrbgems/mruby-sleep/src/mrb_sleep.c +Files: mrbgems/mruby-sleep/src/mrb_sleep.c Copyright: mod_mruby developers 2012 mruby developers 2018 License: Expat -Files: ./mrbgems/mruby-compiler/core/y.tab.c +Files: mrbgems/mruby-compiler/core/y.tab.c Copyright: 1984, 1989-1990, 2000-2015, 2018-2020, Free Software Foundation, License: GPL-3+ with Bison-2.2 exception -Files: ./doc/guides/debugger.md +Files: doc/guides/debugger.md Copyright: 2014, Specified Non-Profit Corporation mruby Forum License: Expat Files: debian/* -Copyright: 2013 Nobuhiro Iwamatsu +Copyright: 2013, 2022 Nobuhiro Iwamatsu License: Expat License: Expat From f63e726b2840307bc0cc3d7ad9d7c7e481ed15b6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 6 Jan 2022 11:22:21 +0900 Subject: [PATCH 139/174] Fix vulnerable to Heap-based Buffer Overflow (Fix CVE-2022-0080) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 7 ++++++ debian/patches/CVE-2022-0080.patch | 38 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) create mode 100644 debian/patches/CVE-2022-0080.patch diff --git a/debian/changelog b/debian/changelog index b72586bb23..dcdaeff438 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mruby (3.0.0-3) unstable; urgency=medium + + * Fix vulnerable to Heap-based Buffer Overflow (Fix CVE-2022-0080). + Add d/patches/CVE-2022-0080.patch. + + -- Nobuhiro Iwamatsu Thu, 06 Jan 2022 11:21:13 +0900 + mruby (3.0.0-2) unstable; urgency=medium * Fix vulnerable to NULL Pointer Dereference (Fix CVE-2021-4110). diff --git a/debian/patches/CVE-2022-0080.patch b/debian/patches/CVE-2022-0080.patch new file mode 100644 index 0000000000..96c6002c03 --- /dev/null +++ b/debian/patches/CVE-2022-0080.patch @@ -0,0 +1,38 @@ +From 58769b78782ff947f7faadcf151fe18a94906ec7 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Sat, 1 Jan 2022 21:02:58 +0900 +Subject: [PATCH] proc.c: should not reference `irep` when copying failed. + +It may cause broken reference count numbers. + +(cherry picked from commit 28ccc664e5dcd3f9d55173e9afde77c4705a9ab6) +Signed-off-by: Nobuhiro Iwamatsu +Reference: CVE-2022-0080 +Origin: https://github.com/mruby/mruby/commit/28ccc664e5dcd3f9d55173e9afde77c4705a9ab6 +--- + src/proc.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/proc.c b/src/proc.c +index b72463617..12bd80724 100644 +--- a/src/proc.c ++++ b/src/proc.c +@@ -190,12 +190,12 @@ mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b) + /* already initialized proc */ + return; + } ++ if (!MRB_PROC_CFUNC_P(b) && b->body.irep) { ++ mrb_irep_incref(mrb, (mrb_irep*)b->body.irep); ++ } + a->flags = b->flags; + a->body = b->body; + a->upper = b->upper; +- if (!MRB_PROC_CFUNC_P(a) && a->body.irep) { +- mrb_irep_incref(mrb, (mrb_irep*)a->body.irep); +- } + a->e.env = b->e.env; + /* a->e.target_class = a->e.target_class; */ + } +-- +2.34.1 + diff --git a/debian/patches/series b/debian/patches/series index 74c8f39b49..dfa85ca2b0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch Fix-typo.patch CVE-2021-4110.patch +CVE-2022-0080.patch From 22fa7554162208917f27b0d7bc0621ed463d43ee Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 7 May 2022 17:13:38 +0900 Subject: [PATCH 140/174] Fix CVE-2022-1212 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 7 ++++++ debian/patches/CVE-2022-1212.patch | 35 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 43 insertions(+) create mode 100644 debian/patches/CVE-2022-1212.patch diff --git a/debian/changelog b/debian/changelog index dcdaeff438..797819817a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mruby (3.0.0-4) UNRELEASED; urgency=medium + + * Fix CVE-2022-1212. (Closes: #1009044) + Add d/patches/CVE-2022-1212.patch. Fix Use-After-Free in str_escape. + + -- Nobuhiro Iwamatsu Sat, 07 May 2022 17:09:06 +0900 + mruby (3.0.0-3) unstable; urgency=medium * Fix vulnerable to Heap-based Buffer Overflow (Fix CVE-2022-0080). diff --git a/debian/patches/CVE-2022-1212.patch b/debian/patches/CVE-2022-1212.patch new file mode 100644 index 0000000000..16b5094feb --- /dev/null +++ b/debian/patches/CVE-2022-1212.patch @@ -0,0 +1,35 @@ +From e7202e482cd40b299a61d8b28c295e7ffbe984f7 Mon Sep 17 00:00:00 2001 +From: Yukihiro "Matz" Matsumoto +Date: Sat, 7 May 2022 17:04:07 +0900 +Subject: [PATCH] vm.c: create break object before clearing GC arena. + +Otherwise it possibly cause use-after-free. + +[iwamatsu] + Backport to 3.0.0, and add reference tag. +Reference: CVE-2022-1212 +Reference: https://huntr.dev/bounties/9fcc06d0-08e4-49c8-afda-2cae40946abe/ +Reference: https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6 +Signed-off-by: Nobuhiro Iwamatsu +--- + src/vm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vm.c b/src/vm.c +index f8b74034e..c5534d8a7 100644 +--- a/src/vm.c ++++ b/src/vm.c +@@ -2109,9 +2109,9 @@ RETRY_TRY_BLOCK: + } + if (ci->acc < 0) { + ci = cipop(mrb); ++ mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v); + mrb_gc_arena_restore(mrb, ai); + mrb->c->vmexec = FALSE; +- mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v); + mrb->jmp = prev_jmp; + MRB_THROW(prev_jmp); + } +-- +2.36.0 + diff --git a/debian/patches/series b/debian/patches/series index dfa85ca2b0..f2586e2424 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ Skip-mruby-tty-test-in-io.patch Fix-typo.patch CVE-2021-4110.patch CVE-2022-0080.patch +CVE-2022-1212.patch From c0e1faeca7d42982e4846b5767fda02706f23679 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 7 May 2022 17:18:22 +0900 Subject: [PATCH 141/174] Fix CVE-2022-1286 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 ++ debian/patches/CVE-2022-1286.patch | 34 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/CVE-2022-1286.patch diff --git a/debian/changelog b/debian/changelog index 797819817a..05704078b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ mruby (3.0.0-4) UNRELEASED; urgency=medium * Fix CVE-2022-1212. (Closes: #1009044) Add d/patches/CVE-2022-1212.patch. Fix Use-After-Free in str_escape. + * Fix CVE-2022-1286. + Add d/patches/CVE-2022-1286.patch. Fix heap-buffer-overflow in mrb_vm_exe. -- Nobuhiro Iwamatsu Sat, 07 May 2022 17:09:06 +0900 diff --git a/debian/patches/CVE-2022-1286.patch b/debian/patches/CVE-2022-1286.patch new file mode 100644 index 0000000000..ed3720d329 --- /dev/null +++ b/debian/patches/CVE-2022-1286.patch @@ -0,0 +1,34 @@ +From e53c8383107a80490fe35046bd42286d8b09efaf Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Sat, 7 May 2022 17:15:30 +0900 +Subject: [PATCH] class.c: clear method cache after remove_method. + +[iwmaatsu] + backport to 3.0.0. +Reference: CVE-2022-1286 +Reference: https://github.com/mruby/mruby/commit/b1d0296a937fe278239bdfac840a3fd0e93b3ee9 +Reference: https://huntr.dev/bounties/f918376e-b488-4113-963d-ffe8716e4189/ +Signed-off-by: Nobuhiro Iwamatsu +--- + src/class.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/class.c b/src/class.c +index 09e52d24a..ca0cc55f9 100644 +--- a/src/class.c ++++ b/src/class.c +@@ -2318,7 +2318,10 @@ mrb_remove_method(mrb_state *mrb, struct RClass *c, mrb_sym mid) + MRB_CLASS_ORIGIN(c); + h = c->mt; + +- if (h && mt_del(mrb, h, mid)) return; ++ if (h && mt_del(mrb, h, mid)) { ++ mrb_mc_clear_by_class(mrb, c); ++ return; ++ } + mrb_name_error(mrb, mid, "method '%n' not defined in %C", mid, c); + } + +-- +2.36.0 + diff --git a/debian/patches/series b/debian/patches/series index f2586e2424..df3d4ac6df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ Fix-typo.patch CVE-2021-4110.patch CVE-2022-0080.patch CVE-2022-1212.patch +CVE-2022-1286.patch From e29d8ee64ca968e16b8118ef3bb311e4564a6ab3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 9 May 2022 10:03:17 +0900 Subject: [PATCH 142/174] d/rules: Add 'DEB_BUILD_MAINT_OPTIONS = hardening=+all' Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 05704078b3..b5d32a1228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mruby (3.0.0-4) UNRELEASED; urgency=medium Add d/patches/CVE-2022-1212.patch. Fix Use-After-Free in str_escape. * Fix CVE-2022-1286. Add d/patches/CVE-2022-1286.patch. Fix heap-buffer-overflow in mrb_vm_exe. + * Add 'DEB_BUILD_MAINT_OPTIONS = hardening=+all' to d/rules. -- Nobuhiro Iwamatsu Sat, 07 May 2022 17:09:06 +0900 diff --git a/debian/rules b/debian/rules index e59e940e78..123c6f8d06 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,5 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all RAKE="rake --verbose" From ac4e54ac6b09d43dedba96f6a454126cc3ec6be6 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 9 May 2022 10:50:19 +0900 Subject: [PATCH 143/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b5d32a1228..ac9f8f568c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (3.0.0-4) UNRELEASED; urgency=medium +mruby (3.0.0-4) unstable; urgency=medium * Fix CVE-2022-1212. (Closes: #1009044) Add d/patches/CVE-2022-1212.patch. Fix Use-After-Free in str_escape. From 641244f0f0b5ccdecd4285e157d54fa3a79cb4e8 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 8 Aug 2022 11:39:33 +0900 Subject: [PATCH 144/174] Update to 3.1.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac9f8f568c..e89bdab115 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.1.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Nobuhiro Iwamatsu Mon, 08 Aug 2022 11:39:09 +0900 + mruby (3.0.0-4) unstable; urgency=medium * Fix CVE-2022-1212. (Closes: #1009044) From 14b3007c3d586b6e3b55528a943bc431919ceb4c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 8 Aug 2022 11:41:02 +0900 Subject: [PATCH 145/174] d/patches: Drop CVE*.patch These patches had been included in latest verison. Drop these. Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/CVE-2021-4110.patch | 101 ----------------------------- debian/patches/CVE-2022-0080.patch | 38 ----------- debian/patches/CVE-2022-1212.patch | 35 ---------- debian/patches/CVE-2022-1286.patch | 34 ---------- debian/patches/series | 4 -- 5 files changed, 212 deletions(-) delete mode 100644 debian/patches/CVE-2021-4110.patch delete mode 100644 debian/patches/CVE-2022-0080.patch delete mode 100644 debian/patches/CVE-2022-1212.patch delete mode 100644 debian/patches/CVE-2022-1286.patch diff --git a/debian/patches/CVE-2021-4110.patch b/debian/patches/CVE-2021-4110.patch deleted file mode 100644 index 89f2b0ff4a..0000000000 --- a/debian/patches/CVE-2021-4110.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 3d33e7b86e45f5a57957c04020c27ea769174185 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Tue, 14 Dec 2021 13:35:18 +0900 -Subject: [PATCH] proc.c: add `mrb_state` argument to `mrb_proc_copy()`. - -The function may invoke the garbage collection and it requires -`mrb_state` to run. - -(cherry picked from commit f5e10c5a79a17939af763b1dcf5232ce47e24a34) -Signed-off-by: Nobuhiro Iwamatsu -Reference: CVE-2021-4110 -Bug-Debian: http://bugs.debian.org/1001768 -Origin: https://github.com/mruby/mruby/commit/f5e10c5a79a17939af763b1dcf5232ce47e24a34 ---- - include/mruby/proc.h | 2 +- - src/class.c | 2 +- - src/proc.c | 12 ++++++------ - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/include/mruby/proc.h b/include/mruby/proc.h -index 0edd3e1f1..2593c8a9a 100644 ---- a/include/mruby/proc.h -+++ b/include/mruby/proc.h -@@ -90,7 +90,7 @@ struct RProc *mrb_proc_new(mrb_state*, const mrb_irep*); - struct RProc *mrb_closure_new(mrb_state*, const mrb_irep*); - MRB_API struct RProc *mrb_proc_new_cfunc(mrb_state*, mrb_func_t); - MRB_API struct RProc *mrb_closure_new_cfunc(mrb_state *mrb, mrb_func_t func, int nlocals); --void mrb_proc_copy(struct RProc *a, struct RProc *b); -+void mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b); - mrb_int mrb_proc_arity(const struct RProc *p); - - /* following functions are defined in mruby-proc-ext so please include it when using */ -diff --git a/src/class.c b/src/class.c -index 09e52d24a..6d03aa462 100644 ---- a/src/class.c -+++ b/src/class.c -@@ -2511,7 +2511,7 @@ mrb_mod_define_method_m(mrb_state *mrb, struct RClass *c) - mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given"); - } - p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class); -- mrb_proc_copy(p, mrb_proc_ptr(blk)); -+ mrb_proc_copy(mrb, p, mrb_proc_ptr(blk)); - p->flags |= MRB_PROC_STRICT; - MRB_METHOD_FROM_PROC(m, p); - mrb_define_method_raw(mrb, c, mid, m); -diff --git a/src/proc.c b/src/proc.c -index 870d5ea16..b72463617 100644 ---- a/src/proc.c -+++ b/src/proc.c -@@ -184,7 +184,7 @@ mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx) - } - - void --mrb_proc_copy(struct RProc *a, struct RProc *b) -+mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b) - { - if (a->body.irep) { - /* already initialized proc */ -@@ -192,10 +192,10 @@ mrb_proc_copy(struct RProc *a, struct RProc *b) - } - a->flags = b->flags; - a->body = b->body; -+ a->upper = b->upper; - if (!MRB_PROC_CFUNC_P(a) && a->body.irep) { -- mrb_irep_incref(NULL, (mrb_irep*)a->body.irep); -+ mrb_irep_incref(mrb, (mrb_irep*)a->body.irep); - } -- a->upper = b->upper; - a->e.env = b->e.env; - /* a->e.target_class = a->e.target_class; */ - } -@@ -210,7 +210,7 @@ mrb_proc_s_new(mrb_state *mrb, mrb_value proc_class) - /* Calling Proc.new without a block is not implemented yet */ - mrb_get_args(mrb, "&!", &blk); - p = (struct RProc *)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class)); -- mrb_proc_copy(p, mrb_proc_ptr(blk)); -+ mrb_proc_copy(mrb, p, mrb_proc_ptr(blk)); - proc = mrb_obj_value(p); - mrb_funcall_with_block(mrb, proc, MRB_SYM(initialize), 0, NULL, proc); - if (!MRB_PROC_STRICT_P(p) && -@@ -228,7 +228,7 @@ mrb_proc_init_copy(mrb_state *mrb, mrb_value self) - if (!mrb_proc_p(proc)) { - mrb_raise(mrb, E_ARGUMENT_ERROR, "not a proc"); - } -- mrb_proc_copy(mrb_proc_ptr(self), mrb_proc_ptr(proc)); -+ mrb_proc_copy(mrb, mrb_proc_ptr(self), mrb_proc_ptr(proc)); - return self; - } - -@@ -264,7 +264,7 @@ proc_lambda(mrb_state *mrb, mrb_value self) - p = mrb_proc_ptr(blk); - if (!MRB_PROC_STRICT_P(p)) { - struct RProc *p2 = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, p->c); -- mrb_proc_copy(p2, p); -+ mrb_proc_copy(mrb, p2, p); - p2->flags |= MRB_PROC_STRICT; - return mrb_obj_value(p2); - } --- -2.34.1 - diff --git a/debian/patches/CVE-2022-0080.patch b/debian/patches/CVE-2022-0080.patch deleted file mode 100644 index 96c6002c03..0000000000 --- a/debian/patches/CVE-2022-0080.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 58769b78782ff947f7faadcf151fe18a94906ec7 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Sat, 1 Jan 2022 21:02:58 +0900 -Subject: [PATCH] proc.c: should not reference `irep` when copying failed. - -It may cause broken reference count numbers. - -(cherry picked from commit 28ccc664e5dcd3f9d55173e9afde77c4705a9ab6) -Signed-off-by: Nobuhiro Iwamatsu -Reference: CVE-2022-0080 -Origin: https://github.com/mruby/mruby/commit/28ccc664e5dcd3f9d55173e9afde77c4705a9ab6 ---- - src/proc.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/proc.c b/src/proc.c -index b72463617..12bd80724 100644 ---- a/src/proc.c -+++ b/src/proc.c -@@ -190,12 +190,12 @@ mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b) - /* already initialized proc */ - return; - } -+ if (!MRB_PROC_CFUNC_P(b) && b->body.irep) { -+ mrb_irep_incref(mrb, (mrb_irep*)b->body.irep); -+ } - a->flags = b->flags; - a->body = b->body; - a->upper = b->upper; -- if (!MRB_PROC_CFUNC_P(a) && a->body.irep) { -- mrb_irep_incref(mrb, (mrb_irep*)a->body.irep); -- } - a->e.env = b->e.env; - /* a->e.target_class = a->e.target_class; */ - } --- -2.34.1 - diff --git a/debian/patches/CVE-2022-1212.patch b/debian/patches/CVE-2022-1212.patch deleted file mode 100644 index 16b5094feb..0000000000 --- a/debian/patches/CVE-2022-1212.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e7202e482cd40b299a61d8b28c295e7ffbe984f7 Mon Sep 17 00:00:00 2001 -From: Yukihiro "Matz" Matsumoto -Date: Sat, 7 May 2022 17:04:07 +0900 -Subject: [PATCH] vm.c: create break object before clearing GC arena. - -Otherwise it possibly cause use-after-free. - -[iwamatsu] - Backport to 3.0.0, and add reference tag. -Reference: CVE-2022-1212 -Reference: https://huntr.dev/bounties/9fcc06d0-08e4-49c8-afda-2cae40946abe/ -Reference: https://github.com/mruby/mruby/commit/3cf291f72224715942beaf8553e42ba8891ab3c6 -Signed-off-by: Nobuhiro Iwamatsu ---- - src/vm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vm.c b/src/vm.c -index f8b74034e..c5534d8a7 100644 ---- a/src/vm.c -+++ b/src/vm.c -@@ -2109,9 +2109,9 @@ RETRY_TRY_BLOCK: - } - if (ci->acc < 0) { - ci = cipop(mrb); -+ mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v); - mrb_gc_arena_restore(mrb, ai); - mrb->c->vmexec = FALSE; -- mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, proc, v); - mrb->jmp = prev_jmp; - MRB_THROW(prev_jmp); - } --- -2.36.0 - diff --git a/debian/patches/CVE-2022-1286.patch b/debian/patches/CVE-2022-1286.patch deleted file mode 100644 index ed3720d329..0000000000 --- a/debian/patches/CVE-2022-1286.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e53c8383107a80490fe35046bd42286d8b09efaf Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Sat, 7 May 2022 17:15:30 +0900 -Subject: [PATCH] class.c: clear method cache after remove_method. - -[iwmaatsu] - backport to 3.0.0. -Reference: CVE-2022-1286 -Reference: https://github.com/mruby/mruby/commit/b1d0296a937fe278239bdfac840a3fd0e93b3ee9 -Reference: https://huntr.dev/bounties/f918376e-b488-4113-963d-ffe8716e4189/ -Signed-off-by: Nobuhiro Iwamatsu ---- - src/class.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/class.c b/src/class.c -index 09e52d24a..ca0cc55f9 100644 ---- a/src/class.c -+++ b/src/class.c -@@ -2318,7 +2318,10 @@ mrb_remove_method(mrb_state *mrb, struct RClass *c, mrb_sym mid) - MRB_CLASS_ORIGIN(c); - h = c->mt; - -- if (h && mt_del(mrb, h, mid)) return; -+ if (h && mt_del(mrb, h, mid)) { -+ mrb_mc_clear_by_class(mrb, c); -+ return; -+ } - mrb_name_error(mrb, mid, "method '%n' not defined in %C", mid, c); - } - --- -2.36.0 - diff --git a/debian/patches/series b/debian/patches/series index df3d4ac6df..94b4bc6640 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,3 @@ Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch Fix-typo.patch -CVE-2021-4110.patch -CVE-2022-0080.patch -CVE-2022-1212.patch -CVE-2022-1286.patch From 299f1e4fd0dbe1ae3401616c4bbf44aa096dccb4 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 8 Aug 2022 11:46:02 +0900 Subject: [PATCH 146/174] d/copyright: Update files of mrbgems/mruby-sleep Signed-off-by: Nobuhiro Iwamatsu --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 295c3d3667..a226937e0a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,7 +18,7 @@ Files: src/fmt_fp.c Copyright: 2005-2014, Rich Felker, et al. License: Expat -Files: mrbgems/mruby-sleep/src/mrb_sleep.c +Files: mrbgems/mruby-sleep/src/sleep.c Copyright: mod_mruby developers 2012 mruby developers 2018 License: Expat From fb202f38b6e31057ec099b63737d14abd45cdc98 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 15 Dec 2022 04:52:14 +0900 Subject: [PATCH 147/174] Update d/changelog Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index e89bdab115..8fc3605805 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mruby (3.1.0-1) UNRELEASED; urgency=medium * New upstream release. + * Fix CVE-2021-46020, CVE-2022-0240, CVE-2022-0481, CVE-2022-0890, + CVE-2022-1071, CVE-2022-1427, CVE-2022-1201. (Closes: #1014968) -- Nobuhiro Iwamatsu Mon, 08 Aug 2022 11:39:09 +0900 From 7d23204aa49957dc5e46916b937e00011814f81f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 15 Dec 2022 05:10:02 +0900 Subject: [PATCH 148/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8fc3605805..5724ba990c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (3.1.0-1) UNRELEASED; urgency=medium +mruby (3.1.0-1) unstable; urgency=medium * New upstream release. * Fix CVE-2021-46020, CVE-2022-0240, CVE-2022-0481, CVE-2022-0890, From d103a265c4ba8f85925145d27f21b8457786d8ba Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 11 Feb 2023 08:38:53 +0900 Subject: [PATCH 149/174] d/rules: Build using host-m32.rb when architecture is i386 Signed-off-by: Nobuhiro Iwamatsu --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 123c6f8d06..32388fc55a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,11 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifeq ($(DEB_TARGET_ARCH), i386) +RAKE="rake --verbose MRUBY_CONFIG=build_config/host-m32.rb" +else RAKE="rake --verbose" +endif %: dh $@ From ea83b956ad5a9680f67342aba086b8345f8f7922 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 11 Feb 2023 09:19:42 +0900 Subject: [PATCH 150/174] upload to experimental Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5724ba990c..f5ad4faa4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.1.0-2) experimental; urgency=medium + + * d/rules: Build using host-m32.rb when architecture is i386. + + -- Nobuhiro Iwamatsu Sat, 11 Feb 2023 09:19:05 +0900 + mruby (3.1.0-1) unstable; urgency=medium * New upstream release. From e0729374729394fa3d30392fbfe489ec3f033d35 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 13 Mar 2023 16:49:21 +0900 Subject: [PATCH 151/174] Revert "d/rules: Build using host-m32.rb when architecture is i386" This reverts commit d103a265c4ba8f85925145d27f21b8457786d8ba. --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/rules b/debian/rules index 32388fc55a..123c6f8d06 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,7 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all -ifeq ($(DEB_TARGET_ARCH), i386) -RAKE="rake --verbose MRUBY_CONFIG=build_config/host-m32.rb" -else RAKE="rake --verbose" -endif %: dh $@ From ad0cbc45a60cdee5f55644c74fca5cc68c77f88a Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 13 Mar 2023 16:51:52 +0900 Subject: [PATCH 152/174] d/rules: Add -ffloat-store to DEB_CFLAGS_MAINT_APPEND if architecture are i386 or m68k (Closes: #1031321) Thanks to Adrian Bunk . Signed-off-by: Nobuhiro Iwamatsu --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 123c6f8d06..bbccf14c98 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,10 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 m68k)) + export DEB_CFLAGS_MAINT_APPEND += -ffloat-store +endif + RAKE="rake --verbose" %: From e319dad93a32086342314103deb4afce70a379c7 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 13 Mar 2023 16:56:25 +0900 Subject: [PATCH 153/174] Update changelog for 3.1.0-3 release Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index f5ad4faa4b..0c6059f40c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mruby (3.1.0-3) unstable; urgency=medium + + * Revert "d/rules: Build using host-m32.rb when architecture is i386" + * d/rules: Fix FTBFS on i386. (Closes: #1031321) + Add '-ffloat-store' to DEB_CFLAGS_MAINT_APPEND if architecture are i386 or + m68k. Thanks to Adrian Bunk . + + -- Nobuhiro Iwamatsu Mon, 13 Mar 2023 16:53:46 +0900 + mruby (3.1.0-2) experimental; urgency=medium * d/rules: Build using host-m32.rb when architecture is i386. From 0974daf40edcab8f5efc68d4424352985091161b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 25 Jun 2023 13:06:21 +0900 Subject: [PATCH 154/174] Update to 3.2.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0c6059f40c..2485fbfe66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.2.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Nobuhiro Iwamatsu Sun, 25 Jun 2023 13:05:38 +0900 + mruby (3.1.0-3) unstable; urgency=medium * Revert "d/rules: Build using host-m32.rb when architecture is i386" From f43e2b104c4bcec24a242f24f6a776d4ef8b975b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 25 Jun 2023 13:09:33 +0900 Subject: [PATCH 155/174] d/copyright: Update copyright year Signed-off-by: Nobuhiro Iwamatsu --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index a226937e0a..d187e20185 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,7 +32,7 @@ Copyright: 2014, Specified Non-Profit Corporation mruby Forum License: Expat Files: debian/* -Copyright: 2013, 2022 Nobuhiro Iwamatsu +Copyright: 2013, 2022,2023 Nobuhiro Iwamatsu License: Expat License: Expat From acc26a746d86fbb9dae13d9093020a4891fc177a Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 25 Jun 2023 13:10:37 +0900 Subject: [PATCH 156/174] d/control: Bump Standards-Version to 4.6.2 Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3e9d8cbe06..4889d765d8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper-compat (= 13), ruby, bison -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Homepage: https://mruby.org/ Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 0af45103490bacd29a8eb5c52fa10cdff9653cc0 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 25 Jun 2023 14:39:58 +0900 Subject: [PATCH 157/174] Update changelog for 3.2.0-1 release Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2485fbfe66..d567c40c80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -mruby (3.2.0-1) UNRELEASED; urgency=medium +mruby (3.2.0-1) unstable; urgency=medium * New upstream release. + * d/copyright: Update copyright year + * d/control: Bump Standards-Version to 4.6.2 - -- Nobuhiro Iwamatsu Sun, 25 Jun 2023 13:05:38 +0900 + -- Nobuhiro Iwamatsu Sun, 25 Jun 2023 14:39:17 +0900 mruby (3.1.0-3) unstable; urgency=medium From 1bffcc2a1917f4a6633d71b53fe0e23e9b73e3a4 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 6 Sep 2023 14:19:47 +0900 Subject: [PATCH 158/174] d/clean: Add build_config/default.rb.lock (Closes: #1046416) Signed-off-by: Nobuhiro Iwamatsu --- debian/clean | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/clean diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000000..98f71f74c2 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +build_config/default.rb.lock From 63a1c54995001bfccb4d0c0c58aa681fd0f86dbb Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 6 Sep 2023 14:23:57 +0900 Subject: [PATCH 159/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d567c40c80..6f9a7bf4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.2.0-2) unstable; urgency=medium + + * d/clean: Add build_config/default.rb.lock. (Closes: #1046416) + + -- Nobuhiro Iwamatsu Wed, 06 Sep 2023 14:23:11 +0900 + mruby (3.2.0-1) unstable; urgency=medium * New upstream release. From a8aa07acd7f6ccf15168d4750ee63b4b1dfb2d9b Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 7 Feb 2024 16:30:21 +0900 Subject: [PATCH 160/174] Update to 3.3.0-rc2 (3.3.0~rc2) Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6f9a7bf4db..4f7b23349d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.3.0~rc2-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Nobuhiro Iwamatsu Wed, 07 Feb 2024 16:29:54 +0900 + mruby (3.2.0-2) unstable; urgency=medium * d/clean: Add build_config/default.rb.lock. (Closes: #1046416) From 67dc79bccf805d22814bc6159e29a0b4d1ddc1be Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 7 Feb 2024 16:34:00 +0900 Subject: [PATCH 161/174] d/patches: Update Change-optimize-O2-on-build-system-of-Debian.patch Signed-off-by: Nobuhiro Iwamatsu --- ...ptimize-O2-on-build-system-of-Debian.patch | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch b/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch index d500c6238f..9203edc48c 100644 --- a/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch +++ b/debian/patches/Change-optimize-O2-on-build-system-of-Debian.patch @@ -1,26 +1,26 @@ -From 0ec9603b9891e00c5de9aeed1aceb123b0338cc5 Mon Sep 17 00:00:00 2001 -From: Nobuhiro Iwamatsu -Date: Thu, 10 May 2018 08:17:17 +0900 +From a60e73484000ba107b3f7d50c622244cd9ac4c55 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Wed, 7 Feb 2024 16:32:52 +0900 Subject: [PATCH] Change optimize O2 on build system of Debian -Signed-off-by: Nobuhiro Iwamatsu +Signed-off-by: Nobuhiro Iwamatsu --- - lib/mruby/build.rb | 2 +- + tasks/toolchains/gcc.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb -index 57bd9c51..f1bc160d 100644 ---- a/lib/mruby/build.rb -+++ b/lib/mruby/build.rb -@@ -104,7 +104,7 @@ module MRuby - compilers.each do |c| - c.defines += %w(MRB_DEBUG) - if toolchains.any? { |toolchain| toolchain == "gcc" } -- c.flags += %w(-g3 -O0) -+ c.flags += %w(-g3 -O2) - end - end - @mrbc.compile_options += ' -g' +diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake +index 675c26880..81d0302d5 100644 +--- a/tasks/toolchains/gcc.rake ++++ b/tasks/toolchains/gcc.rake +@@ -22,7 +22,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| + compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags + + def compiler.setup_debug(conf) +- self.flags << %w(-g3 -O0) ++ self.flags << %w(-g3 -O2) + end + end + -- -2.17.0 +2.43.0 From 3f396d2d4df493a0e239b0aaa152006568ab9e32 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 7 Feb 2024 16:41:43 +0900 Subject: [PATCH 162/174] Upload to experimental Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4f7b23349d..082655c9f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (3.3.0~rc2-1) UNRELEASED; urgency=medium +mruby (3.3.0~rc2-1) experimental; urgency=medium * New upstream release. From e2be230961999219ba630904ef032b3328f61874 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 3 Apr 2024 13:19:48 +0900 Subject: [PATCH 163/174] Update to 3.3.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 082655c9f1..d3576fca62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mruby (3.3.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Nobuhiro Iwamatsu Wed, 03 Apr 2024 13:19:27 +0900 + mruby (3.3.0~rc2-1) experimental; urgency=medium * New upstream release. From 661494b5df5ddf61907352bd373c4ee01064b245 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 3 Apr 2024 13:23:03 +0900 Subject: [PATCH 164/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d3576fca62..a9cd0aafc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mruby (3.3.0-1) UNRELEASED; urgency=medium +mruby (3.3.0-1) unstable; urgency=medium * New upstream release. From b7f45bac233d68606436a1774318e49c9ab0c73f Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 11 Jul 2025 13:19:36 +0900 Subject: [PATCH 165/174] d/control: Bumped Standards-Version to 4.7.2 Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4889d765d8..dd67fb9891 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Nobuhiro Iwamatsu Uploaders: Akira Mitsui Build-Depends: debhelper-compat (= 13), ruby, bison -Standards-Version: 4.6.2 +Standards-Version: 4.7.2 Homepage: https://mruby.org/ Vcs-Git: https://github.com/mruby-debian/mruby.git Vcs-Browser: https://github.com/mruby-debian/mruby From 6ec1a40d7b507dd3110e5956983c0c60e8a0237c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 11 Jul 2025 13:25:38 +0900 Subject: [PATCH 166/174] d/copyright: Update copyright year Signed-off-by: Nobuhiro Iwamatsu --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index d187e20185..9050ff09ad 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,7 +32,7 @@ Copyright: 2014, Specified Non-Profit Corporation mruby Forum License: Expat Files: debian/* -Copyright: 2013, 2022,2023 Nobuhiro Iwamatsu +Copyright: 2013, 2022 - 2025 Nobuhiro Iwamatsu License: Expat License: Expat From 9684d1f9a1f2673ea26edcb88bbff9b8505ee958 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 11 Jul 2025 13:32:02 +0900 Subject: [PATCH 167/174] d/copyright: Drop license for mrbgems/mruby-compiler/core/y.tab.c mrbgems/mruby-compiler/core/y.tab.c is not included, remove the license information for it. Signed-off-by: Nobuhiro Iwamatsu --- debian/copyright | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/debian/copyright b/debian/copyright index 9050ff09ad..aa2fcbbec9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,10 +23,6 @@ Copyright: mod_mruby developers 2012 mruby developers 2018 License: Expat -Files: mrbgems/mruby-compiler/core/y.tab.c -Copyright: 1984, 1989-1990, 2000-2015, 2018-2020, Free Software Foundation, -License: GPL-3+ with Bison-2.2 exception - Files: doc/guides/debugger.md Copyright: 2014, Specified Non-Profit Corporation mruby Forum License: Expat @@ -53,33 +49,3 @@ License: Expat LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -License: GPL-3+ with Bison-2.2 exception - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - . - As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - . - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. From 5492a6750264c4445cf25d38007fe46310bc5aae Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 11 Jul 2025 13:16:27 +0900 Subject: [PATCH 168/174] Update to 3.4.0 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index a9cd0aafc7..19298b30ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mruby (3.4.0-1~exp1) experimental; urgency=medium + + * New upstream release. + * d/control: Bumped Standards-Version to 4.7.2. + * d/copyright: Update copyright year. + * d/copyright: Drop license for mrbgems/mruby-compiler/core/y.tab.c. + + -- Nobuhiro Iwamatsu Fri, 11 Jul 2025 13:22:37 +0900 + mruby (3.3.0-1) unstable; urgency=medium * New upstream release. From e5c4608264b41918e066fed62013928c35faf799 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 15 Aug 2025 12:07:40 +0900 Subject: [PATCH 169/174] d/patches: Add fix-bigint-on-raspberry-pi.patch This patch fixes bitint issue in arm64 and others. Signed-off-by: Nobuhiro Iwamatsu --- .../patches/fix-bigint-on-raspberry-pi.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/fix-bigint-on-raspberry-pi.patch diff --git a/debian/patches/fix-bigint-on-raspberry-pi.patch b/debian/patches/fix-bigint-on-raspberry-pi.patch new file mode 100644 index 0000000000..cac418f5dd --- /dev/null +++ b/debian/patches/fix-bigint-on-raspberry-pi.patch @@ -0,0 +1,26 @@ +From d7edd3dbc1529f3334ba1da01e59c93056fb263d Mon Sep 17 00:00:00 2001 +From: Hendrik +Date: Sun, 10 Aug 2025 09:21:38 +0200 +Subject: [PATCH] fix bigint on raspberry pi + +this fixes an issue where base can be out of range on a raspberry pi. +--- + src/vm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vm.c b/src/vm.c +index 95eec8041..2772b09b7 100644 +--- a/src/vm.c ++++ b/src/vm.c +@@ -1718,7 +1718,7 @@ RETRY_TRY_BLOCK: + #ifdef MRB_USE_BIGINT + { + const char *s = irep->pool[b].u.str; +- regs[a] = mrb_bint_new_str(mrb, s+2, (uint8_t)s[0], s[1]); ++ regs[a] = mrb_bint_new_str(mrb, s+2, (uint8_t)s[0], (int8_t)s[1]); + } + break; + #else +-- +2.50.1 + diff --git a/debian/patches/series b/debian/patches/series index 94b4bc6640..8eea4187c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ Change-optimize-O2-on-build-system-of-Debian.patch add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch Fix-typo.patch +fix-bigint-on-raspberry-pi.patch From 133baae948122a188ba85dd4a059e878afc320e7 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 15 Aug 2025 12:10:13 +0900 Subject: [PATCH 170/174] Update to 3.4.0-1~exp2 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 19298b30ea..eae1b8a1e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mruby (3.4.0-1~exp2) experimental; urgency=medium + + * d/patches: Add fix-bigint-on-raspberry-pi.patch. + Fix test on arm64 and others. + + -- Nobuhiro Iwamatsu Fri, 15 Aug 2025 12:08:48 +0900 + mruby (3.4.0-1~exp1) experimental; urgency=medium * New upstream release. From 0a1992148532441387567f10dcd9ed33957ae60c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 16 Aug 2025 07:08:56 +0900 Subject: [PATCH 171/174] Fix CVE-2025-7207 (Closes: #1109338) Add d/patches/CVE-2025-7207.patch. Fix A heap-buffer-overflow in stack_clear at src/vm.c. Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/CVE-2025-7207.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 debian/patches/CVE-2025-7207.patch diff --git a/debian/patches/CVE-2025-7207.patch b/debian/patches/CVE-2025-7207.patch new file mode 100644 index 0000000000..0131e485d1 --- /dev/null +++ b/debian/patches/CVE-2025-7207.patch @@ -0,0 +1,28 @@ +From 1fdd96104180cc0fb5d3cb086b05ab6458911bb9 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Mon, 7 Apr 2025 11:35:19 +0900 +Subject: [PATCH] mruby-compiler (scope_new): need to initialize nregs; fix + #6509 + +`nregs` should not be smaller than `nlocals`. + +--- + mrbgems/mruby-compiler/core/codegen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c +index be0bf875a..9deaa7fec 100644 +--- a/mrbgems/mruby-compiler/core/codegen.c ++++ b/mrbgems/mruby-compiler/core/codegen.c +@@ -4012,7 +4012,7 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *nlv) + + s->lv = nlv; + s->sp += node_len(nlv)+1; /* add self */ +- s->nlocals = s->sp; ++ s->nlocals = s->nregs = s->sp; + if (nlv) { + mrb_sym *lv; + node *n = nlv; +-- +2.50.1 + From a5621c8a00615753ad8c5dcfd82630fbfdc50d59 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 16 Aug 2025 07:15:34 +0900 Subject: [PATCH 172/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index eae1b8a1e9..0d20ac4c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mruby (3.4.0-1) unstable; urgency=medium + + * Upload to unstable. + * Fix CVE-2025-7207 (Closes: #1109338) + Add d/patches/CVE-2025-7207.patch. + + -- Nobuhiro Iwamatsu Sat, 16 Aug 2025 07:14:20 +0900 + mruby (3.4.0-1~exp2) experimental; urgency=medium * d/patches: Add fix-bigint-on-raspberry-pi.patch. From eddc9ba15dac29bcdba21e87c20b1b7cbc1d9c41 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 16 Aug 2025 09:14:44 +0900 Subject: [PATCH 173/174] Add CVE-2025-7207.patch to d/patches/series (Closes: #1109338) Signed-off-by: Nobuhiro Iwamatsu --- debian/patches/series | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/series b/debian/patches/series index 8eea4187c0..3e2ba92bc5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ add_fpic_amd64.patch Skip-mruby-tty-test-in-io.patch Fix-typo.patch fix-bigint-on-raspberry-pi.patch +CVE-2025-7207.patch From e7a0c2992d9165cd6253502ca0c6cdeb5423f038 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 16 Aug 2025 09:19:10 +0900 Subject: [PATCH 174/174] Upload to unstable Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d20ac4c1e..e960504315 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mruby (3.4.0-2) unstable; urgency=medium + + * Fix CVE-2025-7207 (Closes: #1109338) + Add CVE-2025-7207.patch to d/patches/series. + + -- Nobuhiro Iwamatsu Sat, 16 Aug 2025 09:18:10 +0900 + mruby (3.4.0-1) unstable; urgency=medium * Upload to unstable.