head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.50 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.48 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.46 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.44 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.42 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.40 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.38 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.36 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.34 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.32 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.30 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.28 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.26 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.24 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.22 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.20 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.18 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.16 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.14 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.12 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.10 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.8 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.6 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.4 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.2 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.2.0.12 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.8 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.6 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.4 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.2 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.1.0.2 pkgsrc-2018Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2020.01.21.21.09.41; author schmonz; state Exp; branches; next 1.2; commitid D2sWQ7CoWd4inBTB; 1.2 date 2018.12.22.01.08.56; author schmonz; state Exp; branches; next 1.1; commitid yuYieRWGhjOrqJ4B; 1.1 date 2018.08.05.15.00.46; author schmonz; state Exp; branches; next ; commitid 4BpcMYb7bkWCuWMA; desc @@ 1.3 log @Stop adding unneeded CFLAGS. Fixes tests on at least macOS Catalina. @ text @$NetBSD: patch-Makefile,v 1.2 2018/12/22 01:08:56 schmonz Exp $ Use pkgsrc paths, flags, users, etc. --- Makefile.orig 2004-04-08 12:59:11.000000000 +0000 +++ Makefile @@@@ -3,20 +3,20 @@@@ # - change it to fit your needs # - see also params.h -MANDIR = /usr/share/man -DEST = /command -GROUP = nofiles +MANDIR = ${DESTDIR}${PREFIX}/${PKGMANDIR} +DEST = ${DESTDIR}${PREFIX}/bin +#GROUP = nofiles ARCH = $(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/') DIET = $(shell basename `which diet 2>/dev/null` 2>/dev/null) # compiler CC = $(DIET) gcc -CFLAGS = -Os -Wall -pipe -fomit-frame-pointer -LDFLAGS = -s -lcrypt +CFLAGS += -Wall +#LDFLAGS = -s -lcrypt # extraflags -CFLAGS += -mpreferred-stack-boundary=2 -march=$(ARCH) -mcpu=$(ARCH) +#CFLAGS += -mpreferred-stack-boundary=2 -march=$(ARCH) -mcpu=$(ARCH) #CFLAGS += -W -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -Wswitch -Wredundant-decls -Wunused #CFLAGS += -Werror #CFLAGS += -funroll-loops @@@@ -45,18 +45,16 @@@@ setup: it install again: clean setup multicheckpw: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJS) - $(STRIP) $@@ + $(CC) $(CFLAGS) -o $@@ $(OBJS) $(LDFLAGS) for i in checkpasswd checkqpasswd qpasswd; do \ ( test -f $$i || ln -s multicheckpw $$i ) \ done test-cases: $(OBJS2) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJS2) - $(STRIP) $@@ + $(CC) $(CFLAGS) -o $@@ $(OBJS2) $(LDFLAGS) check: test-cases - test-cases > test-cases.computed + ./test-cases > test-cases.computed @@echo If the following test fails, send a mail to crypto@@mcmilk.de! diff test-cases.wanted test-cases.computed @@echo The test was OKAY! @@@@ -66,15 +64,14 @@@@ clean: .c.o: $(CC) $(CFLAGS) -c $< -o $@@ - $(STRIPx) $@@ -install: uninstall +install: test -d $(MANDIR)/man5 || mkdir -p $(MANDIR)/man5 test -d $(MANDIR)/man8 || mkdir -p $(MANDIR)/man8 man/install-pages.sh $(MANDIR) cp -f multicheckpw $(DEST)/multicheckpw - chown root.$(GROUP) $(DEST)/multicheckpw - chmod 4510 $(DEST)/multicheckpw + #chown root.$(GROUP) $(DEST)/multicheckpw + #chmod 4510 $(DEST)/multicheckpw ln -s multicheckpw $(DEST)/checkpasswd ln -s multicheckpw $(DEST)/checkqpasswd ln -s multicheckpw $(DEST)/qpasswd @ 1.2 log @Move LDFLAGS to the end. Fixes Ubuntu, doesn't break NetBSD or OS X. @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.1 2018/08/05 15:00:46 schmonz Exp $ d25 1 a25 1 +CFLAGS += -Os -Wall -pipe -fomit-frame-pointer @ 1.1 log @Add qpasswd, a set of password-checking tools for many authentication schemes. The qpasswd tools are meant for use with checkpassword-compatible authentication programs like qmail-popup and qmail-smtpd. Currently, the following auth mechanisms are supported: plain, login, apop, cram-md5, cram-sha1, cram-ripemd, and digest-md5. The tools: - multicheckpw (runs multiple checkpassword programs) - checkqpasswd (for virtual users) - checkpasswd (for system users in /etc/passwd) @ text @d1 1 a1 1 $NetBSD$ d34 2 a35 1 @@@@ -46,17 +46,15 @@@@ again: clean setup d38 1 a38 1 $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJS) d40 1 d46 1 a46 1 $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJS2) d48 1 @