/[smecontribs]/rpms/mailman/contribs9/mailman-2.1.10-FHS.patch
ViewVC logotype

Annotation of /rpms/mailman/contribs9/mailman-2.1.10-FHS.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Fri Aug 21 17:29:56 2015 UTC (9 years, 3 months ago) by stephdl
Branch: MAIN
CVS Tags: mailman-2_1_12-103_el6_sme, mailman-2_1_12-100_el6_sme, mailman-2_1_12-104_el6_sme, mailman-2_1_12-25_el6_sme_sme, mailman-2_1_12-102_el6_sme, mailman-2_1_12-101_el6_sme, HEAD 
Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.1.12
2.1.12-25.sme.sme - Initial release to contribs9
1 stephdl 1.1 diff -ruN mailman-2.1.12-a/bin/check_perms mailman-2.1.12-b/bin/check_perms
2     --- mailman-2.1.12-a/bin/check_perms 2009-02-23 22:23:35.000000000 +0100
3     +++ mailman-2.1.12-b/bin/check_perms 2009-07-28 12:19:49.000000000 +0200
4     @@ -183,7 +183,8 @@
5     print _('checking mode for %(prefix)s')
6     dirs = {}
7     for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
8     - mm_cfg.LOG_DIR):
9     + mm_cfg.CONFIG_DIR, mm_cfg.DATA_DIR, mm_cfg.LOCK_DIR,
10     + mm_cfg.LOG_DIR, mm_cfg.QUEUE_DIR, mm_cfg.PID_DIR):
11     dirs[d] = True
12     for d in dirs.keys():
13     try:
14     diff -ruN mailman-2.1.12-a/configure.in mailman-2.1.12-b/configure.in
15     --- mailman-2.1.12-a/configure.in 2009-07-28 12:19:47.000000000 +0200
16     +++ mailman-2.1.12-b/configure.in 2009-07-28 12:19:49.000000000 +0200
17     @@ -248,6 +248,62 @@
18     prefixcheck=$VAR_PREFIX
19     fi
20    
21     +# Get the configuration file directory
22     +AC_SUBST(CONFIG_DIR)
23     +AC_MSG_CHECKING(for --with-config-dir)
24     +AC_ARG_WITH(config-dir, dnl
25     +[ --with-config-dir specify directory for configuration data other than [VAR_]PREFIX/data])
26     +case "$with_config_dir" in
27     + yes|no|"") CONFIG_DIR="$VAR_PREFIX/data";;
28     + *) CONFIG_DIR=$with_config_dir;;
29     +esac
30     +AC_MSG_RESULT($CONFIG_DIR)
31     +
32     +# Get the lock directory
33     +AC_SUBST(LOCK_DIR)
34     +AC_MSG_CHECKING(for --with-lock-dir)
35     +AC_ARG_WITH(lock-dir, dnl
36     +[ --with-lock-dir specify directory for lock files other than [VAR_]PREFIX/locks])
37     +case "$with_lock_dir" in
38     + yes|no|"") LOCK_DIR="$VAR_PREFIX/locks";;
39     + *) LOCK_DIR=$with_lock_dir;;
40     +esac
41     +AC_MSG_RESULT($LOCK_DIR)
42     +
43     +# Get the log directory
44     +AC_SUBST(LOG_DIR)
45     +AC_MSG_CHECKING(for --with-log-dir)
46     +AC_ARG_WITH(log-dir, dnl
47     +[ --with-log-dir specify directory for log files other than [VAR_]PREFIX/logs])
48     +case "$with_log_dir" in
49     + yes|no|"") LOG_DIR="$VAR_PREFIX/logs";;
50     + *) LOG_DIR=$with_log_dir;;
51     +esac
52     +AC_MSG_RESULT($LOG_DIR)
53     +
54     +# Get the pid directory
55     +AC_SUBST(PID_DIR)
56     +AC_MSG_CHECKING(for --with-pid-dir)
57     +AC_ARG_WITH(pid-dir, dnl
58     +[ --with-pid-dir specify directory for the pid file other than [VAR_]PREFIX/data])
59     +case "$with_pid_dir" in
60     + yes|no|"") PID_DIR="$VAR_PREFIX/data";;
61     + *) PID_DIR=$with_pid_dir;;
62     +esac
63     +AC_MSG_RESULT($PID_DIR)
64     +
65     +# Get the queue directory
66     +AC_SUBST(QUEUE_DIR)
67     +AC_MSG_CHECKING(for --with-queue-dir)
68     +AC_ARG_WITH(queue-dir, dnl
69     +[ --with-queue-dir specify directory for queue files other than [VAR_]PREFIX/qfiles])
70     +case "$with_queue_dir" in
71     + yes|no|"") QUEUE_DIR="$VAR_PREFIX/qfiles";;
72     + *) QUEUE_DIR=$with_queue_dir;;
73     +esac
74     +AC_MSG_RESULT($QUEUE_DIR)
75     +
76     +
77     # new macro for finding group names
78     # returns a comma separated list of quoted group names
79     # the list is returned in the same order as specified with any duplicates removed
80     diff -ruN mailman-2.1.12-a/Mailman/Defaults.py.in mailman-2.1.12-b/Mailman/Defaults.py.in
81     --- mailman-2.1.12-a/Mailman/Defaults.py.in 2009-02-23 22:23:35.000000000 +0100
82     +++ mailman-2.1.12-b/Mailman/Defaults.py.in 2009-07-28 12:19:49.000000000 +0200
83     @@ -1325,9 +1325,11 @@
84    
85     # Useful directories
86     LIST_DATA_DIR = os.path.join(VAR_PREFIX, 'lists')
87     -LOG_DIR = os.path.join(VAR_PREFIX, 'logs')
88     -LOCK_DIR = os.path.join(VAR_PREFIX, 'locks')
89     +LOG_DIR = '@LOG_DIR@'
90     +LOCK_DIR = '@LOCK_DIR@'
91     +CONFIG_DIR = '@CONFIG_DIR@'
92     DATA_DIR = os.path.join(VAR_PREFIX, 'data')
93     +PID_DIR = '@PID_DIR@'
94     SPAM_DIR = os.path.join(VAR_PREFIX, 'spam')
95     WRAPPER_DIR = os.path.join(EXEC_PREFIX, 'mail')
96     BIN_DIR = os.path.join(PREFIX, 'bin')
97     @@ -1338,7 +1340,7 @@
98     PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
99    
100     # Directories used by the qrunner subsystem
101     -QUEUE_DIR = os.path.join(VAR_PREFIX, 'qfiles')
102     +QUEUE_DIR = '@QUEUE_DIR@'
103     INQUEUE_DIR = os.path.join(QUEUE_DIR, 'in')
104     OUTQUEUE_DIR = os.path.join(QUEUE_DIR, 'out')
105     CMDQUEUE_DIR = os.path.join(QUEUE_DIR, 'commands')
106     @@ -1352,9 +1354,9 @@
107     MAILDIR_DIR = os.path.join(QUEUE_DIR, 'maildir')
108    
109     # Other useful files
110     -PIDFILE = os.path.join(DATA_DIR, 'master-qrunner.pid')
111     -SITE_PW_FILE = os.path.join(DATA_DIR, 'adm.pw')
112     -LISTCREATOR_PW_FILE = os.path.join(DATA_DIR, 'creator.pw')
113     +PIDFILE = os.path.join(PID_DIR, 'master-qrunner.pid')
114     +SITE_PW_FILE = os.path.join(CONFIG_DIR, 'adm.pw')
115     +LISTCREATOR_PW_FILE = os.path.join(CONFIG_DIR, 'creator.pw')
116    
117     # Import a bunch of version numbers
118     from Version import *
119     diff -ruN mailman-2.1.12-a/Mailman/MTA/Postfix.py mailman-2.1.12-b/Mailman/MTA/Postfix.py
120     --- mailman-2.1.12-a/Mailman/MTA/Postfix.py 2009-02-23 22:23:35.000000000 +0100
121     +++ mailman-2.1.12-b/Mailman/MTA/Postfix.py 2009-07-28 12:19:49.000000000 +0200
122     @@ -32,8 +32,8 @@
123     from Mailman.Logging.Syslog import syslog
124    
125     LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
126     -ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases')
127     -VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman')
128     +ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases')
129     +VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman')
130    
131     try:
132     True, False
133     diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
134     --- mailman-2.1.12-a/Makefile.in 2009-07-28 12:19:48.000000000 +0200
135     +++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:49.000000000 +0200
136     @@ -28,6 +28,11 @@
137     prefix= @prefix@
138     exec_prefix= @exec_prefix@
139     var_prefix= @VAR_PREFIX@
140     +configdir= @CONFIG_DIR@
141     +lockdir= @LOCK_DIR@
142     +logdir= @LOG_DIR@
143     +piddir= @PID_DIR@
144     +queuedir= @QUEUE_DIR@
145     DESTDIR=
146    
147     CC= @CC@
148     @@ -41,8 +46,11 @@
149     OPT= @OPT@
150     CFLAGS= @CFLAGS@ $(OPT) $(DEFS)
151    
152     +FHS_DIRS= \
153     + ${configdir} ${lockdir} ${logdir} ${piddir} ${queuedir}
154     +
155     VAR_DIRS= \
156     - logs archives lists locks data spam qfiles \
157     + archives lists data spam \
158     archives/private archives/public
159    
160     ARCH_INDEP_DIRS= \
161     @@ -105,6 +113,15 @@
162     else true; \
163     fi; \
164     done
165     + @for d in $(FHS_DIRS); \
166     + do \
167     + dir=$(DESTDIR)/$$d; \
168     + if test ! -d $$dir; then \
169     + echo "Creating directory $$dir"; \
170     + $(INSTALL) -d -m $(DIRMODE) $$dir; \
171     + else true; \
172     + fi; \
173     + done
174     chmod o-r $(DESTDIR)$(var_prefix)/archives/private
175     @for d in $(ARCH_INDEP_DIRS); \
176     do \
177     diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
178     --- mailman-2.1.12-a/misc/Makefile.in 2009-07-28 12:19:48.000000000 +0200
179     +++ mailman-2.1.12-b/misc/Makefile.in 2009-07-28 12:19:49.000000000 +0200
180     @@ -27,6 +27,12 @@
181     prefix= @prefix@
182     exec_prefix= @exec_prefix@
183     var_prefix= @VAR_PREFIX@
184     +configdir= @CONFIG_DIR@
185     +lockdir= @LOCK_DIR@
186     +logdir= @LOG_DIR@
187     +piddir= @PID_DIR@
188     +queuedir= @QUEUE_DIR@
189     +MAILMAN_GROUP= @MAILMAN_GROUP@
190     DESTDIR=
191    
192     CC= @CC@
193     @@ -87,7 +93,7 @@
194     $(INSTALL) -m $(FILEMODE) paths.py $$dir; \
195     done
196     $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
197     - $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
198     + $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
199    
200     install-packages:
201     if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed