That fails even earlier, and on all of the files instead of just pine.
On Oct 4, 2023, at 10:22 PM, Herby G <[email protected]<mailto:[email protected]>> wrote: Attempt with `patch.pre_args -p0` On Wed, Oct 4, 2023 at 10:38 PM contextnerror <[email protected]<mailto:[email protected]>> wrote: Thanks for that advice. I tried to use the patch from https://repo.or.cz/alpine.git/patch/701aebc00aff0585ce6c96653714e4ba94834c9c This was with patch.pre_args -p1 applied as well. It’s failing at pith/pine.hlp: "Hunk #1 FAILED at 147.” Do I even need this file? I’m not sure how it’s related. > On Oct 4, 2023, at 6:49 AM, Joshua Root > <[email protected]<mailto:[email protected]>> wrote: > > On 4/10/2023 15:05, contextnerror wrote: >> I was hoping to update the portfile for alpine. >> Currently the 2.26 release will not build due to a passfile bug, but this >> was fixed in a newer commit. (https://repo.or.cz/alpine.git) >> I had a few questions about how to implement this: >> - Should I add the changes as patchfiles, or just change the master site to >> the git repo? >> - Would the version still be 2.26 or something else? >> - Should I also add any of the other new fixes from git? > > Fetching from a VCS should be avoided if possible, since we can't mirror the > source in that case, and fetching is more likely to fail on restrictive > networks. So probably patchfiles. > > Usually we would not change the version when adding bug fix patches. If the > version in the published ports tree were already 2.26 and you added a patch > that changes the installed files in any way, you would of course increase the > port's revision. > > Normally you don't want to pull in all the changes that exist in an upstream > repo, simply because if they were considered ready to use there would be a > new release containing them. Some projects have very slow release cycles > though, so if that's the case here, try to get some sense of the risk vs > benefit for each change before deciding to incorporate it. > > - Josh
Executing: cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_mail_alpine/alpine/work/alpine-2.26" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/mail/alpine/files/passfile-build-fix.patch' can't find file to patch at input line 18 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 701aebc00aff0585ce6c96653714e4ba94834c9c Mon Sep 17 00:00:00 2001 |From: Eduardo Chappa <[email protected]> |Date: Sat, 27 Aug 2022 15:11:38 -0600 |Subject: [PATCH] * Fixes to the configure script that prevented Alpine from | completing compilation in Mac OSX due to Alpine defining a password | file, when Alpine uses the KeyChain instead. | |--- | configure | 49 ++++++++++++++++++++++++++----------------------- | configure.ac | 33 ++++++++++++++++++--------------- | pith/pine.hlp | 2 +- | 3 files changed, 45 insertions(+), 39 deletions(-) | |diff --git a/configure b/configure |index 5163229..e6d7a70 100755 |--- a/configure |+++ b/configure -------------------------- File to patch: Skip this patch? [y] Skipping patch. 5 out of 5 hunks ignored can't find file to patch at input line 113 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/configure.ac b/configure.ac |index 5a61bde..05b09b2 100644 |--- a/configure.ac |+++ b/configure.ac -------------------------- File to patch: Skip this patch? [y] Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 171 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/pith/pine.hlp b/pith/pine.hlp |index 74c2d25..60ee304 100644 |--- a/pith/pine.hlp |+++ b/pith/pine.hlp -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored Command failed: cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_mail_alpine/alpine/work/alpine-2.26" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/mail/alpine/files/passfile-build-fix.patch' Exit code: 1 Error: Failed to patch alpine: command execution failed Error: See /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_mail_alpine/alpine/main.log for details. Error: Follow https://guide.macports.org/#project.tickets if you believe there is a bug. Error: Processing of port alpine failed
