[csw-devel] SF.net SVN: gar:[17609] csw/mgar/pkg/powerdns/trunk

[wilbury at users.sourceforge.net]

Revision: 17609
          http://gar.svn.sourceforge.net/gar/?rev=17609&view=rev
Author:   wilbury
Date:     2012-04-04 21:28:08 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
powerdns/trunk: Tweak patch for OpenLDAP usage.

Modified Paths:
--------------
    csw/mgar/pkg/powerdns/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch

Removed Paths:
-------------
    csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch

Property Changed:
----------------
    csw/mgar/pkg/powerdns/trunk/


Property changes on: csw/mgar/pkg/powerdns/trunk
___________________________________________________________________
Modified: svn:ignore
   - work
download
cookies

   + cookies
download
work



Modified: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile	2012-04-04 21:03:48 UTC (rev 17608)
+++ csw/mgar/pkg/powerdns/trunk/Makefile	2012-04-04 21:28:08 UTC (rev 17609)
@@ -22,7 +22,7 @@
 PATCHFILES += 0003-Include-correct-sys-ethernet.h.patch
 PATCHFILES += 0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
 PATCHFILES += 0005-Use-correct-namespace-for-timegm.patch
-PATCHFILES += 0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch
+PATCHFILES += 0006-Use-also-llber-with-lldap.patch
 
 WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
 

Added: csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch	2012-04-04 21:28:08 UTC (rev 17609)
@@ -0,0 +1,20 @@
+From f1b652f0be4c9f5ef6512a7d2207920bbe74179f Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Wed, 4 Apr 2012 23:17:47 +0200
+Subject: [PATCH] Use also -llber with -lldap
+
+---
+ modules/ldapbackend/OBJECTLIBS |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS
+index a787b8d..4adc2f0 100644
+--- a/modules/ldapbackend/OBJECTLIBS
++++ b/modules/ldapbackend/OBJECTLIBS
+@@ -1 +1 @@
+--lldap_r
+\ No newline at end of file
++-lldap_r -llber
+-- 
+1.7.9
+

Deleted: csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch	2012-04-04 21:03:48 UTC (rev 17608)
+++ csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch	2012-04-04 21:28:08 UTC (rev 17609)
@@ -1,36 +0,0 @@
-From e72393802b2f4f786f7b7383c8a25a80ff289f33 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Wed, 4 Apr 2012 22:26:31 +0200
-Subject: [PATCH] Add -llber to -lldap for ldapbackend to make OpenLDAP happy.
-
----
- modules/ldapbackend/Makefile.am |    2 +-
- modules/ldapbackend/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am
-index 8709848..abf762e 100644
---- a/modules/ldapbackend/Makefile.am
-+++ b/modules/ldapbackend/Makefile.am
-@@ -5,4 +5,4 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS
- lib_LTLIBRARIES = libldapbackend.la
- libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh
- libldapbackend_la_LDFLAGS =-module -avoid-version
--libldapbackend_la_LIBADD =-l at LIBLDAP@
-+libldapbackend_la_LIBADD =-l at LIBLDAP@ -llber
-diff --git a/modules/ldapbackend/Makefile.in b/modules/ldapbackend/Makefile.in
-index 8d3b0d9..ccf27c5 100644
---- a/modules/ldapbackend/Makefile.in
-+++ b/modules/ldapbackend/Makefile.in
-@@ -257,7 +257,7 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS
- lib_LTLIBRARIES = libldapbackend.la
- libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh
- libldapbackend_la_LDFLAGS = -module -avoid-version
--libldapbackend_la_LIBADD = -l at LIBLDAP@
-+libldapbackend_la_LIBADD = -l at LIBLDAP@ -llber
- all: all-am
- 
- .SUFFIXES:
--- 
-1.7.9
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.