Cherry-pick upstream patch reverting bindir/sbindir

From:
3cc3948d71.patch

debian/patches/git_revert_bindir.patch

@@ -0,0 +1,32 @@
+From 3cc3948d719d3b9dedaaf2e96221e4b5b96ea380 Mon Sep 17 00:00:00 2001
+From: Patrick McLean <chutzpah@gentoo.org>
+Date: Sun, 1 Dec 2019 13:59:52 -0800
+Subject: [PATCH] Revert "Honor --sbindir and --bindir for binary installation"
+
+This reverts commit e293aa9cfca0619a63616af75532637dab60d49d.
+
+See https://github.com/shadow-maint/shadow/issues/196
+
+Some distros still care about `/bin` vs `/usr/bin`. This commit makes
+it so all binaries are always installed to `/bin`/`/sbin`. The only way to
+restore the previous behaviour of installing some binaries to
+`/usr/bin`/`/usr/sbin` is to revert the patch.
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f31fd7ab..7b0aeec8 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,8 +2,8 @@
+ EXTRA_DIST = \
+ 	.indent.pro
+ 
+-ubindir = ${bindir}
+-usbindir = ${sbindir}
++ubindir = ${prefix}/bin
++usbindir = ${prefix}/sbin
+ suidperms = 4755
+ sgidperms = 2755
+ 

debian/patches/series

@@ -14,3 +14,4 @@
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
 501_commonio_group_shadow
+git_revert_bindir.patch