Re: [gentoo-musl] [PATCH] app-crypt/shash: in tree version works

[Anthony G. Basile]

On 4/25/16 3:47 PM, Felix Janda wrote:
> ---
> I don't quite understand why I added it in the first place...

neither do i.  its gone.

> ---
>  app-crypt/shash/Manifest                           |  7 ----
>  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-missing-includes.patch | 27 ---------------
>  app-crypt/shash/files/shash.bash-completion        | 40 ----------------------
>  app-crypt/shash/metadata.xml                       | 10 ------
>  app-crypt/shash/shash-0.2.6-r99.ebuild             | 35 -------------------
>  7 files changed, 183 deletions(-)
>  delete mode 100644 app-crypt/shash/Manifest
>  delete mode 100644 app-crypt/shash/files/0.2.6-manpage-fixes.patch
>  delete mode 100644 app-crypt/shash/files/shash-0.2.6-binary-files.patch
>  delete mode 100644 app-crypt/shash/files/shash-0.2.6-missing-includes.patch
>  delete mode 100644 app-crypt/shash/files/shash.bash-completion
>  delete mode 100644 app-crypt/shash/metadata.xml
>  delete mode 100644 app-crypt/shash/shash-0.2.6-r99.ebuild
>
> diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
> deleted file mode 100644
> index c2a7944..0000000
> --- a/app-crypt/shash/Manifest
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -AUX 0.2.6-manpage-fixes.patch 1451 SHA256 12619eaba8cfd99917658139306fb8c0ff087f10ce05bd285aa3c8e66f88e317 SHA512 10dbcfa52a7df57ef68dc58f21e1b2931adf0479697e13f99c56ccfbbd1c79188751d1ce7e2b160261170a678a4130a71a6b531820aa59e4ddbd131d5d9cb551 WHIRLPOOL 11b4d1aaf6feae4dd00d7abfbe704fcb8ba665d0de46de724098fa57b60960060c6df7661c9e3735c9ccd5865ab6c66cad3527395fec4279822e114dc59ab92d
> -AUX shash-0.2.6-binary-files.patch 898 SHA256 e06660afe1afb338bf4f209d39ac33c412ecc6fb22feec684c0a7b5fd80f46a6 SHA512 47f299097b8a9907ccfe2f877c42ab8f76f02546211643573796b378d67dd7941518341f8fd07e646c1aa11a665ddbca6ae113a4d58f6995007d9b5aec171d8b WHIRLPOOL 0bbe198601dd7b1ce55719936d8670975505b9b31baa68f0663d25c9988026587b8bc1dcfb18d188b598298715f57716c334b875ac6ff5075ff3a79dc121e7f9
> -AUX shash-0.2.6-missing-includes.patch 483 SHA256 c00017237b6f6176424f9738ec7d97ecdde8994916aaa62d0138d7901cc1131d SHA512 3adf22d3a886d703a51d614f1106f20bf3f7b068e416317ba5cbd4def91f60b31a6737c11d7f44a44c48e1a713df4b2074b3ad68653be5dd117486148fbab81e WHIRLPOOL 1932da3b2905b6405d5bfa5dfea878a584f01b2e9b41859b8adf559987e9a822f0075822744f7c23b9f57f7228cc8f3931e4e02c3c17637b436c8ec2ea41b239
> -AUX shash.bash-completion 880 SHA256 7e5cf8850dd2cee423fc0295d1d113ca6c96a1acf5f7d55eb5c340efa2d01971 SHA512 2c7bacf8f12fc6cf9570eb5bd4b95ad05b5632a71a669516b364712308c5b88f1cc917c435f82eade3193885530c08c659ed4d947136f0952da157cb98b30c92 WHIRLPOOL b15411fae32b7e9d715ad7cbb670691167546fe32190a0a5b1f5e7c65bff76a05930424f263e42a00b606f132533fdcc5f78483c4b3f3f30b084f826cd18e7d6
> -DIST shash-0.2.6.tar.gz 105641 SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b WHIRLPOOL 8b809f5fddc98def54907fee8af424937c747f341dd0eaa6fd0c1057858c4dce7d117dfbc729cdd951c53e68a363d3339e9db4e2de1677620bbb9a94a810e8a5
> -EBUILD shash-0.2.6-r99.ebuild 848 SHA256 a3016b9fb697fb66e8b2544d5d1137d76b5371a3401606e9e5858cea21bba9a7 SHA512 2d6cd4546b19a92be6a8827c27b5779bdf95354e79aae7f656d6e9bfce95b09e21557a459c388399f6f54db46a6a0b698f1f610dc1b369ce721e596e730da5ff WHIRLPOOL 5615667780b6a88deeaf7fa0d7cdab2adbc6e77637da47441860f6219b2124527b9a7d616983f511b436844283ee4248ebc3b7087d617c987c908abc564f62a7
> -MISC metadata.xml 437 SHA256 7c03f43673bb700e0bc1063720dc80df195304f74a397d8175192ec6e705bb88 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d WHIRLPOOL e086a413a8a5bc1d1fba9a2a4717d83af4137a40f17ff969a5536a26fbd342c8a58b3418933fc42770ffae3c60812ab2bd044951de17a52566441a9210b26282
> diff --git a/app-crypt/shash/files/0.2.6-manpage-fixes.patch b/app-crypt/shash/files/0.2.6-manpage-fixes.patch
> deleted file mode 100644
> index 0376e15..0000000
> --- a/app-crypt/shash/files/0.2.6-manpage-fixes.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -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
> deleted file mode 100644
> index 1eb0cba..0000000
> --- a/app-crypt/shash/files/shash-0.2.6-binary-files.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> ---- 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-missing-includes.patch b/app-crypt/shash/files/shash-0.2.6-missing-includes.patch
> deleted file mode 100644
> index 1d57934..0000000
> --- a/app-crypt/shash/files/shash-0.2.6-missing-includes.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> ---- a/shash-0.2.6/src/errors.c
> -+++ b/shash-0.2.6/src/errors.c
> -@@ -1,4 +1,5 @@
> - #include <defines.h>
> -+#include <stdio.h>
> -
> - extern int quiet;
> -
> ---- a/shash-0.2.6/src/random.c
> -+++ b/shash-0.2.6/src/random.c
> -@@ -18,6 +18,8 @@
> - #define DEFINES_H
> - #include <defines.h>
> - #endif
> -+#include <stdlib.h>
> -+#include <stdio.h>
> -
> - #ifdef HAVE_DEV_RANDOM
> -
> ---- a/shash-0.2.6/src/extra.c
> -+++ b/shash-0.2.6/src/extra.c
> -@@ -1,4 +1,5 @@
> - #include <defines.h>
> -+#include <strings.h>
> -
> - #ifdef HAVE_STAT
> -
> diff --git a/app-crypt/shash/files/shash.bash-completion b/app-crypt/shash/files/shash.bash-completion
> deleted file mode 100644
> index d3b867c..0000000
> --- a/app-crypt/shash/files/shash.bash-completion
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -# Copyright 1999-2006 Gentoo Foundation
> -# Distributed under the terms of the GNU General Public License v2
> -# $Id$
> -#
> -# shash(1) completion.
> -
> -have shash &&
> -_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
> deleted file mode 100644
> index 3b9877f..0000000
> --- a/app-crypt/shash/metadata.xml
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
> -<pkgmetadata>
> -	<maintainer type="person">
> -		<email>swegener@g.o</email>
> -		<name>Sven Wegener</name>
> -		<description>primary maintainer</description>
> -	</maintainer>
> -	<longdescription>shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files.</longdescription>
> -</pkgmetadata>
> diff --git a/app-crypt/shash/shash-0.2.6-r99.ebuild b/app-crypt/shash/shash-0.2.6-r99.ebuild
> deleted file mode 100644
> index a2f9317..0000000
> --- a/app-crypt/shash/shash-0.2.6-r99.ebuild
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -# Copyright 1999-2016 Gentoo Foundation
> -# Distributed under the terms of the GNU General Public License v2
> -# $Id$
> -
> -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="amd64 arm ~mips ppc x86"
> -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
> -	epatch "${FILESDIR}"/${P}-missing-includes.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}
> -}
>


-- 
Anthony G. Basile, Ph. D.
Chair of Information Technology
D'Youville College
Buffalo, NY 14201
[phone]