head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.54 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.52 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.50 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.48 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.46 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.44 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.42 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.40 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.38 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.36 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.34 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.32 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.30 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.28 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.26 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.24 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.22 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.20 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.18 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.16 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.14 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.12 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.10 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.8 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.4 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.6 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.2 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.5.0.2 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.4.0.10 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.8 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.6 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.4 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.2 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.2.0.10 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.8 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.4 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.2 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.1.0.10 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.8 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.6 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.4 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.2 pkgsrc-2015Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2019.08.07.12.58.49; author nia; state Exp; branches; next 1.5; commitid IZUZZjMZP67E16yB; 1.5 date 2019.05.27.01.17.21; author maya; state Exp; branches; next 1.4; commitid aTuOySsmcmNYrMoB; 1.4 date 2018.01.10.09.36.54; author adam; state Exp; branches; next 1.3; commitid DCpDrMt0Bc4smjmA; 1.3 date 2017.12.30.11.34.12; author adam; state Exp; branches; next 1.2; commitid SBZROEIDn52umUkA; 1.2 date 2017.02.21.22.00.51; author kleink; state Exp; branches; next 1.1; commitid PbHKjI6oT9pEQRGz; 1.1 date 2015.11.05.08.50.33; author wiz; state Exp; branches; next ; commitid yPNPoPq0SWoTISHy; desc @@ 1.6 log @argon2: Update to 20190702 Add a pkg-config file. @ text @$NetBSD: patch-Makefile,v 1.5 2019/05/27 01:17:21 maya Exp $ Remove -O3 -g compiler flags. Disable -march=native since it causes problems on NetBSD. Use the same shared library name across platforms. --- Makefile.orig 2019-05-20 09:18:00.000000000 +0000 +++ Makefile @@@@ -37,7 +37,7 @@@@ SRC_BENCH = src/bench.c SRC_GENKAT = src/genkat.c OBJ = $(SRC:.c=.o) -CFLAGS += -std=c89 -O3 -Wall -g -Iinclude -Isrc +CFLAGS += -std=c89 -Wall -Iinclude -Isrc ifeq ($(NO_THREADS), 1) CFLAGS += -DARGON2_NO_THREADS @@@@ -48,8 +48,7 @@@@ endif CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \ -Wextra -Wno-type-limits -Werror -coverage -DTEST_LARGE_RAM -OPTTARGET ?= native -OPTTEST := $(shell $(CC) -Iinclude -Isrc -march=$(OPTTARGET) src/opt.c -c \ +OPTTEST := $(shell $(CC) $(CFLAGS) -Iinclude -Isrc src/opt.c -c \ -o /dev/null 2>/dev/null; echo $$?) # Detect compatible platform ifneq ($(OPTTEST), 0) @@@@ -57,7 +56,6 @@@@ $(info Building without optimizations) SRC += src/ref.c else $(info Building with optimizations for $(OPTTARGET)) - CFLAGS += -march=$(OPTTARGET) SRC += src/opt.c endif @@@@ -70,7 +68,7 @@@@ PC_NAME = lib$(LIB_NAME).pc PC_SRC = $(PC_NAME).in ifeq ($(KERNEL_NAME), Linux) - LIB_EXT := so.$(ABI_VERSION) + LIB_EXT := so LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1 SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT) LINKED_LIB_EXT := so @@@@ -82,8 +80,8 @@@@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_ PC_EXTRA_LIBS ?= endif ifeq ($(KERNEL_NAME), Darwin) - LIB_EXT := $(ABI_VERSION).dylib - LIB_CFLAGS := -dynamiclib -install_name @@rpath/lib$(LIB_NAME).$(LIB_EXT) + LIB_EXT := dylib + LIB_CFLAGS := -dynamiclib -install_name ${DESTDIR}${PREFIX}/lib/lib$(LIB_NAME).$(LIB_EXT) LINKED_LIB_EXT := dylib PC_EXTRA_LIBS ?= endif @@@@ -103,7 +101,6 @@@@ ifeq ($(findstring MSYS, $(KERNEL_NAME)) PC_EXTRA_LIBS ?= endif ifeq ($(KERNEL_NAME), SunOS) - CC := gcc CFLAGS += -D_REENTRANT LIB_EXT := so LIB_CFLAGS := -shared -fPIC @ 1.5 log @argon2: don't test if opt.c can build with -march=native. Avoid a situation where a build host can use SSE2, but opt.c is then compiled without SSE2 support (which fails). Also check for CFLAGS for this compile test while here. amend comment: we avoid -march=native not because of netbsd, but because it results in shiny package builders creating packages not usable by some users with older machines. PR pkg/54238: security/argon2 build fails on i386-current (8.99.41) @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.4 2018/01/10 09:36:54 adam Exp $ d7 1 a7 1 --- Makefile.orig 2017-12-27 19:56:31.000000000 +0000 d9 1 a9 1 @@@@ -30,7 +30,7 @@@@ SRC_BENCH = src/bench.c d18 1 a18 1 @@@@ -41,8 +41,7 @@@@ endif d28 1 a28 1 @@@@ -50,7 +49,6 @@@@ $(info Building without optimizations) d36 2 a37 1 @@@@ -59,7 +57,7 @@@@ KERNEL_NAME := $(shell uname -s) a38 1 LIB_NAME=argon2 d45 2 a46 2 @@@@ -69,8 +67,8 @@@@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_ LIB_CFLAGS := -shared -fPIC d54 4 d59 5 a63 1 ifeq ($(findstring CYGWIN, $(KERNEL_NAME)), CYGWIN) @ 1.4 log @Better -install_name on Darwin @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.3 2017/12/30 11:34:12 adam Exp $ d18 11 a28 1 @@@@ -50,7 +50,6 @@@@ $(info Building without optimizations) d36 1 a36 1 @@@@ -59,7 +58,7 @@@@ KERNEL_NAME := $(shell uname -s) d45 1 a45 1 @@@@ -69,8 +68,8 @@@@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_ @ 1.3 log @argon2: updated to 20171227 20171227: Added ABI version number AVX2/AVX-512F optimizations of BLAMKA Set Argon2 version number from the command line New bindings Minor bug and warning fixes (no security issue) @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.2 2017/02/21 22:00:51 kleink Exp $ d35 1 a35 1 @@@@ -69,7 +68,7 @@@@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_ d40 1 d42 1 a42 1 LIB_CFLAGS := -dynamiclib -install_name @@rpath/lib$(LIB_NAME).$(LIB_EXT) d45 1 @ 1.2 log @Update argon2 to 20161029. # 20161029 * Argon2id added * Better documentation * Dual licensing CC0 / Apache 2.0 * Minor bug fixes (no security issue) # 20160406 * Version 1.3 of Argon2 * Version number in encoded hash * Refactored low-level API * Visibility control for library symbols * Microsoft Visual Studio solution * New bindings * Minor bug and warning fixes (no security issue) # 20151206 * Python bindings * Password read from stdin, instead of being an argument * Compatibility FreeBSD, NetBSD, OpenBSD * Constant-time verification * Minor bug and warning fixes (no security issue) @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.1 2015/11/05 08:50:33 wiz Exp $ d3 1 d5 1 d7 1 a7 1 --- Makefile.orig 2016-10-29 09:24:03.000000000 +0000 d9 10 a18 1 @@@@ -40,7 +40,6 @@@@ $(info Building without optimizations) d26 18 @ 1.1 log @Import argon2-20151102 as security/argon2. This is the reference C implementation of Argon2, the password-hashing function that won the Password Hashing Competition (PHC). You should use Argon2 whenever you need to hash passwords for credential storage, key derivation, or other applications. There are two main versions of Argon2, Argon2i and Argon2d. Argon2i is the safest against side-channel attacks, while Argon2d provides the highest resistance against GPU cracking attacks. Argon2i and Argon2d are parametrized by * A time cost, which defines the amount of computation realized and therefore the execution time, given in number of iterations * A memory cost, which defines the memory usage, given in kibibytes * A parallelism degree, which defines the number of parallel threads @ text @d1 1 a1 1 $NetBSD$ a3 1 Add NetBSD support. d5 1 a5 1 --- Makefile.orig 2015-11-02 15:20:31.000000000 +0000 d7 5 a11 5 @@@@ -24,7 +24,6 @@@@ CFLAGS = -std=c89 -pthread -O3 -Wall -g #OPT=TRUE ifeq ($(OPT), TRUE) - CFLAGS += -march=native a12 5 else SRC += src/ref.c @@@@ -39,6 +38,11 @@@@ ifeq ($(KERNEL_NAME), Linux) LIB_CFLAGS := -shared -fPIC LIB_PATH := -Wl,-rpath=$(BUILD_PATH) d14 1 a14 8 +ifeq ($(KERNEL_NAME), NetBSD) + LIB_EXT := so + LIB_CFLAGS := -shared -fPIC + LIB_PATH := -Wl,-rpath=$(BUILD_PATH) +endif ifeq ($(KERNEL_NAME), Darwin) LIB_EXT := dylib LIB_CFLAGS := -dynamiclib -install_name @@rpath/lib$(LIB_NAME).$(LIB_EXT) @