gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-01-10 03:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Run refresh on all packages

Browse Source 
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 <ilya.lipnitskiy@gmail.com>
This commit is contained in:
Ilya Lipnitskiy
2021-02-20 16:02:15 -08:00
parent d651082447
commit 5d8d4fbbcb
558 changed files with 1518 additions and 2977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/acl/patches/100-no-gettext_configure.patch
View File

@@ -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

2
utils/acl/patches/101-no-gettext_autogen.patch
View File

@@ -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 @@

2
utils/acl/patches/102-no-gettext_Makefile.patch
View File

@@ -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

17
utils/at/patches/100-remove-glibc-assumption.patch
View File

@@ -18,21 +18,19 @@ Signed-off-by: Phil Eichinger <phil@zankapfel.net>
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

4
utils/attr/patches/100-no-gettext_configure.patch
View File

@@ -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

2
utils/attr/patches/101-no-gettext_autogen.patch
View File

@@ -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 @@

2
utils/attr/patches/102-no-gettext_Makefile.patch
View File

@@ -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

15
utils/attr/patches/110-Replace-bzero-with-memset.patch
View File

@@ -13,11 +13,9 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
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

19
utils/audit/patches/0001-Add-substitue-functions-for-strndupa-rawmemchr.patch
View File

@@ -12,8 +12,6 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
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

5
utils/audit/patches/0002-fix-gcc-10.patch
View File

@@ -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

2
utils/avrdude/patches/020-no-cpp-timestamps.patch
View File

@@ -6,7 +6,7 @@ Author: Milan Kupcevic <milan@debian.org>
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
*/

8
utils/avrdude/patches/110-ud-to-u.patch
View File

@@ -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];

10
utils/bc/patches/001-disable-doc.patch
View File

@@ -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

6
utils/bluez/patches/001-bcm43xx-Add-bcm43xx-3wire-variant.patch
View File

@@ -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 },

6
utils/bluez/patches/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
View File

@@ -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;

6
utils/bluez/patches/003-Increase-firmware-load-timeout-to-30s.patch
View File

@@ -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;

6
utils/bluez/patches/004-Move-the-43xx-firmware-into-lib-firmware.patch
View File

@@ -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"

6
utils/bluez/patches/201-readline.patch
View File

@@ -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

6
utils/bluez/patches/202-fix-endianness.patch
View File

@@ -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 <alloca.h>
#include <byteswap.h>

14
utils/bluez/patches/203-obexd_without_systemd.patch
View File

@@ -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

6
utils/bluez/patches/205-refresh_adv_manager_for_non-LE_devices.patch
View File

@@ -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");

4
utils/bonnie++/patches/010-openwrt-fixes.patch
View File

@@ -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)

20
utils/ccrypt/patches/001-no-intl.patch
View File

@@ -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@

4
utils/cmdpad/patches/100-Makefile.patch
View File

@@ -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

6
utils/cmdpad/patches/120-kernel26-compat.patch
View File

@@ -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 ;
}

8
utils/cmdpad/patches/130-no_zombie.patch
View File

@@ -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())

4
utils/collectd/patches/920-backport-netlink-reg-noerror.patch
View File

@@ -24,11 +24,9 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
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) {

20
utils/collectd/patches/930-dhcpleases-add-dhcpleases-plugin.patch
View File

@@ -18,8 +18,6 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
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
#</Plugin>
@@ -92,9 +84,6 @@ index 562a55d9..94659e81 100644
#<Plugin "dpdkevents">
# <EAL>
# 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

8
utils/coreutils/patches/001-no_docs_man_tests.patch
View File

@@ -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;

21
utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch
View File

@@ -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 <stdio.h>
#include <assert.h>
#include <setjmp.h>
@@ -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

13
utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch
View File

@@ -11,8 +11,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
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 || 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 || relay>(FIRST_RELAY+g_num_relays-1))
{
--
2.17.1

4
utils/device-observatory/patches/020-libmicrohttpd.patch
View File

@@ -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;

50
utils/digitemp/patches/0001_add_missing_includes.patch
View File

@@ -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 <sys/types.h>
#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 <string.h>
#include <ctype.h>
#include "ownet.h"
+#include "sys/types.h"
#ifdef __MC68K__
#include <PalmOS.h>
--- 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 */

6
utils/dockerd/patches/001-libdevmapper_name_fix.patch
View File

@@ -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

98
utils/domoticz/patches/010-boost-173.patch
View File

@@ -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 <boost/function.hpp>
#include <boost/thread.hpp>
#include <boost/smart_ptr/shared_array.hpp> // 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 <ctime>
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 <json/json.h>
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 <json/json.h>
#include <ctime>
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 <ctime>
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 <ifaddrs.h>
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<void(const std::string &Subject, const std::string &Text, const std::string &ExtraData, const int Priority, const std::string & Sound, const bool bFromNotification)> 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 @@

11
utils/domoticz/patches/011-openzwave-include.patch
View File

@@ -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 <sys/stat.h>
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

5
utils/domoticz/patches/012-minizip-overflow.patch
View File

@@ -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

4
utils/dosfstools/patches/010-iconv.patch
View File

@@ -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

5
utils/evtest/patches/010-musl.patch
View File

@@ -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

9
utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch
View File

@@ -13,11 +13,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
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 <unistd.h>
#include <limits.h> /* 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

4
utils/flashrom/patches/010-bitbang.patch
View File

@@ -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')

2
utils/gddrescue/patches/001-fix_uclibc.patch
View File

@@ -25,4 +25,4 @@
+#include <cctype>
#include <climits>
#include <cstdio>
#include <cstdlib>
#include <cstdlib>

4
utils/haserl/patches/100-replace-lua2c-with-sed.patch
View File

@@ -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)

6
utils/haserl/patches/101-adjust-script-size.patch
View File

@@ -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

6
utils/hwinfo/patches/0-hardcoding-version
View File

@@ -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)

16
utils/lcdproc/patches/100-remove-build-timestamp.patch
View File

@@ -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);

2
utils/lcdproc/patches/110-in-outb.patch
View File

@@ -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 <sys/io.h> (Linux) */
/* And iopl for higher addresses of PCI LPT cards */

2
utils/lrzsz/patches/100-install_delete_fix.patch
View File

@@ -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)'`

4
utils/lvm2/patches/002-const-stdio.patch
View File

@@ -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;
}

6
utils/lvm2/patches/003-no-mallinfo.patch
View File

@@ -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
*/

6
utils/macchanger/patches/0001-fix-build-with-musl.patch
View File

@@ -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;

2
utils/mariadb/patches/100-fix_hostname.patch
View File

@@ -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

8
utils/mariadb/patches/130-c11_atomics.patch
View File

@@ -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()

12
utils/mariadb/patches/170-ppc-remove-glibc-dep.patch
View File

@@ -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;

6
utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
View File

@@ -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

6
utils/mariadb/patches/190-replace-hostname-in-mysqld_safe.patch
View File

@@ -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

2
utils/mbtools/patches/010-glib.patch
View File

@@ -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])

6
utils/mbtools/patches/100-fix-unit-test-server-return-value.patch
View File

@@ -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));

2
utils/mc/patches/010-subshell.patch
View File

@@ -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 "

4
utils/mg/patches/001-cross_compile_openwrt.patch
View File

@@ -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

4
utils/minicom/patches/200-gcc10.patch
View File

@@ -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 */

2
utils/mksh/patches/100-dot_mkshrc
View File

@@ -32,7 +32,7 @@ Signed-off-by: Alif M. A. <alive4ever at live.com>
--- a/dot.mkshrc
+++ b/dot.mkshrc
@@ -64,9 +64,9 @@
@@ -64,9 +64,9 @@ for EDITOR in "${EDITOR:-}" jupp jstar m
EDITOR=
done

7
utils/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch
View File

@@ -11,11 +11,9 @@ Acked-by: Avri Altman <avri.altman@wdc.com>
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

47
utils/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch
View File

@@ -12,8 +12,6 @@ Signed-off-by: Stephane Fillod <f8cfe@free.fr>
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",
.id = 0x33,
@@ -159,6 +169,21 @@ struct ids_database database[] = {
.id = 0x6f,
.manufacturer = "STMicroelectronics",
},
+ {
+ .type = "sd",
.id = 0x33,
.manufacturer = "STMicroelectronics",
},
@@ -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

57
utils/mmc-utils/patches/0008-Various-fixes.patch
View File

@@ -12,11 +12,9 @@ Reviewed-by: Michael Heimpold <mhei@heimpold.de>
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

7
utils/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch
View File

@@ -14,8 +14,6 @@ Reviewed-by: Avri Altman <avri.altman@wdc.com>
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

5
utils/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch
View File

@@ -13,8 +13,6 @@ Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
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

7
utils/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch
View File

@@ -14,11 +14,9 @@ Reviewed-by: Avri Altman <avri.altman@wdc.com>
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

2
utils/moreutils/patches/002_no-install-strip.patch
View File

@@ -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

12
utils/mpack/patches/001-use-stdlib.patch
View File

@@ -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 <stdio.h>
#include <ctype.h>
@@ -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 <stdio.h>

4
utils/mt-st/patches/010-sysmacros.patch
View File

@@ -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 <sys/stat.h>
#include <sys/utsname.h>
diff --git a/stinit.c b/stinit.c
index 5a50341..af5582c 100644
--- a/stinit.c
+++ b/stinit.c
@@ -16,6 +16,7 @@

2
utils/netwhere/patches/010-libmicrohttpd.patch
View File

@@ -16,7 +16,7 @@
struct MHD_Connection * connection,
const char * url,
const char * method,
@@ -53,7 +53,7 @@ int WebService<Functor>::on_request(void * cls,
@@ -53,7 +53,7 @@ int WebService<Functor>::on_request(void
size_t * upload_data_size,
void ** ptr) {
static int dummy;

4
utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch
View File

@@ -15,8 +15,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
.../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() {

2
utils/openobex/patches/001-cxx.patch
View File

@@ -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 @@

2
utils/pcmciautils/patches/001-switch_unsigned.patch
View File

@@ -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;

14
utils/pcmciautils/patches/002-disable_yywrap.patch
View File

@@ -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
======================================================================*/

4
utils/pcsc-tools/patches/001-disable-atr.patch
View File

@@ -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

4
utils/picocom/patches/010-fix-compile.patch
View File

@@ -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)

5
utils/picocom/patches/020-fix-compile-x86.patch
View File

@@ -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

2
utils/picocom/patches/030-usleep.patch
View File

@@ -10,8 +10,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
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 @@

4
utils/pigz/patches/001.patch
View File

@@ -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

6
utils/powertop/patches/002-strerror_r.patch
View File

@@ -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) {

5
utils/powertop/patches/010-src-main-Add-missing-pthread-header.patch
View File

@@ -21,8 +21,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
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

7
utils/powertop/patches/020-intel_cpus.cpp-Change-open-parameter-to-const-char.patch
View File

@@ -12,11 +12,9 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
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

2
utils/procps-ng/patches/100-no-tests-docs.patch
View File

@@ -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

2
utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
View File

@@ -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

2
utils/qemu/patches/0002-configure-allow-enabling-disabling-libudev-from-comm.patch
View File

@@ -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

2
utils/qemu/patches/0003-configure-enable-guest_agent-no-matter-whether-softm.patch
View File

@@ -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

8
utils/qemu/patches/0004-disas-fix-compilation-failure-when-isnan-is-a-macro.patch
View File

@@ -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 <typename T>
inline bool IsQuietNaN(T num) {

4
utils/qemu/patches/0005-pc-bios-fix-compilation-when-AS-is-actually-gcc-driv.patch
View File

@@ -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

2
utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch
View File

@@ -20,8 +20,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
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 @@

8
utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
View File

@@ -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);

2
utils/quota/patches/020-remove-reallocarray.patch
View File

@@ -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)

15
utils/readsb/patches/001-network-avoid-segfault-in-freeaddrinfo.patch
View File

@@ -12,11 +12,9 @@ Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
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

6
utils/readsb/patches/010-gcc10.patch
View File

@@ -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 @@

10
utils/relayctl/patches/0001-ftdi1.patch
View File

@@ -8,19 +8,13 @@ Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
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

7
utils/rrdtool1/patches/001-no_ordering_cd_joke.patch
View File

@@ -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

4
utils/rrdtool1/patches/002-no_timezone.patch
View File

@@ -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);

6
utils/rrdtool1/patches/020-x86-float-cast.patch
View File

@@ -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"

6
utils/rrdtool1/patches/030-pod2man-stderr.patch
View File

@@ -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:

Some files were not shown because too many files have changed in this diff Show More