Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 126 → Rev 127

/trunk/debian/patches/dlopen_templates.patch
169,7 → 169,7
--- a/shared/shared.h
+++ b/shared/shared.h
@@ -40,3 +40,4 @@ extern int errno; /* just
@@ -40,3 +40,4 @@ extern int errno; /* just
#include "setproctitle.h"
#include "mymutex.h"
#include "log.h"
176,16 → 176,18
+#include "dlopen_templates.h"
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -73,7 +73,7 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
@@ -60,8 +60,8 @@ ifeq ($(strip $(ACCOUNTD_ENABLE)), true)
endif
endif
MYCFLAGS = $(BASECFLAGS) $(SERVER_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-MYLDFLAGS = $(BASELDFLAGS)
+MYLDFLAGS = $(BASELDFLAGS) -ldl
-PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS)
-SESSION_LIBS = $(BASE_LIBS) $(CCLIENT_LIBS)
+PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS) -ldl
+SESSION_LIBS = $(BASE_LIBS) $(CCLIENT_LIBS) -ldl
TEMPLATES= ../templates/index.o \
../templates/old/templates.a \
@@ -84,15 +84,13 @@ TEMPLATES_FRONTEND= ../templates/index.o
# Add SSL if c-client needs SSL
ifeq ($(strip $(CCLIENT_SSL_ENABLE)), true)
@@ -90,15 +90,13 @@ TEMPLATES_FRONTEND= ../templates/index.o
../templates/cam/templates_frontend.a
PRAYER_OBJS= prayer.o prayer_login.o prayer_server.o portlist.o \
215,7 → 217,7
ifeq ($(strip $(ACCOUNTD_ENABLE)), true)
--- a/servers/session_exchange.c
+++ b/servers/session_exchange.c
@@ -212,6 +212,8 @@ BOOL session_exchange(struct session * s
@@ -144,6 +144,8 @@ BOOL session_exchange(struct session * s
else
template_set = config->template_set; /* Safe default */
/trunk/debian/changelog
1,3 → 1,15
prayer (1.3.3-dfsg1-4) unstable; urgency=low
 
* Merge ld-as-needed.diff from Ubuntu into dlopen_templates.patch.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 20 Mar 2011 20:27:39 +0100
 
prayer (1.3.3-dfsg1-3ubuntu1) natty; urgency=low
 
* Fix FTBFS with ld --as-needed.
 
-- Matthias Klose <doko@ubuntu.com> Sun, 19 Dec 2010 19:07:04 +0100
 
prayer (1.3.3-dfsg1-3) unstable; urgency=high
 
* ipv6_v6only.patch (new): Set the IPV6_V6ONLY socket option on