Merging debian version 1.9.4-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 0 insertions, 326 deletions

diff --git a/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb
deleted file mode 100644
index b6b0901..0000000
--- a/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'tempfile'
-
-assert('regression for #1564') do
-  o = `#{cmd('mruby')} -e #{shellquote('<<')} 2>&1`
-  assert_include o, "-e:1:2: syntax error"
-  o = `#{cmd('mruby')} -e #{shellquote('<<-')} 2>&1`
-  assert_include o, "-e:1:3: syntax error"
-end
-
-assert('regression for #1572') do
-  script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb')
-  File.write script.path, 'p "ok"'
-  system "#{cmd('mrbc')} -g -o #{bin.path} #{script.path}"
-  o = `#{cmd('mruby')} -b #{bin.path}`.strip
-  assert_equal o, '"ok"'
-end
-
-assert '$0 value' do
-  script, bin = Tempfile.new('test.rb'), Tempfile.new('test.mrb')
-
-  # .rb script
-  script.write "p $0\n"
-  script.flush
-  assert_equal "\"#{script.path}\"", `#{cmd('mruby')} "#{script.path}"`.chomp
-
-  # .mrb file
-  `#{cmd('mrbc')} -o "#{bin.path}" "#{script.path}"`
-  assert_equal "\"#{bin.path}\"", `#{cmd('mruby')} -b "#{bin.path}"`.chomp
-
-  # one liner
-  assert_equal '"-e"', `#{cmd('mruby')} -e #{shellquote('p $0')}`.chomp
-end
-
-assert '__END__', '8.6' do
-  script = Tempfile.new('test.rb')
-
-  script.write <<EOS
-p 'test'
-  __END__ = 'fin'
-p __END__
-__END__
-p 'legend'
-EOS
-  script.flush
-  assert_equal "\"test\"\n\"fin\"\n", `#{cmd('mruby')} #{script.path}`
-end
-
-assert('garbage collecting built-in classes') do
-  script = Tempfile.new('test.rb')
-
-  script.write <<RUBY
-NilClass = nil
-GC.start
-Array.dup
-print nil.class.to_s
-RUBY
-  script.flush
-  assert_equal "NilClass", `#{cmd('mruby')} #{script.path}`
-  assert_equal 0, $?.exitstatus
-end
diff --git a/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake b/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake
deleted file mode 100644
index fbec138..0000000
--- a/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake
+++ /dev/null
@@ -1,12 +0,0 @@
-MRuby::Gem::Specification.new('mruby-bin-mruby') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'mruby developers'
-  spec.summary = 'mruby command'
-  spec.bins = %w(mruby)
-  spec.add_dependency('mruby-compiler', :core => 'mruby-compiler')
-  spec.add_dependency('mruby-error', :core => 'mruby-error')
-
-  if build.cxx_exception_enabled?
-    build.compile_as_cxx("#{spec.dir}/tools/mruby/mruby.c", "#{spec.build_dir}/tools/mruby/mruby.cxx")
-  end
-end
diff --git a/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
deleted file mode 100644
index 61d4cde..0000000
--- a/debian/vendor-h2o/deps/mruby/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ /dev/null
@@ -1,254 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mruby.h>
-#include <mruby/array.h>
-#include <mruby/compile.h>
-#include <mruby/dump.h>
-#include <mruby/variable.h>
-
-#ifdef MRB_DISABLE_STDIO
-static void
-p(mrb_state *mrb, mrb_value obj)
-{
-  mrb_value val = mrb_inspect(mrb, obj);
-
-  fwrite(RSTRING_PTR(val), RSTRING_LEN(val), 1, stdout);
-  putc('\n', stdout);
-}
-#else
-#define p(mrb,obj) mrb_p(mrb,obj)
-#endif
-
-struct _args {
-  FILE *rfp;
-  char* cmdline;
-  mrb_bool fname        : 1;
-  mrb_bool mrbfile      : 1;
-  mrb_bool check_syntax : 1;
-  mrb_bool verbose      : 1;
-  int argc;
-  char** argv;
-};
-
-static void
-usage(const char *name)
-{
-  static const char *const usage_msg[] = {
-  "switches:",
-  "-b           load and execute RiteBinary (mrb) file",
-  "-c           check syntax only",
-  "-e 'command' one line of script",
-  "-v           print version number, then run in verbose mode",
-  "--verbose    run in verbose mode",
-  "--version    print the version",
-  "--copyright  print the copyright",
-  NULL
-  };
-  const char *const *p = usage_msg;
-
-  printf("Usage: %s [switches] programfile\n", name);
-  while (*p)
-    printf("  %s\n", *p++);
-}
-
-static int
-parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
-{
-  char **origargv = argv;
-  static const struct _args args_zero = { 0 };
-
-  *args = args_zero;
-
-  for (argc--,argv++; argc > 0; argc--,argv++) {
-    char *item;
-    if (argv[0][0] != '-') break;
-
-    if (strlen(*argv) <= 1) {
-      argc--; argv++;
-      args->rfp = stdin;
-      break;
-    }
-
-    item = argv[0] + 1;
-    switch (*item++) {
-    case 'b':
-      args->mrbfile = TRUE;
-      break;
-    case 'c':
-      args->check_syntax = TRUE;
-      break;
-    case 'e':
-      if (item[0]) {
-        goto append_cmdline;
-      }
-      else if (argc > 1) {
-        argc--; argv++;
-        item = argv[0];
-append_cmdline:
-        if (!args->cmdline) {
-          size_t buflen;
-          char *buf;
-
-          buflen = strlen(item) + 1;
-          buf = (char *)mrb_malloc(mrb, buflen);
-          memcpy(buf, item, buflen);
-          args->cmdline = buf;
-        }
-        else {
-          size_t cmdlinelen;
-          size_t itemlen;
-
-          cmdlinelen = strlen(args->cmdline);
-          itemlen = strlen(item);
-          args->cmdline =
-            (char *)mrb_realloc(mrb, args->cmdline, cmdlinelen + itemlen + 2);
-          args->cmdline[cmdlinelen] = '\n';
-          memcpy(args->cmdline + cmdlinelen + 1, item, itemlen + 1);
-        }
-      }
-      else {
-        printf("%s: No code specified for -e\n", *origargv);
-        return EXIT_SUCCESS;
-      }
-      break;
-    case 'v':
-      if (!args->verbose) mrb_show_version(mrb);
-      args->verbose = TRUE;
-      break;
-    case '-':
-      if (strcmp((*argv) + 2, "version") == 0) {
-        mrb_show_version(mrb);
-        exit(EXIT_SUCCESS);
-      }
-      else if (strcmp((*argv) + 2, "verbose") == 0) {
-        args->verbose = TRUE;
-        break;
-      }
-      else if (strcmp((*argv) + 2, "copyright") == 0) {
-        mrb_show_copyright(mrb);
-        exit(EXIT_SUCCESS);
-      }
-    default:
-      return EXIT_FAILURE;
-    }
-  }
-
-  if (args->rfp == NULL && args->cmdline == NULL) {
-    if (*argv == NULL) args->rfp = stdin;
-    else {
-      args->rfp = fopen(argv[0], args->mrbfile ? "rb" : "r");
-      if (args->rfp == NULL) {
-        printf("%s: Cannot open program file. (%s)\n", *origargv, *argv);
-        return EXIT_FAILURE;
-      }
-      args->fname = TRUE;
-      args->cmdline = argv[0];
-      argc--; argv++;
-    }
-  }
-  args->argv = (char **)mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
-  memcpy(args->argv, argv, (argc+1) * sizeof(char*));
-  args->argc = argc;
-
-  return EXIT_SUCCESS;
-}
-
-static void
-cleanup(mrb_state *mrb, struct _args *args)
-{
-  if (args->rfp && args->rfp != stdin)
-    fclose(args->rfp);
-  if (!args->fname)
-    mrb_free(mrb, args->cmdline);
-  mrb_free(mrb, args->argv);
-  mrb_close(mrb);
-}
-
-int
-main(int argc, char **argv)
-{
-  mrb_state *mrb = mrb_open();
-  int n = -1;
-  int i;
-  struct _args args;
-  mrb_value ARGV;
-  mrbc_context *c;
-  mrb_value v;
-  mrb_sym zero_sym;
-
-  if (mrb == NULL) {
-    fputs("Invalid mrb_state, exiting mruby\n", stderr);
-    return EXIT_FAILURE;
-  }
-
-  n = parse_args(mrb, argc, argv, &args);
-  if (n == EXIT_FAILURE || (args.cmdline == NULL && args.rfp == NULL)) {
-    cleanup(mrb, &args);
-    usage(argv[0]);
-    return n;
-  }
-  else {
-    int ai = mrb_gc_arena_save(mrb);
-    ARGV = mrb_ary_new_capa(mrb, args.argc);
-    for (i = 0; i < args.argc; i++) {
-      char* utf8 = mrb_utf8_from_locale(args.argv[i], -1);
-      if (utf8) {
-        mrb_ary_push(mrb, ARGV, mrb_str_new_cstr(mrb, utf8));
-        mrb_utf8_free(utf8);
-      }
-    }
-    mrb_define_global_const(mrb, "ARGV", ARGV);
-
-    c = mrbc_context_new(mrb);
-    if (args.verbose)
-      c->dump_result = TRUE;
-    if (args.check_syntax)
-      c->no_exec = TRUE;
-
-    /* Set $0 */
-    zero_sym = mrb_intern_lit(mrb, "$0");
-    if (args.rfp) {
-      const char *cmdline;
-      cmdline = args.cmdline ? args.cmdline : "-";
-      mrbc_filename(mrb, c, cmdline);
-      mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline));
-    }
-    else {
-      mrbc_filename(mrb, c, "-e");
-      mrb_gv_set(mrb, zero_sym, mrb_str_new_lit(mrb, "-e"));
-    }
-
-    /* Load program */
-    if (args.mrbfile) {
-      v = mrb_load_irep_file_cxt(mrb, args.rfp, c);
-    }
-    else if (args.rfp) {
-      v = mrb_load_file_cxt(mrb, args.rfp, c);
-    }
-    else {
-      char* utf8 = mrb_utf8_from_locale(args.cmdline, -1);
-      if (!utf8) abort();
-      v = mrb_load_string_cxt(mrb, utf8, c);
-      mrb_utf8_free(utf8);
-    }
-
-    mrb_gc_arena_restore(mrb, ai);
-    mrbc_context_free(mrb, c);
-    if (mrb->exc) {
-      if (mrb_undef_p(v)) {
-        mrb_p(mrb, mrb_obj_value(mrb->exc));
-      }
-      else {
-        mrb_print_error(mrb);
-      }
-      n = -1;
-    }
-    else if (args.check_syntax) {
-      printf("Syntax OK\n");
-    }
-  }
-  cleanup(mrb, &args);
-
-  return n == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}