From MAILER-DAEMON Mon Mar 01 05:46:13 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nm38e-0000lR-Tt
	for mharc-myserver-commit@gnu.org; Mon, 01 Mar 2010 05:46:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nm38c-0000jl-PR
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:46:10 -0500
Received: from [140.186.70.92] (port=42598 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nm38b-0000iY-Rj
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:46:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nm38b-0005vF-9z
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:46:09 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:48264
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nm38b-0005vB-6a
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:46:09 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nm38a-0001et-NK
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 10:46:08 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Nm38a-0000qu-A9
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 10:46:08 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bb5cf6002034761e10707b923a85d487856ac4b2
X-Git-Newrev: c48f59eddcfe03fa31232bf611ad134cdfa0fb2d
Message-Id: <E1Nm38a-0000qu-A9@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 01 Mar 2010 10:46:08 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-61-gc48f59e
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 10:46:11 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  c48f59eddcfe03fa31232bf611ad134cdfa0fb2d (commit)
      from  bb5cf6002034761e10707b923a85d487856ac4b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit c48f59eddcfe03fa31232bf611ad134cdfa0fb2d
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 11:46:02 2010 +0100

    Handle the case `getpwnam' returns NULL and sets `errno' to zero.

diff --git a/myserver/src/base/home_dir/home_dir.cpp b/myserver/src/base/home_dir/home_dir.cpp
index 23db24a..b360b58 100644
--- a/myserver/src/base/home_dir/home_dir.cpp
+++ b/myserver/src/base/home_dir/home_dir.cpp
@@ -243,7 +243,7 @@ int HomeDir::getHomeDir (string& userName, string& out)
   int ret = 0;
 
   loadMutex.lock ();
-
+  errno = 0;
   p = ::getpwnam (userName.c_str ());
   if (p == NULL)
     ret = 1;
@@ -253,8 +253,8 @@ int HomeDir::getHomeDir (string& userName, string& out)
   loadMutex.unlock ();
 
   /* The user was not found.  */
-  if (p == NULL && (errno == ENOENT || errno == ESRCH || errno == EBADF
-                    || errno == EPERM))
+  if (p == NULL && (errno == 0 || errno == ENOENT || errno == ESRCH
+                    || errno == EBADF || errno == EPERM))
     return 1;
 
   return p ? 0 : -1;
diff --git a/myserver/tests/test_homedir.cpp b/myserver/tests/test_homedir.cpp
index ce8f295..3afb0d9 100644
--- a/myserver/tests/test_homedir.cpp
+++ b/myserver/tests/test_homedir.cpp
@@ -24,9 +24,10 @@
 
 class TestHomeDir : public CppUnit::TestFixture
 {
-  CPPUNIT_TEST_SUITE ( TestHomeDir );
-  CPPUNIT_TEST ( testLoadClear );
-  CPPUNIT_TEST ( testGetAdmin );
+  CPPUNIT_TEST_SUITE (TestHomeDir);
+  CPPUNIT_TEST (testLoadClear);
+  CPPUNIT_TEST (testGetAdmin);
+  CPPUNIT_TEST (testUserDoesNotExist);
   CPPUNIT_TEST_SUITE_END ();
   HomeDir *homeDir;
 public:
@@ -46,6 +47,17 @@ public:
     CPPUNIT_ASSERT (!homeDir->isLoaded ());
   }
 
+
+  void testUserDoesNotExist ()
+  {
+    homeDir->load ();
+    string username = "ShoUlDnTExist";
+    string dir;
+    int ret = homeDir->getHomeDir (username, dir);
+    CPPUNIT_ASSERT (ret > 0);
+    homeDir->clear ();
+  }
+
   void testGetAdmin ()
   {
     homeDir->load ();

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/base/home_dir/home_dir.cpp |    6 +++---
 myserver/tests/test_homedir.cpp         |   18 +++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon Mar 01 05:54:05 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nm3GH-0003TK-5d
	for mharc-myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:05 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nm3GE-0003QF-Mi
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:02 -0500
Received: from [140.186.70.92] (port=41185 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nm3GD-0003Oi-MU
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Nm3GC-0006a3-L3
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:01 -0500
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:43739)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Nm3GC-0006Zo-Dd
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:00 -0500
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o21ArusE003419
	for <myserver-commit@gnu.org>; Mon, 1 Mar 2010 11:53:56 +0100
Message-Id: <201003011053.o21ArusE003419@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Mon, 01 Mar 2010 11:53:56 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Mon, 1 Mar 2010 11:53:56 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:build build 308709
	SUCCEEDED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 10:54:03 -0000

Hi,

This is to let you know that Hydra build 308709 of job gnu:myserver-master:build has changed from FAILED to SUCCEEDED.

Complete build information can be found on this page: http://hydra.nixos.org/build/308709

A summary of the build information follows:

Build ID:              | 308709
Nix name:              | myserver-0.9.2
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/33d116gqv11n7mm8l7wmqn1w2dbqka4d-myserver-0.9.2.drv
Output store path:     | /nix/store/i0s1a4h2avkmm46c8c98l2cxjg2x41p3-myserver-0.9.2
Time added:            | 2010-03-01 11:53:56
Build started:         | 2010-03-01 11:51:31
Build finished:        | 2010-03-01 11:53:56
Duration:              | 145s

The build inputs were:

Name        | Type   | Value
------------+--------+-------------------------------------------------------------
hydraConfig | svn    | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20296
nixpkgs     | svn    | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20292
system      | string | x86_64-linux
tarball     | build  | 308707

Regards,

The Hydra build daemon.



From MAILER-DAEMON Mon Mar 01 05:54:19 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nm3GU-0003iF-NA
	for mharc-myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nm3GT-0003gs-Fa
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:17 -0500
Received: from [140.186.70.92] (port=57199 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nm3GS-0003gD-G0
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Nm3GR-0006bc-JN
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:16 -0500
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:43740)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Nm3GR-0006bX-94
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 05:54:15 -0500
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o21AsDmD003422
	for <myserver-commit@gnu.org>; Mon, 1 Mar 2010 11:54:13 +0100
Message-Id: <201003011054.o21AsDmD003422@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Mon, 01 Mar 2010 11:54:13 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Mon, 1 Mar 2010 11:54:13 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:build build 308710
	SUCCEEDED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 10:54:17 -0000

Hi,

This is to let you know that Hydra build 308710 of job gnu:myserver-master:build has changed from FAILED to SUCCEEDED.

Complete build information can be found on this page: http://hydra.nixos.org/build/308710

A summary of the build information follows:

Build ID:              | 308710
Nix name:              | myserver-0.9.2
Short description:     | Native Nix build on i686-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | i686-linux
Derivation store path: | /nix/store/aqmn27j3a75d6rlhfbxm3l1ssnxmkwv6-myserver-0.9.2.drv
Output store path:     | /nix/store/s7ldfq25annigv24nf08470vh3w1sfyg-myserver-0.9.2
Time added:            | 2010-03-01 11:54:13
Build started:         | 2010-03-01 11:51:31
Build finished:        | 2010-03-01 11:54:13
Duration:              | 162s

The build inputs were:

Name        | Type   | Value
------------+--------+-------------------------------------------------------------
hydraConfig | svn    | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20296
nixpkgs     | svn    | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20292
system      | string | i686-linux
tarball     | build  | 308707

Regards,

The Hydra build daemon.



From MAILER-DAEMON Mon Mar 01 15:52:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NmCbC-0007ih-3D
	for mharc-myserver-commit@gnu.org; Mon, 01 Mar 2010 15:52:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NmCbB-0007hF-6m
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 15:52:17 -0500
Received: from [140.186.70.92] (port=35531 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NmCbA-0007fV-6L
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 15:52:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NmCb5-0004DI-IM
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 15:52:15 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:60151
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NmCb5-0004DE-Fz
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 15:52:11 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NmCb5-0000XO-0W
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 20:52:11 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NmCb4-0007Yq-IM
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 20:52:10 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c48f59eddcfe03fa31232bf611ad134cdfa0fb2d
X-Git-Newrev: 59af38244e9dea8871df6294c59158676198ea63
Message-Id: <E1NmCb4-0007Yq-IM@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 01 Mar 2010 20:52:10 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-62-g59af382
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 20:52:17 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  59af38244e9dea8871df6294c59158676198ea63 (commit)
      from  c48f59eddcfe03fa31232bf611ad134cdfa0fb2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 59af38244e9dea8871df6294c59158676198ea63
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 21:50:03 2010 +0100

    Remove lock from the virtual hosts manager.

diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h b/myserver/include/conf/vhost/xml_vhost_handler.h
index 883c397..3f9f4f0 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -50,7 +50,6 @@ public:
 private:
   void loadXMLlogData (string, Vhost*, xmlNode*);
   ListenThreads* listenThreads;
-  Mutex mutex;
 
   /*! List of virtual hosts. */
   list<Vhost*> hostList;
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index 545eadd..6730090 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -51,8 +51,6 @@ int XmlVhostHandler::addVHost (Vhost* vh)
 {
   list<Vhost*>::iterator it;
 
-  mutex.lock ();
-
   /* Be sure there is a listening thread on the specified port.  */
   listenThreads->addListeningThread (vh->getPort ());
 
@@ -75,12 +73,10 @@ int XmlVhostHandler::addVHost (Vhost* vh)
                                     protocol.c_str ());
 
       hostList.push_back (vh);
-      mutex.unlock ();
       return 0;
     }
   catch (...)
     {
-      mutex.unlock ();
       return -1;
     };
 }
@@ -91,54 +87,44 @@ int XmlVhostHandler::addVHost (Vhost* vh)
 Vhost* XmlVhostHandler::getVHost (const char* host, const char* ip, u_short port)
 {
   list<Vhost*>::iterator it;
+  /*
+    Do a linear search here. We have to use the first full-matching
+    virtual host.
+  */
+  for (it = hostList.begin (); it != hostList.end (); it++)
+    {
+      Vhost* vh = *it;
 
-  mutex.lock ();
+      /* Control if the host port is the correct one.  */
+      if (vh->getPort () != port)
+        continue;
 
-  try
-    {
-      it = hostList.begin ();
+      /* If ip is defined check that it is allowed to connect to the host.  */
+      if (ip && !vh->isIPAllowed (ip))
+        continue;
 
-      /*Do a linear search here. We have to use the first full-matching
-       *virtual host.
-       */
-      for (; it != hostList.end (); it++)
-        {
-          Vhost* vh = *it;
-          /* Control if the host port is the correct one.  */
-          if (vh->getPort () != port)
-            continue;
-          /* If ip is defined check that it is allowed to connect to the host.  */
-          if (ip && !vh->isIPAllowed (ip))
-            continue;
-          /* If host is defined check if it is allowed to connect to the host.  */
-          if (host && !vh->isHostAllowed (host))
-            continue;
-          /* We find a valid host.  */
-          mutex.unlock ();
-          /* Add a reference.  */
-          vh->addRef ();
-          return vh;
-        }
-      mutex.unlock ();
-      return 0;
+      /* If host is defined check if it is allowed to connect to the host.  */
+      if (host && !vh->isHostAllowed (host))
+        continue;
+
+      /* Add a reference.  */
+      vh->addRef ();
+      return vh;
     }
-  catch (...)
-    {
-      mutex.unlock ();
-      return 0;
-    };
+  return 0;
+
+  return 0;
 }
 
 /*!
- *XmlVhostHandler costructor.
- *\param lt A ListenThreads object to use to create new threads.
- *\param lm The log manager to use.
+ * XmlVhostHandler costructor.
+ * \param lt A ListenThreads object to use to create new threads.
+ * \param lm The log manager to use.
  */
 XmlVhostHandler::XmlVhostHandler (ListenThreads* lt, LogManager* lm)
 {
   listenThreads = lt;
   hostList.clear ();
-  mutex.init ();
   logManager = lm;
 }
 
@@ -149,8 +135,6 @@ void XmlVhostHandler::clean ()
 {
   list<Vhost*>::iterator it;
 
-  mutex.lock ();
-
   it = hostList.begin ();
 
   try
@@ -159,12 +143,9 @@ void XmlVhostHandler::clean ()
         delete *it;
 
       hostList.clear ();
-
-      mutex.unlock ();
     }
   catch (...)
     {
-      mutex.unlock ();
       return;
     };
 }
@@ -175,7 +156,6 @@ void XmlVhostHandler::clean ()
 XmlVhostHandler::~XmlVhostHandler ()
 {
   clean ();
-  mutex.destroy ();
 }
 
 /*!
@@ -563,58 +543,36 @@ int XmlVhostHandler::load (const char *filename)
  */
 Vhost* XmlVhostHandler::getVHost (int n)
 {
-  Vhost* ret = 0;
-  mutex.lock ();
-  try
+  Vhost* ret = NULL;
+  list<Vhost*>::iterator i = hostList.begin ();
+  for ( ; i != hostList.end (); i++)
     {
-      list<Vhost*>::iterator i = hostList.begin ();
-      for ( ; i != hostList.end (); i++)
+      if (!(n--))
         {
-          if (!(n--))
-            {
-              ret = *i;
-              ret->addRef ();
-              break;
-            }
+          ret = *i;
+          ret->addRef ();
+          break;
         }
-      mutex.unlock ();
-
-      return ret;
     }
-  catch (...)
-    {
-      mutex.unlock ();
-      return ret;
-    };
+  return ret;
 }
 
 /*!
- *Remove a virtual host by its position in the list
- *First position is zero.
- *\param n The virtual host identifier in the list.
+ * Remove a virtual host by its position in the list
+ * First position is zero.
+ * \param n The virtual host identifier in the list.
  */
 int XmlVhostHandler::removeVHost (int n)
 {
-  mutex.lock ();
-  try
-    {
-      list<Vhost*>::iterator i = hostList.begin ();
+  list<Vhost*>::iterator i = hostList.begin ();
 
-      for ( ;i != hostList.end (); i++)
+  for ( ;i != hostList.end (); i++)
+    {
+      if (!(n--))
         {
-          if (!(n--))
-            {
-              delete *i;
-              mutex.unlock ();
-              return 1;
-            }
+          delete *i;
+          return 1;
         }
-      mutex.unlock ();
-      return 0;
     }
-  catch (...)
-    {
-      mutex.unlock ();
-      return 0;
-    };
+  return 0;
 }

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/conf/vhost/xml_vhost_handler.h |    1 -
 myserver/src/conf/vhost/xml_vhost_handler.cpp   |  130 ++++++++---------------
 2 files changed, 44 insertions(+), 87 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon Mar 01 17:00:43 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NmDfP-0007mi-H5
	for mharc-myserver-commit@gnu.org; Mon, 01 Mar 2010 17:00:43 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NmDfO-0007js-1b
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 17:00:42 -0500
Received: from [140.186.70.92] (port=59931 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NmDfM-0007fl-2i
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 17:00:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NmDfK-0001dQ-RK
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 17:00:40 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:41103
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NmDfK-0001dM-Nk
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 17:00:38 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NmDfK-0001Pb-3T
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 22:00:38 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NmDfG-0003Ss-TR
	for myserver-commit@gnu.org; Mon, 01 Mar 2010 22:00:38 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 59af38244e9dea8871df6294c59158676198ea63
X-Git-Newrev: cb02215daa8ee1a11974a22491d7c24d6d516f94
Message-Id: <E1NmDfG-0003Ss-TR@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 01 Mar 2010 22:00:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-67-gcb02215
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 22:00:42 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  cb02215daa8ee1a11974a22491d7c24d6d516f94 (commit)
       via  a177f2c266a5db03b15757934b115a983632f01a (commit)
       via  db17b3f78e450097ef710ebf5868b93dc17e1757 (commit)
       via  2c27c403fd42c81d11c70e8dd932975fd2886540 (commit)
       via  41080a29f4368c94ee06478dc941c4683a6d4d08 (commit)
      from  59af38244e9dea8871df6294c59158676198ea63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit cb02215daa8ee1a11974a22491d7c24d6d516f94
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 23:00:52 2010 +0100

    Make XmlVhostHandler a base class for the guile_conf plugin vhost manager

diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h b/myserver/include/conf/vhost/xml_vhost_handler.h
index 7f6f2fc..9fcd225 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -39,7 +39,7 @@ public:
   vector<Vhost*>* getVHostList ();
 
   /*! Get a pointer to a vhost.  */
-  Vhost* getVHost (const char*, const char*, u_short);
+  virtual Vhost* getVHost (const char*, const char*, u_short);
 
   /*! Add an element to the vhost list.  */
   int addVHost (Vhost*);
diff --git a/plugins/src/guile_conf/guile_conf.cpp b/plugins/src/guile_conf/guile_conf.cpp
index 868f51f..a0cd0cc 100644
--- a/plugins/src/guile_conf/guile_conf.cpp
+++ b/plugins/src/guile_conf/guile_conf.cpp
@@ -20,6 +20,7 @@
 #include <guile/gh.h>
 #include <include/plugin/plugin.h>
 #include <include/conf/main/main_configuration.h>
+#include <include/conf/vhost/xml_vhost_handler.h>
 #include <include/server/server.h>
 
 #include <string.h>
@@ -122,57 +123,12 @@ GuileConfiguration::readData (list<NodeTree<string>*> *hashedDataTrees,
     }
 }
 
-class GuileVhostManagerHandler : public VhostManagerHandler
+class GuileVhostManagerHandler : public XmlVhostHandler
 {
-  vector<Vhost*> vhosts;
-  ListenThreads* lt;
-  LogManager* lm;
 public:
-  GuileVhostManagerHandler (ListenThreads* lt, LogManager* lm)
+  GuileVhostManagerHandler (ListenThreads* lt, LogManager* lm) :
+    XmlVhostHandler (lt, lm)
   {
-    this->lm = lm;
-    this->lt = lt;
-  }
-
-  virtual Vhost* getVHost (const char *host, const char *ip, u_short port)
-  {
-    vector<Vhost*>::iterator it;
-
-      try
-        {
-          it = vhosts.begin ();
-
-          /*Do a linear search here. We have to use the first full-matching
-           *virtual host.
-           */
-          for (; it != vhosts.end (); it++)
-            {
-              Vhost* vh = *it;
-              /* Control if the host port is the correct one.  */
-              if (vh->getPort () != port)
-                continue;
-              /* If ip is defined check that it is allowed to connect to the host.  */
-              if (ip && !vh->isIPAllowed (ip))
-                continue;
-              /* If host is defined check if it is allowed to connect to the host.  */
-              if (host && !vh->isHostAllowed (host))
-                continue;
-              /* We find a valid host.  */
-              /* Add a reference.  */
-              vh->addRef ();
-              return vh;
-            }
-          return 0;
-        }
-      catch (...)
-        {
-          return 0;
-        };
-    }
-
-  virtual Vhost* getVHost (int n)
-  {
-    return vhosts[n];
   }
 
   virtual int load (const char *resource)
@@ -185,7 +141,7 @@ public:
       {
         size_t len;
         SCM v = gh_car (list);
-        Vhost *vh = new Vhost (lm);
+        Vhost *vh = new Vhost (logManager);
         char *name = gh_scm2newstr (gh_car (v), &len);
         vh->setName (name);
         free (name);
@@ -211,9 +167,10 @@ public:
 
 
         /* TODO: read other information!!!  */
-        lt->addListeningThread (port);
-        vhosts.push_back (vh);
+        listenThreads->addListeningThread (port);
+        addVHost (vh);
       }
+
     return 0;
   }
 };



commit a177f2c266a5db03b15757934b115a983632f01a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 22:54:19 2010 +0100

    Raise an error at configure time when libguile is not present

diff --git a/plugins/src/guile/SConscript b/plugins/src/guile/SConscript
index f8ea846..46a8302 100644
--- a/plugins/src/guile/SConscript
+++ b/plugins/src/guile/SConscript
@@ -19,8 +19,9 @@ env = Environment(CPPPATH=local_listinc)
 
 conf = Configure(env, config_h="config.h")
 
-if conf.CheckHeader("libguile.h") and conf.CheckLib("guile"):
-    conf.Define('GUILE', 1)
+if not conf.CheckHeader("libguile.h") or not conf.CheckLib("guile"):
+    print "unable to find lib guile"
+    Exit(1)
 
 env = conf.Finish()
 
diff --git a/plugins/src/guile_conf/SConscript b/plugins/src/guile_conf/SConscript
index 4cb9227..f55fe56 100644
--- a/plugins/src/guile_conf/SConscript
+++ b/plugins/src/guile_conf/SConscript
@@ -19,8 +19,9 @@ env = Environment(CPPPATH=local_listinc)
 
 conf = Configure(env, config_h="config.h")
 
-if conf.CheckHeader("libguile.h") and conf.CheckLib("guile"):
-    conf.Define('GUILE', 1)
+if not conf.CheckHeader("libguile.h") or not conf.CheckLib("guile"):
+    print "unable to find lib guile"
+    Exit(1)
 
 env = conf.Finish()
 



commit db17b3f78e450097ef710ebf5868b93dc17e1757
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 22:43:49 2010 +0100

    Don't abbreviate Windows to win32, use w32 instead.

diff --git a/plugins/SConstruct b/plugins/SConstruct
index 4de4c7c..b443ec4 100644
--- a/plugins/SConstruct
+++ b/plugins/SConstruct
@@ -4,7 +4,7 @@
 # MyServer
 # http://www.gnu.org/software/myserver/
 #
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -39,7 +39,7 @@ command = ARGUMENTS.get('command', "build")
 arch = ""
 import os
 if os.name=="nt":
-    arch = "win32"
+    arch = "w32"
 else:
     arch = string.lower(os.uname()[0])
     if string.find(os.uname()[4],"64")==-1:
@@ -135,6 +135,3 @@ elif command=='source':
 
 #if command == "tests":
 #    AddPostAction('tests/tests_suite', env.Execute('tests/tests_suite'))
-
-
-



commit 2c27c403fd42c81d11c70e8dd932975fd2886540
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 22:19:51 2010 +0100

    Move members in the private section of XmlVhostHandler to protected

diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h b/myserver/include/conf/vhost/xml_vhost_handler.h
index 6b7f5c9..7f6f2fc 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -35,11 +35,11 @@ public:
   Vhost* getVHost (int n);
   void clean ();
   int removeVHost (int n);
-  int switchVhosts (int n1,int n2);
+  int switchVhosts (int n1, int n2);
   vector<Vhost*>* getVHostList ();
 
   /*! Get a pointer to a vhost.  */
-  Vhost* getVHost (const char*,const char*,u_short);
+  Vhost* getVHost (const char*, const char*, u_short);
 
   /*! Add an element to the vhost list.  */
   int addVHost (Vhost*);
@@ -51,7 +51,8 @@ public:
   void changeLocationsOwner ();
 
   static void registerBuilder (VhostManager& manager);
-private:
+
+protected:
   void loadXMLlogData (string, Vhost*, xmlNode*);
   ListenThreads* listenThreads;
 



commit 41080a29f4368c94ee06478dc941c4683a6d4d08
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 1 22:07:51 2010 +0100

    Use a std::vector instead of a std::list to store virtual hosts.
    
    Now some operations are done in a constant time.

diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h b/myserver/include/conf/vhost/xml_vhost_handler.h
index 3f9f4f0..6b7f5c9 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -22,6 +22,10 @@
 # include "myserver.h"
 # include <include/conf/vhost/vhost_manager.h>
 
+# include <vector>
+
+using namespace std;
+
 class XmlVhostHandler : public VhostManagerHandler
 {
 public:
@@ -32,7 +36,7 @@ public:
   void clean ();
   int removeVHost (int n);
   int switchVhosts (int n1,int n2);
-  list<Vhost*>* getVHostList ();
+  vector<Vhost*>* getVHostList ();
 
   /*! Get a pointer to a vhost.  */
   Vhost* getVHost (const char*,const char*,u_short);
@@ -52,7 +56,7 @@ private:
   ListenThreads* listenThreads;
 
   /*! List of virtual hosts. */
-  list<Vhost*> hostList;
+  vector<Vhost*> hosts;
   LogManager* logManager;
 };
 
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index 6730090..539aca3 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -49,12 +49,12 @@ void XmlVhostHandler::registerBuilder (VhostManager& manager)
  */
 int XmlVhostHandler::addVHost (Vhost* vh)
 {
-  list<Vhost*>::iterator it;
+  vector<Vhost*>::iterator it;
 
   /* Be sure there is a listening thread on the specified port.  */
   listenThreads->addListeningThread (vh->getPort ());
 
-  it = hostList.begin ();
+  it = hosts.begin ();
 
   try
     {
@@ -72,7 +72,7 @@ int XmlVhostHandler::addVHost (Vhost* vh)
                                 _("The protocol \"%s\" is used but not loaded"),
                                     protocol.c_str ());
 
-      hostList.push_back (vh);
+      hosts.push_back (vh);
       return 0;
     }
   catch (...)
@@ -86,12 +86,12 @@ int XmlVhostHandler::addVHost (Vhost* vh)
  */
 Vhost* XmlVhostHandler::getVHost (const char* host, const char* ip, u_short port)
 {
-  list<Vhost*>::iterator it;
+  vector<Vhost*>::iterator it;
   /*
     Do a linear search here. We have to use the first full-matching
     virtual host.
   */
-  for (it = hostList.begin (); it != hostList.end (); it++)
+  for (it = hosts.begin (); it != hosts.end (); it++)
     {
       Vhost* vh = *it;
 
@@ -124,7 +124,6 @@ Vhost* XmlVhostHandler::getVHost (const char* host, const char* ip, u_short port
 XmlVhostHandler::XmlVhostHandler (ListenThreads* lt, LogManager* lm)
 {
   listenThreads = lt;
-  hostList.clear ();
   logManager = lm;
 }
 
@@ -133,16 +132,15 @@ XmlVhostHandler::XmlVhostHandler (ListenThreads* lt, LogManager* lm)
  */
 void XmlVhostHandler::clean ()
 {
-  list<Vhost*>::iterator it;
-
-  it = hostList.begin ();
+  vector<Vhost*>::iterator it;
 
+  it = hosts.begin ();
   try
     {
-      for (;it != hostList.end (); it++)
+      for (;it != hosts.end (); it++)
         delete *it;
 
-      hostList.clear ();
+      hosts.clear ();
     }
   catch (...)
     {
@@ -161,9 +159,9 @@ XmlVhostHandler::~XmlVhostHandler ()
 /*!
  *Returns the entire virtual hosts list.
  */
-list<Vhost*>* XmlVhostHandler::getVHostList ()
+vector<Vhost*>* XmlVhostHandler::getVHostList ()
 {
-  return &(this->hostList);
+  return &(this->hosts);
 }
 
 /*!
@@ -181,7 +179,7 @@ void XmlVhostHandler::changeLocationsOwner ()
        *Change the log files owner if a different user or group
        *identifier is specified.
        */
-      for (list<Vhost*>::iterator it = hostList.begin (); it != hostList.end (); it++)
+      for (vector<Vhost*>::iterator it = hosts.begin (); it != hosts.end (); it++)
         {
           int err;
           Vhost* vh = *it;
@@ -206,7 +204,7 @@ void XmlVhostHandler::changeLocationsOwner ()
  */
 int XmlVhostHandler::getHostsNumber ()
 {
-  return hostList.size ();
+  return hosts.size ();
 }
 
 
@@ -237,7 +235,7 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
   for (; stream; stream = stream->next, location.assign (""), cycle = 0, filters.clear ())
     {
       if (stream->type == XML_ELEMENT_NODE &&
-          !xmlStrcmp (stream->name, (xmlChar const*)"STREAM"))
+          !xmlStrcmp (stream->name, (xmlChar const*) "STREAM"))
         {
           xmlAttr* streamAttr = stream->properties;
           while (streamAttr)
@@ -256,7 +254,7 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
           for (; filterList; filterList = filterList->next)
             {
               if (filterList->type == XML_ELEMENT_NODE &&
-                  !xmlStrcmp (filterList->name, (xmlChar const*)"FILTER"))
+                  !xmlStrcmp (filterList->name, (xmlChar const*) "FILTER"))
                 {
                   if (filterList->children && filterList->children->content)
                     {
@@ -314,7 +312,7 @@ int XmlVhostHandler::load (const char *filename)
     {
       xmlNodePtr lcur;
       Vhost *vh;
-      if (xmlStrcmp (node->name, (const xmlChar *)"VHOST"))
+      if (xmlStrcmp (node->name, (const xmlChar *) "VHOST"))
         continue;
       lcur = node->children;
       vh = new Vhost (logManager);
@@ -340,31 +338,31 @@ int XmlVhostHandler::load (const char *filename)
               continue;
             }
 
-          if (!xmlStrcmp (lcur->name, (const xmlChar *)"HOST"))
+          if (!xmlStrcmp (lcur->name, (const xmlChar *) "HOST"))
             {
               int useRegex = 0;
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 {
-                  if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex")
+                  if (!xmlStrcmp (attrs->name, (const xmlChar *) "isRegex")
                       && attrs->children && attrs->children->content
                       && (!xmlStrcmp (attrs->children->content,
-                                     (const xmlChar *)"YES")))
+                                     (const xmlChar *) "YES")))
                         useRegex = 1;
                 }
 
               vh->addHost ((const char*)lcur->children->content, useRegex);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"NAME"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "NAME"))
             {
               vh->setName ((char*)lcur->children->content);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"LOCATION"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "LOCATION"))
             {
               string loc (vh->getDocumentRoot ());
               loc.append ("/");
 
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
-                if (!xmlStrcmp (attrs->name, (const xmlChar *)"path"))
+                if (!xmlStrcmp (attrs->name, (const xmlChar *) "path"))
                   loc.append ((const char*) attrs->children->content);
 
               MimeRecord *record = XmlMimeHandler::readRecord (lcur);
@@ -380,35 +378,35 @@ int XmlVhostHandler::load (const char *filename)
 
               vh->getLocationsMime ()->put (loc, record);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_PRIVATEKEY"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_PRIVATEKEY"))
             {
               string pk ((char*)lcur->children->content);
               sslContext->setPrivateKeyFile (pk);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_CERTIFICATE"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_CERTIFICATE"))
             {
               string certificate ((char*)lcur->children->content);
               sslContext->setCertificateFile (certificate);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"CONNECTIONS_PRIORITY"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "CONNECTIONS_PRIORITY"))
             {
               vh->setDefaultPriority (atoi ((const char*)lcur->children->content));
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_PASSWORD"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_PASSWORD"))
             {
               string pw ((char*)lcur->children->content);
               sslContext->setPassword (pw);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"IP"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "IP"))
             {
               int useRegex = 0;
               xmlAttr *attrs = lcur->properties;
 
               while (attrs)
                 {
-                  if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex")
+                  if (!xmlStrcmp (attrs->name, (const xmlChar *) "isRegex")
                       && !xmlStrcmp (attrs->children->content,
-                                     (const xmlChar *)"YES"))
+                                     (const xmlChar *) "YES"))
                     useRegex = 1;
 
                   attrs = attrs->next;
@@ -416,7 +414,7 @@ int XmlVhostHandler::load (const char *filename)
 
               vh->addIP ((char*)lcur->children->content, useRegex);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"PORT"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PORT"))
             {
               int val = atoi ((char*)lcur->children->content);
               if (val > (1 << 16) || val <= 0)
@@ -424,7 +422,7 @@ int XmlVhostHandler::load (const char *filename)
                       _("Specified invalid port %s"), lcur->children->content);
               vh->setPort ((u_short)val);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"PROTOCOL"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PROTOCOL"))
             {
               char* lastChar = (char*)lcur->children->content;
               while (*lastChar != '\0')
@@ -434,7 +432,7 @@ int XmlVhostHandler::load (const char *filename)
                 }
               vh->setProtocolName ((char*)lcur->children->content);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"DOCROOT"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "DOCROOT"))
             {
               char* lastChar = (char*)lcur->children->content;
               while (*(lastChar+1) != '\0')
@@ -445,7 +443,7 @@ int XmlVhostHandler::load (const char *filename)
 
               vh->setDocumentRoot ((const char*)lcur->children->content);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SYSROOT"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SYSROOT"))
             {
               char* lastChar = (char*)lcur->children->content;
 
@@ -457,25 +455,25 @@ int XmlVhostHandler::load (const char *filename)
 
               vh->setSystemRoot ((const char*)lcur->children->content);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"ACCESSLOG"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "ACCESSLOG"))
             {
               loadXMLlogData ("ACCESSLOG", vh, lcur);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"WARNINGLOG"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "WARNINGLOG"))
             {
               loadXMLlogData ("WARNINGLOG", vh, lcur);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"MIME_FILE"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "MIME_FILE"))
             {
               string hnd ("xml");
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 {
-                  if (!xmlStrcmp (attrs->name, (const xmlChar *)"name")
+                  if (!xmlStrcmp (attrs->name, (const xmlChar *) "name")
                       && attrs->children && attrs->children->content)
                     hnd.assign((const char*) attrs->children->content);
                 }
 
-              const char *filename = (const char*)lcur->children->content;
+              const char *filename = (const char*) lcur->children->content;
               MimeManagerHandler *handler =
                 Server::getInstance ()->getMimeManager ()->buildHandler (hnd);
 
@@ -494,7 +492,7 @@ int XmlVhostHandler::load (const char *filename)
                 }
               vh->setMimeHandler (handler);
             }
-          else if (!xmlStrcmp (lcur->name, (const xmlChar *)"THROTTLING_RATE"))
+          else if (!xmlStrcmp (lcur->name, (const xmlChar *) "THROTTLING_RATE"))
             {
               u_long rate = (u_long)atoi ((char*)lcur->children->content);
               vh->setThrottlingRate (rate);
@@ -543,18 +541,10 @@ int XmlVhostHandler::load (const char *filename)
  */
 Vhost* XmlVhostHandler::getVHost (int n)
 {
-  Vhost* ret = NULL;
-  list<Vhost*>::iterator i = hostList.begin ();
-  for ( ; i != hostList.end (); i++)
-    {
-      if (!(n--))
-        {
-          ret = *i;
-          ret->addRef ();
-          break;
-        }
-    }
-  return ret;
+  if (n > hosts.size ())
+    return NULL;
+
+  return hosts.at (n - 1);
 }
 
 /*!
@@ -564,15 +554,7 @@ Vhost* XmlVhostHandler::getVHost (int n)
  */
 int XmlVhostHandler::removeVHost (int n)
 {
-  list<Vhost*>::iterator i = hostList.begin ();
-
-  for ( ;i != hostList.end (); i++)
-    {
-      if (!(n--))
-        {
-          delete *i;
-          return 1;
-        }
-    }
+  vector<Vhost*>::iterator it = hosts.erase (hosts.begin () + n - 1);
+  delete *it;
   return 0;
 }

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/conf/vhost/xml_vhost_handler.h |   15 ++-
 myserver/src/conf/vhost/xml_vhost_handler.cpp   |  108 ++++++++++-------------
 plugins/SConstruct                              |    7 +-
 plugins/src/guile/SConscript                    |    5 +-
 plugins/src/guile_conf/SConscript               |    5 +-
 plugins/src/guile_conf/guile_conf.cpp           |   59 ++-----------
 6 files changed, 71 insertions(+), 128 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Mar 04 05:41:21 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nn8Ua-0000Po-Hb
	for mharc-myserver-commit@gnu.org; Thu, 04 Mar 2010 05:41:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nn8UY-0000M3-HO
	for myserver-commit@gnu.org; Thu, 04 Mar 2010 05:41:18 -0500
Received: from [140.186.70.92] (port=51531 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nn8UW-0000JY-NK
	for myserver-commit@gnu.org; Thu, 04 Mar 2010 05:41:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nn8UV-0006wh-Op
	for myserver-commit@gnu.org; Thu, 04 Mar 2010 05:41:16 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:36015
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nn8UV-0006wd-Jb
	for myserver-commit@gnu.org; Thu, 04 Mar 2010 05:41:15 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nn8UV-0003Z6-3k
	for myserver-commit@gnu.org; Thu, 04 Mar 2010 10:41:15 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Nn8UT-0007bh-Iz
	for myserver-commit@gnu.org; Thu, 04 Mar 2010 10:41:15 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cb02215daa8ee1a11974a22491d7c24d6d516f94
X-Git-Newrev: 8deaba9bad41463b7e93a2205f254923a93558ce
Message-Id: <E1Nn8UT-0007bh-Iz@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 04 Mar 2010 10:41:14 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-68-g8deaba9
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Mar 2010 10:41:19 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  8deaba9bad41463b7e93a2205f254923a93558ce (commit)
      from  cb02215daa8ee1a11974a22491d7c24d6d516f94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 8deaba9bad41463b7e93a2205f254923a93558ce
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Mar 4 11:41:07 2010 +0100

    Mass update: reindent preprocessor macro directives.

diff --git a/myserver/include/base/crypt/sha1.h b/myserver/include/base/crypt/sha1.h
index 7d9f21a..ff65ee5 100644
--- a/myserver/include/base/crypt/sha1.h
+++ b/myserver/include/base/crypt/sha1.h
@@ -23,7 +23,7 @@
 
 extern "C"
 {
-#include <sha1.h>
+# include <sha1.h>
 }
 
 # include "myserver.h"
diff --git a/myserver/include/base/process/fork_server.h b/myserver/include/base/process/fork_server.h
index 72da869..fa39269 100644
--- a/myserver/include/base/process/fork_server.h
+++ b/myserver/include/base/process/fork_server.h
@@ -20,11 +20,11 @@
 
 # include "myserver.h"
 
-#ifndef WIN32
-# include <unistd.h>
-#endif
+# ifndef WIN32
+#  include <unistd.h>
+# endif
 
-#include <include/base/unix_socket/unix_socket.h>
+# include <include/base/unix_socket/unix_socket.h>
 
 
 struct StartProcInfo;
diff --git a/myserver/include/base/read_directory/read_directory.h b/myserver/include/base/read_directory/read_directory.h
index c8e58c2..9bdc7ef 100644
--- a/myserver/include/base/read_directory/read_directory.h
+++ b/myserver/include/base/read_directory/read_directory.h
@@ -67,7 +67,7 @@ public:
   u_long st_nlink;
 # else
   nlink_t st_nlink;
-#endif
+# endif
 
   int findfirst (const char *directory);
   int findfirst (string &directory) {return findfirst (directory.c_str ());};
diff --git a/myserver/include/base/socket/ssl_socket.h b/myserver/include/base/socket/ssl_socket.h
index cb8a415..ff947de 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -24,8 +24,8 @@
 
 extern "C"
 {
-#  include <sys/types.h>
-#  include <sys/socket.h>
+# include <sys/types.h>
+# include <sys/socket.h>
 }
 
 # include <include/base/socket/socket.h>
diff --git a/myserver/include/plugin/plugin.h b/myserver/include/plugin/plugin.h
index 721310a..e6423a9 100644
--- a/myserver/include/plugin/plugin.h
+++ b/myserver/include/plugin/plugin.h
@@ -19,13 +19,13 @@
 #ifndef PLUGIN_H
 # define PLUGIN_H
 
-#ifdef WIN32
-# define EXPORTABLE(x) x _declspec(dllexport)
-#else
-# define EXPORTABLE(x) extern "C" x
+# ifdef WIN32
+#  define EXPORTABLE(x) x _declspec(dllexport)
+# else
+#  define EXPORTABLE(x) extern "C" x
 # endif
 
-#define PLUGIN_NAME(X) static const char * __name = X; \
+# define PLUGIN_NAME(X) static const char * __name = X; \
         EXPORTABLE(const char*) name (){return X;}
 
 # include "myserver.h"
diff --git a/myserver/include/protocol/ftp/ftp_parser.h b/myserver/include/protocol/ftp/ftp_parser.h
index 8c68e77..13e0c20 100644
--- a/myserver/include/protocol/ftp/ftp_parser.h
+++ b/myserver/include/protocol/ftp/ftp_parser.h
@@ -129,7 +129,7 @@ typedef union YYSTYPE
 {
 
   /* Line 1676 of yacc.c  */
-#line 15 "ftp_parser.ypp"
+# line 15 "ftp_parser.ypp"
 
   int           m_nInt;
   char          m_nChar;
@@ -139,7 +139,7 @@ typedef union YYSTYPE
 
 
   /* Line 1676 of yacc.c  */
-#line 143 "../../../include/protocol/ftp/ftp_parser.h"
+# line 143 "../../../include/protocol/ftp/ftp_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/myserver/include/protocol/gopher/engine.h b/myserver/include/protocol/gopher/engine.h
index a6d29ee..f060b27 100644
--- a/myserver/include/protocol/gopher/engine.h
+++ b/myserver/include/protocol/gopher/engine.h
@@ -18,12 +18,12 @@
 */
 
 #ifndef GOPHER_ENGINE_H
-#define GOPHER_ENGINE_H
+# define GOPHER_ENGINE_H
 
-#include "myserver.h"
-#include <include/base/hash_map/hash_map.h>
-#include <include/conf/vhost/vhost.h>
-#include <include/base/base64/mime_utils.h>
+# include "myserver.h"
+# include <include/base/hash_map/hash_map.h>
+# include <include/conf/vhost/vhost.h>
+# include <include/base/base64/mime_utils.h>
 
 using namespace std;
 
diff --git a/myserver/include/protocol/gopher/gopher_content.h b/myserver/include/protocol/gopher/gopher_content.h
index f18014f..622f031 100644
--- a/myserver/include/protocol/gopher/gopher_content.h
+++ b/myserver/include/protocol/gopher/gopher_content.h
@@ -18,15 +18,15 @@
 */
 
 #ifndef GOPHER_CONTENT_H
-#define GOPHER_CONTENT_H
-
-#include "myserver.h"
-#include <include/base/socket/socket.h>
-#include <include/base/mem_buff/mem_buff.h>
-#include <include/base/file/file.h>
-#include <include/connection/connection.h>
-#include <vector>
-#include <string>
+# define GOPHER_CONTENT_H
+
+# include "myserver.h"
+# include <include/base/socket/socket.h>
+# include <include/base/mem_buff/mem_buff.h>
+# include <include/base/file/file.h>
+# include <include/connection/connection.h>
+# include <vector>
+# include <string>
 
 using namespace std;
 
diff --git a/myserver/myserver.h b/myserver/myserver.h
index 748aacf..ede34f1 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -17,35 +17,35 @@
 */
 
 #ifndef STDAFX_H
-#define STDAFX_H
+# define STDAFX_H
 
 extern "C"
 {
-#include "config.h"
+# include "config.h"
 
-#ifdef HAVE_PTHREAD
-# include <pthread.h>
-#endif
+# ifdef HAVE_PTHREAD
+#  include <pthread.h>
+# endif
 }
 
 extern "C"
 {
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <math.h>
-#include "time.h"
-#include <ctype.h>
-#include <stdint.h>
-
-#ifdef WIN32
-# include <tchar.h>
-# include <process.h>
-#else
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <limits.h>
-#endif
+# include <stdlib.h>
+# include <stdio.h>
+# include <fcntl.h>
+# include <math.h>
+# include "time.h"
+# include <ctype.h>
+# include <stdint.h>
+
+# ifdef WIN32
+#  include <tchar.h>
+#  include <process.h>
+# else
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <limits.h>
+# endif
 }
 
 typedef void* HANDLE;
diff --git a/myserver/src/base/multicast/multicast.cpp b/myserver/src/base/multicast/multicast.cpp
index 1214bc9..99ec6e8 100644
--- a/myserver/src/base/multicast/multicast.cpp
+++ b/myserver/src/base/multicast/multicast.cpp
@@ -18,8 +18,8 @@
 #ifndef MULTICAST_CPP
 # define MULTICAST_CPP
 
-#include "myserver.h"
-#include <include/base/multicast/multicast.h>
+# include "myserver.h"
+# include <include/base/multicast/multicast.h>
 
 
 /*!
diff --git a/myserver/src/base/socket/ssl_socket.cpp b/myserver/src/base/socket/ssl_socket.cpp
index 4c9231a..ceca2cf 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -31,10 +31,10 @@ extern "C"
 #ifdef WIN32
 # include <w32sock.h>
 #else
-#include <netdb.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+# include <netdb.h>
+# include <unistd.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
 #endif
 }
 
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 009123d..615157f 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -29,7 +29,7 @@ extern "C"
 # include <direct.h>
 #endif
 
-# include <argp.h>
+#include <argp.h>
 
 #ifndef WIN32
 # include <string.h>

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/crypt/sha1.h                 |    2 +-
 myserver/include/base/process/fork_server.h        |    8 ++--
 .../include/base/read_directory/read_directory.h   |    2 +-
 myserver/include/base/socket/ssl_socket.h          |    4 +-
 myserver/include/plugin/plugin.h                   |   10 ++--
 myserver/include/protocol/ftp/ftp_parser.h         |    4 +-
 myserver/include/protocol/gopher/engine.h          |   10 ++--
 myserver/include/protocol/gopher/gopher_content.h  |   18 ++++----
 myserver/myserver.h                                |   42 ++++++++++----------
 myserver/src/base/multicast/multicast.cpp          |    4 +-
 myserver/src/base/socket/ssl_socket.cpp            |    8 ++--
 myserver/src/myserver.cpp                          |    2 +-
 12 files changed, 57 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon Mar 08 07:13:00 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NobpU-0006hl-Gp
	for mharc-myserver-commit@gnu.org; Mon, 08 Mar 2010 07:13:00 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NobpS-0006hJ-W8
	for myserver-commit@gnu.org; Mon, 08 Mar 2010 07:12:59 -0500
Received: from [140.186.70.92] (port=38582 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NobpS-0006h7-8D
	for myserver-commit@gnu.org; Mon, 08 Mar 2010 07:12:58 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NobpR-0006nj-Gm
	for myserver-commit@gnu.org; Mon, 08 Mar 2010 07:12:58 -0500
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:48149)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NobpR-0006nR-9e
	for myserver-commit@gnu.org; Mon, 08 Mar 2010 07:12:57 -0500
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o28CCs9q020945
	for <myserver-commit@gnu.org>; Mon, 8 Mar 2010 13:12:54 +0100
Message-Id: <201003081212.o28CCs9q020945@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Mon, 08 Mar 2010 13:12:54 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Mon, 8 Mar 2010 13:12:54 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:manual build 314857
	FAILED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Mar 2010 12:12:59 -0000

Hi,

This is to let you know that Hydra build 314857 of job gnu:myserver-master:manual has changed from FAILED to FAILED.

Complete build information can be found on this page: http://hydra.nixos.org/build/314857

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 314857
Nix name:              | myserver-manual-0.9.2
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/m50f4l49iz1wscn4yc78rlgbw8gsjd1a-myserver-manual-0.9.2.drv
Output store path:     | /nix/store/d16l3ghq4sa2fw7cy3hcgy2ar5bsfif1-myserver-manual-0.9.2
Time added:            | 2010-03-08 13:12:54
Build started:         | 2010-03-08 13:12:48
Build finished:        | 2010-03-08 13:12:54
Duration:              | 6s

The build inputs were:

Name        | Type  | Value
------------+-------+-------------------------------------------------------------
hydraConfig | svn   | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20296
nixpkgs     | svn   | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20473
tarball     | build | 310407

Regards,

The Hydra build daemon.

---



From MAILER-DAEMON Tue Mar 09 02:13:16 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Notcy-0008Nt-9G
	for mharc-myserver-commit@gnu.org; Tue, 09 Mar 2010 02:13:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Notcv-0008Nj-Bk
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 02:13:13 -0500
Received: from [140.186.70.92] (port=42560 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Notcu-0008NS-19
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 02:13:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Notcs-0003Oh-IG
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 02:13:11 -0500
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:48770)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Notcs-0003Oc-B3
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 02:13:10 -0500
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o297D8uM003446
	for <myserver-commit@gnu.org>; Tue, 9 Mar 2010 08:13:08 +0100
Message-Id: <201003090713.o297D8uM003446@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Tue, 09 Mar 2010 08:13:08 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Tue, 9 Mar 2010 08:13:08 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:manual build 315206
	FAILED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Mar 2010 07:13:14 -0000

Hi,

This is to let you know that Hydra build 315206 of job gnu:myserver-master:manual has changed from FAILED to FAILED.

Complete build information can be found on this page: http://hydra.nixos.org/build/315206

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 315206
Nix name:              | myserver-manual-0.9.2
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv
Output store path:     | /nix/store/4z47r8r7195cgk1vazn7s4n9m9rl8ac3-myserver-manual-0.9.2
Time added:            | 2010-03-09 08:13:08
Build started:         | 2010-03-09 07:46:34
Build finished:        | 2010-03-09 08:13:08
Duration:              | 1594s

The build inputs were:

Name        | Type  | Value
------------+-------+-------------------------------------------------------------
hydraConfig | svn   | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20475
nixpkgs     | svn   | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20480
tarball     | build | 310407

Regards,

The Hydra build daemon.

---
config.status: creating src/base/thread/Makefile
config.status: creating src/base/unix_socket/Makefile
config.status: creating src/protocol/Makefile
config.status: creating src/protocol/ftp/Makefile
config.status: creating src/protocol/control/Makefile
config.status: creating src/protocol/https/Makefile
config.status: creating src/protocol/http/Makefile
config.status: creating src/protocol/http/env/Makefile
config.status: creating src/protocol/gopher/Makefile
config.status: creating src/filter/Makefile
config.status: creating src/filter/gzip/Makefile
config.status: creating src/plugin/Makefile
config.status: creating src/server/Makefile
config.status: creating src/GUI/Makefile
config.status: creating tests/Makefile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing po-directories commands
config.status: creating po/POTFILES
config.status: creating po/Makefile
[q[pbuilding
[pmake: Entering directory `/tmp/nix-build-18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[pbuilding html-recursive
[pmake[1]: Entering directory `/tmp/nix-build-18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[pbuilding myserver.html
[3s[arm -rf myserver.htp[b
[3s[aif /bin/sh /tmp/nix-build-18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv-0/myserver-0.9.2/build-aux/missing --run makeinfo --html   -I . \
	 -o myserver.htp myserver.texi; \
	then \
	  rm -rf myserver.html; \
	  if test ! -d myserver.htp && test -d myserver; then \
	    mv myserver myserver.html; else mv myserver.htp myserver.html; fi; \
	else \
	  if test ! -d myserver.htp && test -d myserver; then \
	    rm -rf myserver; else rm -Rf myserver.htp myserver.html; fi; \
	  exit 1; \
	fi[b
myserver.texi:119: @include `security.texi': No such file or directory.
myserver.texi:138: @include `log_management.texi': No such file or directory.
makeinfo: Removing output file `/tmp/nix-build-18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation/myserver.htp/index.html' due to errors; use --force to preserve.
make[1]: *** [myserver.html] Error 1
make[1]: Leaving directory `/tmp/nix-build-18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[q[qmake: *** [html-recursive] Error 1
make: Leaving directory `/tmp/nix-build-18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[q[q[q[qbuild time elapsed:  0m0.017s 0m0.010s 0m21.638s 0m13.106s
builder for `/nix/store/18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv' failed with exit code 2
error: build of `/nix/store/18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv' failed
Shared connection to stan closed.

build of `/nix/store/18fiwqlx1yad4q7mv2dgxh619cwgb3hk-myserver-manual-0.9.2.drv' on `buildfarm@stan' failed with exit code 256



From MAILER-DAEMON Tue Mar 09 11:55:19 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Np2iE-0007I5-Nu
	for mharc-myserver-commit@gnu.org; Tue, 09 Mar 2010 11:55:18 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Np2iC-0007Gn-JQ
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 11:55:16 -0500
Received: from [140.186.70.92] (port=55477 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Np2iB-0007FV-LT
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 11:55:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Np2iA-0003To-QN
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 11:55:15 -0500
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:49141)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Np2iA-0003Td-GP
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 11:55:14 -0500
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o29GtCCK013090
	for <myserver-commit@gnu.org>; Tue, 9 Mar 2010 17:55:12 +0100
Message-Id: <201003091655.o29GtCCK013090@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Tue, 09 Mar 2010 17:55:12 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Tue, 9 Mar 2010 17:55:12 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:manual build 316390
	FAILED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Mar 2010 16:55:16 -0000

Hi,

This is to let you know that Hydra build 316390 of job gnu:myserver-master:manual has changed from FAILED to FAILED.

Complete build information can be found on this page: http://hydra.nixos.org/build/316390

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 316390
Nix name:              | myserver-manual-0.9.2
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/012qs5qm2xgx4jbh8ksisvpnv07j9cw9-myserver-manual-0.9.2.drv
Output store path:     | /nix/store/9b4p98wmq6ghazxc3jk0jay9ba4600mp-myserver-manual-0.9.2
Time added:            | 2010-03-09 17:55:12
Build started:         | 2010-03-09 17:55:12
Build finished:        | 2010-03-09 17:55:12
Duration:              | 0s

The build inputs were:

Name        | Type  | Value
------------+-------+-------------------------------------------------------------
hydraConfig | svn   | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20475
nixpkgs     | svn   | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20503
tarball     | build | 310407

Regards,

The Hydra build daemon.

---



From MAILER-DAEMON Tue Mar 09 20:44:34 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NpAyQ-0001hO-LM
	for mharc-myserver-commit@gnu.org; Tue, 09 Mar 2010 20:44:34 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NpAyP-0001f6-3l
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 20:44:33 -0500
Received: from [140.186.70.92] (port=57234 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NpAyO-0001db-2l
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 20:44:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NpAyM-0001c2-Od
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 20:44:31 -0500
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:49364)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NpAyM-0001by-HR
	for myserver-commit@gnu.org; Tue, 09 Mar 2010 20:44:30 -0500
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o2A1iTEZ019043
	for <myserver-commit@gnu.org>; Wed, 10 Mar 2010 02:44:29 +0100
Message-Id: <201003100144.o2A1iTEZ019043@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Wed, 10 Mar 2010 02:44:29 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Wed, 10 Mar 2010 02:44:29 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:manual build 321576
	FAILED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Mar 2010 01:44:33 -0000

Hi,

This is to let you know that Hydra build 321576 of job gnu:myserver-master:manual has changed from FAILED to FAILED.

Complete build information can be found on this page: http://hydra.nixos.org/build/321576

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 321576
Nix name:              | myserver-manual-0.9.2
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv
Output store path:     | /nix/store/b35k32arvnk8q1iaj4xml183h02qhfvr-myserver-manual-0.9.2
Time added:            | 2010-03-10 02:44:28
Build started:         | 2010-03-10 02:42:55
Build finished:        | 2010-03-10 02:44:28
Duration:              | 93s

The build inputs were:

Name        | Type  | Value
------------+-------+-------------------------------------------------------------
hydraConfig | svn   | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20515
nixpkgs     | svn   | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20518
tarball     | build | 310407

Regards,

The Hydra build daemon.

---
config.status: creating src/base/thread/Makefile
config.status: creating src/base/unix_socket/Makefile
config.status: creating src/protocol/Makefile
config.status: creating src/protocol/ftp/Makefile
config.status: creating src/protocol/control/Makefile
config.status: creating src/protocol/https/Makefile
config.status: creating src/protocol/http/Makefile
config.status: creating src/protocol/http/env/Makefile
config.status: creating src/protocol/gopher/Makefile
config.status: creating src/filter/Makefile
config.status: creating src/filter/gzip/Makefile
config.status: creating src/plugin/Makefile
config.status: creating src/server/Makefile
config.status: creating src/GUI/Makefile
config.status: creating tests/Makefile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing po-directories commands
config.status: creating po/POTFILES
config.status: creating po/Makefile
[q[pbuilding
[pmake: Entering directory `/tmp/nix-build-q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[pbuilding html-recursive
[pmake[1]: Entering directory `/tmp/nix-build-q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[pbuilding myserver.html
[3s[arm -rf myserver.htp[b
[3s[aif /bin/sh /tmp/nix-build-q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv-0/myserver-0.9.2/build-aux/missing --run makeinfo --html   -I . \
	 -o myserver.htp myserver.texi; \
	then \
	  rm -rf myserver.html; \
	  if test ! -d myserver.htp && test -d myserver; then \
	    mv myserver myserver.html; else mv myserver.htp myserver.html; fi; \
	else \
	  if test ! -d myserver.htp && test -d myserver; then \
	    rm -rf myserver; else rm -Rf myserver.htp myserver.html; fi; \
	  exit 1; \
	fi[b
myserver.texi:119: @include `security.texi': No such file or directory.
myserver.texi:138: @include `log_management.texi': No such file or directory.
makeinfo: Removing output file `/tmp/nix-build-q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation/myserver.htp/index.html' due to errors; use --force to preserve.
make[1]: *** [myserver.html] Error 1
make[1]: Leaving directory `/tmp/nix-build-q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[q[qmake: *** [html-recursive] Error 1
make: Leaving directory `/tmp/nix-build-q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv-0/myserver-0.9.2/documentation'
[q[q[q[qbuild time elapsed:  0m0.020s 0m0.013s 0m22.412s 0m13.945s
builder for `/nix/store/q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv' failed with exit code 2
error: build of `/nix/store/q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv' failed
Shared connection to stan closed.

build of `/nix/store/q5v8ndx5bx30l8j2awc31n8jgszvigdc-myserver-manual-0.9.2.drv' on `buildfarm@stan' failed with exit code 256



From MAILER-DAEMON Sun Mar 14 11:36:35 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nqprm-0001dj-NX
	for mharc-myserver-commit@gnu.org; Sun, 14 Mar 2010 11:36:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nqprk-0001dF-TL
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:36:32 -0400
Received: from [140.186.70.92] (port=38410 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nqpri-0001ce-A9
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:36:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nqprg-00060M-F4
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:36:30 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33813
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nqprg-00060H-AU
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:36:28 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nqprg-0005Jj-3p
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:36:28 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Nqpre-0002uE-RE
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:36:28 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8deaba9bad41463b7e93a2205f254923a93558ce
X-Git-Newrev: 3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4
Message-Id: <E1Nqpre-0002uE-RE@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 14 Mar 2010 15:36:27 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-69-g3e6b52d
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Mar 2010 15:36:33 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4 (commit)
      from  8deaba9bad41463b7e93a2205f254923a93558ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Mar 14 16:13:38 2010 +0100

    Update `bootstrap'.

diff --git a/myserver/bootstrap b/myserver/bootstrap
index e6b8e20..365a3d9 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -1,8 +1,10 @@
 #! /bin/sh
+# Print a version string.
+scriptversion=2010-02-24.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +19,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Written by Paul Eggert.
+# Originally written by Paul Eggert.  The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project.  The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib@gnu.org.
 
 nl='
 '
@@ -34,7 +44,7 @@ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
 
 usage() {
-  echo >&2 "\
+  cat <<EOF
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
@@ -43,7 +53,7 @@ Options:
                           sources reside.  Use this if you already
                           have gnulib sources on your machine, and
                           do not want to waste your bandwidth downloading
-                          them again.
+                          them again.  Defaults to \$GNULIB_SRCDIR.
  --copy                   Copy files instead of creating symbolic links.
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
@@ -52,8 +62,11 @@ Options:
 If the file $0.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
 Running without arguments will suffice in most cases.
-"
+EOF
 }
 
 # Configuration.
@@ -67,6 +80,10 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
 # The command to download all .po files for a specified domain into
 # a specified directory.  Fill in the first %s is the domain name, and
 # the second with the destination directory.  Use rsync's -L and -r
@@ -103,14 +120,14 @@ tests_base=tests
 
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files="
-	$build_aux/install-sh
-	$build_aux/missing
-	$build_aux/mdate-sh
-	$build_aux/texinfo.tex
-	$build_aux/depcomp
-	$build_aux/config.guess
-	$build_aux/config.sub
-	doc/INSTALL
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
 "
 
 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
@@ -126,7 +143,8 @@ XGETTEXT_OPTIONS='\\\
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 
-# Package bug report address for gettext files
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
 MSGID_BUGS_ADDRESS=bug-$package@gnu.org
 
 # Files we don't want to import.
@@ -134,7 +152,7 @@ excluded_files=
 
 # File that should exist in the top directory of a checked out hierarchy,
 # but not in a distribution tarball.
-checkout_only_file=README
+checkout_only_file=README-hacking
 
 # Whether to use copies instead of symlinks.
 copy=false
@@ -145,6 +163,44 @@ copy=false
 # on which version control system (if any) is used in the source directory.
 vc_ignore=auto
 
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program.  Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run (i.e.,
+# supports --version).  If found, set ENVVAR to the program name,
+# die otherwise.
+find_tool ()
+{
+  find_tool_envvar=$1
+  shift
+  find_tool_names=$@
+  eval "find_tool_res=\$$find_tool_envvar"
+  if test x"$find_tool_res" = x; then
+    for i
+    do
+      if ($i --version </dev/null) >/dev/null 2>&1; then
+       find_tool_res=$i
+       break
+      fi
+    done
+  else
+    find_tool_error_prefix="\$$find_tool_envvar: "
+  fi
+  if test x"$find_tool_res" = x; then
+    echo >&2 "$0: one of these is required: $find_tool_names"
+    exit 1
+  fi
+  ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
+    echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+    exit 1
+  }
+  eval "$find_tool_envvar=\$find_tool_res"
+  eval "export $find_tool_envvar"
+}
+
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+find_tool SHA1SUM sha1sum gsha1sum shasum
+
 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
 # if we were invoked as "sh bootstrap".
@@ -195,7 +251,7 @@ insert_sorted_if_absent() {
   file=$1
   str=$2
   test -f $file || touch $file
-  echo "$str" | sort -u - $file | cmp -s - $file \
+  echo "$str" | sort -u - $file | cmp - $file > /dev/null \
     || echo "$str" | sort -u - $file -o $file \
     || exit 1
 }
@@ -222,6 +278,110 @@ if test ! -d $build_aux; then
   done
 fi
 
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+sort_ver() { # sort -V is not generally available
+  ver1="$1"
+  ver2="$2"
+
+  # split on '.' and compare each component
+  i=1
+  while : ; do
+    p1=$(echo "$ver1" | cut -d. -f$i)
+    p2=$(echo "$ver2" | cut -d. -f$i)
+    if [ ! "$p1" ]; then
+      echo "$1 $2"
+      break
+    elif [ ! "$p2" ]; then
+      echo "$2 $1"
+      break
+    elif [ ! "$p1" = "$p2" ]; then
+      if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+        echo "$2 $1"
+      elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+        echo "$1 $2"
+      else # numeric, then lexicographic comparison
+        lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+        if [ "$lp" = "$p2" ]; then
+          echo "$1 $2"
+        else
+          echo "$2 $1"
+        fi
+      fi
+      break
+    fi
+    i=$(($i+1))
+  done
+}
+
+get_version() {
+  app=$1
+
+  $app --version >/dev/null 2>&1 || return 1
+
+  $app --version 2>&1 |
+  sed -n '# extract version within line
+          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          t done
+
+          # extract version at start of line
+          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          t done
+
+          d
+
+          :done
+          #the following essentially does s/5.005/5.5/
+          s/\.0*\([1-9]\)/.\1/g
+          p
+          q'
+}
+
+check_versions() {
+  ret=0
+
+  while read app req_ver; do
+    # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+    appvar=`echo $app | tr '[a-z]' '[A-Z]'`
+    test "$appvar" = TAR && appvar=AMTAR
+    eval "app=\${$appvar-$app}"
+    inst_ver=$(get_version $app)
+    if [ ! "$inst_ver" ]; then
+      echo "Error: '$app' not found" >&2
+      ret=1
+    elif [ ! "$req_ver" = "-" ]; then
+      latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+      if [ ! "$latest_ver" = "$inst_ver" ]; then
+        echo "Error: '$app' version == $inst_ver is too old" >&2
+        echo "       '$app' version >= $req_ver is required" >&2
+        ret=1
+      fi
+    fi
+  done
+
+  return $ret
+}
+
+print_versions() {
+  echo "Program    Min_version"
+  echo "----------------------"
+  printf "$buildreq"
+  echo "----------------------"
+  # can't depend on column -t
+}
+
+if ! printf "$buildreq" | check_versions; then
+  test -f README-prereq &&
+  echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2
+  echo
+  print_versions
+  exit 1
+fi
+
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.
@@ -240,14 +400,16 @@ fi
 
 cleanup_gnulib() {
   status=$?
-  rm -fr gnulib
+  rm -fr "$gnulib_path"
   exit $status
 }
 
 git_modules_config () {
-  GIT_CONFIG_LOCAL=.gitmodules git config "$@"
+  test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
+gnulib_path=`git_modules_config submodule.gnulib.path`
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
@@ -257,30 +419,43 @@ case ${GNULIB_SRCDIR--} in
     git submodule init || exit $?
     git submodule update || exit $?
 
-  elif [ ! -d gnulib ]; then
+  elif [ ! -d "$gnulib_path" ]; then
     echo "$0: getting gnulib files..."
 
     trap cleanup_gnulib 1 2 13 15
 
     git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
-    git clone $shallow git://git.sv.gnu.org/gnulib ||
+    git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 
     trap - 1 2 13 15
   fi
-  GNULIB_SRCDIR=gnulib
+  GNULIB_SRCDIR=$gnulib_path
   ;;
 *)
-  # Redirect the gnulib submodule to the directory on the command line
-  # if possible.
+  # Use GNULIB_SRCDIR as a reference.
   if test -d "$GNULIB_SRCDIR"/.git && \
-	git_modules_config submodule.gnulib.url >/dev/null; then
-    git submodule init
-    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
-    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+        git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
-    git submodule update || exit $?
-    GNULIB_SRCDIR=gnulib
+    if git submodule --help|grep reference > /dev/null; then
+      # Prefer the one-liner available in git 1.6.4 or newer.
+      git submodule update --init --reference "$GNULIB_SRCDIR" \
+        "$gnulib_path" || exit $?
+    else
+      # This fallback allows at least git 1.5.5.
+      if test -f "$gnulib_path"/gnulib-tool; then
+        # Since file already exists, assume submodule init already complete.
+        git submodule update || exit $?
+      else
+        # Older git can't clone into an empty directory.
+        rmdir "$gnulib_path" 2>/dev/null
+        git clone --reference "$GNULIB_SRCDIR" \
+          "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+          && git submodule init && git submodule update \
+          || exit $?
+      fi
+    fi
+    GNULIB_SRCDIR=$gnulib_path
   fi
   ;;
 esac
@@ -322,10 +497,12 @@ update_po_files() {
     new_po="$ref_po_dir/$po.po"
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
-	! test -f "$po_dir/$po.po" ||
-	! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
+        ! test -f "$po_dir/$po.po" ||
+        ! $SHA1SUM -c --status "$cksum_file" \
+            < "$new_po" > /dev/null; then
       echo "updated $po_dir/$po.po..."
-      cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
+      cp "$new_po" "$po_dir/$po.po" \
+          && $SHA1SUM < "$new_po" > "$cksum_file"
     fi
   done
 }
@@ -359,45 +536,45 @@ symlink_to_dir()
       # FIXME: for now, this does only one level
       parent=`dirname "$dst_dir"`
       for dot_ig in x $vc_ignore; do
-	test $dot_ig = x && continue
-	ig=$parent/$dot_ig
-	insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
       done
     fi
 
     if $copy; then
       {
-	test ! -h "$dst" || {
-	  echo "$0: rm -f $dst" &&
-	  rm -f "$dst"
-	}
+        test ! -h "$dst" || {
+          echo "$0: rm -f $dst" &&
+          rm -f "$dst"
+        }
       } &&
       test -f "$dst" &&
       cmp -s "$src" "$dst" || {
-	echo "$0: cp -fp $src $dst" &&
-	cp -fp "$src" "$dst"
+        echo "$0: cp -fp $src $dst" &&
+        cp -fp "$src" "$dst"
       }
     else
       test -h "$dst" &&
       src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
       dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
       test "$src_i" = "$dst_i" || {
-	dot_dots=
-	case $src in
-	/*) ;;
-	*)
-	  case /$dst/ in
-	  *//* | */../* | */./* | /*/*/*/*/*/)
-	     echo >&2 "$0: invalid symlink calculation: $src -> $dst"
-	     exit 1;;
-	  /*/*/*/*/)	dot_dots=../../../;;
-	  /*/*/*/)	dot_dots=../../;;
-	  /*/*/)	dot_dots=../;;
-	  esac;;
-	esac
-
-	echo "$0: ln -fs $dot_dots$src $dst" &&
-	ln -fs "$dot_dots$src" "$dst"
+        dot_dots=
+        case $src in
+        /*) ;;
+        *)
+          case /$dst/ in
+          *//* | */../* | */./* | /*/*/*/*/*/)
+             echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+             exit 1;;
+          /*/*/*/*/)	dot_dots=../../../;;
+          /*/*/*/)	dot_dots=../../;;
+          /*/*/)	dot_dots=../;;
+          esac;;
+        esac
+
+        echo "$0: ln -fs $dot_dots$src $dst" &&
+        ln -fs "$dot_dots$src" "$dst"
       }
     fi
   }
@@ -427,28 +604,28 @@ cp_mark_as_generated()
 
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
-	# Copy the file first to get proper permissions if it
-	# doesn't already exist.  Then overwrite the copy.
-	echo "$0: cp -f $cp_src $cp_dst" &&
-	rm -f "$cp_dst" &&
-	cp "$cp_src" "$cp_dst-t" &&
-	sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
-	mv -f "$cp_dst-t" "$cp_dst"
+        # Copy the file first to get proper permissions if it
+        # doesn't already exist.  Then overwrite the copy.
+        echo "$0: cp -f $cp_src $cp_dst" &&
+        rm -f "$cp_dst" &&
+        cp "$cp_src" "$cp_dst-t" &&
+        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+        mv -f "$cp_dst-t" "$cp_dst"
       }
     else
       # Copy the file first to get proper permissions if it
       # doesn't already exist.  Then overwrite the copy.
       cp "$cp_src" "$cp_dst-t" &&
       (
-	echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
-	echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
-	sed "s!$bt_regex/!!g" "$cp_src"
+        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
+        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
+        sed "s!$bt_regex/!!g" "$cp_src"
       ) > $cp_dst-t &&
       if cmp -s "$cp_dst-t" "$cp_dst"; then
-	rm -f "$cp_dst-t"
+        rm -f "$cp_dst-t"
       else
-	echo "$0: cp $cp_src $cp_dst # with edits" &&
-	mv -f "$cp_dst-t" "$cp_dst"
+        echo "$0: cp $cp_src $cp_dst # with edits" &&
+        mv -f "$cp_dst-t" "$cp_dst"
       fi
     fi
   fi
@@ -460,7 +637,7 @@ version_controlled_file() {
   found=no
   if test -d CVS; then
     grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
-	     grep '^/[^/]*/[0-9]' > /dev/null && found=yes
+             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
     git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
   elif test -d .svn; then
@@ -482,35 +659,35 @@ slurp() {
       esac
       test -d $1/$dir/$file && continue
       for excluded_file in $excluded_files; do
-	test "$dir/$file" = "$excluded_file" && continue 2
+        test "$dir/$file" = "$excluded_file" && continue 2
       done
-      if test $file = Makefile.am; then
+      if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
         copied=$copied${sep}$gnulib_mk; sep=$nl
-	remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
-	  echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
-	  rm -f $dir/$gnulib_mk &&
-	  sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
-	}
+        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+        sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null || {
+          echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+          rm -f $dir/$gnulib_mk &&
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+        }
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
-	   version_controlled_file $dir $file; then
-	echo "$0: $dir/$file overrides $1/$dir/$file"
+           version_controlled_file $dir $file; then
+        echo "$0: $dir/$file overrides $1/$dir/$file"
       else
-	copied=$copied$sep$file; sep=$nl
-	if test $file = gettext.m4; then
-	  echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
-	  rm -f $dir/$file
-	  sed '
-	    /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-	      AC_DEFUN([AM_INTL_SUBDIR], [
-	    /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-	      AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-	    $a\
-	      AC_DEFUN([gl_LOCK_EARLY], [])
-	  ' $1/$dir/$file >$dir/$file
-	else
-	  cp_mark_as_generated $1/$dir/$file $dir/$file
-	fi
+        copied=$copied$sep$file; sep=$nl
+        if test $file = gettext.m4; then
+          echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
+          rm -f $dir/$file
+          sed '
+            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+              AC_DEFUN([AM_INTL_SUBDIR], [])
+            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
+            $a\
+              AC_DEFUN([gl_LOCK_EARLY], [])
+          ' $1/$dir/$file >$dir/$file
+        else
+          cp_mark_as_generated $1/$dir/$file $dir/$file
+        fi
       fi || exit
     done
 
@@ -518,18 +695,18 @@ slurp() {
       test $dot_ig = x && continue
       ig=$dir/$dot_ig
       if test -n "$copied"; then
-	insert_sorted_if_absent $ig "$copied"
-	# If an ignored file name ends with .in.h, then also add
-	# the name with just ".h".  Many gnulib headers are generated,
-	# e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
-	# Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-	f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
-	insert_sorted_if_absent $ig "$f"
-
-	# For files like sys_stat.in.h and sys_time.in.h, record as
-	# ignorable the directory we might eventually create: sys/.
-	f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-	insert_sorted_if_absent $ig "$f"
+        insert_sorted_if_absent $ig "$copied"
+        # If an ignored file name ends with .in.h, then also add
+        # the name with just ".h".  Many gnulib headers are generated,
+        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+        f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+        insert_sorted_if_absent $ig "$f"
+
+        # For files like sys_stat.in.h and sys_time.in.h, record as
+        # ignorable the directory we might eventually create: sys/.
+        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
+        insert_sorted_if_absent $ig "$f"
       fi
     done
   done
@@ -569,9 +746,9 @@ grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
     with_gettext=no
 
 if test $with_gettext = yes; then
-  echo "$0: (cd $bt2; autopoint) ..."
+  echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
   cp configure.ac $bt2 &&
-  (cd $bt2 && autopoint && rm configure.ac) &&
+  (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
   slurp $bt2 $bt || exit
 fi
 rm -fr $bt $bt2 || exit
@@ -590,13 +767,16 @@ find "$m4_base" "$source_base" \
 
 # Reconfigure, getting other files.
 
-aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am`
+# Skip autoheader if it's not needed.
+grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
+  AUTOHEADER=true
+
 for command in \
   libtool \
-  "aclocal --force $aclocal_flags" \
-  'autoconf --force' \
-  'autoheader --force' \
-  'automake --add-missing --copy --force-missing';
+  "${ACLOCAL-aclocal} --force -I m4" \
+  "${AUTOCONF-autoconf} --force" \
+  "${AUTOHEADER-autoheader} --force" \
+  "${AUTOMAKE-automake} --add-missing --copy --force-missing"
 do
   if test "$command" = libtool; then
     use_libtool=0
@@ -609,7 +789,7 @@ do
       && use_libtool=1
     test $use_libtool = 0 \
       && continue
-    command='libtoolize -c -f'
+    command="${LIBTOOLIZE-libtoolize} -c -f"
   fi
   echo "$0: $command ..."
   $command || exit
@@ -632,11 +812,12 @@ if test $with_gettext = yes; then
   rm -f po/Makevars
   sed '
     /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-    /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
+    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
     /^XGETTEXT_OPTIONS *=/{
       s/$/ \\/
       a\
-	  '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
   ' po/Makevars.template >po/Makevars
 
@@ -648,9 +829,9 @@ if test $with_gettext = yes; then
       /^subdir *=.*/s/=.*/= runtime-po/
       /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
       /^XGETTEXT_OPTIONS *=/{
-	s/$/ \\/
-	a\
-	    '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+        s/$/ \\/
+        a\
+            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
       }
     ' <po/Makevars.template >runtime-po/Makevars
 
@@ -659,4 +840,14 @@ if test $with_gettext = yes; then
   fi
 fi
 
+bootstrap_epilogue
+
 echo "$0: done.  Now you can run './configure'."
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap |  433 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 312 insertions(+), 121 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun Mar 14 11:38:21 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NqptU-0002Z4-NH
	for mharc-myserver-commit@gnu.org; Sun, 14 Mar 2010 11:38:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NqptT-0002Yc-GM
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:38:19 -0400
Received: from [140.186.70.92] (port=49845 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NqptR-0002Xg-OX
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:38:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NqptP-00067G-25
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:38:17 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:52422)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NqptO-000679-Mk
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 11:38:15 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o2EFcD92022837
	for <myserver-commit@gnu.org>; Sun, 14 Mar 2010 16:38:13 +0100
Message-Id: <201003141538.o2EFcD92022837@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Sun, 14 Mar 2010 16:38:13 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Sun, 14 Mar 2010 16:38:13 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:tarball build
	325173 FAILED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Mar 2010 15:38:19 -0000

Hi,

This is to let you know that Hydra build 325173 of job gnu:myserver-master:tarball has changed from SUCCEEDED to FAILED.

Complete build information can be found on this page: http://hydra.nixos.org/build/325173

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 325173
Nix name:              | myserver-tarball-0pre3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/v52svwj3s3bdwlmvqh5aikc74fqn1rmy-myserver-tarball-0pre3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4.drv
Output store path:     | /nix/store/pqmwywxbqpzpsf2zw7x1lijc93v949ry-myserver-tarball-0pre3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4
Time added:            | 2010-03-14 16:38:13
Build started:         | 2010-03-14 16:37:25
Build finished:        | 2010-03-14 16:38:13
Duration:              | 48s

The build inputs were:

Name        | Type | Value
------------+------+---------------------------------------------------------------------------
myserverSrc | git  | git://git.sv.gnu.org/myserver.git:3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4
hydraConfig | svn  | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20615
nixpkgs     | svn  | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20614

Regards,

The Hydra build daemon.

---
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/c-strtod.h' -> `../gnulib/lib/c-strtod.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/argp-fs-xinl.c' -> `../gnulib/lib/argp-fs-xinl.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/hash-triple.h' -> `../gnulib/lib/hash-triple.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/round.c' -> `../gnulib/lib/round.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/arctwo.h' -> `../gnulib/lib/arctwo.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/readline.h' -> `../gnulib/lib/readline.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/vsnprintf.c' -> `../gnulib/lib/vsnprintf.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/mknodat.c' -> `../gnulib/lib/mknodat.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/findprog-lgpl.c' -> `../gnulib/lib/findprog-lgpl.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/mbscspn.c' -> `../gnulib/lib/mbscspn.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/memmem.c' -> `../gnulib/lib/memmem.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/spawnattr_init.c' -> `../gnulib/lib/spawnattr_init.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/posixver.h' -> `../gnulib/lib/posixver.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/closein.h' -> `../gnulib/lib/closein.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/fatal-signal.h' -> `../gnulib/lib/fatal-signal.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/printf-frexpl.c' -> `../gnulib/lib/printf-frexpl.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/gettimeofday.c' -> `../gnulib/lib/gettimeofday.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/gl_rbtree_oset.h' -> `../gnulib/lib/gl_rbtree_oset.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/c-strcaseeq.h' -> `../gnulib/lib/c-strcaseeq.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/file-set.c' -> `../gnulib/lib/file-set.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/filevercmp.c' -> `../gnulib/lib/filevercmp.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/glob.c' -> `../gnulib/lib/glob.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/tanl.c' -> `../gnulib/lib/tanl.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/sincosl.c' -> `../gnulib/lib/sincosl.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/openat.c' -> `../gnulib/lib/openat.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/savewd.h' -> `../gnulib/lib/savewd.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/fseeko.c' -> `../gnulib/lib/fseeko.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/inttostr.c' -> `../gnulib/lib/inttostr.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/fprintftime.c' -> `../gnulib/lib/fprintftime.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/expl.c' -> `../gnulib/lib/expl.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/memcoll.h' -> `../gnulib/lib/memcoll.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/memset.c' -> `../gnulib/lib/memset.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/truncf.c' -> `../gnulib/lib/truncf.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/mbsinit.c' -> `../gnulib/lib/mbsinit.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/mkfifoat.c' -> `../gnulib/lib/mkfifoat.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/full-read.c' -> `../gnulib/lib/full-read.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/getopt.in.h' -> `../gnulib/lib/getopt.in.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/xmemdup0.c' -> `../gnulib/lib/xmemdup0.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/alloca.c' -> `../gnulib/lib/alloca.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/mbmemcasecoll.c' -> `../gnulib/lib/mbmemcasecoll.c'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/gl_anytreehash_list1.h' -> `../gnulib/lib/gl_anytreehash_list1.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/stdlib--.h' -> `../gnulib/lib/stdlib--.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/concat-filename.h' -> `../gnulib/lib/concat-filename.h'
`/nix/store/k3nkmkqdi1ja641xnf2cbqh5zi8izzv4-git-export/lib/at-func.c' -> `../gnulib/lib/at-func.c'
./bootstrap: Bootstrapping from a non-checked-out distribution is risky.
[q[qbuild time elapsed:  0m0.025s 0m0.008s 0m0.079s 0m0.361s
builder for `/nix/store/v52svwj3s3bdwlmvqh5aikc74fqn1rmy-myserver-tarball-0pre3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4.drv' failed with exit code 1
error: build of `/nix/store/v52svwj3s3bdwlmvqh5aikc74fqn1rmy-myserver-tarball-0pre3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4.drv' failed
Shared connection to kenny closed.

build of `/nix/store/v52svwj3s3bdwlmvqh5aikc74fqn1rmy-myserver-tarball-0pre3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4.drv' on `buildfarm@kenny' failed with exit code 256



From MAILER-DAEMON Sun Mar 14 15:45:57 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nqtl6-0004uD-Vp
	for mharc-myserver-commit@gnu.org; Sun, 14 Mar 2010 15:45:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nqtl4-0004tx-I5
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:45:54 -0400
Received: from [140.186.70.92] (port=36911 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nqtl2-0004tp-OS
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:45:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nqtl1-00016a-OW
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:45:52 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:42171
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nqtl1-00016W-M3
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:45:51 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nqtl1-0008Om-JS
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 19:45:51 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Nqtl0-0000cI-1c
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 19:45:51 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4
X-Git-Newrev: 80f9b82ddb239eae82dced5882892e1fcc70792c
Message-Id: <E1Nqtl0-0000cI-1c@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 14 Mar 2010 19:45:50 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-70-g80f9b82
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Mar 2010 19:45:54 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  80f9b82ddb239eae82dced5882892e1fcc70792c (commit)
      from  3e6b52dbc05dcd8af19a2faa2b35970aae7e20e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 80f9b82ddb239eae82dced5882892e1fcc70792c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Mar 14 20:46:13 2010 +0100

    Remove check from `bootstrap'.

diff --git a/myserver/bootstrap b/myserver/bootstrap
index 365a3d9..8b26de3 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -240,11 +240,6 @@ do
   esac
 done
 
-if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
-  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
-  exit 1
-fi
-
 # If $STR is not already on a line by itself in $FILE, insert it,
 # sorting the new contents of the file and replacing $FILE with the result.
 insert_sorted_if_absent() {

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun Mar 14 15:51:00 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nqtq0-0006s6-6d
	for mharc-myserver-commit@gnu.org; Sun, 14 Mar 2010 15:51:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nqtpz-0006rR-Ap
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:50:59 -0400
Received: from [140.186.70.92] (port=57116 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nqtpx-0006qk-To
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:50:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Nqtpv-0001Ut-6r
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:50:57 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:52467)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Nqtpu-0001UY-LB
	for myserver-commit@gnu.org; Sun, 14 Mar 2010 15:50:55 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o2EJop6T025369
	for <myserver-commit@gnu.org>; Sun, 14 Mar 2010 20:50:51 +0100
Message-Id: <201003141950.o2EJop6T025369@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Sun, 14 Mar 2010 20:50:51 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Sun, 14 Mar 2010 20:50:51 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:tarball build
	325262 SUCCEEDED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Mar 2010 19:50:59 -0000

Hi,

This is to let you know that Hydra build 325262 of job gnu:myserver-master:tarball has changed from FAILED to SUCCEEDED.

Complete build information can be found on this page: http://hydra.nixos.org/build/325262

A summary of the build information follows:

Build ID:              | 325262
Nix name:              | myserver-tarball-0pre80f9b82ddb239eae82dced5882892e1fcc70792c
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/5zzlfv4m8h27c039marixphazzl5fbya-myserver-tarball-0pre80f9b82ddb239eae82dced5882892e1fcc70792c.drv
Output store path:     | /nix/store/wf2l5x3w5yy2q9yvr8aly9yzvknqr3bl-myserver-tarball-0pre80f9b82ddb239eae82dced5882892e1fcc70792c
Time added:            | 2010-03-14 20:50:51
Build started:         | 2010-03-14 20:47:23
Build finished:        | 2010-03-14 20:50:51
Duration:              | 208s

The build inputs were:

Name        | Type | Value
------------+------+---------------------------------------------------------------------------
myserverSrc | git  | git://git.sv.gnu.org/myserver.git:80f9b82ddb239eae82dced5882892e1fcc70792c
hydraConfig | svn  | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20616
nixpkgs     | svn  | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20614

Regards,

The Hydra build daemon.



From MAILER-DAEMON Mon Mar 15 15:42:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NrGBe-0005Xm-9u
	for mharc-myserver-commit@gnu.org; Mon, 15 Mar 2010 15:42:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NrGBb-0005Wd-T6
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:42:47 -0400
Received: from [140.186.70.92] (port=53301 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NrGBZ-0005Uf-TG
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:42:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NrGBY-0004jH-Ks
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:42:45 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39657
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NrGBY-0004jA-J2
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:42:44 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NrGBY-0000al-3g
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 19:42:44 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NrGBV-0004zM-06
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 19:42:44 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 80f9b82ddb239eae82dced5882892e1fcc70792c
X-Git-Newrev: 4f041fcb2253ffa1da86de24d5c832a9f48c2394
Message-Id: <E1NrGBV-0004zM-06@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 15 Mar 2010 19:42:41 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-71-g4f041fc
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Mar 2010 19:42:48 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  4f041fcb2253ffa1da86de24d5c832a9f48c2394 (commit)
      from  80f9b82ddb239eae82dced5882892e1fcc70792c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 4f041fcb2253ffa1da86de24d5c832a9f48c2394
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 15 20:42:56 2010 +0100

    Move class `HttpInternalException' definition in a separate file.

diff --git a/myserver/include/protocol/http/Makefile.am b/myserver/include/protocol/http/Makefile.am
index 18e4efb..d716710 100644
--- a/myserver/include/protocol/http/Makefile.am
+++ b/myserver/include/protocol/http/Makefile.am
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 httpincludedir=$(includedir)/myserver/include/protocol/http
-httpinclude_HEADERS = dyn_http_command.h dyn_http_command_manager.h dyn_http_manager.h dyn_http_manager_list.h http_data_handler.h http_data_read.h http_errors.h http.h http_header.h http_headers.h http_request.h http_req_security_domain.h http_response.h http_thread_context.h
+httpinclude_HEADERS = dyn_http_command.h dyn_http_command_manager.h \
+	dyn_http_manager.h dyn_http_manager_list.h http_data_handler.h \
+	http_data_read.h http_errors.h http.h http_header.h http_headers.h \
+	http_internal_exception.h http_request.h http_req_security_domain.h	\
+	http_response.h http_thread_context.h
 SUBDIRS = env
 
diff --git a/myserver/include/protocol/http/http_internal_exception.h b/myserver/include/protocol/http/http_internal_exception.h
new file mode 100644
index 0000000..8d01488
--- /dev/null
+++ b/myserver/include/protocol/http/http_internal_exception.h
@@ -0,0 +1,44 @@
+/* -*- mode: c++ -*- */
+/*
+  MyServer
+  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef HTTP_INTERNAL_EXCEPTION_H
+# define HTTP_INTERNAL_EXCEPTION_H
+
+# include <exception>
+
+using namespace std;
+
+class HttpInternalException : public exception
+{
+public:
+  virtual const char *what () const throw ()
+  {
+    return message;
+  }
+
+  HttpInternalException (string & str)
+  {
+    this->message = str.c_str ();
+  }
+
+private:
+  const char *message;
+};
+
+#endif
diff --git a/myserver/src/protocol/http/http.cpp b/myserver/src/protocol/http/http.cpp
index f58896c..51f3af0 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -20,6 +20,7 @@
 
 #include <include/protocol/http/http.h>
 #include <include/protocol/http/http_headers.h>
+#include <include/protocol/http/http_internal_exception.h>
 #include <include/protocol/http/http_req_security_domain.h>
 #include <include/server/server.h>
 #include <include/conf/security/security_manager.h>
@@ -63,25 +64,6 @@ extern "C"
 #endif
 }
 
-/*FIXME: Move somewhere else.  */
-class HttpInternalException : public exception
-{
-public:
-  virtual const char *what () const throw ()
-  {
-    return message;
-  }
-
-  HttpInternalException (string & str)
-  {
-    this->message = str.c_str ();
-  }
-
-private:
-  const char *message;
-};
-
-
 int HttpProtocol::loadProtocol ()
 {
   const char *data = NULL;

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/protocol/http/Makefile.am         |    6 ++-
 .../protocol/http/http_internal_exception.h}       |   51 ++++++++-----------
 myserver/src/protocol/http/http.cpp                |   20 +-------
 3 files changed, 28 insertions(+), 49 deletions(-)
 copy myserver/{src/conf/security/security_domain.cpp => include/protocol/http/http_internal_exception.h} (62%)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon Mar 15 15:53:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NrGMG-0002Nc-CK
	for mharc-myserver-commit@gnu.org; Mon, 15 Mar 2010 15:53:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NrGME-0002N1-Tq
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:53:46 -0400
Received: from [140.186.70.92] (port=38002 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NrGMD-0002MT-Dt
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:53:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NrGMC-0006Cr-6S
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:53:45 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60638
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NrGMC-0006Cl-55
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 15:53:44 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NrGMB-0000hd-EL
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 19:53:43 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NrGMB-0005Ts-9C
	for myserver-commit@gnu.org; Mon, 15 Mar 2010 19:53:43 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4f041fcb2253ffa1da86de24d5c832a9f48c2394
X-Git-Newrev: 9952d53f7c118789c12edb0bfa946b40b20ff978
Message-Id: <E1NrGMB-0005Ts-9C@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 15 Mar 2010 19:53:43 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-72-g9952d53
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Mar 2010 19:53:47 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  9952d53f7c118789c12edb0bfa946b40b20ff978 (commit)
      from  4f041fcb2253ffa1da86de24d5c832a9f48c2394 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 9952d53f7c118789c12edb0bfa946b40b20ff978
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 15 20:54:06 2010 +0100

    Remove `strcasecmp' from gnulib imported modules.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 4150eae..02a2797 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -56,7 +56,6 @@ setsockopt
 shutdown
 snprintf
 socket
-strcasecmp
 sysexits
 unlink
 write

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 19 17:05:05 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NsjNQ-0001A2-S9
	for mharc-myserver-commit@gnu.org; Fri, 19 Mar 2010 17:05:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NsjNP-00017h-3w
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:05:03 -0400
Received: from [140.186.70.92] (port=59687 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NsjNK-00010p-Rw
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:05:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NsjNH-0002y6-Da
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:04:58 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:43604
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NsjNH-0002y2-9v
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:04:55 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NsjNG-0004oq-Qf
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 21:04:54 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NsjNF-00087Q-8d
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 21:04:54 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9952d53f7c118789c12edb0bfa946b40b20ff978
X-Git-Newrev: db29a2c07c3144cc89007546c7f558905fc88d4c
Message-Id: <E1NsjNF-00087Q-8d@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 19 Mar 2010 21:04:54 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-73-gdb29a2c
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Mar 2010 21:05:03 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  db29a2c07c3144cc89007546c7f558905fc88d4c (commit)
      from  9952d53f7c118789c12edb0bfa946b40b20ff978 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit db29a2c07c3144cc89007546c7f558905fc88d4c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 19 22:05:13 2010 +0100

    Use the c++defs module from gnulib.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 02a2797..a1db223 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -31,6 +31,7 @@ close
 crypto/md5
 crypto/sha1
 connect
+c++defs
 fsync
 getcwd
 gethostname
@@ -44,6 +45,7 @@ mktime
 nproc
 open
 pipe
+read
 read-file
 readlink
 recv
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 572c3f9..b12c2aa 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -49,6 +49,8 @@ LT_INIT
 
 AC_DEFINE([WINVER], [0x0501], [WINVER])
 
+AC_DEFINE([GNULIB_NAMESPACE], [gnulib], [GNULIB_NAMESPACE])
+
 LT_INIT
 
 AC_CANONICAL_HOST
diff --git a/myserver/include/base/string/stringutils.h b/myserver/include/base/string/stringutils.h
index 214d44c..968d962 100644
--- a/myserver/include/base/string/stringutils.h
+++ b/myserver/include/base/string/stringutils.h
@@ -23,10 +23,7 @@
 # include "myserver.h"
 # include <string>
 
-extern "C"
-{
 # include <string.h>
-}
 
 using namespace std;
 
diff --git a/myserver/include/base/unix_socket/unix_socket.h b/myserver/include/base/unix_socket/unix_socket.h
index b7cedc2..dba2bc1 100644
--- a/myserver/include/base/unix_socket/unix_socket.h
+++ b/myserver/include/base/unix_socket/unix_socket.h
@@ -22,16 +22,12 @@
 # include "myserver.h"
 # include <include/base/socket/socket.h>
 
-
-extern "C"
-{
 # ifdef WIN32
-#  undef AF_UNIX //This shouldn't happen, but better be sure.
+#  undef AF_UNIX /* This shouldn't happen, but better be sure.  */
 # else
+#  include <string.h>
 #  include <sys/un.h>
 # endif
-}
-
 
 class UnixSocket: public Socket
 {
@@ -55,12 +51,7 @@ protected:
 
 private:
 # ifdef AF_UNIX
-  void makeAddrInfo (sockaddr_un *info, const char *path)
-  {
-    memset (info, 0, sizeof (struct sockaddr_un));
-    info->sun_family = AF_UNIX;
-    strcpy (info->sun_path, path);
-  }
+  void makeAddrInfo (sockaddr_un *info, const char *path);
 # endif
 };
 
diff --git a/myserver/include/protocol/ftp/ftp_lexer.h b/myserver/include/protocol/ftp/ftp_lexer.h
index 5123dbf..e85448f 100644
--- a/myserver/include/protocol/ftp/ftp_lexer.h
+++ b/myserver/include/protocol/ftp/ftp_lexer.h
@@ -97,15 +97,15 @@ typedef unsigned int flex_uint32_t;
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
-#else   /* ! __cplusplus */
+#else	/* ! __cplusplus */
 
 /* C99 requires __STDC__ to be defined as 1. */
 #if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif  /* defined (__STDC__) */
-#endif  /* ! __cplusplus */
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
 #define yyconst const
@@ -156,52 +156,52 @@ typedef size_t yy_size_t;
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
-{
-  FILE *yy_input_file;
-
-  char *yy_ch_buf;              /* input buffer */
-  char *yy_buf_pos;             /* current position in input buffer */
-
-  /* Size of input buffer in bytes, not including room for EOB
-   * characters.
-   */
-  yy_size_t yy_buf_size;
-
-  /* Number of characters read into yy_ch_buf, not including EOB
-   * characters.
-   */
-  int yy_n_chars;
-
-  /* Whether we "own" the buffer - i.e., we know we created it,
-   * and can realloc() it to grow it, and should free() it to
-   * delete it.
-   */
-  int yy_is_our_buffer;
-
-  /* Whether this is an "interactive" input source; if so, and
-   * if we're using stdio for input, then we want to use getc()
-   * instead of fread(), to make sure we stop fetching input after
-   * each newline.
-   */
-  int yy_is_interactive;
-
-  /* Whether we're considered to be at the beginning of a line.
-   * If so, '^' rules will be active on the next match, otherwise
-   * not.
-   */
-  int yy_at_bol;
-
-  int yy_bs_lineno; /**< The line count. */
-  int yy_bs_column; /**< The column count. */
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
     
-  /* Whether to try to fill the input buffer when we reach the
-   * end of it.
-   */
-  int yy_fill_buffer;
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
 
-  int yy_buffer_status;
+	int yy_buffer_status;
 
-};
+	};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
 void yyrestart (FILE *input_file ,yyscan_t yyscanner );
@@ -284,9 +284,9 @@ YYSTYPE * yyget_lval (yyscan_t yyscanner );
 
 void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
 
-YYLTYPE *yyget_lloc (yyscan_t yyscanner );
+       YYLTYPE *yyget_lloc (yyscan_t yyscanner );
     
-void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
+        void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
     
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -334,10 +334,10 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
 #define YY_DECL_IS_OURS 1
 
 extern int yylex \
-(YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
+               (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
 
-#define YY_DECL int yylex                                               \
-  (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
+#define YY_DECL int yylex \
+               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
 #endif /* !YY_DECL */
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
diff --git a/myserver/include/protocol/ftp/ftp_parser.h b/myserver/include/protocol/ftp/ftp_parser.h
index 13e0c20..ba8617b 100644
--- a/myserver/include/protocol/ftp/ftp_parser.h
+++ b/myserver/include/protocol/ftp/ftp_parser.h
@@ -3,8 +3,8 @@
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2010 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,49 +36,49 @@
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-/* Put the tokens into the symbol table, so that GDB and other debuggers
-   know about them.  */
-enum yytokentype {
-  NUMBER_FTP_ARG = 258,
-  STRING_FTP_ARG = 259,
-  CHAR_FTP_ARG = 260,
-  CRLF_FTP_SEP = 261,
-  SPACE_FTP_SEP = 262,
-  PUNCT_FTP_SEP = 263,
-  USER_FTP_COMMAND = 264,
-  PASS_FTP_COMMAND = 265,
-  QUIT_FTP_COMMAND = 266,
-  PORT_FTP_COMMAND = 267,
-  PASV_FTP_COMMAND = 268,
-  MODE_FTP_COMMAND = 269,
-  TYPE_FTP_COMMAND = 270,
-  STRU_FTP_COMMAND = 271,
-  REST_FTP_COMMAND = 272,
-  RETR_FTP_COMMAND = 273,
-  LIST_FTP_COMMAND = 274,
-  NLST_FTP_COMMAND = 275,
-  ABOR_FTP_COMMAND = 276,
-  CWD_FTP_COMMAND = 277,
-  CDUP_FTP_COMMAND = 278,
-  PWD_FTP_COMMAND = 279,
-  ALLO_FTP_COMMAND = 280,
-  STOR_FTP_COMMAND = 281,
-  STOU_FTP_COMMAND = 282,
-  DELE_FTP_COMMAND = 283,
-  APPE_FTP_COMMAND = 284,
-  MKD_FTP_COMMAND = 285,
-  RMD_FTP_COMMAND = 286,
-  RNFR_FTP_COMMAND = 287,
-  RNTO_FTP_COMMAND = 288,
-  HELP_FTP_COMMAND = 289,
-  SYST_FTP_COMMAND = 290,
-  STAT_FTP_COMMAND = 291,
-  NOOP_FTP_COMMAND = 292,
-  SITE_FTP_COMMAND = 293,
-  CHMOD_FTP_COMMAND = 294,
-  UTIME_FTP_COMMAND = 295,
-  SIZE_FTP_COMMAND = 296
-};
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     NUMBER_FTP_ARG = 258,
+     STRING_FTP_ARG = 259,
+     CHAR_FTP_ARG = 260,
+     CRLF_FTP_SEP = 261,
+     SPACE_FTP_SEP = 262,
+     PUNCT_FTP_SEP = 263,
+     USER_FTP_COMMAND = 264,
+     PASS_FTP_COMMAND = 265,
+     QUIT_FTP_COMMAND = 266,
+     PORT_FTP_COMMAND = 267,
+     PASV_FTP_COMMAND = 268,
+     MODE_FTP_COMMAND = 269,
+     TYPE_FTP_COMMAND = 270,
+     STRU_FTP_COMMAND = 271,
+     REST_FTP_COMMAND = 272,
+     RETR_FTP_COMMAND = 273,
+     LIST_FTP_COMMAND = 274,
+     NLST_FTP_COMMAND = 275,
+     ABOR_FTP_COMMAND = 276,
+     CWD_FTP_COMMAND = 277,
+     CDUP_FTP_COMMAND = 278,
+     PWD_FTP_COMMAND = 279,
+     ALLO_FTP_COMMAND = 280,
+     STOR_FTP_COMMAND = 281,
+     STOU_FTP_COMMAND = 282,
+     DELE_FTP_COMMAND = 283,
+     APPE_FTP_COMMAND = 284,
+     MKD_FTP_COMMAND = 285,
+     RMD_FTP_COMMAND = 286,
+     RNFR_FTP_COMMAND = 287,
+     RNTO_FTP_COMMAND = 288,
+     HELP_FTP_COMMAND = 289,
+     SYST_FTP_COMMAND = 290,
+     STAT_FTP_COMMAND = 291,
+     NOOP_FTP_COMMAND = 292,
+     SITE_FTP_COMMAND = 293,
+     CHMOD_FTP_COMMAND = 294,
+     UTIME_FTP_COMMAND = 295,
+     SIZE_FTP_COMMAND = 296
+   };
 #endif
 /* Tokens.  */
 #define NUMBER_FTP_ARG 258
@@ -128,18 +128,18 @@ enum yytokentype {
 typedef union YYSTYPE
 {
 
-  /* Line 1676 of yacc.c  */
-# line 15 "ftp_parser.ypp"
+/* Line 1676 of yacc.c  */
+#line 16 "ftp_parser.ypp"
 
-  int           m_nInt;
-  char          m_nChar;
-  char          m_szStr[PARSER_STR_LEN];
-  FtpHost       m_host;
+  int		m_nInt;
+  char		m_nChar;
+  char		m_szStr[PARSER_STR_LEN];
+  FtpHost 	m_host;
 
 
 
-  /* Line 1676 of yacc.c  */
-# line 143 "../../../include/protocol/ftp/ftp_parser.h"
+/* Line 1676 of yacc.c  */
+#line 143 "../../../include/protocol/ftp/ftp_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/myserver/lib/Makefile.am b/myserver/lib/Makefile.am
index 33f45d3..891dd40 100644
--- a/myserver/lib/Makefile.am
+++ b/myserver/lib/Makefile.am
@@ -47,6 +47,5 @@ GNULIB_RECVFROM=1
 GNULIB_SENDTO=1
 GNULIB_SETSOCKOPT=1
 GNULIB_SHUTDOWN=1
-GNULIB_ACCEPT4=1
 
 include gnulib.mk
diff --git a/myserver/src/base/base64/mime_utils.cpp b/myserver/src/base/base64/mime_utils.cpp
index 390fbb8..4a2bf96 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -27,9 +27,10 @@ extern "C"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 }
 
+#include <string.h>
+
 #include <include/base/string/stringutils.h>
 #include <include/base/string/securestr.h>
 
@@ -258,7 +259,7 @@ char* CBase64Utils::mimeDecodeMailHeaderField (char *s)
     if (start != NULL) alloclen +=static_cast<int>(strlen (start));
     if (rest != NULL) alloclen +=static_cast<int>(strlen (rest));
     alloclen *= sizeof (char);
-    s = (char*)realloc (s, alloclen);
+    s = (char*)gnulib::realloc (s, alloclen);
     s[0] = '\0';
     if (start != NULL)
     {
@@ -547,7 +548,7 @@ char* CQPUtils::expandBuffer (char *buffer, int UsedSize, int *BufSize,
   if (UsedSize >= *BufSize - AddVal)
   {
     *BufSize += BufAdd;
-    return (char*)realloc (buffer, *BufSize * sizeof (char));
+    return (char*)gnulib::realloc (buffer, *BufSize * sizeof (char));
   }
   return buffer;
 }
@@ -580,7 +581,7 @@ char* CQPUtils::encode (char *input)
       }
       finalresult = expandBuffer (finalresult, UsedSize, &BufSize, 0);
 
-      snprintf (mids, 3, "%X", mid);
+      gnulib::snprintf (mids, 3, "%X", mid);
 
       myserver_strupr (mids);
       *(fresult++) = '=';
diff --git a/myserver/src/base/crypt/crypt_algo_manager.cpp b/myserver/src/base/crypt/crypt_algo_manager.cpp
index f9472d7..3ee5759 100644
--- a/myserver/src/base/crypt/crypt_algo_manager.cpp
+++ b/myserver/src/base/crypt/crypt_algo_manager.cpp
@@ -106,7 +106,7 @@ CryptAlgoManager::check (const char *value, size_t valueLen, const char *result,
   CryptAlgo *f = make (algo);
   if (!f)
     {
-      snprintf (buffer, bufferLen, _("%s is not a registered algorithm"),
+      gnulib::snprintf (buffer, bufferLen, _("%s is not a registered algorithm"),
                 algo);
       throw CryptAlgoManagerException (buffer);
     }
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index d0c4eca..93fb3cf 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -99,7 +99,7 @@ int File::writeToFile (const char* buffer, u_long buffersize, u_long* nbw)
     return -1;
   }
 
-  ret = ::write (handle, buffer, buffersize);
+  ret = gnulib::write (handle, buffer, buffersize);
   if (ret < 0)
     return ret;
 
@@ -162,9 +162,9 @@ int File::openFile (const char* nfilename, u_long opt)
     flags |= O_APPEND;
 
   if (exists)
-    handle = open (filename.c_str (), O_APPEND | flags);
+    handle = gnulib::open (filename.c_str (), O_APPEND | flags);
   else
-    handle = open (filename.c_str (), O_CREAT | flags, S_IRUSR | S_IWUSR);
+    handle = gnulib::open (filename.c_str (), O_CREAT | flags, S_IRUSR | S_IWUSR);
 
   try
     {
@@ -176,7 +176,7 @@ int File::openFile (const char* nfilename, u_long opt)
           }
  
       if (opt & File::TEMPORARY)
-        if (unlink (filename.c_str ()))
+        if (gnulib::unlink (filename.c_str ()))
           {
             close ();
             return -1;
@@ -268,9 +268,9 @@ int File::close ()
   if (handle != -1)
     {
       if (opt & File::TEMPORARY_DELAYED)
-        unlink (filename.c_str ());
-      ret = fsync (handle);
-      ret |= ::close (handle);
+        gnulib::unlink (filename.c_str ());
+      ret = gnulib::fsync (handle);
+      ret |= gnulib::close (handle);
     }
 
   filename.clear ();
@@ -287,7 +287,7 @@ u_long File::getFileSize ()
 {
   u_long ret;
   struct stat fStats;
-  ret = fstat (handle, &fStats);
+  ret = gnulib::fstat (handle, &fStats);
   if (ret)
     return (u_long)(-1);
   else
@@ -357,7 +357,7 @@ int File::write (const char* buffer, u_long len, u_long *nbw)
  */
 int File::read (char* buffer, u_long buffersize, u_long* nbr)
 {
-  int ret  = ::read (handle, buffer, buffersize);
+  int ret = ::read (handle, buffer, buffersize);
   if (ret < 0)
     return ret;
 
diff --git a/myserver/src/base/file/files_utility.cpp b/myserver/src/base/file/files_utility.cpp
index 4915950..61c4a88 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -142,7 +142,7 @@ int FilesUtility::getPathRecursionLevel (const char* path)
  */
 int FilesUtility::renameFile (const char* before, const char* after)
 {
-  return rename (before, after);
+  return gnulib::rename (before, after);
 }
 
 /*!
@@ -215,7 +215,7 @@ int FilesUtility::copyFile (File& src, File& dest)
 int FilesUtility::deleteFile (const char *filename)
 {
   int ret;
-  ret = remove (filename);
+  ret = gnulib::remove (filename);
 
   if (ret && errno == ENOENT)
     ret = 0;
@@ -255,7 +255,7 @@ int FilesUtility::isLink (const char* filename)
   return 0;
 #else
   struct stat F_Stats;
-  int ret = lstat (filename, &F_Stats);
+  int ret = gnulib::lstat (filename, &F_Stats);
   if (ret < 0)
     return 0;
 
@@ -362,8 +362,8 @@ time_t FilesUtility::getLastAccTime (const char *filename)
 int FilesUtility::chown (const char* filename, string &uid, string &gid)
 {
 #ifndef WIN32
-  return ::chown (filename, Process::getUid (uid.c_str ()),
-                  Process::getGid (gid.c_str ())) ? 1 : 0;
+  return gnulib::chown (filename, Process::getUid (uid.c_str ()),
+                        Process::getGid (gid.c_str ())) ? 1 : 0;
 #endif
   return 0;
 }
@@ -574,7 +574,7 @@ int FilesUtility::getShortFileName (char *filePath, char *out, int buffersize)
  * Return non-zero on errors.
  * \param fileName The buffer to use.
  * \param size The new buffer size.
- * \param dontRealloc Don't realloc a new buffer.
+ * \param dontRealloc Don't gnulib::realloc a new buffer.
  */
 int FilesUtility::completePath (char **fileName, int *size, int dontRealloc)
 {
@@ -695,7 +695,7 @@ int FilesUtility::mkdir (const char *path)
 #ifdef WIN32
   return CreateDirectory (path, NULL) ? 0 : -1;
 #else
-  return ::mkdir (path, S_IRUSR | S_IWUSR);
+  return gnulib::mkdir (path, S_IRUSR | S_IWUSR);
 #endif
 }
 
@@ -709,7 +709,7 @@ int FilesUtility::rmdir (const char *path)
 #ifdef WIN32
   return RemoveDirectory (path) ? 0 : -1;
 #else
-  return ::rmdir (path);
+  return gnulib::rmdir (path);
 #endif
 }
 
diff --git a/myserver/src/base/mem_buff/mem_buff.cpp b/myserver/src/base/mem_buff/mem_buff.cpp
index fa4eba2..44e1e43 100644
--- a/myserver/src/base/mem_buff/mem_buff.cpp
+++ b/myserver/src/base/mem_buff/mem_buff.cpp
@@ -126,7 +126,7 @@ MemBuf::MemBuf (const void* pAdr, u_int size)
 
 /*!
  * Direct copy constructor (should only be used by the operators to
- * avoid reallocations).
+ * avoid gnulib::reallocations).
  */
 MemBuf::MemBuf (const MemBuf& srcBuf)
 {
@@ -158,7 +158,7 @@ u_int MemBuf::find (char c, u_int start)
 {
   if (start >= nSize)
     return (u_int) -1;
-  void* pFound = memchr (buffer + start, c, nSize - start);
+  void* pFound = gnulib::memchr (buffer + start, c, nSize - start);
 
   return (pFound == NULL) ? (u_int) -1 : ((char*) pFound - buffer);
 }
@@ -174,7 +174,7 @@ u_int MemBuf::find (const void* pAdr, u_int size, u_int start)
   const char* pPrev = buffer + start;
   u_int size_buf = nSize - start;
   const char* pEnd = buffer + nSize + 1;
-  while ((pLast = (char*) memchr (pPrev, first, size_buf)) != NULL)
+  while ((pLast = (char*) gnulib::memchr (pPrev, first, size_buf)) != NULL)
     {
       size_buf -= (u_int)(pLast - pPrev);
       pPrev = pLast + 1;
@@ -202,9 +202,9 @@ void MemBuf::replace (char what, char by)
 
 /*!
  * Add a buffer at the end of the internal buffer.
- * If the internal buffer isn't large enough, a reallocation is done
+ * If the internal buffer isn't large enough, a gnulib::reallocation is done
  * until nSizeLimit is reached.
- * If nSizeLimit is equal to 0, reallocation are always done.
+ * If nSizeLimit is equal to 0, gnulib::reallocation are always done.
  */
 void MemBuf::addBuffer (const void* pAdr, u_int size)
 {
@@ -330,8 +330,8 @@ int MemBuf::getPartAsString (u_int nStart, u_int nEnd, MemBuf& result)
  * at least newSize bytes, if this value is bigger than nSizeLimit
  * then the latter is used.
  *
- * If the length is smallest than the existing one, no reallocation is done.
- * if it's biggest, a reallocation is done until nSizeLimit is reached.
+ * If the length is smallest than the existing one, no gnulib::reallocation is done.
+ * if it's biggest, a gnulib::reallocation is done until nSizeLimit is reached.
  */
 void MemBuf::setRealLength (u_int newSize)
 {
@@ -361,7 +361,7 @@ void MemBuf::setRealLength (u_int newSize)
 
 /*!
  * Set the cursor in the internal buffer.
- * If the specified position is bigger than the buffer size then a reallocation
+ * If the specified position is bigger than the buffer size then a gnulib::reallocation
  * is done.
  */
 void MemBuf::setLength (u_int newSize)
diff --git a/myserver/src/base/pipe/pipe.cpp b/myserver/src/base/pipe/pipe.cpp
index bb3b5bb..62256e5 100644
--- a/myserver/src/base/pipe/pipe.cpp
+++ b/myserver/src/base/pipe/pipe.cpp
@@ -146,7 +146,7 @@ int Pipe::write (const char* buffer, u_long len, u_long *nbw)
 {
   *nbw = 0;
 #ifndef WIN32
-  int ret = ::write (handles[1], buffer, len);
+  int ret = gnulib::write (handles[1], buffer, len);
   if (ret == -1)
     {
       terminated = true;
@@ -193,9 +193,9 @@ int Pipe::close ()
   terminated = true;
 #ifndef WIN32
   if (handles[0] >= 0)
-    ::close (handles[0]);
+    gnulib::close (handles[0]);
   if (handles[1] >= 0)
-    ::close (handles[1]);
+    gnulib::close (handles[1]);
 
   handles[0] = handles[1] = -1;
 #else
@@ -234,8 +234,8 @@ private:
 void Pipe::inverted (Pipe& pipe)
 {
 #ifndef WIN32
-  pipe.handles[0] = dup (handles[1]);
-  pipe.handles[1] = dup (handles[0]);
+  pipe.handles[0] = gnulib::dup (handles[1]);
+  pipe.handles[1] = gnulib::dup (handles[0]);
   if (pipe.handles[0] < 0 || pipe.handles[1] < 0)
     {
       string err (_("Internal error"));
@@ -277,7 +277,7 @@ void Pipe::closeRead ()
   terminated = true;
 #ifndef WIN32
   if (handles[0] >= 0)
-    ::close (handles[0]);
+    gnulib::close (handles[0]);
   handles[0] = -1;
 #else
   if (readHandle >= 0)
@@ -294,7 +294,7 @@ void Pipe::closeWrite ()
   terminated = true;
 #ifndef WIN32
   if (handles[1] >= 0)
-    ::close (handles[1]);
+    gnulib::close (handles[1]);
   handles[1] = -1;
 #else
   if (writeHandle >= 0)
@@ -343,7 +343,7 @@ int Pipe::waitForData (int sec, int usec)
 
   FD_SET (handles[0], &readfds);
 
-  ret = ::select (handles[0] + 1, &readfds, NULL, NULL, &tv);
+  ret = gnulib::select (handles[0] + 1, &readfds, NULL, NULL, &tv);
 
   if (ret == -1 || ret == 0)
     return 0;
diff --git a/myserver/src/base/process/fork_server.cpp b/myserver/src/base/process/fork_server.cpp
index e0c975f..6285a07 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -207,13 +207,13 @@ int ForkServer::handleRequest (Socket *sock)
   delete [] chroot;
 
   if (flags & FLAG_USE_IN)
-    close (stdIn);
+    gnulib::close (stdIn);
 
   if (flags & FLAG_USE_OUT)
-    close (stdOut);
+    gnulib::close (stdOut);
 
   if (flags & FLAG_USE_ERR)
-    close (stdErr);
+    gnulib::close (stdErr);
 #endif
 
   return 0;
diff --git a/myserver/src/base/process/process.cpp b/myserver/src/base/process/process.cpp
index a167f6c..0f8c542 100644
--- a/myserver/src/base/process/process.cpp
+++ b/myserver/src/base/process/process.cpp
@@ -267,29 +267,28 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
         exit (1);
 
       if ((long)spi->stdOut == -1)
-        spi->stdOut = (FileHandle)open ("/dev/null", O_WRONLY);
+        spi->stdOut = gnulib::open ("/dev/null", O_WRONLY);
 
       if ((long)spi->stdError == -1)
-        spi->stdError = (FileHandle)open ("/dev/null", O_WRONLY);
+        spi->stdError = gnulib::open ("/dev/null", O_WRONLY);
 
-      close (0);
+      gnulib::close (0);
 
       if (spi->stdIn != -1)
         {
-          if (dup2 (spi->stdIn, 0) == -1)
+          if (gnulib::dup2 (spi->stdIn, 0) == -1)
             exit (1);
-          close (spi->stdIn);
+          gnulib::close (spi->stdIn);
         }
 
-      close (1);
+      gnulib::close (1);
 
-      if (dup2 (spi->stdOut, 1) == -1)
+      if (gnulib::dup2 (spi->stdOut, 1) == -1)
         exit (1);
 
+      gnulib::close (2);
 
-      close (2);
-
-      if (dup2 (spi->stdError, 2) == -1)
+      if (gnulib::dup2 (spi->stdError, 2) == -1)
         exit (1);
 
       if (spi->handlesToClose)
@@ -297,7 +296,7 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
           FileHandle* h = spi->handlesToClose;
           while (*h)
             {
-              close (*h);
+              gnulib::close (*h);
               h++;
             }
         }
diff --git a/myserver/src/base/read_directory/read_directory.cpp b/myserver/src/base/read_directory/read_directory.cpp
index 8e379b0..40d9e03 100644
--- a/myserver/src/base/read_directory/read_directory.cpp
+++ b/myserver/src/base/read_directory/read_directory.cpp
@@ -134,7 +134,7 @@ int ReadDirectory::find (const char *filename)
        if (dirName[dirName.length () - 1] == '/')
          dirName.erase (dirName.length () - 1);
 
-       dh = opendir (dirName.c_str ());
+       dh = gnulib::opendir (dirName.c_str ());
 
        if (dh == NULL)
          return -1;
@@ -158,7 +158,7 @@ int ReadDirectory::find (const char *filename)
 # endif
 
 # ifdef HAVE_FSTATAT
-   if (fstatat (dirfd (dh), name.c_str (), &stats, 0))
+   if (gnulib::fstatat (dirfd (dh), name.c_str (), &stats, 0))
      return -1;
 # else
    string tempName;
@@ -198,7 +198,7 @@ int ReadDirectory::findclose ()
   if (!dh)
     return -1;
 
-  closedir (dh);
+  gnulib::closedir (dh);
   dh = NULL;
   return 0;
 #endif
diff --git a/myserver/src/base/safetime/safetime.cpp b/myserver/src/base/safetime/safetime.cpp
index 5af463e..1d4754d 100644
--- a/myserver/src/base/safetime/safetime.cpp
+++ b/myserver/src/base/safetime/safetime.cpp
@@ -69,7 +69,7 @@ struct tm *myserver_localtime (const time_t *timep, tm* res)
   memcpy (res, localtime (timep), sizeof (tm));
   return res;
 #elif HAVE_LOCALTIME_R
-  return localtime_r (timep, res);
+  return gnulib::localtime_r (timep, res);
 #else
 
   mutex.lock ();
@@ -91,7 +91,7 @@ struct tm *myserver_gmtime (const time_t *timep, tm* res)
   return res;
 
 #elif HAVE_LOCALTIME_R
-  return gmtime_r (timep, res);
+  return gnulib::gmtime_r (timep, res);
 #else
 
   mutex.lock ();
diff --git a/myserver/src/base/socket/socket.cpp b/myserver/src/base/socket/socket.cpp
index 27b81f5..0f1409d 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -96,7 +96,7 @@ int Socket::operator=(Socket* s)
  */
 int Socket::socket (int af, int type, int protocol)
 {
-  fd = ::socket (af, type, protocol);
+  fd = gnulib::socket (af, type, protocol);
   return fd;
 }
 
@@ -170,7 +170,7 @@ int Socket::bind (MYSERVER_SOCKADDR* sa, int namelen)
       )
     return -1;
 
-  return ::bind (fd, (struct sockaddr*) sa, namelen);
+  return gnulib::bind (fd, (struct sockaddr*) sa, namelen);
 }
 
 /*!
@@ -178,7 +178,7 @@ int Socket::bind (MYSERVER_SOCKADDR* sa, int namelen)
  */
 int Socket::listen (int max)
 {
-  return ::listen (fd, max);
+  return gnulib::listen (fd, max);
 }
 
 /*!
@@ -186,8 +186,8 @@ int Socket::listen (int max)
  */
 Socket* Socket::accept (MYSERVER_SOCKADDR* sa, socklen_t* sockaddrlen)
 {
-  int acceptedHandle = ::accept (fd, (struct sockaddr *)sa,
-                                          sockaddrlen);
+  int acceptedHandle = gnulib::accept (fd, (struct sockaddr *)sa,
+                                       sockaddrlen);
 
   if (acceptedHandle >= 0)
     return new Socket ((SocketHandle) acceptedHandle);
@@ -202,7 +202,7 @@ int Socket::close ()
 {
   int ret = -1;
   if (fd >= 0)
-    ret = ::close (fd);
+    ret = gnulib::close (fd);
 
   fd = -1;
   return ret;
@@ -229,7 +229,7 @@ MYSERVER_HOSTENT *Socket::gethostbyname (const char *hostname)
  */
 int Socket::shutdown (int how)
 {
-  return ::shutdown (fd, how);
+  return gnulib::shutdown (fd, how);
 }
 
 /*!
@@ -238,7 +238,7 @@ int Socket::shutdown (int how)
 int  Socket::setsockopt (int level, int optname,
                        const char *optval, int optlen)
 {
-  return ::setsockopt (fd, level, optname, optval, optlen);
+  return gnulib::setsockopt (fd, level, optname, optval, optlen);
 }
 
 /*!
@@ -322,7 +322,7 @@ int Socket::getLocalIPsList (string &out)
  */
 int Socket::rawSend (const char* buffer, int len, int flags)
 {
-  return ::send (fd, buffer, len, flags);
+  return gnulib::send (fd, buffer, len, flags);
 }
 
 /*!
@@ -375,7 +375,7 @@ int Socket::send (const char* buffer, int len, int flags)
  */
 int Socket::ioctlsocket (long cmd, unsigned long* argp)
 {
-  return ::ioctl (fd, cmd, argp);
+  return gnulib::ioctl (fd, cmd, argp);
 }
 
 /*!
@@ -411,7 +411,7 @@ int Socket::connect (const char* host, u_short port)
     }
 
   memset (szPort, 0, sizeof (char)*10);
-  snprintf (szPort, 10, "%d", port);
+  gnulib::snprintf (szPort, 10, "%d", port);
 
   if (aiHints.ai_family != 0)
     nGetaddrinfoRet = getaddrinfo (host, NULL, &aiHints, &pHostInfo);
@@ -523,7 +523,7 @@ int Socket::connect (MYSERVER_SOCKADDR* sa, int na)
  )
     return -1;
 
-  return ::connect (fd, (sockaddr *) sa, na);
+  return gnulib::connect (fd, (sockaddr *) sa, na);
 }
 
 /*!
@@ -550,7 +550,7 @@ int Socket::recv (char* buffer,int len,int flags)
 {
   int err = 0;
 
-  err = ::recv (fd, buffer, len, flags);
+  err = gnulib::recv (fd, buffer, len, flags);
 
   if ( err < 0 && errno == EAGAIN && isNonBlocking)
     return 0;
@@ -595,7 +595,7 @@ int Socket::setNonBlocking (int nonBlocking)
   u_long nonblock = nonBlocking ? 1 : 0;
   ret = ioctlsocket (FIONBIO, &nonblock);
 #else
-  flags = fcntl (fd, F_GETFL, 0);
+  flags = gnulib::fcntl (fd, F_GETFL, 0);
   if (flags < 0)
     return -1;
 
@@ -604,7 +604,7 @@ int Socket::setNonBlocking (int nonBlocking)
   else
     flags &= ~O_NONBLOCK;
 
-  ret = fcntl (fd, F_SETFL, flags);
+  ret = gnulib::fcntl (fd, F_SETFL, flags);
 
   isNonBlocking = nonBlocking ? true : false;
 #endif
@@ -617,7 +617,7 @@ int Socket::setNonBlocking (int nonBlocking)
  */
 int Socket::gethostname (char *name, int namelen)
 {
-  return ::gethostname (name,namelen);
+  return gnulib::gethostname (name,namelen);
 }
 
 /*!
@@ -626,7 +626,7 @@ int Socket::gethostname (char *name, int namelen)
 int Socket::getsockname (MYSERVER_SOCKADDR *ad, int *namelen)
 {
   socklen_t len =(socklen_t) *namelen;
-  int ret = ::getsockname (fd, (struct sockaddr *)ad, &len);
+  int ret = gnulib::getsockname (fd, (struct sockaddr *)ad, &len);
   *namelen = (int)len;
   return ret;
 }
@@ -661,7 +661,7 @@ int Socket::dataAvailable (int sec, int usec)
   FD_ZERO (&readfds);
   FD_SET (fd, &readfds);
 
-  ret = ::select (fd + 1, &readfds, NULL, NULL, &tv);
+  ret = gnulib::select (fd + 1, &readfds, NULL, NULL, &tv);
   if (ret <= 0)
     return 0;
 
diff --git a/myserver/src/base/socket/ssl_socket.cpp b/myserver/src/base/socket/ssl_socket.cpp
index ceca2cf..d6e25e8 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -89,7 +89,7 @@ int SslSocket::shutdown (int how)
   if (sslConnection)
     SSL_shutdown (sslConnection);
 
-  return ::shutdown (fd, how);
+  return gnulib::shutdown (fd, how);
 }
 
 /*!
@@ -133,7 +133,7 @@ int SslSocket::connect (MYSERVER_SOCKADDR* sa, int na)
     return -1;
 
   /*! Do the TCP connection.  */
-  if (::connect (fd, (sockaddr *) sa, na))
+  if (gnulib::connect (fd, (sockaddr *) sa, na))
     {
       SSL_CTX_free (sslContext);
       sslContext = 0;
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index e175b86..f3b7c43 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -36,7 +36,11 @@ extern "C"
 # endif
 # include <gcrypt.h>
 # if HAVE_PTHREAD
+  /* Hack.  */
+# undef malloc
+# define malloc gnulib::malloc
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
+# undef malloc
 # endif
 #endif
 }
diff --git a/myserver/src/base/string/stringutils.cpp b/myserver/src/base/string/stringutils.cpp
index f14c505..c5c3061 100644
--- a/myserver/src/base/string/stringutils.cpp
+++ b/myserver/src/base/string/stringutils.cpp
@@ -311,7 +311,7 @@ time_t getTime (const char* str)
 
   t.tm_isdst = -1;
 
-  return mktime (&t);
+  return gnulib::mktime (&t);
 }
 
 /*!
diff --git a/myserver/src/base/sync/event.cpp b/myserver/src/base/sync/event.cpp
index f93b588..1db107d 100644
--- a/myserver/src/base/sync/event.cpp
+++ b/myserver/src/base/sync/event.cpp
@@ -96,7 +96,7 @@ int Event::wait (u_long id, u_long timeout)
   {
     struct timespec ts;
     struct timeval tp;
-    gettimeofday (&tp, NULL);
+    gnulib::gettimeofday (&tp, NULL);
     ts.tv_sec = tp.tv_sec + tp.tv_usec / 1000000 + timeout / 1000;
     ts.tv_nsec = (tp.tv_usec * 1000 + timeout * 1000000) % 1000000000;
 
diff --git a/myserver/src/base/unix_socket/unix_socket.cpp b/myserver/src/base/unix_socket/unix_socket.cpp
index e16eec5..3e76fc3 100644
--- a/myserver/src/base/unix_socket/unix_socket.cpp
+++ b/myserver/src/base/unix_socket/unix_socket.cpp
@@ -20,6 +20,16 @@
 #include <include/base/unix_socket/unix_socket.h>
 #include <include/base/utility.h>
 
+#ifdef AF_UNIX
+void UnixSocket::makeAddrInfo (sockaddr_un *info, const char *path)
+{
+  memset (info, 0, sizeof (struct sockaddr_un));
+  info->sun_family = AF_UNIX;
+  strcpy (info->sun_path, path);
+}
+#endif
+
+
 UnixSocket::UnixSocket ()
 {
 
@@ -42,7 +52,7 @@ int UnixSocket::bind (const char* path)
 
 #ifdef AF_UNIX
   makeAddrInfo (&addr, path);
-  unlink (path);
+  gnulib::unlink (path);
 
   return Socket::bind ((MYSERVER_SOCKADDR*) &addr, sizeof (sockaddr_un));
 #else
@@ -58,7 +68,7 @@ int UnixSocket::shutdown ()
 {
 #ifdef AF_UNIX
   Socket::shutdown (2);
-  return unlink (addr.sun_path);
+  return gnulib::unlink (addr.sun_path);
 #else
   return -1;
 #endif
diff --git a/myserver/src/base/utility.cpp b/myserver/src/base/utility.cpp
index a235e3d..cca09f1 100644
--- a/myserver/src/base/utility.cpp
+++ b/myserver/src/base/utility.cpp
@@ -69,7 +69,7 @@ static int initializeCwd ()
   if (currentPath)
     return 0;
 
-  currentPath = getcwd (NULL, 0);
+  currentPath = gnulib::getcwd (NULL, 0);
   if (!currentPath)
     return -1;
 
@@ -144,7 +144,7 @@ char *getdefaultwd (char *path, int len)
 int setcwd (const char *dir)
 {
   int ret;
-  char *tmp = strdup (dir);
+  char *tmp = gnulib::strdup (dir);
   if (!tmp)
     return -1;
 
@@ -203,7 +203,7 @@ u_long getTicks ()
   return GetTickCount ();
 #else
   struct timeval tval;
-  int ret = gettimeofday (&tval, 0);
+  int ret = gnulib::gettimeofday (&tval, 0);
   if (ret == -1)
     return 0;
   return  (tval.tv_sec * 1000) + (tval.tv_usec / 1000);
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 615157f..dc487c3 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -107,13 +107,12 @@ void registerSignals ()
   sig1.sa_handler = SIG_IGN;
   sig2.sa_handler = Sig_Quit;
   sig3.sa_handler = Sig_Hup;
-  sigaction (SIGPIPE, &sig1, NULL);
-  sigaction (SIGINT, &sig2, NULL);
-  sigaction (SIGTERM, &sig2, NULL);
-  sigaction (SIGHUP, &sig3, NULL);
-
+  gnulib::sigaction (SIGPIPE, &sig1, NULL);
+  gnulib::sigaction (SIGINT, &sig2, NULL);
+  gnulib::sigaction (SIGTERM, &sig2, NULL);
+  gnulib::sigaction (SIGHUP, &sig3, NULL);
   /* Avoid zombie processes.  */
-  sigaction (SIGCHLD, &sa, (struct sigaction *)NULL);
+  gnulib::sigaction (SIGCHLD, &sa, (struct sigaction *)NULL);
 #else
   SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), ENABLE_PROCESSED_INPUT);
   SetConsoleCtrlHandler ((PHANDLER_ROUTINE) SignalHandler, TRUE);
@@ -563,18 +562,18 @@ int writePidfile (const char* filename)
       file.append ("/var/run/myserver.pid");
     }
 
-  pidfile = open (filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+  pidfile = gnulib::open (filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
   if (pidfile == -1)
     return -1;
 
   sprintf (buff,"%i\n", pid);
-  ret = write (pidfile, buff, strlen (buff));
+  ret = gnulib::write (pidfile, buff, strlen (buff));
   if (ret == -1)
     {
-      close (pidfile);
+      gnulib::close (pidfile);
       return -1;
     }
-  return close (pidfile);
+  return gnulib::close (pidfile);
 }
 #endif
 
diff --git a/myserver/src/protocol/control/control_protocol.cpp b/myserver/src/protocol/control/control_protocol.cpp
index 7bd1736..5be58f9 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -543,7 +543,7 @@ int ControlProtocol::addToLog (int retCode, ConnectionPtr con, char *buffer,
 {
   string time;
   getRFC822GMTTime (time, 32);
-  snprintf (buffer, bufferSize, "%s [%s] %s:%s:%s - %s - %i", con->getIpAddr (),
+  gnulib::snprintf (buffer, bufferSize, "%s [%s] %s:%s:%s - %s - %i", con->getIpAddr (),
             time.c_str (), header.getCommand (), header.getVersion (),
             header.getOptions (), header.getAuthLogin (), retCode);
   con->host->accessesLogWrite ("%s", buffer);
@@ -567,14 +567,14 @@ int ControlProtocol::sendResponse (char *buffer, int buffersize,
     dataLength = outFile->getFileSize ();
 
   /* Build and send the first line.  */
-  snprintf (buffer, buffersize, "/%i\r\n", errID);
+  gnulib::snprintf (buffer, buffersize, "/%i\r\n", errID);
   if (a->socket->send (buffer, strlen (buffer), 0) < 0)
     {
       a->host->warningsLogWrite (_("Control: socket error"));
       return -1;
     }
 
-  snprintf (buffer, buffersize, "/LEN %u\r\n", (u_int)dataLength);
+  gnulib::snprintf (buffer, buffersize, "/LEN %u\r\n", (u_int)dataLength);
   if (a->socket->send (buffer, strlen (buffer), 0) < 0)
     {
       a->host->warningsLogWrite (_("Control: socket error"));
@@ -671,7 +671,7 @@ int ControlProtocol::visitConnection (ConnectionPtr con, void *argP)
 
   if (arg->command == ControlProtocolVisitorArg::SHOW_CONNECTIONS)
   {
-    snprintf (arg->buffer, arg->bufferSize, "%i - %s - %i - %s - %i - %s - %s\r\n",
+    gnulib::snprintf (arg->buffer, arg->bufferSize, "%i - %s - %i - %s - %i - %s - %s\r\n",
              static_cast<int>(con->getID ()),  con->getIpAddr (),
              static_cast<int>(con->getPort ()),
              con->getLocalIpAddr (),  static_cast<int>(con->getLocalPort ()),
diff --git a/myserver/src/protocol/ftp/ftp.cpp b/myserver/src/protocol/ftp/ftp.cpp
index 10e72c9..2e1a4b9 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -58,7 +58,7 @@ void setFtpHost (FtpHost & out, const FtpHost & in)
 void setFtpHost (FtpHost & out, const char *szIn)
 {
   std::stringstream ss;
-  char *szLocalIn = strdup (szIn);
+  char *szLocalIn = gnulib::strdup (szIn);
   char *tok = strtok (szLocalIn, ",.");
   while (tok != NULL)
     {
diff --git a/myserver/src/protocol/ftp/ftp_lexer.cpp b/myserver/src/protocol/ftp/ftp_lexer.cpp
index 32602f6..f938380 100644
--- a/myserver/src/protocol/ftp/ftp_lexer.cpp
+++ b/myserver/src/protocol/ftp/ftp_lexer.cpp
@@ -1,7 +1,23 @@
 /* We need this hack to ensure myserver.h is include before any other file.  */
 #include "myserver.h"
+
+#undef fprintf
+#undef malloc
+#undef realloc
+#undef fwrite
+
+#define fprintf gnulib::fprintf
+#define fwrite gnulib::fwrite
+#define malloc gnulib::malloc
+#define realloc gnulib::realloc
+
 #include "ftp_lexer.out.cpp"
 
+#undef fprintf
+#undef fwrite
+#undef malloc
+#undef realloc
+
 /* Shutup a warning.  */
 void
 ftp_lexer_dummy ()
diff --git a/myserver/src/protocol/ftp/ftp_parser.cpp b/myserver/src/protocol/ftp/ftp_parser.cpp
index bedac40..ba64ea1 100644
--- a/myserver/src/protocol/ftp/ftp_parser.cpp
+++ b/myserver/src/protocol/ftp/ftp_parser.cpp
@@ -195,12 +195,12 @@ typedef union YYSTYPE
 {
 
 /* Line 214 of yacc.c  */
-#line 15 "ftp_parser.ypp"
+#line 16 "ftp_parser.ypp"
 
-	int		m_nInt;
-	char		m_nChar;
-	char		m_szStr[PARSER_STR_LEN];
-	FtpHost 	m_host;
+  int		m_nInt;
+  char		m_nChar;
+  char		m_szStr[PARSER_STR_LEN];
+  FtpHost 	m_host;
 
 
 
@@ -229,13 +229,14 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 /* Line 264 of yacc.c  */
-#line 22 "ftp_parser.ypp"
+#line 23 "ftp_parser.ypp"
 
+#define YYSTACK_ALLOC gnulib::malloc
 #define yyscanner pContext->getScanner()
 
 
 /* Line 264 of yacc.c  */
-#line 239 "ftp_parser.cpp"
+#line 240 "ftp_parser.cpp"
 
 #ifdef short
 # undef short
@@ -551,13 +552,13 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,    92,    92,    93,    99,   103,   107,   111,   115,   119,
-     126,   133,   137,   141,   145,   149,   153,   157,   161,   165,
-     169,   173,   177,   181,   185,   189,   193,   197,   201,   205,
-     209,   213,   217,   221,   225,   229,   233,   237,   241,   245,
-     249,   253,   256,   261,   267,   274,   285,   294,   301,   305,
-     309,   315,   319,   323,   329,   333,   337,   341,   347,   351,
-     355
+       0,    94,    94,    95,   101,   105,   109,   113,   117,   121,
+     128,   135,   139,   143,   147,   151,   155,   159,   163,   167,
+     171,   175,   179,   183,   187,   191,   195,   199,   203,   207,
+     211,   215,   219,   223,   227,   231,   235,   239,   243,   247,
+     251,   255,   258,   263,   269,   276,   287,   296,   303,   307,
+     311,   317,   321,   325,   331,   335,   339,   343,   349,   353,
+     357
 };
 #endif
 
@@ -1615,7 +1616,7 @@ yyreduce:
         case 3:
 
 /* Line 1455 of yacc.c  */
-#line 94 "ftp_parser.ypp"
+#line 96 "ftp_parser.ypp"
     {
 			pContext->computeParseLength((yyloc));
 		}
@@ -1624,7 +1625,7 @@ yyreduce:
   case 4:
 
 /* Line 1455 of yacc.c  */
-#line 100 "ftp_parser.ypp"
+#line 102 "ftp_parser.ypp"
     {
 			pContext->user((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1633,7 +1634,7 @@ yyreduce:
   case 5:
 
 /* Line 1455 of yacc.c  */
-#line 104 "ftp_parser.ypp"
+#line 106 "ftp_parser.ypp"
     {
 			pContext->password((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1642,7 +1643,7 @@ yyreduce:
   case 6:
 
 /* Line 1455 of yacc.c  */
-#line 108 "ftp_parser.ypp"
+#line 110 "ftp_parser.ypp"
     {
 		  pContext->port((yyvsp[(3) - (4)].m_host));
 		}
@@ -1651,7 +1652,7 @@ yyreduce:
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 112 "ftp_parser.ypp"
+#line 114 "ftp_parser.ypp"
     {
 		  pContext->pasv();
 		}
@@ -1660,7 +1661,7 @@ yyreduce:
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 116 "ftp_parser.ypp"
+#line 118 "ftp_parser.ypp"
     {
 		  pContext->mode((yyvsp[(3) - (4)].m_nInt));
 		}
@@ -1669,7 +1670,7 @@ yyreduce:
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 120 "ftp_parser.ypp"
+#line 122 "ftp_parser.ypp"
     {
       if ((yyvsp[(3) - (4)].m_nInt) == -1)
         pContext->ftpReply(504);
@@ -1681,7 +1682,7 @@ yyreduce:
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 127 "ftp_parser.ypp"
+#line 129 "ftp_parser.ypp"
     {
       if ((yyvsp[(3) - (6)].m_nInt) == -1 || (yyvsp[(5) - (6)].m_nInt) == -1)
         pContext->ftpReply(504);
@@ -1693,7 +1694,7 @@ yyreduce:
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 134 "ftp_parser.ypp"
+#line 136 "ftp_parser.ypp"
     {
 		  pContext->stru((yyvsp[(3) - (4)].m_nInt));
 		}
@@ -1702,7 +1703,7 @@ yyreduce:
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 138 "ftp_parser.ypp"
+#line 140 "ftp_parser.ypp"
     {
 		  pContext->rest((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1711,7 +1712,7 @@ yyreduce:
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 142 "ftp_parser.ypp"
+#line 144 "ftp_parser.ypp"
     {
 		  pContext->allo((yyvsp[(3) - (4)].m_nInt));
 		}
@@ -1720,7 +1721,7 @@ yyreduce:
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 146 "ftp_parser.ypp"
+#line 148 "ftp_parser.ypp"
     {
 		  pContext->allo((yyvsp[(3) - (8)].m_nInt), (yyvsp[(7) - (8)].m_nInt));
 		}
@@ -1729,7 +1730,7 @@ yyreduce:
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 150 "ftp_parser.ypp"
+#line 152 "ftp_parser.ypp"
     {
 		  pContext->retr((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1738,7 +1739,7 @@ yyreduce:
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 154 "ftp_parser.ypp"
+#line 156 "ftp_parser.ypp"
     {
 			pContext->abor();
 		}
@@ -1747,7 +1748,7 @@ yyreduce:
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 158 "ftp_parser.ypp"
+#line 160 "ftp_parser.ypp"
     {
 		  pContext->list();
 		}
@@ -1756,7 +1757,7 @@ yyreduce:
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 162 "ftp_parser.ypp"
+#line 164 "ftp_parser.ypp"
     {
 		  pContext->list((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1765,7 +1766,7 @@ yyreduce:
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 166 "ftp_parser.ypp"
+#line 168 "ftp_parser.ypp"
     {
 		  pContext->nlst();
 		}
@@ -1774,7 +1775,7 @@ yyreduce:
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 170 "ftp_parser.ypp"
+#line 172 "ftp_parser.ypp"
     {
 		  pContext->nlst((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1783,7 +1784,7 @@ yyreduce:
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 174 "ftp_parser.ypp"
+#line 176 "ftp_parser.ypp"
     {
 			pContext->cwd((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1792,7 +1793,7 @@ yyreduce:
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 178 "ftp_parser.ypp"
+#line 180 "ftp_parser.ypp"
     {
 			pContext->cwd("..");
 		}
@@ -1801,7 +1802,7 @@ yyreduce:
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 182 "ftp_parser.ypp"
+#line 184 "ftp_parser.ypp"
     {
 			pContext->pwd();
 		}
@@ -1810,7 +1811,7 @@ yyreduce:
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 186 "ftp_parser.ypp"
+#line 188 "ftp_parser.ypp"
     {
 			pContext->help((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1819,7 +1820,7 @@ yyreduce:
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 190 "ftp_parser.ypp"
+#line 192 "ftp_parser.ypp"
     {
 			pContext->help();
 		}
@@ -1828,7 +1829,7 @@ yyreduce:
   case 26:
 
 /* Line 1455 of yacc.c  */
-#line 194 "ftp_parser.ypp"
+#line 196 "ftp_parser.ypp"
     {
 			pContext->syst();
 		}
@@ -1837,7 +1838,7 @@ yyreduce:
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 198 "ftp_parser.ypp"
+#line 200 "ftp_parser.ypp"
     {
 			pContext->statCmd();
 		}
@@ -1846,7 +1847,7 @@ yyreduce:
   case 28:
 
 /* Line 1455 of yacc.c  */
-#line 202 "ftp_parser.ypp"
+#line 204 "ftp_parser.ypp"
     {
 			pContext->quit();
 		}
@@ -1855,7 +1856,7 @@ yyreduce:
   case 29:
 
 /* Line 1455 of yacc.c  */
-#line 206 "ftp_parser.ypp"
+#line 208 "ftp_parser.ypp"
     {
 			pContext->noop();
 		}
@@ -1864,7 +1865,7 @@ yyreduce:
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 210 "ftp_parser.ypp"
+#line 212 "ftp_parser.ypp"
     {
 			pContext->ftpReply(502);//any new commands
 		}
@@ -1873,7 +1874,7 @@ yyreduce:
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 214 "ftp_parser.ypp"
+#line 216 "ftp_parser.ypp"
     {
 			pContext->ftpReply(502);//any new commands
 		}
@@ -1882,7 +1883,7 @@ yyreduce:
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 218 "ftp_parser.ypp"
+#line 220 "ftp_parser.ypp"
     {
 			// ignore empty lines
 		}
@@ -1891,7 +1892,7 @@ yyreduce:
   case 33:
 
 /* Line 1455 of yacc.c  */
-#line 222 "ftp_parser.ypp"
+#line 224 "ftp_parser.ypp"
     {
 		  pContext->stor((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1900,7 +1901,7 @@ yyreduce:
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 226 "ftp_parser.ypp"
+#line 228 "ftp_parser.ypp"
     {
 		  pContext->stou((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1909,7 +1910,7 @@ yyreduce:
   case 35:
 
 /* Line 1455 of yacc.c  */
-#line 230 "ftp_parser.ypp"
+#line 232 "ftp_parser.ypp"
     {
 		  pContext->dele((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1918,7 +1919,7 @@ yyreduce:
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 234 "ftp_parser.ypp"
+#line 236 "ftp_parser.ypp"
     {
 		  pContext->appe((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1927,7 +1928,7 @@ yyreduce:
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 238 "ftp_parser.ypp"
+#line 240 "ftp_parser.ypp"
     {
 		  pContext->mkd((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1936,7 +1937,7 @@ yyreduce:
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 242 "ftp_parser.ypp"
+#line 244 "ftp_parser.ypp"
     {
 		  pContext->rmd((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1945,7 +1946,7 @@ yyreduce:
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 246 "ftp_parser.ypp"
+#line 248 "ftp_parser.ypp"
     {
 		  pContext->rnfr((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1954,7 +1955,7 @@ yyreduce:
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 250 "ftp_parser.ypp"
+#line 252 "ftp_parser.ypp"
     {
 		  pContext->Rnto((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -1963,7 +1964,7 @@ yyreduce:
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 254 "ftp_parser.ypp"
+#line 256 "ftp_parser.ypp"
     {
 		}
     break;
@@ -1971,7 +1972,7 @@ yyreduce:
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 257 "ftp_parser.ypp"
+#line 259 "ftp_parser.ypp"
     {
 			//pContext->Chmod($3, $5);
 			pContext->ftpReply(502);
@@ -1981,7 +1982,7 @@ yyreduce:
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 262 "ftp_parser.ypp"
+#line 264 "ftp_parser.ypp"
     {
 			//pContext->Utime($3, $5);
 			pContext->ftpReply(502);
@@ -1991,7 +1992,7 @@ yyreduce:
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 268 "ftp_parser.ypp"
+#line 270 "ftp_parser.ypp"
     {
 			pContext->size((yyvsp[(3) - (4)].m_szStr));
 		}
@@ -2000,7 +2001,7 @@ yyreduce:
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 275 "ftp_parser.ypp"
+#line 277 "ftp_parser.ypp"
     {
 		  (yyval.m_host).h1 = (yyvsp[(1) - (3)].m_host).h1;
 		  (yyval.m_host).h2 = (yyvsp[(1) - (3)].m_host).h2;
@@ -2014,7 +2015,7 @@ yyreduce:
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 286 "ftp_parser.ypp"
+#line 288 "ftp_parser.ypp"
     {
 		  (yyval.m_host).h1 = (yyvsp[(1) - (7)].m_nInt);
 		  (yyval.m_host).h2 = (yyvsp[(3) - (7)].m_nInt);
@@ -2026,7 +2027,7 @@ yyreduce:
   case 47:
 
 /* Line 1455 of yacc.c  */
-#line 295 "ftp_parser.ypp"
+#line 297 "ftp_parser.ypp"
     {
 		  (yyval.m_host).p1 = (yyvsp[(1) - (3)].m_nInt);
 		  (yyval.m_host).p2 = (yyvsp[(3) - (3)].m_nInt);
@@ -2036,7 +2037,7 @@ yyreduce:
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 302 "ftp_parser.ypp"
+#line 304 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = FtpuserData::MODE_STREAM;
 		}
@@ -2045,7 +2046,7 @@ yyreduce:
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 306 "ftp_parser.ypp"
+#line 308 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = -1;
 		}
@@ -2054,7 +2055,7 @@ yyreduce:
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 310 "ftp_parser.ypp"
+#line 312 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = -1;
 		}
@@ -2063,7 +2064,7 @@ yyreduce:
   case 51:
 
 /* Line 1455 of yacc.c  */
-#line 316 "ftp_parser.ypp"
+#line 318 "ftp_parser.ypp"
     {
 			(yyval.m_nInt) = FtpuserData::STRU_FILE;
 		}
@@ -2072,7 +2073,7 @@ yyreduce:
   case 52:
 
 /* Line 1455 of yacc.c  */
-#line 320 "ftp_parser.ypp"
+#line 322 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = -1;
 		}
@@ -2081,7 +2082,7 @@ yyreduce:
   case 53:
 
 /* Line 1455 of yacc.c  */
-#line 324 "ftp_parser.ypp"
+#line 326 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = -1;
 		}
@@ -2090,7 +2091,7 @@ yyreduce:
   case 54:
 
 /* Line 1455 of yacc.c  */
-#line 330 "ftp_parser.ypp"
+#line 332 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = FtpuserData::REPR_ASCII;
 		}
@@ -2099,7 +2100,7 @@ yyreduce:
   case 55:
 
 /* Line 1455 of yacc.c  */
-#line 334 "ftp_parser.ypp"
+#line 336 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = FtpuserData::REPR_IMAGE;
 		}
@@ -2108,7 +2109,7 @@ yyreduce:
   case 56:
 
 /* Line 1455 of yacc.c  */
-#line 338 "ftp_parser.ypp"
+#line 340 "ftp_parser.ypp"
     {
       (yyval.m_nInt) = -1;
 		}
@@ -2117,7 +2118,7 @@ yyreduce:
   case 57:
 
 /* Line 1455 of yacc.c  */
-#line 342 "ftp_parser.ypp"
+#line 344 "ftp_parser.ypp"
     {
       (yyval.m_nInt) = -1;
 		}
@@ -2126,7 +2127,7 @@ yyreduce:
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 348 "ftp_parser.ypp"
+#line 350 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = FtpuserData::NON_PRINT;
 		}
@@ -2135,7 +2136,7 @@ yyreduce:
   case 59:
 
 /* Line 1455 of yacc.c  */
-#line 352 "ftp_parser.ypp"
+#line 354 "ftp_parser.ypp"
     {
 		  (yyval.m_nInt) = -1;
 		}
@@ -2144,7 +2145,7 @@ yyreduce:
   case 60:
 
 /* Line 1455 of yacc.c  */
-#line 356 "ftp_parser.ypp"
+#line 358 "ftp_parser.ypp"
     {
       (yyval.m_nInt) = -1;
 		}
@@ -2153,7 +2154,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 2157 "ftp_parser.cpp"
+#line 2158 "ftp_parser.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2372,91 +2373,97 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 360 "ftp_parser.ypp"
+#line 362 "ftp_parser.ypp"
 
 
 int Ftp::parseControlConnection()
 {
-	if ( td.buffer == NULL || td.buffer->getBuffer() == NULL )
-		return ClientsThread::DELETE_CONNECTION;
-	FtpuserData *pFtpuserData = static_cast<FtpuserData *>(td.pConnection->protocolBuffer);
-	if ( pFtpuserData == NULL )
-		return ClientsThread::DELETE_CONNECTION;
-
-	// awaiting commands reply
-	if ( pFtpuserData->m_nFtpstate <= FtpuserData::NO_CONTROL_CONNECTION )
-	{
-		ftpReply(220);
-		pFtpuserData->m_nFtpstate = FtpuserData::CONTROL_CONNECTION_UP;
-	}
+  if (td.buffer == NULL || td.buffer->getBuffer() == NULL)
+    return ClientsThread::DELETE_CONNECTION;
 
-	MemBuf out;
-	escapeTelnet(*td.buffer, out);
-	if ( !m_bEnablePipelining )
-	{
-		MemBuf tmpBuff(out);
-		removePipelinedCmds(tmpBuff, out);
-	}
-	char *pBuffToParse = out.getBuffer();
+  FtpuserData *pFtpuserData = static_cast<FtpuserData *> (td.pConnection->protocolBuffer);
+  if (pFtpuserData == NULL)
+    return ClientsThread::DELETE_CONNECTION;
 
-	if ( pBuffToParse == NULL || td.buffersize <= td.m_nParseLength )// nothing to parse ...
-		return ClientsThread::KEEP_CONNECTION;
-	else
-		pBuffToParse += td.m_nParseLength;
-
-	yylex_init(&m_scanner);
-	yy_buffer_state *bufstate = yy_scan_string (pBuffToParse, m_scanner);
-	int nParserRet = yyparse(this);
-	yy_delete_buffer(bufstate, m_scanner);
-	yylex_destroy(m_scanner);
-	switch ( nParserRet )
-	{
-		case 0:
-			if ( pFtpuserData->m_nFtpstate == FtpuserData::NO_CONTROL_CONNECTION )
-				return ClientsThread::DELETE_CONNECTION;
-			else
-				return ClientsThread::KEEP_CONNECTION;
-		case 1:
-			// parsing failed because of invalid input!
-			return ClientsThread::DELETE_CONNECTION;
-		case 2:
-			// memory exhaustion!
-			return ClientsThread::DELETE_CONNECTION;
-	}//TODO: handle INCOMPLETE_REQUEST
-	return ClientsThread::DELETE_CONNECTION;
+  /* awaiting commands reply.  */
+  if (pFtpuserData->m_nFtpstate <= FtpuserData::NO_CONTROL_CONNECTION)
+    {
+      ftpReply (220);
+      pFtpuserData->m_nFtpstate = FtpuserData::CONTROL_CONNECTION_UP;
+    }
+
+  MemBuf out;
+  escapeTelnet (*td.buffer, out);
+  if (! m_bEnablePipelining)
+    {
+      MemBuf tmpBuff (out);
+      removePipelinedCmds (tmpBuff, out);
+    }
+  char *pBuffToParse = out.getBuffer ();
+
+  if (pBuffToParse == NULL || td.buffersize <= td.m_nParseLength )
+    return ClientsThread::KEEP_CONNECTION;
+  else
+    pBuffToParse += td.m_nParseLength;
+
+  yylex_init (&m_scanner);
+  yy_buffer_state *bufstate = yy_scan_string (pBuffToParse, m_scanner);
+  int nParserRet = yyparse (this);
+  yy_delete_buffer (bufstate, m_scanner);
+  yylex_destroy (m_scanner);
+
+  switch (nParserRet)
+    {
+    case 0:
+      if (pFtpuserData->m_nFtpstate == FtpuserData::NO_CONTROL_CONNECTION )
+        return ClientsThread::DELETE_CONNECTION;
+      else
+        return ClientsThread::KEEP_CONNECTION;
+
+    case 1:
+      /* Invalid input.  */
+      return ClientsThread::DELETE_CONNECTION;
+
+    case 2:
+      /* memory exhaustion!  */
+      return ClientsThread::DELETE_CONNECTION;
+    }
+  /*TODO: handle INCOMPLETE_REQUEST */
+  return ClientsThread::DELETE_CONNECTION;
 }
 
-u_long Ftp::computeParseLength(const YYLTYPE &location)
+u_long Ftp::computeParseLength (const YYLTYPE &location)
 {
-	if ( td.buffer == NULL )
-		return 1;
-	int nBuffLine = 1, nBuffCol = 0;
-	char *pszBuff = td.buffer->getBuffer();
-	for ( u_long i = 0; i < td.buffersize; i++ )
-	{
-		if ( pszBuff[i] == '\n' )
-		{
-			nBuffLine++;
-			nBuffCol = 0;
-		}
-		else
-			nBuffCol++;
-		if ( nBuffLine == location.last_line && nBuffCol == location.last_column )
-		{
-			td.m_nParseLength = i;
-			return 0;
-		}
-	}
-	return 1;//error
+  if (td.buffer == NULL)
+    return 1;
+
+  int nBuffLine = 1, nBuffCol = 0;
+  char *pszBuff = td.buffer->getBuffer ();
+  for (u_long i = 0; i < td.buffersize; i++)
+    {
+      if (pszBuff[i] == '\n')
+        {
+          nBuffLine++;
+          nBuffCol = 0;
+        }
+      else
+        nBuffCol++;
+      if (nBuffLine == location.last_line && nBuffCol == location.last_column)
+        {
+          td.m_nParseLength = i;
+          return 0;
+        }
+    }
+
+  return 1;
 }
 
-///////////////////////////////////////////////////////////
-// global fncs
+/* Global functions.  */
 
-void yyerror(YYLTYPE *pLoc, Ftp *pContext, const char *msg)
+void yyerror (YYLTYPE *pLoc, Ftp *pContext, const char *msg)
 {
-	if ( pContext == NULL )
-		return;
-	pContext->printError(msg);
+  if (pContext == NULL)
+    return;
+  pContext->printError (msg);
 }
 
diff --git a/myserver/src/protocol/ftp/ftp_parser.ypp b/myserver/src/protocol/ftp/ftp_parser.ypp
index 618dd09..afd0a21 100755
--- a/myserver/src/protocol/ftp/ftp_parser.ypp
+++ b/myserver/src/protocol/ftp/ftp_parser.ypp
@@ -21,6 +21,7 @@
 }
 
 %{
+#define YYSTACK_ALLOC gnulib::malloc
 #define yyscanner pContext->getScanner()
 %}
 
diff --git a/myserver/src/server/clients_thread.cpp b/myserver/src/server/clients_thread.cpp
index bc78372..903dfe6 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -102,11 +102,11 @@ DEFINE_THREAD (clients_thread, pParam)
 #ifndef WIN32
   /* Block SigTerm, SigInt, and SigPipe in threads.  */
   sigset_t sigmask;
-  sigemptyset (&sigmask);
-  sigaddset (&sigmask, SIGPIPE);
-  sigaddset (&sigmask, SIGINT);
-  sigaddset (&sigmask, SIGTERM);
-  sigprocmask (SIG_SETMASK, &sigmask, NULL);
+  gnulib::sigemptyset (&sigmask);
+  gnulib::sigaddset (&sigmask, SIGPIPE);
+  gnulib::sigaddset (&sigmask, SIGINT);
+  gnulib::sigaddset (&sigmask, SIGTERM);
+  gnulib::sigprocmask (SIG_SETMASK, &sigmask, NULL);
 #endif
   ClientsThread *ct = (ClientsThread*)pParam;
 

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf                            |    2 +
 myserver/configure.ac                              |    2 +
 myserver/include/base/string/stringutils.h         |    3 -
 myserver/include/base/unix_socket/unix_socket.h    |   15 +-
 myserver/include/protocol/ftp/ftp_lexer.h          |  102 ++++----
 myserver/include/protocol/ftp/ftp_parser.h         |  106 ++++----
 myserver/lib/Makefile.am                           |    1 -
 myserver/src/base/base64/mime_utils.cpp            |    9 +-
 myserver/src/base/crypt/crypt_algo_manager.cpp     |    2 +-
 myserver/src/base/file/file.cpp                    |   18 +-
 myserver/src/base/file/files_utility.cpp           |   16 +-
 myserver/src/base/mem_buff/mem_buff.cpp            |   16 +-
 myserver/src/base/pipe/pipe.cpp                    |   16 +-
 myserver/src/base/process/fork_server.cpp          |    6 +-
 myserver/src/base/process/process.cpp              |   21 +-
 .../src/base/read_directory/read_directory.cpp     |    6 +-
 myserver/src/base/safetime/safetime.cpp            |    4 +-
 myserver/src/base/socket/socket.cpp                |   36 ++--
 myserver/src/base/socket/ssl_socket.cpp            |    4 +-
 myserver/src/base/ssl/ssl.cpp                      |    4 +
 myserver/src/base/string/stringutils.cpp           |    2 +-
 myserver/src/base/sync/event.cpp                   |    2 +-
 myserver/src/base/unix_socket/unix_socket.cpp      |   14 +-
 myserver/src/base/utility.cpp                      |    6 +-
 myserver/src/myserver.cpp                          |   19 +-
 myserver/src/protocol/control/control_protocol.cpp |    8 +-
 myserver/src/protocol/ftp/ftp.cpp                  |    2 +-
 myserver/src/protocol/ftp/ftp_lexer.cpp            |   16 +
 myserver/src/protocol/ftp/ftp_parser.cpp           |  299 ++++++++++----------
 myserver/src/protocol/ftp/ftp_parser.ypp           |    1 +
 myserver/src/server/clients_thread.cpp             |   10 +-
 31 files changed, 398 insertions(+), 370 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 19 17:08:47 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NsjR0-0006Gt-RT
	for mharc-myserver-commit@gnu.org; Fri, 19 Mar 2010 17:08:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NsjQz-0006F2-J9
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:08:45 -0400
Received: from [140.186.70.92] (port=56329 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NsjQx-0006Cj-Ue
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:08:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NsjQv-0003Yb-Su
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:08:43 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:37635)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1NsjQv-0003YH-Kx
	for myserver-commit@gnu.org; Fri, 19 Mar 2010 17:08:41 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o2JM8dri011342
	for <myserver-commit@gnu.org>; Fri, 19 Mar 2010 23:08:39 +0100
Message-Id: <201003192208.o2JM8dri011342@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Fri, 19 Mar 2010 22:08:39 +0100
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Date: Fri, 19 Mar 2010 22:08:39 +0100
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:tarball build
	328772 FAILED
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Mar 2010 21:08:45 -0000

Hi,

This is to let you know that Hydra build 328772 of job gnu:myserver-master:tarball has changed from SUCCEEDED to FAILED.

Complete build information can be found on this page: http://hydra.nixos.org/build/328772

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 328772
Nix name:              | myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv
Output store path:     | /nix/store/bw6kjrcjbkyazlwray5jpz8q7zli961j-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c
Time added:            | 2010-03-19 22:08:39
Build started:         | 2010-03-19 22:06:27
Build finished:        | 2010-03-19 22:08:39
Duration:              | 132s

The build inputs were:

Name        | Type | Value
------------+------+---------------------------------------------------------------------------
myserverSrc | git  | git://git.sv.gnu.org/myserver.git:db29a2c07c3144cc89007546c7f558905fc88d4c
hydraConfig | svn  | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:20763
nixpkgs     | svn  | https://svn.nixos.org/repos/nix/nixpkgs/trunk:20762

Regards,

The Hydra build daemon.

---
	    if cmp myserver.1po myserver.2po >/dev/null 2>&1; then \
	      rm -f myserver.1po myserver.2po myserver.po; \
	    else \
	      rm -f myserver.1po myserver.2po ./myserver.pot && \
	      mv myserver.po ./myserver.pot; \
	    fi; \
	  else \
	    mv myserver.po ./myserver.pot; \
	  fi; \
	}[b
[qmake[3]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/po'
[q[q[pbuilding stamp-po
[3s[atest ! -f ./myserver.pot || \
	  test -z "" || make [b
[qmake[2]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/po'
[qMaking all in src
[pmake[2]: Entering directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src'
[pbuilding all-recursive
Making all in base
[pmake[3]: Entering directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src/base'
[pbuilding all-recursive
Making all in base64
[pmake[4]: Entering directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src/base/base64'
[pbuilding all-recursive
[pmake[5]: Entering directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src/base/base64'
[pbuilding mime_utils.o
  CXX    mime_utils.o
[3s[ag++ -DHAVE_CONFIG_H -I. -I../../..   -I/nix/store/3l4iggpn70brxyk4pkfpfgcsavlxwjl5-libxml2-2.7.6/include/libxml2 "-I../../../lib" -fPIC -DPIC  -c -o mime_utils.o mime_utils.cpp[b
mime_utils.cpp: In member function 'char* CBase64Utils::mimeDecodeMailHeaderField(char*)':
mime_utils.cpp:262: error: 'gnulib' has not been declared
mime_utils.cpp: In member function 'char* CQPUtils::expandBuffer(char*, int, int*, int)':
mime_utils.cpp:551: error: 'gnulib' has not been declared
mime_utils.cpp: In member function 'char* CQPUtils::encode(char*)':
mime_utils.cpp:584: error: 'gnulib' has not been declared
make[5]: *** [mime_utils.o] Error 1
make[5]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src/base/base64'
[q[qmake[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src/base/base64'
[q[qmake[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src/base'
[q[qmake[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver/src'
[q[qmake[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/tmp/nix-build-fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv-0/git-export/myserver'
[q[qmake: *** [all] Error 2
[q[q[qbuild time elapsed:  0m0.024s 0m0.013s 0m53.366s 0m28.967s
builder for `/nix/store/fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv' failed with exit code 2
error: build of `/nix/store/fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv' failed
Shared connection to kenny closed.

build of `/nix/store/fmpyabzp3aibwd8wfv5978vpw65650is-myserver-tarball-0predb29a2c07c3144cc89007546c7f558905fc88d4c.drv' on `buildfarm@kenny' failed with exit code 256



From MAILER-DAEMON Mon Mar 22 17:14:12 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ntowu-0001vN-7J
	for mharc-myserver-commit@gnu.org; Mon, 22 Mar 2010 17:14:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ntows-0001uT-Nu
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 17:14:10 -0400
Received: from [140.186.70.92] (port=43543 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ntowr-0001ta-F4
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 17:14:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ntowm-0002s6-PV
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 17:14:09 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46346
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ntowm-0002ry-M2
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 17:14:04 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ntowm-0006dy-8S
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 21:14:04 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Ntowl-0004Cv-LH
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 21:14:04 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: db29a2c07c3144cc89007546c7f558905fc88d4c
X-Git-Newrev: 26baf6943d2357a10702b1603083fa17e5c94c96
Message-Id: <E1Ntowl-0004Cv-LH@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 22 Mar 2010 21:14:03 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-74-g26baf69
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Mar 2010 21:14:11 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  26baf6943d2357a10702b1603083fa17e5c94c96 (commit)
      from  db29a2c07c3144cc89007546c7f558905fc88d4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 26baf6943d2357a10702b1603083fa17e5c94c96
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon Mar 22 21:36:39 2010 +0100

    Fix ./bootstrap

diff --git a/myserver/bootstrap b/myserver/bootstrap
index 8b26de3..b52bb00 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -404,6 +404,9 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
+if test -z $gnulib_path ; then
+    gnulib_path="gnulib"
+fi
 
 # Get gnulib files.
 
@@ -425,6 +428,7 @@ case ${GNULIB_SRCDIR--} in
 
     trap - 1 2 13 15
   fi
+
   GNULIB_SRCDIR=$gnulib_path
   ;;
 *)

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon Mar 22 19:08:43 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ntqjj-0006me-6c
	for mharc-myserver-commit@gnu.org; Mon, 22 Mar 2010 19:08:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ntqjh-0006mL-WD
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 19:08:42 -0400
Received: from [140.186.70.92] (port=43226 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ntqje-0006lk-Uz
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 19:08:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ntqjd-0004cc-Gp
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 19:08:38 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36406
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ntqjd-0004cY-Ez
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 19:08:37 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Ntqjd-00083B-9k
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 23:08:37 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Ntqja-00038Y-KQ
	for myserver-commit@gnu.org; Mon, 22 Mar 2010 23:08:37 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 26baf6943d2357a10702b1603083fa17e5c94c96
X-Git-Newrev: 5105864fac02eb602a8460a2d02e320201cd31d1
Message-Id: <E1Ntqja-00038Y-KQ@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 22 Mar 2010 23:08:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-75-g5105864
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Mar 2010 23:08:42 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  5105864fac02eb602a8460a2d02e320201cd31d1 (commit)
      from  26baf6943d2357a10702b1603083fa17e5c94c96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 5105864fac02eb602a8460a2d02e320201cd31d1
Author: Rupinder Singh <rupinder@rupinder-laptop.(none)>
Date:   Tue Mar 23 00:56:26 2010 +0530

    Set the myserver logo in the title bar

diff --git a/myserver/images/myserverlogo.png b/myserver/images/myserverlogo.png
new file mode 100644
index 0000000..43f1290
Binary files /dev/null and b/myserver/images/myserverlogo.png differ
diff --git a/myserver/src/GUI/Makefile.am b/myserver/src/GUI/Makefile.am
index a26a902..e5beccc 100644
--- a/myserver/src/GUI/Makefile.am
+++ b/myserver/src/GUI/Makefile.am
@@ -23,6 +23,7 @@ copy_files:
 if BUILD_GUI
 	cp ../../COPYING MyServer/GUI/
 	cp ../../version MyServer/GUI/
+	cp ../../images/myserverlogo.png MyServer/GUI/
 endif
 
 install:
diff --git a/myserver/src/GUI/MyServer/GUI/AboutWindow.py b/myserver/src/GUI/MyServer/GUI/AboutWindow.py
index 64376f1..2564dbf 100644
--- a/myserver/src/GUI/MyServer/GUI/AboutWindow.py
+++ b/myserver/src/GUI/MyServer/GUI/AboutWindow.py
@@ -24,6 +24,9 @@ with open(os.path.join(os.path.dirname(__file__), 'COPYING')) as file:
 with open(os.path.join(os.path.dirname(__file__), 'version')) as file:
     version = 'v' + file.read()
 
+logo = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__), 'myserverlogo.png'))
+
+
 class About():
     '''GNU MyServer Control about window.'''
 
diff --git a/myserver/src/GUI/MyServerControl b/myserver/src/GUI/MyServerControl
index 35ec92e..976f409 100755
--- a/myserver/src/GUI/MyServerControl
+++ b/myserver/src/GUI/MyServerControl
@@ -26,6 +26,7 @@ from MyServer.pycontrollib.mimetypes import MIMETypes
 from MyServer.pycontrollib.vhost import VHosts
 from MyServer.GUI import GUIConfig
 from MyServer.GUI.AboutWindow import About
+from MyServer.GUI.AboutWindow import logo
 from MyServer.GUI.ConnectionWindow import Connection
 from MyServer.GUI.DefinitionWidgets import DefinitionTable, DefinitionTreeView
 from MyServer.GUI.MIMEWidgets import MimeTable, MimeTreeView
@@ -42,6 +43,7 @@ class PyGTKControl():
         self.statusbar = gtk.Statusbar()
         self.menubar = gtk.MenuBar()
 
+        # Class for Menu Item
         class MenuItemWithStockImage(gtk.ImageMenuItem):
             '''ImageMenuItem with custom label and stock image.'''
             def __init__(self, label, stock_id):
@@ -51,6 +53,11 @@ class PyGTKControl():
                 self.set_image(gtk.image_new_from_stock(
                         stock_id, gtk.ICON_SIZE_MENU))
 
+
+        # Set logo for Main Window
+        self.window.set_icon_list(logo)
+
+        # Set up Menu Items
         file_menu_item = gtk.MenuItem('_File')
         self.menubar.append(file_menu_item)
         file_menu = gtk.Menu()
@@ -59,15 +66,15 @@ class PyGTKControl():
         file_menu.append(new_menu_item)
         new_menu = gtk.Menu()
         new_menu_item.set_submenu(new_menu)
-        new_config_menu_item = gtk.MenuItem('New server configuration')
+        new_config_menu_item = gtk.MenuItem('Server Configuration')
         new_config_menu_item.connect('activate',
                                      self.on_new_config_menu_item_activate)
         new_menu.append(new_config_menu_item)
-        new_mime_menu_item = gtk.MenuItem('New MIME configuration')
+        new_mime_menu_item = gtk.MenuItem('MIME Configuration')
         new_mime_menu_item.connect('activate',
                                    self.on_new_mime_menu_item_activate)
         new_menu.append(new_mime_menu_item)
-        new_vhost_menu_item = gtk.MenuItem('New VHost configuration')
+        new_vhost_menu_item = gtk.MenuItem('VHost Configuration')
         new_vhost_menu_item.connect('activate',
                                     self.on_new_vhost_menu_item_activate)
         new_menu.append(new_vhost_menu_item)
@@ -75,15 +82,15 @@ class PyGTKControl():
         file_menu.append(open_menu_item)
         open_menu = gtk.Menu()
         open_menu_item.set_submenu(open_menu)
-        open_config_menu_item = gtk.MenuItem('Open server configuration')
+        open_config_menu_item = gtk.MenuItem('Server Configuration')
         open_config_menu_item.connect('activate',
                                       self.on_open_config_menu_item_activate)
         open_menu.append(open_config_menu_item)
-        open_mime_menu_item = gtk.MenuItem('Open MIME configuration')
+        open_mime_menu_item = gtk.MenuItem('MIME Configuration')
         open_mime_menu_item.connect('activate',
                                     self.on_open_mime_menu_item_activate)
         open_menu.append(open_mime_menu_item)
-        open_vhost_menu_item = gtk.MenuItem('Open VHost configuration')
+        open_vhost_menu_item = gtk.MenuItem('VHost Configuration')
         open_vhost_menu_item.connect('activate',
                                      self.on_open_vhost_menu_item_activate)
         open_menu.append(open_vhost_menu_item)
@@ -91,15 +98,15 @@ class PyGTKControl():
         file_menu.append(save_menu_item)
         save_menu = gtk.Menu()
         save_menu_item.set_submenu(save_menu)
-        save_config_menu_item = gtk.MenuItem('Save server configuration')
+        save_config_menu_item = gtk.MenuItem('Save Server Configuration')
         save_config_menu_item.connect('activate',
                                       self.on_save_config_menu_item_activate)
         save_menu.append(save_config_menu_item)
-        save_mime_menu_item = gtk.MenuItem('Save MIME configuration')
+        save_mime_menu_item = gtk.MenuItem('Save MIME Configuration')
         save_mime_menu_item.connect('activate',
                                     self.on_save_mime_menu_item_activate)
         save_menu.append(save_mime_menu_item)
-        save_vhost_menu_item = gtk.MenuItem('Save VHost configuration')
+        save_vhost_menu_item = gtk.MenuItem('Save VHost Configuration')
         save_vhost_menu_item.connect('activate',
                                      self.on_save_vhost_menu_item_activate)
         save_menu.append(save_vhost_menu_item)
@@ -107,15 +114,15 @@ class PyGTKControl():
         file_menu.append(save_as_menu_item)
         save_as_menu = gtk.Menu()
         save_as_menu_item.set_submenu(save_as_menu)
-        save_as_config_menu_item = gtk.MenuItem('Save server configuration')
+        save_as_config_menu_item = gtk.MenuItem('Save server Configuration')
         save_as_config_menu_item.connect('activate',
                                          self.on_save_as_config_menu_item_activate)
         save_as_menu.append(save_as_config_menu_item)
-        save_as_mime_menu_item = gtk.MenuItem('Save MIME configuration')
+        save_as_mime_menu_item = gtk.MenuItem('Save MIME Configuration')
         save_as_mime_menu_item.connect('activate',
                                        self.on_save_as_mime_menu_item_activate)
         save_as_menu.append(save_as_mime_menu_item)
-        save_as_vhost_menu_item = gtk.MenuItem('Save VHost configuration')
+        save_as_vhost_menu_item = gtk.MenuItem('Save VHost Configuration')
         save_as_vhost_menu_item.connect('activate',
                                         self.on_save_as_vhost_menu_item_activate)
         save_as_menu.append(save_as_vhost_menu_item)
@@ -143,15 +150,15 @@ class PyGTKControl():
         remote_menu.append(get_menu_item)
         get_menu = gtk.Menu()
         get_menu_item.set_submenu(get_menu)
-        get_config_menu_item = gtk.MenuItem('Get server configuration')
+        get_config_menu_item = gtk.MenuItem('Server configuration')
         get_config_menu_item.connect('activate',
                                      self.on_get_config_menu_item_activate)
         get_menu.append(get_config_menu_item)
-        get_mime_menu_item = gtk.MenuItem('Get MIME configuration')
+        get_mime_menu_item = gtk.MenuItem('MIME configuration')
         get_mime_menu_item.connect('activate',
                                    self.on_get_mime_menu_item_activate)
         get_menu.append(get_mime_menu_item)
-        get_vhost_menu_item = gtk.MenuItem('Get VHost configuration')
+        get_vhost_menu_item = gtk.MenuItem('VHost configuration')
         get_vhost_menu_item.connect('activate',
                                     self.on_get_vhost_menu_item_activate)
         get_menu.append(get_vhost_menu_item)
@@ -159,15 +166,15 @@ class PyGTKControl():
         remote_menu.append(put_menu_item)
         put_menu = gtk.Menu()
         put_menu_item.set_submenu(put_menu)
-        put_config_menu_item = gtk.MenuItem('Put server configuration')
+        put_config_menu_item = gtk.MenuItem('Server configuration')
         put_config_menu_item.connect('activate',
                                      self.on_put_config_menu_item_activate)
         put_menu.append(put_config_menu_item)
-        put_mime_menu_item = gtk.MenuItem('Put MIME configuration')
+        put_mime_menu_item = gtk.MenuItem('MIME configuration')
         put_mime_menu_item.connect('activate',
                                    self.on_put_mime_menu_item_activate)
         put_menu.append(put_mime_menu_item)
-        put_vhost_menu_item = gtk.MenuItem('Put VHost configuration')
+        put_vhost_menu_item = gtk.MenuItem('VHost configuration')
         put_vhost_menu_item.connect('activate',
                                     self.on_put_vhost_menu_item_activate)
         put_menu.append(put_vhost_menu_item)
@@ -177,30 +184,30 @@ class PyGTKControl():
         definitions_menu = gtk.Menu()
         definitions_menu_item.set_submenu(definitions_menu)
         add_unknown_definition_menu_item = \
-            MenuItemWithStockImage('Add unknown definition', gtk.STOCK_ADD)
+            MenuItemWithStockImage('Add Unknown Definition', gtk.STOCK_ADD)
         add_unknown_definition_menu_item.connect(
             'activate',
             self.on_add_unknown_definition_menu_item_activate)
         definitions_menu.append(add_unknown_definition_menu_item)
 
-        mime_types_menu_item = gtk.MenuItem('_MIME types')
+        mime_types_menu_item = gtk.MenuItem('_MIME Types')
         self.menubar.append(mime_types_menu_item)
         mime_types_menu = gtk.Menu()
         mime_types_menu_item.set_submenu(mime_types_menu)
         add_mime_type_menu_item = MenuItemWithStockImage(
-            'Add MIME type', gtk.STOCK_ADD)
+            'Add MIME Type', gtk.STOCK_ADD)
         add_mime_type_menu_item.connect(
             'activate',
             self.on_add_mime_type_menu_item_activate)
         mime_types_menu.append(add_mime_type_menu_item)
         remove_mime_type_menu_item = MenuItemWithStockImage(
-            'Remove MIME type', gtk.STOCK_DELETE)
+            'Remove MIME Type', gtk.STOCK_DELETE)
         remove_mime_type_menu_item.connect(
             'activate',
             self.on_remove_mime_type_menu_item_activate)
         mime_types_menu.append(remove_mime_type_menu_item)
         add_definition_to_mime_menu_item = MenuItemWithStockImage(
-            'Add definition MIME type', gtk.STOCK_ADD)
+            'Add Definition MIME Type', gtk.STOCK_ADD)
         add_definition_to_mime_menu_item.connect(
             'activate',
             self.on_add_definition_to_mime_menu_item_activate)
@@ -238,7 +245,7 @@ class PyGTKControl():
         security_menu = gtk.Menu()
         security_menu_item.set_submenu(security_menu)
         save_security_menu_item = MenuItemWithStockImage(
-            'Save security', gtk.STOCK_SAVE)
+            'Save Security', gtk.STOCK_SAVE)
         save_security_menu_item.connect(
             'activate',
             self.on_save_security_menu_item_activate)
@@ -678,7 +685,7 @@ class PyGTKControl():
         panels.pack2(self.security_table, True, False)
         self.browser_table = BrowserTable(self.security_table.read_from_file)
         panels.pack1(self.browser_table, True, False)
-        
+
         self.notebook.append_page(panels, gtk.Label('File browser'))
 
         self.notebook.show_all()

-----------------------------------------------------------------------

Summary of changes:
 myserver/images/myserverlogo.png             |  Bin 0 -> 10060 bytes
 myserver/src/GUI/Makefile.am                 |    1 +
 myserver/src/GUI/MyServer/GUI/AboutWindow.py |    3 +
 myserver/src/GUI/MyServerControl             |   57 ++++++++++++++-----------
 4 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 myserver/images/myserverlogo.png


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Mar 23 18:13:00 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NuCLL-0004qc-PW
	for mharc-myserver-commit@gnu.org; Tue, 23 Mar 2010 18:12:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NuCLK-0004pp-9A
	for myserver-commit@gnu.org; Tue, 23 Mar 2010 18:12:58 -0400
Received: from [140.186.70.92] (port=56529 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NuCLI-0004ov-BY
	for myserver-commit@gnu.org; Tue, 23 Mar 2010 18:12:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NuCLH-0007tc-62
	for myserver-commit@gnu.org; Tue, 23 Mar 2010 18:12:56 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47685
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NuCLH-0007tV-4J
	for myserver-commit@gnu.org; Tue, 23 Mar 2010 18:12:55 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NuCLG-000832-L8
	for myserver-commit@gnu.org; Tue, 23 Mar 2010 22:12:54 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NuCLE-0000uJ-Hn
	for myserver-commit@gnu.org; Tue, 23 Mar 2010 22:12:54 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5105864fac02eb602a8460a2d02e320201cd31d1
X-Git-Newrev: 4fb87edf14cce994712b71d196d288c8f0b49e33
Message-Id: <E1NuCLE-0000uJ-Hn@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 23 Mar 2010 22:12:53 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-76-g4fb87ed
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Mar 2010 22:12:58 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  4fb87edf14cce994712b71d196d288c8f0b49e33 (commit)
      from  5105864fac02eb602a8460a2d02e320201cd31d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 4fb87edf14cce994712b71d196d288c8f0b49e33
Author: Rupinder Singh <rupinder@rupinder-laptop.(none)>
Date:   Wed Mar 24 02:17:48 2010 +0530

    Fix to prevent wobbling of Definition Tables upon switching data types.
    
    Also, set logo for AboutWindow and ConnectionWindow.

diff --git a/myserver/src/GUI/MyServer/GUI/AboutWindow.py b/myserver/src/GUI/MyServer/GUI/AboutWindow.py
index 2564dbf..8362d59 100644
--- a/myserver/src/GUI/MyServer/GUI/AboutWindow.py
+++ b/myserver/src/GUI/MyServer/GUI/AboutWindow.py
@@ -34,6 +34,7 @@ class About():
         self.window = gtk.AboutDialog()
         self.window.connect('response', self.on_aboutdialog_response)
         self.window.set_program_name('GNU MyServer Control')
+        self.window.set_icon_list(logo)
         self.window.set_version(version)
         self.window.set_copyright(copyright_notice)
         self.window.set_license(gpl_v3)
diff --git a/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py b/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py
index 1635e30..38ec00f 100644
--- a/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py
+++ b/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import gtk
 from MyServer.pycontrollib.controller import Controller
+from MyServer.GUI.AboutWindow import logo
 
 class Connection():
     def __init__(self, parent):
@@ -28,13 +29,16 @@ class Connection():
                                      gtk.DIALOG_DESTROY_WITH_PARENT,
                                  (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                                   gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
-        self.host_label = gtk.Label('host:')
+
+        self.window.set_icon_list(logo)
+
+        self.host_label = gtk.Label('Host:')
         self.host_entry = gtk.Entry()
-        self.port_label = gtk.Label('port:')
+        self.port_label = gtk.Label('Port:')
         self.port_entry = gtk.Entry()
-        self.username_label = gtk.Label('username:')
+        self.username_label = gtk.Label('Username:')
         self.username_entry = gtk.Entry()
-        self.password_label = gtk.Label('password:')
+        self.password_label = gtk.Label('Password:')
         self.password_entry = gtk.Entry()
         table = gtk.Table(4, 2)
         table.attach(self.host_label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
diff --git a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
index 09a353e..07023ad 100644
--- a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
@@ -167,15 +167,25 @@ class DefinitionTable(gtk.Table):
         self.string_value_field.hide()
         self.int_value_field.hide()
         self.bool_value_field.hide()
+
         if var_type == 'string':
             self.string_value_field.set_text(row[4])
             self.string_value_field.show()
+            self.set_col_spacing(1,0)
+            self.set_row_spacing(1,4)
+
         elif var_type == 'integer':
             self.int_value_field.set_value(int(row[4]))
             self.int_value_field.show()
+            self.set_col_spacing(1,66)
+            self.set_row_spacing(1,4)
+
         elif var_type == 'bool':
             self.bool_value_field.set_active(int(row[4] == 'NO'))
             self.bool_value_field.show()
+            self.set_col_spacing(1,103)
+            self.set_row_spacing(1,0)
+
         self.value_check_field.set_active(row[5])
         for attribute in row[6]:
             self.attributes_field.append((attribute, row[6][attribute], ))
diff --git a/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py b/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
index 9957fbe..9f52219 100644
--- a/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
@@ -28,7 +28,8 @@ class SecurityTree(gtk.TreeView):
                 gobject.TYPE_STRING, # tag
                 gobject.TYPE_PYOBJECT)) # object
         renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('tag')
+        column = gtk.TreeViewColumn('Tag')
+        column.set_resizable(True)
         column.pack_start(renderer)
         column.add_attribute(renderer, 'text', 0)
         self.append_column(column)
diff --git a/myserver/src/GUI/MyServerControl b/myserver/src/GUI/MyServerControl
index 976f409..839ffdf 100755
--- a/myserver/src/GUI/MyServerControl
+++ b/myserver/src/GUI/MyServerControl
@@ -25,8 +25,7 @@ from MyServer.pycontrollib.config import MyServerConfig
 from MyServer.pycontrollib.mimetypes import MIMETypes
 from MyServer.pycontrollib.vhost import VHosts
 from MyServer.GUI import GUIConfig
-from MyServer.GUI.AboutWindow import About
-from MyServer.GUI.AboutWindow import logo
+from MyServer.GUI.AboutWindow import About, logo
 from MyServer.GUI.ConnectionWindow import Connection
 from MyServer.GUI.DefinitionWidgets import DefinitionTable, DefinitionTreeView
 from MyServer.GUI.MIMEWidgets import MimeTable, MimeTreeView

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/GUI/MyServer/GUI/AboutWindow.py       |    1 +
 myserver/src/GUI/MyServer/GUI/ConnectionWindow.py  |   12 ++++++++----
 myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py |   10 ++++++++++
 myserver/src/GUI/MyServer/GUI/SecurityWidgets.py   |    3 ++-
 myserver/src/GUI/MyServerControl                   |    3 +--
 5 files changed, 22 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Mar 25 08:24:31 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Num6x-0008FH-Jk
	for mharc-myserver-commit@gnu.org; Thu, 25 Mar 2010 08:24:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Num6v-0008Ev-9P
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 08:24:29 -0400
Received: from [140.186.70.92] (port=35090 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Num6t-0008EK-Rb
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 08:24:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Num6s-0004qG-T1
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 08:24:27 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:55221
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Num6s-0004qC-RG
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 08:24:26 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Num6s-0001zU-PJ
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 12:24:26 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Num6s-0005jf-Do
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 12:24:26 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4fb87edf14cce994712b71d196d288c8f0b49e33
X-Git-Newrev: 970dc54701b4435a3b01f7cb895214bd09118d70
Message-Id: <E1Num6s-0005jf-Do@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 25 Mar 2010 12:24:26 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-77-g970dc54
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Mar 2010 12:24:29 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  970dc54701b4435a3b01f7cb895214bd09118d70 (commit)
      from  4fb87edf14cce994712b71d196d288c8f0b49e33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 970dc54701b4435a3b01f7cb895214bd09118d70
Author: Stephan Peijnik <speijnik@gmail.com>
Date:   Thu Mar 25 13:21:59 2010 +0100

    Added missing check for event.h header in configure.ac

diff --git a/myserver/configure.ac b/myserver/configure.ac
index b12c2aa..336196e 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -155,9 +155,12 @@ else
 fi
 AC_SUBST(XNET_LIB)
 
+
 AC_SEARCH_LIBS([event_add], [event event_core event_extra],,
                             [AC_MSG_ERROR([*** Cannot find libevent
                             *** libevent is required for MyServer])])
+AC_CHECK_HEADER([event.h],,[AC_MSG_ERROR([*** Cannnot find libevent header
+                            *** libevent is required for MyServer])])
 
 AC_CHECK_FUNCS(event_loopbreak,
         AC_DEFINE(EVENT_LOOPBREAK, 1,

-----------------------------------------------------------------------

Summary of changes:
 myserver/configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu Mar 25 11:38:49 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nup8z-00029o-3i
	for mharc-myserver-commit@gnu.org; Thu, 25 Mar 2010 11:38:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nup8x-00029N-Ti
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 11:38:48 -0400
Received: from [140.186.70.92] (port=55354 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nup8w-00028s-Ks
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 11:38:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nup8v-00020K-Gh
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 11:38:46 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:45154
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nup8v-00020G-Cc
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 11:38:45 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Nup8v-0004Kp-4d
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 15:38:45 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Nup8s-0007ad-N6
	for myserver-commit@gnu.org; Thu, 25 Mar 2010 15:38:45 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 970dc54701b4435a3b01f7cb895214bd09118d70
X-Git-Newrev: c6a4b34ff43f2dd1e2091f532e327e628e447b86
Message-Id: <E1Nup8s-0007ad-N6@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 25 Mar 2010 15:38:43 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-78-gc6a4b34
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Mar 2010 15:38:48 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  c6a4b34ff43f2dd1e2091f532e327e628e447b86 (commit)
      from  970dc54701b4435a3b01f7cb895214bd09118d70 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit c6a4b34ff43f2dd1e2091f532e327e628e447b86
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Mar 25 16:38:25 2010 +0100

    Remove duplicate copyright header

diff --git a/myserver/lib/Makefile.am b/myserver/lib/Makefile.am
index 891dd40..f4a6073 100644
--- a/myserver/lib/Makefile.am
+++ b/myserver/lib/Makefile.am
@@ -1,20 +1,4 @@
 # GNU MyServer
-#
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-## Makefile for gnulib/lib				-*-Makefile-*-
 
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 # 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.

-----------------------------------------------------------------------

Summary of changes:
 myserver/lib/Makefile.am |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 26 11:29:21 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvBTN-00087z-HH
	for mharc-myserver-commit@gnu.org; Fri, 26 Mar 2010 11:29:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvBTM-00087d-13
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 11:29:20 -0400
Received: from [140.186.70.92] (port=40841 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvBTK-00087J-HP
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 11:29:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvBTJ-0000v9-6Z
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 11:29:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:42466
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvBTJ-0000v5-3M
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 11:29:17 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvBTJ-0004ym-0W
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 15:29:17 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvBTI-000529-TZ
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 15:29:16 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c6a4b34ff43f2dd1e2091f532e327e628e447b86
X-Git-Newrev: f936d2902dbe22547ba185af9d5d2a52e0c9bba0
Message-Id: <E1NvBTI-000529-TZ@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 26 Mar 2010 15:29:16 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-80-gf936d29
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 15:29:20 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  f936d2902dbe22547ba185af9d5d2a52e0c9bba0 (commit)
       via  8c1399346bddef87dae5451d31f621a35c8553ca (commit)
      from  c6a4b34ff43f2dd1e2091f532e327e628e447b86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit f936d2902dbe22547ba185af9d5d2a52e0c9bba0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 26 15:47:21 2010 +0100

    Append a newline after a warning message.

diff --git a/myserver/src/conf/vhost/vhost.cpp b/myserver/src/conf/vhost/vhost.cpp
index ff69c18..4cb9fb7 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -389,7 +389,7 @@ Vhost::warningsLogWrite (const char* fmt, ...)
   va_list argptr;
   va_start (argptr, fmt);
   int ret = logManager->log (this, warningLogType, MYSERVER_LOG_MSG_INFO, true,
-                             false, fmt, argptr);
+                             true, fmt, argptr);
   va_end (argptr);
   return ret;
 }



commit 8c1399346bddef87dae5451d31f621a35c8553ca
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 26 14:54:46 2010 +0100

    Use libtool to build mscgi examples.

diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index e72617d..68806f8 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -15,24 +15,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for math_sum
+
 AM_CXXFLAGS="-I$(top_srcdir)/lib"
-lib_LIBRARIES = libmath_sum.a
-libmath_sum_a_SOURCES = math_sum.cpp
+lib_LTLIBRARIES = libmath_sum.la
+libmath_sum_la_SOURCES = math_sum.cpp
+libmath_sum_la_LDFLAGS = -avoid-version -module -shared
+libmath_sum_la_LIBADD = ../../../../src/libmyserver.a ../../../../lib/libgnu.a
+SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e '/^shrext_cmds/ !d; s/^.*="\(.*\)"/\1/'`
 
 all : all-am math_sum.mscgi
-	cp math_sum.mscgi ../../cgi-bin/
-
-
-math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
-	-rm -f math_sum.mscgi
-	$(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a  ../../../../lib/libgnu.a \
-	 $(libmath_sum_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(ZLIB_LIB)\
-	 $(XML_LIBS) $(INTLLIBS) $(LDFLAGS) -o math_sum.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
-
-install : math_sum.mscgi
-	$(INSTALL) -D 'math_sum.mscgi' '$(DESTDIR)$(prefix)/var/web/cgi-bin/math_sum.mscgi'
+	cp libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
 
+math_sum.mscgi:
+	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) \
+		$(INSTALL_STRIP_FLAG) libmath_sum.la $(abs_builddir)
 
 clean-local:
-	rm -f math_sum.mscgi
-	rm -f *.o
+	test \! -e libmath_sum.la || \
+	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall libmath_sum.la
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am b/myserver/binaries/web/cgi-src/post/Makefile.am
index 3c13919..5170515 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -15,24 +15,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for post
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
-lib_LIBRARIES = libpost.a
-libpost_a_SOURCES = post.cpp
-
-all : all-am post.mscgi
-	cp post.mscgi ../../cgi-bin/
 
+AM_CXXFLAGS="-I$(top_srcdir)/lib"
+lib_LTLIBRARIES = libpost.la
+libpost_la_SOURCES = post.cpp
+libpost_la_LDFLAGS = -avoid-version -module -shared
+libpost_la_LIBADD = ../../../../src/libmyserver.a ../../../../lib/libgnu.a
+SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e '/^shrext_cmds/ !d; s/^.*="\(.*\)"/\1/'`
 
-post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
-	-rm -f post.mscgi
-	$(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a  ../../../../lib/libgnu.a \
-	 $(libpost_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(ZLIB_LIB)\
-	 $(XML_LIBS) $(INTLLIBS) $(LDFLAGS) -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
-
-install : post.mscgi
-	$(INSTALL) -D 'post.mscgi' '$(DESTDIR)$(prefix)/var/web/cgi-bin/post.mscgi'
+all: all-am post.mscgi
+	cp libpost$(SO_EXT) ../../cgi-bin/post.mscgi
 
+post.mscgi:
+	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) \
+		$(INSTALL_STRIP_FLAG) libpost.la $(abs_builddir)
 
 clean-local:
-	rm -f post.mscgi
-	rm -f *.o
+	test \! -e libpost.la || \
+	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall libpost.la
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 336196e..cd6834a 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -35,9 +35,12 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LIBTOOL
 
 gl_EARLY
 
+AC_ENABLE_SHARED
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_USE_SYSTEM_EXTENSIONS

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |   27 ++++++++----------
 myserver/binaries/web/cgi-src/post/Makefile.am     |   29 +++++++++-----------
 myserver/configure.ac                              |    3 ++
 myserver/src/conf/vhost/vhost.cpp                  |    2 +-
 4 files changed, 29 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 26 12:15:27 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvCBz-0002Yl-Km
	for mharc-myserver-commit@gnu.org; Fri, 26 Mar 2010 12:15:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvCBx-0002Xw-Tw
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 12:15:26 -0400
Received: from [140.186.70.92] (port=42074 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvCBv-0002Wr-Fz
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 12:15:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvCBu-0008PN-Ik
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 12:15:23 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38025
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvCBu-0008PB-Ad
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 12:15:22 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvCBt-0005bu-S3
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 16:15:22 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvCBt-0007u7-Hg
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 16:15:21 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f936d2902dbe22547ba185af9d5d2a52e0c9bba0
X-Git-Newrev: 36f9ed4aa1d224808d4f290ff4cf1e62733ffe3c
Message-Id: <E1NvCBt-0007u7-Hg@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 26 Mar 2010 16:15:21 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-81-g36f9ed4
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 16:15:26 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  36f9ed4aa1d224808d4f290ff4cf1e62733ffe3c (commit)
      from  f936d2902dbe22547ba185af9d5d2a52e0c9bba0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 36f9ed4aa1d224808d4f290ff4cf1e62733ffe3c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 26 17:10:20 2010 +0100

    Fix the `TestForkServer::testExecuteProcess' test case under 64 bits systems.
    
    An u_long is not 4 bytes long under 64 bits systems, use int instead.

diff --git a/myserver/src/base/process/fork_server.cpp b/myserver/src/base/process/fork_server.cpp
index 6285a07..d3bd03a 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -97,7 +97,7 @@ int ForkServer::readInt (Socket *sock, int *dest)
  */
 int ForkServer::readString (Socket *sock, char **out)
 {
-  u_long len;
+  int len;
   u_long nbr;
 
   if (sock->read ((char*) &len, 4, &nbr) || nbr < 4)

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/base/process/fork_server.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 26 15:05:23 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvEqQ-0003BO-Rg
	for mharc-myserver-commit@gnu.org; Fri, 26 Mar 2010 15:05:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvEqO-0003AT-Vx
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 15:05:21 -0400
Received: from [140.186.70.92] (port=33115 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvEqN-00039M-DS
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 15:05:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvEqH-0007gl-Oq
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 15:05:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36814
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvEqH-0007gh-Kj
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 15:05:13 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvEqH-0007gS-EC
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 19:05:13 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvEqH-0000h1-86
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 19:05:13 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 36f9ed4aa1d224808d4f290ff4cf1e62733ffe3c
X-Git-Newrev: e53341a55415e36fb1c0d05e51c52e3e535c5b46
Message-Id: <E1NvEqH-0000h1-86@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 26 Mar 2010 19:05:13 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-82-ge53341a
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 19:05:21 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  e53341a55415e36fb1c0d05e51c52e3e535c5b46 (commit)
      from  36f9ed4aa1d224808d4f290ff4cf1e62733ffe3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit e53341a55415e36fb1c0d05e51c52e3e535c5b46
Author: Daniele Cocca <daniele.cocca@gmail.com>
Date:   Fri Mar 26 17:45:33 2010 +0100

    Removed a method which is never being used in MyServer.

diff --git a/myserver/include/base/base64/mime_utils.h b/myserver/include/base/base64/mime_utils.h
index 4fce9bf..87145e2 100644
--- a/myserver/include/base/base64/mime_utils.h
+++ b/myserver/include/base/base64/mime_utils.h
@@ -33,7 +33,6 @@ public:
   ~CBase64Utils ();
   char* decode (const char *in, int *bufsize);
   char* encode (const char *in, int bufsize);
-  char* mimeDecodeMailHeaderField (char *s);
 };
 
 class CQPUtils
diff --git a/myserver/src/base/base64/mime_utils.cpp b/myserver/src/base/base64/mime_utils.cpp
index 4a2bf96..92701f4 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -190,92 +190,6 @@ const char QpEncodeMap[] =
 
 
 
-char* CBase64Utils::mimeDecodeMailHeaderField (char *s)
-{
-
-  if (s == NULL) return s;
-  if (s[strlen (s) - 2] == '\r')
-  {
-    s[strlen (s) - 2] = '\0';
-  }
-  char *s1 = s;
-  char *rest = NULL;
-  char *start = NULL;
-  while (*s1 == ' ') s1++;
-  if (strupos (s1, (char*) "=?") > 0)
-  {
-    int startendpos =static_cast<int>(strupos (s1, (char*)"=?"));
-    start = new char[startendpos + 1];
-    strncpy (start, s, startendpos);
-    start[startendpos] = '\0';
-    s1 += startendpos;
-  }
-  if (strupos (s1, (char*) "=?") == 0)
-  {
-    int alloclen;
-    char *decodedText=0;
-    int plainpos =static_cast<int>(strupos (s1, (char*) "Q?="));
-    if (plainpos > 0)
-    {
-      plainpos += 3;
-      char *m = s1 + plainpos;
-      plainpos +=static_cast<int>(strupos (m, (char*)"?="));
-    }
-    else
-    {
-      plainpos = static_cast<int>(strupos (s1, (char*) "?="));
-    }
-    if (plainpos > 1)
-    {
-      char *mid = s1 + plainpos + 2;
-      s1[plainpos] = '\0';
-      if (strlen (mid) > 0)
-      {
-        rest = new char[strlen (mid) + 1];
-        strncpy (rest, mid,(strlen (mid) + 2));
-      }
-    }
-    if (strupos (s1, (char*) "?Q?") > 0)
-    {
-      CQPUtils qp;
-      int pos = static_cast<int>(strupos (s1, (char*) "?Q?"));
-      s1 += pos;
-      if (strlen (s1) < 4) return s;
-      s1 += 3;
-      decodedText = qp.decode (s1);
-    }
-    if (strupos (s1, (char*) "?B?") > 0)
-    {
-      CBase64Utils bu;
-      int sLen;
-      int pos = static_cast<int>(strupos (s1, (char*) "?B?"));
-      s1 += pos;
-      if (strlen (s1) < 4) return s;
-      s1 += 3;
-      sLen = static_cast<int>(strlen (s1));
-      decodedText = bu.decode (s1, &sLen);
-    }
-    alloclen =static_cast<int>(strlen (decodedText)) + 1;
-    if (start != NULL) alloclen +=static_cast<int>(strlen (start));
-    if (rest != NULL) alloclen +=static_cast<int>(strlen (rest));
-    alloclen *= sizeof (char);
-    s = (char*)gnulib::realloc (s, alloclen);
-    s[0] = '\0';
-    if (start != NULL)
-    {
-      strncat (s, start, strlen (s));
-    }
-    strncat (s, decodedText, strlen (s));
-    if (rest != NULL)
-    {
-      strncat (s, rest, strlen (s));
-    }
-    delete [] decodedText;
-  }
-  return s;
-}
-
-
 CBase64Utils::CBase64Utils ()
 {
   ErrorCode = 0;

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/base64/mime_utils.h |    1 -
 myserver/src/base/base64/mime_utils.cpp   |   86 -----------------------------
 2 files changed, 0 insertions(+), 87 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 26 16:56:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvGaI-0003mx-G5
	for mharc-myserver-commit@gnu.org; Fri, 26 Mar 2010 16:56:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvGaG-0003m5-Mk
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 16:56:48 -0400
Received: from [140.186.70.92] (port=33625 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvGPM-0007gU-NQ
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 16:45:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvGPL-0003S1-EA
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 16:45:32 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46709
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvGPL-0003Rw-A7
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 16:45:31 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvGPK-0000Tn-U8
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 20:45:30 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvGPJ-0005YQ-5H
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 20:45:30 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e53341a55415e36fb1c0d05e51c52e3e535c5b46
X-Git-Newrev: 17d5520c9b4b7d3dff94c730b1095f2fec4e2cda
Message-Id: <E1NvGPJ-0005YQ-5H@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 26 Mar 2010 20:45:30 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-83-g17d5520
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Mar 2010 20:56:49 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  17d5520c9b4b7d3dff94c730b1095f2fec4e2cda (commit)
      from  e53341a55415e36fb1c0d05e51c52e3e535c5b46 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 17d5520c9b4b7d3dff94c730b1095f2fec4e2cda
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 26 21:46:03 2010 +0100

    Ensure the .mscgi module is built before attempt to copy it.

diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 68806f8..85d7d6d 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -23,13 +23,16 @@ libmath_sum_la_LDFLAGS = -avoid-version -module -shared
 libmath_sum_la_LIBADD = ../../../../src/libmyserver.a ../../../../lib/libgnu.a
 SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e '/^shrext_cmds/ !d; s/^.*="\(.*\)"/\1/'`
 
-all : all-am math_sum.mscgi
-	cp libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
+all: all-am math_sum.mscgi
 
-math_sum.mscgi:
+math_sum.mscgi: libmath_sum.la
 	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) \
 		$(INSTALL_STRIP_FLAG) libmath_sum.la $(abs_builddir)
+	cp libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
 
 clean-local:
 	test \! -e libmath_sum.la || \
 	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall libmath_sum.la
+
+
+.phony : math_sum.mscgi
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am b/myserver/binaries/web/cgi-src/post/Makefile.am
index 5170515..dc621be 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -24,12 +24,15 @@ libpost_la_LIBADD = ../../../../src/libmyserver.a ../../../../lib/libgnu.a
 SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e '/^shrext_cmds/ !d; s/^.*="\(.*\)"/\1/'`
 
 all: all-am post.mscgi
-	cp libpost$(SO_EXT) ../../cgi-bin/post.mscgi
 
-post.mscgi:
+post.mscgi: libpost.la
 	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) \
 		$(INSTALL_STRIP_FLAG) libpost.la $(abs_builddir)
+	cp libpost$(SO_EXT) ../../cgi-bin/post.mscgi
 
 clean-local:
 	test \! -e libpost.la || \
 	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall libpost.la
+
+
+.phony : post.mscgi

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    9 ++++++---
 myserver/binaries/web/cgi-src/post/Makefile.am     |    7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 26 22:09:56 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvLTI-00081D-Ak
	for mharc-myserver-commit@gnu.org; Fri, 26 Mar 2010 22:09:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvLTF-0007zf-Aj
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:09:53 -0400
Received: from [140.186.70.92] (port=40758 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvLTE-0007zX-3f
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:09:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvLTD-0005XM-4N
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:09:51 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:58686
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvLTD-0005XD-1F
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:09:51 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvLTC-0004Kf-Hq
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 02:09:50 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvLTC-0000Ke-FK
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 02:09:50 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 17d5520c9b4b7d3dff94c730b1095f2fec4e2cda
X-Git-Newrev: d4f6ff444fb4990f80891fd0b6861d838b578740
Message-Id: <E1NvLTC-0000Ke-FK@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 27 Mar 2010 02:09:50 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-85-gd4f6ff4
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Mar 2010 02:09:55 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  d4f6ff444fb4990f80891fd0b6861d838b578740 (commit)
       via  546fd6f8112b7cfb2b1803bcc736c61e3b5368c9 (commit)
      from  17d5520c9b4b7d3dff94c730b1095f2fec4e2cda (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit d4f6ff444fb4990f80891fd0b6861d838b578740
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 27 03:10:19 2010 +0100

    Intercept an exception to prevent that server termination.

diff --git a/myserver/src/connections_scheduler/connections_scheduler.cpp b/myserver/src/connections_scheduler/connections_scheduler.cpp
index 0805f4f..d124807 100644
--- a/myserver/src/connections_scheduler/connections_scheduler.cpp
+++ b/myserver/src/connections_scheduler/connections_scheduler.cpp
@@ -169,18 +169,26 @@ static void listenerHandler (int fd, short event, void *arg)
       MYSERVER_SOCKADDRIN asockIn;
       socklen_t asockInLen = sizeof (asockIn);
       Socket *clientSock;
-      do
+      try
         {
-          clientSock = s->serverSocket->accept (&asockIn, &asockInLen);
-          if (s->server && clientSock
-              && s->server->addConnection (clientSock, &asockIn))
+          do
             {
-              clientSock->shutdown (2);
-              clientSock->close ();
-              delete clientSock;
+              clientSock = s->serverSocket->accept (&asockIn, &asockInLen);
+              if (s->server && clientSock
+                  && s->server->addConnection (clientSock, &asockIn))
+                {
+                  clientSock->shutdown (2);
+                  clientSock->close ();
+                  delete clientSock;
+                }
             }
+          while (clientSock);
+        }
+      catch (std::exception & e)
+        {
+          s->server->log (MYSERVER_LOG_MSG_ERROR, _("Error listening on socket %s"),
+                          e.what ());
         }
-      while (clientSock);
     }
 
   event_add (&(s->ev), &tv);
diff --git a/myserver/src/http_handler/http_file/http_file.cpp b/myserver/src/http_handler/http_file/http_file.cpp
index 8f99b96..5936067 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -568,8 +568,11 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
   }
   catch (...)
     {
-      file->close ();
-      delete file;
+      if (file)
+        {
+          file->close ();
+          delete file;
+        }
       td->connection->host->warningsLogWrite (_("HttpFile: internal error"));
       chain.clearAllFilters ();
       return td->http->raiseHTTPError (500);



commit 546fd6f8112b7cfb2b1803bcc736c61e3b5368c9
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 27 03:09:44 2010 +0100

    Initialize HttpHeader::Entry class members to NULL.

diff --git a/myserver/include/protocol/http/http_header.h b/myserver/include/protocol/http/http_header.h
index b088d47..fe03c69 100644
--- a/myserver/include/protocol/http/http_header.h
+++ b/myserver/include/protocol/http/http_header.h
@@ -32,13 +32,13 @@ struct HttpHeader
   {
     string *name;
     string *value;
-    Entry ()
+    Entry () : name (NULL), value (NULL)
     {
       name = new string ();
       value = new string ();
     }
 
-    Entry (string& n, string& v)
+    Entry (string& n, string& v) : name (NULL), value (NULL)
     {
       name = new string ();
       value = new string ();
@@ -51,7 +51,6 @@ struct HttpHeader
     {
       delete name;
       delete value;
-
     }
 
   };

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/protocol/http/http_header.h       |    5 +--
 .../connections_scheduler.cpp                      |   24 +++++++++++++------
 myserver/src/http_handler/http_file/http_file.cpp  |    7 ++++-
 3 files changed, 23 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri Mar 26 22:15:57 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvLZ7-0000pM-K5
	for mharc-myserver-commit@gnu.org; Fri, 26 Mar 2010 22:15:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvLZ4-0000oJ-OC
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:15:54 -0400
Received: from [140.186.70.92] (port=36598 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvLZ3-0000no-DL
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:15:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvLZ2-0005ys-6t
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:15:53 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46361
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvLZ2-0005yo-3f
	for myserver-commit@gnu.org; Fri, 26 Mar 2010 22:15:52 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvLZ1-0004RF-KW
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 02:15:51 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvLZ1-0000fn-8u
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 02:15:51 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d4f6ff444fb4990f80891fd0b6861d838b578740
X-Git-Newrev: 116935a34fd9e9534079a4b655f98b4b2a24884c
Message-Id: <E1NvLZ1-0000fn-8u@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 27 Mar 2010 02:15:51 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-86-g116935a
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Mar 2010 02:15:55 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  116935a34fd9e9534079a4b655f98b4b2a24884c (commit)
      from  d4f6ff444fb4990f80891fd0b6861d838b578740 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 116935a34fd9e9534079a4b655f98b4b2a24884c
Author: Daniele Cocca <daniele.cocca@gmail.com>
Date:   Sat Mar 27 02:48:29 2010 +0100

    Two more useless functions removed.

diff --git a/myserver/include/base/file/files_utility.h b/myserver/include/base/file/files_utility.h
index 77e06a6..f8e79b4 100644
--- a/myserver/include/base/file/files_utility.h
+++ b/myserver/include/base/file/files_utility.h
@@ -89,8 +89,6 @@ public:
   static void splitPath (const char* path, char* dir, char*filename);
   static void splitPath (string const &path, string& dir, string& filename);
 
-  static int getFilenameLength (const char*, int *);
-  static void getFilename (const char* path, char* filename);
   static void getFilename (string const &path, string& filename);
 
   static int rmdir (const char *path);
diff --git a/myserver/src/base/file/files_utility.cpp b/myserver/src/base/file/files_utility.cpp
index 61c4a88..75b2cfc 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -60,7 +60,7 @@ FilesUtility::FilesUtility ()
 }
 
 /*!
- * This funtion iterates through every character of the path
+ * This function iterates through every character of the path
  * The first IF tries to clear out the bars, if it finds one,
  * just advances one character and starts the cycle again
  * The second IF tries to find at least two dots.
@@ -275,7 +275,7 @@ int FilesUtility::nodeExists (const char* filename)
                              NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL
                              | FILE_FLAG_BACKUP_SEMANTICS, NULL);
 
-  int nRet = hFile != INVALID_HANDLE_VALUE ? 1 : 0;
+  int nRet = (hFile != INVALID_HANDLE_VALUE) ? 1 : 0;
   CloseHandle (hFile);
   return nRet;
 #else
@@ -369,49 +369,6 @@ int FilesUtility::chown (const char* filename, string &uid, string &gid)
 }
 
 /*!
- *Get the length of the file in the path.
- *\param path The full path where get the filename length.
- *\param filename A pointer to the start of the file name.
- */
-int FilesUtility::getFilenameLength (const char *path, int *filename)
-{
-  int splitpoint = static_cast<int> (strlen (path) - 1);
-  while ((splitpoint > 0) && (path[splitpoint] != '/'))
-    splitpoint--;
-  *filename = splitpoint + 1;
-  return *filename;
-}
-
-/*!
- * Get the filename from a path.
- * Be sure that the filename buffer is at least getFilenameLength (...) bytes
- * before call this function.
- * \param path The full path to the file.
- * \param filename A buffer to fullfill with the file name.
- */
-void FilesUtility::getFilename (const char *path, char *filename)
-{
-  int splitpoint, i = 0, j = 0;
-  splitpoint = static_cast<int>(strlen (path) - 1);
-  while ((splitpoint > 0) && (path[splitpoint] != '/'))
-    splitpoint--;
-  if ((splitpoint == 0) && (path[splitpoint] != '/'))
-    strcpy (filename, path);
-  else
-    {
-      splitpoint++;
-      i=splitpoint;
-      while (path[i] != 0)
-        {
-          filename[j] = path[i];
-          j++;
-          i++;
-        }
-      filename[j] = 0;
-    }
-}
-
-/*!
  * Get the filename from a path.
  * \param path The full path to the file.
  * \param filename A buffer to fullfill with the file name.

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/file/files_utility.h |    2 -
 myserver/src/base/file/files_utility.cpp   |   47 +--------------------------
 2 files changed, 2 insertions(+), 47 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sat Mar 27 13:01:20 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvZNw-0001kl-4P
	for mharc-myserver-commit@gnu.org; Sat, 27 Mar 2010 13:01:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvZNu-0001hb-JF
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 13:01:18 -0400
Received: from [140.186.70.92] (port=33388 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvZNt-0001dr-2Y
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 13:01:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvZNr-0005oI-T2
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 13:01:16 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:35433
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvZNr-0005oB-Pe
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 13:01:15 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvZNr-0006i7-EY
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 17:01:15 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvZNq-0006R1-OW
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 17:01:15 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 116935a34fd9e9534079a4b655f98b4b2a24884c
X-Git-Newrev: 99dad7ad83b119a689d237639e8ea01c13a089a6
Message-Id: <E1NvZNq-0006R1-OW@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 27 Mar 2010 17:01:15 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-87-g99dad7a
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Mar 2010 17:01:18 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  99dad7ad83b119a689d237639e8ea01c13a089a6 (commit)
      from  116935a34fd9e9534079a4b655f98b4b2a24884c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 99dad7ad83b119a689d237639e8ea01c13a089a6
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 27 17:58:59 2010 +0100

    Do not use libtool with gnulib.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index a1db223..369f5c9 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -18,7 +18,7 @@
 # 02110-1301, USA.
 
 gnulib_name=libgnu
-
+gnulib_tool_option_extras=--no-libtool
 SKIP_PO=t
 
 # gnulib modules used by this package.

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sat Mar 27 17:37:39 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NvdhL-0004vb-As
	for mharc-myserver-commit@gnu.org; Sat, 27 Mar 2010 17:37:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NvdhK-0004vU-OQ
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 17:37:38 -0400
Received: from [140.186.70.92] (port=35936 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NvdhJ-0004vG-6e
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 17:37:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvdhH-0005ER-Ux
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 17:37:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38697
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvdhH-0005EN-TH
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 17:37:35 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NvdhH-0001aS-6C
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 21:37:35 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NvdhG-00042Q-Vf
	for myserver-commit@gnu.org; Sat, 27 Mar 2010 21:37:35 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 99dad7ad83b119a689d237639e8ea01c13a089a6
X-Git-Newrev: 679778479c11f73540bcec24a0ff508d33aad3ea
Message-Id: <E1NvdhG-00042Q-Vf@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 27 Mar 2010 21:37:35 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-90-g6797784
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Mar 2010 21:37:39 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  679778479c11f73540bcec24a0ff508d33aad3ea (commit)
       via  487b1ebd6389e76bfac4d725878dc8b163afb4ff (commit)
       via  465da19dc33cd5664a3371d4fce1b95adfd133c0 (commit)
      from  99dad7ad83b119a689d237639e8ea01c13a089a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 679778479c11f73540bcec24a0ff508d33aad3ea
Author: Daniele Cocca <daniele.cocca@gmail.com>
Date:   Sat Mar 27 20:26:34 2010 +0100

    Refactor the code that checks if the server is called with an absolute path.
    
    The `updateWorkingDirectory' method was extracted from `main'.

diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index dc487c3..ea51af4 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -348,6 +348,24 @@ int loadConfFilesLocation (string &mainConfigurationFile,
   return 0;
 }
 
+static void updateWorkingDirectory (const char *firstArgument)
+{
+  string path (firstArgument);
+  size_t index;
+
+#ifdef WIN32
+  index = path.find_last_of ('\\');
+#else
+  index = path.find_last_of ('/');
+#endif
+
+  if (index != string::npos)
+    {
+      string newdir (path, 0, index);
+      setcwd (newdir.c_str ());
+    }
+}
+
 static MainConfiguration *_genMainConf (Server *server, const char *arg)
 {
   XmlMainConfiguration *conf = new XmlMainConfiguration ();
@@ -397,38 +415,8 @@ int main (int argn, char **argv)
       return 1;
     };
 
-  u_int pathLen = 0;
-  u_int len = 0;
-  bool differentCwd = false;
-  char *path;
-
-  pathLen = strlen (argv[0]);
-  path = new char[pathLen + 1];
-  if (path == 0)
-    return 1;
-  strncpy (path, argv[0], pathLen);
-
-  for (len = 0; len < pathLen; len++)
-    {
-      if (path[len] == '/' || path[len] == '\\')
-        {
-          differentCwd = true;
-          break;
-        }
-    }
-
-  if (differentCwd)
-    {
-      len = pathLen;
-      while ((path[len] != '\\') && (path[len] != '/'))
-        len--;
-      path[len] = '\0';
-
-      setcwd (path);
-    }
-
-  /* We can free path memory now.  */
-  delete [] path;
+  /* Move to a different working directory, if necessary.  */
+  updateWorkingDirectory (argv[0]);
 
   /* Call the parser.  */
   argp_parse (&myserverArgp, argn, argv, 0, 0, &input);



commit 487b1ebd6389e76bfac4d725878dc8b163afb4ff
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 27 18:15:22 2010 +0100

    Fix autoconf warning.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index cd6834a..a0df4b7 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -32,6 +32,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_MACRO_DIR([m4])
 
+AC_USE_SYSTEM_EXTENSIONS
+
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_CXX
@@ -41,7 +43,6 @@ gl_EARLY
 
 AC_ENABLE_SHARED
 
-AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_USE_SYSTEM_EXTENSIONS
 AC_HEADER_STDC



commit 465da19dc33cd5664a3371d4fce1b95adfd133c0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 27 18:13:06 2010 +0100

    Remove `read' from the list of imported gnulib modules.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 369f5c9..03f3b98 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -45,7 +45,6 @@ mktime
 nproc
 open
 pipe
-read
 read-file
 readlink
 recv

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf   |    1 -
 myserver/configure.ac     |    3 +-
 myserver/src/myserver.cpp |   52 +++++++++++++++++---------------------------
 3 files changed, 22 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue Mar 30 19:11:17 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Nwkaa-00058w-Uj
	for mharc-myserver-commit@gnu.org; Tue, 30 Mar 2010 19:11:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nwkaa-00058k-0K
	for myserver-commit@gnu.org; Tue, 30 Mar 2010 19:11:16 -0400
Received: from [140.186.70.92] (port=55299 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NwkaX-00058b-88
	for myserver-commit@gnu.org; Tue, 30 Mar 2010 19:11:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NwkaV-0004Ob-Fn
	for myserver-commit@gnu.org; Tue, 30 Mar 2010 19:11:13 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:49765
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NwkaV-0004OT-Dk
	for myserver-commit@gnu.org; Tue, 30 Mar 2010 19:11:11 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1NwkaU-0004Wv-WA
	for myserver-commit@gnu.org; Tue, 30 Mar 2010 23:11:11 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1NwkaU-0002Y5-Bk
	for myserver-commit@gnu.org; Tue, 30 Mar 2010 23:11:10 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 679778479c11f73540bcec24a0ff508d33aad3ea
X-Git-Newrev: 29af15248e35381f71ca7f0467d94852ff1718d1
Message-Id: <E1NwkaU-0002Y5-Bk@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 30 Mar 2010 23:11:10 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-94-g29af152
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Mar 2010 23:11:16 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  29af15248e35381f71ca7f0467d94852ff1718d1 (commit)
       via  1f71fec7fdda977cce481a742b49d61d3a128643 (commit)
       via  d39d87dfa31510d259da0bdd338de2541c8b292d (commit)
       via  00bc64b872746d6c28043d3d3e84345cdb7be76f (commit)
      from  679778479c11f73540bcec24a0ff508d33aad3ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 29af15248e35381f71ca7f0467d94852ff1718d1
Merge: d39d87d 1f71fec
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Mar 31 01:09:33 2010 +0200

    Merge branch 'master' of git://github.com/rupinder/GNU-MyServer




commit 1f71fec7fdda977cce481a742b49d61d3a128643
Author: Rupinder Singh <rupinder.singh@nsitonline.in>
Date:   Wed Mar 31 04:22:12 2010 +0530

    Remove trailing whitespaces

diff --git a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
index d08236b..e95f172 100644
--- a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
@@ -23,13 +23,13 @@ from MyServer.GUI import GUIConfig
 
 class DefinitionTable(gtk.Table):
     def __init__(self, tree):
-        
+
         # 7 rows and 3 columns
         gtk.Table.__init__(self, 7, 3)
 
         tree.connect('cursor-changed', self.cursor_changed)
         self.last_selected = None
-        
+
         # Enabled checkbutton
         enabled_label = gtk.Label('Enabled:')
         self.enabled_field = enabled_checkbutton = gtk.CheckButton()
@@ -226,15 +226,15 @@ class DefinitionTreeView(gtk.TreeView):
                 gobject.TYPE_STRING, # value
                 gobject.TYPE_BOOLEAN, # value_check
                 gobject.TYPE_PYOBJECT)) # attributes dict
-        
+
         model = self.get_model()
-        
+
         def name_edited_handler(cell, path, text, data):
             model = data
             row = model[path]
             if not row[2]: # don't edit names of known options
                 row[0] = text
-        
+
         name_renderer = gtk.CellRendererText()
         name_column = gtk.TreeViewColumn('Name')
         name_column.pack_start(name_renderer)



commit d39d87dfa31510d259da0bdd338de2541c8b292d
Merge: 6797784 00bc64b
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Mar 31 00:11:24 2010 +0200

    Merge branch 'master' of git://github.com/rupinder/GNU-MyServer




commit 00bc64b872746d6c28043d3d3e84345cdb7be76f
Author: Rupinder Singh <rupinder.singh@nsitonline.in>
Date:   Mon Mar 29 21:01:33 2010 +0530

    Set the 'Name' TreeViewColumn to undeditable

diff --git a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
index 07023ad..d08236b 100644
--- a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
@@ -23,18 +23,22 @@ from MyServer.GUI import GUIConfig
 
 class DefinitionTable(gtk.Table):
     def __init__(self, tree):
+        
+        # 7 rows and 3 columns
         gtk.Table.__init__(self, 7, 3)
 
         tree.connect('cursor-changed', self.cursor_changed)
         self.last_selected = None
-
-        enabled_label = gtk.Label('enabled:')
+        
+        # Enabled checkbutton
+        enabled_label = gtk.Label('Enabled:')
         self.enabled_field = enabled_checkbutton = gtk.CheckButton()
-        enabled_checkbutton.set_tooltip_text('If not active, definition won\'t be included in saved configuration.')
+        enabled_checkbutton.set_tooltip_text('If not checked, Definition won\'t be included in Saved Configuration.')
         self.attach(enabled_label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
         self.attach(enabled_checkbutton, 1, 3, 0, 1, yoptions = gtk.FILL)
 
-        value_label = gtk.Label('value:')
+        #Value Field
+        value_label = gtk.Label('Value:')
         self.string_value_field = gtk.Entry()
         self.int_value_field = gtk.SpinButton()
         self.int_value_field.set_adjustment(
@@ -49,14 +53,15 @@ class DefinitionTable(gtk.Table):
         value_box.add(self.int_value_field)
         value_box.add(self.bool_value_field)
         self.value_check_field = value_checkbutton = gtk.CheckButton()
-        value_checkbutton.set_tooltip_text('If not active value won\'t be saved in configuration.')
+        value_checkbutton.set_tooltip_text('If not checked, Value won\'t be included in Saved Configuration.')
         value_checkbutton.set_active(True)
 
         self.attach(value_label, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
         self.attach(value_box, 1, 2, 1, 2, yoptions = gtk.FILL)
         self.attach(value_checkbutton, 2, 3, 1, 2, gtk.FILL, gtk.FILL)
 
-        add_definition_button = gtk.Button('add sub-definition')
+        # Add Sub-Definition button
+        add_definition_button = gtk.Button('Add Sub-Definition')
         def add_sub_definition(button):
             model, selected = tree.get_selection().get_selected()
             if selected is not None:
@@ -65,7 +70,8 @@ class DefinitionTable(gtk.Table):
         add_definition_button.connect('clicked', add_sub_definition)
         self.attach(add_definition_button, 0, 3, 2, 3, yoptions = gtk.FILL)
 
-        remove_definition_button = gtk.Button('remove this definition')
+        # Remove Sub-Definition button
+        remove_definition_button = gtk.Button('Remove Definition')
         def remove_definition(button):
             model, selected = tree.get_selection().get_selected()
             if selected is not None and not model[selected][2]:
@@ -74,9 +80,10 @@ class DefinitionTable(gtk.Table):
         remove_definition_button.connect('clicked', remove_definition)
         self.attach(remove_definition_button, 0, 3, 3, 4, yoptions = gtk.FILL)
 
-        add_attribute_button = gtk.Button('add attribute')
-        remove_attribute_button = gtk.Button('remove attribute')
-        button_table = gtk.Table(1, 2)
+        # Add/Remove Attribute Buttons
+        add_attribute_button = gtk.Button('Add Attribute')
+        remove_attribute_button = gtk.Button('Remove Attribute')
+        button_table = gtk.Table(1, 3)
         add_attribute_button.connect(
             'clicked',
             lambda button: attributes_model.append(('', '', )))
@@ -85,11 +92,12 @@ class DefinitionTable(gtk.Table):
             if selected is not None:
                 model.remove(selected)
         remove_attribute_button.connect('clicked', remove_attribute)
-        button_table.attach(add_attribute_button, 0, 1, 0, 1)
-        button_table.attach(remove_attribute_button, 1, 2, 0, 1)
+        button_table.attach(add_attribute_button, 0, 2, 0, 1)
+        button_table.attach(remove_attribute_button, 2, 3, 0, 1)
         self.attach(button_table, 0, 3, 4, 5, yoptions = gtk.FILL)
 
-        attributes_label = gtk.Label('attributes:')
+        # Attributes TreeView
+        attributes_label = gtk.Label('Attributes:')
         attributes_list = gtk.TreeView(gtk.ListStore(gobject.TYPE_STRING,
                                                      gobject.TYPE_STRING))
         attributes_scroll = gtk.ScrolledWindow()
@@ -102,7 +110,7 @@ class DefinitionTable(gtk.Table):
         def edited_handler(cell, path, text, data):
             model, col = data
             model[path][col] = text
-        variable_column = gtk.TreeViewColumn('variable')
+        variable_column = gtk.TreeViewColumn('Variable')
         variable_renderer = gtk.CellRendererText()
         variable_renderer.set_property('editable', True)
         variable_renderer.connect('edited', edited_handler,
@@ -110,7 +118,7 @@ class DefinitionTable(gtk.Table):
         variable_column.pack_start(variable_renderer)
         variable_column.add_attribute(variable_renderer, 'text', 0)
 
-        value_column = gtk.TreeViewColumn('value')
+        value_column = gtk.TreeViewColumn('Value')
         value_renderer = gtk.CellRendererText()
         value_renderer.set_property('editable', True)
         value_renderer.connect('edited', edited_handler,
@@ -218,21 +226,22 @@ class DefinitionTreeView(gtk.TreeView):
                 gobject.TYPE_STRING, # value
                 gobject.TYPE_BOOLEAN, # value_check
                 gobject.TYPE_PYOBJECT)) # attributes dict
+        
         model = self.get_model()
+        
         def name_edited_handler(cell, path, text, data):
             model = data
             row = model[path]
             if not row[2]: # don't edit names of known options
                 row[0] = text
+        
         name_renderer = gtk.CellRendererText()
-        name_renderer.set_property('editable', True)
-        name_renderer.connect('edited', name_edited_handler, model)
-        name_column = gtk.TreeViewColumn('name')
+        name_column = gtk.TreeViewColumn('Name')
         name_column.pack_start(name_renderer)
         name_column.add_attribute(name_renderer, 'text', 0)
         self.append_column(name_column)
         value_renderer = gtk.CellRendererText()
-        value_column = gtk.TreeViewColumn('value')
+        value_column = gtk.TreeViewColumn('Value')
         value_column.pack_start(value_renderer)
         value_column.add_attribute(value_renderer, 'text', 4)
         self.append_column(value_column)

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py |   45 ++++++++++++--------
 1 files changed, 27 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU MyServer



