inn-PLD.patch

   1 --- inn-2.5.3/doc/man/rnews.1.orig      2013-06-11 17:19:04.427402611 +0200
   2 +++ inn-2.5.3/doc/man/rnews.1   2013-06-11 17:41:12.624041596 +0200
   3 @@ -181,7 +181,7 @@
   4  .PP
   5  Otherwise, if the command is any other word, then \fBrnews\fR will try to
   6  execute a program with that name, looking for it in the directory
   7 -\&\fIpathbin\fR/rnews.libexec.  The rest of the batch will be fed to that
   8 +/usr/lib*/news/rnews .  The rest of the batch will be fed to that
   9  program's standard input, and the standard output from the program will be
  10  treated as if it were the original input to \fBrnews\fR.  \s-1INN\s0 comes with three
  11  such standard batch processors:
  12 --- inn-2.5.3/include/inn/paths.h.in.orig       2013-06-11 17:42:12.677373675 +0200
  13 +++ inn-2.5.3/include/inn/paths.h.in    2013-06-11 17:49:38.687364380 +0200
  14 @@ -22,12 +22,12 @@
  15  /* Default prefix path is pathbin. */
  16  #define INN_PATH_NNRPD                  "nnrpd"
  17  #define INN_PATH_NNTPD                  "nnrpd"
  18 -#define INN_PATH_AUTHDIR                "auth"
  19 +#define INN_PATH_AUTHDIR                "@libdir@/news/auth"
  20  #define INN_PATH_AUTHDIR_GENERIC        "generic"
  21  #define INN_PATH_AUTHDIR_NOPASS         "resolv"
  22  #define INN_PATH_AUTHDIR_PASSWD         "passwd"
  23  #define INN_PATH_CTLINND                "ctlinnd"
  24 -#define INN_PATH_RNEWSPROGS             "rnews.libexec"
  25 +#define INN_PATH_RNEWSPROGS             "@libdir@/news/rnews"
  26
  27  /* Default prefix path is pathfilter. */
  28  #define INN_PATH_PERL_STARTUP_INND      "startup_innd.pl"
  29 --- inn-2.5.3/Makefile.global.in.orig   2013-06-11 17:54:53.957357808 +0200
  30 +++ inn-2.5.3/Makefile.global.in        2013-06-11 17:57:11.437354942 +0200
  31 @@ -250,7 +250,7 @@
  32  PATHAUTH       = $(PATHBIN)/auth
  33  PATHAUTHRESOLV = $(PATHAUTH)/resolv
  34  PATHAUTHPASSWD = $(PATHAUTH)/passwd
  35 -PATHRNEWS      = $(PATHBIN)/rnews.libexec
  36 +PATHRNEWS      = @libdir@/news/rnews
  37  PATHARCHIVE    = $(PATHSPOOL)/archive
  38  PATHARTICLES   = $(PATHSPOOL)/articles
  39  PATHINCOMING   = $(PATHSPOOL)/incoming
  40 @@ -282,8 +282,8 @@
  41  RNEWSMODE      = @RNEWSMODE@
  42  FILEMODE       = @FILEMODE@
  43
  44 -OWNER          = -o $(RUNASUSER) -g $(RUNASGROUP)
  45 -ROWNER         = -o $(RUNASUSER) -g $(RNEWSGROUP)
  46 +OWNER          =
  47 +ROWNER         =
  48
  49  INSTALL                = $(top)/support/install-sh -c
  50
  51 --- inn-2.5.3/scripts/scanlogs.in.orig  2013-06-11 17:57:46.774020873 +0200
  52 +++ inn-2.5.3/scripts/scanlogs.in       2013-06-11 17:59:15.287352361 +0200
  53 @@ -10,7 +10,7 @@
  54  ##     norotate        Do not rotate logfiles.
  55
  56  ##  Directory where old log files are kept.
  57 -OLD=${MOST_LOGS}/OLD
  58 +OLD=/var/log/archive/news
  59
  60  ##  Files defined in innshellvars.  We repeat them for clarity.
  61  ERRLOG=${MOST_LOGS}/errlog
  62 --- inn-2.5.3/scripts/inncheck.in.orig  2013-06-11 17:59:47.974018346 +0200
  63 +++ inn-2.5.3/scripts/inncheck.in       2013-06-11 18:00:16.837351078 +0200
  64 @@ -44,7 +44,7 @@
  65      'passwd.nntp',     "$INN::Config::pathetc/passwd.nntp",
  66      'readers.conf',    "$INN::Config::pathetc/readers.conf",
  67      'rnews',           "$INN::Config::rnews",
  68 -    'rnewsprogs',      "$INN::Config::pathbin/rnews.libexec",
  69 +    'rnewsprogs',      "@libdir@/news/rnews",
  70      'spooltemp',       "$INN::Config::pathtmp",
  71      'spool',           "$INN::Config::patharticles",
  72      'spoolnews',       "$INN::Config::pathincoming",
  73 --- inn-2.5.3/frontends/Makefile.orig   2013-06-11 17:59:47.977351680 +0200
  74 +++ inn-2.5.3/frontends/Makefile        2013-06-11 18:01:39.537349354 +0200
  75 @@ -36,11 +36,11 @@
  76         for F in getlist innconfval sm ; do \
  77             $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \
  78         done
  79 -       $(CP_XPUB) bunbatch $D$(PATHBIN)/rnews.libexec/bunbatch
  80 -       $(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch
  81 -       $(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode
  82 -       $(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode
  83 -       $(CP_XPUB) gunbatch $D$(PATHBIN)/rnews.libexec/gunbatch
  84 +       $(CP_XPUB) bunbatch $D$(PATHRNEWS)/bunbatch
  85 +       $(CP_XPUB) c7unbatch $D$(PATHRNEWS)/c7unbatch
  86 +       $(LI_XPUB) decode $D$(PATHRNEWS)/decode
  87 +       $(LI_XPUB) encode $D$(PATHRNEWS)/encode
  88 +       $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch
  89
  90  bootstrap: $(MAN)
  91