[rpms/inn] epel10.3: merge Patch14 and Patch17 into Patch1

[rpms/inn] epel10.3: merge Patch14 and Patch17 into Patch1

[Dominik 'Rathann' Mierzejewski]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10.3
Commit : 7999286c0bd55e78553afc781036e5a6d594b8be
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2020-09-13T01:57:21+02:00
Stats  : +45/-49 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/7999286c0bd55e78553afc781036e5a6d594b8be?branch=epel10.3

Log:
merge Patch14 and Patch17 into Patch1

---
diff --git a/inn-2.5.2-pconf.patch b/inn-2.5.2-pconf.patch
deleted file mode 100644
index c04d7f9..0000000
--- a/inn-2.5.2-pconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
---- inn-2.5.2/perl/INN/Config.pm.in.pfix	2010-06-29 17:13:57.507194722 +0200
-+++ inn-2.5.2/perl/INN/Config.pm.in	2010-06-29 17:14:32.270853010 +0200
-@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
- 
- ##  Then, process the variables provided by innconfval.
- my @INNCONFVAR = ();
--my @values = `${exec_prefix}/bin/innconfval -p`;
-+my @values = `${exec_prefix}/innconfval -p`;
- foreach my $line (@values) {
-   eval 'our '.$line;
-   if ($line =~ /^(.*?) = /m) {

diff --git a/inn-2.6.3-rh.patch b/inn-2.6.3-rh.patch
index 8181d47..2139158 100644
--- a/inn-2.6.3-rh.patch
+++ b/inn-2.6.3-rh.patch
@@ -57,3 +57,47 @@ diff -up inn-2.6.3/tests/lib/innconf-t.c.rh inn-2.6.3/tests/lib/innconf-t.c
      errors_uncapture();
      free(errors);
      errors = NULL;
+diff -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
+--- inn-2.5.2/perl/INN/Config.pm.in.pfix	2010-06-29 17:13:57.507194722 +0200
++++ inn-2.5.2/perl/INN/Config.pm.in	2010-06-29 17:14:32.270853010 +0200
+@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
+ 
+ ##  Then, process the variables provided by innconfval.
+ my @INNCONFVAR = ();
+-my @values = `${exec_prefix}/bin/innconfval -p`;
++my @values = `${exec_prefix}/innconfval -p`;
+ foreach my $line (@values) {
+   eval 'our '.$line;
+   if ($line =~ /^(.*?) = /m) {
+diff -up inn-2.5.1/scripts/Makefile.redhat_build inn-2.5.1/scripts/Makefile
+--- inn-2.5.1/scripts/Makefile.redhat_build	2009-12-01 14:06:00.977311656 +0100
++++ inn-2.5.1/scripts/Makefile	2009-12-01 14:06:00.977311656 +0100
+@@ -27,7 +27,7 @@ install: all
+ 	done
+ 	for F in innreport_inn.pm innshellvars innshellvars.pl \
+ 	         innshellvars.tcl ; do \
+-	    $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
++	    $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
+ 	done
+ 
+ bootstrap:
+diff -up inn-2.5.1/support/fixscript.in.redhat_build inn-2.5.1/support/fixscript.in
+--- inn-2.5.1/support/fixscript.in.redhat_build	2009-12-01 14:18:13.664811185 +0100
++++ inn-2.5.1/support/fixscript.in	2009-12-01 14:18:50.024811262 +0100
+@@ -26,6 +26,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ libdir="@libdir@"
+ libperldir="@LIBPERLDIR@"
++libexecdir="@libexecdir@"
+ 
+ # We can probably just assume sed is on the path, but since we have it, we may
+ # as well use it.
+@@ -60,7 +61,7 @@ interpreter=`head -n 1 "$input"`
+ case "$interpreter" in
+ */sh|*SH*)
+     path="@SHELL@"
+-    lib=". $libdir/innshellvars"
++    lib=". $libexecdir/news/innshellvars"
+     ;;
+ */perl*|*PERL*)
+     path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`

diff --git a/inn-redhat_build.patch b/inn-redhat_build.patch
deleted file mode 100644
index e8c8591..0000000
--- a/inn-redhat_build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up inn-2.5.1/scripts/Makefile.redhat_build inn-2.5.1/scripts/Makefile
---- inn-2.5.1/scripts/Makefile.redhat_build	2009-12-01 14:06:00.977311656 +0100
-+++ inn-2.5.1/scripts/Makefile	2009-12-01 14:06:00.977311656 +0100
-@@ -27,7 +27,7 @@ install: all
- 	done
- 	for F in innreport_inn.pm innshellvars innshellvars.pl \
- 	         innshellvars.tcl ; do \
--	    $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
-+	    $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
- 	done
- 
- bootstrap:
-diff -up inn-2.5.1/support/fixscript.in.redhat_build inn-2.5.1/support/fixscript.in
---- inn-2.5.1/support/fixscript.in.redhat_build	2009-12-01 14:18:13.664811185 +0100
-+++ inn-2.5.1/support/fixscript.in	2009-12-01 14:18:50.024811262 +0100
-@@ -26,6 +26,7 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- libdir="@libdir@"
- libperldir="@LIBPERLDIR@"
-+libexecdir="@libexecdir@"
- 
- # We can probably just assume sed is on the path, but since we have it, we may
- # as well use it.
-@@ -60,7 +61,7 @@ interpreter=`head -n 1 "$input"`
- case "$interpreter" in
- */sh|*SH*)
-     path="@SHELL@"
--    lib=". $libdir/innshellvars"
-+    lib=". $libexecdir/news/innshellvars"
-     ;;
- */perl*|*PERL*)
-     path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`

diff --git a/inn.spec b/inn.spec
index 0efb993..1044d01 100644
--- a/inn.spec
+++ b/inn.spec
@@ -24,8 +24,6 @@ Source26: innd-rnews.timer
 Patch1: inn-2.6.3-rh.patch
 Patch2: inn-2.6.3-filterPath.patch
 Patch4: inn-2.6.0.pie.patch
-Patch14: inn-redhat_build.patch
-patch17: inn-2.5.2-pconf.patch
 BuildRequires: autoconf
 BuildRequires: byacc
 BuildRequires: cyrus-sasl-devel
@@ -118,9 +116,6 @@ gpgv2 --keyring %{S:3} %{S:1} %{S:0}
 %patch1 -p1 -b .rh
 %patch2 -p1 -b .gcc10
 %patch4 -p1 -b .pie
-%patch14 -p1 -b .redhat_build
-
-%patch17 -p1 -b .pfix
 
 %build
 %configure \
@@ -628,6 +623,7 @@ fi
 - follow current guidelines for systemd units packaging
 - drop Patch6 (upstream says it's formally incorrect)
 - drop Patch7 (doesn't seem to fix any warnings)
+- merge Patch14 and Patch17 into Patch1
 
 * Wed Sep 09 2020 Petr Viktorin <pviktori@redhat.com> - 2.6.3-9
 - Switch BuildRequires to python3