[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/

[Conrad Kostecki]

commit:     eb988e1ee07d3d7862e514dc02fb719aac2e2bc1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Aug 28 19:47:49 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 07:48:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb988e1e

net-im/spectrum2: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32494
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/spectrum2-2.1.3-log4cxx-1.0.0.patch      | 63 ----------------------
 1 file changed, 63 deletions(-)

diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
deleted file mode 100644
index 852f4ad78027..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
-  This patch just enables C++17 for the build and using smart pointers
-  where needed.
-Author: Tobias Frost <tobi@debian.org>
-Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code.
-Last-Update: 2022-11-21 <YYYY-MM-DD, last update of the meta-information, optional>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@
- 
- project(libtransport)
- 
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- if(WIN32)
- 	set(CMAKE_CXX_STANDARD 17)
- endif(WIN32)
---- a/plugin/cpp/Logging.cpp
-+++ b/plugin/cpp/Logging.cpp
-@@ -26,6 +26,7 @@
- #include <iterator>
- #include <algorithm>
- 
-+#include <memory>
- 
- #include <boost/filesystem.hpp>
- #include <boost/algorithm/string.hpp>
-@@ -100,15 +101,17 @@
- #ifdef _MSC_VER
- 		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
- #else
--		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
-+		auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
-+		auto consoleappender = std::make_shared<ConsoleAppender>(patternlayout);
-+		root->addAppender(consoleappender);
- #endif
- 	}
- 	else {
- 		log4cxx::helpers::Properties p;
- 
--		log4cxx::helpers::FileInputStream *istream = NULL;
-+		log4cxx::helpers::InputStreamPtr istream;
- 		try {
--			istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
-+			istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
- 		}
- 		catch(log4cxx::helpers::IOException &ex) {
- 			std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
---- a/tests/libtransport/main.cpp
-+++ b/tests/libtransport/main.cpp
-@@ -23,7 +23,9 @@
- #ifdef WITH_LOG4CXX
- 	LoggerPtr root = Logger::getRootLogger();
- #ifndef _MSC_VER
--	root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false));
-+	auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
-+	auto fileappender = std::make_shared<FileAppender>(patternlayout, "libtransport_test.log", false);
-+	root->addAppender(fileappender);
- #else
- 	root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false));
- #endif

[gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/

[Michael Orlitzky]

commit:     c89a996083eb1c654d0c4aa661862ef06f26e544
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 00:17:51 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 00:24:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89a9960

net-im/spectrum2: update http -> https in a comment

The bundled OpenRC service file contains a link to my website that can
now benefit from https://

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-im/spectrum2/files/spectrum2.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/spectrum2/files/spectrum2.initd b/net-im/spectrum2/files/spectrum2.initd
index 8a35dbe75bc9..0ab25819804d 100644
--- a/net-im/spectrum2/files/spectrum2.initd
+++ b/net-im/spectrum2/files/spectrum2.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/spectrum2_manager"
@@ -41,7 +41,7 @@ stop() {
 # Andrey Utkin <andrey_utkin@gentoo.org> (24 Nov 2018)
 # Conrad Kostecki <conrad@kostecki.com> (24 Nov 2018)
 # We are aware of many security issues caused by careless chowning, see
-# http://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml
+# https://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml
 # We believe none of these issues apply.
 # These pidfiles are not read by any privileged process.
 # checkpath here chowns only the dir itself and doesn't act recursively.