up to 1.5.27.2

diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index d51482e829eaead27e26a7b709093c7753f0bca4..c94299734d0818224dddba27c27ed2aaf1857232 100644 (file)
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -24,12 +24,12 @@
 %define        apxs            %{_sbindir}/apxs
 Summary:       Apache module for rewriting web pages to reduce latency and bandwidth
 Name:          apache-mod_%{mod_name}
-Version:       1.4.26.1
-Release:       2
+Version:       1.5.27.2
+Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       modpagespeed-%{version}.tar.xz
-# Source0-md5: d2273ce11c3d382fc7e3755c57393237
+# Source0-md5: fa8d6a80fc4ca7f929910fa4eeb4a941
 Source1:       get-source.sh
 Source2:       gclient.conf
 Patch0:                system-libs.patch
@@ -83,7 +83,7 @@ site is maintained.
 %setup -q -n modpagespeed-%{version}
 %patch0 -p2
 %patch1 -p2
-%patch2 -p2
+%patch2 -p1
 %patch3 -p3
 
 %build

diff --git a/bug-632.patch b/bug-632.patch
index aca03bae8348e050f86096c1c10797e72b654b60..59bf80c5cc82e3fd40cad5e18fc8eca70dbdb234 100644 (file)
--- a/bug-632.patch
+++ b/bug-632.patch
@@ -1,8 +1,8 @@
 https://code.google.com/p/modpagespeed/issues/detail?id=632
 
---- modpagespeed/src/install/Makefile~ 2013-03-02 13:19:46.590881666 +0200
-+++ modpagespeed/src/install/Makefile  2013-03-02 13:56:57.010557918 +0200
-@@ -180,10 +180,10 @@
+--- 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 @@
  
  ifeq ($(STRESS_TEST),1)
    # remove prefix
@@ -15,7 +15,14 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
  endif
  
  ifeq ($(REWRITE_TEST),1)
-@@ -196,130 +196,130 @@
+   # remove prefix
+-  REWRITE_TEST_SED_PATTERN=^\#REWRITE
++  REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
+ else
+   # remove whole line
+-  REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
++  REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
+ endif
  
  ifeq ($(COVERAGE_TRACE_TEST),1)
    # remove coverage prefix
@@ -77,6 +84,16 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
 +  MEMCACHE_COVERAGE_TEST_SED_PATTERN=/^\#MEMCACHE_COVERAGE/d
  endif
  
+ ifeq ($(PURGING_COVERAGE_TEST),1)
+   # remove prefix
+-  PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE
++  PURGING_COVERAGE_TEST_SED_PATTERN=s/^\#PURGING_COVERAGE//
+ else
+   # remove whole line
+-  PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE.*\n
++  PURGING_COVERAGE_TEST_SED_PATTERN=/^\#PURGING_COVERAGE/d
+ endif
+ 
  ifeq ($(SPELING_TEST),1)
    # remove prefix
 -  SPELING_TEST_SED_PATTERN=^\#SPELING
@@ -178,7 +195,7 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
  endif
  
  # Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
-@@ -336,23 +336,23 @@
+@@ -351,24 +351,24 @@
            -e "s@# ModPagespeedSlurpDirectory ...@$(APACHE_SLURP_DIR_COMMAND)@g" \
            -e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
            -e "s|@@TMP_SLURP_DIR@@|$(TMP_SLURP_DIR)|g" \
@@ -191,6 +208,7 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
 -          -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
 -          -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
 -          -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
+-          -e "s@$(PURGING_COVERAGE_TEST_SED_PATTERN)@@" \
 -          -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
 -          -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
 -          -e "s@$(FURIOUS_GA_TEST_SED_PATTERN)@@" \
@@ -208,6 +226,7 @@ https://code.google.com/p/modpagespeed/issues/detail?id=632
 +          -e "$(SPELING_TEST_SED_PATTERN)" \
 +          -e "$(MEMCACHED_TEST_SED_PATTERN)" \
 +          -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
++          -e "$(PURGING_COVERAGE_TEST_SED_PATTERN)" \
 +          -e "$(GZIP_TEST_SED_PATTERN)" \
 +          -e "$(HTTPS_TEST_SED_PATTERN)" \
 +          -e "$(FURIOUS_GA_TEST_SED_PATTERN)" \

diff --git a/gclient.conf b/gclient.conf
index b8433d17d0547ea4d25bd85cc6c2851a074c8d17..5d0e2dcfdbc74e31df5a57ff29d149f647e5810a 100644 (file)
--- a/gclient.conf
+++ b/gclient.conf
@@ -1,6 +1,6 @@
 solutions = [
   { "name"        : "src",
-    "url"         : "http://modpagespeed.googlecode.com/svn/tags/0.10.22.7/src",
+    "url"         : "http://modpagespeed.googlecode.com/svn/tags/1.5.27.2/src",
     "deps_file"   : "DEPS",
     "managed"     : True,
 

diff --git a/get-source.sh b/get-source.sh
index cf72b98632a6e5e4a088496f1958ef5baca42ca7..79b24f115807ab7b4cad3ae3b4d2a74d354c99f5 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -84,7 +84,7 @@ sed -i -re '/"url"/ s,"http[^"]+","'$svnurl'",' .gclient
 ../depot_tools/gclient sync --nohooks -v
 
 # Populate the LASTCHANGE file template as we will not include VCS info in tarball
-(cd src && svnversion > LASTCHANGE.in)
+(cd src && ./build/lastchange.sh . -o LASTCHANGE.in)
 cd ..
 
 XZ_OPT=-e9 \