1.8b Development

the patch patch-dnsmasq-iscreader.patch from /usr/m0n0wall/build82/freebsd8/build/patches/packages no longer applies to the current dnsmasq from the FreeBSD's ports tree.

FYI, just so you know.

I'm trying to build my own images from 1.8, I know, maybe I shouldn't be doing that, but nevertheless.

And thinking the patch might be on the 8.2's ports tarball, it does the same thing:


===>  Extracting for dnsmasq-2.55,1
=> SHA256 Checksum OK for dnsmasq-2.55.tar.lzma.
===>  Patching for dnsmasq-2.55,1
===>  Applying FreeBSD patches for dnsmasq-2.55,1
1 out of 1 hunks failed--saving rejects to Makefile.rej
1 out of 2 hunks failed--saving rejects to src/config.h.rej
=> Patch patch-dnsmasq-iscreader.patch failed to apply cleanly.
*** Error code 1

Stop in /usr/ports/dns/dnsmasq.
*** Error code 1

Stop in /usr/ports/dns/dnsmasq.

the patch expected 2.59 of dnsmasq and 2.60 is in the ports now, so I just checked out the RELEASE_9_0_0 tagged version of the ports tree which includes that version (and the rest of the ports tree related).  It fixed it.

I have run in to exactly the same issues, however I am still at the learning FreeBSD stage of the game, so, though I understand exactly what you are saying, and I downloaded a tar dnsmasq file 2.60, but I have absolutely no idea what I need to do with it, or how to adjust the 2makebinaries file to download the correct file?

ok so I have updated everything, and now I get the following

Applying FreeBSD patches for dnsmasq-2.60_1,1
1 out of 1 hunks failes--saving rejects to Makefile.rej
1 out of 2 hunks failed--saving rejects to scr/config.h.rej
1 out of 3 hunks failed--saving rejects to src/dnsmasq.c.rej
=> Patch patch-dnsmasq-iscreader.patch failed to apply cleanly
*** Error code 1

Stop in /usr/ports/dns/dnsmasq.

So now it is using the correct version but still comes up with the same errors as it did before when it was using 2.55 or 2.59?

You may simply want to use r507: "- update ISC patch for dnsmasq 2.60"

I used cvsup to update my ports, now stage 2 completes error free, but Im now stucl with Patchtools error

./3patchtools.sh: line 13 cd: /usr/src/usr.sbin: no such file or directory

It is correct there is no file or directory there, question is should there be, and where should this be created from?

I think that you didn't  install FreeBSD with sources ?

Run sysinstall to install them

Im past that error now, I get this one instead 

./3patchtools.sh
x ./clog/
x ./clog/clog.c
x ./clog/Makefile
x ./clog/clog.h
x ./clog/clog.8
Hmm... Looks like a unified diff to me...
The test leading up to this was:
--------------------------
|--- syslogd.c.orig     2010-12-21 18:09:25.000000000 +0100
|+++ syslogd.c 2011-07-02 13:45:44.000000000 +0200
--------------------------
File to patch:

Tried inserting syslogd, syslogd.c and syslogd.c.orig but none work, just asks if I want to skip it

ok, further again, during the 3patchtools I get the following

File to patch.
I insert ../syslogd.c.patch
Patching file ../syslogd.c.patch using plan A...
Hunk #1 failed at 66
Hunk #2 failed at 88
Hunk #3 failed at 112
Hunk #4 failed at 120
Hunk #5 failed at 186
Hunk #6 failed at 269
Hunk #7 failed at 338
Hunk #8 failed at 1290
Hunk #9 failed at 1617
Hunk #10 failed at 1762
Hunk #11 failed at 1816
Hunk #12 failed at 1979
Hunk #14 failed at 2031
Hunk #14 succeeded at 2772 with fuzz 2 (offset -1 lines)
patch: **** misordered hunks! output would be garbled

Not sure where to go from here,

build tools now ensure your ports tree is compatible with the patches. a fresh install of 8.2 should all work fine consistently now.