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

[wilbury at users.sourceforge.net]

Revision: 17607
          http://gar.svn.sourceforge.net/gar/?rev=17607&view=rev
Author:   wilbury
Date:     2012-04-04 20:56:46 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
powerdns/trunk: Correct reinplacements, patches.

Modified Paths:
--------------
    csw/mgar/pkg/powerdns/trunk/Makefile
    csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch

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

Modified: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile	2012-04-04 18:20:52 UTC (rev 17606)
+++ csw/mgar/pkg/powerdns/trunk/Makefile	2012-04-04 20:56:46 UTC (rev 17607)
@@ -19,6 +19,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
 
 WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)
 
@@ -38,8 +39,13 @@
 REINPLACEMENTS += usrlocaletc
 REINPLACE_MATCH_usrlocaletc = /usr/local/etc
 REINPLACE_WITH_usrlocaletc = /etc$(prefix)/pdns
-REINPLACE_FILES_usrlocaletc = pdns/pdns.conf-dist
+REINPLACE_FILES_usrlocaletc = pdns/pdns.conf
 
+REINPLACEMENTS += usrlocallib
+REINPLACE_MATCH_usrlocallib = /usr/local/lib
+REINPLACE_WITH_usrlocallib = $(prefix)/lib/pdns
+REINPLACE_FILES_usrlocallib = pdns/pdns.conf
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/pdns
 CONFIGURE_ARGS += --libdir=$(prefix)/lib/pdns
@@ -50,10 +56,9 @@
 CONFIGURE_ARGS += --with-mysql-lib=$(prefix)/lib
 CONFIGURE_ARGS += --with-mysql-includes=$(prefix)/include
 CONFIGURE_ARGS += --with-modules="ldap geo gmysql"
+
+# Prepend Boost 1.49 installation in paths so we pick up the correct one
 EXTRA_INC = /opt/csw/gxx/include
-
-# Extra libs for LDAP backend
-EXTRA_LIB = lber
 LDFLAGS += -L/opt/csw/gxx/lib
 
 # PowerDNS does not have any "test" target

Modified: csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch	2012-04-04 18:20:52 UTC (rev 17606)
+++ csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch	2012-04-04 20:56:46 UTC (rev 17607)
@@ -15,8 +15,8 @@
  
          if( tmp != NULL && *tmp == 0 )
          {
--        	return timegm( &tm );
-+        	return Utility::timegm( &tm );
+-		return timegm( &tm );
++		return Utility::timegm( &tm );
          }
  
          return 0;

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0007-Add-llber-to-lldap-for-ldapbackend-to-make-OpenLDAP-.patch	2012-04-04 20:56:46 UTC (rev 17607)
@@ -0,0 +1,36 @@
+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.