Update to sympa 6.1.6.

see http://www.sympa.org/distribution/latest-stable/NEWS for a list of
the fixes.
This commit is contained in:
landry 2011-08-16 10:06:58 +00:00
parent 313e459dd0
commit 7ee30bc5c6
14 changed files with 100 additions and 95 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.16 2011/07/06 17:11:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2011/08/16 10:06:58 landry Exp $
COMMENT = mailing list manager with web interface
VERSION = 6.1.3
VERSION = 6.1.6
DISTNAME = sympa-${VERSION}
REVISION = 5
CATEGORIES = mail www
HOMEPAGE = http://www.sympa.org
MAINTAINER = Landry Breuil <gaston@gcu.info>
MAINTAINER = Landry Breuil <landry@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@ -18,7 +16,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = ${HOMEPAGE}/distribution/old/ \
MASTER_SITES = ${HOMEPAGE}/distribution/ \
http://distfiles.nl/
MODULES = perl

View File

@ -1,5 +1,5 @@
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
MD5 (sympa-6.1.6.tar.gz) = F4BieElsIvqvqhx4XwVhaA==
RMD160 (sympa-6.1.6.tar.gz) = Ru6ESFwvWVAZOkp+ZRtAVZ+43XE=
SHA1 (sympa-6.1.6.tar.gz) = feJbCvFAKQt0knRNiDgGr+8dBXQ=
SHA256 (sympa-6.1.6.tar.gz) = 49Vq2TEoqopNyDQUGT/Z1mTwVqwetQhaFd8e8e0qY0w=
SIZE (sympa-6.1.6.tar.gz) = 7347170

View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-Makefile_in,v 1.3 2011/08/16 10:06:58 landry Exp $
--- Makefile.in.orig Wed Jul 20 18:37:47 2011
+++ Makefile.in Sun Aug 7 11:37:43 2011
@@ -573,7 +573,6 @@ info-am:
install-data-am:
@$(NORMAL_INSTALL)

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-configure,v 1.3 2011/08/16 10:06:58 landry Exp $
--- configure.orig Wed Jul 20 18:37:47 2011
+++ configure Sun Aug 7 11:37:43 2011
@@ -2724,19 +2724,19 @@ else
# define custom variables
initdir=/etc/rc.d/init.d
@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.2 2010/12/30 17:51:25 landry Exp $
confdir=/etc
fi
@@ -4512,7 +4512,7 @@ $as_echo "$as_me: error: invalid value $POSTMAP for po
@@ -4504,7 +4504,7 @@ $as_echo "$as_me: error: invalid value $POSTMAP for po
$as_echo "$POSTMAP" >&6; }
else
# default value

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-doc_man8_Makefile_in,v 1.1 2010/12/30 17:51:25 landry Exp $
$OpenBSD: patch-doc_man8_Makefile_in,v 1.2 2011/08/16 10:06:58 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
--- doc/man8/Makefile.in.orig Wed Jul 20 18:37:46 2011
+++ doc/man8/Makefile.in Sun Aug 7 11:37:43 2011
@@ -378,7 +378,7 @@ archived.pod bounced.pod alias_manager.pod: Makefile
$(AM_V_GEN)$(SED) \
-e 's|--piddir--|$(piddir)|' \
-e 's|--libexecdir--|$(libexecdir)|' \

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-soap_Makefile_in,v 1.3 2011/08/16 10:06:58 landry Exp $
--- soap/Makefile.in.orig Wed Jul 20 18:37:46 2011
+++ soap/Makefile.in Sun Aug 7 11:37:43 2011
@@ -527,7 +527,6 @@ install-data-am: install-defaultDATA install-modulesDA
install-exec-am: install-execcgiPROGRAMS install-execcgiSCRIPTS
@$(NORMAL_INSTALL)

View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-src_Makefile_in,v 1.3 2011/08/16 10:06:58 landry Exp $
--- src/Makefile.in.orig Wed Jul 20 18:37:46 2011
+++ src/Makefile.in Sun Aug 7 11:37:43 2011
@@ -697,7 +697,6 @@ install-data-am:
install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \
install-sbinSCRIPTS
@$(NORMAL_INSTALL)

View File

@ -1,16 +1,7 @@
$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,
$OpenBSD: patch-src_etc_script_create_db_SQLite,v 1.2 2011/08/16 10:06:58 landry Exp $
fix non-sqlite keywords ?
--- src/etc/script/create_db.SQLite.orig Mon Jan 17 08:53:45 2011
+++ src/etc/script/create_db.SQLite Sun Aug 7 11:40:00 2011
@@ -26,11 +26,11 @@ CREATE TABLE subscriber_table (
bounce_subscriber text,
bounce_address_subscriber text,
@ -77,7 +68,7 @@ fix typos: https://sourcesup.cru.fr/tracker/?func=detail&atid=167&aid=7371&group
- dkim_selector_bulkspool varchar(50),
- dkim_d_bulkspool varchar(50),
- dkim_i_bulkspool varchar(50),
- dkim_header_list_bulkspool' varchar(500),
- dkim_header_list_bulkspool varchar(500),
+ dkim_privatekey_bulkspool text,
+ dkim_selector_bulkspool text,
+ dkim_d_bulkspool text,

View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-src_etc_script_sympa_in,v 1.3 2011/08/16 10:06:58 landry Exp $
--- src/etc/script/sympa.in.orig Wed Nov 17 08:25:42 2010
+++ src/etc/script/sympa.in Sun Aug 7 11:43:46 2011
@@ -14,43 +14,11 @@
# chkconfig: 345 95 05
# description: sympa is a powerfull mailing lists management system.
@ -104,34 +104,52 @@ $OpenBSD: patch-src_etc_script_sympa_in,v 1.2 2010/12/30 17:51:25 landry Exp $
}
# Test state of module before startup
@@ -155,40 +101,23 @@ sympa_stop() {
if [ -f --piddir--/$1.pid ]; then
echo $echo_opt "Stopping module $1.pl: "
pid=`head -1 --piddir--/$1.pid`
- running=`ps -A | grep "$pid"`
@@ -159,25 +105,21 @@ sympa_stop() {
if [ "$pids" != "" ]; then
for pid in $pids; do
killcount=0
- running=`ps -A | grep "$pid ..* $1\\.pl"`
+ running=`pgrep -f $1.pl`
if [ $1 = 'bulk' ]; then
- if [ ${use_functions} ]; then
- kill -TERM $pid && success || failure
- else
kill -TERM $pid && echo "success" || echo "failure"
- fi
else
if [ "$running" != "" ]; then
while [ "$running" != "" ]; do
if [ $killcount -gt 10 ]; then
- if [ ${use_functions} ]; then
- kill -TERM $pid && success || failure
- failure
- else
kill -TERM $pid && echo "success" || echo "failure"
- fi
else
echo "died"
echo 'failure'
- fi
return 3
fi
fi
- echo
else
echo "Module $1.pl not running"
kill -TERM $pid >/dev/null 2>&1
- running=`ps -A | grep "$pid ..* $1\\.pl"`
+ running=`pgrep -f $1.pl`
if [ "$running" = "" ]; then
runcount=`expr $runcount + 1`
break
fi
sleep 2
- running=`ps -A | grep "$pid ..* $1\\.pl"`
+ running=`pgrep -f $1.pl`
if [ "$running" = "" ]; then
runcount=`expr $runcount + 1`
break
@@ -187,15 +129,10 @@ sympa_stop() {
done
fi
if [ $runcount -gt 0 ]; then
- if [ ${use_functions} ]; then
- success
- else
echo 'success'
- fi
else
echo 'died'
fi
- echo
else
echo "Module $1.pl not running"
fi
@@ -203,14 +140,6 @@ sympa_stop() {
}
@ -146,7 +164,7 @@ $OpenBSD: patch-src_etc_script_sympa_in,v 1.2 2010/12/30 17:51:25 landry Exp $
# Check config files
[ -d $sympadir ] || exit 0
[ -f $sympaconf ] || exit 0
@@ -205,7 +134,6 @@ case "$1" in
@@ -227,7 +156,6 @@ case "$1" in
sympa_start bounced
sympa_start task_manager
touch --lockdir--/sympa
@ -154,7 +172,7 @@ $OpenBSD: patch-src_etc_script_sympa_in,v 1.2 2010/12/30 17:51:25 landry Exp $
else
echo "Sympa seems active. No action will be taken."
@@ -236,19 +164,24 @@ case "$1" in
@@ -258,17 +186,22 @@ case "$1" in
echo "Status file for subsystem found."
else
echo "Status file for subsystem NOT found."
@ -173,9 +191,7 @@ $OpenBSD: patch-src_etc_script_sympa_in,v 1.2 2010/12/30 17:51:25 landry Exp $
;;
restart)
echo "Restarting Sympa subsystem: "
$0 stop
sleep 3
$0 start
$0 stop && $0 start
- echo
;;
*)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_familyqueue_c,v 1.2 2010/12/30 17:51:25 landry Exp $
$OpenBSD: patch-src_familyqueue_c,v 1.3 2011/08/16 10:06:58 landry Exp $
--- src/familyqueue.c.orig Wed Jun 9 11:50:04 2010
+++ src/familyqueue.c Sun Dec 19 11:30:52 2010
+++ src/familyqueue.c Sun Aug 7 11:37:43 2011
@@ -25,6 +25,9 @@
#include <sysexits.h>
#include <string.h>
@ -9,5 +9,5 @@ $OpenBSD: patch-src_familyqueue_c,v 1.2 2010/12/30 17:51:25 landry Exp $
+#include <sys/stat.h>
+#include <unistd.h>
static char rcsid[] = "(@)$Id: patch-src_familyqueue_c,v 1.2 2010/12/30 17:51:25 landry Exp $";
static char rcsid[] = "(@)$Id: patch-src_familyqueue_c,v 1.3 2011/08/16 10:06:58 landry Exp $";

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib_List_pm,v 1.2 2010/12/30 17:51:25 landry Exp $
$OpenBSD: patch-src_lib_List_pm,v 1.3 2011/08/16 10:06:58 landry Exp $
Don't spam error_log
--- src/lib/List.pm.orig Wed Nov 10 13:26:20 2010
+++ src/lib/List.pm Sun Dec 19 11:30:52 2010
--- src/lib/List.pm.orig Tue Apr 12 15:31:43 2011
+++ src/lib/List.pm Sun Aug 7 11:37:43 2011
@@ -1521,7 +1521,7 @@ sub db_get_handler {
sub new {
my($pkg, $name, $robot, $options) = @_;
@ -11,7 +11,7 @@ Don't spam error_log
## Allow robot in the name
if ($name =~ /\@/) {
@@ -1898,7 +1898,7 @@ sub save_config {
@@ -1920,7 +1920,7 @@ sub save_config {
## Loads the administrative data for a list
sub load {
my ($self, $name, $robot, $options) = @_;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_queue_c,v 1.2 2010/12/30 17:51:25 landry Exp $
$OpenBSD: patch-src_queue_c,v 1.3 2011/08/16 10:06:58 landry Exp $
--- src/queue.c.orig Wed Jun 9 11:50:04 2010
+++ src/queue.c Sun Dec 19 11:31:07 2010
+++ src/queue.c Sun Aug 7 11:37:44 2011
@@ -25,6 +25,9 @@
#include <sysexits.h>
#include <string.h>
@ -9,5 +9,5 @@ $OpenBSD: patch-src_queue_c,v 1.2 2010/12/30 17:51:25 landry Exp $
+#include <sys/stat.h>
+#include <unistd.h>
static char rcsid[] = "(@)$Id: patch-src_queue_c,v 1.2 2010/12/30 17:51:25 landry Exp $";
static char rcsid[] = "(@)$Id: patch-src_queue_c,v 1.3 2011/08/16 10:06:58 landry Exp $";

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-wwsympa_Makefile_in,v 1.3 2011/08/16 10:06:58 landry Exp $
--- wwsympa/Makefile.in.orig Wed Jul 20 18:37:47 2011
+++ wwsympa/Makefile.in Sun Aug 7 11:37:44 2011
@@ -640,7 +640,6 @@ install-data-am: install-defaultDATA install-nobase_mo
install-exec-am: install-execcgiPROGRAMS install-execcgiSCRIPTS \
install-sbinSCRIPTS
@$(NORMAL_INSTALL)

View File

@ -1,7 +1,7 @@
$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@
$OpenBSD: patch-wwsympa_icons_Makefile_in,v 1.3 2011/08/16 10:06:58 landry Exp $
--- wwsympa/icons/Makefile.in.orig Wed Jul 20 18:37:47 2011
+++ wwsympa/icons/Makefile.in Sun Aug 7 11:37:44 2011
@@ -168,7 +168,7 @@ staticdir = @staticdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
webtemplatedir = @webtemplatedir@