inn-PLD.patch

   1 diff -Nur inn-2.4.0.orig/doc/man/rnews.1 inn-2.4.0/doc/man/rnews.1
   2 --- inn-2.4.0.orig/doc/man/rnews.1      2003-05-09 06:25:27.000000000 +0200
   3 +++ inn-2.4.0/doc/man/rnews.1   2003-06-29 12:58:27.000000000 +0200
   4 @@ -67,7 +67,7 @@
   5  is defined and the command is any other word, then
   6  .I rnews
   7  will try to execute a program with that name in the directory
   8 -.IR <pathbin\ in\ inn.conf>/bin/rnews.libexec .
   9 +.IR /usr/lib*/news/rnews .
  10
  11  The batch will be fed into the program's standard input, and the
  12  standard output will be read back as input into
  13 diff -Nur inn-2.4.0.orig/include/paths.h.in inn-2.4.0/include/paths.h.in
  14 --- inn-2.4.0.orig/include/paths.h.in   2003-05-09 06:25:27.000000000 +0200
  15 +++ inn-2.4.0/include/paths.h.in        2003-06-29 12:57:56.000000000 +0200
  16 @@ -19,12 +19,12 @@
  17  /* Default prefix path is pathbin. */
  18  #define _PATH_NNRPD            "nnrpd"
  19  #define _PATH_NNTPD            "nnrpd"
  20 -#define _PATH_AUTHDIR          "auth"
  21 +#define _PATH_AUTHDIR          "@libdir@/news/auth"
  22  #define _PATH_AUTHDIR_GENERIC  "generic"
  23  #define _PATH_AUTHDIR_NOPASS   "resolv"
  24  #define _PATH_AUTHDIR_PASSWD   "passwd"
  25  #define _PATH_CTLINND          "ctlinnd"
  26 -#define _PATH_RNEWSPROGS       "rnews.libexec"
  27 +#define _PATH_RNEWSPROGS       "@libdir@/news/rnews"
  28
  29  /* Default prefix path is pathfilter. */
  30  #define _PATH_TCL_STARTUP      "startup.tcl"
  31 diff -Nur inn-2.4.0.orig/Makefile inn-2.4.0/Makefile
  32 --- inn-2.4.0.orig/Makefile     2003-05-09 06:25:27.000000000 +0200
  33 +++ inn-2.4.0/Makefile  2003-06-29 12:57:10.000000000 +0200
  34 @@ -75,7 +75,7 @@
  35  ##  Installation rules.  make install installs everything; make update only
  36  ##  updates the binaries, scripts, and documentation and leaves config
  37  ##  files alone.
  38 -install: directories
  39 +install:
  40         @for D in $(ALLDIRS) ; do \
  41             echo '' ; \
  42             cd $$D && $(MAKE) install || exit 1 ; cd .. ; \
  43 @@ -91,9 +91,9 @@
  44  directories:
  45         @chmod +x support/install-sh
  46         for D in $(INSTDIRS) ; do \
  47 -           support/install-sh $(OWNER) -m 0755 -d $(D)$$D ; \
  48 +           support/install-sh -m 0755 -d $(D)$$D ; \
  49         done
  50 -       support/install-sh $(OWNER) -m 0750 -d $(D)$(PATHRUN)
  51 +       support/install-sh -m 0750 -d $(D)$(PATHRUN)
  52
  53  update:
  54         @chmod +x support/install-sh
  55 --- inn-2.4.2.orig/Makefile.global.in   2003-05-09 06:25:27.000000000 +0200
  56 +++ inn-2.4.2/Makefile.global.in        2003-06-29 12:59:13.000000000 +0200
  57 @@ -213,7 +213,7 @@
  58  PATHAUTH        = $(PATHBIN)/auth
  59  PATHAUTHRESOLV  = $(PATHAUTH)/resolv
  60  PATHAUTHPASSWD  = $(PATHAUTH)/passwd
  61 -PATHRNEWS       = $(PATHBIN)/rnews.libexec
  62 +PATHRNEWS       = @libdir@/news/rnews
  63  PATHARCHIVE     = $(PATHSPOOL)/archive
  64  PATHARTICLES    = $(PATHSPOOL)/articles
  65  PATHINCOMING    = $(PATHSPOOL)/incoming
  66 @@ -234,16 +234,7 @@
  67  ##  configure; inews and rnews are special and have configure flags to
  68  ##  control how they're installed.  See INSTALL for more information.
  69
  70 -NEWSUSER        = @NEWSUSER@
  71 -NEWSGROUP       = @NEWSGRP@
  72 -
  73 -INEWSMODE       = @INEWSMODE@
  74 -RNEWSMODE       = @RNEWSMODE@
  75  FILEMODE        = @FILEMODE@
  76 -
  77 -OWNER           = -o $(NEWSUSER) -g $(NEWSGROUP)
  78 -ROWNER          = -o $(NEWSUSER) -g @RNEWSGRP@
  79 -
  80  INSTALL         = $(top)/support/install-sh -c
  81
  82  ##  Installation commands.  These commands are used by the installation
  83 diff -Nur inn-2.4.0.orig/scripts/scanlogs.in inn-2.4.0/scripts/scanlogs.in
  84 --- inn-2.4.0.orig/scripts/scanlogs.in  2003-05-09 06:25:27.000000000 +0200
  85 +++ inn-2.4.0/scripts/scanlogs.in       2003-06-29 12:58:56.000000000 +0200
  86 @@ -11,7 +11,7 @@
  87  ##  then get a better egrep, like the FSF one.
  88
  89  ##  Directory where old log files are kept.
  90 -OLD=${MOST_LOGS}/OLD
  91 +OLD=/var/log/archive/news
  92  ##  If you want to archive the active file, enable this line.
  93  ACTIVEFILE=${ACTIVE}
  94  ##  Number of lines of error in each category to report.
  95 --- inn-2.4.2/scripts/inncheck.in.orig  2004-12-22 05:21:19.000000000 +0100
  96 +++ inn-2.4.2/scripts/inncheck.in       2004-12-28 20:36:22.804969760 +0100
  97 @@ -43,7 +43,7 @@
  98      'passwd.nntp',     "$inn::pathetc/passwd.nntp",
  99      'readers.conf',    "$inn::pathetc/readers.conf",
 100      'rnews',           "$inn::pathbin/rnews",
 101 -    'rnewsprogs',      "$inn::pathbin/rnews.libexec",
 102 +    'rnewsprogs',      "@libdir@/news/rnews",
 103      'spooltemp',       "$inn::pathtmp",
 104      'spool',           "$inn::patharticles",
 105      'spoolnews',       "$inn::pathincoming"
 106 --- inn-2.4.2/frontends/Makefile.orig   2004-12-22 05:21:19.000000000 +0100
 107 +++ inn-2.4.2/frontends/Makefile        2004-12-28 20:37:09.988796728 +0100
 108 @@ -32,10 +32,10 @@
 109         for F in getlist innconfval sm ; do \
 110             $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \
 111         done
 112 -       $(CP_XPUB) c7unbatch $D$(PATHBIN)/rnews.libexec/c7unbatch
 113 -       $(LI_XPUB) decode $D$(PATHBIN)/rnews.libexec/decode
 114 -       $(LI_XPUB) encode $D$(PATHBIN)/rnews.libexec/encode
 115 -       $(CP_XPUB) gunbatch $D$(PATHBIN)/rnews.libexec/gunbatch
 116 +       $(CP_XPUB) c7unbatch $D$(PATHRNEWS)/c7unbatch
 117 +       $(LI_XPUB) decode $D$(PATHRNEWS)/decode
 118 +       $(LI_XPUB) encode $D$(PATHRNEWS)/encode
 119 +       $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch
 120
 121  clean:
 122         rm -f *.o $(ALL)