diff options
| -rw-r--r-- | httpd-2.0.45-deplibs.patch | 19 | ||||
| -rw-r--r-- | httpd-2.2.9-deplibs.patch | 14 | ||||
| -rw-r--r-- | httpd.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 18 insertions, 23 deletions
diff --git a/httpd-2.0.45-deplibs.patch b/httpd-2.0.45-deplibs.patch deleted file mode 100644 index 8fd05cf..0000000 --- a/httpd-2.0.45-deplibs.patch +++ /dev/null @@ -1,19 +0,0 @@ - -apr and apr-util are patched to correctly depend on their deps, so -it's sufficient to just link httpd against the .la file. - -Upstream-HEAD: needed -Upstream-2.0: omit -Upstream-Status: apr-util still to be fixed properly on HEAD - ---- httpd-2.0.45/configure.in.deplibs 2003-04-29 10:27:05.000000000 +0100 -+++ httpd-2.0.45/configure.in 2003-04-29 10:26:45.000000000 +0100 -@@ -455,7 +455,7 @@ - AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS" - - dnl APR should go after the other libs, so the right symbols can be picked up --AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`" -+AP_LIBS="$AP_LIBS `$apu_config --link-libtool` `$apr_config --link-libtool`" - APACHE_SUBST(AP_LIBS) - APACHE_SUBST(AP_BUILD_SRCLIB_DIRS) - APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS) diff --git a/httpd-2.2.9-deplibs.patch b/httpd-2.2.9-deplibs.patch new file mode 100644 index 0000000..def61ed --- /dev/null +++ b/httpd-2.2.9-deplibs.patch @@ -0,0 +1,14 @@ +--- httpd-2.2.9/configure.in.deplibs ++++ httpd-2.2.9/configure.in +@@ -588,9 +588,8 @@ APACHE_HELP_STRING(--with-suexec-umask,u + AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] ) + + dnl APR should go after the other libs, so the right symbols can be picked up +-apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \ +- || apulinklibs="`$apu_config --link-libtool --libs`" +-AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`" ++apulinklibs="`$apu_config --link-libtool`" ++AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool`" + APACHE_SUBST(AP_LIBS) + APACHE_SUBST(AP_BUILD_SRCLIB_DIRS) + APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS) @@ -5,8 +5,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.2.8 -Release: 3.1 +Version: 2.2.9 +Release: 1%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -23,7 +23,7 @@ Source33: README.confd # build/scripts patches Patch1: httpd-2.1.10-apctl.patch Patch2: httpd-2.1.10-apxs.patch -Patch3: httpd-2.0.45-deplibs.patch +Patch3: httpd-2.2.9-deplibs.patch Patch4: httpd-2.1.10-disablemods.patch Patch5: httpd-2.1.10-layout.patch # Features/functional changes @@ -1 +1 @@ -39a755eb0f584c279336387b321e3dfc httpd-2.2.8.tar.gz +80d3754fc278338033296f0d41ef2c04 httpd-2.2.9.tar.gz |