Fri Apr 26 09:18:01 2024 UTC (17d)
Comment the augmented build system patch.


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

--- pkgsrc/www/hiawatha/distinfo 2024/04/26 09:14:47 1.8
+++ pkgsrc/www/hiawatha/distinfo 2024/04/26 09:18:00 1.9
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.8 2024/04/26 09:14:47 hauke Exp $ 1$NetBSD: distinfo,v 1.9 2024/04/26 09:18:00 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) = eeefd12db00da32433d38f89f70f0386843ff896 6SHA1 (patch-CMakeLists.txt) = a96e51545ab31e5ceb4a520bb4757787088c8174
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.2 -r1.3 pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt 2024/04/26 09:14:47 1.2
+++ pkgsrc/www/hiawatha/patches/patch-CMakeLists.txt 2024/04/26 09:18:00 1.3
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2024/04/26 09:14:47 hauke Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.3 2024/04/26 09:18:00 hauke Exp $
2 2
3setuid binaries should not be writable by anyone. 3setuid binaries should not be writable by anyone.
4 4
 5Keep build system from installing to PKG_SYSCONFDIR - we handle
 6preference files ourselves.
 7
5--- CMakeLists.txt.orig 2023-10-13 13:21:31.000000000 +0000 8--- CMakeLists.txt.orig 2023-10-13 13:21:31.000000000 +0000
6+++ CMakeLists.txt 9+++ CMakeLists.txt
7@@ -154,16 +154,9 @@ endif() 10@@ -154,16 +154,9 @@ endif()
8 # Installation 11 # Installation
9 install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR}) 12 install(TARGETS hiawatha wigwam DESTINATION ${CMAKE_INSTALL_SBINDIR})
10 install(TARGETS cgi-wrapper DESTINATION ${CMAKE_INSTALL_SBINDIR} 13 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) 14- 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) 15+ PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
13 install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR}) 16 install(TARGETS ssi-cgi DESTINATION ${CMAKE_INSTALL_BINDIR})
14  17
15-foreach(configfile ${config_files}) 18-foreach(configfile ${config_files})
16- install(CODE "copy_if_not_exists(\"${CMAKE_SOURCE_DIR}/${configfile}\" \"${CONFIG_DIR}\")") 19- install(CODE "copy_if_not_exists(\"${CMAKE_SOURCE_DIR}/${configfile}\" \"${CONFIG_DIR}\")")
17-endforeach() 20-endforeach()