[packages/exim] Rel 3; bring back all git fixes
arekm
arekm at pld-linux.org
Mon Sep 12 11:11:43 CEST 2022
commit 0c83653cb38d8b94496d008641b9b0703c25f1ab
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Sep 12 11:10:18 2022 +0200
Rel 3; bring back all git fixes
branch.sh | 13 ++++++-------
exim.spec | 8 +++-----
2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/exim.spec b/exim.spec
index da8ffa3..cb04115 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: 2
+Release: 3
Epoch: 2
License: GPL v2+
Group: Networking/Daemons/SMTP
@@ -48,10 +48,8 @@ Source14: ftp://ftp.exim.org/pub/exim/exim4/old/config.samples.tar.bz2
Source15: %{name}4-smtp.pamd
Source16: %{name}on.png
# sh branch.sh
-# Patch100: %{name}-git.patch
-# manually created patch with upstream fixes
-Patch100: %{name}-git-manual.patch
-# Patch100-md5: 706af51f29db2a91422081491fb85d87
+Patch100: %{name}-git.patch
+# Patch100-md5: 740ae0b0e536781a04fd566d8e523fe9
Patch0: %{name}4-EDITME.patch
Patch1: %{name}4-monitor-EDITME.patch
Patch2: %{name}4-cflags.patch
diff --git a/branch.sh b/branch.sh
index 117650d..22e9d86 100755
--- a/branch.sh
+++ b/branch.sh
@@ -2,17 +2,16 @@
set -e
url=git://git.exim.org/exim.git
package=exim
-tag=exim-4.95
-branch=exim-4.95+fixes
+tag=exim-4.96
+branch=master
out=$package-git.patch
repo=$package.git
-echo "No usable branch on upstream git repository... exiting" >&2
-exit 1
-
# use filterdiff, etc to exclude bad chunks from diff
filter() {
- cat
+ filterdiff \
+ -x '*/test/*' \
+ -x '*/doc/*'
}
if [ ! -d $repo ]; then
@@ -21,7 +20,7 @@ fi
cd $repo
git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag
- git log -p --reverse $tag..$branch ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" | filter > ../$out.tmp
+ git log -p --reverse --first-parent $tag..$branch ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" | filter > ../$out.tmp
cd ..
if cmp -s $out{,.tmp}; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exim.git/commitdiff/0c83653cb38d8b94496d008641b9b0703c25f1ab
More information about the pld-cvs-commit
mailing list