link mod_lua against -lcrypt (#1538992)

Resolves: rhbz#1538992
This commit is contained in:
Joe Orton 2018-01-27 09:19:58 +01:00
parent 2820bed4db
commit 2971e92b1f
2 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,17 @@
# ./pullrev.sh 1822305
http://svn.apache.org/viewvc?view=revision&revision=1822305
https://bugzilla.redhat.com/show_bug.cgi?id=1538992
--- httpd-2.4.27/modules/lua/config.m4
+++ httpd-2.4.27/modules/lua/config.m4
@@ -104,7 +104,7 @@
CHECK_LUA()
if test "x$enable_lua" != "xno" ; then
APR_ADDTO(MOD_INCLUDES, [$LUA_CFLAGS])
- APR_ADDTO(MOD_LUA_LDADD, [$LUA_LIBS])
+ APR_ADDTO(MOD_LUA_LDADD, [$LUA_LIBS $CRYPT_LIBS])
fi
])

View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.29 Version: 2.4.29
Release: 4%{?dist} Release: 5%{?dist}
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -56,6 +56,7 @@ Patch2: httpd-2.4.9-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch Patch3: httpd-2.4.1-deplibs.patch
Patch5: httpd-2.4.3-layout.patch Patch5: httpd-2.4.3-layout.patch
Patch6: httpd-2.4.3-apctl-systemd.patch Patch6: httpd-2.4.3-apctl-systemd.patch
Patch7: httpd-2.4.27-r1822305.patch
# Needed for socket activation and mod_systemd patch # Needed for socket activation and mod_systemd patch
Patch19: httpd-2.4.25-detect-systemd.patch Patch19: httpd-2.4.25-detect-systemd.patch
# Features/functional changes # Features/functional changes
@ -200,6 +201,7 @@ interface for storing and accessing per-user session data.
%patch3 -p1 -b .deplibs %patch3 -p1 -b .deplibs
%patch5 -p1 -b .layout %patch5 -p1 -b .layout
%patch6 -p1 -b .apctlsystemd %patch6 -p1 -b .apctlsystemd
%patch7 -p1 -b .r1822305
%patch19 -p1 -b .detectsystemd %patch19 -p1 -b .detectsystemd
@ -682,6 +684,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Sat Jan 27 2018 Joe Orton <jorton@redhat.com> - 2.4.29-5
- link mod_lua against -lcrypt (#1538992)
* Fri Jan 26 2018 Paul Howarth <paul@city-fan.org> - 2.4.29-4 * Fri Jan 26 2018 Paul Howarth <paul@city-fan.org> - 2.4.29-4
- Rebuild with updated flags to work around compiler issues on i686 - Rebuild with updated flags to work around compiler issues on i686
(#1538648, #1538693) (#1538648, #1538693)