On Sun, Jan 26, 2014 at 07:40:36PM +0100, Alexander Aring wrote: > This patch adds splits netcat in gnu and bsd version. > The bsd version of netcat has ipv6 support and lot of others > improvements. > > The patches for netcat-openbsd are taken from debian project.
Using a 'choice' here is not a good idea. Selecting something in a 'choice' does not work properly. Is there any good reason to keep the old version? If not, then just replace it. Otherwise leave the old packages as is and add a new netcat-bsd package. Just make things exclusive as we do with busybox tools. [...] > + > + config NETCAT_BSD > + bool > + prompt "bsd" > + depends on GLOBAL_IPV6 I don't think this is necessary. As far as I know, there are no prerequisites. The packages should build anyways but using IPv6 may not work during runtime. Michael > + select LIBBSD > + select LIBC_RESOLV > + help > + The nc (or netcat) utility is used for just about anything > under The > + sun involving TCP, UDP, or UNIX-domain sockets. It can open > TCP > + connections, send UDP packets, listen on arbitrary TCP and > UDP ports > + do port scanning, and deal with both IPv4 and IPv6. > + > +endchoice > + > +if NETCAT_GNU > + > +config NETCAT_GNU_OLD_HEXDUMP > bool > prompt "Use the old style hexdump format" > help > Disabled by default - if unsure, say NO > > -config NETCAT_OLD_TELNET > +config NETCAT_GNU_OLD_TELNET > bool > prompt "Use old telnet codes parsing policy" > help > Disabled by default - if unsure, say NO > +endif > > endif > diff --git a/rules/netcat.make b/rules/netcat.make > deleted file mode 100644 > index 7b46576..0000000 > --- a/rules/netcat.make > +++ /dev/null > @@ -1,72 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2005 by Bjoern Buerger <b.buer...@pengutronix.de> > -# 2010 Michael Olbrich <m.olbr...@pengutronix.de> > -# > -# See CREDITS for details about who has contributed to this project. > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_NETCAT) += netcat > - > -# > -# Paths and names > -# > -NETCAT_VERSION := 0.7.1 > -NETCAT_MD5 := 088def25efe04dcdd1f8369d8926ab34 > -NETCAT := netcat-$(NETCAT_VERSION) > -NETCAT_SUFFIX := tar.gz > -NETCAT_URL := $(call ptx/mirror, SF, netcat/$(NETCAT).$(NETCAT_SUFFIX)) > -NETCAT_SOURCE := $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX) > -NETCAT_DIR := $(BUILDDIR)/$(NETCAT) > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -NETCAT_PATH := PATH=$(CROSS_PATH) > -NETCAT_ENV := $(CROSS_ENV) > - > -# > -# autoconf > -# > -NETCAT_AUTOCONF := $(CROSS_AUTOCONF_ROOT) > - > -ifdef PTXCONF_NETCAT_OLD_HEXDUMP > -NETCAT_AUTOCONF += --enable-oldhexdump > -else > -NETCAT_AUTOCONF += --disable-oldhexdump > -endif > - > -ifdef PTXCONF_NETCAT_OLD_TELNET > -NETCAT_AUTOCONF += --enable-oldtelnet > -else > -NETCAT_AUTOCONF += --disable-oldtelnet > -endif > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/netcat.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, netcat) > - @$(call install_fixup, netcat,PRIORITY,optional) > - @$(call install_fixup, netcat,SECTION,base) > - @$(call install_fixup, netcat,AUTHOR,"Bjoern Buerger > <b.buer...@pengutronix.de>") > - @$(call install_fixup, netcat,DESCRIPTION,missing) > - > - @$(call install_copy, netcat, 0, 0, 0755, -, /bin/netcat) > - @$(call install_link, netcat, netcat, /bin/nc) > - > - @$(call install_finish, netcat) > - > - @$(call touch) > - > -# vim: syntax=make > -- > 1.8.5.3 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de
