Sync patches with upstream

Author: michaelklishin

debian/patches/clean.patch

@@ -1,17 +1,23 @@
-diff --git a/Makefile.in b/Makefile.in
-index ec5988348c..d76d79e589 100644
+clean.patch by Sergei Golovan <sgolovan@nes.ru>
+
+Erlang leaves many files after make clean. This patch contains
+a hack to remove them.
+
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -931,11 +931,214 @@ clean: check_recreate_primary_bootstrap
+@@ -931,6 +931,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)
- 	find . -type f -name SKIP-APPLICATIONS -print | xargs $(RM)
-
+@@ -989,3 +990,204 @@
+ $(NO_DIALYZER_APPS): $$(patsubst %,%_build,$$@)
+ $(APPS_TEST): $$(patsubst %_test,%_build,$$@)
+ 	ERL_TOP=$(ERL_TOP) TYPE=$(TYPE) $(MAKE) -C lib/$(patsubst %_test,%,$@) test
++
 +additional_clean:
 +	rm -rf $(ERL_TOP)/bin
 +	rm -rf $(ERL_TOP)/bootstrap/bin/erl
@@ -212,8 +218,3 @@ index ec5988348c..d76d79e589 100644
 +	rm -rf $(ERL_TOP)/system/doc/tutorial/erl_interface.xml
 +	rm -rf $(ERL_TOP)/system/doc/tutorial/example.xml
 +	rm -rf $(ERL_TOP)/system/doc/tutorial/nif.xml
-+
-+
- #
- # Just wipe out emulator, not libraries
- #

debian/patches/doc.patch

@@ -5,7 +5,7 @@ Last-Modified: Mon, 04 Mar 2024 16:08:31 +0300
 
 --- a/lib/snmp/doc/references/snmpc_cmd.md
 +++ b/lib/snmp/doc/references/snmpc_cmd.md
-@@ -56,17 +56,17 @@
+@@ -57,17 +57,17 @@
 
  - **\--verbosity _verbosity_** - Print debug info.
 

debian/patches/exdoc.patch

@@ -0,0 +1,80 @@
+Author: Sergei Golovan
+Description: Patch fixes FTBFS when using pbuilder.
+
+--- a/make/ex_doc_wrapper.in
++++ b/make/ex_doc_wrapper.in
+@@ -35,11 +35,14 @@
+ 
+ ## Running the command where we redirect stderr to fd 1 and stdout to fd 3.
+ ## We then use tee on the stderr (which is now fd 1) to print that to fd 4
+-OUTPUT="$( { escript@EXEEXT@ "${EX_DOC}" "${ARGS[@]}"; } 2>&1 1>&3 | tee /dev/fd/4 )"
++export ERL_LIBS=/usr/lib/elixir/lib
++OUTPUT="$( { "${EX_DOC}" "${ARGS[@]}"; } 2>&1 1>&3 )"
+ 
+ ## Close fd 3 and 4
+ exec 3>&- 4>&-
+ 
++echo "${OUTPUT}"
++
+ ## If EX_DOC_WARNINGS_AS_ERRORS is not explicitly turned on
+ ## and any .app file is missing, we turn off warnings as errors
+ if [ "${EX_DOC_WARNINGS_AS_ERRORS}" != "true" ]; then
+--- a/make/ex_doc.exs
++++ b/make/ex_doc.exs
+@@ -185,6 +185,7 @@
+     |> Enum.uniq(),
+   extras: extras,
+   skip_undefined_reference_warnings_on: ["notes.md"],
++  skip_code_autolink_to: ["t:fun/0"],
+   groups_for_docs:
+     (Access.get(local_config, :groups_for_docs, []) ++ groups_for_docs) |> Enum.uniq(),
+   deps:
+--- a/lib/kernel/doc/docs.exs
++++ b/lib/kernel/doc/docs.exs
+@@ -39,7 +39,7 @@
+       :trace
+     ]
+   ],
+-  skip_code_autolink_to: ["t:file_descriptor/0"],
++  skip_code_autolink_to: ["t:file_descriptor/0","t:fun/0"],
+   ## The order of these items determine
+   ## how they are listed in the docs
+   extras: [
+--- a/lib/tools/doc/docs.exs
++++ b/lib/tools/doc/docs.exs
+@@ -11,6 +11,7 @@
+     "references/erlang.el.md"
+   ],
+   skip_code_autolink_to: [
++    "t:fun/0",
+     "fprof:apply_start_stop/4",
+     "prim_file:drv_command/4",
+     "prim_file:drv_command/2",
+--- a/lib/xmerl/doc/docs.exs
++++ b/lib/xmerl/doc/docs.exs
+@@ -1,5 +1,5 @@
+ [
+-  skip_code_autolink_to: ["t:xmerl_scanner/0", "t:xsd_state/0"],
++  skip_code_autolink_to: ["t:xmerl_scanner/0", "t:xsd_state/0", "t:fun/0"],
+ 
+   ## The order of these items determine
+   ## how they are listed in the docs
+--- a/lib/diameter/doc/docs.exs
++++ b/lib/diameter/doc/docs.exs
+@@ -9,5 +9,5 @@
+     "references/diameterc_cmd.md",
+     "references/diameter_dict.md"
+   ],
+-  skip_code_autolink_to: ["diameter_traffic:request/1"]
++  skip_code_autolink_to: ["diameter_traffic:request/1","t:fun/0"]
+ ]
+--- a/erts/doc/docs.exs
++++ b/erts/doc/docs.exs
+@@ -106,6 +106,7 @@
+       "references/werl_cmd.md"
+     ] ++ Path.wildcard("../emulator/internal_doc/*.md"),
+   skip_code_autolink_to: [
++    "t:fun/0",
+     "dist_util:net_ticker_spawn_options/0",
+     "dist_util:handshake_we_started/1",
+     "dist_util:handshake_other_started/1",

debian/patches/gnu.patch

@@ -15,7 +15,7 @@ Author: Pino Toscano <pino@debian.org>
 
 --- a/erts/configure.ac
 +++ b/erts/configure.ac
-@@ -527,7 +527,7 @@
+@@ -526,7 +526,7 @@
 
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -24,7 +24,7 @@ Author: Pino Toscano <pino@debian.org>
      aix*|os400*)
          # * _ALL_SOURCE: Required to get the winsize structure for TIOCSWINSZ.
          # * _LINUX_SOURCE_COMPAT: Not required, but makes some libc functions
-@@ -1158,7 +1158,7 @@
+@@ -1157,7 +1157,7 @@
  fi
 
  case $host_os in
@@ -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
-@@ -5297,6 +5297,11 @@
+@@ -5308,6 +5308,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
-@@ -1663,7 +1663,7 @@
+@@ -1699,7 +1699,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';
 
-@@ -1677,7 +1677,7 @@
+@@ -1713,7 +1713,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';
 
-@@ -1911,7 +1911,7 @@
+@@ -1947,7 +1947,7 @@
          char cwd[MAX_PATH];
          if (_getcwd(cwd, sizeof(cwd)) == NULL) {
  #else
@@ -166,3 +166,32 @@ Author: Pino Toscano <pino@debian.org>
  	| perl -pe "s@ [a-zA-Z]?$(ERL_TOP_NATIVE)/(?:bootstrap/)?lib/([^/]+)@ ../../\1@g" 2> /dev/null \
  	| sed "s/\.$(EMULATOR)/\.$$\(EMULATOR\)/" \
  	| sed 's@^dtls_@$$(EBIN)/dtls_@' \
+--- a/make/autoconf/otp.m4
++++ b/make/autoconf/otp.m4
+@@ -1818,6 +1818,8 @@
+ 		    ETHR_DEFS="$ETHR_DEFS -DETHR_UNUSABLE_SIGALTSTACK"
+ 		fi
+ 		;;
++	    *gnu*)
++		ETHR_DEFS="$ETHR_DEFS -D_GNU_SOURCE" ;;
+ 	    *) ;;
+ 	esac
+ 
+@@ -3079,7 +3081,7 @@
+ DED_CFLAGS=
+ DED_OSTYPE=unix
+ case $host_os in
+-     linux*)
++     linux*|*gnu*)
+ 	DED_CFLAGS="-D_GNU_SOURCE" ;;
+      win32)
+ 	DED_CFLAGS="-D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
+@@ -3217,7 +3219,7 @@
+ 		DED_LD="$CC"
+ 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+ 	;;
+-	linux*)
++	linux*|*gnu*)
+ 		DED_LD="$CC"
+ 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+ 		DED_LDFLAGS="-shared -Wl,-Bsymbolic"

debian/patches/javascript.patch

@@ -1,3 +1,6 @@
+Author: Sergei Golovan
+Description: Patch drops JavaScript libraries from the binary package.
+
 --- a/lib/common_test/priv/Makefile.in
 +++ b/lib/common_test/priv/Makefile.in
 @@ -61,7 +61,7 @@

debian/patches/series

@@ -3,3 +3,4 @@ gnu.patch
 javascript.patch
 x32.patch
 doc.patch
+exdoc.patch