Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix error with zlib 1.3 #19989

Closed
wants to merge 1 commit into from

Conversation

artkiver
Copy link
Contributor

Description

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 13.5.1 22G90 arm64
Xcode 15.0 15A5219j

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL?
  • checked your Portfile with port lint --nitpick?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?

@artkiver
Copy link
Contributor Author

Supersedes: #19985 with comments referencing the upstream change as suggested by @reneeotten

@artkiver artkiver mentioned this pull request Aug 19, 2023
12 tasks
@artkiver
Copy link
Contributor Author

Ooph, that did not go so well.

`
Executing: cd "/opt/local/var/macports/build/_Users_runner_work_macports-ports_macports-ports_ports_net_openssh/openssh/work/openssh-9.4p1" && /usr/bin/patch -p0 -p1 < '/Users/runner/work/macports-ports/macports-ports/ports/net/openssh/files/patch.zlib1.3_configure.ac9.4pre2.diff'
DEBUG: system: cd "/opt/local/var/macports/build/_Users_runner_work_macports-ports_macports-ports_ports_net_openssh/openssh/work/openssh-9.4p1" && /usr/bin/patch -p0 -p1 < '/Users/runner/work/macports-ports/macports-ports/ports/net/openssh/files/patch.zlib1.3_configure.ac9.4pre2.diff'
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:

|# fix from upstream: openssh/openssh-portable@cb4ed12
|--- configure.ac
|+++ configure.ac

File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
Command failed: cd "/opt/local/var/macports/build/_Users_runner_work_macports-ports_macports-ports_ports_net_openssh/openssh/work/openssh-9.4p1" && /usr/bin/patch -p0 -p1 < '/Users/runner/work/macports-ports/macports-ports/ports/net/openssh/files/patch.zlib1.3_configure.ac9.4pre2.diff'
Exit code: 1
Error: Failed to patch openssh: command execution failed
DEBUG: Error code: CHILDSTATUS 2309 1
DEBUG: Backtrace: command execution failed
while executing
"system {}$notty {}$callback {*}$nice $fullcmdstring"
invoked from within
"command_exec patch "" "< '$patch'""
(procedure "portpatch::patch_main" line 41)
invoked from within
"$procedure $targetname"
Error: See /opt/local/var/macports/logs/_Users_runner_work_macports-ports_macports-ports_ports_net_openssh/openssh/main.log for details.
Error: Follow https://guide.macports.org/#project.tickets if you believe there is a bug.
Error: Processing of port openssh failed
Build of 'openssh' failed.
/Users/runner/work/macports-ports/macports-ports/mpbb/mpbb: error: install-port' failed to run successfully /Users/runner/work/_temp/1fb2c362-81b3-4a6e-b07c-770ed8b4d407.sh: line 6: 2152 Terminated: 15 tail -f "$workdir/logs/dependencies-progress.txt" 2> /dev/null Error: Failed to install openssh Error: Process completed with exit code 1.

I'm wondering maybe it's better to omit the comment in the patch and just leave it in the Portfile?

@artkiver
Copy link
Contributor Author

Superseded by: #19991

@artkiver artkiver closed this Aug 19, 2023
@artkiver artkiver deleted the openssh9.4p1rev1_dos branch August 19, 2023 03:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2 participants