SourceMage Grimoire Bug List

[bugzilla-daemon AT bugs.sourcemage.org]

http://bugs.sourcemage.org/show_bug.cgi?id=14127

           Summary: openldap : patch for context security does not apply to
                    2.4.6 version
           Product: Codex
           Version: test grimoire
          Platform: x86
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: collab
        AssignedTo: sm-grimoire-bugs AT lists.ibiblio.org
        ReportedBy: julien AT rozo.org


In openldap spell, there's a patch to apply context security to openldap. But 
if
this patch is applied to version 2.4.6, it is rejected with the following 
error :

Unpacking source file openldap-2.4.6.tgz for spell openldap.
Applying the context patch.
patching file include/ldap.h
Hunk #1 succeeded at 708 (offset 41 lines).
Hunk #2 succeeded at 863 (offset 132 lines).
Hunk #3 succeeded at 1294 (offset -57 lines).
patching file include/ldap_pvt.h
Hunk #1 succeeded at 283 (offset 44 lines).
patching file libraries/libldap/init.c
Hunk #1 succeeded at 127 (offset 13 lines).
Hunk #3 succeeded at 249 (offset 18 lines).
Hunk #4 succeeded at 240 with fuzz 1.
Hunk #5 succeeded at 290 (offset 36 lines).
Hunk #7 succeeded at 331 (offset 36 lines).
Hunk #8 succeeded at 434 (offset 2 lines).
Hunk #9 succeeded at 533 (offset 36 lines).
Hunk #10 succeeded at 564 (offset 1 line).
patching file libraries/libldap/ldap-int.h
Hunk #1 succeeded at 421 (offset 46 lines).
Hunk #2 succeeded at 606 (offset -25 lines).
patching file libraries/libldap/open.c
Hunk #1 FAILED at 87.
Hunk #2 FAILED at 243.
Hunk #3 succeeded at 282 (offset -3 lines).
2 out of 3 hunks FAILED -- saving rejects to file libraries/libldap/open.c.rej
patching file libraries/libldap/options.c
Hunk #1 succeeded at 97 (offset 3 lines).
Hunk #3 succeeded at 349 (offset 20 lines).
Hunk #5 succeeded at 398 (offset 20 lines).
Hunk #6 succeeded at 673 (offset -17 lines).
patching file libraries/libldap/tls.c
Hunk #1 succeeded at 2097 with fuzz 1 (offset 928 lines).
Hunk #2 FAILED at 2121.
Hunk #3 succeeded at 1222 (offset 3 lines).
Hunk #4 succeeded at 2161 (offset 928 lines).
Hunk #5 succeeded at 1349 (offset 16 lines).
misordered hunks! output would be garbled
Hunk #6 FAILED at 2175.
2 out of 6 hunks FAILED -- saving rejects to file libraries/libldap/tls.c.rej

Spells that encountered problems:
---------------------------------
openldap

-- 
Configure bugmail: http://bugs.sourcemage.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.