asterisk users - Jul 2015 - 11.18.0 patch against 11.17.0 running version failed to apply

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:

It seems that patch file for 11.18.0 are completely different from 
previous one. Patch for 11.17.0 looked like (first 3 lines)

--- asterisk-11.16.0-summary.html       (.../11.16.0) (revision 433916)
+++ asterisk-11.16.0-summary.html       (.../11.17.0) (revision 433916)
@@ -1,307 +0,0 @@

which is different from 11.18.0

diff --git a/.version b/.version
index c5df2aa..150754a 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@

OS is Debian Wheezy 7.8

What are we doing wrong ?

Thanks for any hint

-- 
Daniel

On Wed, Jul 8, 2015 at 8:14 AM, Administrator TOOTAI <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:
>
> It seems that patch file for 11.18.0 are completely different from
> previous one. Patch for 11.17.0 looked like (first 3 lines)
>
> --- asterisk-11.16.0-summary.html       (.../11.16.0) (revision 433916)
> +++ asterisk-11.16.0-summary.html       (.../11.17.0) (revision 433916)
> @@ -1,307 +0,0 @@
>
> which is different from 11.18.0
>
> diff --git a/.version b/.version
> index c5df2aa..150754a 100644
> --- a/.version
> +++ b/.version
> @@ -1 +1 @@
>
> OS is Debian Wheezy 7.8
>
> What are we doing wrong ?
>
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?".

Richard
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.digium.com/pipermail/asterisk-users/attachments/20150708/b73e9056/attachment.html>

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