Sync patches with Debian Experimental (26.0), use maint-26

Author: michaelklishin

.github/workflows/test-ubuntu-20.yaml

@@ -1,4 +1,4 @@
-name: Test Ubuntu 20.04
+name: Test Ubuntu Focal
 on:
   push:
 jobs:
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v2.3.4
         with:
           repository: erlang/otp
-          ref: maint-24
+          ref: maint-26
           fetch-depth: 0
           path: erlang-sources
       - name: Build package

debian/patches/atomsfontlock.patch

@@ -5,15 +5,15 @@ a hack to remove them.
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1209,6 +1209,7 @@
+@@ -963,6 +963,7 @@
  	rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
  	cd lib  && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
 +	$(MAKE) additional_clean
 
  distclean: clean
  	find . -type f -name SKIP              -print | xargs $(RM)
-@@ -1266,3 +1267,204 @@
+@@ -1020,3 +1021,204 @@
  .SECONDEXPANSION:
  $(APPS_TEST): $$(patsubst %_test,%,$$@)
  	ERL_TOP=$(ERL_TOP) TYPE=$(TYPE) $(MAKE) -C lib/$< test

debian/patches/autoconfversion.patch

@@ -14,7 +14,7 @@ Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
        </xsl:otherwise>
      </xsl:choose>
    </xsl:template>
-@@ -860,7 +860,7 @@
+@@ -871,7 +871,7 @@
    <xsl:template match="desc">
      <xsl:text>&#10;.RS</xsl:text>
      <xsl:apply-templates/>
@@ -25,7 +25,7 @@ Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
 
 --- a/lib/stdlib/doc/src/re.xml
 +++ b/lib/stdlib/doc/src/re.xml
-@@ -594,7 +594,7 @@
+@@ -626,7 +626,7 @@
                to match before it. Setting this without <c>multiline</c> (at
                compile time) causes circumflex never to match. This option only
                affects the behavior of the circumflex metacharacter. It does not
@@ -34,7 +34,7 @@ Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
            </item>
            <tag><c>noteol</c></tag>
            <item>
-@@ -603,7 +603,7 @@
+@@ -635,7 +635,7 @@
                in multiline mode) a newline immediately before it. Setting this
                without <c>multiline</c> (at compile time) causes dollar never to
                match. This option affects only the behavior of the dollar

debian/patches/beamload.patch

@@ -16,7 +16,7 @@ section 3.
    "The man directories displayed in the Erlang menu.
 
  Each item in the list should be a list with three elements, the first
-@@ -2083,7 +2083,7 @@
+@@ -2082,7 +2082,7 @@
 
  (defun erlang-man-make-menu-item (file)
    "Create a menu item containing the name of the man page."
@@ -25,7 +25,7 @@ section 3.
         (let ((page (substring file (match-beginning 1) (match-end 1))))
           (list (capitalize page)
                 (list 'lambda '()
-@@ -2094,7 +2094,7 @@
+@@ -2093,7 +2093,7 @@
 
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -34,7 +34,7 @@ section 3.
 
 
  (defun erlang-man-module (&optional module)
-@@ -2116,7 +2116,7 @@
+@@ -2115,7 +2115,7 @@
      (error "No Erlang module name given"))
    (let ((dir-list erlang-man-dirs)
          (pat (concat "/" (regexp-quote module)
@@ -43,7 +43,7 @@ section 3.
          (file nil)
          file-list)
      (while (and dir-list (null file))
-@@ -2350,7 +2350,7 @@
+@@ -2349,7 +2349,7 @@
                        nil)))))))))
 
  (defvar erlang-man-file-regexp
@@ -52,7 +52,7 @@ section 3.
 
  (defun erlang-man-display (file)
    "Display FILE as a `man' file.
-@@ -2362,7 +2362,7 @@
+@@ -2361,7 +2361,7 @@
        (let ((process-environment (copy-sequence process-environment)))
          (if (string-match erlang-man-file-regexp file)
              (let ((dir (substring file (match-beginning 1) (match-end 1)))

debian/patches/clean.patch

@@ -49,7 +49,7 @@ Author: Pino Toscano <pino@debian.org>
  #include <sys/sysctl.h>
 --- a/erts/emulator/drivers/common/inet_drv.c
 +++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -5042,6 +5042,11 @@
+@@ -5262,6 +5262,11 @@
      *x = addr;
      return 0;
  }
@@ -63,7 +63,7 @@ Author: Pino Toscano <pino@debian.org>
 
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -1645,7 +1645,7 @@
+@@ -1646,7 +1646,7 @@
      if (!bindir) {
  	/* Determine bindir from absolute path to executable */
  	char *p;
@@ -72,7 +72,7 @@ Author: Pino Toscano <pino@debian.org>
  	strncpy(buffer, argv[0], sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
 
-@@ -1659,7 +1659,7 @@
+@@ -1660,7 +1660,7 @@
      if (!rootdir) {
  	/* Determine rootdir from absolute path to bindir */
  	char *p;
@@ -81,7 +81,7 @@ Author: Pino Toscano <pino@debian.org>
  	strncpy(buffer, bindir, sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
 
-@@ -1888,7 +1888,7 @@
+@@ -1889,7 +1889,7 @@
          char cwd[MAX_PATH];
          if (_getcwd(cwd, sizeof(cwd)) == NULL) {
  #else
@@ -156,7 +156,7 @@ Author: Pino Toscano <pino@debian.org>
          abspath = find_prog(argv[0]);
 --- a/lib/ssl/src/Makefile
 +++ b/lib/ssl/src/Makefile
-@@ -181,7 +181,8 @@
+@@ -184,7 +184,8 @@
 
  $(DEP_FILE): $(ERL_FILES)
  	@echo SED $(TARGET) $(ERL_TOP_NATIVE)

debian/patches/docs.patch

@@ -8,7 +8,7 @@ Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
 
 --- a/erts/configure.ac
 +++ b/erts/configure.ac
-@@ -3397,7 +3397,8 @@
+@@ -3439,7 +3439,8 @@
    dnl Make sure it's at least JDK 1.6
    AC_CACHE_CHECK(for JDK version 1.6, 
       ac_cv_prog_javac_ver_1_6,

debian/patches/emacs.patch

@@ -6,7 +6,7 @@ as required by Debian policy.)
 
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -708,8 +708,10 @@
+@@ -716,8 +716,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";