Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk/tests/util (inndf.t) (INN Commit)
2. INN commit: trunk (authprogs/ckpasswd.c doc/pod/news.pod)
(INN Commit)
3. INN commit: branches/2.5 (authprogs/ckpasswd.c
doc/pod/news.pod) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Thu, 1 Aug 2013 11:51:27 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/tests/util (inndf.t)
Message-ID: <20130801185127.347ea67...@hope.eyrie.org>
Date: Thursday, August 1, 2013 @ 11:51:26
Author: iulius
Revision: 9522
fix the test suite for inndf
When the filesystem name is lengthy, df may output two lines.
"df -k -P ." and "df -i -P ." (-P for a POSIX result) are
not available on all systems, so we just rewrite the df output
on one line.
$ df -k .
Filesystem 1K-blocks Used Available Use% Mounted on
/dev/mapper/gcc12-home
546781616 413506476 133275140 76% /home
Modified:
trunk/tests/util/inndf.t
---------+
inndf.t | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: inndf.t
===================================================================
--- inndf.t 2013-07-31 17:27:33 UTC (rev 9521)
+++ inndf.t 2013-08-01 18:51:26 UTC (rev 9522)
@@ -34,9 +34,9 @@
# Make sure df -k works, or we have to just skip this test.
if df -k . > /dev/null 2>&1 ; then
if [ -z "${UNAME_SYSTEM##IRIX[[:alnum:]]*}" ] ; then
- real=`df -k . | sed 1d | awk '{ print $5 }'`
+ real=`df -k . | sed 1d | tr -d '\r\n' | awk '{ print $5 }'`
else
- real=`df -k . | sed 1d | awk '{ print $4 }'`
+ real=`df -k . | sed 1d | tr -d '\r\n' | awk '{ print $4 }'`
fi
try=`$inndf .`
diff=`expr "$real" - "$try"`
@@ -55,12 +55,12 @@
# Linux.
if df -i . > /dev/null 2>&1 ; then
if [ -z "${UNAME_SYSTEM##IRIX[[:alnum:]]*}" ] ; then
- real=`df -i . | sed 1d | awk '{ print $8 }'`
+ real=`df -i . | sed 1d | tr -d '\r\n' | awk '{ print $8 }'`
elif [ "${UNAME_SYSTEM}" = "FreeBSD" ] \
|| [ "${UNAME_SYSTEM}" = "NetBSD" ] ; then
- real=`df -i . | sed 1d | awk '{ print $7 }'`
+ real=`df -i . | sed 1d | tr -d '\r\n' | awk '{ print $7 }'`
else
- real=`df -i . | sed 1d | awk '{ print $4 }'`
+ real=`df -i . | sed 1d | tr -d '\r\n' | awk '{ print $4 }'`
fi
try=`$inndf -i .`
if [ "$try" = 4294967295 ] ; then
------------------------------
Message: 2
Date: Thu, 1 Aug 2013 13:09:21 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (authprogs/ckpasswd.c doc/pod/news.pod)
Message-ID: <20130801200921.6468467...@hope.eyrie.org>
Date: Thursday, August 1, 2013 @ 13:09:20
Author: iulius
Revision: 9523
ckpasswd: use Berkeley DB ndbm compatibility layer first
On a few systems like Fedora 18 ppc64, the GNU dbm library
shipped as ndbm.h is not usable.
ckpasswd.c: In function 'password_dbm':
ckpasswd.c:165:5: warning: passing argument 1 of 'dbm_open' discards 'const'
qualifier from pointer target type [enabled by default]
database = dbm_open(file, O_RDONLY, 0600);
^
In file included from ckpasswd.c:30:0:
/usr/include/ndbm.h:55:14: note: expected 'char *' but argument is of type
'const char *'
extern DBM *dbm_open (char *file, int flags, int mode);
^
ckpasswd.o: In function `password_dbm':
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:165: undefined reference to
`dbm_open'
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:170: undefined reference to
`dbm_fetch'
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:177: undefined reference to
`dbm_close'
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:172: undefined reference to
`dbm_close'
collect2: error: ld returned 1 exit status
Modified:
trunk/authprogs/ckpasswd.c
trunk/doc/pod/news.pod
----------------------+
authprogs/ckpasswd.c | 11 ++++++++---
doc/pod/news.pod | 6 ++++++
2 files changed, 14 insertions(+), 3 deletions(-)
Modified: authprogs/ckpasswd.c
===================================================================
--- authprogs/ckpasswd.c 2013-08-01 18:51:26 UTC (rev 9522)
+++ authprogs/ckpasswd.c 2013-08-01 20:09:20 UTC (rev 9523)
@@ -25,12 +25,17 @@
#include <pwd.h>
#include <grp.h>
+
+/*
+** If compiling with Berkeley DB, use its ndbm compatibility layer
+** in preference to other libraries.
+*/
#if defined(HAVE_DBM) || defined(HAVE_BDB_DBM)
-# if HAVE_NDBM_H
-# include <ndbm.h>
-# 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
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2013-08-01 18:51:26 UTC (rev 9522)
+++ doc/pod/news.pod 2013-08-01 20:09:20 UTC (rev 9523)
@@ -181,6 +181,12 @@
=item *
+If compiling with S<Berkeley DB>, use its ndbm compatibility layer for
+B<ckpasswd> in preference to the GNU dbm library that appears to be
+broken on a few systems.
+
+=item *
+
Fixed a Perl warning in B<inncheck>; using C<defined(@array)> has been
deprecated since S<Perl 5.16>.
------------------------------
Message: 3
Date: Thu, 1 Aug 2013 13:10:57 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5 (authprogs/ckpasswd.c
doc/pod/news.pod)
Message-ID: <20130801201057.a89b967...@hope.eyrie.org>
Date: Thursday, August 1, 2013 @ 13:10:57
Author: iulius
Revision: 9524
ckpasswd: use Berkeley DB ndbm compatibility layer first
On a few systems like Fedora 18 ppc64, the GNU dbm library
shipped as ndbm.h is not usable.
ckpasswd.c: In function 'password_dbm':
ckpasswd.c:165:5: warning: passing argument 1 of 'dbm_open' discards 'const'
qualifier from pointer target type [enabled by default]
database = dbm_open(file, O_RDONLY, 0600);
^
In file included from ckpasswd.c:30:0:
/usr/include/ndbm.h:55:14: note: expected 'char *' but argument is of type
'const char *'
extern DBM *dbm_open (char *file, int flags, int mode);
^
ckpasswd.o: In function `password_dbm':
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:165: undefined reference to
`dbm_open'
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:170: undefined reference to
`dbm_fetch'
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:177: undefined reference to
`dbm_close'
/home/iulius/autobuild/inn/authprogs/ckpasswd.c:172: undefined reference to
`dbm_close'
collect2: error: ld returned 1 exit status
Modified:
branches/2.5/authprogs/ckpasswd.c
branches/2.5/doc/pod/news.pod
----------------------+
authprogs/ckpasswd.c | 11 ++++++++---
doc/pod/news.pod | 6 ++++++
2 files changed, 14 insertions(+), 3 deletions(-)
Modified: authprogs/ckpasswd.c
===================================================================
--- authprogs/ckpasswd.c 2013-08-01 20:09:20 UTC (rev 9523)
+++ authprogs/ckpasswd.c 2013-08-01 20:10:57 UTC (rev 9524)
@@ -25,12 +25,17 @@
#include <pwd.h>
#include <grp.h>
+
+/*
+** If compiling with Berkeley DB, use its ndbm compatibility layer
+** in preference to other libraries.
+*/
#if defined(HAVE_DBM) || defined(HAVE_BDB_DBM)
-# if HAVE_NDBM_H
-# include <ndbm.h>
-# 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
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2013-08-01 20:09:20 UTC (rev 9523)
+++ doc/pod/news.pod 2013-08-01 20:10:57 UTC (rev 9524)
@@ -52,6 +52,12 @@
=item *
+If compiling with S<Berkeley DB>, use its ndbm compatibility layer for
+B<ckpasswd> in preference to the GNU dbm library that appears to be
+broken on a few systems.
+
+=item *
+
Fixed a Perl warning in B<inncheck>; using C<defined(@array)> has been
deprecated since S<Perl 5.16>.
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 54, Issue 2
*********************************************
