Merge pull request #3469 from lazka/openbsd-netcat-update

openbsd-netcat: Sync with Arch

openbsd-netcat/001-msys2-build-fix.patch

@@ -0,0 +1,13 @@
+--- netcat-openbsd-debian-1.219-1/netcat.c.orig	2022-12-30 13:29:36.639812800 +0100
++++ netcat-openbsd-debian-1.219-1/netcat.c	2022-12-30 13:29:47.870486300 +0100
+@@ -58,6 +58,10 @@
+ # define IPTOS_MINCOST IPTOS_LOWCOST
+ #endif /* IPTOS_LOWDELAY */
+ 
++#ifndef IPTOS_LOWCOST
++# define IPTOS_LOWCOST 0x02
++#endif 
++
+ # ifndef IPTOS_DSCP_AF11
+ # define	IPTOS_DSCP_AF11		0x28
+ # define	IPTOS_DSCP_AF12		0x30

openbsd-netcat/PKGBUILD

@@ -1,38 +1,41 @@
 # Maintainer: LoveSy <shana@zju.edu.cn>
 
 pkgname="openbsd-netcat"
-pkgver=1.217_2
+pkgver=1.219_1
 pkgrel=1
 pkgdesc="TCP/IP swiss army knife. OpenBSD variant."
 arch=('i686' 'x86_64')
 url="https://packages.debian.org/sid/netcat-openbsd"
 license=('BSD')
+depends=('libbsd')
 makedepends=('make' 'gcc')
 provides=('netcat')
 conflicts=('gnu-netcat')
-source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver%_*}.orig.tar.gz"
+source=("https://salsa.debian.org/debian/netcat-openbsd/-/archive/debian/${pkgver/_/-}/netcat-openbsd-debian-${pkgver/_/-}.tar.gz"
-        "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver/_/-}.debian.tar.xz"
+        "001-msys2-build-fix.patch")
-        "openbsd-netcat.patch")
+sha256sums=('25fb463ba60d2c54f3f44ddd45d122e9a95b9cc2a2f4dfb264b5b2d0adfc9265'
-sha256sums=('fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5'
+            '60d725e13cebeb3b40574d41f0218f89c4fe2982118fb80c4ecc9c19b3df9892')
-            'ffc8e45798103942c8b4cf573c9f993a0e257e2f80c06d451043d96cd36b1712'
-            'a55a35b0dc3a600324295235a7eea5dc5abada6e5506ba318087abd6c0c7766c')
 
 prepare() {
-  cd "$srcdir"/netcat-openbsd-${pkgver%_*}
+  cd netcat-openbsd-debian-${pkgver/_/-}
-  for i in `cat ../debian/patches/series`; do
+  for i in `cat debian/patches/series`; do
     echo "** patch $i" 1>&2
-    cat "../debian/patches/$i"
+    cat "debian/patches/$i"
   done | patch -p1
-  patch -p1 -i "${srcdir}/openbsd-netcat.patch"
+
+  patch -p1 -i "${srcdir}/001-msys2-build-fix.patch"
 }
 
 build() {
-  cd "$srcdir"/netcat-openbsd-${pkgver%_*}
+  cd netcat-openbsd-debian-${pkgver/_/-}
-  make
+
+  make \
+    CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\"" \
+    LDFLAGS="$LDFLAGS -lbsd"
 }
 
 package() {
-  cd "$srcdir"/netcat-openbsd-${pkgver%_*}
+  cd netcat-openbsd-debian-${pkgver/_/-}
   install -Dm0755 nc "$pkgdir"/usr/bin/nc
   ln -s nc "$pkgdir"/usr/bin/netcat
   install -Dm0644 nc.1 "$pkgdir"/usr/share/man/man1/nc.1