Hello community,
here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at 2019-07-31 14:21:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-mail (Old)
and /work/SRC/openSUSE:Factory/.yast2-mail.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-mail"
Wed Jul 31 14:21:18 2019 rev:90 rq:708370 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-mail/yast2-mail.changes 2018-12-31 09:40:51.906487942 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-mail.new.4126/yast2-mail.changes 2019-07-31 14:21:20.138555811 +0200
@@ -1,0 +2,15 @@
+Thu Jun 6 12:35:42 UTC 2019 - Peter Varkoly
+
+- bsc#105491 setup of postfix with amavis DKIM signing does noti
+ work at all. The dkim setup script was rewritten.
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:33:17 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-mail-4.1.0.tar.bz2
New:
----
yast2-mail-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.K33MHD/_old 2019-07-31 14:21:20.610555137 +0200
+++ /var/tmp/diff_new_pack.K33MHD/_new 2019-07-31 14:21:20.614555131 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-mail
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,18 @@
Name: yast2-mail
-Version: 4.1.0
+Version: 4.2.1
Release: 0
+Summary: YaST2 - Mail Configuration
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-mail
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
PreReq: %fillup_prereq
@@ -33,61 +36,42 @@
# SuSEFirewall2 replaced by firewalld (fate#323460)
Requires: yast2 >= 4.0.39
Requires: yast2-ldap
-Requires: yast2-users
-BuildArch: noarch
Requires: yast2-ruby-bindings >= 1.0.0
+Requires: yast2-users
-Summary: YaST2 - Mail Configuration
-License: GPL-2.0-or-later
-Group: System/YaST
+BuildArch: noarch
%description
The YaST2 component for mail configuration. It handles Postfix, Cyrus,
Amavis and Fetchmail.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%post
%{fillup_only -n mail}
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/mail
-%{yast_yncludedir}/mail/*
-%dir %{yast_clientdir}
-%{yast_clientdir}/mail*
-%dir %{yast_moduledir}
-%{yast_moduledir}/Mail.rb
-%dir %{yast_desktopdir}
-%{yast_desktopdir}/mail.desktop
-%dir %{yast_schemadir}/autoyast/rnc
-%{yast_schemadir}/autoyast/rnc/mail.rnc
-%{yast_scrconfdir}/*
-%dir %{yast_agentdir}
-%{yast_agentdir}/ag_fetchmailrc
-%{yast_agentdir}/ag_mailconfig
-%{yast_agentdir}/ag_mail_ldaptable
-%{yast_agentdir}/ag_mailtable
-%{yast_agentdir}/ag_smtp_auth
-%{yast_agentdir}/MasterCFParser.pm
-%{yast_agentdir}/ag_fetchmailrc
-%{yast_agentdir}/ag_mailtable
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
+%{yast_scrconfdir}
+%{yast_agentdir}
%attr(0755,root,root) %{yast_agentdir}/setup_dkim_verifying.pl
-
-%dir /etc/openldap/
-%dir /etc/openldap/schema/
-/etc/openldap/schema/suse-mailserver.schema
+%{_sysconfdir}/openldap/
%doc %{yast_docdir}
%license COPYING
%{yast_icondir}
-
%{_fillupdir}/sysconfig.mail
%changelog
++++++ yast2-mail-4.1.0.tar.bz2 -> yast2-mail-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/.travis.yml new/yast2-mail-4.2.1/.travis.yml
--- old/yast2-mail-4.1.0/.travis.yml 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/.travis.yml 2019-06-07 15:27:31.000000000 +0200
@@ -8,4 +8,4 @@
script:
# the "yast-travis-ruby" script is included in the base yastdevel/ruby image
# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
- - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-mail-image yast-travis-ruby
+ - docker run -it --rm -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e PERL5LIB=./src/servers_non_y2 yast-mail-image yast-travis-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/Dockerfile new/yast2-mail-4.2.1/Dockerfile
--- old/yast2-mail-4.1.0/Dockerfile 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/Dockerfile 2019-06-07 15:27:31.000000000 +0200
@@ -1,3 +1,3 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/package/yast2-mail.changes new/yast2-mail-4.2.1/package/yast2-mail.changes
--- old/yast2-mail-4.1.0/package/yast2-mail.changes 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/package/yast2-mail.changes 2019-06-07 15:27:31.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Jun 6 12:35:42 UTC 2019 - Peter Varkoly
+
+- bsc#105491 setup of postfix with amavis DKIM signing does noti
+ work at all. The dkim setup script was rewritten.
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:33:17 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Sat Nov 24 20:01:16 UTC 2018 - Stasiek Michalski
- Provide icon with module (boo#1109310)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/package/yast2-mail.spec new/yast2-mail-4.2.1/package/yast2-mail.spec
--- old/yast2-mail-4.1.0/package/yast2-mail.spec 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/package/yast2-mail.spec 2019-06-07 15:27:31.000000000 +0200
@@ -12,19 +12,22 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-mail
-Version: 4.1.0
+Version: 4.2.1
Release: 0
+Summary: YaST2 - Mail Configuration
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-mail
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
PreReq: %fillup_prereq
@@ -33,60 +36,41 @@
Requires: yast2 >= 4.0.39
Requires: yast2-ldap
Requires: yast2-users
-BuildArch: noarch
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - Mail Configuration
-License: GPL-2.0-or-later
-Group: System/YaST
+BuildArch: noarch
%description
The YaST2 component for mail configuration. It handles Postfix, Cyrus,
Amavis and Fetchmail.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%post
%{fillup_only -n mail}
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/mail
-%{yast_yncludedir}/mail/*
-%dir %{yast_clientdir}
-%{yast_clientdir}/mail*
-%dir %{yast_moduledir}
-%{yast_moduledir}/Mail.rb
-%dir %{yast_desktopdir}
-%{yast_desktopdir}/mail.desktop
-%dir %{yast_schemadir}/autoyast/rnc
-%{yast_schemadir}/autoyast/rnc/mail.rnc
-%{yast_scrconfdir}/*
-%dir %{yast_agentdir}
-%{yast_agentdir}/ag_fetchmailrc
-%{yast_agentdir}/ag_mailconfig
-%{yast_agentdir}/ag_mail_ldaptable
-%{yast_agentdir}/ag_mailtable
-%{yast_agentdir}/ag_smtp_auth
-%{yast_agentdir}/MasterCFParser.pm
-%{yast_agentdir}/ag_fetchmailrc
-%{yast_agentdir}/ag_mailtable
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
+%{yast_scrconfdir}
+%{yast_agentdir}
%attr(0755,root,root) %{yast_agentdir}/setup_dkim_verifying.pl
-
-%dir /etc/openldap/
-%dir /etc/openldap/schema/
-/etc/openldap/schema/suse-mailserver.schema
+%{_sysconfdir}/openldap/
%doc %{yast_docdir}
%license COPYING
%{yast_icondir}
-
%{_fillupdir}/sysconfig.mail
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/src/Makefile.am new/yast2-mail-4.2.1/src/Makefile.am
--- old/yast2-mail-4.1.0/src/Makefile.am 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/src/Makefile.am 2019-06-07 15:27:31.000000000 +0200
@@ -46,7 +46,7 @@
autoyast-rnc/mail.rnc
desktop_DATA = \
- desktop/mail.desktop
+ desktop/org.opensuse.yast.Mail.desktop
fillup_DATA = \
fillup/sysconfig.mail
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/src/desktop/mail.desktop new/yast2-mail-4.2.1/src/desktop/mail.desktop
--- old/yast2-mail-4.1.0/src/desktop/mail.desktop 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/src/desktop/mail.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=mail
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstSchema=mail.rnc
-X-SuSE-YaST-Keywords=network,internet
-
-Icon=yast-mail
-Exec=xdg-su -c "/sbin/yast2 mail"
-
-Name=Mail Server
-GenericName=Configure mail
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/src/desktop/org.opensuse.yast.Mail.desktop new/yast2-mail-4.2.1/src/desktop/org.opensuse.yast.Mail.desktop
--- old/yast2-mail-4.1.0/src/desktop/org.opensuse.yast.Mail.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-mail-4.2.1/src/desktop/org.opensuse.yast.Mail.desktop 2019-06-07 15:27:31.000000000 +0200
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=mail
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=mail.rnc
+X-SuSE-YaST-Keywords=network,internet
+
+Icon=yast-mail
+Exec=xdg-su -c "/sbin/yast2 mail"
+
+Name=YaST Mail Server
+GenericName=Mail Server
+Comment=Configure your Mail Server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/src/include/mail/ui.rb new/yast2-mail-4.2.1/src/include/mail/ui.rb
--- old/yast2-mail-4.1.0/src/include/mail/ui.rb 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/src/include/mail/ui.rb 2019-06-07 15:27:31.000000000 +0200
@@ -1476,7 +1476,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("mail")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Mail")
# the second map must override the first!
sequence = Builtins.union(@common_sequence, sequence)
@@ -1504,7 +1504,7 @@
contents = Label(_("Initializing..."))
Wizard.CreateDialog
- Wizard.SetDesktopIcon("mail")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Mail")
Wizard.SetContentsButtons(
caption,
contents,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-4.1.0/src/servers_non_y2/setup_dkim_verifying.pl new/yast2-mail-4.2.1/src/servers_non_y2/setup_dkim_verifying.pl
--- old/yast2-mail-4.1.0/src/servers_non_y2/setup_dkim_verifying.pl 2018-11-28 15:15:38.000000000 +0100
+++ new/yast2-mail-4.2.1/src/servers_non_y2/setup_dkim_verifying.pl 2019-06-07 15:27:31.000000000 +0200
@@ -24,121 +24,31 @@
open IN, "/ )
{
- my $dkim = "dkim_key('$DOMAIN', 'default', '/var/db/dkim/$DOMAIN.pem');";
- if( ! /$dkim/ )
- {
- $amavisd .= "$dkim\n$_";
- }
- $enable_dkim_signing = 0;
- next;
- }
- $amavisd .= $_;
-}
-close IN;
-system("cp /etc/amavisd.conf /etc/amavisd.conf.backup");
-open OUT, ">/etc/amavisd.conf";
-print OUT $amavisd;
-close OUT;
-
-#Now we adapt master.cf
-my $msc = new MasterCFParser();
-$msc->readMasterCF();
-
-if( ! $msc->serviceExists( { service => 'submission' , command => 'smtpd' } ))
-{
- if( $msc->addService( { 'service' => 'submission',
- 'type' => 'inet',
- 'private' => 'n',
- 'unpriv' => '-',
- 'chroot' => 'n',
- 'wakeup' => '-',
- 'maxproc' => '-',
- 'command' => 'smtpd',
- 'options' => { 'content_filte' => 'amavis:[127.0.0.1]:10026',
- 'smtpd_recipient_restrictions' => 'permit_sasl_authenticated,permit_mynetworks,reject' }
- }) )
- {
- print "ERROR in addService()\n";
- }
-}
-else
-{
- if( $msc->modifyService( { 'service' => 'submission',
- 'type' => 'inet',
- 'private' => 'n',
- 'unpriv' => '-',
- 'chroot' => 'n',
- 'wakeup' => '-',
- 'maxproc' => '-',
- 'command' => 'smtpd',
- 'options' => { 'content_filte' => 'amavis:[127.0.0.1]:10026',
- 'smtpd_recipient_restrictions' => 'permit_sasl_authenticated,permit_mynetworks,reject' }
- }) )
- {
- print "ERROR in modifyService()\n";
- }
-}
-
-$msc->writeMasterCF();
-#!/usr/bin/perl
-
-BEGIN { push @INC, "/usr/lib/YaST2/servers_non_y2"; }
-
-use strict;
-use MasterCFParser;
-my $DOMAIN=`postconf -h mydomain`;
-chomp $DOMAIN;
-
-if( ! "$DOMAIN" ) {
- print "Bad postfix configuration. mydomain can not be detected";
- exit 1;
-}
-
-#Generate the key
-if( ! -e "/var/db/dkim/$DOMAIN.pem" ){
- print "Creating /var/db/dkim/$DOMAIN.pem\n";
- system( "mkdir -p /var/db/dkim/; amavisd genrsa /var/db/dkim/$DOMAIN.pem");
-}
-
-#Introduce key into /etc/amavisd.conf
-my $amavisd = "";
-my $enable_dkim_signing = 0;
-open IN, " '-',
'maxproc' => '-',
'command' => 'smtpd',
- 'options' => { 'content_filte' => 'amavis:[127.0.0.1]:10026',
+ 'options' => { 'content_filter' => 'amavis:[127.0.0.1]:10026',
'smtpd_recipient_restrictions' => 'permit_sasl_authenticated,permit_mynetworks,reject' }
}) )
{
@@ -179,7 +89,7 @@
'wakeup' => '-',
'maxproc' => '-',
'command' => 'smtpd',
- 'options' => { 'content_filte' => 'amavis:[127.0.0.1]:10026',
+ 'options' => { 'content_filter' => 'amavis:[127.0.0.1]:10026',
'smtpd_recipient_restrictions' => 'permit_sasl_authenticated,permit_mynetworks,reject' }
}) )
{
@@ -187,4 +97,4 @@
}
}
-$msc->wramavisiteMasterCF();
+$msc->writeMasterCF();