[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/files/

[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/files/

[Patrice Clement]

commit:     eb28ed4ff50815fc3b41354ad9e61acef8b284c4
Author:     Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sun Feb 21 19:45:51 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 17:13:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb28ed4f

net-irc/irker: Default logging is now syslog instead of file

This behaviour appeared in version 2.9.

Handle IRKERD_LOGFILE checkpath only when IRKERD_LOGFILE is defined as IRKERD_LOGLEVEL is independant.

Package-Manager: portage-2.2.26

 net-irc/irker/files/irkerd.confd |  5 ++---
 net-irc/irker/files/irkerd.initd | 10 ++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/net-irc/irker/files/irkerd.confd b/net-irc/irker/files/irkerd.confd
index f176e62..42ae732 100644
--- a/net-irc/irker/files/irkerd.confd
+++ b/net-irc/irker/files/irkerd.confd
@@ -6,14 +6,13 @@
 # Nick-Server password
 # IRKERD_PASSWORD=""
 
-# Log file, intended for debug purpose only, no logrotate will
-# handle this logfile
+# Log file, if none syslog is used (facility daemon)
 # IRKERD_LOGFILE=""
 
 # Debug Level (critical, error, warning, info, debug)
 # IRKERD_LOGLEVEL=""
 
-# To run an anonymous irkerd safely. It should not able able
+# To run an anonymous irkerd safely. It should not be able
 # to write to anywhere on your system
 # IRKERD_USER=""
 

diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd
index 246fcf4..2ea6a44 100644
--- a/net-irc/irker/files/irkerd.initd
+++ b/net-irc/irker/files/irkerd.initd
@@ -7,8 +7,6 @@
 
 : ${IRKERD_NICK:=}
 : ${IRKERD_PASSWORD:=}
-: ${IRKERD_LOGFILE:=/var/log/${RC_SVCNAME}.log}
-: ${IRKERD_LOGLEVEL:=0}
 : ${IRKERD_USER:=nobody}
 
 depend() {
@@ -16,12 +14,7 @@ depend() {
 }
 
 start () {
-	if [[ ${IRKERD_LOGLEVEL} ]] ; then
-		IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}"
-
-		ewarn "IRKERD_LOGLEVEL is intended to be used for debugging purpose only"
-		ewarn "No logrotate can handle ${IRKERD_LOGFILE}"
-
+	if [[ ${IRKERD_LOGFILE} ]] ; then
 		checkpath -f \
 			-o "${IRKERD_USER}" \
 			"${IRKERD_LOGFILE}" \
@@ -32,6 +25,7 @@ start () {
 		die "IRKERD_USER is mandatory"
 	fi
 
+	[[ -n "${IRKERD_LOGLEVEL}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}"
 	[[ -n "${IRKERD_LOGFILE}"  ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}"
 	[[ -n "${IRKERD_NICK}"     ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}"
 	[[ -n "${IRKERD_PASSWORD}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}"

[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/files/

[Aaron Bauman]

commit:     9a3f6d109fdeddac19ae2316b2847c0a90a8c399
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 28 07:43:13 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May  5 01:22:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3f6d10

net-irc/irker: remove unused patch

Closes: https://bugs.gentoo.org/650188

 .../files/2.17-irkerhook-Remove-file-listing.patch | 104 ---------------------
 1 file changed, 104 deletions(-)

diff --git a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch
deleted file mode 100644
index 356bc9ae264..00000000000
--- a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon, 7 Oct 2013 13:33:30 +0200
-Subject: [PATCH 2/2] irkerhook: Remove file listing
-
----
- irkerhook.py | 28 +++-------------------------
- 1 file changed, 3 insertions(+), 25 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index 18c9b01..0ba6834 100755
---- a/irkerhook.py
-+++ b/irkerhook.py
-@@ -66,7 +66,6 @@ class Commit:
-         self.rev = None
-         self.mail = None
-         self.author = None
--        self.files = None
-         self.logmsg = None
-         self.url = None
-         self.author_date = None
-@@ -237,7 +236,7 @@ class GitExtractor(GenericExtractor):
-         self.channels = do("git config --get irker.channels")
-         self.email = do("git config --get irker.email")
-         self.tcp = do("git config --bool --get irker.tcp")
--        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-+        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-         self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier
-         self.color = do("git config --get irker.color")
-         self.urlprefix = do("git config --get irker.urlprefix") or "gitweb"
-@@ -286,9 +285,6 @@ class GitExtractor(GenericExtractor):
-             if self.urlprefix in ('gitweb', 'cgit'):
-                 # Also truncate the commit used for the announced urls
-                 commit.commit = commit.rev
--        # Extract the meta-information for the commit
--        commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
--        commit.files = " ".join(commit.files.strip().split("\n")[1:])
-         # Design choice: for git we ship only the first message line, which is
-         # conventionally supposed to be a summary of the commit.  Under
-         # other VCSes a different choice may be appropriate.
-@@ -309,7 +305,7 @@ class SvnExtractor(GenericExtractor):
-             if tok.startswith("--repository="):
-                 self.repository = tok[13:]
-         self.project = os.path.basename(self.repository)
--        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-+        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-         self.urlprefix = "viewcvs"
-         self.load_preferences(os.path.join(self.repository, "irker.conf"))
-         self.do_overrides()
-@@ -323,7 +319,6 @@ class SvnExtractor(GenericExtractor):
-         commit.rev = "r%s" % self.id
-         commit.author = self.svnlook("author")
-         commit.commit_date = self.svnlook("date").partition('(')[0]
--        commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ")
-         commit.logmsg = self.svnlook("log").strip()
-         return commit
-     def svnlook(self, info):
-@@ -367,7 +362,7 @@ class HgExtractor(GenericExtractor):
-         self.channels = ui.config('irker', 'channels')
-         self.email = ui.config('irker', 'email')
-         self.tcp = str(ui.configbool('irker', 'tcp'))  # converted to bool again in do_overrides
--        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-+        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-         self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier
-         self.color = ui.config('irker', 'color')
-         self.urlprefix = (ui.config('irker', 'urlprefix') or
-@@ -397,9 +392,6 @@ class HgExtractor(GenericExtractor):
-         commit.author_date = \
-             datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S')
-         commit.logmsg = ctx.description()
--        # Extract changed files from status against first parent
--        st = self.repository.status(ctx.p1().node(), ctx.node())
--        commit.files = ' '.join(st[0] + st[1] + st[2])
-         return commit
- 
- def hg_hook(ui, repo, **kwds):
-@@ -440,17 +432,6 @@ def ship(extractor, commit, debug):
-             sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
-             raise SystemExit(1)
- 
--    # Rewrite the file list if too long. The objective here is only
--    # to be easier on the eyes.
--    if extractor.cialike \
--           and extractor.cialike.lower() != "none" \
--           and len(metadata.files) > int(extractor.cialike):
--        files = metadata.files.split()
--        dirs = set([d.rpartition('/')[0] for d in files])
--        if len(dirs) == 1:
--            metadata.files = "(%s files)" % (len(files),)
--        else:
--            metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs))
-     # Message reduction.  The assumption here is that IRC can't handle
-     # lines more than 510 characters long. If we exceed that length, we
-     # try knocking out the file list, on the theory that for notification
-@@ -458,9 +439,6 @@ def ship(extractor, commit, debug):
-     # there's nothing much can be done other than ship it expecting the IRC
-     # server to truncate.
-     privmsg = unicode(metadata)
--    if len(privmsg) > 510:
--        metadata.files = ""
--        privmsg = unicode(metadata)
- 
-     # Anti-spamming guard.  It's deliberate that we get maxchannels not from
-     # the user-filtered metadata but from the extractor data - means repo

[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/files/

[Sam James]

commit:     57c3b63a002a67aad884624fc89fe57c50e94eb5
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Thu Mar 11 06:11:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 06:11:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c3b63a

net-irc/irker: remove bashisms from init script

Quote the ${parameter:=word} expansions (SC2223), while removing two
that are spurious.

Remove the -z test which does absolutely nothing. It can never be true,
because IRKERD_USER will always contain something. As an aside, the
"nobody" account is not intended for running services. If ever the test
is re-instated, it should be carried out _before_ checkpath is invoked,
for reasons that should be obvious.

Remove the use of the [[ keyword in favour of the POSIX test command
(SC3010).

Employ a vastly improved method of conveying the user-specified options.
Obviously, POSIX sh doesn't support arrays so we must still perform
word-splitting upon IRKERD_OPTS. However, potential pathname expansion
can still be suppressed with set -f, so let's do that.

Next, proceed to assemble a list of positional parameters using the set
builtin. This completely eliminates the possibility for word-splitting
and pathname expansion to be performed upon the other IRKERD_*
variables, instead conveying them verbatim. Note that the start function
is altered to define a ( ... ) compound command, so that the effects of
set -f do not persist beyond the intended scope of the function.

Closes: https://bugs.gentoo.org/760869
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/irker/files/irkerd.confd |  4 ++--
 net-irc/irker/files/irkerd.initd | 29 ++++++++++++-----------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/net-irc/irker/files/irkerd.confd b/net-irc/irker/files/irkerd.confd
index 42ae7323612..9b74518472c 100644
--- a/net-irc/irker/files/irkerd.confd
+++ b/net-irc/irker/files/irkerd.confd
@@ -12,8 +12,8 @@
 # Debug Level (critical, error, warning, info, debug)
 # IRKERD_LOGLEVEL=""
 
-# To run an anonymous irkerd safely. It should not be able
-# to write to anywhere on your system
+# To run an anonymous irkerd safely. It should not be able to write to anywhere
+# on your system. If the user is undefined or empty, it defaults to "nobody".
 # IRKERD_USER=""
 
 # see man pages for irkerd for valid cmdline options

diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd
index 6417d45ebf8..9a02708e2ee 100644
--- a/net-irc/irker/files/irkerd.initd
+++ b/net-irc/irker/files/irkerd.initd
@@ -2,32 +2,27 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-: ${pidfile:=/run/${RC_SVCNAME}.pid}
-
-: ${IRKERD_NICK:=}
-: ${IRKERD_PASSWORD:=}
-: ${IRKERD_USER:=nobody}
+: "${pidfile:=/run/${RC_SVCNAME}.pid}"
+: "${IRKERD_USER:=nobody}"
 
 depend() {
         use net
 }
 
-start () {
-	if [[ ${IRKERD_LOGFILE} ]] ; then
+start() (
+	if [ -n "${IRKERD_LOGFILE}" ] ; then
 		checkpath -f \
 			-o "${IRKERD_USER}" \
 			"${IRKERD_LOGFILE}" \
 			|| return 1
 	fi
 
-	if [[ -z "${IRKERD_USER}" ]] ; then
-		die "IRKERD_USER is mandatory"
-	fi
-
-	[[ -n "${IRKERD_LOGLEVEL}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}"
-	[[ -n "${IRKERD_LOGFILE}"  ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}"
-	[[ -n "${IRKERD_NICK}"     ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}"
-	[[ -n "${IRKERD_PASSWORD}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}"
+	set -f
+	set -- ${IRKERD_OPTS}
+	[ -n "${IRKERD_LOGLEVEL}" ] && set -- "$@" -d "${IRKERD_LOGLEVEL}"
+	[ -n "${IRKERD_LOGFILE}"  ] && set -- "$@" -l "${IRKERD_LOGFILE}"
+	[ -n "${IRKERD_NICK}"     ] && set -- "$@" -n "${IRKERD_NICK}"
+	[ -n "${IRKERD_PASSWORD}" ] && set -- "$@" -p "${IRKERD_PASSWORD}"
 
         ebegin "Starting ${RC_SVCNAME}"
         start-stop-daemon --start \
@@ -35,6 +30,6 @@ start () {
                 --user "${IRKERD_USER}" \
                 --make-pidfile --pidfile "${pidfile}" \
                 --exec /usr/bin/irkerd \
-                -- ${IRKERD_OPTS} < /dev/null
+                -- "$@" < /dev/null
         eend $?
-}
+)

[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/files/

[Sam James]

commit:     ce959a9a084b7c6497d5f80e02a771cefef3b397
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 06:12:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 06:12:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce959a9a

net-irc/irker: fix copyright header in files/irkerd.initd

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/irker/files/irkerd.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd
index 9a02708e2ee..cd4d1012e80 100644
--- a/net-irc/irker/files/irkerd.initd
+++ b/net-irc/irker/files/irkerd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 : "${pidfile:=/run/${RC_SVCNAME}.pid}"

[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/files/

[Conrad Kostecki]

commit:     99e3aacd8f3abf2e3eb08f9f89117899b6f61db1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 29 19:21:47 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed May 31 16:37:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e3aacd

net-irc/irker: remove unused patch

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

 net-irc/irker/files/irker-2.22-fix-tcpserver.patch | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/net-irc/irker/files/irker-2.22-fix-tcpserver.patch b/net-irc/irker/files/irker-2.22-fix-tcpserver.patch
deleted file mode 100644
index 1848a4430cc7..000000000000
--- a/net-irc/irker/files/irker-2.22-fix-tcpserver.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gitlab.com/esr/irker/-/merge_requests/29
-
-From da933d5188d88ef0557bda59f02188f164ad427c Mon Sep 17 00:00:00 2001
-From: "Frank Ch. Eigler" <fche@elastic.org>
-Date: Mon, 11 Apr 2022 15:43:22 +0000
-Subject: [PATCH] irkerd: correct typo to our internal TCP/UDP ipv6 server
- classes
-
---- a/irkerd
-+++ b/irkerd
-@@ -1131,8 +1131,8 @@ if __name__ == '__main__':
-             tcpserver = socketserver.TCPServer((args.host, PORT), IrkerTCPHandler)
-             udpserver = socketserver.UDPServer((args.host, PORT), IrkerUDPHandler)
-             # pylint: disable=undefined-variable
--            tcp6server = TCPServer((args.host6, PORT), IrkerTCPHandler)
--            udp6server = UDPServer((args.host6, PORT), IrkerUDPHandler)
-+            tcp6server = TCP6Server((args.host6, PORT), IrkerTCPHandler)
-+            udp6server = UDP6Server((args.host6, PORT), IrkerUDPHandler)
-             for server in [tcpserver, udpserver, tcp6server, udp6server]:
-                 server = threading.Thread(target=server.serve_forever)
-                 server.setDaemon(True)
-GitLab