Changes - j0ke.net Open Build Service

Changes of Revision 11

[-] [+]	Changed	apache2-mod_rpaf.spec
@@ -22,7 +22,7 @@ %define apache_localstatedir %(%{apxs} -q LOCALSTATEDIR) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) Version: 0.6 -Release: 1 +Release: 2 License: Apache License Group: Productivity/Networking/Web/Servers Requires: apache2 %{apache_mmn} @@ -31,6 +31,7 @@ Url: http://stderr.net/apache/rpaf/ Source0: http://stderr.net/apache/rpaf/download/%{modname}-%{version}.tar.gz Source1: mod_rpaf.conf +Patch0: mod_rpaf-ipv6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,6 +40,7 @@ %debug_package %prep %setup -n %{modname}-%{version} +%patch0 -p1 %build %{apxs} -a -n %{modname}.so -c %{modname}-2.0.c @@ -57,5 +59,8 @@ %{apache_sysconfdir}/conf.d/%{modname}.conf %changelog +* Sat May 22 2010 Carsten Schoene <cs@linux-administrator.com> - 0.6-2 +- added IPv6 patch + * Sun Oct 31 2008 Carsten Schoene <cs@linux-administrator.com> - initial package (0.6) x 1 @@ -22,7 +22,7 @@ 2 %define apache_localstatedir %(%{apxs} -q LOCALSTATEDIR) 3 %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) 4 Version: 0.6 5 -Release: 1 6 +Release: 2 7 License: Apache License 8 Group: Productivity/Networking/Web/Servers 9 Requires: apache2 %{apache_mmn} 10 @@ -31,6 +31,7 @@ 11 Url: http://stderr.net/apache/rpaf/ 12 Source0: http://stderr.net/apache/rpaf/download/%{modname}-%{version}.tar.gz 13 Source1: mod_rpaf.conf 14 +Patch0: mod_rpaf-ipv6.patch 15 BuildRoot: %{_tmppath}/%{name}-%{version}-build 16 17 %description 18 @@ -39,6 +40,7 @@ 19 %debug_package 20 %prep 21 %setup -n %{modname}-%{version} 22 +%patch0 -p1 23 24 %build 25 %{apxs} -a -n %{modname}.so -c %{modname}-2.0.c 26 @@ -57,5 +59,8 @@ 27 %{apache_sysconfdir}/conf.d/%{modname}.conf 28 29 %changelog 30 +* Sat May 22 2010 Carsten Schoene <cs@linux-administrator.com> - 0.6-2 31 +- added IPv6 patch 32 + 33 * Sun Oct 31 2008 Carsten Schoene <cs@linux-administrator.com> 34 - initial package (0.6) 35
[-] [+]	Added	mod_rpaf-ipv6.patch ^
@@ -0,0 +1,23 @@ +diff -ur mod_rpaf-0.5/mod_rpaf.c mod_rpaf-0.5.ipv6/mod_rpaf.c +--- mod_rpaf-0.5/mod_rpaf.c 2004-03-17 17:47:30.000000000 +0200 ++++ mod_rpaf-0.5.ipv6/mod_rpaf.c 2006-01-05 18:18:09.000000000 +0200 +@@ -148,7 +148,18 @@ + ++fwdvalue; + } + r->connection->remote_ip = ap_pstrdup(r->connection->pool, ((char *)arr->elts)[((arr->nelts)-1)]); +- r->connection->remote_addr.sin_addr.s_addr = inet_addr(r->connection->remote_ip); ++ switch (r->connection->remote_addr.ss_family) { ++ case AF_INET: ++ inet_pton(AF_INET, r->connection->remote_ip, &((struct sockaddr_in)&r->connection->remote_addr)->sin_addr.s_addr); ++ break; ++ case AF_INET6: ++ inet_pton(AF_INET6, r->connection->remote_ip, ((struct sockaddr_in6)&r->connection->remote_addr)->sin6_addr.s6_addr); ++ break; ++ default: ++ ap_log_rerror(APLOG_MARK, APLOG_DEBUG\|APLOG_NOERRNO, r, "Apache doesn't support this address family"); ++ break; ++ } ++ + if (cfg->sethostname) { + const char hostvalue; + if (hostvalue = ap_table_get(r->headers_in, "X-Forwarded-Host")) {