Attachment #240692 for bug #270061

View | Details | Raw Unified | Return to bug 270061
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/mail/sympa/Makefile (-1 / +1 lines)
1	PORTNAME= sympa	1	PORTNAME= sympa
2	DISTVERSION= 6.2.68	2	DISTVERSION= 6.2.70
3	CATEGORIES= mail	3	CATEGORIES= mail
4		4
5	MAINTAINER= dgeo@centrale-marseille.fr	5	MAINTAINER= dgeo@centrale-marseille.fr

Lines 1-3 Link Here

(-)b/mail/sympa/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1646733590	1	TIMESTAMP = 1671006023
2	SHA256 (sympa-community-sympa-6.2.68_GH0.tar.gz) = 109e31b5d2812a1e2dc7fb831d79b9be66a41df3da5bf99e489e1c3afeb7cea5	2	SHA256 (sympa-community-sympa-6.2.70_GH0.tar.gz) = 45b22844a5c610054543612f660b5145677826a3236b6a006b29de917f56e8ce
3	SIZE (sympa-community-sympa-6.2.68_GH0.tar.gz) = 10497703	3	SIZE (sympa-community-sympa-6.2.70_GH0.tar.gz) = 10501286




--- Makefile.am.orig	2022-11-10 11:35:55 UTC
+++ Makefile.am
@@ -150,19 +150,19 @@ installdir:
 
 installconfig: installdir
 	@echo "Installing basic configuration ..."

+		chown $(USER) $(DESTDIR)$(confdir)/sympa.conf.sample; \
+		chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf.sample; \
 	fi
 	@echo "Installing configuration template ..."
 	-@echo "installing sympa.conf-dist"; \
-	$(INSTALL) -m 644 -T sympa.conf-dist $(DESTDIR)$(confdir)/sympa.conf-dist; \
+	$(INSTALL) -m 644 sympa.conf-dist $(DESTDIR)$(confdir)/sympa.conf-dist; \
 	chown $(USER) $(DESTDIR)$(confdir)/sympa.conf-dist; \
 	chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf-dist
-	-@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
+	-@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version.sample ]; then \
 		cd $(DESTDIR)$(sysconfdir); \

 	fi
 	-@for dir in create_list_templates custom_actions custom_conditions \
 		data_sources families tasks \
@@ -203,9 +203,9 @@ nextstep: 
 	@echo "#######################################################"
 
 uninstall-hook:
-	cd $(DESTDIR)$(confdir) && rm -f sympa.conf
+	cd $(DESTDIR)$(confdir) && rm -f sympa.conf.sample
 	cd $(DESTDIR)$(confdir) && rm -f sympa.conf-dist
-	cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf
-	cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version
+	cd $(DESTDIR)$(confdir) && rm -f sympa.conf.sample
+	cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf.sample
+	cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version.sample
 	cd $(DESTDIR)$(sysconfdir) && rm -f README

Lines 1-5 Link Here

(-)b/mail/sympa/pkg-plist (-3 / +15 lines)
1	@sample %%ETCDIR%%/sympa.conf.sample	1	@sample %%ETCDIR%%/sympa.conf.sample
2	%%ETCDIR%%/sympa.conf-dist
3	bin/sympa	2	bin/sympa
4	bin/sympa.pl	3	bin/sympa.pl
5	bin/sympa_wizard.pl	4	bin/sympa_wizard.pl
Lines 17-25 libexec/sympa/Sympa/Aliases/Template.pm Link Here
17	libexec/sympa/Sympa/Archive.pm	16	libexec/sympa/Sympa/Archive.pm
18	libexec/sympa/Sympa/CLI.pm	17	libexec/sympa/Sympa/CLI.pm
19	libexec/sympa/Sympa/CLI/add.pm	18	libexec/sympa/Sympa/CLI/add.pm
		19	libexec/sympa/Sympa/CLI/bouncers.pm
		20	libexec/sympa/Sympa/CLI/bouncers/del.pm
		21	libexec/sympa/Sympa/CLI/bouncers/reset.pm
20	libexec/sympa/Sympa/CLI/check.pm	22	libexec/sympa/Sympa/CLI/check.pm
21	libexec/sympa/Sympa/CLI/close.pm	23	libexec/sympa/Sympa/CLI/close.pm
22	libexec/sympa/Sympa/CLI/conf_2_db.pm	24	libexec/sympa/Sympa/CLI/conf_2_db.pm
		25	libexec/sympa/Sympa/CLI/config.pm
		26	libexec/sympa/Sympa/CLI/config/create.pm
		27	libexec/sympa/Sympa/CLI/config/show.pm
23	libexec/sympa/Sympa/CLI/copy.pm	28	libexec/sympa/Sympa/CLI/copy.pm
24	libexec/sympa/Sympa/CLI/create.pm	29	libexec/sympa/Sympa/CLI/create.pm
25	libexec/sympa/Sympa/CLI/del.pm	30	libexec/sympa/Sympa/CLI/del.pm
Lines 36-41 libexec/sympa/Sympa/CLI/open.pm Link Here
36	libexec/sympa/Sympa/CLI/rebuildarc.pm	41	libexec/sympa/Sympa/CLI/rebuildarc.pm
37	libexec/sympa/Sympa/CLI/reload_list_config.pm	42	libexec/sympa/Sympa/CLI/reload_list_config.pm
38	libexec/sympa/Sympa/CLI/restore.pm	43	libexec/sympa/Sympa/CLI/restore.pm
		44	libexec/sympa/Sympa/CLI/review.pm
39	libexec/sympa/Sympa/CLI/send_digest.pm	45	libexec/sympa/Sympa/CLI/send_digest.pm
40	libexec/sympa/Sympa/CLI/show_pending_lists.pm	46	libexec/sympa/Sympa/CLI/show_pending_lists.pm
41	libexec/sympa/Sympa/CLI/sync_list_db.pm	47	libexec/sympa/Sympa/CLI/sync_list_db.pm
Lines 232-238 libexec/sympa/sympa_soap_client.pl Link Here
232	@(sympa,sympa,6755) libexec/sympa/sympa_soap_server-wrapper.fcgi	238	@(sympa,sympa,6755) libexec/sympa/sympa_soap_server-wrapper.fcgi
233	libexec/sympa/sympa_soap_server.fcgi	239	libexec/sympa/sympa_soap_server.fcgi
234	libexec/sympa/sympa_test_ldap.pl	240	libexec/sympa/sympa_test_ldap.pl
235	libexec/sympa/sympa_wizard.pl
236	libexec/sympa/task_manager.pl	241	libexec/sympa/task_manager.pl
237	libexec/sympa/testlogs.pl	242	libexec/sympa/testlogs.pl
238	libexec/sympa/tpl2tt2.pl	243	libexec/sympa/tpl2tt2.pl
Lines 245-253 libexec/sympa/wwsympa.fcgi Link Here
245	man/man1/mod2html.1.gz	250	man/man1/mod2html.1.gz
246	man/man1/sympa.1.gz	251	man/man1/sympa.1.gz
247	man/man1/sympa-add.1.gz	252	man/man1/sympa-add.1.gz
		253	man/man1/sympa-bouncers-del.1.gz
		254	man/man1/sympa-bouncers-reset.1.gz
		255	man/man1/sympa-bouncers.1.gz
248	man/man1/sympa-check.1.gz	256	man/man1/sympa-check.1.gz
249	man/man1/sympa-close.1.gz	257	man/man1/sympa-close.1.gz
250	man/man1/sympa-conf_2_db.1.gz	258	man/man1/sympa-conf_2_db.1.gz
		259	man/man1/sympa-config-create.1.gz
		260	man/man1/sympa-config-show.1.gz
		261	man/man1/sympa-config.1.gz
251	man/man1/sympa-copy.1.gz	262	man/man1/sympa-copy.1.gz
252	man/man1/sympa-create.1.gz	263	man/man1/sympa-create.1.gz
253	man/man1/sympa-del.1.gz	264	man/man1/sympa-del.1.gz
Lines 273-281 man/man1/sympa-user-move.1.gz Link Here
273	man/man1/sympa-user.1.gz	284	man/man1/sympa-user.1.gz
274	man/man1/sympa-version.1.gz	285	man/man1/sympa-version.1.gz
275	man/man1/sympa_newaliases.1.gz	286	man/man1/sympa_newaliases.1.gz
		287	man/man1/sympa-review.1.gz
276	man/man1/sympa_test_ldap.1.gz	288	man/man1/sympa_test_ldap.1.gz
277	man/man1/sympa_toc.1.gz	289	man/man1/sympa_toc.1.gz
278	man/man1/sympa_wizard.1.gz
279	man/man1/upgrade_bulk_spool.1.gz	290	man/man1/upgrade_bulk_spool.1.gz
280	man/man1/upgrade_send_spool.1.gz	291	man/man1/upgrade_send_spool.1.gz
281	man/man1/upgrade_shared_repository.1.gz	292	man/man1/upgrade_shared_repository.1.gz
Lines 428-433 man/man3/Sympa::Spool::Topic.3Sympa.gz Link Here
428	man/man3/Sympa::Task.3Sympa.gz	439	man/man3/Sympa::Task.3Sympa.gz
429	man/man3/Sympa::Template.3Sympa.gz	440	man/man3/Sympa::Template.3Sympa.gz
430	man/man3/Sympa::Ticket.3Sympa.gz	441	man/man3/Sympa::Ticket.3Sympa.gz
		442	man/man3/Sympa::Tools::Data.3Sympa.gz
431	man/man3/Sympa::Tools::Domains.3Sympa.gz	443	man/man3/Sympa::Tools::Domains.3Sympa.gz
432	man/man3/Sympa::Tools::File.3Sympa.gz	444	man/man3/Sympa::Tools::File.3Sympa.gz
433	man/man3/Sympa::Tools::SMIME.3Sympa.gz	445	man/man3/Sympa::Tools::SMIME.3Sympa.gz

Return to bug 270061

Lines 1-6 Link Here

(-)b/mail/sympa/files/patch-Makefile.am (-11 / +4 lines)
1	--- Makefile.am.orig 2019-06-21 03:28:22 UTC	1	--- Makefile.am.orig 2022-11-10 11:35:55 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -132,24 +132,24 @@ installdir:	3	@@ -150,19 +150,19 @@ installdir:
4		4
5	installconfig: installdir	5	installconfig: installdir
6	@echo "Installing basic configuration ..."	6	@echo "Installing basic configuration ..."
Lines 15-26 Link Here
15	+ chown $(USER) $(DESTDIR)$(confdir)/sympa.conf.sample; \	15	+ chown $(USER) $(DESTDIR)$(confdir)/sympa.conf.sample; \
16	+ chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf.sample; \	16	+ chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf.sample; \
17	fi	17	fi
18	@echo "Installing configuration template ..."
19	-@echo "installing sympa.conf-dist"; \
20	- $(INSTALL) -m 644 -T sympa.conf-dist $(DESTDIR)$(confdir)/sympa.conf-dist; \
21	+ $(INSTALL) -m 644 sympa.conf-dist $(DESTDIR)$(confdir)/sympa.conf-dist; \
22	chown $(USER) $(DESTDIR)$(confdir)/sympa.conf-dist; \
23	chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf-dist
24	- -@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \	18	- -@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
25	+ -@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version.sample ]; then \	19	+ -@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version.sample ]; then \
26	cd $(DESTDIR)$(sysconfdir); \	20	cd $(DESTDIR)$(sysconfdir); \
Lines 37-51 Link Here
37	fi	31	fi
38	-@for dir in create_list_templates custom_actions custom_conditions \	32	-@for dir in create_list_templates custom_actions custom_conditions \
39	data_sources families tasks \	33	data_sources families tasks \
40	@@ -197,10 +197,10 @@ nextstep:	34	@@ -203,9 +203,9 @@ nextstep:
41	@echo "#######################################################"	35	@echo "#######################################################"
42		36
43	uninstall-hook:	37	uninstall-hook:
44	- cd $(DESTDIR)$(confdir) && rm -f sympa.conf	38	- cd $(DESTDIR)$(confdir) && rm -f sympa.conf
45	+ cd $(DESTDIR)$(confdir) && rm -f sympa.conf.sample
46	cd $(DESTDIR)$(confdir) && rm -f sympa.conf-dist
47	- cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf	39	- cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf
48	- cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version	40	- cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version
		41	+ cd $(DESTDIR)$(confdir) && rm -f sympa.conf.sample
49	+ cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf.sample	42	+ cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf.sample
50	+ cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version.sample	43	+ cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version.sample
51	cd $(DESTDIR)$(sysconfdir) && rm -f README	44	cd $(DESTDIR)$(sysconfdir) && rm -f README