cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-24 21:14:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Run refresh on all packages

Browse Source 
The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

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

2
net/aggregate/patches/500-cross_compile_flags.patch
View File

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

14
net/apache/patches/020-openssl-deprecated.patch
View File

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

4
net/apcupsd/patches/010-fix-usb.patch
View File

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

8
net/apcupsd/patches/015-drop-doc.patch
View File

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

6
net/beanstalkd/patches/900-makefile.patch
View File

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

4
net/beanstalkd/patches/901-fix-headers.patch
View File

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

2
net/beanstalkd/patches/902-replace-posix_fallocate.patch
View File

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

6
net/boinc/patches/001-avoidExtraDependencies
View File

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

6
net/boinc/patches/002-hosttypeRespected
View File

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

38
net/bwm-ng/patches/001-Use-static-inline-instead-of-inline.patch
View File

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

16
net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch
View File

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

2
net/chaosvpn/patches/010-openssl-deprecated.patch
View File

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

28
net/conserver/patches/001-remove-strip.patch
View File

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

4
net/coova-chilli/patches/200-wolfssl.patch
View File

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

2
net/coova-chilli/patches/300-sysinfo.patch
View File

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

4
net/darkstat/patches/101-allow-multiple-local-interfaces.patch
View File

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

2
net/davfs2/patches/010-main_code_fix.patch
View File

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

8
net/davfs2/patches/030-realpath.patch
View File

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

2
net/davfs2/patches/050-sys-types.patch
View File

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

4
net/dcwapd/patches/01_add_uci_config_provider.patch
View File

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

2
net/dnscrypt-proxy/patches/010-internal.patch
View File

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

6
net/eoip/patches/100-add_LF_to_pidfile.patch
View File

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

5
net/etherwake/patches/110-format_security_fix.patch
View File

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

2
net/etherwake/patches/120-musl-compat.patch
View File

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

6
net/foolsm/patches/100-plugin-export-dir.patch
View File

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

6
net/foolsm/patches/110-missing-WAIT_ANY.patch
View File

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

4
net/freeradius3/patches/002-disable-session-cache-CVE-2017-9148.patch
View File

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

1
net/freeradius3/patches/004-get-hostname-from-proc-in-radtest.patch
View File

@@ -9,4 +9,3 @@
fi
(

14
net/freeradius3/patches/010-openssl-deprecated.patch
View File

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

2
net/frr/patches/098-fix_mips_libyang.patch
View File

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

6
net/git/patches/100-configure_for_crosscompiling.patch
View File

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

2
net/git/patches/200-imapsend_without_curl.patch
View File

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

9
net/git/patches/310-fix-uname-detection-for-crosscompiling
View File

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

8
net/gitolite/patches/0100-avoid-ssh-keygen.patch
View File

@@ -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 {
}
# ----------------------------------------------------------------------

12
net/horst/patches/0001-reproducible-builds.patch
View File

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

13
net/ibrdtnd/patches/0001-ibrdtnd-added-openssl-compatibility.patch
View File

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

42
net/ifstat/patches/0001-support-64-bits-counters-and-fix-gcc-warnings.patch
View File

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

4
net/iftop/patches/010-gcc10.patch
View File

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

4
net/iodine/patches/010-cross-compile.patch
View File

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

2
net/iodine/patches/100-musl-compatibility.patch
View File

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

7
net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch
View File

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

2
net/isc-dhcp/patches/520-bind-no-catgets.patch
View File

@@ -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} && \

6
net/kismet/patches/030-libcxx.patch
View File

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

2
net/knot/patches/01_zscanner_tests.patch
View File

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

6
net/knot/patches/02_knot.conf.patch
View File

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

6
net/knxd/patches/0099-openwrt.patch
View File

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

6
net/knxd/patches/0100-version.patch
View File

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

2
net/knxd/patches/020-cdefs.patch
View File

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

12
net/krb5/patches/001-fix-uninitialized-warning-errors.patch
View File

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

8
net/libreswan/patches/010-nanosleep.patch
View File

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

4
net/libreswan/patches/020-limits.patch
View File

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

4
net/libreswan/patches/030-fix_musl_build.patch
View File

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

6
net/libreswan/patches/040-disable_man.patch
View File

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

7
net/lighttpd/patches/010-meson-lua.patch
View File

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

5
net/lighttpd/patches/020-meson-zstd.patch
View File

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

2
net/linknx/patches/010-cdefs.patch
View File

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

5
net/lksctp-tools/patches/010-build-fix-netinet-sctp.h-not-to-be-installed.patch
View File

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

36
net/lora-gateway-hal/patches/0001-add-cmake-support.patch
View File

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

5
net/lora-gateway-hal/patches/0002-add-preprocessing-for-SPI_DEV_PATH-and-SPI_SPEED.patch
View File

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

9
net/lora-gateway-hal/patches/0003-add-SPI_DEV_PATH-and-SPI_SPEED-to-cmake.patch
View File

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

2
net/miniupnpc/patches/100-no-fPIC.patch
View File

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

2
net/miniupnpd/patches/200-remove-default-cflags.patch
View File

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

4
net/miniupnpd/patches/300-macos-compat.patch
View File

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

18
net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
View File

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

2
net/mstpd/patches/010-bsd.patch
View File

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

21
net/net-snmp/patches/110-debian-makefiles.patch
View File

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

2
net/net-snmp/patches/170-ldflags.patch
View File

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

8
net/net-snmp/patches/910-signal.patch
View File

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

2
net/netatalk/patches/010-gcc10.patch
View File

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

10
net/netcat/patches/001-netcat_flag_count.patch
View File

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

2
net/netdiscover/patches/010-gcc10.patch
View File

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

5
net/netsniff-ng/patches/0001-configure-script-honors-C-LD-FLAGS.patch
View File

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

5
net/netsniff-ng/patches/0002-fix-ncurses-check-during-configure.patch
View File

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

5
net/netsniff-ng/patches/0003-removed-flowtop-pkg-config-usage-for-ncurses.patch
View File

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

2
net/nginx/patches/104-endianness_fix.patch
View File

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

2
net/nginx/patches/201-ignore-invalid-options.patch
View File

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

16
net/nmap/patches/010-Avoid-using-namespace-std-causing-name-conflicts.patch
View File

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

44
net/nmap/patches/020-Python3-port-of-ndiff.patch
View File

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

4
net/ntpclient/patches/200-time.patch
View File

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

2
net/oor/patches/010-gcc10.patch
View File

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

22
net/open-isns/patches/01-security_mode.patch
View File

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

6
net/open-isns/patches/02-fix_signed_vs_unsigned.patch
View File

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

2
net/open-isns/patches/03-include_poll_h.patch
View File

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

6
net/open-isns/patches/04-ignore_write.patch
View File

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

2
net/open-isns/patches/20-signals.patch
View File

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

4
net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
View File

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

4
net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
View File

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

2
net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
View File

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

2
net/openvswitch/patches/0004-build-trim-build.patch
View File

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

2
net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch
View File

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

6
net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch
View File

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

2
net/ovn/patches/0001-build-skip-check-and-use-of-libunbound.patch
View File

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

6
net/ovn/patches/0002-build-skip-tests-and-docs.patch
View File

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

2
net/ovn/patches/0003-ovn-lib-fix-install_dir.patch
View File

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

4
net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch
View File

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

9
net/pen/patches/010-deprecated-openssl.patch
View File

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

4
net/port-mirroring/patches/020-time.patch
View File

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

7
net/radicale/patches/010-Run-as-user-group-radicale-radicale.patch
View File

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

6
net/radicale2/patches/110-disable-setup_requirements.patch
View File

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

2
net/radsecproxy/patches/200-logdest-on-foreground.patch
View File

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

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