--- /dev/null
+Add system-wide daemon support.
+
+This patch adds system-wide daemon support to ZNC so that you can run
+one ZNC instance system-wide using the new "--system-wide-config-as"
+option.
+
+Patch is based on @mrueg version from 2012.
+
+X-Gentoo-Bug: 438430
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438430
+---
+ include/znc/znc.h | 3 ++
+ src/main.cpp | 83 ++++++++++++++++++++++++++++++++++++++++---------------
+ src/znc.cpp | 7 ++++-
+ 3 files changed, 70 insertions(+), 23 deletions(-)
+
+diff --git a/include/znc/znc.h b/include/znc/znc.h
+index cf2326e..16394f9 100644
+--- a/include/znc/znc.h
++++ b/include/znc/znc.h
+@@ -187,6 +187,8 @@ public:
+
+ static void DumpConfig(const CConfig* Config);
+
++ void SetSystemWideConfig(bool systemWideConfig);
++
+ private:
+ CFile* InitPidFile();
+ bool DoRehash(CString& sError);
+@@ -231,6 +233,7 @@ protected:
+ unsigned int m_uiConnectPaused;
+ TCacheMap<CString> m_sConnectThrottle;
+ bool m_bProtectWebSessions;
++ bool m_bSystemWideConfig;
+ bool m_bHideVersion;
+ };
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 09b2c9c..bd5cca6 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -16,6 +16,9 @@
+
+ #include <znc/znc.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <pwd.h>
++#include <grp.h>
+
+ #if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD)
+ #include <znc/Threads.h>
+@@ -99,34 +102,36 @@ static inline int getopt_long(int argc, char * const argv[], const char *optstri
+ #endif
+
+ static const struct option g_LongOpts[] = {
+- { "help", no_argument, 0, 'h' },
+- { "version", no_argument, 0, 'v' },
+- { "debug", no_argument, 0, 'D' },
+- { "foreground", no_argument, 0, 'f' },
+- { "no-color", no_argument, 0, 'n' },
+- { "allow-root", no_argument, 0, 'r' },
+- { "makeconf", no_argument, 0, 'c' },
+- { "makepass", no_argument, 0, 's' },
+- { "makepem", no_argument, 0, 'p' },
+- { "datadir", required_argument, 0, 'd' },
++ { "help", no_argument, 0, 'h' },
++ { "version", no_argument, 0, 'v' },
++ { "debug", no_argument, 0, 'D' },
++ { "foreground", no_argument, 0, 'f' },
++ { "no-color", no_argument, 0, 'n' },
++ { "allow-root", no_argument, 0, 'r' },
++ { "makeconf", no_argument, 0, 'c' },
++ { "makepass", no_argument, 0, 's' },
++ { "makepem", no_argument, 0, 'p' },
++ { "datadir", required_argument, 0, 'd' },
++ { "system-wide-config-as", required_argument, 0, 'S' },
+ { 0, 0, 0, 0 }
+ };
+
+ static void GenerateHelp(const char *appname) {
+ CUtils::PrintMessage("USAGE: " + CString(appname) + " [options]");
+ CUtils::PrintMessage("Options are:");
+- CUtils::PrintMessage("\t-h, --help List available command line options (this page)");
+- CUtils::PrintMessage("\t-v, --version Output version information and exit");
+- CUtils::PrintMessage("\t-f, --foreground Don't fork into the background");
+- CUtils::PrintMessage("\t-D, --debug Output debugging information (Implies -f)");
+- CUtils::PrintMessage("\t-n, --no-color Don't use escape sequences in the output");
+- CUtils::PrintMessage("\t-r, --allow-root Don't complain if ZNC is run as root");
+- CUtils::PrintMessage("\t-c, --makeconf Interactively create a new config");
+- CUtils::PrintMessage("\t-s, --makepass Generates a password for use in config");
++ CUtils::PrintMessage("\t-h, --help List available command line options (this page)");
++ CUtils::PrintMessage("\t-v, --version Output version information and exit");
++ CUtils::PrintMessage("\t-f, --foreground Don't fork into the background");
++ CUtils::PrintMessage("\t-D, --debug Output debugging information (Implies -f)");
++ CUtils::PrintMessage("\t-n, --no-color Don't use escape sequences in the output");
++ CUtils::PrintMessage("\t-r, --allow-root Don't complain if ZNC is run as root");
++ CUtils::PrintMessage("\t-c, --makeconf Interactively create a new config");
++ CUtils::PrintMessage("\t-s, --makepass Generates a password for use in config");
+ #ifdef HAVE_LIBSSL
+- CUtils::PrintMessage("\t-p, --makepem Generates a pemfile for use with SSL");
++ CUtils::PrintMessage("\t-p, --makepem Generates a pemfile for use with SSL");
+ #endif /* HAVE_LIBSSL */
+- CUtils::PrintMessage("\t-d, --datadir Set a different ZNC repository (default is ~/.znc)");
++ CUtils::PrintMessage("\t-d, --datadir Set a different ZNC repository (default is ~/.znc)");
++ CUtils::PrintMessage("\t-S, --system-wide-config-as Create a system-wide ZNC daemon configuration");
+ }
+
+ static void die(int sig) {
+@@ -192,6 +197,8 @@ int main(int argc, char** argv) {
+ bool bMakeConf = false;
+ bool bMakePass = false;
+ bool bAllowRoot = false;
++ bool bSystemWideConfig = false;
++ CString sSystemWideConfigUser = "znc";
+ bool bForeground = false;
+ #ifdef ALWAYS_RUN_IN_FOREGROUND
+ bForeground = true;
+@@ -201,7 +208,7 @@ int main(int argc, char** argv) {
+ #endif
+ CZNC::CreateInstance();
+
+- while ((iArg = getopt_long(argc, argv, "hvnrcspd:Df", g_LongOpts, &iOptIndex)) != -1) {
++ while ((iArg = getopt_long(argc, argv, "hvnrcspd:DfS:", g_LongOpts, &iOptIndex)) != -1) {
+ switch (iArg) {
+ case 'h':
+ GenerateHelp(argv[0]);
+@@ -219,6 +226,10 @@ int main(int argc, char** argv) {
+ case 'c':
+ bMakeConf = true;
+ break;
++ case 'S':
++ bSystemWideConfig = true;
++ sSystemWideConfigUser = optarg;
++ break;
+ case 's':
+ bMakePass = true;
+ break;
+@@ -254,8 +265,36 @@ int main(int argc, char** argv) {
+ return 1;
+ }
+
++ if (bSystemWideConfig && getuid() == 0) {
++ struct passwd *pwd;
++
++ pwd = getpwnam(sSystemWideConfigUser.c_str());
++ if (pwd == NULL) {
++ CUtils::PrintError("Daemon user not found.");
++ return 1;
++ }
++
++ if ((long) pwd->pw_uid == 0) {
++ CUtils::PrintError("Please define a daemon user other than root.");
++ return 1;
++ }
++ if (setgroups(0, NULL) != 0) {
++ CUtils::PrintError("setgroups: Unable to clear supplementary group IDs");
++ return 1;
++ }
++ if (setgid((long) pwd->pw_gid) != 0) {
++ CUtils::PrintError("setgid: Unable to drop group privileges");
++ return 1;
++ }
++ if (setuid((long) pwd->pw_uid) != 0) {
++ CUtils::PrintError("setuid: Unable to drop user privileges");
++ return 1;
++ }
++ }
++
+ CZNC* pZNC = &CZNC::Get();
+ pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
++ pZNC->SetSystemWideConfig(bSystemWideConfig);
+
+ #ifdef HAVE_LIBSSL
+ if (bMakePem) {
+@@ -304,7 +343,7 @@ int main(int argc, char** argv) {
+ CUtils::PrintStatus(true, "");
+ }
+
+- if (isRoot()) {
++ if (isRoot() && !bSystemWideConfig) {
+ CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
+ CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
+ if (!bAllowRoot) {
+diff --git a/src/znc.cpp b/src/znc.cpp
+index 78cda1a..b33e860 100644
+--- a/src/znc.cpp
++++ b/src/znc.cpp
+@@ -55,6 +55,7 @@ CZNC::CZNC() {
+ m_sConnectThrottle.SetTTL(30000);
+ m_pLockFile = NULL;
+ m_bProtectWebSessions = true;
++ m_bSystemWideConfig = false;
+ m_bHideVersion = false;
+ m_uDisabledSSLProtocols = Csock::EDP_SSL;
+ m_sSSLProtocols = "";
+@@ -861,7 +862,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+ CUtils::PrintMessage("");
+
+ File.UnLock();
+- return bFileOpen && CUtils::GetBoolInput("Launch ZNC now?", true);
++ return bFileOpen && !m_bSystemWideConfig && CUtils::GetBoolInput("Launch ZNC now?", true);
+ }
+
+ void CZNC::BackupConfigOnce(const CString& sSuffix) {
+@@ -1973,3 +1974,7 @@ void CZNC::LeakConnectQueueTimer(CConnectQueueTimer *pTimer) {
+ bool CZNC::WaitForChildLock() {
+ return m_pLockFile && m_pLockFile->ExLock();
+ }
++
++void CZNC::SetSystemWideConfig(bool systemWideConfig) {
++ m_bSystemWideConfig = systemWideConfig;
++}
+--
+2.5.0
+
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit base python-single-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/znc/znc.git"
+ SRC_URI="test? ( ${GTEST_URL} )"
+ KEYWORDS=""
+else
+ SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz
+ test? ( ${GTEST_URL} )"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://znc.in"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="daemon debug ipv6 perl python ssl sasl tcl test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ perl? ( >=dev-lang/perl-5.10 )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ ssl? ( >=dev-libs/openssl-0.9.7d:0 )
+ tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="
+ virtual/pkgconfig
+ perl? (
+ >=dev-lang/swig-2.0.12
+ )
+ python? (
+ >=dev-lang/swig-2.0.12
+ )
+ ${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+ "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+ZNC_DATADIR="${ZNC_DATADIR:-"/var/lib/znc"}"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+ if use daemon; then
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /dev/null ${PN}
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ else
+ default
+ fi
+
+ if use test; then
+ cd "${S}"/test || die "Failed to chdir into '${S}/test'"
+ unpack $(basename ${GTEST_URL})
+ mv gtest-${GTEST_VER} gtest || die "Failed to rename '${S}/test/gtest-${GTEST_VER}' dir"
+ fi
+}
+
+src_prepare() {
+ if [[ ${PV} == *9999* ]]; then
+ ./autogen.sh
+ fi
+
+ base_src_prepare
+}
+
+src_configure() {
+ econf \
+ --with-systemdsystemunitdir=$(systemd_get_unitdir) \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable perl) \
+ $(use python && echo "--enable-python=python3") \
+ $(use_enable sasl cyrus) \
+ $(use_enable ssl openssl) \
+ $(use_enable tcl tcl) \
+ $(use_with test gtest "${S}/test/gtest")
+}
+
+src_install() {
+ emake install DESTDIR="${D%/}"
+ dodoc NOTICE README.md
+ if use daemon; then
+ newinitd "${FILESDIR}"/znc.initd-r1 znc
+ newconfd "${FILESDIR}"/znc.confd-r1 znc
+ fi
+}
+
+pkg_postinst() {
+ if use !daemon; then
+ elog
+ elog "Run 'znc --makeconf' as the user you want to run ZNC as"
+ elog "to make a configuration file"
+ elog
+ else
+ elog
+ elog "An init-script was installed in /etc/init.d"
+ elog "A config file was installed in /etc/conf.d"
+ if [[ ! -d "${EROOT}${ZNC_DATADIR}" ]]; then
+ elog
+ elog "Run 'emerge --config znc' to configure ZNC"
+ elog "as a system-wide daemon."
+ elog
+ elog "To generate a new SSL certificate, run:"
+ elog " znc --system-wide-config-as znc --makepem -d ${ZNC_DATADIR}"
+ elog "as root"
+ elog
+ elog "If migrating from a user-based install"
+ elog "you can use your existing config files:"
+ elog " mkdir ${ZNC_DATADIR}"
+ elog " mv /home/\$USER/.znc/* ${ZNC_DATADIR}"
+ elog " rm -rf /home/\$USER/.znc"
+ elog " chown -R znc:znc ${ZNC_DATADIR}"
+ elog
+ elog "If you already have znc set up and want take advantage of the"
+ elog "init script but skip of all the above, you can also edit"
+ elog " /etc/conf.d/znc"
+ elog "and adjust the variables to your current znc user and config"
+ elog "location."
+ elog
+ elog "Please make sure that your existing configuration contains"
+ elog " PidFile = /run/znc/znc.pid"
+ elog "or that PidFile value matches the one in /etc/conf.d/znc"
+ if [[ -d "${EROOT}"/etc/znc ]]; then
+ elog
+ ewarn "/etc/znc exists on your system."
+ ewarn "Due to the nature of the contents of that folder,"
+ ewarn "we have changed the default configuration to use"
+ ewarn " ${ZNC_DATADIR}"
+ ewarn "please move /etc/znc to ${ZNC_DATADIR}"
+ ewarn "or adjust /etc/conf.d/znc"
+ fi
+ else
+ elog "Existing config detected in ${ZNC_DATADIR}"
+ if ! systemd_is_booted; then
+ elog
+ elog "Please make sure that your existing configuration contains"
+ elog " PidFile = /run/znc/znc.pid"
+ elog "or that PidFile value matches the one in /etc/conf.d/znc"
+ else
+ elog "You're good to go :)"
+ fi
+ fi
+ elog
+ fi
+}
+
+pkg_config() {
+ if use daemon && ! [[ -d "${EROOT}${ZNC_DATADIR}" ]]; then
+ einfo "Press ENTER to interactively create a new configuration file for znc."
+ einfo "To abort, press Control-C"
+ read
+ mkdir -p "${EROOT}${ZNC_DATADIR}" || die
+ chown -R ${PN}:${PN} "${EROOT}${ZNC_DATADIR}" ||
+ die "Setting permissions failed"
+ "${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${ZNC_DATADIR}" ||
+ die "Config failed"
+ echo
+ einfo "To start znc, run '/etc/init.d/znc start'"
+ einfo "or add znc to a runlevel:"
+ einfo " rc-update add znc default"
+ else
+ if use daemon; then
+ ewarn "${ZNC_DATADIR} already exists, aborting to avoid damaging"
+ ewarn "any existing configuration. If you are sure you want"
+ ewarn "to generate a new configuration, remove the folder"
+ ewarn "and try again."
+ else
+ ewarn "To configure znc as a system-wide daemon you have to"
+ ewarn "enable the 'daemon' use flag."
+ fi
+ fi
+}
projects / gentoo.git / commitdiff