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 (MANIFEST doc/pod/hacking.pod
support/getrra-c-util) (INN Commit)
2. INN commit: trunk/lib (asprintf.c) (INN Commit)
3. INN commit: branches/2.5/lib (asprintf.c) (INN Commit)
4. INN commit: branches/2.5/doc/pod (news.pod) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Sun, 3 Nov 2013 11:11:52 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (MANIFEST doc/pod/hacking.pod
support/getrra-c-util)
Message-ID: <20131103191152.41be067...@hope.eyrie.org>
Date: Sunday, November 3, 2013 @ 11:11:51
Author: iulius
Revision: 9552
add getrra-c-util support script to help the synchronization with upstream
Added:
trunk/support/getrra-c-util
Modified:
trunk/MANIFEST
trunk/doc/pod/hacking.pod
-----------------------+
MANIFEST | 1
doc/pod/hacking.pod | 8 +++-
support/getrra-c-util | 77 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 84 insertions(+), 2 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2013-10-28 20:58:39 UTC (rev 9551)
+++ MANIFEST 2013-11-03 19:11:51 UTC (rev 9552)
@@ -760,6 +760,7 @@
support/config.sub Canonicalize system type for libtool
support/fixconfig.in Config file path fixup script
support/fixscript.in Interpreter path fixup script
+support/getrra-c-util Get the latest files from rra-c-util
support/indent A mostly working wrapper around indent
support/install-sh Installation utility
support/ltmain.sh Source for libtool utility
Modified: doc/pod/hacking.pod
===================================================================
--- doc/pod/hacking.pod 2013-10-28 20:58:39 UTC (rev 9551)
+++ doc/pod/hacking.pod 2013-11-03 19:11:51 UTC (rev 9552)
@@ -674,8 +674,12 @@
=item *
-Make sure that the latest version of rra-c-util is used for the librairies.
-It is available from L<http://www.eyrie.org/~eagle/software/rra-c-util/>.
+Make sure that the latest version of the files maintained in the
+rra-c-util package that INN uses are in sync with upstream. These files
+are available at L<http://www.eyrie.org/~eagle/software/rra-c-util/>
+and can be easily synchronized with the script F<support/getrra-c-util>;
+just run it, have a look at the resulting changes in INN source code and,
+if all looks right, commit these changes.
=item *
Added: support/getrra-c-util
===================================================================
--- support/getrra-c-util (rev 0)
+++ support/getrra-c-util 2013-11-03 19:11:51 UTC (rev 9552)
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+## $Id$
+##
+## Synchronize INN files maintained in rra-c-util with upstream.
+##
+## This script downloads the latest version of the files maintained
+## in the rra-c-util package that INN uses. These files are
+## available at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+##
+## Running this script automatically downloads the latest version
+## of the files, and puts them in the expected location in the INN source
+## code. The name of the files that have been modified since the last
+## run of the script are written to standard output. Have a look at
+## the changes and, if all looks right, commit the changes.
+
+## URL where the files can be downloaded.
+URL_START="http://git.eyrie.org/?p=devel/rra-c-util.git;a=blob_plain;hb=HEAD;f=";
+
+## This function downloads the files and copies them to the expected
+## location in the INN source code, after having changed "RRA_" to "INN_"
+## and "rra_" to "inn_" so as to keep a homogeneous naming convention.
+## If a file is not found in upstream or has been modified, write it
+## on standard output.
+##
+## This function expects the following arguments:
+## $1 - full path of the file to download in rra-c-util
+## $2 - directory where the file should be copied in INN source code
+## $3 - name of the file in INN source code
+download ()
+{
+ TEMP=$3.tmp
+
+ rm -f ${TEMP}
+ wget -q "${URL_START}$1" -O ${TEMP}
+
+ if [ ! -s "${TEMP}" ]
+ then
+ echo "File $1 does not exist in rra-c-util"
+ else
+ if [ "$2" = "m4" ]
+ then
+ sed -i -e 's/RRA_/INN_/g' \
+ -e 's/rra_/inn_/g' \
+ -e '1 a\
+dnl $Id$' ${TEMP}
+ elif [ "$2" = "lib" ] || [ "$2" = "include/portable" ]
+ then
+ sed -i -e 's/<config\.h>/"config.h"/g' \
+ -e 's/<portable\/system\.h>/"clibrary.h"/g' \
+ -e 's/<portable\/socket\.h>/"portable\/socket.h"/g' \
+ -e '/^#include <portable\/macros\.h>$/d' \
+ -e '1 s/$/ $Id$\n */' ${TEMP}
+ fi
+ mv -f ${TEMP} ../$2/$3
+ svn status ../$2/$3
+ fi
+}
+
+# Synchronize Autoconf macros from upstream.
+download m4/inet-ntoa.m4 m4 inet-ntoa.m4
+download m4/lib-depends.m4 m4 lib-depends.m4
+download m4/lib-helper.m4 m4 lib-helper.m4
+download m4/lib-pathname.m4 m4 lib-pathname.m4
+download m4/krb5.m4 m4 krb5.m4
+download m4/krb5-config.m4 m4 krb5-config.m4
+download m4/openssl.m4 m4 openssl.m4
+download m4/pam-const.m4 m4 pam-const.m4
+download m4/snprintf.m4 m4 snprintf.m4
+download m4/socket.m4 m4 socket.m4
+download m4/socket-unix.m4 m4 socket-unix.m4
+download m4/vamacros.m4 m4 vamacros.m4
+
+# Synchronize portability functions from upstream.
+download portable/asprintf.c lib asprintf.c
+download portable/getaddrinfo.c lib getaddrinfo.c
+download portable/getaddrinfo.h include/portable getaddrinfo.h
Property changes on: trunk/support/getrra-c-util
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision
------------------------------
Message: 2
Date: Sun, 3 Nov 2013 11:16:22 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/lib (asprintf.c)
Message-ID: <20131103191622.a75be67...@hope.eyrie.org>
Date: Sunday, November 3, 2013 @ 11:16:22
Author: iulius
Revision: 9553
asprintf.c: synchronize with rra-c-util
In the vasprintf replacement, preserve errno if snprintf fails when
formatting the string into the newly-allocated buffer.
Modified:
trunk/lib/asprintf.c
------------+
asprintf.c | 44 +++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
Modified: asprintf.c
===================================================================
--- asprintf.c 2013-11-03 19:11:51 UTC (rev 9552)
+++ asprintf.c 2013-11-03 19:16:22 UTC (rev 9553)
@@ -1,19 +1,33 @@
-/* $Id$
-**
-** Replacement for a missing asprintf and vasprintf.
-**
-** Written by Russ Allbery <r...@stanford.edu>
-** This work is hereby placed in the public domain by its author.
-**
-** Provides the same functionality as the standard GNU library routines
-** asprintf and vasprintf for those platforms that don't have them.
-*/
+/* $Id$
+ *
+ * Replacement for a missing asprintf and vasprintf.
+ *
+ * Provides the same functionality as the standard GNU library routines
+ * asprintf and vasprintf for those platforms that don't have them.
+ *
+ * The canonical version of this file is maintained in the rra-c-util package,
+ * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+ *
+ * Written by Russ Allbery <r...@stanford.edu>
+ *
+ * The authors hereby relinquish any claim to any copyright that they may have
+ * in this work, whether granted under contract or by operation of law or
+ * international treaty, and hereby commit to the public, at large, that they
+ * shall not, at any time in the future, seek to enforce any copyright in this
+ * work against any person or entity, or prevent any person or entity from
+ * copying, publishing, distributing or creating derivative works of this
+ * work.
+ */
#include "config.h"
#include "clibrary.h"
-/* If we're running the test suite, rename the functions to avoid conflicts
- with the system versions. */
+#include <errno.h>
+
+/*
+ * If we're running the test suite, rename the functions to avoid conflicts
+ * with the system versions.
+ */
#if TESTING
# define asprintf test_asprintf
# define vasprintf test_vasprintf
@@ -22,6 +36,7 @@
int test_vasprintf(char **, const char *, va_list);
#endif
+
int
asprintf(char **strp, const char *fmt, ...)
{
@@ -34,11 +49,12 @@
return status;
}
+
int
vasprintf(char **strp, const char *fmt, va_list args)
{
va_list args_copy;
- int status, needed;
+ int status, needed, oerrno;
va_copy(args_copy, args);
needed = vsnprintf(NULL, 0, fmt, args_copy);
@@ -54,8 +70,10 @@
if (status >= 0)
return status;
else {
+ oerrno = errno;
free(*strp);
*strp = NULL;
+ errno = oerrno;
return status;
}
}
------------------------------
Message: 3
Date: Sun, 3 Nov 2013 11:18:12 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/lib (asprintf.c)
Message-ID: <20131103191812.a31ad67...@hope.eyrie.org>
Date: Sunday, November 3, 2013 @ 11:18:12
Author: iulius
Revision: 9554
asprintf.c: synchronize with rra-c-util
In the vasprintf replacement, preserve errno if snprintf fails when
formatting the string into the newly-allocated buffer.
Modified:
branches/2.5/lib/asprintf.c
------------+
asprintf.c | 44 +++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
Modified: asprintf.c
===================================================================
--- asprintf.c 2013-11-03 19:16:22 UTC (rev 9553)
+++ asprintf.c 2013-11-03 19:18:12 UTC (rev 9554)
@@ -1,19 +1,33 @@
-/* $Id$
-**
-** Replacement for a missing asprintf and vasprintf.
-**
-** Written by Russ Allbery <r...@stanford.edu>
-** This work is hereby placed in the public domain by its author.
-**
-** Provides the same functionality as the standard GNU library routines
-** asprintf and vasprintf for those platforms that don't have them.
-*/
+/* $Id$
+ *
+ * Replacement for a missing asprintf and vasprintf.
+ *
+ * Provides the same functionality as the standard GNU library routines
+ * asprintf and vasprintf for those platforms that don't have them.
+ *
+ * The canonical version of this file is maintained in the rra-c-util package,
+ * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+ *
+ * Written by Russ Allbery <r...@stanford.edu>
+ *
+ * The authors hereby relinquish any claim to any copyright that they may have
+ * in this work, whether granted under contract or by operation of law or
+ * international treaty, and hereby commit to the public, at large, that they
+ * shall not, at any time in the future, seek to enforce any copyright in this
+ * work against any person or entity, or prevent any person or entity from
+ * copying, publishing, distributing or creating derivative works of this
+ * work.
+ */
#include "config.h"
#include "clibrary.h"
-/* If we're running the test suite, rename the functions to avoid conflicts
- with the system versions. */
+#include <errno.h>
+
+/*
+ * If we're running the test suite, rename the functions to avoid conflicts
+ * with the system versions.
+ */
#if TESTING
# define asprintf test_asprintf
# define vasprintf test_vasprintf
@@ -22,6 +36,7 @@
int test_vasprintf(char **, const char *, va_list);
#endif
+
int
asprintf(char **strp, const char *fmt, ...)
{
@@ -34,11 +49,12 @@
return status;
}
+
int
vasprintf(char **strp, const char *fmt, va_list args)
{
va_list args_copy;
- int status, needed;
+ int status, needed, oerrno;
va_copy(args_copy, args);
needed = vsnprintf(NULL, 0, fmt, args_copy);
@@ -54,8 +70,10 @@
if (status >= 0)
return status;
else {
+ oerrno = errno;
free(*strp);
*strp = NULL;
+ errno = oerrno;
return status;
}
}
------------------------------
Message: 4
Date: Sun, 3 Nov 2013 11:19:53 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/doc/pod (news.pod)
Message-ID: <20131103191953.3507267...@hope.eyrie.org>
Date: Sunday, November 3, 2013 @ 11:19:52
Author: iulius
Revision: 9555
update changelog for previous commit [9538]
Modified:
branches/2.5/doc/pod/news.pod
----------+
news.pod | 6 ++++++
1 file changed, 6 insertions(+)
Modified: news.pod
===================================================================
--- news.pod 2013-11-03 19:18:12 UTC (rev 9554)
+++ news.pod 2013-11-03 19:19:52 UTC (rev 9555)
@@ -67,6 +67,12 @@
B<innd>. Thanks to Paul Tomblin for having caught that long-standing
issue.
+=item *
+
+When building INN with S<Berkeley DB> support, no longer add
+F<-L/usr/lib> to the linker include flags; unconditionally adding it
+may break the build on systems using lib32 and lib64 directories.
+
=back
=head1 Changes in 2.5.3
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 57, Issue 1
*********************************************
