Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4633e0b06593b4b66bb86757af024989f5d98f6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4633e0b06593b4b66bb86757af024989f5d98f6f)
  • Date: Sun, 11 May 2014 08:31:47 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

mail/masqmail/DETAILS | 2 +-
mail/masqmail/HISTORY | 6 ++++++
mail/masqmail/PRE_BUILD | 6 ++++++
mail/masqmail/log.patch | 27 +++++++++++++++++++++++++++
4 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit 4633e0b06593b4b66bb86757af024989f5d98f6f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

masqmail: fixed logging

diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
index 6dfe039..6ea2d64 100755
--- a/mail/masqmail/DETAILS
+++ b/mail/masqmail/DETAILS
@@ -1,6 +1,6 @@
SPELL=masqmail
VERSION=0.3.4
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
index 43e78f6..589cd19 100644
--- a/mail/masqmail/HISTORY
+++ b/mail/masqmail/HISTORY
@@ -1,3 +1,9 @@
+2014-05-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1
+ * PRE_BUILD: added, to apply log patch and prevent a log dir from
+ installing
+ * log.patch: added, to fix empty log file creation
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added msmtp

diff --git a/mail/masqmail/PRE_BUILD b/mail/masqmail/PRE_BUILD
new file mode 100755
index 0000000..28ef01f
--- /dev/null
+++ b/mail/masqmail/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:install-data-local\: log_dir:install-data-local\::" Makefile.in &&
+
+patch -p0 < "$SPELL_DIRECTORY/log.patch"
diff --git a/mail/masqmail/log.patch b/mail/masqmail/log.patch
new file mode 100644
index 0000000..71e5122
--- /dev/null
+++ b/mail/masqmail/log.patch
@@ -0,0 +1,27 @@
+--- src/conf.c.orig 2012-01-18 12:31:45.000000000 +0400
++++ src/conf.c 2014-05-11 15:40:03.205332624 +0400
+@@ -416,6 +416,7 @@
+ conf.localpartcmp = strcmp;
+ conf.max_defer_time = 86400 * 4; /* 4 days */
+ conf.max_msg_size = 0; /* no limit on msg size */
++ conf.log_dir = LOG_DIR;
+ conf.spool_dir = SPOOL_DIR;
+ conf.mail_dir = "/var/mail";
+ conf.listen_addresses = g_list_append(NULL,
parse_interface("localhost", 25));
+--- src/masqmail.c.orig 2012-01-18 12:31:45.000000000 +0400
++++ src/masqmail.c 2014-05-11 15:48:18.197013226 +0400
+@@ -640,14 +640,10 @@
+ }
+ }
+
+- conf.log_dir = LOG_DIR;
+- /* FIXME: fails if we run as user */
+- logopen();
+ if (!read_conf(conf_file)) {
+ logwrite(LOG_ALERT, "SHUTTING DOWN due to problems reading
config\n");
+ exit(5);
+ }
+- logclose();
+
+ if (do_queue) {
+ conf.do_queue = TRUE;



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4633e0b06593b4b66bb86757af024989f5d98f6f), Vlad Glagolev, 05/11/2014

Archive powered by MHonArc 2.6.24.

Top of Page