Commit 71765b53 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

* Backport 102870; PR 17217; stop linking OpenSSL .so's to support/* 

      binaries (especially when compiled --with-static-support (!)) and
          fix mod_ssl.so to compile against .a openssl archives.
                http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev
                    adjusted patch without distcache complexity and accomodating the
                        changes for pkgconfig info from ssl
                              http://people.apache.org/~wrowe/httpd-2.0-limit-ssl-binding.patch
                                  +1: wrowe, colm, rpluem



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@607260 13f79535-47bb-0310-9956-ffa450edef68
parent 702b1ee6

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -116,14 +116,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  * Backport 102870; PR 17217; stop linking OpenSSL .so's to support/*

    binaries (especially when compiled --with-static-support (!)) and

    fix mod_ssl.so to compile against .a openssl archives.

      http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev

    adjusted patch without distcache complexity and accomodating the

    changes for pkgconfig info from ssl

      http://people.apache.org/~wrowe/httpd-2.0-limit-ssl-binding.patch

    +1: wrowe, colm, rpluem



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ please place SVN revisions from trunk here, so it is easy to

acinclude.m4

+17 −4
Changes for acinclude.m4: 17 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ AC_DEFUN(APACHE_MODPATH_ADD,[ 
      modpath_static="$modpath_static $libname"

      cat >>$modpath_current/modules.mk<<EOF

$libname: $objects

	\$(MOD_LINK) $objects

	\$(MOD_LINK) $objects $5

EOF

    else

      apache_need_shared=yes
@@ -266,7 +266,10 @@ AC_DEFUN(APACHE_MODULE,[ 
      fi

      shared="";;

    esac

    APACHE_MODPATH_ADD($1, $shared, $3)

    define([modprefix], [MOD_]translit($1, [a-z-], [A-Z_]))

    APACHE_MODPATH_ADD($1, $shared, $3,, [\$(]modprefix[_LDADD)])

    APACHE_SUBST(modprefix[_LDADD])

    undefine([modprefix])

  fi

])dnl
@@ -488,14 +491,24 @@ if test "x$ap_ssltk_base" = "x"; then 
      APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_libdir])

    fi

  fi

  APR_ADDTO(LIBS, [-lssl -lcrypto])

  # Put SSL libraries in SSL_LIBS.

  if test "$ap_ssltk_type" = "openssl"; then

    APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])

  else

    APR_SETVAR(SSL_LIBS, [-lsslc])

  fi

  pkg-config openssl 2> /dev/null

  if test $? -eq 0; then

    ap_ssltk_incdep=`pkg-config --cflags-only-I openssl`

    APR_ADDTO(INCLUDES, $ap_ssltk_incdep)

    ap_ssltk_libdep=`pkg-config --libs openssl`

    APR_ADDTO(LIBS, $ap_ssltk_libdep)

    if test "$ap_ssltk_type" = "openssl"; then

      APR_SETVAR(SSL_LIBS, $ap_ssltk_libdep)

    else

      APR_SETVAR(SSL_LIBS, $ap_ssltk_libdep)

    fi

  fi

  APACHE_SUBST(SSL_LIBS)

  ap_cv_ssltk="$ap_ssltk_base"

fi

])

modules/ssl/config.m4

+1 −0
Changes for modules/ssl/config.m4: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ ssl_util_table.lo dnl 
dnl #  hook module into the Autoconf mechanism (--enable-ssl option)

APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [

    APACHE_CHECK_SSL_TOOLKIT

    APR_SETVAR(MOD_SSL_LDADD, [\$(SSL_LIBS)])

    AC_CHECK_FUNCS(SSL_set_state)

    AC_CHECK_FUNCS(SSL_set_cert_store)

])

support/Makefile.in

+2 −1
Changes for support/Makefile.in: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ htdbm: $(htdbm_OBJECTS) 
	$(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD)



ab_OBJECTS = ab.lo

ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS)

ab: $(ab_OBJECTS)

	$(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(PROGRAM_LDADD)

	$(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD)



checkgid_OBJECTS = checkgid.lo

checkgid: $(checkgid_OBJECTS)