Hi, 陈星 schrieb: > hello, > I can not install pdns (pdns_2.27_v1a.gz) with ns 2.29, Has anyone > done it successfully? > >
As you can see, this patch is intended for ns 2.27. So in order to apply it to version 2.29 you have to manually solve the merge conflicts. And it seems quit easy as only 6 files do not merge. Have a look into the rejected files and modify the corresponding ns files by hand. Afterwards (if it works) make a diff against the unmodified ns 2.29. This diff will be usefull for other users and if you try do patch the 2.29 version again. Daniel. > Here is the message: > ======================================================================== > patching file Makefile.in > Hunk #2 FAILED at 60. > Hunk #3 succeeded at 81 with fuzz 2 (offset 3 lines). > Hunk #4 FAILED at 102. > Hunk #5 succeeded at 110 (offset -1 lines). > Hunk #6 succeeded at 128 (offset 3 lines). > Hunk #7 succeeded at 343 (offset 5 lines). > Hunk #8 succeeded at 363 (offset 3 lines). > Hunk #9 succeeded at 383 (offset 5 lines). > Hunk #10 succeeded at 397 (offset 3 lines). > Hunk #11 succeeded at 507 (offset 2 lines). > 2 out of 11 hunks FAILED -- saving rejects to file Makefile.in.rej > patching file apps/app.cc > patching file apps/udp.cc > Hunk #1 succeeded at 128 (offset 22 lines). > patching file classifier/delayfilter.cc > patching file classifier/delayfilter.h > patching file common/agent.cc > patching file common/agent.h > patching file common/pktcount.h > patching file common/scheduler-map.cc > Hunk #3 FAILED at 50. > 1 out of 3 hunks FAILED -- saving rejects to file common/scheduler- > map.cc.rej > patching file common/scheduler-map.h > patching file common/scheduler.cc > Hunk #2 succeeded at 125 (offset 1 line). > patching file link/delay.cc > Hunk #2 succeeded at 110 (offset 3 lines). > patching file nix/classifier-nix.cc > Hunk #1 succeeded at 54 (offset 29 lines). > Hunk #3 succeeded at 108 (offset 29 lines). > patching file nix/hdr_nv.cc > Hunk #1 succeeded at 55 (offset 28 lines). > patching file nix/nixnode.cc > Hunk #1 succeeded at 53 (offset 29 lines). > Hunk #3 succeeded at 155 (offset 29 lines). > Hunk #5 FAILED at 200. > Hunk #6 succeeded at 243 (offset 29 lines). > Hunk #8 succeeded at 321 (offset 29 lines). > 1 out of 9 hunks FAILED -- saving rejects to file nix/nixnode.cc.rej > patching file nix/nixnode.h > patching file nix/nixroute.cc > Hunk #1 succeeded at 53 (offset 28 lines). > patching file nix/nixvec.cc > Hunk #1 succeeded at 53 (offset 29 lines). > Hunk #3 succeeded at 84 (offset 29 lines). > Hunk #5 succeeded at 181 (offset 29 lines). > Hunk #7 succeeded at 358 (offset 29 lines). > patching file nix/nixvec.h > Hunk #1 succeeded at 54 (offset 29 lines). > patching file queue/drop-tail.cc > patching file queue/jobs.h > patching file rti/hdr_rti.cc > patching file rti/hdr_rti.h > patching file rti/liveapp.cc > patching file rti/liveapp.h > patching file rti/rticompress.cc > patching file rti/rticompress.h > patching file rti/rtidummy.cc > patching file rti/rtilink.cc > patching file rti/rtilink.h > patching file rti/rtioob.h > patching file rti/rtirouter.cc > patching file rti/rtirouter.h > patching file rti/rtisched.cc > patching file rti/rtisched.h > patching file rti/veilmsg.h > patching file tcl/lib/gt-rtilib.tcl > patching file tcl/lib/ns-lib.tcl > Hunk #1 succeeded at 214 (offset 1 line). > patching file tcl/lib/ns-packet.tcl > Hunk #1 FAILED at 157. > 1 out of 1 hunk FAILED -- saving rejects to file tcl/lib/ns-packet.tcl.rej > patching file tcl/rti/ns-rti-default.tcl > patching file tcl/rti/ns-rtiagent.tcl > patching file tcl/rti/ns-rtilink.tcl > patching file tcl/rti/ns-rtinode.tcl > patching file tcl/rti/ns-rtisim.tcl > patching file tcp/tcp-full.cc > Hunk #1 succeeded at 393 (offset -4 lines). > Hunk #2 succeeded at 823 (offset 14 lines). > Hunk #3 succeeded at 1180 (offset 16 lines). > Hunk #4 succeeded at 1489 with fuzz 2 (offset 25 lines). > patching file tcp/tcp-full.h > Hunk #2 FAILED at 121. > 1 out of 3 hunks FAILED -- saving rejects to file tcp/tcp-full.h.rej > patching file tcp/tcp-listener.cc > patching file tcp/tcp-listener.h > patching file tcp/trace-colors.h > patching file webcache/webserver.cc > Hunk #1 succeeded at 77 (offset 23 lines). > patching file webcache/webserver.h > Hunk #1 succeeded at 83 with fuzz 2 (offset 26 lines). > patching file webcache/webtraf.cc > Hunk #1 FAILED at 412. > 1 out of 1 hunk FAILED -- saving rejects to file webcache/webtraf.cc.rej > =========================================================== >
