Update to Sympa 6.1.3.
- switch config dir to /var/sympa/etc as sympa daemon/fcgi might want to write templates there - switch to use spawn-fcgi, this way sympa web admin works fine in chrooted httpd - provide a httpd.conf fragment to ease sympa integration - switch to rc scripts (with help from aja@) - improve README With help and feedback from J.G Pailloncy, ok ajacoutot@
This commit is contained in:
landry
parent
e243d2d395
commit
4824533aee
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2010/11/19 07:23:09 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2010/12/30 17:51:25 landry Exp $
|
||||
|
||||
COMMENT = mailing list manager with web interface
|
||||
|
||||
DISTNAME = sympa-6.0.1
|
||||
REVISION = 2
|
||||
VERSION = 6.1.3
|
||||
DISTNAME = sympa-${VERSION}
|
||||
|
||||
CATEGORIES = mail www
|
||||
|
||||
HOMEPAGE = http://www.sympa.org
|
||||
@ -34,13 +35,14 @@ CONFIGURE_ARGS = --with-modulesdir=${PREFIX}/${P5SITE}/Sympa \
|
||||
--with-group=${SYMPA_GROUP} \
|
||||
--with-sendmail_aliases=${SYMPA_HOME}/sympa_aliases \
|
||||
--with-virtual_aliases=${SYMPA_HOME}/sympa_virtual \
|
||||
--with-confdir=${SYMPA_HOME}/etc/ \
|
||||
--with-cgidir=${PREFIX}/libexec/sympa \
|
||||
--with-libexecdir=${PREFIX}/libexec/sympa \
|
||||
--libexecdir=${PREFIX}/libexec/sympa \
|
||||
--with-defaultdir=${PREFIX}/share/sympa \
|
||||
--with-sbindir=${PREFIX}/sbin \
|
||||
--with-docdir=${PREFIX}/share/examples/sympa \
|
||||
--sbindir=${PREFIX}/sbin \
|
||||
--with-localedir=${PREFIX}/share/locale
|
||||
|
||||
MAKE_ENV = docdir=${PREFIX}/share/examples/sympa
|
||||
USE_GROFF = Yes
|
||||
|
||||
# no MODULE, doesn't link with it
|
||||
@ -48,6 +50,7 @@ BUILD_DEPENDS = devel/gettext
|
||||
WANTLIB = c
|
||||
|
||||
RUN_DEPENDS = archivers/p5-Archive-Zip \
|
||||
converters/p5-Unicode-LineBreak \
|
||||
databases/p5-DBI \
|
||||
devel/gettext \
|
||||
devel/p5-IO-stringy \
|
||||
@ -63,7 +66,7 @@ RUN_DEPENDS = archivers/p5-Archive-Zip \
|
||||
security/p5-Crypt-CipherSaber \
|
||||
textproc/p5-Template \
|
||||
textproc/p5-XML-LibXML \
|
||||
www/fcgi \
|
||||
www/spawn-fcgi \
|
||||
www/mod_fastcgi \
|
||||
www/mhonarc \
|
||||
www/p5-libwww \
|
||||
@ -77,12 +80,16 @@ pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/src/lib/confdef.pm
|
||||
|
||||
post-install:
|
||||
# taken from Makefile's installconfig target
|
||||
env PERL5LIB=${PREFIX}/${P5SITE}/Sympa \
|
||||
${PREFIX}/sbin/sympa_wizard.pl --create wwsympa.conf \
|
||||
--target ${PREFIX}/share/examples/sympa/wwsympa.conf
|
||||
env PERL5LIB=${PREFIX}/${P5SITE}/Sympa \
|
||||
${PREFIX}/sbin/sympa_wizard.pl --create sympa.conf \
|
||||
--target ${PREFIX}/share/examples/sympa/sympa.conf
|
||||
echo ${VERSION} > ${PREFIX}/share/examples/sympa/data_structure.version
|
||||
chown ${SYMPA_USER}:${SYMPA_GROUP} ${PREFIX}/share/examples/sympa/data_structure.version
|
||||
mv ${PREFIX}/bin/create_db.* ${PREFIX}/share/examples/sympa/
|
||||
${INSTALL_DATA} ${FILESDIR}/httpd-sympa.conf ${PREFIX}/share/examples/sympa/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (sympa-6.0.1.tar.gz) = QY/I+FG03Krmd4WnsSxM9Q==
|
||||
RMD160 (sympa-6.0.1.tar.gz) = kjc7VIXWloISb9DG2tIBn7GKvFU=
|
||||
SHA1 (sympa-6.0.1.tar.gz) = vo9sko7mAZgR7GiXMBi8Ys8Zi4A=
|
||||
SHA256 (sympa-6.0.1.tar.gz) = O30OfYRLjKAsWpUYbV2N4FyQikt8m6AT/eDdsrFaHR8=
|
||||
SIZE (sympa-6.0.1.tar.gz) = 6384623
|
||||
MD5 (sympa-6.1.3.tar.gz) = yCJOBsWOs4cG8XCqlZF+mw==
|
||||
RMD160 (sympa-6.1.3.tar.gz) = uy0UBHqpZa27oZcVVvq3Rbt3gRk=
|
||||
SHA1 (sympa-6.1.3.tar.gz) = imhrWGWZOQ7Cb72dZf1h1WOP/zw=
|
||||
SHA256 (sympa-6.1.3.tar.gz) = GyWFiLkHakgJZrTQj0Y+mlYb/aHXmLuHmtu/6WyV2f0=
|
||||
SIZE (sympa-6.1.3.tar.gz) = 6940694
|
||||
|
||||
9
mail/sympa/files/httpd-sympa.conf
Normal file
9
mail/sympa/files/httpd-sympa.conf
Normal file
@ -0,0 +1,9 @@
|
||||
# $OpenBSD: httpd-sympa.conf,v 1.1 2010/12/30 17:51:25 landry Exp $
|
||||
|
||||
Alias /wwsicons /sympa/icons/
|
||||
Alias /static-sympa /sympa/
|
||||
ScriptAlias /sympa /wwsympa.fcgi
|
||||
FastCgiExternalServer /wwsympa.fcgi -host 127.0.0.1:1026
|
||||
<Location /sympa>
|
||||
SetHandler fastcgi-script
|
||||
</Location>
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- Makefile.in.orig Tue Nov 10 22:32:23 2009
|
||||
+++ Makefile.in Tue Nov 10 22:32:29 2009
|
||||
@@ -561,7 +561,6 @@ info-am:
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- Makefile.in.orig Mon Nov 15 11:22:17 2010
|
||||
+++ Makefile.in Sun Dec 19 11:30:51 2010
|
||||
@@ -569,7 +569,6 @@ info-am:
|
||||
|
||||
install-data-am:
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
@ -1,33 +1,41 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- configure.orig Thu Oct 1 00:59:41 2009
|
||||
+++ configure Fri Nov 13 16:52:15 2009
|
||||
@@ -2091,20 +2091,20 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- configure.orig Mon Nov 15 11:22:18 2010
|
||||
+++ configure Thu Dec 30 18:42:48 2010
|
||||
@@ -2732,19 +2732,19 @@ else
|
||||
|
||||
# define custom variables
|
||||
initdir=/etc/rc.d/init.d
|
||||
- piddir=$prefix
|
||||
- lockdir=$localstatedir/lock/subsys
|
||||
+ piddir=$localstatedir/run/sympa
|
||||
+ lockdir=$localstatedir/spool/lock
|
||||
modulesdir=$prefix/bin
|
||||
scriptdir=$prefix/bin
|
||||
defaultdir=$prefix/default
|
||||
- mailtemplatedir=$defaultdir/mail_tt2
|
||||
- webtemplatedir=$defaultdir/web_tt2
|
||||
+ mailtemplatedir=$prefix/share/sympa/mail_tt2
|
||||
+ webtemplatedir=$prefix/share/sympa/web_tt2
|
||||
execcgidir=$prefix/bin
|
||||
- expldir=$prefix/list_data
|
||||
- spooldir=$prefix/spool
|
||||
- staticdir=$prefix/static_content
|
||||
- arcdir=$prefix/arc
|
||||
- bouncedir=$prefix/bounce
|
||||
+ spooldir=$localstatedir/spool/sympa
|
||||
+ expldir=$localstatedir/sympa/list_data
|
||||
+ staticdir=/var/www/sympa
|
||||
+ arcdir=$localstatedir/sympa/archives
|
||||
+ bouncedir=$localstatedir/sympa/bounces
|
||||
confdir=/etc
|
||||
fi
|
||||
|
||||
@@ -4512,7 +4512,7 @@ $as_echo "$as_me: error: invalid value $POSTMAP for po
|
||||
$as_echo "$POSTMAP" >&6; }
|
||||
else
|
||||
# default value
|
||||
- POSTMAP=/usr/sbin/postmap
|
||||
+ POSTMAP=${LOCALBASE}/sbin/postmap
|
||||
fi
|
||||
|
||||
# custom variables
|
||||
initdir=/etc/rc.d/init.d
|
||||
-piddir=$prefix
|
||||
localstatedir=/var
|
||||
-lockdir=$localstatedir/lock/subsys
|
||||
+piddir=$localstatedir/run/sympa
|
||||
+lockdir=$localstatedir/spool/lock
|
||||
modulesdir=$prefix/bin
|
||||
scriptdir=$prefix/bin
|
||||
defaultdir=$prefix/default
|
||||
-mailtemplatedir=$defaultdir/mail_tt2
|
||||
-webtemplatedir=$defaultdir/web_tt2
|
||||
+mailtemplatedir=$prefix/share/sympa/mail_tt2
|
||||
+webtemplatedir=$prefix/share/sympa/web_tt2
|
||||
execcgidir=$prefix/bin
|
||||
-expldir=$prefix/list_data
|
||||
-spooldir=$prefix/spool
|
||||
-staticdir=$prefix/static_content
|
||||
-arcdir=$prefix/arc
|
||||
-bouncedir=$prefix/bounce
|
||||
+spooldir=$localstatedir/spool/sympa
|
||||
+expldir=$localstatedir/sympa/list_data
|
||||
+staticdir=$localstatedir/sympa/static
|
||||
+arcdir=$localstatedir/sympa/archives
|
||||
+bouncedir=$localstatedir/sympa/bounces
|
||||
confdir=/etc
|
||||
localedir=$prefix/locale
|
||||
|
||||
|
||||
13
mail/sympa/patches/patch-doc_man8_Makefile_in
Normal file
13
mail/sympa/patches/patch-doc_man8_Makefile_in
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-doc_man8_Makefile_in,v 1.1 2010/12/30 17:51:25 landry Exp $
|
||||
subst correct path to config file
|
||||
--- doc/man8/Makefile.in.orig Mon Dec 20 16:27:23 2010
|
||||
+++ doc/man8/Makefile.in Mon Dec 20 16:27:48 2010
|
||||
@@ -374,7 +374,7 @@ archived.pod bounced.pod alias_manager.pod: Makefile
|
||||
$(AM_V_GEN)$(SED) \
|
||||
-e 's|--piddir--|$(piddir)|' \
|
||||
-e 's|--libexecdir--|$(libexecdir)|' \
|
||||
- -e 's|--sysconfdir--|$(sysconfdir)|' \
|
||||
+ -e 's|--sysconfdir--|$(confdir)|' \
|
||||
-e 's|--defaultdir--|$(defaultdir)|' \
|
||||
-e 's|--spooldir--|$(spooldir)|' \
|
||||
-e 's|--docdir--|$(docdir)|' \
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-soap_Makefile_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- soap/Makefile.in.orig Thu Nov 12 20:29:29 2009
|
||||
+++ soap/Makefile.in Thu Nov 12 20:29:33 2009
|
||||
@@ -515,7 +515,6 @@ install-data-am: install-defaultDATA install-modulesDA
|
||||
$OpenBSD: patch-soap_Makefile_in,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- soap/Makefile.in.orig Mon Nov 15 11:22:17 2010
|
||||
+++ soap/Makefile.in Sun Dec 19 11:30:51 2010
|
||||
@@ -523,7 +523,6 @@ install-data-am: install-defaultDATA install-modulesDA
|
||||
|
||||
install-exec-am: install-execcgiPROGRAMS install-execcgiSCRIPTS
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- src/Makefile.in.orig Thu Nov 12 20:29:09 2009
|
||||
+++ src/Makefile.in Thu Nov 12 20:29:21 2009
|
||||
@@ -640,7 +640,6 @@ install-data-am:
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- src/Makefile.in.orig Mon Nov 15 11:22:17 2010
|
||||
+++ src/Makefile.in Sun Dec 19 11:30:51 2010
|
||||
@@ -693,7 +693,6 @@ install-data-am:
|
||||
install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
|
||||
install-sbinSCRIPTS
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
88
mail/sympa/patches/patch-src_etc_script_create_db_SQLite
Normal file
88
mail/sympa/patches/patch-src_etc_script_create_db_SQLite
Normal file
@ -0,0 +1,88 @@
|
||||
$OpenBSD: patch-src_etc_script_create_db_SQLite,v 1.1 2010/12/30 17:51:25 landry Exp $
|
||||
fix typos: https://sourcesup.cru.fr/tracker/?func=detail&atid=167&aid=7371&group_id=23
|
||||
--- src/etc/script/create_db.SQLite.orig Mon Jun 7 11:00:38 2010
|
||||
+++ src/etc/script/create_db.SQLite Mon Dec 20 17:52:29 2010
|
||||
@@ -5,7 +5,7 @@ CREATE TABLE user_table (
|
||||
password_user text,
|
||||
last_login_date_user integer,
|
||||
last_login_host_user text,
|
||||
- wrong_login_count_user integer,,
|
||||
+ wrong_login_count_user integer,
|
||||
cookie_delay_user integer,
|
||||
lang_user text,
|
||||
attributes_user text,
|
||||
@@ -26,11 +26,11 @@ CREATE TABLE subscriber_table (
|
||||
bounce_subscriber text,
|
||||
bounce_address_subscriber text,
|
||||
comment_subscriber text,
|
||||
- subscribed_subscriber boolean,
|
||||
- included_subscriber boolean,
|
||||
+ subscribed_subscriber numeric,
|
||||
+ included_subscriber numeric,
|
||||
include_sources_subscriber text,
|
||||
bounce_score_subscriber integer,
|
||||
- suspend_subscriber boolean,
|
||||
+ suspend_subscriber numeric,
|
||||
suspend_start_date_subscriber integer,
|
||||
suspend_end_date_subscriber integer,
|
||||
PRIMARY KEY (robot_subscriber, list_subscriber, user_subscriber)
|
||||
@@ -47,8 +47,8 @@ CREATE TABLE admin_table (
|
||||
reception_admin text,
|
||||
visibility_admin text,
|
||||
comment_admin text,
|
||||
- subscribed_admin boolean,
|
||||
- included_admin boolean,
|
||||
+ subscribed_admin numeric,
|
||||
+ included_admin numeric,
|
||||
include_sources_admin text,
|
||||
info_admin text,
|
||||
profile_admin text,
|
||||
@@ -117,34 +117,34 @@ CREATE TABLE one_time_ticket_table (
|
||||
CREATE INDEX one_time_ticket_idx ON one_time_ticket_table(ticket_one_time_ticket);
|
||||
|
||||
CREATE TABLE bulkmailer_table(
|
||||
- messagekey_bulkmailer varchar(80) NOT NULL,
|
||||
- packetid_bulkmailer varchar(33) NOT NULL,
|
||||
- messageid_bulkmailer varchar(100),
|
||||
+ messagekey_bulkmailer text NOT NULL,
|
||||
+ packetid_bulkmailer text NOT NULL,
|
||||
+ messageid_bulkmailer text,
|
||||
receipients_bulkmailer text,
|
||||
- returnpath_bulkmailer varchar(100),
|
||||
- robot_bulkmailer varchar(80),
|
||||
- listname_bulkmailer varchar(50),
|
||||
+ returnpath_bulkmailer text,
|
||||
+ robot_bulkmailer text,
|
||||
+ listname_bulkmailer text,
|
||||
verp_bulkmailer integer,
|
||||
merge_bulkmailer integer,
|
||||
priority_message_bulkmailer integer,
|
||||
priority_packet_bulkmailer integer,
|
||||
reception_date_bulkmailer integer,
|
||||
delivery_date_bulkmailer integer,
|
||||
- lock_bulkmailer varchar(30),
|
||||
+ lock_bulkmailer text,
|
||||
PRIMARY KEY (messagekey_bulkmailer, packetid_bulkmailer)
|
||||
);
|
||||
CREATE INDEX bulkmailer_idx ON bulkmailer_table(messagekey_bulkmailer,packetid_bulkmailer);
|
||||
|
||||
CREATE TABLE bulkspool_table (
|
||||
- messagekey_bulkspool varchar(33) NOT NULL,
|
||||
- messageid_bulkspool varchar(100),
|
||||
+ messagekey_bulkspool text NOT NULL,
|
||||
+ messageid_bulkspool text,
|
||||
message_bulkspool text,
|
||||
lock_bulkspool integer,
|
||||
- dkim_privatekey_bulkspool varchar(100),
|
||||
- dkim_selector_bulkspool varchar(50),
|
||||
- dkim_d_bulkspool varchar(50),
|
||||
- dkim_i_bulkspool varchar(50),
|
||||
- dkim_header_list_bulkspool' varchar(500),
|
||||
+ dkim_privatekey_bulkspool text,
|
||||
+ dkim_selector_bulkspool text,
|
||||
+ dkim_d_bulkspool text,
|
||||
+ dkim_i_bulkspool text,
|
||||
+ dkim_header_list_bulkspool text,
|
||||
PRIMARY KEY (messagekey_bulkspool)
|
||||
);
|
||||
CREATE INDEX bulkspool_idx ON bulkspool_table(messagekey_bulkspool);
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_etc_script_sympa_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- src/etc/script/sympa.in.orig Tue Aug 4 08:36:44 2009
|
||||
+++ src/etc/script/sympa.in Sat Nov 14 18:46:40 2009
|
||||
$OpenBSD: patch-src_etc_script_sympa_in,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- src/etc/script/sympa.in.orig Wed Aug 25 11:40:43 2010
|
||||
+++ src/etc/script/sympa.in Tue Dec 21 13:11:24 2010
|
||||
@@ -14,43 +14,11 @@
|
||||
# chkconfig: 345 95 05
|
||||
# description: sympa is a powerfull mailing lists management system.
|
||||
@ -69,12 +69,12 @@ $OpenBSD: patch-src_etc_script_sympa_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp
|
||||
- else
|
||||
# First try "/u1/home/sympa/*.pid" files
|
||||
if [ -f --piddir--/$1.pid ] ; then
|
||||
pid=`head -1 --piddir--/$1.pid`
|
||||
pid=`head -1 --piddir--/$1.pid | tr -s ' ' '|'`
|
||||
if [ "$pid" != "" ] ; then
|
||||
- running=`ps -A | grep "$pid"`
|
||||
- running=`ps -A | egrep "$pid"`
|
||||
+ running=`pgrep -f $1.pl`
|
||||
if [ "$running" != "" ]; then
|
||||
echo "$1 (pid $pid) is active..."
|
||||
echo "$1 (pid(s) $pid) is active..."
|
||||
return 0
|
||||
@@ -97,7 +55,6 @@ sympa_status() {
|
||||
fi
|
||||
@ -154,7 +154,25 @@ $OpenBSD: patch-src_etc_script_sympa_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp
|
||||
else
|
||||
|
||||
echo "Sympa seems active. No action will be taken."
|
||||
@@ -248,7 +176,6 @@ case "$1" in
|
||||
@@ -236,19 +164,24 @@ case "$1" in
|
||||
echo "Status file for subsystem found."
|
||||
else
|
||||
echo "Status file for subsystem NOT found."
|
||||
+ exit 1
|
||||
fi
|
||||
sympa_status sympa
|
||||
+ [ $? = 0 ] || exit 1
|
||||
sympa_status bulk
|
||||
+ [ $? = 0 ] || exit 1
|
||||
sympa_status archived
|
||||
+ [ $? = 0 ] || exit 1
|
||||
sympa_status bounced
|
||||
+ [ $? = 0 ] || exit 1
|
||||
sympa_status task_manager
|
||||
+ [ $? = 0 ] || exit 1
|
||||
;;
|
||||
restart)
|
||||
echo "Restarting Sympa subsystem: "
|
||||
$0 stop
|
||||
sleep 3
|
||||
$0 start
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_familyqueue_c,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- src/familyqueue.c.orig Wed Nov 11 22:25:34 2009
|
||||
+++ src/familyqueue.c Wed Nov 11 22:25:49 2009
|
||||
$OpenBSD: patch-src_familyqueue_c,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- src/familyqueue.c.orig Wed Jun 9 11:50:04 2010
|
||||
+++ src/familyqueue.c Sun Dec 19 11:30:52 2010
|
||||
@@ -25,6 +25,9 @@
|
||||
#include <sysexits.h>
|
||||
#include <string.h>
|
||||
@ -9,5 +9,5 @@ $OpenBSD: patch-src_familyqueue_c,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
static char rcsid[] = "(@)$Id: patch-src_familyqueue_c,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $";
|
||||
static char rcsid[] = "(@)$Id: patch-src_familyqueue_c,v 1.2 2010/12/30 17:51:25 landry Exp $";
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-src_lib_List_pm,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
$OpenBSD: patch-src_lib_List_pm,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
Don't spam error_log
|
||||
--- src/lib/List.pm.orig Tue Sep 22 17:04:18 2009
|
||||
+++ src/lib/List.pm Tue Nov 17 22:44:24 2009
|
||||
@@ -1446,7 +1446,7 @@ sub db_get_handler {
|
||||
--- src/lib/List.pm.orig Wed Nov 10 13:26:20 2010
|
||||
+++ src/lib/List.pm Sun Dec 19 11:30:52 2010
|
||||
@@ -1521,7 +1521,7 @@ sub db_get_handler {
|
||||
sub new {
|
||||
my($pkg, $name, $robot, $options) = @_;
|
||||
my $list={};
|
||||
@ -11,7 +11,7 @@ Don't spam error_log
|
||||
|
||||
## Allow robot in the name
|
||||
if ($name =~ /\@/) {
|
||||
@@ -1829,7 +1829,7 @@ sub save_config {
|
||||
@@ -1898,7 +1898,7 @@ sub save_config {
|
||||
## Loads the administrative data for a list
|
||||
sub load {
|
||||
my ($self, $name, $robot, $options) = @_;
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_lib_Lock_pm,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
Don't spam error_log
|
||||
--- src/lib/Lock.pm.orig Tue Nov 17 22:25:17 2009
|
||||
+++ src/lib/Lock.pm Tue Nov 17 22:25:42 2009
|
||||
@@ -43,7 +43,7 @@ my $default_timeout = 60 * 20; ## After this period a
|
||||
## Creates a new object
|
||||
sub new {
|
||||
my($pkg, $filepath) = @_;
|
||||
- &do_log('debug', 'Lock::new(%s,%s)',$filepath);
|
||||
+ &do_log('debug', 'Lock::new(%s,%s)',$pkg, $filepath);
|
||||
|
||||
my $lock_filename = $filepath.'.lock';
|
||||
my $lock = {'lock_filename' => $lock_filename};
|
||||
30
mail/sympa/patches/patch-src_lib_Upgrade_pm
Normal file
30
mail/sympa/patches/patch-src_lib_Upgrade_pm
Normal file
@ -0,0 +1,30 @@
|
||||
$OpenBSD: patch-src_lib_Upgrade_pm,v 1.1 2010/12/30 17:51:25 landry Exp $
|
||||
https://sourcesup.cru.fr/tracker/index.php?func=detail&aid=7372&group_id=23&atid=167
|
||||
--- src/lib/Upgrade.pm.orig Mon Dec 20 17:56:18 2010
|
||||
+++ src/lib/Upgrade.pm Mon Dec 20 17:53:25 2010
|
||||
@@ -843,7 +843,7 @@ sub probe_db {
|
||||
'bounce_score_subscriber' => 'integer',
|
||||
'bounce_address_subscriber' => 'text',
|
||||
'custom_attribute_subscriber' => 'text',
|
||||
- 'suspend_subscriber' => "boolean",
|
||||
+ 'suspend_subscriber' => 'numeric',
|
||||
'suspend_start_date_subscriber' => 'integer',
|
||||
'suspend_end_date_subscriber' => 'integer'},
|
||||
'admin_table' => {'list_admin' => 'text',
|
||||
@@ -914,11 +914,11 @@ sub probe_db {
|
||||
'messageid_bulkspool' => 'text',
|
||||
'message_bulkspool' => 'text',
|
||||
'lock_bulkspool' => 'integer',
|
||||
- 'dkim_privatekey_bulkspool' => 'varchar(1000)',
|
||||
- 'dkim_selector_bulkspool' => 'varchar(50)',
|
||||
- 'dkim_d_bulkspool' => 'varchar(50)',
|
||||
- 'dkim_i_bulkspool' => 'varchar(100)',
|
||||
- 'dkim_header_list_bulkspool' => 'varchar(500)'},
|
||||
+ 'dkim_privatekey_bulkspool' => 'text',
|
||||
+ 'dkim_selector_bulkspool' => 'text',
|
||||
+ 'dkim_d_bulkspool' => 'text',
|
||||
+ 'dkim_i_bulkspool' => 'text',
|
||||
+ 'dkim_header_list_bulkspool' => 'text'},
|
||||
'conf_table' => {'robot_conf' => 'text',
|
||||
'label_conf' => 'text',
|
||||
'value_conf' => 'text'}});
|
||||
@ -1,19 +1,16 @@
|
||||
$OpenBSD: patch-src_lib_confdef_pm,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- src/lib/confdef.pm.orig Mon Sep 14 17:36:47 2009
|
||||
+++ src/lib/confdef.pm Sat Nov 14 18:27:15 2009
|
||||
@@ -402,11 +402,6 @@ our @params = (
|
||||
optional => '1',
|
||||
$OpenBSD: patch-src_lib_confdef_pm,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- src/lib/confdef.pm.orig Mon Nov 15 09:32:17 2010
|
||||
+++ src/lib/confdef.pm Mon Dec 20 16:55:44 2010
|
||||
@@ -47,7 +47,7 @@ our @params = (
|
||||
},
|
||||
{
|
||||
- name => 'cookie_cas_expire',
|
||||
- default => '6',
|
||||
- file => 'wwsympa.conf',
|
||||
- },
|
||||
- {
|
||||
name => 'legacy_character_support_feature',
|
||||
default => 'off',
|
||||
query => 'If set to "on", enables support of legacy characters',
|
||||
@@ -625,7 +620,7 @@ our @params = (
|
||||
name => 'etc',
|
||||
- default => Sympa::Constants::SYSCONFDIR,
|
||||
+ default => "${SYMPA_HOME}/".Sympa::Constants::SYSCONFDIR,
|
||||
query => 'Directory for configuration files ; it also contains scenari/ and templates/ directories',
|
||||
file => 'sympa.conf',
|
||||
},
|
||||
@@ -639,7 +639,7 @@ our @params = (
|
||||
},
|
||||
{
|
||||
name => 'mhonarc',
|
||||
@ -22,7 +19,7 @@ $OpenBSD: patch-src_lib_confdef_pm,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
query => 'Path to MhOnarc mail2html pluggin',
|
||||
file => 'wwsympa.conf',
|
||||
edit => '1',
|
||||
@@ -634,7 +629,7 @@ our @params = (
|
||||
@@ -704,7 +704,7 @@ our @params = (
|
||||
{ 'title' => 'S/MIME pluggin' },
|
||||
{
|
||||
name => 'openssl',
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_queue_c,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- src/queue.c.orig Tue Jul 28 14:12:59 2009
|
||||
+++ src/queue.c Wed Nov 11 22:24:21 2009
|
||||
$OpenBSD: patch-src_queue_c,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- src/queue.c.orig Wed Jun 9 11:50:04 2010
|
||||
+++ src/queue.c Sun Dec 19 11:31:07 2010
|
||||
@@ -25,6 +25,9 @@
|
||||
#include <sysexits.h>
|
||||
#include <string.h>
|
||||
@ -9,5 +9,5 @@ $OpenBSD: patch-src_queue_c,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
+#include <sys/stat.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
static char rcsid[] = "(@)$Id: patch-src_queue_c,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $";
|
||||
static char rcsid[] = "(@)$Id: patch-src_queue_c,v 1.2 2010/12/30 17:51:25 landry Exp $";
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-wwsympa_Makefile_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- wwsympa/Makefile.in.orig Thu Nov 12 20:28:40 2009
|
||||
+++ wwsympa/Makefile.in Thu Nov 12 20:28:58 2009
|
||||
@@ -628,7 +628,6 @@ install-data-am: install-defaultDATA install-nobase_mo
|
||||
$OpenBSD: patch-wwsympa_Makefile_in,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- wwsympa/Makefile.in.orig Mon Nov 15 11:22:17 2010
|
||||
+++ wwsympa/Makefile.in Sun Dec 19 11:31:07 2010
|
||||
@@ -636,7 +636,6 @@ install-data-am: install-defaultDATA install-nobase_mo
|
||||
install-exec-am: install-execcgiPROGRAMS install-execcgiSCRIPTS \
|
||||
install-sbinSCRIPTS
|
||||
@$(NORMAL_INSTALL)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-wwsympa_icons_Makefile_in,v 1.1.1.1 2010/03/27 11:47:13 landry Exp $
|
||||
--- wwsympa/icons/Makefile.in.orig Sun Nov 15 19:27:58 2009
|
||||
+++ wwsympa/icons/Makefile.in Sun Nov 15 19:31:19 2009
|
||||
@@ -156,7 +156,7 @@ staticdir = @staticdir@
|
||||
$OpenBSD: patch-wwsympa_icons_Makefile_in,v 1.2 2010/12/30 17:51:25 landry Exp $
|
||||
--- wwsympa/icons/Makefile.in.orig Mon Nov 15 11:22:17 2010
|
||||
+++ wwsympa/icons/Makefile.in Sun Dec 19 11:31:07 2010
|
||||
@@ -164,7 +164,7 @@ staticdir = @staticdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
webtemplatedir = @webtemplatedir@
|
||||
|
||||
3
mail/sympa/pkg/MESSAGE
Normal file
3
mail/sympa/pkg/MESSAGE
Normal file
@ -0,0 +1,3 @@
|
||||
If you upgrade from sympa 6.0.1 to 6.1.3 or later, configuration files
|
||||
sympa.conf and wwsympa.conf moved from ${SYSCONFDIR} to /var/sympa${SYSCONFDIR}.
|
||||
You'll have to merge your configuration changes in the new location.
|
||||
@ -1,6 +1,20 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2010/11/12 16:10:17 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2010/12/30 17:51:25 landry Exp $
|
||||
@newgroup _sympa:648
|
||||
@newuser _sympa:648:648:daemon:Sympa Daemon:/var/empty:/sbin/nologin
|
||||
@mode 755
|
||||
@owner _sympa
|
||||
@group _sympa
|
||||
@sample /var/spool/sympa/
|
||||
@sample /var/sympa/
|
||||
@sample /var/sympa/archives/
|
||||
@sample /var/sympa/bounces/
|
||||
@sample /var/sympa/etc/
|
||||
@sample /var/sympa/list_data/
|
||||
@sample /var/sympa/tmp/
|
||||
@sample /var/www/sympa/
|
||||
@mode
|
||||
@owner
|
||||
@group
|
||||
bin/arc2webarc.pl
|
||||
bin/crypt_passwd.pl
|
||||
bin/init_comment.pl
|
||||
@ -74,6 +88,7 @@ libexec/sympa/
|
||||
@group
|
||||
libexec/sympa/sympa_soap_server.fcgi
|
||||
libexec/sympa/wwsympa.fcgi
|
||||
@sample /var/www/wwsympa.fcgi
|
||||
@man man/man8/alias_manager.8
|
||||
@man man/man8/archived.8
|
||||
@man man/man8/bounced.8
|
||||
@ -99,6 +114,14 @@ share/examples/sympa/create_db.Pg
|
||||
share/examples/sympa/create_db.SQLite
|
||||
share/examples/sympa/create_db.Sybase
|
||||
share/examples/sympa/create_db.mysql
|
||||
@owner _sympa
|
||||
@group _sympa
|
||||
share/examples/sympa/data_structure.version
|
||||
@sample /var/sympa/etc/data_structure.version
|
||||
@owner
|
||||
@group
|
||||
share/examples/sympa/httpd-sympa.conf
|
||||
@sample /var/www/conf/modules.sample/sympa.conf
|
||||
share/examples/sympa/sample/
|
||||
share/examples/sympa/sample/README
|
||||
share/examples/sympa/sample/employees.ldap
|
||||
@ -111,9 +134,9 @@ share/examples/sympa/sample/test/web_tt2/
|
||||
share/examples/sympa/sample/test/web_tt2/welcome.tt2
|
||||
share/examples/sympa/sample/trusted_applications.conf
|
||||
share/examples/sympa/sympa.conf
|
||||
@sample ${SYSCONFDIR}/sympa.conf
|
||||
@sample /var/sympa/${SYSCONFDIR}/sympa.conf
|
||||
share/examples/sympa/wwsympa.conf
|
||||
@sample ${SYSCONFDIR}/wwsympa.conf
|
||||
@sample /var/sympa/${SYSCONFDIR}/wwsympa.conf
|
||||
share/locale/ar/
|
||||
share/locale/ar/LC_MESSAGES/
|
||||
share/locale/ar/LC_MESSAGES/sympa.mo
|
||||
@ -391,6 +414,7 @@ share/sympa/scenari/send.public_nobcc
|
||||
share/sympa/scenari/send.publickey
|
||||
share/sympa/scenari/send.publicnoattachment
|
||||
share/sympa/scenari/send.publicnomultipart
|
||||
share/sympa/scenari/spam_status.x-spam-status
|
||||
share/sympa/scenari/subscribe.auth
|
||||
share/sympa/scenari/subscribe.auth_notify
|
||||
share/sympa/scenari/subscribe.auth_owner
|
||||
@ -433,9 +457,11 @@ share/sympa/web_tt2/arc_protect.tt2
|
||||
share/sympa/web_tt2/arcsearch.tt2
|
||||
share/sympa/web_tt2/arcsearch_form.tt2
|
||||
share/sympa/web_tt2/authorization_reject.tt2
|
||||
share/sympa/web_tt2/auto_signoff.tt2
|
||||
share/sympa/web_tt2/blacklist.tt2
|
||||
share/sympa/web_tt2/button_footer.tt2
|
||||
share/sympa/web_tt2/button_header.tt2
|
||||
share/sympa/web_tt2/ca.tt2
|
||||
share/sympa/web_tt2/change_email.tt2
|
||||
share/sympa/web_tt2/change_email_request.tt2
|
||||
share/sympa/web_tt2/choosepasswd.tt2
|
||||
@ -455,6 +481,7 @@ share/sympa/web_tt2/d_upload.tt2
|
||||
share/sympa/web_tt2/dump_scenario.tt2
|
||||
share/sympa/web_tt2/dumpvars.tt2
|
||||
share/sympa/web_tt2/edit_attributes.tt2
|
||||
share/sympa/web_tt2/edit_config.tt2
|
||||
share/sympa/web_tt2/edit_list_request.tt2
|
||||
share/sympa/web_tt2/edit_template.tt2
|
||||
share/sympa/web_tt2/editfile.tt2
|
||||
@ -486,6 +513,7 @@ share/sympa/web_tt2/javascript.tt2
|
||||
share/sympa/web_tt2/latest_arc.tt2
|
||||
share/sympa/web_tt2/latest_d_read.tt2
|
||||
share/sympa/web_tt2/latest_lists.tt2
|
||||
share/sympa/web_tt2/lca.tt2
|
||||
share/sympa/web_tt2/list_button_footer.tt2
|
||||
share/sympa/web_tt2/list_button_header.tt2
|
||||
share/sympa/web_tt2/list_menu.tt2
|
||||
@ -524,6 +552,7 @@ share/sympa/web_tt2/serveradmin.tt2
|
||||
share/sympa/web_tt2/set_pending_list_request.tt2
|
||||
share/sympa/web_tt2/setlang.tt2
|
||||
share/sympa/web_tt2/show_cert.tt2
|
||||
share/sympa/web_tt2/show_exclude.tt2
|
||||
share/sympa/web_tt2/show_sessions.tt2
|
||||
share/sympa/web_tt2/sigrequest.tt2
|
||||
share/sympa/web_tt2/skinsedit.tt2
|
||||
@ -532,6 +561,8 @@ share/sympa/web_tt2/stats.tt2
|
||||
share/sympa/web_tt2/subindex.tt2
|
||||
share/sympa/web_tt2/suboptions.tt2
|
||||
share/sympa/web_tt2/subrequest.tt2
|
||||
share/sympa/web_tt2/subscriber_table.tt2
|
||||
share/sympa/web_tt2/suspend_request.tt2
|
||||
share/sympa/web_tt2/ticket.tt2
|
||||
share/sympa/web_tt2/title.tt2
|
||||
share/sympa/web_tt2/tt2_error.tt2
|
||||
@ -541,16 +572,8 @@ share/sympa/web_tt2/viewlogs.tt2
|
||||
share/sympa/web_tt2/viewmod.tt2
|
||||
share/sympa/web_tt2/which.tt2
|
||||
share/sympa/web_tt2/your_lists.tt2
|
||||
@mode 755
|
||||
@owner _sympa
|
||||
@group _sympa
|
||||
@sample /var/spool/sympa/
|
||||
@sample /var/sympa/
|
||||
@sample /var/sympa/static/
|
||||
@sample /var/sympa/archives/
|
||||
@sample /var/sympa/bounces/
|
||||
@sample /var/sympa/list_data/
|
||||
@sample /var/sympa/tmp/
|
||||
@exec ln -s ${PREFIX}/share/sympa/icons /var/sympa/static/
|
||||
@unexec rm -f /var/sympa/static/icons
|
||||
@exec cp -r ${PREFIX}/share/sympa/icons /var/www/sympa/
|
||||
@unexec rm -Rf /var/www/sympa/icons
|
||||
@extraunexec rm -rf /var/sympa
|
||||
@rcscript ${RCDIR}/sympa
|
||||
@rcscript ${RCDIR}/wwsympa
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: README,v 1.2 2010/11/12 16:17:36 ajacoutot Exp $
|
||||
$OpenBSD: README,v 1.3 2010/12/30 17:51:25 landry Exp $
|
||||
|
||||
SYMPA is now installed, and sample configuration files were created in
|
||||
${SYSCONFDIR}/sympa.conf and ${SYSCONFDIR}/wwsympa.conf
|
||||
${SYMPA_HOME}/${SYSCONFDIR}/sympa.conf and ${SYMPA_HOME}/${SYSCONFDIR}/wwsympa.conf
|
||||
|
||||
Basic configuration
|
||||
===================
|
||||
|
||||
You should first edit them to suit your needs, at least http_host,
|
||||
domain, listmaster, db_type, db_host, db_user, db_passwd, wwsympa_url
|
||||
settings in ${SYSCONFDIR}/sympa.conf, and then configure the needed
|
||||
settings in ${SYMPA_HOME}/${SYSCONFDIR}/sympa.conf, and then configure the needed
|
||||
database with one of the ${TRUEPREFIX}/share/examples/sympa/create_db.*
|
||||
provided schemas.
|
||||
You should also install the corresponding p5-DBD-{mysql,SQLite,Pg} module.
|
||||
@ -20,40 +20,22 @@ Start sympa using the init.d-style ${TRUEPREFIX}/sbin/sympa script.
|
||||
WWSympa configuration
|
||||
=====================
|
||||
|
||||
Then, add the following lines to your httpd.conf :
|
||||
To enable WWSympa within httpd once wwsympa.fcgi has been spawned,
|
||||
please create a symbolic link from /var/www/conf/modules.sample/sympa.conf
|
||||
to /var/www/conf/modules/sympa.conf
|
||||
|
||||
Alias /wwsicons ${SYMPA_HOME}/static/icons/
|
||||
Alias /static-sympa ${SYMPA_HOME}/static/
|
||||
ScriptAlias /sympa ${TRUEPREFIX}/libexec/sympa/wwsympa-wrapper.fcgi
|
||||
FastCgiServer ${TRUEPREFIX}/libexec/sympa/wwsympa.fcgi -processes 2
|
||||
<Location /sympa>
|
||||
SetHandler fastcgi-script
|
||||
</Location>
|
||||
|
||||
For optimal performance you also need to enable mod_fastcgi.
|
||||
|
||||
As WWSympa needs to access ${SYMPA_HOME} and ${SYSCONFDIR}/sympa.conf
|
||||
files, you have to run httpd unchrooted with httpd -u, or chroot the
|
||||
whole sympa package and its dependencies otherwise.
|
||||
# ln -s /var/www/conf/modules.sample/sympa.conf \
|
||||
/var/www/conf/modules
|
||||
# apachectl stop
|
||||
# apachectl start
|
||||
|
||||
WWSympa should be available at http://domain.tld/sympa/
|
||||
|
||||
Startup/Shutdown configuration
|
||||
==============================
|
||||
|
||||
You can start sympa upon boot by adding the following lines to
|
||||
${SYSCONFDIR}/rc.local after starting your DB server :
|
||||
|
||||
if [ -x ${TRUEPREFIX}/sbin/sympa ]; then
|
||||
echo -n ' sympa' ; ${TRUEPREFIX}/sbin/sympa start
|
||||
fi
|
||||
|
||||
You should also cleanly stop sympa upon shutdown by adding the
|
||||
following lines to ${SYSCONFDIR}/rc.shutdown :
|
||||
|
||||
if [ -x ${TRUEPREFIX}/sbin/sympa ]; then
|
||||
echo -n 'stopping sympa' ; ${TRUEPREFIX}/sbin/sympa stop
|
||||
fi
|
||||
You can control sympa/wwsympa.fcgi daemons using the rc scripts in
|
||||
${SYSCONFDIR}/rc.d/.
|
||||
|
||||
Mail aliases configuration
|
||||
==========================
|
||||
|
||||
23
mail/sympa/pkg/sympa.rc
Normal file
23
mail/sympa/pkg/sympa.rc
Normal file
@ -0,0 +1,23 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: sympa.rc,v 1.1 2010/12/30 17:51:25 landry Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/sbin/sympa"
|
||||
|
||||
. /etc/rc.d/rc.subr
|
||||
|
||||
rc_reload=NO
|
||||
|
||||
rc_start() {
|
||||
${daemon} start >/dev/null 2>&1
|
||||
}
|
||||
|
||||
rc_stop() {
|
||||
${daemon} stop >/dev/null 2>&1
|
||||
}
|
||||
|
||||
rc_check() {
|
||||
${daemon} status >/dev/null 2>&1
|
||||
}
|
||||
|
||||
rc_cmd $1
|
||||
13
mail/sympa/pkg/wwsympa.rc
Normal file
13
mail/sympa/pkg/wwsympa.rc
Normal file
@ -0,0 +1,13 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: wwsympa.rc,v 1.1 2010/12/30 17:51:25 landry Exp $
|
||||
|
||||
daemon="${LOCALBASE}/bin/spawn-fcgi"
|
||||
daemon_flags="-u_sympa -g_sympa -p1026 ${TRUEPREFIX}/libexec/sympa/wwsympa.fcgi"
|
||||
|
||||
. /etc/rc.d/rc.subr
|
||||
|
||||
pexp="/usr/bin/perl.*wwsympa.fcgi"
|
||||
rc_reload=NO
|
||||
|
||||
rc_cmd $1
|
||||
Loading…
Reference in New Issue
Block a user