Merge ~paelzer/ubuntu/+source/netcat-openbsd:bionic-lp-1767283 into ubuntu/+source/netcat-openbsd:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Considering https://salsa.debian.org/debian/netcat-openbsd.git commit by commit this can be done mcuh simpler ...

[Christian Ehrhardt  (paelzer)]

Yeah that looks much better.
Works from ppa https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3260/+packages
to fix bug 1767283 in Bionic and I'd be happy about a review.

[Andreas Hasenack (ahasenack)]

+1

Just missing the sru template in the bug.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks Andreas, I added the SRU Template in the meantime.
Uploading now ...

diff --git a/debian/changelog b/debian/changelog
index 9ba728a..9f63e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+netcat-openbsd (1.187-1ubuntu0.1) bionic; urgency=medium
+
+  * Re-enable usage of '-s' (local source address) and '-p' (local source
+    port) in client mode (when '-l' is unset).  Regression introduced in
+    a Debian-specific patch added in 1.187-1. (LP: #1767283).
+    Backport of https://salsa.debian.org/debian/netcat-openbsd/commit/338b1fa7
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 14 May 2018 14:24:33 +0200
+
 netcat-openbsd (1.187-1) unstable; urgency=low
 
   * New upstream release (from OpenBSD 6.2)
diff --git a/debian/patches/misc-failures-and-features.patch b/debian/patches/misc-failures-and-features.patch
index e907711..468791d 100644
--- a/debian/patches/misc-failures-and-features.patch
+++ b/debian/patches/misc-failures-and-features.patch
@@ -295,7 +295,7 @@ Subject: misc failures and features
  		host = argv[0];
 -		uport = argv[1];
 + 		uport = &argv[1];
-+		if (pflag || sflag)
++		if (lflag && (pflag || sflag))
 +			usage(1);
  	} else
  		usage(1);