Merge branch 'master-2.7' into dist/2.7/buster

Author: sorah

ChangeLog

@@ -1585,6 +1585,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
 static unsigned long
 uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
 {
+    *ptr = NULL;
 #ifdef SUPPORT_COMPRESSED_DEBUG_LINE
     ElfW(Chdr) *chdr = (ElfW(Chdr) *)(file + shdr->sh_offset);
     unsigned long destsize = chdr->ch_size;
@@ -1605,6 +1606,7 @@ uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
 
 fail:
     free(*ptr);
+    *ptr = NULL;
 #endif
     return 0;
 }

addr2line.c

@@ -911,17 +911,22 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
     }
 
     while (module) {
+        int origin_seen = FALSE;
 	int superclass_seen = FALSE;
 	struct rb_id_table *tbl;
 
+        if (klass == c)
+            origin_seen = TRUE;
 	if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
 	    return -1;
 	/* ignore if the module included already in superclasses */
 	for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
 	    int type = BUILTIN_TYPE(p);
+            if (c == p)
+                origin_seen = TRUE;
 	    if (type == T_ICLASS) {
 		if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
-		    if (!superclass_seen) {
+		    if (!superclass_seen && origin_seen) {
 			c = p;  /* move insertion point */
 		    }
 		    goto skip;

class.c

@@ -7,7 +7,7 @@ ARG BUILDDATE=99999999
 RUN sed -i -e 's|archive\.ubuntu\.com/ubuntu|ap-northeast-1.ec2.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list
 # Allow use of debhelper-compat 12 in backport
 # https://help.ubuntu.com/community/UbuntuBackports
-RUN /bin/echo -e "Package: debhelper\nPin: release a=bionic-backports\nPin-Priority: 500\n" | tee -a /etc/apt/preferences
+RUN /bin/echo -e "Package: debhelper libdebhelper-perl dh-autoreconf dwz\nPin: release a=bionic-backports\nPin-Priority: 500\n\n" | tee -a /etc/apt/preferences
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN mkdir -p /build \

debian/Dockerfile.bionic

@@ -0,0 +1,14 @@
+FROM debian:bullseye
+
+# just to invalidate cache
+ARG BUILDDATE=99999999
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN mkdir -p /build \
+  && apt-get update \
+  && apt-get install -y debhelper dh-make devscripts gnupg2 vim equivs
+RUN mkdir -p -m700 /root/.gnupg
+
+ADD control /control
+RUN mk-build-deps -i --t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' /control
+RUN apt-get install -y tzdata

debian/Dockerfile.bullseye

@@ -1,3 +1,9 @@
+ruby2.7 (2.7.5-0nkmi1~dist) unstable; urgency=medium
+
+  * 2.7.5
+
+ -- Sorah Fukumori <[email protected]>  Sat, 08 Jan 2022 09:18:20 +0900
+
 ruby2.7 (2.7.4-0nkmi1~dist) unstable; urgency=medium
 
   * 2.7.4

debian/changelog

@@ -0,0 +1 @@
+exclude :test_valid_socket_ip_address_list, 'https://github.com/ruby/resolv/pull/2'

debian/tests/excludes/any/TestResolvAddr.rb

@@ -648,7 +648,7 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary = rb_ary_new();
 
-    rb_block_call(obj, id_each, argc, argv, collect_all, ary);
+    rb_block_call_kw(obj, id_each, argc, argv, collect_all, ary, RB_PASS_CALLED_KEYWORDS);
 
     return ary;
 }

enum.c

@@ -36,7 +36,8 @@ static VALUE
 optimized_escape_html(VALUE str)
 {
     VALUE vbuf;
-    char *buf = ALLOCV_N(char, vbuf, RSTRING_LEN(str) * HTML_ESCAPE_MAX_LEN);
+    typedef char escape_buf[HTML_ESCAPE_MAX_LEN];
+    char *buf = *ALLOCV_N(escape_buf, vbuf, RSTRING_LEN(str));
     const char *cstr = RSTRING_PTR(str);
     const char *end = cstr + RSTRING_LEN(str);
 

ext/cgi/escape/escape.c

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
+
+version = File.foreach(File.expand_path("../lib/date.rb", __FILE__)).find do |line|
+  /^\s*VERSION\s*=\s*["'](.*)["']/ =~ line and break $1
+end
+
 Gem::Specification.new do |s|
   s.name = "date"
-  s.version = '3.0.0'
+  s.version = version
   s.summary = "A subclass of Object includes Comparable module for handling dates."
   s.description = "A subclass of Object includes Comparable module for handling dates."