Advertisement
venture37

Patch to add SPDY support to www/nginx-devel

Jun 16th, 2012
234
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.48 KB | None | 0 0
  1. Index: Makefile
  2. ===================================================================
  3. RCS file: /usr/local/sandbox/ports/www/nginx-devel/Makefile,v
  4. retrieving revision 1.467
  5. diff -u -r1.467 Makefile
  6. --- Makefile 14 Jun 2012 11:29:07 -0000 1.467
  7. +++ Makefile 16 Jun 2012 22:25:55 -0000
  8. @@ -12,8 +12,8 @@
  9. MASTER_SITES= http://nginx.org/download/
  10. MASTER_SITES+= ${MASTER_SITE_LOCAL}
  11. MASTER_SITE_SUBDIR= osa
  12. -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
  13. PKGNAMESUFFIX= -devel
  14. +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
  15.  
  16. MAINTAINER= osa@FreeBSD.org
  17. COMMENT= Robust and small WWW server
  18. @@ -49,6 +49,7 @@
  19. MAIL_POP3 \
  20. MAIL_SMTP \
  21. MAIL_SSL \
  22. + SPDY_SUPPORT \
  23. WWW \
  24. CACHE_PURGE \
  25. ECHO \
  26. @@ -132,6 +133,7 @@
  27. MAIL_POP3_DESC= Enable POP3 proxy module
  28. MAIL_SMTP_DESC= Enable SMTP proxy module
  29. MAIL_SSL_DESC= Enable mail_ssl module
  30. +SPDY_SUPPORT_DESC= Enable SPDY support
  31. WWW_DESC= Enable html sample files
  32. CACHE_PURGE_DESC= 3rd party cache_purge module
  33. ECHO_DESC= 3rd party echo module
  34. @@ -508,7 +510,7 @@
  35. .endif
  36.  
  37. .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY}
  38. -USE_HTTP_SSL= yes
  39. +WITH_HTTP_SSL= yes
  40. NGINX_UPSTREAM_STICKY_VERSION= 1.0
  41. MASTER_SITES+= http://nginx-sticky-module.googlecode.com/files/:upstreamsticky
  42. DISTFILES+= nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky
  43. @@ -548,7 +550,7 @@
  44. .endif
  45.  
  46. .if ${PORT_OPTIONS:MENCRYPTSESSION}
  47. -USE_NGINX_DEVEL_KIT= yes
  48. +WITH_NGINX_DEVEL_KIT= yes
  49. NGINX_ENCRYPTSESSION_VERSION= 0.02
  50. GIT_ENCRYPTSESSION_VERSION= 0-gc752861
  51. FETCH_ARGS= -pRr
  52. @@ -583,7 +585,7 @@
  53. LIB_DEPENDS+= luajit-5.1.2:${PORTSDIR}/lang/luajit
  54. CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
  55. CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
  56. -USE_NGINX_DEVEL_KIT= yes
  57. +WITH_NGINX_DEVEL_KIT= yes
  58. NGINX_LUA_VERSION= 0.5.0rc30
  59. GIT_LUA_VERSION= 0-g3b1e9aa
  60. FETCH_ARGS= -pRr
  61. @@ -677,7 +679,7 @@
  62. .endif
  63.  
  64. .if ${PORT_OPTIONS:MSET_MISC}
  65. -USE_NGINX_DEVEL_KIT= yes
  66. +WITH_NGINX_DEVEL_KIT= yes
  67. NGINX_SET_MISC_VERSION= 0.22rc8
  68. GIT_SET_MISC_VERSION= 0-g658c235
  69. FETCH_ARGS= -pRr
  70. @@ -702,6 +704,13 @@
  71. CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION}
  72. .endif
  73.  
  74. +.if ${PORT_OPTIONS:MSPDY_SUPPORT}
  75. +PATCH_SITES+=http://nginx.org/patches/spdy/
  76. +PATCHFILES=patch.spdy-36.txt
  77. +WITH_OPENSSL_PORT= YES
  78. +WITH_HTTP_SSL= YES
  79. +.endif
  80. +
  81. .if ${PORT_OPTIONS:MSRCACHE}
  82. NGINX_SRCACHE_VERSION= 0.13rc8
  83. GIT_SRCACHE_VERSION= 0-g5237f26
  84. @@ -777,12 +786,12 @@
  85. .endif
  86. .endif # WITH_MAIL
  87.  
  88. -.if ${PORT_OPTIONS:MHTTP_SSL} || defined(USE_HTTP_SSL)
  89. +.if ${PORT_OPTIONS:MHTTP_SSL} || defined(WITH_HTTP_SSL)
  90. NGINX_OPENSSL= yes
  91. CONFIGURE_ARGS+=--with-http_ssl_module
  92. .endif
  93.  
  94. -.if defined(USE_NGINX_DEVEL_KIT)
  95. +.if defined(WITH_NGINX_DEVEL_KIT)
  96. NGINX_DEVEL_KIT_VERSION= 0.2.17
  97. GIT_DEVEL_KIT_VERSION= 0-gbc97eea
  98. FETCH_ARGS= -pRr
  99. @@ -792,7 +801,7 @@
  100. .endif
  101.  
  102. .if ${PORT_OPTIONS:MARRAYVAR}
  103. -USE_NGINX_DEVEL_KIT= yes
  104. +WITH_NGINX_DEVEL_KIT= yes
  105. NGINX_ARRAYVAR_VERSION= 0.03rc1
  106. GIT_ARRAYVAR_VERSION= 0-gfed751a
  107. FETCH_ARGS= -pRr
  108. @@ -802,7 +811,7 @@
  109. .endif
  110.  
  111. .if ${PORT_OPTIONS:MFORMINPUT}
  112. -USE_NGINX_DEVEL_KIT= yes
  113. +WITH_NGINX_DEVEL_KIT= yes
  114. NGINX_FORMINPUT_VERSION= 0.07rc5
  115. GIT_FORMINPUT_VERSION= 0-gd41681d
  116. FETCH_ARGS= -pRr
  117. @@ -813,7 +822,7 @@
  118.  
  119. .if ${PORT_OPTIONS:MICONV}
  120. LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv
  121. -USE_NGINX_DEVEL_KIT= yes
  122. +WITH_NGINX_DEVEL_KIT= yes
  123. NGINX_ICONV_VERSION= 0.10rc7
  124. GIT_ICONV_VERSION= 0-gabdac17
  125. FETCH_ARGS= -pRr
  126. @@ -828,12 +837,12 @@
  127. USERS?= ${WWWOWN}
  128. GROUPS?=${WWWGRP}
  129.  
  130. -.include <bsd.port.pre.mk>
  131. -
  132. .if defined(NGINX_OPENSSL)
  133. USE_OPENSSL= yes
  134. .endif
  135.  
  136. +.include <bsd.port.pre.mk>
  137. +
  138. pre-everything::
  139. @${ECHO_MSG}
  140. .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
  141. Index: distinfo
  142. ===================================================================
  143. RCS file: /usr/local/sandbox/ports/www/nginx-devel/distinfo,v
  144. retrieving revision 1.404
  145. diff -u -r1.404 distinfo
  146. --- distinfo 14 Jun 2012 11:29:07 -0000 1.404
  147. +++ distinfo 16 Jun 2012 17:01:10 -0000
  148. @@ -1,106 +1,4 @@
  149. SHA256 (nginx-1.3.1.tar.gz) = 9b30a6f67f0a9eda7db026e12d4f09656f9254cddbb66ff9c0c01d8963dc1d73
  150. SIZE (nginx-1.3.1.tar.gz) = 721002
  151. -SHA256 (giom-nginx_accept_language_module-02262ce.tar.gz) = 3191f4caa70d9a8942c4f10b6abaaa96af451991d4b5e1e3d7b991376b00bf0c
  152. -SIZE (giom-nginx_accept_language_module-02262ce.tar.gz) = 3398
  153. -SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
  154. -SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
  155. -SHA256 (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = e223f55fd97e56425e232d8698e024707d1b2ed3714eff7d91a4d1ca76b4cbee
  156. -SIZE (samizdatco-nginx-http-auth-digest-bd1c86a.tar.gz) = 14454
  157. -SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
  158. -SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
  159. -SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230cc61462b60497cbac6f581d7e008a9262ba4
  160. -SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
  161. -SHA256 (ngx_cache_purge-1.5.tar.gz) = 4b9cf48c0cf8f13150dfc329a889c221f6206a44aa9dcf8fa2f347abce55995c
  162. -SIZE (ngx_cache_purge-1.5.tar.gz) = 7149
  163. -SHA256 (agentzh-echo-nginx-module-v0.38rc2-0-g43c8843.tar.gz) = b1ac031931da71a6b5ee7f51c9b031f98f5339c34d4d2a8fe361123c2a9f748d
  164. -SIZE (agentzh-echo-nginx-module-v0.38rc2-0-g43c8843.tar.gz) = 83870
  165. -SHA256 (agentzh-headers-more-nginx-module-v0.17rc1-0-g3580526.tar.gz) = 826b62c13605281f843ad4a612a00b38d71599a673c3112480bff9bdbbcd36cd
  166. -SIZE (agentzh-headers-more-nginx-module-v0.17rc1-0-g3580526.tar.gz) = 24707
  167. -SHA256 (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = a0d6fa256e354ce48c06e1f689d26ebb2f7b75f71ce682e34ae6c29331a7fbff
  168. -SIZE (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = 6065
  169. -SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f
  170. -SIZE (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 5727
  171. -SHA256 (ngx-fancyindex-0.3.1.tar.gz) = 877e383c6bc06be92abb88f5ac251a165b63feb5f4828d52a554efc19a3f7c7d
  172. -SIZE (ngx-fancyindex-0.3.1.tar.gz) = 13071
  173. -SHA256 (ngx_http_gunzip_filter_module-0.4.tar.gz) = d2bcef58612d1f66f92c7160fc05695b540ffdee45936b1e86a0d4981e09114a
  174. -SIZE (ngx_http_gunzip_filter_module-0.4.tar.gz) = 7432
  175. -SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
  176. -SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
  177. -SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
  178. -SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
  179. -SHA256 (kr-nginx-notice-0-g3c95966.tar.gz) = bb0b8c603b2df206aeb13100fb60c1328aa6a69d0ac7f411e5dabe8fdb2affce
  180. -SIZE (kr-nginx-notice-0-g3c95966.tar.gz) = 3348
  181. -SHA256 (nginx_http_push_module-0.692.tar.gz) = 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
  182. -SIZE (nginx_http_push_module-0.692.tar.gz) = 29119
  183. -SHA256 (ngx_http_redis-0.3.6.tar.gz) = 9e5d8c0f1317a6910710c94d27f9aca4968c48ee1de271e5034525a1e9b6c70e
  184. -SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099
  185. -SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
  186. -SIZE (ngx_http_response-0.3.tar.gz) = 2244
  187. -SHA256 (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 7db85255b0f8f3e7ea912a572c2a0a3e5a67f9771838cf1df072049fa9367000
  188. -SIZE (ngx_http_subs_filter_module-0.5.2.r53.tar.gz) = 94682
  189. -SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
  190. -SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796
  191. -SHA256 (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
  192. -SIZE (masterzen-nginx-upload-progress-module-v0.8.3-0-gc7c663f.tar.gz) = 16694
  193. -SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b
  194. -SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024
  195. -SHA256 (Nginx_upstream_hash-0.3.1.tar.gz) = 51929c5352d4c2608b3f852987830be08b6946baf20da346fe520d9b12e39968
  196. -SIZE (Nginx_upstream_hash-0.3.1.tar.gz) = 5049
  197. -SHA256 (nginx-sticky-module-1.0.tar.gz) = 415beaac0dd229c271128b461f6059601f4889714b548b20a4720fc5f0a86b60
  198. -SIZE (nginx-sticky-module-1.0.tar.gz) = 114184
  199. -SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
  200. -SIZE (mod_zip-1.1.6.tar.gz) = 21991
  201. -SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca
  202. -SIZE (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 32575
  203. -SHA256 (chaoslawful-drizzle-nginx-module-v0.1.2rc7-0-g272cabf.tar.gz) = 3e26ee338c3a7b456bfbd4ea79540728410c72ff3096a0b6dc2ebd7c4a99c1fe
  204. -SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc7-0-g272cabf.tar.gz) = 61112
  205. -SHA256 (agentzh-encrypted-session-nginx-module-v0.02-0-gc752861.tar.gz) = 9689fbef49b6c3b4c4fc67b21fe1aa60880a374af988e93b36b8cf5335109cd9
  206. -SIZE (agentzh-encrypted-session-nginx-module-v0.02-0-gc752861.tar.gz) = 8763
  207. -SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
  208. -SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
  209. -SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
  210. -SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
  211. -SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
  212. -SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
  213. -SHA256 (chaoslawful-lua-nginx-module-v0.5.0rc30-0-g3b1e9aa.tar.gz) = 7a3f9eb0d80007baab7b8112a1b031d13df08c647cb999489fc08216a52c2f4e
  214. -SIZE (chaoslawful-lua-nginx-module-v0.5.0rc30-0-g3b1e9aa.tar.gz) = 330248
  215. -SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c
  216. -SIZE (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 39778
  217. -SHA256 (naxsi-0.46-1.tgz) = 635f7790dcf71d289fb9c69412adbe814ee056e9f4457c67e1fb462b2a5a4b21
  218. -SIZE (naxsi-0.46-1.tgz) = 449034
  219. -SHA256 (passenger-3.0.13.tar.gz) = 87d5299dd41cb9592bf459d8e4526090a9b37170af9c50c043a20fd43fb09b72
  220. -SIZE (passenger-3.0.13.tar.gz) = 2654448
  221. -SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
  222. -SIZE (ngx_postgres-0.9.tar.gz) = 41022
  223. -SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023
  224. -SIZE (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 17993
  225. -SHA256 (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 903b4c88b43b47ca80b45556d702b760707ceecc3decc923340f3b3b69b7f1fe
  226. -SIZE (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 32794
  227. -SHA256 (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2
  228. -SIZE (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 28039
  229. -SHA256 (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 09129fdf3591f9162e250fa0481e2ba44e5b3f9aea5cad709217822f63876037
  230. -SIZE (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 949482
  231. -SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd
  232. -SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053
  233. -SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0
  234. -SIZE (nginx-sflow-module-0.9.6.tar.gz) = 27758
  235. -SHA256 (ngx_slowfs_cache-1.8.tar.gz) = 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644
  236. -SIZE (ngx_slowfs_cache-1.8.tar.gz) = 11408
  237. -SHA256 (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 2cb76adb4cf20079b44cf951f6a7fa480265878d65a6def2ae4dc5deb17ed686
  238. -SIZE (agentzh-srcache-nginx-module-v0.13rc8-0-g5237f26.tar.gz) = 58234
  239. -SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
  240. -SIZE (ngx_supervisord-1.4.tar.gz) = 19351
  241. -SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659
  242. -SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
  243. -SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035
  244. -SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
  245. -SHA256 (agentzh-xss-nginx-module-v0.03rc9-0-gbeddbe1.tar.gz) = 444d7e319bb2af4c7892815407f53e4ffe21183f3e6711eafe86ed7523a3531b
  246. -SIZE (agentzh-xss-nginx-module-v0.03rc9-0-gbeddbe1.tar.gz) = 9891
  247. -SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02
  248. -SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
  249. -SHA256 (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 345e60d7a479409b7a7aba933a042629d59fd4fbfaed1d0f7fe43cc688e48ced
  250. -SIZE (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 9500
  251. -SHA256 (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 831bb3fa339206130b6395aa2cb4dfe4cdf9222e2a7da9de8d3de4a1a4620abc
  252. -SIZE (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 11048
  253. -SHA256 (calio-iconv-nginx-module-v0.10rc7-0-gabdac17.tar.gz) = bc35d461efccb29b7affda5a397d86d89f5c860fcd9d300ac2d6d7f7667c22b1
  254. -SIZE (calio-iconv-nginx-module-v0.10rc7-0-gabdac17.tar.gz) = 12060
  255. +SHA256 (patch.spdy-36.txt) = 97f5ab0e8e6652ce9638bc708038b84e33643937c51620987e7bdb5fcd8a5003
  256. +SIZE (patch.spdy-36.txt) = 146509
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement