From 7da037e0b3624ec45385b66422e4ab7bc8a046a9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Fri, 4 Nov 2022 08:15:57 +0100
Subject: [PATCH] Rel 7; bug was in 4.96 itself, so restore branch diff (which
 also includes fix now; https://bugs.exim.org/show_bug.cgi?id=2930)

---
 branch.sh | 3 ++-
 exim.spec | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/branch.sh b/branch.sh
index 22e9d86..961118f 100755
--- a/branch.sh
+++ b/branch.sh
@@ -11,7 +11,8 @@ repo=$package.git
 filter() {
     filterdiff \
         -x '*/test/*' \
-        -x '*/doc/*'
+        -x '*/doc/*' \
+        -x '*/release-process/*'
 }
 
 if [ ! -d $repo ]; then
diff --git a/exim.spec b/exim.spec
index 4eac068..a28156d 100644
--- a/exim.spec
+++ b/exim.spec
@@ -23,7 +23,7 @@ Summary(pl.UTF-8):	Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):	Servidor de correio eletrônico exim
 Name:		exim
 Version:	4.96
-Release:	6
+Release:	7
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons/SMTP
@@ -49,7 +49,7 @@ Source15:	%{name}4-smtp.pamd
 Source16:	%{name}on.png
 # sh branch.sh
 Patch100:	%{name}-git.patch
-# Patch100-md5:	393b8bbf42e4e25abc4ce32857ca6e95
+# Patch100-md5:	5024defa802005706d5b9e457004360d
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
@@ -174,7 +174,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-#%patch100 -p2
+%patch100 -p2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-- 
2.43.0