diff --git a/packages/netcat-openbsd/build.sh b/packages/netcat-openbsd/build.sh index a8e9c10c83..3005b7d0fc 100644 --- a/packages/netcat-openbsd/build.sh +++ b/packages/netcat-openbsd/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/sid/netcat-openbsd TERMUX_PKG_DESCRIPTION="TCP/IP swiss army knife. OpenBSD variant." TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.217-2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=1.218-5 TERMUX_PKG_SRCURL=https://salsa.debian.org/debian/netcat-openbsd/-/archive/debian/${TERMUX_PKG_VERSION}/netcat-openbsd-debian-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=bb6427c49015c8d485c013898b08808192bf5719c40a79676162e5c2d971a34e +TERMUX_PKG_SHA256=e966b598e8af34141e9993c0434cafc83fb707f8ace900fb7c4e758889653c08 TERMUX_PKG_DEPENDS="libbsd" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/netcat-openbsd/debian-patches-port-to-linux-with-libbsd.patch b/packages/netcat-openbsd/debian-patches-port-to-linux-with-libbsd.patch new file mode 100644 index 0000000000..3f191b950e --- /dev/null +++ b/packages/netcat-openbsd/debian-patches-port-to-linux-with-libbsd.patch @@ -0,0 +1,21 @@ +diff -uNr netcat-openbsd-debian-1.218-5/debian/patches/port-to-linux-with-libbsd.patch netcat-openbsd-debian-1.218-5.mod/debian/patches/port-to-linux-with-libbsd.patch +--- netcat-openbsd-debian-1.218-5/debian/patches/port-to-linux-with-libbsd.patch 2022-03-12 05:06:36.000000000 +0800 ++++ netcat-openbsd-debian-1.218-5.mod/debian/patches/port-to-linux-with-libbsd.patch 2022-08-19 14:06:55.555066100 +0800 +@@ -23,7 +23,7 @@ + +LIBS= `$(PKG_CONFIG) --libs libbsd` -lresolv + +OBJS= $(SRCS:.c=.o) + +CFLAGS= -g -O2 +-+LDFLAGS= -Wl,--no-add-needed +++LDFLAGS= -Wl,--no-copy-dt-needed-entries + + + +all: nc + +nc: $(OBJS) +@@ -76,7 +76,7 @@ + +# include + +#endif + + +-+#ifndef IPTOS_LOWDELAY +++#ifdef __ANDROID__ + +# define IPTOS_LOWDELAY 0x10 + +# define IPTOS_THROUGHPUT 0x08 + +# define IPTOS_RELIABILITY 0x04 diff --git a/packages/netcat-openbsd/debian-patches-port-to-linux-with-libsd.patch b/packages/netcat-openbsd/debian-patches-port-to-linux-with-libsd.patch deleted file mode 100644 index 5dd4984d1f..0000000000 --- a/packages/netcat-openbsd/debian-patches-port-to-linux-with-libsd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr netcat-openbsd-debian-1.217-2/debian/patches/port-to-linux-with-libsd.patch netcat-openbsd-debian-1.217-2.mod/debian/patches/port-to-linux-with-libsd.patch ---- netcat-openbsd-debian-1.217-2/debian/patches/port-to-linux-with-libsd.patch 2020-06-05 04:20:03.000000000 +0300 -+++ netcat-openbsd-debian-1.217-2.mod/debian/patches/port-to-linux-with-libsd.patch 2020-10-02 22:09:45.573193613 +0300 -@@ -68,7 +68,7 @@ - +# include - +#endif - + --+#ifndef IPTOS_LOWDELAY -++#ifdef __ANDROID__ - +# define IPTOS_LOWDELAY 0x10 - +# define IPTOS_THROUGHPUT 0x08 - +# define IPTOS_RELIABILITY 0x04