diff --git a/root-packages/iptables/build.sh b/root-packages/iptables/build.sh index f68525154b..d186367d32 100644 --- a/root-packages/iptables/build.sh +++ b/root-packages/iptables/build.sh @@ -2,15 +2,19 @@ TERMUX_PKG_HOMEPAGE=https://www.netfilter.org/projects/iptables TERMUX_PKG_DESCRIPTION="Program used to configure the Linux 2.4 and later kernel packet filtering ruleset" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.8.8 -TERMUX_PKG_SRCURL=https://www.netfilter.org/projects/iptables/files/iptables-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f +TERMUX_PKG_VERSION=1.8.9 +TERMUX_PKG_SRCURL=https://www.netfilter.org/projects/iptables/files/iptables-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f TERMUX_PKG_DEPENDS="libmnl, libnftnl, libandroid-spawn" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-xt-lock-name=$TERMUX_PREFIX/var/run/xtables.lock " +termux_step_post_get_source() { + cp $TERMUX_PKG_BUILDER_DIR/syslog-names.h ./extensions/ +} + termux_step_pre_configure() { export CFLAGS+=" -Dindex=strchr -Drindex=strrchr -D__STDC_FORMAT_MACROS=1" } diff --git a/root-packages/iptables/extensions-libxt_LOG.c.patch b/root-packages/iptables/extensions-libxt_LOG.c.patch new file mode 100644 index 0000000000..999a9bcf2d --- /dev/null +++ b/root-packages/iptables/extensions-libxt_LOG.c.patch @@ -0,0 +1,12 @@ +--- a/extensions/libxt_LOG.c ++++ b/extensions/libxt_LOG.c +@@ -2,6 +2,9 @@ + #include + #define SYSLOG_NAMES + #include ++#ifdef __ANDROID__ ++#include "syslog-names.h" ++#endif + #include + #include + diff --git a/root-packages/iptables/libxtables-Makefile.in.patch b/root-packages/iptables/libxtables-Makefile.in.patch new file mode 100644 index 0000000000..026bdd1c42 --- /dev/null +++ b/root-packages/iptables/libxtables-Makefile.in.patch @@ -0,0 +1,11 @@ +--- a/libxtables/Makefile.in ++++ b/libxtables/Makefile.in +@@ -148,7 +148,7 @@ + am__v_lt_1 = + libxtables_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libxtables_la_CFLAGS) \ +- $(CFLAGS) $(libxtables_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(libxtables_la_LDFLAGS) $(LDFLAGS) -landroid-spawn -o $@ + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false diff --git a/root-packages/iptables/syslog-names.h b/root-packages/iptables/syslog-names.h new file mode 100644 index 0000000000..b9bedabfb3 --- /dev/null +++ b/root-packages/iptables/syslog-names.h @@ -0,0 +1,62 @@ +/* + * Copyright (c) 1982, 1986, 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)syslog.h 8.1 (Berkeley) 6/2/93 + */ + +#ifndef _SYSLOG_NAMES_H +#define _SYSLOG_NAMES_H 1 + +#include + +#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */ + /* mark "facility" */ +#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES << 3, 0) +typedef struct _code { + char *c_name; + int c_val; +} CODE; + +CODE prioritynames[] = + { + { "alert", LOG_ALERT }, + { "crit", LOG_CRIT }, + { "debug", LOG_DEBUG }, + { "emerg", LOG_EMERG }, + { "err", LOG_ERR }, + { "error", LOG_ERR }, /* DEPRECATED */ + { "info", LOG_INFO }, + { "none", INTERNAL_NOPRI }, /* INTERNAL */ + { "notice", LOG_NOTICE }, + { "panic", LOG_EMERG }, /* DEPRECATED */ + { "warn", LOG_WARNING }, /* DEPRECATED */ + { "warning", LOG_WARNING }, + { NULL, -1 } + }; + +#endif