Attachment 240692 Details for Bug 270061 – git diff mail/sympa

[patch] git diff mail/sympa

sympa.diff (text/plain), 5.34 KB, created by geoffroy desvernay on 2023-03-09 09:59:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: geoffroy desvernay

Created: 2023-03-09 09:59:51 UTC

Size: 5.34 KB

patch

obsolete

>diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
>index 4bc41c988663..f506ae9e65d7 100644
>--- a/mail/sympa/Makefile
>+++ b/mail/sympa/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	sympa
>-DISTVERSION=	6.2.68
>+DISTVERSION=	6.2.70
> CATEGORIES=	mail
> 
> MAINTAINER=	dgeo@centrale-marseille.fr
>diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
>index 93b4d482b944..a296c6111e6f 100644
>--- a/mail/sympa/distinfo
>+++ b/mail/sympa/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1646733590
>-SHA256 (sympa-community-sympa-6.2.68_GH0.tar.gz) = 109e31b5d2812a1e2dc7fb831d79b9be66a41df3da5bf99e489e1c3afeb7cea5
>-SIZE (sympa-community-sympa-6.2.68_GH0.tar.gz) = 10497703
>+TIMESTAMP = 1671006023
>+SHA256 (sympa-community-sympa-6.2.70_GH0.tar.gz) = 45b22844a5c610054543612f660b5145677826a3236b6a006b29de917f56e8ce
>+SIZE (sympa-community-sympa-6.2.70_GH0.tar.gz) = 10501286
>diff --git a/mail/sympa/files/patch-Makefile.am b/mail/sympa/files/patch-Makefile.am
>index c9f5fe1394b4..3bee746ff75c 100644
>--- a/mail/sympa/files/patch-Makefile.am
>+++ b/mail/sympa/files/patch-Makefile.am
>@@ -1,6 +1,6 @@
>---- Makefile.am.orig	2019-06-21 03:28:22 UTC
>+--- Makefile.am.orig	2022-11-10 11:35:55 UTC
> +++ Makefile.am
>-@@ -132,24 +132,24 @@ installdir:
>+@@ -150,19 +150,19 @@ installdir:
>  
>  installconfig: installdir
>  	@echo "Installing basic configuration ..."
>@@ -15,12 +15,6 @@
> +		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); \
>@@ -37,15 +31,14 @@
>  	fi
>  	-@for dir in create_list_templates custom_actions custom_conditions \
>  		data_sources families tasks \
>-@@ -197,10 +197,10 @@ nextstep: 
>+@@ -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
>diff --git a/mail/sympa/pkg-plist b/mail/sympa/pkg-plist
>index 4d15ed70cbb8..8f314e022854 100644
>--- a/mail/sympa/pkg-plist
>+++ b/mail/sympa/pkg-plist
>@@ -1,5 +1,4 @@
> @sample %%ETCDIR%%/sympa.conf.sample
>-%%ETCDIR%%/sympa.conf-dist
> bin/sympa
> bin/sympa.pl
> bin/sympa_wizard.pl
>@@ -17,9 +16,15 @@ libexec/sympa/Sympa/Aliases/Template.pm
> libexec/sympa/Sympa/Archive.pm
> libexec/sympa/Sympa/CLI.pm
> libexec/sympa/Sympa/CLI/add.pm
>+libexec/sympa/Sympa/CLI/bouncers.pm
>+libexec/sympa/Sympa/CLI/bouncers/del.pm
>+libexec/sympa/Sympa/CLI/bouncers/reset.pm
> libexec/sympa/Sympa/CLI/check.pm
> libexec/sympa/Sympa/CLI/close.pm
> libexec/sympa/Sympa/CLI/conf_2_db.pm
>+libexec/sympa/Sympa/CLI/config.pm
>+libexec/sympa/Sympa/CLI/config/create.pm
>+libexec/sympa/Sympa/CLI/config/show.pm
> libexec/sympa/Sympa/CLI/copy.pm
> libexec/sympa/Sympa/CLI/create.pm
> libexec/sympa/Sympa/CLI/del.pm
>@@ -36,6 +41,7 @@ libexec/sympa/Sympa/CLI/open.pm
> libexec/sympa/Sympa/CLI/rebuildarc.pm
> libexec/sympa/Sympa/CLI/reload_list_config.pm
> libexec/sympa/Sympa/CLI/restore.pm
>+libexec/sympa/Sympa/CLI/review.pm
> libexec/sympa/Sympa/CLI/send_digest.pm
> libexec/sympa/Sympa/CLI/show_pending_lists.pm
> libexec/sympa/Sympa/CLI/sync_list_db.pm
>@@ -232,7 +238,6 @@ libexec/sympa/sympa_soap_client.pl
> @(sympa,sympa,6755) libexec/sympa/sympa_soap_server-wrapper.fcgi
> libexec/sympa/sympa_soap_server.fcgi
> libexec/sympa/sympa_test_ldap.pl
>-libexec/sympa/sympa_wizard.pl
> libexec/sympa/task_manager.pl
> libexec/sympa/testlogs.pl
> libexec/sympa/tpl2tt2.pl
>@@ -245,9 +250,15 @@ libexec/sympa/wwsympa.fcgi
> man/man1/mod2html.1.gz
> man/man1/sympa.1.gz
> man/man1/sympa-add.1.gz
>+man/man1/sympa-bouncers-del.1.gz
>+man/man1/sympa-bouncers-reset.1.gz
>+man/man1/sympa-bouncers.1.gz
> man/man1/sympa-check.1.gz
> man/man1/sympa-close.1.gz
> man/man1/sympa-conf_2_db.1.gz
>+man/man1/sympa-config-create.1.gz
>+man/man1/sympa-config-show.1.gz
>+man/man1/sympa-config.1.gz
> man/man1/sympa-copy.1.gz
> man/man1/sympa-create.1.gz
> man/man1/sympa-del.1.gz
>@@ -273,9 +284,9 @@ man/man1/sympa-user-move.1.gz
> man/man1/sympa-user.1.gz
> man/man1/sympa-version.1.gz
> man/man1/sympa_newaliases.1.gz
>+man/man1/sympa-review.1.gz
> man/man1/sympa_test_ldap.1.gz
> man/man1/sympa_toc.1.gz
>-man/man1/sympa_wizard.1.gz
> man/man1/upgrade_bulk_spool.1.gz
> man/man1/upgrade_send_spool.1.gz
> man/man1/upgrade_shared_repository.1.gz
>@@ -428,6 +439,7 @@ man/man3/Sympa::Spool::Topic.3Sympa.gz
> man/man3/Sympa::Task.3Sympa.gz
> man/man3/Sympa::Template.3Sympa.gz
> man/man3/Sympa::Ticket.3Sympa.gz
>+man/man3/Sympa::Tools::Data.3Sympa.gz
> man/man3/Sympa::Tools::Domains.3Sympa.gz
> man/man3/Sympa::Tools::File.3Sympa.gz
> man/man3/Sympa::Tools::SMIME.3Sympa.gz

Flags:

dgeo: maintainer-approval+

Actions: View | Diff

Attachments on bug 270061: 240692