[MacPorts] #72546: nginx @1.28.0 +zip: patch failed - patch-src-http-ngx_http_upstream.h.diff

[MacPorts]

#72546: nginx @1.28.0 +zip: patch failed - patch-src-http-ngx_http_upstream.h.diff
--------------------+--------------------
 Reporter:  dagui0  |      Owner:  (none)
     Type:  defect  |     Status:  new
 Priority:  Normal  |  Milestone:
Component:  ports   |    Version:  2.10.7
 Keywords:          |       Port:
--------------------+--------------------
 Today I update os to 15.5 and trying to update ports.
 I'm using my custom nginx build with following variants.

 {{{
 sudo port -NRuc install nginx
 +addition+dav+davext+echo+fancyindex+flv+gzip_static+http2+image_filter+mp4+rtmp+secure_link+ssl+status+stream+vod+zip
 }}}

 While update patch failed at {{{patching patch-src-http-
 ngx_http_upstream.h.diff}}},
 it seems related with variant {{{+zip}}}.

 {{{
 main.log
 -----
 ...
 :info:patch --->  Applying patch-src-http-ngx_http_upstream.h.diff
 :debug:patch Environment:
 :debug:patch CC_PRINT_OPTIONS='YES'
 :debug:patch
 CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_www_nginx/nginx/work/.CC_PRINT_OPTIONS'
 :debug:patch CPATH='/opt/local/include'
 :debug:patch DEVELOPER_DIR='/Library/Developer/CommandLineTools'
 :debug:patch LIBRARY_PATH='/opt/local/lib'
 :debug:patch MACOSX_DEPLOYMENT_TARGET='15.0'
 :debug:patch
 SDKROOT='/Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk'
 :debug:patch SOURCE_DATE_EPOCH='1745504210'
 :info:patch Executing:  cd
 "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_www_nginx/nginx/work/nginx-1.28.0"
 && /usr/bin/patch -t -N -p0 <
 '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/nginx/files
 /patch-src-http-ngx_http_upstream.h.diff'
 :debug:patch system:  cd
 "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_www_nginx/nginx/work/nginx-1.28.0"
 && /usr/bin/patch -t -N -p0 <
 '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/nginx/files
 /patch-src-http-ngx_http_upstream.h.diff'
 :info:patch patching file 'src/http/ngx_http_upstream.h'
 :info:patch 1 out of 1 hunks failed--saving rejects to
 'src/http/ngx_http_upstream.h.rej'
 :info:patch Command failed:  cd
 "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_www_nginx/nginx/work/nginx-1.28.0"
 && /usr/bin/patch -t -N -p0 <
 '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/nginx/files
 /patch-src-http-ngx_http_upstream.h.diff'
 :info:patch Exit code: 1
 :error:patch Failed to patch nginx: command execution failed
 :debug:patch Error code: CHILDSTATUS 19189 1
 :debug:patch Backtrace: command execution failed
 :debug:patch     while executing
 :debug:patch "system {*}$notty {*}$callback {*}$nice $fullcmdstring"
 :debug:patch     invoked from within
 :debug:patch "command_exec patch "" "< '$patch'""
 :debug:patch     (procedure "portpatch::patch_main" line 41)
 :debug:patch     invoked from within
 :debug:patch "$procedure $targetname"
 :error:patch See
 /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_www_nginx/nginx/main.log
 for details.
 -----


 src/http/ngx_http_upstream.h.rej
 ----
 @@ -414,6 +414,8 @@
  ngx_int_t ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
      ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev,
      ngx_str_t *default_hide_headers, ngx_hash_init_t *hash);
 +ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r,
 +    ngx_http_variable_value_t *v, uintptr_t data);


  #define ngx_http_conf_upstream_srv_conf(uscf, module)
 \
 -----
 }}}

 * OS: Sequoia 15.5
 * Arch: x86_64
 * MacPort: 2.10.7
 * port: nginx @1.28.8
 * variants: zip

 {{{
 dagui at yidigun:~]$ uname -a
 Darwin yidigun.local 24.5.0 Darwin Kernel Version 24.5.0: Tue Apr 22
 19:53:26 PDT 2025; root:xnu-11417.121.6~2/RELEASE_X86_64 x86_64
 dagui at yidigun:~]$ xcodebuild -version
 Xcode 16.3
 Build version 16E140
 dagui at yidigun:~]$ cc --version
 Apple clang version 17.0.0 (clang-1700.0.13.3)
 Target: x86_64-apple-darwin24.5.0
 Thread model: posix
 InstalledDir:
 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
 }}}

-- 
Ticket URL: <https://trac.macports.org/ticket/72546>
MacPorts <https://www.macports.org/>
Ports system for macOS