CVS commit: pkgsrc/devel/nsis

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jul 17 10:16:04 UTC 2026

Modified Files:
        pkgsrc/devel/nsis: Makefile PLIST distinfo
Removed Files:
        pkgsrc/devel/nsis/patches: patch-Docs_src_bin_halibut_halibut.h

Log Message:
nsis: updated to 3.12

3.12

Security

Don't use the Low IL temp directory when elevated
This stops a possible privilege escalation for installers running as SYSTEM.

Minor Changes

Added StartsWith[S], EndsWith[S], Contains[S], IsLowerCase and IsUpperCase LogicLib operators.

Build System

Support Python older than 3.6 again
Preliminary ARM64 support in makensis.nsi


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/nsis/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/nsis/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/nsis/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/nsis/patches/patch-Docs_src_bin_halibut_halibut.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nsis/Makefile
diff -u pkgsrc/devel/nsis/Makefile:1.26 pkgsrc/devel/nsis/Makefile:1.27
--- pkgsrc/devel/nsis/Makefile:1.26     Mon Aug 14 05:24:13 2023
+++ pkgsrc/devel/nsis/Makefile  Fri Jul 17 10:16:04 2026
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2023/08/14 05:24:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.27 2026/07/17 10:16:04 adam Exp $
 
 DISTNAME=      nsis-${NSIS_VER}
-PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nsis/}
 EXTRACT_SUFX=  .zip .tar.bz2
@@ -12,16 +10,17 @@ DISTFILES=  ${DISTNAME}.zip \
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://nsis.sourceforge.io/Main_Page
 COMMENT=       Scriptable system to build Windows installers
+LICENSE=       zlib
 
+MAKE_JOBS_SAFE=        no # fails to build in parallel
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pax
 
-PYTHON_VERSIONS_ACCEPTED=      27      # as of 3.04
+NSIS_SRC=      ${DISTNAME:=-src}
+NSIS_VER=      3.12
+WRKSRC=                ${WRKDIR}/${NSIS_SRC}
+NO_CONFIGURE=  yes
 
-NSIS_SRC=              ${DISTNAME:=-src}
-NSIS_VER=              3.04
-WRKSRC=                        ${WRKDIR}/${NSIS_SRC}
-NO_CONFIGURE=          yes
 EXTRACT_OPTS_ZIP=      -qo
 
 MAKENSIS_BIN=  ${PREFIX}/share/nsis/makensis
@@ -34,23 +33,27 @@ SUBST_FILES.makensis=       makensis.sh
 SUBST_SED.makensis=    -e s,@@SH@@,${SH:Q},
 SUBST_SED.makensis+=   -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q},
 
+# https://nsis.sourceforge.io/Docs/AppendixG.html#build_posix
+SCONS_BUILD_ARGS+=     NSIS_CONFIG_CONST_DATA_PATH=no
+SCONS_BUILD_ARGS+=     SKIPMISC=all
+SCONS_BUILD_ARGS+=     SKIPPLUGINS=all
+SCONS_BUILD_ARGS+=     SKIPSTUBS=all
+SCONS_BUILD_ARGS+=     SKIPUTILS=all
+SCONS_BUILD_ARGS+=     VERSION=${NSIS_VER:Q}
+SCONS_DO_INSTALL=      no
+
 post-extract:
-       ${CP} ${FILESDIR:Q}/makensis.sh ${WRKSRC:Q}
+       ${CP} ${FILESDIR}/makensis.sh ${WRKSRC}
        chmod -R go-w ${WRKDIR}/*
 
-do-build:
-       cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV}                  \
-           ${SCONSBIN:Q} SKIPSTUBS=all SKIPPLUGINS=all         \
-               SKIPUTILS=all SKIPMISC=all VERSION=${NSIS_VER:Q}
-
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC:Q}/build/urelease/makensis/makensis \
+       ${INSTALL_PROGRAM} ${WRKSRC}/build/urelease/makensis/makensis   \
                ${DESTDIR}${MAKENSIS_BIN:Q}
-       ${INSTALL_SCRIPT} ${WRKSRC:Q}/makensis.sh                       \
-               ${DESTDIR}${PREFIX:Q}/bin/makensis
-       cd ${WRKDIR:Q}/${DISTNAME:Q} && pax -rw .                       \
-               ${DESTDIR}${PREFIX:Q}/share/nsis
+       ${INSTALL_SCRIPT} ${WRKSRC}/makensis.sh         \
+               ${DESTDIR}${PREFIX}/bin/makensis
+       cd ${WRKDIR}/${DISTNAME} && ${PAX} -rw .        \
+               ${DESTDIR}${PREFIX}/share/nsis
 
-.include "../../devel/scons/buildlink3.mk"
+.include "../../devel/scons4/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/nsis/PLIST
diff -u pkgsrc/devel/nsis/PLIST:1.4 pkgsrc/devel/nsis/PLIST:1.5
--- pkgsrc/devel/nsis/PLIST:1.4 Wed Jan  2 21:35:57 2019
+++ pkgsrc/devel/nsis/PLIST     Fri Jul 17 10:16:04 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/01/02 21:35:57 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2026/07/17 10:16:04 adam Exp $
 bin/makensis
 share/nsis/Bin/GenPat.exe
 share/nsis/Bin/MakeLangId.exe
@@ -280,6 +280,7 @@ share/nsis/Docs/makensisw/Readme.txt
 share/nsis/Docs/nsDialogs/Readme.html
 share/nsis/Docs/nsExec/nsExec.txt
 share/nsis/Examples/AdvSplash/Example.nsi
+share/nsis/Examples/AppGen.nsi
 share/nsis/Examples/Banner/Example.nsi
 share/nsis/Examples/BgImage/Example.nsi
 share/nsis/Examples/FileFunc.ini
@@ -305,6 +306,7 @@ share/nsis/Examples/Modern UI/HeaderBitm
 share/nsis/Examples/Modern UI/MultiLanguage.nsi
 share/nsis/Examples/Modern UI/StartMenu.nsi
 share/nsis/Examples/Modern UI/WelcomeFinish.nsi
+share/nsis/Examples/MultiUser.nsi
 share/nsis/Examples/NSISMenu.nsi
 share/nsis/Examples/Plugin/exdll-vs2008.sln
 share/nsis/Examples/Plugin/exdll-vs2008.vcproj
@@ -331,7 +333,6 @@ share/nsis/Examples/TextFunc.ini
 share/nsis/Examples/TextFunc.nsi
 share/nsis/Examples/TextFuncTest.nsi
 share/nsis/Examples/UserInfo/UserInfo.nsi
-share/nsis/Examples/UserVars.nsi
 share/nsis/Examples/VPatch/example.nsi
 share/nsis/Examples/VPatch/newfile.txt
 share/nsis/Examples/VPatch/oldfile.txt
@@ -344,6 +345,8 @@ share/nsis/Examples/bigtest.nsi
 share/nsis/Examples/example1.nsi
 share/nsis/Examples/example2.nsi
 share/nsis/Examples/gfx.nsi
+share/nsis/Examples/install-per-user.nsi
+share/nsis/Examples/install-shared.nsi
 share/nsis/Examples/languages.nsi
 share/nsis/Examples/makensis.nsi
 share/nsis/Examples/nsDialogs/InstallOptions.nsi
@@ -356,11 +359,11 @@ share/nsis/Examples/primes.nsi
 share/nsis/Examples/rtest.nsi
 share/nsis/Examples/silent.nsi
 share/nsis/Examples/unicode.nsi
-share/nsis/Examples/viewhtml.nsi
 share/nsis/Examples/waplugin.nsi
 share/nsis/Include/Colors.nsh
 share/nsis/Include/FileFunc.nsh
 share/nsis/Include/InstallOptions.nsh
+share/nsis/Include/Integration.nsh
 share/nsis/Include/LangFile.nsh
 share/nsis/Include/Library.nsh
 share/nsis/Include/LogicLib.nsh
@@ -377,6 +380,7 @@ share/nsis/Include/VB6RunTime.nsh
 share/nsis/Include/VPatchLib.nsh
 share/nsis/Include/Win/COM.nsh
 share/nsis/Include/Win/Propkey.nsh
+share/nsis/Include/Win/RestartManager.nsh
 share/nsis/Include/Win/WinDef.nsh
 share/nsis/Include/Win/WinError.nsh
 share/nsis/Include/Win/WinNT.nsh
@@ -388,6 +392,7 @@ share/nsis/Include/WordFunc.nsh
 share/nsis/Include/nsDialogs.nsh
 share/nsis/Include/x64.nsh
 share/nsis/NSIS.chm
+share/nsis/NSIS.exe
 share/nsis/Plugins/x86-ansi/AdvSplash.dll
 share/nsis/Plugins/x86-ansi/Banner.dll
 share/nsis/Plugins/x86-ansi/BgImage.dll

Index: pkgsrc/devel/nsis/distinfo
diff -u pkgsrc/devel/nsis/distinfo:1.8 pkgsrc/devel/nsis/distinfo:1.9
--- pkgsrc/devel/nsis/distinfo:1.8      Thu Jul 27 11:34:40 2023
+++ pkgsrc/devel/nsis/distinfo  Fri Jul 17 10:16:04 2026
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2023/07/27 11:34:40 tnn Exp $
+$NetBSD: distinfo,v 1.9 2026/07/17 10:16:04 adam Exp $
 
-BLAKE2s (nsis-3.04-src.tar.bz2) = 8ebc6f16b7e17f7b866549d93696613462f14406d9b34c8438472a1a5ab5d6b6
-SHA512 (nsis-3.04-src.tar.bz2) = 1fa0e4ed99716e36a1feb6efb2261d0bd876077aeae0c7735bd0ac97eaac4413bf49016f1efa4e929e12ffe896007a2f2905704c50abc3a7a4d2bc514ea59e2e
-Size (nsis-3.04-src.tar.bz2) = 1740579 bytes
-BLAKE2s (nsis-3.04.zip) = 9fcc0d6cc826d0ec757891c9c7e4020a1e581d7e8e3002e8530a85428ea4a0f1
-SHA512 (nsis-3.04.zip) = 5e7d0a8e2e329ed7d4affd2bff3de58e096d6bcadb517b2ee3b56cf6500c355e6e9e7e12f28e92c79fe2b05d26e7666da0df834b48973b4bcc5157e8a3325192
-Size (nsis-3.04.zip) = 2246851 bytes
-SHA1 (patch-Docs_src_bin_halibut_halibut.h) = 8872a64c4b7a6dfadb55edbcb5ce66a69ef8f401
+BLAKE2s (nsis-3.12-src.tar.bz2) = db427baa867634d533cf8b50f845ac377e380b98cd6841d7bc2f82f2d039d1de
+SHA512 (nsis-3.12-src.tar.bz2) = e32fe4539699aa06d1aa30f36af5042cf7b017c4c1c29bb1a18cc68a229e739eebe9c85124f1de974d087bbddaff7aad72d66c17d913258d1d362609f4a2859b
+Size (nsis-3.12-src.tar.bz2) = 1818389 bytes
+BLAKE2s (nsis-3.12.zip) = 5b517bb0d316590e50f2ce5e1dd823d76b5674020f0fa22a1ab34bc7af208114
+SHA512 (nsis-3.12.zip) = d339933767b3c3f99a3c0df154688197642486e69a6679f3bf6d004441cfed046c5335d151358fa03d7b4ccfa596849f6eeb2aefbded66a2ab1e264d0a4ea30a
+Size (nsis-3.12.zip) = 2362938 bytes