We try the patch against the version 1.6.12 but we got many reject failures. (see below)
Unfortunately we have to upgrade to 1.8 Tx, Arjan File to patch: apps/app_dial.c patching file apps/app_dial.c Hunk #1 FAILED at 111. Hunk #2 FAILED at 123. Hunk #3 FAILED at 164. Hunk #4 succeeded at 466 (offset 234 lines). Hunk #5 FAILED at 497. Hunk #6 FAILED at 512. Hunk #7 FAILED at 524. Hunk #8 FAILED at 539. Hunk #9 succeeded at 435 (offset 12 lines). Hunk #10 FAILED at 510. Hunk #11 succeeded at 767 (offset 247 lines). Hunk #12 succeeded at 560 (offset 15 lines). Hunk #13 succeeded at 854 (offset 247 lines). Hunk #14 succeeded at 662 (offset 15 lines). Hunk #15 succeeded at 962 (offset 249 lines). Hunk #16 succeeded at 850 with fuzz 2 (offset 25 lines). Hunk #17 succeeded at 1394 (offset 260 lines). Hunk #18 succeeded at 1263 with fuzz 1 (offset 42 lines). Hunk #19 succeeded at 1572 (offset 274 lines). Hunk #20 FAILED at 1597. Hunk #21 succeeded at 1400 (offset 25 lines). Hunk #22 FAILED at 1490. Hunk #23 succeeded at 1817 (offset 260 lines). 10 out of 23 hunks FAILED -- saving rejects to file apps/app_dial.c.rej patching file apps/app_directed_pickup.c Hunk #1 succeeded at 94 (offset 36 lines). patching file apps/app_followme.c Hunk #1 succeeded at 832 with fuzz 2 (offset 37 lines). patching file apps/app_queue.c Hunk #1 succeeded at 820 (offset 306 lines). Hunk #2 FAILED at 2487. Hunk #3 FAILED at 2874. 2 out of 3 hunks FAILED -- saving rejects to file apps/app_queue.c.rej patching file channels/chan_agent.c Hunk #1 succeeded at 796 (offset 96 lines). patching file channels/chan_dahdi.c Hunk #1 succeeded at 3164 (offset 1033 lines). Hunk #3 succeeded at 3222 with fuzz 2 (offset 1032 lines). Hunk #4 FAILED at 3289. Hunk #5 succeeded at 2404 with fuzz 1 (offset 27 lines). Hunk #6 succeeded at 3458 (offset 1032 lines). Hunk #7 FAILED at 3539. Hunk #8 succeeded at 2791 (offset 76 lines). Hunk #9 succeeded at 3762 (offset 1033 lines). 2 out of 9 hunks FAILED -- saving rejects to file channels/chan_dahdi.c.rej patching file channels/chan_h323.c Hunk #1 succeeded at 609 (offset -2 lines). patching file channels/chan_iax2.c Hunk #1 FAILED at 279. Hunk #2 succeeded at 4340 (offset 1033 lines). Hunk #3 FAILED at 4385. Hunk #5 succeeded at 4849 (offset 1270 lines). Hunk #7 succeeded at 5354 (offset 1365 lines). Hunk #8 succeeded at 4015 (offset -8 lines). Hunk #9 succeeded at 7417 (offset 1479 lines). Hunk #10 succeeded at 8033 (offset 63 lines). Hunk #11 succeeded at 11047 (offset 1602 lines). Hunk #12 FAILED at 11577. Hunk #13 FAILED at 12079. Hunk #14 FAILED at 12320. 5 out of 14 hunks FAILED -- saving rejects to file channels/chan_iax2.c.rej patching file channels/chan_local.c Hunk #1 FAILED at 473. 1 out of 1 hunk FAILED -- saving rejects to file channels/chan_local.c.rej patching file channels/chan_mgcp.c Hunk #1 succeeded at 916 (offset 4 lines). patching file channels/chan_phone.c patching file channels/chan_sip.c Hunk #1 FAILED at 988. Hunk #2 succeeded at 1590 with fuzz 2 (offset 387 lines). Hunk #3 FAILED at 2374. Hunk #4 succeeded at 2199 with fuzz 1 (offset 181 lines). Hunk #5 succeeded at 2414 (offset 387 lines). Hunk #6 FAILED at 4445. Hunk #7 succeeded at 6278 with fuzz 2 (offset 995 lines). Hunk #8 succeeded at 8692 (offset 1160 lines). Hunk #9 succeeded at 8786 (offset 998 lines). Hunk #10 FAILED at 9624. Hunk #11 succeeded at 9824 with fuzz 2 (offset 1163 lines). Hunk #12 succeeded at 9759 with fuzz 2 (offset 1003 lines). Hunk #13 succeeded at 9928 with fuzz 1 (offset 1163 lines). Hunk #14 succeeded at 9888 with fuzz 2 (offset 1022 lines). Hunk #15 succeeded at 10528 with fuzz 2 (offset 1387 lines). Hunk #16 succeeded at 12007 (offset 1363 lines). Hunk #17 FAILED at 12748. Hunk #18 FAILED at 12764. Hunk #19 FAILED at 12800. Hunk #20 FAILED at 12815. Hunk #21 FAILED at 12840. Hunk #22 succeeded at 12828 (offset 1317 lines). Hunk #23 succeeded at 12931 (offset 1382 lines). Hunk #24 FAILED at 12977. Hunk #25 FAILED at 13040. Hunk #26 succeeded at 12996 (offset 1323 lines). Hunk #27 FAILED at 13070. Hunk #28 succeeded at 16556 (offset 1732 lines). Hunk #29 FAILED at 16580. Hunk #30 succeeded at 18467 (offset 1582 lines). misordered hunks! output would be garbled Hunk #31 FAILED at 18103. Hunk #32 FAILED at 19110. Hunk #33 FAILED at 20636. 16 out of 33 hunks FAILED -- saving rejects to file channels/chan_sip.c.rej patching file channels/chan_skinny.c Hunk #1 FAILED at 2246. Hunk #2 succeeded at 3648 (offset 366 lines). Hunk #3 FAILED at 3805. Hunk #4 FAILED at 3884. Hunk #5 FAILED at 4076. Hunk #6 FAILED at 4116. Hunk #7 FAILED at 4157. Hunk #8 succeeded at 3943 with fuzz 2 (offset 131 lines). 6 out of 8 hunks FAILED -- saving rejects to file channels/chan_skinny.c.rej patching file channels/chan_unistim.c Hunk #1 succeeded at 3672 (offset 6 lines). patching file funcs/func_connectedline.c patching file include/asterisk/channel.h Hunk #1 FAILED at 244. Hunk #2 FAILED at 493. Hunk #3 succeeded at 1846 with fuzz 1 (offset 195 lines). 2 out of 3 hunks FAILED -- saving rejects to file include/asterisk/channel.h.rej patching file include/asterisk/frame.h Hunk #1 FAILED at 84. Hunk #2 FAILED at 300. 2 out of 2 hunks FAILED -- saving rejects to file include/asterisk/frame.h.rej patching file main/channel.c Hunk #1 succeeded at 1444 (offset 190 lines). Hunk #2 succeeded at 1338 (offset 5 lines). Hunk #3 FAILED at 2867. Hunk #4 FAILED at 3357. Hunk #5 FAILED at 3398. Hunk #6 FAILED at 4298. Hunk #7 succeeded at 6159 with fuzz 2 (offset 963 lines). 4 out of 7 hunks FAILED -- saving rejects to file main/channel.c.rej patching file main/dial.c Hunk #1 succeeded at 274 with fuzz 1 (offset 1 line). Hunk #3 succeeded at 430 (offset 1 line). patching file main/features.c Hunk #1 succeeded at 4566 with fuzz 2 (offset 1271 lines). patching file main/rtp.c Hunk #1 FAILED at 3389. Hunk #2 FAILED at 3630. 2 out of 2 hunks FAILED -- saving rejects to file main/rtp.c.rej -----Oorspronkelijk bericht----- Van: asterisk-users-boun...@lists.digium.com [mailto:asterisk-users-boun...@lists.digium.com] Namens Doug Lytle Verzonden: 20-06-2011 13:11 Aan: Asterisk Users Mailing List - Non-Commercial Discussion Onderwerp: Re: [asterisk-users] Connected Line ID Arjan Kroon | Mobillion wrote: > But is there a patch from version 1.6.2.12? Not that I can see. You could try applying the patches against that version and see if they apply cleanly. Doug -- Ben Franklin quote: "Those who would give up Essential Liberty to purchase a little Temporary Safety, deserve neither Liberty nor Safety." -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- New to Asterisk? Join us for a live introductory webinar every Thurs: http://www.asterisk.org/hello asterisk-users mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-users -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- New to Asterisk? Join us for a live introductory webinar every Thurs: http://www.asterisk.org/hello asterisk-users mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-users
