bug-632.patch

   1 https://code.google.com/p/modpagespeed/issues/detail?id=632
   2
   3 patterns used (vim):
   4
   5 update pattern to remove prefixes
   6 :%s,\^\\#\([A-Z_]*\)$,s/&//,
   7
   8 update pattern to remove whole lines:
   9 :%s,\^\\#\([A-Z_]*\)\.\*\\n,/^\\#\1/d,
  10
  11 update subst lines
  12 :%s#-e "s@\$(\([A-Z_]*_PATTERN\))@@"#-e "$(\1)"#
  13
  14 --- modpagespeed-1.8.31.5/install/Makefile~     2014-12-14 16:05:55.000000000 +0200
  15 +++ modpagespeed-1.8.31.5/install/Makefile      2014-12-14 16:12:55.900374377 +0200
  16 @@ -190,176 +190,176 @@
  17
  18  ifeq ($(STRESS_TEST),1)
  19    # remove prefix
  20 -  STRESS_TEST_SED_PATTERN=^\#STRESS
  21 +  STRESS_TEST_SED_PATTERN=s/^\#STRESS//
  22  else
  23    # remove whole line
  24 -  STRESS_TEST_SED_PATTERN=^\#STRESS.*\n
  25 +  STRESS_TEST_SED_PATTERN=/^\#STRESS/d
  26  endif
  27
  28  ifeq ($(REWRITE_TEST),1)
  29    # remove prefix
  30 -  REWRITE_TEST_SED_PATTERN=^\#REWRITE
  31 +  REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
  32  else
  33    # remove whole line
  34 -  REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
  35 +  REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
  36  endif
  37
  38  ifeq ($(COVERAGE_TRACE_TEST),1)
  39    # remove coverage prefix
  40 -  COVERAGE_TEST_SED_PATTERN=^\#COVERAGE
  41 +  COVERAGE_TEST_SED_PATTERN=s/^\#COVERAGE//
  42  else
  43    # remove coverage lines
  44 -  COVERAGE_TEST_SED_PATTERN=^\#COVERAGE.*\n
  45 +  COVERAGE_TEST_SED_PATTERN=/^\#COVERAGE/d
  46  endif
  47
  48  ifeq ($(PROXY_TEST),1)
  49    # remove prefix
  50 -  PROXY_TEST_SED_PATTERN=^\#PROXY
  51 +  PROXY_TEST_SED_PATTERN=s/^\#PROXY//
  52  else
  53    # remove whole line
  54 -  PROXY_TEST_SED_PATTERN=^\#PROXY.*\n
  55 +  PROXY_TEST_SED_PATTERN=/^\#PROXY/d
  56  endif
  57
  58  ifeq ($(SLURP_TEST),1)
  59    # remove prefix
  60 -  SLURP_TEST_SED_PATTERN=^\#SLURP
  61 +  SLURP_TEST_SED_PATTERN=s/^\#SLURP//
  62  else
  63    # remove whole line
  64 -  SLURP_TEST_SED_PATTERN=^\#SLURP.*\n
  65 +  SLURP_TEST_SED_PATTERN=/^\#SLURP/d
  66  endif
  67
  68  ifeq ($(SHARED_MEM_LOCK_TEST),1)
  69    # remove prefix
  70 -  SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS
  71 +  SHARED_MEM_LOCK_TEST_SED_PATTERN=s/^\#SHARED_MEM_LOCKS//
  72  else
  73    # remove whole line
  74 -  SHARED_MEM_LOCK_TEST_SED_PATTERN=^\#SHARED_MEM_LOCKS.*\n
  75 +  SHARED_MEM_LOCK_TEST_SED_PATTERN=/^\#SHARED_MEM_LOCKS/d
  76  endif
  77
  78  ifeq ($(MEMCACHED_TEST),1)
  79    # remove prefix
  80 -  MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED
  81 +  MEMCACHED_TEST_SED_PATTERN=s/^\#MEMCACHED//
  82  else
  83    # remove whole line
  84 -  MEMCACHED_TEST_SED_PATTERN=^\#MEMCACHED.*\n
  85 +  MEMCACHED_TEST_SED_PATTERN=/^\#MEMCACHED/d
  86  endif
  87
  88  ifeq ($(IPRO_PRESERVE_COVERAGE_TEST),1)
  89    # remove prefix
  90 -  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE
  91 +  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=s/^\#IPRO_PRESERVE_COVERAGE//
  92  else
  93    # remove whole line
  94 -  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=^\#IPRO_PRESERVE_COVERAGE.*\n
  95 +  IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN=/^\#IPRO_PRESERVE_COVERAGE/d
  96  endif
  97
  98  ifeq ($(MEMCACHE_COVERAGE_TEST),1)
  99    # remove prefix
 100 -  MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE
 101 +  MEMCACHE_COVERAGE_TEST_SED_PATTERN=s/^\#MEMCACHE_COVERAGE//
 102  else
 103    # remove whole line
 104 -  MEMCACHE_COVERAGE_TEST_SED_PATTERN=^\#MEMCACHE_COVERAGE.*\n
 105 +  MEMCACHE_COVERAGE_TEST_SED_PATTERN=/^\#MEMCACHE_COVERAGE/d
 106  endif
 107
 108  ifeq ($(PURGING_COVERAGE_TEST),1)
 109    # remove prefix
 110 -  PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE
 111 +  PURGING_COVERAGE_TEST_SED_PATTERN=s/^\#PURGING_COVERAGE//
 112  else
 113    # remove whole line
 114 -  PURGING_COVERAGE_TEST_SED_PATTERN=^\#PURGING_COVERAGE.*\n
 115 +  PURGING_COVERAGE_TEST_SED_PATTERN=/^\#PURGING_COVERAGE/d
 116  endif
 117
 118  ifeq ($(IUR_COVERAGE_TEST),1)
 119    # remove prefix
 120 -  IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE
 121 +  IUR_COVERAGE_TEST_SED_PATTERN=s/^\#IUR_COVERAGE//
 122    # remove whole explicit domain authorization line
 123 -  DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE.*\n
 124 +  DOMAIN_AUTH_SED_PATTERN=/^\#DOMAIN_AUTH_COVERAGE/d
 125  else
 126    # remove whole line
 127 -  IUR_COVERAGE_TEST_SED_PATTERN=^\#IUR_COVERAGE.*\n
 128 +  IUR_COVERAGE_TEST_SED_PATTERN=/^\#IUR_COVERAGE/d
 129    ifeq ($(COVERAGE_TRACE_TEST),1)
 130      # remove prefix for explicit domain authorization line
 131 -    DOMAIN_AUTH_SED_PATTERN=^\#DOMAIN_AUTH_COVERAGE
 132 +    DOMAIN_AUTH_SED_PATTERN=s/^\#DOMAIN_AUTH_COVERAGE//
 133    endif
 134  endif
 135
 136  ifeq ($(SPELING_TEST),1)
 137    # remove prefix
 138 -  SPELING_TEST_SED_PATTERN=^\#SPELING
 139 +  SPELING_TEST_SED_PATTERN=s/^\#SPELING//
 140  else
 141    # remove whole line
 142 -  SPELING_TEST_SED_PATTERN=^\#SPELING.*\n
 143 +  SPELING_TEST_SED_PATTERN=/^\#SPELING/d
 144  endif
 145
 146  ifeq ($(REWRITE_TEST),1)
 147    # remove prefix
 148 -  REWRITE_TEST_SED_PATTERN=^\#REWRITE
 149 +  REWRITE_TEST_SED_PATTERN=s/^\#REWRITE//
 150  else
 151    # remove whole line
 152 -  REWRITE_TEST_SED_PATTERN=^\#REWRITE.*\n
 153 +  REWRITE_TEST_SED_PATTERN=/^\#REWRITE/d
 154  endif
 155
 156  ifeq ($(GZIP_TEST),1)
 157    # remove prefix
 158 -  GZIP_TEST_SED_PATTERN=^\#GZIP
 159 +  GZIP_TEST_SED_PATTERN=s/^\#GZIP//
 160  else
 161    # remove whole line
 162 -  GZIP_TEST_SED_PATTERN=^\#GZIP.*\n
 163 +  GZIP_TEST_SED_PATTERN=/^\#GZIP/d
 164  endif
 165
 166  ifeq ($(EXPERIMENT_GA_TEST),1)
 167    # remove prefix
 168 -  EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA
 169 +  EXPERIMENT_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_GA//
 170  else
 171    # remove whole line
 172 -  EXPERIMENT_GA_TEST_SED_PATTERN=^\#EXPERIMENT_GA.*\n
 173 +  EXPERIMENT_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_GA/d
 174  endif
 175
 176  ifeq ($(EXPERIMENT_NO_GA_TEST),1)
 177    # remove prefix
 178 -  EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA
 179 +  EXPERIMENT_NO_GA_TEST_SED_PATTERN=s/^\#EXPERIMENT_NO_GA//
 180  else
 181    # remove whole line
 182 -  EXPERIMENT_NO_GA_TEST_SED_PATTERN=^\#EXPERIMENT_NO_GA.*\n
 183 +  EXPERIMENT_NO_GA_TEST_SED_PATTERN=/^\#EXPERIMENT_NO_GA/d
 184  endif
 185
 186  ifeq ($(HTTPS_TEST),1)
 187    # remove prefix
 188 -  HTTPS_TEST_SED_PATTERN=^\#HTTPS
 189 +  HTTPS_TEST_SED_PATTERN=s/^\#HTTPS//
 190  else
 191    # remove whole line
 192 -  HTTPS_TEST_SED_PATTERN=^\#HTTPS.*\n
 193 +  HTTPS_TEST_SED_PATTERN=/^\#HTTPS/d
 194  endif
 195
 196  ifeq ($(ALL_DIRECTIVES_TEST),1)
 197    # remove prefix
 198 -  ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES
 199 +  ALL_DIRECTIVES_TEST_SED_PATTERN=s/^\#ALL_DIRECTIVES//
 200  else
 201    # remove whole line
 202 -  ALL_DIRECTIVES_TEST_SED_PATTERN=^\#ALL_DIRECTIVES.*\n
 203 +  ALL_DIRECTIVES_TEST_SED_PATTERN=/^\#ALL_DIRECTIVES/d
 204  endif
 205
 206  ifeq ($(PER_VHOST_STATS_TEST),1)
 207    # remove prefix
 208 -  PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS
 209 +  PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#PER_VHOST_STATS//
 210  else
 211    # remove whole line
 212 -  PER_VHOST_STATS_TEST_SED_PATTERN=^\#PER_VHOST_STATS.*\n
 213 +  PER_VHOST_STATS_TEST_SED_PATTERN=/^\#PER_VHOST_STATS/d
 214  endif
 215
 216  ifeq ($(NO_PER_VHOST_STATS_TEST),1)
 217    # remove prefix
 218 -  NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS
 219 +  NO_PER_VHOST_STATS_TEST_SED_PATTERN=s/^\#NO_PER_VHOST_STATS//
 220  else
 221    # remove whole line
 222 -  NO_PER_VHOST_STATS_TEST_SED_PATTERN=^\#NO_PER_VHOST_STATS.*\n
 223 +  NO_PER_VHOST_STATS_TEST_SED_PATTERN=/^\#NO_PER_VHOST_STATS/d
 224  endif
 225
 226  ifeq ($(STATS_LOGGING_TEST),1)
 227    # remove prefix
 228 -  STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING
 229 +  STATS_LOGGING_TEST_SED_PATTERN=s/^\#STATS_LOGGING//
 230  else
 231    # remove whole line
 232 -  STATS_LOGGING_TEST_SED_PATTERN=^\#STATS_LOGGING.*\n
 233 +  STATS_LOGGING_TEST_SED_PATTERN=/^\#STATS_LOGGING/d
 234  endif
 235
 236  # Note that the quoted sed replacement for APACHE_SLURP_DIR_COMMAND is because
 237 @@ -381,27 +381,27 @@
 238             -e "s@# ModPagespeedSlurpReadOnly on@$(APACHE_SLURP_READ_ONLY_COMMAND)@g" \
 239             -e "s|@@TMP_SLURP_DIR@@|$(TMP_SLURP_DIR)|g" \
 240             -e "s|@@MEMCACHED_PORT@@|$(MEMCACHED_PORT)|g" \
 241 -           -e "s@$(STRESS_TEST_SED_PATTERN)@@" \
 242 -           -e "s@$(REWRITE_TEST_SED_PATTERN)@@" \
 243 -           -e "s@$(COVERAGE_TEST_SED_PATTERN)@@" \
 244 -           -e "s@$(PROXY_TEST_SED_PATTERN)@@" \
 245 -           -e "s@$(SLURP_TEST_SED_PATTERN)@@" \
 246 -           -e "s@$(SHARED_MEM_LOCK_TEST_SED_PATTERN)@@" \
 247 -           -e "s@$(SPELING_TEST_SED_PATTERN)@@" \
 248 -           -e "s@$(MEMCACHED_TEST_SED_PATTERN)@@" \
 249 -           -e "s@$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)@@" \
 250 -           -e "s@$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)@@" \
 251 -           -e "s@$(PURGING_COVERAGE_TEST_SED_PATTERN)@@" \
 252 -           -e "s@$(IUR_COVERAGE_TEST_SED_PATTERN)@@" \
 253 -           -e "s@$(DOMAIN_AUTH_SED_PATTERN)@@" \
 254 -           -e "s@$(GZIP_TEST_SED_PATTERN)@@" \
 255 -           -e "s@$(HTTPS_TEST_SED_PATTERN)@@" \
 256 -           -e "s@$(EXPERIMENT_GA_TEST_SED_PATTERN)@@" \
 257 -           -e "s@$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)@@" \
 258 -           -e "s@$(ALL_DIRECTIVES_TEST_SED_PATTERN)@@" \
 259 -           -e "s@$(PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
 260 -           -e "s@$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)@@" \
 261 -           -e "s@$(STATS_LOGGING_TEST_SED_PATTERN)@@" \
 262 +           -e "$(STRESS_TEST_SED_PATTERN)" \
 263 +           -e "$(REWRITE_TEST_SED_PATTERN)" \
 264 +           -e "$(COVERAGE_TEST_SED_PATTERN)" \
 265 +           -e "$(PROXY_TEST_SED_PATTERN)" \
 266 +           -e "$(SLURP_TEST_SED_PATTERN)" \
 267 +           -e "$(SHARED_MEM_LOCK_TEST_SED_PATTERN)" \
 268 +           -e "$(SPELING_TEST_SED_PATTERN)" \
 269 +           -e "$(MEMCACHED_TEST_SED_PATTERN)" \
 270 +           -e "$(IPRO_PRESERVE_COVERAGE_TEST_SED_PATTERN)" \
 271 +           -e "$(MEMCACHE_COVERAGE_TEST_SED_PATTERN)" \
 272 +           -e "$(PURGING_COVERAGE_TEST_SED_PATTERN)" \
 273 +           -e "$(IUR_COVERAGE_TEST_SED_PATTERN)" \
 274 +           -e "$(DOMAIN_AUTH_SED_PATTERN)" \
 275 +           -e "$(GZIP_TEST_SED_PATTERN)" \
 276 +           -e "$(HTTPS_TEST_SED_PATTERN)" \
 277 +           -e "$(EXPERIMENT_GA_TEST_SED_PATTERN)" \
 278 +           -e "$(EXPERIMENT_NO_GA_TEST_SED_PATTERN)" \
 279 +           -e "$(ALL_DIRECTIVES_TEST_SED_PATTERN)" \
 280 +           -e "$(PER_VHOST_STATS_TEST_SED_PATTERN)" \
 281 +           -e "$(NO_PER_VHOST_STATS_TEST_SED_PATTERN)" \
 282 +           -e "$(STATS_LOGGING_TEST_SED_PATTERN)" \
 283                 $^ > $@
 284         ! grep '@@' $@  # Make sure we don't have any remaining @@variables@@
 285