On Sat, November 20, 2021 1:23 pm, Jay Hart wrote: >> >>>> patch -d ../../ -p2 < patches/xxxx.diff >>>> >>>> You may need to fiddle with the options until you get it right. >>>> >>> >>> This appeared to run better, but I ended up with this: >>> >>> [root@dream msg_flags]# patch -d ../../ -p2 < >>> patches/msg_flags-squirrelmail-1.4.20.diff >>> patching file functions/mailbox_display.php >>> Reversed (or previously applied) patch detected! Assume -R? [n] >>> >>> What do I want to do here??? >> >> Select 'no', or if you want to be sure you applied everything correctly, >> select 'yes' and see if it "unpatches" itself correctly. If not, you'll >> want to start from scratch. Otherwise, re-apply the patch and you're >> good. >> > > Ok, here is how things went: > [root@dream msg_flags]# patch -d ../../ -p2 < I don't recommend you work as root, especially if you are unsure about the commands you're running; even typos can end up being disastrous. > patches/msg_flags-squirrelmail-1.4.20.diff > patching file functions/mailbox_display.php > Reversed (or previously applied) patch detected! Assume -R? [n] n > Apply anyway? [n] n > Skipping patch. > 2 out of 2 hunks ignored -- saving rejects to file > functions/mailbox_display.php.rej > patching file src/move_messages.php > Hunk #1 succeeded at 150 with fuzz 2 (offset 13 lines). > Hunk #2 succeeded at 224 (offset 21 lines). > patching file src/left_main.php > Hunk #1 succeeded at 78 (offset 2 lines). > Hunk #2 succeeded at 192 (offset 2 lines). Yuck, one file was patched, the others not... although it looks like you applied everything, I'd personally start with a fresh codebase and apply the patches, making sure they all go in the first time. > 2. This plugin has other patches, do I apply just the 1.4.20 patch, or > others as well? > > msg_flags-squirrelmail-1.4.10.diff > msg_flags-squirrelmail-1.4.13.diff > msg_flags-squirrelmail-1.4.15.diff > msg_flags-squirrelmail-1.4.20.diff > msg_flags-squirrelmail-1.4.3a.diff > > I assume the 1.4.20 diff contains all the other patches, correct? This is > hinted at in the instructions. Yes, ignore all but the newest version. -- Paul Lesniewski SquirrelMail Team Please support Open Source Software by donating to SquirrelMail! http://squirrelmail.org/donate_paul_lesniewski.php ----- squirrelmail-users mailing list Posting guidelines: http://squirrelmail.org/postingguidelines List address: squirrelmail-users@xxxxxxxxxxxxxxxxxxxxx List archives: http://news.gmane.org/gmane.mail.squirrelmail.user List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-users
