gentoo resync : 03.11.2019

7 files changed, 147 insertions, 49 deletions

diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 9e1d49260c31..0f3c48e8317d 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -1,7 +1,8 @@
-AUX 0.90-errno.patch 243 BLAKE2B 7d47a8de24cc1750a040e6abcc3905d78684d9717b7ea410be9e62c83ae033550225495fa0807610e33b457be4696c347f258783bd82e5eae3e008b4975763c5 SHA512 97ce36c130989e6844d9308f56aeb97b17bd2b3c7dc0b8da69f12cf0f3dfe5bfd2fd43600c7a4d798f743ffeac9bfbd0de9918efaf2f2581c3c695bf58dc18de
-AUX 0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
 AUX 0.90-head-1.patch 1201 BLAKE2B e9e0748772232855ed1ce0990d2b5438dca1b86a671a5bf70827e33795914a5099e648ef6047f3537db19c7fdbb456e45d20ea00e12331334230cf9b95aa7b53 SHA512 b8fd43218a6b396b848e5e827ad30ce406b2c3860abbedf359c7649e4cbedac96968726e0a910c4e9f563d48ec924873c96f315392be2b4bbd252767bdb5f6a9
+AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7df279e163dfc0c4a84d4ed8083af51d91658bfe44df640a45dc18654477cd7341e7c703c3108d6e3343a16ebdadf1e8 SHA512 67b2764ad73cc6773e59d0335aa5a3b03e3620cd4421f51ad7e17c68abeffc2a481d728dc6850f232190e91cffaf1e83904cd3b94e33647193e0b2ea6105c3a2
+AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5
+AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
-EBUILD checkpassword-0.90-r2.ebuild 882 BLAKE2B 6177e356923eb86ac3cec6e65156d5da8130565ae287afbf7562641bbf92cb61bf6c6dfb75dc8b11640ad014701eb5e29a2e41a716f99a3a940560779b53df81 SHA512 e6eafd2032a99adb107c27be8a832b97d20592610e31df380e9aa98657dcf0800c0fabdb8c88d0bc2a81030c8e78c7b75167cf4313955a33c85981874b36a781
-EBUILD checkpassword-0.90-r3.ebuild 855 BLAKE2B e10918d69b0b0d541edfb006119a366975e0100ee343072f3d4603c5267f3ea4ce5b31aa1c15a400e377ef97ae8260f0ace18ebb68ab3f82f97f400884ce3c06 SHA512 0edd1f66c2b48e1808acddd809ea9fbf4cc9eec9536db8c08e9abd68cb18d3879813c28985df93ac5c4de561bd2e6301d14f18cefa47c313f38a41b645df1d41
+EBUILD checkpassword-0.90-r2.ebuild 880 BLAKE2B 836c292fe8f20d674faefea9b66b1095c16f3d80504fd0c9471c1eef86cb59ca1eabd4af5016e84540fd5e10916a179c6cc0299293743e5c59fb03b1d3a0504f SHA512 d358b40ac9e2cd7f54a5d7b22a86774bb161dc59673b7e90d3827937b7bb97a5906b0594c2a4f25a693382d0e7e539b7f5080e343dc7136372c8a52b7081e320
+EBUILD checkpassword-0.90-r4.ebuild 922 BLAKE2B 999e0746fb92e3824da9c642d084ee0bd486f0cea0e4583667a0f20e553ce0c92498f18388867d465438986c6fb8418909fee648a358dd07712727ef9d26bd68 SHA512 ae143516e179bbc0a33edec9e2ba4926d22913b4b9e0ba8e6ff978eaf1d29e613bac7e255fa2774665cba1bcb6baddb1889e46bf33df5971860e002d08dd7590
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
index 8efb8a03c5c4..5cd7a09218fc 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -6,8 +6,8 @@ EAPI=0
 inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A uniform password checking interface for root applications"
-HOMEPAGE="http://cr.yp.to/checkpwd.html"
-SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
+HOMEPAGE="https://cr.yp.to/checkpwd.html"
+SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -18,7 +18,7 @@ RESTRICT="mirror bindist"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-errno.patch
+	epatch "${FILESDIR}"/${P}-errno.patch
 	epatch "${FILESDIR}"/${PV}-head-1.patch
 
 	use static && append-ldflags -static
diff --git a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
deleted file mode 100644
index 7ed02b16fe94..000000000000
--- a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils fixheadtails flag-o-matic qmail
-
-DESCRIPTION="A uniform password checking interface for root applications"
-HOMEPAGE="http://cr.yp.to/checkpwd.html"
-SRC_URI="http://cr.yp.to/checkpwd/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static"
-RESTRICT="mirror bindist"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}-errno.patch
-	epatch "${FILESDIR}"/${PV}-exit.patch
-
-	ht_fix_file Makefile print-cc.sh
-
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	qmail_set_cc
-	make || die
-}
-
-src_install() {
-	into /
-	dobin checkpassword || die
-	dodoc CHANGES README TODO VERSION FILES SYSDEPS TARGETS
-}
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
new file mode 100644
index 000000000000..1680029cd0a6
--- /dev/null
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails toolchain-funcs
+
+DESCRIPTION="A uniform password checking interface for root applications"
+HOMEPAGE="https://cr.yp.to/checkpwd.html"
+SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+RESTRICT="mirror bindist"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-exit.patch
+	"${FILESDIR}"/${P}-headers.patch
+)
+
+src_prepare() {
+	default
+
+	ht_fix_file Makefile print-cc.sh
+
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > ./conf-cc || die 'Patching conf-cc failed.'
+	echo "$(tc-getCC) ${LDFLAGS}" > ./conf-ld || die 'Patching conf-ld failed.'
+}
+
+src_install() {
+	dobin checkpassword
+	einstalldocs
+}
diff --git a/net-mail/checkpassword/files/0.90-errno.patch b/net-mail/checkpassword/files/checkpassword-0.90-errno.patch
index 9cf40c689c1e..0e152b4aee76 100644
--- a/net-mail/checkpassword/files/0.90-errno.patch
+++ b/net-mail/checkpassword/files/checkpassword-0.90-errno.patch
@@ -1,5 +1,5 @@
---- error.h.orig	2003-03-05 15:48:54.000000000 -0500
-+++ error.h	2003-03-05 15:49:08.000000000 -0500
+--- a/error.h	2003-03-05 15:48:54.000000000 -0500
++++ b/error.h	2003-03-05 15:49:08.000000000 -0500
 @@ -1,7 +1,7 @@
  #ifndef ERROR_H
  #define ERROR_H
diff --git a/net-mail/checkpassword/files/0.90-exit.patch b/net-mail/checkpassword/files/checkpassword-0.90-exit.patch
index e8e4d2d1fc1e..e8e4d2d1fc1e 100644
--- a/net-mail/checkpassword/files/0.90-exit.patch
+++ b/net-mail/checkpassword/files/checkpassword-0.90-exit.patch
diff --git a/net-mail/checkpassword/files/checkpassword-0.90-headers.patch b/net-mail/checkpassword/files/checkpassword-0.90-headers.patch
new file mode 100644
index 000000000000..4644542204ba
--- /dev/null
+++ b/net-mail/checkpassword/files/checkpassword-0.90-headers.patch
@@ -0,0 +1,98 @@
+diff -aurp checkpassword-0.90-orig/alloc.c checkpassword-0.90/alloc.c
+--- checkpassword-0.90-orig/alloc.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/alloc.c	2019-10-18 18:39:41.820000000 +0200
+@@ -1,7 +1,6 @@
++#include <stdlib.h>
+ #include "alloc.h"
+ #include "error.h"
+-extern char *malloc();
+-extern void free();
+ 
+ #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
+ #define SPACE 2048 /* must be multiple of ALIGNMENT */
+diff -aurp checkpassword-0.90-orig/checkpassword.c checkpassword-0.90/checkpassword.c
+--- checkpassword-0.90-orig/checkpassword.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/checkpassword.c	2019-10-18 18:42:00.352000000 +0200
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <unistd.h>
+ 
+ #include "error.h"
+@@ -23,6 +24,7 @@ static struct userpw *upw;
+ static char up[513];
+ static int uplen;
+ 
++int
+ main(int argc,char **argv)
+ {
+   char *login;
+diff -aurp checkpassword-0.90-orig/chkshsgr.c checkpassword-0.90/chkshsgr.c
+--- checkpassword-0.90-orig/chkshsgr.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/chkshsgr.c	2019-10-18 18:38:29.436000000 +0200
+@@ -1,5 +1,8 @@
++#include <grp.h>
++#include <unistd.h>
+ #include "exit.h"
+ 
++int
+ main()
+ {
+   short x[4];
+diff -aurp checkpassword-0.90-orig/install.c checkpassword-0.90/install.c
+--- checkpassword-0.90-orig/install.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/install.c	2019-10-18 18:43:52.968000000 +0200
+@@ -1,3 +1,6 @@
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <unistd.h>
+ #include "buffer.h"
+ #include "strerr.h"
+ #include "error.h"
+@@ -137,6 +140,7 @@ int mode;
+     strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
+ }
+ 
++int
+ main()
+ {
+   fdsourcedir = open_read(".");
+diff -aurp checkpassword-0.90-orig/instcheck.c checkpassword-0.90/instcheck.c
+--- checkpassword-0.90-orig/instcheck.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/instcheck.c	2019-10-18 18:42:42.428000000 +0200
+@@ -101,6 +101,7 @@ int mode;
+   perm("",home,"/",file,S_IFREG,uid,gid,mode);
+ }
+ 
++int
+ main()
+ {
+   hier();
+diff -aurp checkpassword-0.90-orig/pathexec_run.c checkpassword-0.90/pathexec_run.c
+--- checkpassword-0.90-orig/pathexec_run.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/pathexec_run.c	2019-10-18 18:40:42.944000000 +0200
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+diff -aurp checkpassword-0.90-orig/prot.c checkpassword-0.90/prot.c
+--- checkpassword-0.90-orig/prot.c	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/prot.c	2019-10-18 18:37:28.668000000 +0200
+@@ -1,3 +1,5 @@
++#include <grp.h>
++#include <unistd.h>
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
+diff -aurp checkpassword-0.90-orig/readwrite.h checkpassword-0.90/readwrite.h
+--- checkpassword-0.90-orig/readwrite.h	2019-10-18 18:32:45.888000000 +0200
++++ checkpassword-0.90/readwrite.h	2019-10-18 18:33:59.732000000 +0200
+@@ -1,7 +1,6 @@
+ #ifndef READWRITE_H
+ #define READWRITE_H
+ 
+-extern int read();
+-extern int write();
++#include <unistd.h>
+ 
+ #endif