SOURCES: inn-config.patch, inn-db.patch, inn-install.patch - updated for 2.4.4
qboosh
qboosh at pld-linux.org
Fri Jun 13 07:17:40 CEST 2008
Author: qboosh Date: Fri Jun 13 05:17:40 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.4.4
---- Files affected:
SOURCES:
inn-config.patch (1.3 -> 1.4) , inn-db.patch (1.4 -> 1.5) , inn-install.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/inn-config.patch
diff -u SOURCES/inn-config.patch:1.3 SOURCES/inn-config.patch:1.4
--- SOURCES/inn-config.patch:1.3 Sun Aug 8 00:15:29 2004
+++ SOURCES/inn-config.patch Fri Jun 13 07:17:35 2008
@@ -25,9 +25,8 @@
# 2. Meta-cyclic buffers
# Format:
-diff -Nur old/samples/inn.conf.in new/samples/inn.conf.in
---- old/samples/inn.conf.in 2004-01-07 22:47:19.000000000 +0000
-+++ new/samples/inn.conf.in 2004-08-07 21:57:05.000000000 +0000
+--- inn-2.4.4/samples/inn.conf.in.orig 2008-05-05 12:18:36.000000000 +0200
++++ inn-2.4.4/samples/inn.conf.in 2008-06-12 23:34:03.819271092 +0200
@@ -17,11 +17,11 @@
# The following parameters are most likely to need setting, although the
# defaults generated by configure may be reasonable.
@@ -53,10 +52,10 @@
dontrejectfiltered: false
hiscachesize: 0
ignorenewsgroups: false
-@@ -44,13 +44,13 @@
- maxartsize: 1000000
+@@ -45,13 +45,13 @@
maxconnections: 50
#pathalias:
+ #pathcluster:
-pgpverify: @pgpverify@
+pgpverify: true
port: 119
@@ -71,7 +70,7 @@
wanttrash: false
wipcheck: 5
wipexpire: 10
-@@ -63,6 +63,7 @@
+@@ -64,6 +64,7 @@
mergetogroups: false
overcachesize: 15
#ovgrouppat:
@@ -79,7 +78,7 @@
storeonxref: true
useoverchan: false
wireformat: false
-@@ -71,9 +72,9 @@
+@@ -72,9 +73,9 @@
# Reading
@@ -91,7 +90,7 @@
initialtimeout: 10
msgidcachesize: 10000
nnrpdcheckart: true
-@@ -101,8 +102,8 @@
+@@ -103,8 +104,8 @@
addnntppostingdate: true
addnntppostinghost: true
checkincludedtext: false
@@ -102,7 +101,7 @@
localmaxartsize: 1000000
#moderatormailer:
nnrpdauthsender: false
-@@ -114,7 +115,7 @@
+@@ -116,7 +117,7 @@
# Posting -- Exponential Backoff
backoffauth: false
@@ -111,7 +110,7 @@
backoffk: 1
backoffpostfast: 0
backoffpostslow: 1
-@@ -130,11 +131,11 @@
+@@ -132,11 +133,11 @@
innwatchpauseload: 1500
innwatchsleeptime: 600
innwatchspoolnodes: 200
@@ -125,7 +124,7 @@
logartsize: true
logcancelcomm: false
logcycles: 3
-@@ -157,7 +158,7 @@
+@@ -159,7 +160,7 @@
keepmmappedthreshold: 1024
#maxcmdreadsize:
maxforks: 10
================================================================
Index: SOURCES/inn-db.patch
diff -u SOURCES/inn-db.patch:1.4 SOURCES/inn-db.patch:1.5
--- SOURCES/inn-db.patch:1.4 Sun Feb 17 22:35:32 2008
+++ SOURCES/inn-db.patch Fri Jun 13 07:17:35 2008
@@ -1,34 +1,37 @@
-diff -Nur inn-2.4.0.orig/authprogs/ckpasswd.c inn-2.4.0/authprogs/ckpasswd.c
---- inn-2.4.0.orig/authprogs/ckpasswd.c 2003-05-09 06:25:27.000000000 +0200
-+++ inn-2.4.0/authprogs/ckpasswd.c 2003-06-29 13:03:12.000000000 +0200
-@@ -26,13 +26,8 @@
+--- inn-2.4.4/authprogs/ckpasswd.c.orig 2008-05-05 12:18:36.000000000 +0200
++++ inn-2.4.4/authprogs/ckpasswd.c 2008-06-12 23:17:16.157845226 +0200
+@@ -26,11 +26,11 @@
#include <grp.h>
- #if HAVE_DBM
+ #if defined(HAVE_DBM) || defined(HAVE_BDB_DBM)
-# if HAVE_NDBM_H
-# include <ndbm.h>
--# elif HAVE_GDBM_NDBM_H
--# include <gdbm-ndbm.h>
--# elif HAVE_DB1_NDBM_H
--# include <db1/ndbm.h>
--# endif
-+# define DB_DBM_HSEARCH 1
-+# include <db.h>
- # define OPT_DBM "d:"
- #else
- # define OPT_DBM ""
---- 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,7 +780,7 @@
- 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)
--INN_SEARCH_AUX_LIBS(dbm_open, ndbm dbm, DBM_LIB,
-+INN_SEARCH_AUX_LIBS(db_create, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db4 db, DBM_LIB,
- [AC_DEFINE(HAVE_DBM, 1, [Define if you have a dbm library.])])
-
- dnl IRIX has a PAM library with the right symbols but no header files suitable
-@@ -973,17 +973,11 @@
+-# elif HAVE_BDB_DBM
++# if HAVE_BDB_DBM
+ # define DB_DBM_HSEARCH 1
+ # include <db.h>
++# elif HAVE_NDBM_H
++# include <ndbm.h>
+ # elif HAVE_GDBM_NDBM_H
+ # include <gdbm-ndbm.h>
+ # elif HAVE_DB1_NDBM_H
+--- inn-2.4.4/configure.in.orig 2008-05-05 12:18:36.000000000 +0200
++++ inn-2.4.4/configure.in 2008-06-12 23:24:11.005485208 +0200
+@@ -670,8 +670,13 @@
+ fi
+ fi
+ else
++ if test "$BERKELEY_DB_DIR" = "/usr" ; then
++ BERKELEY_DB_LDFLAGS=
++ BERKELEY_DB_CFLAGS=
++ else
+ BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
+ BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
++ fi
+ BERKELEY_DB_LIB="-ldb"
+ AC_MSG_RESULT($BERKELEY_DB_DIR)
+ fi
+@@ -993,17 +998,11 @@
AC_HEADER_SYS_WAIT
dnl Generic checks for header files.
================================================================
Index: SOURCES/inn-install.patch
diff -u SOURCES/inn-install.patch:1.6 SOURCES/inn-install.patch:1.7
--- SOURCES/inn-install.patch:1.6 Wed Dec 29 20:33:30 2004
+++ SOURCES/inn-install.patch Fri Jun 13 07:17:35 2008
@@ -7,14 +7,14 @@
-LI_SPRI = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -B .OLD
-LI_XPRI = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -B .OLD
-LI_XPUB = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -B .OLD
-+LI_SPRI = $(LIBTOOL) $(INSTALL) -m 4550
-+LI_XPRI = $(LIBTOOL) $(INSTALL) -m 0550
-+LI_XPUB = $(LIBTOOL) $(INSTALL) -m 0555
++LI_SPRI = $(LIBTOOL) --mode=install $(INSTALL) -m 4550
++LI_XPRI = $(LIBTOOL) --mode=install $(INSTALL) -m 0550
++LI_XPUB = $(LIBTOOL) --mode=install $(INSTALL) -m 0555
-LI_INEWS = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -B .OLD
-LI_RNEWS = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -B .OLD
-+LI_INEWS = $(LIBTOOL) $(INSTALL)
-+LI_RNEWS = $(LIBTOOL) $(INSTALL)
++LI_INEWS = $(LIBTOOL) --mode=install $(INSTALL)
++LI_RNEWS = $(LIBTOOL) --mode=install $(INSTALL)
-CP_RPRI = $(INSTALL) $(OWNER) -m 0640 -B .OLD
-CP_RPUB = $(INSTALL) $(OWNER) -m 0644 -B .OLD
@@ -27,9 +27,9 @@
## Some additional definitions needed by some versions of make, to ensure a
## consistant set of variables are available.
---- 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 @@
+--- inn-2.4.4/site/Makefile.orig 2008-05-05 12:18:36.000000000 +0200
++++ inn-2.4.4/site/Makefile 2008-06-12 23:06:18.100345504 +0200
+@@ -132,15 +132,10 @@
$D$(PATH_NEWSGROUPS): ; $(CP_DATA) newsgroups.minimal $@
$D$(PATH_ACTIVE_TIMES):
touch $@
@@ -38,6 +38,9 @@
chmod $(FILEMODE) $@
$D$(PATH_HISTORY):
touch $@
+- chown $(NEWSUSER) $@
+- chgrp $(NEWSGROUP) $@
+ chmod $(FILEMODE) $@
- $(PATHBIN)/makedbz -i -o
## Remove files that are unchanged from the release version.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/inn-config.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/inn-db.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/inn-install.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list