gentoo resync : 22.05.2021

5 files changed, 67 insertions, 38 deletions

diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index 58883de3017f..86957edf31fe 100644
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,5 +1,6 @@
-AUX pwdb-0.62-build.patch 2920 BLAKE2B e0d7362fd82f3c053a25c16d7f07aff8200a2904411a3b9a5c8921551320924aa8be41820bbb81a952ce46aed3c756d7a2b28e38c669585e1e55c415c0388e64 SHA512 fb6b1bb322daf4a343b31fd8cadb1c546682421775670a361721272ea5811cb87b8215aa1c7bad624334da826ddab4776a4809fce0613346a4560ffce8af3bba
-AUX pwdb-0.62-selinux.patch 10371 BLAKE2B bb6acd534be858c85b237d18a5e805d812db97178d9d79b3b84c5b724981aa102fe7eb58fa661719185b0b957a58c0929996a9b7aa025d49560cafe8631de70d SHA512 63cb33af31179183c32f738c90ac2144e8d8092034faa5bcd0c5420832e51018e7e9ffcea59c8354ee0ae598e53dbd120cd9338ab80b0e5df6cc1c53eb75b818
+AUX pwdb-0.62-build.patch 2948 BLAKE2B 430bdb7b027c75b7c0abd38ee921270d6dc83daffa0f44945d432145bf122085f3308bd81fdeda465930d9ba5971a20d9e19aff5c6475564fce0dd874eb7014f SHA512 e0b25062a2dee7c836098bb5e4b56f7b985ebe57e5980bdf60ec7cdfdd04f44897365f58bb9809a1cab9cc32cd4e640e003cb2135dba63fdc06a84ee3d8f3bca
+AUX pwdb-0.62-disable-static.patch 531 BLAKE2B 7900485fdad6a71460b79d439b903ae6dd2016dfd3aba90443f4d42f7b395f2b6c6a77fc87a65d7283bc3675487528dde1a5608a8866c2e22d03feebc0589596 SHA512 5bc22e79ddc068b78003c5756ead055e860ac97dcae5369fed2ac293ae7cd74d020041aad51aa235fb2e27a6dce1557c10a544159be1113d68ec4e52c2c28e08
+AUX pwdb-0.62-selinux.patch 9771 BLAKE2B 1be94b7a39c5a72cbaa8c6671ea15d817413f613d9dcc5aca34be344c4ac057ad4d17f9c8b83fe0e763edbdbb2cff9a2a58296a12db3b2f8b2ec9a2e5a1e9d98 SHA512 f965d70db75fe8f6d0f26d39cefae616e77f95fdd9a2f29437cb4e2a84efae110a6f396039e4c8b8f6365c9186d7dc229d6ab7388e220b1ab3f776f787cfde36
 DIST pwdb-0.62.tar.gz 133183 BLAKE2B f9b75e9875c8de1050d8eafa8b0c0c58b8c415c9b67683d1928100ce4f192f1b1cea3033264b6c31edd0709094c034ae3790ceaf0143d6b52ce2647a3ad62992 SHA512 baba1f42125a4773f2e645129be79e0e5fbd0b0da7c6624f4b1d13e59cb65f5807bd22997aa1ba360c7627f2aff93c9949b2bb5fbd27d74b516853bcbca96ef4
-EBUILD pwdb-0.62-r1.ebuild 1398 BLAKE2B c71fc9f7e9e5f56e7ce143144168f2ad7386e1041970744de4053cde6d2ee1527a503dfb2dc955440569efca0933492c49c17a9f985411a5dd34f3dd3aa07c20 SHA512 7f42787666b7be50a190d6dba4444ee60f5fa6a83e792bc5662bb3edca307d8dd87ac33d4272d61eb0e94f1c8643a884334b4c2cd6d9fdaa1541bdb523e9a40d
+EBUILD pwdb-0.62-r2.ebuild 1513 BLAKE2B da67343b0afcf43b50941dd5fcb53cc2566d240a6818e839242ef903e120d11a0cd6fbcb791b6df2113a42683544687a3ce9720262eaeb85e5dc7c80200a1961 SHA512 6c2190a69ca56c81ce34311ee4ac16f4689afcdf83f635597c8e0b95e8829c5fe441dd5badc0817eabe30bf5e1a0ca733beedf2d810700120cf2eeaf3eaf18d9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/pwdb/files/pwdb-0.62-build.patch b/sys-libs/pwdb/files/pwdb-0.62-build.patch
index ecef517b1ca3..92c77c28d101 100644
--- a/sys-libs/pwdb/files/pwdb-0.62-build.patch
+++ b/sys-libs/pwdb/files/pwdb-0.62-build.patch
@@ -11,8 +11,8 @@ http://bugs.gentoo.org/126695
 http://bugs.gentoo.org/137134
  - don't show traditional warnings
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -71,7 +71,7 @@
  
  WARNINGS += -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
@@ -22,8 +22,8 @@ http://bugs.gentoo.org/137134
  	-Wnested-externs -Winline -Wshadow 
  INCLUDEDIR=-I$(CRTDIR)/include
  
---- libpwdb/Makefile
-+++ libpwdb/Makefile
+--- a/libpwdb/Makefile
++++ b/libpwdb/Makefile
 @@ -50,7 +50,7 @@
  
  
@@ -42,8 +42,8 @@ http://bugs.gentoo.org/137134
  	ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBDYNAME)
  	$(INSTALL) -m 644 $(LIBSTATIC) $(LIBDIR)
  
---- libpwdb/posix/pwd.c
-+++ libpwdb/posix/pwd.c
+--- a/libpwdb/posix/pwd.c
++++ b/libpwdb/posix/pwd.c
 @@ -7,6 +7,7 @@
   */
  
@@ -52,8 +52,8 @@ http://bugs.gentoo.org/137134
  
  #define PWDB_HARD_CORE 1
  #include <pwdb/pwdb_public.h>
---- libpwdb/posix/undefined.c
-+++ libpwdb/posix/undefined.c
+--- a/libpwdb/posix/undefined.c
++++ b/libpwdb/posix/undefined.c
 @@ -5,6 +5,7 @@
   */
  
@@ -62,8 +62,8 @@ http://bugs.gentoo.org/137134
  
  #define PWDB_HARD_CORE 1
  #include <pwdb/pwdb_public.h>
---- libpwdb/pwdb/pwdb_helper.c
-+++ libpwdb/pwdb/pwdb_helper.c
+--- a/libpwdb/pwdb/pwdb_helper.c
++++ b/libpwdb/pwdb/pwdb_helper.c
 @@ -18,6 +18,7 @@
   *
   */
@@ -72,8 +72,8 @@ http://bugs.gentoo.org/137134
  #include "pwdb_public.h"
  #include "pwdb_module.h"
  
---- libpwdb/pwdb/interface/shadow/group.c
-+++ libpwdb/pwdb/interface/shadow/group.c
+--- a/libpwdb/pwdb/interface/shadow/group.c
++++ b/libpwdb/pwdb/interface/shadow/group.c
 @@ -533,7 +533,7 @@
  
      static const char *supp_entry[] = {
@@ -83,8 +83,8 @@ http://bugs.gentoo.org/137134
      "groups",               /* these are serviced by requests */
      NULL
      };
---- libpwdb/radius/radius.c
-+++ libpwdb/radius/radius.c
+--- a/libpwdb/radius/radius.c
++++ b/libpwdb/radius/radius.c
 @@ -145,7 +145,7 @@
  		      const char* password,
  		      RADIUS_RESULT *rad_result)
diff --git a/sys-libs/pwdb/files/pwdb-0.62-disable-static.patch b/sys-libs/pwdb/files/pwdb-0.62-disable-static.patch
new file mode 100644
index 000000000000..a3395e169079
--- /dev/null
+++ b/sys-libs/pwdb/files/pwdb-0.62-disable-static.patch
@@ -0,0 +1,19 @@
+--- a/libpwdb/Makefile
++++ b/libpwdb/Makefile
+@@ -46,7 +46,7 @@
+ %.o : %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DYNAMIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
+ 
+-all: $(LIBSTATIC) $(LIBDYNAME) 
++all: $(LIBDYNAME)
+ 
+ 
+ $(LIBDYNAME): $(LIBOBJ)
+@@ -70,7 +70,6 @@
+ 	$(INSTALL) -m 755 $(LIBFILENAME) $(LIBDIR)
+ 	ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBSONAME)
+ 	ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBDYNAME)
+-	$(INSTALL) -m 644 $(LIBSTATIC) $(LIBDIR)
+ 
+ clean:
+ 	@rm -f *.so *.a core a.out `find . -name "*.o" -print` `find . -name "*~" -print`
diff --git a/sys-libs/pwdb/files/pwdb-0.62-selinux.patch b/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
index 106be5645176..02ba3c50c38c 100644
--- a/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
+++ b/sys-libs/pwdb/files/pwdb-0.62-selinux.patch
@@ -1,5 +1,5 @@
---- pwdb-0.62/examples/Makefile.pwdbselinux	1998-10-06 19:57:04.000000000 -0400
-+++ pwdb-0.62/examples/Makefile	2003-07-09 14:45:54.702663000 -0400
+--- a/examples/Makefile
++++ b/examples/Makefile
 @@ -4,6 +4,8 @@ PROGS	= posix gentest tpwdb radtest grou
  SRCS = $(addsuffix .c,$(PROGS))
  OBJS = $(addsuffix .o,$(PROGS))
@@ -36,8 +36,8 @@
  
  clean:
  	rm -f ${PROGS} *.o *~
---- pwdb-0.62/libpwdb/shadow/shadowio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/shadow/shadowio.c	2003-07-09 14:45:54.705662544 -0400
+--- a/libpwdb/shadow/shadowio.c
++++ b/libpwdb/shadow/shadowio.c
 @@ -16,6 +16,12 @@
  
  #include "../_pwdb_internal.h"
@@ -133,8 +133,8 @@
  }
  
  int __pwdb_spw_update (const struct __pwdb_spwd *spwd)
---- pwdb-0.62/libpwdb/shadow/sgroupio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/shadow/sgroupio.c	2003-07-09 14:45:54.704662696 -0400
+--- a/libpwdb/shadow/sgroupio.c
++++ b/libpwdb/shadow/sgroupio.c
 @@ -16,6 +16,12 @@
  
  #include "../_pwdb_internal.h"
@@ -230,8 +230,8 @@
  }
  
  int __pwdb_sgr_update (const struct __pwdb_sgrp *sgrent)
---- pwdb-0.62/libpwdb/unix/pwio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/unix/pwio.c	2003-07-09 14:45:54.707662240 -0400
+--- a/libpwdb/unix/pwio.c
++++ b/libpwdb/unix/pwio.c
 @@ -16,6 +16,11 @@
  
  #include "../_pwdb_internal.h"
@@ -326,8 +326,8 @@
  }
  
  /*
---- pwdb-0.62/libpwdb/unix/groupio.c.pwdbselinux	1998-10-06 16:58:43.000000000 -0400
-+++ pwdb-0.62/libpwdb/unix/groupio.c	2003-07-09 14:45:54.708662088 -0400
+--- a/libpwdb/unix/groupio.c
++++ b/libpwdb/unix/groupio.c
 @@ -11,6 +11,12 @@
  #include "../_pwdb_internal.h"
  
@@ -422,8 +422,8 @@
  }
  
  /* update an entry */
---- pwdb-0.62/libpwdb/Makefile.pwdbselinux	1999-04-10 05:31:20.000000000 -0400
-+++ pwdb-0.62/libpwdb/Makefile	2003-07-09 14:45:54.709661936 -0400
+--- a/libpwdb/Makefile
++++ b/libpwdb/Makefile
 @@ -22,7 +22,7 @@ HEADERS	= pwdb/pwdb_public.h pwdb/pwdb_c
  
  # needed for generic interface compilation
diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r2.ebuild
index ea832e84206e..d44cdd852dd0 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch toolchain-funcs flag-o-matic usr-ldscript
+inherit toolchain-funcs flag-o-matic usr-ldscript
 
 DESCRIPTION="Password database"
 HOMEPAGE="https://packages.gentoo.org/package/sys-libs/pwdb"
@@ -16,22 +16,32 @@ IUSE="selinux"
 RESTRICT="test" #122603
 
 # Note: NIS could probably be made conditional if anyone cared ...
-RDEPEND="selinux? ( sys-libs/libselinux )
+RDEPEND="
 	net-libs/libnsl:0=
-	net-libs/libtirpc"
+	net-libs/libtirpc
+	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS README doc/pwdb.txt )
+HTML_DOCS=( doc/html/. )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-disable-static.patch # bug 725972
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
 
-	use selinux && epatch "${FILESDIR}"/${P}-selinux.patch
+	use selinux && eapply "${FILESDIR}"/${P}-selinux.patch
 
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
 	export LDLIBS=$($(tc-getPKG_CONFIG) --libs libtirpc)
 
 	sed -i \
 		-e "s/^DIRS = .*/DIRS = libpwdb/" \
-		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
+		-e "s;EXTRAS += ;EXTRAS += ${CFLAGS} ;" \
 		Makefile || die
 	sed -i \
 		-e "s:=gcc:=$(tc-getCC):g" \
@@ -53,6 +63,5 @@ src_install() {
 	insinto /etc
 	doins conf/pwdb.conf
 
-	dodoc CHANGES CREDITS README doc/*.txt
-	dohtml -r doc/html/*
+	einstalldocs
 }