From a47c655f9eeeea36f57378d7bcf42e820d1cb6eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 2 Sep 2021 23:42:51 +0200 Subject: [PATCH] - rediff patches --- inn-PLD.patch | 124 ++++++++++++++++++++++++---------------------- inn-install.patch | 9 ++-- 2 files changed, 70 insertions(+), 63 deletions(-) diff --git a/inn-PLD.patch b/inn-PLD.patch index 4ed2257..828c9bc 100644 --- a/inn-PLD.patch +++ b/inn-PLD.patch @@ -1,6 +1,30 @@ ---- inn-2.6.4/doc/man/rnews.1.orig 2021-05-16 18:02:27.608638493 +0200 -+++ inn-2.6.4/doc/man/rnews.1 2021-05-16 18:06:02.730806409 +0200 -@@ -191,7 +191,7 @@ +diff -urNp -x '*.orig' inn-2.6.4.org/Makefile.global.in inn-2.6.4/Makefile.global.in +--- inn-2.6.4.org/Makefile.global.in 2021-01-21 22:53:07.000000000 +0100 ++++ inn-2.6.4/Makefile.global.in 2021-09-02 23:41:48.986139529 +0200 +@@ -284,7 +284,7 @@ PATHTMP = $(tmpdir) + PATHAUTH = $(PATHBIN)/auth + PATHAUTHRESOLV = $(PATHAUTH)/resolv + PATHAUTHPASSWD = $(PATHAUTH)/passwd +-PATHRNEWS = $(PATHBIN)/rnews.libexec ++PATHRNEWS = @libdir@/news/rnews + PATHARCHIVE = $(PATHSPOOL)/archive + PATHARTICLES = $(PATHSPOOL)/articles + PATHINCOMING = $(PATHSPOOL)/incoming +@@ -316,8 +316,8 @@ INEWSMODE = @INEWSMODE@ + RNEWSMODE = @RNEWSMODE@ + FILEMODE = @FILEMODE@ + +-OWNER = -o $(RUNASUSER) -g $(RUNASGROUP) +-ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP) ++OWNER = ++ROWNER = + + INSTALL = $(top)/support/install-sh -p + +diff -urNp -x '*.orig' inn-2.6.4.org/doc/man/rnews.1 inn-2.6.4/doc/man/rnews.1 +--- inn-2.6.4.org/doc/man/rnews.1 2021-01-21 22:53:07.000000000 +0100 ++++ inn-2.6.4/doc/man/rnews.1 2021-09-02 23:41:48.986139529 +0200 +@@ -191,7 +191,7 @@ is more widely available, due to old pat .PP Otherwise, if the command is any other word and the \fB\-a\fR flag is not given, \fBrnews\fR will try to execute a program with that name, looking @@ -9,7 +33,7 @@ batch will be fed to that program's standard input, and the standard output from the program will be treated as if it were the original input to \fBrnews\fR. \s-1INN\s0 comes with three such standard batch processors: -@@ -210,7 +210,7 @@ +@@ -210,7 +210,7 @@ It invokes \fBgzip\fR and should be used .IP "\fB\-a\fR" 4 .IX Item "-a" By default, \fBrnews\fR looks for additional unpackers in the @@ -18,8 +42,29 @@ If \fB\-a\fR is given, no additional batch processor will be used; only \&\f(CW\*(C`rnews\*(C'\fR and \f(CW\*(C`cunbatch\*(C'\fR will be recognized as valid batch commands. .IP "\fB\-b\fR" 4 ---- inn-2.5.3/include/inn/paths.h.in.orig 2013-06-11 17:42:12.677373675 +0200 -+++ inn-2.5.3/include/inn/paths.h.in 2013-06-11 17:49:38.687364380 +0200 +diff -urNp -x '*.orig' inn-2.6.4.org/frontends/Makefile inn-2.6.4/frontends/Makefile +--- inn-2.6.4.org/frontends/Makefile 2021-01-21 22:53:07.000000000 +0100 ++++ inn-2.6.4/frontends/Makefile 2021-09-02 23:41:48.986139529 +0200 +@@ -38,11 +38,11 @@ install: all + for F in getlist innconfval sm ; do \ + $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \ + done +- $(CP_XPUB) bunbatch $D$(PATHBIN)/rnews.libexec/bunbatch +- $(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch +- $(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode +- $(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode +- $(CP_XPUB) gunbatch $D$(PATHBIN)/rnews.libexec/gunbatch ++ $(CP_XPUB) bunbatch $D$(PATHRNEWS)/bunbatch ++ $(CP_XPUB) c7unbatch $D$(PATHRNEWS)/c7unbatch ++ $(LI_XPUB) decode $D$(PATHRNEWS)/decode ++ $(LI_XPUB) encode $D$(PATHRNEWS)/encode ++ $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch + + bootstrap: $(MAN) + +diff -urNp -x '*.orig' inn-2.6.4.org/include/inn/paths.h.in inn-2.6.4/include/inn/paths.h.in +--- inn-2.6.4.org/include/inn/paths.h.in 2021-01-21 22:53:07.000000000 +0100 ++++ inn-2.6.4/include/inn/paths.h.in 2021-09-02 23:41:48.986139529 +0200 @@ -22,12 +22,12 @@ /* Default prefix path is pathbin. */ #define INN_PATH_NNRPD "nnrpd" @@ -35,42 +80,10 @@ /* Default prefix path is pathfilter. */ #define INN_PATH_PERL_STARTUP_INND "startup_innd.pl" ---- inn-2.5.3/Makefile.global.in.orig 2013-06-11 17:54:53.957357808 +0200 -+++ inn-2.5.3/Makefile.global.in 2013-06-11 17:57:11.437354942 +0200 -@@ -250,7 +250,7 @@ - PATHAUTH = $(PATHBIN)/auth - PATHAUTHRESOLV = $(PATHAUTH)/resolv - PATHAUTHPASSWD = $(PATHAUTH)/passwd --PATHRNEWS = $(PATHBIN)/rnews.libexec -+PATHRNEWS = @libdir@/news/rnews - PATHARCHIVE = $(PATHSPOOL)/archive - PATHARTICLES = $(PATHSPOOL)/articles - PATHINCOMING = $(PATHSPOOL)/incoming -@@ -282,8 +282,8 @@ - RNEWSMODE = @RNEWSMODE@ - FILEMODE = @FILEMODE@ - --OWNER = -o $(RUNASUSER) -g $(RUNASGROUP) --ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP) -+OWNER = -+ROWNER = - - INSTALL = $(top)/support/install-sh -c - ---- inn-2.5.3/scripts/scanlogs.in.orig 2013-06-11 17:57:46.774020873 +0200 -+++ inn-2.5.3/scripts/scanlogs.in 2013-06-11 17:59:15.287352361 +0200 -@@ -10,7 +10,7 @@ - ## norotate Do not rotate logfiles. - - ## Directory where old log files are kept. --OLD=${MOST_LOGS}/OLD -+OLD=/var/log/archive/news - - ## Files defined in innshellvars. We repeat them for clarity. - ERRLOG=${MOST_LOGS}/errlog ---- inn-2.5.3/scripts/inncheck.in.orig 2013-06-11 17:59:47.974018346 +0200 -+++ inn-2.5.3/scripts/inncheck.in 2013-06-11 18:00:16.837351078 +0200 -@@ -44,7 +44,7 @@ +diff -urNp -x '*.orig' inn-2.6.4.org/scripts/inncheck.in inn-2.6.4/scripts/inncheck.in +--- inn-2.6.4.org/scripts/inncheck.in 2021-01-21 22:53:07.000000000 +0100 ++++ inn-2.6.4/scripts/inncheck.in 2021-09-02 23:41:48.986139529 +0200 +@@ -44,7 +44,7 @@ my %paths = ( 'passwd.nntp', "$INN::Config::pathetc/passwd.nntp", 'readers.conf', "$INN::Config::pathetc/readers.conf", 'rnews', "$INN::Config::rnews", @@ -79,22 +92,15 @@ 'spooltemp', "$INN::Config::pathtmp", 'spool', "$INN::Config::patharticles", 'spoolnews', "$INN::Config::pathincoming", ---- inn-2.5.3/frontends/Makefile.orig 2013-06-11 17:59:47.977351680 +0200 -+++ inn-2.5.3/frontends/Makefile 2013-06-11 18:01:39.537349354 +0200 -@@ -36,11 +36,11 @@ - for F in getlist innconfval sm ; do \ - $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \ - done -- $(CP_XPUB) bunbatch $D$(PATHBIN)/rnews.libexec/bunbatch -- $(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch -- $(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode -- $(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode -- $(CP_XPUB) gunbatch $D$(PATHBIN)/rnews.libexec/gunbatch -+ $(CP_XPUB) bunbatch $D$(PATHRNEWS)/bunbatch -+ $(CP_XPUB) c7unbatch $D$(PATHRNEWS)/c7unbatch -+ $(LI_XPUB) decode $D$(PATHRNEWS)/decode -+ $(LI_XPUB) encode $D$(PATHRNEWS)/encode -+ $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch +diff -urNp -x '*.orig' inn-2.6.4.org/scripts/scanlogs.in inn-2.6.4/scripts/scanlogs.in +--- inn-2.6.4.org/scripts/scanlogs.in 2021-01-21 22:53:07.000000000 +0100 ++++ inn-2.6.4/scripts/scanlogs.in 2021-09-02 23:41:48.986139529 +0200 +@@ -10,7 +10,7 @@ + ## norotate Do not rotate logfiles. - bootstrap: $(MAN) + ## Directory where old log files are kept. +-OLD=${MOST_LOGS}/OLD ++OLD=/var/log/archive/news + ## Files defined in innshellvars. We repeat them for clarity. + ERRLOG=${MOST_LOGS}/errlog diff --git a/inn-install.patch b/inn-install.patch index 4c46935..12d2e3e 100644 --- a/inn-install.patch +++ b/inn-install.patch @@ -1,8 +1,9 @@ ---- inn-2.6.3/Makefile.global.in.orig 2020-11-07 17:33:18.128984967 +0100 -+++ inn-2.6.3/Makefile.global.in 2020-11-07 18:30:28.819400995 +0100 -@@ -337,7 +337,7 @@ +diff -urNp -x '*.orig' inn-2.6.4.org/Makefile.global.in inn-2.6.4/Makefile.global.in +--- inn-2.6.4.org/Makefile.global.in 2021-09-02 23:41:49.119470657 +0200 ++++ inn-2.6.4/Makefile.global.in 2021-09-02 23:41:49.199469335 +0200 +@@ -344,7 +344,7 @@ INSTALL = $(top)/support/install-sh -p - BACKUP_OPTION = -B .OLD + BACKUP_OPTION = -S .OLD -LI_SPRI = $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION) +LI_SPRI = $(LIBTOOLINST) $(INSTALL) -m 4550 $(BACKUP_OPTION) -- 2.44.0