Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 144 → Rev 145

/trunk/debian/patches/makefile_install_config.patch
87,17 → 87,17
# EGD socket, if system has no /dev/urandom
#egd_socket = "/var/prngd/urandom"
@@ -376,13 +364,15 @@ sendmail_path = /usr/lib/sendmail
@@ -374,13 +375,15 @@ sendmail_path = /usr/lib/sendmail
ispell_path = /usr/bin/ispell
# Message of the day file
-motd_path = "$prefix/etc/motd.html"
-
-# HTML to insert into login page
-#login_insert1_path = "$prefix/etc/ucsnews.html"
+#motd_path = "/etc/prayer/motd.html"
-# HTML to insert into login page
-#login_insert1_path = "$prefix/etc/ucsnews.html"
-
-# HTML to insert into login page
-#login_insert2_path = "$prefix/etc/ucsnews.html"
+# HTML to make available to login template as $login_insert1
+# (only used in "cam" template set).
109,7 → 109,7
# Login security: Prayer's front page defaults to a login form.
# If the user does not connect via SSL then this can be changed
@@ -411,10 +401,11 @@ bin_dir = "__BIN_DIR__"
@@ -409,10 +412,11 @@ bin_dir = "__BIN_DIR__"
# Various directories used by the running system
# Logs stored in $log_dir
123,7 → 123,7
# $socket_dir is location for unix domain sockets which connect frontend
# to backend in proxy mode of operation.
@@ -422,7 +413,7 @@ socket_dir = "$var_prefix/socke
@@ -420,7 +424,7 @@ socket_dir = "$var_prefix/socke
# Split socket directory into 64 subdirs keyed on first letter of sessionID
# Code provides compatibility in both directions: can switch back and forward
132,7 → 132,7
# Name of Unix domain socket (in $socket_dir) used for initial handshake
# between prayer and prayer-session processes when a user logs in
@@ -436,7 +427,7 @@ ssl_session_dir = "$var_prefix/ssl_s
@@ -434,7 +438,7 @@ ssl_session_dir = "$var_prefix/ssl_s
tmp_dir = "$var_prefix/tmp"
# Location for PID files for prayer and prayer-session master processes.
141,7 → 141,7
# Interface to Hermes finger database
#lookup_rpasswd = "/data/finger/rpasswd.cdb"
@@ -454,7 +445,7 @@ pid_dir = "$var_prefix/pid"
@@ -452,7 +456,7 @@ pid_dir = "$var_prefix/pid"
# Template stuff
template_path = "__PREFIX__/templates"
150,7 → 150,7
template_use_compiled = TRUE
template old "Traditional"
@@ -603,14 +594,14 @@ hiersep = "/"
@@ -601,14 +605,14 @@ hiersep = "/"
dualuse = FALSE
# Names of postponed_folder and sent_mail_folder, relative to maildir
/trunk/debian/patches/templates_fallback_to_compiled.patch
34,7 → 34,7
"Template %s not found (top level template_expand())\n",
--- a/files/etc/prayer.cf.SRC
+++ b/files/etc/prayer.cf.SRC
@@ -444,7 +444,7 @@ pid_dir = "$var_prefix"
@@ -455,7 +455,7 @@ pid_dir = "$var_prefix"
######################################################################
# Template stuff
/trunk/debian/patches/dlopen_templates.patch
181,9 → 181,9
endif
-PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS)
-SESSION_LIBS = $(BASE_LIBS) $(CCLIENT_LIBS)
-SESSION_LIBS = $(CCLIENT_LIBS) $(BASE_LIBS)
+PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS) -ldl
+SESSION_LIBS = $(BASE_LIBS) $(CCLIENT_LIBS) -ldl
+SESSION_LIBS = $(CCLIENT_LIBS) $(BASE_LIBS) -ldl
# Add SSL if c-client needs SSL
ifeq ($(strip $(CCLIENT_SSL_ENABLE)), true)
217,7 → 217,7
ifeq ($(strip $(ACCOUNTD_ENABLE)), true)
--- a/servers/session_exchange.c
+++ b/servers/session_exchange.c
@@ -144,6 +144,8 @@ BOOL session_exchange(struct session * s
@@ -146,6 +146,8 @@ BOOL session_exchange(struct session * s
else
template_set = config->template_set; /* Safe default */
/trunk/debian/changelog
1,8 → 1,9
prayer (1.3.5-dfsg1-1) unstable; urgency=low
 
* New upstream release.
* Refresh patches.
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 06 May 2013 22:39:01 +0200
-- Magnus Holmgren <holmgren@debian.org> Mon, 06 May 2013 22:58:13 +0200
 
prayer (1.3.4-dfsg1-1) unstable; urgency=low