rhash: updated to 1.4.2 RHash v1.4.2 significantly improve file reading performance on Linux/Unix print 'Nothing to verify' when verifying a hash file without a message digest count unparsed lines of a hash file as errors print line numbers of unparsed lines of a hash file Bugfix: fix verification of some hash files containing spaces in file pathsdiff -r1.15 -r1.16 pkgsrc/misc/rhash/Makefile
(adam)
@@ -1,31 +1,30 @@ | @@ -1,31 +1,30 @@ | |||
1 | # $NetBSD: Makefile,v 1.15 2021/01/07 22:00:29 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.16 2021/07/15 09:39:17 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= rhash-1.4.1 | 3 | DISTNAME= rhash-1.4.2 | |
4 | CATEGORIES= misc | 4 | CATEGORIES= misc | |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=rhash/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=rhash/} | |
6 | GITHUB_PROJECT= RHash | 6 | GITHUB_PROJECT= RHash | |
7 | GITHUB_TAG= v${PKGVERSION_NOREV} | 7 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://github.com/rhash/RHash | 10 | HOMEPAGE= https://github.com/rhash/RHash | |
11 | COMMENT= Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums | 11 | COMMENT= Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums | |
12 | LICENSE= mit | 12 | LICENSE= mit | |
13 | 13 | |||
14 | WRKSRC= ${WRKDIR}/${DISTNAME:S/rh/RH/} | 14 | WRKSRC= ${WRKDIR}/${DISTNAME:S/rh/RH/} | |
15 | HAS_CONFIGURE= yes | 15 | HAS_CONFIGURE= yes | |
16 | USE_GCC_RUNTIME= yes | 16 | USE_GCC_RUNTIME= yes | |
17 | CONFIGURE_ARGS+= --disable-symlinks | 17 | CONFIGURE_ARGS+= --disable-symlinks | |
18 | CONFIGURE_ARGS+= --disable-openssl-runtime | |||
19 | CONFIGURE_ARGS+= --enable-lib-shared | 18 | CONFIGURE_ARGS+= --enable-lib-shared | |
20 | CONFIGURE_ARGS+= --enable-lib-static | 19 | CONFIGURE_ARGS+= --enable-lib-static | |
21 | CONFIGURE_ARGS+= --enable-openssl | 20 | CONFIGURE_ARGS+= --enable-openssl | |
22 | CONFIGURE_ARGS+= --extra-cflags=-I${PREFIX}/include\ ${CFLAGS:Q} | 21 | CONFIGURE_ARGS+= --extra-cflags=-I${PREFIX}/include\ ${CFLAGS:Q} | |
23 | CONFIGURE_ARGS+= --extra-ldflags=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib\ ${LDFLAGS:Q} | 22 | CONFIGURE_ARGS+= --extra-ldflags=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib\ ${LDFLAGS:Q} | |
24 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} | 23 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} | |
25 | CONFIGURE_ARGS+= --prefix=${PREFIX} | 24 | CONFIGURE_ARGS+= --prefix=${PREFIX} | |
26 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 25 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
27 | INSTALL_TARGET= install install-pkg-config | 26 | INSTALL_TARGET= install install-pkg-config | |
28 | INSTALLATION_DIRS= share/examples/rhash | 27 | INSTALLATION_DIRS= share/examples/rhash | |
29 | TEST_TARGET= test | 28 | TEST_TARGET= test | |
30 | 29 | |||
31 | CONF_FILES+= ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc | 30 | CONF_FILES+= ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.16 2021/01/07 22:00:29 adam Exp $ | 1 | $NetBSD: distinfo,v 1.17 2021/07/15 09:39:17 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (rhash-1.4.1.tar.gz) = e1f559d060fd07bfca854c8ae3384798bd2ef266 | 3 | SHA1 (rhash-1.4.2.tar.gz) = fdb0b0c16f3ba3eba734b3adf9f2fc4c427ff987 | |
4 | RMD160 (rhash-1.4.1.tar.gz) = fa43a665be6f994e536ca6e69c5239cbc4febaa0 | 4 | RMD160 (rhash-1.4.2.tar.gz) = 0427c702fa88f53c9c4a16255f8ae3c20c225b47 | |
5 | SHA512 (rhash-1.4.1.tar.gz) = 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638 | 5 | SHA512 (rhash-1.4.2.tar.gz) = 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25 | |
6 | Size (rhash-1.4.1.tar.gz) = 413274 bytes | 6 | Size (rhash-1.4.2.tar.gz) = 416853 bytes | |
7 | SHA1 (patch-configure) = ed8e4fc7106cd59f0e25f807ad588a219a798e92 | 7 | SHA1 (patch-configure) = 6f0c4abf3f487f046feea5aca5866481eda4546a | |
8 | SHA1 (patch-librhash_util.h) = 78d34ff14a7d03069915de0ade14f3d0faff2d69 | 8 | SHA1 (patch-librhash_util.h) = 78d34ff14a7d03069915de0ade14f3d0faff2d69 |
@@ -1,21 +1,32 @@ | @@ -1,21 +1,32 @@ | |||
1 | $NetBSD: patch-configure,v 1.1 2020/08/24 12:58:52 schmonz Exp $ | 1 | $NetBSD: patch-configure,v 1.2 2021/07/15 09:39:17 adam Exp $ | |
2 | ||||
3 | Skip compiler detection magic. | |||
2 | 4 | |||
3 | Avoid choosing aligned_alloc() when it's not present, such as CentOS 6 | 5 | Avoid choosing aligned_alloc() when it's not present, such as CentOS 6 | |
4 | with lang/gcc7. | 6 | with lang/gcc7. | |
5 | 7 | |||
6 | --- configure.orig 2020-07-14 19:35:11.000000000 +0000 | 8 | --- configure.orig 2021-07-14 20:55:34.000000000 +0000 | |
7 | +++ configure | 9 | +++ configure | |
8 | @@ -655,6 +655,16 @@ elif test "$OPT_OPENSSL" = "auto" || tes | 10 | @@ -563,8 +563,6 @@ else | |
11 | fi | |||
12 | done | |||
13 | fi # icc | |||
14 | -test -z "$cc_vendor" && die "compiler not found" | |||
15 | -test "$cc_fail" = "yes" && die "unsupported compiler version" | |||
16 | ||||
17 | log_start "compiler working with default options" | |||
18 | if ! cc_check_cflag; then | |||
19 | @@ -660,6 +658,16 @@ elif test "$OPT_OPENSSL" = "auto" || tes | |||
9 | finish_check "$ALLOW_RUNTIME_LINKING" | 20 | finish_check "$ALLOW_RUNTIME_LINKING" | |
10 | fi | 21 | fi | |
11 | 22 | |||
12 | +start_check "libc provides aligned_alloc" | 23 | +start_check "libc provides aligned_alloc" | |
13 | +HAS_STDC_ALIGNED_ALLOC=no | 24 | +HAS_STDC_ALIGNED_ALLOC=no | |
14 | +if cc_check_statement "stdlib.h" 'aligned_alloc(256, 1024);' "-Werror -Wno-unused-result"; then | 25 | +if cc_check_statement "stdlib.h" 'aligned_alloc(256, 1024);' "-Werror -Wno-unused-result"; then | |
15 | + HAS_STDC_ALIGNED_ALLOC=yes | 26 | + HAS_STDC_ALIGNED_ALLOC=yes | |
16 | +fi | 27 | +fi | |
17 | +if test "$HAS_STDC_ALIGNED_ALLOC" = "no"; then | 28 | +if test "$HAS_STDC_ALIGNED_ALLOC" = "no"; then | |
18 | + BUILD_EXTRA_CFLAGS=$(join_params $BUILD_EXTRA_CFLAGS -DNOPE_DOES_NOT_HAS_STDC_ALIGNED_ALLOC) | 29 | + BUILD_EXTRA_CFLAGS=$(join_params $BUILD_EXTRA_CFLAGS -DNOPE_DOES_NOT_HAS_STDC_ALIGNED_ALLOC) | |
19 | +fi | 30 | +fi | |
20 | +finish_check "$HAS_STDC_ALIGNED_ALLOC" | 31 | +finish_check "$HAS_STDC_ALIGNED_ALLOC" | |
21 | + | 32 | + |