From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zmap/files/
Date: Fri, 28 Mar 2025 21:06:24 +0000 (UTC) [thread overview]
Message-ID: <1743195979.73cb1dc6a39a78f410a223e9c5c1d74d99e2ece8.conikost@gentoo> (raw)
commit: 73cb1dc6a39a78f410a223e9c5c1d74d99e2ece8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Mar 28 07:03:33 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 28 21:06:19 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73cb1dc6
net-analyzer/zmap: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/zmap-2.1.1-always-install-config.patch | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch
deleted file mode 100644
index b3a8f9003dc5..000000000000
--- a/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-We always want to install configs as the host machine may be different from
-the one where zmap is installed to. Plus we have CONFIG_PROTECT in Gentoo
-for protecting the user's existing configuration.
-
-Bug: https://bugs.gentoo.org/885707
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configuration file location is /etc/zmap")
- foreach(EACH_CONF ${CONF_FILES})
- get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
- message(STATUS "Checking if ${CONF_BASENAME} exists there...")
-- if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}")
-- install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
-- else()
-- message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!")
-- endif()
-+ install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION})
- endforeach()
-
- # Allow Debian Packaging
next reply other threads:[~2025-03-28 21:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-28 21:06 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-01-21 21:19 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zmap/files/ Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1743195979.73cb1dc6a39a78f410a223e9c5c1d74d99e2ece8.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox