]> git.pld-linux.org Git - packages/mailman.git/blame - mailman-FHS.patch
projects / packages / mailman.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- forgotten FHS patch, taken from Fedora
[packages/mailman.git] / mailman-FHS.patch
CommitLineData
9568f585
PG		 1Only in mailman-2.1.5.FHS: autom4te.cache
2diff -r -u mailman-2.1.5.orig/bin/check_perms mailman-2.1.5.FHS/bin/check_perms
3--- mailman-2.1.5.orig/bin/check_perms 2003-03-31 15:07:55.000000000 -0500
4+++ mailman-2.1.5.FHS/bin/check_perms 2004-10-08 16:05:09.000000000 -0400
5@@ -164,7 +164,8 @@
6 print _('checking mode for %(prefix)s')
7 dirs = {}
8 for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
9- mm_cfg.LOG_DIR):
10+ mm_cfg.CONFIG_DIR, mm_cfg.DATA_DIR, mm_cfg.LOCK_DIR,
11+ mm_cfg.LOG_DIR, mm_cfg.QUEUE_DIR, mm_cfg.PID_DIR):
12 dirs[d] = True
13 for d in dirs.keys():
14 try:
15Only in mailman-2.1.5.FHS/bin: check_perms~
16Only in mailman-2.1.5.FHS: config.log
17Only in mailman-2.1.5.FHS: configure
18diff -r -u mailman-2.1.5.orig/configure.in mailman-2.1.5.FHS/configure.in
19--- mailman-2.1.5.orig/configure.in 2003-12-24 12:11:48.000000000 -0500
20+++ mailman-2.1.5.FHS/configure.in 2004-09-30 16:13:56.000000000 -0400
21@@ -180,7 +180,7 @@
22 AC_SUBST(VAR_PREFIX)
23 AC_MSG_CHECKING(for --with-var-prefix)
24 AC_ARG_WITH(var-prefix, dnl
25-[ --with-var-prefix directory for mutable data [/var/mailman]])
26+[ --with-var-prefix directory for mutable data [/var/mailman]])
27 case "$with_var_prefix" in
28 yes) VAR_PREFIX="$default_var_prefix"; ans=$VAR_PREFIX;;
29 ""|no) VAR_PREFIX="$prefix"; ans="no";;
30@@ -207,6 +207,61 @@
31 prefixcheck=$VAR_PREFIX
32 fi
33
34+# Get the configuration file directory
35+AC_SUBST(CONFIG_DIR)
36+AC_MSG_CHECKING(for --with-config-dir)
37+AC_ARG_WITH(config-dir, dnl
38+[ --with-config-dir specify directory for configuration data other than [VAR_]PREFIX/data])
39+case "$with_config_dir" in
40+ yes|no|"") CONFIG_DIR="$VAR_PREFIX/data";;
41+ *) CONFIG_DIR=$with_config_dir;;
42+esac
43+AC_MSG_RESULT($CONFIG_DIR)
44+
45+# Get the lock directory
46+AC_SUBST(LOCK_DIR)
47+AC_MSG_CHECKING(for --with-lock-dir)
48+AC_ARG_WITH(lock-dir, dnl
49+[ --with-lock-dir specify directory for lock files other than [VAR_]PREFIX/locks])
50+case "$with_lock_dir" in
51+ yes|no|"") LOCK_DIR="$VAR_PREFIX/locks";;
52+ *) LOCK_DIR=$with_lock_dir;;
53+esac
54+AC_MSG_RESULT($LOCK_DIR)
55+
56+# Get the log directory
57+AC_SUBST(LOG_DIR)
58+AC_MSG_CHECKING(for --with-log-dir)
59+AC_ARG_WITH(log-dir, dnl
60+[ --with-log-dir specify directory for log files other than [VAR_]PREFIX/logs])
61+case "$with_log_dir" in
62+ yes|no|"") LOG_DIR="$VAR_PREFIX/logs";;
63+ *) LOG_DIR=$with_log_dir;;
64+esac
65+AC_MSG_RESULT($LOG_DIR)
66+
67+# Get the pid directory
68+AC_SUBST(PID_DIR)
69+AC_MSG_CHECKING(for --with-pid-dir)
70+AC_ARG_WITH(pid-dir, dnl
71+[ --with-pid-dir specify directory for the pid file other than [VAR_]PREFIX/data])
72+case "$with_pid_dir" in
73+ yes|no|"") PID_DIR="$VAR_PREFIX/data";;
74+ *) PID_DIR=$with_pid_dir;;
75+esac
76+AC_MSG_RESULT($PID_DIR)
77+
78+# Get the queue directory
79+AC_SUBST(QUEUE_DIR)
80+AC_MSG_CHECKING(for --with-queue-dir)
81+AC_ARG_WITH(queue-dir, dnl
82+[ --with-queue-dir specify directory for queue files other than [VAR_]PREFIX/qfiles])
83+case "$with_queue_dir" in
84+ yes|no|"") QUEUE_DIR="$VAR_PREFIX/qfiles";;
85+ *) QUEUE_DIR=$with_queue_dir;;
86+esac
87+AC_MSG_RESULT($QUEUE_DIR)
88+
89 # new macro for finding group names
90 AC_DEFUN(MM_FIND_GROUP_NAME, [
91 # $1 == variable name
92@@ -619,7 +674,7 @@
93 templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
94 cron/crontab.in misc/mailman Makefile
95 tests/Makefile tests/bounces/Makefile tests/msgs/Makefile
96- $SCRIPTS],
97+ $SCRIPTS ],
98 echo "configuration completed at" `date`)
99
100 # Make sure all the build scripts are executable.
101Only in mailman-2.1.5.FHS: configure.in~
102diff -r -u mailman-2.1.5.orig/Mailman/Defaults.py.in mailman-2.1.5.FHS/Mailman/Defaults.py.in
103--- mailman-2.1.5.orig/Mailman/Defaults.py.in 2004-04-24 22:30:03.000000000 -0400
104+++ mailman-2.1.5.FHS/Mailman/Defaults.py.in 2004-10-08 14:38:57.000000000 -0400
105@@ -1198,9 +1198,11 @@
106
107 # Useful directories
108 LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
109-LOG_DIR = os.path.join(VAR_PREFIX, 'logs')
110-LOCK_DIR = os.path.join(VAR_PREFIX, 'locks')
111+LOG_DIR = '@LOG_DIR@'
112+LOCK_DIR = '@LOCK_DIR@'
113+CONFIG_DIR = '@CONFIG_DIR@'
114 DATA_DIR = os.path.join(VAR_PREFIX, 'data')
115+PID_DIR = '@PID_DIR@'
116 SPAM_DIR = os.path.join(VAR_PREFIX, 'spam')
117 WRAPPER_DIR = os.path.join(EXEC_PREFIX, 'mail')
118 BIN_DIR = os.path.join(PREFIX, 'bin')
119@@ -1211,7 +1213,7 @@
120 PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
121
122 # Directories used by the qrunner subsystem
123-QUEUE_DIR = os.path.join(VAR_PREFIX, 'qfiles')
124+QUEUE_DIR = '@QUEUE_DIR@'
125 INQUEUE_DIR = os.path.join(QUEUE_DIR, 'in')
126 OUTQUEUE_DIR = os.path.join(QUEUE_DIR, 'out')
127 CMDQUEUE_DIR = os.path.join(QUEUE_DIR, 'commands')
128@@ -1225,9 +1227,9 @@
129 MAILDIR_DIR = os.path.join(QUEUE_DIR, 'maildir')
130
131 # Other useful files
132-PIDFILE = os.path.join(DATA_DIR, 'master-qrunner.pid')
133-SITE_PW_FILE = os.path.join(DATA_DIR, 'adm.pw')
134-LISTCREATOR_PW_FILE = os.path.join(DATA_DIR, 'creator.pw')
135+PIDFILE = os.path.join(PID_DIR, 'master-qrunner.pid')
136+SITE_PW_FILE = os.path.join(CONFIG_DIR, 'adm.pw')
137+LISTCREATOR_PW_FILE = os.path.join(CONFIG_DIR, 'creator.pw')
138
139 # Import a bunch of version numbers
140 from Version import *
141Only in mailman-2.1.5.FHS/Mailman: Defaults.py.in~
142diff -r -u mailman-2.1.5.orig/Mailman/MTA/Postfix.py mailman-2.1.5.FHS/Mailman/MTA/Postfix.py
143--- mailman-2.1.5.orig/Mailman/MTA/Postfix.py 2003-03-31 16:49:43.000000000 -0500
144+++ mailman-2.1.5.FHS/Mailman/MTA/Postfix.py 2004-10-08 16:02:20.000000000 -0400
145@@ -32,8 +32,8 @@
146 from Mailman.Logging.Syslog import syslog
147
148 LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
149-ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases')
150-VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman')
151+ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases')
152+VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman')
153
154 try:
155 True, False
156Only in mailman-2.1.5.FHS/Mailman/MTA: Postfix.py~
157Only in mailman-2.1.5.orig: mailman-FHS.patch
158diff -r -u mailman-2.1.5.orig/Makefile.in mailman-2.1.5.FHS/Makefile.in
159--- mailman-2.1.5.orig/Makefile.in 2003-03-31 14:26:57.000000000 -0500
160+++ mailman-2.1.5.FHS/Makefile.in 2004-10-15 16:48:17.000000000 -0400
161@@ -28,6 +28,11 @@
162 prefix= @prefix@
163 exec_prefix= @exec_prefix@
164 var_prefix= @VAR_PREFIX@
165+configdir= @CONFIG_DIR@
166+lockdir= @LOCK_DIR@
167+logdir= @LOG_DIR@
168+piddir= @PID_DIR@
169+queuedir= @QUEUE_DIR@
170 DESTDIR=
171
172 CC= @CC@
173@@ -41,8 +46,12 @@
174 OPT= @OPT@
175 CFLAGS= @CFLAGS@ $(OPT) $(DEFS)
176
177+FHS_DIRS= \
178+ ${configdir} ${lockdir} ${logdir} ${piddir} ${queuedir}
179+
180+
181 VAR_DIRS= \
182- logs archives lists locks data spam qfiles \
183+ archives lists data spam \
184 archives/private archives/public
185
186 ARCH_INDEP_DIRS= \
187@@ -96,6 +105,15 @@
188 else true; \
189 fi; \
190 done
191+ @for d in $(FHS_DIRS); \
192+ do \
193+ dir=$(DESTDIR)/$$d; \
194+ if test ! -d $$dir; then \
195+ echo "Creating directory $$dir"; \
196+ $(INSTALL) -d -m $(DIRMODE) $$dir; \
197+ else true; \
198+ fi; \
199+ done
200 chmod o-r $(DESTDIR)$(var_prefix)/archives/private
201 @for d in $(ARCH_INDEP_DIRS); \
202 do \
203Only in mailman-2.1.5.FHS: Makefile.in~
204Only in mailman-2.1.5.FHS/messages: Makefile.in~
205diff -r -u mailman-2.1.5.orig/misc/Makefile.in mailman-2.1.5.FHS/misc/Makefile.in
206--- mailman-2.1.5.orig/misc/Makefile.in 2004-05-13 23:34:34.000000000 -0400
207+++ mailman-2.1.5.FHS/misc/Makefile.in 2004-10-13 14:00:19.000000000 -0400
208@@ -26,6 +26,12 @@
209 prefix= @prefix@
210 exec_prefix= @exec_prefix@
211 var_prefix= @VAR_PREFIX@
212+configdir= @CONFIG_DIR@
213+lockdir= @LOCK_DIR@
214+logdir= @LOG_DIR@
215+piddir= @PID_DIR@
216+queuedir= @QUEUE_DIR@
217+MAILMAN_GROUP= @MAILMAN_GROUP@
218 DESTDIR=
219
220 CC= @CC@
221@@ -84,7 +90,7 @@
222 $(INSTALL) -m $(FILEMODE) paths.py $$dir; \
223 done
224 $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
225- $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
226+ $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
227
228 install-packages:
229 for p in $(PACKAGES); \
230Only in mailman-2.1.5.FHS/misc: Makefile.in~
231Only in mailman-2.1.5.FHS/templates: Makefile.in~
The GNU Mailing List Management System
This page took 0.080912 seconds and 4 git commands to generate.