From f2be949a42773a007d03f008b365f5f15ca2808d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 18 Aug 2015 08:37:25 +0200
Subject: [PATCH] openldap: build with pie/relro; misc cosmetic tweaks.

Close #2246
---
 srcpkgs/openldap/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index edb6591731..1fca0619cb 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'libldap'
 pkgname=openldap
 version=2.4.42
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -23,10 +23,10 @@ homepage="http://www.openldap.org"
 distfiles="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz"
 checksum=eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63
 
+build_pie=yes
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"
-make_dirs="
-	/var/lib/openldap 0755 ldap ldap"
+make_dirs="/var/lib/openldap 0755 ldap ldap"
 
 pre_configure() {
 	sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
@@ -34,9 +34,8 @@ pre_configure() {
 	sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
 	aclocal; autoconf; autoheader; libtoolize -f
 }
-
 post_install() {
-	ln -sf ../libexec/slapd "${DESTDIR}"/usr/bin/slapd
+	ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
 	vsv slapd
 	vlicense LICENSE
 	chmod 755 ${DESTDIR}/usr/lib/*.so.*
@@ -52,7 +51,6 @@ libldap-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
 libldap_package() {
 	short_desc+=" library"
 	pkg_install() {