gentoo resync : 22.05.2021

3 files changed, 45 insertions, 26 deletions

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