diff options
| -rw-r--r-- | main/apk-tools/tar-parser-overflow.patch | 51 | ||||
| -rw-r--r-- | main/attr/fix-tests.patch | 14 | ||||
| -rw-r--r-- | main/bctoolbox/cmake-lib-version-fix.patch | 34 | ||||
| -rw-r--r-- | main/clang/30-fix-python-shebangs.patch | 391 | ||||
| -rw-r--r-- | main/llvm11/python3-test.patch | 8 | ||||
| -rw-r--r-- | main/sysfsutils/gcc-10.patch | 31 | ||||
| -rw-r--r-- | main/xtables-addons-lts/use-uint64_t.patch | 26 |
7 files changed, 0 insertions, 555 deletions
diff --git a/main/apk-tools/tar-parser-overflow.patch b/main/apk-tools/tar-parser-overflow.patch deleted file mode 100644 index 8b20cad48a6..00000000000 --- a/main/apk-tools/tar-parser-overflow.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/io_archive.c b/src/io_archive.c -index de4741e..a8f3c3d 100644 ---- a/src/io_archive.c -+++ b/src/io_archive.c -@@ -51,6 +51,7 @@ struct tar_header { - - #define GET_OCTAL(s) get_octal(s, sizeof(s)) - #define PUT_OCTAL(s,v) put_octal(s, sizeof(s), v) -+#define HAS_NULLTERM(a) memchr(a, '\0', sizeof(a)) - - static unsigned int get_octal(char *s, size_t l) - { -@@ -125,6 +126,27 @@ static void handle_extended_header(struct apk_file_info *fi, apk_blob_t hdr) - } - } - -+static int validate_tar_header(struct tar_header *buf) -+{ -+ /* Ensure that fields which should be null-terminated -+ * are null-terminated to use string functions on them. */ -+ if (!HAS_NULLTERM(buf->uname) || !HAS_NULLTERM(buf->gname) || -+ !HAS_NULLTERM(buf->linkname) || !HAS_NULLTERM(buf->magic) || -+ !HAS_NULLTERM(buf->name) || !HAS_NULLTERM(buf->prefix)) { -+ return FALSE; -+ } -+ -+ /* Validate the typeflag field. */ -+ //if (!strchr("KLgx01234567", buf->typeflag)) -+ // return FALSE; -+ -+ /* Validate the size field. */ -+ if (GET_OCTAL(buf->size) >= SSIZE_MAX - 512) -+ return FALSE; -+ -+ return TRUE; -+} -+ - int apk_tar_parse(struct apk_istream *is, apk_archive_entry_parser parser, - void *ctx, struct apk_id_cache *idc) - { -@@ -141,6 +163,10 @@ int apk_tar_parse(struct apk_istream *is, apk_archive_entry_parser parser, - memset(&entry, 0, sizeof(entry)); - entry.name = buf.name; - while ((r = apk_istream_read(is, &buf, 512)) == 512) { -+ if (!validate_tar_header(&buf)) { -+ goto err; -+ } -+ - if (buf.name[0] == '\0') { - if (end) break; - end++; diff --git a/main/attr/fix-tests.patch b/main/attr/fix-tests.patch deleted file mode 100644 index 54ca561a8f9..00000000000 --- a/main/attr/fix-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/run b/test/run -index 4b1f8d0..07e916c 100755 ---- a/test/run -+++ b/test/run -@@ -106,7 +106,7 @@ for (;;) { - if (defined $line) { - # Substitute %VAR and %{VAR} with environment variables. - $line =~ s[%(\w+)][$ENV{$1}]eg; -- $line =~ s[%{(\w+)}][$ENV{$1}]eg; -+ $line =~ s[%\{(\w+)}][$ENV{$1}]eg; - } - if (defined $line) { - if ($line =~ s/^\s*< ?//) { - diff --git a/main/bctoolbox/cmake-lib-version-fix.patch b/main/bctoolbox/cmake-lib-version-fix.patch deleted file mode 100644 index f2e88c34b16..00000000000 --- a/main/bctoolbox/cmake-lib-version-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/cmake/BcToolboxCMakeUtils.cmake b/cmake/BcToolboxCMakeUtils.cmake -index fd4894e..da8daf1 100644 ---- a/cmake/BcToolboxCMakeUtils.cmake -+++ b/cmake/BcToolboxCMakeUtils.cmake -@@ -147,29 +147,7 @@ function(bc_parse_full_version version major minor patch) - endfunction() - - function(bc_compute_lib_version OUTPUT_VERSION default_version) -- find_program(GIT_EXECUTABLE git NAMES Git CMAKE_FIND_ROOT_PATH_BOTH) -- if(GIT_EXECUTABLE) -- execute_process( -- COMMAND "${GIT_EXECUTABLE}" "describe" -- OUTPUT_VARIABLE GIT_DESCRIBE_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ERROR_QUIET -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" -- ) -- -- # parse git describe version -- if (NOT (GIT_DESCRIBE_VERSION MATCHES "^([0-9]+)[.]([0-9]+)[.]([0-9]+)(-alpha|-beta)?(-[0-9]+)?(-g[0-9a-f]+)?$")) -- message(FATAL_ERROR "invalid git describe version: '${GIT_DESCRIBE_VERSION}'") -- endif() -- set(version_major ${CMAKE_MATCH_1}) -- set(version_minor ${CMAKE_MATCH_2}) -- set(version_patch ${CMAKE_MATCH_3}) -- -- # format lib version -- set(${OUTPUT_VERSION} "${version_major}.${version_minor}.${version_patch}" CACHE STRING "") -- else() - set(${OUTPUT_VERSION} "${default_version}" CACHE STRING "") -- endif() - endfunction() - - function(bc_compute_full_version OUTPUT_VERSION) diff --git a/main/clang/30-fix-python-shebangs.patch b/main/clang/30-fix-python-shebangs.patch deleted file mode 100644 index fad56c81da9..00000000000 --- a/main/clang/30-fix-python-shebangs.patch +++ /dev/null @@ -1,391 +0,0 @@ -diff --git a/bindings/python/examples/cindex/cindex-dump.py b/bindings/python/examples/cindex/cindex-dump.py -index 46073b28..fc513c7e 100644 ---- a/bindings/python/examples/cindex/cindex-dump.py -+++ b/bindings/python/examples/cindex/cindex-dump.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - #===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===# - # -diff --git a/bindings/python/examples/cindex/cindex-includes.py b/bindings/python/examples/cindex/cindex-includes.py -index ec1fbc0c..be600342 100644 ---- a/bindings/python/examples/cindex/cindex-includes.py -+++ b/bindings/python/examples/cindex/cindex-includes.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - #===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===# - # -diff --git a/docs/tools/dump_ast_matchers.py b/docs/tools/dump_ast_matchers.py -index c96c1ca2..26cf4156 100755 ---- a/docs/tools/dump_ast_matchers.py -+++ b/docs/tools/dump_ast_matchers.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # A tool to parse ASTMatchers.h and update the documentation in - # ../LibASTMatchersReference.html automatically. Run from the - # directory in which this file is located to update the docs. -diff --git a/docs/tools/dump_format_style.py b/docs/tools/dump_format_style.py -index 5feb793a..e18a2ffb 100755 ---- a/docs/tools/dump_format_style.py -+++ b/docs/tools/dump_format_style.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # A tool to parse the FormatStyle struct from Format.h and update the - # documentation in ../ClangFormatStyleOptions.rst automatically. - # Run from the directory in which this file is located to update the docs. -diff --git a/test/AST/gen_ast_dump_json_test.py b/test/AST/gen_ast_dump_json_test.py -index 975039ea..9a6ee94c 100644 ---- a/test/AST/gen_ast_dump_json_test.py -+++ b/test/AST/gen_ast_dump_json_test.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import print_function - from collections import OrderedDict -diff --git a/tools/clang-format/clang-format-diff.py b/tools/clang-format/clang-format-diff.py -index 3ba0abef..6b0425a7 100755 ---- a/tools/clang-format/clang-format-diff.py -+++ b/tools/clang-format/clang-format-diff.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===# - # -diff --git a/tools/clang-format/git-clang-format b/tools/clang-format/git-clang-format -index ef7f22d0..4ea4521f 100755 ---- a/tools/clang-format/git-clang-format -+++ b/tools/clang-format/git-clang-format -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - #===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===# - # -diff --git a/tools/scan-build-py/bin/analyze-build b/tools/scan-build-py/bin/analyze-build -index 6c285874..5b270d54 100755 ---- a/tools/scan-build-py/bin/analyze-build -+++ b/tools/scan-build-py/bin/analyze-build -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-build-py/bin/analyze-c++ b/tools/scan-build-py/bin/analyze-c++ -index 564e2abf..b2b60a44 100755 ---- a/tools/scan-build-py/bin/analyze-c++ -+++ b/tools/scan-build-py/bin/analyze-c++ -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-build-py/bin/analyze-cc b/tools/scan-build-py/bin/analyze-cc -index 564e2abf..b2b60a44 100755 ---- a/tools/scan-build-py/bin/analyze-cc -+++ b/tools/scan-build-py/bin/analyze-cc -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-build-py/bin/intercept-build b/tools/scan-build-py/bin/intercept-build -index 23f51047..fe45c545 100755 ---- a/tools/scan-build-py/bin/intercept-build -+++ b/tools/scan-build-py/bin/intercept-build -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-build-py/bin/intercept-c++ b/tools/scan-build-py/bin/intercept-c++ -index 4230c803..0cba3a3c 100755 ---- a/tools/scan-build-py/bin/intercept-c++ -+++ b/tools/scan-build-py/bin/intercept-c++ -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-build-py/bin/intercept-cc b/tools/scan-build-py/bin/intercept-cc -index 4230c803..0cba3a3c 100755 ---- a/tools/scan-build-py/bin/intercept-cc -+++ b/tools/scan-build-py/bin/intercept-cc -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-build-py/bin/scan-build b/tools/scan-build-py/bin/scan-build -index 156da064..4fa08175 100755 ---- a/tools/scan-build-py/bin/scan-build -+++ b/tools/scan-build-py/bin/scan-build -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - # See https://llvm.org/LICENSE.txt for license information. -diff --git a/tools/scan-view/bin/scan-view b/tools/scan-view/bin/scan-view -index 6165432e..07effbca 100755 ---- a/tools/scan-view/bin/scan-view -+++ b/tools/scan-view/bin/scan-view -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import print_function - -diff --git a/tools/scan-view/share/Reporter.py b/tools/scan-view/share/Reporter.py -index b1ff1614..d6300e78 100644 ---- a/tools/scan-view/share/Reporter.py -+++ b/tools/scan-view/share/Reporter.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - """Methods for reporting bugs.""" -diff --git a/tools/scan-view/share/startfile.py b/tools/scan-view/share/startfile.py -index 9eb548bc..cdf3db27 100644 ---- a/tools/scan-view/share/startfile.py -+++ b/tools/scan-view/share/startfile.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - """Utility for opening a file using the default application in a cross-platform -diff --git a/utils/ABITest/ABITestGen.py b/utils/ABITest/ABITestGen.py -index 93a6de93..efb35fa7 100755 ---- a/utils/ABITest/ABITestGen.py -+++ b/utils/ABITest/ABITestGen.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import absolute_import, division, print_function - from pprint import pprint -diff --git a/utils/CIndex/completion_logger_server.py b/utils/CIndex/completion_logger_server.py -index 20166711..02d7cd6f 100755 ---- a/utils/CIndex/completion_logger_server.py -+++ b/utils/CIndex/completion_logger_server.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import, division, print_function - import sys - from socket import * -diff --git a/utils/CaptureCmd b/utils/CaptureCmd -index 705585c3..5ffdfe56 100755 ---- a/utils/CaptureCmd -+++ b/utils/CaptureCmd -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """CaptureCmd - A generic tool for capturing information about the - invocations of another program. -diff --git a/utils/CmpDriver b/utils/CmpDriver -index 12ce7a32..c2b6ab5e 100755 ---- a/utils/CmpDriver -+++ b/utils/CmpDriver -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - A simple utility that compares tool invocations and exit codes issued by -diff --git a/utils/FindSpecRefs b/utils/FindSpecRefs -index 9097f93f..3ad581b3 100755 ---- a/utils/FindSpecRefs -+++ b/utils/FindSpecRefs -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import os - import re -diff --git a/utils/FuzzTest b/utils/FuzzTest -index 0e043df7..c4c956b6 100755 ---- a/utils/FuzzTest -+++ b/utils/FuzzTest -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - This is a generic fuzz testing tool, see --help for more information. -diff --git a/utils/TestUtils/deep-stack.py b/utils/TestUtils/deep-stack.py -index 10bf47ac..5fb8d0df 100755 ---- a/utils/TestUtils/deep-stack.py -+++ b/utils/TestUtils/deep-stack.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import absolute_import, division, print_function - def pcall(f, N): -diff --git a/utils/analyzer/CmpRuns.py b/utils/analyzer/CmpRuns.py -index 3fab6ef5..9baa7a48 100755 ---- a/utils/analyzer/CmpRuns.py -+++ b/utils/analyzer/CmpRuns.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - CmpRuns - A simple tool for comparing two static analyzer runs to determine -diff --git a/utils/analyzer/SATestAdd.py b/utils/analyzer/SATestAdd.py -index 52089f4e..d087a90b 100755 ---- a/utils/analyzer/SATestAdd.py -+++ b/utils/analyzer/SATestAdd.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - Static Analyzer qualification infrastructure: adding a new project to -diff --git a/utils/analyzer/SATestBuild.py b/utils/analyzer/SATestBuild.py -index 691ded80..b17b3db1 100755 ---- a/utils/analyzer/SATestBuild.py -+++ b/utils/analyzer/SATestBuild.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - Static Analyzer qualification infrastructure. -diff --git a/utils/analyzer/SATestUpdateDiffs.py b/utils/analyzer/SATestUpdateDiffs.py -index ea3c08cc..08e3f82f 100755 ---- a/utils/analyzer/SATestUpdateDiffs.py -+++ b/utils/analyzer/SATestUpdateDiffs.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - Update reference results for static analyzer. -diff --git a/utils/analyzer/SumTimerInfo.py b/utils/analyzer/SumTimerInfo.py -index 36e519ad..d1934f19 100644 ---- a/utils/analyzer/SumTimerInfo.py -+++ b/utils/analyzer/SumTimerInfo.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """ - Script to Summarize statistics in the scan-build output. -diff --git a/utils/analyzer/exploded-graph-rewriter.py b/utils/analyzer/exploded-graph-rewriter.py -index 5ce56d61..808f21c9 100755 ---- a/utils/analyzer/exploded-graph-rewriter.py -+++ b/utils/analyzer/exploded-graph-rewriter.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - #===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--# - # -diff --git a/utils/check_cfc/check_cfc.py b/utils/check_cfc/check_cfc.py -index 311f502f..0bbbc088 100755 ---- a/utils/check_cfc/check_cfc.py -+++ b/utils/check_cfc/check_cfc.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """Check CFC - Check Compile Flow Consistency - -diff --git a/utils/check_cfc/obj_diff.py b/utils/check_cfc/obj_diff.py -index a0951c5b..b3866948 100755 ---- a/utils/check_cfc/obj_diff.py -+++ b/utils/check_cfc/obj_diff.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import absolute_import, division, print_function - -diff --git a/utils/check_cfc/test_check_cfc.py b/utils/check_cfc/test_check_cfc.py -index 0808252a..6f149ebc 100755 ---- a/utils/check_cfc/test_check_cfc.py -+++ b/utils/check_cfc/test_check_cfc.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - """Test internal functions within check_cfc.py.""" - -diff --git a/utils/creduce-clang-crash.py b/utils/creduce-clang-crash.py -index be16211c..e56f3697 100755 ---- a/utils/creduce-clang-crash.py -+++ b/utils/creduce-clang-crash.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """Calls C-Reduce to create a minimal reproducer for clang crashes. - - Output files: -diff --git a/utils/hmaptool/hmaptool b/utils/hmaptool/hmaptool -index 58baab2f..00296f11 100755 ---- a/utils/hmaptool/hmaptool -+++ b/utils/hmaptool/hmaptool -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - from __future__ import absolute_import, division, print_function - - import json -diff --git a/utils/modfuzz.py b/utils/modfuzz.py -index 61ca3272..19a9807b 100644 ---- a/utils/modfuzz.py -+++ b/utils/modfuzz.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - - # To use: - # 1) Update the 'decls' list below with your fuzzing configuration. -diff --git a/utils/token-delta.py b/utils/token-delta.py -index 62b4eb3c..022fb2f8 100755 ---- a/utils/token-delta.py -+++ b/utils/token-delta.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import absolute_import, division, print_function - import os -diff --git a/www/builtins.py b/www/builtins.py -index f0bcf196..54901487 100755 ---- a/www/builtins.py -+++ b/www/builtins.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import sys, fileinput - -diff --git a/www/make_cxx_dr_status b/www/make_cxx_dr_status -index 2d7c1f32..bc24cd12 100755 ---- a/www/make_cxx_dr_status -+++ b/www/make_cxx_dr_status -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - import sys, os, re - - index = 'cwg_index.html' - diff --git a/main/llvm11/python3-test.patch b/main/llvm11/python3-test.patch deleted file mode 100644 index 746313317e1..00000000000 --- a/main/llvm11/python3-test.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py.old 2014-03-13 00:10:37.000000000 +0000 -+++ llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py 2019-03-10 03:48:48.600000000 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import sys - diff --git a/main/sysfsutils/gcc-10.patch b/main/sysfsutils/gcc-10.patch deleted file mode 100644 index 2c911fcfa32..00000000000 --- a/main/sysfsutils/gcc-10.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream: Should be -Reason: Fixes compilation with gcc-10 - -Taken from https://src.fedoraproject.org/rpms/sysfsutils/blob/master/f/0002-fix-compiler-complaints.patch - -diff --git a/test/test-defs.h b/test/test-defs.h -index b22909a..73ede6d 100644 ---- a/test/test-defs.h -+++ b/test/test-defs.h -@@ -42,7 +42,7 @@ - #define inval_path "/sys/invalid/path" - #define FUNC_TABLE_SIZE (sizeof(func_table)/sizeof(int)) - --FILE *my_stdout; -+extern FILE *my_stdout; - - #define dbg_print(format, arg...) fprintf(my_stdout, format, ## arg) - -diff --git a/test/test.c b/test/test.c -index 2e8f201..f63e346 100644 ---- a/test/test.c -+++ b/test/test.c -@@ -27,6 +27,8 @@ - #include "test-defs.h" - #include <errno.h> - -+FILE *my_stdout; -+ - /*************************************************/ - char *function_name[] = { - "sysfs_get_mnt_path", diff --git a/main/xtables-addons-lts/use-uint64_t.patch b/main/xtables-addons-lts/use-uint64_t.patch deleted file mode 100644 index da2306ebc33..00000000000 --- a/main/xtables-addons-lts/use-uint64_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -do_div needs 64 bit type on all arches - -upstream report: https://www.spinics.net/lists/netfilter-devel/msg70467.html - -diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c -index 5296eef..3c304e0 100644 ---- a/extensions/pknock/xt_pknock.c -+++ b/extensions/pknock/xt_pknock.c -@@ -338,7 +338,7 @@ is_interknock_time_exceeded(const struct peer *peer, unsigned int max_time) - static inline bool - has_logged_during_this_minute(const struct peer *peer) - { -- unsigned long x, y; -+ uint64_t x, y; - if (peer == NULL) - return 0; - x = ktime_get_seconds(); -@@ -717,7 +717,7 @@ has_secret(const unsigned char *secret, unsigned int secret_len, uint32_t ipsrc, - unsigned int hexa_size; - int ret; - bool fret = false; -- unsigned long x; -+ uint64_t x; - unsigned int epoch_min; - - if (payload_len == 0) |