Re: Squirrelmail 1.4.23-SVN Functionality

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



>
>>> 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 < 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).


Questions:

1. Reapply or leave as-is?

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.

Thanks for the support so far. And earlier, when I said I "can't patch", it was because of the issue we just worked through.

Thanks for the help again.

Jay

>> This was the version of the msg_flags plugin I downloaded:
>> msg_flags-1.4.20-1.4.3.tar.gz
>>
>> Sounds like I don't 'need' to patch?  Should select 'n'??
>
> --
> 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
>




-----
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



[Index of Archives]     [Video For Linux]     [Yosemite News]     [Yosemite Photos]     [gtk]     [KDE]     [Cyrus SASL]     [Gimp on Windows]     [Steve's Art]     [Webcams]

  Powered by Linux