Fri Apr 26 09:14:47 2024 UTC (17d)
Keep the build system from installing to PKG_SYSCONFDIR.

My local setting is a non-standard /etc/pkg, which was probably
shielded by the pkgsrc framework, hiding the problem.


(hauke)
diff -r1.7 -r1.8 pkgsrc/www/hiawatha/distinfo
diff -r1.1 -r1.2 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt
cvs diff -r1.7 -r1.8 pkgsrc/www/hiawatha/distinfo (expand / switch to unified diff)

--- pkgsrc/www/hiawatha/distinfo 2024/04/15 14:52:33 1.7
+++ pkgsrc/www/hiawatha/distinfo 2024/04/26 09:14:47 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2024/04/15 14:52:33 hauke Exp $ 1$NetBSD: distinfo,v 1.8 2024/04/26 09:14:47 hauke Exp $
2 2
3BLAKE2s (hiawatha-v11.5.tar.gz) = d925682455f7c822d0aa5659716fbbf41fc6f04d53883945e0d0fe077794fb18 3BLAKE2s (hiawatha-v11.5.tar.gz) = d925682455f7c822d0aa5659716fbbf41fc6f04d53883945e0d0fe077794fb18
4SHA512 (hiawatha-v11.5.tar.gz) = c374ce680874aa9aacaa4d8b59cce3209275286e5b8baaabdf53346a0a743cb6decc97136b356c207b33b18db2977a0b1d6e9743cc6f4479860fade389bdd86a 4SHA512 (hiawatha-v11.5.tar.gz) = c374ce680874aa9aacaa4d8b59cce3209275286e5b8baaabdf53346a0a743cb6decc97136b356c207b33b18db2977a0b1d6e9743cc6f4479860fade389bdd86a
5Size (hiawatha-v11.5.tar.gz) = 1810756 bytes 5Size (hiawatha-v11.5.tar.gz) = 1810756 bytes
6SHA1 (patch-CMakeLists.txt) = e7eb2dab5b95bb4849e234d977baba31395cd527 6SHA1 (patch-CMakeLists.txt) = eeefd12db00da32433d38f89f70f0386843ff896
7SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a 7SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
8SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347 8SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347
cvs diff -r1.1 -r1.2 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt 2024/04/15 14:52:33 1.1
+++ pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt 2024/04/26 09:14:47 1.2
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2024/04/15 14:52:33 hauke Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2024/04/26 09:14:47 hauke Exp $
2 2
3setuid binaries should not be writable by anyone. 3setuid binaries should not be writable by anyone.
4 4
5--- CMakeLists.txt.orig 2024-04-05 17:22:48.812504624 +0000 5--- CMakeLists.txt.orig 2023-10-13 13:21:31.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -154,7 +154,7 @@ endif() 7@@ -154,16 +154,9 @@ endif()
8 # Installation 8 # Installation
9 install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR}) 9 install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR})
10 install(TARGETS cgi-wrapper DESTINATION ${CMAKE_INSTALL_SBINDIR} 10 install(TARGETS cgi-wrapper DESTINATION ${CMAKE_INSTALL_SBINDIR}
11- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID) 11- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
12+ PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID) 12+ PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
13 install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR}) 13 install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR})
14  14
15 foreach(configfile ${config_files}) 15-foreach(configfile ${config_files})
 16- install(CODE "copy_if_not_exists(\"${CMAKE_SOURCE_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
 17-endforeach()
 18-foreach(configfile ${config_files_in})
 19- install(CODE "copy_if_not_exists(\"${CMAKE_CURRENT_BINARY_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
 20-endforeach()
 21-
 22 install(FILES ${manual_pages} DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
 23 foreach(manpage ${manual_pages_in})
 24 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${manpage} DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)