robert pushed to mod_geoip (el5). "Merge remote branch 'origin/master' into el5"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 23 11:20:39 UTC 2015
>From 0c1d5907bd1b210d02e2593a23946d3225bf95ee Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Thu, 14 Feb 2013 01:20:44 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/mod_geoip.spec b/mod_geoip.spec
index 89f959e..b0aa235 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.spec
@@ -8,7 +8,7 @@
Summary: GeoIP module for the Apache HTTP Server
Name: mod_geoip
Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: ASL 1.1
URL: http://www.maxmind.com/app/mod_geoip
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sat Nov 17 2012 Robert Scheck <robert at fedoraproject.org> 1.2.7-1
- Upgrade to 1.2.7
- Updated spec file to match with Apache 2.4 policy (#809698)
--
cgit v0.10.2
>From c93e53a42bcf26f6667f4fcef25cd9ad2d3858f6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 3 Aug 2013 06:31:35 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/mod_geoip.spec b/mod_geoip.spec
index b0aa235..31f286d 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.spec
@@ -8,7 +8,7 @@
Summary: GeoIP module for the Apache HTTP Server
Name: mod_geoip
Version: 1.2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: ASL 1.1
URL: http://www.maxmind.com/app/mod_geoip
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
cgit v0.10.2
>From 1d8eb7bd196fdd9f0f1e075f701a0c309bd4cf76 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton at redhat.com>
Date: Thu, 23 Jan 2014 10:54:09 +0000
Subject: fix _httpd_mmn expansion in absence of httpd-devel
diff --git a/mod_geoip.spec b/mod_geoip.spec
index 31f286d..de503fb 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.spec
@@ -1,5 +1,5 @@
%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
-%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
@@ -8,7 +8,7 @@
Summary: GeoIP module for the Apache HTTP Server
Name: mod_geoip
Version: 1.2.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Daemons
License: ASL 1.1
URL: http://www.maxmind.com/app/mod_geoip
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.2.7-4
+- fix _httpd_mmn expansion in absence of httpd-devel
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--
cgit v0.10.2
>From 91e8909c3e55fa11646e97ea5df61cc90ea25bd4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 7 Jun 2014 05:45:36 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/mod_geoip.spec b/mod_geoip.spec
index de503fb..a4d7d84 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.spec
@@ -8,7 +8,7 @@
Summary: GeoIP module for the Apache HTTP Server
Name: mod_geoip
Version: 1.2.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: System Environment/Daemons
License: ASL 1.1
URL: http://www.maxmind.com/app/mod_geoip
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.2.7-4
- fix _httpd_mmn expansion in absence of httpd-devel
--
cgit v0.10.2
>From 375d73c34cdd10f725f0c547bc5342d310be836e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sun, 17 Aug 2014 09:57:56 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/mod_geoip.spec b/mod_geoip.spec
index a4d7d84..9544bf3 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.spec
@@ -8,7 +8,7 @@
Summary: GeoIP module for the Apache HTTP Server
Name: mod_geoip
Version: 1.2.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Daemons
License: ASL 1.1
URL: http://www.maxmind.com/app/mod_geoip
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
>From e06f5d7cb5eb215d8cbc05341a5973ad5a6bb120 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Thu, 23 Apr 2015 13:02:22 +0200
Subject: Upgrade to 1.2.10 (#1214493)
diff --git a/.gitignore b/.gitignore
index 4f1c4ba..768a150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-mod_geoip2_1.2.?.tar.gz
+/mod_geoip2_1.2.*.tar.gz
+/1.2.*.tar.gz
diff --git a/10-geoip.conf b/10-geoip.conf
new file mode 100644
index 0000000..1b70122
--- /dev/null
+++ b/10-geoip.conf
@@ -0,0 +1 @@
+LoadModule geoip_module modules/mod_geoip.so
diff --git a/geoip.conf b/geoip.conf
new file mode 100644
index 0000000..5bcf9a0
--- /dev/null
+++ b/geoip.conf
@@ -0,0 +1,4 @@
+<IfModule mod_geoip.c>
+ GeoIPEnable On
+ GeoIPDBFile /usr/share/GeoIP/GeoIP.dat
+</IfModule>
diff --git a/mod_geoip-1.2.5-httpd24.patch b/mod_geoip-1.2.5-httpd24.patch
deleted file mode 100644
index 563e35b..0000000
--- a/mod_geoip-1.2.5-httpd24.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mod_geoip.c.geoip
-+++ mod_geoip.c
-@@ -66,6 +66,7 @@
- #include "http_config.h"
- #include "http_protocol.h"
- #include "http_log.h"
-+#include "util_script.h"
- #include "ap_config.h"
- #include "apr_strings.h"
- #include <GeoIP.h>
-@@ -320,7 +321,11 @@
- return DECLINED;
-
- if (!cfg->scanProxyHeaders) {
-+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
-+ ipaddr = r->useragent_ip;
-+#else
- ipaddr = r->connection->remote_ip;
-+#endif
- }
- else {
- ap_add_common_vars(r);
-@@ -338,7 +343,11 @@
- }
- if (!ipaddr_ptr) {
- ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: Error while getting ipaddr from proxy headers. Using REMOTE_ADDR.");
-- ipaddr = r->connection->remote_ip;
-+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
-+ ipaddr = r->useragent_ip;
-+#else
-+ ipaddr = r->connection->remote_ip;
-+#endif
- }
- else {
- ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: IPADDR_PTR: %s", ipaddr_ptr);
diff --git a/mod_geoip.spec b/mod_geoip.spec
index 9544bf3..f8029c3 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.spec
@@ -7,13 +7,14 @@
Summary: GeoIP module for the Apache HTTP Server
Name: mod_geoip
-Version: 1.2.7
-Release: 6%{?dist}
+Version: 1.2.10
+Release: 1%{?dist}
Group: System Environment/Daemons
License: ASL 1.1
-URL: http://www.maxmind.com/app/mod_geoip
-Source: http://www.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_%{version}.tar.gz
-Patch0: mod_geoip-1.2.5-httpd24.patch
+URL: http://dev.maxmind.com/geoip/legacy/mod_geoip2/
+Source0: https://github.com/maxmind/geoip-api-mod_geoip2/archive/%{version}.tar.gz
+Source1: 10-geoip.conf
+Source2: geoip.conf
BuildRequires: httpd-devel, GeoIP-devel >= 1.4.3
Requires: GeoIP%{?_isa}, httpd-mmn = %{_httpd_mmn}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,8 +26,7 @@ and database to perform the lookup. It is free software, licensed under
the Apache license.
%prep
-%setup -q -n mod_geoip2_%{version}
-%patch0 -p0 -b .geoip
+%setup -q -n geoip-api-mod_geoip2-%{version}
%build
%{_httpd_apxs} -Wc,-Wall -Wl,"-lGeoIP" -c %{name}.c
@@ -35,27 +35,17 @@ the Apache license.
rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 .libs/%{name}.so $RPM_BUILD_ROOT%{_httpd_moddir}/%{name}.so
-cat << EOF > 10-geoip.conf
-LoadModule geoip_module modules/mod_geoip.so
-EOF
-
-cat << EOF > geoip.conf
-<IfModule mod_geoip.c>
- GeoIPEnable On
- GeoIPDBFile /usr/share/GeoIP/GeoIP.dat
-</IfModule>
-EOF
-
%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
# httpd <= 2.2.x
-cat 10-geoip.conf > unified.conf
+cat %{SOURCE1} > unified.conf
echo >> unified.conf
-cat geoip.conf >> unified.conf
+cat %{SOURCE2} >> unified.conf
+touch -c -r %{SOURCE1} unified.conf
install -D -p -m 644 unified.conf $RPM_BUILD_ROOT%{_httpd_confdir}/geoip.conf
%else
# httpd >= 2.4.x
-install -D -p -m 644 10-geoip.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-geoip.conf
-install -D -p -m 644 geoip.conf $RPM_BUILD_ROOT%{_httpd_confdir}/geoip.conf
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-geoip.conf
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_httpd_confdir}/geoip.conf
%endif
%clean
@@ -63,7 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc INSTALL README* Changes
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc Changes INSTALL.md README.*
%{_httpd_moddir}/%{name}.so
%config(noreplace) %{_httpd_confdir}/geoip.conf
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
@@ -71,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Apr 23 2015 Robert Scheck <robert at fedoraproject.org> 1.2.10-1
+- Upgrade to 1.2.10 (#1214493)
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 7508eb3..82fa6a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76514ad0e8adb8cd8231c5e3646d03fd mod_geoip2_1.2.7.tar.gz
+c2b564cfd2bcb8527304f20818f29443 1.2.10.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mod_geoip.git/commit/?h=el5&id=9b99e3a10c5dbaceada9f8c4410e12da4145e76f
More information about the scm-commits
mailing list