[myserver-commit] [SCM] GNU MyServer branch, master, updated. 20d3c2b838d3dea15910bcd7bfe0a67b51c70982

[Giuseppe Scrivano]

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  20d3c2b838d3dea15910bcd7bfe0a67b51c70982 (commit)
       via  bca114fa443002166a0ebe30af725a5a601b3d80 (commit)
      from  a7ea4a1f4d96641613ebed01e38fce840d6b2d6b (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 20d3c2b838d3dea15910bcd7bfe0a67b51c70982
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Oct 19 15:46:21 2009 +0200

    Fix some problems introduced by the migration to gnulib.

diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index a106925..3895ae8 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -7,9 +7,9 @@ if BUILD_DOC
 DOCS = documentation
 endif
 
-SUBDIRS = po lib src include $(CONTROL) $(CGI_LIB) binaries $(DOCS) 
$(TESTS_DIR)
+SUBDIRS = lib po src include $(CONTROL) binaries $(DOCS) $(TESTS_DIR)
 
-EXTRA_DIST = config.rpath  stdafx.h stdafx.cpp doxygen SConstruct
+EXTRA_DIST = stdafx.h stdafx.cpp doxygen SConstruct
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -20,5 +20,29 @@ localedir.h: Makefile
 all: localedir.h
 # Generate the localedir.h file before any other rule.
 
-regenerate-po:
-       find -iname '*.cpp' src/ > po/POTFILES.in
+update-po: check-gettext
+       git ls-files src/ | grep "cpp$$" \
+               | sort > $(srcdir)/po/POTFILES.in.2 ; \
+       if diff $(srcdir)/po/POTFILES.in \
+               $(srcdir)/po/POTFILES.in.2 >/dev/null 2>&1 ; then \
+               rm -f $(srcdir)/po/POTFILES.in.2 ; \
+       else \
+               mv $(srcdir)/po/POTFILES.in.2 $(srcdir)/po/POTFILES.in ; \
+       fi
+       cd po && $(MAKE) $(AM_MAKEFLAGS) update-po
+
+update-gmo: check-gettext
+       cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
+
+force-update-gmo: check-gettext
+       touch po/*.po
+       cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
+
+force-update-gmo-%: check-gettext
+       @language=`echo $@ | sed s/force-update-gmo-//` ; \
+       if test ! -f po/$$language.po ; then \
+       echo "file po/$$language.po does not exist" ; exit 1 ; fi ; \
+       touch po/$$language.po ; \
+       cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
+
+.PHONY: check-gettext update-po update-gmo force-update-gmo
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 901572a..64be0c7 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -54,7 +54,8 @@ MYSERVER_VERSION="${PACKAGE_STRING}"
 
 AC_SUBST(MYSERVER_VERSION)
 
-AC_DEFINE_UNQUOTED([MYSERVER_VERSION], ["${MYSERVER_VERSION}"], [The software 
version])
+AC_DEFINE_UNQUOTED([MYSERVER_VERSION], ["${MYSERVER_VERSION}"],
+                                      [The software version])
 
 AM_GNU_GETTEXT([external])
 
@@ -66,24 +67,31 @@ else
    MAKE_DOC=yes
 fi
 
-AC_ARG_ENABLE([ipv6], [--enable-ipv6 Build with IPv6 support], 
enable_ipv6="yes", enable_ipv6="")
+AC_ARG_ENABLE([ipv6], [--enable-ipv6 Build with IPv6 support],
+                     enable_ipv6="yes", enable_ipv6="")
 
 AC_ARG_ENABLE([tests], [--disable-tests Disable the tests suite],
                        enable_tests="$enableval", enable_tests="yes")
 
-AC_ARG_ENABLE([gui], [--enable-gui Build and install GUI application], 
enable_gui="yes", enable_gui="")
+AC_ARG_ENABLE([gui], [--enable-gui Build and install GUI application],
+                    enable_gui="yes", enable_gui="")
 
 
-AC_CHECK_HEADER([argp.h], AC_DEFINE(ARGP, 1, [Define if GNU argp tools are 
available]))
-AC_CHECK_HEADER([error.h], AC_DEFINE(ERRORH, 1, [Define if the error.h file is 
present]))
+AC_CHECK_HEADER([argp.h], AC_DEFINE(ARGP, 1,
+                         [Define if GNU argp tools are available]))
+AC_CHECK_HEADER([error.h], AC_DEFINE(ERRORH, 1,
+                          [Define if the error.h file is present]))
 AC_CHECK_HEADER([grp.h], AC_DEFINE(GRP, 1, [Define if grp.h is available]))
-AC_CHECK_HEADER([sys/sendfile.h], AC_DEFINE(SENDFILE, 1, [Define if the 
sendfile syscall is present]))
+AC_CHECK_HEADER([sys/sendfile.h], AC_DEFINE(SENDFILE, 1,
+                                 [Define if the sendfile syscall is present]))
 
 gl_INIT
 
-AC_CHECK_FUNCS(regcomp gettimeofday setgroups localtime_r pipe posix_fallocate 
snprintf openat fstatat getpwnam ffsl readdir_r)
+AC_CHECK_FUNCS(regcomp gettimeofday setgroups localtime_r pipe posix_fallocate 
\
+                      snprintf openat fstatat getpwnam ffsl readdir_r)
 
-AC_CHECK_LIB(gcrypt, gcry_control, AC_DEFINE(GCRY_CONTROL, 1, [Define if the 
gcry_control function is present]))
+AC_CHECK_LIB(gcrypt, gcry_control, AC_DEFINE(GCRY_CONTROL, 1,
+                    [Define if the gcry_control function is present]))
 
 case "${host}" in
     *-*-mingw32*)
@@ -94,9 +102,9 @@ case "${host}" in
      dnl Looking for pthreads
         PTHREAD_LIB="" 
         AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
-                [AC_CHECK_LIB(pthreads, pthread_create, 
PTHREAD_LIB="-lpthreads",
-                    [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
-                        [AC_CHECK_FUNC(pthread_create)]
+               [AC_CHECK_LIB(pthreads, pthread_create, 
PTHREAD_LIB="-lpthreads",
+                   [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
+                       [AC_CHECK_FUNC(pthread_create)]
                     )]
                 )]
         )
@@ -158,16 +166,16 @@ fi
 AC_SUBST(EVENT_LIB)
 
 AC_CHECK_FUNCS(event_loopbreak, AC_DEFINE(EVENT_LOOPBREAK, 1,
-                         [Define if the event_loopbreak function is present]) )
+                         [Define if the event_loopbreak function is present]))
 
 dnl check for Unix98 socklen_t
  AC_MSG_CHECKING(if socklen_t is defined)
  AC_TRY_COMPILE(
      [#include <sys/socket.h>],
      [socklen_t len = 10; return len;],
-         [AC_MSG_RESULT(yes)],
-         [AC_MSG_RESULT(no)
-          AC_DEFINE(socklen_t, int, need to define this where socklen_t is not 
present)])
+        [AC_MSG_RESULT(yes)],
+        [AC_MSG_RESULT(no)
+         AC_DEFINE(socklen_t, int, define this where socklen_t is not 
present)])
 
 
 # Libidn checks
@@ -191,7 +199,8 @@ if test "x$IDN_LIB" = "x"; then
 
                if test "x$have_idn" = "xyes"; then
                                IDN_LIB="-lidn"
-                               AC_DEFINE(HAVE_IDN, 1, [Define if the IDN 
library is present])
+                               AC_DEFINE(HAVE_IDN, 1,
+                               [Define if the IDN library is present])
                fi
   fi
 
@@ -231,7 +240,8 @@ if test x$have_libz = xyes; then
 *** compressBound checking will not be enabled
 ])
     else
-        AC_DEFINE(GZIP_COMPRESS_BOUNDS, 1, [Memory checking for Zlib, not 
defined in older vrs])
+        AC_DEFINE(GZIP_COMPRESS_BOUNDS, 1,
+       [Memory checking for Zlib, not defined in older vrs])
     fi
 else
     AC_MSG_WARN([
@@ -339,7 +349,8 @@ fi
 CFLAGS="$CFLAGS $pic_flag"
 CXXFLAGS="$CXXFLAGS $pic_flag"
 LDFLAGS="$LDFLAGS $LIBS $pic_flag"
-all_includes="$all_includes -I$(top_builddir)/lib -I$(top_srcdir)/lib"
+CFLAGS="-I$(pwd)/lib -I$(pwd)/lib $CFLAGS"
+CXXFLAGS="-I$(pwd)/lib -I$(pwd)/lib $CXXFLAGS"
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
diff --git a/myserver/lib/Makefile.am b/myserver/lib/Makefile.am
index 41c3e04..9598591 100644
--- a/myserver/lib/Makefile.am
+++ b/myserver/lib/Makefile.am
@@ -18,5 +18,5 @@
 include gnulib.mk
 
 # Dirty hack.  FIXME!
-all-local:
-       cp .libs/*.a .
+all-local: libgnu.la
+       cp .libs/libgnu.a .



commit bca114fa443002166a0ebe30af725a5a601b3d80
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon Oct 19 15:45:31 2009 +0200

    Update POTFILES.in file.

diff --git a/myserver/po/POTFILES.in b/myserver/po/POTFILES.in
index 07c96d7..6ab14eb 100644
--- a/myserver/po/POTFILES.in
+++ b/myserver/po/POTFILES.in
@@ -1,113 +1,117 @@
-./src/base/base64/mime_utils.cpp
-./src/base/bitvec/bitvec.cpp
-./src/base/dynamic_lib/dynamiclib.cpp
-./src/base/file/file.cpp
-./src/base/file/files_utility.cpp
-./src/base/files_cache/cached_file_buffer.cpp
-./src/base/files_cache/cached_file.cpp
-./src/base/files_cache/cached_file_factory.cpp
-./src/base/find_data/find_data.cpp
-./src/base/hash_map/hash_map.cpp
-./src/base/home_dir/home_dir.cpp
-./src/base/md5/md5.cpp
-./src/base/mem_buff/mem_buff.cpp
-./src/base/multicast/multicast.cpp
-./src/base/pipe/pipe.cpp
-./src/base/process/fork_server.cpp
-./src/base/process/process.cpp
-./src/base/process/process_server_manager.cpp
-./src/base/regex/myserver_regex.cpp
-./src/base/safetime/safetime.cpp
-./src/base/slab/slab.cpp
-./src/base/socket_pair/socket_pair.cpp
-./src/base/socket/socket.cpp
-./src/base/socket/ssl_socket.cpp
-./src/base/ssl/ssl.cpp
-./src/base/string/securestr.cpp
-./src/base/string/stringutils.cpp
-./src/base/sync/event.cpp
-./src/base/sync/mutex.cpp
-./src/base/sync/read_write_lock.cpp
-./src/base/sync/recursive_mutex.cpp
-./src/base/sync/semaphore.cpp
-./src/base/thread/thread.cpp
-./src/base/unix_socket/unix_socket.cpp
-./src/base/utility.cpp
-./src/base/xml/xml_parser.cpp
-./src/conf/mime/mime_manager.cpp
-./src/conf/nodetree.cpp
-./src/conf/security/auth_domain.cpp
-./src/conf/security/auth_method.cpp
-./src/conf/security/auth_method_factory.cpp
-./src/conf/security/security_cache.cpp
-./src/conf/security/security_domain.cpp
-./src/conf/security/security_manager.cpp
-./src/conf/security/security_token.cpp
-./src/conf/security/validator.cpp
-./src/conf/security/validator_factory.cpp
-./src/conf/security/xml_validator.cpp
-./src/conf/vhost/ip.cpp
-./src/conf/vhost/vhost.cpp
-./src/conf/vhost/vhost_manager.cpp
-./src/conf/xml_conf.cpp
-./src/connection/connection.cpp
-./src/connections_scheduler/connections_scheduler.cpp
-./src/connections_scheduler/listen_threads.cpp
-./src/filter/console.cpp
-./src/filter/filter.cpp
-./src/filter/filters_chain.cpp
-./src/filter/filters_factory.cpp
-./src/filter/gzip/gzip.cpp
-./src/filter/gzip/gzip_decompress.cpp
-./src/filter/memory_stream.cpp
-./src/filter/stream.cpp
-./src/http_handler/cgi/cgi.cpp
-./src/http_handler/fastcgi/fastcgi.cpp
-./src/http_handler/http_dir/http_dir.cpp
-./src/http_handler/http_file/http_file.cpp
-./src/http_handler/isapi/isapi.cpp
-./src/http_handler/mscgi/mscgi.cpp
-./src/http_handler/mscgi/mscgi_manager.cpp
-./src/http_handler/proxy/proxy.cpp
-./src/http_handler/scgi/scgi.cpp
-./src/http_handler/wincgi/wincgi.cpp
-./src/log/log_manager.cpp
-./src/log/stream/console_stream.cpp
-./src/log/stream/console_stream_creator.cpp
-./src/log/stream/file_stream.cpp
-./src/log/stream/file_stream_creator.cpp
-./src/log/stream/log_stream.cpp
-./src/log/stream/log_stream_creator.cpp
-./src/log/stream/log_stream_factory.cpp
-./src/log/stream/socket_stream.cpp
-./src/log/stream/socket_stream_creator.cpp
-./src/myserver.cpp
-./src/plugin/plugin.cpp
-./src/plugin/plugin_info.cpp
-./src/plugin/plugins_manager.cpp
-./src/protocol/control/control_header.cpp
-./src/protocol/control/control_protocol.cpp
-./src/protocol/ftp/ftp.cpp
-./src/protocol/ftp/ftp_lexer.cpp
-./src/protocol/ftp/ftp_parser.cpp
-./src/protocol/http/dyn_http_command.cpp
-./src/protocol/http/dyn_http_command_manager.cpp
-./src/protocol/http/dyn_http_manager.cpp
-./src/protocol/http/dyn_http_manager_list.cpp
-./src/protocol/http/env/env.cpp
-./src/protocol/http/http.cpp
-./src/protocol/http/http_data_handler.cpp
-./src/protocol/http/http_data_read.cpp
-./src/protocol/http/http_errors.cpp
-./src/protocol/http/http_headers.cpp
-./src/protocol/http/http_req_security_domain.cpp
-./src/protocol/http/http_request.cpp
-./src/protocol/http/http_response.cpp
-./src/protocol/http/http_thread_context.cpp
-./src/protocol/https/https.cpp
-./src/protocol/protocol_buffer.cpp
-./src/protocol/protocol.cpp
-./src/protocol/protocols_manager.cpp
-./src/protocol/url.cpp
-./src/server/clients_thread.cpp
-./src/server/server.cpp
+src/base/base64/mime_utils.cpp
+src/base/bitvec/bitvec.cpp
+src/base/dynamic_lib/dynamiclib.cpp
+src/base/file/file.cpp
+src/base/file/files_utility.cpp
+src/base/files_cache/cached_file_buffer.cpp
+src/base/files_cache/cached_file.cpp
+src/base/files_cache/cached_file_factory.cpp
+src/base/hash_map/hash_map.cpp
+src/base/home_dir/home_dir.cpp
+src/base/md5/md5.cpp
+src/base/mem_buff/mem_buff.cpp
+src/base/multicast/multicast.cpp
+src/base/pipe/pipe.cpp
+src/base/process/fork_server.cpp
+src/base/process/process.cpp
+src/base/process/process_server_manager.cpp
+src/base/read_directory/read_directory.cpp
+src/base/regex/myserver_regex.cpp
+src/base/safetime/safetime.cpp
+src/base/slab/slab.cpp
+src/base/socket_pair/socket_pair.cpp
+src/base/socket/socket.cpp
+src/base/socket/ssl_socket.cpp
+src/base/ssl/ssl.cpp
+src/base/string/securestr.cpp
+src/base/string/stringutils.cpp
+src/base/sync/event.cpp
+src/base/sync/mutex.cpp
+src/base/sync/read_write_lock.cpp
+src/base/sync/recursive_mutex.cpp
+src/base/sync/semaphore.cpp
+src/base/thread/thread.cpp
+src/base/unix_socket/unix_socket.cpp
+src/base/utility.cpp
+src/base/xml/xml_parser.cpp
+src/conf/main/main_configuration.cpp
+src/conf/main/xml_main_configuration.cpp
+src/conf/mime/mime_manager.cpp
+src/conf/mime/xml_mime_handler.cpp
+src/conf/nodetree.cpp
+src/conf/security/auth_domain.cpp
+src/conf/security/auth_method.cpp
+src/conf/security/auth_method_factory.cpp
+src/conf/security/security_cache.cpp
+src/conf/security/security_domain.cpp
+src/conf/security/security_manager.cpp
+src/conf/security/security_token.cpp
+src/conf/security/validator.cpp
+src/conf/security/validator_factory.cpp
+src/conf/security/xml_validator.cpp
+src/conf/vhost/ip.cpp
+src/conf/vhost/vhost.cpp
+src/conf/vhost/vhost_manager.cpp
+src/conf/vhost/xml_vhost_handler.cpp
+src/conf/xml_conf.cpp
+src/connection/connection.cpp
+src/connections_scheduler/connections_scheduler.cpp
+src/connections_scheduler/listen_threads.cpp
+src/filter/console.cpp
+src/filter/filter.cpp
+src/filter/filters_chain.cpp
+src/filter/filters_factory.cpp
+src/filter/gzip/gzip.cpp
+src/filter/gzip/gzip_decompress.cpp
+src/filter/memory_stream.cpp
+src/filter/stream.cpp
+src/http_handler/cgi/cgi.cpp
+src/http_handler/fastcgi/fastcgi.cpp
+src/http_handler/http_dir/http_dir.cpp
+src/http_handler/http_file/http_file.cpp
+src/http_handler/isapi/isapi.cpp
+src/http_handler/mscgi/mscgi.cpp
+src/http_handler/mscgi/mscgi_manager.cpp
+src/http_handler/proxy/proxy.cpp
+src/http_handler/scgi/scgi.cpp
+src/http_handler/wincgi/wincgi.cpp
+src/log/log_manager.cpp
+src/log/stream/console_stream.cpp
+src/log/stream/console_stream_creator.cpp
+src/log/stream/file_stream.cpp
+src/log/stream/file_stream_creator.cpp
+src/log/stream/log_stream.cpp
+src/log/stream/log_stream_creator.cpp
+src/log/stream/log_stream_factory.cpp
+src/log/stream/socket_stream.cpp
+src/log/stream/socket_stream_creator.cpp
+src/myserver.cpp
+src/plugin/plugin.cpp
+src/plugin/plugin_info.cpp
+src/plugin/plugins_manager.cpp
+src/protocol/control/control_header.cpp
+src/protocol/control/control_protocol.cpp
+src/protocol/ftp/ftp.cpp
+src/protocol/ftp/ftp_lexer.cpp
+src/protocol/ftp/ftp_parser.cpp
+src/protocol/http/dyn_http_command.cpp
+src/protocol/http/dyn_http_command_manager.cpp
+src/protocol/http/dyn_http_manager.cpp
+src/protocol/http/dyn_http_manager_list.cpp
+src/protocol/http/env/env.cpp
+src/protocol/http/http.cpp
+src/protocol/http/http_data_handler.cpp
+src/protocol/http/http_data_read.cpp
+src/protocol/http/http_errors.cpp
+src/protocol/http/http_headers.cpp
+src/protocol/http/http_req_security_domain.cpp
+src/protocol/http/http_request.cpp
+src/protocol/http/http_response.cpp
+src/protocol/http/http_thread_context.cpp
+src/protocol/https/https.cpp
+src/protocol/protocol_buffer.cpp
+src/protocol/protocol.cpp
+src/protocol/protocols_manager.cpp
+src/protocol/url.cpp
+src/server/clients_thread.cpp
+src/server/server.cpp

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

Summary of changes:
 myserver/Makefile.am     |   32 ++++++-
 myserver/configure.ac    |   47 ++++++----
 myserver/lib/Makefile.am |    4 +-
 myserver/po/POTFILES.in  |  230 +++++++++++++++++++++++-----------------------
 4 files changed, 176 insertions(+), 137 deletions(-)


hooks/post-receive
-- 
GNU MyServer