[imp] which "patch" program to use

[John Morrissey]

On Mon, May 21, 2001 at 05:43:57PM +0100, Lars Hecking wrote:
% > $ patch < deletetotrash-2.1.1.patch
% > patching file defaults.php3.dist
% > patch: **** malformed patch at line 18:  ?>
% > 
% > $ patch --version
% > patch 2.5.4
% > 
% > $ cat_with_linenumber deletetotrash-2.1.1.patch
% > [...]
% >      1  diff -urN [...]/defaults.php3.dist [...]/defaults.php3.dist
% >      2  --- [...]/defaults.php3.dist   Tue Aug 22 21:57:38 2000
% >      3  +++ [...]/defaults.php3.dist Sat Feb 10 11:33:28 2001
% >      5   // $default->path_to_rpm = '/usr/bin/rpm';
% >      6   // $default->path_to_dpkg = '/usr/bin/dpkg';
% >      7
% >      8  +$default->trash_folder = 'Trash';
% >      9  +$default->delete_to_trash = true;
% >     10  +$default->user_change_deletetotrash = true;
% >     11  +
% >     12  +$default->empty_on_exit = true;
% >     13  +$default->user_change_emptyonexit = true;
% >     14  +
% >     15  +$default->expunge_on = 'N';
% >     16  +$default->user_change_expungeon = true;
% >     17  +
% >     18   ?>
%            ^^
% 
%  Well, the patch file is obviously broken. Was it downloaded from a web
%  page, or otherwise converted?

You're right; there's a malformed hunk in the patch I released. I just put
out 2.1.2, which fixes this. You can either download that version, or change
line 4 to read:

@@ -423,4 +423,14 @@

Sorry about that. :-)

john
-- 
John Morrissey          _o            /\         ----  __o
jwm@horde.net        _-< \_          /  \       ----  <  \,
www.horde.net/    __(_)/_(_)________/    \_______(_) /_(_)__