head 1.1; access; symbols; locks; strict; comment @# @; 1.1 date 2026.09.25.14.20.40; author wiz; state Exp; branches; next ; commitid TmvT2kz6VnKzH0XG; desc @@ 1.1 log @thttpd: fix a couple CVEs Rename patches, add some patches from Debian/FreeBSD, move MESSAGE to README.pkgsrc. Bump PKGREVISION. From Showta Ishizaki in PR 60761. @ text @$NetBSD$ The same as patch-ab for the CGI programs: honour DESTDIR, install with the BSD_INSTALL_* tools instead of cp, and append to CFLAGS rather than overwrite it. --- cgi-src/Makefile.in.orig 2005-05-20 19:10:25.000000000 +0000 +++ cgi-src/Makefile.in @@@@ -34,7 +34,7 @@@@ CCOPT = @@V_CCOPT@@ DEFS = @@DEFS@@ INCLS = -I.. -CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +CFLAGS += $(CCOPT) $(DEFS) $(INCLS) LDFLAGS = @@LDFLAGS@@ @@V_STATICFLAG@@ LIBS = @@LIBS@@ NETLIBS = @@V_NETLIBS@@ @@@@ -67,17 +67,17 @@@@ cd .. ; $(MAKE) $(MFLAGS) strerror.o install: all - -mkdir -p $(CGIBINDIR) - rm -f $(CGIBINDIR)/redirect - cp redirect $(CGIBINDIR)/redirect - rm -f $(MANDIR)/man8/redirect.8 - cp redirect.8 $(MANDIR)/man8/redirect.8 - rm -f $(CGIBINDIR)/ssi - cp ssi $(CGIBINDIR)/ssi - rm -f $(MANDIR)/man8/ssi.8 - cp ssi.8 $(MANDIR)/man8/ssi.8 - rm -f $(CGIBINDIR)/phf - cp phf $(CGIBINDIR)/phf + -mkdir -p $(DESTDIR)$(CGIBINDIR) + rm -f $(DESTDIR)$(CGIBINDIR)/redirect + $(BSD_INSTALL_PROGRAM) redirect $(DESTDIR)$(CGIBINDIR)/redirect + rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8 + $(BSD_INSTALL_MAN) redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8 + rm -f $(DESTDIR)$(CGIBINDIR)/ssi + $(BSD_INSTALL_PROGRAM) ssi $(DESTDIR)$(CGIBINDIR)/ssi + rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8 + $(BSD_INSTALL_MAN) ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8 + rm -f $(DESTDIR)$(CGIBINDIR)/phf + $(BSD_INSTALL_PROGRAM) phf $(DESTDIR)$(CGIBINDIR)/phf clean: rm -f $(CLEANFILES) @