diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
| commit | 5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch) | |
| tree | d0754921833f413b7eb93fb6bb1b1c8a22fb0498 /net | |
| parent | d651082447b4392399a40ea1ae11d0bce4bfe83a (diff) | |
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'net')
174 files changed, 422 insertions, 820 deletions
diff --git a/net/aggregate/patches/500-cross_compile_flags.patch b/net/aggregate/patches/500-cross_compile_flags.patch index b7392fbb0..66feaf05a 100644 --- a/net/aggregate/patches/500-cross_compile_flags.patch +++ b/net/aggregate/patches/500-cross_compile_flags.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -25,8 +25,9 @@ +@@ -25,8 +25,9 @@ CC = @CC@ INSTALL = @INSTALL@ DEFS = @DEFS@ LIBS = @LIBS@ diff --git a/net/apache/patches/020-openssl-deprecated.patch b/net/apache/patches/020-openssl-deprecated.patch index c9794384e..667a24c68 100644 --- a/net/apache/patches/020-openssl-deprecated.patch +++ b/net/apache/patches/020-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c -@@ -708,23 +708,23 @@ const char *md_cert_get_serial_number(const md_cert_t *cert, apr_pool_t *p) +@@ -708,23 +708,23 @@ const char *md_cert_get_serial_number(co int md_cert_is_valid_now(const md_cert_t *cert) { @@ -31,7 +31,7 @@ int md_cert_covers_domain(md_cert_t *cert, const char *domain_name) --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c -@@ -226,7 +226,7 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, +@@ -226,7 +226,7 @@ apr_status_t ssl_init_Module(apr_pool_t apr_status_t rv; apr_array_header_t *pphrases; @@ -42,7 +42,7 @@ "a newer library (%s, version currently loaded is %s)" --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c -@@ -1255,9 +1255,9 @@ static apr_status_t ssl_io_filter_handshake(ssl_filter_ctx_t *filter_ctx) +@@ -1255,9 +1255,9 @@ static apr_status_t ssl_io_filter_handsh if (dc->proxy->ssl_check_peer_expire != FALSE) { if (!cert || (X509_cmp_current_time( @@ -56,7 +56,7 @@ "SSL Proxy: Peer certificate is expired"); --- a/modules/ssl/ssl_engine_log.c +++ b/modules/ssl/ssl_engine_log.c -@@ -161,10 +161,10 @@ static void ssl_log_cert_error(const char *file, int line, int level, +@@ -161,10 +161,10 @@ static void ssl_log_cert_error(const cha BIO_puts(bio, "(ERROR)"); BIO_puts(bio, " / notbefore: "); @@ -71,7 +71,7 @@ --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c -@@ -490,13 +490,13 @@ static char *ssl_var_lookup_ssl_cert(apr_pool_t *p, request_rec *r, X509 *xs, +@@ -490,13 +490,13 @@ static char *ssl_var_lookup_ssl_cert(apr result = ssl_var_lookup_ssl_cert_serial(p, xs); } else if (strcEQ(var, "V_START")) { @@ -102,7 +102,7 @@ * when the user points at an explicit non-engine flavor of OpenSSL --- a/support/ab.c +++ b/support/ab.c -@@ -652,11 +652,11 @@ static void ssl_print_cert_info(BIO *bio, X509 *cert) +@@ -652,11 +652,11 @@ static void ssl_print_cert_info(BIO *bio BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1); BIO_printf(bio,"Valid from: "); @@ -116,7 +116,7 @@ BIO_printf(bio,"\n"); pk = X509_get_pubkey(cert); -@@ -2634,8 +2634,10 @@ int main(int argc, const char * const argv[]) +@@ -2634,8 +2634,10 @@ int main(int argc, const char * const ar CRYPTO_malloc_init(); #endif #endif diff --git a/net/apcupsd/patches/010-fix-usb.patch b/net/apcupsd/patches/010-fix-usb.patch index b313bb22f..0954e16f3 100644 --- a/net/apcupsd/patches/010-fix-usb.patch +++ b/net/apcupsd/patches/010-fix-usb.patch @@ -1,5 +1,5 @@ ---- a/include/libusb.h.in.orig 2015-02-21 18:53:51.023682068 +0100 -+++ a/include/libusb.h.in 2015-02-21 18:54:14.722788757 +0100 +--- a/include/libusb.h.in ++++ b/include/libusb.h.in @@ -6,4 +6,4 @@ * path at configure time and various apcupsd bits include this
* when they need libusb's usb.h.
diff --git a/net/apcupsd/patches/015-drop-doc.patch b/net/apcupsd/patches/015-drop-doc.patch index fb90b22c0..ff2144d23 100644 --- a/net/apcupsd/patches/015-drop-doc.patch +++ b/net/apcupsd/patches/015-drop-doc.patch @@ -1,10 +1,10 @@ ---- a/Makefile.orig 2019-04-04 18:19:45.007668656 +0200 -+++ a/Makefile 2019-04-04 18:23:00.723165465 +0200 +--- a/Makefile ++++ b/Makefile @@ -1,6 +1,6 @@ topdir:=. - + -SUBDIRS=src platforms doc +SUBDIRS=src platforms include autoconf/targets.mak - + # Force platforms/ to build after src/ diff --git a/net/beanstalkd/patches/900-makefile.patch b/net/beanstalkd/patches/900-makefile.patch index f948851e2..3cac7178b 100644 --- a/net/beanstalkd/patches/900-makefile.patch +++ b/net/beanstalkd/patches/900-makefile.patch @@ -1,5 +1,3 @@ -diff --git a/Makefile b/Makefile -index a3f345f..fe5a083 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,16 @@ @@ -91,7 +89,7 @@ index a3f345f..fe5a083 100644 bench: ct/_ctcheck ct/_ctcheck -b -@@ -88,11 +79,8 @@ ct/ct.o ct/_ctcheck.o: ct/ct.h ct/internal.h +@@ -88,11 +79,8 @@ ct/ct.o ct/_ctcheck.o: ct/ct.h ct/intern $(TOFILES): $(HFILES) ct/ct.h @@ -104,7 +102,7 @@ index a3f345f..fe5a083 100644 vers.c: ./verc.sh >vers.c -@@ -100,3 +88,9 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: doc/beanstalkd.ronn +@@ -100,3 +88,9 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: ronn $< freebsd.o: darwin.c diff --git a/net/beanstalkd/patches/901-fix-headers.patch b/net/beanstalkd/patches/901-fix-headers.patch index ba6de6d78..3c97abce7 100644 --- a/net/beanstalkd/patches/901-fix-headers.patch +++ b/net/beanstalkd/patches/901-fix-headers.patch @@ -1,5 +1,5 @@ ---- a/sd-daemon.c 2017-02-16 18:50:20.000000000 -0700 -+++ b/sd-daemon.c 2017-02-16 19:21:09.086008361 -0700 +--- a/sd-daemon.c ++++ b/sd-daemon.c @@ -32,7 +32,7 @@ #include <sys/stat.h> #include <sys/socket.h> diff --git a/net/beanstalkd/patches/902-replace-posix_fallocate.patch b/net/beanstalkd/patches/902-replace-posix_fallocate.patch index 18b07c188..3371ff438 100644 --- a/net/beanstalkd/patches/902-replace-posix_fallocate.patch +++ b/net/beanstalkd/patches/902-replace-posix_fallocate.patch @@ -7,7 +7,7 @@ #include <stdint.h> #include <fcntl.h> #include <stdlib.h> -@@ -19,7 +19,7 @@ static int epfd; +@@ -19,7 +21,7 @@ static int epfd; int rawfalloc(int fd, int len) { diff --git a/net/boinc/patches/001-avoidExtraDependencies b/net/boinc/patches/001-avoidExtraDependencies index ee914978b..e70997b49 100644 --- a/net/boinc/patches/001-avoidExtraDependencies +++ b/net/boinc/patches/001-avoidExtraDependencies @@ -1,7 +1,5 @@ -Index: boinc-client_release-7.16-7.16.5/configure.ac -=================================================================== ---- boinc-client_release-7.16-7.16.5.orig/configure.ac -+++ boinc-client_release-7.16-7.16.5/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -506,8 +506,10 @@ SAH_CHECK_LIB([dl], [dlopen], [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) SAH_CHECK_LIB([nsl], [gethostbyname], diff --git a/net/boinc/patches/002-hosttypeRespected b/net/boinc/patches/002-hosttypeRespected index 6702b572e..b40271c08 100644 --- a/net/boinc/patches/002-hosttypeRespected +++ b/net/boinc/patches/002-hosttypeRespected @@ -1,7 +1,5 @@ -Index: boinc-client_release-7.16-7.16.6/client/cs_platforms.cpp -=================================================================== ---- boinc-client_release-7.16-7.16.6.orig/client/cs_platforms.cpp -+++ boinc-client_release-7.16-7.16.6/client/cs_platforms.cpp +--- a/client/cs_platforms.cpp ++++ b/client/cs_platforms.cpp @@ -76,6 +76,21 @@ void CLIENT_STATE::add_platform(const ch // void CLIENT_STATE::detect_platforms() { diff --git a/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch b/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch index da9ae7040..c4cc24dd2 100644 --- a/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch +++ b/net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch @@ -22,8 +22,6 @@ See also: src/process.c | 28 ++++++++++++++-------------- 5 files changed, 37 insertions(+), 37 deletions(-) -diff --git a/src/bwm-ng.c b/src/bwm-ng.c -index ad94ccd..c2ab0db 100644 --- a/src/bwm-ng.c +++ b/src/bwm-ng.c @@ -26,7 +26,7 @@ @@ -44,8 +42,6 @@ index ad94ccd..c2ab0db 100644 if_count=0; delay=500; #if EXTENDED_STATS -diff --git a/src/help.c b/src/help.c -index 7fd9ca4..4853297 100644 --- a/src/help.c +++ b/src/help.c @@ -24,9 +24,9 @@ @@ -60,11 +56,9 @@ index 7fd9ca4..4853297 100644 #ifdef LONG_OPTIONS printf(" %-23s",long_c); #else -diff --git a/src/options.c b/src/options.c -index 1b65eeb..30dccb4 100644 --- a/src/options.c +++ b/src/options.c -@@ -30,12 +30,12 @@ static char* getToken(char** str, const char* delims); +@@ -30,12 +30,12 @@ static char* getToken(char** str, const char *trim_whitespace(char *str); int read_config(const char *config_file); #endif @@ -81,7 +75,7 @@ index 1b65eeb..30dccb4 100644 #ifdef CONFIG_FILE /****************************************************************************** -@@ -65,7 +65,7 @@ static char* getToken(char** str, const char* delims) { +@@ -65,7 +65,7 @@ static char* getToken(char** str, const /******************************************************************************/ #endif @@ -90,7 +84,7 @@ index 1b65eeb..30dccb4 100644 if (optarg) { if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; if (!strcasecmp(optarg,"bits")) return BITS_OUT; -@@ -76,7 +76,7 @@ inline int str2output_unit(char *optarg) { +@@ -76,7 +76,7 @@ inline int str2output_unit(char *optarg) } #if EXTENDED_STATS @@ -99,7 +93,7 @@ index 1b65eeb..30dccb4 100644 if (optarg) { if (!strcasecmp(optarg,"rate")) return RATE_OUT; if (!strcasecmp(optarg,"max")) return MAX_OUT; -@@ -87,7 +87,7 @@ inline int str2output_type(char *optarg) { +@@ -87,7 +87,7 @@ inline int str2output_type(char *optarg) } #endif @@ -108,7 +102,7 @@ index 1b65eeb..30dccb4 100644 if (optarg) { if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; #ifdef HAVE_CURSES -@@ -109,7 +109,7 @@ inline int str2out_method(char *optarg) { +@@ -109,7 +109,7 @@ inline int str2out_method(char *optarg) } @@ -117,8 +111,6 @@ index 1b65eeb..30dccb4 100644 if (optarg) { #ifdef PROC_NET_DEV if (!strcasecmp(optarg,"proc")) return PROC_IN; -diff --git a/src/output.c b/src/output.c -index 653e444..1425b3c 100644 --- a/src/output.c +++ b/src/output.c @@ -25,13 +25,13 @@ @@ -140,7 +132,7 @@ index 653e444..1425b3c 100644 char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); inline static const char *output_type2str(void) { -@@ -59,7 +59,7 @@ inline static const char *output_type2str(void) { +@@ -59,7 +59,7 @@ inline static const char *output_type2st } @@ -167,7 +159,7 @@ index 653e444..1425b3c 100644 switch (mode) { case 0: return stats.in; -@@ -275,7 +275,7 @@ inline ullong direction2value(char mode,struct inout_long stats) { +@@ -275,7 +275,7 @@ inline ullong direction2value(char mode, } #if EXTENDED_STATS @@ -176,7 +168,7 @@ index 653e444..1425b3c 100644 switch (mode) { case 0: return (double)(stats.in/items); -@@ -288,7 +288,7 @@ inline double direction_max2value(char mode,struct inouttotal_double stats,int i +@@ -288,7 +288,7 @@ inline double direction_max2value(char m } #endif @@ -185,7 +177,7 @@ index 653e444..1425b3c 100644 if (dynamic) { if (value<1024) snprintf(str,buf_size,"%15.2f ",value); -@@ -306,7 +306,7 @@ inline char *dyn_byte_value2str(double value,char *str,int buf_size) { +@@ -306,7 +306,7 @@ inline char *dyn_byte_value2str(double v return str; } @@ -194,8 +186,6 @@ index 653e444..1425b3c 100644 if (dynamic) { if (value<1000) snprintf(str,buf_size,"%15.2f ",value); -diff --git a/src/process.c b/src/process.c -index 59eccf0..d06c6dd 100644 --- a/src/process.c +++ b/src/process.c @@ -26,19 +26,19 @@ @@ -225,7 +215,7 @@ index 59eccf0..d06c6dd 100644 #endif /* returns the whether to show the iface or not -@@ -74,7 +74,7 @@ short show_iface(char *instr, char *searchstr,char iface_is_up) { +@@ -74,7 +74,7 @@ short show_iface(char *instr, char *sear #if HAVE_GETTIMEOFDAY /* Returns: the time difference in milliseconds. */ @@ -234,7 +224,7 @@ index 59eccf0..d06c6dd 100644 return labs((newer.tv_sec-older.tv_sec)*1000+ (newer.tv_usec-older.tv_usec)/1000); } -@@ -95,7 +95,7 @@ float get_time_delay(int iface_num) { +@@ -92,7 +92,7 @@ float get_time_delay(int iface_num) { #endif /* basically new-old, but handles "overflow" of source aswell */ @@ -243,7 +233,7 @@ index 59eccf0..d06c6dd 100644 /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ return (new>=old) ? (ullong)(new-old) : (ullong)(( #ifdef HAVE_LIBKSTAT -@@ -136,13 +136,13 @@ t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_ +@@ -133,13 +133,13 @@ t_iface_speed_stats convert2calced_disk_ #if EXTENDED_STATS /* sub old values from cached for avg stats */ @@ -259,7 +249,7 @@ index 59eccf0..d06c6dd 100644 values->in+=data.in; values->out+=data.out; values->total+=data.total; -@@ -151,7 +151,7 @@ inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_do +@@ -148,7 +148,7 @@ inline void add_avg_values(struct inoutt /* put new-old bytes in inout_long struct into a inouttotal_double struct * and add values to cached .value struct */ @@ -268,7 +258,7 @@ index 59eccf0..d06c6dd 100644 data->in=calced_stats.in*multiplier; data->out=calced_stats.out*multiplier; data->total=(calced_stats.in+calced_stats.out)*multiplier; -@@ -201,13 +201,13 @@ void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float mult +@@ -198,13 +198,13 @@ void save_avg(struct t_avg *avg,struct i } /* add current in and out bytes to totals struct */ diff --git a/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch b/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch index 44a644dd9..38acd1cac 100644 --- a/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch +++ b/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch @@ -7,8 +7,6 @@ Subject: [PATCH] OpenSSL 1.1.0 compile fix. crypto.c | 53 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 18 deletions(-) -diff --git a/crypto.c b/crypto.c -index e476611..e8b72d3 100644 --- a/crypto.c +++ b/crypto.c @@ -46,6 +46,10 @@ openssl dgst \ @@ -22,7 +20,7 @@ index e476611..e8b72d3 100644 EVP_PKEY * crypto_load_key(const char *key, const bool is_private) { -@@ -80,7 +84,7 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -80,7 +84,7 @@ crypto_rsa_verify_signature(struct strin { int err; bool retval; @@ -31,7 +29,7 @@ index e476611..e8b72d3 100644 EVP_PKEY *pkey; /* load public key into openssl structure */ -@@ -89,15 +93,22 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -89,15 +93,22 @@ crypto_rsa_verify_signature(struct strin log_err("crypto_verify_signature: key loading failed\n"); return false; } @@ -58,7 +56,7 @@ index e476611..e8b72d3 100644 EVP_PKEY_free(pkey); if (err != 1) { -@@ -110,7 +121,7 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -110,7 +121,7 @@ crypto_rsa_verify_signature(struct strin retval = true; bailout_ctx_cleanup: @@ -67,7 +65,7 @@ index e476611..e8b72d3 100644 //log_info("Signature Verified Ok.\n"); return retval; -@@ -146,7 +157,7 @@ crypto_rsa_decrypt(struct string *ciphertext, const char *privkey, struct string +@@ -146,7 +157,7 @@ crypto_rsa_decrypt(struct string *cipher len = RSA_private_decrypt(string_length(ciphertext), (unsigned char*)string_get(ciphertext), (unsigned char*)string_get(decrypted), @@ -118,7 +116,7 @@ index e476611..e8b72d3 100644 goto bail_out; } -@@ -201,7 +217,7 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -201,7 +217,7 @@ crypto_aes_decrypt(struct string *cipher goto bail_out; } @@ -127,7 +125,7 @@ index e476611..e8b72d3 100644 &decryptdone, (unsigned char*)string_get(ciphertext), string_length(ciphertext))) { /* TODO: need cleaner way: */ -@@ -212,7 +228,7 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -212,7 +228,7 @@ crypto_aes_decrypt(struct string *cipher goto bail_out; } @@ -136,7 +134,7 @@ index e476611..e8b72d3 100644 (unsigned char*)string_get(decrypted)+string_length(decrypted), &decryptdone)) { /* TODO: need cleaner way: */ -@@ -226,7 +242,8 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -226,7 +242,8 @@ crypto_aes_decrypt(struct string *cipher retval = true; bail_out: diff --git a/net/chaosvpn/patches/010-openssl-deprecated.patch b/net/chaosvpn/patches/010-openssl-deprecated.patch index 4690f92cf..5d1ebf444 100644 --- a/net/chaosvpn/patches/010-openssl-deprecated.patch +++ b/net/chaosvpn/patches/010-openssl-deprecated.patch @@ -32,7 +32,7 @@ } void -@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void) +@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void * OpenSSL library used. * Output a warning if not. */ diff --git a/net/conserver/patches/001-remove-strip.patch b/net/conserver/patches/001-remove-strip.patch index 9271c5102..2befd20d3 100644 --- a/net/conserver/patches/001-remove-strip.patch +++ b/net/conserver/patches/001-remove-strip.patch @@ -1,7 +1,6 @@ -diff -ur conserver-8.2.1.old/autologin/Makefile.in conserver-8.2.1/autologin/Makefile.in ---- conserver-8.2.1.old/autologin/Makefile.in 2013-09-14 00:46:49.000000000 +0200 -+++ conserver-8.2.1/autologin/Makefile.in 2016-03-30 17:11:44.489446435 +0200 -@@ -9,7 +9,7 @@ +--- a/autologin/Makefile.in ++++ b/autologin/Makefile.in +@@ -9,7 +9,7 @@ sysconfdir = @sysconfdir@ ### Installation programs and flags INSTALL = @INSTALL@ @@ -10,10 +9,9 @@ diff -ur conserver-8.2.1.old/autologin/Makefile.in conserver-8.2.1/autologin/Mak LN_S = @LN_S@ MKDIR = @MKDIR@ -diff -ur conserver-8.2.1.old/conserver/Makefile.in conserver-8.2.1/conserver/Makefile.in ---- conserver-8.2.1.old/conserver/Makefile.in 2013-09-14 00:46:53.000000000 +0200 -+++ conserver-8.2.1/conserver/Makefile.in 2016-03-30 17:11:44.509446803 +0200 -@@ -14,7 +14,7 @@ +--- a/conserver/Makefile.in ++++ b/conserver/Makefile.in +@@ -14,7 +14,7 @@ exampledir = $(datadir)/examples/conserv ### Installation programs and flags INSTALL = @INSTALL@ @@ -22,10 +20,9 @@ diff -ur conserver-8.2.1.old/conserver/Makefile.in conserver-8.2.1/conserver/Mak LN_S = @LN_S@ MKDIR = @MKDIR@ -diff -ur conserver-8.2.1.old/console/Makefile.in conserver-8.2.1/console/Makefile.in ---- conserver-8.2.1.old/console/Makefile.in 2013-09-14 00:46:55.000000000 +0200 -+++ conserver-8.2.1/console/Makefile.in 2016-03-30 17:11:44.481446288 +0200 -@@ -10,7 +10,7 @@ +--- a/console/Makefile.in ++++ b/console/Makefile.in +@@ -10,7 +10,7 @@ mandir = @mandir@ ### Installation programs and flags INSTALL = @INSTALL@ @@ -34,10 +31,9 @@ diff -ur conserver-8.2.1.old/console/Makefile.in conserver-8.2.1/console/Makefil LN_S = @LN_S@ MKDIR = @MKDIR@ -diff -ur conserver-8.2.1.old/contrib/chat/Makefile.in conserver-8.2.1/contrib/chat/Makefile.in ---- conserver-8.2.1.old/contrib/chat/Makefile.in 2013-09-14 00:47:31.000000000 +0200 -+++ conserver-8.2.1/contrib/chat/Makefile.in 2016-03-30 17:11:44.501446656 +0200 -@@ -10,7 +10,7 @@ +--- a/contrib/chat/Makefile.in ++++ b/contrib/chat/Makefile.in +@@ -10,7 +10,7 @@ mandir = @mandir@ ### Installation programs and flags INSTALL = @INSTALL@ diff --git a/net/coova-chilli/patches/200-wolfssl.patch b/net/coova-chilli/patches/200-wolfssl.patch index 9cc61da9c..dac526dae 100644 --- a/net/coova-chilli/patches/200-wolfssl.patch +++ b/net/coova-chilli/patches/200-wolfssl.patch @@ -11,7 +11,7 @@ [Define if you have cyassl]) --- a/src/ippool.c +++ b/src/ippool.c -@@ -35,6 +35,7 @@ int ippool_print(int fd, struct ippool_t *this) { +@@ -35,6 +35,7 @@ int ippool_print(int fd, struct ippool_t char * sep = "-- %-15s ------------------------------------------------------------\n"; #define ERR 0 @@ -31,7 +31,7 @@ struct MD5Context { --- a/src/ssl.c +++ b/src/ssl.c -@@ -131,7 +131,7 @@ _openssl_env_init(openssl_env *env, char *engine, int server) { +@@ -131,7 +131,7 @@ _openssl_env_init(openssl_env *env, char */ const long options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION; env->meth = SSLv23_method(); diff --git a/net/coova-chilli/patches/300-sysinfo.patch b/net/coova-chilli/patches/300-sysinfo.patch index 033b5ef94..3881d2a74 100644 --- a/net/coova-chilli/patches/300-sysinfo.patch +++ b/net/coova-chilli/patches/300-sysinfo.patch @@ -11,8 +11,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com> src/system.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/system.h b/src/system.h -index 257b65b..5c1aa4a 100644 --- a/src/system.h +++ b/src/system.h @@ -114,6 +114,7 @@ diff --git a/net/darkstat/patches/101-allow-multiple-local-interfaces.patch b/net/darkstat/patches/101-allow-multiple-local-interfaces.patch index b2b22faa5..7f2e00f87 100644 --- a/net/darkstat/patches/101-allow-multiple-local-interfaces.patch +++ b/net/darkstat/patches/101-allow-multiple-local-interfaces.patch @@ -37,7 +37,7 @@ } verbosef("local network address: %s", addr_to_str(&localnet)); -@@ -138,11 +145,15 @@ static int addr_is_local(const struct addr * const a, +@@ -138,11 +145,15 @@ static int addr_is_local(const struct ad if (is_localip(a, local_ips)) return 1; if (a->family == IPv4 && using_localnet4) { @@ -59,7 +59,7 @@ } --- a/darkstat.c +++ b/darkstat.c -@@ -193,7 +193,7 @@ static struct cmdline_arg cmdline_args[] = { +@@ -193,7 +193,7 @@ static struct cmdline_arg cmdline_args[] {"-r", "capfile", cb_capfile, 0}, {"-p", "port", cb_port, 0}, {"-b", "bindaddr", cb_bindaddr, -1}, diff --git a/net/davfs2/patches/010-main_code_fix.patch b/net/davfs2/patches/010-main_code_fix.patch index 99b588f8f..a20430fbe 100644 --- a/net/davfs2/patches/010-main_code_fix.patch +++ b/net/davfs2/patches/010-main_code_fix.patch @@ -1,6 +1,6 @@ --- a/src/webdav.c +++ b/src/webdav.c -@@ -2037,7 +2037,7 @@ ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert) +@@ -2045,7 +2045,7 @@ ssl_verify(void *userdata, int failures, len = getline(&s, &n, stdin); if (len < 0) abort(); diff --git a/net/davfs2/patches/030-realpath.patch b/net/davfs2/patches/030-realpath.patch index a1658e27a..27a5588f5 100644 --- a/net/davfs2/patches/030-realpath.patch +++ b/net/davfs2/patches/030-realpath.patch @@ -1,6 +1,6 @@ --- a/src/mount_davfs.c +++ b/src/mount_davfs.c -@@ -702,7 +702,7 @@ check_fstab(const dav_args *args) +@@ -672,7 +672,7 @@ check_fstab(const dav_args *args) struct mntent *ft = getmntent(fstab); while (ft) { if (ft->mnt_dir) { @@ -9,7 +9,7 @@ if (mp) { if (strcmp(mp, mpoint) == 0) { free(mp); -@@ -966,7 +966,7 @@ parse_commandline(int argc, char *argv[]) +@@ -911,7 +911,7 @@ parse_commandline(int argc, char *argv[] url = ne_strdup(argv[i]); } i++; @@ -18,7 +18,7 @@ if (!mpoint) error(EXIT_FAILURE, 0, _("can't evaluate path of mount point %s"), mpoint); -@@ -2188,7 +2188,7 @@ read_config(dav_args *args, const char * filename, int system) +@@ -2131,7 +2131,7 @@ read_config(dav_args *args, const char * error_at_line(EXIT_FAILURE, 0, filename, lineno, _("malformed line")); *(parmv[0] + strlen(parmv[0]) - 1) = '\0'; @@ -27,7 +27,7 @@ if (mp) { applies = (strcmp(mp, mpoint) == 0); free(mp); -@@ -2440,7 +2440,7 @@ read_secrets(dav_args *args, const char *filename) +@@ -2386,7 +2386,7 @@ read_secrets(dav_args *args, const char if (scheme && !port) port = ne_uri_defaultport(scheme); diff --git a/net/davfs2/patches/050-sys-types.patch b/net/davfs2/patches/050-sys-types.patch index 9478b8b78..0e82c7490 100644 --- a/net/davfs2/patches/050-sys-types.patch +++ b/net/davfs2/patches/050-sys-types.patch @@ -1,6 +1,6 @@ --- a/src/kernel_interface.c +++ b/src/kernel_interface.c -@@ -45,6 +45,8 @@ +@@ -46,6 +46,8 @@ #include <unistd.h> #endif diff --git a/net/dcwapd/patches/01_add_uci_config_provider.patch b/net/dcwapd/patches/01_add_uci_config_provider.patch index afb034bdd..de6eec91b 100644 --- a/net/dcwapd/patches/01_add_uci_config_provider.patch +++ b/net/dcwapd/patches/01_add_uci_config_provider.patch @@ -1,4 +1,4 @@ ---- a/dev/null +--- /dev/null +++ b/dcwlinux/uci_configuration_provider.h @@ -0,0 +1,104 @@ +#ifndef UCI_CONFIGURATION_PROVIDER_H_INCLUDED @@ -105,7 +105,7 @@ +}; //namespace dcwlinux { + +#endif //#ifndef UCI_CONFIGURATION_PROVIDER_H_INCLUDED ---- a/dev/null +--- /dev/null +++ b/dcwlinux/uci_configuration_provider.cxx @@ -0,0 +1,365 @@ + diff --git a/net/dnscrypt-proxy/patches/010-internal.patch b/net/dnscrypt-proxy/patches/010-internal.patch index f10a85f1b..18b27ab4b 100644 --- a/net/dnscrypt-proxy/patches/010-internal.patch +++ b/net/dnscrypt-proxy/patches/010-internal.patch @@ -1,6 +1,6 @@ --- a/src/proxy/app.c +++ b/src/proxy/app.c -@@ -391,7 +391,7 @@ dnscrypt_proxy_main(int argc, char *argv[]) +@@ -391,7 +391,7 @@ dnscrypt_proxy_main(int argc, char *argv } logger_noformat(&proxy_context, LOG_NOTICE, "Starting " PACKAGE_STRING); sodium_mlock(&proxy_context, sizeof proxy_context); diff --git a/net/eoip/patches/100-add_LF_to_pidfile.patch b/net/eoip/patches/100-add_LF_to_pidfile.patch index bb66d146d..66278d465 100644 --- a/net/eoip/patches/100-add_LF_to_pidfile.patch +++ b/net/eoip/patches/100-add_LF_to_pidfile.patch @@ -1,6 +1,6 @@ ---- a/eoip.c 2013-09-25 22:50:48.272763057 +0200 -+++ b/eoip.c 2013-09-25 22:51:03.804762840 +0200 -@@ -430,7 +430,7 @@ +--- a/eoip.c ++++ b/eoip.c +@@ -430,7 +430,7 @@ int main(int argc, char **argv) exit(1); mfd = fopen(pidfile, "w"); diff --git a/net/etherwake/patches/110-format_security_fix.patch b/net/etherwake/patches/110-format_security_fix.patch index e937fb341..165d2ce2c 100644 --- a/net/etherwake/patches/110-format_security_fix.patch +++ b/net/etherwake/patches/110-format_security_fix.patch @@ -1,6 +1,6 @@ --- a/ether-wake.c +++ b/ether-wake.c -@@ -135,7 +135,7 @@ int main(int argc, char *argv[]) +@@ -131,7 +131,7 @@ int main(int argc, char *argv[]) case 'D': debug++; break; case 'i': ifname = optarg; break; case 'p': get_wol_pw(optarg); break; @@ -9,7 +9,7 @@ case 'v': verbose++; break; case 'V': do_version++; break; case '?': -@@ -144,7 +144,7 @@ int main(int argc, char *argv[]) +@@ -140,7 +140,7 @@ int main(int argc, char *argv[]) if (verbose || do_version) printf("%s\n", version_msg); if (errflag) { @@ -17,3 +17,4 @@ + fprintf(stderr, "%s\n", brief_usage_msg); return 3; } + diff --git a/net/etherwake/patches/120-musl-compat.patch b/net/etherwake/patches/120-musl-compat.patch index a2cdfba9d..e55f57248 100644 --- a/net/etherwake/patches/120-musl-compat.patch +++ b/net/etherwake/patches/120-musl-compat.patch @@ -1,6 +1,6 @@ --- a/ether-wake.c +++ b/ether-wake.c -@@ -82,14 +82,8 @@ static char usage_msg[] = +@@ -78,14 +78,8 @@ static char usage_msg[] = #include <linux/if.h> #include <features.h> diff --git a/net/foolsm/patches/100-plugin-export-dir.patch b/net/foolsm/patches/100-plugin-export-dir.patch index 028413f89..79c3bcd8e 100644 --- a/net/foolsm/patches/100-plugin-export-dir.patch +++ b/net/foolsm/patches/100-plugin-export-dir.patch @@ -1,6 +1,6 @@ ---- a/defs.h 2016-11-10 07:22:50.275506874 -0500 -+++ b/defs.h 2016-11-10 07:22:58.639469850 -0500 -@@ -22,7 +22,7 @@ +--- a/defs.h ++++ b/defs.h +@@ -22,7 +22,7 @@ License: GPLv2 #define min(x, y) ((x)<(y) ? (x) : (y)) diff --git a/net/foolsm/patches/110-missing-WAIT_ANY.patch b/net/foolsm/patches/110-missing-WAIT_ANY.patch index 4409a8c42..673baa87e 100644 --- a/net/foolsm/patches/110-missing-WAIT_ANY.patch +++ b/net/foolsm/patches/110-missing-WAIT_ANY.patch @@ -1,6 +1,6 @@ ---- a/forkexec.c 2017-11-02 07:45:28.679821530 -0400 -+++ /bforkexec.c 2017-11-02 07:44:54.527653043 -0400 -@@ -108,7 +108,7 @@ +--- a/forkexec.c ++++ b/forkexec.c +@@ -108,7 +108,7 @@ static void sigchld_hdl(int sig) int script_status; pid_t pid; diff --git a/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch b/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch index 559119ddc..73561f50f 100644 --- a/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch +++ b/net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch @@ -9,7 +9,7 @@ Last-Update: 2020-04-28 --- a/src/main/tls.c +++ b/src/main/tls.c -@@ -675,7 +675,7 @@ tls_session_t *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQU +@@ -675,7 +675,7 @@ tls_session_t *tls_new_session(TALLOC_CT state->mtu = vp->vp_integer; } @@ -36,7 +36,7 @@ Last-Update: 2020-04-28 /* * Create a unique context Id per EAP-TLS configuration. */ -@@ -3571,7 +3571,7 @@ fr_tls_server_conf_t *tls_server_conf_parse(CONF_SECTION *cs) +@@ -3571,7 +3571,7 @@ fr_tls_server_conf_t *tls_server_conf_pa goto error; } diff --git a/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch b/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch index c3f368e24..e2cdfb9f7 100644 --- a/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch +++ b/net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch @@ -9,4 +9,3 @@ fi ( - diff --git a/net/freeradius3/patches/010-openssl-deprecated.patch b/net/freeradius3/patches/010-openssl-deprecated.patch index 203b71378..aeaf4928e 100644 --- a/net/freeradius3/patches/010-openssl-deprecated.patch +++ b/net/freeradius3/patches/010-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/src/main/threads.c +++ b/src/main/threads.c -@@ -298,6 +298,7 @@ static void ssl_locking_function(int mode, int n, UNUSED char const *file, UNUSE +@@ -298,6 +298,7 @@ static void ssl_locking_function(int mod */ int tls_mutexes_init(void) { @@ -18,7 +18,7 @@ } --- a/src/main/tls.c +++ b/src/main/tls.c -@@ -55,6 +55,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ +@@ -55,6 +55,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API # include <openssl/evp.h> # endif # include <openssl/ssl.h> @@ -26,7 +26,7 @@ #define LOG_PREFIX "tls" -@@ -2133,7 +2134,7 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx) +@@ -2133,7 +2134,7 @@ int cbtls_verify(int ok, X509_STORE_CTX int my_ok = ok; ASN1_INTEGER *sn = NULL; @@ -35,7 +35,7 @@ VALUE_PAIR **certs; char **identity; #ifdef HAVE_OPENSSL_OCSP_H -@@ -2207,7 +2208,7 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx) +@@ -2207,7 +2208,7 @@ int cbtls_verify(int ok, X509_STORE_CTX * Get the Expiration Date */ buf[0] = '\0'; @@ -44,7 +44,7 @@ if (certs && (lookup <= 1) && asn_time && (asn_time->length < (int) sizeof(buf))) { memcpy(buf, (char*) asn_time->data, asn_time->length); -@@ -2220,7 +2221,7 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx) +@@ -2220,7 +2221,7 @@ int cbtls_verify(int ok, X509_STORE_CTX * Get the Valid Since Date */ buf[0] = '\0'; @@ -53,7 +53,7 @@ if (certs && (lookup <= 1) && asn_time && (asn_time->length < (int) sizeof(buf))) { memcpy(buf, (char*) asn_time->data, asn_time->length); -@@ -2690,10 +2691,12 @@ static int set_ecdh_curve(SSL_CTX *ctx, char const *ecdh_curve, bool disable_sin +@@ -2690,10 +2691,12 @@ static int set_ecdh_curve(SSL_CTX *ctx, */ int tls_global_init(bool spawn_flag, bool check) { @@ -66,7 +66,7 @@ /* * Initialize the index for the certificates. -@@ -2769,6 +2772,7 @@ int tls_global_version_check(char const *acknowledged) +@@ -2769,6 +2772,7 @@ int tls_global_version_check(char const */ void tls_global_cleanup(void) { diff --git a/net/frr/patches/098-fix_mips_libyang.patch b/net/frr/patches/098-fix_mips_libyang.patch index 3785cfef3..adf0785b5 100644 --- a/net/frr/patches/098-fix_mips_libyang.patch +++ b/net/frr/patches/098-fix_mips_libyang.patch @@ -1,6 +1,6 @@ --- a/lib/northbound.h +++ b/lib/northbound.h -@@ -504,11 +504,7 @@ struct frr_yang_module_info { +@@ -562,11 +562,7 @@ struct frr_yang_module_info { /* Priority - lower priorities are processed first. */ uint32_t priority; diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch index bb7a61d13..3fa826b6b 100644 --- a/net/git/patches/100-configure_for_crosscompiling.patch +++ b/net/git/patches/100-configure_for_crosscompiling.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -952,7 +952,8 @@ AC_RUN_IFELSE( +@@ -1001,7 +1001,8 @@ AC_RUN_IFELSE( FILE *f = fopen(".", "r"); return f != NULL;]])], [ac_cv_fread_reads_directories=no], @@ -10,7 +10,7 @@ ]) if test $ac_cv_fread_reads_directories = yes; then FREAD_READS_DIRECTORIES=UnfortunatelyYes -@@ -986,7 +987,8 @@ AC_RUN_IFELSE( +@@ -1035,7 +1036,8 @@ AC_RUN_IFELSE( if (snprintf(buf, 3, "%s", "12345") != 5 || strcmp(buf, "12")) return 1]])], [ac_cv_snprintf_returns_bogus=no], @@ -20,7 +20,7 @@ ]) if test $ac_cv_snprintf_returns_bogus = yes; then SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes -@@ -1009,7 +1011,8 @@ yippeeyeswehaveit +@@ -1058,7 +1060,8 @@ yippeeyeswehaveit #endif ]), [ac_cv_sane_mode_bits=yes], diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index e38301136..5de4e9330 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1378,7 +1378,7 @@ endif +@@ -1428,7 +1428,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" diff --git a/net/git/patches/310-fix-uname-detection-for-crosscompiling b/net/git/patches/310-fix-uname-detection-for-crosscompiling index 3831958c3..0402a8f41 100644 --- a/net/git/patches/310-fix-uname-detection-for-crosscompiling +++ b/net/git/patches/310-fix-uname-detection-for-crosscompiling @@ -20,12 +20,11 @@ Signed-off-by: Mauro Condarelli <mc5686 at mclink.it> config.mak.uname | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/config.mak.uname b/config.mak.uname -index 40d6b29..d933b23 100644 --- a/config.mak.uname +++ b/config.mak.uname -@@ -1,11 +1,11 @@ - # Platform specific Makefile tweaks based on uname detection +@@ -4,12 +4,12 @@ + # Microsoft's Safe Exception Handling in libraries (such as zlib). + # Typically required for VS2013+/32-bit compilation on Vista+ versions. -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') -uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') @@ -41,4 +40,4 @@ index 40d6b29..d933b23 100644 +uname_V ?= $(shell sh -c 'uname -v 2>/dev/null || echo not') ifdef MSVC - # avoid the MingW and Cygwin configuration sections + # avoid the MingW and Cygwin configuration sections diff --git a/net/gitolite/patches/0100-avoid-ssh-keygen.patch b/net/gitolite/patches/0100-avoid-ssh-keygen.patch index f74e51785..253e0f9f0 100644 --- a/net/gitolite/patches/0100-avoid-ssh-keygen.patch +++ b/net/gitolite/patches/0100-avoid-ssh-keygen.patch @@ -11,10 +11,8 @@ gitolite: Eliminate the need for ssh-keygen dependency embedded distro such as OpenWrt. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com> -Index: gitolite-3.6.11/src/lib/Gitolite/Common.pm -=================================================================== ---- gitolite-3.6.11.orig/src/lib/Gitolite/Common.pm -+++ gitolite-3.6.11/src/lib/Gitolite/Common.pm +--- a/src/lib/Gitolite/Common.pm ++++ b/src/lib/Gitolite/Common.pm @@ -26,6 +26,8 @@ package Gitolite::Common; use Exporter 'import'; use File::Path qw(mkpath); @@ -24,7 +22,7 @@ Index: gitolite-3.6.11/src/lib/Gitolite/Common.pm use Carp qw(carp cluck croak confess); use strict; -@@ -352,43 +352,82 @@ sub logger_plus_stderr { +@@ -352,43 +354,82 @@ sub logger_plus_stderr { } # ---------------------------------------------------------------------- diff --git a/net/horst/patches/0001-reproducible-builds.patch b/net/horst/patches/0001-reproducible-builds.patch index 541d16f74..cde876d1b 100644 --- a/net/horst/patches/0001-reproducible-builds.patch +++ b/net/horst/patches/0001-reproducible-builds.patch @@ -1,7 +1,5 @@ -Index: horst-5.1/conf_options.c -=================================================================== ---- horst-5.1.orig/conf_options.c -+++ horst-5.1/conf_options.c +--- a/conf_options.c ++++ b/conf_options.c @@ -519,7 +519,7 @@ void config_parse_file_and_cmdline(int a conf_filename = optarg; break; @@ -11,10 +9,8 @@ Index: horst-5.1/conf_options.c exit(0); case 'h': case '?': -Index: horst-5.1/display-help.c -=================================================================== ---- horst-5.1.orig/display-help.c -+++ horst-5.1/display-help.c +--- a/display-help.c ++++ b/display-help.c @@ -36,7 +36,7 @@ void update_help_win(WINDOW *win) print_centered(win, 2, COLS, "HORST - Horsts OLSR Radio Scanning Tool (or)"); print_centered(win, 3, COLS, "HORST - Highly Optimized Radio Scanning Tool"); diff --git a/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch b/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch index fd07db5f0..9ef603928 100644 --- a/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch +++ b/net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch @@ -15,8 +15,6 @@ Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> create mode 100644 ibrdtn/daemon/src/security/exchange/openssl_compat.cpp create mode 100644 ibrdtn/daemon/src/security/exchange/openssl_compat.h -diff --git a/src/security/exchange/DHProtocol.cpp b/src/security/exchange/DHProtocol.cpp -index e94c5026..3e0ad717 100644 --- a/src/security/exchange/DHProtocol.cpp +++ b/src/security/exchange/DHProtocol.cpp @@ -30,6 +30,7 @@ @@ -97,8 +95,6 @@ index e94c5026..3e0ad717 100644 manager.submit(session, response); -diff --git a/src/security/exchange/Makefile.am b/src/security/exchange/Makefile.am -index a6b2f832..71ed8365 100644 --- a/src/security/exchange/Makefile.am +++ b/src/security/exchange/Makefile.am @@ -22,6 +22,8 @@ exchange_SOURCES += \ @@ -110,9 +106,6 @@ index a6b2f832..71ed8365 100644 QRCodeProtocol.h \ QRCodeProtocol.cpp -diff --git a/src/security/exchange/openssl_compat.cpp b/src/security/exchange/openssl_compat.cpp -new file mode 100644 -index 00000000..e3baba0f --- /dev/null +++ b/src/security/exchange/openssl_compat.cpp @@ -0,0 +1,62 @@ @@ -178,9 +171,6 @@ index 00000000..e3baba0f +} + +#endif /* OPENSSL_VERSION_NUMBER */ -diff --git a/src/security/exchange/openssl_compat.h b/src/security/exchange/openssl_compat.h -new file mode 100644 -index 00000000..29e7d415 --- /dev/null +++ b/src/security/exchange/openssl_compat.h @@ -0,0 +1,13 @@ @@ -197,6 +187,3 @@ index 00000000..29e7d415 +
+#endif /* OPENSSL_VERSION_NUMBER */
+#endif /* LIBCRYPTO_COMPAT_H */
--- -2.16.1 - diff --git a/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch b/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch index b006ff843..1f0a239b4 100644 --- a/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch +++ b/net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch @@ -22,11 +22,9 @@ Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> ifstat.h | 6 +-- snmp.c | 12 +++--- -diff --git a/data.c b/data.c -index e29149b..9af27bf 100644 --- a/data.c +++ b/data.c -@@ -103,8 +103,8 @@ void ifstat_free_interface(struct ifstat_data *data) { +@@ -103,8 +103,8 @@ void ifstat_free_interface(struct ifstat } void ifstat_set_interface_stats(struct ifstat_data *data, @@ -37,8 +35,6 @@ index e29149b..9af27bf 100644 if (data->bout > bytesout || data->bin > bytesin) { if (!ifstat_quiet) ifstat_error("warning: rollover for interface %s, reinitialising.", data->name); -diff --git a/drivers.c b/drivers.c -index d5ac501..2861fff 100644 --- a/drivers.c +++ b/drivers.c @@ -140,6 +140,7 @@ char *strchr (), *strrchr (); @@ -49,7 +45,7 @@ index d5ac501..2861fff 100644 #ifdef IFF_LOOPBACK if ((ifflags & IFF_LOOPBACK) && !(ifs->flags & IFSTAT_LOOPBACK)) return; -@@ -242,6 +243,7 @@ static int ioctl_map_scan(int sd, struct ifreq *ifr, void *data) { +@@ -242,6 +243,7 @@ static int ioctl_map_scan(int sd, struct static int ioctl_scan_interfaces(struct ifstat_driver *driver, struct ifstat_list *ifs) { int sd; @@ -57,7 +53,7 @@ index d5ac501..2861fff 100644 if ((sd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ifstat_perror("socket"); -@@ -256,7 +258,7 @@ static int ioctl_scan_interfaces(struct ifstat_driver *driver, +@@ -256,7 +258,7 @@ static int ioctl_scan_interfaces(struct #endif #ifdef USE_KSTAT @@ -66,7 +62,7 @@ index d5ac501..2861fff 100644 kstat_named_t *data; if ((data = kstat_data_lookup(ksp, name)) == NULL) -@@ -277,7 +279,7 @@ static int get_kstat_long(kstat_t *ksp, char *name, unsigned long *value) { +@@ -277,7 +279,7 @@ static int get_kstat_long(kstat_t *ksp, *value = data->value.ui64; break; #else @@ -75,7 +71,7 @@ index d5ac501..2861fff 100644 *value = data->value.ll; break; case KSTAT_DATA_ULONGLONG: -@@ -311,7 +313,7 @@ static int kstat_open_driver(struct ifstat_driver *driver, +@@ -311,7 +313,7 @@ static int kstat_open_driver(struct ifst static int kstat_get_stats(struct ifstat_driver *driver, struct ifstat_list *ifs) { @@ -84,7 +80,7 @@ index d5ac501..2861fff 100644 struct ifstat_data *cur; kstat_ctl_t *kc = driver->data; kstat_t *ksp; -@@ -802,7 +804,7 @@ static int proc_get_stats(struct ifstat_driver *driver, +@@ -802,7 +804,7 @@ static int proc_get_stats(struct ifstat_ char buf[1024]; FILE *f; char *iface, *stats; @@ -93,7 +89,7 @@ index d5ac501..2861fff 100644 struct ifstat_data *cur; struct proc_driver_data *data = driver->data; char *file; -@@ -839,7 +841,7 @@ static int proc_get_stats(struct ifstat_driver *driver, +@@ -839,7 +841,7 @@ static int proc_get_stats(struct ifstat_ iface++; if (*iface == '\0') continue; @@ -102,7 +98,7 @@ index d5ac501..2861fff 100644 continue; if ((cur = ifstat_get_interface(ifs, iface)) != NULL) -@@ -1326,9 +1328,9 @@ static int win32_get_stats(struct ifstat_driver *driver, +@@ -1326,9 +1328,9 @@ static int win32_get_stats(struct ifstat for (i = 0; i < iftable->dwNumEntries; i++) { if ((cur = ifstat_get_interface(ifs, iftable->table[i].bDescr)) != NULL) ifstat_set_interface_stats(cur, @@ -114,7 +110,7 @@ index d5ac501..2861fff 100644 iftable->table[i].dwOutOctets); } return 1; -@@ -1346,40 +1348,40 @@ void win32_close_driver(struct ifstat_driver *driver) { +@@ -1346,40 +1348,40 @@ void win32_close_driver(struct ifstat_dr static struct ifstat_driver drivers[] = { #ifdef USE_KSTAT { "kstat", &kstat_open_driver, &ioctl_scan_interfaces, &kstat_get_stats, @@ -165,11 +161,9 @@ index d5ac501..2861fff 100644 int ifstat_get_driver(char *name, struct ifstat_driver *driver) { int num = 0; -diff --git a/ifstat.c b/ifstat.c -index 942aa94..0521e71 100644 --- a/ifstat.c +++ b/ifstat.c -@@ -215,7 +215,8 @@ static RETSIGTYPE update_termsize(int sig) { +@@ -215,7 +215,8 @@ static RETSIGTYPE update_termsize(int si int _sigcont = 0; #ifdef SIGCONT static RETSIGTYPE sigcont(int sig) { @@ -188,8 +182,6 @@ index 942aa94..0521e71 100644 #define LEN(options, namelen) (((options) & OPT_FIXEDWIDTH || (namelen) < WIDTH) ? WIDTH : (namelen)) #define FMT(n) (((n) < 1e+5) ? "%8.2f" : (((n) < 1e+6) ? "%.1f" : "%.2e")) -diff --git a/ifstat.h b/ifstat.h -index b63a3fb..dff38b6 100644 --- a/ifstat.h +++ b/ifstat.h @@ -35,7 +35,7 @@ @@ -201,7 +193,7 @@ index b63a3fb..dff38b6 100644 int flags, index; struct ifstat_data *next; }; -@@ -72,8 +72,8 @@ void ifstat_add_interface(struct ifstat_list *ifs, char *ifname, int flags); +@@ -72,8 +72,8 @@ void ifstat_add_interface(struct ifstat_ void ifstat_free_interface(struct ifstat_data *data); void ifstat_set_interface_stats(struct ifstat_data *data, @@ -212,11 +204,9 @@ index b63a3fb..dff38b6 100644 void ifstat_set_interface_index(struct ifstat_data *data, int index); -diff --git a/snmp.c b/snmp.c -index 2457001..5dd8a0a 100644 --- a/snmp.c +++ b/snmp.c -@@ -91,7 +91,7 @@ static int snmp_get_ifcount(struct snmp_session *ss) { +@@ -91,7 +91,7 @@ static int snmp_get_ifcount(struct snmp_ static int snmp_get_nextif(struct snmp_session *ss, int index) { oid ifindex[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 1, 0 }; @@ -225,7 +215,7 @@ index 2457001..5dd8a0a 100644 struct snmp_pdu *pdu; struct snmp_pdu *response = NULL; struct variable_list *vars; -@@ -139,7 +139,7 @@ static int snmp_get_nextif(struct snmp_session *ss, int index) { +@@ -139,7 +139,7 @@ static int snmp_get_nextif(struct snmp_s struct ifsnmp { char name[S_IFNAMEMAX]; @@ -234,7 +224,7 @@ index 2457001..5dd8a0a 100644 int flags, index; }; -@@ -248,7 +248,7 @@ static int snmp_get_ifinfos(struct snmp_session *ss, int nifaces, +@@ -248,7 +248,7 @@ static int snmp_get_ifinfos(struct snmp_ if (memcmp(ifinfo, vars->name, sizeof(ifinfo) - 2 * sizeof(oid)) != 0) continue; for(i = 0; i < nifaces; i++) { @@ -243,7 +233,7 @@ index 2457001..5dd8a0a 100644 break; } -@@ -258,11 +258,11 @@ static int snmp_get_ifinfos(struct snmp_session *ss, int nifaces, +@@ -258,11 +258,11 @@ static int snmp_get_ifinfos(struct snmp_ switch (vars->name[9]) { case ifDescr: if (vars->type == ASN_OCTET_STR) { @@ -257,7 +247,7 @@ index 2457001..5dd8a0a 100644 ifsnmp[i].name[count] = '\0'; } break; -@@ -361,7 +361,7 @@ int snmp_open_driver(struct ifstat_driver *driver, char *options) { +@@ -361,7 +361,7 @@ int snmp_open_driver(struct ifstat_drive snmp_sess_init(&session); session.peername = host; session.version = SNMP_VERSION_1; diff --git a/net/iftop/patches/010-gcc10.patch b/net/iftop/patches/010-gcc10.patch index 7c212d03a..ffa81cf5e 100644 --- a/net/iftop/patches/010-gcc10.patch +++ b/net/iftop/patches/010-gcc10.patch @@ -16,8 +16,6 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ui_common.h | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) -diff --git a/ui_common.c b/ui_common.c -index dcf6646..b1027ec 100644 --- a/ui_common.c +++ b/ui_common.c @@ -17,6 +17,12 @@ @@ -33,8 +31,6 @@ index dcf6646..b1027ec 100644 /* 2, 10 and 40 seconds */ int history_divs[HISTORY_DIVISIONS] = {1, 5, 20}; -diff --git a/ui_common.h b/ui_common.h -index 63ae5bb..add72fe 100644 --- a/ui_common.h +++ b/ui_common.h @@ -33,12 +33,12 @@ typedef struct host_pair_line_tag { diff --git a/net/iodine/patches/010-cross-compile.patch b/net/iodine/patches/010-cross-compile.patch index 40dfb0a70..8226a69a0 100644 --- a/net/iodine/patches/010-cross-compile.patch +++ b/net/iodine/patches/010-cross-compile.patch @@ -1,5 +1,5 @@ ---- iodine-0.7.0.orig/src/osflags -+++ iodine-0.7.0/src/osflags +--- a/src/osflags ++++ b/src/osflags @@ -16,12 +16,6 @@ link) windows32) echo '-lws2_32 -liphlpapi'; diff --git a/net/iodine/patches/100-musl-compatibility.patch b/net/iodine/patches/100-musl-compatibility.patch index ef55c3c52..bb09627d4 100644 --- a/net/iodine/patches/100-musl-compatibility.patch +++ b/net/iodine/patches/100-musl-compatibility.patch @@ -11,8 +11,6 @@ Date: Thu Jun 25 19:38:24 2015 +0300 The reason for such brutal intrusiuon is explained in musl FAQ: http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F -diff --git a/src/common.c b/src/common.c -index 2715979..5f0e370 100644 --- a/src/common.c +++ b/src/common.c @@ -57,7 +57,7 @@ diff --git a/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch b/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch index ac3f30932..095c82c92 100644 --- a/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch +++ b/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch @@ -9,11 +9,9 @@ SSL_CTX_new is in both. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index e8290dfd..8dde6095 100644 --- a/configure.ac +++ b/configure.ac -@@ -319,7 +319,7 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], [ +@@ -328,7 +328,7 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], CFLAGS="$CFLAGS $OPENSSL_CFLAGS" LIBS="$LIBS $OPENSSL_LIBS" ], [ @@ -22,6 +20,3 @@ index e8290dfd..8dde6095 100644 LIBS="$LIBS -lssl -lcrypto" ], [ AC_MSG_ERROR([The OpenSSL library was not found]) --- -2.17.1 - diff --git a/net/isc-dhcp/patches/520-bind-no-catgets.patch b/net/isc-dhcp/patches/520-bind-no-catgets.patch index 5655b08eb..ed8a4b063 100644 --- a/net/isc-dhcp/patches/520-bind-no-catgets.patch +++ b/net/isc-dhcp/patches/520-bind-no-catgets.patch @@ -1,6 +1,6 @@ --- a/bind/Makefile.in +++ b/bind/Makefile.in -@@ -57,6 +57,7 @@ +@@ -57,6 +57,7 @@ bind1: rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ export CC=${CROSS_CC} && \ diff --git a/net/kismet/patches/030-libcxx.patch b/net/kismet/patches/030-libcxx.patch index 9f0a99664..5c1f63e05 100644 --- a/net/kismet/patches/030-libcxx.patch +++ b/net/kismet/patches/030-libcxx.patch @@ -11,7 +11,7 @@ string(strerror(errno)), MSGFLAG_ERROR); --- a/packetsource_wext.cc +++ b/packetsource_wext.cc -@@ -405,7 +405,7 @@ void PacketSource_Wext::OpenWpaSupplicant() { +@@ -405,7 +405,7 @@ void PacketSource_Wext::OpenWpaSupplican wpa_local.sun_family = AF_UNIX; snprintf(wpa_local.sun_path, sizeof(wpa_local.sun_path), "%s", wpa_local_path.c_str()); @@ -22,7 +22,7 @@ MSGFLAG_PRINTERROR); --- a/tcpclient.cc +++ b/tcpclient.cc -@@ -75,7 +75,7 @@ int TcpClient::Connect(const char *in_remotehost, short int in_port, +@@ -75,7 +75,7 @@ int TcpClient::Connect(const char *in_re local_sock.sin_addr.s_addr = htonl(INADDR_ANY); local_sock.sin_port = htons(0); @@ -31,7 +31,7 @@ snprintf(errstr, 1024, "TCP client bind() failed: %s", strerror(errno)); globalreg->messagebus->InjectMessage(errstr, MSGFLAG_ERROR); close(cli_fd); -@@ -170,7 +170,7 @@ int TcpClient::ConnectSync(const char *in_remotehost, short int in_port, +@@ -170,7 +170,7 @@ int TcpClient::ConnectSync(const char *i local_sock.sin_addr.s_addr = htonl(INADDR_ANY); local_sock.sin_port = htons(0); diff --git a/net/knot/patches/01_zscanner_tests.patch b/net/knot/patches/01_zscanner_tests.patch index bd147ddc1..efcb12224 100644 --- a/net/knot/patches/01_zscanner_tests.patch +++ b/net/knot/patches/01_zscanner_tests.patch @@ -1,5 +1,3 @@ -diff --git a/tests/libzscanner/test_zscanner.in b/tests/libzscanner/test_zscanner.in -index 2c0c27526..72b2124c7 100644 --- a/tests/libzscanner/test_zscanner.in +++ b/tests/libzscanner/test_zscanner.in @@ -1,15 +1,14 @@ diff --git a/net/knot/patches/02_knot.conf.patch b/net/knot/patches/02_knot.conf.patch index 8c626690e..f599e0dcf 100644 --- a/net/knot/patches/02_knot.conf.patch +++ b/net/knot/patches/02_knot.conf.patch @@ -1,8 +1,6 @@ -diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in -index 10302f958..75082f537 100644 --- a/samples/knot.sample.conf.in +++ b/samples/knot.sample.conf.in -@@ -30,6 +30,8 @@ template: +@@ -33,6 +33,8 @@ template: - id: default storage: "@storage_dir@" file: "%s.zone" @@ -10,4 +8,4 @@ index 10302f958..75082f537 100644 + max-timer-db-size: 5M zone: - # # Master zone + # # Primary zone diff --git a/net/knxd/patches/0099-openwrt.patch b/net/knxd/patches/0099-openwrt.patch index 346a79b95..be77ffaf1 100644 --- a/net/knxd/patches/0099-openwrt.patch +++ b/net/knxd/patches/0099-openwrt.patch @@ -1,6 +1,6 @@ ---- a/src/client/Makefile.am 2017-01-25 20:17:14.000000000 +0100 -+++ b/src/client/Makefile.am 2017-01-25 20:18:50.639995000 +0100 -@@ -4,5 +4,5 @@ +--- a/src/client/Makefile.am ++++ b/src/client/Makefile.am +@@ -4,5 +4,5 @@ else BUILDJAVA = endif diff --git a/net/knxd/patches/0100-version.patch b/net/knxd/patches/0100-version.patch index 9ff5a3113..d597753da 100644 --- a/net/knxd/patches/0100-version.patch +++ b/net/knxd/patches/0100-version.patch @@ -1,8 +1,8 @@ ---- a/tools/version.sh 2020-04-08 19:39:40.349461034 +0200 -+++ b/tools/version.sh 2020-05-13 13:40:26.354277094 +0200 +--- a/tools/version.sh ++++ b/tools/version.sh @@ -1,4 +1,3 @@ #!/bin/sh - + -test -d .git || exit -git describe --tags +echo -n "0.14.39" diff --git a/net/knxd/patches/020-cdefs.patch b/net/knxd/patches/020-cdefs.patch index d2924e266..a1bc12454 100644 --- a/net/knxd/patches/020-cdefs.patch +++ b/net/knxd/patches/020-cdefs.patch @@ -14,7 +14,7 @@ #include "eibloadresult.h" -@@ -935,5 +936,7 @@ int EIB_Cache_LastUpdates2_async (EIBConnection * con, uint32_t start, +@@ -935,5 +936,7 @@ int EIB_Cache_LastUpdates2_async (EIBCon uint32_t * end); diff --git a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch index 2ec16f852..6d1e373dd 100644 --- a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch +++ b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch @@ -1,6 +1,6 @@ --- a/src/kadmin/ktutil/ktutil_funcs.c +++ b/src/kadmin/ktutil/ktutil_funcs.c -@@ -64,7 +64,7 @@ krb5_error_code ktutil_delete(context, list, idx) +@@ -65,7 +65,7 @@ krb5_error_code ktutil_delete(context, l krb5_kt_list *list; int idx; { @@ -11,7 +11,7 @@ for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c -@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int req_neg, krb5_flags *toset, +@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int { int found = 0, invert = 0; size_t i; @@ -22,7 +22,7 @@ for (i = 0; !found && i < NFTBL; i++) { --- a/src/lib/krad/packet.c +++ b/src/lib/krad/packet.c -@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code, +@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx { krb5_error_code retval; krad_packet *pkt; @@ -33,7 +33,7 @@ pkt = packet_new(); --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -3764,7 +3764,7 @@ pkinit_open_session(krb5_context context, +@@ -3646,7 +3646,7 @@ pkinit_open_session(krb5_context context { CK_ULONG i, r; unsigned char *cp; @@ -44,7 +44,7 @@ CK_TOKEN_INFO tinfo; --- a/src/util/profile/prof_file.c +++ b/src/util/profile/prof_file.c -@@ -309,7 +309,7 @@ errcode_t profile_update_file_data_locked(prf_data_t data, char **ret_modspec) +@@ -270,7 +270,7 @@ errcode_t profile_update_file_data_locke unsigned long frac; time_t now; #endif @@ -52,4 +52,4 @@ + FILE *f = NULL; int isdir = 0; - #ifdef HAVE_STAT + if ((data->flags & PROFILE_FILE_NO_RELOAD) && data->root != NULL) diff --git a/net/libreswan/patches/010-nanosleep.patch b/net/libreswan/patches/010-nanosleep.patch index 45481cd1b..c38b4dade 100644 --- a/net/libreswan/patches/010-nanosleep.patch +++ b/net/libreswan/patches/010-nanosleep.patch @@ -9,13 +9,13 @@ #include <errno.h> #include "defs.h" -@@ -180,7 +180,8 @@ - /* Send a duplicate packet when this impair is enabled - used for testing */ - if (IMPAIR(JACOB_TWO_TWO)) { +@@ -192,7 +192,8 @@ static bool send_chunks(const char *wher + */ + if (impair.jacob_two_two) { /* sleep for half a second, and second another packet */ - usleep(500000); + const struct timespec req = {0, 500 * 1000 * 1000}; + nanosleep(&req, NULL); endpoint_buf b; endpoint_buf ib; - DBG_log("JACOB 2-2: resending %zu bytes for %s through %s from %s to %s:", + llog(RC_LOG, logger, diff --git a/net/libreswan/patches/020-limits.patch b/net/libreswan/patches/020-limits.patch index 5a5635698..20d86cb80 100644 --- a/net/libreswan/patches/020-limits.patch +++ b/net/libreswan/patches/020-limits.patch @@ -16,5 +16,5 @@ #include <unistd.h> /* for gethostname() */ +#include <limits.h> - #include <libreswan.h> - #include "libreswan/pfkeyv2.h" + #include <event2/event.h> + #include <event2/event_struct.h> diff --git a/net/libreswan/patches/030-fix_musl_build.patch b/net/libreswan/patches/030-fix_musl_build.patch index 7183a1989..1f0baad9e 100644 --- a/net/libreswan/patches/030-fix_musl_build.patch +++ b/net/libreswan/patches/030-fix_musl_build.patch @@ -1,5 +1,5 @@ ---- a/include/fd.h 2020-10-25 12:29:43.527467613 +0200 -+++ b/include/fd.h 2020-10-25 12:27:41.043595114 +0200 +--- a/include/fd.h ++++ b/include/fd.h @@ -26,6 +26,7 @@ #include <stdbool.h> diff --git a/net/libreswan/patches/040-disable_man.patch b/net/libreswan/patches/040-disable_man.patch index 92850d532..42a5c3364 100644 --- a/net/libreswan/patches/040-disable_man.patch +++ b/net/libreswan/patches/040-disable_man.patch @@ -1,6 +1,6 @@ ---- a/mk/targets.mk 2020-10-25 12:47:38.504784276 +0200 -+++ b/mk/targets.mk 2020-10-25 12:48:16.242123361 +0200 -@@ -64,7 +64,7 @@ +--- a/mk/targets.mk ++++ b/mk/targets.mk +@@ -64,7 +64,7 @@ endef # # For each define: TARGET clean-TARGET install-TARGET diff --git a/net/lighttpd/patches/010-meson-lua.patch b/net/lighttpd/patches/010-meson-lua.patch index d1c96c84a..e75250b88 100644 --- a/net/lighttpd/patches/010-meson-lua.patch +++ b/net/lighttpd/patches/010-meson-lua.patch @@ -12,11 +12,9 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/meson.build b/src/meson.build -index 71e4ec90..14ed9cec 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -381,7 +381,7 @@ endif +@@ -377,7 +377,7 @@ endif liblua = [] if get_option('with_lua') found_lua = false @@ -25,6 +23,3 @@ index 71e4ec90..14ed9cec 100644 if not(found_lua) liblua = dependency(l, required: false) if (liblua.found()) --- -2.28.0 - diff --git a/net/lighttpd/patches/020-meson-zstd.patch b/net/lighttpd/patches/020-meson-zstd.patch index deb7190a3..184d6b19d 100644 --- a/net/lighttpd/patches/020-meson-zstd.patch +++ b/net/lighttpd/patches/020-meson-zstd.patch @@ -8,8 +8,6 @@ Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> meson_options.txt | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/meson_options.txt b/meson_options.txt -index 51bea44d..f6687159 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -148,6 +148,11 @@ option('with_zlib', @@ -24,6 +22,3 @@ index 51bea44d..f6687159 100644 option('build_extra_warnings', type: 'boolean', --- -2.29.2 - diff --git a/net/linknx/patches/010-cdefs.patch b/net/linknx/patches/010-cdefs.patch index 971a9c740..aaa9f5ff8 100644 --- a/net/linknx/patches/010-cdefs.patch +++ b/net/linknx/patches/010-cdefs.patch @@ -15,7 +15,7 @@ #include "eibloadresult.h" -@@ -705,5 +706,7 @@ BCU_LOAD_RESULT EIB_LoadImage (EIBConnection * con, const uint8_t * image, +@@ -705,5 +706,7 @@ BCU_LOAD_RESULT EIB_LoadImage (EIBConnec */ int EIB_LoadImage_async (EIBConnection * con, const uint8_t * image, int len); diff --git a/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch b/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch index 3d9d93936..389138a81 100644 --- a/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch +++ b/net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch @@ -19,8 +19,6 @@ Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> src/include/netinet/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am -index ca0aac2..965db8c 100644 --- a/src/include/netinet/Makefile.am +++ b/src/include/netinet/Makefile.am @@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet @@ -30,6 +28,3 @@ index ca0aac2..965db8c 100644 -libcnetinet_HEADERS = sctp.h.in -BUILT_SOURCES = sctp.h +libcnetinet_HEADERS = sctp.h --- -2.17.1 - diff --git a/net/lora-gateway-hal/patches/0001-add-cmake-support.patch b/net/lora-gateway-hal/patches/0001-add-cmake-support.patch index e41e2ddcd..8cf422baf 100644 --- a/net/lora-gateway-hal/patches/0001-add-cmake-support.patch +++ b/net/lora-gateway-hal/patches/0001-add-cmake-support.patch @@ -29,9 +29,6 @@ Signed-off-by: Xue Liu <liuxuenetmail@gmail.com> create mode 100644 util_tx_continuous/CMakeLists.txt create mode 100644 util_tx_test/CMakeLists.txt -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..b112150 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,77 @@ @@ -112,16 +109,10 @@ index 0000000..b112150 + +# -- add util_tx_test +add_subdirectory(util_tx_test) -diff --git a/cmake/loragw-config.cmake b/cmake/loragw-config.cmake -new file mode 100644 -index 0000000..ee8687b --- /dev/null +++ b/cmake/loragw-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/loragw-targets.cmake") -diff --git a/libloragw/CMakeLists.txt b/libloragw/CMakeLists.txt -new file mode 100644 -index 0000000..b2102ae --- /dev/null +++ b/libloragw/CMakeLists.txt @@ -0,0 +1,150 @@ @@ -275,9 +266,6 @@ index 0000000..b2102ae + +endforeach() + -diff --git a/libloragw/loragw.pc.in b/libloragw/loragw.pc.in -new file mode 100644 -index 0000000..01bb3cf --- /dev/null +++ b/libloragw/loragw.pc.in @@ -0,0 +1,10 @@ @@ -291,9 +279,6 @@ index 0000000..01bb3cf +Version: @lora_gateway_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lloragw -diff --git a/libloragw/loragw_config.h.in b/libloragw/loragw_config.h.in -new file mode 100644 -index 0000000..76ad35a --- /dev/null +++ b/libloragw/loragw_config.h.in @@ -0,0 +1,14 @@ @@ -311,9 +296,6 @@ index 0000000..76ad35a +#cmakedefine01 DEBUG_LBT + +#endif -diff --git a/util_lbt_test/CMakeLists.txt b/util_lbt_test/CMakeLists.txt -new file mode 100644 -index 0000000..f184b82 --- /dev/null +++ b/util_lbt_test/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -340,9 +322,6 @@ index 0000000..f184b82 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_pkt_logger/CMakeLists.txt b/util_pkt_logger/CMakeLists.txt -new file mode 100644 -index 0000000..82cfc86 --- /dev/null +++ b/util_pkt_logger/CMakeLists.txt @@ -0,0 +1,29 @@ @@ -375,9 +354,6 @@ index 0000000..82cfc86 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_spectral_scan/CMakeLists.txt b/util_spectral_scan/CMakeLists.txt -new file mode 100644 -index 0000000..3cec2a9 --- /dev/null +++ b/util_spectral_scan/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -404,9 +380,6 @@ index 0000000..3cec2a9 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_spi_stress/CMakeLists.txt b/util_spi_stress/CMakeLists.txt -new file mode 100644 -index 0000000..d5f0eea --- /dev/null +++ b/util_spi_stress/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -433,9 +406,6 @@ index 0000000..d5f0eea + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_tx_continuous/CMakeLists.txt b/util_tx_continuous/CMakeLists.txt -new file mode 100644 -index 0000000..97c70e5 --- /dev/null +++ b/util_tx_continuous/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -462,9 +432,6 @@ index 0000000..97c70e5 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) -diff --git a/util_tx_test/CMakeLists.txt b/util_tx_test/CMakeLists.txt -new file mode 100644 -index 0000000..6cc0e04 --- /dev/null +++ b/util_tx_test/CMakeLists.txt @@ -0,0 +1,23 @@ @@ -491,6 +458,3 @@ index 0000000..6cc0e04 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) --- -2.20.1 - diff --git a/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch b/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch index 084a114a5..17404b226 100644 --- a/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch +++ b/net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch @@ -8,8 +8,6 @@ Signed-off-by: Xue Liu <liuxuenetmail@gmail.com> libloragw/src/loragw_spi.native.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -diff --git a/libloragw/src/loragw_spi.native.c b/libloragw/src/loragw_spi.native.c -index c01ed1c..fe251e3 100644 --- a/libloragw/src/loragw_spi.native.c +++ b/libloragw/src/loragw_spi.native.c @@ -53,8 +53,15 @@ Maintainer: Sylvain Miermont @@ -30,6 +28,3 @@ index c01ed1c..fe251e3 100644 //#define SPI_DEV_PATH "/dev/spidev32766.0" /* -------------------------------------------------------------------------- */ --- -2.20.1 - diff --git a/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch b/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch index f80dde0fb..fd82d02ca 100644 --- a/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch +++ b/net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch @@ -8,11 +8,9 @@ Signed-off-by: Xue Liu <liuxuenetmail@gmail.com> libloragw/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/libloragw/CMakeLists.txt b/libloragw/CMakeLists.txt -index b2102ae..32abf51 100644 --- a/libloragw/CMakeLists.txt +++ b/libloragw/CMakeLists.txt -@@ -13,6 +13,9 @@ option(DEBUG_GPIO "Active debug mode in GPIO module" OFF) +@@ -13,6 +13,9 @@ option(DEBUG_GPIO "Active debug mode in option(DEBUG_LBT "Active debug mode in LBT module" OFF) option(DEBUG_GPS "Active debug mode in GPS module" OFF) @@ -22,7 +20,7 @@ index b2102ae..32abf51 100644 message("-- Build with debug AUX: ${DEBUG_AUX}") message("-- Build with debug SPI: ${DEBUG_SPI}") message("-- Build with debug REG: ${DEBUG_REG}") -@@ -20,6 +23,8 @@ message("-- Build with debug HAL: ${DEBUG_HAL}") +@@ -20,6 +23,8 @@ message("-- Build with debug HAL: ${DEBU message("-- Build with debug GPIO: ${DEBUG_GPIO}") message("-- Build with debug LBT: ${DEBUG_LBT}") message("-- Build with debug GPS: ${DEBUG_GPS}") @@ -40,6 +38,3 @@ index b2102ae..32abf51 100644 ) target_sources(${TARGET} --- -2.20.1 - diff --git a/net/miniupnpc/patches/100-no-fPIC.patch b/net/miniupnpc/patches/100-no-fPIC.patch index ce4c6752c..f0b73b474 100644 --- a/net/miniupnpc/patches/100-no-fPIC.patch +++ b/net/miniupnpc/patches/100-no-fPIC.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,12 +39,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") +@@ -41,12 +41,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") target_compile_definitions(miniupnpc-private INTERFACE _DARWIN_C_SOURCE) endif () diff --git a/net/miniupnpd/patches/200-remove-default-cflags.patch b/net/miniupnpd/patches/200-remove-default-cflags.patch index 462060450..0a1ba0a23 100644 --- a/net/miniupnpd/patches/200-remove-default-cflags.patch +++ b/net/miniupnpd/patches/200-remove-default-cflags.patch @@ -1,6 +1,6 @@ --- a/Makefile.linux +++ b/Makefile.linux -@@ -24,16 +24,16 @@ +@@ -25,16 +25,16 @@ CONFIG_OPTIONS ?= $(cat .configure.cache CONFIG_OPTIONS += --firewall=iptables #CFLAGS = -O -g -DDEBUG CFLAGS ?= -Os diff --git a/net/miniupnpd/patches/300-macos-compat.patch b/net/miniupnpd/patches/300-macos-compat.patch index ccd5de993..12b5f2488 100644 --- a/net/miniupnpd/patches/300-macos-compat.patch +++ b/net/miniupnpd/patches/300-macos-compat.patch @@ -1,6 +1,6 @@ --- a/Makefile.linux +++ b/Makefile.linux -@@ -94,13 +94,13 @@ $(info please install uuid-dev package / +@@ -95,13 +95,13 @@ $(info please install uuid-dev package / endif # ($(TEST),1) endif # ($(TARGET_OPENWRT,) @@ -20,7 +20,7 @@ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o -@@ -140,11 +140,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8 +@@ -141,11 +141,11 @@ install: miniupnpd $(SRCDIR)/miniupnpd.8 $(INSTALL) $(SRCDIR)/netfilter/ip6tables_init.sh $(DESTDIR)$(ETCINSTALLDIR) $(INSTALL) $(SRCDIR)/netfilter/ip6tables_removeall.sh $(DESTDIR)$(ETCINSTALLDIR) $(INSTALL) $(SRCDIR)/netfilter/miniupnpd_functions.sh $(DESTDIR)$(ETCINSTALLDIR) diff --git a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch index 1cd97e336..55551eb30 100644 --- a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch +++ b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch @@ -9,8 +9,6 @@ Date: Sun Jul 5 10:42:52 2020 +0800 Signed-off-by: Chen Minqiang <ptpt52@gmail.com> -diff --git a/getifaddr.c b/getifaddr.c -index 7c09064..46cae8c 100644 --- a/getifaddr.c +++ b/getifaddr.c @@ -25,6 +25,7 @@ @@ -33,11 +31,9 @@ index 7c09064..46cae8c 100644 for (i = 0; i < sizeof(reserved)/sizeof(reserved[0]); ++i) { if ((address >> reserved[i].rmask) == (reserved[i].address >> reserved[i].rmask)) return 1; -diff --git a/miniupnpd.c b/miniupnpd.c -index e9f9f61..86b4200 100644 --- a/miniupnpd.c +++ b/miniupnpd.c -@@ -1225,6 +1225,10 @@ init(int argc, char * * argv, struct runtime_vars * v) +@@ -1225,6 +1225,10 @@ init(int argc, char * * argv, struct run case UPNPEXT_IP: use_ext_ip_addr = ary_options[i].value; break; @@ -48,8 +44,6 @@ index e9f9f61..86b4200 100644 case UPNPEXT_PERFORM_STUN: if(strcmp(ary_options[i].value, "yes") == 0) SETFLAG(PERFORMSTUNMASK); -diff --git a/miniupnpd.conf b/miniupnpd.conf -index 6274f67..c614192 100644 --- a/miniupnpd.conf +++ b/miniupnpd.conf @@ -9,6 +9,8 @@ @@ -61,8 +55,6 @@ index 6274f67..c614192 100644 # WAN interface must have public IP address. Otherwise it is behind NAT # and port forwarding is impossible. In some cases WAN interface can be # behind unrestricted NAT 1:1 when all incoming traffic is NAT-ed and -diff --git a/options.c b/options.c -index 05fa317..3711094 100644 --- a/options.c +++ b/options.c @@ -34,6 +34,7 @@ static const struct { @@ -73,8 +65,6 @@ index 05fa317..3711094 100644 { UPNPEXT_PERFORM_STUN, "ext_perform_stun" }, { UPNPEXT_STUN_HOST, "ext_stun_host" }, { UPNPEXT_STUN_PORT, "ext_stun_port" }, -diff --git a/options.h b/options.h -index 96cdbbf..34c698f 100644 --- a/options.h +++ b/options.h @@ -21,6 +21,7 @@ enum upnpconfigoptions { @@ -85,8 +75,6 @@ index 96cdbbf..34c698f 100644 UPNPEXT_PERFORM_STUN, /* ext_perform_stun */ UPNPEXT_STUN_HOST, /* ext_stun_host */ UPNPEXT_STUN_PORT, /* ext_stun_port */ -diff --git a/testgetifaddr.c b/testgetifaddr.c -index 8045b89..b5cdbb4 100644 --- a/testgetifaddr.c +++ b/testgetifaddr.c @@ -13,6 +13,8 @@ @@ -98,8 +86,6 @@ index 8045b89..b5cdbb4 100644 #if defined(__sun) /* solaris 10 does not define LOG_PERROR */ #define LOG_PERROR 0 -diff --git a/testportinuse.c b/testportinuse.c -index 98574c6..507f830 100644 --- a/testportinuse.c +++ b/testportinuse.c @@ -14,6 +14,8 @@ @@ -111,8 +97,6 @@ index 98574c6..507f830 100644 int main(int argc, char * * argv) { #ifndef CHECK_PORTINUSE -diff --git a/upnpglobalvars.h b/upnpglobalvars.h -index a474353..4f5bbdd 100644 --- a/upnpglobalvars.h +++ b/upnpglobalvars.h @@ -84,6 +84,8 @@ extern int runtime_flags; diff --git a/net/mstpd/patches/010-bsd.patch b/net/mstpd/patches/010-bsd.patch index 45ecb3f75..120a0dbd4 100644 --- a/net/mstpd/patches/010-bsd.patch +++ b/net/mstpd/patches/010-bsd.patch @@ -1,6 +1,6 @@ --- a/hmac_md5.c +++ b/hmac_md5.c -@@ -356,10 +356,10 @@ caddr_t digest; /* caller digest to be filled in */ +@@ -356,10 +356,10 @@ caddr_t digest; /* caller di */ /* start out by storing key in pads */ diff --git a/net/net-snmp/patches/110-debian-makefiles.patch b/net/net-snmp/patches/110-debian-makefiles.patch index 7b71ed087..2cb2715aa 100644 --- a/net/net-snmp/patches/110-debian-makefiles.patch +++ b/net/net-snmp/patches/110-debian-makefiles.patch @@ -1,7 +1,6 @@ -diff -uNr a/local/Makefile.in b/local/Makefile.in ---- a/local/Makefile.in 2014-02-20 08:36:42.000000000 +0800 -+++ b/local/Makefile.in 2014-05-27 13:21:34.245223503 +0800 -@@ -101,7 +101,7 @@ +--- a/local/Makefile.in ++++ b/local/Makefile.in +@@ -101,7 +101,7 @@ tkmib.made: $(srcdir)/tkmib mib2c.made: $(srcdir)/mib2c if test "x$(PERL)" != "x" ; then \ @@ -10,10 +9,9 @@ diff -uNr a/local/Makefile.in b/local/Makefile.in else \ touch mib2c.made; \ fi -diff -uNr a/Makefile.top b/Makefile.top ---- a/Makefile.top 2014-02-20 08:36:42.000000000 +0800 -+++ b/Makefile.top 2014-05-27 13:26:53.023737120 +0800 -@@ -28,6 +28,7 @@ +--- a/Makefile.top ++++ b/Makefile.top +@@ -28,6 +28,7 @@ man8dir = $(mandir)/man8 snmplibdir = $(datadir)/snmp mibdir = $(snmplibdir)/mibs persistentdir = @PERSISTENT_DIRECTORY@ @@ -21,10 +19,9 @@ diff -uNr a/Makefile.top b/Makefile.top DESTDIR = @INSTALL_PREFIX@ INSTALL_PREFIX = $(DESTDIR) -diff -uNr a/mibs/Makefile.in b/mibs/Makefile.in ---- a/mibs/Makefile.in 2014-02-20 08:36:42.000000000 +0800 -+++ b/mibs/Makefile.in 2014-05-27 13:25:07.151988585 +0800 -@@ -47,11 +47,15 @@ +--- a/mibs/Makefile.in ++++ b/mibs/Makefile.in +@@ -47,11 +47,15 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-M UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \ UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt diff --git a/net/net-snmp/patches/170-ldflags.patch b/net/net-snmp/patches/170-ldflags.patch index 656fdede4..dd1b9fe25 100644 --- a/net/net-snmp/patches/170-ldflags.patch +++ b/net/net-snmp/patches/170-ldflags.patch @@ -1,6 +1,6 @@ --- a/Makefile.top +++ b/Makefile.top -@@ -87,7 +87,7 @@ LIBCURRENT = 30 +@@ -87,7 +87,7 @@ LIBCURRENT = 35 LIBAGE = 0 LIBREVISION = 0 diff --git a/net/net-snmp/patches/910-signal.patch b/net/net-snmp/patches/910-signal.patch index a70d42f7e..45cd1fac2 100644 --- a/net/net-snmp/patches/910-signal.patch +++ b/net/net-snmp/patches/910-signal.patch @@ -10,13 +10,9 @@ https://github.com/net-snmp/net-snmp/pull/162. 1 file changed, 28 insertions(+), 83 deletions(-) mode change 100644 => 100755 apps/snmpnetstat/if.c -diff --git a/apps/snmpnetstat/if.c b/apps/snmpnetstat/if.c -old mode 100644 -new mode 100755 -index 16768151d..84b87b531 --- a/apps/snmpnetstat/if.c +++ b/apps/snmpnetstat/if.c -@@ -64,8 +64,6 @@ +@@ -64,8 +64,6 @@ static char *rcsid = "$OpenBSD: if.c,v 1 #define NO 0 static void sidewaysintpr(u_int); @@ -60,7 +56,7 @@ index 16768151d..84b87b531 /* * Retrieve the interface addressing information * XXX - This could also be extended to handle non-IP interfaces -@@ -845,84 +871,3 @@ sidewaysintpr(unsigned int interval) +@@ -845,84 +871,3 @@ loop: goto loop; /*NOTREACHED*/ } diff --git a/net/netatalk/patches/010-gcc10.patch b/net/netatalk/patches/010-gcc10.patch index 8652b68ca..cbf2177e6 100644 --- a/net/netatalk/patches/010-gcc10.patch +++ b/net/netatalk/patches/010-gcc10.patch @@ -7,8 +7,6 @@ Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries etc/afpd/directory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 --- a/etc/afpd/directory.h +++ b/etc/afpd/directory.h @@ -91,7 +91,7 @@ struct maccess { diff --git a/net/netcat/patches/001-netcat_flag_count.patch b/net/netcat/patches/001-netcat_flag_count.patch index 44ee9e1f9..004fe9461 100644 --- a/net/netcat/patches/001-netcat_flag_count.patch +++ b/net/netcat/patches/001-netcat_flag_count.patch @@ -1,8 +1,6 @@ -Index: netcat-0.7.1/src/flagset.c -=================================================================== ---- netcat-0.7.1.orig/src/flagset.c 2009-02-06 19:56:01.000000000 +0100 -+++ netcat-0.7.1/src/flagset.c 2009-02-06 19:56:13.000000000 +0100 -@@ -134,7 +134,7 @@ +--- a/src/flagset.c ++++ b/src/flagset.c +@@ -134,7 +134,7 @@ unsigned short netcat_flag_next(unsigned int netcat_flag_count(void) { @@ -11,7 +9,7 @@ Index: netcat-0.7.1/src/flagset.c register int i; int ret = 0; -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ int netcat_flag_count(void) Assumed that the bit number 1 is the sign, and that we will shift the bit 1 (or the bit that takes its place later) until the the most right, WHY it has to keep the wrong sign? */ diff --git a/net/netdiscover/patches/010-gcc10.patch b/net/netdiscover/patches/010-gcc10.patch index 9a679ec21..552c8bd1b 100644 --- a/net/netdiscover/patches/010-gcc10.patch +++ b/net/netdiscover/patches/010-gcc10.patch @@ -74,7 +74,7 @@ extern void parseable_scan_end(); void *inject_arp(void *arg); -@@ -52,6 +53,9 @@ void *parsable_screen_refresh(void *arg); +@@ -52,6 +53,9 @@ void *parsable_screen_refresh(void *arg) void scan_range(char *disp, char *sip); void usage(); diff --git a/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch b/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch index b7aae876e..0f9d2e070 100644 --- a/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch +++ b/net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch @@ -8,8 +8,6 @@ Signed-off-by: Toni Uhlig <matzeton@googlemail.com> configure | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) -diff --git a/configure b/configure -index 510826a..ceda000 100755 --- a/configure +++ b/configure @@ -221,8 +221,8 @@ EOF @@ -149,6 +147,3 @@ index 510826a..ceda000 100755 if [ ! -x $TMPDIR/nettest ] ; then echo "[NO]" MISSING_DEFS=1 --- -2.20.1 - diff --git a/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch b/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch index 382b4f5cc..181ffbee2 100644 --- a/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch +++ b/net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch @@ -8,8 +8,6 @@ Signed-off-by: Toni Uhlig <matzeton@googlemail.com> configure | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/configure b/configure -index ceda000..f843d64 100755 --- a/configure +++ b/configure @@ -434,11 +434,8 @@ int main(void) @@ -25,6 +23,3 @@ index ceda000..f843d64 100755 if [ ! -x $TMPDIR/ncursestest ] ; then echo "[NO]" MISSING_DEFS=1 --- -2.20.1 - diff --git a/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch b/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch index 65b4b7aff..1abeaadd9 100644 --- a/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch +++ b/net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch @@ -8,8 +8,6 @@ Signed-off-by: Toni Uhlig <matzeton@googlemail.com> flowtop/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/flowtop/Makefile b/flowtop/Makefile -index e001ce8..aeee049 100644 --- a/flowtop/Makefile +++ b/flowtop/Makefile @@ -1,7 +1,6 @@ @@ -31,6 +29,3 @@ index e001ce8..aeee049 100644 flowtop-confs = tcp.conf \ udp.conf \ --- -2.20.1 - diff --git a/net/nginx/patches/104-endianness_fix.patch b/net/nginx/patches/104-endianness_fix.patch index 081bcdb00..4d8255e93 100644 --- a/net/nginx/patches/104-endianness_fix.patch +++ b/net/nginx/patches/104-endianness_fix.patch @@ -1,5 +1,3 @@ -diff --git a/auto/endianness b/auto/endianness -index 1b552b6b..2b6f9ea4 100644 --- a/auto/endianness +++ b/auto/endianness @@ -12,6 +12,16 @@ checking for system byte ordering diff --git a/net/nginx/patches/201-ignore-invalid-options.patch b/net/nginx/patches/201-ignore-invalid-options.patch index 88b521353..d208bf507 100644 --- a/net/nginx/patches/201-ignore-invalid-options.patch +++ b/net/nginx/patches/201-ignore-invalid-options.patch @@ -1,6 +1,6 @@ --- a/auto/options +++ b/auto/options -@@ -396,8 +396,7 @@ $0: warning: the \"--with-sha1-asm\" opt +@@ -400,8 +400,7 @@ $0: warning: the \"--with-sha1-asm\" opt --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; *) diff --git a/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch b/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch index 400ea1a29..7cf808c91 100644 --- a/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch +++ b/net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch @@ -15,11 +15,9 @@ Subject: [PATCH] Avoid 'using namespace std' causing name conflicts. Fixes nping/utils.h | 2 -- 8 files changed, 8 insertions(+), 14 deletions(-) -diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc -index ccdcf9c2d0..a824340cd2 100644 --- a/nping/EchoServer.cc +++ b/nping/EchoServer.cc -@@ -199,7 +199,7 @@ NEPContext *EchoServer::getClientContext(nsock_iod iod){ +@@ -199,7 +199,7 @@ NEPContext *EchoServer::getClientContext * the context could not be found. */ int EchoServer::destroyClientContext(clientid_t clnt){ bool deleted=false; @@ -28,8 +26,6 @@ index ccdcf9c2d0..a824340cd2 100644 /* Iterate through the context array and delete the one that belongs to clnt */ for ( it=this->client_ctx.begin(); it<this->client_ctx.end(); it++){ if(it->getIdentifier()==clnt){ -diff --git a/nping/EchoServer.h b/nping/EchoServer.h -index c3dece6341..c9fee6de9e 100644 --- a/nping/EchoServer.h +++ b/nping/EchoServer.h @@ -136,15 +136,13 @@ @@ -49,8 +45,6 @@ index c3dece6341..c9fee6de9e 100644 clientid_t client_id_count; /* Methods */ -diff --git a/nping/NEPContext.h b/nping/NEPContext.h -index 5e470d7551..32b8be48d6 100644 --- a/nping/NEPContext.h +++ b/nping/NEPContext.h @@ -135,7 +135,6 @@ @@ -70,8 +64,6 @@ index 5e470d7551..32b8be48d6 100644 struct sockaddr_storage clnt_addr; u8 *generateKey(int key_type, size_t *final_len); -diff --git a/nping/NpingTargets.h b/nping/NpingTargets.h -index 61bb356f39..3a9a2145af 100644 --- a/nping/NpingTargets.h +++ b/nping/NpingTargets.h @@ -137,8 +137,6 @@ @@ -92,8 +84,6 @@ index 61bb356f39..3a9a2145af 100644 }; /* End of class NpingTargets */ -diff --git a/nping/ProbeMode.h b/nping/ProbeMode.h -index aa86939e02..313776d862 100644 --- a/nping/ProbeMode.h +++ b/nping/ProbeMode.h @@ -135,11 +135,9 @@ @@ -108,8 +98,6 @@ index aa86939e02..313776d862 100644 #define PKT_TYPE_TCP_CONNECT 1 #define PKT_TYPE_UDP_NORMAL 2 -diff --git a/nping/nping.cc b/nping/nping.cc -index 9de151a7be..40df912a88 100644 --- a/nping/nping.cc +++ b/nping/nping.cc @@ -150,7 +150,6 @@ @@ -120,8 +108,6 @@ index 9de151a7be..40df912a88 100644 NpingOps o; EchoClient ec; EchoServer es; -diff --git a/nping/utils.h b/nping/utils.h -index c3516cf29f..5de6b64b89 100644 --- a/nping/utils.h +++ b/nping/utils.h @@ -143,8 +143,6 @@ diff --git a/net/nmap/patches/020-Python3-port-of-ndiff.patch b/net/nmap/patches/020-Python3-port-of-ndiff.patch index ccf09c6e1..4151cec69 100644 --- a/net/nmap/patches/020-Python3-port-of-ndiff.patch +++ b/net/nmap/patches/020-Python3-port-of-ndiff.patch @@ -25,8 +25,6 @@ Resolves: #1484 7 files changed, 337 insertions(+), 332 deletions(-) mode change 100644 => 100755 ndiff/setup.py -diff --git a/.travis.yml b/.travis.yml -index 145ebc6..9bb50d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,13 @@ compiler: @@ -44,8 +42,6 @@ index 145ebc6..9bb50d6 100644 env: - SSL_FLAG="--without-openssl" LUA_FLAG="--without-liblua" -diff --git a/Makefile.in b/Makefile.in -index 7ac5ae5..a0152f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ @@ -82,8 +78,6 @@ index 7ac5ae5..a0152f4 100644 check-nsock: @cd $(NSOCKDIR)/src && $(MAKE) check -diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py -index 043273f..abbd1c5 100755 --- a/ndiff/ndiff.py +++ b/ndiff/ndiff.py @@ -1,4 +1,4 @@ @@ -92,7 +86,7 @@ index 043273f..abbd1c5 100755 # Ndiff # -@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] +@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ import xml.sax import xml.sax.saxutils import xml.dom.minidom @@ -488,7 +482,7 @@ index 043273f..abbd1c5 100755 def script_result_diffs_to_dom_fragment(elem, script_results_a, -@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a, +@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment( if len(script_results_a) == 0 and len(script_results_b) == 0: return document.createDocumentFragment() elif len(script_results_b) == 0: @@ -934,7 +928,7 @@ index 043273f..abbd1c5 100755 class NmapContentHandler(xml.sax.handler.ContentHandler): -@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler self.current_port = None self._start_elem_handlers = { @@ -971,7 +965,7 @@ index 043273f..abbd1c5 100755 } def parent_element(self): -@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler def _start_nmaprun(self, name, attrs): assert self.parent_element() is None if "start" in attrs: @@ -1061,7 +1055,7 @@ index 043273f..abbd1c5 100755 'attribute; assuming 0.' % ( name, self.current_host.format_name())) count = 0 -@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): +@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler try: count = int(count) except ValueError: @@ -1192,7 +1186,7 @@ index 043273f..abbd1c5 100755 self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp) def _end_host(self, name): -@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator): +@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGen def frag(self, frag): for node in frag.childNodes: @@ -1283,8 +1277,6 @@ index 043273f..abbd1c5 100755 sys.exit(EXIT_ERROR) if output_format == "text": -diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py -index 2fa4ae0..27fc525 100755 --- a/ndiff/ndifftest.py +++ b/ndiff/ndifftest.py @@ -1,4 +1,4 @@ @@ -1464,7 +1456,7 @@ index 2fa4ae0..27fc525 100755 class ScanDiffSub(ScanDiff): -@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase): +@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCa a.load_from_file("test-scans/empty.xml") b = Scan() b.load_from_file("test-scans/simple.xml") @@ -1473,7 +1465,7 @@ index 2fa4ae0..27fc525 100755 self.scan_diff = ScanDiffXML(a, b, f) self.scan_diff.output() self.xml = f.getvalue() -@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase): +@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCa def test_well_formed(self): try: document = xml.dom.minidom.parseString(self.xml) @@ -1495,8 +1487,6 @@ index 2fa4ae0..27fc525 100755 if port.state == state: del host.ports[port.spec] host.extraports = diff.host_b.extraports.copy() -diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff -index 8517c07..4671e73 100755 --- a/ndiff/scripts/ndiff +++ b/ndiff/scripts/ndiff @@ -1,4 +1,4 @@ @@ -1505,7 +1495,7 @@ index 8517c07..4671e73 100755 # Ndiff # -@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB): +@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure try: import ndiff @@ -1527,13 +1517,9 @@ index 8517c07..4671e73 100755 sys.exit(1) import ndiff -diff --git a/ndiff/setup.py b/ndiff/setup.py -old mode 100644 -new mode 100755 -index b5e254c..c49bcf3 --- a/ndiff/setup.py +++ b/ndiff/setup.py -@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install): +@@ -94,7 +94,7 @@ class checked_install(distutils.command. self.saved_prefix = sys.prefix try: distutils.command.install.install.finalize_options(self) @@ -1542,7 +1528,7 @@ index b5e254c..c49bcf3 raise distutils.errors.DistutilsPlatformError(str(e) + """ Installing your distribution's python-dev package may solve this problem.""") -@@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""") +@@ -155,13 +155,13 @@ Installing your distribution's python-de #!/usr/bin/env python import errno, os, os.path, sys @@ -1619,7 +1605,7 @@ index b5e254c..c49bcf3 finally: f.close() -@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command): +@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command # Read the list of installed files. try: f = open(INSTALLED_FILES_NAME, "r") @@ -1628,7 +1614,7 @@ index b5e254c..c49bcf3 if e.errno == errno.ENOENT: log.error("Couldn't open the installation record '%s'. " "Have you installed yet?" % INSTALLED_FILES_NAME) -@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command): +@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command try: if not self.dry_run: os.remove(file) @@ -1637,7 +1623,7 @@ index b5e254c..c49bcf3 log.error(str(e)) # Delete the directories. First reverse-sort the normalized paths by # length so that child directories are deleted before their parents. -@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command): +@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command log.info("Removing the directory '%s'." % dir) if not self.dry_run: os.rmdir(dir) @@ -1646,8 +1632,6 @@ index b5e254c..c49bcf3 if e.errno == errno.ENOTEMPTY: log.info("Directory '%s' not empty; not removing." % dir) else: -diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py -index 9ba612a..fd251fe 100755 --- a/ndiff/test-scans/anonymize.py +++ b/ndiff/test-scans/anonymize.py @@ -1,4 +1,4 @@ diff --git a/net/ntpclient/patches/200-time.patch b/net/ntpclient/patches/200-time.patch index 6456f3093..38138e179 100644 --- a/net/ntpclient/patches/200-time.patch +++ b/net/ntpclient/patches/200-time.patch @@ -34,7 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -@@ -181,7 +182,7 @@ static void set_time(struct ntptime *new) +@@ -181,7 +182,7 @@ static void set_time(struct ntptime *new exit(1); } if (debug) { @@ -43,7 +43,7 @@ } #else /* Traditional Linux way to set the system clock -@@ -196,7 +197,7 @@ static void set_time(struct ntptime *new) +@@ -196,7 +197,7 @@ static void set_time(struct ntptime *new exit(1); } if (debug) { diff --git a/net/oor/patches/010-gcc10.patch b/net/oor/patches/010-gcc10.patch index 17242aa22..303716e99 100644 --- a/net/oor/patches/010-gcc10.patch +++ b/net/oor/patches/010-gcc10.patch @@ -1,6 +1,6 @@ --- a/oor/data-plane/tun/tun.c +++ b/oor/data-plane/tun/tun.c -@@ -53,6 +53,8 @@ int tun_rm_fwd_from_entry(lisp_addr_t *eid_prefix, uint8_t is_local); +@@ -53,6 +53,8 @@ int tun_rm_fwd_from_entry(lisp_addr_t *e tun_dplane_data_t * tun_dplane_data_new_init(oor_encap_t encap_type, glist_t *allowed_dst_eids); void tun_dplane_data_free(tun_dplane_data_t *data); diff --git a/net/open-isns/patches/01-security_mode.patch b/net/open-isns/patches/01-security_mode.patch index dc827bd96..e6d962ef2 100644 --- a/net/open-isns/patches/01-security_mode.patch +++ b/net/open-isns/patches/01-security_mode.patch @@ -12,11 +12,9 @@ Subject: [PATCH] Fix compiler issue when not in security mode socket.c | 5 +++-- 6 files changed, 35 insertions(+), 19 deletions(-) -diff --git a/client.c b/client.c -index 8487877..fda26be 100644 --- a/client.c +++ b/client.c -@@ -122,22 +122,17 @@ isns_client_get_local_address(const isns_client_t *clnt, +@@ -122,22 +122,17 @@ isns_client_get_local_address(const isns /* * Create a security context */ @@ -40,7 +38,7 @@ index 8487877..fda26be 100644 ctx = isns_create_dsa_context(); if (ctx == NULL) isns_fatal("Unable to create security context\n"); -@@ -174,8 +169,19 @@ __create_security_context(const char *name, const char *auth_key, +@@ -174,8 +169,19 @@ __create_security_context(const char *na } return ctx; @@ -61,11 +59,9 @@ index 8487877..fda26be 100644 /* * Create the default security context -diff --git a/db-policy.c b/db-policy.c -index b1c46e2..d4a0cba 100644 --- a/db-policy.c +++ b/db-policy.c -@@ -52,11 +52,11 @@ __isns_db_keystore_lookup(isns_db_keystore_t *store, +@@ -52,11 +52,11 @@ __isns_db_keystore_lookup(isns_db_keysto /* * Load a DSA key from the DB store */ @@ -78,7 +74,7 @@ index b1c46e2..d4a0cba 100644 isns_db_keystore_t *store = (isns_db_keystore_t *) store_base; isns_object_t *obj; const void *key_data; -@@ -71,10 +71,16 @@ __isns_db_keystore_find(isns_keystore_t *store_base, +@@ -71,10 +71,16 @@ __isns_db_keystore_find(isns_keystore_t return NULL; return isns_dsa_decode_public(key_data, key_size); @@ -97,8 +93,6 @@ index b1c46e2..d4a0cba 100644 /* * Retrieve policy from database -diff --git a/include/libisns/util.h b/include/libisns/util.h -index 4174480..e5ed037 100644 --- a/include/libisns/util.h +++ b/include/libisns/util.h @@ -14,6 +14,7 @@ @@ -109,8 +103,6 @@ index 4174480..e5ed037 100644 #define array_num_elements(a) (sizeof(a) / sizeof((a)[0])) -diff --git a/isnsadm.c b/isnsadm.c -index 7a96007..94c705e 100644 --- a/isnsadm.c +++ b/isnsadm.c @@ -1162,7 +1162,7 @@ generate_key_callback(void) @@ -122,8 +114,6 @@ index 7a96007..94c705e 100644 { isns_fatal("Authentication disabled in this build\n"); return NULL; -diff --git a/security.c b/security.c -index 673a26e..68eb779 100644 --- a/security.c +++ b/security.c @@ -408,32 +408,34 @@ isns_security_init(void) @@ -167,11 +157,9 @@ index 673a26e..68eb779 100644 { return NULL; } -diff --git a/socket.c b/socket.c -index da9f5dc..a76d593 100644 --- a/socket.c +++ b/socket.c -@@ -322,8 +322,9 @@ isns_pdu_authenticate(isns_security_t *sec, +@@ -322,8 +322,9 @@ failed: } #else /* WITH_SECURITY */ static int diff --git a/net/open-isns/patches/02-fix_signed_vs_unsigned.patch b/net/open-isns/patches/02-fix_signed_vs_unsigned.patch index 2d966dd3a..9a4837018 100644 --- a/net/open-isns/patches/02-fix_signed_vs_unsigned.patch +++ b/net/open-isns/patches/02-fix_signed_vs_unsigned.patch @@ -13,8 +13,6 @@ shows up only on 586 (32-bit). isnsdd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index e4f3995..d956e58 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh) @@ -26,11 +24,9 @@ index e4f3995..d956e58 100644 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" fi -diff --git a/isnsdd.c b/isnsdd.c -index 58825cc..9cedb9f 100644 --- a/isnsdd.c +++ b/isnsdd.c -@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr) +@@ -401,7 +401,7 @@ check_portal_registration(__attribute__( continue; last_modified = isns_object_last_modified(obj); diff --git a/net/open-isns/patches/03-include_poll_h.patch b/net/open-isns/patches/03-include_poll_h.patch index cf87b51b5..5183fd62e 100644 --- a/net/open-isns/patches/03-include_poll_h.patch +++ b/net/open-isns/patches/03-include_poll_h.patch @@ -9,8 +9,6 @@ https://pubs.opengroup.org/onlinepubs/009695399/basedefs/poll.h.html socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/socket.c b/socket.c -index a76d593..432a9bd 100644 --- a/socket.c +++ b/socket.c @@ -5,7 +5,7 @@ diff --git a/net/open-isns/patches/04-ignore_write.patch b/net/open-isns/patches/04-ignore_write.patch index 012bea7d4..3affdcd0b 100644 --- a/net/open-isns/patches/04-ignore_write.patch +++ b/net/open-isns/patches/04-ignore_write.patch @@ -9,8 +9,6 @@ system call, so check the return value. pki.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) -diff --git a/pki.c b/pki.c -index 486d9bb..57ea664 100644 --- a/pki.c +++ b/pki.c @@ -9,12 +9,13 @@ @@ -28,7 +26,7 @@ index 486d9bb..57ea664 100644 #include <libisns/isns.h> #include "security.h" #include <libisns/util.h> -@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filename) +@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filenam return dsa; } @@ -75,7 +73,7 @@ index 486d9bb..57ea664 100644 return 0; } -@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filename) +@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filenam dsa = DSA_generate_parameters(dsa_key_bits, NULL, 0, NULL, NULL, isns_dsa_param_gen_callback, NULL); #endif diff --git a/net/open-isns/patches/20-signals.patch b/net/open-isns/patches/20-signals.patch index 898284794..8b9d999b6 100644 --- a/net/open-isns/patches/20-signals.patch +++ b/net/open-isns/patches/20-signals.patch @@ -8,8 +8,6 @@ The man page says that these are deprecated. Use sugprocmask as a replacement. include/libisns/util.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -diff --git a/include/libisns/util.h b/include/libisns/util.h -index e5ed037..f1b97f0 100644 --- a/include/libisns/util.h +++ b/include/libisns/util.h @@ -41,14 +41,22 @@ char * print_size(unsigned long); diff --git a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch index 90ad6ffa6..46cfa5822 100644 --- a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch +++ b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch @@ -16,11 +16,9 @@ Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> lib/netdev-linux.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c -index fe7fb9b29..63407ba1b 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c -@@ -3469,7 +3469,13 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off, +@@ -3469,7 +3469,13 @@ update_flags(struct netdev_linux *netdev unsigned int old_flags, new_flags; int error = 0; diff --git a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch index 7903afed3..2c86a3048 100644 --- a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch +++ b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch @@ -9,8 +9,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> m4/openvswitch.m4 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index 27ef9e4b4..7effb5fec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ endif @@ -22,8 +20,6 @@ index 27ef9e4b4..7effb5fec 100644 ALL_LOCAL = BUILT_SOURCES = -diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index 6fe79297e..f2e0169f8 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -383,6 +383,8 @@ else: diff --git a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch index 363bc95fc..373c6a6d3 100644 --- a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch +++ b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> utilities/ovs-lib.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in -index d646b444a..dee63dece 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -159,7 +159,10 @@ install_dir () { diff --git a/net/openvswitch/patches/0004-build-trim-build.patch b/net/openvswitch/patches/0004-build-trim-build.patch index 36fb946fc..19ea959ef 100644 --- a/net/openvswitch/patches/0004-build-trim-build.patch +++ b/net/openvswitch/patches/0004-build-trim-build.patch @@ -8,8 +8,6 @@ Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com> Makefile.am | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 7effb5fec..d6df91e8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -475,12 +475,10 @@ dist-docs: diff --git a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch index 305d2a413..3993c60a2 100644 --- a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch +++ b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> datapath/linux/Makefile.main.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in -index 6db4aa3ab..6f295387a 100644 --- a/datapath/linux/Makefile.main.in +++ b/datapath/linux/Makefile.main.in @@ -68,7 +68,7 @@ ifeq (,$(wildcard $(CONFIG_FILE))) diff --git a/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch b/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch index 9db7ca912..86c1d41bf 100644 --- a/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch +++ b/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> m4/openvswitch.m4 | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) -diff --git a/lib/automake.mk b/lib/automake.mk -index 380a67228..610f3d940 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -10,6 +10,8 @@ lib_LTLIBRARIES += lib/libopenvswitch.la @@ -23,8 +21,6 @@ index 380a67228..610f3d940 100644 if WIN32 -diff --git a/lib/libopenvswitch.pc.in b/lib/libopenvswitch.pc.in -index 2a3f2ca7b..c8d02eb5a 100644 --- a/lib/libopenvswitch.pc.in +++ b/lib/libopenvswitch.pc.in @@ -7,5 +7,5 @@ Name: libopenvswitch @@ -34,8 +30,6 @@ index 2a3f2ca7b..c8d02eb5a 100644 -Libs.private: @LIBS@ +Libs.private: @LIBS@ @SSL_LIBS@ @CAPNG_LDADD@ @LIBBPF_LDADD@ @LIBUNBOUND_LDADD@ @LIBUNWIND_LDADD@ Cflags: -I${includedir}/openvswitch -diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index f2e0169f8..e000c1cc5 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -657,7 +657,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND], diff --git a/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch b/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch index e93deb19c..75da5a249 100644 --- a/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch +++ b/net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch @@ -8,8 +8,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> configure.ac | 1 - 1 file changed, 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 2bcd1945b..ad550fff8 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ OVS_CHECK_LINUX_HOST diff --git a/net/ovn/patches/0002-build-skip-tests-and-docs.patch b/net/ovn/patches/0002-build-skip-tests-and-docs.patch index 342dfabf0..12ef25de0 100644 --- a/net/ovn/patches/0002-build-skip-tests-and-docs.patch +++ b/net/ovn/patches/0002-build-skip-tests-and-docs.patch @@ -8,11 +8,9 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> Makefile.am | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 04400e184..c12cfcd11 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -488,11 +488,9 @@ dist-docs: +@@ -483,11 +483,9 @@ dist-docs: include automake.mk @@ -22,5 +20,5 @@ index 04400e184..c12cfcd11 100644 include utilities/automake.mk -include tests/automake.mk include include/automake.mk - include third-party/automake.mk include debian/automake.mk + include lib/ovsdb_automake.mk diff --git a/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch b/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch index 46a7daadd..86a499551 100644 --- a/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch +++ b/net/ovn/patches/0003-ovn-lib-fix-install_dir.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> utilities/ovn-lib.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in -index af1b72edb..f6ab5581c 100644 --- a/utilities/ovn-lib.in +++ b/utilities/ovn-lib.in @@ -54,7 +54,10 @@ ovn_install_dir () { diff --git a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch index 62a4c8b30..9ac7ab8e7 100644 --- a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch +++ b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch @@ -1,5 +1,3 @@ -diff --git a/pdns/Makefile.am b/pdns/Makefile.am -index 2df5fa7..2246088 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -71,7 +71,6 @@ CLEANFILES = \ @@ -10,7 +8,7 @@ index 2df5fa7..2246088 100644 apidocfiles.h \ api-swagger.yaml \ api-swagger.json -@@ -99,7 +98,6 @@ apidocfiles.h: api-swagger.yaml api-swagger.json +@@ -99,7 +98,6 @@ apidocfiles.h: api-swagger.yaml api-swag ./incfiles $^ > $@ noinst_SCRIPTS = pdns.init diff --git a/net/pen/patches/010-deprecated-openssl.patch b/net/pen/patches/010-deprecated-openssl.patch index b8acbab63..c1023d1fd 100644 --- a/net/pen/patches/010-deprecated-openssl.patch +++ b/net/pen/patches/010-deprecated-openssl.patch @@ -8,11 +8,9 @@ Subject: [PATCH] Fix compilation under OpenSSL 1.1 without deprecated APIs ssl.h | 2 ++ 2 files changed, 6 insertions(+) -diff --git a/ssl.c b/ssl.c -index 6c67879..1a222bb 100644 --- a/ssl.c +++ b/ssl.c -@@ -359,7 +359,9 @@ static SSL_CTX *ssl_create_context(char *keyfile, char *certfile, +@@ -359,7 +359,9 @@ static SSL_CTX *ssl_create_context(char debug("continuing anyway..."); } } @@ -22,7 +20,7 @@ index 6c67879..1a222bb 100644 SSL_CTX_set_info_callback(ssl_context, ssl_info_cb); SSL_CTX_set_tlsext_status_cb(ssl_context, ssl_stapling_cb); SSL_CTX_set_tlsext_servername_callback(ssl_context, ssl_sni_cb); -@@ -405,8 +407,10 @@ static SSL_CTX *ssl_create_context(char *keyfile, char *certfile, +@@ -405,8 +407,10 @@ static SSL_CTX *ssl_create_context(char int ssl_init(void) { @@ -33,8 +31,6 @@ index 6c67879..1a222bb 100644 ssl_context = ssl_create_context(keyfile, certfile, cacert_dir, cacert_file); if (ssl_context == NULL) { error("Unable to create default context"); -diff --git a/ssl.h b/ssl.h -index a0dcd18..b63161e 100644 --- a/ssl.h +++ b/ssl.h @@ -1,6 +1,8 @@ @@ -46,4 +42,3 @@ index a0dcd18..b63161e 100644 #define SRV_SSL_V23 0 #define SRV_SSL_V2 1 - diff --git a/net/port-mirroring/patches/020-time.patch b/net/port-mirroring/patches/020-time.patch index 224ed2738..63350fc9e 100644 --- a/net/port-mirroring/patches/020-time.patch +++ b/net/port-mirroring/patches/020-time.patch @@ -1,6 +1,6 @@ --- a/src/main.c +++ b/src/main.c -@@ -252,7 +252,7 @@ void packet_handler_ex(const struct pcap_pkthdr* header, const u_char* pkt_data, +@@ -252,7 +252,7 @@ void packet_handler_ex(const struct pcap if (handle == NULL || pcap_sendpacket(handle, pkt_data, header->len) != 0) { //error detected @@ -9,7 +9,7 @@ time(&nowTime); if (nowTime - cfg.init_time > ERRTIMEOUT && header->len < 1500) { -@@ -282,7 +282,7 @@ void packet_handler_ex(const struct pcap_pkthdr* header, const u_char* pkt_data, +@@ -282,7 +282,7 @@ void packet_handler_ex(const struct pcap if (handle == NULL || pcap_sendpacket(handle, buf, header->len) != 0) { //error detected diff --git a/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch b/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch index e1f1c21eb..b982d6ade 100644 --- a/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch +++ b/net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch @@ -7,11 +7,9 @@ Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com> bin/radicale | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/bin/radicale b/bin/radicale -index 619aca5..7466020 100755 --- a/bin/radicale +++ b/bin/radicale -@@ -26,6 +26,13 @@ Launch the server according to configuration and command-line options. +@@ -26,6 +26,13 @@ Launch the server according to configura """ @@ -25,6 +23,3 @@ index 619aca5..7466020 100755 import radicale.__main__ --- -2.1.0 - diff --git a/net/radicale2/patches/110-disable-setup_requirements.patch b/net/radicale2/patches/110-disable-setup_requirements.patch index 9957045ae..bb832d144 100644 --- a/net/radicale2/patches/110-disable-setup_requirements.patch +++ b/net/radicale2/patches/110-disable-setup_requirements.patch @@ -1,7 +1,5 @@ -Index: radicale2-python3-2.1.11/setup.py -=================================================================== ---- radicale2-python3-2.1.11.orig/setup.py -+++ radicale2-python3-2.1.11/setup.py +--- a/setup.py ++++ b/setup.py @@ -67,7 +67,7 @@ setup( package_data={"radicale": WEB_FILES}, entry_points={"console_scripts": ["radicale = radicale.__main__:run"]}, diff --git a/net/radsecproxy/patches/200-logdest-on-foreground.patch b/net/radsecproxy/patches/200-logdest-on-foreground.patch index e50c45ff1..64c920673 100644 --- a/net/radsecproxy/patches/200-logdest-on-foreground.patch +++ b/net/radsecproxy/patches/200-logdest-on-foreground.patch @@ -1,6 +1,6 @@ --- a/radsecproxy.c +++ b/radsecproxy.c -@@ -3005,15 +3005,13 @@ int radsecproxy_main(int argc, char **argv) { +@@ -3005,15 +3005,13 @@ int radsecproxy_main(int argc, char **ar options.loglevel = loglevel; else if (options.loglevel) debug_set_level(options.loglevel); diff --git a/net/radsecproxy/patches/300-gcc10.patch b/net/radsecproxy/patches/300-gcc10.patch index 55b90114a..352009b89 100644 --- a/net/radsecproxy/patches/300-gcc10.patch +++ b/net/radsecproxy/patches/300-gcc10.patch @@ -9,8 +9,6 @@ GCC 10 compatibility as per https://gcc.gnu.org/gcc-10/porting_to.html radsecproxy.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -diff --git a/radsecproxy.c b/radsecproxy.c -index a4b1211..b281e21 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -84,6 +84,7 @@ extern int optind; @@ -21,8 +19,6 @@ index a4b1211..b281e21 100644 /* minimum required declarations to avoid reordering code */ struct realm *adddynamicrealmserver(struct realm *realm, char *id); -diff --git a/radsecproxy.h b/radsecproxy.h -index 3082300..0f20f50 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -262,7 +262,7 @@ int radsrv(struct request *rq); diff --git a/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch b/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch index 2c72d4323..1195a9987 100644 --- a/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch +++ b/net/ratched/patches/0001-Disable-non-IANA-TLS-extensions.patch @@ -8,11 +8,9 @@ Signed-off-by: Toni Uhlig <matzeton@googlemail.com> openssl_clienthello.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/openssl_clienthello.c b/openssl_clienthello.c -index 559db56..6ecabcb 100644 --- a/openssl_clienthello.c +++ b/openssl_clienthello.c -@@ -93,7 +93,9 @@ static struct lookup_table_element_t known_extensions[] = { +@@ -93,7 +93,9 @@ static struct lookup_table_element_t kno ELEMENT(TLSEXT_TYPE_certificate_authorities), #endif ELEMENT(TLSEXT_TYPE_renegotiate), @@ -22,6 +20,3 @@ index 559db56..6ecabcb 100644 { 0 } }; --- -2.20.1 - diff --git a/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch b/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch index 2736c4b28..9a6b9411e 100644 --- a/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch +++ b/net/ratched/patches/0002-openssl-fix-compilation-without-deprecated-APIs.patch @@ -12,8 +12,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com> openssl_tls.c | 5 ----- 3 files changed, 7 insertions(+), 15 deletions(-) -diff --git a/openssl.c b/openssl.c -index ba097a5..76c817b 100644 --- a/openssl.c +++ b/openssl.c @@ -22,21 +22,17 @@ @@ -40,8 +38,6 @@ index ba097a5..76c817b 100644 } static void errstack_free_X509(struct errstack_element_t *element) { -diff --git a/openssl_certs.c b/openssl_certs.c -index 021b573..a062a24 100644 --- a/openssl_certs.c +++ b/openssl_certs.c @@ -27,6 +27,7 @@ @@ -52,7 +48,7 @@ index 021b573..a062a24 100644 #include <openssl/x509v3.h> #include "ipfwd.h" -@@ -280,8 +281,8 @@ X509* openssl_create_certificate(const struct certificatespec_t *spec) { +@@ -280,8 +281,8 @@ X509* openssl_create_certificate(const s BN_free(serial); /* Set lifetime */ @@ -63,7 +59,7 @@ index 021b573..a062a24 100644 /* Set public key */ X509_set_pubkey(cert, spec->subject_pubkey); -@@ -357,8 +358,8 @@ X509* openssl_create_certificate(const struct certificatespec_t *spec) { +@@ -357,8 +358,8 @@ X509* openssl_create_certificate(const s return cert; } @@ -74,11 +70,9 @@ index 021b573..a062a24 100644 } X509* openssl_load_stored_certificate(const struct certificatespec_t *certspec, const char *filename, bool recreate_when_expired, bool recreate_when_key_mismatch) { -diff --git a/openssl_tls.c b/openssl_tls.c -index 4ba19a3..96a12ec 100644 --- a/openssl_tls.c +++ b/openssl_tls.c -@@ -146,11 +146,6 @@ struct tls_connection_t openssl_tls_connect(const struct tls_connection_request_ +@@ -146,11 +146,6 @@ struct tls_connection_t openssl_tls_conn SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, NULL); SSL_CTX_set_cert_verify_callback(sslctx, cert_verify_callback, &result); } @@ -90,6 +84,3 @@ index 4ba19a3..96a12ec 100644 if (request->config && request->config->cert) { if (SSL_CTX_use_certificate(sslctx, request->config->cert) != 1) { --- -2.20.1 - diff --git a/net/redsocks/patches/0006-fix_default_config_location.patch b/net/redsocks/patches/0006-fix_default_config_location.patch index 987085f0d..cb0bdf936 100644 --- a/net/redsocks/patches/0006-fix_default_config_location.patch +++ b/net/redsocks/patches/0006-fix_default_config_location.patch @@ -6,7 +6,7 @@ Forwared: no Last-Update: 2013-04-23 --- a/main.c +++ b/main.c -@@ -39,7 +39,7 @@ app_subsys *subsystems[] = { +@@ -45,7 +45,7 @@ app_subsys *subsystems[] = { &dnstc_subsys, }; diff --git a/net/rtorrent/patches/130-usleep.patch b/net/rtorrent/patches/130-usleep.patch index c3463e4be..935429d37 100644 --- a/net/rtorrent/patches/130-usleep.patch +++ b/net/rtorrent/patches/130-usleep.patch @@ -9,8 +9,6 @@ uClibc-ng. src/thread_base.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/thread_base.cc b/src/thread_base.cc -index 081791d4..275015ab 100644 --- a/src/thread_base.cc +++ b/src/thread_base.cc @@ -42,6 +42,8 @@ @@ -22,7 +20,7 @@ index 081791d4..275015ab 100644 #include <signal.h> #include <unistd.h> #include <rak/error_number.h> -@@ -66,7 +68,7 @@ class lt_cacheline_aligned thread_queue_hack { +@@ -66,7 +68,7 @@ public: thread_queue_hack() { std::memset(this, 0, sizeof(thread_queue_hack)); } diff --git a/net/samba4/patches/001-samba-4.4.0-pam.patch b/net/samba4/patches/001-samba-4.4.0-pam.patch index efd81f4d3..f52e2efb2 100644 --- a/net/samba4/patches/001-samba-4.4.0-pam.patch +++ b/net/samba4/patches/001-samba-4.4.0-pam.patch @@ -1,6 +1,6 @@ --- a/source3/wscript +++ b/source3/wscript -@@ -843,7 +843,7 @@ msg.msg_accrightslen = sizeof(fd); +@@ -907,7 +907,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -9,7 +9,7 @@ use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -920,6 +920,17 @@ int i; i = PAM_RADIO_TYPE; +@@ -984,6 +984,17 @@ int i; i = PAM_RADIO_TYPE; "or headers not found. Use --without-pam to disable " "PAM support."); diff --git a/net/samba4/patches/003-getpwent_r.patch b/net/samba4/patches/003-getpwent_r.patch index 0ba5fcc53..4671aeae0 100644 --- a/net/samba4/patches/003-getpwent_r.patch +++ b/net/samba4/patches/003-getpwent_r.patch @@ -1,8 +1,6 @@ -diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2cd6122..04f13c6 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c -@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, +@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct tortu return true; } @@ -10,7 +8,7 @@ index 2cd6122..04f13c6 100644 static bool test_getgrgid(struct torture_context *tctx, gid_t gid, struct group *grp_p) -@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx, +@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct tort return true; } @@ -18,7 +16,7 @@ index 2cd6122..04f13c6 100644 static bool test_enum_r_passwd(struct torture_context *tctx, struct passwd **pwd_array_p, size_t *num_pwd_p) -@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx, +@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct to return true; } @@ -26,7 +24,7 @@ index 2cd6122..04f13c6 100644 static bool torture_assert_passwd_equal(struct torture_context *tctx, const struct passwd *p1, -@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx) +@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture struct passwd *pwd, pwd1, pwd2; size_t num_pwd; @@ -35,7 +33,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx) +@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct t struct passwd *pwd, pwd1, pwd2, pwd3, pwd4; size_t num_pwd; @@ -44,7 +42,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx, +@@ -533,6 +534,7 @@ static bool test_enum_group(struct tortu return true; } @@ -52,7 +50,7 @@ index 2cd6122..04f13c6 100644 static bool test_enum_r_group(struct torture_context *tctx, struct group **grp_array_p, size_t *num_grp_p) -@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx, +@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct tor return true; } @@ -60,7 +58,7 @@ index 2cd6122..04f13c6 100644 static bool torture_assert_group_equal(struct torture_context *tctx, const struct group *g1, -@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx) +@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_ struct group *grp, grp1, grp2; size_t num_grp; @@ -69,7 +67,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate group"); for (i=0; i < num_grp; i++) { -@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx) +@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct to struct group *grp, grp1, grp2, grp3, grp4; size_t num_grp; diff --git a/net/samba4/patches/004-missing-headers.patch b/net/samba4/patches/004-missing-headers.patch index 58c26aece..5d294fcb8 100644 --- a/net/samba4/patches/004-missing-headers.patch +++ b/net/samba4/patches/004-missing-headers.patch @@ -1,5 +1,3 @@ -diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h -index b5d79b9..3f4eae0 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -31,6 +31,7 @@ @@ -10,8 +8,6 @@ index b5d79b9..3f4eae0 100644 struct parmlist_entry { struct parmlist_entry *prev, *next; -diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c -index 3b1ac9c..4044d75 100644 --- a/source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c @@ -27,6 +27,8 @@ @@ -23,8 +19,6 @@ index 3b1ac9c..4044d75 100644 #ifndef HAVE_GETGROUPLIST -diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2cd6122..0c84ec2 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c @@ -20,6 +20,8 @@ diff --git a/net/samba4/patches/005-musl_uintptr.patch b/net/samba4/patches/005-musl_uintptr.patch index de7f28572..4437e9fea 100644 --- a/net/samba4/patches/005-musl_uintptr.patch +++ b/net/samba4/patches/005-musl_uintptr.patch @@ -11,11 +11,9 @@ Date: Wed Mar 29 15:22:38 2017 -0300 Signed-off-by: Breno Leitao <breno.leitao@gmail.com> -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index 303d0ae..a2bfc40 100644 --- a/third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ +@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; ((LargestIntegralType)(value)) /* Smallest integral type capable of holding a pointer. */ @@ -24,7 +22,7 @@ index 303d0ae..a2bfc40 100644 # if defined(_WIN32) /* WIN32 is an ILP32 platform */ typedef unsigned int uintptr_t; -@@ -137,6 +137,8 @@ +@@ -137,6 +137,8 @@ typedef uintmax_t LargestIntegralType; # define _UINTPTR_T # define _UINTPTR_T_DEFINED diff --git a/net/samba4/patches/006-netdb-defines.patch b/net/samba4/patches/006-netdb-defines.patch index d7d6446ab..7cb073c15 100644 --- a/net/samba4/patches/006-netdb-defines.patch +++ b/net/samba4/patches/006-netdb-defines.patch @@ -1,8 +1,6 @@ -diff --git a/nsswitch/wins.c b/nsswitch/wins.c -index dccb6dd..bb24acb 100644 --- a/nsswitch/wins.c +++ b/nsswitch/wins.c -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = #define INADDRSZ 4 #endif diff --git a/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch b/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch index c0e7e8907..192cf564d 100644 --- a/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch +++ b/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch @@ -13,8 +13,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> lib/tevent/tevent.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h -index aa6fe0d..2572696 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -32,6 +32,8 @@ @@ -26,6 +24,3 @@ index aa6fe0d..2572696 100644 struct tevent_context; struct tevent_ops; --- -2.7.4 - diff --git a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch index 88c560d1a..507b74c9c 100644 --- a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch +++ b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch @@ -1,5 +1,5 @@ ---- a/wscript_configure_embedded_heimdal 2019-12-17 -+++ b/wscript_configure_embedded_heimdal 2019-12-17 +--- a/wscript_configure_embedded_heimdal ++++ b/wscript_configure_embedded_heimdal @@ -1 +1,12 @@ conf.RECURSE('source4/heimdal_build') + @@ -13,8 +13,8 @@ + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") ---- a/wscript_configure_system_heimdal 2019-12-17 -+++ b/wscript_configure_system_heimdal 2019-12-17 +--- a/wscript_configure_system_heimdal ++++ b/wscript_configure_system_heimdal @@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, funct conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True diff --git a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch index 1d19ec73c..bbc66a057 100644 --- a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch +++ b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch @@ -1,5 +1,5 @@ ---- a/lib/util/util_paths.c 2020-07-03 -+++ b/lib/util/util_paths.c 2020-07-03 +--- a/lib/util/util_paths.c ++++ b/lib/util/util_paths.c @@ -26,6 +26,9 @@ #include "dynconfig/dynconfig.h" #include "lib/util/util_paths.h" diff --git a/net/samba4/patches/020-source3-msgsock-nvram-fix.patch b/net/samba4/patches/020-source3-msgsock-nvram-fix.patch index dc647a788..351f87bf7 100644 --- a/net/samba4/patches/020-source3-msgsock-nvram-fix.patch +++ b/net/samba4/patches/020-source3-msgsock-nvram-fix.patch @@ -1,5 +1,5 @@ ---- a/source3/lib/messages.c 2020-02-28 09:59:35.000000000 +0100 -+++ b/source3/lib/messages.c 2020-05-19 13:35:11.814566657 +0200 +--- a/source3/lib/messages.c ++++ b/source3/lib/messages.c @@ -507,7 +507,7 @@ static NTSTATUS messaging_init_internal( return NT_STATUS_ACCESS_DENIED; } diff --git a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch index 527174001..d05e7bdcc 100644 --- a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch +++ b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch @@ -1,6 +1,6 @@ --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c -@@ -350,7 +350,7 @@ static struct imessaging_context *imessa +@@ -500,7 +500,7 @@ struct imessaging_context *imessaging_in goto fail; } diff --git a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch index 2b5bcdf57..39bbb77b7 100644 --- a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch +++ b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch @@ -4,7 +4,7 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> --- a/lib/ldb/wscript +++ b/lib/ldb/wscript -@@ -152,7 +152,7 @@ def configure(conf): +@@ -143,7 +143,7 @@ def configure(conf): conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) if conf.env.standalone_ldb: @@ -15,7 +15,7 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): --- a/lib/talloc/wscript +++ b/lib/talloc/wscript -@@ -49,7 +49,7 @@ def configure(conf): +@@ -48,7 +48,7 @@ def configure(conf): conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' conf.env.TALLOC_VERSION = VERSION @@ -26,12 +26,12 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> conf.CHECK_FUNCS('getauxval') --- a/lib/tdb/wscript +++ b/lib/tdb/wscript -@@ -89,7 +89,7 @@ def configure(conf): +@@ -95,7 +95,7 @@ def configure(conf): not conf.env.disable_tdb_mutex_locking): conf.define('USE_TDB_MUTEX_LOCKING', 1) - conf.CHECK_XSLTPROC_MANPAGES() + #conf.CHECK_XSLTPROC_MANPAGES() - if not conf.env.disable_python: - # also disable if we don't have the python libs installed + conf.SAMBA_CHECK_PYTHON() + conf.SAMBA_CHECK_PYTHON_HEADERS() diff --git a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch index 1e2e11fcf..8bb80897d 100644 --- a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch +++ b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch @@ -1,6 +1,6 @@ --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -340,22 +340,13 @@ def configure(conf): +@@ -416,22 +416,13 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -29,7 +29,7 @@ conf.CHECK_CODE(''' struct ucred cred; -@@ -698,9 +689,6 @@ def configure(conf): +@@ -809,9 +800,6 @@ def configure(conf): # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: @@ -39,8 +39,8 @@ if conf.CHECK_CODE(''' #define %s 1 #define NO_CONFIG_H 1 -@@ -713,7 +701,7 @@ def configure(conf): - #include "test/getifaddrs.c" +@@ -824,7 +812,7 @@ def configure(conf): + #include "tests/getifaddrs.c" ''' % method, method, - lib='nsl socket' + bsd_for_strlcpy, @@ -48,12 +48,11 @@ addmain=False, execute=True): break -@@ -761,7 +749,6 @@ def build(bld): +@@ -872,7 +860,6 @@ def build(bld): break extra_libs = '' - if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd' if bld.CONFIG_SET('HAVE_LIBRT'): extra_libs += ' rt' - - bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC', - REPLACE_HOSTCC_SOURCE, + if bld.CONFIG_SET('REPLACE_REQUIRES_LIBSOCKET_LIBNSL'): extra_libs += ' socket nsl' + diff --git a/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch b/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch index 043b0a3b0..14a010c42 100644 --- a/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch +++ b/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch @@ -1,5 +1,5 @@ ---- a/lib/util/wscript_configure 2020-06-14 -+++ b/lib/util/wscript_configure 2020-06-14 +--- a/lib/util/wscript_configure ++++ b/lib/util/wscript_configure @@ -11,13 +11,13 @@ conf.CHECK_FUNCS_IN('backtrace backtrace conf.CHECK_HEADERS('execinfo.h') diff --git a/net/samba4/patches/104-samba-4.12-unbundle-icu.patch b/net/samba4/patches/104-samba-4.12-unbundle-icu.patch index fcba20609..bceaa1add 100644 --- a/net/samba4/patches/104-samba-4.12-unbundle-icu.patch +++ b/net/samba4/patches/104-samba-4.12-unbundle-icu.patch @@ -1,5 +1,5 @@ ---- a/lib/util/charset/wscript_configure 2020-06-14 -+++ b/lib/util/charset/wscript_configure 2020-06-14 +--- a/lib/util/charset/wscript_configure ++++ b/lib/util/charset/wscript_configure @@ -37,15 +37,15 @@ conf.CHECK_CODE(''' lib='iconv', headers='errno.h iconv.h') diff --git a/net/shorewall-core/patches/110-lib.common.patch b/net/shorewall-core/patches/110-lib.common.patch index 2391c0db2..8e79db3cf 100644 --- a/net/shorewall-core/patches/110-lib.common.patch +++ b/net/shorewall-core/patches/110-lib.common.patch @@ -1,8 +1,6 @@ -Index: shorewall-core-5.2.4/lib.common -=================================================================== ---- shorewall-core-5.2.4.orig/lib.common 2020-03-25 22:16:13.640263032 +0100 -+++ shorewall-core-5.2.4/lib.common 2020-03-25 22:16:13.640263032 +0100 -@@ -347,7 +347,7 @@ +--- a/lib.common ++++ b/lib.common +@@ -347,7 +347,7 @@ reload_kernel_modules() { if [ -z "$MODULESDIR" ]; then uname=$(uname -r) @@ -11,7 +9,7 @@ Index: shorewall-core-5.2.4/lib.common if [ -n "$extras" ]; then for directory in $(split "$extras"); do MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory" -@@ -401,7 +401,7 @@ +@@ -401,7 +401,7 @@ load_kernel_modules() # $1 = Yes, if we if [ -z "$MODULESDIR" ]; then uname=$(uname -r) diff --git a/net/shorewall-lite/patches/010-install_cp.patch b/net/shorewall-lite/patches/010-install_cp.patch index 6e9e264d2..dac666d68 100644 --- a/net/shorewall-lite/patches/010-install_cp.patch +++ b/net/shorewall-lite/patches/010-install_cp.patch @@ -1,8 +1,6 @@ -Index: shorewall-lite-5.2.1.2/install.sh -=================================================================== ---- shorewall-lite-5.2.1.2.orig/install.sh 2018-12-02 22:24:48.432796798 +0100 -+++ shorewall-lite-5.2.1.2/install.sh 2018-12-02 22:24:48.424797192 +0100 -@@ -500,7 +500,7 @@ +--- a/install.sh ++++ b/install.sh +@@ -500,7 +500,7 @@ ln -sf shorewall ${DESTDIR}${SBINDIR}/${ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755 diff --git a/net/shorewall-lite/patches/020-set-PATH.patch b/net/shorewall-lite/patches/020-set-PATH.patch index d800f2f67..90fab17f0 100644 --- a/net/shorewall-lite/patches/020-set-PATH.patch +++ b/net/shorewall-lite/patches/020-set-PATH.patch @@ -1,6 +1,6 @@ ---- shorewall-lite-5.1.9/shorewall-lite.conf.orig 2017-12-17 09:06:52.301331288 -0500 -+++ shorewall-lite-5.1.9/shorewall-lite.conf 2017-12-17 09:05:55.769714392 -0500 -@@ -36,7 +36,7 @@ +--- a/shorewall-lite.conf ++++ b/shorewall-lite.conf +@@ -36,7 +36,7 @@ LOGFILE= IPTABLES= diff --git a/net/shorewall-lite/patches/120-logfile.patch b/net/shorewall-lite/patches/120-logfile.patch index ff1c02e93..19c53e138 100644 --- a/net/shorewall-lite/patches/120-logfile.patch +++ b/net/shorewall-lite/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall-lite-5.1.7.2/shorewall-lite.conf -=================================================================== ---- shorewall-lite-5.1.7.2.orig/shorewall-lite.conf 2017-10-11 08:19:35.565847520 +0200 -+++ shorewall-lite-5.1.7.2/shorewall-lite.conf 2017-10-11 08:19:35.561847733 +0200 -@@ -28,7 +28,7 @@ +--- a/shorewall-lite.conf ++++ b/shorewall-lite.conf +@@ -28,7 +28,7 @@ VERBOSITY= # L O G G I N G ############################################################################### diff --git a/net/shorewall/patches/130-set-path.patch b/net/shorewall/patches/130-set-path.patch index e28aa399f..b3448a0ba 100644 --- a/net/shorewall/patches/130-set-path.patch +++ b/net/shorewall/patches/130-set-path.patch @@ -1,8 +1,6 @@ -Index: shorewall-5.1.9/configfiles/shorewall.conf -=================================================================== ---- shorewall-5.1.9.orig/configfiles/shorewall.conf 2017-12-18 08:09:12.043625770 +0100 -+++ shorewall-5.1.9/configfiles/shorewall.conf 2017-12-18 08:09:54.353402257 +0100 -@@ -95,7 +95,7 @@ +--- a/configfiles/shorewall.conf ++++ b/configfiles/shorewall.conf +@@ -95,7 +95,7 @@ MODULESDIR= NFACCT= diff --git a/net/shorewall6-lite/patches/010-install_cp.patch b/net/shorewall6-lite/patches/010-install_cp.patch index 913be5437..dac666d68 100644 --- a/net/shorewall6-lite/patches/010-install_cp.patch +++ b/net/shorewall6-lite/patches/010-install_cp.patch @@ -1,8 +1,6 @@ -Index: shorewall6-lite-5.2.1.2/install.sh -=================================================================== ---- shorewall6-lite-5.2.1.2.orig/install.sh 2018-12-02 22:31:46.628225916 +0100 -+++ shorewall6-lite-5.2.1.2/install.sh 2018-12-02 22:31:46.624226113 +0100 -@@ -500,7 +500,7 @@ +--- a/install.sh ++++ b/install.sh +@@ -500,7 +500,7 @@ ln -sf shorewall ${DESTDIR}${SBINDIR}/${ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755 diff --git a/net/shorewall6-lite/patches/020-set-PATH.patch b/net/shorewall6-lite/patches/020-set-PATH.patch index a75cc6905..5ed8fe1f5 100644 --- a/net/shorewall6-lite/patches/020-set-PATH.patch +++ b/net/shorewall6-lite/patches/020-set-PATH.patch @@ -1,6 +1,6 @@ ---- shorewall6-lite-5.1.9/shorewall6-lite.conf.orig 2017-12-17 09:06:52.301331288 -0500 -+++ shorewall6-lite-5.1.9/shorewall6-lite.conf 2017-12-17 09:05:55.769714392 -0500 -@@ -36,7 +36,7 @@ +--- a/shorewall6-lite.conf ++++ b/shorewall6-lite.conf +@@ -36,7 +36,7 @@ LOGFILE= IP6TABLES= diff --git a/net/shorewall6-lite/patches/120-logfile.patch b/net/shorewall6-lite/patches/120-logfile.patch index 6afb39d2a..68a0e9438 100644 --- a/net/shorewall6-lite/patches/120-logfile.patch +++ b/net/shorewall6-lite/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall6-lite-5.1.10.2/shorewall6-lite.conf -=================================================================== ---- shorewall6-lite-5.1.10.2.orig/shorewall6-lite.conf 2018-01-04 22:09:34.461951267 +0100 -+++ shorewall6-lite-5.1.10.2/shorewall6-lite.conf 2018-01-04 22:10:23.559291269 +0100 -@@ -28,7 +28,7 @@ +--- a/shorewall6-lite.conf ++++ b/shorewall6-lite.conf +@@ -28,7 +28,7 @@ VERBOSITY= # L O G G I N G ############################################################################### diff --git a/net/shorewall6/patches/120-logfile.patch b/net/shorewall6/patches/120-logfile.patch index 1712e168d..1db1d7107 100644 --- a/net/shorewall6/patches/120-logfile.patch +++ b/net/shorewall6/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall6-5.1.4.1/configfiles/shorewall6.conf -=================================================================== ---- shorewall6-5.1.4.1.orig/configfiles/shorewall6.conf 2017-10-05 11:28:34.893849703 +0200 -+++ shorewall6-5.1.4.1/configfiles/shorewall6.conf 2017-10-05 11:29:13.047785350 +0200 -@@ -34,7 +34,7 @@ +--- a/configfiles/shorewall6.conf ++++ b/configfiles/shorewall6.conf +@@ -34,7 +34,7 @@ FIREWALL= # L O G G I N G ############################################################################### @@ -11,7 +9,7 @@ Index: shorewall6-5.1.4.1/configfiles/shorewall6.conf BLACKLIST_LOG_LEVEL= -@@ -100,7 +100,7 @@ +@@ -100,7 +100,7 @@ RESTOREFILE=restore SHOREWALL_SHELL=/bin/sh diff --git a/net/shorewall6/patches/130-set-path.patch b/net/shorewall6/patches/130-set-path.patch index f420571b9..d9ba88bb7 100644 --- a/net/shorewall6/patches/130-set-path.patch +++ b/net/shorewall6/patches/130-set-path.patch @@ -1,8 +1,6 @@ -Index: shorewall6-5.1.9/configfiles/shorewall6.conf -=================================================================== ---- shorewall6-5.1.9.orig/configfiles/shorewall6.conf 2017-12-18 08:13:01.999494346 +0100 -+++ shorewall6-5.1.9/configfiles/shorewall6.conf 2017-12-18 08:13:37.253618974 +0100 -@@ -94,7 +94,7 @@ +--- a/configfiles/shorewall6.conf ++++ b/configfiles/shorewall6.conf +@@ -94,7 +94,7 @@ NFACCT= PERL=/usr/bin/perl diff --git a/net/snort/patches/001-compile.patch b/net/snort/patches/001-compile.patch index 419051e93..1a56e77f2 100644 --- a/net/snort/patches/001-compile.patch +++ b/net/snort/patches/001-compile.patch @@ -1,7 +1,6 @@ -diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure.in ---- snort-2.9.11.1-vanilla/configure.in 2018-03-02 15:41:50.601809500 -0500 -+++ snort-2.9.11.1/configure.in 2018-03-02 16:19:08.119307772 -0500 -@@ -282,21 +282,7 @@ +--- a/configure.in ++++ b/configure.in +@@ -282,21 +282,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i AC_CHECK_TYPES([boolean]) # In case INADDR_NONE is not defined (like on Solaris) @@ -24,7 +23,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_inaddr_none) if test "x$have_inaddr_none" = "xno"; then AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) -@@ -428,17 +414,7 @@ +@@ -428,17 +414,7 @@ if test "x$LPCAP" = "xno"; then fi fi @@ -43,7 +42,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_pcap_lex_destroy) if test "x$have_pcap_lex_destroy" = "xyes"; then AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) -@@ -715,18 +691,7 @@ +@@ -716,18 +692,7 @@ fi AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta] [daq_dp_add_dc]) @@ -63,7 +62,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_real_addresses) if test "x$have_daq_real_addresses" = "xyes"; then AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1], -@@ -753,56 +718,21 @@ +@@ -770,56 +735,21 @@ if test "x$ac_cv_func_daq_dp_add_dc" = " fi @@ -123,7 +122,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_ext_modflow) if test "x$have_daq_ext_modflow" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW" -@@ -810,20 +740,7 @@ +@@ -827,20 +757,7 @@ if test "x$have_daq_ext_modflow" = "xyes [DAQ version supports extended flow modifiers.]) fi @@ -145,7 +144,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_queryflow) if test "x$have_daq_queryflow" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW" -@@ -831,17 +748,7 @@ +@@ -848,17 +765,7 @@ if test "x$have_daq_queryflow" = "xyes"; [DAQ version supports query flow.]) fi @@ -164,7 +163,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_data_channel_flags) if test "x$have_daq_data_channel_flags" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_PARAMS" -@@ -849,18 +756,7 @@ +@@ -866,18 +773,7 @@ if test "x$have_daq_data_channel_flags" [DAQ version supports data channel.]) fi @@ -184,7 +183,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions) if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS" -@@ -869,35 +765,14 @@ +@@ -886,35 +782,14 @@ if test "x$have_daq_data_channel_separat fi AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) @@ -222,7 +221,7 @@ diff -u --recursive snort-2.9.11.1-vanilla/configure.in snort-2.9.11.1/configure AC_MSG_RESULT($have_daq_packet_trace) if test "x$have_daq_packet_trace" = "xyes"; then AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1], -@@ -906,18 +781,7 @@ +@@ -923,18 +798,7 @@ else echo "DAQ version doesn't support packet trace." fi diff --git a/net/snort/patches/003-include-tirpc.patch b/net/snort/patches/003-include-tirpc.patch index 439287dca..16f0c1d0b 100644 --- a/net/snort/patches/003-include-tirpc.patch +++ b/net/snort/patches/003-include-tirpc.patch @@ -1,6 +1,5 @@ -diff -u --recursive snort-2.9.15-vanilla/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c snort-2.9.15/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ---- snort-2.9.15-vanilla/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c 2019-10-03 02:42:31.000000000 -0400 -+++ snort-2.9.15/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c 2019-10-13 16:16:37.146329944 -0400 +--- a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ++++ b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c @@ -32,6 +32,7 @@ #include "flow.h" #include "service_api.h" diff --git a/net/socat/patches/100-usleep.patch b/net/socat/patches/100-usleep.patch index 305eaf25c..cead181c1 100644 --- a/net/socat/patches/100-usleep.patch +++ b/net/socat/patches/100-usleep.patch @@ -1,6 +1,6 @@ --- a/sycls.c +++ b/sycls.c -@@ -1329,6 +1329,7 @@ unsigned int Sleep(unsigned int seconds) { +@@ -1329,6 +1329,7 @@ unsigned int Sleep(unsigned int seconds) return retval; } diff --git a/net/socat/patches/200-openssl-deprecated.patch b/net/socat/patches/200-openssl-deprecated.patch index 07c9e5b0c..a95828457 100644 --- a/net/socat/patches/200-openssl-deprecated.patch +++ b/net/socat/patches/200-openssl-deprecated.patch @@ -1,5 +1,3 @@ -diff --git a/xio-openssl.c b/xio-openssl.c -index e931983..84ec100 100644 --- a/xio-openssl.c +++ b/xio-openssl.c @@ -8,6 +8,8 @@ diff --git a/net/softethervpn/patches/110-no-m64.patch b/net/softethervpn/patches/110-no-m64.patch index ed21e1488..6ee75eca7 100644 --- a/net/softethervpn/patches/110-no-m64.patch +++ b/net/softethervpn/patches/110-no-m64.patch @@ -1,6 +1,6 @@ --- a/src/makefiles/linux_64bit.mak +++ b/src/makefiles/linux_64bit.mak -@@ -66,9 +66,9 @@ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT +@@ -66,9 +66,9 @@ OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG - OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz diff --git a/net/softethervpn/patches/120-openssl-deprecated.patch b/net/softethervpn/patches/120-openssl-deprecated.patch index 67bf97358..e722fab98 100644 --- a/net/softethervpn/patches/120-openssl-deprecated.patch +++ b/net/softethervpn/patches/120-openssl-deprecated.patch @@ -16,7 +16,7 @@ #include <openssl/des.h>
#include <openssl/aes.h>
#include <openssl/dh.h>
-@@ -627,7 +629,7 @@ UINT CipherProcess(CIPHER *c, void *iv, void *dest, void *src, UINT size) +@@ -627,7 +629,7 @@ UINT CipherProcess(CIPHER *c, void *iv, return 0;
}
@@ -61,7 +61,7 @@ LOCK *lock = ssl_lock_obj[n];
if (mode & CRYPTO_LOCK)
-@@ -972,12 +979,15 @@ void OpenSSL_Lock(int mode, int n, const char *file, int line) +@@ -972,12 +979,15 @@ void OpenSSL_Lock(int mode, int n, const // Unlock
Unlock(lock);
}
@@ -77,7 +77,7 @@ }
// Get the display name of the certificate
-@@ -1901,8 +1911,8 @@ X509 *NewX509(K *pub, K *priv, X *ca, NAME *name, UINT days, X_SERIAL *serial) +@@ -1901,8 +1911,8 @@ X509 *NewX509(K *pub, K *priv, X *ca, NA X509_set_version(x509, 2L);
// Set the Expiration
@@ -88,7 +88,7 @@ if (!UINT64ToAsn1Time(t1, notBefore))
{
FreeX509(x509);
-@@ -2043,8 +2053,8 @@ X509 *NewRootX509(K *pub, K *priv, NAME *name, UINT days, X_SERIAL *serial) +@@ -2043,8 +2053,8 @@ X509 *NewRootX509(K *pub, K *priv, NAME X509_set_version(x509, 2L);
// Set the Expiration
@@ -218,7 +218,7 @@ --- a/src/Mayaqua/Network.c +++ b/src/Mayaqua/Network.c -@@ -18172,7 +18172,7 @@ struct ssl_ctx_st *NewSSLCtx(bool server_mode) +@@ -18172,7 +18172,7 @@ struct ssl_ctx_st *NewSSLCtx(bool server SSL_CTX_set_ecdh_auto(ctx, 1);
#endif // SSL_CTX_set_ecdh_auto
diff --git a/net/softethervpn/patches/130-iconv.patch b/net/softethervpn/patches/130-iconv.patch index b670a9e74..935216df4 100644 --- a/net/softethervpn/patches/130-iconv.patch +++ b/net/softethervpn/patches/130-iconv.patch @@ -1,6 +1,6 @@ --- a/src/Mayaqua/Mayaqua.h +++ b/src/Mayaqua/Mayaqua.h -@@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow) +@@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS #include <ifaddrs.h>
#endif // MAYAQUA_SUPPORTS_GETIFADDRS
@@ -11,7 +11,7 @@ size_t iconv (iconv_t __cd, char **__restrict __inbuf,
--- a/src/makefiles/linux_32bit.mak +++ b/src/makefiles/linux_32bit.mak -@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lrea +@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char @@ -22,7 +22,7 @@ INSTALL_VPNSERVER_DIR=/usr/vpnserver/ --- a/src/makefiles/linux_64bit.mak +++ b/src/makefiles/linux_64bit.mak -@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto +@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char diff --git a/net/softethervpn5/patches/001-iconv-defines-fix.patch b/net/softethervpn5/patches/001-iconv-defines-fix.patch index 66173f99a..88c8dc37c 100644 --- a/net/softethervpn5/patches/001-iconv-defines-fix.patch +++ b/net/softethervpn5/patches/001-iconv-defines-fix.patch @@ -1,6 +1,6 @@ ---- a/src/Mayaqua/Mayaqua.h 2019-07-11 -+++ b/src/Mayaqua/Mayaqua.h 2019-07-11 -@@ -178,7 +178,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS +--- a/src/Mayaqua/Mayaqua.h ++++ b/src/Mayaqua/Mayaqua.h +@@ -184,7 +184,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS #include <ifaddrs.h>
#endif // MAYAQUA_SUPPORTS_GETIFADDRS
diff --git a/net/softethervpn5/patches/002-iconv-cmake-fix.patch b/net/softethervpn5/patches/002-iconv-cmake-fix.patch index 1f94c1abb..3683627e6 100644 --- a/net/softethervpn5/patches/002-iconv-cmake-fix.patch +++ b/net/softethervpn5/patches/002-iconv-cmake-fix.patch @@ -1,5 +1,5 @@ ---- a/src/Mayaqua/CMakeLists.txt 2019-07-10 -+++ b/src/Mayaqua/CMakeLists.txt 2019-07-11 +--- a/src/Mayaqua/CMakeLists.txt ++++ b/src/Mayaqua/CMakeLists.txt @@ -59,7 +59,7 @@ if(UNIX) find_package(ZLIB REQUIRED) diff --git a/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch b/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch index 5ce814a7a..9ceacb1b4 100644 --- a/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch +++ b/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch @@ -1,6 +1,6 @@ ---- a/src/Cedar/Server.h 2018-07-21 -+++ b/src/Cedar/Server.h 2018-07-23 -@@ -138,10 +138,10 @@ extern char *SERVER_CONFIG_FILE_NAME; +--- a/src/Cedar/Server.h ++++ b/src/Cedar/Server.h +@@ -32,10 +32,10 @@ extern char *SERVER_CONFIG_FILE_NAME; #define SERVER_CONTROL_TCP_TIMEOUT (60 * 1000)
#define SERVER_FARM_CONTROL_INTERVAL (10 * 1000)
diff --git a/net/softethervpn5/patches/101-add-config-write-syslog.patch b/net/softethervpn5/patches/101-add-config-write-syslog.patch index 8f2ede5f9..86b1ad205 100644 --- a/net/softethervpn5/patches/101-add-config-write-syslog.patch +++ b/net/softethervpn5/patches/101-add-config-write-syslog.patch @@ -1,6 +1,6 @@ ---- a/src/Cedar/Server.c 2018-07-25 -+++ b/src/Cedar/Server.c 2018-07-26 -@@ -110,7 +110,7 @@ +--- a/src/Cedar/Server.c ++++ b/src/Cedar/Server.c +@@ -4,7 +4,7 @@ // Server.c
// VPN Server module
@@ -9,7 +9,7 @@ #include "CedarPch.h"
static SERVER *server = NULL;
-@@ -6601,6 +6601,10 @@ UINT SiWriteConfigurationFile(SERVER *s) +@@ -6492,6 +6492,10 @@ UINT SiWriteConfigurationFile(SERVER *s) {
return 0;
}
diff --git a/net/softflowd/patches/010-bzero.patch b/net/softflowd/patches/010-bzero.patch index 8743a583d..a67f6f34e 100644 --- a/net/softflowd/patches/010-bzero.patch +++ b/net/softflowd/patches/010-bzero.patch @@ -1,6 +1,6 @@ --- a/freelist.c +++ b/freelist.c -@@ -46,7 +46,7 @@ freelist_init(struct freelist *fl, size_t allocsz) +@@ -46,7 +46,7 @@ freelist_init(struct freelist *fl, size_ { size_t sizeof_fl = sizeof(fl); FLOGIT((LOG_DEBUG, "%s: %s(%p, %zu)", __func__, __func__, fl, allocsz)); @@ -11,7 +11,7 @@ } --- a/ipfix.c +++ b/ipfix.c -@@ -388,7 +388,7 @@ ipfix_init_template_unity (struct FLOWTRACKPARAMETERS *param, +@@ -388,7 +388,7 @@ ipfix_init_template_unity (struct FLOWTR u_int8_t icmp_flag, u_int8_t bi_flag, u_int16_t version) { u_int index = 0, bi_index = 0, length = 0; @@ -20,7 +20,7 @@ template->h.c.set_id = htons (version == 10 ? IPFIX_TEMPLATE_SET_ID : NFLOW9_TEMPLATE_SET_ID); -@@ -510,7 +510,7 @@ nflow9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -510,7 +510,7 @@ nflow9_init_option (u_int16_t ifidx, str NFLOW9_SOFTFLOWD_OPTION_TEMPLATE_NRECORDS * sizeof (struct IPFIX_FIELD_SPECIFIER); @@ -29,7 +29,7 @@ option_template.h.c.set_id = htons (NFLOW9_OPTION_TEMPLATE_SET_ID); option_template.h.c.length = htons (sizeof (option_template.h) + scope_len + opt_len); -@@ -524,7 +524,7 @@ nflow9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -524,7 +524,7 @@ nflow9_init_option (u_int16_t ifidx, str ipfix_init_fields (option_template.r, &option_index, field_nf9option, NFLOW9_SOFTFLOWD_OPTION_TEMPLATE_NRECORDS); @@ -38,7 +38,7 @@ nf9opt_data.c.set_id = htons (IPFIX_SOFTFLOWD_OPTION_TEMPLATE_ID); nf9opt_data.c.length = htons (sizeof (nf9opt_data)); nf9opt_data.scope_ifidx = htonl (ifidx); -@@ -536,7 +536,7 @@ nflow9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -536,7 +536,7 @@ nflow9_init_option (u_int16_t ifidx, str static void ipfix_init_option (struct timeval *system_boot_time, struct OPTION *option) { u_int scope_index = 0, option_index = 0; @@ -47,7 +47,7 @@ option_template.h.c.set_id = htons (IPFIX_OPTION_TEMPLATE_SET_ID); option_template.h.c.length = htons (sizeof (option_template)); option_template.h.u.i.r.template_id = -@@ -553,7 +553,7 @@ ipfix_init_option (struct timeval *system_boot_time, struct OPTION *option) { +@@ -553,7 +553,7 @@ ipfix_init_option (struct timeval *syste ipfix_init_fields (option_template.r, &option_index, field_option, IPFIX_SOFTFLOWD_OPTION_TEMPLATE_NRECORDS); @@ -56,7 +56,7 @@ option_data.c.set_id = htons (IPFIX_SOFTFLOWD_OPTION_TEMPLATE_ID); option_data.c.length = htons (sizeof (option_data)); option_data.scope_pid = htonl ((u_int32_t) option->meteringProcessId); -@@ -809,7 +809,7 @@ send_ipfix_common (struct FLOW **flows, int num_flows, +@@ -809,7 +809,7 @@ send_ipfix_common (struct FLOW **flows, last_valid = num_packets = 0; for (j = 0; j < num_flows;) { @@ -94,7 +94,7 @@ option_template.h.c.flowset_id = htons (NFLOW9_OPTION_TEMPLATE_SET_ID); option_template.h.c.length = htons (sizeof (option_template)); option_template.h.template_id = htons (NF9_SOFTFLOWD_OPTION_TEMPLATE_ID); -@@ -238,7 +238,7 @@ nf9_init_option (u_int16_t ifidx, struct OPTION *option) { +@@ -238,7 +238,7 @@ nf9_init_option (u_int16_t ifidx, struct option_template.r[1].length = htons (sizeof (option_data.sampling_algorithm)); @@ -103,7 +103,7 @@ option_data.c.flowset_id = htons (NF9_SOFTFLOWD_OPTION_TEMPLATE_ID); option_data.c.length = htons (sizeof (option_data)); option_data.scope_ifidx = htonl (ifidx); -@@ -257,7 +257,7 @@ nf_flow_to_flowset (const struct FLOW *flow, u_char * packet, u_int len, +@@ -257,7 +257,7 @@ nf_flow_to_flowset (const struct FLOW *f struct NF9_SOFTFLOWD_DATA_COMMON *dc[2]; u_int freclen, ret_len, nflows; @@ -112,7 +112,7 @@ *len_used = nflows = ret_len = 0; switch (flow->af) { case AF_INET: -@@ -363,7 +363,7 @@ send_netflow_v9 (struct SENDPARAMETER sp) { +@@ -363,7 +363,7 @@ send_netflow_v9 (struct SENDPARAMETER sp last_valid = num_packets = 0; for (j = 0; j < num_flows;) { @@ -123,7 +123,7 @@ nf9->version = htons (9); --- a/psamp.c +++ b/psamp.c -@@ -51,7 +51,7 @@ static int psamp_pkts_until_template = -1; +@@ -51,7 +51,7 @@ static int psamp_pkts_until_template = - static void psamp_init_template (struct PSAMP_SOFTFLOWD_TEMPLATE *template_p) { u_int index = 0; diff --git a/net/sslh/patches/001-no_sslh_select.patch b/net/sslh/patches/001-no_sslh_select.patch index 1d3b3feff..fccceb693 100644 --- a/net/sslh/patches/001-no_sslh_select.patch +++ b/net/sslh/patches/001-no_sslh_select.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -76,7 +76,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS) +@@ -76,7 +76,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_T version.h: ./genver.sh >version.h @@ -9,7 +9,7 @@ $(OBJS): version.h -@@ -87,10 +87,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h +@@ -87,10 +87,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) #strip sslh-fork diff --git a/net/sstp-client/patches/200-openssl-deprecated.patch b/net/sstp-client/patches/200-openssl-deprecated.patch index 9772c511f..e2d4e3224 100644 --- a/net/sstp-client/patches/200-openssl-deprecated.patch +++ b/net/sstp-client/patches/200-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/src/sstp-client.c +++ b/src/sstp-client.c -@@ -477,6 +477,7 @@ static status_t sstp_init_ssl(sstp_client_st *client, sstp_option_st *opt) +@@ -477,6 +477,7 @@ static status_t sstp_init_ssl(sstp_clien int retval = SSTP_FAIL; int status = 0; @@ -8,7 +8,7 @@ /* Initialize the OpenSSL library */ status = SSL_library_init(); if (status != 1) -@@ -490,6 +491,9 @@ static status_t sstp_init_ssl(sstp_client_st *client, sstp_option_st *opt) +@@ -490,6 +491,9 @@ static status_t sstp_init_ssl(sstp_clien /* Create a new crypto context */ client->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); diff --git a/net/stubby/patches/stubby-0.3.0-fix-config-install.patch b/net/stubby/patches/stubby-0.3.0-fix-config-install.patch index c873a5008..539012526 100644 --- a/net/stubby/patches/stubby-0.3.0-fix-config-install.patch +++ b/net/stubby/patches/stubby-0.3.0-fix-config-install.patch @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt 2020-07-01 22:17:14.424445933 +0100 -+++ b/CMakeLists.txt 2020-07-01 22:17:57.032637638 +0100 -@@ -115,14 +115,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,14 +115,26 @@ install(FILES AUTHORS COPYING ChangeLog # Ensure the file gets CRLF line endings on Windows. file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubby.yml INPUT ${CMAKE_CURRENT_SOURCE_DIR}/stubby.yml.example) diff --git a/net/sysrepo/patches/006-update-generated-protobufc-files.patch b/net/sysrepo/patches/006-update-generated-protobufc-files.patch index dbb4288e6..093fc4154 100644 --- a/net/sysrepo/patches/006-update-generated-protobufc-files.patch +++ b/net/sysrepo/patches/006-update-generated-protobufc-files.patch @@ -1,6 +1,6 @@ --- a/src/common/sysrepo.pb-c.c +++ b/src/common/sysrepo.pb-c.c -@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__event_notif_replay_resp__descriptor = +@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__eve (ProtobufCMessageInit) sr__event_notif_replay_resp__init, NULL,NULL,NULL /* reserved[123] */ }; @@ -9,7 +9,7 @@ { { "xpath", -@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[4] +@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, @@ -31,7 +31,7 @@ 3, /* field[3] = request_id */ 1, /* field[1] = subscriber_address */ 2, /* field[2] = subscription_id */ -@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_provide_req__number_ranges[3 + 1] = +@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_ { 1, 0 }, { 10, 1 }, { 20, 3 }, @@ -40,7 +40,7 @@ }; const ProtobufCMessageDescriptor sr__data_provide_req__descriptor = { -@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__data_provide_req__descriptor = +@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__dat "Sr__DataProvideReq", "sr", sizeof(Sr__DataProvideReq), diff --git a/net/tac_plus/patches/010-configure-remove-libnsl.patch b/net/tac_plus/patches/010-configure-remove-libnsl.patch index 01ac6aa55..4d5ad0c60 100644 --- a/net/tac_plus/patches/010-configure-remove-libnsl.patch +++ b/net/tac_plus/patches/010-configure-remove-libnsl.patch @@ -1,6 +1,6 @@ ---- a/tacacs-F4.0.4.28/configure 2015-01-06 22:55:35.000000000 +0100 -+++ b/tacacs-F4.0.4.28/configure 2019-01-31 14:44:28.679272504 +0100 -@@ -3285,11 +3285,9 @@ +--- a/tacacs-F4.0.4.28/configure ++++ b/tacacs-F4.0.4.28/configure +@@ -3244,11 +3244,9 @@ case "${host_os}" in ;; *linux* ) # XXX: not sure if /usr/local is necessary. diff --git a/net/tcpproxy/patches/001-ragel_generated.patch b/net/tcpproxy/patches/001-ragel_generated.patch index 600e602c2..70723e3e9 100644 --- a/net/tcpproxy/patches/001-ragel_generated.patch +++ b/net/tcpproxy/patches/001-ragel_generated.patch @@ -1,6 +1,5 @@ -diff -Nur tcpproxy-1.2.orig/src/cfg_parser.c tcpproxy-1.2/src/cfg_parser.c ---- tcpproxy-1.2.orig/src/cfg_parser.c 1970-01-01 01:00:00.000000000 +0100 -+++ tcpproxy-1.2/src/cfg_parser.c 2015-05-17 18:10:54.933307372 +0200 +--- /dev/null ++++ b/src/cfg_parser.c @@ -0,0 +1,1374 @@ + +#line 1 "cfg_parser.rl" diff --git a/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch b/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch index 363ea27f6..e96d8a9f5 100644 --- a/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch +++ b/net/tcpproxy/patches/100-remove-build-timestamps-build-hostname.patch @@ -1,8 +1,6 @@ -Index: tcpproxy-1.2/src/configure -=================================================================== ---- tcpproxy-1.2.orig/src/configure 2017-12-03 13:12:34.483712208 +0100 -+++ tcpproxy-1.2/src/configure 2017-12-03 13:13:56.677386919 +0100 -@@ -195,9 +195,6 @@ +--- a/src/configure ++++ b/src/configure +@@ -195,9 +195,6 @@ if which git >/dev/null; then fi fi @@ -12,7 +10,7 @@ Index: tcpproxy-1.2/src/configure cat > config.h <<EOF /* * tcpproxy config header -@@ -211,7 +208,6 @@ +@@ -211,7 +208,6 @@ cat > config.h <<EOF #define TCPPROXY_config_h_INCLUDED #define VERSION_STRING_0 "tcpproxy version $VERSION" @@ -20,11 +18,9 @@ Index: tcpproxy-1.2/src/configure #define TARGET "$TARGET" #define PREFIX "$PREFIX" -Index: tcpproxy-1.2/src/options.c -=================================================================== ---- tcpproxy-1.2.orig/src/options.c 2015-05-14 00:14:22.000000000 +0200 -+++ tcpproxy-1.2/src/options.c 2017-12-03 13:14:37.442219952 +0100 -@@ -326,11 +326,9 @@ +--- a/src/options.c ++++ b/src/options.c +@@ -326,11 +326,9 @@ void options_print_version() { printf("%s\n", VERSION_STRING_0); #if defined(__clang__) diff --git a/net/tinyproxy/patches/120-fix_INET6.patch b/net/tinyproxy/patches/120-fix_INET6.patch index 041354885..3911c18f0 100644 --- a/net/tinyproxy/patches/120-fix_INET6.patch +++ b/net/tinyproxy/patches/120-fix_INET6.patch @@ -10,7 +10,7 @@ { struct addrinfo hints, *res, *ressave; -@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *addr, int family) +@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *add assert (addr != NULL && strlen (addr) != 0); memset (&hints, 0, sizeof (struct addrinfo)); @@ -19,7 +19,7 @@ hints.ai_socktype = SOCK_STREAM; /* The local port it not important */ -@@ -112,14 +111,12 @@ int opensock (const char *host, int port, const char *bind_to) +@@ -112,14 +111,12 @@ int opensock (const char *host, int port /* Bind to the specified address */ if (bind_to) { diff --git a/net/tor/patches/001-torrc.patch b/net/tor/patches/001-torrc.patch index 16cae0402..e4c26266a 100644 --- a/net/tor/patches/001-torrc.patch +++ b/net/tor/patches/001-torrc.patch @@ -18,8 +18,8 @@ ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -@@ -238,3 +238,4 @@ - #%include /etc/torrc.d/ - #%include /etc/torrc.custom +@@ -251,3 +251,4 @@ + ## The %include option can be used recursively. + #%include /etc/torrc.d/*.conf +User tor diff --git a/net/udptunnel/patches/001-multicast.patch b/net/udptunnel/patches/001-multicast.patch index d69d139fe..4cfcbadeb 100644 --- a/net/udptunnel/patches/001-multicast.patch +++ b/net/udptunnel/patches/001-multicast.patch @@ -1,9 +1,9 @@ Description: Fix issue where udptunnel was failing to receive packets sent to a multicast address. (See #254834). Author: singh_chinmay@extenprise.net ---- udptunnel-1.1.orig/udptunnel.c -+++ udptunnel-1.1/udptunnel.c -@@ -217,7 +217,7 @@ +--- a/udptunnel.c ++++ b/udptunnel.c +@@ -217,7 +217,7 @@ static void parse_args(int argc, char *a (*relays)[i].udpaddr.sin_port = htons(udpport + i); (*relays)[i].udpaddr.sin_family = AF_INET; (*relays)[i].udp_ttl = udpttl; diff --git a/net/udptunnel/patches/002-main_code_fix.patch b/net/udptunnel/patches/002-main_code_fix.patch index 93043df0e..1c417e4fd 100644 --- a/net/udptunnel/patches/002-main_code_fix.patch +++ b/net/udptunnel/patches/002-main_code_fix.patch @@ -1,10 +1,8 @@ Description: remove yp host lookup and fix some types Author: Jan Delgado <jdelgado@gmx.net> -Index: udptunnel-1.1/host2ip.c -=================================================================== ---- udptunnel-1.1.orig/host2ip.c -+++ udptunnel-1.1/host2ip.c +--- a/host2ip.c ++++ b/host2ip.c @@ -4,7 +4,6 @@ #include <netdb.h> /* gethostbyname() */ #include <netinet/in.h> /* sockaddr_in */ @@ -33,10 +31,8 @@ Index: udptunnel-1.1/host2ip.c } return in; } /* host2ip */ -Index: udptunnel-1.1/udptunnel.c -=================================================================== ---- udptunnel-1.1.orig/udptunnel.c -+++ udptunnel-1.1/udptunnel.c +--- a/udptunnel.c ++++ b/udptunnel.c @@ -423,7 +423,7 @@ static void await_incoming_connections(s for (i = 0; i < relay_count; i++) { if (FD_ISSET(relays[i].tcp_listen_sock, &readfds)) { diff --git a/net/ulogd/patches/010-json-remote.patch b/net/ulogd/patches/010-json-remote.patch index a250e0631..e217a11d8 100644 --- a/net/ulogd/patches/010-json-remote.patch +++ b/net/ulogd/patches/010-json-remote.patch @@ -13,8 +13,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ulogd.conf.in | 11 ++ 2 files changed, 281 insertions(+), 21 deletions(-) -diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c -index 4d8e3e9..6edfa90 100644 --- a/output/ulogd_output_JSON.c +++ b/output/ulogd_output_JSON.c @@ -20,10 +20,15 @@ @@ -70,7 +68,7 @@ index 4d8e3e9..6edfa90 100644 JSON_CONF_MAX }; -@@ -95,15 +116,167 @@ static struct config_keyset json_kset = { +@@ -95,15 +116,167 @@ static struct config_keyset json_kset = .options = CONFIG_OPT_NONE, .u = { .value = 0 }, }, @@ -238,7 +236,7 @@ index 4d8e3e9..6edfa90 100644 json_t *msg; msg = json_object(); -@@ -218,34 +391,65 @@ static int json_interp(struct ulogd_pluginstance *upi) +@@ -218,34 +391,65 @@ static int json_interp(struct ulogd_plug } } @@ -320,7 +318,7 @@ index 4d8e3e9..6edfa90 100644 break; default: break; -@@ -255,6 +459,8 @@ static void sighup_handler_print(struct ulogd_pluginstance *upi, int signal) +@@ -255,6 +459,8 @@ static void sighup_handler_print(struct static int json_configure(struct ulogd_pluginstance *upi, struct ulogd_pluginstance_stack *stack) { @@ -329,7 +327,7 @@ index 4d8e3e9..6edfa90 100644 int ret; ret = ulogd_wildcard_inputkeys(upi); -@@ -265,13 +471,25 @@ static int json_configure(struct ulogd_pluginstance *upi, +@@ -265,13 +471,25 @@ static int json_configure(struct ulogd_p if (ret < 0) return ret; @@ -357,7 +355,7 @@ index 4d8e3e9..6edfa90 100644 op->of = fopen(upi->config_kset->ces[0].u.string, "a"); if (!op->of) { -@@ -280,6 +498,27 @@ static int json_init(struct ulogd_pluginstance *upi) +@@ -280,6 +498,27 @@ static int json_init(struct ulogd_plugin return -1; } @@ -385,7 +383,7 @@ index 4d8e3e9..6edfa90 100644 /* search for time */ op->sec_idx = -1; op->usec_idx = -1; -@@ -293,15 +532,25 @@ static int json_init(struct ulogd_pluginstance *upi) +@@ -293,15 +532,25 @@ static int json_init(struct ulogd_plugin *op->cached_tz = '\0'; @@ -414,8 +412,6 @@ index 4d8e3e9..6edfa90 100644 return 0; } -diff --git a/ulogd.conf.in b/ulogd.conf.in -index 62222db..99cfc24 100644 --- a/ulogd.conf.in +++ b/ulogd.conf.in @@ -213,6 +213,17 @@ sync=1 @@ -436,6 +432,3 @@ index 62222db..99cfc24 100644 [pcap1] #default file is /var/log/ulogd.pcap --- -cgit v1.2.1 - diff --git a/net/ulogd/patches/020-fix-musl.patch b/net/ulogd/patches/020-fix-musl.patch index 592429a6d..afbc64cf4 100644 --- a/net/ulogd/patches/020-fix-musl.patch +++ b/net/ulogd/patches/020-fix-musl.patch @@ -12,8 +12,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> src/ulogd.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/ulogd.c b/src/ulogd.c -index b8bc57c..9cd64e8 100644 --- a/src/ulogd.c +++ b/src/ulogd.c @@ -65,6 +65,7 @@ @@ -24,6 +22,3 @@ index b8bc57c..9cd64e8 100644 #include <ulogd/conffile.h> #include <ulogd/ulogd.h> #ifdef DEBUG --- -cgit v1.2.1 - diff --git a/net/ulogd/patches/030-ipfix-add.patch b/net/ulogd/patches/030-ipfix-add.patch index ec42c66e3..13d1472c9 100644 --- a/net/ulogd/patches/030-ipfix-add.patch +++ b/net/ulogd/patches/030-ipfix-add.patch @@ -68,11 +68,9 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> create mode 100644 output/ipfix/ulogd_output_IPFIX.c delete mode 100644 output/ulogd_output_IPFIX.c -diff --git a/configure.ac b/configure.ac -index 3aa0624..48b4995 100644 --- a/configure.ac +++ b/configure.ac -@@ -179,7 +179,7 @@ AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefi +@@ -179,7 +179,7 @@ AC_CONFIG_FILES(include/Makefile include input/sum/Makefile \ filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \ @@ -81,8 +79,6 @@ index 3aa0624..48b4995 100644 src/Makefile Makefile Rules.make) AC_OUTPUT -diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h -index 2e38195..1636a8c 100644 --- a/include/ulogd/ulogd.h +++ b/include/ulogd/ulogd.h @@ -28,6 +28,11 @@ @@ -97,11 +93,9 @@ index 2e38195..1636a8c 100644 #define ULOGD_RET_INT8 0x0001 #define ULOGD_RET_INT16 0x0002 -diff --git a/output/Makefile.am b/output/Makefile.am -index ff851ad..7ba8217 100644 --- a/output/Makefile.am +++ b/output/Makefile.am -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${LIBNETFILTER_ACCT_CFLAGS} \ +@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include ${ ${LIBNETFILTER_CONNTRACK_CFLAGS} ${LIBNETFILTER_LOG_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} @@ -110,9 +104,6 @@ index ff851ad..7ba8217 100644 pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \ ulogd_output_OPRINT.la ulogd_output_GPRINT.la \ -diff --git a/output/ipfix/Makefile.am b/output/ipfix/Makefile.am -new file mode 100644 -index 0000000..cacda26 --- /dev/null +++ b/output/ipfix/Makefile.am @@ -0,0 +1,7 @@ @@ -123,9 +114,6 @@ index 0000000..cacda26 + +ulogd_output_IPFIX_la_SOURCES = ulogd_output_IPFIX.c ipfix.c +ulogd_output_IPFIX_la_LDFLAGS = -avoid-version -module -diff --git a/output/ipfix/ipfix.c b/output/ipfix/ipfix.c -new file mode 100644 -index 0000000..60a4c7f --- /dev/null +++ b/output/ipfix/ipfix.c @@ -0,0 +1,141 @@ @@ -270,9 +258,6 @@ index 0000000..60a4c7f + + return sizeof(struct vy_ipfix_data); +} -diff --git a/output/ipfix/ipfix.h b/output/ipfix/ipfix.h -new file mode 100644 -index 0000000..cdb5a6f --- /dev/null +++ b/output/ipfix/ipfix.h @@ -0,0 +1,89 @@ @@ -365,9 +350,6 @@ index 0000000..cdb5a6f +int ipfix_dump_msg(const struct ipfix_msg *); + +#endif /* IPFIX_H */ -diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c -new file mode 100644 -index 0000000..ec143b1 --- /dev/null +++ b/output/ipfix/ulogd_output_IPFIX.c @@ -0,0 +1,503 @@ @@ -874,6 +856,3 @@ index 0000000..ec143b1 +{ + ulogd_register_plugin(&ipfix_plugin); +} --- -cgit v1.2.1 - diff --git a/net/ulogd/patches/040-ipfix-template.patch b/net/ulogd/patches/040-ipfix-template.patch index c6ac601bf..c7b9d8eeb 100644 --- a/net/ulogd/patches/040-ipfix-template.patch +++ b/net/ulogd/patches/040-ipfix-template.patch @@ -27,8 +27,6 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> output/ipfix/ulogd_output_IPFIX.c | 56 ++++++++++++---------- 4 files changed, 139 insertions(+), 37 deletions(-) -diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h -index aef47f0..01dd96a 100644 --- a/include/ulogd/ipfix_protocol.h +++ b/include/ulogd/ipfix_protocol.h @@ -129,6 +129,7 @@ enum { @@ -39,8 +37,6 @@ index aef47f0..01dd96a 100644 IPFIX_bgpNextAdjacentAsNumber = 128, IPFIX_bgpPrevAdjacentAsNumber = 129, IPFIX_exporterIPv4Address = 130, -diff --git a/output/ipfix/ipfix.c b/output/ipfix/ipfix.c -index 60a4c7f..4bb432a 100644 --- a/output/ipfix/ipfix.c +++ b/output/ipfix/ipfix.c @@ -2,6 +2,7 @@ @@ -56,7 +52,8 @@ index 60a4c7f..4bb432a 100644 #include <ulogd/ulogd.h> #include <ulogd/common.h> +#include <ulogd/ipfix_protocol.h> -+ + +-struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid) +struct ipfix_templ_elem { + uint16_t id; + uint16_t len; @@ -113,8 +110,7 @@ index 60a4c7f..4bb432a 100644 + } + } +}; - --struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid) ++ +struct ipfix_msg *ipfix_msg_alloc(size_t len, uint32_t oid, int tid) { struct ipfix_msg *msg; @@ -162,7 +158,7 @@ index 60a4c7f..4bb432a 100644 return msg; } -@@ -47,6 +130,14 @@ void ipfix_msg_free(struct ipfix_msg *msg) +@@ -47,6 +130,14 @@ void ipfix_msg_free(struct ipfix_msg *ms free(msg); } @@ -177,8 +173,6 @@ index 60a4c7f..4bb432a 100644 struct ipfix_hdr *ipfix_msg_hdr(const struct ipfix_msg *msg) { return (struct ipfix_hdr *)msg->data; -diff --git a/output/ipfix/ipfix.h b/output/ipfix/ipfix.h -index cdb5a6f..93945fb 100644 --- a/output/ipfix/ipfix.h +++ b/output/ipfix/ipfix.h @@ -2,6 +2,7 @@ @@ -257,8 +251,6 @@ index cdb5a6f..93945fb 100644 size_t ipfix_msg_len(const struct ipfix_msg *); void *ipfix_msg_data(struct ipfix_msg *); struct ipfix_set_hdr *ipfix_msg_add_set(struct ipfix_msg *, uint16_t); -diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c -index ec143b1..5b59003 100644 --- a/output/ipfix/ulogd_output_IPFIX.c +++ b/output/ipfix/ulogd_output_IPFIX.c @@ -3,6 +3,9 @@ @@ -313,7 +305,7 @@ index ec143b1..5b59003 100644 .ces = { { .key = "oid", -@@ -70,20 +74,21 @@ static const struct config_keyset ipfix_kset = { +@@ -70,20 +74,21 @@ static const struct config_keyset ipfix_ .key = "mtu", .type = CONFIG_TYPE_INT, .u.value = DEFAULT_MTU @@ -340,7 +332,7 @@ index ec143b1..5b59003 100644 int proto; struct ulogd_timer timer; struct sockaddr_in sa; -@@ -258,8 +263,8 @@ static void ipfix_timer_cb(struct ulogd_timer *t, void *data) +@@ -258,8 +263,8 @@ static void ipfix_timer_cb(struct ulogd_ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginstance_stack *stack) { struct ipfix_priv *priv = (struct ipfix_priv *) &pi->private; @@ -350,7 +342,7 @@ index ec143b1..5b59003 100644 char addr[16]; ret = config_parse_file(pi->id, pi->config_kset); -@@ -271,6 +276,7 @@ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginsta +@@ -271,6 +276,7 @@ static int ipfix_configure(struct ulogd_ port = port_ce(pi->config_kset).u.value; proto = proto_ce(pi->config_kset).u.string; mtu = mtu_ce(pi->config_kset).u.value; @@ -358,7 +350,7 @@ index ec143b1..5b59003 100644 if (!oid) { ulogd_log(ULOGD_FATAL, "invalid Observation ID\n"); -@@ -303,6 +309,8 @@ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginsta +@@ -303,6 +309,8 @@ static int ipfix_configure(struct ulogd_ ulogd_init_timer(&priv->timer, pi, ipfix_timer_cb); @@ -367,7 +359,7 @@ index ec143b1..5b59003 100644 ulogd_log(ULOGD_INFO, "using IPFIX Collector at %s:%d (MTU %d)\n", inet_ntop(AF_INET, &priv->sa.sin_addr, addr, sizeof(addr)), port, mtu); -@@ -410,25 +418,30 @@ static int ipfix_stop(struct ulogd_pluginstance *pi) +@@ -410,25 +418,30 @@ static int ipfix_stop(struct ulogd_plugi static int ipfix_interp(struct ulogd_pluginstance *pi) { struct ipfix_priv *priv = (struct ipfix_priv *) &pi->private; @@ -427,6 +419,3 @@ index ec143b1..5b59003 100644 if ((ret = send_msgs(pi)) < 0) return ret; --- -cgit v1.2.1 - diff --git a/net/unbound/patches/100-example-conf-in.patch b/net/unbound/patches/100-example-conf-in.patch index 0a4b61104..e73f7b0ba 100644 --- a/net/unbound/patches/100-example-conf-in.patch +++ b/net/unbound/patches/100-example-conf-in.patch @@ -3,14 +3,12 @@ Patch the default configuration file with the tiny memory configuration example from Unbound documentation. This is the best starting point for embedded routers if one is not going to use UCI. -Index: doc/example.conf.in -=================================================================== --- a/doc/example.conf.in +++ b/doc/example.conf.in -@@ -15,6 +15,76 @@ server: +@@ -19,6 +19,76 @@ server: # verbosity number, 0 is least verbose. 1 is default. verbosity: 1 - + + ############################################################################ + # MEMORY CONTROL EXAMPLE + # In the example config settings below memory usage is reduced. Some ser- diff --git a/net/uwsgi/patches/001-dont-hardcode-zlib.patch b/net/uwsgi/patches/001-dont-hardcode-zlib.patch index 23ca62d5d..df007ce06 100644 --- a/net/uwsgi/patches/001-dont-hardcode-zlib.patch +++ b/net/uwsgi/patches/001-dont-hardcode-zlib.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -851,11 +851,11 @@ class uConf(object): +@@ -856,11 +856,11 @@ class uConf(object): self.cflags.append('-DUWSGI_HAS_EXECINFO') report['execinfo'] = True diff --git a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch index 196edfbdb..ff8de5df9 100644 --- a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch +++ b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -680,7 +680,7 @@ class uConf(object): +@@ -685,7 +685,7 @@ class uConf(object): self.include_path += os.environ['UWSGI_INCLUDES'].split(',') diff --git a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch index 169a309f8..6f496ef0d 100644 --- a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch +++ b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -5,9 +5,9 @@ +@@ -5,9 +5,9 @@ uwsgi_version = '2.0.19.1' import os import re import time diff --git a/net/uwsgi/patches/010-uclibc-ng.patch b/net/uwsgi/patches/010-uclibc-ng.patch index e967320d9..e12c3c514 100644 --- a/net/uwsgi/patches/010-uclibc-ng.patch +++ b/net/uwsgi/patches/010-uclibc-ng.patch @@ -1,6 +1,6 @@ --- a/core/uwsgi.c +++ b/core/uwsgi.c -@@ -1820,7 +1820,7 @@ void uwsgi_plugins_atexit(void) { +@@ -1822,7 +1822,7 @@ void uwsgi_plugins_atexit(void) { void uwsgi_backtrace(int depth) { diff --git a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch index 82522be19..7c7389269 100644 --- a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch +++ b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch @@ -1,7 +1,5 @@ -Index: uwsgi-2.0.18/Makefile -=================================================================== ---- uwsgi-2.0.18.orig/Makefile -+++ uwsgi-2.0.18/Makefile +--- a/Makefile ++++ b/Makefile @@ -1,4 +1,4 @@ -PYTHON := python +PYTHON ?= python3 diff --git a/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch b/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch index 7acdfc71c..cd4572123 100644 --- a/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch +++ b/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch @@ -11,8 +11,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> plugins/cgi/cgi_plugin.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -diff --git a/plugins/cgi/cgi_plugin.c b/plugins/cgi/cgi_plugin.c -index d032db17c..30e1cc528 100644 --- a/plugins/cgi/cgi_plugin.c +++ b/plugins/cgi/cgi_plugin.c @@ -15,6 +15,7 @@ struct uwsgi_cgi { @@ -23,7 +21,7 @@ index d032db17c..30e1cc528 100644 int from_docroot; int has_mountpoints; struct uwsgi_dyn_dict *default_cgi; -@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[] = { +@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[] {"cgi-safe", required_argument, 0, "skip security checks if the cgi file is under the specified path", uwsgi_opt_add_string_list, &uc.cgi_safe, 0}, @@ -32,7 +30,7 @@ index d032db17c..30e1cc528 100644 {0, 0, 0, 0, 0, 0, 0}, }; -@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) { +@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi char full_path[PATH_MAX]; char tmp_path[PATH_MAX]; @@ -40,7 +38,7 @@ index d032db17c..30e1cc528 100644 struct stat cgi_stat; int need_free = 0; int is_a_file = 0; -@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) { +@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi uwsgi_404(wsgi_req); return UWSGI_OK; } @@ -51,7 +49,7 @@ index d032db17c..30e1cc528 100644 full_path_len = strlen(tmp_path); // add +1 to copy the null byte -@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) { +@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi } } diff --git a/net/vncrepeater/patches/001-uclibcxx_linking.patch b/net/vncrepeater/patches/001-uclibcxx_linking.patch index eca2c3af4..1fef93cdd 100644 --- a/net/vncrepeater/patches/001-uclibcxx_linking.patch +++ b/net/vncrepeater/patches/001-uclibcxx_linking.patch @@ -1,5 +1,5 @@ ---- vncrepeater-0.14/Makefile 2006-04-09 23:37:10.000000000 +0200 -+++ vncrepeater-0.14.new/Makefile 2016-11-09 19:59:13.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,27 +1,28 @@ CFLAGS=-Wall repeater: repeater.o repeaterproc.o openbsd_stringfuncs.o iniparser.o readini.o repeaterutil.o repeaterevents.o diff --git a/net/vncrepeater/patches/002-cfg-path.patch b/net/vncrepeater/patches/002-cfg-path.patch index 976504ba6..85a92c8f0 100644 --- a/net/vncrepeater/patches/002-cfg-path.patch +++ b/net/vncrepeater/patches/002-cfg-path.patch @@ -1,6 +1,6 @@ ---- vncrepeater-0.14/repeater.cpp 2006-10-20 17:07:50.000000000 +0200 -+++ vncrepeater-0.14.new/repeater.cpp 2016-11-19 17:04:59.907871000 +0100 -@@ -593,7 +593,9 @@ +--- a/repeater.cpp ++++ b/repeater.cpp +@@ -593,7 +593,9 @@ static bool checkIdCode(char *IdCode) static long parseId(char *IdCode) { unsigned int ii; @@ -11,7 +11,7 @@ debug(LEVEL_3, "parseId(): IdCode = %s\n", IdCode); -@@ -998,9 +1000,13 @@ +@@ -998,9 +1000,13 @@ static bool isServerAddressAllowed(char allow = false; //server 0 == denied @@ -27,7 +27,7 @@ //allowed so far ? if (allow) -@@ -1983,7 +1989,7 @@ +@@ -1983,7 +1989,7 @@ int main(int argc, char **argv) struct sigaction saInt; //ini file default diff --git a/net/vnstat/patches/990-adjust-configuration-defaults.patch b/net/vnstat/patches/990-adjust-configuration-defaults.patch index 1627b4d72..ca11ff83a 100644 --- a/net/vnstat/patches/990-adjust-configuration-defaults.patch +++ b/net/vnstat/patches/990-adjust-configuration-defaults.patch @@ -9,8 +9,8 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- a/cfg/vnstat.conf +++ b/cfg/vnstat.conf -@@ -87,13 +87,13 @@ DaemonUser "" - DaemonGroup "" +@@ -98,13 +98,13 @@ DaemonGroup "" + TimeSyncWait 5 # how often (in seconds) interface data is updated -UpdateInterval 30 diff --git a/net/vpnc/patches/110-openssl-deprecated.patch b/net/vpnc/patches/110-openssl-deprecated.patch index 1c10bb892..bd7c2fa26 100644 --- a/net/vpnc/patches/110-openssl-deprecated.patch +++ b/net/vpnc/patches/110-openssl-deprecated.patch @@ -8,7 +8,7 @@ #include "config.h" #include "sysdep.h" #include "crypto.h" -@@ -35,10 +36,12 @@ crypto_ctx *crypto_ctx_new(crypto_error **error) +@@ -35,10 +36,12 @@ crypto_ctx *crypto_ctx_new(crypto_error return NULL; } diff --git a/net/vsftpd/patches/010-openssl-deprecated.patch b/net/vsftpd/patches/010-openssl-deprecated.patch index bbbfbe8e7..0db80b975 100644 --- a/net/vsftpd/patches/010-openssl-deprecated.patch +++ b/net/vsftpd/patches/010-openssl-deprecated.patch @@ -8,8 +8,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com> ssl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/ssl.c b/ssl.c -index c362983..845f77b 100644 --- a/ssl.c +++ b/ssl.c @@ -28,6 +28,9 @@ @@ -51,7 +49,7 @@ index c362983..845f77b 100644 if (tunable_ssl_request_cert) { verify_option |= SSL_VERIFY_PEER; -@@ -660,7 +669,9 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_session* p_sess, struct mystr* p_str) +@@ -660,7 +669,9 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_s static char* get_ssl_error() { @@ -61,6 +59,3 @@ index c362983..845f77b 100644 return ERR_error_string(ERR_get_error(), NULL); } --- -2.19.1 - diff --git a/net/wifidog/patches/010-use-tls-above-1.patch b/net/wifidog/patches/010-use-tls-above-1.patch index ba397506a..71273a983 100644 --- a/net/wifidog/patches/010-use-tls-above-1.patch +++ b/net/wifidog/patches/010-use-tls-above-1.patch @@ -1,5 +1,3 @@ -diff --git a/configure.in b/configure.in -index bf5463a..43ec27c 100644 --- a/configure.in +++ b/configure.in @@ -96,8 +96,8 @@ if test "x$enable_cyassl" = xyes; then @@ -22,8 +20,6 @@ index bf5463a..43ec27c 100644 CyaSSL_CTX_UseSNI(ctx, CYASSL_SNI_HOST_NAME, "wifidog.org", 11); ]])], [enabled_sni=yes], [enabled_sni=no]) -diff --git a/src/simple_http.c b/src/simple_http.c -index f0e27ee..7271021 100644 --- a/src/simple_http.c +++ b/src/simple_http.c @@ -162,8 +162,7 @@ get_cyassl_ctx(const char *hostname) diff --git a/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch b/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch index a1afe597a..9a13ba144 100644 --- a/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch +++ b/net/wifidog/patches/020-Modify-get-ip-from-iface-method.patch @@ -7,8 +7,6 @@ This used to use a RAW socket, while now it used a DGRAM socket. Previously it failed with operation not permitted, while this version seems to work reliably. -diff --git a/src/util.c b/src/util.c -index 46ec5a2..426ba13 100644 --- a/src/util.c +++ b/src/util.c @@ -174,11 +174,13 @@ get_iface_ip(const char *ifname) diff --git a/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch b/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch index 6475272df..0ee0376f2 100644 --- a/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch +++ b/net/xl2tpd/patches/0001-xl2tpd-control-fix-out-of-bound-access.patch @@ -10,8 +10,6 @@ Fixes 90884c62 ("xl2tpd-control refactoring") xl2tpd-control.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/xl2tpd-control.c b/xl2tpd-control.c -index 1e87c93..d1df0f6 100644 --- a/xl2tpd-control.c +++ b/xl2tpd-control.c @@ -83,7 +83,8 @@ struct command_t commands[] = { diff --git a/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch b/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch index ae5dc0649..200688e9b 100644 --- a/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch +++ b/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch @@ -7,8 +7,6 @@ Subject: [PATCH] xl2tpd-control: fix typo in usage xl2tpd-control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xl2tpd-control.c b/xl2tpd-control.c -index d1df0f6..2e683c8 100644 --- a/xl2tpd-control.c +++ b/xl2tpd-control.c @@ -96,7 +96,7 @@ void usage() diff --git a/net/xl2tpd/patches/0003-Skip-building-pfc.patch b/net/xl2tpd/patches/0003-Skip-building-pfc.patch index ed40d4330..4ec98f38a 100644 --- a/net/xl2tpd/patches/0003-Skip-building-pfc.patch +++ b/net/xl2tpd/patches/0003-Skip-building-pfc.patch @@ -10,8 +10,6 @@ It can cause build failure, see [1] Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -diff --git a/Makefile b/Makefile -index 9927715..8a3eecd 100644 --- a/Makefile +++ b/Makefile @@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin diff --git a/net/xtables-addons/patches/210-freebsd-build-fix.patch b/net/xtables-addons/patches/210-freebsd-build-fix.patch index d5bc16d60..4f05d60eb 100644 --- a/net/xtables-addons/patches/210-freebsd-build-fix.patch +++ b/net/xtables-addons/patches/210-freebsd-build-fix.patch @@ -1,6 +1,6 @@ --- a/extensions/LUA/Makefile +++ b/extensions/LUA/Makefile -@@ -110,7 +110,7 @@ +@@ -110,7 +110,7 @@ PKG_CONFIG = /usr/bin/pkg-config RANLIB = ranlib SED = /bin/sed SET_MAKE = |