cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-24 21:14:40 +01: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

4
libs/apr-util/patches/002-fix-gdbm-error-handling.patch
View File

@@ -1,7 +1,7 @@
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170
# needs to be submitted upstream
--- apr-util.orig/dbm/apr_dbm_gdbm.c
+++ apr-util/dbm/apr_dbm_gdbm.c
--- a/dbm/apr_dbm_gdbm.c
+++ b/dbm/apr_dbm_gdbm.c
@@ -36,13 +36,22 @@
static apr_status_t g2s(int gerr)
{

28
libs/avahi/patches/010-pkgconfig.patch
View File

@@ -24,8 +24,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
avahi-ui.pc.in | 4 ++--
14 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/avahi-client.pc.in b/avahi-client.pc.in
index 65ee8d84..1e1bd249 100644
--- a/avahi-client.pc.in
+++ b/avahi-client.pc.in
@@ -1,6 +1,6 @@
@@ -37,8 +35,6 @@ index 65ee8d84..1e1bd249 100644
includedir=${prefix}/include
Name: avahi-client
diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in
index b3cd02a7..1bb42c6b 100644
--- a/avahi-compat-howl.pc.in
+++ b/avahi-compat-howl.pc.in
@@ -1,6 +1,6 @@
@@ -50,8 +46,6 @@ index b3cd02a7..1bb42c6b 100644
includedir=${prefix}/include/avahi-compat-howl/
Name: avahi-compat-howl
diff --git a/avahi-compat-libdns_sd.pc.in b/avahi-compat-libdns_sd.pc.in
index d6196325..d4778a17 100644
--- a/avahi-compat-libdns_sd.pc.in
+++ b/avahi-compat-libdns_sd.pc.in
@@ -1,6 +1,6 @@
@@ -63,8 +57,6 @@ index d6196325..d4778a17 100644
includedir=${prefix}/include/avahi-compat-libdns_sd/
Name: avahi-compat-libdns_sd
diff --git a/avahi-core.pc.in b/avahi-core.pc.in
index 52491b41..73412d45 100644
--- a/avahi-core.pc.in
+++ b/avahi-core.pc.in
@@ -1,6 +1,6 @@
@@ -76,8 +68,6 @@ index 52491b41..73412d45 100644
includedir=${prefix}/include
Name: avahi-core
diff --git a/avahi-glib.pc.in b/avahi-glib.pc.in
index f163e899..3d0ff9fc 100644
--- a/avahi-glib.pc.in
+++ b/avahi-glib.pc.in
@@ -1,6 +1,6 @@
@@ -89,8 +79,6 @@ index f163e899..3d0ff9fc 100644
includedir=${prefix}/include
Name: avahi-glib
diff --git a/avahi-gobject.pc.in b/avahi-gobject.pc.in
index bf382003..88146744 100644
--- a/avahi-gobject.pc.in
+++ b/avahi-gobject.pc.in
@@ -1,6 +1,6 @@
@@ -102,8 +90,6 @@ index bf382003..88146744 100644
includedir=${prefix}/include
Name: avahi-gobject
diff --git a/avahi-libevent.pc.in b/avahi-libevent.pc.in
index a1dca01b..59b35e8e 100644
--- a/avahi-libevent.pc.in
+++ b/avahi-libevent.pc.in
@@ -1,6 +1,6 @@
@@ -115,8 +101,6 @@ index a1dca01b..59b35e8e 100644
includedir=${prefix}/include
Name: avahi-libevent
diff --git a/avahi-qt3.pc.in b/avahi-qt3.pc.in
index c18f0809..d4fb4b88 100644
--- a/avahi-qt3.pc.in
+++ b/avahi-qt3.pc.in
@@ -1,6 +1,6 @@
@@ -128,8 +112,6 @@ index c18f0809..d4fb4b88 100644
includedir=${prefix}/include
Name: avahi-qt3
diff --git a/avahi-qt4.pc.in b/avahi-qt4.pc.in
index f62f7171..aefc135a 100644
--- a/avahi-qt4.pc.in
+++ b/avahi-qt4.pc.in
@@ -1,6 +1,6 @@
@@ -141,8 +123,6 @@ index f62f7171..aefc135a 100644
includedir=${prefix}/include
Name: avahi-qt4
diff --git a/avahi-qt5.pc.in b/avahi-qt5.pc.in
index 71548baf..fffe192a 100644
--- a/avahi-qt5.pc.in
+++ b/avahi-qt5.pc.in
@@ -1,6 +1,6 @@
@@ -154,8 +134,6 @@ index 71548baf..fffe192a 100644
includedir=${prefix}/include
Name: avahi-qt5
diff --git a/avahi-sharp.pc.in b/avahi-sharp.pc.in
index 3cc78b60..4d4c15df 100644
--- a/avahi-sharp.pc.in
+++ b/avahi-sharp.pc.in
@@ -1,6 +1,6 @@
@@ -166,8 +144,6 @@ index 3cc78b60..4d4c15df 100644
Name: avahi-sharp
Description: Mono bindings for the Avahi mDNS/DNS-SD stack
diff --git a/avahi-ui-gtk3.pc.in b/avahi-ui-gtk3.pc.in
index 27c4322d..56159481 100644
--- a/avahi-ui-gtk3.pc.in
+++ b/avahi-ui-gtk3.pc.in
@@ -1,6 +1,6 @@
@@ -179,8 +155,6 @@ index 27c4322d..56159481 100644
includedir=${prefix}/include
Name: avahi-ui
diff --git a/avahi-ui-sharp.pc.in b/avahi-ui-sharp.pc.in
index cdc35e0d..d448b241 100644
--- a/avahi-ui-sharp.pc.in
+++ b/avahi-ui-sharp.pc.in
@@ -1,6 +1,6 @@
@@ -191,8 +165,6 @@ index cdc35e0d..d448b241 100644
Name: avahi-ui-sharp
Description: Mono bindings for the Avahi mDNS/DNS-SD stack
diff --git a/avahi-ui.pc.in b/avahi-ui.pc.in
index 9edeea96..0dab729a 100644
--- a/avahi-ui.pc.in
+++ b/avahi-ui.pc.in
@@ -1,6 +1,6 @@

10
libs/avahi/patches/100-p2p-no-iff_multicast-required.patch
View File

@@ -6,11 +6,9 @@ Date: Thu Sep 17 00:27:55 2020 +0000
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
index e116c7b..75089c4 100644
--- a/avahi-core/iface-linux.c
+++ b/avahi-core/iface-linux.c
@@ -105,8 +105,8 @@ static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdat
@@ -105,8 +105,8 @@ static void netlink_callback(AvahiNetlin
(ifinfomsg->ifi_flags & IFF_UP) &&
(!m->server->config.use_iff_running || (ifinfomsg->ifi_flags & IFF_RUNNING)) &&
((ifinfomsg->ifi_flags & IFF_LOOPBACK) ||
@@ -21,11 +19,9 @@ index e116c7b..75089c4 100644
/* Handle interface attributes */
l = NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg));
diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index 45fd970..4eafce0 100644
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -81,8 +81,8 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
@@ -81,8 +81,8 @@ static void rtm_info(struct rt_msghdr *r
(ifm->ifm_flags & IFF_UP) &&
(!m->server->config.use_iff_running || (ifm->ifm_flags & IFF_RUNNING)) &&
((ifm->ifm_flags & IFF_LOOPBACK) ||
@@ -36,7 +32,7 @@ index 45fd970..4eafce0 100644
avahi_free(hw->name);
hw->name = avahi_strndup(sdl->sdl_data, sdl->sdl_nlen);
@@ -428,8 +428,8 @@ static void if_add_interface(struct lifreq *lifreq, AvahiInterfaceMonitor *m, in
@@ -428,8 +428,8 @@ static void if_add_interface(struct lifr
(flags & IFF_UP) &&
(!m->server->config.use_iff_running || (flags & IFF_RUNNING)) &&
((flags & IFF_LOOPBACK) ||

11
libs/flac/patches/010-utime.patch
View File

@@ -22,8 +22,6 @@ This fixes flac_utime to work in such a situation.
src/share/grabbag/file.c | 9 +++++++--
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/include/share/compat.h b/include/share/compat.h
index f3041655..a063c083 100644
--- a/include/share/compat.h
+++ b/include/share/compat.h
@@ -112,9 +112,13 @@
@@ -57,11 +55,9 @@ index f3041655..a063c083 100644
#endif
#ifdef _WIN32
diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c
index 352a6c7a..d5255eb9 100644
--- a/src/libFLAC/metadata_iterators.c
+++ b/src/libFLAC/metadata_iterators.c
@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *filename, struct flac_stat_s *stats)
@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *f
void set_file_stats_(const char *filename, struct flac_stat_s *stats)
{
@@ -82,8 +78,6 @@ index 352a6c7a..d5255eb9 100644
(void)flac_chmod(filename, stats->st_mode);
(void)flac_utime(filename, &srctime);
#if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__
diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c
index 2c67bebf..edd835a6 100644
--- a/src/share/grabbag/file.c
+++ b/src/share/grabbag/file.c
@@ -27,7 +27,6 @@
@@ -113,6 +107,3 @@ index 2c67bebf..edd835a6 100644
(void)flac_chmod(destpath, srcstat.st_mode);
(void)flac_utime(destpath, &srctime);
}
--
2.17.1

2
libs/getdns/patches/020-openssl-no-dynamic.patch
View File

@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OPENSSL_ERR_H)
@@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OP
check_include_file(openssl/rand.h HAVE_OPENSSL_RAND_H)
check_include_file(openssl/conf.h HAVE_OPENSSL_CONF_H)
check_include_file(openssl/engine.h HAVE_OPENSSL_ENGINE_H)

6
libs/getdns/patches/getdns-1.6.0-fix-crosscompile.patch
View File

@@ -1,6 +1,6 @@
--- a/CMakeLists.txt 2020-07-01 00:06:07.784792469 +0100
+++ b/CMakeLists.txt 2020-07-01 00:07:09.232511018 +0100
@@ -520,7 +520,7 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -523,7 +523,7 @@ set(STRPTIME_TEST_SOURCE "\n
res = strptime(\"20070207111842\", \"%Y%m%d%H%M%S\", &tm);\n
if (!res) return 1; return 0; }")

4
libs/h2o/patches/100-socket_disable_npn.patch
View File

@@ -1,6 +1,6 @@
--- a/include/h2o/socket.h
+++ b/include/h2o/socket.h
@@ -29,6 +29,7 @@
@@ -29,6 +29,7 @@ extern "C" {
#include <stdint.h>
#include <sys/socket.h>
#include <openssl/ssl.h>
@@ -8,7 +8,7 @@
#include "h2o/cache.h"
#include "h2o/memory.h"
#include "h2o/openssl_backport.h"
@@ -45,7 +44,11 @@
@@ -44,7 +45,11 @@ extern "C" {
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
#define H2O_USE_ALPN 1

8
libs/h2o/patches/200-libh2o-evloop_wslay-link.patch
View File

@@ -15,11 +15,9 @@ Signed-off-by: James Taylor <james@jtaylor.id.au>
CMakeLists.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68613081..13c2f8a9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,13 +519,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES
@@ -386,13 +386,21 @@ SET_TARGET_PROPERTIES(libh2o PROPERTIES
OUTPUT_NAME h2o
VERSION ${LIBRARY_VERSION}
SOVERSION ${LIBRARY_SOVERSION})
@@ -41,5 +39,5 @@ index a68613081..13c2f8a9f 100644
+ TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS})
+ENDIF (WSLAY_FOUND)
TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})
TARGET_INCLUDE_DIRECTORIES(libh2o-evloop PUBLIC ${OPENSSL_INCLUDE_DIR})
IF (OPENSSL_FOUND)
TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})

8
libs/h2o/patches/400-backtrace-detection.patch
View File

@@ -8,8 +8,6 @@ Subject: [PATCH] Autodetect backtrace and backtrace_symbols_fd
src/main.c | 10 ++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abfab1f19..2a26fb98a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,19 @@ __sync_add_and_fetch(&a, 1);
@@ -32,8 +30,6 @@ index abfab1f19..2a26fb98a 100644
SET(WITH_BUNDLED_SSL_DEFAULT "ON")
IF ((NOT UNIX) OR CYGWIN)
SET(WITH_BUNDLED_SSL_DEFAULT "OFF")
diff --git a/src/main.c b/src/main.c
index 7c346af18..edc7d5eb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,7 +48,7 @@
@@ -45,7 +41,7 @@ index 7c346af18..edc7d5eb3 100644
#include <execinfo.h>
#endif
#if H2O_USE_PICOTLS
@@ -1435,7 +1435,8 @@ static void on_sigterm(int signo)
@@ -1436,7 +1436,8 @@ static void on_sigterm(int signo)
notify_all_threads();
}
@@ -55,7 +51,7 @@ index 7c346af18..edc7d5eb3 100644
static int popen_crash_handler(void)
{
char *cmd_fullpath = h2o_configurator_get_cmd_path(conf.crash_handler), *argv[] = {cmd_fullpath, NULL};
@@ -1487,13 +1488,14 @@ static void on_sigfatal(int signo)
@@ -1488,13 +1489,14 @@ static void on_sigfatal(int signo)
raise(signo);
}

12
libs/h2o/patches/500-openssl.patch
View File

@@ -18,7 +18,7 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/x509_vfy.h>
@@ -941,7 +942,7 @@ int ptls_openssl_encrypt_ticket(ptls_buffer_t *buf, ptls_iovec_t src,
@@ -941,7 +942,7 @@ int ptls_openssl_encrypt_ticket(ptls_buf
Exit:
if (cctx != NULL)
@@ -27,7 +27,7 @@
if (hctx != NULL)
HMAC_CTX_free(hctx);
return ret;
@@ -1011,7 +1012,7 @@ int ptls_openssl_decrypt_ticket(ptls_buffer_t *buf, ptls_iovec_t src,
@@ -1011,7 +1012,7 @@ int ptls_openssl_decrypt_ticket(ptls_buf
Exit:
if (cctx != NULL)
@@ -46,7 +46,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
@@ -1825,7 +1826,7 @@ static h2o_iovec_t on_extra_status(void *unused, h2o_globalconf_t *_conf, h2o_re
@@ -1827,7 +1828,7 @@ static h2o_iovec_t on_extra_status(void
" \"listeners\": %zu,\n"
" \"worker-threads\": %zu,\n"
" \"num-sessions\": %lu",
@@ -55,7 +55,7 @@
num_connections(0), conf.max_connections, conf.num_listeners, conf.num_threads, num_sessions(0));
assert(ret.len < BUFSIZE);
@@ -2006,7 +2007,7 @@ int main(int argc, char **argv)
@@ -2008,7 +2009,7 @@ int main(int argc, char **argv)
break;
case 'v':
printf("h2o version " H2O_VERSION "\n");
@@ -66,7 +66,7 @@
"mruby: YES\n"); /* TODO determine the way to obtain the version of mruby (that is being linked dynamically) */
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -911,6 +911,7 @@ void ssl_setup_session_resumption(SSL_CTX **contexts, size_t num_contexts)
@@ -911,6 +911,7 @@ void ssl_setup_session_resumption(SSL_CT
#endif
}
@@ -74,7 +74,7 @@
static pthread_mutex_t *mutexes;
static void lock_callback(int mode, int n, const char *file, int line)
@@ -937,9 +938,11 @@ static int add_lock_callback(int *num, int amount, int type, const char *file, i
@@ -937,9 +938,11 @@ static int add_lock_callback(int *num, i
return __sync_add_and_fetch(num, amount);
}

4
libs/h2o/patches/600-engine.patch
View File

@@ -1,6 +1,6 @@
--- a/deps/neverbleed/neverbleed.c
+++ b/deps/neverbleed/neverbleed.c
@@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
@@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, ch
close(pipe_fds[0]);
pipe_fds[0] = -1;
@@ -8,7 +8,7 @@
/* setup engine */
if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
!ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
@@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
@@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, ch
goto Fail;
}
ENGINE_add(nb->engine);

2
libs/ibrcommon/patches/001-fix-build-with-musl.patch
View File

@@ -1,5 +1,3 @@
diff --git a/ibrcommon/data/File.cpp b/ibrcommon/data/File.cpp
index 31af4ae..9b49890 100644
--- a/ibrcommon/data/File.cpp
+++ b/ibrcommon/data/File.cpp
@@ -35,9 +35,7 @@

22
libs/ibrcommon/patches/010-build-with-openssl-1.1.patch
View File

@@ -16,8 +16,6 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
6 files changed, 95 insertions(+), 30 deletions(-)
create mode 100644 ibrcommon/ssl/openssl_compat.h
diff --git a/ibrcommon/ssl/HMacStream.cpp b/ibrcommon/ssl/HMacStream.cpp
index e5d317e3..66d8ce42 100644
--- a/ibrcommon/ssl/HMacStream.cpp
+++ b/ibrcommon/ssl/HMacStream.cpp
@@ -20,29 +20,30 @@
@@ -56,8 +54,6 @@ index e5d317e3..66d8ce42 100644
+ HMAC_Final(ctx_, (unsigned char*)hash, &size);
}
}
diff --git a/ibrcommon/ssl/HMacStream.h b/ibrcommon/ssl/HMacStream.h
index 7dcea168..d04bceb8 100644
--- a/ibrcommon/ssl/HMacStream.h
+++ b/ibrcommon/ssl/HMacStream.h
@@ -44,7 +44,7 @@ namespace ibrcommon
@@ -69,8 +65,6 @@ index 7dcea168..d04bceb8 100644
};
}
diff --git a/ibrcommon/ssl/RSASHA256Stream.cpp b/ibrcommon/ssl/RSASHA256Stream.cpp
index d94430ed..d25c5d2f 100644
--- a/ibrcommon/ssl/RSASHA256Stream.cpp
+++ b/ibrcommon/ssl/RSASHA256Stream.cpp
@@ -21,6 +21,7 @@
@@ -174,8 +168,6 @@ index d94430ed..d25c5d2f 100644
{
IBRCOMMON_LOGGER_TAG("RSASHA256Stream", critical) << "failed to feed data into the verification function" << IBRCOMMON_LOGGER_ENDL;
ERR_print_errors_fp(stderr);
diff --git a/ibrcommon/ssl/RSASHA256Stream.h b/ibrcommon/ssl/RSASHA256Stream.h
index 344f8e10..6f3a1168 100644
--- a/ibrcommon/ssl/RSASHA256Stream.h
+++ b/ibrcommon/ssl/RSASHA256Stream.h
@@ -106,7 +106,7 @@ namespace ibrcommon
@@ -187,8 +179,6 @@ index 344f8e10..6f3a1168 100644
/** tells if the context needs to be finalized to get a valid signature or
verification */
diff --git a/ibrcommon/ssl/iostreamBIO.cpp b/ibrcommon/ssl/iostreamBIO.cpp
index 18c1b55c..ea6c63eb 100644
--- a/ibrcommon/ssl/iostreamBIO.cpp
+++ b/ibrcommon/ssl/iostreamBIO.cpp
@@ -23,6 +23,7 @@
@@ -240,7 +230,7 @@ index 18c1b55c..ea6c63eb 100644
if(!_bio){
/* creation failed, throw exception */
char err_buf[ERR_BUF_SIZE];
@@ -72,7 +91,7 @@ iostreamBIO::iostreamBIO(iostream *stream)
@@ -72,7 +91,7 @@ iostreamBIO::iostreamBIO(iostream *strea
}
/* save the iostream in the bio object */
@@ -281,7 +271,7 @@ index 18c1b55c..ea6c63eb 100644
IBRCOMMON_LOGGER_DEBUG_TAG("iostreamBIO", 90) << "ctrl called, cmd: " << cmd << ", num: " << num << "." << IBRCOMMON_LOGGER_ENDL;
@@ -147,8 +167,12 @@ static long ctrl(BIO *bio, int cmd, long num, void *)
@@ -147,8 +167,12 @@ static long ctrl(BIO *bio, int cmd, long
static int bread(BIO *bio, char *buf, int len)
{
@@ -295,7 +285,7 @@ index 18c1b55c..ea6c63eb 100644
try{
/* make sure to read at least 1 byte and then read as much as we can */
@@ -170,7 +194,7 @@ static int bwrite(BIO *bio, const char *buf, int len)
@@ -170,7 +194,7 @@ static int bwrite(BIO *bio, const char *
if(len == 0){
return 0;
}
@@ -304,9 +294,6 @@ index 18c1b55c..ea6c63eb 100644
/* write the data */
try{
diff --git a/ibrcommon/ssl/openssl_compat.h b/ibrcommon/ssl/openssl_compat.h
new file mode 100644
index 00000000..e491677f
--- /dev/null
+++ b/ibrcommon/ssl/openssl_compat.h
@@ -0,0 +1,38 @@
@@ -348,6 +335,3 @@ index 00000000..e491677f
+
+#endif /* OPENSSL_COMPAT_H */
+
--
2.16.1

2
libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch
View File

@@ -9,8 +9,6 @@ the algorithm implemenetations.
ibrdtn/data/Bundle.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ibrdtn/data/Bundle.h b/ibrdtn/data/Bundle.h
index 036a2a6fb..9bbc066d7 100644
--- a/ibrdtn/data/Bundle.h
+++ b/ibrdtn/data/Bundle.h
@@ -69,6 +69,9 @@ namespace dtn

2
libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch
View File

@@ -7,8 +7,6 @@ Subject: [PATCH] Use const iterator in const function of MemoryBundleSet
ibrdtn/data/MemoryBundleSet.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ibrdtn/data/MemoryBundleSet.cpp b/ibrdtn/data/MemoryBundleSet.cpp
index 987342e6d..b67fdd393 100644
--- a/ibrdtn/data/MemoryBundleSet.cpp
+++ b/ibrdtn/data/MemoryBundleSet.cpp
@@ -134,7 +134,7 @@ namespace dtn

4
libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch
View File

@@ -8,8 +8,6 @@ Subject: [PATCH] Use std::streamoff instead of std::streampos
ibrdtn/data/Dictionary.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ibrdtn/data/BundleMerger.cpp b/ibrdtn/data/BundleMerger.cpp
index 1cd20c522..b71a0849b 100644
--- a/ibrdtn/data/BundleMerger.cpp
+++ b/ibrdtn/data/BundleMerger.cpp
@@ -119,7 +119,7 @@ namespace dtn
@@ -21,8 +19,6 @@ index 1cd20c522..b71a0849b 100644
const dtn::data::PayloadBlock &p = obj.find<dtn::data::PayloadBlock>();
const Length plength = p.getLength();
diff --git a/ibrdtn/data/Dictionary.cpp b/ibrdtn/data/Dictionary.cpp
index 6299e66f3..208f90488 100644
--- a/ibrdtn/data/Dictionary.cpp
+++ b/ibrdtn/data/Dictionary.cpp
@@ -154,11 +154,11 @@ namespace dtn

4
libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch
View File

@@ -11,8 +11,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
ibrdtn/data/Bundle.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/ibrdtn/data/Bundle.cpp b/ibrdtn/data/Bundle.cpp
index f515860..943544e 100644
--- a/ibrdtn/data/Bundle.cpp
+++ b/ibrdtn/data/Bundle.cpp
@@ -71,11 +71,21 @@ namespace dtn
@@ -37,8 +35,6 @@ index f515860..943544e 100644
bool Bundle::operator!=(const Bundle& other) const
{
return (const PrimaryBlock&)(*this) != (const PrimaryBlock&)other;
diff --git a/ibrdtn/data/Bundle.h b/ibrdtn/data/Bundle.h
index 9bbc066..6a4ea47 100644
--- a/ibrdtn/data/Bundle.h
+++ b/ibrdtn/data/Bundle.h
@@ -97,7 +97,9 @@ namespace dtn

66
libs/ipfs-http-client/patches/001-add-srv-addr.patch
View File

@@ -1,6 +1,6 @@
--- a/test/block.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/block.cc 2019-11-22 18:16:58.245249328 +0300
@@ -24,9 +24,16 @@
--- a/test/block.cc
+++ b/test/block.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <sstream>
#include <stdexcept>
@@ -19,9 +19,9 @@
/** [ipfs::Client::BlockPut] */
ipfs::Json block;
--- a/test/config.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/config.cc 2019-11-22 18:16:58.245249328 +0300
@@ -23,9 +23,16 @@
--- a/test/config.cc
+++ b/test/config.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <iostream>
#include <stdexcept>
@@ -40,9 +40,9 @@
/** [ipfs::Client::ConfigSet] */
client.ConfigSet("Datastore.StorageMax", "20GB");
--- a/test/dht.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/dht.cc 2019-11-22 18:16:58.245249328 +0300
@@ -23,9 +23,16 @@
--- a/test/dht.cc
+++ b/test/dht.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <iostream>
#include <stdexcept>
@@ -61,9 +61,9 @@
ipfs::Json add_result;
client.FilesAdd(
--- a/test/error.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/error.cc 2019-11-22 18:16:58.245249328 +0300
@@ -35,16 +35,23 @@
--- a/test/error.cc
+++ b/test/error.cc
@@ -35,16 +35,23 @@ extern std::string replace_body;
}
} // namespace ipfs
@@ -90,9 +90,9 @@
std::string object_id;
client.ObjectNew(&object_id);
--- a/test/files.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/files.cc 2019-11-22 18:16:58.245249328 +0300
@@ -24,9 +24,16 @@
--- a/test/files.cc
+++ b/test/files.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <sstream>
#include <stdexcept>
@@ -111,9 +111,9 @@
/** [ipfs::Client::FilesGet] */
std::stringstream contents;
--- a/test/generic.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/generic.cc 2019-11-22 18:16:58.245249328 +0300
@@ -24,16 +24,23 @@
--- a/test/generic.cc
+++ b/test/generic.cc
@@ -24,16 +24,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <utility>
@@ -140,9 +140,9 @@
clientC = std::move(clientB);
#pragma GCC diagnostic push
--- a/test/key.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/key.cc 2019-11-22 18:16:58.245249328 +0300
@@ -26,9 +26,16 @@
--- a/test/key.cc
+++ b/test/key.cc
@@ -26,9 +26,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
using Json = nlohmann::json;
@@ -161,9 +161,9 @@
/** [ipfs::Client::KeyGen] */
std::string key_id;
--- a/test/name.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/name.cc 2019-11-22 18:16:58.245249328 +0300
@@ -24,9 +24,16 @@
--- a/test/name.cc
+++ b/test/name.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <sstream>
#include <stdexcept>
@@ -182,9 +182,9 @@
// We need a key here, so as not to clobber the "self" key.
std::string key_id;
--- a/test/object.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/object.cc 2019-11-22 18:16:58.245249328 +0300
@@ -24,9 +24,16 @@
--- a/test/object.cc
+++ b/test/object.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <string>
@@ -203,9 +203,9 @@
/** [ipfs::Client::ObjectNew] */
std::string object_id;
--- a/test/pin.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/pin.cc 2019-11-23 23:09:57.507400418 +0300
@@ -23,9 +23,16 @@
--- a/test/pin.cc
+++ b/test/pin.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <string>
@@ -224,9 +224,9 @@
std::string object_id;
--- a/test/swarm.cc 2019-11-22 18:16:53.973272202 +0300
+++ b/test/swarm.cc 2019-11-23 23:10:07.199342933 +0300
@@ -23,9 +23,16 @@
--- a/test/swarm.cc
+++ b/test/swarm.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <string>

2
libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch
View File

@@ -7,8 +7,6 @@ Subject: [PATCH] Fix minor FILE* leak
cmd/jwe/pwd.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmd/jwe/pwd.h b/cmd/jwe/pwd.h
index 0b5be54..2f021eb 100644
--- a/cmd/jwe/pwd.h
+++ b/cmd/jwe/pwd.h
@@ -57,8 +57,10 @@ jwe_getpass(const char *prompt)

2
libs/jose/patches/020-openssl-deprecated.patch
View File

@@ -10,7 +10,7 @@
#include <openssl/ecdsa.h>
--- a/lib/openssl/misc.c
+++ b/lib/openssl/misc.c
@@ -185,6 +185,8 @@ add_entity(json_t *root, json_t *obj, const char *plural, ...)
@@ -185,6 +185,8 @@ add_entity(json_t *root, json_t *obj, co
static void __attribute__((constructor))
constructor(void)
{

2
libs/ldns/patches/001-compile-for-darwin.patch
View File

@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([--with-xcode-sdk],
@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([-
[],[with_xcode_sdk="yes"])
if test "x_$with_xcode_sdk" != "x_no" ; then
# check OSX deployment target, if needed

8
libs/ldns/patches/010-openssl-deprecated.patch
View File

@@ -9,11 +9,9 @@ Subject: [PATCH] Fix compilation without deprecated APIs
keys.c | 1 +
3 files changed, 5 insertions(+)
diff --git a/dnssec_verify.c b/dnssec_verify.c
index d22962eb..99a7515d 100644
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE *out,
@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE
if (tree->parent_status[i]
== LDNS_STATUS_SSL_ERR) {
printf("; SSL Error: ");
@@ -23,8 +21,6 @@ index d22962eb..99a7515d 100644
ERR_print_errors_fp(stdout);
printf("\n");
}
diff --git a/drill/drill.c b/drill/drill.c
index 6efd29a5..186bdff2 100644
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -994,10 +994,12 @@ main(int argc, char *argv[])
@@ -40,8 +36,6 @@ index 6efd29a5..186bdff2 100644
#ifdef USE_WINSOCK
WSACleanup();
#endif
diff --git a/keys.c b/keys.c
index 016f9731..06afb739 100644
--- a/keys.c
+++ b/keys.c
@@ -15,6 +15,7 @@

49
libs/ldns/patches/020-openssl-dsa.patch
View File

@@ -16,11 +16,9 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
rr_functions.c | 4 ++++
9 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/dnssec.c b/dnssec.c
index 482cefd6..71508600 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -332,6 +332,7 @@ uint16_t ldns_calc_keytag_raw(const uint8_t* key, size_t keysize)
@@ -332,6 +332,7 @@ uint16_t ldns_calc_keytag_raw(const uint
}
#ifdef HAVE_SSL
@@ -28,7 +26,7 @@ index 482cefd6..71508600 100644
DSA *
ldns_key_buf2dsa(const ldns_buffer *key)
{
@@ -407,6 +408,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t len)
@@ -407,6 +408,7 @@ ldns_key_buf2dsa_raw(const unsigned char
#endif /* OPENSSL_VERSION_NUMBER */
return dsa;
}
@@ -36,8 +34,6 @@ index 482cefd6..71508600 100644
RSA *
ldns_key_buf2rsa(const ldns_buffer *key)
diff --git a/examples/ldns-dane.c b/examples/ldns-dane.c
index 4c31fd8f..7b33ad18 100644
--- a/examples/ldns-dane.c
+++ b/examples/ldns-dane.c
@@ -1680,9 +1680,11 @@ main(int argc, char* const* argv)
@@ -52,8 +48,6 @@ index 4c31fd8f..7b33ad18 100644
/* ssl load validation store */
if (! assume_pkix_validity || CAfile || CApath) {
diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c
index 62b8d228..237016e5 100644
--- a/examples/ldns-keygen.c
+++ b/examples/ldns-keygen.c
@@ -148,6 +148,7 @@ main(int argc, char *argv[])
@@ -72,8 +66,6 @@ index 62b8d228..237016e5 100644
#ifdef USE_GOST
case LDNS_SIGN_ECC_GOST:
if(!ldns_key_EVP_load_gost_id()) {
diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 7d24ad90..abae352a 100644
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -72,10 +72,14 @@ usage(FILE *fp, const char *prog) {
@@ -107,7 +99,7 @@ index 7d24ad90..abae352a 100644
__MATCH ( ECC_GOST );
__MATCH ( ECDSAP256SHA256 );
__MATCH ( ECDSAP384SHA384 );
@@ -419,8 +427,10 @@ load_key ( const char * const p, ENGINE * const e )
@@ -419,8 +427,10 @@ load_key ( const char * const p, ENGINE
case LDNS_SIGN_RSASHA1_NSEC3:
case LDNS_SIGN_RSASHA256:
case LDNS_SIGN_RSASHA512:
@@ -132,21 +124,20 @@ index 7d24ad90..abae352a 100644
}
#endif
exit(EXIT_FAILURE);
@@ -1018,7 +1032,9 @@ main(int argc, char *argv[])
@@ -1018,8 +1032,10 @@ main(int argc, char *argv[])
#ifndef OPENSSL_NO_ENGINE
shutdown_openssl ( engine );
#else
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
CRYPTO_cleanup_all_ex_data();
+#endif
#endif
+#endif
free(prog);
diff --git a/examples/ldns-verify-zone.c b/examples/ldns-verify-zone.c
index c17bd21c..a5a1d003 100644
exit(EXIT_SUCCESS);
--- a/examples/ldns-verify-zone.c
+++ b/examples/ldns-verify-zone.c
@@ -113,7 +113,9 @@ print_rr_status_error(FILE* stream, ldns_rr* rr, ldns_status status)
@@ -113,7 +113,9 @@ print_rr_status_error(FILE* stream, ldns
if (status != LDNS_STATUS_OK) {
print_rr_error(stream, rr, ldns_get_errorstr_by_id(status));
if (verbosity > 0 && status == LDNS_STATUS_SSL_ERR) {
@@ -156,8 +147,6 @@ index c17bd21c..a5a1d003 100644
ERR_print_errors_fp(stream);
}
}
diff --git a/host2str.c b/host2str.c
index 3ca23c20..29a5f5c9 100644
--- a/host2str.c
+++ b/host2str.c
@@ -49,10 +49,14 @@
@@ -175,7 +164,7 @@ index 3ca23c20..29a5f5c9 100644
{ LDNS_RSASHA1_NSEC3, "RSASHA1-NSEC3-SHA1" },
#ifdef USE_SHA2
{ LDNS_RSASHA256, "RSASHA256"},
@@ -2133,7 +2137,9 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
@@ -2133,7 +2137,9 @@ ldns_key2buffer_str(ldns_buffer *output,
unsigned char *bignum;
#ifdef HAVE_SSL
RSA *rsa;
@@ -185,7 +174,7 @@ index 3ca23c20..29a5f5c9 100644
#endif /* HAVE_SSL */
if (!k) {
@@ -2243,6 +2249,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
@@ -2243,6 +2249,7 @@ ldns_key2buffer_str(ldns_buffer *output,
RSA_free(rsa);
break;
@@ -193,7 +182,7 @@ index 3ca23c20..29a5f5c9 100644
case LDNS_SIGN_DSA:
case LDNS_SIGN_DSA_NSEC3:
dsa = ldns_key_dsa_key(k);
@@ -2283,6 +2290,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
@@ -2283,6 +2290,7 @@ ldns_key2buffer_str(ldns_buffer *output,
goto error;
}
break;
@@ -201,11 +190,9 @@ index 3ca23c20..29a5f5c9 100644
case LDNS_SIGN_ECC_GOST:
/* no format defined, use blob */
#if defined(HAVE_SSL) && defined(USE_GOST)
diff --git a/keys.c b/keys.c
index 06afb739..ddff6f35 100644
--- a/keys.c
+++ b/keys.c
@@ -905,6 +905,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr)
@@ -905,6 +905,7 @@ error:
return NULL;
}
@@ -213,7 +200,7 @@ index 06afb739..ddff6f35 100644
DSA *
ldns_key_new_frm_fp_dsa(FILE *f)
{
@@ -1015,6 +1016,7 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr))
@@ -1015,6 +1016,7 @@ error:
BN_free(pub_key);
return NULL;
}
@@ -221,7 +208,7 @@ index 06afb739..ddff6f35 100644
unsigned char *
ldns_key_new_frm_fp_hmac(FILE *f, size_t *hmac_size)
@@ -1149,9 +1151,9 @@ ldns_key_new_frm_algorithm(ldns_signing_algorithm alg, uint16_t size)
@@ -1149,9 +1151,9 @@ ldns_key_new_frm_algorithm(ldns_signing_
#endif /* HAVE_EVP_PKEY_KEYGEN */
#endif /* HAVE_SSL */
break;
@@ -256,7 +243,7 @@ index 06afb739..ddff6f35 100644
#ifdef HAVE_SSL
dsa = ldns_key_dsa_key(k);
if (dsa) {
@@ -2165,7 +2167,9 @@ ldns_signing_algorithm ldns_get_signing_algorithm_by_name(const char* name)
@@ -2165,7 +2167,9 @@ ldns_signing_algorithm ldns_get_signing_
ldns_lookup_table aliases[] = {
/* from bind dnssec-keygen */
{LDNS_SIGN_HMACMD5, "HMAC-MD5"},
@@ -266,8 +253,6 @@ index 06afb739..ddff6f35 100644
{LDNS_SIGN_RSASHA1_NSEC3, "NSEC3RSASHA1"},
/* old ldns usage, now RFC names */
#ifdef USE_DSA
diff --git a/ldns/keys.h b/ldns/keys.h
index df4bb22b..826f876f 100644
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -45,10 +45,14 @@ enum ldns_enum_algorithm
@@ -301,11 +286,9 @@ index df4bb22b..826f876f 100644
LDNS_SIGN_ECC_GOST = LDNS_ECC_GOST,
LDNS_SIGN_ECDSAP256SHA256 = LDNS_ECDSAP256SHA256,
LDNS_SIGN_ECDSAP384SHA384 = LDNS_ECDSAP384SHA384,
diff --git a/rr_functions.c b/rr_functions.c
index 20a0bfaa..8d72696b 100644
--- a/rr_functions.c
+++ b/rr_functions.c
@@ -269,14 +269,17 @@ ldns_rr_dnskey_key_size_raw(const unsigned char* keydata,
@@ -269,14 +269,17 @@ ldns_rr_dnskey_key_size_raw(const unsign
const size_t len,
const ldns_algorithm alg)
{
@@ -323,7 +306,7 @@ index 20a0bfaa..8d72696b 100644
case LDNS_SIGN_DSA:
case LDNS_SIGN_DSA_NSEC3:
if (len > 0) {
@@ -286,6 +289,7 @@ ldns_rr_dnskey_key_size_raw(const unsigned char* keydata,
@@ -286,6 +289,7 @@ ldns_rr_dnskey_key_size_raw(const unsign
return 0;
}
break;

2
libs/ldns/patches/030-signzone.patch
View File

@@ -1,6 +1,6 @@
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const id )
@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const
static void
shutdown_openssl ( ENGINE * const e )
{

3
libs/libaio/patches/004_arches_x32.patch
View File

@@ -13,7 +13,7 @@ Last-Update: 2013-05-06
--- a/src/syscall-x86_64.h
+++ b/src/syscall-x86_64.h
@@ -1,5 +1,15 @@
@@ -1,6 +1,16 @@
+#ifndef __NR_io_setup
#define __NR_io_setup 206
+#endif
@@ -29,6 +29,7 @@ Last-Update: 2013-05-06
+#ifndef __NR_io_cancel
#define __NR_io_cancel 210
+#endif
#define __NR_io_pgetevents 333
--- a/harness/main.c
+++ b/harness/main.c
@@ -14,7 +14,7 @@

4
libs/libcap/patches/300-disable-tests.patch
View File

@@ -1,8 +1,8 @@
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ endif
ifeq ($(GOLANG),yes)
@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
$(MAKE) -C go $@
rm -f cap/go.sum
endif
- $(MAKE) -C tests $@
$(MAKE) -C progs $@

12
libs/libcgroup/patches/010-cdefs.patch
View File

@@ -70,7 +70,7 @@
/**
* Flags for cgroup_delete_cgroup_ext().
@@ -577,6 +578,8 @@ char *cgroup_get_cgroup_name(struct cgroup *cgroup);
@@ -577,6 +578,8 @@ char *cgroup_get_cgroup_name(struct cgro
*/
@@ -97,7 +97,7 @@
/**
* @defgroup group_init 1. Initialization
* @{
@@ -58,6 +56,8 @@ int cgroup_get_subsys_mount_point(const char *controller, char **mount_point);
@@ -58,6 +56,8 @@ int cgroup_get_subsys_mount_point(const
* @}
* @}
*/
@@ -123,7 +123,7 @@
/**
* @defgroup group_iterators 3. Iterators
@@ -423,6 +424,8 @@ int cgroup_get_subsys_mount_point_end(void **handle);
@@ -423,6 +424,8 @@ int cgroup_get_subsys_mount_point_end(vo
* @}
*/
@@ -152,7 +152,7 @@
/**
* @defgroup group_log 7. Logging
@@ -142,6 +140,8 @@ extern int cgroup_parse_log_level_str(const char *levelstr);
@@ -142,6 +140,8 @@ extern int cgroup_parse_log_level_str(co
* @}
* @}
*/
@@ -179,7 +179,7 @@
/** Flags for cgroup_change_cgroup_uid_gid(). */
enum cgflags {
@@ -204,6 +205,8 @@ int cgroup_register_unchanged_process(pid_t pid, int flags);
@@ -204,6 +205,8 @@ int cgroup_register_unchanged_process(pi
* @}
* @}
*/
@@ -228,7 +228,7 @@
#include "config.h"
#include <fts.h>
@@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_end(void **handle);
@@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_e
*/
int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask);

7
libs/libdaemon/patches/001-daemon_set_verbosity.patch
View File

@@ -12,11 +12,9 @@ Signed-off-by: Michael Heimpold <mhei@heimpold.de>
libdaemon/dlog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libdaemon/dlog.c b/libdaemon/dlog.c
index 1cc0566..cc2b918 100644
--- a/libdaemon/dlog.c
+++ b/libdaemon/dlog.c
@@ -42,7 +42,7 @@ static int daemon_verbosity_level = LOG_INFO;
@@ -37,7 +37,7 @@ static int daemon_verbosity_level = LOG_
void daemon_set_verbosity(int verbosity_prio) {
/* Allow using negative verbosity levels to hide _all_ messages */
@@ -25,6 +23,3 @@ index 1cc0566..cc2b918 100644
daemon_log(LOG_ERR, "The value %d is not a valid priority value", verbosity_prio);
daemon_verbosity_level = verbosity_prio & LOG_PRIMASK;
--
1.7.10.4

7
libs/libdaq/patches/001-compile.patch
View File

@@ -1,7 +1,6 @@
diff -u --recursive daq-2.2.2-vanilla/configure daq-2.2.2/configure
--- daq-2.2.2-vanilla/configure 2017-07-05 15:58:03.000000000 -0400
+++ daq-2.2.2/configure 2018-09-01 17:18:56.774898034 -0400
@@ -13244,10 +13244,11 @@
--- a/configure
+++ b/configure
@@ -13244,10 +13244,11 @@ if ${daq_cv_libpcap_version_1x+:} false;
else
if test "$cross_compiling" = yes; then :

15
libs/libdaq/patches/100-musl-compat.patch
View File

@@ -1,6 +1,5 @@
diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c daq-2.2.2/os-daq-modules/daq_ipfw.c
--- daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c 2017-02-08 17:04:18.000000000 -0500
+++ daq-2.2.2/os-daq-modules/daq_ipfw.c 2018-09-01 17:21:10.608181841 -0400
--- a/os-daq-modules/daq_ipfw.c
+++ b/os-daq-modules/daq_ipfw.c
@@ -23,10 +23,10 @@
#include <stdlib.h>
#include <string.h>
@@ -13,9 +12,8 @@ diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c daq-2.2.2/os-daq
#include <netinet/in.h>
#include <sys/socket.h>
diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c daq-2.2.2/os-daq-modules/daq_ipq.c
--- daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c 2017-02-08 17:04:18.000000000 -0500
+++ daq-2.2.2/os-daq-modules/daq_ipq.c 2018-09-01 17:21:23.162208457 -0400
--- a/os-daq-modules/daq_ipq.c
+++ b/os-daq-modules/daq_ipq.c
@@ -24,10 +24,10 @@
#include <stdio.h>
#include <stdlib.h>
@@ -28,9 +26,8 @@ diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c daq-2.2.2/os-daq-
#include <netinet/ip.h>
diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_nfq.c daq-2.2.2/os-daq-modules/daq_nfq.c
--- daq-2.2.2-vanilla/os-daq-modules/daq_nfq.c 2017-02-08 17:04:18.000000000 -0500
+++ daq-2.2.2/os-daq-modules/daq_nfq.c 2018-09-01 17:21:35.202233988 -0400
--- a/os-daq-modules/daq_nfq.c
+++ b/os-daq-modules/daq_nfq.c
@@ -24,10 +24,10 @@
#include <stdio.h>
#include <stdlib.h>

80
libs/libdbi-drivers/patches/100-remove-date-to-fix-reproducible-builds.patch
View File

@@ -1,8 +1,6 @@
Index: libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/db2/dbd_db2.c 2013-01-09 22:30:19.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c 2017-12-02 00:28:50.354329791 +0100
@@ -57,8 +57,7 @@
--- a/drivers/db2/dbd_db2.c
+++ b/drivers/db2/dbd_db2.c
@@ -57,8 +57,7 @@ static const dbi_info_t driver_info = {
"IBM DB2 database support (using DB2 Call Level Interface)",
"João Henrique F. Freitas <joaohf@users.sourceforge.net>",
"http://libdbi-drivers.sourceforge.net",
@@ -12,11 +10,9 @@ Index: libdbi-drivers-0.9.0/drivers/db2/dbd_db2.c
};
static const char *custom_functions[] = {NULL}; // TODO
Index: libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/firebird/dbd_firebird.c 2013-01-09 22:20:07.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c 2017-12-02 00:28:47.418270022 +0100
@@ -67,8 +67,7 @@
--- a/drivers/firebird/dbd_firebird.c
+++ b/drivers/firebird/dbd_firebird.c
@@ -67,8 +67,7 @@ static const dbi_info_t driver_info = {
"Firebird/Interbase database support",
"Christian M. Stamgren <cms@cention.se>",
"http://libdbi-drivers.sourceforge.net",
@@ -26,11 +22,9 @@ Index: libdbi-drivers-0.9.0/drivers/firebird/dbd_firebird.c
};
Index: libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/freetds/dbd_freetds.c 2013-01-09 22:21:11.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c 2017-12-02 00:29:05.482637950 +0100
@@ -63,8 +63,7 @@
--- a/drivers/freetds/dbd_freetds.c
+++ b/drivers/freetds/dbd_freetds.c
@@ -63,8 +63,7 @@ static const dbi_info_t driver_info = {
"MS SQL and Sybase databases support (using libct)",
"Vadym Kononenko <konan_v@users.sourceforge.net>",
"http://libdbi.sourceforge.net",
@@ -40,11 +34,9 @@ Index: libdbi-drivers-0.9.0/drivers/freetds/dbd_freetds.c
};
static const char APP_NAME[] = "libdbi-freetds-driver";
Index: libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/ingres/dbd_ingres.c 2013-01-09 22:30:19.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c 2017-12-02 00:29:02.370574535 +0100
@@ -44,8 +44,7 @@
--- a/drivers/ingres/dbd_ingres.c
+++ b/drivers/ingres/dbd_ingres.c
@@ -44,8 +44,7 @@ static const dbi_info_t driver_info = {
"Ingres database support",
"Toby Thain <qu1j0t3@sourceforge.net>",
"http://libdbi-drivers.sourceforge.net",
@@ -54,11 +46,9 @@ Index: libdbi-drivers-0.9.0/drivers/ingres/dbd_ingres.c
};
static const char *custom_functions[] = {NULL};
Index: libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/msql/dbd_msql.c 2013-01-09 22:26:20.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c 2017-12-02 00:29:09.034710349 +0100
@@ -57,8 +57,7 @@
--- a/drivers/msql/dbd_msql.c
+++ b/drivers/msql/dbd_msql.c
@@ -57,8 +57,7 @@ static const dbi_info_t driver_info = {
"Mini SQL (mSQL) database support",
"Christian M. Stamgren <christian@centiongroup.com>",
"libdbi-drivers.sourceforge.net",
@@ -68,11 +58,9 @@ Index: libdbi-drivers-0.9.0/drivers/msql/dbd_msql.c
};
static const char *custom_functions[] = {NULL};
Index: libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/mysql/dbd_mysql.c 2013-02-28 00:16:20.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c 2017-12-02 00:28:42.438168678 +0100
@@ -59,8 +59,7 @@
--- a/drivers/mysql/dbd_mysql.c
+++ b/drivers/mysql/dbd_mysql.c
@@ -59,8 +59,7 @@ static const dbi_info_t driver_info = {
"MySQL database support (using libmysqlclient)",
"Mark M. Tobenkin <mark@brentwoodradio.com>",
"http://libdbi-drivers.sourceforge.net",
@@ -82,11 +70,9 @@ Index: libdbi-drivers-0.9.0/drivers/mysql/dbd_mysql.c
};
static const char *custom_functions[] = MYSQL_CUSTOM_FUNCTIONS;
Index: libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/oracle/dbd_oracle.c 2013-01-09 22:27:16.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c 2017-12-02 00:28:55.958443910 +0100
@@ -54,8 +54,7 @@
--- a/drivers/oracle/dbd_oracle.c
+++ b/drivers/oracle/dbd_oracle.c
@@ -54,8 +54,7 @@ static const dbi_info_t driver_info = {
"Oracle database support (using Oracle Call Interface)",
"Ashish Ranjan <ashishwave@yahoo.com>",
"http://libdbi-drivers.sourceforge.net",
@@ -96,11 +82,9 @@ Index: libdbi-drivers-0.9.0/drivers/oracle/dbd_oracle.c
};
static const char *custom_functions[] = {NULL};
Index: libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/pgsql/dbd_pgsql.c 2017-12-02 00:28:08.737484155 +0100
+++ libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c 2017-12-02 00:28:53.386391528 +0100
@@ -61,8 +61,7 @@
--- a/drivers/pgsql/dbd_pgsql.c
+++ b/drivers/pgsql/dbd_pgsql.c
@@ -61,8 +61,7 @@ static const dbi_info_t driver_info = {
"PostgreSQL database support (using libpq)",
"David A. Parker <david@neongoat.com>",
"http://libdbi-drivers.sourceforge.net",
@@ -110,11 +94,9 @@ Index: libdbi-drivers-0.9.0/drivers/pgsql/dbd_pgsql.c
};
static const char *custom_functions[] = PGSQL_CUSTOM_FUNCTIONS;
Index: libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/sqlite/dbd_sqlite.c 2013-01-09 22:30:20.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c 2017-12-02 00:28:59.370513412 +0100
@@ -65,8 +65,7 @@
--- a/drivers/sqlite/dbd_sqlite.c
+++ b/drivers/sqlite/dbd_sqlite.c
@@ -65,8 +65,7 @@ static const dbi_info_t driver_info = {
"SQLite database support (using libsqlite)",
"Markus Hoenicka <mhoenicka@users.sourceforge.net>",
"http://libdbi-drivers.sourceforge.net",
@@ -124,11 +106,9 @@ Index: libdbi-drivers-0.9.0/drivers/sqlite/dbd_sqlite.c
};
static const char *custom_functions[] = SQLITE_CUSTOM_FUNCTIONS;
Index: libdbi-drivers-0.9.0/drivers/sqlite3/dbd_sqlite3.c
===================================================================
--- libdbi-drivers-0.9.0.orig/drivers/sqlite3/dbd_sqlite3.c 2013-01-23 00:29:13.000000000 +0100
+++ libdbi-drivers-0.9.0/drivers/sqlite3/dbd_sqlite3.c 2017-12-02 00:29:11.706764820 +0100
@@ -65,8 +65,7 @@
--- a/drivers/sqlite3/dbd_sqlite3.c
+++ b/drivers/sqlite3/dbd_sqlite3.c
@@ -65,8 +65,7 @@ static const dbi_info_t driver_info = {
"SQLite3 database support (using libsqlite3)",
"Markus Hoenicka <mhoenicka@users.sourceforge.net>",
"http://libdbi-drivers.sourceforge.net",

7
libs/libdmapsharing/patches/001-disable_pixbuf.patch
View File

@@ -1,7 +1,6 @@
diff -u --recursive libdmapsharing-3.9.10-vanilla/configure.ac libdmapsharing-3.9.10/configure.ac
--- libdmapsharing-3.9.10-vanilla/configure.ac 2020-07-08 08:04:40.000000000 -0400
+++ libdmapsharing-3.9.10/configure.ac 2020-07-08 21:34:56.960942899 -0400
@@ -125,15 +125,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -125,15 +125,7 @@ fi
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)

6
libs/libesmtp/patches/100-openssl-1.1.patch
View File

@@ -1,5 +1,3 @@
diff --git a/configure b/configure
index d586ca2..ee39284 100755
--- a/configure
+++ b/configure
@@ -11896,9 +11896,9 @@ fi
@@ -15,7 +13,7 @@ index d586ca2..ee39284 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11913,27 +11913,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11913,27 +11913,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
@@ -50,8 +48,6 @@ index d586ca2..ee39284 100755
with_openssl=yes
LIBS="-lssl -lcrypto $LIBS"
diff --git a/smtp-tls.c b/smtp-tls.c
index 9a66806..5bdc191 100644
--- a/smtp-tls.c
+++ b/smtp-tls.c
@@ -64,10 +64,12 @@ openssl_mutexcb (int mode, int n,

2
libs/libesmtp/patches/200-add-TLSv1_1-TLSv1_2-support.patch
View File

@@ -7,7 +7,7 @@ Last-Update: 2015-11-07
--- a/smtp-tls.c
+++ b/smtp-tls.c
@@ -197,11 +197,24 @@ starttls_create_ctx (smtp_session_t sess
@@ -202,11 +202,24 @@ starttls_create_ctx (smtp_session_t sess
ckf_t status;
/* The decision not to support SSL v2 and v3 but instead to use only

7
libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch
View File

@@ -12,8 +12,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
tools/mouse-dpi-tool.c | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tools/libevdev-events.c b/tools/libevdev-events.c
index 547513e..e5940c9 100644
--- a/tools/libevdev-events.c
+++ b/tools/libevdev-events.c
@@ -33,6 +33,11 @@
@@ -28,8 +26,6 @@ index 547513e..e5940c9 100644
static void
print_abs_bits(struct libevdev *dev, int axis)
{
diff --git a/tools/mouse-dpi-tool.c b/tools/mouse-dpi-tool.c
index 9961f3a..c4830e7 100644
--- a/tools/mouse-dpi-tool.c
+++ b/tools/mouse-dpi-tool.c
@@ -37,6 +37,11 @@
@@ -44,6 +40,3 @@ index 9961f3a..c4830e7 100644
#define min(a, b) (((a) < (b)) ? (a) : (b))
#define max(a, b) (((a) > (b)) ? (a) : (b))
--
2.25.3

4
libs/libevhtp/patches/010-openssl-thread.patch
View File

@@ -1,6 +1,6 @@
--- a/evhtp.c
+++ b/evhtp.c
@@ -2863,7 +2863,7 @@ htp__accept_cb_(struct evconnlistener * serv, int fd, struct sockaddr * s, int s
@@ -2863,7 +2863,7 @@ htp__accept_cb_(struct evconnlistener *
} /* htp__accept_cb_ */
#ifndef EVHTP_DISABLE_SSL
@@ -18,7 +18,7 @@
evhtp_ssl_use_threads();
#endif
@@ -4723,7 +4723,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp, evhtp_post_accept_cb cb, void * arg)
@@ -4723,7 +4723,7 @@ evhtp_set_post_accept_cb(evhtp_t * htp,
}
#ifndef EVHTP_DISABLE_SSL

7
libs/libexif/patches/100-no_doc.patch
View File

@@ -1,7 +1,6 @@
diff -u --recursive libexif-0.6.22-vanilla/Makefile.in libexif-0.6.22/Makefile.in
--- libexif-0.6.22-vanilla/Makefile.in 2020-05-18 14:51:57.000000000 -0500
+++ libexif-0.6.22/Makefile.in 2020-11-10 14:02:49.736268440 -0600
@@ -393,7 +393,7 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -393,7 +393,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

2
libs/libffi/patches/100-fix_mips_softfloat.patch
View File

@@ -8,8 +8,6 @@ Thank you!
src/mips/o32.S | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/mips/o32.S b/src/mips/o32.S
index 44e74cb9..799139b2 100644
--- a/src/mips/o32.S
+++ b/src/mips/o32.S
@@ -282,9 +282,11 @@ $LCFI12:

2
libs/libffi/patches/200-ppc.patch
View File

@@ -21,8 +21,6 @@ Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
src/powerpc/ffi_powerpc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h
index 5ee2a709..8e2f2f0e 100644
--- a/src/powerpc/ffi_powerpc.h
+++ b/src/powerpc/ffi_powerpc.h
@@ -62,7 +62,7 @@ typedef _Float128 float128;

2
libs/libftdi1/patches/100-fix-x86_64-build.patch
View File

@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ if ( NOT DEFINED LIB_SUFFIX )
@@ -57,7 +57,7 @@ if ( NOT DEFINED LIB_SUFFIX )
AND NOT EXISTS "/etc/debian_version"
AND NOT EXISTS "/etc/arch-release" )
if ( "${CMAKE_SIZEOF_VOID_P}" EQUAL "8" )

7
libs/libgabe/patches/010-shared-library.patch
View File

@@ -7,8 +7,6 @@ Subject: [PATCH] shared library
Makefile.in | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index f23bf90..c8c19fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,13 +18,12 @@ LDFLAGS = @LDFLAGS@ \
@@ -28,7 +26,7 @@ index f23bf90..c8c19fa 100644
# test: test.o libgabe.a
# $(CC) -o $@ $(LDFLAGS) $^
@@ -44,14 +43,14 @@ dist: AUTHORS COPYING INSTALL NEWS README \
@@ -44,14 +43,14 @@ dist: AUTHORS COPYING INSTALL NEWS READM
tar zc $(DISTNAME) > $(DISTNAME).tar.gz
rm -rf $(DISTNAME)
@@ -46,6 +44,3 @@ index f23bf90..c8c19fa 100644
/bin/rm -f $(DESTDIR)$(includedir)/gabe.h
# development and meta stuff
--
2.17.1

6
libs/libgd/patches/010-getlib.patch
View File

@@ -8,9 +8,6 @@ Subject: [PATCH] distribute getlib.sh
1 file changed, 42 insertions(+)
create mode 100755 config/getlib.sh
diff --git a/config/getlib.sh b/config/getlib.sh
new file mode 100755
index 0000000..4835cf6
--- /dev/null
+++ b/config/getlib.sh
@@ -0,0 +1,42 @@
@@ -56,6 +53,3 @@ index 0000000..4835cf6
+ printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
+ ;;
+esac
--
2.25.1

6
libs/libhttp-parser/patches/000-fix_darwin_error.patch
View File

@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,7 @@
@@ -25,11 +25,7 @@ SOLIBNAME = libhttp_parser
SOMAJOR = 2
SOMINOR = 9
SOREV = 4
@@ -13,7 +13,7 @@
CC = winegcc
BINEXT = .exe.so
HELPER = wine
@@ -65,12 +61,8 @@
@@ -65,12 +61,8 @@ PREFIX ?= /usr/local
LIBDIR = $(PREFIX)/lib
INCLUDEDIR = $(PREFIX)/include
@@ -26,7 +26,7 @@
test: test_g test_fast
$(HELPER) ./test_g$(BINEXT)
@@ -131,14 +123,18 @@
@@ -131,14 +123,18 @@ tags: http_parser.c http_parser.h test.c
ctags $^
install: library

10
libs/libimobiledevice/patches/120-iOS14.patch
View File

@@ -22,7 +22,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+
typedef enum {
--- a/include/libimobiledevice/lockdown.h
+++ b/include/libimobiledevice/lockdown.h
@@ -96,6 +96,7 @@ typedef struct lockdownd_pair_record *lockdownd_pair_record_t;
@@ -96,6 +96,7 @@ typedef struct lockdownd_pair_record *lo
struct lockdownd_service_descriptor {
uint16_t port;
uint8_t ssl_enabled;
@@ -32,7 +32,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+
--- a/src/debugserver.c
+++ b/src/debugserver.c
@@ -80,7 +80,10 @@ LIBIMOBILEDEVICE_API debugserver_error_t debugserver_client_new(idevice_t device
@@ -80,7 +80,10 @@ LIBIMOBILEDEVICE_API debugserver_error_t
debug_info("Creating base service client failed. Error: %i", ret);
return ret;
}
@@ -44,7 +44,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+
debugserver_client_t client_loc = (debugserver_client_t) malloc(sizeof(struct debugserver_client_private));
client_loc->parent = parent;
@@ -95,7 +98,11 @@ LIBIMOBILEDEVICE_API debugserver_error_t debugserver_client_new(idevice_t device
@@ -95,7 +98,11 @@ LIBIMOBILEDEVICE_API debugserver_error_t
LIBIMOBILEDEVICE_API debugserver_error_t debugserver_client_start_service(idevice_t device, debugserver_client_t * client, const char* label)
{
debugserver_error_t err = DEBUGSERVER_E_UNKNOWN_ERROR;
@@ -59,7 +59,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -1307,6 +1307,7 @@ static lockdownd_error_t lockdownd_do_start_service(lockdownd_client_t client, c
@@ -1307,6 +1307,7 @@ static lockdownd_error_t lockdownd_do_st
*service = (lockdownd_service_descriptor_t)malloc(sizeof(struct lockdownd_service_descriptor));
(*service)->port = 0;
(*service)->ssl_enabled = 0;
@@ -67,7 +67,7 @@ Subject: [PATCH] debugserver: Fix service startup for iOS 14b4+
/* read service port number */
plist_t node = plist_dict_get_item(dict, "Port");
@@ -1511,8 +1512,10 @@ LIBIMOBILEDEVICE_API lockdownd_error_t lockdownd_data_classes_free(char **classe
@@ -1511,8 +1512,10 @@ LIBIMOBILEDEVICE_API lockdownd_error_t l
LIBIMOBILEDEVICE_API lockdownd_error_t lockdownd_service_descriptor_free(lockdownd_service_descriptor_t service)
{

2
libs/liblo/patches/010-index.patch
View File

@@ -1,6 +1,6 @@
--- a/src/server.c
+++ b/src/server.c
@@ -2013,11 +2013,8 @@ static void dispatch_method(lo_server s, const char *path,
@@ -2013,11 +2013,8 @@ static void dispatch_method(lo_server s,
tmp = (char*) malloc(strlen(it->path + len) + 1);
strcpy(tmp, it->path + len);

4
libs/liblo/patches/020-usleep.patch
View File

@@ -1,6 +1,6 @@
--- a/src/tools/oscsendfile.c
+++ b/src/tools/oscsendfile.c
@@ -354,7 +354,7 @@ int send_file(lo_address target, double speed) {
@@ -354,7 +354,7 @@ int send_file(lo_address target, double
lo_timetag_now(&tt_now);
double wait_time = timetag_diff(*tt_last, tt_now);
if (wait_time > 0.) {
@@ -9,7 +9,7 @@
}
if (b) {
ret = lo_send_bundle(target, b);
@@ -376,7 +376,7 @@ int send_file(lo_address target, double speed) {
@@ -376,7 +376,7 @@ int send_file(lo_address target, double
lo_timetag_now(&tt_now);
double wait_time = timetag_diff(*tt_last, tt_now);
if (wait_time > 0.) {

18
libs/libmad/patches/001-mips_removal_h_constraint.patch
View File

@@ -1,7 +1,6 @@
diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
--- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030
+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930
@@ -299,6 +299,23 @@
--- a/fixed.h
+++ b/fixed.h
@@ -299,6 +299,23 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t
# elif defined(FPM_MIPS)
@@ -25,7 +24,7 @@ diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
/*
* This MIPS version is fast and accurate; the disposition of the least
* significant bit depends on OPT_ACCURACY via mad_f_scale64().
@@ -328,6 +345,7 @@
@@ -328,6 +345,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t
: "%r" ((x) >> 12), "r" ((y) >> 16))
# define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
# endif
@@ -33,10 +32,9 @@ diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
# if defined(OPT_SPEED)
# define mad_f_scale64(hi, lo) \
diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
--- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030
+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930
@@ -344,6 +344,23 @@
--- a/mad.h
+++ b/mad.h
@@ -344,6 +344,23 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t
# elif defined(FPM_MIPS)
@@ -60,7 +58,7 @@ diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
/*
* This MIPS version is fast and accurate; the disposition of the least
* significant bit depends on OPT_ACCURACY via mad_f_scale64().
@@ -373,6 +390,7 @@
@@ -373,6 +390,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t
: "%r" ((x) >> 12), "r" ((y) >> 16))
# define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
# endif

26
libs/libmad/patches/101-CVE-2017-8374-length-check.patch
View File

@@ -6,10 +6,8 @@ There are various cases where it attemps to read past the end of the buffer
using mad_bit_read(). Most functions didn't even know the size of the buffer
they were reading from.
Index: libmad-0.15.1b/bit.c
===================================================================
--- libmad-0.15.1b.orig/bit.c
+++ libmad-0.15.1b/bit.c
--- a/bit.c
+++ b/bit.c
@@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bi
{
register unsigned long value;
@@ -20,10 +18,8 @@ Index: libmad-0.15.1b/bit.c
if (bitptr->left == CHAR_BIT)
bitptr->cache = *bitptr->byte;
Index: libmad-0.15.1b/frame.c
===================================================================
--- libmad-0.15.1b.orig/frame.c
+++ libmad-0.15.1b/frame.c
--- a/frame.c
+++ b/frame.c
@@ -120,11 +120,18 @@ static
int decode_header(struct mad_header *header, struct mad_stream *stream)
{
@@ -85,10 +81,8 @@ Index: libmad-0.15.1b/frame.c
ptr = stream->next_frame = stream->this_frame + 1;
goto sync;
}
Index: libmad-0.15.1b/layer12.c
===================================================================
--- libmad-0.15.1b.orig/layer12.c
+++ libmad-0.15.1b/layer12.c
--- a/layer12.c
+++ b/layer12.c
@@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = {
* DESCRIPTION: decode one requantized Layer I sample from a bitstream
*/
@@ -343,10 +337,8 @@ Index: libmad-0.15.1b/layer12.c
for (ch = 0; ch < nch; ++ch) {
for (s = 0; s < 3; ++s) {
Index: libmad-0.15.1b/layer3.c
===================================================================
--- libmad-0.15.1b.orig/layer3.c
+++ libmad-0.15.1b/layer3.c
--- a/layer3.c
+++ b/layer3.c
@@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_b
static
unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
@@ -806,7 +798,7 @@ Index: libmad-0.15.1b/layer3.c
}
mad_bit_finish(&peek);
@@ -2653,7 +2733,7 @@ int mad_layer_III(struct mad_stream *str
@@ -2645,7 +2725,7 @@ int mad_layer_III(struct mad_stream *str
/* decode main_data */
if (result == 0) {

10
libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch
View File

@@ -26,11 +26,9 @@ stream->md_len bytes. If stream->md_len is larger than the data we
need from the previous frame (si.main_data_begin) it still wouldn't fit
in the buffer, so just keep the data that we need.
Index: libmad-0.15.1b/layer3.c
===================================================================
--- libmad-0.15.1b.orig/layer3.c
+++ libmad-0.15.1b/layer3.c
@@ -2608,6 +2608,11 @@ int mad_layer_III(struct mad_stream *str
--- a/layer3.c
+++ b/layer3.c
@@ -2688,6 +2688,11 @@ int mad_layer_III(struct mad_stream *str
next_md_begin = 0;
md_len = si.main_data_begin + frame_space - next_md_begin;
@@ -42,7 +40,7 @@ Index: libmad-0.15.1b/layer3.c
frame_used = 0;
@@ -2625,8 +2630,11 @@ int mad_layer_III(struct mad_stream *str
@@ -2705,8 +2710,11 @@ int mad_layer_III(struct mad_stream *str
}
}
else {

7
libs/libmodbus/patches/0001-Fixed-MODBUS_GET_-macros-in-case-of-negative-values.patch
View File

@@ -8,11 +8,9 @@ In case resulting value should be negative it is incorrect to use '+' operator t
src/modbus.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modbus.h b/src/modbus.h
index f6e9a5f..c63f5ce 100644
--- a/src/modbus.h
+++ b/src/modbus.h
@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req,
@@ -245,12 +245,12 @@ MODBUS_API int modbus_reply_exception(mo
#define MODBUS_GET_HIGH_BYTE(data) (((data) >> 8) & 0xFF)
#define MODBUS_GET_LOW_BYTE(data) ((data) & 0xFF)
#define MODBUS_GET_INT64_FROM_INT16(tab_int16, index) \
@@ -30,6 +28,3 @@ index f6e9a5f..c63f5ce 100644
#define MODBUS_SET_INT16_TO_INT8(tab_int8, index, value) \
do { \
tab_int8[(index)] = (value) >> 8; \
--
2.17.1

5
libs/libmpeg2/patches/102-arm_data_preload_check.patch
View File

@@ -1,6 +1,5 @@
diff -urN libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S
--- libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200
+++ libmpeg2-0.5.1.new/libmpeg2/motion_comp_arm_s.S 2012-07-30 15:22:58.664964215 +0200
--- a/libmpeg2/motion_comp_arm_s.S
+++ b/libmpeg2/motion_comp_arm_s.S
@@ -19,6 +19,15 @@
@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

2
libs/libmraa/patches/020-support_v12.patch
View File

@@ -1,6 +1,6 @@
--- a/api/mraa/gpio.hpp
+++ b/api/mraa/gpio.hpp
@@ -175,7 +175,11 @@
@@ -175,7 +175,11 @@ class Gpio
v8::Local<v8::Value> argv[] = { SWIGV8_INTEGER_NEW(-1) };
#if NODE_MODULE_VERSION >= 0x000D
v8::Local<v8::Function> f = v8::Local<v8::Function>::New(v8::Isolate::GetCurrent(), This->m_v8isr);

5
libs/libnetfilter-log/patches/0001-build-remove-unnecessary-pkgconfig-config.status-dep.patch
View File

@@ -11,8 +11,6 @@ Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Make_global.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Make_global.am b/Make_global.am
index b7dab7b..a4e9bd9 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -1,2 +1,2 @@
@@ -20,6 +18,3 @@ index b7dab7b..a4e9bd9 100644
-AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS}
+AM_CFLAGS = -Wall
--
1.7.10.4

5
libs/libnetfilter-log/patches/0002-build-remove-unused-lines-in-Makefile.am.patch
View File

@@ -8,8 +8,6 @@ Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b758e56..9a1cbcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
@@ -19,6 +17,3 @@ index b758e56..9a1cbcb 100644
ACLOCAL_AMFLAGS = -I m4
--
1.7.10.4

5
libs/libnetfilter-log/patches/0003-build-resolve-automake-1.12-warnings.patch
View File

@@ -12,8 +12,6 @@ Signed-off-by: Jan Engelhardt <jengelh@inai.de>
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index fe6e75f..e6e1317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
@@ -24,6 +22,3 @@ index fe6e75f..e6e1317 100644
dnl kernel style compile messages
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--
1.7.10.4

5
libs/libnetfilter-log/patches/0004-Add-include-needed-for-integer-type-definition.patch
View File

@@ -7,8 +7,6 @@ Subject: [PATCH 4/6] Add include needed for integer type definition.
include/libnetfilter_log/libnetfilter_log.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
index 6b0d3b0..a1331de 100644
--- a/include/libnetfilter_log/libnetfilter_log.h
+++ b/include/libnetfilter_log/libnetfilter_log.h
@@ -9,6 +9,7 @@
@@ -19,6 +17,3 @@ index 6b0d3b0..a1331de 100644
#include <libnetfilter_log/linux_nfnetlink_log.h>
struct nflog_handle;
--
1.7.10.4

5
libs/libnetfilter-log/patches/0005-configure-uclinux-is-also-linux.patch
View File

@@ -9,8 +9,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index e6e1317..189a753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PROG_INSTALL
@@ -22,6 +20,3 @@ index e6e1317..189a753 100644
*) AC_MSG_ERROR([Linux only, dude!]);;
esac
--
1.7.10.4

11
libs/libnetfilter-log/patches/0006-configure-add-without-ipulog-option-to-disable-libip.patch
View File

@@ -16,8 +16,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
utils/Makefile.am | 7 +++++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 189a753..88ff7ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,11 @@ case "$host" in
@@ -32,8 +30,6 @@ index 189a753..88ff7ab 100644
dnl Dependencies
PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am
index fe934f1..fde1d60 100644
--- a/include/libnetfilter_log/Makefile.am
+++ b/include/libnetfilter_log/Makefile.am
@@ -1,3 +1,6 @@
@@ -44,8 +40,6 @@ index fe934f1..fde1d60 100644
+if BUILD_IPULOG
+pkginclude_HEADERS += libipulog.h
+endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 10a66e2..33933a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,14 +22,18 @@ LIBVERSION=2:0:1
@@ -68,8 +62,6 @@ index 10a66e2..33933a4 100644
libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la
libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
+endif
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ae64c90..f961b6c 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,12 +1,15 @@
@@ -90,6 +82,3 @@ index ae64c90..f961b6c 100644
ulog_test_LDFLAGS = -dynamic
-
+endif
--
1.7.10.4

5
libs/libnetfilter-log/patches/0007-include-Sync-with-current-kernel-headers.patch
View File

@@ -9,8 +9,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++-------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
index 4c802c8..9f38277 100644
--- a/include/libnetfilter_log/linux_nfnetlink_log.h
+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
@@ -20,33 +20,31 @@ enum nfulnl_msg_types {
@@ -103,6 +101,3 @@ index 4c802c8..9f38277 100644
#define NFULNL_CFG_F_SEQ 0x0001
#define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
--
2.11.0

5
libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch
View File

@@ -9,8 +9,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
index 9f38277..081e7f9 100644
--- a/include/libnetfilter_log/linux_nfnetlink_log.h
+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
@@ -1,16 +1,12 @@
@@ -47,6 +45,3 @@ index 9f38277..081e7f9 100644
+#define NFULNL_CFG_F_CONNTRACK 0x0004
#endif /* _NFNETLINK_LOG_H */
--
2.11.0

4
libs/libnetfilter-queue/patches/0002-src-fix-IPv6-header-handling.patch
View File

@@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/src/extra/ipv6.c
+++ b/src/extra/ipv6.c
@@ -67,10 +67,19 @@ int nfq_ip6_set_transport_header(struct
@@ -67,10 +67,19 @@ int nfq_ip6_set_transport_header(struct
uint8_t nexthdr = ip6h->ip6_nxt;
uint8_t *cur = (uint8_t *)ip6h + sizeof(struct ip6_hdr);
@@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/* No more extensions, we're done. */
if (nexthdr == IPPROTO_NONE) {
cur = NULL;
@@ -107,11 +116,13 @@ int nfq_ip6_set_transport_header(struct
@@ -107,11 +116,13 @@ int nfq_ip6_set_transport_header(struct
} else if (nexthdr == IPPROTO_AH)
hdrlen = (ip6_ext->ip6e_len + 2) << 2;
else

14
libs/libnopoll/patches/010-openssl-deprecated.patch
View File

@@ -1,5 +1,3 @@
diff --git a/src/nopoll.c b/src/nopoll.c
index d4b50f3..3603f41 100644
--- a/src/nopoll.c
+++ b/src/nopoll.c
@@ -868,9 +868,11 @@ void nopoll_cleanup_library (void)
@@ -14,11 +12,9 @@ index d4b50f3..3603f41 100644
/* notify the library isn't initialized */
__nopoll_tls_was_init = nopoll_false;
diff --git a/src/nopoll_conn.c b/src/nopoll_conn.c
index 0b85382..1770723 100644
--- a/src/nopoll_conn.c
+++ b/src/nopoll_conn.c
@@ -1380,7 +1380,9 @@ noPollConn * nopoll_conn_tls_new (noPollCtx * ctx,
@@ -1380,7 +1380,9 @@ noPollConn * nopoll_conn_tls_new (noPoll
/* init ssl ciphers and engines */
if (! __nopoll_tls_was_init) {
__nopoll_tls_was_init = nopoll_true;
@@ -28,7 +24,7 @@ index 0b85382..1770723 100644
} /* end if */
/* call common implementation */
@@ -1426,7 +1428,9 @@ noPollConn * nopoll_conn_tls_new6 (noPollCtx * ctx,
@@ -1426,7 +1428,9 @@ noPollConn * nopoll_conn_tls_new6 (noPol
/* init ssl ciphers and engines */
if (! __nopoll_tls_was_init) {
__nopoll_tls_was_init = nopoll_true;
@@ -38,7 +34,7 @@ index 0b85382..1770723 100644
} /* end if */
/* call common implementation */
@@ -1495,7 +1499,9 @@ noPollConn * nopoll_conn_tls_new_with_socket (noPollCtx * ctx,
@@ -1495,7 +1499,9 @@ noPollConn * nopoll_conn_tls_new_with_so
/* init ssl ciphers and engines */
if (! __nopoll_tls_was_init) {
__nopoll_tls_was_init = nopoll_true;
@@ -48,7 +44,7 @@ index 0b85382..1770723 100644
} /* end if */
/* call common implementation */
@@ -4755,7 +4761,9 @@ nopoll_bool __nopoll_conn_accept_complete_common (noPollCtx * ctx, noPollConnOpt
@@ -4755,7 +4761,9 @@ nopoll_bool __nopoll_conn_accept_complet
/* init ssl ciphers and engines */
if (! __nopoll_tls_was_init) {
__nopoll_tls_was_init = nopoll_true;
@@ -58,8 +54,6 @@ index 0b85382..1770723 100644
} /* end if */
/* now configure chainCertificate */
diff --git a/src/nopoll_decl.h b/src/nopoll_decl.h
index bfe496e..b0ce535 100644
--- a/src/nopoll_decl.h
+++ b/src/nopoll_decl.h
@@ -511,20 +511,18 @@ typedef enum {

2
libs/libowfat/patches/001-fixbuild.patch
View File

@@ -1,6 +1,6 @@
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -357,6 +357,8 @@ socket_accept4.o socket_accept6.o socket_connected.o socket_local4.o \
@@ -357,6 +357,8 @@ socket_accept4.o socket_accept6.o socket
socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \
socket_remote6.o: havesl.h

6
libs/libp11/patches/001-fix-install.patch
View File

@@ -16,7 +16,7 @@
mylibdir=$(libdir)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -899,7 +899,7 @@ distdir-am: $(DISTFILES)
@@ -900,7 +900,7 @@ distdir-am: $(DISTFILES)
fi; \
done
check-am: all-am
@@ -25,7 +25,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
installdirs:
@@ -988,7 +988,7 @@ install-dvi-am:
@@ -989,7 +989,7 @@ install-dvi-am:
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES
@$(NORMAL_INSTALL)
@@ -34,7 +34,7 @@
install-html: install-html-am
install-html-am:
@@ -1051,14 +1051,14 @@ uninstall-am: uninstall-enginesexecLTLIB
@@ -1052,14 +1052,14 @@ uninstall-am: uninstall-enginesexecLTLIB
.MAKE: all check-am install-am install-exec-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \

64
libs/libpfring/patches/0002-kernel-pf_ring.c-linux-v5.9-compatibility.patch
View File

@@ -22,7 +22,7 @@
unsigned
int optlen)
{
@@ -6842,7 +6852,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -6842,7 +6852,7 @@ static int ring_setsockopt(struct socket
ret = -EFAULT;
@@ -31,7 +31,7 @@
break;
if(fprog.len <= 1) { /* empty filter */
@@ -6888,7 +6898,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -6888,7 +6898,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(cluster))
return(-EINVAL);
@@ -40,7 +40,7 @@
return(-EFAULT);
write_lock_bh(&pfr->ring_rules_lock);
@@ -6911,7 +6921,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -6911,7 +6921,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(channel_id_mask))
return(-EINVAL);
@@ -49,7 +49,7 @@
return(-EFAULT);
num_channels = 0;
@@ -6967,7 +6977,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -6967,7 +6977,7 @@ static int ring_setsockopt(struct socket
if(optlen > sizeof(name) /* Names should not be too long */ )
return(-EINVAL);
@@ -58,7 +58,7 @@
return(-EFAULT);
if(pfr->appl_name != NULL)
@@ -6985,7 +6995,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -6985,7 +6995,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(direction))
return(-EINVAL);
@@ -67,7 +67,7 @@
return(-EFAULT);
pfr->direction = direction;
@@ -6999,7 +7009,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -6999,7 +7009,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(sockmode))
return(-EINVAL);
@@ -76,7 +76,7 @@
return(-EFAULT);
pfr->mode = sockmode;
@@ -7013,7 +7023,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7013,7 +7023,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(rule_inactivity))
return(-EINVAL);
@@ -85,7 +85,7 @@
return(-EFAULT);
else {
write_lock_bh(&pfr->ring_rules_lock);
@@ -7027,7 +7037,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7027,7 +7037,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(rule_inactivity))
return(-EINVAL);
@@ -94,7 +94,7 @@
return(-EFAULT);
else {
write_lock_bh(&pfr->ring_rules_lock);
@@ -7043,7 +7053,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7043,7 +7053,7 @@ static int ring_setsockopt(struct socket
else {
u_int8_t new_policy;
@@ -103,7 +103,7 @@
return(-EFAULT);
write_lock_bh(&pfr->ring_rules_lock);
@@ -7075,7 +7085,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7075,7 +7085,7 @@ static int ring_setsockopt(struct socket
if(rule == NULL)
return(-EFAULT);
@@ -112,7 +112,7 @@
return(-EFAULT);
INIT_LIST_HEAD(&rule->list);
@@ -7099,7 +7109,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7099,7 +7109,7 @@ static int ring_setsockopt(struct socket
if(rule == NULL)
return(-EFAULT);
@@ -121,7 +121,7 @@
return(-EFAULT);
write_lock_bh(&pfr->ring_rules_lock);
@@ -7123,7 +7133,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7123,7 +7133,7 @@ static int ring_setsockopt(struct socket
/* This is a list rule */
int rc;
@@ -130,7 +130,7 @@
return(-EFAULT);
write_lock_bh(&pfr->ring_rules_lock);
@@ -7139,7 +7149,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7139,7 +7149,7 @@ static int ring_setsockopt(struct socket
sw_filtering_hash_bucket rule;
int rc;
@@ -139,7 +139,7 @@
return(-EFAULT);
write_lock_bh(&pfr->ring_rules_lock);
@@ -7156,7 +7166,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7156,7 +7166,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(pfr->sample_rate))
return(-EINVAL);
@@ -148,7 +148,7 @@
return(-EFAULT);
break;
@@ -7164,7 +7174,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7164,7 +7174,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(pfr->filtering_sample_rate))
return(-EINVAL);
@@ -157,7 +157,7 @@
return(-EFAULT);
pfr->filtering_sampling_size = pfr->filtering_sample_rate;
@@ -7231,7 +7241,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7231,7 +7241,7 @@ static int ring_setsockopt(struct socket
else
threshold = min_num_slots;
@@ -166,7 +166,7 @@
return(-EFAULT);
if(pfr->poll_num_pkts_watermark > threshold)
@@ -7248,7 +7258,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7248,7 +7258,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(u_int16_t))
return(-EINVAL);
else {
@@ -175,7 +175,7 @@
return(-EFAULT);
debug_printk(2, "--> SO_SET_POLL_WATERMARK_TIMEOUT=%u\n", pfr->poll_watermark_timeout);
}
@@ -7258,7 +7268,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7258,7 +7268,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(u_int32_t))
return(-EINVAL);
@@ -184,7 +184,7 @@
return(-EFAULT);
debug_printk(2, "--> SO_RING_BUCKET_LEN=%d\n", pfr->bucket_len);
@@ -7268,7 +7278,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7268,7 +7278,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(zc_dev_mapping))
return(-EINVAL);
@@ -193,7 +193,7 @@
return(-EFAULT);
debug_printk(2, "SO_SELECT_ZC_DEVICE %s\n", mapping.device_name);
@@ -7278,7 +7288,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7278,7 +7288,7 @@ static int ring_setsockopt(struct socket
else
ret = pfring_release_zc_dev(pfr);
@@ -202,7 +202,7 @@
return(-EFAULT);
break;
@@ -7291,7 +7301,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7291,7 +7301,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(ring_id))
return(-EINVAL);
@@ -211,7 +211,7 @@
return(-EFAULT);
write_lock_bh(&pfr->ring_rules_lock);
@@ -7303,7 +7313,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7303,7 +7313,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(hw_filtering_rule))
return(-EINVAL);
@@ -220,7 +220,7 @@
return(-EFAULT);
/* Check if a rule with the same id exists */
@@ -7343,7 +7353,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7343,7 +7353,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(u_int16_t))
return(-EINVAL);
@@ -229,7 +229,7 @@
return(-EFAULT);
/* Check if the rule we want to remove exists */
@@ -7381,7 +7391,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7381,7 +7391,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(elem))
return(-EINVAL);
@@ -238,7 +238,7 @@
return(-EFAULT);
if((pfr->v_filtering_dev = add_virtual_filtering_device(pfr, &elem)) == NULL)
@@ -7402,14 +7412,14 @@ static int ring_setsockopt(struct socket *sock,
@@ -7402,14 +7412,14 @@ static int ring_setsockopt(struct socket
if(optlen < sizeof(ccri))
return(-EINVAL);
@@ -255,7 +255,7 @@
remove_cluster_referee(pfr);
return(-EFAULT);
}
@@ -7422,7 +7432,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7422,7 +7432,7 @@ static int ring_setsockopt(struct socket
{
struct public_cluster_object_info pcoi;
@@ -264,7 +264,7 @@
return(-EFAULT);
if(publish_cluster_object(pfr, pcoi.cluster_id, pcoi.object_type, pcoi.object_id) < 0)
@@ -7436,7 +7446,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7436,7 +7446,7 @@ static int ring_setsockopt(struct socket
{
struct lock_cluster_object_info lcoi;
@@ -273,7 +273,7 @@
return(-EFAULT);
if(lock_cluster_object(pfr, lcoi.cluster_id, lcoi.object_type, lcoi.object_id, lcoi.lock_mask) < 0)
@@ -7450,7 +7460,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7450,7 +7460,7 @@ static int ring_setsockopt(struct socket
{
struct lock_cluster_object_info lcoi;
@@ -282,7 +282,7 @@
return(-EFAULT);
if(unlock_cluster_object(pfr, lcoi.cluster_id, lcoi.object_type, lcoi.object_id, lcoi.lock_mask) < 0)
@@ -7465,7 +7475,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7465,7 +7475,7 @@ static int ring_setsockopt(struct socket
if(optlen > (sizeof(pfr->custom_bound_device_name)-1))
optlen = sizeof(pfr->custom_bound_device_name)-1;
@@ -291,7 +291,7 @@
pfr->custom_bound_device_name[0] = '\0';
return(-EFAULT);
} else
@@ -7490,7 +7500,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7490,7 +7500,7 @@ static int ring_setsockopt(struct socket
if(optlen > (sizeof(pfr->statsString)-1))
optlen = sizeof(pfr->statsString)-1;
@@ -300,7 +300,7 @@
pfr->statsString[0] = '\0';
return(-EFAULT);
}
@@ -7511,7 +7521,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7511,7 +7521,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(u_int32_t))
return (-EINVAL);
@@ -309,7 +309,7 @@
return (-EFAULT);
if(!pfr->ring_dev || pfr->ring_dev == &none_device_element || pfr->ring_dev == &any_device_element) {
@@ -7537,7 +7547,7 @@ static int ring_setsockopt(struct socket *sock,
@@ -7537,7 +7547,7 @@ static int ring_setsockopt(struct socket
if(optlen != sizeof(vlan_id))
return(-EINVAL);

2
libs/libre2/patches/010-cxx17.patch
View File

@@ -14,7 +14,7 @@
if(WIN32)
--- a/re2.pc
+++ b/re2.pc
@@ -6,5 +6,5 @@ libdir=@libdir@
@@ -4,5 +4,5 @@ libdir=@libdir@
Name: re2
Description: RE2 is a fast, safe, thread-friendly regular expression engine.
Version: 0.0.0

16
libs/libtheora/patches/001-no_docs_tests.patch
View File

@@ -1,7 +1,6 @@
diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am
--- libtheora-1.1.1/Makefile.am 2009-07-14 01:55:02.000000000 +0200
+++ libtheora-1.1.1.new/Makefile.am 2012-12-05 14:21:06.103521554 +0100
@@ -8,7 +8,7 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ else
EXAMPLES_DIR =
endif
@@ -10,10 +9,9 @@ diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in
--- libtheora-1.1.1/Makefile.in 2009-10-01 20:04:07.000000000 +0200
+++ libtheora-1.1.1.new/Makefile.in 2012-12-05 14:21:18.239521864 +0100
@@ -164,7 +164,7 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,7 +164,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
@THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
@THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR =
@@ -22,7 +20,7 @@ diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
@@ -200,7 +200,7 @@
@@ -200,7 +200,7 @@ DIST_COMMON = README AUTHORS COPYING Mak
missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
theoradec-uninstalled.pc.in theoradec.pc.in \
theoraenc-uninstalled.pc.in theoraenc.pc.in

6
libs/libtheora/patches/002-no_sdl_check.patch
View File

@@ -1,6 +1,6 @@
--- libtheora-1.1.1/configure.ac 2009-10-01 20:00:33.000000000 +0200
+++ libtheora-1.1.1.new/configure.ac 2012-12-05 14:22:26.319523608 +0100
@@ -313,11 +313,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -313,11 +313,6 @@ fi
dnl check for SDL
HAVE_SDL=no

4
libs/libtorrent/patches/010-usleep.patch
View File

@@ -12,7 +12,7 @@
#include "torrent/exceptions.h"
#include "torrent/data/download_data.h"
@@ -137,7 +138,7 @@ HashQueue::remove(HashQueueNode::id_type id) {
@@ -137,7 +138,7 @@ HashQueue::remove(HashQueueNode::id_type
while ((done_itr = m_done_chunks.find(hash_chunk)) == m_done_chunks.end()) {
pthread_mutex_unlock(&m_done_chunks_lock);
@@ -43,7 +43,7 @@
}
acquire_global_lock();
@@ -161,7 +162,7 @@ thread_base::event_loop(thread_base* thread) {
@@ -161,7 +162,7 @@ thread_base::event_loop(thread_base* thr
}
// Add the sleep call when testing interrupts, etc.

4
libs/libupm/patches/001-version.patch
View File

@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,14 +231,7 @@
@@ -231,14 +231,7 @@ include(GNUInstallDirs)
set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
# Make a version file containing the current version from git.
@@ -9,10 +9,10 @@
-# If git_describe fails, use a dirty version
-if (${VERSION} MATCHES -NOTFOUND)
- set (VERSION "v1.7.1")
+ set (VERSION "v2.0.0")
- message (WARNING "Failed to retrieve UPM version with 'git describe' (using "
- "${VERSION}). Check that git is installed and this is a valid git repo.")
-endif ()
+ set (VERSION "v2.0.0")
message (STATUS "UPM Version ${VERSION}")

2
libs/libupm/patches/002-at42qt1070-id.patch
View File

@@ -1,6 +1,6 @@
--- a/src/at42qt1070/at42qt1070.cxx
+++ b/src/at42qt1070/at42qt1070.cxx
@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t address)
@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t
return;
}

21
libs/libupm/patches/004-uint8_t.patch
View File

@@ -1,7 +1,6 @@
diff -urN a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx
--- a/src/bma250e/bma250e.cxx 2019-05-09 00:06:25.000000000 +0900
+++ b/src/bma250e/bma250e.cxx 2019-05-13 16:43:04.344536227 +0900
@@ -195,35 +195,35 @@
--- a/src/bma250e/bma250e.cxx
+++ b/src/bma250e/bma250e.cxx
@@ -195,35 +195,35 @@ BMA250E::BMA250E(std::string initStr) :
fifoConfig(mode, axes);
}
if(tok.substr(0, 20) == "setInterruptEnable0:") {
@@ -45,10 +44,9 @@ diff -urN a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx
setInterruptOutputControl(bits);
}
if(tok.substr(0, 26) == "setInterruptLatchBehavior:") {
diff -urN a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx
--- a/src/bmg160/bmg160.cxx 2019-05-09 00:06:25.000000000 +0900
+++ b/src/bmg160/bmg160.cxx 2019-05-13 16:44:25.516304666 +0900
@@ -173,23 +173,23 @@
--- a/src/bmg160/bmg160.cxx
+++ b/src/bmg160/bmg160.cxx
@@ -173,23 +173,23 @@ BMG160::BMG160(std::string initStr) : mr
fifoConfig(mode, axes);
}
if(tok.substr(0, 20) == "setInterruptEnable0:") {
@@ -77,10 +75,9 @@ diff -urN a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx
setInterruptOutputControl(bits);
}
if(tok.substr(0, 26) == "setInterruptLatchBehavior:") {
diff -urN a/src/bmm150/bmm150.cxx b/src/bmm150/bmm150.cxx
--- a/src/bmm150/bmm150.cxx 2019-05-09 00:06:25.000000000 +0900
+++ b/src/bmm150/bmm150.cxx 2019-05-13 16:45:03.228197100 +0900
@@ -170,19 +170,19 @@
--- a/src/bmm150/bmm150.cxx
+++ b/src/bmm150/bmm150.cxx
@@ -170,19 +170,19 @@ BMM150::BMM150(std::string initStr) : mr
setOpmode(opmode);
}
if(tok.substr(0, 19) == "setInterruptEnable:") {

4
libs/libuwsc/patches/001-fix_find_lua.patch
View File

@@ -1,7 +1,5 @@
Index: libuwsc-3.3.1/cmake/Modules/FindLua.cmake
===================================================================
--- /dev/null
+++ libuwsc-3.3.1/cmake/Modules/FindLua.cmake
+++ b/cmake/Modules/FindLua.cmake
@@ -0,0 +1,18 @@
+# - Try to find lua
+# Once done this will define

2
libs/libv4l/patches/010-remove-libudev-check.patch
View File

@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -309,16 +309,9 @@ else
@@ -291,16 +291,9 @@ else
AC_MSG_WARN(ALSA library not available)
fi

8
libs/libwslay/patches/100-disable-doc.patch
View File

@@ -1,5 +1,3 @@
diff --git a/Makefile.am b/Makefile.am
index ae8b02f..2e86973 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,6 @@
@@ -8,10 +6,8 @@ index ae8b02f..2e86973 100644
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib tests examples doc
+SUBDIRS = lib tests
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 5e83cbf..88f4f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,9 +123,6 @@ AC_CONFIG_FILES([
@@ -23,4 +19,4 @@ index 5e83cbf..88f4f03 100644
- doc/sphinx/conf.py
])
AC_OUTPUT

4
libs/libx264/patches/001-fix-x32-build-by-disabling-asm.patch
View File

@@ -18,7 +18,7 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com>
--- a/configure
+++ b/configure
@@ -736,7 +736,13 @@ case $host_cpu in
@@ -769,7 +769,13 @@ case $host_cpu in
AS_EXT=".asm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
stack_alignment=16
@@ -33,7 +33,7 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com>
if [ "$SYS" = MACOSX ]; then
ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
if cc_check '' "-arch x86_64"; then
@@ -755,7 +761,11 @@ case $host_cpu in
@@ -788,7 +794,11 @@ case $host_cpu in
RCFLAGS="--target=pe-x86-64 $RCFLAGS"
fi
else

2
libs/libx264/patches/002-dont-default-to-cortex-a9-with-neon.patch
View File

@@ -16,7 +16,7 @@ Signed-off-by: Maxin B. John <maxin.john@intel.com>
--- a/configure
+++ b/configure
@@ -940,9 +940,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $A
@@ -975,9 +975,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $A
fi
if [ $asm = auto -a $ARCH = ARM ] ; then

7
libs/libxml2/patches/001-CVE-2019-20388.patch
View File

@@ -16,11 +16,9 @@ Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
xmlschemas.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/xmlschemas.c b/xmlschemas.c
index 301c84499..39d92182f 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {
@@ -28095,7 +28095,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vc
vctxt->nberrors = 0;
vctxt->depth = -1;
vctxt->skipDepth = -1;
@@ -28,6 +26,3 @@ index 301c84499..39d92182f 100644
vctxt->hasKeyrefs = 0;
#ifdef ENABLE_IDC_NODE_TABLES_TEST
vctxt->createIDCNodeTables = 1;
--
GitLab

5
libs/libxml2/patches/002-CVE-2020-24977.patch
View File

@@ -14,8 +14,6 @@ Fixes #178.
xmllint.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/xmllint.c b/xmllint.c
index f6a8e4636..c647486f3 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -528,6 +528,12 @@ static void
@@ -31,6 +29,3 @@ index f6a8e4636..c647486f3 100644
result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);
if (result) {
xmlGenericError(xmlGenericErrorContext, "%s", result);
--
GitLab

7
libs/libxml2/patches/003-CVE-2020-7595.patch
View File

@@ -13,11 +13,9 @@ Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
parser.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/parser.c b/parser.c
index d1c319631..a34bb6cdd 100644
--- a/parser.c
+++ b/parser.c
@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxt
else
c = 0;
while ((c != 0) && (c != end) && /* non input consuming loop */
@@ -27,6 +25,3 @@ index d1c319631..a34bb6cdd 100644
if (c == 0) break;
if ((c == '&') && (str[1] == '#')) {
--
GitLab

2
libs/libyaml-cpp/patches/010-libcxx.patch
View File

@@ -8,8 +8,6 @@ Somehow this instantiates a template properly otherwise the build fails
include/yaml-cpp/node/iterator.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/yaml-cpp/node/iterator.h b/include/yaml-cpp/node/iterator.h
index b4472381..080ec76c 100644
--- a/include/yaml-cpp/node/iterator.h
+++ b/include/yaml-cpp/node/iterator.h
@@ -15,6 +15,8 @@

10
libs/lmdb/patches/010-fix-makefile.patch
View File

@@ -5,19 +5,19 @@
datarootdir = $(prefix)/share
mandir = $(datarootdir)/man
+FPIC ?= -fPIC
########################################################################
@@ -86,10 +87,10 @@ midl.o: midl.c midl.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c
mdb.lo: mdb.c lmdb.h midl.h
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c -o $@
+ $(CC) $(CFLAGS) $(FPIC) $(CPPFLAGS) -c mdb.c -o $@
midl.lo: midl.c midl.h
- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
+ $(CC) $(CFLAGS) $(FPIC) $(CPPFLAGS) -c midl.c -o $@
%: %.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@

2
libs/loudmouth/patches/001-allow-disable-libidn.patch
View File

@@ -1,5 +1,3 @@
diff --git a/configure.ac b/configure.ac
index 8435d9a..148453c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,9 +109,22 @@ else

7
libs/loudmouth/patches/002-fix-comparison.patch
View File

@@ -1,7 +1,6 @@
diff -u --recursive loudmouth-1.5.3-vanilla/loudmouth/lm-sasl.c loudmouth-1.5.3/loudmouth/lm-sasl.c
--- loudmouth-1.5.3-vanilla/loudmouth/lm-sasl.c 2018-07-27 22:42:03.250616281 -0400
+++ loudmouth-1.5.3/loudmouth/lm-sasl.c 2018-07-27 22:42:26.756659723 -0400
@@ -529,7 +529,7 @@
--- a/loudmouth/lm-sasl.c
+++ b/loudmouth/lm-sasl.c
@@ -529,7 +529,7 @@ sasl_md5_prepare_response (LmSASL *sasl,
}
nonce = g_hash_table_lookup (challenge, "nonce");

48
libs/loudmouth/patches/010-add-private.patch
View File

@@ -13,8 +13,6 @@ g_type_class_add_private() will be deprecated in GLib 2.58. Replace:
loudmouth/lm-resolver.c | 28 +++++++++++++---------------
3 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/loudmouth/lm-blocking-resolver.c b/loudmouth/lm-blocking-resolver.c
index 5a25061..d980d24 100644
--- a/loudmouth/lm-blocking-resolver.c
+++ b/loudmouth/lm-blocking-resolver.c
@@ -38,10 +38,10 @@
@@ -31,7 +29,7 @@ index 5a25061..d980d24 100644
GSource *idle_source;
};
@@ -49,7 +49,7 @@ static void blocking_resolver_dispose (GObject *object);
@@ -49,7 +49,7 @@ static void blocking_resolver_finali
static void blocking_resolver_lookup (LmResolver *resolver);
static void blocking_resolver_cancel (LmResolver *resolver);
@@ -40,7 +38,7 @@ index 5a25061..d980d24 100644
static void
lm_blocking_resolver_class_init (LmBlockingResolverClass *class)
@@ -61,9 +61,6 @@ lm_blocking_resolver_class_init (LmBlockingResolverClass *class)
@@ -61,9 +61,6 @@ lm_blocking_resolver_class_init (LmBlock
resolver_class->lookup = blocking_resolver_lookup;
resolver_class->cancel = blocking_resolver_cancel;
@@ -50,7 +48,7 @@ index 5a25061..d980d24 100644
}
static void
@@ -194,7 +191,7 @@ blocking_resolver_lookup_service (LmBlockingResolver *resolver)
@@ -194,7 +191,7 @@ blocking_resolver_lookup_service (LmBloc
static gboolean
blocking_resolver_idle_lookup (LmBlockingResolver *resolver)
{
@@ -59,7 +57,7 @@ index 5a25061..d980d24 100644
gint type;
/* Start the DNS querying */
@@ -219,7 +216,7 @@ blocking_resolver_idle_lookup (LmBlockingResolver *resolver)
@@ -219,7 +216,7 @@ blocking_resolver_idle_lookup (LmBlockin
static void
blocking_resolver_lookup (LmResolver *resolver)
{
@@ -68,7 +66,7 @@ index 5a25061..d980d24 100644
GMainContext *context;
g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver));
@@ -236,7 +233,7 @@ blocking_resolver_lookup (LmResolver *resolver)
@@ -236,7 +233,7 @@ blocking_resolver_lookup (LmResolver *re
static void
blocking_resolver_cancel (LmResolver *resolver)
{
@@ -77,8 +75,6 @@ index 5a25061..d980d24 100644
g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver));
diff --git a/loudmouth/lm-feature-ping.c b/loudmouth/lm-feature-ping.c
index b2dd439..bfd1e6d 100644
--- a/loudmouth/lm-feature-ping.c
+++ b/loudmouth/lm-feature-ping.c
@@ -28,10 +28,10 @@
@@ -95,7 +91,7 @@ index b2dd439..bfd1e6d 100644
LmConnection *connection;
guint keep_alive_rate;
GSource *keep_alive_source;
@@ -55,7 +55,7 @@ feature_ping_keep_alive_reply (LmMessageHandler *handler,
@@ -55,7 +55,7 @@ feature_ping_keep_alive_reply
gpointer user_data);
static gboolean feature_ping_send_keep_alive (LmFeaturePing *fp);
@@ -104,7 +100,7 @@ index b2dd439..bfd1e6d 100644
enum {
PROP_0,
@@ -103,8 +103,6 @@ lm_feature_ping_class_init (LmFeaturePingClass *class)
@@ -103,8 +103,6 @@ lm_feature_ping_class_init (LmFeaturePin
NULL, NULL,
_lm_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -113,7 +109,7 @@ index b2dd439..bfd1e6d 100644
}
static void
@@ -127,7 +125,7 @@ feature_ping_get_property (GObject *object,
@@ -127,7 +125,7 @@ feature_ping_get_property (GObject *o
GValue *value,
GParamSpec *pspec)
{
@@ -122,7 +118,7 @@ index b2dd439..bfd1e6d 100644
priv = GET_PRIV (object);
@@ -147,7 +145,7 @@ feature_ping_set_property (GObject *object,
@@ -147,7 +145,7 @@ feature_ping_set_property (GObject
const GValue *value,
GParamSpec *pspec)
{
@@ -131,7 +127,7 @@ index b2dd439..bfd1e6d 100644
priv = GET_PRIV (object);
@@ -171,7 +169,7 @@ feature_ping_keep_alive_reply (LmMessageHandler *handler,
@@ -171,7 +169,7 @@ feature_ping_keep_alive_reply (LmMessage
LmMessage *m,
gpointer user_data)
{
@@ -140,7 +136,7 @@ index b2dd439..bfd1e6d 100644
priv = GET_PRIV (user_data);
@@ -183,7 +181,7 @@ feature_ping_keep_alive_reply (LmMessageHandler *handler,
@@ -183,7 +181,7 @@ feature_ping_keep_alive_reply (LmMessage
static gboolean
feature_ping_send_keep_alive (LmFeaturePing *fp)
{
@@ -149,7 +145,7 @@ index b2dd439..bfd1e6d 100644
LmMessage *ping;
LmMessageNode *ping_node;
LmMessageHandler *keep_alive_handler;
@@ -237,7 +235,7 @@ feature_ping_send_keep_alive (LmFeaturePing *fp)
@@ -237,7 +235,7 @@ feature_ping_send_keep_alive (LmFeatureP
void
lm_feature_ping_start (LmFeaturePing *fp)
{
@@ -158,7 +154,7 @@ index b2dd439..bfd1e6d 100644
g_return_if_fail (LM_IS_FEATURE_PING (fp));
@@ -260,7 +258,7 @@ lm_feature_ping_start (LmFeaturePing *fp)
@@ -260,7 +258,7 @@ lm_feature_ping_start (LmFeaturePing *fp
void
lm_feature_ping_stop (LmFeaturePing *fp)
{
@@ -167,8 +163,6 @@ index b2dd439..bfd1e6d 100644
g_return_if_fail (LM_IS_FEATURE_PING (fp));
diff --git a/loudmouth/lm-resolver.c b/loudmouth/lm-resolver.c
index b9d7762..a0500ef 100644
--- a/loudmouth/lm-resolver.c
+++ b/loudmouth/lm-resolver.c
@@ -36,10 +36,10 @@
@@ -185,7 +179,7 @@ index b9d7762..a0500ef 100644
GMainContext *context;
LmResolverCallback callback;
@@ -71,7 +71,7 @@ static void resolver_set_property (GObject *object,
@@ -71,7 +71,7 @@ static void resolver_set_property
const GValue *value,
GParamSpec *pspec);
@@ -194,7 +188,7 @@ index b9d7762..a0500ef 100644
enum {
PROP_0,
@@ -151,8 +151,6 @@ lm_resolver_class_init (LmResolverClass *class)
@@ -151,8 +151,6 @@ lm_resolver_class_init (LmResolverClass
"Protocol for SRV lookup",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@@ -212,7 +206,7 @@ index b9d7762..a0500ef 100644
priv = GET_PRIV (object);
@@ -190,7 +188,7 @@ resolver_get_property (GObject *object,
@@ -190,7 +188,7 @@ resolver_get_property (GObject *objec
GValue *value,
GParamSpec *pspec)
{
@@ -221,7 +215,7 @@ index b9d7762..a0500ef 100644
priv = GET_PRIV (object);
@@ -228,7 +226,7 @@ resolver_set_property (GObject *object,
@@ -228,7 +226,7 @@ resolver_set_property (GObject *obj
const GValue *value,
GParamSpec *pspec)
{
@@ -230,7 +224,7 @@ index b9d7762..a0500ef 100644
priv = GET_PRIV (object);
@@ -301,7 +299,7 @@ lm_resolver_new_for_host (const gchar *host,
@@ -301,7 +299,7 @@ lm_resolver_new_for_host (const gchar
gpointer user_data)
{
LmResolver *resolver;
@@ -239,7 +233,7 @@ index b9d7762..a0500ef 100644
g_return_val_if_fail (host != NULL, NULL);
g_return_val_if_fail (callback != NULL, NULL);
@@ -327,7 +325,7 @@ lm_resolver_new_for_service (const gchar *domain,
@@ -327,7 +325,7 @@ lm_resolver_new_for_service (const gchar
gpointer user_data)
{
LmResolver *resolver;
@@ -248,7 +242,7 @@ index b9d7762..a0500ef 100644
g_return_val_if_fail (domain != NULL, NULL);
g_return_val_if_fail (service != NULL, NULL);
@@ -373,7 +371,7 @@ lm_resolver_cancel (LmResolver *resolver)
@@ -373,7 +371,7 @@ lm_resolver_cancel (LmResolver *resolver
struct addrinfo *
lm_resolver_results_get_next (LmResolver *resolver)
{
@@ -266,7 +260,7 @@ index b9d7762..a0500ef 100644
g_return_if_fail (LM_IS_RESOLVER (resolver));
@@ -427,7 +425,7 @@ _lm_resolver_set_result (LmResolver *resolver,
@@ -427,7 +425,7 @@ _lm_resolver_set_result (LmResolver
LmResolverResult result,
struct addrinfo *results)
{

2
libs/loudmouth/patches/900-disable-docs-examples-tests.patch
View File

@@ -12,7 +12,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -307,12 +307,7 @@ AC_SUBST(LOUDMOUTH_LIBS)
@@ -320,12 +320,7 @@ AC_SUBST(LOUDMOUTH_LIBS)
AC_OUTPUT([
Makefile

13
libs/minizip/patches/010-disable-libbsd.patch
View File

@@ -12,11 +12,9 @@ https://github.com/openwrt/packages/issues/12471
CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0de10cf..217359a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ option(MZ_PKCRYPT "Enables PKWARE traditional encryption" ON)
@@ -17,6 +17,7 @@ option(MZ_PKCRYPT "Enables PKWARE tradit
option(MZ_WZAES "Enables WinZIP AES encryption" ON)
option(MZ_LIBCOMP "Enables Apple compression" OFF)
option(MZ_OPENSSL "Enables OpenSSL for encryption" OFF)
@@ -24,7 +22,7 @@ index 0de10cf..217359a 100644
option(MZ_BRG "Enables Brian Gladman's encryption library" OFF)
option(MZ_SIGNING "Enables zip signing support" ON)
option(MZ_COMPRESS_ONLY "Only support compression" OFF)
@@ -275,7 +276,7 @@ if(UNIX)
@@ -298,7 +299,7 @@ if(UNIX)
endif()
endif()
@@ -33,7 +31,7 @@ index 0de10cf..217359a 100644
find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBBSD libbsd)
@@ -288,6 +289,8 @@ if(UNIX)
@@ -311,6 +312,8 @@ if(UNIX)
list(APPEND MINIZIP_INC ${LIBBSD_INCLUDE_DIRS})
link_directories(${LIBBSD_LIBRARY_DIRS})
endif()
@@ -42,7 +40,7 @@ index 0de10cf..217359a 100644
endif()
endif()
endif()
@@ -935,6 +938,7 @@ add_feature_info(MZ_PKCRYPT MZ_PKCRYPT "Enables PKWARE traditional encryption")
@@ -943,6 +946,7 @@ add_feature_info(MZ_PKCRYPT MZ_PKCRYPT "
add_feature_info(MZ_WZAES MZ_WZAES "Enables WinZIP AES encryption")
add_feature_info(MZ_LIBCOMP MZ_LIBCOMP "Enables Apple compression")
add_feature_info(MZ_OPENSSL MZ_OPENSSL "Enables OpenSSL for encryption")
@@ -50,6 +48,3 @@ index 0de10cf..217359a 100644
add_feature_info(MZ_BRG MZ_BRG "Enables Brian Gladman's encryption library")
add_feature_info(MZ_SIGNING MZ_SIGNING "Enables zip signing support")
add_feature_info(MZ_COMPRESS_ONLY MZ_COMPRESS_ONLY "Only support compression")
--
2.17.1

4
libs/newt/patches/python_memory_allocation.patch
View File

@@ -15,7 +15,7 @@ Forwarded: no
if (!widget)
return NULL;
@@ -937,7 +937,7 @@ static snackForm * formCreate(PyObject *
@@ -932,7 +932,7 @@ static snackForm * formCreate(PyObject *
if (help == Py_None)
help = NULL;
@@ -24,7 +24,7 @@ Forwarded: no
form->fo = newtForm(NULL, help, 0);
return form;
@@ -949,7 +949,7 @@ static snackGrid * gridCreate(PyObject *
@@ -944,7 +944,7 @@ static snackGrid * gridCreate(PyObject *
if (!PyArg_ParseTuple(args, "ii", &cols, &rows)) return NULL;

13
libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch
View File

@@ -22,8 +22,6 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
pr/src/Makefile.in | 8 +-------
4 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index e737791..b578476 100644
--- a/nspr/lib/ds/Makefile.in
+++ b/nspr/lib/ds/Makefile.in
@@ -110,13 +110,7 @@ GARBAGE += $(TINC)
@@ -41,8 +39,6 @@ index e737791..b578476 100644
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index e8a6d9f..978ed28 100644
--- a/nspr/lib/libc/src/Makefile.in
+++ b/nspr/lib/libc/src/Makefile.in
@@ -112,13 +112,7 @@ GARBAGE += $(TINC)
@@ -60,8 +56,6 @@ index e8a6d9f..978ed28 100644
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
index aeb2944..f318097 100644
--- a/nspr/lib/prstreams/Makefile.in
+++ b/nspr/lib/prstreams/Makefile.in
@@ -110,13 +110,7 @@ endif
@@ -79,11 +73,9 @@ index aeb2944..f318097 100644
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index 19c5a69..b4ac31c 100644
--- a/nspr/pr/src/Makefile.in
+++ b/nspr/pr/src/Makefile.in
@@ -310,13 +310,7 @@ GARBAGE += $(TINC)
@@ -306,13 +306,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
@@ -98,6 +90,3 @@ index 19c5a69..b4ac31c 100644
$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
--
2.7.4

12
libs/nspr/patches/002-native_and_musl_fix.patch
View File

@@ -1,6 +1,6 @@
--- a/nspr/config/config.mk 2017-10-31 13:13:22.692343122 +0200
+++ b/nspr/config/config.mk 2017-10-31 13:13:58.758016378 +0200
@@ -126,6 +126,9 @@
--- a/nspr/config/config.mk
+++ b/nspr/config/config.mk
@@ -126,6 +126,9 @@ endif
ifeq ($(USE_IPV6),1)
DEFINES += -D_PR_INET6
@@ -10,9 +10,9 @@
endif
ifeq ($(MOZ_UNICODE),1)
--- a/nspr/config/Makefile.in 2019-03-31 13:44:56.919871810 +0300
+++ b/nspr/config/Makefile.in 2019-03-31 13:45:21.560545948 +0300
@@ -30,7 +30,7 @@
--- a/nspr/config/Makefile.in
+++ b/nspr/config/Makefile.in
@@ -30,7 +30,7 @@ CSRCS = now.c
# This version hasn't been ported for us; the one in mozilla/config has
ifneq ($(OS_ARCH),OS2)

2
libs/p11-kit/patches/010-stdint.patch
View File

@@ -10,8 +10,6 @@ Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
p11-kit/lists.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/p11-kit/lists.c b/p11-kit/lists.c
index 365a6d89..1d9062be 100644
--- a/p11-kit/lists.c
+++ b/p11-kit/lists.c
@@ -39,6 +39,7 @@

4
libs/pixman/patches/0004-pixman-fix-detection-of-mips-dspr2.patch
View File

@@ -1,5 +1,5 @@
--- a/configure.ac.orig 2016-11-22 20:44:21.205150763 +0800
+++ b/configure.ac 2016-11-22 20:44:55.505161500 +0800
--- a/configure.ac
+++ b/configure.ac
@@ -735,7 +735,6 @@ dnl Check if assembler is gas compatible
have_mips_dspr2=no
AC_MSG_CHECKING(whether to use MIPS DSPr2 assembler)

7
libs/pthsem/patches/001-linux3x-fix.patch
View File

@@ -1,6 +1,6 @@
--- pthsem-2.0.8/acinclude.m4
+++ pthsem-2.0.8/acinclude.m4
@@ -892,6 +892,8 @@
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -892,6 +892,8 @@ case $PLATFORM in
case "x`uname -r`" in
changequote(, )dnl
x2.[23456789]* ) ;;
@@ -9,4 +9,3 @@
changequote([, ])
* ) braindead=yes ;;
esac

10
libs/pthsem/patches/002-fix-signal.h
View File

@@ -1,5 +1,5 @@
--- a/pth.h.in 2015-07-16 21:14:48.786970549 +0200
+++ b/pth.h.in 2015-07-16 21:15:22.439416462 +0200
--- a/pth.h.in
+++ b/pth.h.in
@@ -43,7 +43,7 @@
#include <time.h> /* for struct timespec */
#include <sys/time.h> /* for struct timeval */
@@ -9,9 +9,9 @@
@EXTRA_INCLUDE_SYS_SELECT_H@
/* fallbacks for essential typedefs */
--- a/pthread.h.in 2015-07-16 21:14:58.948310639 +0200
+++ b/pthread.h.in 2015-07-16 21:15:40.989869061 +0200
@@ -111,7 +111,7 @@
--- a/pthread.h.in
+++ b/pthread.h.in
@@ -111,7 +111,7 @@ typedef int __vendor_sched_param;
#include <sys/types.h> /* for ssize_t */
#include <sys/time.h> /* for struct timeval */
#include <sys/socket.h> /* for sockaddr */

6
libs/pthsem/patches/003-linux4x-fix.patch
View File

@@ -1,7 +1,5 @@
Index: pthsem-2.0.8/acinclude.m4
===================================================================
--- pthsem-2.0.8.orig/acinclude.m4
+++ pthsem-2.0.8/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -894,6 +894,8 @@ changequote(, )dnl
x2.[23456789]* ) ;;
changequote(, )dnl

2
libs/quasselc/patches/001-respect-cflags-ldflags.patch
View File

@@ -14,7 +14,7 @@
BOTLIBS := -Wl,-rpath,.
@@ -15,10 +15,10 @@ lib_objects=setters.o getters.o main.o cmds.o negotiation.o io.o symbols.o
@@ -15,10 +15,10 @@ lib_objects=setters.o getters.o main.o c
all: bot libquasselc.so.$(VERSION) quasselc.pc
libquasselc.so.$(VERSION): $(lib_objects)

4
libs/spice/patches/010-librt-libm.patch
View File

@@ -13,11 +13,9 @@ Acked-by: Frediano Ziglio <fziglio@redhat.com>
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 1685c077..f9090a82 100644
--- a/meson.build
+++ b/meson.build
@@ -102,7 +102,7 @@ foreach dep : ['libjpeg', 'zlib']
@@ -103,7 +103,7 @@ foreach dep : ['libjpeg', 'zlib']
endforeach
if host_machine.system() != 'windows'

43
libs/spice/patches/020-no-code-generation.patch
View File

@@ -14,11 +14,9 @@ Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
tests/meson.build | 34 ++++++++++++++++++----------------
4 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/common/meson.build b/common/meson.build
index 7356cc0..14bf242 100644
--- a/subprojects/spice-common/common/meson.build
+++ b/subprojects/spice-common/common/meson.build
@@ -67,19 +67,21 @@ spice_common_dep = declare_dependency(link_with : spice_common_lib,
@@ -67,19 +67,21 @@ spice_common_dep = declare_dependency(li
# client_demarshallers
@@ -28,13 +26,6 @@ index 7356cc0..14bf242 100644
- '--include', 'common/messages.h',
- '--generated-declaration-file', '@OUTPUT1@',
- '@INPUT@', '@OUTPUT0@']
-
-client_demarshallers = custom_target('client_demarshallers',
- input : [spice_proto],
- output : ['generated_client_demarshallers.c', 'generated_messages.h'],
- install : false,
- command : [codegen_cmd, codegen_args],
- depend_files : [spice_codegen_files, 'messages.h'])
+if spice_common_generate_client_code or spice_common_generate_server_code
+ codegen_cmd = [python, spice_codegen]
+ codegen_args = ['--generate-demarshallers',
@@ -42,7 +33,13 @@ index 7356cc0..14bf242 100644
+ '--include', 'common/messages.h',
+ '--generated-declaration-file', '@OUTPUT1@',
+ '@INPUT@', '@OUTPUT0@']
+
-client_demarshallers = custom_target('client_demarshallers',
- input : [spice_proto],
- output : ['generated_client_demarshallers.c', 'generated_messages.h'],
- install : false,
- command : [codegen_cmd, codegen_args],
- depend_files : [spice_codegen_files, 'messages.h'])
+ client_demarshallers = custom_target('client_demarshallers',
+ input : [spice_proto],
+ output : ['generated_client_demarshallers.c', 'generated_messages.h'],
@@ -53,17 +50,18 @@ index 7356cc0..14bf242 100644
#
# libspice-common-client
diff --git a/meson.build b/meson.build
index 41a9419..b60a9fe 100644
--- a/subprojects/spice-common/meson.build
+++ b/subprojects/spice-common/meson.build
@@ -119,17 +119,19 @@ foreach dep, version : optional_deps
@@ -131,17 +131,19 @@ foreach dep, version : optional_deps
endforeach
# Python
-py_module = import('python')
-python = py_module.find_installation()
-
+if spice_common_generate_client_code or spice_common_generate_server_code
+ py_module = import('python')
+ python = py_module.find_installation()
-if get_option('python-checks')
- foreach module : ['six', 'pyparsing']
- message('Checking for python module @0@'.format(module))
@@ -72,10 +70,6 @@ index 41a9419..b60a9fe 100644
- error('Python module @0@ not found'.format(module))
- endif
- endforeach
+if spice_common_generate_client_code or spice_common_generate_server_code
+ py_module = import('python')
+ python = py_module.find_installation()
+
+ if get_option('python-checks')
+ foreach module : ['six', 'pyparsing']
+ message('Checking for python module @0@'.format(module))
@@ -88,11 +82,9 @@ index 41a9419..b60a9fe 100644
endif
# smartcard check
diff --git a/meson_options.txt b/meson_options.txt
index d30858f..d93d74b 100644
--- a/subprojects/spice-common/meson_options.txt
+++ b/subprojects/spice-common/meson_options.txt
@@ -39,7 +39,7 @@ option('manual',
@@ -45,7 +45,7 @@ option('manual',
option('generate-code',
type : 'combo',
@@ -101,11 +93,9 @@ index d30858f..d93d74b 100644
description : 'Which code should be built')
option('tests',
diff --git a/tests/meson.build b/tests/meson.build
index d315056..1ad5bc5 100644
--- a/subprojects/spice-common/tests/meson.build
+++ b/subprojects/spice-common/tests/meson.build
@@ -20,26 +20,28 @@ endforeach
@@ -15,26 +15,28 @@ endforeach
#
# test_marshallers
#
@@ -150,6 +140,3 @@ index d315056..1ad5bc5 100644
#
# test_quic
--
GitLab

26
libs/spice/patches/030-include-generated-code.patch
View File

@@ -10,14 +10,18 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
subprojects/spice-common/common/meson.build | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/subprojects/spice-common/common/meson.build b/subprojects/spice-common/common/meson.build
index 7356cc0..5796989 100644
--- a/subprojects/spice-common/common/meson.build
+++ b/subprojects/spice-common/common/meson.build
@@ -180,6 +180,19 @@ if spice_common_generate_server_code
endif
endforeach
@@ -187,4 +187,17 @@ if spice_common_generate_server_code
spice_common_server_dep = declare_dependency(sources : spice_common_server_dep_sources,
link_with : spice_common_server_lib,
dependencies : spice_common_dep)
+else
+ spice_common_server_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h']
+ spice_common_server_sources += ['generated_server_demarshallers.c']
+ spice_common_server_dep_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h']
+ spice_common_server_dep_sources += ['generated_server_demarshallers.c']
+
+ spice_common_server_lib = static_library('spice-common-server', spice_common_server_sources,
+ install : false,
+ dependencies : spice_common_dep)
@@ -25,12 +29,4 @@ index 7356cc0..5796989 100644
+ spice_common_server_dep = declare_dependency(sources : spice_common_server_dep_sources,
+ link_with : spice_common_server_lib,
+ dependencies : spice_common_dep)
+else
+ spice_common_server_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h']
+ spice_common_server_sources += ['generated_server_demarshallers.c']
+ spice_common_server_dep_sources = ['generated_server_marshallers.c', 'generated_server_marshallers.h']
+ spice_common_server_dep_sources += ['generated_server_demarshallers.c']
+
spice_common_server_lib = static_library('spice-common-server', spice_common_server_sources,
install : false,
dependencies : spice_common_dep)
endif

4
libs/spice/patches/040-only-server.patch
View File

@@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
@@ -192,8 +192,6 @@ add_project_arguments(compiler.get_supported_arguments(spice_server_global_cflag
@@ -192,8 +192,6 @@ add_project_arguments(compiler.get_suppo
# Subdirectories
#
subdir('server')
@@ -11,7 +11,7 @@
# write config.h
--- a/server/meson.build
+++ b/server/meson.build
@@ -186,5 +186,3 @@ spice_server_libs = both_libraries('spice-server', spice_server_sources,
@@ -186,5 +186,3 @@ spice_server_libs = both_libraries('spic
spice_server_shared_lib = spice_server_libs.get_shared_lib()
spice_server_static_lib = spice_server_libs.get_static_lib()

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