inn-PLD.patch

   1 diff -urNp -x '*.orig' inn-2.6.4.org/Makefile.global.in inn-2.6.4/Makefile.global.in
   2 --- inn-2.6.4.org/Makefile.global.in    2021-01-21 22:53:07.000000000 +0100
   3 +++ inn-2.6.4/Makefile.global.in        2021-09-02 23:41:48.986139529 +0200
   4 @@ -284,7 +284,7 @@ PATHTMP             = $(tmpdir)
   5  PATHAUTH       = $(PATHBIN)/auth
   6  PATHAUTHRESOLV = $(PATHAUTH)/resolv
   7  PATHAUTHPASSWD = $(PATHAUTH)/passwd
   8 -PATHRNEWS      = $(PATHBIN)/rnews.libexec
   9 +PATHRNEWS      = @libdir@/news/rnews
  10  PATHARCHIVE    = $(PATHSPOOL)/archive
  11  PATHARTICLES   = $(PATHSPOOL)/articles
  12  PATHINCOMING   = $(PATHSPOOL)/incoming
  13 @@ -316,8 +316,8 @@ INEWSMODE   = @INEWSMODE@
  14  RNEWSMODE      = @RNEWSMODE@
  15  FILEMODE       = @FILEMODE@
  16
  17 -OWNER          = -o $(RUNASUSER) -g $(RUNASGROUP)
  18 -ROWNER         = -o $(RUNASUSER) -g $(RNEWSGROUP)
  19 +OWNER          =
  20 +ROWNER         =
  21
  22  INSTALL                = $(top)/support/install-sh -p
  23
  24 diff -urNp -x '*.orig' inn-2.6.4.org/doc/man/rnews.1 inn-2.6.4/doc/man/rnews.1
  25 --- inn-2.6.4.org/doc/man/rnews.1       2021-01-21 22:53:07.000000000 +0100
  26 +++ inn-2.6.4/doc/man/rnews.1   2021-09-02 23:41:48.986139529 +0200
  27 @@ -191,7 +191,7 @@ is more widely available, due to old pat
  28  .PP
  29  Otherwise, if the command is any other word and the \fB\-a\fR flag is not
  30  given, \fBrnews\fR will try to execute a program with that name, looking
  31 -for it in the directory \fIpathbin\fR/rnews.libexec.  The rest of the
  32 +for it in the directory /usr/lib*/news/rnews .  The rest of the
  33  batch will be fed to that program's standard input, and the standard
  34  output from the program will be treated as if it were the original
  35  input to \fBrnews\fR.  \s-1INN\s0 comes with three such standard batch processors:
  36 @@ -210,7 +210,7 @@ It invokes \fBgzip\fR and should be used
  37  .IP "\fB\-a\fR" 4
  38  .IX Item "-a"
  39  By default, \fBrnews\fR looks for additional unpackers in the
  40 -\&\fIrnews.libexec\fR sub-directory of \fIpathbin\fR (as set in \fIinn.conf\fR).
  41 +/usr/lib*/news/rnews directory (as set in \fIinn.conf\fR).
  42  If \fB\-a\fR is given, no additional batch processor will be used; only
  43  \&\f(CW\*(C`rnews\*(C'\fR and \f(CW\*(C`cunbatch\*(C'\fR will be recognized as valid batch commands.
  44  .IP "\fB\-b\fR" 4
  45 diff -urNp -x '*.orig' inn-2.6.4.org/frontends/Makefile inn-2.6.4/frontends/Makefile
  46 --- inn-2.6.4.org/frontends/Makefile    2021-01-21 22:53:07.000000000 +0100
  47 +++ inn-2.6.4/frontends/Makefile        2021-09-02 23:41:48.986139529 +0200
  48 @@ -38,11 +38,11 @@ install: all
  49         for F in getlist innconfval sm ; do \
  50             $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \
  51         done
  52 -       $(CP_XPUB) bunbatch $D$(PATHBIN)/rnews.libexec/bunbatch
  53 -       $(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch
  54 -       $(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode
  55 -       $(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode
  56 -       $(CP_XPUB) gunbatch $D$(PATHBIN)/rnews.libexec/gunbatch
  57 +       $(CP_XPUB) bunbatch $D$(PATHRNEWS)/bunbatch
  58 +       $(CP_XPUB) c7unbatch $D$(PATHRNEWS)/c7unbatch
  59 +       $(LI_XPUB) decode $D$(PATHRNEWS)/decode
  60 +       $(LI_XPUB) encode $D$(PATHRNEWS)/encode
  61 +       $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch
  62
  63  bootstrap: $(MAN)
  64
  65 diff -urNp -x '*.orig' inn-2.6.4.org/include/inn/paths.h.in inn-2.6.4/include/inn/paths.h.in
  66 --- inn-2.6.4.org/include/inn/paths.h.in        2021-01-21 22:53:07.000000000 +0100
  67 +++ inn-2.6.4/include/inn/paths.h.in    2021-09-02 23:41:48.986139529 +0200
  68 @@ -22,12 +22,12 @@
  69  /* Default prefix path is pathbin. */
  70  #define INN_PATH_NNRPD                  "nnrpd"
  71  #define INN_PATH_NNTPD                  "nnrpd"
  72 -#define INN_PATH_AUTHDIR                "auth"
  73 +#define INN_PATH_AUTHDIR                "@libdir@/news/auth"
  74  #define INN_PATH_AUTHDIR_GENERIC        "generic"
  75  #define INN_PATH_AUTHDIR_NOPASS         "resolv"
  76  #define INN_PATH_AUTHDIR_PASSWD         "passwd"
  77  #define INN_PATH_CTLINND                "ctlinnd"
  78 -#define INN_PATH_RNEWSPROGS             "rnews.libexec"
  79 +#define INN_PATH_RNEWSPROGS             "@libdir@/news/rnews"
  80
  81  /* Default prefix path is pathfilter. */
  82  #define INN_PATH_PERL_STARTUP_INND      "startup_innd.pl"
  83 diff -urNp -x '*.orig' inn-2.6.4.org/scripts/inncheck.in inn-2.6.4/scripts/inncheck.in
  84 --- inn-2.6.4.org/scripts/inncheck.in   2021-01-21 22:53:07.000000000 +0100
  85 +++ inn-2.6.4/scripts/inncheck.in       2021-09-02 23:41:48.986139529 +0200
  86 @@ -44,7 +44,7 @@ my %paths = (
  87      'passwd.nntp',     "$INN::Config::pathetc/passwd.nntp",
  88      'readers.conf',    "$INN::Config::pathetc/readers.conf",
  89      'rnews',           "$INN::Config::rnews",
  90 -    'rnewsprogs',      "$INN::Config::pathbin/rnews.libexec",
  91 +    'rnewsprogs',      "@libdir@/news/rnews",
  92      'spooltemp',       "$INN::Config::pathtmp",
  93      'spool',           "$INN::Config::patharticles",
  94      'spoolnews',       "$INN::Config::pathincoming",
  95 diff -urNp -x '*.orig' inn-2.6.4.org/scripts/scanlogs.in inn-2.6.4/scripts/scanlogs.in
  96 --- inn-2.6.4.org/scripts/scanlogs.in   2021-01-21 22:53:07.000000000 +0100
  97 +++ inn-2.6.4/scripts/scanlogs.in       2021-09-02 23:41:48.986139529 +0200
  98 @@ -10,7 +10,7 @@
  99  ##     norotate        Do not rotate logfiles.
 100
 101  ##  Directory where old log files are kept.
 102 -OLD=${MOST_LOGS}/OLD
 103 +OLD=/var/log/archive/news
 104
 105  ##  Files defined in innshellvars.  We repeat them for clarity.
 106  ERRLOG=${MOST_LOGS}/errlog