From 5d8d4fbbcb5c5de9370711c19bb3510210989a98 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Sat, 20 Feb 2021 16:02:15 -0800 Subject: treewide: Run refresh on all packages The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy --- utils/acl/patches/100-no-gettext_configure.patch | 6 +- utils/acl/patches/101-no-gettext_autogen.patch | 2 - utils/acl/patches/102-no-gettext_Makefile.patch | 2 - utils/at/patches/100-remove-glibc-assumption.patch | 17 ++-- utils/attr/patches/100-no-gettext_configure.patch | 4 +- utils/attr/patches/101-no-gettext_autogen.patch | 2 - utils/attr/patches/102-no-gettext_Makefile.patch | 2 - .../patches/110-Replace-bzero-with-memset.patch | 15 +--- ...ubstitue-functions-for-strndupa-rawmemchr.patch | 19 +---- utils/audit/patches/0002-fix-gcc-10.patch | 5 -- utils/avrdude/patches/020-no-cpp-timestamps.patch | 2 +- utils/avrdude/patches/110-ud-to-u.patch | 8 +- utils/bc/patches/001-disable-doc.patch | 10 +-- .../001-bcm43xx-Add-bcm43xx-3wire-variant.patch | 6 +- ...-UART-speed-must-be-reset-after-the-firmw.patch | 6 +- ...003-Increase-firmware-load-timeout-to-30s.patch | 6 +- ...-Move-the-43xx-firmware-into-lib-firmware.patch | 6 +- utils/bluez/patches/201-readline.patch | 6 +- utils/bluez/patches/202-fix-endianness.patch | 6 +- .../bluez/patches/203-obexd_without_systemd.patch | 14 +--- ...05-refresh_adv_manager_for_non-LE_devices.patch | 6 +- utils/bonnie++/patches/010-openwrt-fixes.patch | 4 +- utils/ccrypt/patches/001-no-intl.patch | 20 ++--- utils/cmdpad/patches/100-Makefile.patch | 4 +- utils/cmdpad/patches/120-kernel26-compat.patch | 6 +- utils/cmdpad/patches/130-no_zombie.patch | 8 +- .../patches/920-backport-netlink-reg-noerror.patch | 4 +- .../930-dhcpleases-add-dhcpleases-plugin.patch | 20 +---- .../coreutils/patches/001-no_docs_man_tests.patch | 8 +- ...store-831-behavior-on-removed-directories.patch | 21 ++--- ...-support-gpio-with-number-bigger-than-255.patch | 13 +-- .../patches/020-libmicrohttpd.patch | 4 +- .../patches/0001_add_missing_includes.patch | 50 +++++------ .../patches/001-libdevmapper_name_fix.patch | 6 +- utils/domoticz/patches/010-boost-173.patch | 98 ---------------------- utils/domoticz/patches/011-openzwave-include.patch | 11 --- utils/domoticz/patches/012-minizip-overflow.patch | 5 -- utils/dosfstools/patches/010-iconv.patch | 4 +- utils/evtest/patches/010-musl.patch | 5 -- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 9 +- utils/flashrom/patches/010-bitbang.patch | 4 +- utils/gddrescue/patches/001-fix_uclibc.patch | 2 +- .../patches/100-replace-lua2c-with-sed.patch | 4 +- utils/haserl/patches/101-adjust-script-size.patch | 6 +- utils/hwinfo/patches/0-hardcoding-version | 6 +- .../patches/100-remove-build-timestamp.patch | 16 ++-- utils/lcdproc/patches/110-in-outb.patch | 2 +- utils/lrzsz/patches/100-install_delete_fix.patch | 2 +- utils/lvm2/patches/002-const-stdio.patch | 4 +- utils/lvm2/patches/003-no-mallinfo.patch | 6 +- .../patches/0001-fix-build-with-musl.patch | 6 +- utils/mariadb/patches/100-fix_hostname.patch | 2 +- utils/mariadb/patches/130-c11_atomics.patch | 8 +- .../mariadb/patches/170-ppc-remove-glibc-dep.patch | 12 +-- .../180-relax-mysql_install-db-wrt-pam-tool.patch | 6 +- .../190-replace-hostname-in-mysqld_safe.patch | 6 +- utils/mbtools/patches/010-glib.patch | 2 +- .../100-fix-unit-test-server-return-value.patch | 6 +- utils/mc/patches/010-subshell.patch | 2 +- utils/mg/patches/001-cross_compile_openwrt.patch | 4 +- utils/minicom/patches/200-gcc10.patch | 4 +- utils/mksh/patches/100-dot_mkshrc | 2 +- ...ing-of-Product-Revision-and-Serial-Number.patch | 7 +- ...0007-Add-various-SD-eMMC-vendors-to-table.patch | 45 +++++----- utils/mmc-utils/patches/0008-Various-fixes.patch | 57 ++++++------- ...mc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch | 7 -- ...-further-optimization-of-trimming-routine.patch | 5 -- .../0011-mmc-utils-Fix-scaling-of-cache-size.patch | 7 +- utils/moreutils/patches/002_no-install-strip.patch | 2 +- utils/mpack/patches/001-use-stdlib.patch | 12 +-- utils/mt-st/patches/010-sysmacros.patch | 4 - utils/netwhere/patches/010-libmicrohttpd.patch | 2 +- .../patches/001-fix-32-bit-build.patch | 4 - utils/openobex/patches/001-cxx.patch | 2 - .../pcmciautils/patches/001-switch_unsigned.patch | 2 +- utils/pcmciautils/patches/002-disable_yywrap.patch | 14 +--- utils/pcsc-tools/patches/001-disable-atr.patch | 4 +- utils/picocom/patches/010-fix-compile.patch | 4 +- utils/picocom/patches/020-fix-compile-x86.patch | 5 -- utils/picocom/patches/030-usleep.patch | 2 - utils/pigz/patches/001.patch | 4 +- utils/powertop/patches/002-strerror_r.patch | 6 +- .../010-src-main-Add-missing-pthread-header.patch | 5 -- ...s.cpp-Change-open-parameter-to-const-char.patch | 7 +- utils/procps-ng/patches/100-no-tests-docs.patch | 2 +- ...01-configure-allow-disable-fortify_source.patch | 2 - ...llow-enabling-disabling-libudev-from-comm.patch | 2 - ...nable-guest_agent-no-matter-whether-softm.patch | 2 - ...compilation-failure-when-isnan-is-a-macro.patch | 8 +- ...-compilation-when-AS-is-actually-gcc-driv.patch | 4 +- ...0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch | 2 - ...separate-applets-for-guest-shutdown-modes.patch | 8 +- utils/quota/patches/020-remove-reallocarray.patch | 2 - ...01-network-avoid-segfault-in-freeaddrinfo.patch | 15 +--- utils/readsb/patches/010-gcc10.patch | 6 -- utils/relayctl/patches/0001-ftdi1.patch | 10 +-- .../rrdtool1/patches/001-no_ordering_cd_joke.patch | 7 +- utils/rrdtool1/patches/002-no_timezone.patch | 4 +- utils/rrdtool1/patches/020-x86-float-cast.patch | 6 +- utils/rrdtool1/patches/030-pod2man-stderr.patch | 6 +- .../sane-backends/patches/002-remove-uneeded.patch | 6 +- .../patches/101-fix_uclibc_std_rand.patch | 6 +- ..._behaviour_in_case_XML_support_is_missing.patch | 19 +---- .../patches/0001-sepolgen-adjust-data_dir.patch | 7 +- ...on-t-hardcode-search-for-ausearch-in-sbin.patch | 5 -- utils/setools/patches/010-no-format.patch | 7 +- utils/setools/patches/020-no-deprecated.patch | 2 +- utils/setserial/patches/010-no-docs.patch | 2 - .../patches/001-use-external-drivedb.patch | 8 +- .../patches/002-os_mailer-is-mailx.patch | 2 - utils/smstools3/patches/004-modem-processes.patch | 4 +- utils/squashfs-tools/patches/010-gcc10.patch | 2 - utils/tang/patches/010-makefile.patch | 2 +- utils/tang/patches/020-no-systemd.patch | 2 +- utils/telldus-core/patches/200-no-iconv.patch | 4 +- utils/telldus-core/patches/930-usleep.patch | 2 +- utils/tini/patches/001-override-git-version.patch | 37 ++++---- utils/unzip/patches/010-remove-build-date.patch | 2 +- ...VE-2018-1000035-overflow-password-protect.patch | 10 +-- ...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 8 +- .../patches/002-remove_helptags_generation.patch | 2 +- ..._git_version_hash_and_fix_release_version.patch | 6 +- utils/yara/patches/010-openssl.patch | 4 +- utils/ykpers/patches/020-json-c-0.14.patch | 10 +-- 124 files changed, 298 insertions(+), 716 deletions(-) (limited to 'utils') diff --git a/utils/acl/patches/100-no-gettext_configure.patch b/utils/acl/patches/100-no-gettext_configure.patch index 676e32c6e..c84617614 100644 --- a/utils/acl/patches/100-no-gettext_configure.patch +++ b/utils/acl/patches/100-no-gettext_configure.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index cd3c680..3d3771b 100644 --- a/configure.ac +++ b/configure.ac -@@ -32,9 +32,6 @@ AC_FUNC_GCC_VISIBILITY +@@ -33,9 +33,6 @@ AC_SYS_LARGEFILE AM_PROG_AR LT_INIT @@ -12,7 +10,7 @@ index cd3c680..3d3771b 100644 AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], [Enable extra debugging])]) AS_IF([test "x$enable_debug" = "xyes"], -@@ -61,6 +58,5 @@ AC_CONFIG_COMMANDS([include/sys], +@@ -62,6 +59,5 @@ AC_CONFIG_COMMANDS([include/sys], AC_CONFIG_FILES([ libacl.pc Makefile diff --git a/utils/acl/patches/101-no-gettext_autogen.patch b/utils/acl/patches/101-no-gettext_autogen.patch index 1fad67a13..e9a8c8c3f 100644 --- a/utils/acl/patches/101-no-gettext_autogen.patch +++ b/utils/acl/patches/101-no-gettext_autogen.patch @@ -1,5 +1,3 @@ -diff --git a/autogen.sh b/autogen.sh -index a98a3c5..982aff1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,2 @@ diff --git a/utils/acl/patches/102-no-gettext_Makefile.patch b/utils/acl/patches/102-no-gettext_Makefile.patch index d7e7377a9..4d562b972 100644 --- a/utils/acl/patches/102-no-gettext_Makefile.patch +++ b/utils/acl/patches/102-no-gettext_Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index 47d2a4e..d02ee91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/utils/at/patches/100-remove-glibc-assumption.patch b/utils/at/patches/100-remove-glibc-assumption.patch index a18a007a9..f8a5e59f4 100644 --- a/utils/at/patches/100-remove-glibc-assumption.patch +++ b/utils/at/patches/100-remove-glibc-assumption.patch @@ -18,21 +18,19 @@ Signed-off-by: Phil Eichinger parsetime.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 --- a/parsetime.y +++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 +@@ -14,6 +14,9 @@ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + #endif +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + struct tm exectm; static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number + static char *tz = NULL; +@@ -230,8 +233,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -43,7 +41,7 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number +@@ -274,8 +277,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -54,6 +52,3 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); --- -2.1.4 - diff --git a/utils/attr/patches/100-no-gettext_configure.patch b/utils/attr/patches/100-no-gettext_configure.patch index c1d5b5128..dea6f2ed9 100644 --- a/utils/attr/patches/100-no-gettext_configure.patch +++ b/utils/attr/patches/100-no-gettext_configure.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index a5f9de5..4c77e97 100644 --- a/configure.ac +++ b/configure.ac -@@ -34,9 +34,6 @@ AC_FUNC_ALLOCA +@@ -34,9 +34,6 @@ AC_FUNC_GCC_VISIBILITY AM_PROG_AR LT_INIT diff --git a/utils/attr/patches/101-no-gettext_autogen.patch b/utils/attr/patches/101-no-gettext_autogen.patch index 1fad67a13..e9a8c8c3f 100644 --- a/utils/attr/patches/101-no-gettext_autogen.patch +++ b/utils/attr/patches/101-no-gettext_autogen.patch @@ -1,5 +1,3 @@ -diff --git a/autogen.sh b/autogen.sh -index a98a3c5..982aff1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,2 @@ diff --git a/utils/attr/patches/102-no-gettext_Makefile.patch b/utils/attr/patches/102-no-gettext_Makefile.patch index 76c8dcd3a..4d562b972 100644 --- a/utils/attr/patches/102-no-gettext_Makefile.patch +++ b/utils/attr/patches/102-no-gettext_Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index a3e8353..381bb55 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 diff --git a/utils/attr/patches/110-Replace-bzero-with-memset.patch b/utils/attr/patches/110-Replace-bzero-with-memset.patch index 4607451ec..cfae36a09 100644 --- a/utils/attr/patches/110-Replace-bzero-with-memset.patch +++ b/utils/attr/patches/110-Replace-bzero-with-memset.patch @@ -13,11 +13,9 @@ Signed-off-by: Rosen Penev tools/attr.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/include/attributes.h b/include/attributes.h -index 14beb8f..039c817 100644 --- a/include/attributes.h +++ b/include/attributes.h -@@ -91,9 +91,9 @@ typedef struct attrlist_ent { /* data from attr_list() */ +@@ -91,9 +91,9 @@ typedef struct attrlist_ent { /* data fr * Implement a "cursor" for use in successive attr_list() calls. * It provides a way to find the last attribute that was returned in the * last attr_list() call so that we can get the next one without missing @@ -29,11 +27,9 @@ index 14beb8f..039c817 100644 */ typedef struct attrlist_cursor { uint32_t opaque[4]; /* an opaque cookie */ -diff --git a/libattr/libattr.c b/libattr/libattr.c -index d550e10..2ebd1c5 100644 --- a/libattr/libattr.c +++ b/libattr/libattr.c -@@ -298,7 +298,7 @@ attr_list(const char *path, char *buffer, const int buffersize, int flags, +@@ -298,7 +298,7 @@ attr_list(const char *path, char *buffer errno = EINVAL; return -1; } @@ -42,7 +38,7 @@ index d550e10..2ebd1c5 100644 if (flags & ATTR_DONTFOLLOW) length = llistxattr(path, lbuf, sizeof(lbuf)); -@@ -348,7 +348,7 @@ attr_listf(int fd, char *buffer, const int buffersize, int flags, +@@ -348,7 +348,7 @@ attr_listf(int fd, char *buffer, const i errno = EINVAL; return -1; } @@ -51,8 +47,6 @@ index d550e10..2ebd1c5 100644 length = flistxattr(fd, lbuf, sizeof(lbuf)); if (length < 0) -diff --git a/tools/attr.c b/tools/attr.c -index c8aa0b4..312aef1 100644 --- a/tools/attr.c +++ b/tools/attr.c @@ -228,7 +228,7 @@ main(int argc, char **argv) @@ -64,6 +58,3 @@ index c8aa0b4..312aef1 100644 do { error = attr_list(filename, buffer, BUFSIZE, attrflags, &cursor); --- -2.17.1 - diff --git a/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch b/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch index ac292c57d..2fa5c5933 100644 --- a/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch +++ b/utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch @@ -12,8 +12,6 @@ Signed-off-by: Thomas Petazzoni src/ausearch-lol.c | 12 +++++++++++- 4 files changed, 43 insertions(+), 4 deletions(-) -diff --git a/auparse/auparse.c b/auparse/auparse.c -index 650db02..2e1c737 100644 --- a/auparse/auparse.c +++ b/auparse/auparse.c @@ -1,5 +1,5 @@ @@ -23,7 +21,7 @@ index 650db02..2e1c737 100644 * All Rights Reserved. * * This library is free software; you can redistribute it and/or -@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t *e) +@@ -1118,6 +1118,16 @@ static int str2event(char *s, au_event_t return 0; } @@ -40,8 +38,6 @@ index 650db02..2e1c737 100644 /* Returns 0 on success and 1 on error */ static int extract_timestamp(const char *b, au_event_t *e) { -diff --git a/auparse/interpret.c b/auparse/interpret.c -index 51c4a5e..67b7b77 100644 --- a/auparse/interpret.c +++ b/auparse/interpret.c @@ -853,6 +853,13 @@ err_out: @@ -58,7 +54,7 @@ index 51c4a5e..67b7b77 100644 static const char *print_proctitle(const char *val) { char *out = (char *)print_escaped(val); -@@ -863,7 +870,7 @@ static const char *print_proctitle(const char *val) +@@ -863,7 +870,7 @@ static const char *print_proctitle(const // Proctitle has arguments separated by NUL bytes // We need to write over the NUL bytes with a space // so that we can see the arguments @@ -67,8 +63,6 @@ index 51c4a5e..67b7b77 100644 if (ptr >= end) break; *ptr = ' '; -diff --git a/configure.ac b/configure.ac -index 6e345f1..6f3007e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ @@ -80,7 +74,7 @@ index 6e345f1..6f3007e 100644 ### ### Permission is hereby granted, free of charge, to any person obtaining a ### copy of this software and associated documentation files (the "Software"), -@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote +@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-r AC_CHECK_FUNCS([posix_fallocate]) dnl; signalfd is needed for libev AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ]) @@ -99,8 +93,6 @@ index 6e345f1..6f3007e 100644 ALLWARNS="" ALLDEBUG="-g" -diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c -index 5d17a72..758c33e 100644 --- a/src/ausearch-lol.c +++ b/src/ausearch-lol.c @@ -1,6 +1,6 @@ @@ -111,7 +103,7 @@ index 5d17a72..758c33e 100644 * All Rights Reserved. * * This software may be freely redistributed and/or modified under the -@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2) +@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, return 0; } @@ -128,6 +120,3 @@ index 5d17a72..758c33e 100644 /* * This function will look at the line and pick out pieces of it. */ --- -2.21.0 - diff --git a/utils/audit/patches/0002-fix-gcc-10.patch b/utils/audit/patches/0002-fix-gcc-10.patch index 5986cf0e4..19c0c4c3b 100644 --- a/utils/audit/patches/0002-fix-gcc-10.patch +++ b/utils/audit/patches/0002-fix-gcc-10.patch @@ -8,8 +8,6 @@ Subject: [PATCH 01/30] Header definitions need to be external when building src/ausearch-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/ausearch-common.h b/src/ausearch-common.h -index 6669203..3040547 100644 --- a/src/ausearch-common.h +++ b/src/ausearch-common.h @@ -50,7 +50,7 @@ extern pid_t event_pid; @@ -21,6 +19,3 @@ index 6669203..3040547 100644 extern const char *event_comm; extern const char *event_filename; extern const char *event_hostname; --- -2.26.2 - diff --git a/utils/avrdude/patches/020-no-cpp-timestamps.patch b/utils/avrdude/patches/020-no-cpp-timestamps.patch index 8427055af..dab8a4371 100644 --- a/utils/avrdude/patches/020-no-cpp-timestamps.patch +++ b/utils/avrdude/patches/020-no-cpp-timestamps.patch @@ -6,7 +6,7 @@ Author: Milan Kupcevic This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/main.c +++ b/main.c -@@ -679,10 +679,10 @@ +@@ -679,10 +679,10 @@ int main(int argc, char * argv []) * Print out an identifying string so folks can tell what version * they are running */ diff --git a/utils/avrdude/patches/110-ud-to-u.patch b/utils/avrdude/patches/110-ud-to-u.patch index 4036c28c2..470f4da67 100644 --- a/utils/avrdude/patches/110-ud-to-u.patch +++ b/utils/avrdude/patches/110-ud-to-u.patch @@ -1,6 +1,6 @@ --- a/linuxgpio.c +++ b/linuxgpio.c -@@ -66,7 +66,7 @@ static int linuxgpio_export(unsigned int gpio) +@@ -66,7 +66,7 @@ static int linuxgpio_export(unsigned int return fd; } @@ -9,7 +9,7 @@ r = write(fd, buf, len); close(fd); -@@ -84,7 +84,7 @@ static int linuxgpio_unexport(unsigned int gpio) +@@ -84,7 +84,7 @@ static int linuxgpio_unexport(unsigned i return fd; } @@ -18,7 +18,7 @@ r = write(fd, buf, len); close(fd); -@@ -95,7 +95,7 @@ static int linuxgpio_openfd(unsigned int gpio) +@@ -95,7 +95,7 @@ static int linuxgpio_openfd(unsigned int { char filepath[60]; @@ -27,7 +27,7 @@ return (open(filepath, O_RDWR)); } -@@ -104,7 +104,7 @@ static int linuxgpio_dir(unsigned int gpio, unsigned int dir) +@@ -104,7 +104,7 @@ static int linuxgpio_dir(unsigned int gp int fd, r; char buf[60]; diff --git a/utils/bc/patches/001-disable-doc.patch b/utils/bc/patches/001-disable-doc.patch index a6ecd6e9f..4b8008639 100644 --- a/utils/bc/patches/001-disable-doc.patch +++ b/utils/bc/patches/001-disable-doc.patch @@ -1,6 +1,6 @@ ---- bc-1.06.95/Makefile.in 2010-07-03 10:48:13.422725147 +0000 -+++ bc-1.06.95/Makefile.in 2010-07-03 10:50:09.714725197 +0000 -@@ -149,7 +149,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -149,7 +149,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -9,8 +9,8 @@ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \ stamp-h $(distdir).tar.gz h/number.h depcomp missing ---- bc-1.06.95/Makefile.am 2010-07-03 10:48:32.522725037 +0000 -+++ bc-1.06.95/Makefile.am 2010-07-03 10:48:38.114725024 +0000 +--- a/Makefile.am ++++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in diff --git a/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch b/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch index 070ed5841..2a3510b6f 100644 --- a/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch +++ b/utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch @@ -7,10 +7,8 @@ Subject: [PATCH 1/4] bcm43xx: Add bcm43xx-3wire variant tools/hciattach.c | 3 +++ 1 file changed, 3 insertions(+) -Index: bluez-5.51/tools/hciattach.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach.c -+++ bluez-5.51/tools/hciattach.c +--- a/tools/hciattach.c ++++ b/tools/hciattach.c @@ -1091,6 +1091,9 @@ struct uart_t uart[] = { { "bcm43xx", 0x0000, 0x0000, HCI_UART_H4, 115200, 3000000, FLOW_CTL, DISABLE_PM, NULL, bcm43xx, NULL }, diff --git a/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch b/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch index 0ae7d15cd..4b68f07bb 100644 --- a/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch +++ b/utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch @@ -8,10 +8,8 @@ Subject: [PATCH 2/4] bcm43xx: The UART speed must be reset after the firmware tools/hciattach_bcm43xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -Index: bluez-5.51/tools/hciattach_bcm43xx.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach_bcm43xx.c -+++ bluez-5.51/tools/hciattach_bcm43xx.c +--- a/tools/hciattach_bcm43xx.c ++++ b/tools/hciattach_bcm43xx.c @@ -367,11 +367,8 @@ int bcm43xx_init(int fd, int def_speed, return -1; diff --git a/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch b/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch index e66ac5e53..b99976643 100644 --- a/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch +++ b/utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch @@ -7,10 +7,8 @@ Subject: [PATCH 3/4] Increase firmware load timeout to 30s tools/hciattach.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: bluez-5.51/tools/hciattach.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach.c -+++ bluez-5.51/tools/hciattach.c +--- a/tools/hciattach.c ++++ b/tools/hciattach.c @@ -1240,7 +1240,7 @@ int main(int argc, char *argv[]) { struct uart_t *u = NULL; diff --git a/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch b/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch index b86dc8363..355f17b6d 100644 --- a/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch +++ b/utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch @@ -7,10 +7,8 @@ Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware tools/hciattach_bcm43xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: bluez-5.51/tools/hciattach_bcm43xx.c -=================================================================== ---- bluez-5.51.orig/tools/hciattach_bcm43xx.c -+++ bluez-5.51/tools/hciattach_bcm43xx.c +--- a/tools/hciattach_bcm43xx.c ++++ b/tools/hciattach_bcm43xx.c @@ -44,7 +44,7 @@ #include "hciattach.h" diff --git a/utils/bluez/patches/201-readline.patch b/utils/bluez/patches/201-readline.patch index 089604fc9..e0dc08c76 100644 --- a/utils/bluez/patches/201-readline.patch +++ b/utils/bluez/patches/201-readline.patch @@ -1,7 +1,5 @@ -Index: bluez-5.54/Makefile.in -=================================================================== ---- bluez-5.54.orig/Makefile.in -+++ bluez-5.54/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -3214,7 +3214,7 @@ unit_tests = $(am__append_54) unit/test- @CLIENT_TRUE@ client/gatt.h client/gatt.c diff --git a/utils/bluez/patches/202-fix-endianness.patch b/utils/bluez/patches/202-fix-endianness.patch index 34b42cbfa..a92cdd04a 100644 --- a/utils/bluez/patches/202-fix-endianness.patch +++ b/utils/bluez/patches/202-fix-endianness.patch @@ -1,7 +1,5 @@ -Index: bluez-5.53/src/shared/util.h -=================================================================== ---- bluez-5.53.orig/src/shared/util.h -+++ bluez-5.53/src/shared/util.h +--- a/src/shared/util.h ++++ b/src/shared/util.h @@ -26,6 +26,7 @@ #include #include diff --git a/utils/bluez/patches/203-obexd_without_systemd.patch b/utils/bluez/patches/203-obexd_without_systemd.patch index 9e3761f92..c79ce3e77 100644 --- a/utils/bluez/patches/203-obexd_without_systemd.patch +++ b/utils/bluez/patches/203-obexd_without_systemd.patch @@ -16,10 +16,8 @@ directly, and to do so it needs the full path of the daemon. delete mode 100644 obexd/src/org.bluez.obex.service create mode 100644 obexd/src/org.bluez.obex.service.in -Index: bluez-5.51/Makefile.obexd -=================================================================== ---- bluez-5.51.orig/Makefile.obexd -+++ bluez-5.51/Makefile.obexd +--- a/Makefile.obexd ++++ b/Makefile.obexd @@ -1,12 +1,12 @@ if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) @@ -35,19 +33,15 @@ Index: bluez-5.51/Makefile.obexd if OBEX -Index: bluez-5.51/obexd/src/org.bluez.obex.service -=================================================================== ---- bluez-5.51.orig/obexd/src/org.bluez.obex.service +--- a/obexd/src/org.bluez.obex.service +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.bluez.obex -Exec=/bin/false -SystemdService=dbus-org.bluez.obex.service -Index: bluez-5.51/obexd/src/org.bluez.obex.service.in -=================================================================== --- /dev/null -+++ bluez-5.51/obexd/src/org.bluez.obex.service.in ++++ b/obexd/src/org.bluez.obex.service.in @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.bluez.obex diff --git a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch index f0fc7dcd8..ed45f98cd 100644 --- a/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch +++ b/utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch @@ -32,10 +32,8 @@ This commit prevents the call to btd_adv_manager_refresh for non-LE devices. src/adapter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: bluez-5.54/src/adapter.c -=================================================================== ---- bluez-5.54.orig/src/adapter.c -+++ bluez-5.54/src/adapter.c +--- a/src/adapter.c ++++ b/src/adapter.c @@ -567,7 +567,8 @@ static void settings_changed(struct btd_ g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "Discoverable"); diff --git a/utils/bonnie++/patches/010-openwrt-fixes.patch b/utils/bonnie++/patches/010-openwrt-fixes.patch index 37a99eba9..123a481a8 100644 --- a/utils/bonnie++/patches/010-openwrt-fixes.patch +++ b/utils/bonnie++/patches/010-openwrt-fixes.patch @@ -13,7 +13,7 @@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ -@@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.cpp +@@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.c GETCHOBJS=$(GETCHSRC:.cpp=.o) bonnie++: $(BONOBJS) @@ -70,7 +70,7 @@ , linux_pthread="yes") if [[ -n "$linux_pthread" ]]; then linux_pthread="#define LINUX_PTHREAD" -@@ -83,7 +82,7 @@ void * thread_func(void * param) { return NULL; } +@@ -83,7 +82,7 @@ void * thread_func(void * param) { retur , thread_ldflags="-pthread") AC_SUBST(large_file) diff --git a/utils/ccrypt/patches/001-no-intl.patch b/utils/ccrypt/patches/001-no-intl.patch index 13db6e6fb..cac7ffbbc 100644 --- a/utils/ccrypt/patches/001-no-intl.patch +++ b/utils/ccrypt/patches/001-no-intl.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.am b/Makefile.am -index bfe1d43..2f45264 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ @@ -11,11 +9,9 @@ index bfe1d43..2f45264 100644 EXTRA_DIST = m4/ChangeLog config.rpath README-WIN -diff --git a/Makefile.in b/Makefile.in -index 314e162..18dcff3 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -117,7 +117,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -117,7 +117,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -42,15 +38,12 @@ index 314e162..18dcff3 100644 EXTRA_DIST = m4/ChangeLog config.rpath README-WIN ACLOCAL_AMFLAGS = -I m4 all: config.h -diff --git a/configure.ac b/configure.ac -index 56d11f1..6d32602 100644 --- a/configure.ac +++ b/configure.ac -@@ -148,17 +148,6 @@ fi - AC_MSG_RESULT($UINT32_TYPE) +@@ -149,17 +149,6 @@ AC_MSG_RESULT($UINT32_TYPE) AC_DEFINE_UNQUOTED(UINT32_TYPE,$UINT32_TYPE,unsigned 32 bit integer type) --dnl ---------------------------------------------------------------------- + dnl ---------------------------------------------------------------------- -dnl Internationalization - -GETTEXT_PACKAGE=ccrypt @@ -61,9 +54,10 @@ index 56d11f1..6d32602 100644 -AM_GNU_GETTEXT_VERSION([0.19.8]) -dnl IT_PO_SUBDIR(po) - - dnl ---------------------------------------------------------------------- +-dnl ---------------------------------------------------------------------- dnl Libtool (needed by intl/) + LT_INIT @@ -180,9 +169,7 @@ AC_SUBST(TAR) dnl ---------------------------------------------------------------------- AC_CONFIG_FILES([doc/ccrypt.1 @@ -74,8 +68,6 @@ index 56d11f1..6d32602 100644 Makefile src/Makefile emacs/Makefile -diff --git a/src/Makefile.am b/src/Makefile.am -index 4cb1d03..ff33d59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,4 +56,4 @@ uninstall-local: @@ -84,8 +76,6 @@ index 4cb1d03..ff33d59 100644 AM_CPPFLAGS = @EXTRA_INCLUDES@ -I../intl -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" -LIBS = @LIBINTL@ @LIBS@ +LIBS = @LIBS@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 27c7d28..01c6764 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -278,7 +278,7 @@ LIBMULTITHREAD = @LIBMULTITHREAD@ diff --git a/utils/cmdpad/patches/100-Makefile.patch b/utils/cmdpad/patches/100-Makefile.patch index 61a6c8f4c..6ebe1b88b 100644 --- a/utils/cmdpad/patches/100-Makefile.patch +++ b/utils/cmdpad/patches/100-Makefile.patch @@ -1,5 +1,5 @@ ---- cmdpad-0.0.3/src/Makefile.orig 2008-01-05 23:29:44.000000000 +0100 -+++ cmdpad-0.0.3/src/Makefile 2008-01-05 23:30:23.000000000 +0100 +--- a/src/Makefile ++++ b/src/Makefile @@ -5,25 +5,25 @@ TOP=.. include $(TOP)/Makefile.common diff --git a/utils/cmdpad/patches/120-kernel26-compat.patch b/utils/cmdpad/patches/120-kernel26-compat.patch index eb7beeb32..6a9813e7d 100644 --- a/utils/cmdpad/patches/120-kernel26-compat.patch +++ b/utils/cmdpad/patches/120-kernel26-compat.patch @@ -1,6 +1,6 @@ ---- cmdpad-0.0.3/src/parse.orig 2008-01-05 23:55:32.000000000 +0100 -+++ cmdpad-0.0.3/src/parse.c 2008-01-05 23:56:07.000000000 +0100 -@@ -289,6 +289,12 @@ +--- a/src/parse.c ++++ b/src/parse.c +@@ -289,6 +289,12 @@ int ParseCommand( char * pchCommandLine) pchEventDevice = strdup( pchValue) ; return 1 ; } diff --git a/utils/cmdpad/patches/130-no_zombie.patch b/utils/cmdpad/patches/130-no_zombie.patch index aa4fc6a0a..e359a1b0d 100644 --- a/utils/cmdpad/patches/130-no_zombie.patch +++ b/utils/cmdpad/patches/130-no_zombie.patch @@ -1,6 +1,6 @@ ---- cmdpad-0.0.3/src/command.c.orig 2003-03-29 17:54:12.000000000 +0100 -+++ cmdpad-0.0.3/src/command.c 2008-01-12 05:41:22.000000000 +0100 -@@ -68,6 +68,7 @@ +--- a/src/command.c ++++ b/src/command.c +@@ -68,6 +68,7 @@ struct CMD * cmd = NULL ; void exec( char * command) { @@ -8,7 +8,7 @@ if( fork() == 0) { char ** tmp ; int i ; -@@ -88,6 +89,7 @@ +@@ -88,6 +89,7 @@ void exec( char * command) perror( "ERROR: execv") ; exit( 1) ; } // end if( fork()) diff --git a/utils/collectd/patches/920-backport-netlink-reg-noerror.patch b/utils/collectd/patches/920-backport-netlink-reg-noerror.patch index 9aef6ab1d..650fb4773 100644 --- a/utils/collectd/patches/920-backport-netlink-reg-noerror.patch +++ b/utils/collectd/patches/920-backport-netlink-reg-noerror.patch @@ -24,11 +24,9 @@ Signed-off-by: Fabrice Fontaine src/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/netlink.c b/src/netlink.c -index 7a5da762c7..fac2fb1eb4 100644 --- a/src/netlink.c +++ b/src/netlink.c -@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type, +@@ -240,7 +240,7 @@ static int check_ignorelist(const char * for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) { #if HAVE_REGEX_H if (i->rdevice != NULL) { diff --git a/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch b/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch index 8db3c1d81..03b3902f2 100644 --- a/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch +++ b/utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch @@ -18,8 +18,6 @@ Signed-off-by: Nick Hainke 5 files changed, 99 insertions(+) create mode 100644 src/dhcpleases.c -diff --git a/Makefile.am b/Makefile.am -index 00947da0..5ee76a00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -963,6 +963,12 @@ df_la_LDFLAGS = $(PLUGIN_LDFLAGS) @@ -35,8 +33,6 @@ index 00947da0..5ee76a00 100644 if BUILD_PLUGIN_DISK pkglib_LTLIBRARIES += disk.la disk_la_SOURCES = src/disk.c -diff --git a/README b/README -index e42e9c24..dd104408 100644 --- a/README +++ b/README @@ -106,6 +106,9 @@ Features @@ -49,11 +45,9 @@ index e42e9c24..dd104408 100644 - dns DNS traffic: Query types, response codes, opcodes and traffic/octets transferred. -diff --git a/configure.ac b/configure.ac -index bcfb8cf5..6c2b6574 100644 --- a/configure.ac +++ b/configure.ac -@@ -7061,6 +7061,7 @@ AC_PLUGIN([curl_xml], [$plugin_curl_xml], [CURL generic xml +@@ -7063,6 +7063,7 @@ AC_PLUGIN([curl_xml], [$plugi AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) AC_PLUGIN([dcpmm], [$with_libpmwapi], [Intel(R) Optane(TM) DC Persistent Memory performance and health statistics]) AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) @@ -61,7 +55,7 @@ index bcfb8cf5..6c2b6574 100644 AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysis]) AC_PLUGIN([dpdkevents], [$plugin_dpdkevents], [Events from DPDK]) -@@ -7508,6 +7509,7 @@ AC_MSG_RESULT([ curl_xml . . . . . . $enable_curl_xml]) +@@ -7512,6 +7513,7 @@ AC_MSG_RESULT([ curl_xml . . . . . . AC_MSG_RESULT([ dbi . . . . . . . . . $enable_dbi]) AC_MSG_RESULT([ dcpmm . . . . . . . $enable_dcpmm]) AC_MSG_RESULT([ df . . . . . . . . . $enable_df]) @@ -69,8 +63,6 @@ index bcfb8cf5..6c2b6574 100644 AC_MSG_RESULT([ disk . . . . . . . . $enable_disk]) AC_MSG_RESULT([ dns . . . . . . . . . $enable_dns]) AC_MSG_RESULT([ dpdkevents. . . . . . $enable_dpdkevents]) -diff --git a/src/collectd.conf.in b/src/collectd.conf.in -index 562a55d9..94659e81 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -119,6 +119,7 @@ @@ -81,7 +73,7 @@ index 562a55d9..94659e81 100644 #@BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk #@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns #@BUILD_PLUGIN_DPDKEVENTS_TRUE@LoadPlugin dpdkevents -@@ -689,6 +690,10 @@ +@@ -690,6 +691,10 @@ # SelectNumericQueryTypes true # @@ -92,9 +84,6 @@ index 562a55d9..94659e81 100644 # # # Coremask "0x1" -diff --git a/src/dhcpleases.c b/src/dhcpleases.c -new file mode 100644 -index 00000000..f43d62bf --- /dev/null +++ b/src/dhcpleases.c @@ -0,0 +1,83 @@ @@ -181,6 +170,3 @@ index 00000000..f43d62bf + config_keys_num); + plugin_register_read("dhcpleases", dhcp_leases_read); +} --- -2.29.2 - diff --git a/utils/coreutils/patches/001-no_docs_man_tests.patch b/utils/coreutils/patches/001-no_docs_man_tests.patch index 0d8dd0d75..dde75778d 100644 --- a/utils/coreutils/patches/001-no_docs_man_tests.patch +++ b/utils/coreutils/patches/001-no_docs_man_tests.patch @@ -9,7 +9,7 @@ EXTRA_DIST = \ .mailmap \ -@@ -210,6 +210,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src +@@ -210,6 +210,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib include $(top_srcdir)/lib/local.mk include $(top_srcdir)/src/local.mk @@ -18,7 +18,7 @@ -include $(top_srcdir)/tests/local.mk --- a/Makefile.in +++ b/Makefile.in -@@ -3156,11 +3156,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ +@@ -3156,11 +3156,7 @@ RECURSIVE_TARGETS = all-recursive check- install-ps-recursive install-recursive installcheck-recursive \ installdirs-recursive pdf-recursive ps-recursive \ tags-recursive uninstall-recursive @@ -31,7 +31,7 @@ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -3411,11 +3407,11 @@ am__DIST_COMMON = $(doc_coreutils_TEXINFOS) $(srcdir)/Makefile.in \ +@@ -3411,11 +3407,11 @@ am__DIST_COMMON = $(doc_coreutils_TEXINF $(top_srcdir)/build-aux/missing \ $(top_srcdir)/build-aux/test-driver \ $(top_srcdir)/build-aux/texinfo.tex \ @@ -82,7 +82,7 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ -@@ -7052,7 +7048,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +@@ -7052,7 +7048,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; diff --git a/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch b/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch index 9654980e9..b297f3746 100644 --- a/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch +++ b/utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch @@ -14,13 +14,11 @@ behavior. tests/ls/removed-directory.sh | 10 ++-------- 3 files changed, 8 insertions(+), 30 deletions(-) -diff --git a/NEWS b/NEWS -index fdc8bf5db..653e7178b 100644 --- a/NEWS +++ b/NEWS -@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- +@@ -97,6 +97,12 @@ GNU coreutils NEWS - * Noteworthy changes in release ?.? (????-??-??) [?] + gzip-compressed tarballs are distributed once again +** Changes in behavior + @@ -29,10 +27,8 @@ index fdc8bf5db..653e7178b 100644 + that was made in release 8.32. + - * Noteworthy changes in release 8.32 (2020-03-05) [stable] + * Noteworthy changes in release 8.31 (2019-03-10) [stable] -diff --git a/src/ls.c b/src/ls.c -index 24b983287..4acf5f44d 100644 --- a/src/ls.c +++ b/src/ls.c @@ -49,10 +49,6 @@ @@ -46,7 +42,7 @@ index 24b983287..4acf5f44d 100644 #include #include #include -@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) +@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const struct dirent *next; uintmax_t total_blocks = 0; static bool first = true; @@ -54,7 +50,7 @@ index 24b983287..4acf5f44d 100644 errno = 0; dirp = opendir (name); -@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) +@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const next = readdir (dirp); if (next) { @@ -62,7 +58,7 @@ index 24b983287..4acf5f44d 100644 if (! file_ignored (next->d_name)) { enum filetype type = unknown; -@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) +@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const if (errno != EOVERFLOW) break; } @@ -85,8 +81,6 @@ index 24b983287..4acf5f44d 100644 else break; -diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh -index e8c835dab..fe8f929a1 100755 --- a/tests/ls/removed-directory.sh +++ b/tests/ls/removed-directory.sh @@ -26,20 +26,14 @@ case $host_triplet in @@ -112,6 +106,3 @@ index e8c835dab..fe8f929a1 100755 +compare /dev/null err || fail=1 Exit $fail --- -cgit v1.2.1 - diff --git a/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch b/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch index dbc443384..02e1faa07 100644 --- a/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch +++ b/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch @@ -11,8 +11,6 @@ Signed-off-by: Pawel Dembicki src/relay_drv_gpio.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) -diff --git a/src/data_types.h b/src/data_types.h -index f13baeb..d4dc7b1 100644 --- a/src/data_types.h +++ b/src/data_types.h @@ -56,14 +56,14 @@ typedef struct @@ -38,8 +36,6 @@ index f13baeb..d4dc7b1 100644 /* [Sainsmart drv] */ uint8_t sainsmart_num_relays; -diff --git a/src/relay_drv_gpio.c b/src/relay_drv_gpio.c -index 705c157..28464be 100644 --- a/src/relay_drv_gpio.c +++ b/src/relay_drv_gpio.c @@ -53,7 +53,7 @@ @@ -51,7 +47,7 @@ index 705c157..28464be 100644 { 0, // dummy 0, // pin 1 -@@ -85,7 +85,7 @@ int set_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t relay_st +@@ -85,7 +85,7 @@ int set_relay_generic_gpio(char* portnam * -1 - fail * -2 - already exported *********************************************************/ @@ -69,7 +65,7 @@ index 705c157..28464be 100644 { int fd; char b[64]; -@@ -261,7 +261,7 @@ int get_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t* relay_s +@@ -261,7 +261,7 @@ int get_relay_generic_gpio(char* portnam int fd; char b[64]; char d[1]; @@ -78,7 +74,7 @@ index 705c157..28464be 100644 if (relay(FIRST_RELAY+g_num_relays-1)) { -@@ -324,7 +324,7 @@ int set_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t relay_st +@@ -324,7 +324,7 @@ int set_relay_generic_gpio(char* portnam int fd; char b[64]; char d[1]; @@ -87,6 +83,3 @@ index 705c157..28464be 100644 if (relay(FIRST_RELAY+g_num_relays-1)) { --- -2.17.1 - diff --git a/utils/device-observatory/patches/020-libmicrohttpd.patch b/utils/device-observatory/patches/020-libmicrohttpd.patch index e065af8f7..3d2844b60 100644 --- a/utils/device-observatory/patches/020-libmicrohttpd.patch +++ b/utils/device-observatory/patches/020-libmicrohttpd.patch @@ -1,6 +1,6 @@ --- a/src/webserver.c +++ b/src/webserver.c -@@ -129,7 +129,7 @@ const char *get_mimetype(const char str[]) +@@ -129,7 +129,7 @@ const char *get_mimetype(const char str[ return "application/octet-stream"; } @@ -9,7 +9,7 @@ const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) { -@@ -142,7 +142,7 @@ static int send_response(void *cls, struct MHD_Connection *connection, +@@ -142,7 +142,7 @@ static int send_response(void *cls, stru struct device *device; int is_localhost; FILE *fp; diff --git a/utils/digitemp/patches/0001_add_missing_includes.patch b/utils/digitemp/patches/0001_add_missing_includes.patch index 3774951ab..a1fbc4292 100644 --- a/utils/digitemp/patches/0001_add_missing_includes.patch +++ b/utils/digitemp/patches/0001_add_missing_includes.patch @@ -1,5 +1,5 @@ ---- a/src/ds2438.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/src/ds2438.c 2017-07-02 22:52:36.671830316 +0200 +--- a/src/ds2438.c ++++ b/src/ds2438.c @@ -5,6 +5,7 @@ Licensed under GPL v2 ----------------------------------------------------------------------- */ @@ -7,66 +7,62 @@ +#include #include "ownet.h" #include "ad26.h" - ---- a/userial/ad26.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/ad26.c 2017-07-02 22:58:03.902024016 +0200 + +--- a/userial/ad26.c ++++ b/userial/ad26.c @@ -33,7 +33,7 @@ #include "ownet.h" #include "ad26.h" #include "owproto.h" - +#include "sys/types.h" - + extern int owBlock(int,int,uchar *,int); extern void setcrc8(int,uchar); - ---- a/userial/cnt1d.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/cnt1d.c 2017-07-02 22:56:26.850619935 +0200 +--- a/userial/cnt1d.c ++++ b/userial/cnt1d.c @@ -29,6 +29,7 @@ // Version: 2.00 // // +#include "sys/types.h" #include "ownet.h" - + // external One Wire functions from nework layer - ---- a/userial/crcutil.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/crcutil.c 2017-07-02 22:55:13.631039389 +0200 +--- a/userial/crcutil.c ++++ b/userial/crcutil.c @@ -29,6 +29,7 @@ - + // Include files #include "ownet.h" +#include "sys/types.h" - + // Local subroutines void setcrc16(int,ushort); - ---- a/userial/ds9097u/owtrnu.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/ds9097u/owtrnu.c 2017-07-02 23:00:52.320902969 +0200 +--- a/userial/ds9097u/owtrnu.c ++++ b/userial/ds9097u/owtrnu.c @@ -39,6 +39,7 @@ // Added file I/O operations // - + +#include "sys/types.h" #include "ownet.h" #include "ds2480.h" - ---- a/userial/ioutil.c 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/ioutil.c 2017-07-02 22:55:48.378843851 +0200 + +--- a/userial/ioutil.c ++++ b/userial/ioutil.c @@ -36,6 +36,7 @@ #include #include #include "ownet.h" +#include "sys/types.h" - + #ifdef __MC68K__ #include - ---- a/userial/owproto.h 2015-12-22 04:47:28.000000000 +0100 -+++ b/userial/owproto.h 2017-07-02 22:58:59.561664538 +0200 +--- a/userial/owproto.h ++++ b/userial/owproto.h @@ -1,3 +1,4 @@ +#include "sys/types.h" /* Prototypes for userial driver functions */ - + /* From other low level userial files */ diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch index ba6bba32c..b9b0a6b8c 100644 --- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch +++ b/utils/dockerd/patches/001-libdevmapper_name_fix.patch @@ -1,7 +1,5 @@ -Index: docker-ce-20.10.0/hack/make.sh -=================================================================== ---- docker-ce-20.10.0.orig/hack/make.sh -+++ docker-ce-20.10.0/hack/make.sh +--- a/hack/make.sh ++++ b/hack/make.sh @@ -95,7 +95,7 @@ fi # with a newer libdevmapper than the one it was built with. if diff --git a/utils/domoticz/patches/010-boost-173.patch b/utils/domoticz/patches/010-boost-173.patch index b1e0561360..6c98abe00 100644 --- a/utils/domoticz/patches/010-boost-173.patch +++ b/utils/domoticz/patches/010-boost-173.patch @@ -55,8 +55,6 @@ Subject: [PATCH] Avoid deprecated bind placeholders in global namespace webserver/server.cpp | 4 +++- 49 files changed, 107 insertions(+), 32 deletions(-) -diff --git a/hardware/ASyncSerial.cpp b/hardware/ASyncSerial.cpp -index 2c9a5e27e9..36dd402fa7 100644 --- a/hardware/ASyncSerial.cpp +++ b/hardware/ASyncSerial.cpp @@ -34,7 +34,7 @@ @@ -68,8 +66,6 @@ index 2c9a5e27e9..36dd402fa7 100644 #include #include #include // for shared_array -diff --git a/hardware/ASyncTCP.cpp b/hardware/ASyncTCP.cpp -index 8990c24300..7f7b1e0f24 100644 --- a/hardware/ASyncTCP.cpp +++ b/hardware/ASyncTCP.cpp @@ -1,10 +1,12 @@ @@ -86,8 +82,6 @@ index 8990c24300..7f7b1e0f24 100644 struct hostent; #ifndef WIN32 -diff --git a/hardware/Comm5Serial.cpp b/hardware/Comm5Serial.cpp -index 9b44496fb5..f1c1f706d2 100644 --- a/hardware/Comm5Serial.cpp +++ b/hardware/Comm5Serial.cpp @@ -5,6 +5,8 @@ @@ -99,8 +93,6 @@ index 9b44496fb5..f1c1f706d2 100644 /* This driver allows Domoticz to control any I/O module from the MA-4xxx Family -diff --git a/hardware/CurrentCostMeterSerial.cpp b/hardware/CurrentCostMeterSerial.cpp -index 05bac73d6a..bf9d35cab7 100644 --- a/hardware/CurrentCostMeterSerial.cpp +++ b/hardware/CurrentCostMeterSerial.cpp @@ -10,10 +10,12 @@ @@ -117,8 +109,6 @@ index 05bac73d6a..bf9d35cab7 100644 // //Class CurrentCostMeterSerial // -diff --git a/hardware/DavisLoggerSerial.cpp b/hardware/DavisLoggerSerial.cpp -index 9c44539beb..44c9dbde5c 100644 --- a/hardware/DavisLoggerSerial.cpp +++ b/hardware/DavisLoggerSerial.cpp @@ -8,13 +8,15 @@ @@ -138,8 +128,6 @@ index 9c44539beb..44c9dbde5c 100644 #ifdef _DEBUG //#define DEBUG_DAVIS #endif -diff --git a/hardware/DenkoviUSBDevices.cpp b/hardware/DenkoviUSBDevices.cpp -index a7977d82c8..53a27e5583 100644 --- a/hardware/DenkoviUSBDevices.cpp +++ b/hardware/DenkoviUSBDevices.cpp @@ -5,6 +5,8 @@ @@ -151,8 +139,6 @@ index a7977d82c8..53a27e5583 100644 #define MAX_POLL_INTERVAL 3600*1000 #define DAE_IO_TYPE_RELAY 2 -diff --git a/hardware/EnOceanESP2.cpp b/hardware/EnOceanESP2.cpp -index f20ff9c0cb..fd08c55f63 100644 --- a/hardware/EnOceanESP2.cpp +++ b/hardware/EnOceanESP2.cpp @@ -8,7 +8,7 @@ @@ -173,8 +159,6 @@ index f20ff9c0cb..fd08c55f63 100644 #define ENOCEAN_RETRY_DELAY 30 #define round(a) ( int ) ( a + .5 ) -diff --git a/hardware/EnOceanESP3.cpp b/hardware/EnOceanESP3.cpp -index 6866eeb0d0..2afa0e1e36 100644 --- a/hardware/EnOceanESP3.cpp +++ b/hardware/EnOceanESP3.cpp @@ -8,7 +8,7 @@ @@ -195,8 +179,6 @@ index 6866eeb0d0..2afa0e1e36 100644 #if _DEBUG #define ENOCEAN_BUTTON_DEBUG #endif -diff --git a/hardware/EvohomeRadio.cpp b/hardware/EvohomeRadio.cpp -index 4da983538b..6ba97158cd 100644 --- a/hardware/EvohomeRadio.cpp +++ b/hardware/EvohomeRadio.cpp @@ -23,6 +23,9 @@ @@ -209,8 +191,6 @@ index 4da983538b..6ba97158cd 100644 extern std::string szUserDataFolder; -diff --git a/hardware/EvohomeSerial.cpp b/hardware/EvohomeSerial.cpp -index 4a54988291..c74cf576cc 100644 --- a/hardware/EvohomeSerial.cpp +++ b/hardware/EvohomeSerial.cpp @@ -7,6 +7,8 @@ @@ -222,8 +202,6 @@ index 4a54988291..c74cf576cc 100644 CEvohomeSerial::CEvohomeSerial(const int ID, const std::string &szSerialPort, const int baudrate, const std::string &UserContID) : CEvohomeRadio(ID, UserContID) { -diff --git a/hardware/KMTronic433.cpp b/hardware/KMTronic433.cpp -index da81b20f9f..f9832a5a74 100644 --- a/hardware/KMTronic433.cpp +++ b/hardware/KMTronic433.cpp @@ -9,11 +9,13 @@ @@ -241,8 +219,6 @@ index da81b20f9f..f9832a5a74 100644 //#define DEBUG_KMTronic #define RETRY_DELAY 30 -diff --git a/hardware/KMTronicBase.cpp b/hardware/KMTronicBase.cpp -index b343108966..d9c45872b5 100644 --- a/hardware/KMTronicBase.cpp +++ b/hardware/KMTronicBase.cpp @@ -10,7 +10,7 @@ @@ -254,8 +230,6 @@ index b343108966..d9c45872b5 100644 #include -diff --git a/hardware/KMTronicSerial.cpp b/hardware/KMTronicSerial.cpp -index 4e07f2c37a..6240f941bd 100644 --- a/hardware/KMTronicSerial.cpp +++ b/hardware/KMTronicSerial.cpp @@ -10,12 +10,14 @@ @@ -274,8 +248,6 @@ index 4e07f2c37a..6240f941bd 100644 #define RETRY_DELAY 30 KMTronicSerial::KMTronicSerial(const int ID, const std::string& devname) -diff --git a/hardware/MQTT.cpp b/hardware/MQTT.cpp -index 8de3671853..19750bb75b 100644 --- a/hardware/MQTT.cpp +++ b/hardware/MQTT.cpp @@ -11,6 +11,8 @@ @@ -287,8 +259,6 @@ index 8de3671853..19750bb75b 100644 #define RETRY_DELAY 30 #define CLIENTID "Domoticz" -diff --git a/hardware/Meteostick.cpp b/hardware/Meteostick.cpp -index 9793f4b57b..10da69d6e3 100644 --- a/hardware/Meteostick.cpp +++ b/hardware/Meteostick.cpp @@ -9,12 +9,14 @@ @@ -307,8 +277,6 @@ index 9793f4b57b..10da69d6e3 100644 #define RETRY_DELAY 30 #define round(a) ( int ) ( a + .5 ) -diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp -index af976fba95..42bf58fad5 100644 --- a/hardware/MySensorsBase.cpp +++ b/hardware/MySensorsBase.cpp @@ -13,7 +13,7 @@ @@ -320,8 +288,6 @@ index af976fba95..42bf58fad5 100644 #include "../webserver/cWebem.h" #include -diff --git a/hardware/MySensorsSerial.cpp b/hardware/MySensorsSerial.cpp -index 44f8692d2b..42f3e05409 100644 --- a/hardware/MySensorsSerial.cpp +++ b/hardware/MySensorsSerial.cpp @@ -8,12 +8,14 @@ @@ -340,8 +306,6 @@ index 44f8692d2b..42f3e05409 100644 //#define DEBUG_MYSENSORS #define RETRY_DELAY 30 -diff --git a/hardware/OTGWBase.cpp b/hardware/OTGWBase.cpp -index 322574458b..ded3a31c2c 100644 --- a/hardware/OTGWBase.cpp +++ b/hardware/OTGWBase.cpp @@ -12,7 +12,7 @@ @@ -353,8 +317,6 @@ index 322574458b..ded3a31c2c 100644 #include #include -diff --git a/hardware/OTGWSerial.cpp b/hardware/OTGWSerial.cpp -index 4ade70e063..5a3416548f 100644 --- a/hardware/OTGWSerial.cpp +++ b/hardware/OTGWSerial.cpp @@ -8,12 +8,14 @@ @@ -373,8 +335,6 @@ index 4ade70e063..5a3416548f 100644 #define RETRY_DELAY 30 #define OTGW_READ_INTERVAL 10 -diff --git a/hardware/OpenWebNetUSB.cpp b/hardware/OpenWebNetUSB.cpp -index bf23049844..352a2220e9 100644 --- a/hardware/OpenWebNetUSB.cpp +++ b/hardware/OpenWebNetUSB.cpp @@ -19,11 +19,12 @@ License: Public domain @@ -391,8 +351,6 @@ index bf23049844..352a2220e9 100644 COpenWebNetUSB::COpenWebNetUSB(const int ID, const std::string& devname, unsigned int baud_rate) { -diff --git a/hardware/P1MeterSerial.cpp b/hardware/P1MeterSerial.cpp -index 566b451fa5..7dc3e0782e 100644 --- a/hardware/P1MeterSerial.cpp +++ b/hardware/P1MeterSerial.cpp @@ -14,10 +14,12 @@ @@ -409,8 +367,6 @@ index 566b451fa5..7dc3e0782e 100644 #ifdef _DEBUG //#define DEBUG_P1_R #endif -diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp -index d3e2fda942..b6dc78a786 100644 --- a/hardware/Pinger.cpp +++ b/hardware/Pinger.cpp @@ -19,6 +19,8 @@ @@ -422,8 +378,6 @@ index d3e2fda942..b6dc78a786 100644 #if BOOST_VERSION >= 107000 #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) #else -diff --git a/hardware/RAVEn.cpp b/hardware/RAVEn.cpp -index d9efc7480a..b6a4399d04 100644 --- a/hardware/RAVEn.cpp +++ b/hardware/RAVEn.cpp @@ -8,6 +8,8 @@ @@ -435,8 +389,6 @@ index d9efc7480a..b6a4399d04 100644 //Rainforest RAVEn USB ZigBee Smart Meter Adapter //https://rainforestautomation.com/rfa-z106-raven/ -diff --git a/hardware/RFLinkSerial.cpp b/hardware/RFLinkSerial.cpp -index c5cae0f739..4ab07ed88e 100644 --- a/hardware/RFLinkSerial.cpp +++ b/hardware/RFLinkSerial.cpp @@ -5,6 +5,8 @@ @@ -448,8 +400,6 @@ index c5cae0f739..4ab07ed88e 100644 CRFLinkSerial::CRFLinkSerial(const int ID, const std::string& devname) : m_szSerialPort(devname) { -diff --git a/hardware/RFXComSerial.cpp b/hardware/RFXComSerial.cpp -index dc85f4832d..4c39520510 100644 --- a/hardware/RFXComSerial.cpp +++ b/hardware/RFXComSerial.cpp @@ -12,7 +12,7 @@ @@ -470,8 +420,6 @@ index dc85f4832d..4c39520510 100644 #define RETRY_DELAY 30 #define RFX_WRITE_DELAY 300 -diff --git a/hardware/RFXComTCP.cpp b/hardware/RFXComTCP.cpp -index 7c6b3954b8..0e4856fbfb 100644 --- a/hardware/RFXComTCP.cpp +++ b/hardware/RFXComTCP.cpp @@ -1,8 +1,6 @@ @@ -483,8 +431,6 @@ index 7c6b3954b8..0e4856fbfb 100644 #include "../main/Helper.h" #include "../main/localtime_r.h" #include "../main/mainworker.h" -diff --git a/hardware/Rego6XXSerial.cpp b/hardware/Rego6XXSerial.cpp -index b94bd291bc..15d22f869a 100644 --- a/hardware/Rego6XXSerial.cpp +++ b/hardware/Rego6XXSerial.cpp @@ -16,11 +16,13 @@ @@ -502,8 +448,6 @@ index b94bd291bc..15d22f869a 100644 #define Rego6XX_RETRY_DELAY 30 #define Rego6XX_COMMAND_DELAY 5 #define Rego6XX_READ_BUFFER_MASK (Rego6XX_READ_BUFFER_SIZE - 1) -diff --git a/hardware/S0MeterBase.cpp b/hardware/S0MeterBase.cpp -index 9cffa67022..75a06e2cc1 100644 --- a/hardware/S0MeterBase.cpp +++ b/hardware/S0MeterBase.cpp @@ -13,7 +13,7 @@ @@ -515,8 +459,6 @@ index 9cffa67022..75a06e2cc1 100644 #include -diff --git a/hardware/S0MeterSerial.cpp b/hardware/S0MeterSerial.cpp -index 1dc16b2b3e..f474d1c766 100644 --- a/hardware/S0MeterSerial.cpp +++ b/hardware/S0MeterSerial.cpp @@ -8,11 +8,13 @@ @@ -534,8 +476,6 @@ index 1dc16b2b3e..f474d1c766 100644 #ifdef _DEBUG //#define DEBUG_S0 #define TOT_DEBUG_LINES 6 -diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp -index 60445d9c28..82ba3559d9 100644 --- a/hardware/TCPProxy/tcpproxy_server.cpp +++ b/hardware/TCPProxy/tcpproxy_server.cpp @@ -15,6 +15,8 @@ @@ -547,8 +487,6 @@ index 60445d9c28..82ba3559d9 100644 #if BOOST_VERSION >= 107000 #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) #else -diff --git a/hardware/TeleinfoSerial.cpp b/hardware/TeleinfoSerial.cpp -index 85f9a6240f..fa794802e9 100644 --- a/hardware/TeleinfoSerial.cpp +++ b/hardware/TeleinfoSerial.cpp @@ -28,9 +28,11 @@ History : @@ -564,8 +502,6 @@ index 85f9a6240f..fa794802e9 100644 CTeleinfoSerial::CTeleinfoSerial(const int ID, const std::string& devname, const int datatimeout, unsigned int baud_rate, const bool disable_crc, const int ratelimit) { m_HwdID = ID; -diff --git a/hardware/USBtin.cpp b/hardware/USBtin.cpp -index c3e3656319..ce6f542df3 100644 --- a/hardware/USBtin.cpp +++ b/hardware/USBtin.cpp @@ -27,7 +27,7 @@ History : @@ -586,8 +522,6 @@ index c3e3656319..ce6f542df3 100644 #define USBTIN_BAUD_RATE 115200 #define USBTIN_PARITY boost::asio::serial_port_base::parity::none #define USBTIN_CARACTER_SIZE 8 -diff --git a/hardware/XiaomiGateway.cpp b/hardware/XiaomiGateway.cpp -index f4567ec62f..e4998faa6a 100644 --- a/hardware/XiaomiGateway.cpp +++ b/hardware/XiaomiGateway.cpp @@ -12,7 +12,7 @@ @@ -599,8 +533,6 @@ index f4567ec62f..e4998faa6a 100644 #ifndef WIN32 #include -diff --git a/hardware/Yeelight.h b/hardware/Yeelight.h -index b063f79743..64fd6f5479 100644 --- a/hardware/Yeelight.h +++ b/hardware/Yeelight.h @@ -2,7 +2,6 @@ @@ -611,8 +543,6 @@ index b063f79743..64fd6f5479 100644 class Yeelight : public CDomoticzHardwareBase { -diff --git a/hardware/ZiBlueSerial.cpp b/hardware/ZiBlueSerial.cpp -index 9e9db2aff1..8e896897fc 100644 --- a/hardware/ZiBlueSerial.cpp +++ b/hardware/ZiBlueSerial.cpp @@ -6,6 +6,8 @@ @@ -624,8 +554,6 @@ index 9e9db2aff1..8e896897fc 100644 #define ZiBlue_RETRY_DELAY 30 CZiBlueSerial::CZiBlueSerial(const int ID, const std::string& devname) : -diff --git a/hardware/plugins/PluginTransports.cpp b/hardware/plugins/PluginTransports.cpp -index c7e065529f..7fc1cb953e 100644 --- a/hardware/plugins/PluginTransports.cpp +++ b/hardware/plugins/PluginTransports.cpp @@ -13,6 +13,8 @@ @@ -637,8 +565,6 @@ index c7e065529f..7fc1cb953e 100644 namespace Plugins { void CPluginTransport::handleRead(const boost::system::error_code& e, std::size_t bytes_transferred) -diff --git a/main/WebServer.cpp b/main/WebServer.cpp -index 0a19319669..ed92f06e32 100644 --- a/main/WebServer.cpp +++ b/main/WebServer.cpp @@ -1,7 +1,7 @@ @@ -659,8 +585,6 @@ index 0a19319669..ed92f06e32 100644 #define round(a) ( int ) ( a + .5 ) extern std::string szStartupFolder; -diff --git a/main/mainworker.cpp b/main/mainworker.cpp -index 505f59f49d..5fb2ee9042 100644 --- a/main/mainworker.cpp +++ b/main/mainworker.cpp @@ -174,6 +174,8 @@ @@ -672,8 +596,6 @@ index 505f59f49d..5fb2ee9042 100644 #define round(a) ( int ) ( a + .5 ) extern std::string szStartupFolder; -diff --git a/push/FibaroPush.cpp b/push/FibaroPush.cpp -index 0bc54e6cfd..350a8fa893 100644 --- a/push/FibaroPush.cpp +++ b/push/FibaroPush.cpp @@ -14,6 +14,8 @@ @@ -685,8 +607,6 @@ index 0bc54e6cfd..350a8fa893 100644 CFibaroPush::CFibaroPush() { m_PushType = PushType::PUSHTYPE_FIBARO; -diff --git a/push/GooglePubSubPush.cpp b/push/GooglePubSubPush.cpp -index 6d0fc82d40..a5b720f219 100644 --- a/push/GooglePubSubPush.cpp +++ b/push/GooglePubSubPush.cpp @@ -21,6 +21,8 @@ extern "C" { @@ -698,8 +618,6 @@ index 6d0fc82d40..a5b720f219 100644 extern std::string szUserDataFolder; // this should be filled in by the preprocessor -diff --git a/push/HttpPush.cpp b/push/HttpPush.cpp -index 8132ca2b43..3d1d51d52e 100644 --- a/push/HttpPush.cpp +++ b/push/HttpPush.cpp @@ -15,6 +15,8 @@ @@ -711,8 +629,6 @@ index 8132ca2b43..3d1d51d52e 100644 CHttpPush::CHttpPush() { m_PushType = PushType::PUSHTYPE_HTTP; -diff --git a/push/InfluxPush.cpp b/push/InfluxPush.cpp -index 0a8e99414f..745fdf0496 100644 --- a/push/InfluxPush.cpp +++ b/push/InfluxPush.cpp @@ -15,6 +15,8 @@ @@ -724,8 +640,6 @@ index 0a8e99414f..745fdf0496 100644 CInfluxPush::CInfluxPush() : m_InfluxPort(8086), m_bInfluxDebugActive(false) -diff --git a/push/WebsocketPush.cpp b/push/WebsocketPush.cpp -index 0fb71f96ec..3c2ce7ed54 100644 --- a/push/WebsocketPush.cpp +++ b/push/WebsocketPush.cpp @@ -3,6 +3,8 @@ @@ -737,8 +651,6 @@ index 0fb71f96ec..3c2ce7ed54 100644 extern boost::signals2::signal sOnNotificationReceived; -diff --git a/tcpserver/TCPServer.cpp b/tcpserver/TCPServer.cpp -index d3b0a94847..3b8d0b9b76 100644 --- a/tcpserver/TCPServer.cpp +++ b/tcpserver/TCPServer.cpp @@ -11,7 +11,7 @@ @@ -750,8 +662,6 @@ index d3b0a94847..3b8d0b9b76 100644 namespace tcp { namespace server { -diff --git a/webserver/cWebem.cpp b/webserver/cWebem.cpp -index f015be097f..63c96f789f 100644 --- a/webserver/cWebem.cpp +++ b/webserver/cWebem.cpp @@ -5,7 +5,7 @@ @@ -763,8 +673,6 @@ index f015be097f..63c96f789f 100644 #include "reply.hpp" #include "request.hpp" #include "mime_types.hpp" -diff --git a/webserver/connection.cpp b/webserver/connection.cpp -index d3485fe923..afe700e5d7 100644 --- a/webserver/connection.cpp +++ b/webserver/connection.cpp @@ -9,7 +9,7 @@ @@ -785,8 +693,6 @@ index d3485fe923..afe700e5d7 100644 namespace http { namespace server { extern std::string convert_to_http_date(time_t time); -diff --git a/webserver/connection_manager.cpp b/webserver/connection_manager.cpp -index b6c20de53f..bf1d9882d0 100644 --- a/webserver/connection_manager.cpp +++ b/webserver/connection_manager.cpp @@ -10,10 +10,12 @@ @@ -803,8 +709,6 @@ index b6c20de53f..bf1d9882d0 100644 namespace http { namespace server { -diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp -index c2bcd3178f..423ee0fb4b 100644 --- a/webserver/proxyclient.cpp +++ b/webserver/proxyclient.cpp @@ -8,6 +8,8 @@ @@ -816,8 +720,6 @@ index c2bcd3178f..423ee0fb4b 100644 // RK: some defines to make mydomoticz also work when openssl not compiled in #ifdef WWW_ENABLE_SSL #define PROXY_PORT 443 -diff --git a/webserver/server.cpp b/webserver/server.cpp -index 1eb2137ef2..6025b1cdb5 100644 --- a/webserver/server.cpp +++ b/webserver/server.cpp @@ -3,7 +3,7 @@ diff --git a/utils/domoticz/patches/011-openzwave-include.patch b/utils/domoticz/patches/011-openzwave-include.patch index ce0af4bfa..1792b5cb6 100644 --- a/utils/domoticz/patches/011-openzwave-include.patch +++ b/utils/domoticz/patches/011-openzwave-include.patch @@ -37,8 +37,6 @@ Tested with both static and dynamic builds of OpenZWave. hardware/openzwave/control_panel/ozwcp.h | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa5b3099d..1f4b6fb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -694,6 +694,7 @@ endif(WITH_LIBUSB) @@ -69,8 +67,6 @@ index fa5b3099d..1f4b6fb57 100644 endif (OPENZWAVE_INCLUDE_DIRS) add_definitions(-DWITH_OPENZWAVE) ELSE() -diff --git a/hardware/OpenZWave.cpp b/hardware/OpenZWave.cpp -index 272e3d0a7..a226a8924 100644 --- a/hardware/OpenZWave.cpp +++ b/hardware/OpenZWave.cpp @@ -22,10 +22,10 @@ @@ -88,8 +84,6 @@ index 272e3d0a7..a226a8924 100644 #include "ZWaveCommands.h" -diff --git a/hardware/openzwave/control_panel/ozwcp.cpp b/hardware/openzwave/control_panel/ozwcp.cpp -index 0b21a9cf3..5e401b2f1 100644 --- a/hardware/openzwave/control_panel/ozwcp.cpp +++ b/hardware/openzwave/control_panel/ozwcp.cpp @@ -39,11 +39,11 @@ @@ -109,8 +103,6 @@ index 0b21a9cf3..5e401b2f1 100644 #include "../../../main/Logger.h" #include -diff --git a/hardware/openzwave/control_panel/ozwcp.h b/hardware/openzwave/control_panel/ozwcp.h -index ebfef1791..96d14b3bf 100644 --- a/hardware/openzwave/control_panel/ozwcp.h +++ b/hardware/openzwave/control_panel/ozwcp.h @@ -38,8 +38,8 @@ @@ -124,6 +116,3 @@ index ebfef1791..96d14b3bf 100644 #define MAX_NODES 255 --- -2.26.2 - diff --git a/utils/domoticz/patches/012-minizip-overflow.patch b/utils/domoticz/patches/012-minizip-overflow.patch index f5b41e667..8c26ede43 100644 --- a/utils/domoticz/patches/012-minizip-overflow.patch +++ b/utils/domoticz/patches/012-minizip-overflow.patch @@ -28,8 +28,6 @@ Reduce the buffer size to 65535 bytes instead. main/unzip_stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/main/unzip_stream.h b/main/unzip_stream.h -index 136fcefd9..813f2489a 100644 --- a/main/unzip_stream.h +++ b/main/unzip_stream.h @@ -135,7 +135,7 @@ namespace clx { @@ -41,6 +39,3 @@ index 136fcefd9..813f2489a 100644 unz_file_info info; unzGetCurrentFileInfo(handler_, &info, path, sizeof(path), NULL, 0, NULL, 0); path_ = path; --- -2.26.2 - diff --git a/utils/dosfstools/patches/010-iconv.patch b/utils/dosfstools/patches/010-iconv.patch index 04d402bf3..f594285d3 100644 --- a/utils/dosfstools/patches/010-iconv.patch +++ b/utils/dosfstools/patches/010-iconv.patch @@ -10,11 +10,9 @@ Added check for libiconv_open as that can be used when the libc lacks iconv. configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 07e8703..1b09964 100644 --- a/configure.ac +++ b/configure.ac -@@ -75,7 +75,8 @@ if test "x$with_udev" != "xno"; then +@@ -59,7 +59,8 @@ if test "x$with_udev" != "xno"; then [true]) fi diff --git a/utils/evtest/patches/010-musl.patch b/utils/evtest/patches/010-musl.patch index 92260297c..647c9dc54 100644 --- a/utils/evtest/patches/010-musl.patch +++ b/utils/evtest/patches/010-musl.patch @@ -7,8 +7,6 @@ Subject: [PATCH] Add missing include of limits.h for PATH_MAX evtest.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/evtest.c b/evtest.c -index 548c203..be5e42c 100644 --- a/evtest.c +++ b/evtest.c @@ -59,6 +59,7 @@ @@ -19,6 +17,3 @@ index 548c203..be5e42c 100644 #define BITS_PER_LONG (sizeof(long) * 8) #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) --- -2.22.0 - diff --git a/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 1473ba743..3fcb25224 100644 --- a/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -13,11 +13,9 @@ Signed-off-by: Khem Raj evtest.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/evtest.c b/evtest.c -index be5e42c..d00437f 100644 --- a/evtest.c +++ b/evtest.c -@@ -62,6 +62,11 @@ +@@ -61,6 +61,11 @@ #include #include /* PATH_MAX */ @@ -29,7 +27,7 @@ index be5e42c..d00437f 100644 #define BITS_PER_LONG (sizeof(long) * 8) #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) #define OFF(x) ((x)%BITS_PER_LONG) -@@ -1141,7 +1146,7 @@ static int print_events(int fd) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) type = ev[i].type; code = ev[i].code; @@ -38,6 +36,3 @@ index be5e42c..d00437f 100644 if (type == EV_SYN) { if (code == SYN_MT_REPORT) --- -2.25.1 - diff --git a/utils/flashrom/patches/010-bitbang.patch b/utils/flashrom/patches/010-bitbang.patch index 33579f19b..b5ff7cd3b 100644 --- a/utils/flashrom/patches/010-bitbang.patch +++ b/utils/flashrom/patches/010-bitbang.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', la +@@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSIO config_atahpt = get_option('config_atahpt') config_atapromise = get_option('config_atapromise') config_atavia = get_option('config_atavia') @@ -10,7 +10,7 @@ config_dediprog = get_option('config_dediprog') --- a/meson_options.txt +++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('usb', type : 'boolean', value : true, description : 'use libusb1') +@@ -4,6 +4,7 @@ option('usb', type : 'boolean', value : option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory') diff --git a/utils/gddrescue/patches/001-fix_uclibc.patch b/utils/gddrescue/patches/001-fix_uclibc.patch index 05113a82c..c516d2cae 100644 --- a/utils/gddrescue/patches/001-fix_uclibc.patch +++ b/utils/gddrescue/patches/001-fix_uclibc.patch @@ -25,4 +25,4 @@ +#include #include #include - #include \ No newline at end of file + #include diff --git a/utils/haserl/patches/100-replace-lua2c-with-sed.patch b/utils/haserl/patches/100-replace-lua2c-with-sed.patch index 4626a0289..622995edd 100644 --- a/utils/haserl/patches/100-replace-lua2c-with-sed.patch +++ b/utils/haserl/patches/100-replace-lua2c-with-sed.patch @@ -1,5 +1,3 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 31d45f7..d249f67 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -86,7 +86,6 @@ POST_INSTALL = : @@ -40,7 +38,7 @@ index 31d45f7..d249f67 100644 # Not strictly required, but we explicitly do not distribute the generated inc file nodist_haserl_SOURCES = haserl_lualib.inc -@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(haserl_DEPENDENCIES) $(EXTRA_haserl_DEPENDE +@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(has @rm -f haserl$(EXEEXT) $(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS) diff --git a/utils/haserl/patches/101-adjust-script-size.patch b/utils/haserl/patches/101-adjust-script-size.patch index a4b7d9a4d..1c4da2531 100644 --- a/utils/haserl/patches/101-adjust-script-size.patch +++ b/utils/haserl/patches/101-adjust-script-size.patch @@ -1,6 +1,6 @@ ---- a/src/h_lua_common.c 2013-09-20 23:35:19.000000000 +0300 -+++ b/src/h_lua_common.c 2014-05-03 19:27:43.000000000 +0300 -@@ -79,7 +79,7 @@ +--- a/src/h_lua_common.c ++++ b/src/h_lua_common.c +@@ -79,7 +79,7 @@ lua_common_setup (char *shell, list_t * /* and load our haserl library */ if (luaL_loadbuffer diff --git a/utils/hwinfo/patches/0-hardcoding-version b/utils/hwinfo/patches/0-hardcoding-version index 6986f6796..96f85fd99 100644 --- a/utils/hwinfo/patches/0-hardcoding-version +++ b/utils/hwinfo/patches/0-hardcoding-version @@ -1,8 +1,8 @@ hardcode version of hwinfo, this must be changed in sync with hwinfo version changes when updating the package ---- a/Makefile -+++ b/Makefile -@@ -12,12 +12,8 @@ +--- a/Makefile ++++ b/Makefile +@@ -12,12 +12,8 @@ export SO_LIBS GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) diff --git a/utils/lcdproc/patches/100-remove-build-timestamp.patch b/utils/lcdproc/patches/100-remove-build-timestamp.patch index 33f2c5707..1c6c84dcc 100644 --- a/utils/lcdproc/patches/100-remove-build-timestamp.patch +++ b/utils/lcdproc/patches/100-remove-build-timestamp.patch @@ -1,8 +1,6 @@ -Index: lcdproc-0.5.9/clients/lcdproc/main.c -=================================================================== ---- lcdproc-0.5.9.orig/clients/lcdproc/main.c 2017-04-21 12:43:48.000000000 +0200 -+++ lcdproc-0.5.9/clients/lcdproc/main.c 2017-12-06 23:36:54.674753530 +0100 -@@ -58,7 +58,6 @@ +--- a/clients/lcdproc/main.c ++++ b/clients/lcdproc/main.c +@@ -58,7 +58,6 @@ int Quit = 0; int sock = -1; char *version = VERSION; @@ -10,10 +8,8 @@ Index: lcdproc-0.5.9/clients/lcdproc/main.c int lcd_wid = 0; int lcd_hgt = 0; -Index: lcdproc-0.5.9/server/main.c -=================================================================== ---- lcdproc-0.5.9.orig/server/main.c 2017-04-24 22:17:15.000000000 +0200 -+++ lcdproc-0.5.9/server/main.c 2017-12-06 23:36:47.550605856 +0100 +--- a/server/main.c ++++ b/server/main.c @@ -104,7 +104,6 @@ char *version = VERSION; char *protocol_version = PROTOCOL_VERSION; @@ -22,7 +18,7 @@ Index: lcdproc-0.5.9/server/main.c /**** Configuration variables ****/ -@@ -197,8 +196,8 @@ +@@ -197,8 +196,8 @@ main(int argc, char **argv) /* Report that server is starting (report will be delayed) */ report(RPT_NOTICE, "LCDd version %s starting", version); diff --git a/utils/lcdproc/patches/110-in-outb.patch b/utils/lcdproc/patches/110-in-outb.patch index 7bf34eb30..cd87e18a6 100644 --- a/utils/lcdproc/patches/110-in-outb.patch +++ b/utils/lcdproc/patches/110-in-outb.patch @@ -1,6 +1,6 @@ --- a/server/drivers/port.h +++ b/server/drivers/port.h -@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count); +@@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns /* ---------------------------- Linux ------------------------------------ */ /* Use ioperm, inb and outb in (Linux) */ /* And iopl for higher addresses of PCI LPT cards */ diff --git a/utils/lrzsz/patches/100-install_delete_fix.patch b/utils/lrzsz/patches/100-install_delete_fix.patch index 3b19443bd..7f3995d51 100644 --- a/utils/lrzsz/patches/100-install_delete_fix.patch +++ b/utils/lrzsz/patches/100-install_delete_fix.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -372,13 +372,13 @@ +@@ -372,13 +372,13 @@ install-exec-local: rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` diff --git a/utils/lvm2/patches/002-const-stdio.patch b/utils/lvm2/patches/002-const-stdio.patch index 3b5b52424..ec1e2f90d 100644 --- a/utils/lvm2/patches/002-const-stdio.patch +++ b/utils/lvm2/patches/002-const-stdio.patch @@ -20,7 +20,7 @@ if (is_valid_fd(STDIN_FILENO) && --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3241,6 +3241,7 @@ int lvm_split(char *str, int *argc, char +@@ -3235,6 +3235,7 @@ int lvm_split(char *str, int *argc, char /* Make sure we have always valid filedescriptors 0,1,2 */ static int _check_standard_fds(void) { @@ -28,7 +28,7 @@ int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && -@@ -3267,6 +3268,12 @@ static int _check_standard_fds(void) +@@ -3261,6 +3262,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; } diff --git a/utils/lvm2/patches/003-no-mallinfo.patch b/utils/lvm2/patches/003-no-mallinfo.patch index 8f7f25d1d..e46ead5da 100644 --- a/utils/lvm2/patches/003-no-mallinfo.patch +++ b/utils/lvm2/patches/003-no-mallinfo.patch @@ -1,6 +1,6 @@ --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c -@@ -183,12 +183,15 @@ static void _allocate_memory(void) +@@ -187,12 +187,15 @@ static void _allocate_memory(void) * memory on free(), this is good enough for our purposes. */ while (missing > 0) { @@ -16,7 +16,7 @@ inf = mallinfo(); if (hblks < inf.hblks) { -@@ -198,9 +201,12 @@ static void _allocate_memory(void) +@@ -202,9 +205,12 @@ static void _allocate_memory(void) free(areas[area]); _size_malloc_tmp /= 2; } else { @@ -29,7 +29,7 @@ if (area == max_areas && missing > 0) { /* Too bad. Warn the user and proceed, as things are -@@ -521,8 +527,13 @@ static void _lock_mem(struct cmd_context +@@ -525,8 +531,13 @@ static void _lock_mem(struct cmd_context * will not block memory locked thread * Note: assuming _memlock_count_daemon is updated before _memlock_count */ diff --git a/utils/macchanger/patches/0001-fix-build-with-musl.patch b/utils/macchanger/patches/0001-fix-build-with-musl.patch index 4a30d5510..23fa5600d 100644 --- a/utils/macchanger/patches/0001-fix-build-with-musl.patch +++ b/utils/macchanger/patches/0001-fix-build-with-musl.patch @@ -1,7 +1,5 @@ -Index: macchanger-1.7.0/src/netinfo.c -=================================================================== ---- macchanger-1.7.0.orig/src/netinfo.c -+++ macchanger-1.7.0/src/netinfo.c +--- a/src/netinfo.c ++++ b/src/netinfo.c @@ -113,7 +113,7 @@ mc_net_info_get_permanent_mac (const net epa->size = IFHWADDRLEN; diff --git a/utils/mariadb/patches/100-fix_hostname.patch b/utils/mariadb/patches/100-fix_hostname.patch index 1e20f4f92..0a64dc6f3 100644 --- a/utils/mariadb/patches/100-fix_hostname.patch +++ b/utils/mariadb/patches/100-fix_hostname.patch @@ -1,6 +1,6 @@ --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -419,7 +419,7 @@ fi +@@ -418,7 +418,7 @@ fi # Try to determine the hostname diff --git a/utils/mariadb/patches/130-c11_atomics.patch b/utils/mariadb/patches/130-c11_atomics.patch index 4c486af61..11c834d69 100644 --- a/utils/mariadb/patches/130-c11_atomics.patch +++ b/utils/mariadb/patches/130-c11_atomics.patch @@ -9,7 +9,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200 --- a/configure.cmake +++ b/configure.cmake -@@ -866,7 +866,25 @@ int main() +@@ -863,7 +863,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" @@ -38,8 +38,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200 SET(HAVE_valgrind 1) --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -79,6 +79,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) +@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings + ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) DTRACE_INSTRUMENT(mysys) +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) @@ -51,7 +51,7 @@ Date: Fri Dec 21 19:14:04 2018 +0200 ENDIF(HAVE_BFD_H) --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -190,6 +190,10 @@ ELSE() +@@ -191,6 +191,10 @@ ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() diff --git a/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch b/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch index fd5958d43..46431d36f 100644 --- a/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch +++ b/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch @@ -1,7 +1,5 @@ -Index: mariadb-10.4.17/include/my_cpu.h -=================================================================== ---- mariadb-10.4.17.orig/include/my_cpu.h -+++ mariadb-10.4.17/include/my_cpu.h +--- a/include/my_cpu.h ++++ b/include/my_cpu.h @@ -24,17 +24,16 @@ */ @@ -34,10 +32,8 @@ Index: mariadb-10.4.17/include/my_cpu.h #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ __asm__ __volatile__ ("":::"memory"); -Index: mariadb-10.4.17/storage/tokudb/PerconaFT/portability/toku_time.h -=================================================================== ---- mariadb-10.4.17.orig/storage/tokudb/PerconaFT/portability/toku_time.h -+++ mariadb-10.4.17/storage/tokudb/PerconaFT/portability/toku_time.h +--- a/storage/tokudb/PerconaFT/portability/toku_time.h ++++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result)); return result; diff --git a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch index 497630711..5a2c30dcf 100644 --- a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch +++ b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch @@ -1,6 +1,6 @@ --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -359,6 +359,14 @@ then +@@ -358,6 +358,14 @@ then exit 1 fi plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin` @@ -15,7 +15,7 @@ pamtooldir=$plugindir # relative from where the script was run for a relocatable install elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld" -@@ -478,7 +486,9 @@ do +@@ -477,7 +485,9 @@ do fi done @@ -26,7 +26,7 @@ then if test -z "$srcdir" -a "$in_rpm" -eq 0 then -@@ -499,6 +509,10 @@ then +@@ -498,6 +508,10 @@ then echo fi fi diff --git a/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch b/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch index 6371628e0..8b74e0308 100644 --- a/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch +++ b/utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch @@ -1,6 +1,6 @@ --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh -@@ -242,7 +242,7 @@ wsrep_recover_position() { +@@ -244,7 +244,7 @@ wsrep_recover_position() { return 1 fi @@ -9,7 +9,7 @@ local wr_options="--disable-log-error --pid-file='$wr_pidfile'" -@@ -673,7 +673,7 @@ then +@@ -664,7 +664,7 @@ then * ) err_log="$DATADIR/$err_log" ;; esac else @@ -18,7 +18,7 @@ fi fi -@@ -752,7 +752,7 @@ fi +@@ -743,7 +743,7 @@ fi if test -z "$pid_file" then diff --git a/utils/mbtools/patches/010-glib.patch b/utils/mbtools/patches/010-glib.patch index 1f2836bec..0da203c81 100644 --- a/utils/mbtools/patches/010-glib.patch +++ b/utils/mbtools/patches/010-glib.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -21,7 +21,7 @@ AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h]) +@@ -21,7 +21,7 @@ AC_CHECK_HEADERS([stdio.h stdlib.h strin MBTOOLS_REQUIRES="glib-2.0 >= 2.10.0 libmodbus >= 3.1.0" PKG_CHECK_MODULES(MBTOOLS_DEPS, [$MBTOOLS_REQUIRES]) diff --git a/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch b/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch index 1ad7c123a..eb89881b0 100644 --- a/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch +++ b/utils/mbtools/patches/100-fix-unit-test-server-return-value.patch @@ -1,7 +1,5 @@ -Index: mbtools-2014-10-29/tests/unit-test-server.c -=================================================================== ---- mbtools-2014-10-29.orig/tests/unit-test-server.c -+++ mbtools-2014-10-29/tests/unit-test-server.c +--- a/tests/unit-test-server.c ++++ b/tests/unit-test-server.c @@ -117,4 +117,5 @@ int main(int argc, char *argv[]) } printf("Quit the loop: %s\n", modbus_strerror(errno)); diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch index 73d8ca949..a6e07aefc 100644 --- a/utils/mc/patches/010-subshell.patch +++ b/utils/mc/patches/010-subshell.patch @@ -1,4 +1,4 @@ --- a/src/subshell/common.c +--- a/src/subshell/common.c +++ b/src/subshell/common.c @@ -836,7 +836,7 @@ init_subshell_precmd (char *precmd, size "else " diff --git a/utils/mg/patches/001-cross_compile_openwrt.patch b/utils/mg/patches/001-cross_compile_openwrt.patch index 3789bef29..756135654 100644 --- a/utils/mg/patches/001-cross_compile_openwrt.patch +++ b/utils/mg/patches/001-cross_compile_openwrt.patch @@ -68,7 +68,7 @@ fparselncheck() { cat << EOF > conftest.c -@@ -229,20 +170,6 @@ +@@ -229,20 +170,6 @@ EOF fi } @@ -89,7 +89,7 @@ # Option variables if [ ! -z "$PREFIX" ] ; then prefix="$PREFIX" -@@ -327,79 +254,9 @@ +@@ -327,79 +254,9 @@ if [ $static -ne 0 ] ; then ldflags="${ldflags}-static" fi diff --git a/utils/minicom/patches/200-gcc10.patch b/utils/minicom/patches/200-gcc10.patch index 6c36c619c..987e16e1a 100644 --- a/utils/minicom/patches/200-gcc10.patch +++ b/utils/minicom/patches/200-gcc10.patch @@ -1,6 +1,6 @@ --- a/src/minicom.h +++ b/src/minicom.h -@@ -109,13 +109,13 @@ EXTERN char *dial_tty; /* tty to use. */ +@@ -109,13 +109,13 @@ EXTERN char *dial_tty; /* tty to use EXTERN char *dial_name; /* System we're conneced to */ EXTERN char *dial_number; /* Number we've dialed. */ @@ -19,7 +19,7 @@ #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \ ? -1 : portfd) #else -@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */ +@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Ba EXTERN int st_attr; /* Status Bar attributes. */ /* jl 04.09.97 conversion tables */ diff --git a/utils/mksh/patches/100-dot_mkshrc b/utils/mksh/patches/100-dot_mkshrc index 45c6cbd4d..1debb4464 100644 --- a/utils/mksh/patches/100-dot_mkshrc +++ b/utils/mksh/patches/100-dot_mkshrc @@ -32,7 +32,7 @@ Signed-off-by: Alif M. A. --- a/dot.mkshrc +++ b/dot.mkshrc -@@ -64,9 +64,9 @@ +@@ -64,9 +64,9 @@ for EDITOR in "${EDITOR:-}" jupp jstar m EDITOR= done diff --git a/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch b/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch index 1e9e295ac..36ea88ccb 100644 --- a/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch +++ b/utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch @@ -11,11 +11,9 @@ Acked-by: Avri Altman lsmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lsmmc.c b/lsmmc.c -index 4f687ac..b627b79 100644 --- a/lsmmc.c +++ b/lsmmc.c -@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config, char *cid) +@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config unsigned int crc; parse_bin(cid, "8u6r2u8u48a4u4u32u4u4u7u1r", @@ -24,6 +22,3 @@ index 4f687ac..b627b79 100644 &mdt_year, &mdt_month, &crc); pnm[6] = '\0'; --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch b/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch index ba97e79f6..6ccf2e5ba 100644 --- a/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch +++ b/utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch @@ -12,8 +12,6 @@ Signed-off-by: Stephane Fillod lsmmc.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) -diff --git a/lsmmc.c b/lsmmc.c -index b627b79..63504d2 100644 --- a/lsmmc.c +++ b/lsmmc.c @@ -112,7 +112,7 @@ struct ids_database database[] = { @@ -34,36 +32,34 @@ index b627b79..63504d2 100644 }, { .type = "sd", -@@ -134,6 +134,11 @@ struct ids_database database[] = { - .id = 0x1f, - .manufacturer = "Kingston", +@@ -136,6 +136,11 @@ struct ids_database database[] = { }, -+ { -+ .type = "sd", + { + .type = "sd", + .id = 0x27, + .manufacturer = "Delkin/Phison", + }, - { - .type = "sd", - .id = 0x28, -@@ -144,6 +149,11 @@ struct ids_database database[] = { - .id = 0x30, - .manufacturer = "SanDisk", - }, + { + .type = "sd", + .id = 0x28, + .manufacturer = "Lexar", + }, +@@ -146,6 +151,11 @@ struct ids_database database[] = { + }, + { + .type = "sd", + .id = 0x31, + .manufacturer = "Silicon Power", + }, - { - .type = "sd", ++ { ++ .type = "sd", .id = 0x33, -@@ -159,6 +169,21 @@ struct ids_database database[] = { - .id = 0x6f, .manufacturer = "STMicroelectronics", }, -+ { -+ .type = "sd", +@@ -161,6 +171,21 @@ struct ids_database database[] = { + }, + { + .type = "sd", + .id = 0x74, + .manufacturer = "Transcend", + }, @@ -77,9 +73,11 @@ index b627b79..63504d2 100644 + .id = 0x82, + .manufacturer = "Gobe/Sony", + }, - { - .type = "sd", ++ { ++ .type = "sd", .id = 0x89, + .manufacturer = "Unknown", + }, @@ -224,6 +249,11 @@ struct ids_database database[] = { .id = 0x70, .manufacturer = "Kingston", @@ -92,6 +90,3 @@ index b627b79..63504d2 100644 }; /* Command line parsing functions */ --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0008-Various-fixes.patch b/utils/mmc-utils/patches/0008-Various-fixes.patch index f680350f8..f3ea6a73d 100644 --- a/utils/mmc-utils/patches/0008-Various-fixes.patch +++ b/utils/mmc-utils/patches/0008-Various-fixes.patch @@ -12,11 +12,9 @@ Reviewed-by: Michael Heimpold mmc_cmds.c | 14 ++++++++++++-- 2 files changed, 33 insertions(+), 23 deletions(-) -diff --git a/lsmmc.c b/lsmmc.c -index 63504d2..06cc0b8 100644 --- a/lsmmc.c +++ b/lsmmc.c -@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config, char *cid) +@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config, printf("\tOID: %s\n", oid); printf("\tPNM: %s\n", pnm); printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor); @@ -28,7 +26,7 @@ index 63504d2..06cc0b8 100644 2000 + mdt_year, months[mdt_month]); printf("\tCRC: 0x%02x\n", crc); } else { -@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config, char *cid) +@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config, else printf("manufacturer: 'Unlisted' '%s'\n", oid); @@ -40,7 +38,7 @@ index 63504d2..06cc0b8 100644 months[mdt_month]); } } -@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config, char *cid) +@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config printf("\tOID: 0x%01x\n", oid); printf("\tPNM: %s\n", pnm); printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor); @@ -52,7 +50,7 @@ index 63504d2..06cc0b8 100644 1997 + mdt_year, months[mdt_month]); printf("\tCRC: 0x%02x\n", crc); } else { -@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config, char *cid) +@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config else printf("manufacturer: 'Unlisted' '%c'\n", oid); @@ -64,7 +62,7 @@ index 63504d2..06cc0b8 100644 months[mdt_month]); } } -@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config, printf("======SD/CSD======\n"); @@ -73,7 +71,7 @@ index 63504d2..06cc0b8 100644 printf("\tTAAC: 0x%02x (", taac); switch (taac_timevalue) { -@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config, if (csd_structure == 1 && taac != 0x0e) printf("Warn: Invalid TAAC (should be 0x0e)\n"); @@ -82,7 +80,7 @@ index 63504d2..06cc0b8 100644 if (csd_structure == 1 && nsac != 0x00) printf("Warn: Invalid NSAC (should be 0x00)\n"); -@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config, if (erase_blk_en != 0x01) printf("Warn: Invalid ERASE_BLK_EN (should be 0x01)\n"); @@ -97,7 +95,7 @@ index 63504d2..06cc0b8 100644 wp_grp_size, wp_grp_size + 1); if (wp_grp_size != 0x00) printf("Warn: Invalid WP_GRP_SIZE (should be 0x00)\n"); -@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config, if (wp_grp_enable != 0x00) printf("Warn: Invalid WP_GRP_ENABLE (should be 0x00)\n"); @@ -106,7 +104,7 @@ index 63504d2..06cc0b8 100644 r2w_factor, r2w_factor); if (r2w_factor != 0x02) printf("Warn: Invalid R2W_FACTOR (should be 0x02)\n"); -@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config, else printf("%.2fbyte", memory_capacity * 1.0); @@ -115,7 +113,7 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } else { unsigned long long blocks = 0; -@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config, char *csd) +@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config, else printf("%.2fbyte", memory_capacity * 1.0); @@ -124,7 +122,7 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } } -@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config break; } @@ -133,7 +131,7 @@ index 63504d2..06cc0b8 100644 printf("\tTRAN_SPEED: 0x%02x (", tran_speed); switch (tran_speed_timevalue) { case 0x0: -@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config printf("\tC_SIZE_MULT: 0x%01x\n", c_size_mult); printf("\tERASE_GRP_SIZE: 0x%02x\n", erase_grp_size); @@ -146,7 +144,7 @@ index 63504d2..06cc0b8 100644 wp_grp_size, wp_grp_size + 1); printf("\tWP_GRP_ENABLE: 0x%01x\n", wp_grp_enable); -@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config break; } @@ -155,7 +153,7 @@ index 63504d2..06cc0b8 100644 r2w_factor, r2w_factor); printf("\tWRITE_BL_LEN: 0x%01x (", write_bl_len); -@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config else printf("%.2fbyte", memory_capacity * 1.0); @@ -164,7 +162,7 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } else { int mult; -@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config, char *csd) +@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config printf("%.2fKbyte", memory_capacity / (1024.0)); else printf("%.2fbyte", memory_capacity * 1.0); @@ -173,11 +171,9 @@ index 63504d2..06cc0b8 100644 memory_capacity, blocks, block_size); } } -diff --git a/mmc_cmds.c b/mmc_cmds.c -index fb37189..8f4a476 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c -@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs, char **argv) +@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs, print_writeprotect_boot_status(ext_csd); @@ -185,7 +181,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs, char **argv) +@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs, exit(1); } @@ -193,7 +189,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs, char **argv) +@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs, if (last_wpblk != (x + y - 1)) print_wp_status(wp_sizeblks, last_wpblk, cnt - 1, last_prot); @@ -201,7 +197,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs, char **argv) +@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs, printf("MMC does not support disabling 512B emulation mode.\n"); } @@ -209,7 +205,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **argv) +@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **a value, EXT_CSD_PART_CONFIG, device); exit(1); } @@ -217,7 +213,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, char **argv) +@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, cha exit(1); } @@ -225,7 +221,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char **argv) +@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char ** exit(1); } @@ -233,7 +229,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv) +@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv printf("SEND_STATUS response: 0x%08x\n", response); @@ -241,7 +237,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **argv) +@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **arg printf("Write reliability setting register" " [WR_REL_SET]: 0x%02x\n", reg); @@ -263,7 +259,7 @@ index fb37189..8f4a476 100644 return ret; } -@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs, char **argv) +@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs, exit(1); } @@ -271,6 +267,3 @@ index fb37189..8f4a476 100644 return ret; } --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch b/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch index ca0e02af8..186e61313 100644 --- a/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch +++ b/utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch @@ -14,8 +14,6 @@ Reviewed-by: Avri Altman mmc_cmds.c | 70 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 31 deletions(-) -diff --git a/mmc.h b/mmc.h -index 648fb26..d648f68 100644 --- a/mmc.h +++ b/mmc.h @@ -25,10 +25,12 @@ @@ -31,8 +29,6 @@ index 648fb26..d648f68 100644 #define MMC_WRITE_BLOCK 24 /* adtc [31:0] data addr R1 */ #define MMC_WRITE_MULTIPLE_BLOCK 25 /* adtc R1 */ #define MMC_SET_WRITE_PROT 28 /* ac [31:0] data addr R1b */ -diff --git a/mmc_cmds.c b/mmc_cmds.c -index 8f4a476..c006ef2 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c @@ -2456,12 +2456,13 @@ int do_ffu(int nargs, char **argv) @@ -183,6 +179,3 @@ index 8f4a476..c006ef2 100644 goto out; } --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch b/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch index 64d275cda..185d64e47 100644 --- a/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch +++ b/utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch @@ -13,8 +13,6 @@ Reviewed-by: Wolfram Sang lsmmc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/lsmmc.c b/lsmmc.c -index 06cc0b8..05d59e8 100644 --- a/lsmmc.c +++ b/lsmmc.c @@ -393,10 +393,9 @@ char *read_file(char *name) @@ -30,6 +28,3 @@ index 06cc0b8..05d59e8 100644 } /* Hexadecimal string parsing functions */ --- -2.17.1 - diff --git a/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch b/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch index 591056413..ec0c4d903 100644 --- a/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch +++ b/utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch @@ -14,11 +14,9 @@ Reviewed-by: Avri Altman mmc_cmds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/mmc_cmds.c b/mmc_cmds.c -index c006ef2..556c105 100644 --- a/mmc_cmds.c +++ b/mmc_cmds.c -@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **argv) +@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **arg printf("Power off notification [POWER_OFF_LONG_TIME: 0x%02x]\n", ext_csd[247]); printf("Cache Size [CACHE_SIZE] is %d KiB\n", @@ -29,6 +27,3 @@ index c006ef2..556c105 100644 } /* A441: Reserved [501:247] --- -2.17.1 - diff --git a/utils/moreutils/patches/002_no-install-strip.patch b/utils/moreutils/patches/002_no-install-strip.patch index d7008d6b7..ecc1403af 100644 --- a/utils/moreutils/patches/002_no-install-strip.patch +++ b/utils/moreutils/patches/002_no-install-strip.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -2,7 +2,7 @@ BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno +@@ -2,7 +2,7 @@ BINS=isutf8 ifdata ifne pee sponge mispi PERLSCRIPTS=vidir vipe ts combine zrun chronic MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1 CFLAGS?=-O2 -g -Wall diff --git a/utils/mpack/patches/001-use-stdlib.patch b/utils/mpack/patches/001-use-stdlib.patch index c5d10df7d..96b928a80 100644 --- a/utils/mpack/patches/001-use-stdlib.patch +++ b/utils/mpack/patches/001-use-stdlib.patch @@ -1,7 +1,5 @@ -Index: mpack-1.6/unixos.c -=================================================================== ---- mpack-1.6.orig/unixos.c -+++ mpack-1.6/unixos.c +--- a/unixos.c ++++ b/unixos.c @@ -25,6 +25,7 @@ #include #include @@ -19,10 +17,8 @@ Index: mpack-1.6/unixos.c int overwrite_files = 0; int didchat; -Index: mpack-1.6/xmalloc.c -=================================================================== ---- mpack-1.6.orig/xmalloc.c -+++ mpack-1.6/xmalloc.c +--- a/xmalloc.c ++++ b/xmalloc.c @@ -24,7 +24,7 @@ */ #include diff --git a/utils/mt-st/patches/010-sysmacros.patch b/utils/mt-st/patches/010-sysmacros.patch index 456b2a752..94abc2ef8 100644 --- a/utils/mt-st/patches/010-sysmacros.patch +++ b/utils/mt-st/patches/010-sysmacros.patch @@ -1,5 +1,3 @@ -diff --git a/mt.c b/mt.c -index d4058c0..4837808 100644 --- a/mt.c +++ b/mt.c @@ -20,6 +20,7 @@ @@ -10,8 +8,6 @@ index d4058c0..4837808 100644 #include #include -diff --git a/stinit.c b/stinit.c -index 5a50341..af5582c 100644 --- a/stinit.c +++ b/stinit.c @@ -16,6 +16,7 @@ diff --git a/utils/netwhere/patches/010-libmicrohttpd.patch b/utils/netwhere/patches/010-libmicrohttpd.patch index 45e0448c8..8592e248d 100644 --- a/utils/netwhere/patches/010-libmicrohttpd.patch +++ b/utils/netwhere/patches/010-libmicrohttpd.patch @@ -16,7 +16,7 @@ struct MHD_Connection * connection, const char * url, const char * method, -@@ -53,7 +53,7 @@ int WebService::on_request(void * cls, +@@ -53,7 +53,7 @@ int WebService::on_request(void size_t * upload_data_size, void ** ptr) { static int dummy; diff --git a/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch b/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch index e7ec5c27c..7bb6c9c0e 100644 --- a/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch +++ b/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch @@ -15,8 +15,6 @@ Signed-off-by: Daniel Golle .../linux_cgroups_relative_hugetlb.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go -index d71dfb9e..e1db3f1b 100644 --- a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go +++ b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go @@ -24,7 +24,7 @@ func testHugetlbCgroups() error { @@ -28,8 +26,6 @@ index d71dfb9e..e1db3f1b 100644 for _, pageSize := range pageSizes { g, err := util.GetDefaultGenerator() -diff --git a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go -index b6d7ae81..583a9fa8 100644 --- a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go +++ b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go @@ -21,7 +21,7 @@ func main() { diff --git a/utils/openobex/patches/001-cxx.patch b/utils/openobex/patches/001-cxx.patch index ec53b4d1d..2b41b08bc 100644 --- a/utils/openobex/patches/001-cxx.patch +++ b/utils/openobex/patches/001-cxx.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 813f900..a0942e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ diff --git a/utils/pcmciautils/patches/001-switch_unsigned.patch b/utils/pcmciautils/patches/001-switch_unsigned.patch index 8a1559cd9..32d97f428 100644 --- a/utils/pcmciautils/patches/001-switch_unsigned.patch +++ b/utils/pcmciautils/patches/001-switch_unsigned.patch @@ -1,6 +1,6 @@ --- a/src/yacc_config.y +++ b/src/yacc_config.y -@@ -40,7 +40,7 @@ +@@ -40,7 +40,7 @@ int yylex(void); %union { char *str; diff --git a/utils/pcmciautils/patches/002-disable_yywrap.patch b/utils/pcmciautils/patches/002-disable_yywrap.patch index e30abb0d1..41895d2a9 100644 --- a/utils/pcmciautils/patches/002-disable_yywrap.patch +++ b/utils/pcmciautils/patches/002-disable_yywrap.patch @@ -1,6 +1,6 @@ ---- pcmciautils-018/src/lex_config.l -+++ pcmciautils-018/src/lex_config.l -@@ -1,8 +1,8 @@ +--- a/src/lex_config.l ++++ b/src/lex_config.l +@@ -1,6 +1,6 @@ /* Special state for handling include files */ %x src -%option noinput nounput @@ -8,11 +8,7 @@ %{ /* - * Startup tool for non statically mapped PCMCIA sockets - * -@@ -75,14 +75,10 @@ module /* skip */ ; - - . return yytext[0]; +@@ -77,10 +77,6 @@ module /* skip */ ; %% @@ -23,5 +19,3 @@ /*====================================================================== Stuff to parse basic data types - - ======================================================================*/ diff --git a/utils/pcsc-tools/patches/001-disable-atr.patch b/utils/pcsc-tools/patches/001-disable-atr.patch index 4ae111cdb..fcca4cd1c 100644 --- a/utils/pcsc-tools/patches/001-disable-atr.patch +++ b/utils/pcsc-tools/patches/001-disable-atr.patch @@ -1,11 +1,9 @@ Disable the analyze ATR perl-script and as we don't want to pull in perl as a dependency. -diff --git a/pcsc_scan.c b/pcsc_scan.c -index d89bc3e..134b675 100644 --- a/pcsc_scan.c +++ b/pcsc_scan.c -@@ -241,7 +241,7 @@ static void initialize_options(options_t *options, const char *pname) +@@ -241,7 +241,7 @@ static void initialize_options(options_t #ifdef WIN32 options->analyse_atr = False; #else diff --git a/utils/picocom/patches/010-fix-compile.patch b/utils/picocom/patches/010-fix-compile.patch index ec4ecb56a..b05231f3a 100644 --- a/utils/picocom/patches/010-fix-compile.patch +++ b/utils/picocom/patches/010-fix-compile.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index d6a4d60..a07d801 100644 --- a/Makefile +++ b/Makefile -@@ -51,7 +51,6 @@ linenoise-1.0/linenoise.o : linenoise-1.0/linenoise.c linenoise-1.0/linenoise.h +@@ -51,7 +51,6 @@ linenoise-1.0/linenoise.o : linenoise-1. OBJS += picocom.o term.o fdio.o split.o termios2.o custbaud_bsd.o picocom : $(OBJS) diff --git a/utils/picocom/patches/020-fix-compile-x86.patch b/utils/picocom/patches/020-fix-compile-x86.patch index 3cc3291d7..92b04006d 100644 --- a/utils/picocom/patches/020-fix-compile-x86.patch +++ b/utils/picocom/patches/020-fix-compile-x86.patch @@ -11,8 +11,6 @@ macros. If not defined, we disable custom baudrate support. custbaud.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -diff --git a/custbaud.h b/custbaud.h -index 48151a4..ae4ae8d 100644 --- a/custbaud.h +++ b/custbaud.h @@ -26,6 +26,8 @@ @@ -39,6 +37,3 @@ index 48151a4..ae4ae8d 100644 #ifndef USE_CUSTOM_BAUD #define USE_CUSTOM_BAUD #endif --- -2.19.1 - diff --git a/utils/picocom/patches/030-usleep.patch b/utils/picocom/patches/030-usleep.patch index 15388d527..27b20d1fa 100644 --- a/utils/picocom/patches/030-usleep.patch +++ b/utils/picocom/patches/030-usleep.patch @@ -10,8 +10,6 @@ Signed-off-by: Rosen Penev term.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/term.c b/term.c -index b45ab3d..23afd4f 100644 --- a/term.c +++ b/term.c @@ -33,6 +33,7 @@ diff --git a/utils/pigz/patches/001.patch b/utils/pigz/patches/001.patch index b75daa1b7..bdd910c32 100644 --- a/utils/pigz/patches/001.patch +++ b/utils/pigz/patches/001.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2019-05-22 19:54:23.980451289 +0800 -+++ b/Makefile 2019-06-10 10:32:58.054675929 +0800 +--- a/Makefile ++++ b/Makefile @@ -1,7 +1,7 @@ -CC=gcc -CFLAGS=-O3 -Wall -Wextra -Wno-unknown-pragmas diff --git a/utils/powertop/patches/002-strerror_r.patch b/utils/powertop/patches/002-strerror_r.patch index cf8659e1e..7612a850b 100644 --- a/utils/powertop/patches/002-strerror_r.patch +++ b/utils/powertop/patches/002-strerror_r.patch @@ -1,6 +1,6 @@ ---- traceevent/event-parse.c.orig -+++ ./traceevent/event-parse.c -@@ -5121,12 +5121,17 @@ +--- a/traceevent/event-parse.c ++++ b/traceevent/event-parse.c +@@ -5121,12 +5121,17 @@ int pevent_strerror(struct pevent *peven const char *msg; if (errnum >= 0) { diff --git a/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch b/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch index e01f0d540..7af8efe78 100644 --- a/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch +++ b/utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch @@ -21,8 +21,6 @@ Signed-off-by: Rosen Penev src/main.cpp | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/main.cpp b/src/main.cpp -index cbb7a4e..75d4202 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,7 @@ @@ -33,6 +31,3 @@ index cbb7a4e..75d4202 100644 #include "cpu/cpu.h" #include "process/process.h" --- -2.17.1 - diff --git a/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch b/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch index 46d01703f..6dd77ef8e 100644 --- a/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch +++ b/utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch @@ -12,11 +12,9 @@ Signed-off-by: Rosen Penev src/cpu/intel_cpus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index 0030dba..4dffadc 100644 --- a/src/cpu/intel_cpus.cpp +++ b/src/cpu/intel_cpus.cpp -@@ -92,7 +92,7 @@ int is_supported_intel_cpu(int model, int cpu) +@@ -92,7 +92,7 @@ int is_supported_intel_cpu(int model, in int is_intel_pstate_driver_loaded() { @@ -25,6 +23,3 @@ index 0030dba..4dffadc 100644 const string intel_pstate("intel_pstate"); char line[32] = { '\0' }; ifstream file; --- -2.17.1 - diff --git a/utils/procps-ng/patches/100-no-tests-docs.patch b/utils/procps-ng/patches/100-no-tests-docs.patch index 3ae60ace8..b863fba3d 100644 --- a/utils/procps-ng/patches/100-no-tests-docs.patch +++ b/utils/procps-ng/patches/100-no-tests-docs.patch @@ -14,7 +14,7 @@ LDADD = ./proc/libprocps.la $(CYGWINFLAGS) --- a/configure.ac +++ b/configure.ac -@@ -292,8 +292,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda +@@ -298,8 +298,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit AC_CONFIG_FILES([Makefile include/Makefile diff --git a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch index 4d11c4ab1..8f1c5fe57 100644 --- a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch +++ b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch @@ -9,8 +9,6 @@ OpenWrt base build system decide flavor of fortify_source to use configure | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/configure b/configure -index 23b5e93752..c8d2ac1c3e 100755 --- a/configure +++ b/configure @@ -1601,6 +1601,8 @@ for opt do diff --git a/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch b/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch index 0af7763d4..162a06f25 100644 --- a/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch +++ b/utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch @@ -7,8 +7,6 @@ Subject: [PATCH] configure: allow enabling/disabling libudev from command line configure | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/configure b/configure -index c8d2ac1c3e..cf3f8ffdd7 100755 --- a/configure +++ b/configure @@ -1601,6 +1601,10 @@ for opt do diff --git a/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch b/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch index afeb2738b..5a49ab596 100644 --- a/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch +++ b/utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch @@ -12,8 +12,6 @@ Fixes a512590 ("configure: qemu-ga is only needed with softmmu targets") configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure b/configure -index cf3f8ffdd7..b4af83a01f 100755 --- a/configure +++ b/configure @@ -6414,7 +6414,7 @@ fi diff --git a/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch b/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch index 52c4b3b39..df79e2417 100644 --- a/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch +++ b/utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch @@ -7,11 +7,9 @@ Subject: [PATCH] disas: fix compilation failure when isnan is a macro disas/libvixl/vixl/utils.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -diff --git a/disas/libvixl/vixl/utils.h b/disas/libvixl/vixl/utils.h -index 5ab134e240..df30663df8 100644 --- a/disas/libvixl/vixl/utils.h +++ b/disas/libvixl/vixl/utils.h -@@ -118,11 +118,17 @@ double double_pack(uint64_t sign, uint64_t exp, uint64_t mantissa); +@@ -118,11 +118,17 @@ double double_pack(uint64_t sign, uint64 // An fpclassify() function for 16-bit half-precision floats. int float16classify(float16 value); @@ -30,7 +28,7 @@ index 5ab134e240..df30663df8 100644 return true; } return false; -@@ -132,7 +138,7 @@ inline bool IsSignallingNaN(double num) { +@@ -132,7 +138,7 @@ inline bool IsSignallingNaN(double num) inline bool IsSignallingNaN(float num) { const uint32_t kFP32QuietNaNMask = 0x00400000; uint32_t raw = float_to_rawbits(num); @@ -39,7 +37,7 @@ index 5ab134e240..df30663df8 100644 return true; } return false; -@@ -148,21 +154,21 @@ inline bool IsSignallingNaN(float16 num) { +@@ -148,21 +154,21 @@ inline bool IsSignallingNaN(float16 num) template inline bool IsQuietNaN(T num) { diff --git a/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch b/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch index 7785bd2d9..ae0fc6d97 100644 --- a/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch +++ b/utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch @@ -7,8 +7,6 @@ Subject: [PATCH] pc-bios: fix compilation when $(AS) is actually gcc driver pc-bios/optionrom/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile -index e33a24da0d..ce734e8202 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -34,7 +34,7 @@ endif @@ -20,7 +18,7 @@ index e33a24da0d..ce734e8202 100644 QEMU_CFLAGS += $(call cc-c-option, $(QEMU_CFLAGS), $(Wa)-32) build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin -@@ -44,7 +44,7 @@ build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin +@@ -44,7 +44,7 @@ build-all: multiboot.bin linuxboot.bin l %.o: %.S diff --git a/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch b/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch index 2cc566e1b..75ed9fd6f 100644 --- a/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch +++ b/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch @@ -20,8 +20,6 @@ Signed-off-by: Yousong Zhou util/mmap-alloc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c -index 27dcccd8ec..e133e38d21 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -12,9 +12,6 @@ diff --git a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch index 1bcf72088..97991a878 100644 --- a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch +++ b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch @@ -11,11 +11,9 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf qga/commands-posix.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/qga/commands-posix.c b/qga/commands-posix.c -index a52af0315f..623d856c64 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c -@@ -84,6 +84,7 @@ static void ga_wait_child(pid_t pid, int *status, Error **errp) +@@ -84,6 +84,7 @@ static void ga_wait_child(pid_t pid, int void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) { const char *shutdown_flag; @@ -23,7 +21,7 @@ index a52af0315f..623d856c64 100644 Error *local_err = NULL; pid_t pid; int status; -@@ -91,10 +92,13 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) +@@ -91,10 +92,13 @@ void qmp_guest_shutdown(bool has_mode, c slog("guest-shutdown called, mode: %s", mode); if (!has_mode || strcmp(mode, "powerdown") == 0) { shutdown_flag = "-P"; @@ -37,7 +35,7 @@ index a52af0315f..623d856c64 100644 } else { error_setg(errp, "mode is invalid (valid values are: halt|powerdown|reboot"); -@@ -111,6 +115,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) +@@ -111,6 +115,7 @@ void qmp_guest_shutdown(bool has_mode, c execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", "hypervisor initiated shutdown", (char*)NULL, environ); diff --git a/utils/quota/patches/020-remove-reallocarray.patch b/utils/quota/patches/020-remove-reallocarray.patch index 942e38eeb..75c7a5d9b 100644 --- a/utils/quota/patches/020-remove-reallocarray.patch +++ b/utils/quota/patches/020-remove-reallocarray.patch @@ -1,5 +1,3 @@ -diff --git a/quota.c b/quota.c -index a6ed61f..a60de12 100644 --- a/quota.c +++ b/quota.c @@ -385,7 +385,7 @@ int main(int argc, char **argv) diff --git a/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch b/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch index 485cb30df..a389475c8 100644 --- a/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch +++ b/utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch @@ -12,11 +12,9 @@ Signed-off-by: Stijn Tintel viewadsb.c | 5 ++++- 3 files changed, 20 insertions(+), 5 deletions(-) -diff --git a/anet.c b/anet.c -index 5c35ff8..7f01958 100644 --- a/anet.c +++ b/anet.c -@@ -212,7 +212,10 @@ static int anetTcpGenericConnect(char *err, char *addr, char *service, int flags +@@ -212,7 +212,10 @@ static int anetTcpGenericConnect(char *e if (ss) { memcpy(ss, p->ai_addr, sizeof(*ss)); } @@ -28,7 +26,7 @@ index 5c35ff8..7f01958 100644 return s; } -@@ -220,7 +223,10 @@ static int anetTcpGenericConnect(char *err, char *addr, char *service, int flags +@@ -220,7 +223,10 @@ static int anetTcpGenericConnect(char *e anetCloseSocket(s); } @@ -40,7 +38,7 @@ index 5c35ff8..7f01958 100644 return ANET_ERR; } -@@ -368,7 +374,10 @@ int anetTcpServer(char *err, char *service, char *bindaddr, int *fds, int nfds) +@@ -368,7 +374,10 @@ int anetTcpServer(char *err, char *servi fds[i++] = s; } @@ -52,8 +50,6 @@ index 5c35ff8..7f01958 100644 return (i > 0 ? i : ANET_ERR); } -diff --git a/net_io.c b/net_io.c -index 1f4d848..5f59194 100644 --- a/net_io.c +++ b/net_io.c @@ -3285,7 +3285,10 @@ void cleanupNetwork(void) { @@ -68,8 +64,6 @@ index 1f4d848..5f59194 100644 if (con->mutex) { pthread_mutex_unlock(con->mutex); pthread_mutex_destroy(con->mutex); -diff --git a/viewadsb.c b/viewadsb.c -index 5fc5386..ad7b1bd 100644 --- a/viewadsb.c +++ b/viewadsb.c @@ -308,7 +308,10 @@ int main(int argc, char **argv) { @@ -84,6 +78,3 @@ index 5fc5386..ad7b1bd 100644 pthread_mutex_unlock(con->mutex); pthread_mutex_destroy(con->mutex); free(con->mutex); --- -2.26.2 - diff --git a/utils/readsb/patches/010-gcc10.patch b/utils/readsb/patches/010-gcc10.patch index 2ef972294..ffa7a3754 100644 --- a/utils/readsb/patches/010-gcc10.patch +++ b/utils/readsb/patches/010-gcc10.patch @@ -9,8 +9,6 @@ Subject: [PATCH] Clean up linkage of struct Modes. viewadsb.c | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/readsb.c b/readsb.c -index e784d891..d6dab324 100644 --- a/readsb.c +++ b/readsb.c @@ -57,6 +57,8 @@ @@ -22,8 +20,6 @@ index e784d891..d6dab324 100644 // // ============================= Program options help ========================== // -diff --git a/readsb.h b/readsb.h -index 3a1b22d5..1b80c338 100644 --- a/readsb.h +++ b/readsb.h @@ -312,7 +312,7 @@ struct mag_buf @@ -46,8 +42,6 @@ index 3a1b22d5..1b80c338 100644 // The struct we use to store information about a decoded message. -diff --git a/viewadsb.c b/viewadsb.c -index ad7b1bd0..915305b6 100644 --- a/viewadsb.c +++ b/viewadsb.c @@ -54,6 +54,8 @@ diff --git a/utils/relayctl/patches/0001-ftdi1.patch b/utils/relayctl/patches/0001-ftdi1.patch index 0b08395f4..f13267ae6 100644 --- a/utils/relayctl/patches/0001-ftdi1.patch +++ b/utils/relayctl/patches/0001-ftdi1.patch @@ -8,19 +8,13 @@ Signed-off-by: Heinrich Schuchardt src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index a533d5c..4dbe6b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,7 +1,7 @@ - sbin_PROGRAMS = \ +@@ -1,6 +1,6 @@ + bin_PROGRAMS = \ relayctl -relayctl_LDFLAGS = -lftdi +relayctl_LDFLAGS = -lftdi1 relayctl_SOURCES = relayctl.c - --- -2.1.4 - diff --git a/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch b/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch index 442fe4972..073c3102a 100644 --- a/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch +++ b/utils/rrdtool1/patches/001-no_ordering_cd_joke.patch @@ -1,7 +1,6 @@ -diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure ---- rrdtool-1.0.50/configure 2005-04-25 22:48:09.000000000 +0200 -+++ rrdtool-1.0.50.new/configure 2009-03-09 17:25:38.000000000 +0100 -@@ -24873,17 +24873,12 @@ +--- a/configure ++++ b/configure +@@ -24873,17 +24873,12 @@ echo "$as_me:$LINENO: result: and out ag echo "${ECHO_T}and out again" >&6 echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6 diff --git a/utils/rrdtool1/patches/002-no_timezone.patch b/utils/rrdtool1/patches/002-no_timezone.patch index 07564b4dd..67bc9b15b 100644 --- a/utils/rrdtool1/patches/002-no_timezone.patch +++ b/utils/rrdtool1/patches/002-no_timezone.patch @@ -1,6 +1,6 @@ --- a/src/rrd_tool.c +++ b/src/rrd_tool.c -@@ -225,11 +225,8 @@ +@@ -225,11 +225,8 @@ int main(int argc, char *argv[]) struct rusage myusage; struct timeval starttime; struct timeval currenttime; @@ -13,7 +13,7 @@ #endif while (fgets(aLine, sizeof(aLine)-1, stdin)){ -@@ -252,7 +249,7 @@ +@@ -252,7 +249,7 @@ int main(int argc, char *argv[]) #if HAVE_GETRUSAGE getrusage(RUSAGE_SELF,&myusage); diff --git a/utils/rrdtool1/patches/020-x86-float-cast.patch b/utils/rrdtool1/patches/020-x86-float-cast.patch index 5b8a66276..1de223443 100644 --- a/utils/rrdtool1/patches/020-x86-float-cast.patch +++ b/utils/rrdtool1/patches/020-x86-float-cast.patch @@ -1,7 +1,5 @@ -Index: rrdtool-1.0.50/src/rrd_format.h -=================================================================== ---- rrdtool-1.0.50.orig/src/rrd_format.h -+++ rrdtool-1.0.50/src/rrd_format.h +--- a/src/rrd_format.h ++++ b/src/rrd_format.h @@ -20,7 +20,7 @@ #define RRD_COOKIE "RRD" diff --git a/utils/rrdtool1/patches/030-pod2man-stderr.patch b/utils/rrdtool1/patches/030-pod2man-stderr.patch index feadf3aa5..38deac7fa 100644 --- a/utils/rrdtool1/patches/030-pod2man-stderr.patch +++ b/utils/rrdtool1/patches/030-pod2man-stderr.patch @@ -1,6 +1,6 @@ ---- rrdtool-1.0.50/doc/Makefile.am.orig 2013-11-16 11:44:50.940231208 -0500 -+++ rrdtool-1.0.50/doc/Makefile.am 2013-11-16 11:45:09.802229483 -0500 -@@ -35,7 +35,7 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -35,7 +35,7 @@ iman_DATA = $(MAN) all-local: link txt man html .pod.1 .pm.1 .pl.1: diff --git a/utils/sane-backends/patches/002-remove-uneeded.patch b/utils/sane-backends/patches/002-remove-uneeded.patch index 418fd8a15..e02eed073 100644 --- a/utils/sane-backends/patches/002-remove-uneeded.patch +++ b/utils/sane-backends/patches/002-remove-uneeded.patch @@ -1,7 +1,5 @@ -Index: sane-backends-1.0.31/Makefile.in -=================================================================== ---- sane-backends-1.0.31.orig/Makefile.in -+++ sane-backends-1.0.31/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -442,7 +442,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch b/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch index 8b797a196..5478a3865 100644 --- a/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch +++ b/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch @@ -1,9 +1,7 @@ https://gitlab.com/sane-project/backends/issues/237 -Index: sane-backends-1.0.31/backend/genesys/image_pipeline.cpp -=================================================================== ---- sane-backends-1.0.31.orig/backend/genesys/image_pipeline.cpp -+++ sane-backends-1.0.31/backend/genesys/image_pipeline.cpp +--- a/backend/genesys/image_pipeline.cpp ++++ b/backend/genesys/image_pipeline.cpp @@ -754,7 +754,11 @@ bool ImagePipelineNodeCalibrate::get_nex float value_f = static_cast(value) / max_value; diff --git a/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch b/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch index dd53747a8..a2518b7d1 100644 --- a/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch +++ b/utils/sane-backends/patches/102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch @@ -11,8 +11,6 @@ Fixes #345. backend/pixma/pixma_mp800.c | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) -diff --git a/backend/pixma/pixma_common.c b/backend/pixma/pixma_common.c -index ff3bd487d..2f46082e2 100644 --- a/backend/pixma/pixma_common.c +++ b/backend/pixma/pixma_common.c @@ -56,8 +56,6 @@ @@ -24,7 +22,7 @@ index ff3bd487d..2f46082e2 100644 #endif #include "pixma_rename.h" -@@ -1241,6 +1239,7 @@ pixma_get_device_status (pixma_t * s, pixma_device_status_t * status) +@@ -1241,6 +1239,7 @@ pixma_get_device_status (pixma_t * s, pi return s->ops->get_status (s, status); } @@ -37,11 +35,9 @@ index ff3bd487d..2f46082e2 100644 return status; } +#endif -diff --git a/backend/pixma/pixma_common.h b/backend/pixma/pixma_common.h -index bee839c2c..1ced88d17 100644 --- a/backend/pixma/pixma_common.h +++ b/backend/pixma/pixma_common.h -@@ -205,7 +205,9 @@ uint8_t *pixma_newcmd (pixma_cmdbuf_t *, unsigned cmd, +@@ -205,7 +205,9 @@ uint8_t *pixma_newcmd (pixma_cmdbuf_t *, int pixma_exec (pixma_t *, pixma_cmdbuf_t *); int pixma_exec_short_cmd (pixma_t *, pixma_cmdbuf_t *, unsigned cmd); int pixma_map_status_errno (unsigned status); @@ -51,8 +47,6 @@ index bee839c2c..1ced88d17 100644 /**@}*/ #define pixma_fill_checksum(start, end) do { \ -diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c -index cd6cd3ddf..a18fbdce1 100644 --- a/backend/pixma/pixma_mp150.c +++ b/backend/pixma/pixma_mp150.c @@ -322,6 +322,10 @@ @@ -66,7 +60,7 @@ index cd6cd3ddf..a18fbdce1 100644 enum mp150_state_t { state_idle, -@@ -459,7 +463,11 @@ send_xml_dialog (pixma_t * s, const char * xml_message) +@@ -459,7 +463,11 @@ send_xml_dialog (pixma_t * s, const char PDBG (pixma_dbg (10, "XML message sent to scanner:\n%s\n", xml_message)); PDBG (pixma_dbg (10, "XML response back from scanner:\n%s\n", mp->cb.buf)); @@ -78,8 +72,6 @@ index cd6cd3ddf..a18fbdce1 100644 } static int -diff --git a/backend/pixma/pixma_mp800.c b/backend/pixma/pixma_mp800.c -index 8b7b232fd..e05107d04 100644 --- a/backend/pixma/pixma_mp800.c +++ b/backend/pixma/pixma_mp800.c @@ -152,6 +152,10 @@ @@ -93,7 +85,7 @@ index 8b7b232fd..e05107d04 100644 enum mp810_state_t { state_idle, -@@ -291,7 +295,11 @@ static int send_xml_dialog (pixma_t * s, const char * xml_message) +@@ -291,7 +295,11 @@ static int send_xml_dialog (pixma_t * s, PDBG(pixma_dbg (10, "XML message sent to scanner:\n%s\n", xml_message)); PDBG(pixma_dbg (10, "XML response back from scanner:\n%s\n", mp->cb.buf)); @@ -105,6 +97,3 @@ index 8b7b232fd..e05107d04 100644 } static void new_cmd_tpu_msg (pixma_t *s, pixma_cmdbuf_t * cb, uint16_t cmd) --- -GitLab - diff --git a/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch b/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch index 5b5426007..2589f2f99 100644 --- a/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch +++ b/utils/selinux-python/patches/0001-sepolgen-adjust-data_dir.patch @@ -8,11 +8,9 @@ Signed-off-by: Thomas Petazzoni sepolgen/src/sepolgen/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/sepolgen/src/sepolgen/defaults.py b/sepolgen/src/sepolgen/defaults.py -index 6e800695..a61d1efd 100644 --- a/sepolgen/src/sepolgen/defaults.py +++ b/sepolgen/src/sepolgen/defaults.py -@@ -57,7 +57,7 @@ Various default settings, including file and directory locations. +@@ -57,7 +57,7 @@ Various default settings, including file """ def data_dir(): @@ -21,6 +19,3 @@ index 6e800695..a61d1efd 100644 def perm_map(): return data_dir() + "/perm_map" --- -2.21.0 - diff --git a/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch b/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch index 0ebc3e593..426781b8b 100644 --- a/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch +++ b/utils/selinux-python/patches/0002-sepolgen-don-t-hardcode-search-for-ausearch-in-sbin.patch @@ -11,8 +11,6 @@ Signed-off-by: Thomas Petazzoni sepolgen/src/sepolgen/audit.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/sepolgen/src/sepolgen/audit.py b/sepolgen/src/sepolgen/audit.py -index 4adb851f..5eafa587 100644 --- a/sepolgen/src/sepolgen/audit.py +++ b/sepolgen/src/sepolgen/audit.py @@ -41,7 +41,7 @@ def get_audit_boot_msgs(): @@ -33,6 +31,3 @@ index 4adb851f..5eafa587 100644 stdout=subprocess.PIPE).communicate()[0] if util.PY3: output = util.decode_input(output) --- -2.21.0 - diff --git a/utils/setools/patches/010-no-format.patch b/utils/setools/patches/010-no-format.patch index d81a9c6e4..939959f65 100644 --- a/utils/setools/patches/010-no-format.patch +++ b/utils/setools/patches/010-no-format.patch @@ -1,7 +1,6 @@ -diff -u --recursive setools-vanilla/setup.py setools/setup.py ---- setools-vanilla/setup.py 2020-04-01 09:57:49.000000000 -0500 -+++ setools/setup.py 2020-08-12 21:44:41.265149504 -0500 -@@ -109,7 +109,6 @@ +--- a/setup.py ++++ b/setup.py +@@ -109,7 +109,6 @@ ext_py_mods = [Extension('setools.policy extra_compile_args=['-Werror', '-Wextra', '-Waggregate-return', '-Wfloat-equal', diff --git a/utils/setools/patches/020-no-deprecated.patch b/utils/setools/patches/020-no-deprecated.patch index 5059bed44..cf3b0e2fe 100644 --- a/utils/setools/patches/020-no-deprecated.patch +++ b/utils/setools/patches/020-no-deprecated.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -126,6 +126,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'], +@@ -125,6 +125,7 @@ ext_py_mods = [Extension('setools.policy '-Wno-unreachable-code', '-Wno-implicit-fallthrough', '-Wno-cast-function-type', diff --git a/utils/setserial/patches/010-no-docs.patch b/utils/setserial/patches/010-no-docs.patch index 1fc247383..8069c07d3 100644 --- a/utils/setserial/patches/010-no-docs.patch +++ b/utils/setserial/patches/010-no-docs.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile.in b/Makefile.in -index 00b9eb1..2fdbae3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ DEFS = @DEFS@ diff --git a/utils/smartmontools/patches/001-use-external-drivedb.patch b/utils/smartmontools/patches/001-use-external-drivedb.patch index ba7bf16c5..1d3a7b66f 100644 --- a/utils/smartmontools/patches/001-use-external-drivedb.patch +++ b/utils/smartmontools/patches/001-use-external-drivedb.patch @@ -1,8 +1,6 @@ -diff --git i/knowndrives.cpp w/knowndrives.cpp -index 072160a..d57417b 100644 ---- i/knowndrives.cpp -+++ w/knowndrives.cpp -@@ -40,11 +40,84 @@ const char * knowndrives_cpp_cvsid = "$Id: knowndrives.cpp 4842 2018-12-02 16:07 +--- a/knowndrives.cpp ++++ b/knowndrives.cpp +@@ -40,11 +40,84 @@ const char * knowndrives_cpp_cvsid = "$I // see read_default_drive_databases() below. // The drive_settings structure is described in drivedb.h. const drive_settings builtin_knowndrives[] = { diff --git a/utils/smartmontools/patches/002-os_mailer-is-mailx.patch b/utils/smartmontools/patches/002-os_mailer-is-mailx.patch index a80e7c9b8..b565f800d 100644 --- a/utils/smartmontools/patches/002-os_mailer-is-mailx.patch +++ b/utils/smartmontools/patches/002-os_mailer-is-mailx.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index 88928cf..736fabd 100755 --- a/configure +++ b/configure @@ -6964,7 +6964,7 @@ releaseversion='${PACKAGE}-${VERSION}' diff --git a/utils/smstools3/patches/004-modem-processes.patch b/utils/smstools3/patches/004-modem-processes.patch index 95de7ba01..8f0f44649 100644 --- a/utils/smstools3/patches/004-modem-processes.patch +++ b/utils/smstools3/patches/004-modem-processes.patch @@ -4,11 +4,9 @@ Date: Sun Feb 18 19:24:48 2018 +0100 Make modem processes terminate when main process dies -diff --git a/src/smsd.c b/src/smsd.c -index fdfa193..37b2e4d 100755 --- a/src/smsd.c +++ b/src/smsd.c -@@ -34,6 +34,7 @@ Either version 2 of the License, or (at your option) any later version. +@@ -34,6 +34,7 @@ Either version 2 of the License, or (at #ifndef DISABLE_INOTIFY #include #endif diff --git a/utils/squashfs-tools/patches/010-gcc10.patch b/utils/squashfs-tools/patches/010-gcc10.patch index 46c6a5ea0..bbd4909ba 100644 --- a/utils/squashfs-tools/patches/010-gcc10.patch +++ b/utils/squashfs-tools/patches/010-gcc10.patch @@ -28,8 +28,6 @@ Signed-off-by: Sergei Trofimovich squashfs-tools/mksquashfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 1beefef7..b6503063 100644 --- a/squashfs-tools/mksquashfs.h +++ b/squashfs-tools/mksquashfs.h @@ -143,7 +143,7 @@ struct append_file { diff --git a/utils/tang/patches/010-makefile.patch b/utils/tang/patches/010-makefile.patch index 30a480ef2..94b073847 100644 --- a/utils/tang/patches/010-makefile.patch +++ b/utils/tang/patches/010-makefile.patch @@ -19,7 +19,7 @@ dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen dist_bin_SCRIPTS = src/tang-show-keys libexec_PROGRAMS = src/tangd -@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http.h src/tangd.c +@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http. AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH) TESTS = tests/adv tests/rec diff --git a/utils/tang/patches/020-no-systemd.patch b/utils/tang/patches/020-no-systemd.patch index 571c72a20..196941276 100644 --- a/utils/tang/patches/020-no-systemd.patch +++ b/utils/tang/patches/020-no-systemd.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser_execute], +@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser [AC_MSG_ERROR([http-parser required!])]) PKG_CHECK_MODULES([jose], [jose >= 8]) diff --git a/utils/telldus-core/patches/200-no-iconv.patch b/utils/telldus-core/patches/200-no-iconv.patch index c82030775..de9493b8b 100644 --- a/utils/telldus-core/patches/200-no-iconv.patch +++ b/utils/telldus-core/patches/200-no-iconv.patch @@ -10,7 +10,7 @@ #endif #include #include -@@ -50,35 +51,8 @@ std::wstring TelldusCore::charToWstring(const char *value) { +@@ -50,35 +51,8 @@ std::wstring TelldusCore::charToWstring( return retval; #else @@ -48,7 +48,7 @@ #endif } -@@ -211,19 +185,8 @@ std::string TelldusCore::wideToString(const std::wstring &input) { +@@ -211,19 +185,8 @@ std::string TelldusCore::wideToString(co #else char *inPointer = inString; #endif diff --git a/utils/telldus-core/patches/930-usleep.patch b/utils/telldus-core/patches/930-usleep.patch index 7c30a105e..c716129f8 100644 --- a/utils/telldus-core/patches/930-usleep.patch +++ b/utils/telldus-core/patches/930-usleep.patch @@ -29,7 +29,7 @@ #include #include -@@ -231,7 +230,7 @@ int TellStick::send( const std::string &strMessage ) { +@@ -231,7 +230,7 @@ int TellStick::send( const std::string & return TELLSTICK_SUCCESS; } } else if(ret == 0) { // No data available diff --git a/utils/tini/patches/001-override-git-version.patch b/utils/tini/patches/001-override-git-version.patch index e1870d079..bd6484991 100644 --- a/utils/tini/patches/001-override-git-version.patch +++ b/utils/tini/patches/001-override-git-version.patch @@ -6,14 +6,12 @@ Date: Sat Oct 31 16:53:39 2020 +1000 * This to help when building from source snapshots that don't have the .git file structure. -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 332b361..3f6f44b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,27 +13,37 @@ if(MINIMAL) add_definitions(-DTINI_MINIMAL=1) endif() - + -# Extract git version and dirty-ness -execute_process ( - COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h @@ -21,24 +19,11 @@ index 332b361..3f6f44b 100644 - RESULT_VARIABLE git_version_check_ret - OUTPUT_VARIABLE tini_VERSION_GIT -) -- --execute_process( -- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no -- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" -- OUTPUT_VARIABLE git_dirty_check_out --) -- --if("${git_version_check_ret}" EQUAL 0) -- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}") -- if(NOT "${git_dirty_check_out}" STREQUAL "") -- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty") -- endif() +# Set the git version +if (NOT "${TINI_VERSION_GIT}" STREQUAL "") + # Set by the user directly + set(tini_VERSION_GIT "${TINI_VERSION_GIT}") - else() -- set(tini_VERSION_GIT "") ++else() + # Extract git version + execute_process ( + COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h @@ -46,7 +31,12 @@ index 332b361..3f6f44b 100644 + RESULT_VARIABLE git_version_check_ret + OUTPUT_VARIABLE tini_VERSION_GIT + ) -+ + +-execute_process( +- COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" +- OUTPUT_VARIABLE git_dirty_check_out +-) + if("${git_version_check_ret}" EQUAL 0) + # Extract git dirty-ness + execute_process( @@ -54,7 +44,14 @@ index 332b361..3f6f44b 100644 + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + OUTPUT_VARIABLE git_dirty_check_out + ) -+ + +-if("${git_version_check_ret}" EQUAL 0) +- set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}") +- if(NOT "${git_dirty_check_out}" STREQUAL "") +- set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty") +- endif() +-else() +- set(tini_VERSION_GIT "") + if(NOT "${git_dirty_check_out}" STREQUAL "") + set(tini_VERSION_GIT "${tini_VERSION_GIT}-dirty") + endif() @@ -66,5 +63,5 @@ index 332b361..3f6f44b 100644 +if(NOT ${tini_VERSION_GIT} STREQUAL "") + set(tini_VERSION_GIT " - git.${tini_VERSION_GIT}") endif() - + # Flags diff --git a/utils/unzip/patches/010-remove-build-date.patch b/utils/unzip/patches/010-remove-build-date.patch index bb60533cb..9a33444d7 100644 --- a/utils/unzip/patches/010-remove-build-date.patch +++ b/utils/unzip/patches/010-remove-build-date.patch @@ -6,7 +6,7 @@ Bug-Debian: https://bugs.debian.org/782851 --- a/unix/unix.c +++ b/unix/unix.c -@@ -1705,7 +1705,7 @@ +@@ -1705,7 +1705,7 @@ void version(__G) #endif /* Sun */ #endif /* SGI */ diff --git a/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch b/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch index e1fdcf588..0c56ace8a 100644 --- a/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch +++ b/utils/unzip/patches/011-CVE-2018-1000035-overflow-password-protect.patch @@ -4,20 +4,20 @@ /* - Copyright (c) 1990-2009 Info-ZIP. All rights reserved. + Copyright (c) 1990-2017 Info-ZIP. All rights reserved. - + See the accompanying file LICENSE, version 2009-Jan-02 or later (the contents of which are also included in unzip.h) for terms of use. -@@ -1582,6 +1582,8 @@ +@@ -1582,6 +1582,8 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf, int r = IZ_PW_ENTERED; char *m; char *prompt; + char *ep; + char *zp; - + #ifndef REENTRANT /* tell picky compilers to shut up about "unused variable" warnings */ -@@ -1590,9 +1592,12 @@ - +@@ -1590,9 +1592,12 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf, + if (*rcnt == 0) { /* First call for current entry */ *rcnt = 2; - if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) { diff --git a/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch index cb429860a..8e07aca5d 100644 --- a/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch +++ b/utils/vim/patches/001-support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch @@ -22,8 +22,6 @@ preprocessor's __DATE__/__TIME__ symbols will be used. src/version.c | 8 ++++++++ 3 files changed, 21 insertions(+) -diff --git a/src/config.h.in b/src/config.h.in -index 5c8c7e5..436a0b7 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -30,6 +30,9 @@ @@ -36,11 +34,9 @@ index 5c8c7e5..436a0b7 100644 /* Define when __attribute__((unused)) can be used */ #undef HAVE_ATTRIBUTE_UNUSED -diff --git a/src/configure.ac b/src/configure.ac -index 8751b2e..cd43387 100644 --- a/src/configure.ac +++ b/src/configure.ac -@@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; then +@@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; th fi fi @@ -57,8 +53,6 @@ index 8751b2e..cd43387 100644 dnl Check for the flag that fails if stuff are missing. AC_MSG_CHECKING(--enable-fail-if-missing argument) -diff --git a/src/version.c b/src/version.c -index c8361eb..e51c738 100644 --- a/src/version.c +++ b/src/version.c @@ -44,9 +44,13 @@ init_longVersion(void) diff --git a/utils/vim/patches/002-remove_helptags_generation.patch b/utils/vim/patches/002-remove_helptags_generation.patch index 8ea06b55e..992f81e67 100644 --- a/utils/vim/patches/002-remove_helptags_generation.patch +++ b/utils/vim/patches/002-remove_helptags_generation.patch @@ -1,6 +1,6 @@ --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile -@@ -323,10 +323,6 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) +@@ -323,10 +323,6 @@ all: tags vim.man evim.man vimdiff.man v # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) diff --git a/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch b/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch index 945d63e9a..a710fb34a 100644 --- a/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch +++ b/utils/wipe/patches/001-ignore_git_version_hash_and_fix_release_version.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index 5757ae3..20d52ce 100644 --- a/Makefile +++ b/Makefile -@@ -157,11 +157,7 @@ wipe.o : wipe.c random.h misc.h version.h +@@ -157,11 +157,7 @@ wipe.o : wipe.c random.h misc.h version. $(CC) $(CCO) $(CCOC) wipe.c -o wipe.o version.h: always @@ -15,8 +13,6 @@ index 5757ae3..20d52ce 100644 random.o : random.c misc.h md5.h $(CC) $(CCO) $(CCOC) random.c -o random.o -diff --git a/wipe.c b/wipe.c -index 5a215e8..5a4f2ad 100644 --- a/wipe.c +++ b/wipe.c @@ -24,7 +24,7 @@ diff --git a/utils/yara/patches/010-openssl.patch b/utils/yara/patches/010-openssl.patch index bbd22fd56..a54b0001a 100644 --- a/utils/yara/patches/010-openssl.patch +++ b/utils/yara/patches/010-openssl.patch @@ -9,11 +9,9 @@ #endif #endif -diff --git a/libyara/modules/pe/pe.c b/libyara/modules/pe/pe.c -index 8eace26..ed43abe 100644 --- a/libyara/modules/pe/pe.c +++ b/libyara/modules/pe/pe.c -@@ -44,8 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +@@ -44,8 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #endif #if OPENSSL_VERSION_NUMBER < 0x10100000L diff --git a/utils/ykpers/patches/020-json-c-0.14.patch b/utils/ykpers/patches/020-json-c-0.14.patch index ca5a918d2..2bb27c91d 100644 --- a/utils/ykpers/patches/020-json-c-0.14.patch +++ b/utils/ykpers/patches/020-json-c-0.14.patch @@ -9,8 +9,6 @@ Upstream removed the TRUE and FALSE defines in commit ykpers-json.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -diff --git a/ykpers-json.c b/ykpers-json.c -index a62e907..15ad380 100644 --- a/ykpers-json.c +++ b/ykpers-json.c @@ -40,7 +40,7 @@ @@ -22,7 +20,7 @@ index a62e907..15ad380 100644 #endif static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { -@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP +@@ -50,7 +50,7 @@ static void set_json_value(struct map_st if(p->mode && (mode & p->mode) == mode) { json_object *joption; json_bool ret = yk_json_object_object_get(options, p->json_text, joption); @@ -31,7 +29,7 @@ index a62e907..15ad380 100644 int value = json_object_get_boolean(joption); if(value == 1) { p->setter(cfg, true); -@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { +@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg ykp_errno = YKP_EINVAL; goto out; } @@ -56,7 +54,7 @@ index a62e907..15ad380 100644 int target_config = json_object_get_int(jtarget); int command; if(target_config == 1) { -@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { +@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg if(mode == MODE_OATH_HOTP) { json_object *jdigits, *jrandom; ykp_set_tktflag_OATH_HOTP(cfg, true); @@ -72,7 +70,7 @@ index a62e907..15ad380 100644 int random = json_object_get_boolean(jrandom); int seed = 0; if(random == 1) { -@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { +@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg goto out; } else { json_object *jseed; -- cgit