- updated for 2.4.2

Changed files:
    inn-PLD.patch -> 1.6
    inn-db.patch -> 1.3
    inn-install.patch -> 1.6

diff --git a/inn-PLD.patch b/inn-PLD.patch
index fa41bf34e9fc7e9f8e51355e52f5e66a8596443a..a69e5c0e296fd784ad310a601032e1ed82bfe377 100644 (file)
--- a/inn-PLD.patch
+++ b/inn-PLD.patch
@@ -6,7 +6,7 @@ diff -Nur inn-2.4.0.orig/doc/man/rnews.1 inn-2.4.0/doc/man/rnews.1
  .I rnews
  will try to execute a program with that name in the directory
 -.IR <pathbin\ in\ inn.conf>/bin/rnews.libexec .
-+.IR /usr/lib/news/rnews .
++.IR /usr/lib*/news/rnews .
  
  The batch will be fed into the program's standard input, and the
  standard output will be read back as input into
@@ -18,13 +18,13 @@ diff -Nur inn-2.4.0.orig/include/paths.h.in inn-2.4.0/include/paths.h.in
  #define _PATH_NNRPD           "nnrpd"
  #define _PATH_NNTPD           "nnrpd"
 -#define _PATH_AUTHDIR         "auth"
-+#define _PATH_AUTHDIR         "/usr/lib/news/auth"
++#define _PATH_AUTHDIR         "@libdir@/news/auth"
  #define _PATH_AUTHDIR_GENERIC "generic"
  #define _PATH_AUTHDIR_NOPASS  "resolv"
  #define _PATH_AUTHDIR_PASSWD  "passwd"
  #define _PATH_CTLINND         "ctlinnd"
 -#define _PATH_RNEWSPROGS      "rnews.libexec"
-+#define _PATH_RNEWSPROGS      "/usr/lib/news/rnews"
++#define _PATH_RNEWSPROGS      "@libdir@/news/rnews"
  
  /* Default prefix path is pathfilter. */
  #define _PATH_TCL_STARTUP     "startup.tcl"
@@ -52,8 +52,17 @@ diff -Nur inn-2.4.0.orig/Makefile inn-2.4.0/Makefile
  
  update: 
        @chmod +x support/install-sh
---- inn-2.4.1.orig/Makefile.global.in  2003-05-09 06:25:27.000000000 +0200
-+++ inn-2.4.1/Makefile.global.in       2003-06-29 12:59:13.000000000 +0200
+--- inn-2.4.2.orig/Makefile.global.in  2003-05-09 06:25:27.000000000 +0200
++++ inn-2.4.2/Makefile.global.in       2003-06-29 12:59:13.000000000 +0200
+@@ -213,7 +213,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
 @@ -234,16 +234,7 @@
  ##  configure; inews and rnews are special and have configure flags to
  ##  control how they're installed.  See INSTALL for more information.
@@ -83,3 +92,31 @@ diff -Nur inn-2.4.0.orig/scripts/scanlogs.in inn-2.4.0/scripts/scanlogs.in
  ##  If you want to archive the active file, enable this line.
  ACTIVEFILE=${ACTIVE}
  ##  Number of lines of error in each category to report.
+--- inn-2.4.2/scripts/inncheck.in.orig 2004-12-22 05:21:19.000000000 +0100
++++ inn-2.4.2/scripts/inncheck.in      2004-12-28 20:36:22.804969760 +0100
+@@ -43,7 +43,7 @@
+     'passwd.nntp',    "$inn::pathetc/passwd.nntp",
+     'readers.conf',   "$inn::pathetc/readers.conf",
+     'rnews',          "$inn::pathbin/rnews",
+-    'rnewsprogs',     "$inn::pathbin/rnews.libexec",
++    'rnewsprogs',     "@libdir@/news/rnews",
+     'spooltemp',      "$inn::pathtmp",
+     'spool',          "$inn::patharticles",
+     'spoolnews',      "$inn::pathincoming"
+--- inn-2.4.2/frontends/Makefile.orig  2004-12-22 05:21:19.000000000 +0100
++++ inn-2.4.2/frontends/Makefile       2004-12-28 20:37:09.988796728 +0100
+@@ -32,10 +32,10 @@
+       for F in getlist innconfval sm ; do \
+           $(LI_XPUB) $$F $D$(PATHBIN)/$$F ; \
+       done
+-      $(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) c7unbatch $D$(PATHRNEWS)/c7unbatch
++      $(LI_XPUB) decode $D$(PATHRNEWS)/decode
++      $(LI_XPUB) encode $D$(PATHRNEWS)/encode
++      $(CP_XPUB) gunbatch $D$(PATHRNEWS)/gunbatch
+ 
+ clean:
+       rm -f *.o $(ALL)

diff --git a/inn-db.patch b/inn-db.patch
index c7899a35a872d7e435c93fdff386ec7051a0fc10..5cb76d18d2228b3b11712d705206525f2c633851 100644 (file)
--- a/inn-db.patch
+++ b/inn-db.patch
@@ -17,10 +17,9 @@ diff -Nur inn-2.4.0.orig/authprogs/ckpasswd.c inn-2.4.0/authprogs/ckpasswd.c
  # define OPT_DBM "d:"
  #else
  # define OPT_DBM ""
-diff -Nur inn-2.4.0.orig/configure.in inn-2.4.0/configure.in
---- inn-2.4.0.orig/configure.in        2003-05-09 06:25:27.000000000 +0200
-+++ inn-2.4.0/configure.in     2003-06-29 13:04:52.000000000 +0200
-@@ -824,8 +824,9 @@
+--- inn-2.4.2/configure.in.orig        2004-12-22 05:21:19.000000000 +0100
++++ inn-2.4.2/configure.in     2004-12-27 08:32:38.010338472 +0100
+@@ -780,8 +780,9 @@
  dnl Search for various additional libraries used by portions of INN.
  INN_SEARCH_AUX_LIBS(crypt, crypt, CRYPT_LIB)
  INN_SEARCH_AUX_LIBS(getspnam, shadow, SHADOW_LIB)
@@ -29,10 +28,10 @@ diff -Nur inn-2.4.0.orig/configure.in inn-2.4.0/configure.in
 +DBM_LIB="-ldb"
 +AC_SUBST(DBM_LIB)
 +AC_DEFINE(HAVE_DBM, 1, [Define if you have a dbm library.])
- INN_SEARCH_AUX_LIBS(pam_start, pam, PAM_LIB,
-     [AC_DEFINE(HAVE_PAM, 1, [Define if you have PAM.])])
  
-@@ -1008,17 +1009,11 @@
+ dnl IRIX has a PAM library with the right symbols but no header files suitable
+ dnl for use with it, so we have to check the header files first and then only
+@@ -973,17 +974,11 @@
  AC_HEADER_SYS_WAIT
  
  dnl Generic checks for header files.

diff --git a/inn-install.patch b/inn-install.patch
index 75d02f3363eedb0283a343644ed0d6101863ff24..231d895222a44c3805eacd891dab0478f1054998 100644 (file)
--- a/inn-install.patch
+++ b/inn-install.patch
@@ -27,14 +27,18 @@
  
  ##  Some additional definitions needed by some versions of make, to ensure a
  ##  consistant set of variables are available.
---- inn-2.4.1/site/Makefile~   Thu Jan 11 09:55:23 2001
-+++ inn-2.4.1/site/Makefile    Sun Jan 21 05:49:06 2001
-@@ -144,8 +144,6 @@
- $D$(PATH_NEWSGROUPS): ; $(CP_RPUB) newsgroups.minimal $@
+--- inn-2.4.2/site/Makefile.orig       2004-12-22 05:21:19.000000000 +0100
++++ inn-2.4.2/site/Makefile    2004-12-28 18:12:21.688619120 +0100
+@@ -132,12 +132,9 @@
+ $D$(PATH_NEWSGROUPS): ; $(CP_DATA) newsgroups.minimal $@
  $D$(PATH_ACTIVE_TIMES):
        touch $@
 -      chown $(NEWSUSER) $@
 -      chgrp $(NEWSGROUP) $@
        chmod $(FILEMODE) $@
+ $D$(PATH_HISTORY):
+       touch $@
+-      $(PATHBIN)/makedbz -i -o
  
  ##  Remove files that are unchanged from the release version.
+ clean: