8 files changed, 185 insertions, 0 deletions
diff --git a/debian/patches/0001-dfsg.patch b/debian/patches/0001-dfsg.patch
new file mode 100644
index 0000000..4b6ae0e
--- /dev/null
+++ b/debian/patches/0001-dfsg.patch
@@ -0,0 +1,22 @@
+From: Daniel Baumann <mail@daniel-baumann.ch>
+Date: Sun, 13 May 2018 15:07:57 +0200
+Subject: Removing logo (no origin known and no source available)
+
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ccb366c..92289d4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,8 +87,7 @@ SOURCES = \
+ 
+ EXTRA_DIST = \
+ 	org.catb.irkerd.plist \
+-	irkerd.service \
+-	irker-logo.png
++	irkerd.service
+ 
+ version:
+ 	@echo $(VERS)
diff --git a/debian/patches/0005-author-name.patch b/debian/patches/0005-author-name.patch
new file mode 100644
index 0000000..94534a2
--- /dev/null
+++ b/debian/patches/0005-author-name.patch
@@ -0,0 +1,21 @@
+From: Daniel Baumann <mail@daniel-baumann.ch>
+Date: Sun, 13 May 2018 15:07:57 +0200
+Subject: Use author_name instead of author in Git notifications.
+
+---
+ irkerhook.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index cf787ed..1d3226c 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -341,7 +341,7 @@ class GitExtractor(GenericExtractor):
+         # Might be be nice to ship the full email address, if not
+         # for spammers' address harvesters - getting this wrong
+         # would make the freenode #commits channel into harvester heaven.
+-        commit.author = commit.mail.split("@")[0]
++        commit.author = commit.author_name
+         commit.author_date, commit.commit_date = \
+             do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
+         return commit
diff --git a/debian/patches/0007-Fix-syntax-error-in-irkerhook.py.patch b/debian/patches/0007-Fix-syntax-error-in-irkerhook.py.patch
new file mode 100644
index 0000000..2bf9c27
--- /dev/null
+++ b/debian/patches/0007-Fix-syntax-error-in-irkerhook.py.patch
@@ -0,0 +1,22 @@
+From: Neil Muller <drnlmuller+debian@gmail.com>
+Date: Sun, 5 Feb 2023 11:31:39 +0200
+Subject: Fix syntax error in irkerhook.py
+
+Bug-Upstream: https://gitlab.com/esr/irker/-/merge_requests/32
+---
+ irkerhook.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 1d3226c..208b756 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -49,7 +49,7 @@ version = "2.21"
+ # pylint: disable=multiple-imports,wrong-import-position
+ import os, sys, socket, subprocess, locale, datetime, re
+ 
+-try
++try:
+     from shlex import quote as shellquote
+ except ImportError:
+     from pipes import quote as shellquote
diff --git a/debian/patches/0007-irkerhook-git.patch b/debian/patches/0007-irkerhook-git.patch
new file mode 100644
index 0000000..b92bd3c
--- /dev/null
+++ b/debian/patches/0007-irkerhook-git.patch
@@ -0,0 +1,28 @@
+From: Neil Muller <drnlmuller+debian@gmail.com>
+Date: Sun, 13 May 2018 15:07:57 +0200
+Subject: Add description for the irkerhook-git helper script.
+
+The debian packages add a irkerhook-git helper script, which simplifies
+the most common use case for irkerhook with git. This patch mentions the
+helper script in the irkerhook manpage.
+Last-Update: 2016-03-15
+---
+ irkerhook.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/irkerhook.xml b/irkerhook.xml
+index 54b7425..9bddd08 100644
+--- a/irkerhook.xml
++++ b/irkerhook.xml
+@@ -220,6 +220,11 @@ while read old new refname; do
+ done
+ </programlisting>
+ 
++<para>For convenience, this is implemented by the irkerhook-git
++helper script. This script will complain about some common configuration
++isssues. For simplicity, irkerhook-git does not support all the
++options of irkerhook.py, and is thus not suitable for all applications.</para>
++
+ <para>Preferences may be set in the repo <filename>config</filename>
+ file in an [irker] section. Here is an example of what that can look
+ like:</para>
diff --git a/debian/patches/0009-env-service.patch b/debian/patches/0009-env-service.patch
new file mode 100644
index 0000000..08abe7f
--- /dev/null
+++ b/debian/patches/0009-env-service.patch
@@ -0,0 +1,29 @@
+From: Python Applications Packaging Team
+ <python-apps-team@lists.alioth.debian.org>
+Date: Sun, 13 May 2018 15:07:57 +0200
+Subject: env-service
+
+    Properly import environment from /etc/defaults (Closes: #832322)
+
+    This fixes a regression in the systemd unit, which doesn't support
+    the equivalent /etc/default/irker configuration supported by the
+    sysvinit startup scripts.
+---
+ irkerd.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/irkerd.service b/irkerd.service
+index 4e75ae2..70b67d5 100644
+--- a/irkerd.service
++++ b/irkerd.service
+@@ -8,8 +8,8 @@ Documentation=man:irkerd(8) man:irkerhook(1) man:irk(1)
+ 
+ [Service]
+ User=irker
+-ExecStart=/usr/bin/irkerd
+-User=irker
++EnvironmentFile=-/etc/default/irker
++ExecStart=/usr/bin/irkerd $IRKER_OPTIONS
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/debian/patches/0015-Update-irkerhook-documentation-to-python-3.patch b/debian/patches/0015-Update-irkerhook-documentation-to-python-3.patch
new file mode 100644
index 0000000..ef217c6
--- /dev/null
+++ b/debian/patches/0015-Update-irkerhook-documentation-to-python-3.patch
@@ -0,0 +1,23 @@
+From: Neil Muller <drnlmuller+debian@gmail.com>
+Date: Thu, 5 Sep 2019 18:08:11 +0200
+Subject: Update irkerhook documentation to python 3
+
+Change the example program to use python3 in the irkerhook
+documentation.
+---
+ irkerhook.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/irkerhook.xml b/irkerhook.xml
+index 9bddd08..77b5d9f 100644
+--- a/irkerhook.xml
++++ b/irkerhook.xml
+@@ -374,7 +374,7 @@ metadata = json.loads(sys.argv[1])
+ 
+ metadata['author'] = "The Great and Powerful Oz"
+ 
+-print json.dumps(metadata)
++print(json.dumps(metadata))
+ # end
+ </programlisting>
+ 
diff --git a/debian/patches/0016-Update-shebangs.patch b/debian/patches/0016-Update-shebangs.patch
new file mode 100644
index 0000000..52be91e
--- /dev/null
+++ b/debian/patches/0016-Update-shebangs.patch
@@ -0,0 +1,33 @@
+From: Neil Muller <drnlmuller+debian@gmail.com>
+Date: Thu, 5 Sep 2019 18:08:51 +0200
+Subject: Update shebangs
+
+Change the shebangs to use python3 so we get the correct result
+when we build the package.
+---
+ filter-example.py | 2 +-
+ filter-test.py    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/filter-example.py b/filter-example.py
+index 922f941..094d0b7 100755
+--- a/filter-example.py
++++ b/filter-example.py
+@@ -9,5 +9,5 @@ metadata = json.loads(sys.argv[1])
+ 
+ metadata['author'] = "The Great and Powerful Oz"
+ 
+-print json.dumps(metadata)
++print(json.dumps(metadata))
+ # end
+diff --git a/filter-test.py b/filter-test.py
+index 9c42b71..82c0660 100755
+--- a/filter-test.py
++++ b/filter-test.py
+@@ -31,5 +31,5 @@ else:
+ 
+ time.sleep(1.5)	# Avoid a race condition
+ 
+-print json.dumps(metadata)
++print(json.dumps(metadata))
+ # end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f271c35
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+0001-dfsg.patch
+0005-author-name.patch
+0007-irkerhook-git.patch
+0009-env-service.patch
+0015-Update-irkerhook-documentation-to-python-3.patch
+0016-Update-shebangs.patch
+0007-Fix-syntax-error-in-irkerhook.py.patch