rpms/openldap
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix: slapd daemon fails to start with segmentation fault on s390x

Browse Source 
Resolves: #1020661
This commit is contained in:
Jan Synacek 2013-10-21 12:40:42 +02:00
parent 7bbf8dc1d7
commit 4f8940365c
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openldap-security-pie.patch
View File

@ -1,16 +0,0 @@
Build slapd as position-independent executable (PIE) to take an advantage of
address space layout randomization (ASLD).
Author: Thomas Woerner <twoerner@redhat.com>
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -263,7 +263,7 @@ slapi/libslapi.la: FORCE
(cd slapi; $(MAKE) $(MFLAGS) all)
slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
- $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
+ $(LTLINK) -pie -Wl,-z,defs -o $@ $(SLAPD_OBJECTS) $(LIBS) \
$(WRAP_LIBS)
$(RM) $(SLAPTOOLS)
for i in $(SLAPTOOLS); do \

15
openldap.spec
View File

@ -5,7 +5,7 @@
Name: openldap Name: openldap
Version: 2.4.36 Version: 2.4.36
Release: 3%{?dist} Release: 4%{?dist}
Summary: LDAP support libraries Summary: LDAP support libraries
Group: System Environment/Daemons Group: System Environment/Daemons
License: OpenLDAP License: OpenLDAP
@ -26,7 +26,6 @@ Source55: libexec-generate-server-cert.sh
# patches for 2.4 # patches for 2.4
Patch0: openldap-manpages.patch Patch0: openldap-manpages.patch
Patch1: openldap-security-pie.patch
Patch2: openldap-sql-linking.patch Patch2: openldap-sql-linking.patch
Patch3: openldap-reentrant-gethostby.patch Patch3: openldap-reentrant-gethostby.patch
Patch4: openldap-smbk5pwd-overlay.patch Patch4: openldap-smbk5pwd-overlay.patch
@ -152,7 +151,6 @@ ln -s %{_includedir}/nspr4 include/nspr
AUTOMAKE=%{_bindir}/true autoreconf -fi AUTOMAKE=%{_bindir}/true autoreconf -fi
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
@ -191,9 +189,15 @@ popd
%build %build
%ifarch s390 s390x
export CFLAGS="-fPIE"
%else
export CFLAGS="-fpie"
%endif
export LDFLAGS="-pie"
# avoid stray dependencies (linker flag --as-needed) # avoid stray dependencies (linker flag --as-needed)
# enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS) # enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
export CFLAGS="%{optflags} -Wl,--as-needed -DLDAP_CONNECTIONLESS" export CFLAGS="${CFLAGS} %{optflags} -Wl,--as-needed -DLDAP_CONNECTIONLESS"
pushd openldap-%{version} pushd openldap-%{version}
%configure \ %configure \
@ -601,6 +605,9 @@ exit 0
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Oct 21 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.36-4
- fix: slapd daemon fails to start with segmentation fault on s390x (#1020661)
* Tue Oct 15 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.36-3 * Tue Oct 15 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.36-3
- rebuilt for libdb-5.3.28 - rebuilt for libdb-5.3.28