[csw-devel] SF.net SVN: gar:[17945] csw/mgar/pkg/powerdns/trunk/files
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Sat May 5 14:44:11 CEST 2012
Revision: 17945
http://gar.svn.sourceforge.net/gar/?rev=17945&view=rev
Author: wilbury
Date: 2012-05-05 12:44:11 +0000 (Sat, 05 May 2012)
Log Message:
-----------
powerdns/trunk: Fix patch file
Modified Paths:
--------------
csw/mgar/pkg/powerdns/trunk/files/0003-Use-gar-instead-of-ar-for-ranlib.patch
Removed Paths:
-------------
csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch
csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch
csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch
csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch
csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch
Deleted: csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0001-Make-checking-for-LUA-behave-correctly.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,25 +0,0 @@
-From fa26498bf683e466fcbcf8b21c2bce06d9024423 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 22:06:09 +0200
-Subject: [PATCH 1/4] Make checking for LUA behave correctly.
-
----
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 1067417..55b5d20 100755
---- a/configure
-+++ b/configure
-@@ -16494,7 +16494,7 @@ $as_echo_n "checking if with lua... " >&6; }
-
- # Check whether --with-lua was given.
- if test "${with_lua+set}" = set; then :
-- withval=$with_lua; WITH_LUA=$withval]
-+ withval=$with_lua; WITH_LUA=$withval
- else
- WITH_LUA=yes
- fi
---
-1.7.9
-
Deleted: csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0002-Use-sys-isa_defs.h-instead-of-endian.h.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,25 +0,0 @@
-From abd2e92b705c96a9422cdaff295ac9a3fbee4793 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 22:12:41 +0200
-Subject: [PATCH 2/4] Use sys/isa_defs.h instead of endian.h
-
----
- pdns/ext/polarssl/library/net.c | 2 +
- 1 file changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/pdns/ext/polarssl/library/net.c b/pdns/ext/polarssl/library/net.c
-index 67b52a7..8106b74 100644
---- a/pdns/ext/polarssl/library/net.c
-+++ b/pdns/ext/polarssl/library/net.c
-@@ -59,6 +59,8 @@ static int wsa_init_done = 0;
- #include <sys/endian.h>
- #elif defined(__APPLE__)
- #include <machine/endian.h>
-+#elif defined(sun)
-+#include <sys/isa_defs.h>
- #else
- #include <endian.h>
- #endif
---
-1.7.9
-
Deleted: csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0003-Include-correct-sys-ethernet.h.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,28 +0,0 @@
-From c20fa0d61171f461fc5c13be4303815e88d4892c Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 22:27:38 +0200
-Subject: [PATCH 3/4] Include correct sys/ethernet.h
-
----
- pdns/dnspcap.hh | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
-index 66e07b9..60596ff 100644
---- a/pdns/dnspcap.hh
-+++ b/pdns/dnspcap.hh
-@@ -10,7 +10,11 @@
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
-+#ifdef sun
-+#include <sys/ethernet.h>
-+#else
- #include <net/ethernet.h>
-+#endif
- #include <vector>
- #include <boost/format.hpp>
- #include "namespaces.hh"
---
-1.7.9
-
Modified: csw/mgar/pkg/powerdns/trunk/files/0003-Use-gar-instead-of-ar-for-ranlib.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0003-Use-gar-instead-of-ar-for-ranlib.patch 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0003-Use-gar-instead-of-ar-for-ranlib.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -4,254 +4,9 @@
Subject: [PATCH] Use "gar" instead of "ar" for ranlib.
---
- codedocs/Makefile | 156 +++++++++++++++---------------
pdns/ext/polarssl-1.1.2/library/Makefile | 3 +
- 2 files changed, 81 insertions(+), 78 deletions(-)
+ 1 files changed, 3 insertions(+), 0 deletions(-)
-diff --git a/codedocs/Makefile b/codedocs/Makefile
-index 3a7d6f5..55c6ec0 100644
---- a/codedocs/Makefile
-+++ b/codedocs/Makefile
-@@ -31,8 +31,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = x86_64-unknown-linux-gnu
--host_triplet = x86_64-unknown-linux-gnu
-+build_triplet = sparc-sun-solaris2.10
-+host_triplet = sparc-sun-solaris2.10
- subdir = codedocs
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -47,51 +47,51 @@ CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/ahu/auto-build/pdns/missing --run aclocal-1.11
--AMTAR = ${SHELL} /home/ahu/auto-build/pdns/missing --run tar
-+ACLOCAL = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/missing --run aclocal-1.11
-+AMTAR = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/missing --run tar
- AR = ar
--AUTOCONF = ${SHELL} /home/ahu/auto-build/pdns/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/ahu/auto-build/pdns/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/ahu/auto-build/pdns/missing --run automake-1.11
-+AUTOCONF = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/missing --run automake-1.11
- AWK = gawk
--BOOST_CPPFLAGS =
--BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/usr/local/lib -R/usr/local/lib
--BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options-mt
-+BOOST_CPPFLAGS = -I/opt/csw/gxx/include
-+BOOST_PROGRAM_OPTIONS_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib
-+BOOST_PROGRAM_OPTIONS_LIBS = -lboost_program_options
- BOOST_ROOT =
--BOOST_SERIALIZATION_LDFLAGS = -L/usr/local/lib -R/usr/local/lib
--BOOST_SERIALIZATION_LIBS = -lboost_serialization-mt
--CC = gcc
-+BOOST_SERIALIZATION_LDFLAGS = -L/opt/csw/gxx/lib -R/opt/csw/gxx/lib
-+BOOST_SERIALIZATION_LIBS = -lboost_serialization
-+CC = /opt/csw/bin/gcc-4.6
- CCDEPMODE = depmode=gcc3
- CDB_CFLAGS =
- CDB_LIBS =
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS =
--CXX = g++
--CXXCPP = g++ -E
-+CFLAGS = -O2 -pipe -mcpu=v9
-+CPP = /opt/csw/bin/gcc-4.6 -E
-+CPPFLAGS = -I/opt/csw/gxx/include -I/opt/csw/include
-+CXX = /opt/csw/bin/g++-4.6
-+CXXCPP = /opt/csw/bin/g++-4.6 -E
- CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -D_GNU_SOURCE -Wall -O2
-+CXXFLAGS = -D_REENTRANT -O2 -pipe -mcpu=v9
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
--DISTCHECK_CONFIGURE_FLAGS = '--with-boost='
-+DISTCHECK_CONFIGURE_FLAGS = '--with-boost=/opt/csw/gxx'
- DSYMUTIL =
- DUMPBIN =
--DYNLINKFLAGS = -rdynamic
-+DYNLINKFLAGS =
- ECHO_C =
- ECHO_N = -n
- ECHO_T =
--EGREP = /bin/grep -E
-+EGREP = /opt/csw/bin/ggrep -E
- EXEEXT =
--FGREP = /bin/grep -F
--GREP = /bin/grep
--INSTALL = /usr/bin/install -c
-+FGREP = /opt/csw/bin/ggrep -F
-+GREP = /opt/csw/bin/ggrep
-+INSTALL = /opt/csw/bin/ginstall -c
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
--LD = /usr/bin/ld -m elf_x86_64
--LDFLAGS = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib
-+LD = /usr/ccs/bin/ld
-+LDFLAGS = -L/opt/csw/lib -L/opt/csw/gxx/lib
- LEX = flex
- LEXLIB = -lfl
- LEX_OUTPUT_ROOT = lex.yy
-@@ -99,21 +99,21 @@ LIBCRYPT = -lcrypt
- LIBDL = -ldl
- LIBLDAP = ldap_r
- LIBOBJS =
--LIBOPENDBX = opendbx
--LIBS = -lz -lcrypt
-+LIBOPENDBX =
-+LIBS = -lposix4 -lresolv -lnsl -lsocket -lpthread -lrt -lz
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LIPO =
- LN_S = ln -s
- LTLIBOBJS =
--LUA_CFLAGS = -I/usr/include/lua5.1
--LUA_LIBS = -llua5.1
--MAKEINFO = ${SHELL} /home/ahu/auto-build/pdns/missing --run makeinfo
--MKDIR_P = /bin/mkdir -p
--MYSQL_incdir = /usr/include/mysql
--MYSQL_lib =
--NM = /usr/bin/nm -B
-+LUA_CFLAGS =
-+LUA_LIBS =
-+MAKEINFO = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/missing --run makeinfo
-+MKDIR_P = /opt/csw/bin/gmkdir -p
-+MYSQL_incdir = /opt/csw/include/mysql
-+MYSQL_lib = -L/opt/csw/lib
-+NM = /usr/ccs/bin/nm -p
- NMEDIT =
--OBJDUMP = objdump
-+OBJDUMP = false
- OBJEXT = o
- OTOOL =
- OTOOL64 =
-@@ -125,78 +125,78 @@ PACKAGE_TARNAME =
- PACKAGE_URL =
- PACKAGE_VERSION =
- PATH_SEPARATOR = :
--PGSQL_incdir = /opt/postgresql/include
--PGSQL_lib = -L/opt/postgresql/lib -Wl,-rpath,/opt/postgresql/lib
--PKG_CONFIG = /usr/bin/pkg-config
-+PGSQL_incdir =
-+PGSQL_lib =
-+PKG_CONFIG = /opt/csw/bin/pkg-config
- RANLIB = ranlib
--SED = /bin/sed
-+SED = /opt/csw/bin/gsed
- SET_MAKE =
- SHELL = /bin/bash
--SQLITE3_CFLAGS =
--SQLITE3_LIBS = -lsqlite3
--SQLITE_incdir = /usr/include/
-+SQLITE3_CFLAGS = -I/opt/csw/include
-+SQLITE3_LIBS = -L/opt/csw/lib -lsqlite3
-+SQLITE_incdir =
- SQLITE_lib =
- STRIP = strip
--THREADFLAGS = -pthread
--UNIXODBC_incdir = /usr/include/
-+THREADFLAGS =
-+UNIXODBC_incdir =
- UNIXODBC_lib =
- VERSION = 3.1
- YACC = bison -y
- YFLAGS =
--abs_builddir = /home/ahu/auto-build/pdns/codedocs
--abs_srcdir = /home/ahu/auto-build/pdns/codedocs
--abs_top_builddir = /home/ahu/auto-build/pdns
--abs_top_srcdir = /home/ahu/auto-build/pdns
--ac_ct_CC = gcc
--ac_ct_CXX = g++
-+abs_builddir = /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/codedocs
-+abs_srcdir = /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/codedocs
-+abs_top_builddir = /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1
-+abs_top_srcdir = /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1
-+ac_ct_CC = /opt/csw/bin/gcc-4.6
-+ac_ct_CXX =
- ac_ct_DUMPBIN =
- am__include = include
- am__leading_dot = .
- am__quote =
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
--bindir = ${exec_prefix}/bin
--build = x86_64-unknown-linux-gnu
-+bindir = /opt/csw/bin
-+build = sparc-sun-solaris2.10
- build_alias =
--build_cpu = x86_64
--build_os = linux-gnu
--build_vendor = unknown
-+build_cpu = sparc
-+build_os = solaris2.10
-+build_vendor = sun
- builddir = .
--datadir = ${datarootdir}
-+datadir = /opt/csw/share
- datarootdir = ${prefix}/share
- docdir = ${datarootdir}/doc/${PACKAGE}
- dvidir = ${docdir}
--exec_prefix = ${prefix}
--host = x86_64-unknown-linux-gnu
-+exec_prefix = /opt/csw
-+host = sparc-sun-solaris2.10
- host_alias =
--host_cpu = x86_64
--host_os = linux-gnu
--host_vendor = unknown
-+host_cpu = sparc
-+host_os = solaris2.10
-+host_vendor = sun
- htmldir = ${docdir}
--includedir = ${prefix}/include
--infodir = ${datarootdir}/info
--install_sh = ${SHELL} /home/ahu/auto-build/pdns/install-sh
--libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
-+includedir = /opt/csw/include
-+infodir = /opt/csw/share/info
-+install_sh = ${SHELL} /home/wilbury/b/powerdns/trunk/work/build-isa-sparcv8plus/pdns-3.1/install-sh
-+libdir = /opt/csw/lib/pdns
-+libexecdir = /opt/csw/libexec
- localedir = ${datarootdir}/locale
--localstatedir = ${prefix}/var
-+localstatedir = /var/opt/csw
- lt_ECHO = echo
--mandir = ${datarootdir}/man
--mkdir_p = /bin/mkdir -p
--moduledirs = mydnsbackend gmysqlbackend mongodbbackend luabackend gpgsqlbackend xdbbackend pipebackend oraclebackend pipebackend db2backend ldapbackend gsqlitebackend gsqlite3backend geobackend goraclebackend opendbxbackend godbcbackend
--modulelibs = -lmysqlclient -lz -lmysqlclient -L/opt/mongo/lib64/ -lmongoclient -lboost_thread -lboost_filesystem -lboost_system -llua5.1 -lpq -lssl -lcrypto -lresolv -lnsl -ltdb -L$(ORACLE_HOME)/lib -lclntsh -lldap_r -llber -lsqlite -lsqlite3 -L$(ORACLE_HOME)/lib -lclient9 -lclntst9 -lopendbx
--moduleobjects = ../modules/mydnsbackend/mydnsbackend.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/mongodbbackend/mongodbbackend.o ../modules/mongodbbackend/minimal.o ../modules/mongodbbackend/slave.o ../modules/mongodbbackend/master.o ../modules/mongodbbackend/reload.o ../modules/mongodbbackend/private.o ../modules/mongodbbackend/dnssec.o ../modules/mongodbbackend/supermaster.o ../modules/mongodbbackend/crc32.o ../modules/luabackend/luabackend.o ../modules/luabackend/minimal.o ../modules/luabackend/reload.o ../modules/luabackend/lua_functions.o ../modules/luabackend/master.o ../modules/luabackend/private.o ../modules/luabackend/slave.o ../modules/luabackend/supermaster.o ../modules/luabackend/dnssec.o ../modules/gpgsqlbackend/gpgsqlbackend.o ../modules/gpgsqlbackend/spgsql.o ../modules/xdbbackend/xdbbackend.o ../modules/xdbbackend/xtdb.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/oraclebacke
nd/oraclebackend.o ../modules/pipebackend/coprocess.o ../modules/pipebackend/pipebackend.o ../modules/db2backend/DB2Backend.o ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/gsqlitebackend/gsqlitebackend.o ../modules/gsqlitebackend/ssqlite.o ../modules/gsqlite3backend/gsqlite3backend.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/goraclebackend/goraclebackend.o ../modules/goraclebackend/soracle.o ../modules/opendbxbackend/odbxbackend.o ../modules/opendbxbackend/odbxprivate.o
-+mandir = /opt/csw/share/man
-+mkdir_p = /opt/csw/bin/gmkdir -p
-+moduledirs = ldapbackend geobackend gmysqlbackend gsqlite3backend pipebackend
-+modulelibs = -lldap_r -llber -lmysqlclient -lsqlite3
-+moduleobjects = ../modules/ldapbackend/ldapbackend.o ../modules/ldapbackend/powerldap.o ../modules/geobackend/geobackend.o ../modules/geobackend/ippreftree.o ../modules/gmysqlbackend/gmysqlbackend.o ../modules/gmysqlbackend/smysql.o ../modules/gsqlite3backend/gsqlite3backend.o
- oldincludedir = /usr/include
- pdfdir = ${docdir}
--prefix = /usr/local
-+prefix = /opt/csw
- program_transform_name = s,x,x,
- programdescend = pdns
- psdir = ${docdir}
--sbindir = ${exec_prefix}/sbin
--sharedstatedir = ${prefix}/com
-+sbindir = /opt/csw/sbin
-+sharedstatedir = /opt/csw/share
- socketdir = /var/run
- srcdir = .
--sysconfdir = ${prefix}/etc
-+sysconfdir = /etc/opt/csw/pdns
- target_alias =
- top_build_prefix = ../
- top_builddir = ..
diff --git a/pdns/ext/polarssl-1.1.2/library/Makefile b/pdns/ext/polarssl-1.1.2/library/Makefile
index 26de4d7..efcca3e 100644
--- a/pdns/ext/polarssl-1.1.2/library/Makefile
Deleted: csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0004-Build-only-stub-LUA-pdns-recursor-implementation.-Do.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,25 +0,0 @@
-From 0fa2d44583c27e481565a38c8f8c331cb9c858e1 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Tue, 3 Apr 2012 23:19:42 +0200
-Subject: [PATCH 4/4] Build only stub LUA pdns recursor implementation. Do not
- check for LIBDIR
-
----
- pdns/lua-pdns-recursor.cc | 2 +-
- 1 file changed, 1 insertion(+), 0 deletions(-)
-
-diff --git a/pdns/lua-pdns-recursor.cc b/pdns/lua-pdns-recursor.cc
-index 5e0dd7f..eb6c380 100644
---- a/pdns/lua-pdns-recursor.cc
-+++ b/pdns/lua-pdns-recursor.cc
-@@ -1,6 +1,6 @@
- #include "lua-pdns-recursor.hh"
-
--#if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR)
-+#if !defined(PDNS_ENABLE_LUA)
-
- // stub implementation
-
---
-1.7.9
-
Deleted: 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-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0005-Use-correct-namespace-for-timegm.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,25 +0,0 @@
-From f0c281399bfdd40dd9d02d5a3fe07417dd20b070 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Wed, 4 Apr 2012 13:12:24 +0200
-Subject: [PATCH] Use correct namespace for timegm()
-
----
- modules/ldapbackend/utils.hh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules/ldapbackend/utils.hh b/modules/ldapbackend/utils.hh
-index ba60f9f..25392c3 100644
---- a/modules/ldapbackend/utils.hh
-+++ b/modules/ldapbackend/utils.hh
-@@ -147,7 +147,7 @@ inline time_t str2tstamp( const string& str )
-
- if( tmp != NULL && *tmp == 0 )
- {
-- return timegm( &tm );
-+ return Utility::timegm( &tm );
- }
-
- return 0;
---
-1.7.9
-
Deleted: 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 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0006-Use-also-llber-with-lldap.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,20 +0,0 @@
-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/0009-Expand-SYSCONFDIR-properly.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch 2012-05-05 12:40:54 UTC (rev 17944)
+++ csw/mgar/pkg/powerdns/trunk/files/0009-Expand-SYSCONFDIR-properly.patch 2012-05-05 12:44:11 UTC (rev 17945)
@@ -1,45 +0,0 @@
-From 788b727662983e877d1ea7c0762212a4a11e7ea6 Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilbury at opencsw.org>
-Date: Thu, 5 Apr 2012 13:36:22 +0200
-Subject: [PATCH] Expand @@SYSCONFDIR@@ properly.
-
----
- pdns/dynloader.cc | 4 ++--
- pdns/receiver.cc | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc
-index d810278..b7691a7 100644
---- a/pdns/dynloader.cc
-+++ b/pdns/dynloader.cc
-@@ -53,9 +53,9 @@ int main(int argc, char **argv)
- string s_programname="pdns";
- string localdir;
-
-- static char pietje[128]="!@@SYSCONFDIR@@:";
-+ static char pietje[128]="!/etc/opt/csw/pdns:";
- ::arg().set("config-dir","Location of configuration directory (pdns.conf)")=
-- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR;
-+ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR;
-
- ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
- ::arg().set("remote-address","Remote address to query");
-diff --git a/pdns/receiver.cc b/pdns/receiver.cc
-index e92e67e..887b3eb 100644
---- a/pdns/receiver.cc
-+++ b/pdns/receiver.cc
-@@ -333,9 +333,9 @@ static int guardian(int argc, char **argv)
-
- static void UNIX_declareArguments()
- {
-- static char pietje[128]="!@@SYSCONFDIR@@:";
-+ static char pietje[128]="!/etc/opt/csw/pdns:";
- ::arg().set("config-dir","Location of configuration directory (pdns.conf)")=
-- strcmp(pietje+1,"@@SYSCONFDIR@@:") ? pietje+strlen("@@SYSCONFDIR@@:")+1 : SYSCONFDIR;
-+ strcmp(pietje+1,"/etc/opt/csw/pdns:") ? pietje+strlen("/etc/opt/csw/pdns:")+1 : SYSCONFDIR;
-
- ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")="";
- ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
---
-1.7.9
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list