1 --- mailman-2.1.5.orig/bin/check_perms 2003-03-31 15:07:55.000000000 -0500
2 +++ mailman-2.1.5.FHS/bin/check_perms 2004-10-08 16:05:09.000000000 -0400
4 print _('checking mode for %(prefix)s')
6 for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
8 + mm_cfg.CONFIG_DIR, mm_cfg.DATA_DIR, mm_cfg.LOCK_DIR,
9 + mm_cfg.LOG_DIR, mm_cfg.QUEUE_DIR, mm_cfg.PID_DIR):
13 --- mailman-2.1.5.orig/configure.in 2003-12-24 12:11:48.000000000 -0500
14 +++ mailman-2.1.5.FHS/configure.in 2004-09-30 16:13:56.000000000 -0400
17 AC_MSG_CHECKING(for --with-var-prefix)
18 AC_ARG_WITH(var-prefix, dnl
19 -[ --with-var-prefix directory for mutable data [/var/mailman]])
20 +[ --with-var-prefix directory for mutable data [/var/mailman]])
21 case "$with_var_prefix" in
22 yes) VAR_PREFIX="$default_var_prefix"; ans=$VAR_PREFIX;;
23 ""|no) VAR_PREFIX="$prefix"; ans="no";;
25 prefixcheck=$VAR_PREFIX
28 +# Get the configuration file directory
30 +AC_MSG_CHECKING(for --with-config-dir)
31 +AC_ARG_WITH(config-dir, dnl
32 +[ --with-config-dir specify directory for configuration data other than [VAR_]PREFIX/data])
33 +case "$with_config_dir" in
34 + yes|no|"") CONFIG_DIR="$VAR_PREFIX/data";;
35 + *) CONFIG_DIR=$with_config_dir;;
37 +AC_MSG_RESULT($CONFIG_DIR)
39 +# Get the lock directory
41 +AC_MSG_CHECKING(for --with-lock-dir)
42 +AC_ARG_WITH(lock-dir, dnl
43 +[ --with-lock-dir specify directory for lock files other than [VAR_]PREFIX/locks])
44 +case "$with_lock_dir" in
45 + yes|no|"") LOCK_DIR="$VAR_PREFIX/locks";;
46 + *) LOCK_DIR=$with_lock_dir;;
48 +AC_MSG_RESULT($LOCK_DIR)
50 +# Get the log directory
52 +AC_MSG_CHECKING(for --with-log-dir)
53 +AC_ARG_WITH(log-dir, dnl
54 +[ --with-log-dir specify directory for log files other than [VAR_]PREFIX/logs])
55 +case "$with_log_dir" in
56 + yes|no|"") LOG_DIR="$VAR_PREFIX/logs";;
57 + *) LOG_DIR=$with_log_dir;;
59 +AC_MSG_RESULT($LOG_DIR)
61 +# Get the pid directory
63 +AC_MSG_CHECKING(for --with-pid-dir)
64 +AC_ARG_WITH(pid-dir, dnl
65 +[ --with-pid-dir specify directory for the pid file other than [VAR_]PREFIX/data])
66 +case "$with_pid_dir" in
67 + yes|no|"") PID_DIR="$VAR_PREFIX/data";;
68 + *) PID_DIR=$with_pid_dir;;
70 +AC_MSG_RESULT($PID_DIR)
72 +# Get the queue directory
74 +AC_MSG_CHECKING(for --with-queue-dir)
75 +AC_ARG_WITH(queue-dir, dnl
76 +[ --with-queue-dir specify directory for queue files other than [VAR_]PREFIX/qfiles])
77 +case "$with_queue_dir" in
78 + yes|no|"") QUEUE_DIR="$VAR_PREFIX/qfiles";;
79 + *) QUEUE_DIR=$with_queue_dir;;
81 +AC_MSG_RESULT($QUEUE_DIR)
83 # new macro for finding group names
84 AC_DEFUN(MM_FIND_GROUP_NAME, [
87 templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
88 cron/crontab.in misc/mailman Makefile
89 tests/Makefile tests/bounces/Makefile tests/msgs/Makefile
92 echo "configuration completed at" `date`)
94 # Make sure all the build scripts are executable.
95 --- mailman-2.1.5.orig/Mailman/Defaults.py.in 2004-04-24 22:30:03.000000000 -0400
96 +++ mailman-2.1.5.FHS/Mailman/Defaults.py.in 2004-10-08 14:38:57.000000000 -0400
97 @@ -1198,9 +1198,11 @@
100 LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
101 -LOG_DIR = os.path.join(VAR_PREFIX, 'logs')
102 -LOCK_DIR = os.path.join(VAR_PREFIX, 'locks')
103 +LOG_DIR = '@LOG_DIR@'
104 +LOCK_DIR = '@LOCK_DIR@'
105 +CONFIG_DIR = '@CONFIG_DIR@'
106 DATA_DIR = os.path.join(VAR_PREFIX, 'data')
107 +PID_DIR = '@PID_DIR@'
108 SPAM_DIR = os.path.join(VAR_PREFIX, 'spam')
109 WRAPPER_DIR = os.path.join(EXEC_PREFIX, 'mail')
110 BIN_DIR = os.path.join(PREFIX, 'bin')
111 @@ -1211,7 +1213,7 @@
112 PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
114 # Directories used by the qrunner subsystem
115 -QUEUE_DIR = os.path.join(VAR_PREFIX, 'qfiles')
116 +QUEUE_DIR = '@QUEUE_DIR@'
117 INQUEUE_DIR = os.path.join(QUEUE_DIR, 'in')
118 OUTQUEUE_DIR = os.path.join(QUEUE_DIR, 'out')
119 CMDQUEUE_DIR = os.path.join(QUEUE_DIR, 'commands')
120 @@ -1225,9 +1227,9 @@
121 MAILDIR_DIR = os.path.join(QUEUE_DIR, 'maildir')
124 -PIDFILE = os.path.join(DATA_DIR, 'master-qrunner.pid')
125 -SITE_PW_FILE = os.path.join(DATA_DIR, 'adm.pw')
126 -LISTCREATOR_PW_FILE = os.path.join(DATA_DIR, 'creator.pw')
127 +PIDFILE = os.path.join(PID_DIR, 'master-qrunner.pid')
128 +SITE_PW_FILE = os.path.join(CONFIG_DIR, 'adm.pw')
129 +LISTCREATOR_PW_FILE = os.path.join(CONFIG_DIR, 'creator.pw')
131 # Import a bunch of version numbers
132 from Version import *
133 --- mailman-2.1.5.orig/Mailman/MTA/Postfix.py 2003-03-31 16:49:43.000000000 -0500
134 +++ mailman-2.1.5.FHS/Mailman/MTA/Postfix.py 2004-10-08 16:02:20.000000000 -0400
136 from Mailman.Logging.Syslog import syslog
138 LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
139 -ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases')
140 -VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman')
141 +ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases')
142 +VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman')
146 --- mailman-2.1.5.orig/Makefile.in 2003-03-31 14:26:57.000000000 -0500
147 +++ mailman-2.1.5.FHS/Makefile.in 2004-10-15 16:48:17.000000000 -0400
150 exec_prefix= @exec_prefix@
151 var_prefix= @VAR_PREFIX@
152 +configdir= @CONFIG_DIR@
156 +queuedir= @QUEUE_DIR@
162 CFLAGS= @CFLAGS@ $(OPT) $(DEFS)
165 + ${configdir} ${lockdir} ${logdir} ${piddir} ${queuedir}
169 - logs archives lists locks data spam qfiles \
170 + archives lists data spam \
171 archives/private archives/public
178 + @for d in $(FHS_DIRS); \
180 + dir=$(DESTDIR)/$$d; \
181 + if test ! -d $$dir; then \
182 + echo "Creating directory $$dir"; \
183 + $(INSTALL) -d -m $(DIRMODE) $$dir; \
187 chmod o-r $(DESTDIR)$(var_prefix)/archives/private
188 @for d in $(ARCH_INDEP_DIRS); \
190 --- mailman-2.1.5.orig/misc/Makefile.in 2004-05-13 23:34:34.000000000 -0400
191 +++ mailman-2.1.5.FHS/misc/Makefile.in 2004-10-13 14:00:19.000000000 -0400
194 exec_prefix= @exec_prefix@
195 var_prefix= @VAR_PREFIX@
196 +configdir= @CONFIG_DIR@
200 +queuedir= @QUEUE_DIR@
201 +MAILMAN_GROUP= @MAILMAN_GROUP@
206 $(INSTALL) -m $(FILEMODE) paths.py $$dir; \
208 $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
209 - $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
210 + $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
213 for p in $(PACKAGES); \