[packages/apache-mod_pagespeed/dev-1.8: 1/11] up to 1.8.31.5
glen
glen at pld-linux.org
Tue Jan 27 17:30:42 CET 2015
commit ffebf8bc2d2430006100840e08dbc956895db256
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Dec 15 20:54:00 2014 +0200
up to 1.8.31.5
apache-mod_pagespeed.spec | 13 ++++----
bug-632.patch | 83 ++++++++++++++++++++++++++++++++++++-----------
gcc-headers.patch | 10 ------
opencv.patch | 12 -------
4 files changed, 70 insertions(+), 48 deletions(-)
---
diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index 65f02b3..e087ebd 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -18,22 +18,23 @@
%define apxs %{_sbindir}/apxs
Summary: Apache module for rewriting web pages to reduce latency and bandwidth
Name: apache-mod_%{mod_name}
-Version: 1.5.27.2
-Release: 3
+# beta: 1.9.32.2-beta
+# stable: 1.8.31.5
+Version: 1.8.31.5
+Release: 0.6
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: modpagespeed-%{version}.tar.xz
-# Source0-md5: fa8d6a80fc4ca7f929910fa4eeb4a941
+# Source0-md5: ce0f27b177fba51f6b9f08fed8134709
Source1: get-source.sh
Source2: gclient.conf
Patch0: system-libs.patch
-Patch1: gcc-headers.patch
Patch2: bug-632.patch
-Patch3: opencv.patch
Patch4: no-dev-stdout.patch
URL: https://developers.google.com/speed/pagespeed/module
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.2
+BuildRequires: bash
BuildRequires: glib2-devel
BuildRequires: gperf
BuildRequires: libselinux-devel
@@ -73,9 +74,7 @@ site is maintained.
%prep
%setup -q -n modpagespeed-%{version}
%patch0 -p2
-%patch1 -p2
%patch2 -p1
-%patch3 -p3
%patch4 -p1
%build
diff --git a/bug-632.patch b/bug-632.patch
index 59bf80c..1fb5415 100644
--- a/bug-632.patch
+++ b/bug-632.patch
@@ -1,8 +1,19 @@
https://code.google.com/p/modpagespeed/issues/detail?id=632
---- modpagespeed-1.5.27.2/install/Makefile 2013-05-03 15:33:46.493803262 +0300
-+++ modpagespeed-1.5.27.2/install/Makefile 2013-05-03 16:15:38.104831966 +0300
-@@ -186,154 +186,154 @@
+patterns used (vim):
+
+update pattern to remove prefixes
+:%s,\^\\#\([A-Z_]*\)$,s/&//,
+
+update pattern to remove whole lines:
+:%s,\^\\#\([A-Z_]*\)\.\*\\n,/^\\#\1/d,
+
+update subst lines
+:%s#-e "s@\$(\([A-Z_]*_PATTERN\))@@"#-e "$(\1)"#
+
+--- modpagespeed-1.8.31.5/install/Makefile~ 2014-12-14 16:05:55.000000000 +0200
++++ modpagespeed-1.8.31.5/install/Makefile 2014-12-14 16:12:55.900374377 +0200
+@@ -190,176 +190,176 @@
ifeq ($(STRESS_TEST),1)
# remove prefix
@@ -74,6 +85,16 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
+ MEMCACHED_TEST_SED_PATTERN=/^\#MEMCACHED/d
endif
+ ifeq ($(IPRO_PRESERVE_COVERAGE_TEST),1)
+ # remove prefix
+- IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE
++ IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=s/^\#IPRO_PRESERVE_COVERAGE//
+ else
+ # remove whole line
+- IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE.*\n
++ IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=/^\#IPRO_PRESERVE_COVERAGE/d
+ endif
+
ifeq ($(MEMCACHE_COVERAGE_TEST),1)
# remove prefix
- MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE
@@ -94,6 +115,24 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
+ PURGING_COVERAGE_TEST_SED_PATTERN=/^\#PURGING_COVERAGE/d
endif
+ ifeq ($(IUR_COVERAGE_TEST),1)
+ # remove prefix
+- IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE
++ IUR_COVERAGE_TEST_SED_PATTERN=s/^\#IUR_COVERAGE//
+ # remove whole explicit domain authorization line
+- DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE.*\n
++ DOMAIN_AUTH_SED_PATTERN=/^\#DOMAIN_AUTH_COVERAGE/d
+ else
+ # remove whole line
+- IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE.*\n
++ IUR_COVERAGE_TEST_SED_PATTERN=/^\#IUR_COVERAGE/d
+ ifeq ($(COVERAGE_TRACE_TEST),1)
+ # remove prefix for explicit domain authorization line
+- DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE
++ DOMAIN_AUTH_SED_PATTERN=s/^\#DOMAIN_AUTH_COVERAGE//
+ endif
+ endif
+
ifeq ($(SPELING_TEST),1)
# remove prefix
- SPELING_TEST_SED_PATTERN=^\#SPELING
@@ -124,24 +163,24 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
+ GZIP_TEST_SED_PATTERN=/^\#GZIP/d
endif
- ifeq ($(FURIOUS_GA_TEST),1)
+ ifeq ($(EXPERIMENT_GA_TEST),1)
# remove prefix
-- FURIOUS_GA_TEST_SED_PATTERN=^\#FURIOUS_GA
-+ FURIOUS_GA_TEST_SED_PATTERN=s/^\#FURIOUS_GA//
+- EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA
++ EXPERIMENT_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_GA//
else
# remove whole line
-- FURIOUS_GA_TEST_SED_PATTERN=^\#FURIOUS_GA.*\n
-+ FURIOUS_GA_TEST_SED_PATTERN=/^\#FURIOUS_GA/d
+- EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA.*\n
++ EXPERIMENT_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_GA/d
endif
- ifeq ($(FURIOUS_NO_GA_TEST),1)
+ ifeq ($(EXPERIMENT_NO_GA_TEST),1)
# remove prefix
-- FURIOUS_NO_GA_TEST_SED_PATTERN=^\#FURIOUS_NO_GA
-+ FURIOUS_NO_GA_TEST_SED_PATTERN=s/^\#FURIOUS_NO_GA//
+- EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA
++ EXPERIMENT_NO_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_NO_GA//
else
# remove whole line
-- FURIOUS_NO_GA_TEST_SED_PATTERN=^\#FURIOUS_NO_GA.*\n
-+ FURIOUS_NO_GA_TEST_SED_PATTERN=/^\#FURIOUS_NO_GA/d
+- EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA.*\n
++ EXPERIMENT_NO_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_NO_GA/d
endif
ifeq ($(HTTPS_TEST),1)
@@ -195,10 +234,10 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
endif
# Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
-@@ -351,24 +351,24 @@
- -e "s@# ModPagespeedSlurpDirectory ...@$(APACHE_SLURP_DIR_COMMAND)@g" \
+@@ -381,27 +381,27 @@
-e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
-e "s|@@TMP_SLURP_DIR@@|$(TMP_SLURP_DIR)|g" \
+ -e "s|@@MEMCACHED_PORT@@|$(MEMCACHED_PORT)|g" \
- -e "s@$(STRESS_TEST_SED_PATTERN)@@" \
- -e "s@$(REWRITE_TEST_SED_PATTERN)@@" \
- -e "s@$(COVERAGE_TEST_SED_PATTERN)@@" \
@@ -207,12 +246,15 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
- -e "s@$(SHARED_MEM_LOCK_TEST_SED_PATTERN)@@" \
- -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
- -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
+- -e "s@$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)@@" \
- -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
- -e "s@$(PURGING_COVERAGE_TEST_SED_PATTERN)@@" \
+- -e "s@$(IUR_COVERAGE_TEST_SED_PATTERN)@@" \
+- -e "s@$(DOMAIN_AUTH_SED_PATTERN)@@" \
- -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
- -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
-- -e "s@$(FURIOUS_GA_TEST_SED_PATTERN)@@" \
-- -e "s@$(FURIOUS_NO_GA_TEST_SED_PATTERN)@@" \
+- -e "s@$(EXPERIMENT_GA_TEST_SED_PATTERN)@@" \
+- -e "s@$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)@@" \
- -e "s@$(ALL_DIRECTIVES_TEST_SED_PATTERN)@@" \
- -e "s@$(PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
- -e "s@$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
@@ -225,12 +267,15 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
+ -e "$(SHARED_MEM_LOCK_TEST_SED_PATTERN)" \
+ -e "$(SPELING_TEST_SED_PATTERN)" \
+ -e "$(MEMCACHED_TEST_SED_PATTERN)" \
++ -e "$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)" \
+ -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
+ -e "$(PURGING_COVERAGE_TEST_SED_PATTERN)" \
++ -e "$(IUR_COVERAGE_TEST_SED_PATTERN)" \
++ -e "$(DOMAIN_AUTH_SED_PATTERN)" \
+ -e "$(GZIP_TEST_SED_PATTERN)" \
+ -e "$(HTTPS_TEST_SED_PATTERN)" \
-+ -e "$(FURIOUS_GA_TEST_SED_PATTERN)" \
-+ -e "$(FURIOUS_NO_GA_TEST_SED_PATTERN)" \
++ -e "$(EXPERIMENT_GA_TEST_SED_PATTERN)" \
++ -e "$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)" \
+ -e "$(ALL_DIRECTIVES_TEST_SED_PATTERN)" \
+ -e "$(PER_VHOST_STATS_TEST_SED_PATTERN)" \
+ -e "$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)" \
diff --git a/gcc-headers.patch b/gcc-headers.patch
deleted file mode 100644
index 7404ab8..0000000
--- a/gcc-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- modpagespeed/src/net/instaweb/util/hostname_util.cc~ 2013-03-02 01:53:18.000000000 +0200
-+++ modpagespeed/src/net/instaweb/util/hostname_util.cc 2013-03-02 11:28:01.761343397 +0200
-@@ -19,6 +19,7 @@
- #include "net/instaweb/util/public/hostname_util.h"
-
- #include <limits.h>
-+#include <unistd.h>
- // The following break portability.
-
- // Windows doesn't use <unistd.h> nor does it define HOST_NAME_MAX.
diff --git a/opencv.patch b/opencv.patch
deleted file mode 100644
index 7d5c548..0000000
--- a/opencv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-#PATCH-FIX-UPSTREAM fix-pkg-config-opencv-flags.patch -- https://groups.google.com/d/msg/mod-pagespeed-discuss/7gFC8mW3_2Q/vhkHbJgZg30J
---- apache-mod_pagespeed/modpagespeed/src/third_party/opencv/opencv.gyp~ 2013-03-02 14:27:03.587319085 +0200
-+++ apache-mod_pagespeed/modpagespeed/src/third_party/opencv/opencv.gyp 2013-03-02 14:58:26.304299923 +0200
-@@ -190,7 +190,7 @@
- '<!@(pkg-config --libs-only-L --libs-only-other opencv)',
- ],
- 'libraries': [
-- '<!@(pkg-config --libs-only-l opencv)',
-+ '<!@(pkg-config --libs opencv)',
- ],
- },
- },
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_pagespeed.git/commitdiff/a16986b10ae569ebade10e6ef3967d3663786ec1
More information about the pld-cvs-commit
mailing list