From c9c609463fab9bcfb35694627bca1429a21fdbb2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Oct 2022 21:06:00 +0000 Subject: gentoo auto-resync : 31:10:2022 - 21:05:59 --- app-crypt/shash/Manifest | 9 +- app-crypt/shash/files/0.2.6-manpage-fixes.patch | 5 +- app-crypt/shash/files/shash-0.2.6-C99-decls.patch | 195 +++++++++++++++++++++ .../shash/files/shash-0.2.6-binary-files.patch | 4 +- .../shash/files/shash-0.2.6-format-security.patch | 4 +- app-crypt/shash/shash-0.2.6-r3.ebuild | 35 ---- app-crypt/shash/shash-0.2.6-r4.ebuild | 42 +++++ 7 files changed, 248 insertions(+), 46 deletions(-) create mode 100644 app-crypt/shash/files/shash-0.2.6-C99-decls.patch delete mode 100644 app-crypt/shash/shash-0.2.6-r3.ebuild create mode 100644 app-crypt/shash/shash-0.2.6-r4.ebuild (limited to 'app-crypt/shash') diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest index 6a264fd339a9..5ed8c92360b3 100644 --- a/app-crypt/shash/Manifest +++ b/app-crypt/shash/Manifest @@ -1,7 +1,8 @@ -AUX 0.2.6-manpage-fixes.patch 1451 BLAKE2B bd67acde05230006a858d57adbe423960a625e095a80e94e4b43de0bbd4c2235fb5551a5b7612b1fe4a457457fbb7dc418aec68b831e1a523078924b28361da8 SHA512 10dbcfa52a7df57ef68dc58f21e1b2931adf0479697e13f99c56ccfbbd1c79188751d1ce7e2b160261170a678a4130a71a6b531820aa59e4ddbd131d5d9cb551 -AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df3754480ef0b18637eed5ab29ac0aa17f4172e7f327d0a28f39fbbf1f29e247fd934d3c18b0591b2dd8130930f7c3cea07 SHA512 47f299097b8a9907ccfe2f877c42ab8f76f02546211643573796b378d67dd7941518341f8fd07e646c1aa11a665ddbca6ae113a4d58f6995007d9b5aec171d8b -AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04 +AUX 0.2.6-manpage-fixes.patch 1294 BLAKE2B e2a80a6178e755027df7c7acd2a647180ba39eca9753396d9d9cc056ca22f0c1acf6c586919fc0dfadce4d7b8acc174dc18e67b4ba9a01b7855ec4458e843a01 SHA512 12cb54fcfa3d09a0c48a3e5e6e7cf57b6879c92f982a5b8286ec8556ca6152f4615197ffda8afdf2dac1854dfd9f2acf0c04bd03845d7a71c1758bd800123442 +AUX shash-0.2.6-C99-decls.patch 3034 BLAKE2B d7613480c8ed56290591971822faa58e204a1bbdfd59ee736ee35dd3be6d60a945af4430a22a8f1fad6badff794b32303d330077a2846a1c745abe23ad5146dc SHA512 d6c53e2298aad4a6bb17c0be80634f7d9f83ff5a374b224da0dade14601c66cc2f9ace2a535144856549233a20a7f2766355179155933d977b822ba2faac7a16 +AUX shash-0.2.6-binary-files.patch 878 BLAKE2B f4dc2d5eb5b6e1a59007a2eae1819f9a035014dc7d92c9616c6806608cf5c14cb64a7a1c19c386b3fb3028e970ba7022c2e264d92512b52a81b0ad4e931c9ad9 SHA512 b653b5940408588198326239489be48baff34bb308317f9dd36180182a535040e4c2e52342396e29637711995e7a255236d6460fc64d8248f47d28e65b18087f +AUX shash-0.2.6-format-security.patch 393 BLAKE2B 85ac84654272a04eefc3884d2b0dd22aafc52ff09b0736f8b5e6dcff6358e66a4c43bafad62ecb911ab6863da8c1e1cfa813cc748c0210da73275021312ce407 SHA512 312e58842396df88809cb125c29247a47c7397cd1ba1b193d7c17b6049552f91167a4666da125c9ce858c92455670b27e2bc43b83f68810090ece6f2908d20aa AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b -EBUILD shash-0.2.6-r3.ebuild 946 BLAKE2B b0c23bf6b3e901cc21d4b623ab62f6a5b058a1fc3ea870512d58b673240a58ed69718c2eb9fda4218932f2c434e897be7ddcabc6e1f55e328bedce5368de4efc SHA512 bf9dc0dd00bf55884f2430f7d201e41907654faf4b29eca1874d149bb72a8441e0f1b784470cd89917625ebb17e03f31c29fa58f75506eda2bf0d5354d8c7dcf +EBUILD shash-0.2.6-r4.ebuild 983 BLAKE2B 73cfa61166cd881e057dc4708e26619f85e6b313a98f00f055271a27dcc48f9288f8b430aa808c39e12ee559fe48739bccb86cd9b563265029efee67bbf6fca9 SHA512 ac210df47a94927ca27d00cd97ccc2b24d7261b4ca8decfbe788feadf9f074a64b4420cf6c1851f7b13e1cb5d3df835e48db8e1c13e53cf369867a1e32984c3f MISC metadata.xml 390 BLAKE2B f58596b6b41e4cd8c5d07c2a281caeb496b606a8921bed82a5b5ec70d7826247826fb5135b51fa4b7705055d28e6731fa5df24092e5353f2324b185499e38157 SHA512 50aa7c011296dc7fb119ff25893cda2712353b935e56fbf8fe5d1c2ebd339975f5adc4146b2e1e46b5b6749ac7b9874d40b59bf1071d550df36a5bc8a919034e diff --git a/app-crypt/shash/files/0.2.6-manpage-fixes.patch b/app-crypt/shash/files/0.2.6-manpage-fixes.patch index 0376e15c3572..111730c57823 100644 --- a/app-crypt/shash/files/0.2.6-manpage-fixes.patch +++ b/app-crypt/shash/files/0.2.6-manpage-fixes.patch @@ -1,6 +1,5 @@ -diff -pruN shash-0.2.6/doc/shash.1 shash-0.2.6-r1/doc/shash.1 ---- shash-0.2.6/doc/shash.1 2004-09-18 09:51:04.004647112 +0100 -+++ shash-0.2.6-r1/doc/shash.1 2004-09-18 09:57:26.062565480 +0100 +--- a/doc/shash.1 ++++ b/doc/shash.1 @@ -31,7 +31,7 @@ Because of this shash also supports HMAC a mechanism for message authentication using cryptographic hash functions. So shash can use a key with a hash algorithm to produce hashes that can only diff --git a/app-crypt/shash/files/shash-0.2.6-C99-decls.patch b/app-crypt/shash/files/shash-0.2.6-C99-decls.patch new file mode 100644 index 000000000000..bf2f3ab79d85 --- /dev/null +++ b/app-crypt/shash/files/shash-0.2.6-C99-decls.patch @@ -0,0 +1,195 @@ +--- a/src/environ.c ++++ b/src/environ.c +@@ -4,7 +4,7 @@ + #endif + #include "environ.h" + +-int check_env() ++int check_env(void) + { + + if (getenv(SHASH_KEY) != NULL +@@ -15,7 +15,7 @@ + } + + char * +- get_env_key() ++ get_env_key(void) + { + + if (getenv(SHASH_KEY) != NULL) { +@@ -26,7 +26,7 @@ + + } + +-char *get_env_bit_mode() ++char *get_env_bit_mode(void) + { + + return getenv(SHASH_KEYMODE); +--- a/src/environ.h ++++ b/src/environ.h +@@ -3,7 +3,7 @@ + #define SHASH_KEY "SHASH_KEY" + #define SHASH_KEYMODE "SHASH_KEYMODE" + +-int check_env(); +-char * get_env_key(); +-char * get_env_bit_mode(); ++int check_env(void); ++char * get_env_key(void); ++char * get_env_bit_mode(void); + +--- a/src/errors.c ++++ b/src/errors.c +@@ -1,5 +1,7 @@ + #include + ++#include ++ + extern int quiet; + + void err_quit(char *errmsg) +--- a/src/extra.c ++++ b/src/extra.c +@@ -1,5 +1,10 @@ + #include + ++#include ++#include ++#include ++#include ++ + #ifdef HAVE_STAT + + int check_file(char *filename) +--- a/src/gaaout.c ++++ b/src/gaaout.c +@@ -11,6 +11,11 @@ + #endif + #endif + ++void hash_license(void); ++void hash_version(void); ++void list_keygen_algorithms(void); ++int hash_list(void); ++ + void* gaa_malloc( size_t size) { + void* ret; + ret = malloc(size); +--- a/src/random.c ++++ b/src/random.c +@@ -24,7 +24,7 @@ + static FILE *ffd; + + word32 +-get_rand32() ++get_rand32(void) + { + int fd, x; + word32 rand_data; +@@ -46,7 +46,7 @@ + + + word8 +-get_rand8() ++get_rand8(void) + { + + int fd, x; +@@ -69,7 +69,7 @@ + + + word32 +-get_safe_rand32() ++get_safe_rand32(void) + { + int fd, x; + word32 rand_data; +@@ -91,7 +91,7 @@ + + + word8 +-get_safe_rand8() ++get_safe_rand8(void) + { + + int fd, x; +@@ -131,13 +131,13 @@ + return 0; + } + +-void close_rand() ++void close_rand(void) + { + fclose(ffd); + } + + word32 +-get_o_rand32() ++get_o_rand32(void) + { + int x; + word32 rand_data; +@@ -152,7 +152,7 @@ + } + + word8 +-get_o_rand8() ++get_o_rand8(void) + { + + int x; +--- a/src/random.h ++++ b/src/random.h +@@ -1,14 +1,14 @@ + + #ifdef HAVE_DEV_RANDOM + +-word32 get_rand32(); +-word8 get_rand8(); +-word32 get_safe_rand32(); +-word8 get_safe_rand8(); ++word32 get_rand32(void); ++word8 get_rand8(void); ++word32 get_safe_rand32(void); ++word8 get_safe_rand8(void); + + int open_rand(int); +-void close_rand(); +-word32 get_o_rand32(); +-word8 get_o_rand8(); ++void close_rand(void); ++word32 get_o_rand32(void); ++word8 get_o_rand8(void); + + #endif +--- a/src/shash.c ++++ b/src/shash.c +@@ -485,7 +485,7 @@ + } + } + +-int hash_list() ++int hash_list(void) + { + hashid i; + char *y; +@@ -715,7 +715,7 @@ + return counter; + } + +-void hash_license() ++void hash_license(void) + { + fprintf(stdout, ("\nCopyright (C) 1999,2001,2002 Nikos Mavroyanopoulos\n" + "This program is free software; you can redistribute it and/or modify \n" +@@ -733,7 +733,7 @@ + "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\n")); + } + +-void hash_version() ++void hash_version(void) + { + fprintf(stderr, ("shash v.%s (%s-%s-%s)\n"), VERSION, T_CPU, + T_VENDOR, T_OS); diff --git a/app-crypt/shash/files/shash-0.2.6-binary-files.patch b/app-crypt/shash/files/shash-0.2.6-binary-files.patch index 1eb0cba17613..9cb5a7dc4c09 100644 --- a/app-crypt/shash/files/shash-0.2.6-binary-files.patch +++ b/app-crypt/shash/files/shash-0.2.6-binary-files.patch @@ -1,5 +1,5 @@ ---- shash-0.2.6/src/shash.c -+++ shash-0.2.6/src/shash.c +--- a/src/shash.c ++++ b/src/shash.c @@ -631,11 +631,11 @@ if (nosalt == FALSE && hmac == 1) { diff --git a/app-crypt/shash/files/shash-0.2.6-format-security.patch b/app-crypt/shash/files/shash-0.2.6-format-security.patch index 4e46639e2807..20f850316ccc 100644 --- a/app-crypt/shash/files/shash-0.2.6-format-security.patch +++ b/app-crypt/shash/files/shash-0.2.6-format-security.patch @@ -1,5 +1,5 @@ ---- shash-0.2.6/src/errors.c -+++ shash-0.2.6/src/errors.c +--- a/src/errors.c ++++ b/src/errors.c @@ -4,7 +4,7 @@ void err_quit(char *errmsg) diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild deleted file mode 100644 index f2730ac61dc3..000000000000 --- a/app-crypt/shash/shash-0.2.6-r3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -DESCRIPTION="Generate or check digests or MACs of files" -HOMEPAGE="http://mcrypt.hellug.gr/shash/" -SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="static" - -DEPEND=">=app-crypt/mhash-0.8.18-r1 - static? ( app-crypt/mhash[static-libs(+)] )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PV}-manpage-fixes.patch - "${FILESDIR}"/${P}-binary-files.patch - "${FILESDIR}"/${P}-format-security.patch -) - -src_configure() { - econf $(use_enable static static-link) -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT - newbashcomp "${FILESDIR}"/shash.bash-completion ${PN} -} diff --git a/app-crypt/shash/shash-0.2.6-r4.ebuild b/app-crypt/shash/shash-0.2.6-r4.ebuild new file mode 100644 index 000000000000..2094f2880276 --- /dev/null +++ b/app-crypt/shash/shash-0.2.6-r4.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 + +DESCRIPTION="Generate or check digests or MACs of files" +HOMEPAGE="http://mcrypt.hellug.gr/shash/" +SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="static" + +DEPEND=" + >=app-crypt/mhash-0.8.18-r1 + static? ( app-crypt/mhash[static-libs(+)] )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PV}-manpage-fixes.patch + "${FILESDIR}"/${P}-binary-files.patch + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-C99-decls.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable static static-link) +} + +src_install() { + default + dodoc doc/sample.shashrc doc/FORMAT + newbashcomp "${FILESDIR}"/shash.bash-completion ${PN} +} -- cgit v1.2.3