Dear QA team,
On Monday, April 12, 2010 I sent you a notice announcing my intent to upload a
QA upload of this package to fix its pending l10n issues, after an initial
notice sent on Wednesday, April 07, 2010.
The new version was just uploaded.
It includes changes such as bumping dh compatibility level to 7,
source v3 switch (one big Debian patch, though) and other
"modernization" stuff.
The full patch is attached to this mail.
Source: newpki-server
Version: 2.0.0+rc1-13
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <bubulle@debian.org>
Date: Mon, 19 Apr 2010 07:24:50 +0200
Closes: 465168 511923 558281 559383 577641 578055
Changes:
newpki-server (2.0.0+rc1-13) unstable; urgency=low
.
* QA upload.
* Fix typo in extended description. Closes: #577641
* Switch to 3.0 source format
* Bump debhelper compatibility level to 7
* As a consequence, replace "dh_clean -k" calls by "dh_prep"
* Fix pending l10n issues. Debconf translations:
- Spanish (Francisco Javier Cuadrado). Closes: #465168, #511923
- Russian (Yuri Kozlov). Closes: #558281
- Japanese (Hideki Yamane (Debian-JP)). Closes: #559383
- Vietnamese (Clytie Siddall). Closes: #578055
--
diff -Nru newpki-server-2.0.0+rc1.old/debian/changelog newpki-server-2.0.0+rc1/debian/changelog
--- newpki-server-2.0.0+rc1.old/debian/changelog 2010-04-05 19:36:37.000000000 +0200
+++ newpki-server-2.0.0+rc1/debian/changelog 2010-04-19 07:25:08.000000000 +0200
@@ -1,3 +1,18 @@
+newpki-server (2.0.0+rc1-13) unstable; urgency=low
+
+ * QA upload.
+ * Fix typo in extended description. Closes: #577641
+ * Switch to 3.0 source format
+ * Bump debhelper compatibility level to 7
+ * As a consequence, replace "dh_clean -k" calls by "dh_prep"
+ * Fix pending l10n issues. Debconf translations:
+ - Spanish (Francisco Javier Cuadrado). Closes: #465168, #511923
+ - Russian (Yuri Kozlov). Closes: #558281
+ - Japanese (Hideki Yamane (Debian-JP)). Closes: #559383
+ - Vietnamese (Clytie Siddall). Closes: #578055
+
+ -- Christian Perrier <bubulle@debian.org> Mon, 19 Apr 2010 07:24:50 +0200
+
newpki-server (2.0.0+rc1-12) unstable; urgency=low
* Orphaning the package (See #567130)
diff -Nru newpki-server-2.0.0+rc1.old/debian/compat newpki-server-2.0.0+rc1/debian/compat
--- newpki-server-2.0.0+rc1.old/debian/compat 2010-04-05 19:36:37.000000000 +0200
+++ newpki-server-2.0.0+rc1/debian/compat 2010-04-19 07:21:27.000000000 +0200
@@ -1 +1 @@
-5
+7
diff -Nru newpki-server-2.0.0+rc1.old/debian/control newpki-server-2.0.0+rc1/debian/control
--- newpki-server-2.0.0+rc1.old/debian/control 2010-04-05 19:36:37.000000000 +0200
+++ newpki-server-2.0.0+rc1/debian/control 2010-04-19 07:21:47.000000000 +0200
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 4.1.16), libssl-dev, libnewpki-dev (>= 2.0.0+rc1), libldap2-dev, libmysqlclient15-dev, autotools-dev, quilt, po-debconf, chrpath
+Build-Depends: debhelper (>= 7), libssl-dev, libnewpki-dev (>= 2.0.0+rc1), libldap2-dev, libmysqlclient15-dev, autotools-dev, po-debconf, chrpath
Standards-Version: 3.8.0
Homepage: http://www.newpki.org/
@@ -17,7 +17,7 @@
which provides a convenient frontend to OpenSSL, and options such as
seeking a certificate with a search engine.
.
- The actual version is able to handle multiple Certificate Authorities
+ The current version is able to handle multiple Certificate Authorities
in one server, to publish a certificate request from a Certificate
Signing Request, to certify a request, to revoke a certificate and to
manage one or more Certificate Revocation Lists. It also able to search
diff -Nru newpki-server-2.0.0+rc1.old/debian/patches/debian-changes-2.0.0+rc1-13 newpki-server-2.0.0+rc1/debian/patches/debian-changes-2.0.0+rc1-13
--- newpki-server-2.0.0+rc1.old/debian/patches/debian-changes-2.0.0+rc1-13 1970-01-01 01:00:00.000000000 +0100
+++ newpki-server-2.0.0+rc1/debian/patches/debian-changes-2.0.0+rc1-13 2010-04-19 08:35:06.000000000 +0200
@@ -0,0 +1,5493 @@
+Description: Upstream changes introduced in version 2.0.0+rc1-13
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ newpki-server (2.0.0+rc1-13) unstable; urgency=low
+ .
+ * QA upload.
+ * Fix typo in extended description. Closes: #577641
+ * Switch to 3.0 source format
+ * Bump debhelper compatibility level to 7
+ * As a consequence, replace "dh_clean -k" calls by "dh_prep"
+ * Fix pending l10n issues. Debconf translations:
+ - Spanish (Francisco Javier Cuadrado). Closes: #465168, #511923
+ - Russian (Yuri Kozlov). Closes: #558281
+ - Japanese (Hideki Yamane (Debian-JP)). Closes: #559383
+ - Vietnamese (Clytie Siddall). Closes: #578055
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Christian Perrier <bubulle@debian.org>
+Bug-Debian: http://bugs.debian.org/465168
+Bug-Debian: http://bugs.debian.org/511923
+Bug-Debian: http://bugs.debian.org/558281
+Bug-Debian: http://bugs.debian.org/559383
+Bug-Debian: http://bugs.debian.org/577641
+Bug-Debian: http://bugs.debian.org/578055
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- newpki-server-2.0.0+rc1.orig/aclocal.m4
++++ newpki-server-2.0.0+rc1/aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+--- newpki-server-2.0.0+rc1.orig/configure
++++ newpki-server-2.0.0+rc1/configure
+@@ -1007,7 +1007,7 @@ esac
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd $ac_popdir
++ cd "$ac_popdir"
+ done
+ fi
+
+@@ -2236,8 +2236,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2295,8 +2294,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2367,8 +2365,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2412,8 +2409,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2770,8 +2766,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2829,8 +2824,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2946,8 +2940,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3001,8 +2994,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3047,8 +3039,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3092,8 +3083,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3960,8 +3950,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4015,8 +4004,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4081,8 +4069,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4289,8 +4276,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4351,8 +4337,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4412,8 +4397,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4492,8 +4476,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4558,8 +4541,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4624,8 +4606,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4689,8 +4670,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4760,8 +4740,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4824,8 +4803,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4887,8 +4865,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4950,8 +4927,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5013,8 +4989,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5086,8 +5061,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5236,8 +5210,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5318,8 +5291,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5460,8 +5432,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5599,8 +5570,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5784,8 +5754,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6160,8 +6129,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6246,8 +6214,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6316,8 +6283,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6385,8 +6351,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6555,8 +6520,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6596,8 +6560,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6653,8 +6616,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6694,8 +6656,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6759,8 +6720,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6787,10 +6747,8 @@ case $ac_lo in
+ esac
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -6883,8 +6841,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6924,8 +6881,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6981,8 +6937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7022,8 +6977,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7087,8 +7041,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7115,10 +7068,8 @@ case $ac_lo in
+ esac
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -7211,8 +7162,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7252,8 +7202,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7309,8 +7258,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7350,8 +7298,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7415,8 +7362,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7443,10 +7389,8 @@ case $ac_lo in
+ esac
+ else
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -7539,8 +7483,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7617,8 +7560,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7768,8 +7710,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7835,8 +7776,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8459,8 +8399,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8538,8 +8477,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8748,8 +8686,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8816,8 +8753,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8885,8 +8821,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8955,8 +8890,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9024,8 +8958,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9093,8 +9026,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9218,8 +9150,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9269,8 +9200,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9360,8 +9290,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9426,8 +9355,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9491,8 +9419,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9637,8 +9564,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9704,8 +9630,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9824,8 +9749,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10270,8 +10194,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10325,8 +10248,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10552,8 +10474,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10725,8 +10646,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10904,8 +10824,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10960,8 +10879,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11076,8 +10994,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11140,8 +11057,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11206,8 +11122,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11273,8 +11188,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11336,8 +11250,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11405,8 +11318,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11591,8 +11503,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11634,18 +11545,24 @@ else
+ ac_cv_func_fork_works=cross
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-/* By Ruediger Kuhlmann. */
+- #include <sys/types.h>
+- #if HAVE_UNISTD_H
+- # include <unistd.h>
+- #endif
+- /* Some systems only have a dummy stub for fork() */
+- int main ()
+- {
+- if (fork() < 0)
+- exit (1);
+- exit (0);
+- }
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
++
++ /* By Ruediger Kuhlmann. */
++ if (fork() < 0)
++ exit (1);
++ exit (0);
++
++ ;
++ return 0;
++}
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -11889,8 +11806,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12202,8 +12118,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12359,8 +12274,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12448,8 +12362,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12547,8 +12460,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12642,8 +12554,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12759,8 +12670,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12891,8 +12801,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13068,8 +12977,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13135,8 +13043,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13616,8 +13523,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13777,8 +13683,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13936,8 +13841,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14010,8 +13914,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14169,8 +14072,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14243,8 +14145,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14431,8 +14332,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14531,8 +14431,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14604,8 +14503,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14763,8 +14661,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14837,8 +14734,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14996,8 +14892,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15101,8 +14996,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15168,8 +15062,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15274,8 +15167,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15341,8 +15233,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15417,8 +15308,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15606,8 +15496,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15706,8 +15595,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15776,8 +15664,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15849,8 +15736,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15933,8 +15819,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16930,11 +16815,6 @@ esac
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -16973,6 +16853,12 @@ echo "$as_me: error: cannot find input f
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
++
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+@@ -17764,7 +17650,7 @@ echo "$as_me: error: $ac_sub_configure f
+ { (exit 1); exit 1; }; }
+ fi
+
+- cd $ac_popdir
++ cd "$ac_popdir"
+ done
+ fi
+
+--- newpki-server-2.0.0+rc1.orig/config.h.in
++++ newpki-server-2.0.0+rc1/config.h.in
+@@ -390,7 +390,7 @@
+
+ /* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+- automatically deduced at run-time.
++ automatically deduced at runtime.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+@@ -420,7 +420,7 @@
+ /* Define to rpl_malloc if the replacement function should be used. */
+ #undef malloc
+
+-/* Define to `long' if <sys/types.h> does not define. */
++/* Define to `long int' if <sys/types.h> does not define. */
+ #undef off_t
+
+ /* Define to `int' if <sys/types.h> does not define. */
+@@ -433,7 +433,7 @@
+ /* Define to empty if the C compiler doesn't support this keyword. */
+ #undef signed
+
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+
+ /* socklen_t define */
+--- newpki-server-2.0.0+rc1.orig/config.sub
++++ newpki-server-2.0.0+rc1/config.sub
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2005-02-10'
++timestamp='2006-02-23'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,14 +21,15 @@ timestamp='2005-02-10'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
+-
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++
+ # Please send patches to <config-patches@gnu.org>. Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
+ while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+- echo "$timestamp" ; exit 0 ;;
++ echo "$timestamp" ; exit ;;
+ --version | -v )
+- echo "$version" ; exit 0 ;;
++ echo "$version" ; exit ;;
+ --help | --h* | -h )
+- echo "$usage"; exit 0 ;;
++ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+- exit 0;;
++ exit ;;
+
+ * )
+ break ;;
+@@ -118,8 +119,9 @@ esac
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+@@ -170,6 +172,10 @@ case $os in
+ -hiux*)
+ os=-hiuxwe2
+ ;;
++ -sco6)
++ os=-sco5v6
++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -186,6 +192,10 @@ case $os in
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
++ -sco5v6*)
++ # Don't forget version if it is 3.2v4 or newer.
++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -231,13 +241,14 @@ case $basic_machine in
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -246,6 +257,7 @@ case $basic_machine in
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
++ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+@@ -254,15 +266,18 @@ case $basic_machine in
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
++ | mt \
+ | msp430 \
++ | nios | nios2 \
+ | ns16k | ns32k \
+- | openrisc | or32 \
++ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
++ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+@@ -271,6 +286,9 @@ case $basic_machine in
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
++ m32c)
++ basic_machine=$basic_machine-unknown
++ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+@@ -278,6 +296,9 @@ case $basic_machine in
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
++ ms1)
++ basic_machine=mt-unknown
++ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+@@ -298,7 +319,7 @@ case $basic_machine in
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
+- | bs2000-* \
++ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+@@ -319,6 +340,7 @@ case $basic_machine in
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
++ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+@@ -327,16 +349,19 @@ case $basic_machine in
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
++ | mt-* \
+ | msp430-* \
++ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+@@ -348,6 +373,8 @@ case $basic_machine in
+ | ymp-* \
+ | z8k-*)
+ ;;
++ m32c-*)
++ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+@@ -683,6 +710,9 @@ case $basic_machine in
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
++ ms1-*)
++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+@@ -758,9 +788,8 @@ case $basic_machine in
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+- or32 | or32-*)
++ openrisc | openrisc-*)
+ basic_machine=or32-unknown
+- os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+@@ -791,6 +820,12 @@ case $basic_machine in
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
++ pc98)
++ basic_machine=i386-pc
++ ;;
++ pc98-*)
++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
+ ;;
+@@ -847,6 +882,10 @@ case $basic_machine in
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
++ rdos)
++ basic_machine=i386-pc
++ os=-rdos
++ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+@@ -1086,12 +1125,9 @@ case $basic_machine in
+ we32k)
+ basic_machine=we32k-att
+ ;;
+- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+- sh64)
+- basic_machine=sh64-unknown
+- ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b)
+ basic_machine=sparc-sun
+ ;;
+@@ -1165,20 +1201,23 @@ case $os in
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++ | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++ | -skyos* | -haiku* | -rdos*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1196,7 +1235,7 @@ case $os in
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+@@ -1385,6 +1424,9 @@ case $basic_machine in
+ *-be)
+ os=-beos
+ ;;
++ *-haiku)
++ os=-haiku
++ ;;
+ *-ibm)
+ os=-aix
+ ;;
+@@ -1556,7 +1598,7 @@ case $basic_machine in
+ esac
+
+ echo $basic_machine$os
+-exit 0
++exit
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+--- newpki-server-2.0.0+rc1.orig/config.guess
++++ newpki-server-2.0.0+rc1/config.guess
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2005-02-10'
++timestamp='2006-02-23'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,13 +17,15 @@ timestamp='2005-02-10'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++
+ # Originally written by Per Bothner <per@bothner.com>.
+ # Please send patches to <config-patches@gnu.org>. Submit a context
+ # diff and a properly formatted ChangeLog entry.
+@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
+ while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+- echo "$timestamp" ; exit 0 ;;
++ echo "$timestamp" ; exit ;;
+ --version | -v )
+- echo "$version" ; exit 0 ;;
++ echo "$version" ; exit ;;
+ --help | --h* | -h )
+- echo "$usage"; exit 0 ;;
++ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+@@ -104,7 +106,7 @@ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -123,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+-esac ;'
++esac ; set_cc_for_build= ;'
+
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+@@ -196,55 +198,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+- exit 0 ;;
+- amd64:OpenBSD:*:*)
+- echo x86_64-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- amiga:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- cats:OpenBSD:*:*)
+- echo arm-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- hp300:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- luna88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mac68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- macppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mvme68k:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mvme88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- mvmeppc:OpenBSD:*:*)
+- echo powerpc-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- sgi:OpenBSD:*:*)
+- echo mips64-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+- sun3:OpenBSD:*:*)
+- echo m68k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:OpenBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
++ *:SolidBSD:*:*)
++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+@@ -297,40 +267,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit 0 ;;
++ exit ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+- exit 0 ;;
++ exit ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+- exit 0 ;;
++ exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+- exit 0;;
++ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+- exit 0 ;;
++ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+- exit 0 ;;
++ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+- exit 0 ;;
++ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+- exit 0 ;;
++ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+- exit 0 ;;
++ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+- exit 0;;
++ exit ;;
++ arm:riscos:*:*|arm:RISCOS:*:*)
++ echo arm-unknown-riscos
++ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+- exit 0;;
++ exit ;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -338,32 +311,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ else
+ echo pyramid-pyramid-bsd
+ fi
+- exit 0 ;;
++ exit ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+- exit 0 ;;
++ exit ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+- exit 0 ;;
++ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+- sparc) echo sparc-icl-nx7 && exit 0 ;;
++ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+@@ -372,10 +345,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+- exit 0 ;;
++ exit ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+@@ -387,10 +360,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+- exit 0 ;;
++ exit ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+@@ -401,40 +374,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+- exit 0 ;;
++ exit ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+@@ -458,32 +431,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ exit (-1);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c \
+- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+- && exit 0
++ $CC_FOR_BUILD -o $dummy $dummy.c &&
++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++ SYSTEM_NAME=`$dummy $dummyarg` &&
++ { echo "$SYSTEM_NAME"; exit; }
+ echo mips-mips-riscos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+- exit 0 ;;
++ exit ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+- exit 0 ;;
++ exit ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+- exit 0 ;;
++ exit ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+- exit 0 ;;
++ exit ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+- exit 0 ;;
++ exit ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+- exit 0 ;;
++ exit ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+- exit 0 ;;
++ exit ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+@@ -499,29 +473,29 @@ EOF
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+- exit 0 ;;
++ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+- exit 0 ;;
++ exit ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+- exit 0 ;;
++ exit ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+- exit 0 ;;
++ exit ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+- exit 0 ;;
++ exit ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+- exit 0 ;;
++ exit ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+- exit 0 ;;
++ exit ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+@@ -529,7 +503,7 @@ EOF
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+- exit 0 ;;
++ exit ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+@@ -544,14 +518,18 @@ EOF
+ exit(0);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+- echo rs6000-ibm-aix3.2.5
++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++ then
++ echo "$SYSTEM_NAME"
++ else
++ echo rs6000-ibm-aix3.2.5
++ fi
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+- exit 0 ;;
++ exit ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+@@ -565,28 +543,28 @@ EOF
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+- exit 0 ;;
++ exit ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+- exit 0 ;;
++ exit ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+- exit 0 ;;
++ exit ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+- exit 0 ;; # report: romp-ibm BSD 4.3
++ exit ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+- exit 0 ;;
++ exit ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+- exit 0 ;;
++ exit ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+- exit 0 ;;
++ exit ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+- exit 0 ;;
++ exit ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+@@ -648,9 +626,19 @@ EOF
+ esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+- # avoid double evaluation of $set_cc_for_build
+- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++ eval $set_cc_for_build
++
++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
++ # generating 64-bit code. GNU and HP use different nomenclature:
++ #
++ # $ CC_FOR_BUILD=cc ./config.guess
++ # => hppa2.0w-hp-hpux11.23
++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++ # => hppa64-hp-hpux11.23
++
++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++ grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -658,11 +646,11 @@ EOF
+ fi
+ fi
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+- exit 0 ;;
++ exit ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+- exit 0 ;;
++ exit ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+@@ -690,161 +678,177 @@ EOF
+ exit (0);
+ }
+ EOF
+- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++ { echo "$SYSTEM_NAME"; exit; }
+ echo unknown-hitachi-hiuxwe2
+- exit 0 ;;
++ exit ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+- exit 0 ;;
++ exit ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+- exit 0 ;;
++ exit ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+- exit 0 ;;
++ exit ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+- exit 0 ;;
++ exit ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+- exit 0 ;;
++ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+- exit 0 ;;
++ exit ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+- exit 0 ;;
++ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+- exit 0 ;;
++ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit 0 ;;
++ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+- exit 0 ;;
++ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+- exit 0 ;;
++ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+- exit 0 ;;
++ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- exit 0 ;;
++ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit 0 ;;
++ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit 0 ;;
++ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:FreeBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+- exit 0 ;;
++ case ${UNAME_MACHINE} in
++ pc98)
++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ *)
++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ esac
++ exit ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+- exit 0 ;;
++ exit ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+- exit 0 ;;
++ exit ;;
++ i*:MSYS_NT-*:*:*)
++ echo ${UNAME_MACHINE}-pc-mingw32
++ exit ;;
++ i*:windows32*:*)
++ # uname -m includes "-pc" on this system.
++ echo ${UNAME_MACHINE}-mingw32
++ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+- exit 0 ;;
+- x86:Interix*:[34]*)
+- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+- exit 0 ;;
++ exit ;;
++ x86:Interix*:[345]*)
++ echo i586-pc-interix${UNAME_RELEASE}
++ exit ;;
++ EM64T:Interix*:[345]*)
++ echo x86_64-unknown-interix${UNAME_RELEASE}
++ exit ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+- exit 0 ;;
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+- exit 0 ;;
++ exit ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+- exit 0 ;;
+- amd64:CYGWIN*:*:*)
++ exit ;;
++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+- exit 0 ;;
++ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+- exit 0 ;;
++ exit ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit 0 ;;
++ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+- exit 0 ;;
++ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+- exit 0 ;;
++ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+- exit 0 ;;
++ exit ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+- exit 0 ;;
++ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+- exit 0 ;;
++ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+@@ -861,8 +865,12 @@ EOF
+ #endif
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^CPU/{
++ s: ::g
++ p
++ }'`"
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -880,15 +888,22 @@ EOF
+ #endif
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^CPU/{
++ s: ::g
++ p
++ }'`"
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
++ or32:Linux:*:*)
++ echo or32-unknown-linux-gnu
++ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+@@ -902,7 +917,7 @@ EOF
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit 0 ;;
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -910,25 +925,28 @@ EOF
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+- exit 0 ;;
++ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+- exit 0 ;;
++ exit ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
++ vax:Linux:*:*)
++ echo ${UNAME_MACHINE}-dec-linux-gnu
++ exit ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+- exit 0 ;;
++ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+@@ -946,15 +964,15 @@ EOF
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit 0 ;;
++ exit ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit 0 ;;
++ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit 0 ;;
++ exit ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+@@ -971,7 +989,7 @@ EOF
+ LIBC=gnulibc1
+ # endif
+ #else
+- #ifdef __INTEL_COMPILER
++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+@@ -981,16 +999,23 @@ EOF
+ LIBC=dietlibc
+ #endif
+ EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++ /^LIBC/{
++ s: ::g
++ p
++ }'`"
++ test x"${LIBC}" != x && {
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit
++ }
++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+- exit 0 ;;
++ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+@@ -998,27 +1023,27 @@ EOF
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+- exit 0 ;;
++ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+- exit 0 ;;
++ exit ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+- exit 0 ;;
++ exit ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+- exit 0 ;;
+- i*86:syllable:*:*)
++ exit ;;
++ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+- exit 0 ;;
++ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+- exit 0 ;;
++ exit ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -1026,15 +1051,16 @@ EOF
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+- exit 0 ;;
+- i*86:*:5:[78]*)
++ exit ;;
++ i*86:*:5:[678]*)
++ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+- exit 0 ;;
++ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+@@ -1052,73 +1078,73 @@ EOF
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+- exit 0 ;;
++ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+- exit 0 ;;
++ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+- exit 0 ;;
++ exit ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+- exit 0 ;;
++ exit ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+- exit 0 ;;
++ exit ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+- exit 0 ;;
++ exit ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+- exit 0 ;;
++ exit ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+- exit 0 ;;
++ exit ;;
+ M68*:*:R3V[5678]*:*)
+- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && echo i486-ncr-sysv4 && exit 0 ;;
++ && { echo i486-ncr-sysv4; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+- exit 0 ;;
++ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+- exit 0 ;;
++ exit ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+- exit 0 ;;
++ exit ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+@@ -1126,69 +1152,72 @@ EOF
+ else
+ echo ns32k-sni-sysv
+ fi
+- exit 0 ;;
++ exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+- exit 0 ;;
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes@openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+- exit 0 ;;
++ exit ;;
+ *:*:*:FTX*)
+ # From seanf@swdc.stratus.com.
+ echo i860-stratus-sysv4
+- exit 0 ;;
++ exit ;;
++ i*86:VOS:*:*)
++ # From Paul.Green@stratus.com.
++ echo ${UNAME_MACHINE}-stratus-vos
++ exit ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+- exit 0 ;;
++ exit ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+- exit 0 ;;
++ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+- exit 0 ;;
++ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+- exit 0 ;;
++ exit ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+- exit 0 ;;
++ exit ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+- exit 0 ;;
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+- *86) UNAME_PROCESSOR=i686 ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+@@ -1196,25 +1225,25 @@ EOF
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+- exit 0 ;;
++ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+- exit 0 ;;
++ exit ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+- exit 0 ;;
++ exit ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+@@ -1225,41 +1254,47 @@ EOF
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+- exit 0 ;;
++ exit ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+- exit 0 ;;
++ exit ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+- exit 0 ;;
++ exit ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+- exit 0 ;;
++ exit ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+- exit 0 ;;
++ exit ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+- exit 0 ;;
++ exit ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+- exit 0 ;;
++ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+- exit 0 ;;
++ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+- exit 0 ;;
++ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+- A*) echo alpha-dec-vms && exit 0 ;;
+- I*) echo ia64-dec-vms && exit 0 ;;
+- V*) echo vax-dec-vms && exit 0 ;;
++ A*) echo alpha-dec-vms ; exit ;;
++ I*) echo ia64-dec-vms ; exit ;;
++ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+- exit 0 ;;
++ exit ;;
++ i*86:skyos:*:*)
++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++ exit ;;
++ i*86:rdos:*:*)
++ echo ${UNAME_MACHINE}-pc-rdos
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1291,7 +1326,7 @@ main ()
+ #endif
+
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+- printf ("arm-acorn-riscix"); exit (0);
++ printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
+
+ #if defined (hp300) && !defined (hpux)
+@@ -1380,11 +1415,12 @@ main ()
+ }
+ EOF
+
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++ { echo "$SYSTEM_NAME"; exit; }
+
+ # Apollos put the system type in the environment.
+
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+ # Convex versions that predate uname can use getsysinfo(1)
+
+@@ -1393,22 +1429,22 @@ then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+- exit 0 ;;
++ exit ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit 0 ;;
++ exit ;;
+ c34*)
+ echo c34-convex-bsd
+- exit 0 ;;
++ exit ;;
+ c38*)
+ echo c38-convex-bsd
+- exit 0 ;;
++ exit ;;
+ c4*)
+ echo c4-convex-bsd
+- exit 0 ;;
++ exit ;;
+ esac
+ fi
+
+@@ -1419,7 +1455,9 @@ This script, last modified $timestamp, h
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- ftp://ftp.gnu.org/pub/gnu/config/
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++and
++ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+--- newpki-server-2.0.0+rc1.orig/Makefile.in
++++ newpki-server-2.0.0+rc1/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- newpki-server-2.0.0+rc1.orig/m4/Makefile.in
++++ newpki-server-2.0.0+rc1/m4/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- newpki-server-2.0.0+rc1.orig/publication/Makefile.in
++++ newpki-server-2.0.0+rc1/publication/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+--- newpki-server-2.0.0+rc1.orig/src/Makefile.in
++++ newpki-server-2.0.0+rc1/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(newpki_server_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+--- newpki-server-2.0.0+rc1.orig/po/fr.po
++++ newpki-server-2.0.0+rc1/po/fr.po
+@@ -1,8 +1,8 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: newpki-server\n"
+-"Report-Msgid-Bugs-To: info@newpki.org\n"
+-"POT-Creation-Date: 2005-10-06 22:55+0200\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2006-01-11 10:48+0100\n"
+ "PO-Revision-Date: 2005-10-09 15:35+0100\n"
+ "Last-Translator: Frederic Giudicelli <info@newpki.org>\n"
+ "Language-Team: <frederic.giudicelli@newpki.org>\n"
+@@ -15,11 +15,11 @@ msgstr ""
+ "X-Poedit-KeywordsList: _sv\n"
+ "X-Poedit-SearchPath-0: .\n"
+
+-#: AsynchJobs.cpp:266
++#: ../src/AsynchJobs.cpp:266
+ msgid "Entity: "
+ msgstr "Entit�
+
+-#: AsynchJobs.cpp:268
++#: ../src/AsynchJobs.cpp:268
+ msgid ""
+ "\n"
+ "Author: "
+@@ -27,8 +27,7 @@ msgstr ""
+ "\n"
+ "Auteur: "
+
+-#: AsynchJobs.cpp:461
+-#: AsynchJobs.cpp:468
++#: ../src/AsynchJobs.cpp:461 ../src/AsynchJobs.cpp:468
+ #, c-format
+ msgid ""
+ "Failed to push conf on entity %s (%s:%ld)\n"
+@@ -37,193 +36,210 @@ msgstr ""
+ "Echec de l'envoi de la conf sur l'entit�%s (%s:%ld)\n"
+ "Raisson:%s"
+
+-#: AsynchJobs.cpp:473
++#: ../src/AsynchJobs.cpp:473
+ #, c-format
+ msgid "Successfully pushed conf on entity %s (%s:%ld)"
+ msgstr "Succ�de l'envoi de la conf sur l'entit�%s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:670
++#: ../src/AsynchMsgs.cpp:670
+ msgid "Optimizing responder's requests table..."
+ msgstr "Optimisation de la table des requ�s du r�ndeur..."
+
+-#: AsynchMsgs.cpp:675
++#: ../src/AsynchMsgs.cpp:675
+ #, c-format
+ msgid "Failed to optimize responder's requests table - Reason: %s"
+-msgstr "Echec de l'optimisation de la table des req�s du r�ndeur - Raison: %s"
++msgstr ""
++"Echec de l'optimisation de la table des req�s du r�ndeur - Raison: %s"
+
+-#: AsynchMsgs.cpp:680
++#: ../src/AsynchMsgs.cpp:680
+ #, c-format
+ msgid "Optimized responder's requests table in %ld secondes"
+ msgstr "Optimis�a table des requ�s du r�ndeur en %ld secondes"
+
+-#: AsynchMsgs.cpp:898
++#: ../src/AsynchMsgs.cpp:898
+ msgid "Importing new conf"
+ msgstr "Importation de la nouvelle conf"
+
+-#: AsynchMsgs.cpp:903
++#: ../src/AsynchMsgs.cpp:903
+ #, c-format
+ msgid "Failed to import new conf: %s"
+ msgstr "Echec lors de l'importation de la nouvelle conf: %s"
+
+-#: AsynchMsgs.cpp:907
++#: ../src/AsynchMsgs.cpp:907
+ msgid "New conf imported"
+ msgstr "Nouvelle conf import�
+
+-#: AsynchMsgs.cpp:922
++#: ../src/AsynchMsgs.cpp:922
+ #, c-format
+ msgid "Importing new request %s"
+ msgstr "Importation de la nouvelle requ� %s"
+
+-#: AsynchMsgs.cpp:927
++#: ../src/AsynchMsgs.cpp:927
+ #, c-format
+ msgid "Failed to import new request %s : %s"
+ msgstr "Echec lors de l'importation de la nouvelle requ� %s : %s"
+
+-#: AsynchMsgs.cpp:933
++#: ../src/AsynchMsgs.cpp:933
+ #, c-format
+ msgid "Successfully imported new request %s"
+ msgstr "Succ�de l'importation de la nouvelle requ� %s"
+
+-#: AsynchMsgs.cpp:950
++#: ../src/AsynchMsgs.cpp:950
+ #, c-format
+ msgid "Importing new response %s"
+ msgstr "Importation de la nouvelle r�nse %s"
+
+-#: AsynchMsgs.cpp:954
++#: ../src/AsynchMsgs.cpp:954
+ msgid "Response"
+ msgstr "R�nse"
+
+-#: AsynchMsgs.cpp:955
++#: ../src/AsynchMsgs.cpp:955
+ #, c-format
+ msgid "Failed to import new response %s : %s"
+ msgstr "Echec lors de l'importation de la nouvelle r�nse %s: %s"
+
+-#: AsynchMsgs.cpp:959
++#: ../src/AsynchMsgs.cpp:959
+ #, c-format
+ msgid "Successfully imported new response %s"
+ msgstr "Succ�de l'imporation de la nouvelle r�nse %s"
+
+-#: AsynchMsgs.cpp:997
++#: ../src/AsynchMsgs.cpp:997
+ #, c-format
+ msgid "Connecting to repository %s (%s:%ld)"
+ msgstr "Connexion �a repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1005
++#: ../src/AsynchMsgs.cpp:1005
+ #, c-format
+ msgid "Failed to connect to repository %s (%s:%ld)"
+ msgstr "Echec lors de la connexion �a repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1008
++#: ../src/AsynchMsgs.cpp:1008
+ #, c-format
+ msgid "Connected to repository %s (%s:%ld)"
+ msgstr "Connect� la repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1022
++#: ../src/AsynchMsgs.cpp:1022
+ #, c-format
+ msgid "Failed to sent request %ld to repository %s (%s:%ld)"
+ msgstr "Echec de l'envoi de la requ� %ld sur la repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1029
++#: ../src/AsynchMsgs.cpp:1029
+ #, c-format
+ msgid "Successfully sent request %ld to repository %s (%s:%ld), still %d to go"
+-msgstr "R�site de l'envoi de la requ� %ld sur la repository %s (%s:%ld), il en reste %d"
++msgstr ""
++"R�site de l'envoi de la requ� %ld sur la repository %s (%s:%ld), il en "
++"reste %d"
+
+-#: AsynchMsgs.cpp:1050
++#: ../src/AsynchMsgs.cpp:1050
+ #, c-format
+ msgid "Failed to sent deletion request %ld to repository %s (%s:%ld)"
+-msgstr "Echec de l'envoi de la demande de suppression %ld sur la repository %s (%s:%ld)"
++msgstr ""
++"Echec de l'envoi de la demande de suppression %ld sur la repository %s (%s:%"
++"ld)"
+
+-#: AsynchMsgs.cpp:1054
++#: ../src/AsynchMsgs.cpp:1054
+ #, c-format
+-msgid "Successfully sent deletion request %ld to repository %s (%s:%ld), still %d to go"
+-msgstr "R�site de l'envoi de la demande de suppression %ld �a repository %s (%s:%ld), il en reste %d"
++msgid ""
++"Successfully sent deletion request %ld to repository %s (%s:%ld), still %d "
++"to go"
++msgstr ""
++"R�site de l'envoi de la demande de suppression %ld �a repository %s (%s:%"
++"ld), il en reste %d"
+
+-#: AsynchMsgs.cpp:1078
++#: ../src/AsynchMsgs.cpp:1078
+ #, c-format
+ msgid "Failed to get my responses from repository %s (%s:%ld)"
+-msgstr "Echec lors de la r�p�tion de mes r�nses depuis la repository %s (%s:%ld)"
++msgstr ""
++"Echec lors de la r�p�tion de mes r�nses depuis la repository %s (%s:%"
++"ld)"
+
+-#: AsynchMsgs.cpp:1082
++#: ../src/AsynchMsgs.cpp:1082
+ #, c-format
+ msgid "Successfully got my responses from repository %s (%s:%ld)"
+-msgstr "Succ�de la r�p�tion de mes r�nses depuis la repository %s (%s:%ld)"
++msgstr ""
++"Succ�de la r�p�tion de mes r�nses depuis la repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1103
++#: ../src/AsynchMsgs.cpp:1103
+ #, c-format
+ msgid "Failed to sent response %s to repository %s (%s:%ld)"
+ msgstr "Echec de l'envoi de la r�nse %s ) la repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1110
++#: ../src/AsynchMsgs.cpp:1110
+ #, c-format
+ msgid "Successfully sent response %s to repository %s (%s:%ld), still %d to go"
+-msgstr "R�site de l'envoi de la r�nse %s sur la repository %s (%s:%ld), il en reste %d"
++msgstr ""
++"R�site de l'envoi de la r�nse %s sur la repository %s (%s:%ld), il en "
++"reste %d"
+
+-#: AsynchMsgs.cpp:1127
++#: ../src/AsynchMsgs.cpp:1127
+ #, c-format
+ msgid "Failed to get my requests from repository %s (%s:%ld)"
+-msgstr "Echec lors de la r�p�tion de mes requ�s depuis la repository %s (%s:%ld)"
++msgstr ""
++"Echec lors de la r�p�tion de mes requ�s depuis la repository %s (%s:%"
++"ld)"
+
+-#: AsynchMsgs.cpp:1131
++#: ../src/AsynchMsgs.cpp:1131
+ #, c-format
+ msgid "Successfully got my requests from repository %s (%s:%ld)"
+-msgstr "Succ�de la r�p�tion de mes requ�s depuis la repository %s (%s:%ld)"
++msgstr ""
++"Succ�de la r�p�tion de mes requ�s depuis la repository %s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1196
++#: ../src/AsynchMsgs.cpp:1196
+ #, c-format
+ msgid "Successfully got my conf and my objects from repository %s (%s:%ld)"
+-msgstr "Succ�de la r�p�tion de ma conf et de mes objets depuis la repository %s (%s:%ld)"
++msgstr ""
++"Succ�de la r�p�tion de ma conf et de mes objets depuis la repository %"
++"s (%s:%ld)"
+
+-#: AsynchMsgs.cpp:1200
++#: ../src/AsynchMsgs.cpp:1200
+ #, c-format
+ msgid ""
+ "Failed to get my conf and my objects from repository %s (%s:%ld)\n"
+ "Reason:%s"
+ msgstr ""
+-"Echec lors de la r�p�tion de ma conf et de mes objets depuis la repository %s (%s:%ld)\n"
++"Echec lors de la r�p�tion de ma conf et de mes objets depuis la "
++"repository %s (%s:%ld)\n"
+ "Raison:%s"
+
+-#: AsynchMsgs.cpp:1581
++#: ../src/AsynchMsgs.cpp:1581
+ msgid "Optimizing requester's requests table..."
+ msgstr "Optimisation de la table des requ�s du requ�ur..."
+
+-#: AsynchMsgs.cpp:1586
++#: ../src/AsynchMsgs.cpp:1586
+ #, c-format
+ msgid "Failed to optimize requester's requests table - Reason: %s"
+-msgstr "Echec de l'optimisation de la table des req�s du req�ur - Raison: %s"
++msgstr ""
++"Echec de l'optimisation de la table des req�s du req�ur - Raison: %s"
+
+-#: AsynchMsgs.cpp:1591
++#: ../src/AsynchMsgs.cpp:1591
+ #, c-format
+ msgid "Optimized requester's requests table in %ld secondes"
+ msgstr "Optimis�a table des requ�s du requ�ur en %ld secondes"
+
+-#: AutoSynchLDAP.cpp:109
+-#: AutoSynchLDAP.cpp:131
+-#: AutoSynchLDAP.cpp:135
+-#: AutoSynchLDAP.cpp:152
+-#: AutoSynchLDAP.cpp:167
+-#: AutoSynchLDAP.cpp:179
+-#: AutoSynchLDAP.cpp:191
+-#: AutoSynchLDAP.cpp:194
+-#: AutoSynchLDAP.cpp:215
++#: ../src/AutoSynchLDAP.cpp:109 ../src/AutoSynchLDAP.cpp:131
++#: ../src/AutoSynchLDAP.cpp:135 ../src/AutoSynchLDAP.cpp:152
++#: ../src/AutoSynchLDAP.cpp:167 ../src/AutoSynchLDAP.cpp:179
++#: ../src/AutoSynchLDAP.cpp:191 ../src/AutoSynchLDAP.cpp:194
++#: ../src/AutoSynchLDAP.cpp:215
+ msgid "LDAP Synchronization"
+ msgstr "Synchronisation LDAP"
+
+-#: AutoSynchLDAP.cpp:109
++#: ../src/AutoSynchLDAP.cpp:109
+ #, c-format
+ msgid "Failed to get known ids: %s"
+ msgstr "Echec lors de la r�p�tion des ids connus: %s"
+
+-#: AutoSynchLDAP.cpp:131
++#: ../src/AutoSynchLDAP.cpp:131
+ #, c-format
+ msgid "Failed to search in LDAP: %s"
+ msgstr "Echec lors de la recherche LDAP: %s"
+
+-#: AutoSynchLDAP.cpp:135
++#: ../src/AutoSynchLDAP.cpp:135
+ #, c-format
+ msgid "LDAP search returned %d new profile(s)"
+ msgstr "La recherche LDAP a renvoy�d nouveau(x) profil(s)"
+
+-#: AutoSynchLDAP.cpp:152
++#: ../src/AutoSynchLDAP.cpp:152
+ #, c-format
+ msgid ""
+ "Failed to process new profile: %s\n"
+@@ -232,176 +248,167 @@ msgstr ""
+ "Echec lors du traitement du profil: %s\n"
+ "Raison:%s"
+
+-#: AutoSynchLDAP.cpp:167
++#: ../src/AutoSynchLDAP.cpp:167
+ #, c-format
+ msgid "Successfully processed new profile: %s"
+ msgstr "Succ�du traitement du nouveau profil: %s"
+
+-#: AutoSynchLDAP.cpp:179
++#: ../src/AutoSynchLDAP.cpp:179
+ msgid "Waiting for LDAP Synchronization Initialization..."
+ msgstr "En attente de l'Initialisation de la Synchronisation LDAP"
+
+-#: AutoSynchLDAP.cpp:191
+-#: AutoSynchLDAP.cpp:215
++#: ../src/AutoSynchLDAP.cpp:191 ../src/AutoSynchLDAP.cpp:215
+ msgid "LDAP Synchronization Stopped"
+ msgstr "Arr�de la Synchronisation LDAP"
+
+-#: AutoSynchLDAP.cpp:194
++#: ../src/AutoSynchLDAP.cpp:194
+ msgid "LDAP Synchronization Initialized"
+ msgstr "La Synchronisation LDAP est Initialis�
+
+-#: AutoSynchLDAP.cpp:256
++#: ../src/AutoSynchLDAP.cpp:256
+ msgid "Profile has no UID"
+ msgstr "Le profil n'a pas d'UID"
+
+-#: CA_Handler.cpp:437
+-#: EeStore.cpp:1270
+-#: RaStore.cpp:671
++#: ../src/CA_Handler.cpp:437 ../src/EeStore.cpp:1270 ../src/RaStore.cpp:671
+ msgid "Optimizing certificates table..."
+ msgstr "Optimisation de la table des certificats..."
+
+-#: CA_Handler.cpp:443
+-#: EeStore.cpp:1275
+-#: RaStore.cpp:676
++#: ../src/CA_Handler.cpp:443 ../src/EeStore.cpp:1275 ../src/RaStore.cpp:676
+ #, c-format
+ msgid "Failed to optimize certificates table - Reason: %s"
+ msgstr "Echec de l'optimisation de la table des certificats - Raison: %s"
+
+-#: CA_Handler.cpp:448
+-#: EeStore.cpp:1280
+-#: RaStore.cpp:681
++#: ../src/CA_Handler.cpp:448 ../src/EeStore.cpp:1280 ../src/RaStore.cpp:681
+ #, c-format
+ msgid "Optimized certificates table in %ld secondes"
+ msgstr "Optimis�a table des certificats en %ld secondes"
+
+-#: Conf.cpp:210
++#: ../src/Conf.cpp:210
+ #, c-format
+ msgid "Could not open %s <> %s"
+ msgstr "Impossible d'ouvrir %s <> %s"
+
+-#: Conf.cpp:231
++#: ../src/Conf.cpp:231
+ #, c-format
+ msgid "Invalid configuration format %s (%s)"
+ msgstr "Format de la configuration invalide %s (%s)"
+
+-#: Conf.cpp:292
++#: ../src/Conf.cpp:292
+ #, c-format
+ msgid "Invalid configuration (%s) <> sprintf failed"
+ msgstr "Configuration invalide (%s) <> sprintf a echou�+
+-#: Conf.cpp:303
++#: ../src/Conf.cpp:303
+ #, c-format
+ msgid "Invalid configuration format (%s) <> Unknown value %s"
+ msgstr "Format de la configuration invalide (%s) <> Valeur inconnue %s"
+
+-#: Conf.cpp:313
+-#: Conf.cpp:319
+-#: Conf.cpp:325
+-#: Conf.cpp:331
+-#: Conf.cpp:337
+-#: Conf.cpp:343
++#: ../src/Conf.cpp:313 ../src/Conf.cpp:319 ../src/Conf.cpp:325
++#: ../src/Conf.cpp:331 ../src/Conf.cpp:337 ../src/Conf.cpp:343
+ #, c-format
+ msgid "Invalid configuration format (%s) <> %s must have a value"
+ msgstr "Format de la configuration invalide (%s) <> %s doit avoir une valeur"
+
+-#: Conf.cpp:358
++#: ../src/Conf.cpp:358
+ msgid "Error"
+ msgstr "Erreur"
+
+-#: EeStore.cpp:174
++#: ../src/EeStore.cpp:174
+ msgid "Optimizing DN validation table..."
+ msgstr "Optimisation de la table des validation de DNs..."
+
+-#: EeStore.cpp:179
++#: ../src/EeStore.cpp:179
+ #, c-format
+ msgid "Failed to optimize DN validation table - Reason: %s"
+-msgstr "Echec de l'optimisation de la table des validations de DNs - Raison: %s"
++msgstr ""
++"Echec de l'optimisation de la table des validations de DNs - Raison: %s"
+
+-#: EeStore.cpp:184
++#: ../src/EeStore.cpp:184
+ #, c-format
+ msgid "Optimized DN validation table in %ld secondes"
+ msgstr "Optimis�a table des validations de DNs en %ld secondes"
+
+-#: EeStore.cpp:188
++#: ../src/EeStore.cpp:188
+ #, c-format
+ msgid ""
+-"In order to generate your certificate, the PKI needs you to validate your personal information.\n"
++"In order to generate your certificate, the PKI needs you to validate your "
++"personal information.\n"
+ "Please logon to \"%svalidate_dn.php?ID=%s\""
+ msgstr ""
+-"Pour pouvoir g�rer votre certificat, la PKI a besoin que vous validiez vos informations personelles.\n"
++"Pour pouvoir g�rer votre certificat, la PKI a besoin que vous validiez vos "
++"informations personelles.\n"
+ "Veuillez vous connecter �"%svalidate_dn.php?ID=%s\""
+
+-#: EeStore.cpp:198
++#: ../src/EeStore.cpp:198
+ msgid "Personal Information Validation"
+ msgstr "Validation d'Informations Personnelles"
+
+-#: EeStore.cpp:271
+-#: EeStore.cpp:329
++#: ../src/EeStore.cpp:271 ../src/EeStore.cpp:329
+ msgid "Unknown Id"
+ msgstr "Id Inconnu"
+
+-#: EeStore.cpp:571
++#: ../src/EeStore.cpp:571
+ msgid "LDAP server not available, please contact your system administrator."
+-msgstr "Le serveur LDAP n'est pas disponible, veuillez contacter votre administrateur"
++msgstr ""
++"Le serveur LDAP n'est pas disponible, veuillez contacter votre administrateur"
+
+-#: EeStore.cpp:603
+-msgid "More than one user has this email address, please contact your administrator"
+-msgstr "Plusieurs utilisateurs ont cette adresse email, veuillez contacter votre administrateur"
++#: ../src/EeStore.cpp:603
++msgid ""
++"More than one user has this email address, please contact your administrator"
++msgstr ""
++"Plusieurs utilisateurs ont cette adresse email, veuillez contacter votre "
++"administrateur"
+
+-#: EeStore.cpp:680
+-#: EeStore.cpp:715
++#: ../src/EeStore.cpp:680 ../src/EeStore.cpp:715
+ msgid "Account hasn't been validated by RA"
+ msgstr "Le compte n'a pas encore � valid�as l'AE"
+
+-#: EeStore.cpp:703
++#: ../src/EeStore.cpp:703
+ msgid "Account isn't active yet"
+ msgstr "Le compte n'est pas encore actif"
+
+-#: EeStore.cpp:1473
+-#: EntityLog.cpp:470
+-#: Entity_CA.cpp:1793
+-#: Entity_CA.cpp:1868
+-#: Entity_EE.cpp:1138
+-#: Entity_PUBLICATION.cpp:491
+-#: Entity_RA.cpp:1137
+-#: Entity_RA.cpp:1989
+-#: Entity_SERVER.cpp:383
+-#: RaStore.cpp:722
+-#: SockServerADMIN.cpp:172
++#. Now search the Pub
++#: ../src/EeStore.cpp:1473 ../src/EntityLog.cpp:470 ../src/Entity_CA.cpp:1793
++#: ../src/Entity_CA.cpp:1868 ../src/Entity_EE.cpp:1138
++#: ../src/Entity_PUBLICATION.cpp:491 ../src/Entity_RA.cpp:1137
++#: ../src/Entity_RA.cpp:1989 ../src/Entity_SERVER.cpp:383
++#: ../src/RaStore.cpp:722 ../src/SockServerADMIN.cpp:172
+ msgid "Unknown"
+ msgstr "Inconnu"
+
+-#: EeStore.cpp:1802
++#: ../src/EeStore.cpp:1802
+ #, c-format
+-msgid "Please logon to \"%sactivate_account.php?ID=%s\" to activate your account"
+-msgstr "Veuillez vous authentifier sur \"%sactivate_account.php?ID=%s\" pour activer votre compte"
++msgid ""
++"Please logon to \"%sactivate_account.php?ID=%s\" to activate your account"
++msgstr ""
++"Veuillez vous authentifier sur \"%sactivate_account.php?ID=%s\" pour activer "
++"votre compte"
+
+-#: EeStore.cpp:1812
++#: ../src/EeStore.cpp:1812
+ msgid "Since you failed to activate your account in time it has been deleted"
+ msgstr "N'ayant pas activ�otre compte en temps voulu, il a � supprim�+
+-#: EeStore.cpp:1816
++#: ../src/EeStore.cpp:1816
+ msgid "Account Activation"
+ msgstr "Activation d'un Compte"
+
+-#: EeStore.cpp:1816
++#: ../src/EeStore.cpp:1816
+ msgid "Account Deletion"
+ msgstr "Suppression d'un Compte"
+
+-#: Entity.cpp:395
++#: ../src/Entity.cpp:395
+ msgid "Entity is not initialized"
+ msgstr "L'entit�'a pas � initialis�
+
+-#: Entity.cpp:523
+-#: Entity.cpp:531
++#: ../src/Entity.cpp:523 ../src/Entity.cpp:531
+ msgid "No emailAddress"
+ msgstr "Pas d'emailAddress"
+
+-#: Entity.cpp:744
++#: ../src/Entity.cpp:744
+ msgid "Type: "
+ msgstr "Type:"
+
+-#: Entity.cpp:746
++#: ../src/Entity.cpp:746
+ msgid ""
+ "\n"
+ "Status: "
+@@ -409,7 +416,7 @@ msgstr ""
+ "\n"
+ "Status: "
+
+-#: Entity.cpp:748
++#: ../src/Entity.cpp:748
+ msgid ""
+ "\n"
+ "Object: "
+@@ -417,7 +424,7 @@ msgstr ""
+ "\n"
+ "Objet: "
+
+-#: Entity.cpp:750
++#: ../src/Entity.cpp:750
+ msgid ""
+ "\n"
+ "User: "
+@@ -425,7 +432,7 @@ msgstr ""
+ "\n"
+ "Utilisateur: "
+
+-#: Entity.cpp:752
++#: ../src/Entity.cpp:752
+ msgid ""
+ "\n"
+ "Date: "
+@@ -433,7 +440,7 @@ msgstr ""
+ "\n"
+ "Date: "
+
+-#: Entity.cpp:756
++#: ../src/Entity.cpp:756
+ msgid ""
+ "\n"
+ "Error: "
+@@ -441,81 +448,60 @@ msgstr ""
+ "\n"
+ "Erreur: "
+
+-#: Entity.cpp:760
++#: ../src/Entity.cpp:760
+ msgid "Audit Event"
+ msgstr "Ev�mment Audit"
+
+-#: Entity.cpp:868
++#: ../src/Entity.cpp:868
+ #, c-format
+ msgid "New personnal conf version %ld"
+ msgstr "Nouvelle conf personnelle version %ld"
+
+-#: Entity_BACKUP.cpp:199
+-#: Entity_CA.cpp:423
+-#: Entity_CA.cpp:424
+-#: Entity_CA.cpp:425
+-#: Entity_CA.cpp:426
+-#: Entity_CA.cpp:427
+-#: Entity_CA.cpp:432
+-#: Entity_EE.cpp:239
+-#: Entity_EE.cpp:241
+-#: Entity_KEYSTORE.cpp:235
+-#: Entity_PKI.cpp:975
+-#: Entity_PKI.cpp:979
+-#: Entity_PKI.cpp:987
+-#: Entity_PKI.cpp:992
+-#: Entity_PKI.cpp:994
+-#: Entity_PUBLICATION.cpp:326
+-#: Entity_PUBLICATION.cpp:338
+-#: Entity_PUBLICATION.cpp:344
+-#: Entity_PUBLICATION.cpp:348
+-#: Entity_PUBLICATION.cpp:462
+-#: Entity_PUBLICATION.cpp:874
+-#: Entity_PUBLICATION.cpp:1067
+-#: Entity_PUBLICATION.cpp:1082
+-#: Entity_PUBLICATION.cpp:1086
+-#: Entity_RA.cpp:380
+-#: Entity_RA.cpp:382
+-#: Entity_RA.cpp:384
+-#: Entity_REPOSITORY.cpp:486
+-#: Entity_REPOSITORY.cpp:505
+-#: Entity_REPOSITORY.cpp:512
++#: ../src/Entity_BACKUP.cpp:199 ../src/Entity_CA.cpp:423
++#: ../src/Entity_CA.cpp:424 ../src/Entity_CA.cpp:425 ../src/Entity_CA.cpp:426
++#: ../src/Entity_CA.cpp:427 ../src/Entity_CA.cpp:432 ../src/Entity_EE.cpp:239
++#: ../src/Entity_EE.cpp:241 ../src/Entity_KEYSTORE.cpp:235
++#: ../src/Entity_PKI.cpp:975 ../src/Entity_PKI.cpp:979
++#: ../src/Entity_PKI.cpp:987 ../src/Entity_PKI.cpp:992
++#: ../src/Entity_PKI.cpp:994 ../src/Entity_PUBLICATION.cpp:326
++#: ../src/Entity_PUBLICATION.cpp:338 ../src/Entity_PUBLICATION.cpp:344
++#: ../src/Entity_PUBLICATION.cpp:348 ../src/Entity_PUBLICATION.cpp:462
++#: ../src/Entity_PUBLICATION.cpp:874 ../src/Entity_PUBLICATION.cpp:1067
++#: ../src/Entity_PUBLICATION.cpp:1082 ../src/Entity_PUBLICATION.cpp:1086
++#: ../src/Entity_RA.cpp:380 ../src/Entity_RA.cpp:382 ../src/Entity_RA.cpp:384
++#: ../src/Entity_REPOSITORY.cpp:486 ../src/Entity_REPOSITORY.cpp:505
++#: ../src/Entity_REPOSITORY.cpp:512
+ msgid "none"
+ msgstr "aucun"
+
+-#: Entity_CA.cpp:351
+-#: Entity_KEYSTORE.cpp:184
+-#: Entity_PKI.cpp:548
+-#: Entity_PUBLICATION.cpp:402
+-#: Entity_RA.cpp:318
+-#: Entity_REPOSITORY.cpp:706
++#: ../src/Entity_CA.cpp:351 ../src/Entity_KEYSTORE.cpp:184
++#: ../src/Entity_PKI.cpp:548 ../src/Entity_PUBLICATION.cpp:402
++#: ../src/Entity_RA.cpp:318 ../src/Entity_REPOSITORY.cpp:706
+ #, c-format
+ msgid "Upgraded to version %s"
+ msgstr "Mis �our vers la version %s"
+
+-#: Entity_EE.cpp:539
+-#: Entity_EE.cpp:677
+-#: Entity_EE.cpp:781
++#: ../src/Entity_EE.cpp:539 ../src/Entity_EE.cpp:677 ../src/Entity_EE.cpp:781
+ msgid "No RA has been associated to this EE"
+ msgstr "Aucune AE n'a � associ�avec cette EE"
+
+-#: Entity_EE.cpp:1029
++#: ../src/Entity_EE.cpp:1029
+ msgid "Your profile was validated by the RA, you may now login."
+ msgstr "Votre profil a � valid�ar l'AE, vous pouvez vous authentifier."
+
+-#: Entity_EE.cpp:1031
++#: ../src/Entity_EE.cpp:1031
+ msgid "Profile accepted"
+ msgstr "Profil accept�+
+-#: Entity_EE.cpp:1054
++#: ../src/Entity_EE.cpp:1054
+ msgid "Your certificate is available on the site."
+ msgstr "Votre certificat est disponible sur le site."
+
+-#: Entity_EE.cpp:1056
++#: ../src/Entity_EE.cpp:1056
+ msgid "Certificate signed"
+ msgstr "Certificat sign�+
+-#: Entity_EE.cpp:1086
++#: ../src/Entity_EE.cpp:1086
+ #, c-format
+ msgid ""
+ "Your profile was rejected by the RA for the following reason(s):\n"
+@@ -524,11 +510,11 @@ msgstr ""
+ "Votre profil a � rejet�ar l'AE pour la(es) raison(s) suivante(s):\n"
+ "%s"
+
+-#: Entity_EE.cpp:1090
++#: ../src/Entity_EE.cpp:1090
+ msgid "Profile was rejected"
+ msgstr "Le Profil a � rejet�+
+-#: Entity_EE.cpp:1111
++#: ../src/Entity_EE.cpp:1111
+ #, c-format
+ msgid ""
+ "Your certificate wasn't signed for the following reason(s):\n"
+@@ -537,44 +523,61 @@ msgstr ""
+ "Votre certificat n'a pas � sign�our la(es) raison(s) suivante(s):\n"
+ "%s"
+
+-#: Entity_EE.cpp:1115
++#: ../src/Entity_EE.cpp:1115
+ msgid "Certificate not generated"
+ msgstr "Certificat non g�r�+
+-#: Entity_PKI.cpp:1547
++#: ../src/Entity_PKI.cpp:1547
+ msgid "You cannot revoke a RA while an EE is attached to it"
+ msgstr "Vous ne pouvez pas r�quer une AE tant qu'une EE y est attach�
+
+-#: Entity_PKI.cpp:2461
+-msgid "In consideration of your use of the Service, you agree to provide true, accurate, current and complete information about yourself as prompted by the DN validation form. If you provide any information that is untrue, inaccurate, not current or incomplete, or we have reasonable grounds to suspect that such information is untrue, inaccurate, not current or incomplete, we have the right to suspend or terminate your account and refuse any and all current or future use of the Service (or any portion thereof)."
+-msgstr "En consid�tion de votre utilisation du Service, vous vous engagez �ournir des informations, �ropos de vous-m�, vraies, pr�ses, �our, et compl�s, telles que demand� dans le formulaire de validation du DN. Si vous �ez amen��ournir des informations qui soient fausses, impr�ses, non �our ou incompl�s, ou que nous ayons suffisamment d'�ments pour suspecter que ces informations soient fausses, impr�ses, non �our ou incompl�s, nous avons le droit de suspendre ou de mettre fin �otre compte et de refuser que vous utilisiez n'importe quelle, ou toute, partie courante ou future du Service (ou toute portion de fait)."
++#: ../src/Entity_PKI.cpp:2461
++msgid ""
++"In consideration of your use of the Service, you agree to provide true, "
++"accurate, current and complete information about yourself as prompted by the "
++"DN validation form. If you provide any information that is untrue, "
++"inaccurate, not current or incomplete, or we have reasonable grounds to "
++"suspect that such information is untrue, inaccurate, not current or "
++"incomplete, we have the right to suspend or terminate your account and "
++"refuse any and all current or future use of the Service (or any portion "
++"thereof)."
++msgstr ""
++"En consid�tion de votre utilisation du Service, vous vous engagez �
++"fournir des informations, �ropos de vous-m�, vraies, pr�ses, �our, "
++"et compl�s, telles que demand� dans le formulaire de validation du DN. "
++"Si vous �ez amen��ournir des informations qui soient fausses, "
++"impr�ses, non �our ou incompl�s, ou que nous ayons suffisamment "
++"d'�ments pour suspecter que ces informations soient fausses, impr�ses, "
++"non �our ou incompl�s, nous avons le droit de suspendre ou de mettre fin "
++"�otre compte et de refuser que vous utilisiez n'importe quelle, ou toute, "
++"partie courante ou future du Service (ou toute portion de fait)."
+
+-#: Entity_PKI.cpp:3813
++#: ../src/Entity_PKI.cpp:3813
+ msgid "You can only have one link between an EE and an RA"
+ msgstr "Il ne peut y avoir qu'un seul lien entre une EE and une AE"
+
+-#: Entity_RA.cpp:515
++#: ../src/Entity_RA.cpp:515
+ msgid "Delegate profile's ownership"
+ msgstr "D�guer le propri� du profil"
+
+-#: Entity_RA.cpp:542
+-#: Entity_RA.cpp:1913
++#: ../src/Entity_RA.cpp:542 ../src/Entity_RA.cpp:1913
+ msgid "You haven't configured an EE for this RA"
+ msgstr "Vous n'avez pas configur�ne EE pour cette AE"
+
+-#: Entity_RA.cpp:1208
++#: ../src/Entity_RA.cpp:1208
+ msgid "You must configure a group to delegate the ownership of the EE profiles"
+-msgstr "Vous devez configurer un group pour d�guer la propri� des profils de l'EE"
++msgstr ""
++"Vous devez configurer un group pour d�guer la propri� des profils de l'EE"
+
+-#: Entity_RA.cpp:1898
++#: ../src/Entity_RA.cpp:1898
+ msgid "The EE Id has an invalid format"
+ msgstr "L'Id EE a un format invalide"
+
+-#: Entity_RA.cpp:1999
++#: ../src/Entity_RA.cpp:1999
+ msgid "A certificate is about to expiry"
+ msgstr "Un certificat va bient�xpirer"
+
+-#: Entity_RA.cpp:2000
++#: ../src/Entity_RA.cpp:2000
+ #, c-format
+ msgid ""
+ "The following certificate will expiry in %d day(s)\n"
+@@ -593,22 +596,21 @@ msgstr ""
+ "DN du Certificat: %s\n"
+ "Sign�ar: %s"
+
+-#: Entity_REPOSITORY.cpp:246
++#: ../src/Entity_REPOSITORY.cpp:246
+ msgid "Optimizing objects table..."
+ msgstr "Optimisation de la table des objets..."
+
+-#: Entity_REPOSITORY.cpp:251
++#: ../src/Entity_REPOSITORY.cpp:251
+ #, c-format
+ msgid "Failed to optimize objects table - Reason: %s"
+ msgstr "Echec de l'optimisation de la table des objets - Raison: %s"
+
+-#: Entity_REPOSITORY.cpp:256
++#: ../src/Entity_REPOSITORY.cpp:256
+ #, c-format
+ msgid "Optimized objects table in %ld secondes"
+ msgstr "Optimis�a table des objets en %ld secondes"
+
+-#: Entity_REPOSITORY.cpp:394
+-#: Entity_REPOSITORY.cpp:411
++#: ../src/Entity_REPOSITORY.cpp:394 ../src/Entity_REPOSITORY.cpp:411
+ #, c-format
+ msgid ""
+ "Failed to push NewPKI object on repository %s (%s:%ld)\n"
+@@ -617,94 +619,92 @@ msgstr ""
+ "Echec de l'envoi de l'objet NewPKI sur la repository %s (%s:%ld)\n"
+ "Raison:%s"
+
+-#: Entity_REPOSITORY.cpp:430
++#: ../src/Entity_REPOSITORY.cpp:430
+ #, c-format
+ msgid "Successfully pushed NewPKI object on repository %s (%s:%ld)"
+ msgstr "L'objet NewPKI a � envoy�vec succ�sur la repository %s (%s:%ld)"
+
+-#: Entity_REPOSITORY.cpp:934
++#: ../src/Entity_REPOSITORY.cpp:934
+ #, c-format
+ msgid "Requesting request object synchronization for %s"
+ msgstr "Demande de synchronization pour l'objet requ� %s"
+
+-#: Entity_REPOSITORY.cpp:940
++#: ../src/Entity_REPOSITORY.cpp:940
+ #, c-format
+ msgid "Request object %s is known"
+ msgstr "L'objet requ� %s est connu"
+
+-#: Entity_REPOSITORY.cpp:962
+-#: Entity_REPOSITORY.cpp:1004
++#: ../src/Entity_REPOSITORY.cpp:962 ../src/Entity_REPOSITORY.cpp:1004
+ #, c-format
+ msgid "Requesting response object deletion for %s"
+ msgstr "Demande de la suppression de l'objet r�nse %s"
+
+-#: Entity_REPOSITORY.cpp:969
++#: ../src/Entity_REPOSITORY.cpp:969
+ #, c-format
+ msgid "Response object %s is known"
+ msgstr "L'objet r�nse %s est connu"
+
+-#: Entity_REPOSITORY.cpp:979
++#: ../src/Entity_REPOSITORY.cpp:979
+ #, c-format
+ msgid "Requesting response object synchronization for %s"
+ msgstr "Demande de synchronization pour l'objet r�nse %s"
+
+-#: Entity_REPOSITORY.cpp:1015
++#: ../src/Entity_REPOSITORY.cpp:1015
+ #, c-format
+ msgid "Importing request object %s"
+ msgstr "Importation de l'objet requ� %s"
+
+-#: Entity_REPOSITORY.cpp:1019
++#: ../src/Entity_REPOSITORY.cpp:1019
+ #, c-format
+ msgid "Importing response object %s"
+ msgstr "Importation de l'objet r�nse %s"
+
+-#: Entity_REPOSITORY.cpp:1023
++#: ../src/Entity_REPOSITORY.cpp:1023
+ #, c-format
+ msgid "Importing deletion for object %s"
+ msgstr "Importation de la suppression de l'objet %s"
+
+-#: Entity_REPOSITORY.cpp:1050
++#: ../src/Entity_REPOSITORY.cpp:1050
+ #, c-format
+ msgid "Sending request object %s"
+ msgstr "Envoi de l'objet requ� %s"
+
+-#: Entity_REPOSITORY.cpp:1073
++#: ../src/Entity_REPOSITORY.cpp:1073
+ #, c-format
+ msgid "Sending response object %s"
+ msgstr "Envoi de l'objet r�nse %s"
+
+-#: Entity_REPOSITORY.cpp:1094
++#: ../src/Entity_REPOSITORY.cpp:1094
+ #, c-format
+ msgid "Deleting response object %s"
+ msgstr "Suppression de l'objet r�nse %s"
+
+-#: Entity_REPOSITORY.cpp:1100
++#: ../src/Entity_REPOSITORY.cpp:1100
+ #, c-format
+ msgid "Reading from request: %ld"
+ msgstr "Lecture depuis la requ�: %ld"
+
+-#: Entity_REPOSITORY.cpp:1107
++#: ../src/Entity_REPOSITORY.cpp:1107
+ #, c-format
+ msgid "Read %ld requests"
+ msgstr "Lu %ld requ�s"
+
+-#: Entity_REPOSITORY.cpp:1109
++#: ../src/Entity_REPOSITORY.cpp:1109
+ #, c-format
+ msgid "Reading from response: %ld"
+ msgstr "Lecture depuis la r�nse: %ld"
+
+-#: Entity_REPOSITORY.cpp:1116
++#: ../src/Entity_REPOSITORY.cpp:1116
+ #, c-format
+ msgid "Read %ld responses"
+ msgstr "Lu %ld r�nses"
+
+-#: Entity_REPOSITORY.cpp:1147
++#: ../src/Entity_REPOSITORY.cpp:1147
+ #, c-format
+ msgid "Requesting full synchro with respository %s (%s:%ld)"
+ msgstr "Demande d'une synchro compl� �a repository %s (%s:%ld)"
+
+-#: Entity_REPOSITORY.cpp:1152
+-#: Entity_REPOSITORY.cpp:1170
++#: ../src/Entity_REPOSITORY.cpp:1152 ../src/Entity_REPOSITORY.cpp:1170
+ #, c-format
+ msgid ""
+ "Failed to synchronize objects on respository %s (%s:%ld)\n"
+@@ -713,123 +713,121 @@ msgstr ""
+ "Echec de la synchronisation des objets sur la repository %s (%s:%ld)\n"
+ "Raison:%s"
+
+-#: Entity_REPOSITORY.cpp:1194
++#: ../src/Entity_REPOSITORY.cpp:1194
+ #, c-format
+ msgid "Successfully synchronized with respository %s (%s:%ld)"
+ msgstr "R�site de la synchronisation avec la repository %s (%s:%ld)"
+
+-#: Entity_REPOSITORY.cpp:1481
++#: ../src/Entity_REPOSITORY.cpp:1481
+ #, c-format
+ msgid "New PKI conf version %ld"
+ msgstr "Nouvelle Conf PKI version %ld"
+
+-#: Entity_SERVER.cpp:66
+-#: Entity_SERVER.cpp:69
+-#: Entity_SERVER.cpp:137
+-#: Entity_SERVER.cpp:142
+-#: Entity_SERVER.cpp:146
+-#: Entity_SERVER.cpp:150
+-#: Entity_SERVER.cpp:154
+-#: Entity_SERVER.cpp:162
+-#: Entity_SERVER.cpp:167
+-#: Entity_SERVER.cpp:310
+-#: Entity_SERVER.cpp:319
++#. Creation of the SSL certificate
++#: ../src/Entity_SERVER.cpp:66 ../src/Entity_SERVER.cpp:69
++#: ../src/Entity_SERVER.cpp:137 ../src/Entity_SERVER.cpp:142
++#: ../src/Entity_SERVER.cpp:146 ../src/Entity_SERVER.cpp:150
++#: ../src/Entity_SERVER.cpp:154 ../src/Entity_SERVER.cpp:162
++#: ../src/Entity_SERVER.cpp:167 ../src/Entity_SERVER.cpp:310
++#: ../src/Entity_SERVER.cpp:319
+ msgid "NewPKI Server"
+ msgstr "Serveur NewPKI"
+
+-#: Entity_SERVER.cpp:66
++#: ../src/Entity_SERVER.cpp:66
+ #, c-format
+ msgid "Unloading entity %s"
+ msgstr "D�argement de l'entit�s"
+
+-#: Entity_SERVER.cpp:69
++#: ../src/Entity_SERVER.cpp:69
+ #, c-format
+ msgid "Successfully unloaded entity %s"
+ msgstr "L'entit�s a � d�arg�avec succ�
+
+-#: Entity_SERVER.cpp:137
++#: ../src/Entity_SERVER.cpp:137
+ msgid "Creating NewPKI database..."
+ msgstr "Cr�ion de la base de donn� NewPKI"
+
+-#: Entity_SERVER.cpp:142
++#: ../src/Entity_SERVER.cpp:142
+ msgid "Failed to create NewPKI database"
+ msgstr "Echec lors de la cr�ion de la base de donn� NewPKI"
+
+-#: Entity_SERVER.cpp:146
++#: ../src/Entity_SERVER.cpp:146
+ msgid "Successfully created NewPKI database"
+ msgstr "La base de donn� NewPKI a � cr�avec succ�
+
+-#: Entity_SERVER.cpp:150
++#: ../src/Entity_SERVER.cpp:150
+ msgid "Creating NewPKI server's SSL certificate..."
+ msgstr "Cr�ion du certificat SSL du serveur NewPKI"
+
+-#: Entity_SERVER.cpp:154
+-#: Entity_SERVER.cpp:162
++#: ../src/Entity_SERVER.cpp:154 ../src/Entity_SERVER.cpp:162
+ msgid "Failed to create NewPKI server's SSL certificate"
+ msgstr "La cr�ion du certificat SSL du serveur NewPKI a �ou�+
+-#: Entity_SERVER.cpp:167
++#: ../src/Entity_SERVER.cpp:167
+ msgid "Successfully created NewPKI server's SSL certificate"
+ msgstr "La cr�ion du certificat SSL du serveur NewPKI a r�ssi"
+
+-#: Entity_SERVER.cpp:240
++#: ../src/Entity_SERVER.cpp:240
+ msgid "Loading entity"
+ msgstr "Chargement de l'entit�+
+-#: Entity_SERVER.cpp:245
++#: ../src/Entity_SERVER.cpp:245
+ #, c-format
+ msgid "Entity failed to load: %s"
+ msgstr "Echec lors du chargement de l'entit�%s"
+
+-#: Entity_SERVER.cpp:250
++#: ../src/Entity_SERVER.cpp:250
+ msgid "Entity loaded"
+ msgstr "Entit�harg�
+
+-#: Entity_SERVER.cpp:310
++#: ../src/Entity_SERVER.cpp:310
+ #, c-format
+ msgid "Failed to upgrade Entity %s"
+ msgstr "Echec lors de la mise �our de l'Entit�s"
+
+-#: Entity_SERVER.cpp:319
++#: ../src/Entity_SERVER.cpp:319
+ #, c-format
+ msgid "Failed to load Entity %s"
+ msgstr "Echec lors du chargement de l'Entit�s"
+
+-#: MAIN.cpp:86
++#: ../src/MAIN.cpp:86
+ #, c-format
+ msgid "Usage: %s -config config.conf -version\n"
+ msgstr "Usage: %s -config config.conf -version\n"
+
+-#: MAIN.cpp:88
++#: ../src/MAIN.cpp:88
+ #, c-format
+-msgid "Usage: %s -config config.conf [-user username] [-detach] [-pidfile file] [-version]\n"
+-msgstr "Usage: %s -config config.conf [-user utilisateur] [-detach] [-pidfile fichier] [-version]\n"
++msgid ""
++"Usage: %s -config config.conf [-user username] [-detach] [-pidfile file] [-"
++"version]\n"
++msgstr ""
++"Usage: %s -config config.conf [-user utilisateur] [-detach] [-pidfile "
++"fichier] [-version]\n"
+
+-#: MAIN.cpp:165
++#: ../src/MAIN.cpp:165
+ msgid "Compiled Against:\n"
+ msgstr "Compil�vec:\n"
+
+-#: MAIN.cpp:174
+-#: MAIN.cpp:687
++#: ../src/MAIN.cpp:174 ../src/MAIN.cpp:687
+ msgid "Version"
+ msgstr "Version"
+
+-#: MAIN.cpp:343
++#: ../src/MAIN.cpp:343
+ #, c-format
+ msgid "Failed to setsid, not closing stdin, stdout and stderr: %s"
+ msgstr "Impossible de setsid, stdin, stdout et stderr ne seront pas ferm� %s"
+
+-#: MAIN.cpp:347
++#: ../src/MAIN.cpp:347
+ #, c-format
+ msgid "Failed to fork: %s"
+ msgstr "Impossible de forker: %s"
+
+-#: MAIN.cpp:366
++#: ../src/MAIN.cpp:366
+ #, c-format
+ msgid "Failed to create PID file: %s - %s"
+ msgstr "Impossible de cr� le fichier PID %s - %s"
+
+-#: RaStore.cpp:124
++#: ../src/RaStore.cpp:124
+ msgid ""
+ "\n"
+ "All certificates associated with this profile \n"
+@@ -839,34 +837,34 @@ msgstr ""
+ "Tous les certificats associ��e profil \n"
+ "doivent �e r�qu�ou dans un �t erreur"
+
+-#: RaStore.cpp:440
++#: ../src/RaStore.cpp:440
+ msgid "Optimizing profiles table..."
+ msgstr "Optimisation de la table des profils..."
+
+-#: RaStore.cpp:445
++#: ../src/RaStore.cpp:445
+ #, c-format
+ msgid "Failed to optimize profiles table - Reason: %s"
+ msgstr "Echec de l'optimisation de la table des profils - Raison: %s"
+
+-#: RaStore.cpp:450
++#: ../src/RaStore.cpp:450
+ #, c-format
+ msgid "Optimized profiles table in %ld secondes"
+ msgstr "Optimis�a table des profils en %ld secondes"
+
+-#: RaStore.cpp:1271
++#: ../src/RaStore.cpp:1271
+ msgid "Received response"
+ msgstr "R�nse re�"
+
+-#: RaStore.cpp:1272
++#: ../src/RaStore.cpp:1272
+ #, c-format
+ msgid "Received response for request %ld, from ca \"%s\"."
+ msgstr "R�nse re� pour la requ� %ld, venant de l'ac \"%s\"."
+
+-#: RaStore.cpp:2071
++#: ../src/RaStore.cpp:2071
+ msgid "unknown"
+ msgstr "inconnu"
+
+-#: RaStore.cpp:2131
++#: ../src/RaStore.cpp:2131
+ #, c-format
+ msgid ""
+ "For: %s\n"
+@@ -881,11 +879,11 @@ msgstr ""
+ "\n"
+ "%s"
+
+-#: RaStore.cpp:2137
++#: ../src/RaStore.cpp:2137
+ msgid "Your certificate's password"
+ msgstr "Votre mot de passe de certificat"
+
+-#: RaStore.cpp:2208
++#: ../src/RaStore.cpp:2208
+ #, c-format
+ msgid ""
+ "For: %s\n"
+@@ -896,173 +894,114 @@ msgstr ""
+ "Venant de: %s\n"
+ "Votre certificat �t��r�
+
+-#: RaStore.cpp:2213
++#: ../src/RaStore.cpp:2213
+ msgid "Your certificate"
+ msgstr "Votre certificat"
+
+-#: RaStore.cpp:2397
++#: ../src/RaStore.cpp:2397
+ msgid "Waiting for EE validation"
+ msgstr "En attente de la validation de l'EE"
+
+-#: RaStore.cpp:2621
++#: ../src/RaStore.cpp:2621
+ msgid "emailAddress not found in admin certificate"
+ msgstr "emailAddress n'a pas � trouv�ans le certificat de l'admin"
+
+-#: RaStore.cpp:2670
++#: ../src/RaStore.cpp:2670
+ msgid "emailAddress not found in user's DN"
+ msgstr "emailAddress n'a pas � trouv�ans le DN de l'utilisateur"
+
+-#: RepStore.cpp:194
++#: ../src/RepStore.cpp:194
+ msgid "Optimizing requests table..."
+ msgstr "Optimisation de la table des req�s..."
+
+-#: RepStore.cpp:199
++#: ../src/RepStore.cpp:199
+ #, c-format
+ msgid "Failed to optimize requests table - Reason: %s"
+ msgstr "Echec de l'optimisation de la table des req�s - Raison: %s"
+
+-#: RepStore.cpp:204
++#: ../src/RepStore.cpp:204
+ #, c-format
+ msgid "Optimized requests table in %ld secondes"
+ msgstr "Optimis�a table des requ�s en %ld secondes"
+
+-#: RepStore.cpp:314
++#: ../src/RepStore.cpp:314
+ msgid "Optimizing responses table..."
+ msgstr "Optimisation de la table des r�nses..."
+
+-#: RepStore.cpp:319
++#: ../src/RepStore.cpp:319
+ #, c-format
+ msgid "Failed to optimize responses table - Reason: %s"
+ msgstr "Echec de l'optimisation de la table des r�nses - Raison: %s"
+
+-#: RepStore.cpp:324
++#: ../src/RepStore.cpp:324
+ #, c-format
+ msgid "Optimized responses table in %ld secondes"
+ msgstr "Optimis�a table des r�nses en %ld secondes"
+
+-#: SmtpClient.cpp:107
+-#: SmtpClient.cpp:317
+-#: SmtpClient.cpp:338
+-msgid "SMTP Client"
+-msgstr "Client SMTP"
+-
+-#: SmtpClient.cpp:107
+-#, c-format
+-msgid "Successfully sent %smail to %s"
+-msgstr "Succ�de l'envoi d'un email %s �s"
+-
+-#: SmtpClient.cpp:317
+-#, c-format
+-msgid ""
+-"Failed to send %smail to %s on server %s:%d\n"
+-"%s"
+-msgstr ""
+-"Echec de l'envoi d'un email %s �s sur le serveur %s:%d\n"
+-"%s"
+-
+-#: SmtpClient.cpp:338
+-#, c-format
+-msgid ""
+-"Failed to resolve server %s:\n"
+-"%s"
+-msgstr ""
+-"Impossible de r�udre le nom du serveur %s:\n"
+-"%s"
+-
+-#: SockServerADMIN.cpp:150
+-msgid "Other"
+-msgstr "Autre"
+-
+-#: SockServerADMIN.cpp:153
+-#, c-format
+-msgid "%.20d - SSL_accept failed : %d -> %s\n"
+-msgstr "%.20d - SSL_accept a echou� %d -> %s\n"
+-
+-#: SockServerADMIN.cpp:172
+-#, c-format
+-msgid ""
+-"%.20d - SSLv3 Connection from: \n"
+-"\tissuer : %s\n"
+-"\tsubject : %s\n"
+-msgstr ""
+-"%.20d - SSLv3 Connexion de: \n"
+-"\t�tteur : %s\n"
+-"\tsujet : %s\n"
+-
+-#: SockServerADMIN.cpp:275
+-#, c-format
+-msgid "%.20d - SSL state (%s): %s"
+-msgstr "%.20d - Etat SSL (%s): %s"
+-
+-#: SockServerADMIN.cpp:280
+-#, c-format
+-msgid "%.20d - SSL alert (%s): %s: %s"
+-msgstr "%.20d - Alerte SSL (%s): %s: %s"
+-
+-#: SOCK_SERVER.cpp:150
++#: ../src/SOCK_SERVER.cpp:150
+ #, c-format
+ msgid "%s : Starting socket server..."
+ msgstr "%s : D�rrage du serveur de socket..."
+
+-#: SOCK_SERVER.cpp:230
++#: ../src/SOCK_SERVER.cpp:230
+ #, c-format
+ msgid "%s : Could not accept a client"
+ msgstr "%s : Impossible d'accepter un client"
+
+-#: SOCK_SERVER.cpp:285
++#: ../src/SOCK_SERVER.cpp:285
+ #, c-format
+ msgid "%s : getpeername has failed"
+ msgstr "%s : getpeername a �ou�+
+-#: SOCK_SERVER.cpp:295
++#: ../src/SOCK_SERVER.cpp:295
+ #, c-format
+ msgid "%s : Unknown IP"
+ msgstr "%s : Ip Inconnue"
+
+-#: SOCK_SERVER.cpp:301
++#: ../src/SOCK_SERVER.cpp:301
+ #, c-format
+ msgid "%s : Connection of %s:%d"
+ msgstr "%s : Connexion de %s:%d"
+
+-#: SOCK_SERVER.cpp:307
++#: ../src/SOCK_SERVER.cpp:307
+ #, c-format
+ msgid "%s : The client has closed the connection (%s:%d)"
+ msgstr "%s : Le client a ferm�a connexion (%s:%d)"
+
+-#: SOCK_SERVER.cpp:322
++#: ../src/SOCK_SERVER.cpp:322
+ #, c-format
+ msgid "%s : Stopping socket server..."
+ msgstr "%s : Arr�du serveur de socket..."
+
+-#: SOCK_SERVER.cpp:329
++#: ../src/SOCK_SERVER.cpp:329
+ msgid "Waiting for accept thread termination"
+ msgstr "Attende de l'arr�du thread accept"
+
+-#: SOCK_SERVER.cpp:331
++#: ../src/SOCK_SERVER.cpp:331
+ msgid "Accept thread terminated"
+ msgstr "Le thread accept est arr�"
+
+-#: SOCK_SERVER.cpp:337
++#: ../src/SOCK_SERVER.cpp:337
+ #, c-format
+ msgid "Waiting for connection thread #%d termination"
+ msgstr "Attende de l'arr�du thread #%d"
+
+-#: SOCK_SERVER.cpp:339
++#: ../src/SOCK_SERVER.cpp:339
+ #, c-format
+ msgid "Connection thread #%d terminated"
+ msgstr "Le thread #%d est arr�"
+
+-#: SOCK_SERVER.cpp:342
++#: ../src/SOCK_SERVER.cpp:342
+ #, c-format
+ msgid "%s : Socket server is stopped"
+ msgstr "%s : Le serveur de socket est arr�"
+
+-#: SOCK_SERVER.cpp:489
++#: ../src/SOCK_SERVER.cpp:489
+ #, c-format
+ msgid "%.2ld day(s) %.2ld hour(s) %.2ld minute(s) %.2ld seconde(s)"
+ msgstr "%.2ld jour(s) %.2ld heure(s) %.2ld minute(s) %.2ld seconde(s)"
+
+-#: SOCK_SERVER.cpp:490
++#: ../src/SOCK_SERVER.cpp:490
+ #, c-format
+ msgid ""
+ "%s : Connections statistics:\n"
+@@ -1083,69 +1022,122 @@ msgstr ""
+ "\tD�t moyen en r�ption: %ld octets/%s\n"
+ "\tD�t moyen en envoi: %ld octets/%s"
+
+-#: SOCK_SERVER.cpp:495
++#: ../src/SOCK_SERVER.cpp:495
+ #, c-format
+ msgid "\tNumber of active connections: %d\n"
+ msgstr "\tNombre de connexions actives : %d\n"
+
+-#: SOCK_SERVER.cpp:498
++#: ../src/SOCK_SERVER.cpp:498
+ #, c-format
+ msgid "\tNumber of waiting connections: %d\n"
+ msgstr "\tNombre de connexions en attentes : %d\n"
+
+-#: SOCK_SERVER.cpp:529
++#: ../src/SOCK_SERVER.cpp:529
+ #, c-format
+ msgid "%s : Unknown bind host %s"
+ msgstr "%s : H�bind inconnu %s"
+
+-#: SOCK_SERVER.cpp:545
++#: ../src/SOCK_SERVER.cpp:545
+ #, c-format
+ msgid "%s : Could not create the socket"
+ msgstr "%s : Impossible de cr� la socket"
+
+-#: SOCK_SERVER.cpp:551
++#: ../src/SOCK_SERVER.cpp:551
+ #, c-format
+ msgid "%s : Could not set socket option: SO_REUSEADDR"
+ msgstr "%s : Impossible d'activer l'option de la socket: SO_REUSEADDR"
+
+-#: SOCK_SERVER.cpp:556
++#: ../src/SOCK_SERVER.cpp:556
+ #, c-format
+ msgid "%s : Could not bind the socket"
+ msgstr "%s : Impossible d'attacher la socket"
+
+-#: SOCK_SERVER.cpp:562
++#: ../src/SOCK_SERVER.cpp:562
+ #, c-format
+ msgid "%s : Could not listen on the socket"
+ msgstr "%s : Impossible d'�uter sur la socket"
+
+-#: SOCK_SERVER.cpp:566
++#: ../src/SOCK_SERVER.cpp:566
+ #, c-format
+ msgid "%s : Socket server started"
+ msgstr "%s : Le serveur de socket a d�rr�+
+-#: SQL/SQL.cpp:94
+-#: SQL/SQL.cpp:168
+-#: SQL/SQL.cpp:279
+-#: SQL/SQL.cpp:302
+-#: SQL/SQL.cpp:321
+-#: SQL/SQL.cpp:351
++#: ../src/SQL/SQL.cpp:94 ../src/SQL/SQL.cpp:168 ../src/SQL/SQL.cpp:279
++#: ../src/SQL/SQL.cpp:302 ../src/SQL/SQL.cpp:321 ../src/SQL/SQL.cpp:351
+ msgid "No connection available"
+ msgstr "Pas de connexion disponible"
+
+-#: SQL/SQL.cpp:104
++#: ../src/SQL/SQL.cpp:104
+ #, c-format
+ msgid "Wrong access type for SQL Request \"%s\" !"
+ msgstr "Type d'acc�invalide pour la requ� SQL \"%s\" !"
+
+-#: SQL/SQL.cpp:106
++#: ../src/SQL/SQL.cpp:106
+ msgid "Bad access type for request !"
+ msgstr "Type d'acc�invalide pour la requ� !"
+
+-#: SQL/SQL.cpp:123
++#: ../src/SQL/SQL.cpp:123
+ msgid "Connection down, reconnecting..."
+ msgstr "La connexion est tomb� reconnexion..."
+
+-#: SQL/SQL.cpp:126
++#: ../src/SQL/SQL.cpp:126
+ msgid "Reconnection failed !"
+ msgstr "La reconnexion a �ou�"
+
++#: ../src/SmtpClient.cpp:107 ../src/SmtpClient.cpp:317
++#: ../src/SmtpClient.cpp:338
++msgid "SMTP Client"
++msgstr "Client SMTP"
++
++#: ../src/SmtpClient.cpp:107
++#, c-format
++msgid "Successfully sent %smail to %s"
++msgstr "Succ�de l'envoi d'un email %s �s"
++
++#: ../src/SmtpClient.cpp:317
++#, c-format
++msgid ""
++"Failed to send %smail to %s on server %s:%d\n"
++"%s"
++msgstr ""
++"Echec de l'envoi d'un email %s �s sur le serveur %s:%d\n"
++"%s"
++
++#: ../src/SmtpClient.cpp:338
++#, c-format
++msgid ""
++"Failed to resolve server %s:\n"
++"%s"
++msgstr ""
++"Impossible de r�udre le nom du serveur %s:\n"
++"%s"
++
++#: ../src/SockServerADMIN.cpp:150
++msgid "Other"
++msgstr "Autre"
++
++#: ../src/SockServerADMIN.cpp:153
++#, c-format
++msgid "%.20d - SSL_accept failed : %d -> %s\n"
++msgstr "%.20d - SSL_accept a echou� %d -> %s\n"
++
++#: ../src/SockServerADMIN.cpp:172
++#, c-format
++msgid ""
++"%.20d - SSLv3 Connection from: \n"
++"\tissuer : %s\n"
++"\tsubject : %s\n"
++msgstr ""
++"%.20d - SSLv3 Connexion de: \n"
++"\t�tteur : %s\n"
++"\tsujet : %s\n"
++
++#: ../src/SockServerADMIN.cpp:275
++#, c-format
++msgid "%.20d - SSL state (%s): %s"
++msgstr "%.20d - Etat SSL (%s): %s"
++
++#: ../src/SockServerADMIN.cpp:280
++#, c-format
++msgid "%.20d - SSL alert (%s): %s: %s"
++msgstr "%.20d - Alerte SSL (%s): %s: %s"
+--- /dev/null
++++ newpki-server-2.0.0+rc1/po/stamp-po
+@@ -0,0 +1 @@
++timestamp
+--- /dev/null
++++ newpki-server-2.0.0+rc1/po/templates.pot
+@@ -0,0 +1,1045 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2006-01-11 10:48+0100\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=CHARSET\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: ../src/AsynchJobs.cpp:266
++msgid "Entity: "
++msgstr ""
++
++#: ../src/AsynchJobs.cpp:268
++msgid ""
++"\n"
++"Author: "
++msgstr ""
++
++#: ../src/AsynchJobs.cpp:461 ../src/AsynchJobs.cpp:468
++#, c-format
++msgid ""
++"Failed to push conf on entity %s (%s:%ld)\n"
++"Reason:%s"
++msgstr ""
++
++#: ../src/AsynchJobs.cpp:473
++#, c-format
++msgid "Successfully pushed conf on entity %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:670
++msgid "Optimizing responder's requests table..."
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:675
++#, c-format
++msgid "Failed to optimize responder's requests table - Reason: %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:680
++#, c-format
++msgid "Optimized responder's requests table in %ld secondes"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:898
++msgid "Importing new conf"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:903
++#, c-format
++msgid "Failed to import new conf: %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:907
++msgid "New conf imported"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:922
++#, c-format
++msgid "Importing new request %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:927
++#, c-format
++msgid "Failed to import new request %s : %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:933
++#, c-format
++msgid "Successfully imported new request %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:950
++#, c-format
++msgid "Importing new response %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:954
++msgid "Response"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:955
++#, c-format
++msgid "Failed to import new response %s : %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:959
++#, c-format
++msgid "Successfully imported new response %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:997
++#, c-format
++msgid "Connecting to repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1005
++#, c-format
++msgid "Failed to connect to repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1008
++#, c-format
++msgid "Connected to repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1022
++#, c-format
++msgid "Failed to sent request %ld to repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1029
++#, c-format
++msgid "Successfully sent request %ld to repository %s (%s:%ld), still %d to go"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1050
++#, c-format
++msgid "Failed to sent deletion request %ld to repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1054
++#, c-format
++msgid ""
++"Successfully sent deletion request %ld to repository %s (%s:%ld), still %d "
++"to go"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1078
++#, c-format
++msgid "Failed to get my responses from repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1082
++#, c-format
++msgid "Successfully got my responses from repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1103
++#, c-format
++msgid "Failed to sent response %s to repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1110
++#, c-format
++msgid "Successfully sent response %s to repository %s (%s:%ld), still %d to go"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1127
++#, c-format
++msgid "Failed to get my requests from repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1131
++#, c-format
++msgid "Successfully got my requests from repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1196
++#, c-format
++msgid "Successfully got my conf and my objects from repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1200
++#, c-format
++msgid ""
++"Failed to get my conf and my objects from repository %s (%s:%ld)\n"
++"Reason:%s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1581
++msgid "Optimizing requester's requests table..."
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1586
++#, c-format
++msgid "Failed to optimize requester's requests table - Reason: %s"
++msgstr ""
++
++#: ../src/AsynchMsgs.cpp:1591
++#, c-format
++msgid "Optimized requester's requests table in %ld secondes"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:109 ../src/AutoSynchLDAP.cpp:131
++#: ../src/AutoSynchLDAP.cpp:135 ../src/AutoSynchLDAP.cpp:152
++#: ../src/AutoSynchLDAP.cpp:167 ../src/AutoSynchLDAP.cpp:179
++#: ../src/AutoSynchLDAP.cpp:191 ../src/AutoSynchLDAP.cpp:194
++#: ../src/AutoSynchLDAP.cpp:215
++msgid "LDAP Synchronization"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:109
++#, c-format
++msgid "Failed to get known ids: %s"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:131
++#, c-format
++msgid "Failed to search in LDAP: %s"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:135
++#, c-format
++msgid "LDAP search returned %d new profile(s)"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:152
++#, c-format
++msgid ""
++"Failed to process new profile: %s\n"
++"Reason:%s"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:167
++#, c-format
++msgid "Successfully processed new profile: %s"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:179
++msgid "Waiting for LDAP Synchronization Initialization..."
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:191 ../src/AutoSynchLDAP.cpp:215
++msgid "LDAP Synchronization Stopped"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:194
++msgid "LDAP Synchronization Initialized"
++msgstr ""
++
++#: ../src/AutoSynchLDAP.cpp:256
++msgid "Profile has no UID"
++msgstr ""
++
++#: ../src/CA_Handler.cpp:437 ../src/EeStore.cpp:1270 ../src/RaStore.cpp:671
++msgid "Optimizing certificates table..."
++msgstr ""
++
++#: ../src/CA_Handler.cpp:443 ../src/EeStore.cpp:1275 ../src/RaStore.cpp:676
++#, c-format
++msgid "Failed to optimize certificates table - Reason: %s"
++msgstr ""
++
++#: ../src/CA_Handler.cpp:448 ../src/EeStore.cpp:1280 ../src/RaStore.cpp:681
++#, c-format
++msgid "Optimized certificates table in %ld secondes"
++msgstr ""
++
++#: ../src/Conf.cpp:210
++#, c-format
++msgid "Could not open %s <> %s"
++msgstr ""
++
++#: ../src/Conf.cpp:231
++#, c-format
++msgid "Invalid configuration format %s (%s)"
++msgstr ""
++
++#: ../src/Conf.cpp:292
++#, c-format
++msgid "Invalid configuration (%s) <> sprintf failed"
++msgstr ""
++
++#: ../src/Conf.cpp:303
++#, c-format
++msgid "Invalid configuration format (%s) <> Unknown value %s"
++msgstr ""
++
++#: ../src/Conf.cpp:313 ../src/Conf.cpp:319 ../src/Conf.cpp:325
++#: ../src/Conf.cpp:331 ../src/Conf.cpp:337 ../src/Conf.cpp:343
++#, c-format
++msgid "Invalid configuration format (%s) <> %s must have a value"
++msgstr ""
++
++#: ../src/Conf.cpp:358
++msgid "Error"
++msgstr ""
++
++#: ../src/EeStore.cpp:174
++msgid "Optimizing DN validation table..."
++msgstr ""
++
++#: ../src/EeStore.cpp:179
++#, c-format
++msgid "Failed to optimize DN validation table - Reason: %s"
++msgstr ""
++
++#: ../src/EeStore.cpp:184
++#, c-format
++msgid "Optimized DN validation table in %ld secondes"
++msgstr ""
++
++#: ../src/EeStore.cpp:188
++#, c-format
++msgid ""
++"In order to generate your certificate, the PKI needs you to validate your "
++"personal information.\n"
++"Please logon to \"%svalidate_dn.php?ID=%s\""
++msgstr ""
++
++#: ../src/EeStore.cpp:198
++msgid "Personal Information Validation"
++msgstr ""
++
++#: ../src/EeStore.cpp:271 ../src/EeStore.cpp:329
++msgid "Unknown Id"
++msgstr ""
++
++#: ../src/EeStore.cpp:571
++msgid "LDAP server not available, please contact your system administrator."
++msgstr ""
++
++#: ../src/EeStore.cpp:603
++msgid ""
++"More than one user has this email address, please contact your administrator"
++msgstr ""
++
++#: ../src/EeStore.cpp:680 ../src/EeStore.cpp:715
++msgid "Account hasn't been validated by RA"
++msgstr ""
++
++#: ../src/EeStore.cpp:703
++msgid "Account isn't active yet"
++msgstr ""
++
++#. Now search the Pub
++#: ../src/EeStore.cpp:1473 ../src/EntityLog.cpp:470 ../src/Entity_CA.cpp:1793
++#: ../src/Entity_CA.cpp:1868 ../src/Entity_EE.cpp:1138
++#: ../src/Entity_PUBLICATION.cpp:491 ../src/Entity_RA.cpp:1137
++#: ../src/Entity_RA.cpp:1989 ../src/Entity_SERVER.cpp:383
++#: ../src/RaStore.cpp:722 ../src/SockServerADMIN.cpp:172
++msgid "Unknown"
++msgstr ""
++
++#: ../src/EeStore.cpp:1802
++#, c-format
++msgid ""
++"Please logon to \"%sactivate_account.php?ID=%s\" to activate your account"
++msgstr ""
++
++#: ../src/EeStore.cpp:1812
++msgid "Since you failed to activate your account in time it has been deleted"
++msgstr ""
++
++#: ../src/EeStore.cpp:1816
++msgid "Account Activation"
++msgstr ""
++
++#: ../src/EeStore.cpp:1816
++msgid "Account Deletion"
++msgstr ""
++
++#: ../src/Entity.cpp:395
++msgid "Entity is not initialized"
++msgstr ""
++
++#: ../src/Entity.cpp:523 ../src/Entity.cpp:531
++msgid "No emailAddress"
++msgstr ""
++
++#: ../src/Entity.cpp:744
++msgid "Type: "
++msgstr ""
++
++#: ../src/Entity.cpp:746
++msgid ""
++"\n"
++"Status: "
++msgstr ""
++
++#: ../src/Entity.cpp:748
++msgid ""
++"\n"
++"Object: "
++msgstr ""
++
++#: ../src/Entity.cpp:750
++msgid ""
++"\n"
++"User: "
++msgstr ""
++
++#: ../src/Entity.cpp:752
++msgid ""
++"\n"
++"Date: "
++msgstr ""
++
++#: ../src/Entity.cpp:756
++msgid ""
++"\n"
++"Error: "
++msgstr ""
++
++#: ../src/Entity.cpp:760
++msgid "Audit Event"
++msgstr ""
++
++#: ../src/Entity.cpp:868
++#, c-format
++msgid "New personnal conf version %ld"
++msgstr ""
++
++#: ../src/Entity_BACKUP.cpp:199 ../src/Entity_CA.cpp:423
++#: ../src/Entity_CA.cpp:424 ../src/Entity_CA.cpp:425 ../src/Entity_CA.cpp:426
++#: ../src/Entity_CA.cpp:427 ../src/Entity_CA.cpp:432 ../src/Entity_EE.cpp:239
++#: ../src/Entity_EE.cpp:241 ../src/Entity_KEYSTORE.cpp:235
++#: ../src/Entity_PKI.cpp:975 ../src/Entity_PKI.cpp:979
++#: ../src/Entity_PKI.cpp:987 ../src/Entity_PKI.cpp:992
++#: ../src/Entity_PKI.cpp:994 ../src/Entity_PUBLICATION.cpp:326
++#: ../src/Entity_PUBLICATION.cpp:338 ../src/Entity_PUBLICATION.cpp:344
++#: ../src/Entity_PUBLICATION.cpp:348 ../src/Entity_PUBLICATION.cpp:462
++#: ../src/Entity_PUBLICATION.cpp:874 ../src/Entity_PUBLICATION.cpp:1067
++#: ../src/Entity_PUBLICATION.cpp:1082 ../src/Entity_PUBLICATION.cpp:1086
++#: ../src/Entity_RA.cpp:380 ../src/Entity_RA.cpp:382 ../src/Entity_RA.cpp:384
++#: ../src/Entity_REPOSITORY.cpp:486 ../src/Entity_REPOSITORY.cpp:505
++#: ../src/Entity_REPOSITORY.cpp:512
++msgid "none"
++msgstr ""
++
++#: ../src/Entity_CA.cpp:351 ../src/Entity_KEYSTORE.cpp:184
++#: ../src/Entity_PKI.cpp:548 ../src/Entity_PUBLICATION.cpp:402
++#: ../src/Entity_RA.cpp:318 ../src/Entity_REPOSITORY.cpp:706
++#, c-format
++msgid "Upgraded to version %s"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:539 ../src/Entity_EE.cpp:677 ../src/Entity_EE.cpp:781
++msgid "No RA has been associated to this EE"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1029
++msgid "Your profile was validated by the RA, you may now login."
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1031
++msgid "Profile accepted"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1054
++msgid "Your certificate is available on the site."
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1056
++msgid "Certificate signed"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1086
++#, c-format
++msgid ""
++"Your profile was rejected by the RA for the following reason(s):\n"
++"%s"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1090
++msgid "Profile was rejected"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1111
++#, c-format
++msgid ""
++"Your certificate wasn't signed for the following reason(s):\n"
++"%s"
++msgstr ""
++
++#: ../src/Entity_EE.cpp:1115
++msgid "Certificate not generated"
++msgstr ""
++
++#: ../src/Entity_PKI.cpp:1547
++msgid "You cannot revoke a RA while an EE is attached to it"
++msgstr ""
++
++#: ../src/Entity_PKI.cpp:2461
++msgid ""
++"In consideration of your use of the Service, you agree to provide true, "
++"accurate, current and complete information about yourself as prompted by the "
++"DN validation form. If you provide any information that is untrue, "
++"inaccurate, not current or incomplete, or we have reasonable grounds to "
++"suspect that such information is untrue, inaccurate, not current or "
++"incomplete, we have the right to suspend or terminate your account and "
++"refuse any and all current or future use of the Service (or any portion "
++"thereof)."
++msgstr ""
++
++#: ../src/Entity_PKI.cpp:3813
++msgid "You can only have one link between an EE and an RA"
++msgstr ""
++
++#: ../src/Entity_RA.cpp:515
++msgid "Delegate profile's ownership"
++msgstr ""
++
++#: ../src/Entity_RA.cpp:542 ../src/Entity_RA.cpp:1913
++msgid "You haven't configured an EE for this RA"
++msgstr ""
++
++#: ../src/Entity_RA.cpp:1208
++msgid "You must configure a group to delegate the ownership of the EE profiles"
++msgstr ""
++
++#: ../src/Entity_RA.cpp:1898
++msgid "The EE Id has an invalid format"
++msgstr ""
++
++#: ../src/Entity_RA.cpp:1999
++msgid "A certificate is about to expiry"
++msgstr ""
++
++#: ../src/Entity_RA.cpp:2000
++#, c-format
++msgid ""
++"The following certificate will expiry in %d day(s)\n"
++"\n"
++"Profile ID: %ld\n"
++"Profile DN: %s\n"
++"Certificate ID: %ld\n"
++"Certificate DN: %s\n"
++"Signed by: %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:246
++msgid "Optimizing objects table..."
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:251
++#, c-format
++msgid "Failed to optimize objects table - Reason: %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:256
++#, c-format
++msgid "Optimized objects table in %ld secondes"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:394 ../src/Entity_REPOSITORY.cpp:411
++#, c-format
++msgid ""
++"Failed to push NewPKI object on repository %s (%s:%ld)\n"
++"Reason:%s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:430
++#, c-format
++msgid "Successfully pushed NewPKI object on repository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:934
++#, c-format
++msgid "Requesting request object synchronization for %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:940
++#, c-format
++msgid "Request object %s is known"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:962 ../src/Entity_REPOSITORY.cpp:1004
++#, c-format
++msgid "Requesting response object deletion for %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:969
++#, c-format
++msgid "Response object %s is known"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:979
++#, c-format
++msgid "Requesting response object synchronization for %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1015
++#, c-format
++msgid "Importing request object %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1019
++#, c-format
++msgid "Importing response object %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1023
++#, c-format
++msgid "Importing deletion for object %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1050
++#, c-format
++msgid "Sending request object %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1073
++#, c-format
++msgid "Sending response object %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1094
++#, c-format
++msgid "Deleting response object %s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1100
++#, c-format
++msgid "Reading from request: %ld"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1107
++#, c-format
++msgid "Read %ld requests"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1109
++#, c-format
++msgid "Reading from response: %ld"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1116
++#, c-format
++msgid "Read %ld responses"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1147
++#, c-format
++msgid "Requesting full synchro with respository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1152 ../src/Entity_REPOSITORY.cpp:1170
++#, c-format
++msgid ""
++"Failed to synchronize objects on respository %s (%s:%ld)\n"
++"Reason:%s"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1194
++#, c-format
++msgid "Successfully synchronized with respository %s (%s:%ld)"
++msgstr ""
++
++#: ../src/Entity_REPOSITORY.cpp:1481
++#, c-format
++msgid "New PKI conf version %ld"
++msgstr ""
++
++#. Creation of the SSL certificate
++#: ../src/Entity_SERVER.cpp:66 ../src/Entity_SERVER.cpp:69
++#: ../src/Entity_SERVER.cpp:137 ../src/Entity_SERVER.cpp:142
++#: ../src/Entity_SERVER.cpp:146 ../src/Entity_SERVER.cpp:150
++#: ../src/Entity_SERVER.cpp:154 ../src/Entity_SERVER.cpp:162
++#: ../src/Entity_SERVER.cpp:167 ../src/Entity_SERVER.cpp:310
++#: ../src/Entity_SERVER.cpp:319
++msgid "NewPKI Server"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:66
++#, c-format
++msgid "Unloading entity %s"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:69
++#, c-format
++msgid "Successfully unloaded entity %s"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:137
++msgid "Creating NewPKI database..."
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:142
++msgid "Failed to create NewPKI database"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:146
++msgid "Successfully created NewPKI database"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:150
++msgid "Creating NewPKI server's SSL certificate..."
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:154 ../src/Entity_SERVER.cpp:162
++msgid "Failed to create NewPKI server's SSL certificate"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:167
++msgid "Successfully created NewPKI server's SSL certificate"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:240
++msgid "Loading entity"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:245
++#, c-format
++msgid "Entity failed to load: %s"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:250
++msgid "Entity loaded"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:310
++#, c-format
++msgid "Failed to upgrade Entity %s"
++msgstr ""
++
++#: ../src/Entity_SERVER.cpp:319
++#, c-format
++msgid "Failed to load Entity %s"
++msgstr ""
++
++#: ../src/MAIN.cpp:86
++#, c-format
++msgid "Usage: %s -config config.conf -version\n"
++msgstr ""
++
++#: ../src/MAIN.cpp:88
++#, c-format
++msgid ""
++"Usage: %s -config config.conf [-user username] [-detach] [-pidfile file] [-"
++"version]\n"
++msgstr ""
++
++#: ../src/MAIN.cpp:165
++msgid "Compiled Against:\n"
++msgstr ""
++
++#: ../src/MAIN.cpp:174 ../src/MAIN.cpp:687
++msgid "Version"
++msgstr ""
++
++#: ../src/MAIN.cpp:343
++#, c-format
++msgid "Failed to setsid, not closing stdin, stdout and stderr: %s"
++msgstr ""
++
++#: ../src/MAIN.cpp:347
++#, c-format
++msgid "Failed to fork: %s"
++msgstr ""
++
++#: ../src/MAIN.cpp:366
++#, c-format
++msgid "Failed to create PID file: %s - %s"
++msgstr ""
++
++#: ../src/RaStore.cpp:124
++msgid ""
++"\n"
++"All certificates associated with this profile \n"
++"must be revoked or in error state"
++msgstr ""
++
++#: ../src/RaStore.cpp:440
++msgid "Optimizing profiles table..."
++msgstr ""
++
++#: ../src/RaStore.cpp:445
++#, c-format
++msgid "Failed to optimize profiles table - Reason: %s"
++msgstr ""
++
++#: ../src/RaStore.cpp:450
++#, c-format
++msgid "Optimized profiles table in %ld secondes"
++msgstr ""
++
++#: ../src/RaStore.cpp:1271
++msgid "Received response"
++msgstr ""
++
++#: ../src/RaStore.cpp:1272
++#, c-format
++msgid "Received response for request %ld, from ca \"%s\"."
++msgstr ""
++
++#: ../src/RaStore.cpp:2071
++msgid "unknown"
++msgstr ""
++
++#: ../src/RaStore.cpp:2131
++#, c-format
++msgid ""
++"For: %s\n"
++"From: %s\n"
++"This is your certificate's password:\n"
++"\n"
++"%s"
++msgstr ""
++
++#: ../src/RaStore.cpp:2137
++msgid "Your certificate's password"
++msgstr ""
++
++#: ../src/RaStore.cpp:2208
++#, c-format
++msgid ""
++"For: %s\n"
++"From: %s\n"
++"Your certificate has been generated."
++msgstr ""
++
++#: ../src/RaStore.cpp:2213
++msgid "Your certificate"
++msgstr ""
++
++#: ../src/RaStore.cpp:2397
++msgid "Waiting for EE validation"
++msgstr ""
++
++#: ../src/RaStore.cpp:2621
++msgid "emailAddress not found in admin certificate"
++msgstr ""
++
++#: ../src/RaStore.cpp:2670
++msgid "emailAddress not found in user's DN"
++msgstr ""
++
++#: ../src/RepStore.cpp:194
++msgid "Optimizing requests table..."
++msgstr ""
++
++#: ../src/RepStore.cpp:199
++#, c-format
++msgid "Failed to optimize requests table - Reason: %s"
++msgstr ""
++
++#: ../src/RepStore.cpp:204
++#, c-format
++msgid "Optimized requests table in %ld secondes"
++msgstr ""
++
++#: ../src/RepStore.cpp:314
++msgid "Optimizing responses table..."
++msgstr ""
++
++#: ../src/RepStore.cpp:319
++#, c-format
++msgid "Failed to optimize responses table - Reason: %s"
++msgstr ""
++
++#: ../src/RepStore.cpp:324
++#, c-format
++msgid "Optimized responses table in %ld secondes"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:150
++#, c-format
++msgid "%s : Starting socket server..."
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:230
++#, c-format
++msgid "%s : Could not accept a client"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:285
++#, c-format
++msgid "%s : getpeername has failed"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:295
++#, c-format
++msgid "%s : Unknown IP"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:301
++#, c-format
++msgid "%s : Connection of %s:%d"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:307
++#, c-format
++msgid "%s : The client has closed the connection (%s:%d)"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:322
++#, c-format
++msgid "%s : Stopping socket server..."
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:329
++msgid "Waiting for accept thread termination"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:331
++msgid "Accept thread terminated"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:337
++#, c-format
++msgid "Waiting for connection thread #%d termination"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:339
++#, c-format
++msgid "Connection thread #%d terminated"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:342
++#, c-format
++msgid "%s : Socket server is stopped"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:489
++#, c-format
++msgid "%.2ld day(s) %.2ld hour(s) %.2ld minute(s) %.2ld seconde(s)"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:490
++#, c-format
++msgid ""
++"%s : Connections statistics:\n"
++"\tDuration: %s\n"
++"\tTotal connections: %ld\n"
++"\tTotal sent bytes: %ld\n"
++"\tTotal received bytes: %ld\n"
++"\tAverage number of connections: %ld connections/%s\n"
++"\tAverage reception bandwidth: %ld bytes/%s\n"
++"\tAverage send bandwidth: %ld bytes/%s"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:495
++#, c-format
++msgid "\tNumber of active connections: %d\n"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:498
++#, c-format
++msgid "\tNumber of waiting connections: %d\n"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:529
++#, c-format
++msgid "%s : Unknown bind host %s"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:545
++#, c-format
++msgid "%s : Could not create the socket"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:551
++#, c-format
++msgid "%s : Could not set socket option: SO_REUSEADDR"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:556
++#, c-format
++msgid "%s : Could not bind the socket"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:562
++#, c-format
++msgid "%s : Could not listen on the socket"
++msgstr ""
++
++#: ../src/SOCK_SERVER.cpp:566
++#, c-format
++msgid "%s : Socket server started"
++msgstr ""
++
++#: ../src/SQL/SQL.cpp:94 ../src/SQL/SQL.cpp:168 ../src/SQL/SQL.cpp:279
++#: ../src/SQL/SQL.cpp:302 ../src/SQL/SQL.cpp:321 ../src/SQL/SQL.cpp:351
++msgid "No connection available"
++msgstr ""
++
++#: ../src/SQL/SQL.cpp:104
++#, c-format
++msgid "Wrong access type for SQL Request \"%s\" !"
++msgstr ""
++
++#: ../src/SQL/SQL.cpp:106
++msgid "Bad access type for request !"
++msgstr ""
++
++#: ../src/SQL/SQL.cpp:123
++msgid "Connection down, reconnecting..."
++msgstr ""
++
++#: ../src/SQL/SQL.cpp:126
++msgid "Reconnection failed !"
++msgstr ""
++
++#: ../src/SmtpClient.cpp:107 ../src/SmtpClient.cpp:317
++#: ../src/SmtpClient.cpp:338
++msgid "SMTP Client"
++msgstr ""
++
++#: ../src/SmtpClient.cpp:107
++#, c-format
++msgid "Successfully sent %smail to %s"
++msgstr ""
++
++#: ../src/SmtpClient.cpp:317
++#, c-format
++msgid ""
++"Failed to send %smail to %s on server %s:%d\n"
++"%s"
++msgstr ""
++
++#: ../src/SmtpClient.cpp:338
++#, c-format
++msgid ""
++"Failed to resolve server %s:\n"
++"%s"
++msgstr ""
++
++#: ../src/SockServerADMIN.cpp:150
++msgid "Other"
++msgstr ""
++
++#: ../src/SockServerADMIN.cpp:153
++#, c-format
++msgid "%.20d - SSL_accept failed : %d -> %s\n"
++msgstr ""
++
++#: ../src/SockServerADMIN.cpp:172
++#, c-format
++msgid ""
++"%.20d - SSLv3 Connection from: \n"
++"\tissuer : %s\n"
++"\tsubject : %s\n"
++msgstr ""
++
++#: ../src/SockServerADMIN.cpp:275
++#, c-format
++msgid "%.20d - SSL state (%s): %s"
++msgstr ""
++
++#: ../src/SockServerADMIN.cpp:280
++#, c-format
++msgid "%.20d - SSL alert (%s): %s: %s"
++msgstr ""
diff -Nru newpki-server-2.0.0+rc1.old/debian/patches/series newpki-server-2.0.0+rc1/debian/patches/series
--- newpki-server-2.0.0+rc1.old/debian/patches/series 2010-04-05 19:36:37.000000000 +0200
+++ newpki-server-2.0.0+rc1/debian/patches/series 2010-04-19 08:22:12.000000000 +0200
@@ -1,3 +1,4 @@
01_badcasts
10_openldap24
20_check_log_entry_verify_return
+debian-changes-2.0.0+rc1-13
diff -Nru newpki-server-2.0.0+rc1.old/debian/po/es.po newpki-server-2.0.0+rc1/debian/po/es.po
--- newpki-server-2.0.0+rc1.old/debian/po/es.po 1970-01-01 01:00:00.000000000 +0100
+++ newpki-server-2.0.0+rc1/debian/po/es.po 2010-04-07 22:06:49.000000000 +0200
@@ -0,0 +1,151 @@
+# newpki-server po-debconf translation to Spanish
+# Copyright (C) 2007, 2009 Software in the Public Interest
+# This file is distributed under the same license as the newpki-server package.
+#
+# Changes:
+# - Initial translation
+# Enrique Matias Sanchez <cronopios@gmail.com>, 2007
+#
+# - Updates
+# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: newpki-server 2.0.0+rc1-10\n"
+"Report-Msgid-Bugs-To: chifflier@cpe.fr\n"
+"POT-Creation-Date: 2007-01-17 23:15+0100\n"
+"PO-Revision-Date: 2009-01-12 22:34+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Host running MySQL server:"
+msgstr "Máquina en la que se ejecuta el servidor de MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"NewPKI requires its own MySQL engine and an administrator login, as the "
+"server will be dynamically creating and destroying databases and schema at "
+"will."
+msgstr ""
+"NewPKI necesita su propio motor de MySQL y una cuenta administrador, debido "
+"a que el servidor creará y destruirá las bases de datos y los esquemas "
+"dinámicamente, a su libre albedrío."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "MySQL server port:"
+msgstr "Puerto del servidor de MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "Administrative login for MySQL server:"
+msgstr "Cuenta de administración del servidor de MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"There is no reason to create a login specifically for NewPKI other than the "
+"\"root\" administrative login provided by MySQL (although you should assign "
+"a password)."
+msgstr ""
+"No hay razón para crear una cuenta específica para NewPKI distinta a la "
+"cuenta de administrador «root» proporcionada por MySQL (aunque debería "
+"asignarle una contraseña)."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "Password for administrative login:"
+msgstr "Contraseña de la cuenta de administración:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Listen address for NewPKI server:"
+msgstr "Dirección de escucha del servidor de NewPKI:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "NewPKI server port:"
+msgstr "Puerto del servidor NewPKI:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Log file location:"
+msgstr "Ubicación del archivo del registro:"
+
+#. Type: string
+#. Description
+#: ../templates:8001
+msgid "Debug level of NewPKI [1-4]:"
+msgstr "Nivel de depuración de NewPKI [1-4]:"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid "Start NewPKI on boot ?"
+msgstr "¿Desea iniciar NewPKI en el arranque?"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid ""
+"The NewPKI can start on boot time or only if you type '/etc/init.d/newpki-"
+"server start' manually. Choose if you want it to start automatically."
+msgstr ""
+"NewPKI puede iniciarse durante el arranque o sólo si teclea «/etc/init.d/"
+"newpki-server start» manualmente. Elija si desea que se inicie "
+"automáticamente."
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid "Removing databases"
+msgstr "Eliminando las bases de datos"
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid ""
+"ATTENTION ! You will have to remove all databases after \"purging\" the "
+"newpki-server package."
+msgstr ""
+"¡ATENCIÓN! Deberá eliminar todas las bases de datos tras «purgar» el paquete "
+"newpki-server."
+
+#. Type: string
+#. Description
+#: ../templates:11001
+msgid "User running NewPKI:"
+msgstr "Usuario que ejecuta NewPKI:"
diff -Nru newpki-server-2.0.0+rc1.old/debian/po/ja.po newpki-server-2.0.0+rc1/debian/po/ja.po
--- newpki-server-2.0.0+rc1.old/debian/po/ja.po 1970-01-01 01:00:00.000000000 +0100
+++ newpki-server-2.0.0+rc1/debian/po/ja.po 2010-04-07 22:07:25.000000000 +0200
@@ -0,0 +1,124 @@
+# Copyright (C) 2009 Pierre Chifflier <pollux@debian.org>
+# This file is distributed under the same license as newpki-server package.
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: newpki-server 2.0.0+rc1-11+b1\n"
+"Report-Msgid-Bugs-To: chifflier@cpe.fr\n"
+"POT-Creation-Date: 2007-01-17 23:15+0100\n"
+"PO-Revision-Date: 2009-11-24 14:32+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Host running MySQL server:"
+msgstr "MySQL サーバが稼働しているホスト:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"NewPKI requires its own MySQL engine and an administrator login, as the "
+"server will be dynamically creating and destroying databases and schema at "
+"will."
+msgstr ""
+"NewPKI は、サーバが必要に応じて動的にデータベースやスキーマの作成と破棄を行う"
+"ため、専用の MySQL エンジンと管理者ログイン名を必要とします。"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "MySQL server port:"
+msgstr "MySQL サーバのポート番号:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "Administrative login for MySQL server:"
+msgstr "MySQL サーバの管理者権限を持つログイン名:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"There is no reason to create a login specifically for NewPKI other than the "
+"\"root\" administrative login provided by MySQL (although you should assign "
+"a password)."
+msgstr ""
+"MySQL が提供する「root」管理者権限ログイン名以外に、特別に NewPKI 用のログイ"
+"ン名を作成する理由はありません (パスワードを設定する必要はあります)。"
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "Password for administrative login:"
+msgstr "管理者権限を持つログインのパスワード:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Listen address for NewPKI server:"
+msgstr "NewPKI サーバが接続待ち受けをするアドレス:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "NewPKI server port:"
+msgstr "NewPKI サーバのポート番号:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Log file location:"
+msgstr "ログファイルの位置:"
+
+#. Type: string
+#. Description
+#: ../templates:8001
+msgid "Debug level of NewPKI [1-4]:"
+msgstr "NewPKI のデバッグレベル [1-4]:"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid "Start NewPKI on boot ?"
+msgstr "システム起動時に NewPKI を開始しますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid ""
+"The NewPKI can start on boot time or only if you type '/etc/init.d/newpki-"
+"server start' manually. Choose if you want it to start automatically."
+msgstr ""
+"NewPKI サーバは、システムの起動時、または手動で '/etc/init.d/newpki-server "
+"start' と入力した時にのみ起動できます。自動的に起動させるかどうかを選んでくだ"
+"さい。"
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid "Removing databases"
+msgstr "データベースの削除について"
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid ""
+"ATTENTION ! You will have to remove all databases after \"purging\" the "
+"newpki-server package."
+msgstr ""
+"注意! newpki-server パッケージの「完全削除 (purge)」後に、全てのデータベース"
+"を削除する必要があります。"
+
+#. Type: string
+#. Description
+#: ../templates:11001
+msgid "User running NewPKI:"
+msgstr "NewPKI を動作させるユーザ:"
diff -Nru newpki-server-2.0.0+rc1.old/debian/po/ru.po newpki-server-2.0.0+rc1/debian/po/ru.po
--- newpki-server-2.0.0+rc1.old/debian/po/ru.po 1970-01-01 01:00:00.000000000 +0100
+++ newpki-server-2.0.0+rc1/debian/po/ru.po 2010-04-07 22:07:17.000000000 +0200
@@ -0,0 +1,130 @@
+# translation of newpki-server_2.0.0+rc1-11_ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: newpki-server 2.0.0+rc1-11\n"
+"Report-Msgid-Bugs-To: chifflier@cpe.fr\n"
+"POT-Creation-Date: 2007-01-17 23:15+0100\n"
+"PO-Revision-Date: 2009-11-20 20:07+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Host running MySQL server:"
+msgstr "Хост с работающим сервером MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"NewPKI requires its own MySQL engine and an administrator login, as the "
+"server will be dynamically creating and destroying databases and schema at "
+"will."
+msgstr ""
+"Для NewPKI требуется отдельный сервер MySQL и административная учётная "
+"запись, так как сервер будет динамически создавать и удалять базы данных и "
+"схемы по своему усмотрению."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "MySQL server port:"
+msgstr "Порт сервера MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "Administrative login for MySQL server:"
+msgstr "Административная учётная запись на сервере MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"There is no reason to create a login specifically for NewPKI other than the "
+"\"root\" administrative login provided by MySQL (although you should assign "
+"a password)."
+msgstr ""
+"Отдельную учётную запись специально для NewPKI создавать не нужно, "
+"достаточно имеющейся записи \"root\" из MySQL (хотя для неё должен быть "
+"установлен пароль)."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "Password for administrative login:"
+msgstr "Пароль для административной учётной записи:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Listen address for NewPKI server:"
+msgstr "Прослушиваемый сервером NewPKI адрес:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "NewPKI server port:"
+msgstr "Порт нового сервера NewPKI:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Log file location:"
+msgstr "Расположение файла журнала:"
+
+#. Type: string
+#. Description
+#: ../templates:8001
+msgid "Debug level of NewPKI [1-4]:"
+msgstr "Уровень отладки NewPKI [1-4]:"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid "Start NewPKI on boot ?"
+msgstr "Запускать NewPKI при включении компьютера?"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid ""
+"The NewPKI can start on boot time or only if you type '/etc/init.d/newpki-"
+"server start' manually. Choose if you want it to start automatically."
+msgstr ""
+"Сервер NewPKI может запускаться при включении компьютера или только, если вы "
+"запустите его вручную, введя '/etc/init.d/newpki-server start'. Ответьте "
+"утвердительно для автоматического запуска."
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid "Removing databases"
+msgstr "Удаление баз данных"
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid ""
+"ATTENTION ! You will have to remove all databases after \"purging\" the "
+"newpki-server package."
+msgstr ""
+"ВНИМАНИЕ! Все базы данных будут удалены при \"вычистке\" пакета newpki-"
+"server."
+
+#. Type: string
+#. Description
+#: ../templates:11001
+msgid "User running NewPKI:"
+msgstr "Пользователь, с правами которого работает NewPKI:"
diff -Nru newpki-server-2.0.0+rc1.old/debian/po/vi.po newpki-server-2.0.0+rc1/debian/po/vi.po
--- newpki-server-2.0.0+rc1.old/debian/po/vi.po 1970-01-01 01:00:00.000000000 +0100
+++ newpki-server-2.0.0+rc1/debian/po/vi.po 2010-04-16 21:54:12.000000000 +0200
@@ -0,0 +1,126 @@
+# Vietnamese translation for New PKI Sserver.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: newpki-server\n"
+"Report-Msgid-Bugs-To: chifflier@cpe.fr\n"
+"POT-Creation-Date: 2007-01-17 23:15+0100\n"
+"PO-Revision-Date: 2010-04-16 22:07+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Host running MySQL server:"
+msgstr "Tên máy của máy phục vụ MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"NewPKI requires its own MySQL engine and an administrator login, as the "
+"server will be dynamically creating and destroying databases and schema at "
+"will."
+msgstr ""
+"NewPKI yêu cầu một cơ chế MySQL riêng và một sự đăng nhập quản trị, vì trình "
+"phục vụ sẽ tạo và hủy cơ sở dữ liệu và lược đồ một cách động và tự do."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "MySQL server port:"
+msgstr "Cổng phục vụ MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "Administrative login for MySQL server:"
+msgstr "Đăng nhập quản trị của máy phục vụ MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"There is no reason to create a login specifically for NewPKI other than the "
+"\"root\" administrative login provided by MySQL (although you should assign "
+"a password)."
+msgstr ""
+"Không cần tạo một sự đăng nhập dành cho NewPKI mà khác với sự đăng nhập quản "
+"trị « root » được MySQL cung cấp (dù bạn nên gán một mật khẩu)."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "Password for administrative login:"
+msgstr "Mặt khẩu để đăng nhập quản trị:"
+
+#. Type: string
+#. Description
+#: ../templates:5001
+msgid "Listen address for NewPKI server:"
+msgstr "Địa chỉ lắng nghe cho trình phục vụ NewPKI:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "NewPKI server port:"
+msgstr "Cổng phục vụ NewPKI:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Log file location:"
+msgstr "Vị trí tập tin theo dõi:"
+
+#. Type: string
+#. Description
+#: ../templates:8001
+msgid "Debug level of NewPKI [1-4]:"
+msgstr "Cấp gỡ lỗi của NewPKI [1-4]:"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid "Start NewPKI on boot ?"
+msgstr "Khởi chạy NewPKI khi khởi động ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:9001
+msgid ""
+"The NewPKI can start on boot time or only if you type '/etc/init.d/newpki-"
+"server start' manually. Choose if you want it to start automatically."
+msgstr ""
+"NewPKI có khả năng khởi chạy vào lúc khởi động, hoặc chỉ khi bạn tự gõ câu "
+"lệnh « /etc/init.d/newpki-server start ». Hãy chọn nếu bạn muốn cho phép nó "
+"tự động khởi chạy."
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid "Removing databases"
+msgstr "Đang gỡ bỏ các cơ sở dữ liệu"
+
+#. Type: note
+#. Description
+#: ../templates:10001
+msgid ""
+"ATTENTION ! You will have to remove all databases after \"purging\" the "
+"newpki-server package."
+msgstr ""
+"CẢNH BÁO ! Bạn cần phải gỡ bỏ tất cả các cơ sở dữ liệu sau khi « tẩy » gói "
+"newpki-server."
+
+#. Type: string
+#. Description
+#: ../templates:11001
+msgid "User running NewPKI:"
+msgstr "Người dùng chạy NewPKI:"
diff -Nru newpki-server-2.0.0+rc1.old/debian/rules newpki-server-2.0.0+rc1/debian/rules
--- newpki-server-2.0.0+rc1.old/debian/rules 2010-04-05 19:36:37.000000000 +0200
+++ newpki-server-2.0.0+rc1/debian/rules 2010-04-19 07:24:07.000000000 +0200
@@ -11,8 +11,6 @@
endif
config.status: configure
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--with-newpki-include=/usr/include/newpki
@@ -33,7 +31,7 @@
rm -f publication/file/config.status publication/file/config.log
rm -f publication/ldap/config.status publication/ldap/config.log
# rm -f po/fr.gmo config.log
-
+
#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
# cp -f /usr/share/misc/config.sub config.sub
#endif
@@ -41,14 +39,12 @@
# cp -f /usr/share/misc/config.guess config.guess
#endif
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/newpki-server libdir=/usr/lib/newpki-server
diff -Nru newpki-server-2.0.0+rc1.old/debian/source/format newpki-server-2.0.0+rc1/debian/source/format
--- newpki-server-2.0.0+rc1.old/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ newpki-server-2.0.0+rc1/debian/source/format 2010-04-19 08:21:12.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru newpki-server-2.0.0+rc1.old/debian/substvars newpki-server-2.0.0+rc1/debian/substvars
--- newpki-server-2.0.0+rc1.old/debian/substvars 2010-04-05 19:36:37.000000000 +0200
+++ newpki-server-2.0.0+rc1/debian/substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libgcc1 (>= 1:3.3.3-1), libldap2 (>= 2.1.17-1), libmysqlclient12, libssl0.9.7, libstdc++5 (>= 1:3.3.3-1), zlib1g (>= 1:1.2.1)
Attachment:
signature.asc
Description: Digital signature