From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:21:13 +0200 Subject: I am to tupid for git, today. Revert "Revert "fix conflict, autoseect libgcj"" This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a. --- package/openldap/Makefile | 4 ++-- package/openldap/patches/patch-build_ltmain_sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'package/openldap') diff --git a/package/openldap/Makefile b/package/openldap/Makefile index a935994cb..bd2492ad0 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.24 +PKG_VERSION:= 2.4.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 116fe1e23a7b67686d5e62274367e6c0 +PKG_MD5SUM:= ec63f9c2add59f323a0459128846905b PKG_DESCR:= OpenLDAP client libraries PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsasl2 diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh index 5876849e1..3b48ef1c9 100644 --- a/package/openldap/patches/patch-build_ltmain_sh +++ b/package/openldap/patches/patch-build_ltmain_sh @@ -1,6 +1,6 @@ ---- openldap-2.4.23.orig/build/ltmain.sh 2010-04-13 22:22:21.000000000 +0200 -+++ openldap-2.4.23/build/ltmain.sh 2011-01-15 12:35:41.000000000 +0100 -@@ -1668,7 +1668,7 @@ EOF +--- openldap-2.4.25.orig/build/ltmain.sh 2011-01-05 00:49:25.000000000 +0100 ++++ openldap-2.4.25/build/ltmain.sh 2011-03-30 18:26:08.621808325 +0200 +@@ -1668,7 +1672,7 @@ EOF # -pg pass through profiling flag for GCC # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -- cgit v1.2.3