Hello community, here is the log from the commit of package apache2-mod_mono for openSUSE:Factory checked in at Tue Feb 22 20:18:02 CET 2011.
-------- --- apache2-mod_mono/apache2-mod_mono.changes 2010-11-03 16:40:06.000000000 +0100 +++ apache2-mod_mono/apache2-mod_mono.changes 2011-02-22 18:16:03.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 22 17:07:08 UTC 2011 - [email protected] + +- Update to 2.10 + * http://www.go-mono.com/archive/2.10 + +------------------------------------------------------------------- +Fri Jan 7 16:16:25 UTC 2011 - [email protected] + +- Update to 2.8.2 + * Fix for CVE-2010-4225, bnc#660070 + * http://www.go-mono.com/archive/2.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mod_mono-2.8.tar.bz2 New: ---- mod_mono-2.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_mono.spec ++++++ --- /var/tmp/diff_new_pack.a1TD8b/_old 2011-02-22 20:16:52.000000000 +0100 +++ /var/tmp/diff_new_pack.a1TD8b/_new 2011-02-22 20:16:52.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package apache2-mod_mono (Version 2.8) +# spec file for package apache2-mod_mono # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ License: Apache Software License Group: Productivity/Networking/Web/Servers AutoReqProv: on -Version: 2.8 +Version: 2.10 Release: 1 Summary: Run ASP.NET Pages on Unix with Apache and Mono Source: %{modname}-%{version}.tar.bz2 ++++++ mod_mono-2.8.tar.bz2 -> mod_mono-2.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.8/configure new/mod_mono-2.10/configure --- old/mod_mono-2.8/configure 2010-09-30 18:56:08.000000000 +0200 +++ new/mod_mono-2.10/configure 2011-01-13 23:48:14.000000000 +0100 @@ -911,6 +911,7 @@ with_gnu_ld enable_libtool_lock with_crosspkgdir +enable_quiet_build enable_debug with_debug_level with_remove_display @@ -1566,6 +1567,7 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-quiet-build Enable quiet build (on by default) --enable-debug build mod_mono in debug mode --enable-gcov build mod_mono for gcov testing --enable-gprof build mono for gprof profiling @@ -2397,7 +2399,7 @@ # Define the identity of the package. PACKAGE=mod_mono - VERSION=2.8 + VERSION=2.10 cat >>confdefs.h <<_ACEOF @@ -4347,13 +4349,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4350: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4352: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4353: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4355: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4356: output\"" >&5) + (eval echo "\"\$as_me:4358: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5559,7 +5561,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5562 "configure"' > conftest.$ac_ext + echo '#line 5564 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7412,11 +7414,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7415: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7417: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7419: \$? = $ac_status" >&5 + echo "$as_me:7421: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7751,11 +7753,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7754: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7756: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7758: \$? = $ac_status" >&5 + echo "$as_me:7760: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7856,11 +7858,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7859: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7861: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7863: \$? = $ac_status" >&5 + echo "$as_me:7865: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7911,11 +7913,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7914: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7916: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7918: \$? = $ac_status" >&5 + echo "$as_me:7920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10711,7 +10713,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10714 "configure" +#line 10716 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10807,7 +10809,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10810 "configure" +#line 10812 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11513,6 +11515,13 @@ fi +# Check whether --enable-quiet-build was given. +if test "${enable_quiet_build+set}" = set; then + enableval=$enable_quiet_build; enable_quiet_build=$enableval +else + enable_quiet_build=yes +fi + # Checks for header files. { $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } @@ -14048,6 +14057,13 @@ +if test x$enable_quiet_build = xyes; then + ac_config_commands="$ac_config_commands quiet" + + ac_config_commands="$ac_config_commands quiet-libtool" + +fi + ac_config_files="$ac_config_files Makefile mod_mono.conf src/Makefile man/mod_mono.8 man/Makefile" cat >confcache <<\_ACEOF @@ -14923,6 +14939,7 @@ +shell=$SHELL _ACEOF @@ -14935,6 +14952,8 @@ "include/mod_mono_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/mod_mono_config.h:config.in" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "quiet") CONFIG_COMMANDS="$CONFIG_COMMANDS quiet" ;; + "quiet-libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS quiet-libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "mod_mono.conf") CONFIG_FILES="$CONFIG_FILES mod_mono.conf" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; @@ -16353,6 +16372,8 @@ chmod +x "$ofile" ;; + "quiet":C) for i in `find src -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done ;; + "quiet-libtool":C) sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool ;; esac done # for ac_tag diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.8/configure.in new/mod_mono-2.10/configure.in --- old/mod_mono-2.8/configure.in 2010-09-30 17:19:04.000000000 +0200 +++ new/mod_mono-2.10/configure.in 2011-01-13 23:32:35.000000000 +0100 @@ -1,5 +1,5 @@ AC_INIT(src/mod_mono.c) -AM_INIT_AUTOMAKE(mod_mono, 2.8) +AM_INIT_AUTOMAKE(mod_mono, 2.10) AM_CONFIG_HEADER(include/mod_mono_config.h:config.in) AC_PROG_CC @@ -28,6 +28,7 @@ fi ) +AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes) # Checks for header files. AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([netdb.h unistd.h]) @@ -439,6 +440,11 @@ AC_SUBST(CPPFLAGS) AC_SUBST(DFLT_MONO_CONFIG_DIR) +if test x$enable_quiet_build = xyes; then + AC_CONFIG_COMMANDS([quiet], [for i in `find src -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL]) + AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) +fi + AC_OUTPUT( Makefile mod_mono.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.8/src/Makefile.am new/mod_mono-2.10/src/Makefile.am --- old/mod_mono-2.8/src/Makefile.am 2010-09-30 17:19:04.000000000 +0200 +++ new/mod_mono-2.10/src/Makefile.am 2011-01-13 23:32:35.000000000 +0100 @@ -3,6 +3,7 @@ lib_LTLIBRARIES = mod_mono.la mod_mono_la_SOURCES = mod_mono.c mod_mono.h mono-io-portability.c mono-io-portability.h glib_compat.h glib_compat.c mod_mono_la_LDFLAGS = -module +mod_mono_la_DEPENDENCIES = ../include/mod_mono_config.h #/usr/sbin/apxs -c -I../include -I. -D HAVE_CONFIG_H mod_mono.c mod_mono_la_CFLAGS = -Wall -DDFLT_MONO_CONFIG_DIR=\"$(DFLT_MONO_CONFIG_DIR)\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.8/src/Makefile.in new/mod_mono-2.10/src/Makefile.in --- old/mod_mono-2.8/src/Makefile.in 2010-09-30 18:56:08.000000000 +0200 +++ new/mod_mono-2.10/src/Makefile.in 2011-01-13 23:48:14.000000000 +0100 @@ -196,6 +196,7 @@ lib_LTLIBRARIES = mod_mono.la mod_mono_la_SOURCES = mod_mono.c mod_mono.h mono-io-portability.c mono-io-portability.h glib_compat.h glib_compat.c mod_mono_la_LDFLAGS = -module +mod_mono_la_DEPENDENCIES = ../include/mod_mono_config.h #/usr/sbin/apxs -c -I../include -I. -D HAVE_CONFIG_H mod_mono.c mod_mono_la_CFLAGS = -Wall -DDFLT_MONO_CONFIG_DIR=\"$(DFLT_MONO_CONFIG_DIR)\" all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.8/src/mod_mono.c new/mod_mono-2.10/src/mod_mono.c --- old/mod_mono-2.8/src/mod_mono.c 2010-09-30 17:19:04.000000000 +0200 +++ new/mod_mono-2.10/src/mod_mono.c 2011-01-13 23:32:35.000000000 +0100 @@ -987,7 +987,7 @@ st = ap_send_fd (file, r, 0, info.size, &nbytes); apr_file_close (file); - if (nbytes < 0) { + if (nbytes < 0 || st != APR_SUCCESS) { DEBUG_PRINT (2, "SEND FAILED"); *result = HTTP_INTERNAL_SERVER_ERROR; retval = -1; @@ -1338,11 +1338,11 @@ error = strerror (err); if (conf->listen_port == NULL) ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER, - "mod_mono: file %s exists, but wrong permissions.", fn); + "mod_mono: file %s exists, but wrong permissions. %s", fn, error); else ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER, - "mod_mono: no permission to listen on %s.", - conf->listen_port); + "mod_mono: no permission to listen on %s. %s", + conf->listen_port, error); apr_socket_close (*sock); @@ -1571,11 +1571,6 @@ if (config->max_cpu_time != NULL) max_cpu_time = (int)string_to_long (config->max_cpu_time, "MonoMaxCPUTime", -1); - set_environment_variables (pool, config->env_vars); - - if (config->iomap && *config->iomap) - SETENV (pool, "MONO_IOMAP", config->iomap); - pid = fork (); if (pid > 0) { waitpid (pid, &status, 0); @@ -1588,6 +1583,11 @@ exit (0); setsid (); + set_environment_variables (pool, config->env_vars); + + if (config->iomap && *config->iomap) + SETENV (pool, "MONO_IOMAP", config->iomap); + status = chdir ("/"); #if defined (APR_HAS_USER) @@ -1836,6 +1836,9 @@ uint32_t le; uint32_t tmp; + if (!str && str_length > 0) + str_length = 0; + buffer += offset; if (str && !str_length) { tmp = strlen (str); @@ -2056,7 +2059,7 @@ inline static void set_uri_item (uri_item* list, int nitems, request_rec* r, int32_t id) { int i; - int uri_len; + int uri_len = 0; int args_len; for (i = 0; i < nitems; i++) { @@ -2215,7 +2218,6 @@ xsp_data *conf; uint32_t connect_attempts; uint32_t start_wait_time; - char *socket_name = NULL; int retrying, was_starting; int32_t id = -1; @@ -2244,7 +2246,6 @@ conf = &config->servers [idx]; ensure_dashboard_initialized (config, conf, pconf); - socket_name = get_unix_socket_path (r->pool, conf); connect_attempts = (uint32_t)string_to_long (conf->start_attempts, "MonoXSPStartAttempts", START_ATTEMPTS); start_wait_time = (uint32_t)string_to_long (conf->start_wait_time, "MonoXSPStartWaitTime", START_WAIT_TIME); if (start_wait_time < 2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.8/src/mod_mono.h new/mod_mono-2.10/src/mod_mono.h --- old/mod_mono-2.8/src/mod_mono.h 2010-09-30 17:19:04.000000000 +0200 +++ new/mod_mono-2.10/src/mod_mono.h 2011-01-13 23:32:35.000000000 +0100 @@ -147,7 +147,13 @@ LAST_COMMAND }; -static char *cmdNames [] = { +#ifdef __GNUC__ +#define UNUSED __attribute__ ((unused)) +#else +#define UNUSED +#endif + +static char UNUSED *cmdNames [] = { "SEND_FROM_MEMORY", "GET_SERVER_VARIABLES", "SET_RESPONSE_HEADERS", @@ -196,7 +202,7 @@ } #else #define DEBUG_PRINT dummy_print -static void +static void UNUSED dummy_print (int a, ...) { } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
