Hello community, here is the log from the commit of package apache2-mod_mono for openSUSE:Factory checked in at 2013-01-30 22:17:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_mono (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_mono.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_mono", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_mono/apache2-mod_mono.changes 2011-09-23 01:51:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2-mod_mono.new/apache2-mod_mono.changes 2013-01-30 22:17:49.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 30 15:22:31 UTC 2013 - [email protected] + +- Add apache2-mod_mono-apache24.patch: Fix build with Apache 2.4 +- Add libtool BuildRequires and call to autoreconf, as above patch + touches the build system. + +------------------------------------------------------------------- New: ---- apache2-mod_mono-apache24.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_mono.spec ++++++ --- /var/tmp/diff_new_pack.11jIFS/_old 2013-01-30 22:17:51.000000000 +0100 +++ /var/tmp/diff_new_pack.11jIFS/_new 2013-01-30 22:17:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_mono # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -16,7 +16,6 @@ # - Name: apache2-mod_mono %define apxs /usr/sbin/apxs2 %define apache2_sysconfdir %(%{apxs} -q SYSCONFDIR)/conf.d @@ -25,21 +24,25 @@ %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-2.0 -Group: Productivity/Networking/Web/Servers Version: 2.10 -Release: 2 +Release: 0 Summary: Run ASP.NET Pages on Unix with Apache and Mono +License: Apache-2.0 +Group: Productivity/Networking/Web/Servers Source: %{modname}-%{version}.tar.bz2 +Patch0: apache2-mod_mono-apache24.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mod_mono = %{version}-%{release} # This must be manually entered according to xsp's protocol version Requires: xsp >= %{version} +BuildRequires: libtool BuildRequires: pkg-config ############### Suse based options %if 0%{?suse_version} -BuildRequires: apache2-devel mono-devel -Requires: apache2 %{apache_mmn} +BuildRequires: apache2-devel +BuildRequires: mono-devel +Requires: %{apache_mmn} +Requires: apache2 %if %{suse_version} >= 1010 BuildRequires: libapr-util1-devel %endif @@ -49,7 +52,8 @@ %endif ############### redhat based options %if 0%{?fedora_version} || 0%{?rhel_version} -BuildRequires: httpd-devel pkgconfig +BuildRequires: httpd-devel +BuildRequires: pkgconfig Requires: httpd %endif @@ -62,8 +66,10 @@ %prep %setup -n %{modname}-%{version} -q +%patch0 -p1 %build +autoreconf -fiv %if 0%{?sles_version} == 10 %define _with_remove_display --with-remove-display %endif ++++++ apache2-mod_mono-apache24.patch ++++++ >From 6fe457dcd6d48ad4f3640071e24dcb20b0fbb15a Mon Sep 17 00:00:00 2001 From: Paul Schneider <[email protected]> Date: Tue, 18 Dec 2012 16:21:41 +0100 Subject: [PATCH] Making mod_mono compile for Apache 2.4.3 (Bug id 4908) --- configure.in | 14 ++++++++++++++ src/mod_mono.c | 39 +++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index d246273..6fa84b8 100644 --- a/configure.in +++ b/configure.in @@ -336,6 +336,16 @@ AC_TRY_RUN([ ], [ ]) +AC_TRY_RUN([ + #include <ap_release.h> + int main () + { + return (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 4) ? 0 : 1; + } +], [ + APACHE_VER=2.4 +], [ +]) fi if test ! "$APACHE_VER" = "1.3" -a ! "$APACHE_VER" = "retry" ; then @@ -385,6 +395,10 @@ if test "$APACHE_VER" = "2.2" ; then AC_DEFINE([APACHE22],,[Compiling for Apache >= 2.2 ]) fi +if test "$APACHE_VER" = "2.4" ; then + AC_DEFINE([APACHE24],,[Compiling for Apache >= 2.4 ]) +fi + # check for --with-mono-default-config-dir DFLT_MONO_CONFIG_DIR=`$APXS -q SYSCONFDIR`/mod-mono-applications AC_ARG_WITH(mono-default-config-dir, diff --git a/src/mod_mono.c b/src/mod_mono.c index 40e5041..ce57ad8 100644 --- a/src/mod_mono.c +++ b/src/mod_mono.c @@ -388,7 +388,11 @@ enum { apache_get_userid () { #ifdef HAVE_UNIXD - return unixd_config.user_id; +#if defined(APACHE24) + return ap_unixd_config.user_id; +#else + return unixd_config.user_id; +#endif #else return ap_user_id; #endif @@ -398,7 +402,11 @@ enum { apache_get_groupid () { #ifdef HAVE_UNIXD - return unixd_config.group_id; +#if defined(APACHE24) + return ap_unixd_config.user_id; +#else + return unixd_config.user_id; +#endif #else return ap_group_id; #endif @@ -408,7 +416,11 @@ enum { apache_get_username () { #ifdef HAVE_UNIXD +#if defined(APACHE24) + return ap_unixd_config.user_name; +#else return unixd_config.user_name; +#endif #else return ap_user_name; #endif @@ -487,7 +499,7 @@ enum { #if defined (AP_NEED_SET_MUTEX_PERMS) && defined (HAVE_UNIXD) DEBUG_PRINT (1, "Setting mutex permissions for %s", xsp->dashboard_lock_file); - rv = unixd_set_global_mutex_perms (xsp->dashboard_mutex); + rv = ap_unixd_set_global_mutex_perms (xsp->dashboard_mutex); if (rv != APR_SUCCESS) { ap_log_error (APLOG_MARK, APLOG_CRIT, STATCODE_AND_SERVER (rv), "Failed to set mutex permissions for %s", @@ -854,9 +866,13 @@ enum { #if defined(APACHE22) return c->remote_addr->port; #else +#if defined(APACHE20) apr_port_t port; apr_sockaddr_port_get (&port, c->remote_addr); return port; +#else + return c->client_addr->port; +#endif #endif } @@ -867,9 +883,13 @@ enum { #if defined(APACHE22) return r->connection->local_addr->port; #else +#if defined(APACHE20) apr_port_t port; apr_sockaddr_port_get (&port, r->connection->local_addr); return port; +#else + return r->connection->local_addr->port; +#endif #endif } @@ -1992,9 +2012,12 @@ enum { size += info.local_ip_len + sizeof (int32_t); size += sizeof (int32_t); - - info.remote_ip_len = strlen (r->connection->remote_ip); - size += info.remote_ip_len + sizeof (int32_t); +#if defined(APACHE24) + info.remote_ip_len = strlen (r->connection->client_ip); +#else + info.remote_ip_len = strlen (r->connection->remote_ip); +#endif + size += info.remote_ip_len + sizeof (int32_t); size += sizeof (int32_t); @@ -2041,7 +2064,11 @@ enum { i = LE_FROM_INT (i); memcpy (ptr, &i, sizeof (i)); ptr += sizeof (int32_t); +#if defined(APACHE24) + ptr += write_string_to_buffer (ptr, 0, r->connection->client_ip, info.remote_ip_len); +#else ptr += write_string_to_buffer (ptr, 0, r->connection->remote_ip, info.remote_ip_len); +#endif i = connection_get_remote_port (r->connection); i = LE_FROM_INT (i); memcpy (ptr, &i, sizeof (i)); -- 1.7.10 >From ce87d27104cf87215edfc0d8cf05d0b76606b956 Mon Sep 17 00:00:00 2001 From: Paul Schneider <[email protected]> Date: Tue, 18 Dec 2012 16:33:08 +0100 Subject: [PATCH] Last commit introducted a compilation error for Apache version < 2.4 --- src/mod_mono.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mod_mono.c b/src/mod_mono.c index ce57ad8..4f03273 100644 --- a/src/mod_mono.c +++ b/src/mod_mono.c @@ -499,8 +499,12 @@ enum { #if defined (AP_NEED_SET_MUTEX_PERMS) && defined (HAVE_UNIXD) DEBUG_PRINT (1, "Setting mutex permissions for %s", xsp->dashboard_lock_file); +#if defined(APACHE24) rv = ap_unixd_set_global_mutex_perms (xsp->dashboard_mutex); - if (rv != APR_SUCCESS) { +#else + rv = unixd_set_global_mutex_perms (xsp->dashboard_mutex); +#endif + if (rv != APR_SUCCESS) { ap_log_error (APLOG_MARK, APLOG_CRIT, STATCODE_AND_SERVER (rv), "Failed to set mutex permissions for %s", xsp->dashboard_lock_file); -- 1.7.10 >From 2c7386122fbbccfe549d9028dd01dd612d90322b Mon Sep 17 00:00:00 2001 From: Paul Schneider <[email protected]> Date: Tue, 18 Dec 2012 17:18:59 +0100 Subject: [PATCH] Fix an introduced compilation error for Apache versions < 2.0 --- src/mod_mono.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mod_mono.c b/src/mod_mono.c index 4f03273..31bccc9 100644 --- a/src/mod_mono.c +++ b/src/mod_mono.c @@ -870,12 +870,12 @@ enum { #if defined(APACHE22) return c->remote_addr->port; #else -#if defined(APACHE20) +#if defined(APACHE24) + return c->client_addr->port; +#else apr_port_t port; apr_sockaddr_port_get (&port, c->remote_addr); return port; -#else - return c->client_addr->port; #endif #endif @@ -887,12 +887,12 @@ enum { #if defined(APACHE22) return r->connection->local_addr->port; #else -#if defined(APACHE20) +#if defined(APACHE24) + return r->connection->local_addr->port; +#else apr_port_t port; apr_sockaddr_port_get (&port, r->connection->local_addr); return port; -#else - return r->connection->local_addr->port; #endif #endif } -- 1.7.10 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
