[ previous ] [ next ] [ threads ]
 
 From:  Stephen Fulton <sfulton at esoteric dot ca>
 To:  m0n0wall dash dev at lists dot m0n0 dot ch
 Subject:  Problem patching syslogd.
 Date:  Tue, 22 Nov 2005 16:41:50 -0500
Hi all,

I'm building a custom version of m0n0wall, and I've run into a snag when 
patching syslogd with the syslogd.c.patch (as described in the 
developers handbook).  I'm patching syslogd in /usr/src/usr.sbin/syslogd 
(FreeBSD 4.11_REL), the src of which is up-to-date from FreeBSD's CVS. 
     Looking at the circular syslog site, the code appears much older, 
so I can't say I'm surprised, but I'd appreciate any and all assistance:

 >> START

Hmm...  Looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -rc /usr/src/usr.sbin/syslogd/syslog.conf.5 syslogd/syslog.conf.5
|*** /usr/src/usr.sbin/syslogd/syslog.conf.5    Tue Apr  3 11:25:59 2001
|--- syslogd/syslog.conf.5      Mon Oct  1 22:56:53 2001
--------------------------
Patching file /usr/src/usr.sbin/syslogd/syslog.conf.5 using Plan A...
Hunk #1 succeeded at 349 (offset 47 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|diff -rc /usr/src/usr.sbin/syslogd/syslogd.c syslogd/syslogd.c
|*** /usr/src/usr.sbin/syslogd/syslogd.c        Sun Feb 18 10:22:59 2001
|--- syslogd/syslogd.c  Mon Oct  1 22:47:58 2001
--------------------------
Patching file /usr/src/usr.sbin/syslogd/syslogd.c using Plan A...
Hunk #1 succeeded at 69.
Hunk #2 failed at 90.
Hunk #3 failed at 110.
Hunk #4 succeeded at 128 (offset 4 lines).
Hunk #5 succeeded at 177 (offset 2 lines).
Hunk #6 failed at 257.
Hunk #7 failed at 312.
Hunk #8 succeeded at 1162 with fuzz 1 (offset 111 lines).
Hunk #9 succeeded at 1380 with fuzz 1 (offset -14 lines).
Hunk #10 succeeded at 1631 (offset 124 lines).
Hunk #11 succeeded at 1537 with fuzz 2 (offset -7 lines).
Hunk #12 succeeded at 1857 with fuzz 1 (offset 160 lines).
Hunk #13 succeeded at 2520 with fuzz 2 (offset 160 lines).
4 out of 13 hunks failed--saving rejects to 
/usr/src/usr.sbin/syslogd/syslogd.c.rej

<< END

Thanks,

-- 
Stephen Fulton            | We can be quick-witted
Systems Administrator     |  or very intelligent
Toronto, Canada           |     but not both.
http://www.esoteric.ca/   |      -- Stephen Hawking.