Commit 6f571b00 authored by Joe Orton's avatar Joe Orton
Browse files

Backport from HEAD: 

* support/Makefile.in (suexec): Don't link against libapr etc; suexec
is self-contained.

Reviewed by: trawick, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105181 13f79535-47bb-0310-9956-ffa450edef68
parent a407dbdd

STATUS

+1 −13
Original line number Diff line number Diff line 
APACHE 2.0 STATUS:                                              -*-text-*-

Last modified at [$Date: 2004/09/17 09:01:49 $]

Last modified at [$Date: 2004/09/17 09:04:56 $]



Release:
@@ -104,18 +104,6 @@ PATCHES TO BACKPORT FROM 2.1 
         modules/mappers/mod_rewrite.c: r1.259

       +1: nd

       

    *) Don't link suexec against APR/etc libraries.

       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/Makefile.in?r1=1.38&r2=1.39

       +1: jorton, trawick, nd

       nd: what about the need of -static (dunno)?

       jorton: -static was needed only to make sure libapr etc were linked statically

       into suexec; they didn't work shared in a binary distribution because

       LD_LIBRARY_PATH etc are ignored for a setuid binary (that only matters

       for binary distributors where suexec gets relocated, since libtool 

       puts an appropriate RPATH in the binary).  Not linking suexec against libapr 

       etc avoids the issue entirely (and avoids scary >1Mb suexec binaries)

       nd: oh well.



    *) mod_headers: Support {...}s tag for SSL variable lookup.

       http://www.apache.org/~jorton/mod_headers-2.0-ssl.diff

       +1: jorton, trawick

support/Makefile.in

+1 −3
Original line number Diff line number Diff line
@@ -57,9 +57,7 @@ checkgid_OBJECTS = checkgid.lo 
checkgid: $(checkgid_OBJECTS)

	$(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)



# suexec must be statically compiled. Otherwise it is not relocatable,

# since LD_* environment variables are ignored in setuid programs.

suexec_OBJECTS = suexec.lo

suexec: $(suexec_OBJECTS)

	$(LINK) -static $(suexec_OBJECTS) $(PROGRAM_LDADD)

	$(LINK) $(suexec_OBJECTS)