Switch to git repo Removed musl patch Refreshed existing patch Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> [cleanup]master
Ansuel Smith
8 years ago
committed by
Felix Fietkau
parent
efb22b6f06
commit
98e43b13a7
@ -1,94 +0,0 @@ |
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -12367,77 +12367,7 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
-pkg_failed=no
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
|
||||
-$as_echo_n "checking for libnfnetlink... " >&6; }
|
||||
-
|
||||
-if test -n "$libnfnetlink_CFLAGS"; then
|
||||
- pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
|
||||
- elif test -n "$PKG_CONFIG"; then
|
||||
- if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
|
||||
- ac_status=$?
|
||||
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
- test $ac_status = 0; }; then
|
||||
- pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null`
|
||||
- test "x$?" != "x0" && pkg_failed=yes
|
||||
-else
|
||||
- pkg_failed=yes
|
||||
-fi
|
||||
- else
|
||||
- pkg_failed=untried
|
||||
-fi
|
||||
-if test -n "$libnfnetlink_LIBS"; then
|
||||
- pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
|
||||
- elif test -n "$PKG_CONFIG"; then
|
||||
- if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
|
||||
- ac_status=$?
|
||||
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
- test $ac_status = 0; }; then
|
||||
- pkg_cv_libnfnetlink_LIBS=`$PKG_CONFIG --libs "libnfnetlink >= 1.0" 2>/dev/null`
|
||||
- test "x$?" != "x0" && pkg_failed=yes
|
||||
-else
|
||||
- pkg_failed=yes
|
||||
-fi
|
||||
- else
|
||||
- pkg_failed=untried
|
||||
-fi
|
||||
-
|
||||
-
|
||||
-
|
||||
-if test $pkg_failed = yes; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
-$as_echo "no" >&6; }
|
||||
-
|
||||
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
- _pkg_short_errors_supported=yes
|
||||
-else
|
||||
- _pkg_short_errors_supported=no
|
||||
-fi
|
||||
- if test $_pkg_short_errors_supported = yes; then
|
||||
- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
|
||||
- else
|
||||
- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
|
||||
- fi
|
||||
- # Put the nasty error message in config.log where it belongs
|
||||
- echo "$libnfnetlink_PKG_ERRORS" >&5
|
||||
-
|
||||
- nfnetlink=0
|
||||
-elif test $pkg_failed = untried; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
-$as_echo "no" >&6; }
|
||||
- nfnetlink=0
|
||||
-else
|
||||
- libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS
|
||||
- libnfnetlink_LIBS=$pkg_cv_libnfnetlink_LIBS
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
-$as_echo "yes" >&6; }
|
||||
- nfnetlink=1
|
||||
-fi
|
||||
- if test "$nfnetlink" = 1; then
|
||||
+if false; then
|
||||
HAVE_LIBNFNETLINK_TRUE=
|
||||
HAVE_LIBNFNETLINK_FALSE='#'
|
||||
else
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -111,9 +111,7 @@ if test "x$enable_bpfc" = "xyes" || test
|
||||
AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool))
|
||||
fi
|
||||
|
||||
-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
|
||||
- [nfnetlink=1], [nfnetlink=0])
|
||||
-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
|
||||
+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [false])
|
||||
|
||||
regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
|
||||
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
|
||||
@ -1,8 +0,0 @@ |
||||
--- a/iptables/iptables-apply
|
||||
+++ b/iptables/iptables-apply
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/usr/bin/env bash
|
||||
#
|
||||
# iptables-apply -- a safer way to update iptables remotely
|
||||
#
|
||||
@ -1,127 +0,0 @@ |
||||
--- a/extensions/libip6t_ipv6header.c
|
||||
+++ b/extensions/libip6t_ipv6header.c
|
||||
@@ -10,6 +10,9 @@ on whether they contain certain headers
|
||||
#include <netdb.h>
|
||||
#include <xtables.h>
|
||||
#include <linux/netfilter_ipv6/ip6t_ipv6header.h>
|
||||
+#ifndef IPPROTO_HOPOPTS
|
||||
+# define IPPROTO_HOPOPTS 0
|
||||
+#endif
|
||||
|
||||
enum {
|
||||
O_HEADER = 0,
|
||||
--- a/extensions/libxt_TCPOPTSTRIP.c
|
||||
+++ b/extensions/libxt_TCPOPTSTRIP.c
|
||||
@@ -12,6 +12,21 @@
|
||||
#ifndef TCPOPT_MD5SIG
|
||||
# define TCPOPT_MD5SIG 19
|
||||
#endif
|
||||
+#ifndef TCPOPT_MAXSEG
|
||||
+# define TCPOPT_MAXSEG 2
|
||||
+#endif
|
||||
+#ifndef TCPOPT_WINDOW
|
||||
+# define TCPOPT_WINDOW 3
|
||||
+#endif
|
||||
+#ifndef TCPOPT_SACK_PERMITTED
|
||||
+# define TCPOPT_SACK_PERMITTED 4
|
||||
+#endif
|
||||
+#ifndef TCPOPT_SACK
|
||||
+# define TCPOPT_SACK 5
|
||||
+#endif
|
||||
+#ifndef TCPOPT_TIMESTAMP
|
||||
+# define TCPOPT_TIMESTAMP 8
|
||||
+#endif
|
||||
|
||||
enum {
|
||||
O_STRIP_OPTION = 0,
|
||||
--- a/include/libiptc/ipt_kernel_headers.h
|
||||
+++ b/include/libiptc/ipt_kernel_headers.h
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
-#if defined(__GLIBC__) && __GLIBC__ == 2
|
||||
#include <netinet/ip.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/ip_icmp.h>
|
||||
@@ -13,15 +12,4 @@
|
||||
#include <netinet/udp.h>
|
||||
#include <net/if.h>
|
||||
#include <sys/types.h>
|
||||
-#else /* libc5 */
|
||||
-#include <sys/socket.h>
|
||||
-#include <linux/ip.h>
|
||||
-#include <linux/in.h>
|
||||
-#include <linux/if.h>
|
||||
-#include <linux/icmp.h>
|
||||
-#include <linux/tcp.h>
|
||||
-#include <linux/udp.h>
|
||||
-#include <linux/types.h>
|
||||
-#include <linux/in6.h>
|
||||
-#endif
|
||||
#endif
|
||||
--- a/include/linux/netfilter_ipv4/ip_tables.h
|
||||
+++ b/include/linux/netfilter_ipv4/ip_tables.h
|
||||
@@ -16,6 +16,7 @@
|
||||
#define _IPTABLES_H
|
||||
|
||||
#include <linux/types.h>
|
||||
+#include <sys/types.h>
|
||||
|
||||
#include <linux/netfilter_ipv4.h>
|
||||
|
||||
--- a/iptables/ip6tables-restore.c
|
||||
+++ b/iptables/ip6tables-restore.c
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
-#include <sys/errno.h>
|
||||
+#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
--- a/iptables/ip6tables-save.c
|
||||
+++ b/iptables/ip6tables-save.c
|
||||
@@ -6,7 +6,7 @@
|
||||
* This code is distributed under the terms of GNU GPL v2
|
||||
*/
|
||||
#include <getopt.h>
|
||||
-#include <sys/errno.h>
|
||||
+#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
--- a/iptables/iptables-restore.c
|
||||
+++ b/iptables/iptables-restore.c
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
-#include <sys/errno.h>
|
||||
+#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
--- a/iptables/iptables-save.c
|
||||
+++ b/iptables/iptables-save.c
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
*/
|
||||
#include <getopt.h>
|
||||
-#include <sys/errno.h>
|
||||
+#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
--- a/iptables/iptables-xml.c
|
||||
+++ b/iptables/iptables-xml.c
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
-#include <sys/errno.h>
|
||||
+#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
Loading…
Reference in new issue