update INSTALL file
Pablo Neira Ayuso
maintainerPATCH 1/2 update INSTALL file
Update it to current library dependencies and existing options.
--- INSTALL | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-)
INSTALL +29 -12
@@ -4,7 +4,7 @@ Installation instructions for nftables Prerequisites ============= - - standard glibc headers, gcc etc. + - build tooling: glibc headers, gcc, autotools, automake, libtool, pkg-config. - libmnl: git://git.netfilter.org/libmnl.git
@@ -14,17 +14,15 @@ Installation instructions for nftables - bison - - libgmp + - libgmp: alternatively, see mini-gmp support below. - - libreadline - - - pkg-config - - - libtool + - libreadline or libedit or linenoise: required by interactive command line - optional: libxtables: required to interact with iptables-compat - - optional: docbook2x: required for building man-page + - optional: libjansson: required to build JSON support + + - optional: asciidoc: required for building man-page Configuring and compiling =========================
@@ -60,17 +58,36 @@ Installation instructions for nftables For libxtables support to interact with the iptables-compat utility. - Suggested configuration options: --prefix=/ --datarootdir=/usr/share + --without-cli + + To disable interactive command line support, ie. -i/--interactive. + + --with-cli=readline + + To enable interactive command line support with libreadline. + + --with-cli=linenoise + + To enable interactive command line support with linenoise. + + --with-cli=editline + + To enable interactive command line support with libedit. + + --with-json + + To enable JSON support, this requires libjansson. Run "make" to compile nftables, "make install" to install it in the configured paths. - Other notes + Source code =========== - The nftables kernel tree can be found at: + Netfilter's Linux kernel tree can be found at: - git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables.git + git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git/ + https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git The latest version of this code can be found at:
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 py: remove setup.py integration with autotools
With Python distutils and setuptools going deprecated, remove integration with autotools. This integration is causing issues in modern environments.
Note that setup.py is still left in place under the py/ folder.
Update INSTALL file to refer to Python support and setup.py.
--- INSTALL | 7 +++++++ Makefile.am | 6 ++---- configure.ac | 26 -------------------------- py/Makefile.am | 27 --------------------------- 4 files changed, 9 insertions(+), 57 deletions(-)
INSTALL +7 -0
@@ -81,6 +81,13 @@ Installation instructions for nftables Run "make" to compile nftables, "make install" to install it in the configured paths. + Python support + ============== + + CPython bindings are available for nftables under the py/ folder. + + setup.py is provided to install it. + Source code ===========
Makefile.am +2 -4
@@ -4,10 +4,8 @@ SUBDIRS = src \ include \ files \ doc \ - examples -if HAVE_PYTHON -SUBDIRS += py -endif + examples\ + py EXTRA_DIST = tests \ files
configure.ac +0 -26
@@ -108,25 +108,6 @@ AC_DEFINE([HAVE_LIBJANSSON], [1], [Define if you have libjansson]) ]) AM_CONDITIONAL([BUILD_JSON], [test "x$with_json" != xno]) -AC_ARG_ENABLE(python, - AS_HELP_STRING([--enable-python], [Enable python]),,[enable_python=check] - ) - -AC_ARG_WITH([python_bin], - [AS_HELP_STRING([--with-python-bin], [Specify Python binary to use])], - [PYTHON_BIN="$withval"], [AC_PATH_PROGS(PYTHON_BIN, python python2 python2.7 python3)] - ) - -AS_IF([test "x$PYTHON_BIN" = "x"], [ - AS_IF([test "x$enable_python" = "xyes"], [AC_MSG_ERROR([Python asked but not found])], - [test "x$enable_python" = "xcheck"], [ - AC_MSG_WARN([Python not found, continuing anyway]) - enable_python=no - ]) -]) - -AM_CONDITIONAL([HAVE_PYTHON], [test "$enable_python" != "no"]) - AC_CONFIG_FILES([ \ Makefile \ libnftables.pc \
@@ -157,10 +138,3 @@ nft configuration: enable man page: ${enable_man_doc} libxtables support: ${with_xtables} json output support: ${with_json}" - -AS_IF([test "$enable_python" != "no"], [ - echo " enable Python: yes (with $PYTHON_BIN)" - ], [ - echo " enable Python: no" - ] - )
py/Makefile.am +0 -27
@@ -1,28 +1 @@ EXTRA_DIST = setup.py __init__.py nftables.py schema.json - -all-local: - cd $(srcdir) && \ - $(PYTHON_BIN) setup.py build --build-base $(abs_builddir) - -install-exec-local: - cd $(srcdir) && \ - $(PYTHON_BIN) setup.py build --build-base $(abs_builddir) \ - install --prefix $(DESTDIR)$(prefix) - -uninstall-local: - rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/nftables - rm -rf $(DESTDIR)$(prefix)/lib*/python*/dist-packages/nftables - rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/nftables-[0-9]*.egg-info - rm -rf $(DESTDIR)$(prefix)/lib*/python*/dist-packages/nftables-[0-9]*.egg-info - rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/nftables-[0-9]*.egg - rm -rf $(DESTDIR)$(prefix)/lib*/python*/dist-packages/nftables-[0-9]*.egg - -clean-local: - cd $(srcdir) && \ - $(PYTHON_BIN) setup.py clean \ - --build-base $(abs_builddir) - rm -rf scripts-* lib* build dist bdist.* nftables.egg-info - find . -name \*.pyc -delete - -distclean-local: - rm -f version
Signature · 1 line
2.30.2
Re: [PATCH nft 2/2] py: remove setup.py integration with autotools
Quoted 8 lines · Pablo Neira Ayuso
With Python distutils and setuptools going deprecated, remove integration with autotools. This integration is causing issues in modern environments.
Note that
setup.pyis still left in place under the py/ folder.Update INSTALL file to refer to Python support and
setup.py.
Quoted 7 lines
Signed-off-by Pablo Neira Ayuso<[email protected]>--- INSTALL | 7 +++++++ Makefile.am | 6 ++---- configure.ac | 26 -------------------------- py/Makefile.am | 27 --------------------------- 4 files changed, 9 insertions(+), 57 deletions(-)
I think this patch can be merged.
regards.
Re: [PATCH nft 2/2] py: remove setup.py integration with autotools
In reply to Pablo Neira AyusoQuoted 9 lines · Pablo Neira Ayuso
With Python distutils and setuptools going deprecated, remove integration with autotools. This integration is causing issues in modern environments.
Note that
setup.pyis still left in place under the py/ folder.Update INSTALL file to refer to Python support and
setup.py.Signed-off-by Pablo Neira Ayuso <[email protected]>
Quoted 3 lines · Pablo Neira Ayuso
Update it to current library dependencies and existing options.
Signed-off-by Pablo Neira Ayuso <[email protected]>