| /trunk/debian/patches/series |
|---|
| 1,4 → 1,5 |
| 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 |
| /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/changelog |
|---|
| 39,6 → 39,11 |
| * makefile_install_config.patch: Remove call to install.sh from |
| files/Makefile and replace it with single tar pipeline; thus |
| install.sh no longer needs to be patched. |
| * remove_old_db_logfiles_from_prayer-ssl-prune.patch (new): Patch |
| myarchive() in lib/mydb_db3.c so that it only deletes obsolete |
| transaction logs if dirname = NULL, then call it (via DB->archive()) |
| from ssl_prune_sessions() in lib/ssl.c. |
| - prayer-db-prune thus unnecessary. |
| -- Magnus Holmgren <holmgren@debian.org> Mon, 23 Jun 2008 22:17:02 +0200 |
| /trunk/debian/prayer.install |
|---|
| 1,6 → 1,5 |
| usr/sbin/prayer |
| usr/sbin/prayer-session |
| usr/sbin/prayer-db-prune |
| usr/sbin/prayer-ssl-prune |
| usr/share/prayer |
| etc/prayer/prayer.cf |
| /trunk/debian/README.Debian |
|---|
| 39,9 → 39,8 |
| disabled by default, as it probably doesn't make that much a |
| difference on modern hardware. To enable it, uncomment the |
| ssl_session_timeout setting in prayer.cf. You should also arrange |
| for prayer-ssl-prune and prayer-db-prune to be run periodically, |
| for example by placing symlinks to them in /etc/cron.hourly or |
| /etc/cron.daily. |
| for prayer-ssl-prune to be run periodically, for example by placing |
| a symlink to it in /etc/cron.hourly or /etc/cron.daily. |
| * The default IMAP folders for sent mail (sent_mail_folder) and |
| drafts (postponed_folder) are "Sent" and "Drafts", respectively, |
| 100,5 → 99,5 |
| automatically expunged. These two approaches are rather |
| incompatible, but some software can take either. |
| -- Magnus Holmgren <holmgren@debian.org>, Mon, 23 Jun 2008 20:57:05 +0200 |
| -- Magnus Holmgren <holmgren@debian.org>, Tue, 24 Jun 2008 00:11:04 +0200 |