Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sha3sum for openSUSE:Factory checked in at 2024-04-14 11:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sha3sum (Old) and /work/SRC/openSUSE:Factory/.sha3sum.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sha3sum" Sun Apr 14 11:54:56 2024 rev:6 rq:1167493 version:1.2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sha3sum/sha3sum.changes 2022-04-02 18:21:16.521780206 +0200 +++ /work/SRC/openSUSE:Factory/.sha3sum.new.26366/sha3sum.changes 2024-04-14 12:24:45.649870411 +0200 @@ -1,0 +2,7 @@ +Fri Apr 12 10:50:49 UTC 2024 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 1.2.3.1 + * Build system updates only +- Add 0001-build-repair-wrong-order-of-link-arguments.patch + +------------------------------------------------------------------- Old: ---- 1.2.2.tar.gz New: ---- 0001-build-repair-wrong-order-of-link-arguments.patch 1.2.3.1.tar.gz BETA DEBUG BEGIN: New: * Build system updates only - Add 0001-build-repair-wrong-order-of-link-arguments.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sha3sum.spec ++++++ --- /var/tmp/diff_new_pack.xsAPFU/_old 2024-04-14 12:24:46.309894446 +0200 +++ /var/tmp/diff_new_pack.xsAPFU/_new 2024-04-14 12:24:46.309894446 +0200 @@ -1,7 +1,7 @@ # # spec file for package sha3sum # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: sha3sum -Version: 1.2.2 +Version: 1.2.3.1 Release: 0 Summary: SHA-3 and Keccak checksum utility License: ISC Group: Productivity/Security -URL: https://github.com/maandree/sha3sum -Source: https://github.com/maandree/sha3sum/archive/%version.tar.gz +URL: https://codeberg.org/maandree/sha3sum +Source: https://codeberg.org/maandree/sha3sum/archive/%version.tar.gz +Patch1: 0001-build-repair-wrong-order-of-link-arguments.patch +BuildRequires: c_compiler BuildRequires: libkeccak-devel >= 1.2 Conflicts: perl-Digest-SHA3 @@ -34,13 +36,13 @@ A subset of Keccak was specified by NIST as SHA-3 (Secure Hash Algorithm 3). %prep -%setup -q +%autosetup -p1 -n %name %build -%make_build CFLAGS="%{optflags}" +%make_build -r CC="%__cc" CFLAGS="%optflags" %install -%make_install PREFIX="%{_prefix}" +%make_install PREFIX="%_prefix" # packaged via macro rm -rvf %buildroot/%_datadir/licenses/%name @@ -50,6 +52,6 @@ %files %license LICENSE %doc README -%{_bindir}/* -%{_mandir}/man1/*.1%{?ext_man} +%_bindir/* +%_mandir/man1/*.1* ++++++ 0001-build-repair-wrong-order-of-link-arguments.patch ++++++ >From 839aed0b45b47462b2e319b016153bdff91b125f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jeng...@inai.de> Date: Fri, 12 Apr 2024 13:35:43 +0200 Subject: [PATCH] build: repair wrong order of link arguments References: https://codeberg.org/jengelh/sha3sum GNU Make gives *pattern rules* a higher precedence over *suffix rules*. It does not track whether rule commands came from built-in defaults or a file. As such, when the sha3sum program is to be built, the commands from ``%: %.o`` rather than ``.o:`` are executed. The implicit rule chosen for linking is therefore (as ``make -p`` says): LINK.o = $(CC) $(LDFLAGS) $(TARGET_ARCH) %: %.o # recipe to execute (built-in): $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ Now, it has long been the case that LDFLAGS is *not* meant for -l options, under *at least* GNU systems, if not others as well. LDLIBS is generally the right place to put it. Indeed, LDLIBS is also offered in the default rules used by BSD make and Solaris make. Fixes: #2, #3. --- Makefile | 4 ++-- config.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bcd7f66..b8ea851 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ $(BIN:=.bo): $(HDR) $(BIN): common.o .o: - $(CC) -o $@ $@.o common.o $(LDFLAGS) + $(CC) -o $@ $@.o common.o $(LDFLAGS) $(LDLIBS) .c.o: $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) @@ -65,7 +65,7 @@ commands.h: Makefile | sed 's/_(\(.*\))/_("\1", main_\1)/' | sed 's/\(main_.*\)-/\1_/' > $@ sha3sum-mcb: sha3sum-mcb.o common.o $(BIN:=.bo) - $(CC) -o $@ sha3sum-mcb.o common.o $(BIN:=.bo) $(LDFLAGS) + $(CC) -o $@ sha3sum-mcb.o common.o $(BIN:=.bo) $(LDFLAGS) $(LDLIBS) check: $(BIN) ./test diff --git a/config.mk b/config.mk index 62cbae7..da9de58 100644 --- a/config.mk +++ b/config.mk @@ -6,4 +6,4 @@ CC = c99 CPPFLAGS = CFLAGS = -LDFLAGS = -lkeccak +LDLIBS = -lkeccak -- 2.44.0 ++++++ 1.2.2.tar.gz -> 1.2.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/DEPENDENCIES new/sha3sum/DEPENDENCIES --- old/sha3sum-1.2.2/DEPENDENCIES 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/DEPENDENCIES 2023-12-07 21:58:14.000000000 +0100 @@ -9,11 +9,11 @@ coreutils gcc libc - libkeccak>=1.2 + libkeccak>=1.4 make sed DEPENDENCY SOURCES: - libkeccak https://github.com/maandree/libkeccak + libkeccak https://codeberg.org/maandree/libkeccak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/LICENSE new/sha3sum/LICENSE --- old/sha3sum-1.2.2/LICENSE 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/LICENSE 2023-12-07 21:58:14.000000000 +0100 @@ -1,6 +1,6 @@ ISC License -© 2013, 2014, 2015, 2017, 2020 Mattias Andrée <maand...@kth.se> +© 2013, 2014, 2015, 2017, 2020, 2022 Mattias Andrée <maand...@kth.se> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/Makefile new/sha3sum/Makefile --- old/sha3sum-1.2.2/Makefile 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/Makefile 2023-12-07 21:58:14.000000000 +0100 @@ -1,66 +1,63 @@ -.NONPOSIX: +.POSIX: CONFIGFILE = config.mk include $(CONFIGFILE) LIBEXECDIR = $(PREFIX)/$(LIBEXEC) -BIN =\ + +BIN_GENERIC =\ keccaksum\ + sha3sum\ + +BIN_SPECIFIC =\ keccak-224sum\ keccak-256sum\ keccak-384sum\ keccak-512sum\ - sha3sum\ sha3-224sum\ sha3-256sum\ sha3-384sum\ sha3-512sum\ + rawshake128sum\ rawshake256sum\ rawshake512sum\ + shake128sum\ shake256sum\ shake512sum +BIN = $(BIN_GENERIC) $(BIN_SPECIFIC) MAN1 = $(BIN:=.1) HDR = arg.h common.h -keccaksum = Keccak[] -keccak-224sum = Keccak-224 -keccak-256sum = Keccak-256 -keccak-384sum = Keccak-384 -keccak-512sum = Keccak-512 -sha3sum = SHA3 -sha3-224sum = SHA3-224 -sha3-256sum = SHA3-256 -sha3-384sum = SHA3-384 -sha3-512sum = SHA3-512 -rawshake256sum = RawSHAKE256 -rawshake512sum = RawSHAKE512 -shake256sum = SHAKE256 -shake512sum = SHAKE512 - all: $(BIN) $(MAN1) mcb: sha3sum-mcb $(MAN1) -sha3sum-mcb.c: commands.h +sha3sum-mcb.o: commands.h +$(BIN:=.o): $(HDR) +$(BIN:=.bo): $(HDR) +$(BIN): common.o -%: %.o common.o - $(CC) -o $@ $< common.o $(LDFLAGS) +.o: + $(CC) -o $@ $@.o common.o $(LDFLAGS) -%.o: %.c $(HDR) +.c.o: $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) -%.bo: %.c $(HDR) +.c.bo: $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) \ -Dmain="main_$$(printf '%s\n' $* | tr - _)(int, char *[]); int main_$$(printf '%s\n' $* | tr - _)" -%.1: xsum.man - u=$$(printf '%s\n' $* | tr a-z A-Z); \ - if test $* = sha3sum; then \ - sed -e 's/xsum/$*/g' -e 's/XSUM/'"$$u"'/g' -e 's/Xsum/$($*)/g' -e 's/^\\# ONLY SHA3: //' < xsum.man > $@; \ +$(MAN1): xsum.man algorithm-map + set -e; \ + f="$$(printf '%s\n' "$@" | sed 's/\.1$$//')"; \ + u="$$(printf '%s\n' "$$f" | tr a-z A-Z)"; \ + a="$$(sed -n 's/^'"$$f"'[[:space:]]*=[[:space:]]*//p' < algorithm-map | sed 's/[[:space:]]*$$//')"; \ + if test "$$f" = sha3sum; then \ + sed -e "s/xsum/$$f/g" -e "s/XSUM/$$u/g" -e "s/Xsum/$$a/g" -e 's/^\\# ONLY SHA3: //' < xsum.man > $@; \ else \ - sed -e 's/xsum/$*/g' -e 's/XSUM/'"$$u"'/g' -e 's/Xsum/$($*)/g' -e '/^\\# ONLY SHA3: /d' < xsum.man > $@; \ + sed -e "s/xsum/$$f/g" -e "s/XSUM/$$u/g" -e "s/Xsum/$$a/g" -e '/^\\# ONLY SHA3: /d' < xsum.man > $@; \ fi commands.h: Makefile @@ -70,18 +67,6 @@ sha3sum-mcb: sha3sum-mcb.o common.o $(BIN:=.bo) $(CC) -o $@ sha3sum-mcb.o common.o $(BIN:=.bo) $(LDFLAGS) -keccak-%sum.c: - printf '%s\n' '#include "common.h"' 'KECCAK_MAIN($*)' > $@ - -sha3-%sum.c: - printf '%s\n' '#include "common.h"' 'SHA3_MAIN($*)' > $@ - -rawshake%sum.c: - printf '%s\n' '#include "common.h"' 'RAWSHAKE_MAIN($*)' > $@ - -shake%sum.c: - printf '%s\n' '#include "common.h"' 'SHAKE_MAIN($*)' > $@ - check: $(BIN) ./test @@ -99,7 +84,7 @@ mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man1" mkdir -p -- "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum" set -e && cd "$(DESTDIR)$(PREFIX)/bin/" && \ - for f in $(BIN); do ln -sf -- ../$(LIBEXEC)/sha3sum "$$f"; done + for f in $(BIN); do ln -sf -- ../$(LIBEXEC)/sha3sum "$$f" || exit 1; done cp -- sha3sum-mcb "$(DESTDIR)$(LIBEXECDIR)/sha3sum" cp -- $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1/" cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/sha3sum/" @@ -111,8 +96,29 @@ -rm -f -- "$(DESTDIR)$(LIBEXECDIR)/sha3sum" clean: - -rm -rf -- $(MAN1) $(BIN) sha3sum-mcb *.o *.bo *.su commands.h keccak-*sum.c sha3-*sum.c rawshake*sum.c shake*sum.c .testdir + -rm -rf -- $(MAN1) $(BIN) sha3sum-mcb *.o *.bo *.su commands.h .testdir + -rm -rf -- keccak-*sum.c sha3-*sum.c rawshake*sum.c shake*sum.c + +$(BIN_SPECIFIC:=.c): + +@set -e; \ + f="$$(\ + set -e; \ + sed -n 's/^\([a-z][a-z0-9-]*\)%\([^:]*\):.*$$/\1 \2/p' < unportable.mk | while read start end; do \ + end="$$(printf '%s\n' "$$end" | sed 's/\./\\\./g')"; \ + x="$$(printf '%s\n' '$@' | sed -n 's/^'"$$start"'\(.*\)'"$$end"'$$/\1/p')"; \ + if test -n "$$x"; then \ + printf '%s\n' "$$x"; \ + break; \ + fi; \ + done; \ + )"; \ + if test -z "$$f"; then \ + printf 'No rule to make target %s\n' "$@" >&2; \ + exit 1; \ + fi; \ + sed "/^[a-z]/s/%/$$f/g" < unportable.mk | sed 's/\$$\*/'"$$f/g" | $(MAKE) -f - "$@" .SUFFIXES: +.SUFFIXES: .c .o .bo -.PHONY: all check install uninstall clean +.PHONY: all mcb check install install-mcb uninstall clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/README new/sha3sum/README --- old/sha3sum-1.2.2/README 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/README 2023-12-07 21:58:14.000000000 +0100 @@ -11,8 +11,10 @@ sha3-256sum [option ...] [file ...] sha3-384sum [option ...] [file ...] sha3-512sum [option ...] [file ...] + shake128sum [option ...] [file ...] shake256sum [option ...] [file ...] shake512sum [option ...] [file ...] + rawshake128sum [option ...] [file ...] rawshake256sum [option ...] [file ...] rawshake512sum [option ...] [file ...] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/algorithm-map new/sha3sum/algorithm-map --- old/sha3sum-1.2.2/algorithm-map 1970-01-01 01:00:00.000000000 +0100 +++ new/sha3sum/algorithm-map 2023-12-07 21:58:14.000000000 +0100 @@ -0,0 +1,16 @@ +keccaksum = Keccak[] +keccak-224sum = Keccak-224 +keccak-256sum = Keccak-256 +keccak-384sum = Keccak-384 +keccak-512sum = Keccak-512 +sha3sum = SHA3 +sha3-224sum = SHA3-224 +sha3-256sum = SHA3-256 +sha3-384sum = SHA3-384 +sha3-512sum = SHA3-512 +rawshake128sum = RawSHAKE128 +rawshake256sum = RawSHAKE256 +rawshake512sum = RawSHAKE512 +shake128sum = SHAKE128 +shake256sum = SHAKE256 +shake512sum = SHAKE512 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/common.c new/sha3sum/common.c --- old/sha3sum-1.2.2/common.c 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/common.c 2023-12-07 21:58:14.000000000 +0100 @@ -91,17 +91,19 @@ switch (libkeccak_degeneralise_spec(gspec, spec)) { case 0: break; - TEST (STATE_NONPOSITIVE, "the state size must be positive"); - TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); - TEST (STATE_MOD_25, "the state size must be a multiple of 25"); - TEST (WORD_NONPOSITIVE, "the word size must be positive"); - TEST (WORD_TOO_LARGE, "the word size is too large, may not exceed 64"); - TEST (STATE_WORD_INCOHERENCY, "the state size must be exactly 25 times the word size"); - TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); - TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); - TEST (BITRATE_NONPOSITIVE, "the rate must be positive"); - TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); - TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); + TEST (STATE_NONPOSITIVE, "the state size must be positive"); + TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); + TEST (STATE_MOD_25, "the state size must be a multiple of 25"); + TEST (WORD_NONPOSITIVE, "the word size must be positive"); + TEST (WORD_TOO_LARGE, "the word size is too large, may not exceed 64"); + TEST (STATE_WORD_INCOHERENCY, "the state size must be exactly 25 times the word size"); + TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); + TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); + TEST (BITRATE_NONPOSITIVE, "the rate must be positive"); + TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); + TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); + TEST (STATE_BITRATE_CAPACITY_INCONSISTENCY, "the sum of the rate and capacity must equal" + " the state size (25 times the word size)"); default: user_error("unknown error in algorithm parameters"); } @@ -320,7 +322,7 @@ if (ptr + blksize > size) buf = erealloc(buf, size <<= 1); - got = read(fd, buf + ptr, blksize); + got = read(fd, &buf[ptr], blksize); if (got < 0) eperror(); if (!got) @@ -397,7 +399,6 @@ user_error("file is malformated"); free(buf); - close(fd); return ret; (void) style; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/config.mk new/sha3sum/config.mk --- old/sha3sum-1.2.2/config.mk 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/config.mk 2023-12-07 21:58:14.000000000 +0100 @@ -1,16 +1,9 @@ -PREFIX = /usr/local +PREFIX = /usr MANPREFIX = $(PREFIX)/share/man LIBEXEC = libexec -WARN = -pedantic -Wdouble-promotion -Wformat=2 -Winit-self -Wmissing-include-dirs \ - -Wtrampolines -Wfloat-equal -Wshadow -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs -Winline -Wno-variadic-macros -Wswitch-default \ - -Wpadded -Wsync-nand -Wunsafe-loop-optimizations -Wcast-align -Wstrict-overflow \ - -Wdeclaration-after-statement -Wundef -Wbad-function-cast -Wcast-qual -Wlogical-op \ - -Wstrict-prototypes -Wold-style-definition -Wpacked -Wvector-operation-performance \ - -Wunsuffixed-float-constants -Wsuggest-attribute=const -Wsuggest-attribute=noreturn \ - -Wsuggest-attribute=pure -Wsuggest-attribute=format -Wnormalized=nfkc +CC = c99 -CFLAGS = -std=c99 -Wall -Wextra $(WARN) -O3 CPPFLAGS = -LDFLAGS = -s -lkeccak +CFLAGS = +LDFLAGS = -lkeccak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/test new/sha3sum/test --- old/sha3sum-1.2.2/test 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/test 2023-12-07 21:58:14.000000000 +0100 @@ -36,11 +36,13 @@ test "$(printf '' | ./sha3-224sum -b)" = "$(printf '\153\116\003\102\066\147\333\267\073\156\025\105\117\016\261\253\324\131\177\232\033\007\216\077\133\132\153\307')" +test "$(printf '' | ./rawshake128sum -N 128)" = 'fa019a3b17630df6014853b5470773f1 -' test "$(printf '' | ./rawshake256sum -N 128)" = '3a1108d4a90a31b85a10bdce77f4bfbd -' test "$(printf '' | ./rawshake256sum -N 8)" = '3a -' test "$(printf '' | ./rawshake512sum -N 128)" = '0ae7dac687c3525d5c2a6c4119ea3968 -' +test "$(printf '' | ./shake128sum -N 128)" = '7f9c2ba4e88f827d616045507605853e -' test "$(printf '' | ./shake256sum -N 128)" = '46b9dd2b0ba88d13233b3feb743eeb24 -' test "$(printf '' | ./shake256sum -N 8)" = '46 -' test "$(printf '' | ./shake512sum -N 128)" = 'ae1b4eea1eaf5ea633e66045f03ff11b -' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/unportable.mk new/sha3sum/unportable.mk --- old/sha3sum-1.2.2/unportable.mk 1970-01-01 01:00:00.000000000 +0100 +++ new/sha3sum/unportable.mk 2023-12-07 21:58:14.000000000 +0100 @@ -0,0 +1,11 @@ +keccak-%sum.c: + printf '%s\n' '#include "common.h"' 'KECCAK_MAIN($*)' > $@ + +sha3-%sum.c: + printf '%s\n' '#include "common.h"' 'SHA3_MAIN($*)' > $@ + +rawshake%sum.c: + printf '%s\n' '#include "common.h"' 'RAWSHAKE_MAIN($*)' > $@ + +shake%sum.c: + printf '%s\n' '#include "common.h"' 'SHAKE_MAIN($*)' > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sha3sum-1.2.2/xsum.man new/sha3sum/xsum.man --- old/sha3sum-1.2.2/xsum.man 2022-03-25 17:05:00.000000000 +0100 +++ new/sha3sum/xsum.man 2023-12-07 21:58:14.000000000 +0100 @@ -107,8 +107,10 @@ which is intended to .I always be used with +.BR shake128sum (1), .BR shake256sum (1), .BR shake512sum (1), +.BR rawshake128sum (1), .BR rawshake256sum (1), and .BR rawshake512sum (1).
