calling all patch XPerts ! calling all patch XPerts ! is anybody out there able to update patch support for the latest nginx ?
[email protected] wrote: > unfortunately this was as far as i got with version git > > $ patch -p0 < nginx_multiple_certs_and_stapling_V2.patch > patching file a/src/event/ngx_event_openssl.c > Hunk #1 succeeded at 96 with fuzz 2 (offset 12 lines). > Hunk #2 succeeded at 162 (offset 14 lines). > Hunk #3 FAILED at 191. > Hunk #4 FAILED at 236. > 2 out of 4 hunks FAILED -- saving rejects to file > a/src/event/ngx_event_openssl.c.rej > patching file a/src/event/ngx_event_openssl.h > Hunk #1 FAILED at 104. > Hunk #2 succeeded at 203 (offset 22 lines). > 1 out of 2 hunks FAILED -- saving rejects to file > a/src/event/ngx_event_openssl.h.rej > patching file a/src/event/ngx_event_openssl_stapling.c > Hunk #1 FAILED at 11. > Hunk #12 succeeded at 1793 (offset 13 lines). > 1 out of 12 hunks FAILED -- saving rejects to file > a/src/event/ngx_event_openssl_stapling.c.rej > patching file a/src/http/modules/ngx_http_ssl_module.c > Hunk #1 FAILED at 66. > Hunk #2 succeeded at 209 (offset 31 lines). > Hunk #3 FAILED at 404. > Hunk #4 FAILED at 463. > Hunk #5 FAILED at 550. > Hunk #6 succeeded at 702 (offset 110 lines). > Hunk #7 succeeded at 762 (offset 118 lines). > 4 out of 7 hunks FAILED -- saving rejects to file > a/src/http/modules/ngx_http_ssl_module.c.rej > patching file a/src/http/modules/ngx_http_ssl_module.h > Hunk #1 FAILED at 25. > 1 out of 1 hunk FAILED -- saving rejects to file > a/src/http/modules/ngx_http_ssl_module.h.rej > patching file a/src/mail/ngx_mail_ssl_module.c > Hunk #1 FAILED at 57. > Hunk #2 FAILED at 173. > Hunk #3 FAILED at 215. > Hunk #4 FAILED at 243. > 4 out of 4 hunks FAILED -- saving rejects to file > a/src/mail/ngx_mail_ssl_module.c.rej > patching file a/src/mail/ngx_mail_ssl_module.h > Hunk #1 FAILED at 27. > 1 out of 1 hunk FAILED -- saving rejects to file > a/src/mail/ngx_mail_ssl_module.h.rej > > > and this was as far as i got with version 1.6.2 just renaming dirs > > beyond that its all greek to me ... > > > $ patch -p0 < nginx_multiple_certs_and_stapling_V2.patch > patching file nginx-1.6.2/src/event/ngx_event_openssl.c > Hunk #1 succeeded at 86 with fuzz 2 (offset 2 lines). > Hunk #2 succeeded at 150 (offset 2 lines). > Hunk #3 FAILED at 191. > Hunk #4 succeeded at 240 (offset 4 lines). > 1 out of 4 hunks FAILED -- saving rejects to file > nginx-1.6.2/src/event/ngx_event_openssl.c.rej > patching file nginx-1.6.2/src/event/ngx_event_openssl.h > Hunk #1 succeeded at 108 (offset 4 lines). > Hunk #2 succeeded at 191 (offset 6 lines). > patching file nginx-1.6.2/src/event/ngx_event_openssl_stapling.c > Hunk #1 FAILED at 11. > Hunk #12 succeeded at 1791 (offset 11 lines). > 1 out of 12 hunks FAILED -- saving rejects to file > nginx-1.6.2/src/event/ngx_event_openssl_stapling.c.rej > patching file nginx-1.6.2/src/http/modules/ngx_http_ssl_module.c > Hunk #1 succeeded at 74 (offset 8 lines). > Hunk #2 succeeded at 200 (offset 22 lines). > Hunk #3 FAILED at 404. > Hunk #4 FAILED at 463. > Hunk #5 succeeded at 640 (offset 90 lines). > Hunk #6 succeeded at 677 (offset 92 lines). > Hunk #7 succeeded at 737 (offset 100 lines). > 2 out of 7 hunks FAILED -- saving rejects to file > nginx-1.6.2/src/http/modules/ngx_http_ssl_module.c.rej > patching file nginx-1.6.2/src/http/modules/ngx_http_ssl_module.h > Hunk #1 FAILED at 25. > 1 out of 1 hunk FAILED -- saving rejects to file > nginx-1.6.2/src/http/modules/ngx_http_ssl_module.h.rej > patching file nginx-1.6.2/src/mail/ngx_mail_ssl_module.c > Hunk #2 FAILED at 173. > Hunk #3 succeeded at 223 (offset 8 lines). > Hunk #4 succeeded at 253 (offset 8 lines). > 1 out of 4 hunks FAILED -- saving rejects to file > nginx-1.6.2/src/mail/ngx_mail_ssl_module.c.rej > patching file nginx-1.6.2/src/mail/ngx_mail_ssl_module.h > Hunk #1 succeeded at 27 with fuzz 1. > > _______________________________________________ nginx mailing list [email protected] http://mailman.nginx.org/mailman/listinfo/nginx
