Hello community,
here is the log from the commit of package apache2-mod_mono for openSUSE:Factory
checked in at Wed Mar 17 16:08:20 CET 2010.
--------
--- apache2-mod_mono/apache2-mod_mono.changes 2010-01-26 22:12:39.000000000 +0100
+++ apache2-mod_mono/apache2-mod_mono.changes 2010-03-16 17:29:58.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 16 16:28:42 UTC 2010 - ajorgensen@novell.com
+
+- Update to 2.6.3
+ * http://www.mono-project.com/Release_Notes_Mono_2.6.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mod_mono-2.6.tar.bz2
New:
----
mod_mono-2.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_mono.spec ++++++
--- /var/tmp/diff_new_pack.M69eeQ/_old 2010-03-17 16:06:28.000000000 +0100
+++ /var/tmp/diff_new_pack.M69eeQ/_new 2010-03-17 16:06:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package apache2-mod_mono (Version 2.6)
+# spec file for package apache2-mod_mono (Version 2.6.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,10 +26,10 @@
%define apache2_libexecdir %(%{apxs} -q LIBEXECDIR)
%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN)
Url: http://go-mono.com/
-License: Apache Software License ..
+License: Apache Software License
Group: Productivity/Networking/Web/Servers
AutoReqProv: on
-Version: 2.6
+Version: 2.6.3
Release: 1
Summary: Run ASP.NET Pages on Unix with Apache and Mono
Source: %{modname}-%{version}.tar.bz2
++++++ mod_mono-2.6.tar.bz2 -> mod_mono-2.6.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/ChangeLog new/mod_mono-2.6.3/ChangeLog
--- old/mod_mono-2.6/ChangeLog 2009-09-25 18:01:20.000000000 +0200
+++ new/mod_mono-2.6.3/ChangeLog 2010-02-13 08:59:28.000000000 +0100
@@ -1,3 +1,9 @@
+2010-02-13 Gonzalo Paniagua Javier
+
+ * configure.in: check for strndup().
+ * src/glib_compat.c: added g_strndup() from eglib.
+ Fixes the compilation for systems without strndup().
+
2009-08-24 Marek Habersack
* configure.in: no longer checks for glib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/config.in new/mod_mono-2.6.3/config.in
--- old/mod_mono-2.6/config.in 2009-12-07 19:47:21.000000000 +0100
+++ new/mod_mono-2.6.3/config.in 2010-03-02 17:17:08.000000000 +0100
@@ -69,6 +69,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/configure new/mod_mono-2.6.3/configure
--- old/mod_mono-2.6/configure 2009-12-07 19:47:22.000000000 +0100
+++ new/mod_mono-2.6.3/configure 2010-03-02 17:17:09.000000000 +0100
@@ -2397,7 +2397,7 @@
# Define the identity of the package.
PACKAGE=mod_mono
- VERSION=2.6
+ VERSION=2.6.3
cat >>confdefs.h <<_ACEOF
@@ -13040,7 +13040,8 @@
-for ac_func in memset mkdir unsetenv putenv setenv setrlimit select strcasecmp strerror strrchr dup2
+
+for ac_func in memset mkdir unsetenv putenv setenv setrlimit select strcasecmp strerror strrchr dup2 strndup
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/configure.in new/mod_mono-2.6.3/configure.in
--- old/mod_mono-2.6/configure.in 2009-09-25 18:01:20.000000000 +0200
+++ new/mod_mono-2.6.3/configure.in 2010-03-02 17:16:59.000000000 +0100
@@ -1,5 +1,5 @@
AC_INIT(src/mod_mono.c)
-AM_INIT_AUTOMAKE(mod_mono, 2.6)
+AM_INIT_AUTOMAKE(mod_mono, 2.6.3)
AM_CONFIG_HEADER(include/mod_mono_config.h:config.in)
AC_PROG_CC
@@ -42,7 +42,7 @@
AC_FUNC_FORK
AC_HEADER_STDC
AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([memset mkdir unsetenv putenv setenv setrlimit select strcasecmp strerror strrchr dup2])
+AC_CHECK_FUNCS([memset mkdir unsetenv putenv setenv setrlimit select strcasecmp strerror strrchr dup2 strndup])
#
# --enable-debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/src/ChangeLog new/mod_mono-2.6.3/src/ChangeLog
--- old/mod_mono-2.6/src/ChangeLog 2009-12-07 19:47:09.000000000 +0100
+++ new/mod_mono-2.6.3/src/ChangeLog 2010-01-19 22:44:35.000000000 +0100
@@ -1,3 +1,22 @@
+2010-01-19 Marek Habersack
+
+ * mod_mono.c (set_process_limits): if RLIMIT_AS is defined, set it
+ in addition to RLIMIT_DATA. Fixes bug #568843. Patch from Brett
+ Kiefer , thanks!
+
+2010-01-18 Marek Habersack
+
+ * mod_mono.c (fork_mod_mono_server): use waitpid to wait for the
+ 1st child during the double fork. Fixes bug #569789. Patch from
+ John Lightsey , thanks!
+
+2010-01-11 Marek Habersack
+
+ * mod_mono.c (increment_active_requests): moved variable
+ declaration to the top of a block so that code doesn't require a
+ C99-compliant compiler. Fixes bug #569794. Patch from John
+ Lightsey , thanks!
+
2009-12-07 Gonzalo Paniagua Javier
* mod_mono.c: fix compilation on systems that don't define SIGPWR.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/src/glib_compat.c new/mod_mono-2.6.3/src/glib_compat.c
--- old/mod_mono-2.6/src/glib_compat.c 2009-09-25 18:01:20.000000000 +0200
+++ new/mod_mono-2.6.3/src/glib_compat.c 2010-02-13 08:59:28.000000000 +0100
@@ -8,6 +8,22 @@
#define ASCII_TOLOWER(_ch_) (isascii ((int)(_ch_)) && isalpha ((int)(_ch_))) ? tolower ((_ch_)) : (_ch_)
+static gchar *
+g_strndup (const char *str, int n)
+{
+#ifdef HAVE_STRNDUP
+ return strndup (str, n);
+#else
+ if (str) {
+ char *retval = malloc (n + 1);
+ if (retval)
+ strncpy (retval, str, n)[n] = 0;
+ return retval;
+ }
+ return NULL;
+#endif
+}
+
static void add_to_vector (gchar ***vector, int size, gchar *token)
{
*vector = *vector == NULL ?
@@ -60,7 +76,7 @@
if (*string) {
size_t toklen = (size_t)(string - c);
- token = strndup (c, toklen);
+ token = g_strndup (c, toklen);
if (strcmp (string, delimiter) != 0)
string += delimiter_len;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6/src/mod_mono.c new/mod_mono-2.6.3/src/mod_mono.c
--- old/mod_mono-2.6/src/mod_mono.c 2009-12-07 19:47:09.000000000 +0100
+++ new/mod_mono-2.6.3/src/mod_mono.c 2010-01-19 22:44:35.000000000 +0100
@@ -1459,6 +1459,13 @@
#endif
set_process_limits2 (RLIMIT_CPU, max_cpu_time, "CPU time");
set_process_limits2 (RLIMIT_DATA, max_memory, "memory (data segment)");
+#ifdef RLIMIT_AS
+ // RLIMIT_AS may not be defined on some systems (e.g. BSD)
+ // If it is defined, it is almost certainly more correct than RLIMIT_DATA, as it
+ // will cause mmap to return null.
+ set_process_limits2 (RLIMIT_AS, max_memory, "memory (virtual memory)");
+#endif
+
}
static void
@@ -1567,7 +1574,7 @@
pid = fork ();
if (pid > 0) {
- wait (&status);
+ waitpid (pid, &status, 0);
return;
}
@@ -2082,6 +2089,8 @@
* allowed concurrent requests, then we have to hold the request
* for a bit of time. */
if (max_active_requests > 0 && conf->dashboard->active_requests >= max_active_requests) {
+ int retries = 20;
+
/* We need to wait until the active requests
* go below the maximum. */
@@ -2104,7 +2113,6 @@
conf->dashboard->waiting_requests++;
set_uri_item (conf->dashboard->waiting_uri_list, WAITING_URI_LIST_ITEM_COUNT, r, id);
- int retries = 20;
while (retries-- > 0) {
// Release the lock, wait some time, and then re-acquire.
apr_global_mutex_unlock (conf->dashboard_mutex);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org