/trunk/debian/patches/template_find_bug.patch |
---|
0,0 → 1,28 |
--- a/lib/template.c |
+++ b/lib/template.c |
@@ -199,10 +199,11 @@ template_find(char *set, char *name, str |
unsigned long first, last, middle; |
int rc; |
- while (strcmp(tmi->name, set) != 0) |
+ while (strcmp(tmi->name, set) != 0) { |
tmi++; |
- if (!tmi->name) |
- return(NIL); |
+ if (!tmi->name) |
+ return(NIL); |
+ } |
tm = tmi->template_map; |
count = *(tmi->count); |
--- a/shared/config.c |
+++ b/shared/config.c |
@@ -168,7 +168,7 @@ struct config *config_create(void) |
config->fatal_dump_core = NIL; |
config->template_path = "../templates"; |
- config->template_set = "html4"; |
+ config->template_set = "xhtml_strict"; |
config->template_use_compiled = T; |
config->prayer_user = NIL; |
/trunk/debian/patches/series |
---|
1,2 → 1,6 |
repair_ssl_session_db_on_version_mismatch.patch |
makefile_install_config.patch |
remove_old_db_logfiles_from_prayer-ssl-prune.patch |
welcome_is_template.patch |
templates_fallback_to_compiled.patch |
template_find_bug.patch |
/trunk/debian/patches/remove_old_db_logfiles_from_prayer-ssl-prune.patch |
---|
0,0 → 1,34 |
--- a/lib/mydb_db3.c |
+++ b/lib/mydb_db3.c |
@@ -289,9 +289,6 @@ static int myarchive(const char **fnames |
const char **fname; |
char dstname[1024], *dp; |
- strcpy(dstname, dirname); |
- dp = dstname + strlen(dstname); |
- |
/* Get the list of log files to remove. */ |
r = log_archive(dbenv, &list, DB_ARCH_ABS, NULL); |
if (r) { |
@@ -312,6 +309,11 @@ static int myarchive(const char **fnames |
free (begin); |
} |
+ if (!dirname) return 0; |
+ |
+ strcpy(dstname, dirname); |
+ dp = dstname + strlen(dstname); |
+ |
/* Get the list of database files to archive. */ |
/* XXX Should we do this, or just use the list given to us? */ |
r = log_archive(dbenv, &list, DB_ARCH_ABS | DB_ARCH_DATA, NULL); |
--- a/lib/ssl.c |
+++ b/lib/ssl.c |
@@ -837,6 +837,7 @@ int ssl_prune_sessions(struct ssl_config |
log_debug("tls_prune: purged %d out of %d entries", |
prock.deletions, prock.count); |
+ DB->archive(NULL, NULL); |
DB->done(); |
return (0); |
/trunk/debian/patches/makefile_install_config.patch |
---|
13,7 → 13,7 |
aliases_name = "vacation.aliases" |
--- a/files/Makefile |
+++ b/files/Makefile |
@@ -65,21 +65,17 @@ install-aconfig: |
@@ -65,26 +65,21 @@ install-aconfig: |
install-motd: |
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ |
20,6 → 20,11 |
- etc/motd.html ${BROOT}${PREFIX}/etc |
+ etc/motd.html ${BROOT}/etc/prayer |
install-welcome: |
$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ |
- etc/welcome.html ${BROOT}${PREFIX}/etc |
+ etc/welcome.html ${BROOT}/etc/prayer |
install: |
- PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \ |
- RO_USER=$(RO_USER) RO_GROUP=$(RO_GROUP) \ |
37,6 → 42,7 |
if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi |
if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi |
- if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi |
- if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi |
+ if [ ! -f $(BROOT)/etc/prayer/motd.html ]; then $(MAKE) install-motd; fi |
+ if [ ! -f $(BROOT)/etc/prayer/welcome.html ]; then $(MAKE) install-welcome; fi |
53,7 → 59,7 |
# Run prayer as background process. |
# TRUE => will return as soon as valid configuration is found. |
@@ -266,11 +266,11 @@ http_icon_embed = TRUE |
@@ -271,11 +271,11 @@ http_icon_embed = TRUE |
# Locatation of SSL certificate file (only used if SSL ports defined). |
# Required if we are going to provide SSL services. |
67,7 → 73,7 |
# Master server will regenerate shared RSA key at this interval: |
ssl_rsakey_lifespan = 15m |
@@ -278,26 +278,14 @@ ssl_rsakey_lifespan = 15m |
@@ -283,26 +283,14 @@ ssl_rsakey_lifespan = 15m |
# RSA key remains fresh in child process for this long after first actual use. |
ssl_rsakey_freshen = 15m |
97,7 → 103,7 |
# Session specific configuration |
# Session switches to idle mode after this much time: connections to IMAP |
@@ -382,13 +370,13 @@ ispell_path = /usr/bin/ispell |
@@ -387,13 +375,13 @@ ispell_path = /usr/bin/ispell |
# <login_suffix_path> |
# Login page prefix |
114,19 → 120,19 |
# Login security: Prayer's front page defaults to a login form. |
# If the user does not connect via SSL then this can be changed |
@@ -423,10 +411,7 @@ bin_dir = "__BIN_DIR__" |
@@ -431,10 +419,7 @@ bin_dir = "__BIN_DIR__" |
# Various directories used by the running system |
# Logs stored in $log_dir |
-log_dir = "$var_prefix/logs" |
+log_dir = "/var/log/prayer" |
- |
-# $lock_dir used for interlocking between prayer processes |
-lock_dir = "$var_prefix/locks" |
+log_dir = "/var/log/prayer" |
# $socket_dir is location for unix domain sockets which connect frontend |
# to backend in proxy mode of operation. |
@@ -434,7 +419,7 @@ socket_dir = "$var_prefix/socke |
@@ -442,7 +427,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 |
135,7 → 141,7 |
# Name of Unix domain socket (in $socket_dir) used for initial handshake |
# between prayer and prayer-session processes when a user logs in |
@@ -445,10 +430,10 @@ ssl_session_dir = "$var_prefix/ssl_s |
@@ -453,10 +438,10 @@ ssl_session_dir = "$var_prefix/ssl_s |
# Location for temporary files e.g; attachments and folders in transist |
# during upload and download operation. Core files also end up here |
148,7 → 154,7 |
# Interface to Hermes finger database |
#lookup_rpasswd = "/data/finger/rpasswd.cdb" |
@@ -609,14 +594,14 @@ hiersep = "/" |
@@ -617,14 +602,14 @@ hiersep = "/" |
dualuse = FALSE |
# Names of postponed_folder and sent_mail_folder, relative to maildir |
/trunk/debian/patches/repair_ssl_session_db_on_version_mismatch.patch |
---|
0,0 → 1,24 |
--- a/lib/mydb_db3.c |
+++ b/lib/mydb_db3.c |
@@ -208,7 +208,11 @@ static int init(const char *dbdir, int m |
if (!(r = myinit(dbdir, myflags))) |
return(0); |
- if (r != ENOENT) { |
+ if (r != ENOENT |
+#ifdef DB_VERSION_MISMATCH |
+ && r != DB_VERSION_MISMATCH |
+#endif |
+ ) { |
log_panic("DBERROR: dbenv->open '%s' failed: %s", dbdir, db_strerror(r)); |
return MYDB_IOERROR; |
} |
@@ -217,7 +217,7 @@ static int init(const char *dbdir, int m |
/* DPC 24/03/2002. DB_CREATE leaks 12 MBytes into dbenv. |
* Workaround: close down dbenv, reopen after backing files created */ |
- r = myinit(dbdir, myflags|MYDB_CREATE); |
+ r = myinit(dbdir, myflags|MYDB_CREATE|MYDB_RECOVER); |
if (r) { |
log_panic("DBERROR: dbenv->open '%s' failed: %s", dbdir, db_strerror(r)); |
return MYDB_IOERROR; |
/trunk/debian/patches/welcome_is_template.patch |
---|
0,0 → 1,31 |
--- a/cmd/cmd_welcome.c |
+++ b/cmd/cmd_welcome.c |
@@ -74,12 +74,7 @@ void cmd_welcome(struct session *session |
unsigned long msgno; |
if ((request->method != POST) && (prefs->use_welcome)) { |
- if (config->welcome_path && |
- (string = read_welcome(request->pool, config->welcome_path))) |
- generate_welcome_page(session, string); |
- else |
- session_redirect(session, request, "list"); |
- |
+ generate_welcome_page(session, NULL); |
return; |
} |
--- a/files/etc/prayer.cf.SRC |
+++ b/files/etc/prayer.cf.SRC |
@@ -402,12 +402,6 @@ ssl_required = FALSE |
# Session banner (local HTML inserted into each page of login session) |
#session_banner_path = "$prefix/etc/session_banner.html" |
-# Welcome text displayed when user first logs in |
-welcome_path = "$prefix/etc/welcome.html" |
- |
-# Location of help files |
-help_dir = "$prefix/help" |
- |
# Location of icon files |
icon_dir = "$prefix/icons" |
/trunk/debian/changelog |
---|
1,14 → 1,3 |
prayer (1.2.3-1) unstable; urgency=low |
* New upstream release. |
- Drop repair_ssl_session_db_on_version_mismatch.patch, |
remove_old_db_logfiles_from_prayer-ssl-prune.patch, |
welcome_is_template.patch, template_find_bug.patch; all incorporated |
upstream. |
- Update makefile_install_config.patch after welcome.html gone. |
-- Magnus Holmgren <holmgren@debian.org> Sat, 05 Jul 2008 22:14:03 +0200 |
prayer (1.2.2.1-1) unstable; urgency=low |
* New upstream release featuring XHTML templates and fixes to various |