Administrator TOOTAI
2015-Jul-08 22:28 UTC
[asterisk-users] 11.18.0 patch against 11.17.0 running version failed to apply
Le 08/07/2015 17:36, Richard Mudgett a ?crit :> > > On Wed, Jul 8, 2015 at 8:14 AM, Administrator TOOTAI <admin at tootai.net > <mailto:admin at tootai.net>> wrote: > > Hi list, > > we wanted to patch our servers with 11.18.0 patch against 11.17.0 > actual running version. Patch failed with > > zone-s:/usr/src/asterisk-11.18.0# patch --dry-run -p0 < > ../asterisk-11.18.0-patch > can't find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/.version b/.version > |index c5df2aa..150754a 100644 > |--- a/.version > |+++ b/.version > -------------------------- > File to patch:[SNIP]> > The two patch files were created by different version control systems. > One was created by git > the other created by subversion. For the git patch you would need to > use -p1 for the subversion > patch you would need to use -p0. The patch program gave you this hint > when it failed to apply > the patch: "Perhaps you used the wrong -p or --strip option?".We already tried with no luck: zone-s:/usr/src/asterisk-11.18.0# patch --dry-run -p1 < ../asterisk-11.18.0-patch patching file .version Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file .version.rej patching file ChangeLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej The next patch would delete the file asterisk-11.18.0-rc1-summary.html, which does not exist! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored The next patch would delete the file asterisk-11.18.0-rc1-summary.txt, which does not exist! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored patching file asterisk-11.18.0-summary.html patching file asterisk-11.18.0-summary.txt As you can see, patch is against -rc1 not 11.17.0 ... Thanks for your support. -- Daniel
Tzafrir Cohen
2015-Jul-09 15:05 UTC
[asterisk-users] 11.18.0 patch against 11.17.0 running version failed to apply
On Thu, Jul 09, 2015 at 12:28:15AM +0200, Administrator TOOTAI wrote:> zone-s:/usr/src/asterisk-11.18.0# patch --dry-run -p1 < > ../asterisk-11.18.0-patch > patching file .version > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file .version.rej > patching file ChangeLog > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej > The next patch would delete the file asterisk-11.18.0-rc1-summary.html, > which does not exist! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored > The next patch would delete the file asterisk-11.18.0-rc1-summary.txt, > which does not exist! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored > patching file asterisk-11.18.0-summary.html > patching file asterisk-11.18.0-summary.txt > > As you can see, patch is against -rc1 not 11.17.0 ...The content of files has changed. patch refuses to change from an unfamiliar content. Either edit the patch file and remove .version (edit the version manually) or edit the patch file and edit the version form 11.7.0 to 11.8.0 . The content of the files you refer to is normally insignificant to the behaviour of Asterisk. Just remove them from the patch and be done with it. -- Tzafrir Cohen icq#16849755 jabber:tzafrir.cohen at xorcom.com +972-50-7952406 mailto:tzafrir.cohen at xorcom.com http://www.xorcom.com
Administrator TOOTAI
2015-Jul-10 11:09 UTC
[asterisk-users] 11.18.0 patch against 11.17.0 running version failed to apply
Le 09/07/2015 17:05, Tzafrir Cohen a ?crit :> On Thu, Jul 09, 2015 at 12:28:15AM +0200, Administrator TOOTAI wrote: > >> zone-s:/usr/src/asterisk-11.18.0# patch --dry-run -p1 < >> ../asterisk-11.18.0-patch >> patching file .version >> Hunk #1 FAILED at 1. >> 1 out of 1 hunk FAILED -- saving rejects to file .version.rej >> patching file ChangeLog >> Hunk #1 FAILED at 1. >> 1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej >> The next patch would delete the file asterisk-11.18.0-rc1-summary.html, >> which does not exist! Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 1 out of 1 hunk ignored >> The next patch would delete the file asterisk-11.18.0-rc1-summary.txt, >> which does not exist! Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 1 out of 1 hunk ignored >> patching file asterisk-11.18.0-summary.html >> patching file asterisk-11.18.0-summary.txt >> >> As you can see, patch is against -rc1 not 11.17.0 ... > > The content of files has changed. patch refuses to change from an > unfamiliar content. > > Either edit the patch file and remove .version (edit the version > manually) or edit the patch file and edit the version form 11.7.0 to > 11.8.0 . > > The content of the files you refer to is normally insignificant to the > behaviour of Asterisk. Just remove them from the patch and be done with > it. >Well take a look in the file, this patch is only for: --- a/.version +++ b/.version --- a/ChangeLog +++ b/ChangeLog --- a/asterisk-11.18.0-rc1-summary.html +++ /dev/null --- a/asterisk-11.18.0-rc1-summary.txt +++ /dev/null --- /dev/null +++ b/asterisk-11.18.0-summary.txt Definitely something is wrong with this patch. We reinstalled our servers from full tar.gz Thanks for your support -- Daniel