From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-crypt/shash/Manifest | 8 +++++ app-crypt/shash/files/0.2.6-manpage-fixes.patch | 30 +++++++++++++++++ .../shash/files/shash-0.2.6-binary-files.patch | 34 +++++++++++++++++++ .../shash/files/shash-0.2.6-format-security.patch | 28 ++++++++++++++++ app-crypt/shash/files/shash.bash-completion | 38 ++++++++++++++++++++++ app-crypt/shash/metadata.xml | 9 +++++ app-crypt/shash/shash-0.2.6-r2.ebuild | 33 +++++++++++++++++++ app-crypt/shash/shash-0.2.6-r3.ebuild | 34 +++++++++++++++++++ 8 files changed, 214 insertions(+) create mode 100644 app-crypt/shash/Manifest create mode 100644 app-crypt/shash/files/0.2.6-manpage-fixes.patch create mode 100644 app-crypt/shash/files/shash-0.2.6-binary-files.patch create mode 100644 app-crypt/shash/files/shash-0.2.6-format-security.patch create mode 100644 app-crypt/shash/files/shash.bash-completion create mode 100644 app-crypt/shash/metadata.xml create mode 100644 app-crypt/shash/shash-0.2.6-r2.ebuild create mode 100644 app-crypt/shash/shash-0.2.6-r3.ebuild (limited to 'app-crypt/shash') diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest new file mode 100644 index 000000000000..549d4ad99f88 --- /dev/null +++ b/app-crypt/shash/Manifest @@ -0,0 +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 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-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e +EBUILD shash-0.2.6-r3.ebuild 923 BLAKE2B 5b41073761b2f723dad67298cf38adffc6f26dc421bf754b7dc7e389f11413aa2237bd513fc5ad92e830d990776ce98c09be92be9ad85900bc76da4114040970 SHA512 a75a9b80eb674812cf64cfc4ec2d69bf3aac8b6393b3e91132e10372940128cdf32777c131550f448ab3123a7fc2c32d8dad7a5f9411094190dc3444b029be66 +MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6 diff --git a/app-crypt/shash/files/0.2.6-manpage-fixes.patch b/app-crypt/shash/files/0.2.6-manpage-fixes.patch new file mode 100644 index 000000000000..0376e15c3572 --- /dev/null +++ b/app-crypt/shash/files/0.2.6-manpage-fixes.patch @@ -0,0 +1,30 @@ +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 +@@ -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 + be verified with the key. This way you can securely check (i.e. you are sure +-that nobody can modify the mac, without beeing detected) ++that nobody can modify the mac, without being detected) + if files in a filesystem were altered. + + If the list of files and digests, that shash produces, is stored as +@@ -72,7 +72,7 @@ Suppress some not critical warnings. + .TP + .B \-b + Use binary mode. In unix environment, only difference between this and +-the normal mode is an asterix preceding the filename in the output. ++the normal mode is an asterisk preceding the filename in the output. + .TP + .B \-c + Check the checksum of all files listed in +@@ -94,7 +94,7 @@ Enter the keyword via the command line. + keyword instead of prompting for it. Keep in mind that someone + may see the command you are executing and so your key. + .TP +-.B \-c --config FILE ++.B \-i --config FILE + Use the specified configuration file. The default is .shashrc + in your home directory. The format of the configuration + file is the same as the parameters. An example file is: 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 new file mode 100644 index 000000000000..1eb0cba17613 --- /dev/null +++ b/app-crypt/shash/files/shash-0.2.6-binary-files.patch @@ -0,0 +1,34 @@ +--- shash-0.2.6/src/shash.c ++++ shash-0.2.6/src/shash.c +@@ -631,11 +631,11 @@ + + if (nosalt == FALSE && hmac == 1) { + if (sscanf +- (linebuf, "%s %s %s\n", hexbuffer, buffer, +- buffer2) < 2) { ++ (linebuf, "%s %s *%s\n", hexbuffer, buffer, ++ buffer2) != 3) { + if (sscanf +- (linebuf, "%s %s *%s\n", hexbuffer, +- buffer, buffer2) < 2) ++ (linebuf, "%s %s %s\n", hexbuffer, ++ buffer, buffer2) != 3) + continue; + } + +@@ -648,11 +648,11 @@ + key = pass2key(algorithm, keymode_buffer, &keylen, password, plen); + + } else { +- if (sscanf(linebuf, "%s %s\n", buffer, buffer2) == +- 0) { ++ if (sscanf(linebuf, "%s *%s\n", buffer, buffer2) != ++ 2) { + if (sscanf +- (linebuf, "%s *%s\n", buffer, +- buffer2) == 0) ++ (linebuf, "%s %s\n", buffer, ++ buffer2) != 2) + continue; + } + 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 new file mode 100644 index 000000000000..4e46639e2807 --- /dev/null +++ b/app-crypt/shash/files/shash-0.2.6-format-security.patch @@ -0,0 +1,28 @@ +--- shash-0.2.6/src/errors.c ++++ shash-0.2.6/src/errors.c +@@ -4,7 +4,7 @@ + + void err_quit(char *errmsg) + { +- fprintf(stderr, errmsg); ++ fputs(errmsg, stderr); + exit(-1); + } + +@@ -12,7 +12,7 @@ + { + + if (quiet < 1) { +- fprintf(stderr, errmsg); ++ fputs(errmsg, stderr); + } + + } +@@ -20,6 +20,6 @@ + void err_crit(char *errmsg) + { + if (quiet <= 2) { +- fprintf(stderr, errmsg); ++ fputs(errmsg, stderr); + } + } diff --git a/app-crypt/shash/files/shash.bash-completion b/app-crypt/shash/files/shash.bash-completion new file mode 100644 index 000000000000..15a677dce5ba --- /dev/null +++ b/app-crypt/shash/files/shash.bash-completion @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# shash(1) completion. + +_shash() { + local cur prev + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + case "${prev}" in + -c|--config) + _filedir + return 0 ;; + -o|--keymode) + COMPREPLY=( $( compgen -W "$( shash --listkeygen | tail -n +2 )" \ + -- ${cur} ) ) + return ;; + -a|--algorithm) + COMPREPLY=( $( compgen -W "$( shash --list )" \ + -- ${cur} ) ) + return ;; + *) + ;; + esac + + COMPREPLY=( $( compgen -W '-V -q -m -d -c -b -t -o -i -a -l -k -h -v \ + -L \ + --verbose --quiet --nosalt --time --hmac --doublecheck \ + --check --binary --text --keymode --config --algorithm \ + --list --key --listkeygen --help --version --license' \ + -- ${cur} ) ) + _filedir + return 0 +} +complete -F _shash ${filenames} shash diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml new file mode 100644 index 000000000000..67634f6f0db4 --- /dev/null +++ b/app-crypt/shash/metadata.xml @@ -0,0 +1,9 @@ + + + + + swegener@gentoo.org + Sven Wegener + + shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files. + diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild new file mode 100644 index 000000000000..2c8f45a03e6e --- /dev/null +++ b/app-crypt/shash/shash-0.2.6-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit bash-completion-r1 eutils + +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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="static" + +DEPEND=">=app-crypt/mhash-0.8.18-r1" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PV}-manpage-fixes.patch + epatch "${FILESDIR}"/${P}-binary-files.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-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild new file mode 100644 index 000000000000..44336b6724d6 --- /dev/null +++ b/app-crypt/shash/shash-0.2.6-r3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="static" + +DEPEND=">=app-crypt/mhash-0.8.18-r1" +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} +} -- cgit v1.2.3