Blicke da nicht durch 2.017 auf 2.018

[wartek]

Nochmal.
Wenn Du den Patch 2.0.17 auf 2.0.18 einspielst ist das ok aber Du hast dann trotzdem keine "echte" 2.0.18 weil Dir dann vl die (Applikations)Updates 2.0.15 auf 2.0.16 und 2.0.16 auf 2.0.17 fehlen. Da ich Deine Erstversion nicht weiß kann das ja auch mit 2.0.8 oder was weiß ich beginnen. Die Liste ist ja nur ein Bsp.

Also immer ganz vone anfagen

wartek

[RalfThomas]

kann ich auch einzelne Ptches einspielen
von vorne beginnen bis 2.18 ?


Gruss
Ralf

[wartek]

Ja. damit hast Du Deine Aufgabe schon mal grob umrissen

wartek

[RalfThomas]

die erste DAtei die ich mânuell änderen möchte stimmt schon nicht.
common.php
Gibt es wirklich keine Möglichkeit anhand einer Datei rauszufinden , welche Version man hat.
Ich vermute es ist 2.13 oder 2.14


Gruss
Ralf

[wartek]

Ja, aber die wird dir nicht gefallen und ist auch irgendwie kontraproduktiv.
Du kannst Dir mal eine 2.0.13 Original herunterholen und mit der vergleichen die Du hast. Bedenke dabei das MODs die Datei verändert haben könnten.
Falls Du im Code keine Beschreibung miteingetragen hast, was wodurch geändert wurde ist der Vergleich also unter Umständen unzureichend und müsste mit dem MOD erneut überarbeitet werden. Das ist nicht wirklich zielführend.
Ja eines der vielen Beispiele das Dokumentation nicht immer nur unnötiges Geschreibsel ist.

Ich kann Dir nicht raten was und wie Du am besten zu einer aktuellen Version kommst. Und ehrlich gesagt habe ich bei dieser Konstellation keine große Lust mich besonders darin zu vertiefen.

wartek

[RalfThomas]

Hallo,

ich denke ich habe den Release gefunden.
2.0.10 da ist die common.phph gleich wie meine und kommt mir auch bekannt vor.
Ich werde von 2.10 an patchen.

Gruss
Ralf

[RalfThomas]

Hallo,

führe ich in der SSH den Patch aus kommt nur
**** strip count l is not a number

Hat jemand ne Ahunhn was das sein könnte ?

Gruss
Ralf

[RalfThomas]

Es kamen mehrer Meldungen mit Rej

5021:/srv/www/web2/html/phpBB2 # patch -p1 -i phpBB-2.0.12_to_2.0.18.patch
patching file admin/admin_board.php
Hunk #1 FAILED at 6.
Hunk #2 succeeded at 97 with fuzz 2 (offset -3 lines).
Hunk #3 FAILED at 165.
Hunk #4 succeeded at 276 (offset 15 lines).
2 out of 4 hunks FAILED -- saving rejects to file admin/admin_board.php.rej
patching file admin/admin_disallow.php
patching file admin/admin_forums.php
Hunk #2 succeeded at 234 (offset 1 line).
Hunk #3 succeeded at 1053 (offset 28 lines).
patching file admin/admin_smilies.php
patching file admin/admin_styles.php
patching file admin/admin_ug_auth.php
Hunk #2 succeeded at 277 (offset 26 lines).
Hunk #3 succeeded at 441 (offset 26 lines).
Hunk #4 succeeded at 536 (offset 26 lines).
Hunk #5 succeeded at 596 (offset 26 lines).
Hunk #6 succeeded at 632 (offset 26 lines).
Hunk #7 succeeded at 835 (offset 26 lines).
Hunk #8 succeeded at 902 (offset 70 lines).
Hunk #9 FAILED at 978.
1 out of 9 hunks FAILED -- saving rejects to file admin/admin_ug_auth.php.rej
patching file admin/admin_user_ban.php
patching file admin/admin_users.php
Hunk #2 succeeded at 72 (offset 1 line).
Hunk #3 succeeded at 87 (offset 1 line).
Hunk #4 succeeded at 271 (offset 17 lines).
Hunk #5 succeeded at 329 (offset 35 lines).
Hunk #6 succeeded at 681 with fuzz 2 (offset 35 lines).
Hunk #7 succeeded at 924 (offset 101 lines).
Hunk #8 succeeded at 969 (offset 101 lines).
Hunk #9 succeeded at 980 (offset 101 lines).
Hunk #10 succeeded at 1040 (offset 105 lines).
patching file admin/index.php
Hunk #1 FAILED at 6.
Hunk #2 FAILED at 567.
Hunk #3 FAILED at 602.
3 out of 3 hunks FAILED -- saving rejects to file admin/index.php.rej
patching file admin/page_footer_admin.php
patching file admin/page_header_admin.php
patching file admin/pagestart.php
Hunk #2 succeeded at 41 with fuzz 1 (offset 1 line).
Hunk #3 succeeded at 58 (offset 1 line).
patching file common.php
Hunk #1 FAILED at 6.
Hunk #2 FAILED at 28.
Hunk #3 FAILED at 48.
Hunk #4 FAILED at 68.
Hunk #5 FAILED at 87.
Hunk #6 succeeded at 171 (offset -5 lines).
Hunk #7 succeeded at 181 (offset -5 lines).
5 out of 7 hunks FAILED -- saving rejects to file common.php.rej
patching file db/mysql.php
patching file db/mysql4.php
patching file db/oracle.php
patching file db/postgres7.php
patching file groupcp.php
Hunk #1 FAILED at 6.
1 out of 4 hunks FAILED -- saving rejects to file groupcp.php.rej
patching file includes/bbcode.php
Hunk #3 FAILED at 196.
Hunk #8 FAILED at 624.
2 out of 11 hunks FAILED -- saving rejects to file includes/bbcode.php.rej
patching file includes/constants.php
Hunk #1 FAILED at 6.
Hunk #2 FAILED at 167.
2 out of 2 hunks FAILED -- saving rejects to file includes/constants.php.rej
patching file includes/db.php
Hunk #2 succeeded at 60 with fuzz 1.
patching file includes/emailer.php
patching file includes/functions.php
Hunk #1 FAILED at 6.
Hunk #2 FAILED at 78.
Hunk #3 succeeded at 120 with fuzz 2 (offset -26 lines).
Hunk #4 succeeded at 554 (offset -14 lines).
Hunk #5 succeeded at 593 (offset -14 lines).
2 out of 5 hunks FAILED -- saving rejects to file includes/functions.php.rej
patching file includes/functions_admin.php
Hunk #3 succeeded at 141 with fuzz 1.
patching file includes/functions_post.php
Hunk #1 FAILED at 6.
Hunk #3 succeeded at 602 (offset 24 lines).
Hunk #4 succeeded at 784 (offset 24 lines).
1 out of 4 hunks FAILED -- saving rejects to file includes/functions_post.php.rej
patching file includes/functions_search.php
Hunk #1 FAILED at 6.
1 out of 2 hunks FAILED -- saving rejects to file includes/functions_search.php.rej
patching file includes/functions_selects.php
patching file includes/functions_validate.php
patching file includes/page_header.php
Hunk #3 succeeded at 574 (offset 124 lines).
Hunk #4 succeeded at 598 (offset 124 lines).
patching file includes/page_tail.php
Hunk #1 FAILED at 6.
Hunk #2 succeeded at 25 with fuzz 2.
Hunk #3 FAILED at 37.
2 out of 3 hunks FAILED -- saving rejects to file includes/page_tail.php.rej
patching file includes/sessions.php
Hunk #5 FAILED at 191.
1 out of 15 hunks FAILED -- saving rejects to file includes/sessions.php.rej
patching file includes/smtp.php
patching file includes/template.php
Hunk #1 FAILED at 6.
Hunk #2 succeeded at 481 (offset 6 lines).
1 out of 2 hunks FAILED -- saving rejects to file includes/template.php.rej
patching file includes/topic_review.php
Hunk #1 FAILED at 6.
Hunk #2 succeeded at 227 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file includes/topic_review.php.rej
patching file includes/usercp_activate.php
patching file includes/usercp_avatar.php
Hunk #1 FAILED at 6.
Hunk #2 FAILED at 63.
Hunk #3 succeeded at 85 (offset -8 lines).
Hunk #4 succeeded at 109 (offset -8 lines).
Hunk #5 succeeded at 169 (offset -8 lines).
Hunk #6 succeeded at 195 (offset -8 lines).
Hunk #7 succeeded at 203 (offset -8 lines).
Hunk #8 succeeded at 309 (offset -12 lines).
Hunk #9 succeeded at 355 (offset -12 lines).
Hunk #10 succeeded at 367 with fuzz 2 (offset -12 lines).
2 out of 10 hunks FAILED -- saving rejects to file includes/usercp_avatar.php.rej
patching file includes/usercp_register.php
Hunk #1 FAILED at 6.
Hunk #2 succeeded at 60 (offset -13 lines).
Hunk #3 succeeded at 163 (offset 10 lines).
Hunk #4 succeeded at 206 (offset 13 lines).
Hunk #5 succeeded at 214 (offset 13 lines).
Hunk #6 succeeded at 243 (offset 22 lines).
Hunk #7 succeeded at 382 (offset -29 lines).
Hunk #8 succeeded at 409 (offset -29 lines).
Hunk #9 succeeded at 427 (offset -29 lines).
Hunk #10 succeeded at 445 with fuzz 2 (offset -29 lines).
Hunk #11 succeeded at 547 (offset 19 lines).
Hunk #12 FAILED at 867.
Hunk #13 succeeded at 944 (offset 85 lines).
Hunk #14 succeeded at 979 (offset 85 lines).
2 out of 14 hunks FAILED -- saving rejects to file includes/usercp_register.php.rej
patching file includes/usercp_sendpasswd.php
Hunk #1 FAILED at 6.
1 out of 2 hunks FAILED -- saving rejects to file includes/usercp_sendpasswd.php.rej
patching file includes/usercp_viewprofile.php
Hunk #1 FAILED at 6.
Hunk #2 succeeded at 57 with fuzz 2 (offset 24 lines).
Hunk #3 FAILED at 189.
2 out of 3 hunks FAILED -- saving rejects to file includes/usercp_viewprofile.php.rej
patching file index.php
Hunk #2 succeeded at 356 (offset 173 lines).
can't find file to patch at input line 4093
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -crN phpbb2012/language/lang_english/email/topic_notify.tpl phpbb2018/language/lang_english/email/topic_notify.tpl
|*** phpbb2012/language/lang_english/email/topic_notify.tpl Mon Feb 21 20:30:21 2005
|--- phpbb2018/language/lang_english/email/topic_notify.tpl Mon Oct 31 08:32:36 2005

[Sandmann2k]

an der Stelle mal die kleine Frage:

Was hat mit diesem

Code: Alles auswählen

Hunk #7 succeeded at 835 (offset 26 lines). 

offset auf sich. Is das ein bedenklicher Fehler?
Hab nämlich einige Meldung des patch-Befehls, die so aussehen. Kann ich mich auf das Update dann trotzdem verlassen, wenn ich die 'richtigen' Fehler manuell korrigiert habe?

[Christian_W]

Das zeigt an, um wieviele Zeilen das Gesuchte gegenüber der Originaldatei verschoben ist. Wenn Du Mods eingebaut hast, hast Du ja Zeilen hinzugefügt und/oder entfernt. Wenn jetzt etwas in Zeile 10 gesucht wird aber erst in Zeile 18 gefunden, wird ein Offset von 8 angezeigt.

With context diffs, and to a lesser extent with normal diffs, patch can detect when the line numbers mentioned in the patch are incorrect, and attempts to find the correct place to apply each hunk of the patch. As a first guess, it takes the line number mentioned for the hunk, plus or minus any offset used in applying the previous hunk. If that is not the correct place, patch scans both forwards and backwards for a set of lines matching the context given in the hunk. First patch looks for a place where all lines of the context match. If no such place is found, and it's a context diff, and the maximum fuzz factor is set to 1 or more, then another scan takes place ignoring the first and last line of context. If that fails, and the maximum fuzz factor is set to 2 or more, the first two and last two lines of context are ignored, and another scan is made. (The default maximum fuzz factor is 2.) If patch cannot find a place to install that hunk of the patch, it puts the hunk out to a reject file, which normally is the name of the output file plus a .rej suffix, or # if .rej would generate a file name that is too long (if even appending the single character # makes the filename too long, then # replaces the file name's last character). (The rejected hunk comes out in ordinary context diff form regardless of the input patch's form. If the input was a normal diff, many of the contexts are simply null.) The line numbers on the hunks in the reject file may be different than in the patch file: they reflect the approximate location patch thinks the failed hunks belong in the new file rather than the old one.

Gruß Christian