--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: i...@packages.debian.org
Control: affects -1 + src:inn2
Please unblock package inn2
I have here a newer snapshot of the inn2 stable 2.7 branch, with various
cleanups and minor bug fixes.
I am aiming to ship in bookworm the final release, which is almost ready.
The package has been used in production on one of my own servers for
3 weeks.
I am attaching a git diff with only the documentation changes omitted.
unblock inn2/2.7.1~20230306-1
--
ciao,
Marco
diff --git a/Makefile.global.in b/Makefile.global.in
index fd86cbbe0..8a185ed39 100644
--- a/Makefile.global.in
+++ b/Makefile.global.in
@@ -201,8 +201,8 @@ SHELL = @SHELL@
UNCOMPRESS = @UNCOMPRESS@
YACC = @YACC@
-FIXCONFIG = $(SHELL) $(top)/support/fixconfig
-FIXSCRIPT = $(SHELL) $(top)/support/fixscript
+FIXCONFIG = $(top)/support/fixconfig
+FIXSCRIPT = $(top)/support/fixscript
PERLWHOAMI = $(PERL) -e 'print scalar getpwuid($$>), "\n"'
WHOAMI = (whoami || /usr/ucb/whoami || $(PERLWHOAMI)) 2> /dev/null
diff --git a/backends/Makefile b/backends/Makefile
index bd50ff218..ac71bea03 100644
--- a/backends/Makefile
+++ b/backends/Makefile
@@ -72,7 +72,7 @@ LINKDEPS = $(LIBLDDEPS) $(LDFLAGS) -o $@
INNLIBS = $(LIBINN) $(LIBS)
STORELIBS = $(BOTH) $(STORAGE_LIBS) $(LIBS)
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
$(FIXSCRIPT):
@echo Run configure before running make. See INSTALL for details.
@@ -95,15 +95,15 @@ shrinkfile: shrinkfile.o $(LIBINN) ; $(LINK) shrinkfile.o $(INNLIBS)
buffchan: buffchan.o $(LIBINN)
$(LINK) buffchan.o $(LIBINN) $(LIBS)
-actmerge: actmerge.in $(FIX) ; $(FIX) actmerge.in
-actsyncd: actsyncd.in $(FIX) ; $(FIX) actsyncd.in
-mod-active: mod-active.in $(FIX) ; $(FIX) mod-active.in
-news2mail: news2mail.in $(FIX) ; $(FIX) news2mail.in
-nntpsend: nntpsend.in $(FIX) ; $(FIX) nntpsend.in
-send-ihave: send-ihave.in $(FIX) ; $(FIX) send-ihave.in
-send-uucp: send-uucp.in $(FIX) ; $(FIX) send-uucp.in
-sendinpaths: sendinpaths.in $(FIX) ; $(FIX) sendinpaths.in
-sendxbatches: sendxbatches.in $(FIX) ; $(FIX) sendxbatches.in
+actmerge: actmerge.in $(FIXSCRIPT) ; $(FIX) actmerge.in
+actsyncd: actsyncd.in $(FIXSCRIPT) ; $(FIX) actsyncd.in
+mod-active: mod-active.in $(FIXSCRIPT) ; $(FIX) mod-active.in
+news2mail: news2mail.in $(FIXSCRIPT) ; $(FIX) news2mail.in
+nntpsend: nntpsend.in $(FIXSCRIPT) ; $(FIX) nntpsend.in
+send-ihave: send-ihave.in $(FIXSCRIPT) ; $(FIX) send-ihave.in
+send-uucp: send-uucp.in $(FIXSCRIPT) ; $(FIX) send-uucp.in
+sendinpaths: sendinpaths.in $(FIXSCRIPT) ; $(FIX) sendinpaths.in
+sendxbatches: sendxbatches.in $(FIXSCRIPT) ; $(FIX) sendxbatches.in
$(LIBINN): ; (cd ../lib ; $(MAKE))
$(LIBSTORAGE): ; (cd ../storage ; $(MAKE) library)
diff --git a/configure.ac b/configure.ac
index 204ff4aac..943058de9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,8 +364,11 @@ dnl (available since podlators 5.00). This options permits disabling
dnl heuristics only intended for Perl documentation, because they prevent
dnl some patterns like C<@@NCM> (in perl-nocem man page) from being converted
dnl as expected.
-AS_IF([`AS_ECHO(["=head1 test"]) | pod2text --guesswork=none > /dev/null`],
- [POD2TEXT_OPTION="--guesswork=none"])
+AC_MSG_CHECKING([if pod2text supports --guesswork])
+AS_IF([`AS_ECHO(["=head1 test"]) | pod2text --guesswork=none > /dev/null 2>&1`],
+ [POD2TEXT_OPTION="--guesswork=none"
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
AC_SUBST(POD2TEXT_OPTION)
dnl Checks for programs.
@@ -572,6 +577,12 @@ AS_IF([test x"$inn_cv_lib_bdb_ndbm" != xyes],
AC_SUBST([DBM_LIBS])])
AC_SUBST([DBM_CPPFLAGS])
+dnl If SQLite is found, check the presence of its Perl DBI driver.
+AS_IF([test x"$inn_use_SQLITE3" = xtrue],
+ [INN_PERL_CHECK_MODULE([DBD::SQLite], [],
+ [inn_perl_mod_warn="$inn_perl_mod_warn DBD::SQLite"
+ inn_perl_mod_warn="$inn_perl_mod_warn (for ovsqlite-util)"])])
+
dnl If configuring with large file support, determine the right flags to
dnl use based on the platform.
if test x"$inn_enable_largefiles" = xyes ; then
diff --git a/contrib/Makefile b/contrib/Makefile
index 2c8eddc89..b585a46f6 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -32,7 +32,7 @@ $(FIXSCRIPT):
## Compilation rules.
LINK = $(LIBLD) $(LDFLAGS) -o $@
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
STORELIBS = $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
@@ -44,20 +44,21 @@ pullart: pullart.o ; $(LINK) pullart.o $(LIBINN)
reset-cnfs: reset-cnfs.o ; $(LINK) reset-cnfs.o
respool: respool.o ; $(LINK) respool.o $(STORELIBS)
-analyze-traffic: analyze-traffic.in $(FIX) ; $(FIX) -i analyze-traffic.in
-archivegz: archivegz.in $(FIX) ; $(FIX) -i archivegz.in
-authmysql: authmysql.in $(FIX) ; $(FIX) -i authmysql.in
-backlogstat: backlogstat.in $(FIX) ; $(FIX) backlogstat.in
-cleannewsgroups: cleannewsgroups.in $(FIX) ; $(FIX) cleannewsgroups.in
-count_overview: count_overview.in $(FIX) ; $(FIX) -i count_overview.in
-delayer: delayer.in $(FIX) ; $(FIX) -i delayer.in
-findreadgroups: findreadgroups.in $(FIX) ; $(FIX) findreadgroups.in
-fixhist: fixhist.in $(FIX) ; $(FIX) -i fixhist.in
-innconfcheck: innconfcheck.in $(FIX) ; $(FIX) -i innconfcheck.in
-makeexpctl: makeexpctl.in $(FIX) ; $(FIX) makeexpctl.in
-makestorconf: makestorconf.in $(FIX) ; $(FIX) makestorconf.in
-mkbuf: mkbuf.in $(FIX) ; $(FIX) -i mkbuf.in
-nnrp.access2readers.conf: nnrp.access2readers.conf.in $(FIX) ; $(FIX) -i nnrp.access2readers.conf.in
-stathist: stathist.in $(FIX) ; $(FIX) -i stathist.in
-thdexpire: thdexpire.in $(FIX) ; $(FIX) thdexpire.in
-tunefeed: tunefeed.in $(FIX) ; $(FIX) -i tunefeed.in
+analyze-traffic: analyze-traffic.in $(FIXSCRIPT) ; $(FIX) -i analyze-traffic.in
+archivegz: archivegz.in $(FIXSCRIPT) ; $(FIX) -i archivegz.in
+authmysql: authmysql.in $(FIXSCRIPT) ; $(FIX) -i authmysql.in
+backlogstat: backlogstat.in $(FIXSCRIPT) ; $(FIX) backlogstat.in
+cleannewsgroups: cleannewsgroups.in $(FIXSCRIPT) ; $(FIX) cleannewsgroups.in
+count_overview: count_overview.in $(FIXSCRIPT) ; $(FIX) -i count_overview.in
+delayer: delayer.in $(FIXSCRIPT) ; $(FIX) -i delayer.in
+findreadgroups: findreadgroups.in $(FIXSCRIPT) ; $(FIX) findreadgroups.in
+fixhist: fixhist.in $(FIXSCRIPT) ; $(FIX) -i fixhist.in
+innconfcheck: innconfcheck.in $(FIXSCRIPT) ; $(FIX) -i innconfcheck.in
+makeexpctl: makeexpctl.in $(FIXSCRIPT) ; $(FIX) makeexpctl.in
+makestorconf: makestorconf.in $(FIXSCRIPT) ; $(FIX) makestorconf.in
+mkbuf: mkbuf.in $(FIXSCRIPT) ; $(FIX) -i mkbuf.in
+nnrp.access2readers.conf: nnrp.access2readers.conf.in $(FIXSCRIPT)
+ $(FIX) -i nnrp.access2readers.conf.in
+stathist: stathist.in $(FIXSCRIPT) ; $(FIX) -i stathist.in
+thdexpire: thdexpire.in $(FIXSCRIPT) ; $(FIX) thdexpire.in
+tunefeed: tunefeed.in $(FIXSCRIPT) ; $(FIX) -i tunefeed.in
diff --git a/control/Makefile b/control/Makefile
index 19b1888fb..7c4092ea7 100644
--- a/control/Makefile
+++ b/control/Makefile
@@ -44,13 +44,13 @@ $(FIXSCRIPT):
## Build rules.
LINK = $(LIBLD) $(LDFLAGS) -o $@
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
-controlbatch: controlbatch.in $(FIX) ; $(FIX) controlbatch.in
-controlchan: controlchan.in $(FIX) ; $(FIX) controlchan.in
-docheckgroups: docheckgroups.in $(FIX) ; $(FIX) docheckgroups.in
-perl-nocem: perl-nocem.in $(FIX) ; $(FIX) perl-nocem.in
-pgpverify: pgpverify.in $(FIX) ; $(FIX) pgpverify.in
+controlbatch: controlbatch.in $(FIXSCRIPT) ; $(FIX) controlbatch.in
+controlchan: controlchan.in $(FIXSCRIPT) ; $(FIX) controlchan.in
+docheckgroups: docheckgroups.in $(FIXSCRIPT) ; $(FIX) docheckgroups.in
+perl-nocem: perl-nocem.in $(FIXSCRIPT) ; $(FIX) perl-nocem.in
+pgpverify: pgpverify.in $(FIXSCRIPT) ; $(FIX) pgpverify.in
../doc/man/perl-nocem.8: perl-nocem.in
$(POD2MAN) -s 8 -n "PERL-NOCEM" $? > $@
diff --git a/debian/changelog b/debian/changelog
index 83259fbb6..ffbb0e6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+inn2 (2.7.1~20230306-1) unstable; urgency=medium
+
+ * New upstream snapshot of the stable branch.
+
+ -- Marco d'Itri <m...@linux.it> Thu, 09 Mar 2023 12:18:11 +0100
+
inn2 (2.7.1~20230220-1) unstable; urgency=medium
* New upstream snapshot of the stable branch.
diff --git a/debian/patches/dash-unbatch b/debian/patches/dash-unbatch
index 40d5ad028..0dfaa006d 100644
--- a/debian/patches/dash-unbatch
+++ b/debian/patches/dash-unbatch
@@ -1,7 +1,7 @@
--- a/frontends/Makefile
+++ b/frontends/Makefile
-@@ -101,15 +101,15 @@ pullnews: pullnews.in $(FIX) ; $(FI
- scanspool: scanspool.in $(FIX) ; $(FIX) scanspool.in
+@@ -114,15 +114,15 @@ pullnews: pullnews.in $(FIXSCRIPT)
+ scanspool: scanspool.in $(FIXSCRIPT) ; $(FIX) scanspool.in
bunbatch: Makefile ../Makefile.global
- ( echo '#! $(SHELL)' ; echo 'exec $(BZIP2) -d -c' ) > $@
diff --git a/expire/Makefile b/expire/Makefile
index 5c0434816..8241b2889 100644
--- a/expire/Makefile
+++ b/expire/Makefile
@@ -39,7 +39,7 @@ LINK = $(LIBLD) $(LDFLAGS) -o $@
INNLIBS = $(LIBINN) $(LIBS)
STORELIBS = $(BOTH) $(STORAGE_LIBS) $(LIBS)
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
$(FIXSCRIPT):
@echo Run configure before running make. See INSTALL for details.
@@ -54,7 +54,7 @@ makedbz: makedbz.o $(LIBINN) ; $(LINK) makedbz.o $(INNLIBS)
makehistory: makehistory.o $(BOTH) ; $(LINK) makehistory.o $(STORELIBS)
prunehistory: prunehistory.o $(BOTH) ; $(LINK) prunehistory.o $(STORELIBS)
-expirerm: expirerm.in $(FIX) ; $(FIX) expirerm.in
+expirerm: expirerm.in $(FIXSCRIPT) ; $(FIX) expirerm.in
$(LIBINN): ; (cd ../lib ; $(MAKE))
$(LIBSTORAGE): ; (cd ../storage ; $(MAKE) library)
diff --git a/frontends/Makefile b/frontends/Makefile
index db8ff92fd..093b33697 100644
--- a/frontends/Makefile
+++ b/frontends/Makefile
@@ -75,7 +75,7 @@ LINKDEPS = $(LIBLDDEPS) $(LDFLAGS) -o $@
INNLIBS = $(LIBINN) $(LIBS)
STORELIBS = $(BOTH) $(STORAGE_LIBS) $(LIBS)
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
ctlinnd: ctlinnd.o $(LIBINN) ; $(LINK) ctlinnd.o $(INNLIBS)
decode: decode.o $(LIBINN) ; $(LINK) decode.o $(INNLIBS)
@@ -107,11 +107,11 @@ ovdb_server.o: ovdb_server.c
ovdb_stat.o: ovdb_stat.c
$(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
-cnfsheadconf: cnfsheadconf.in $(FIX) ; $(FIX) cnfsheadconf.in
-cnfsstat: cnfsstat.in $(FIX) ; $(FIX) cnfsstat.in
-mailpost: mailpost.in $(FIX) ; $(FIX) mailpost.in
-pullnews: pullnews.in $(FIX) ; $(FIX) pullnews.in
-scanspool: scanspool.in $(FIX) ; $(FIX) scanspool.in
+cnfsheadconf: cnfsheadconf.in $(FIXSCRIPT) ; $(FIX) cnfsheadconf.in
+cnfsstat: cnfsstat.in $(FIXSCRIPT) ; $(FIX) cnfsstat.in
+mailpost: mailpost.in $(FIXSCRIPT) ; $(FIX) mailpost.in
+pullnews: pullnews.in $(FIXSCRIPT) ; $(FIX) pullnews.in
+scanspool: scanspool.in $(FIXSCRIPT) ; $(FIX) scanspool.in
bunbatch: Makefile ../Makefile.global
( echo '#! $(SHELL)' ; echo 'exec $(BZIP2) -d -c' ) > $@
diff --git a/frontends/pullnews.in b/frontends/pullnews.in
index d7106a4e4..99ebfbf84 100644
--- a/frontends/pullnews.in
+++ b/frontends/pullnews.in
@@ -74,8 +74,6 @@ my $pathdb = $ENV{HOME};
require 5.004;
-$0 =~ s!.*/!!;
-
$SIG{INT} = \&outtaHere;
$SIG{QUIT} = \&bail;
diff --git a/history/Makefile b/history/Makefile
index 150c66a65..534ad037c 100644
--- a/history/Makefile
+++ b/history/Makefile
@@ -6,7 +6,7 @@ include ../Makefile.global
# recover from make update. We can't use .OLD extensions for the shared
# library since ldconfig will think .OLD sorts after the regular library and
# will point the binaries at the old library.
-LTVERSION = 3:6:0
+LTVERSION = 3:7:0
top = ..
CFLAGS = $(GCFLAGS) -I.
@@ -48,6 +48,8 @@ $(FIXSCRIPT):
@echo Run configure before running make. See INSTALL for details.
@exit 1
+FIX = $(SHELL) $(FIXSCRIPT)
+
libinnhist.la: $(OBJECTS) $(LOBJECTS) $(LIBSTORAGE) $(LIBINN)
$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
$(LIBSTORAGE) $(LIBINN) $(STORAGE_LIBS) $(LIBS) \
@@ -68,7 +70,7 @@ Make.methods hismethods.h hismethods.c: buildconfig
./buildconfig
buildconfig: buildconfig.in $(FIXSCRIPT)
- $(FIXSCRIPT) -i buildconfig.in
+ $(FIX) -i buildconfig.in
.c.o .c.lo:
$(LIBCC) $(CFLAGS) $(CCOUTPUT)
diff --git a/include/Makefile b/include/Makefile
index 12dd1cdda..ac527c667 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -28,7 +28,7 @@ depend:
profiled: all
-$(EXTRA) $(FIXSCRIPT):
+$(EXTRA):
@echo Run configure before running make. See INSTALL for details.
@exit 1
diff --git a/innfeed/Makefile b/innfeed/Makefile
index 5976c657e..f3cccbf7c 100644
--- a/innfeed/Makefile
+++ b/innfeed/Makefile
@@ -44,6 +44,7 @@ $(FIXSCRIPT):
@echo Run configure before running make. See INSTALL for details.
@exit 1
+FIX = $(SHELL) $(FIXSCRIPT)
## Compilation rules.
@@ -72,7 +73,7 @@ imapfeed: $(OBJECTS) imap_connection.o $(LIBSTORAGE) $(LIBINN)
$(SASL_LDFLAGS) $(SASL_LIBS) $(INNFEEDLIBS)
procbatch: procbatch.in $(FIXSCRIPT)
- $(FIXSCRIPT) procbatch.in
+ $(FIX) procbatch.in
tst: config_y.c config_l.c
gcc -DWANT_MAIN -o tst -g -Wall config_y.c config_l.c -ly -ll
diff --git a/lib/Makefile b/lib/Makefile
index f84e28361..12f3340b9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ include ../Makefile.global
# recover from make update. We can't use .OLD extensions for the shared
# library since ldconfig will think .OLD sorts after the regular library and
# will point the binaries at the old library.
-LTVERSION = 8:0:0
+LTVERSION = 9:0:0
top = ..
CFLAGS = $(GCFLAGS)
diff --git a/nnrpd/tls.c b/nnrpd/tls.c
index b83d0f9ef..bb0bea61b 100644
--- a/nnrpd/tls.c
+++ b/nnrpd/tls.c
@@ -24,7 +24,6 @@
static bool tls_initialized = false;
static int verify_depth;
-static int verify_error = X509_V_OK;
static int do_dump = 0;
static SSL_CTX *CTX = NULL;
SSL *tls_conn = NULL;
@@ -43,7 +42,7 @@ static int tls_loglevel = 0;
/*
-** Taken from OpenSSL apps/s_cb.c.
+** Taken from OpenSSL apps/lib/s_cb.c.
** Tim -- this seems to just be giving logging messages.
*/
static void
@@ -205,12 +204,13 @@ tmp_dh_cb(SSL *s UNUSED, int export UNUSED, int keylength UNUSED)
static DH *ffdhe8192 = NULL;
int level = 2; /* Default security level. */
- /* Security levels have been introduced in OpenSSL 1.1.0, and still
- * not present in LibreSSL 3.5.2.
+ /* Security levels have been introduced in OpenSSL 1.1.0 and
+ * LibreSSL 3.6.0.
* Well, as this part of code is no longer active for these versions,
* only keep it for possible future re-use. */
# if OPENSSL_VERSION_NUMBER >= 0x010100000L \
- && !defined(LIBRESSL_VERSION_NUMBER)
+ || (defined(LIBRESSL_VERSION_NUMBER) \
+ && LIBRESSL_VERSION_NUMBER > 0x030600000L)
level = SSL_get_security_level(s);
# endif
@@ -245,7 +245,7 @@ tmp_dh_cb(SSL *s UNUSED, int export UNUSED, int keylength UNUSED)
/*
-** Taken from OpenSSL apps/s_cb.c.
+** Taken from OpenSSL apps/lib/s_cb.c.
*/
static int
verify_callback(int ok, X509_STORE_CTX *ctx)
@@ -275,19 +275,25 @@ verify_callback(int ok, X509_STORE_CTX *ctx)
syslog(L_NOTICE, "verify error:num=%d:%s", err,
X509_verify_cert_error_string(err));
- if (verify_depth >= depth) {
+ if (verify_depth < 0 || verify_depth >= depth) {
+ /* Accept the certificate in error if its depth lies within the
+ * first verify_depth intermediate CA certificates, or if no
+ * verification was asked. */
ok = 1;
- verify_error = X509_V_OK;
} else {
ok = 0;
- verify_error = X509_V_ERR_CERT_CHAIN_TOO_LONG;
}
}
switch (err) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
- X509_NAME_oneline(X509_get_issuer_name(err_cert), buf, sizeof(buf));
- syslog(L_NOTICE, "issuer= %s", buf);
+ if (err_cert != NULL) {
+ X509_NAME_oneline(X509_get_issuer_name(err_cert), buf,
+ sizeof(buf));
+ syslog(L_NOTICE, "issuer= %s", buf);
+ } else {
+ syslog(L_NOTICE, "cert has no issuer");
+ }
break;
case X509_V_ERR_CERT_NOT_YET_VALID:
case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
@@ -371,7 +377,7 @@ tls_dump(const char *s, int len)
** private key (in key_file) and the cert (in cert_file).
** Both files may be identical.
**
-** This function is taken from OpenSSL apps/s_cb.c.
+** This function is taken from OpenSSL apps/lib/s_cb.c.
*/
static int
set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
@@ -741,8 +747,10 @@ tls_init_serverengine(int verifydepth, int askcert, int requirecert,
}
verify_depth = verifydepth;
+ /* Options for OPT_VERIFY in OpenSSL apps/s_server.c. */
if (askcert != 0)
verify_flags |= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
+ /* Options for OPT_UPPER_V_VERIFY in OpenSSL apps/s_server.c. */
if (requirecert)
verify_flags |= SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT
| SSL_VERIFY_CLIENT_ONCE;
diff --git a/perl/Makefile b/perl/Makefile
index e148772a7..6a0b52ead 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -42,9 +42,10 @@ $(EXTRA) $(FIXSCRIPT):
## Compilation rules.
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
-INN/Utils/Shlock.pm: INN/Utils/Shlock.pm.in $(FIX) ; $(FIX) INN/Utils/Shlock.pm.in
+INN/Utils/Shlock.pm: INN/Utils/Shlock.pm.in $(FIXSCRIPT)
+ $(FIX) INN/Utils/Shlock.pm.in
../doc/man/INN__Config.3pm: INN/Config.pm.in
$(POD2MAN) -s '$(MAN3PM_EXT)' -n "INN::Config" $? > $@
diff --git a/samples/Makefile b/samples/Makefile
index 8c6ca8133..369742f5c 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -31,12 +31,12 @@ $(FIXCONFIG) $(FIXSCRIPT):
## Build rules.
-FIXC = $(FIXCONFIG)
-FIXS = $(FIXSCRIPT)
+FIXC = $(SHELL) $(FIXCONFIG)
+FIXS = $(SHELL) $(FIXSCRIPT)
-buffindexed.conf: buffindexed.conf.in $(FIXC) ; $(FIXC) $@.in
-inn.conf: inn.conf.in $(FIXC) ; $(FIXC) $@.in
-innreport.conf: innreport.conf.in $(FIXC) ; $(FIXC) $@.in
-newsfeeds: newsfeeds.in $(FIXC) ; $(FIXC) $@.in
-nnrpd_auth.pl: nnrpd_auth.pl.in $(FIXS) ; $(FIXS) $@.in
-nnrpd_access.pl: nnrpd_access.pl.in $(FIXS) ; $(FIXS) $@.in
+buffindexed.conf: buffindexed.conf.in $(FIXCONFIG) ; $(FIXC) $@.in
+inn.conf: inn.conf.in $(FIXCONFIG) ; $(FIXC) $@.in
+innreport.conf: innreport.conf.in $(FIXCONFIG) ; $(FIXC) $@.in
+newsfeeds: newsfeeds.in $(FIXCONFIG) ; $(FIXC) $@.in
+nnrpd_auth.pl: nnrpd_auth.pl.in $(FIXSCRIPT) ; $(FIXS) $@.in
+nnrpd_access.pl: nnrpd_access.pl.in $(FIXSCRIPT) ; $(FIXS) $@.in
diff --git a/scripts/Makefile b/scripts/Makefile
index 24b6ac111..cbe364aa4 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -47,17 +47,17 @@ $(EXTRA) $(FIXSCRIPT):
## Build rules.
-FIX = $(FIXSCRIPT)
+FIX = $(SHELL) $(FIXSCRIPT)
-inncheck: inncheck.in $(FIX) ; $(FIX) inncheck.in
-innmail: innmail.in $(FIX) ; $(FIX) innmail.in
-innreport: innreport.in $(FIX) ; $(FIX) innreport.in
-innstat: innstat.in $(FIX) ; $(FIX) innstat.in
-innupgrade: innupgrade.in $(FIX) ; $(FIX) -i innupgrade.in
-innwatch: innwatch.in $(FIX) ; $(FIX) innwatch.in
-news.daily: news.daily.in $(FIX) ; $(FIX) news.daily.in
-rc.news: rc.news.in $(FIX) ; $(FIX) rc.news.in
-scanlogs: scanlogs.in $(FIX) ; $(FIX) scanlogs.in
-simpleftp: simpleftp.in $(FIX) ; $(FIX) -i simpleftp.in
-tally.control: tally.control.in $(FIX) ; $(FIX) tally.control.in
-writelog: writelog.in $(FIX) ; $(FIX) writelog.in
+inncheck: inncheck.in $(FIXSCRIPT) ; $(FIX) inncheck.in
+innmail: innmail.in $(FIXSCRIPT) ; $(FIX) innmail.in
+innreport: innreport.in $(FIXSCRIPT) ; $(FIX) innreport.in
+innstat: innstat.in $(FIXSCRIPT) ; $(FIX) innstat.in
+innupgrade: innupgrade.in $(FIXSCRIPT) ; $(FIX) -i innupgrade.in
+innwatch: innwatch.in $(FIXSCRIPT) ; $(FIX) innwatch.in
+news.daily: news.daily.in $(FIXSCRIPT) ; $(FIX) news.daily.in
+rc.news: rc.news.in $(FIXSCRIPT) ; $(FIX) rc.news.in
+scanlogs: scanlogs.in $(FIXSCRIPT) ; $(FIX) scanlogs.in
+simpleftp: simpleftp.in $(FIXSCRIPT) ; $(FIX) -i simpleftp.in
+tally.control: tally.control.in $(FIXSCRIPT) ; $(FIX) tally.control.in
+writelog: writelog.in $(FIXSCRIPT) ; $(FIX) writelog.in
diff --git a/scripts/innreport_inn.pm b/scripts/innreport_inn.pm
index dcb01a3c7..a63e17fe8 100644
--- a/scripts/innreport_inn.pm
+++ b/scripts/innreport_inn.pm
@@ -1668,6 +1668,8 @@ sub collect($$$$$$) {
return 1
if $left
=~ /^python: dynamic authorization access type is not known: /o;
+ # during daily expiration
+ return 1 if $left =~ /^\S+ rejected Expiring process \d+$/o;
# during scanlogs
return 1 if $left =~ /^\S+ rejected Flushing log and syslog files$/o;
return 1 if $left =~ /^\S+ rejected Snapshot log and syslog files$/o;
diff --git a/storage/Makefile b/storage/Makefile
index c10c809a0..b77ae6d08 100644
--- a/storage/Makefile
+++ b/storage/Makefile
@@ -6,7 +6,7 @@ include ../Makefile.global
# recover from make update. We can't use .OLD extensions for the shared
# library since ldconfig will think .OLD sorts after the regular library and
# will point the binaries at the old library.
-LTVERSION = 4:0:1
+LTVERSION = 4:1:1
top = ..
CFLAGS = $(GCFLAGS) -I. $(BDB_CPPFLAGS) $(SQLITE3_CPPFLAGS)
@@ -20,8 +20,15 @@ LOBJECTS = $(OBJECTS:.o=.lo)
all: library programs
-# Included here after the all target, since additional rules are defined in
-# Make.methods to be sure that we recurse properly to build the methods.
+$(FIXSCRIPT):
+ @echo Run configure before running make. See INSTALL for details.
+ @exit 1
+
+FIX = $(SHELL) $(FIXSCRIPT)
+
+# Included here after the FIX definition and all target, since additional rules
+# are defined in Make.methods. Be sure that we recurse properly to build the
+# methods.
include Make.methods
warnings:
@@ -53,10 +60,6 @@ maintclean: distclean
rm -f Make.methods methods.c methods.h ovmethods.c ovmethods.h
rm -f $(RM_MAINTCLEAN)
-$(FIXSCRIPT):
- @echo Run configure before running make. See INSTALL for details.
- @exit 1
-
libinnstorage.la: $(OBJECTS) $(LOBJECTS) $(LIBINN)
$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
$(LIBINN) $(STORAGE_LIBS) $(LIBS) \
@@ -76,7 +79,7 @@ Make.methods methods.h ovmethods.c ovmethods.h methods.c: buildconfig
./buildconfig
buildconfig: buildconfig.in $(FIXSCRIPT)
- $(FIXSCRIPT) -i buildconfig.in
+ $(FIX) -i buildconfig.in
.c.o .c.lo:
$(LIBCC) $(CFLAGS) $(CCOUTPUT)
diff --git a/storage/ovsqlite/ovmethod.mk b/storage/ovsqlite/ovmethod.mk
index fbc69e451..3e56b3f83 100644
--- a/storage/ovsqlite/ovmethod.mk
+++ b/storage/ovsqlite/ovmethod.mk
@@ -9,7 +9,7 @@ ovsqlite/ovsqlite-server: $(OVSQLITEOBJECTS) libinnstorage.$(EXTLIB)
$(LIBS)
ovsqlite/sqlite-helper-gen: ovsqlite/sqlite-helper-gen.in $(FIXSCRIPT)
- $(FIXSCRIPT) -i ovsqlite/sqlite-helper-gen.in
+ $(FIX) -i ovsqlite/sqlite-helper-gen.in
ovsqlite/sql-main.c: ovsqlite/sql-main.sql ovsqlite/sqlite-helper-gen
ovsqlite/sqlite-helper-gen ovsqlite/sql-main.sql
diff --git a/tests/Makefile b/tests/Makefile
index f361fc7e8..31d3be9d1 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -53,6 +53,7 @@ $(FIXSCRIPT):
@echo Run configure before running make. See INSTALL for details.
@exit 1
+FIX = $(SHELL) $(FIXSCRIPT)
.c.o:
$(CC) $(CFLAGS) -c -o $@ $*.c
@@ -79,10 +80,10 @@ runtests: runtests.o
$(LINK) runtests.o
clients/server-list: clients/server-list.in $(FIXSCRIPT)
- $(FIXSCRIPT) -i clients/server-list.in
+ $(FIX) -i clients/server-list.in
docs/pod.t: docs/pod.t.in $(FIXSCRIPT)
- $(FIXSCRIPT) -i docs/pod.t.in
+ $(FIX) -i docs/pod.t.in
authprogs/ident.t: authprogs/ident-t.o tap/basic.o $(LIBINN)
$(LINK) authprogs/ident-t.o tap/basic.o $(LIBINN) $(LIBS)
signature.asc
Description: PGP signature
--- End Message ---
