[gentoo-commits] repo/gentoo:master commit in: app-admin/pwgen/files/, app-admin/pwgen/

[gentoo-commits] repo/gentoo:master commit in: app-admin/pwgen/files/, app-admin/pwgen/

[Jeroen Roovers]

commit:     d7d4815d6b49ba6844fe347866445c1864d54571
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 07:31:40 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 07:32:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d4815d

app-admin/pwgen: Old

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 app-admin/pwgen/Manifest                      |  1 -
 app-admin/pwgen/files/2.06-special-char.patch | 11 -----------
 app-admin/pwgen/pwgen-2.07.ebuild             | 28 ---------------------------
 3 files changed, 40 deletions(-)

diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 673f49b7a40..d9d9e11ce0b 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,2 +1 @@
-DIST pwgen-2.07.tar.gz 53513 BLAKE2B c5d3a548ef1fab3b246b7ad9ffdc18d572136b3addd2a23e375e45d82af0f45f0e19e747d20d4e4cf7138f7121890460e82a85ffe17c451160c6c0f08bed4422 SHA512 9c56ff04ca2f6f60126608a25f395ddbc4a3ac59585a6f233c87d993b6388e30b1867d43a6bc5b0f9f1f4064b12ea450eac4f7c9ac2844707a99fad1bbd2664d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255

diff --git a/app-admin/pwgen/files/2.06-special-char.patch b/app-admin/pwgen/files/2.06-special-char.patch
deleted file mode 100644
index 3d014fa4bf1..00000000000
--- a/app-admin/pwgen/files/2.06-special-char.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pwgen.c
-+++ b/pwgen.c
-@@ -138,7 +138,7 @@ int main(int argc, char **argv)
- 			break;
- 		case 's':
- 			pwgen = pw_rand;
--			pwgen_flags = PW_DIGITS | PW_UPPERS;
-+			pwgen_flags |= PW_DIGITS | PW_UPPERS;
- 			break;
- 		case 'C':
- 			do_columns = 1;

diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
deleted file mode 100644
index 9df81de1440..00000000000
--- a/app-admin/pwgen/pwgen-2.07.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Password Generator"
-HOMEPAGE="https://sourceforge.net/projects/pwgen/"
-SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="livecd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.06-special-char.patch
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/etc/pwgen
-}
-
-src_install() {
-	default
-	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/pwgen/files/, app-admin/pwgen/

[Fabian Groffen]

commit:     08669acd9eac3a9ea64fb177c0c8cf706843c1c0
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 12:58:52 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 12:59:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08669acd

app-admin/pwgen-2.08-r2: fix c2x errors

Closes: https://bugs.gentoo.org/881965
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/pwgen/files/pwgen-2.08-c2x.patch | 62 ++++++++++++++++++++++++++++++
 app-admin/pwgen/pwgen-2.08-r2.ebuild       | 27 +++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/app-admin/pwgen/files/pwgen-2.08-c2x.patch b/app-admin/pwgen/files/pwgen-2.08-c2x.patch
new file mode 100644
index 000000000000..d6cc05734d3c
--- /dev/null
+++ b/app-admin/pwgen/files/pwgen-2.08-c2x.patch
@@ -0,0 +1,62 @@
+replace antiquated C syntax constructs for function declarations
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+--- pwgen-2.08/randnum.c	2017-08-07 06:36:54.000000000 +0200
++++ pwgen-2.08/randnum.c	2023-04-20 14:46:50.107904416 +0200
+@@ -43,8 +43,7 @@
+  * Generate a random number n, where 0 <= n < max_num, using
+  * /dev/urandom if possible.
+  */
+-int pw_random_number(max_num)
+-	int max_num;
++int pw_random_number(int max_num)
+ {
+ 	unsigned int rand_num;
+ 	int i, fd = get_random_fd();
+--- pwgen-2.08/sha1.c	2007-07-04 23:39:35.000000000 +0200
++++ pwgen-2.08/sha1.c	2023-04-20 14:48:25.048635027 +0200
+@@ -42,8 +42,7 @@
+     (b)[(i) + 3] = (uint8) ( (n)       );       \
+ }
+ 
+-void sha1_starts(ctx)
+-	sha1_context *ctx;
++void sha1_starts(sha1_context *ctx)
+ {
+     ctx->total[0] = 0;
+     ctx->total[1] = 0;
+@@ -55,9 +54,7 @@
+     ctx->state[4] = 0xC3D2E1F0;
+ }
+ 
+-void sha1_process(ctx, data)
+-	sha1_context *ctx;
+-	uint8 data[64];
++void sha1_process(sha1_context *ctx, uint8 data[64])
+ {
+     uint32 temp, W[16], A, B, C, D, E;
+ 
+@@ -213,10 +210,7 @@
+     ctx->state[4] += E;
+ }
+ 
+-void sha1_update(ctx, input, length )
+-	sha1_context *ctx;
+-	uint8 *input;
+-	uint32 length;
++void sha1_update(sha1_context *ctx, uint8 *input, uint32 length)
+ {
+     uint32 left, fill;
+ 
+@@ -263,9 +257,7 @@
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ };
+ 
+-void sha1_finish( ctx, digest )
+-	sha1_context *ctx;
+-	uint8 digest[20];
++void sha1_finish(sha1_context *ctx, uint8 digest[20])
+ {
+     uint32 last, padn;
+     uint32 high, low;

diff --git a/app-admin/pwgen/pwgen-2.08-r2.ebuild b/app-admin/pwgen/pwgen-2.08-r2.ebuild
new file mode 100644
index 000000000000..d263bb50e841
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.08-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c2x.patch
+)
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+	default
+
+	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}