feliXyz
11.04.05, 11:41
hallo,
ich versuche gerade squid um den auth-helper ldap_group zu erweitern und möchte den ldap_group-patch in die squid sourcen einbinden.
die originalen squid sourcen kann ich ohne weitere probleme compilieren:
./configure --enable-basic-auth-helpers=SMB --sysconfdir=/etc --localstatedir=/var/log/squid && make && make install
wenn ich, wie auf der ladap_group seite beschrieben den patch über folgenden befehl einbinden will bekomme ich leider immer ein paar meldungen, mit denen ich nichst anfangen kann.
ich habe den patch group_ldap_auth.diff-2.4.STABLE7-1.4 in das verzeichnis squid-2.5.STABLE9 mit den entpackten squid sourcen kopiert und führe nun folgenden befehl, in diesem verzeichnis, aus und erhalte im anschluß folgende ausgabe:
# patch -p2 <group_ldap_auth.diff-2.4.STABLE7-1.4
patching file auth_modules/GROUP_LDAP/Makefile.in
patching file auth_modules/GROUP_LDAP/README
patching file auth_modules/GROUP_LDAP/group_ldap_auth.c
patching file include/version.h
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- saving rejects to file include/version.h.rej
patching file src/Makefile.in
Hunk #1 FAILED at 93.
1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej
patching file src/acl.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 55.
Hunk #3 FAILED at 80.
Hunk #4 succeeded at 110 with fuzz 2 (offset -44 lines).
Hunk #5 succeeded at 247 (offset -42 lines).
Hunk #6 succeeded at 329 (offset -26 lines).
Hunk #7 succeeded at 855 with fuzz 2 (offset 123 lines).
Hunk #8 succeeded at 1012 with fuzz 1 (offset 144 lines).
Hunk #9 succeeded at 1092 (offset 142 lines).
Hunk #10 FAILED at 1299.
Hunk #11 succeeded at 1642 with fuzz 1 (offset 172 lines).
Hunk #12 succeeded at 2090 (offset 235 lines).
Hunk #13 succeeded at 2250 with fuzz 2 (offset 207 lines).
Hunk #14 FAILED at 2434.
Hunk #15 succeeded at 2700 with fuzz 2 (offset 324 lines).
Hunk #16 succeeded at 2813 (offset 313 lines).
Hunk #17 succeeded at 2875 with fuzz 2 (offset 329 lines).
Hunk #18 FAILED at 3204.
6 out of 18 hunks FAILED -- saving rejects to file src/acl.c.rej
patching file src/cf.data.pre
Hunk #1 succeeded at 1603 with fuzz 1 (offset 398 lines).
Hunk #2 succeeded at 2158 (offset 361 lines).
patching file src/client_side.c
Hunk #1 FAILED at 243.
1 out of 1 hunk FAILED -- saving rejects to file src/client_side.c.rej
patching file src/enums.h
Hunk #1 succeeded at 121 with fuzz 1 (offset 6 lines).
Hunk #2 FAILED at 526.
1 out of 2 hunks FAILED -- saving rejects to file src/enums.h.rej
patching file src/ldap_authenticate.c
patching file src/main.c
Hunk #1 FAILED at 344.
Hunk #2 FAILED at 360.
Hunk #3 FAILED at 387.
Hunk #4 FAILED at 403.
Hunk #5 FAILED at 493.
Hunk #6 FAILED at 716.
6 out of 6 hunks FAILED -- saving rejects to file src/main.c.rej
patching file src/mem.c
Hunk #1 FAILED at 206.
1 out of 1 hunk FAILED -- saving rejects to file src/mem.c.rej
patching file src/protos.h
Hunk #1 FAILED at 58.
Hunk #2 succeeded at 775 with fuzz 2 (offset 72 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/protos.h.rej
patching file src/structs.h
Hunk #1 succeeded at 195 with fuzz 1 (offset 124 lines).
Hunk #2 FAILED at 286.
Hunk #3 FAILED at 458.
Hunk #4 succeeded at 519 with fuzz 1 (offset 169 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/structs.h.rej
patching file src/typedefs.h
Hunk #1 FAILED at 63.
1 out of 1 hunk FAILED -- saving rejects to file src/typedefs.h.rej[n]
im anschluß habe ich folgenden befehl ausprobiert und die nachfolgende abfrage erhalten
# patch -p2 <./group_ldap_auth.diff-2.4.STABLE7-1.4
The next patch would create the file auth_modules/GROUP_LDAP/Makefile.in,
which already exists! Assume -R? [n]
muß ich in dem ldap_group patch noch änderungen an den variablen vornehmen oder kann ich den ldap_group patch nicht mit der version (STABLE9) von squid verwenden?
gruß felix
ich versuche gerade squid um den auth-helper ldap_group zu erweitern und möchte den ldap_group-patch in die squid sourcen einbinden.
die originalen squid sourcen kann ich ohne weitere probleme compilieren:
./configure --enable-basic-auth-helpers=SMB --sysconfdir=/etc --localstatedir=/var/log/squid && make && make install
wenn ich, wie auf der ladap_group seite beschrieben den patch über folgenden befehl einbinden will bekomme ich leider immer ein paar meldungen, mit denen ich nichst anfangen kann.
ich habe den patch group_ldap_auth.diff-2.4.STABLE7-1.4 in das verzeichnis squid-2.5.STABLE9 mit den entpackten squid sourcen kopiert und führe nun folgenden befehl, in diesem verzeichnis, aus und erhalte im anschluß folgende ausgabe:
# patch -p2 <group_ldap_auth.diff-2.4.STABLE7-1.4
patching file auth_modules/GROUP_LDAP/Makefile.in
patching file auth_modules/GROUP_LDAP/README
patching file auth_modules/GROUP_LDAP/group_ldap_auth.c
patching file include/version.h
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- saving rejects to file include/version.h.rej
patching file src/Makefile.in
Hunk #1 FAILED at 93.
1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej
patching file src/acl.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 55.
Hunk #3 FAILED at 80.
Hunk #4 succeeded at 110 with fuzz 2 (offset -44 lines).
Hunk #5 succeeded at 247 (offset -42 lines).
Hunk #6 succeeded at 329 (offset -26 lines).
Hunk #7 succeeded at 855 with fuzz 2 (offset 123 lines).
Hunk #8 succeeded at 1012 with fuzz 1 (offset 144 lines).
Hunk #9 succeeded at 1092 (offset 142 lines).
Hunk #10 FAILED at 1299.
Hunk #11 succeeded at 1642 with fuzz 1 (offset 172 lines).
Hunk #12 succeeded at 2090 (offset 235 lines).
Hunk #13 succeeded at 2250 with fuzz 2 (offset 207 lines).
Hunk #14 FAILED at 2434.
Hunk #15 succeeded at 2700 with fuzz 2 (offset 324 lines).
Hunk #16 succeeded at 2813 (offset 313 lines).
Hunk #17 succeeded at 2875 with fuzz 2 (offset 329 lines).
Hunk #18 FAILED at 3204.
6 out of 18 hunks FAILED -- saving rejects to file src/acl.c.rej
patching file src/cf.data.pre
Hunk #1 succeeded at 1603 with fuzz 1 (offset 398 lines).
Hunk #2 succeeded at 2158 (offset 361 lines).
patching file src/client_side.c
Hunk #1 FAILED at 243.
1 out of 1 hunk FAILED -- saving rejects to file src/client_side.c.rej
patching file src/enums.h
Hunk #1 succeeded at 121 with fuzz 1 (offset 6 lines).
Hunk #2 FAILED at 526.
1 out of 2 hunks FAILED -- saving rejects to file src/enums.h.rej
patching file src/ldap_authenticate.c
patching file src/main.c
Hunk #1 FAILED at 344.
Hunk #2 FAILED at 360.
Hunk #3 FAILED at 387.
Hunk #4 FAILED at 403.
Hunk #5 FAILED at 493.
Hunk #6 FAILED at 716.
6 out of 6 hunks FAILED -- saving rejects to file src/main.c.rej
patching file src/mem.c
Hunk #1 FAILED at 206.
1 out of 1 hunk FAILED -- saving rejects to file src/mem.c.rej
patching file src/protos.h
Hunk #1 FAILED at 58.
Hunk #2 succeeded at 775 with fuzz 2 (offset 72 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/protos.h.rej
patching file src/structs.h
Hunk #1 succeeded at 195 with fuzz 1 (offset 124 lines).
Hunk #2 FAILED at 286.
Hunk #3 FAILED at 458.
Hunk #4 succeeded at 519 with fuzz 1 (offset 169 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/structs.h.rej
patching file src/typedefs.h
Hunk #1 FAILED at 63.
1 out of 1 hunk FAILED -- saving rejects to file src/typedefs.h.rej[n]
im anschluß habe ich folgenden befehl ausprobiert und die nachfolgende abfrage erhalten
# patch -p2 <./group_ldap_auth.diff-2.4.STABLE7-1.4
The next patch would create the file auth_modules/GROUP_LDAP/Makefile.in,
which already exists! Assume -R? [n]
muß ich in dem ldap_group patch noch änderungen an den variablen vornehmen oder kann ich den ldap_group patch nicht mit der version (STABLE9) von squid verwenden?
gruß felix