Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2017-02-28 23:43:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spamassassin" Tue Feb 28 23:43:15 2017 rev:68 rq:460544 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2017-02-21 13:31:14.438032136 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2017-02-28 23:43:16.375066899 +0100 @@ -1,0 +2,6 @@ +Sun Feb 26 13:38:51 UTC 2017 - [email protected] + +- SPAMPD: add spampd-2.42_git_20170226.patch - support IPv6 with IO::Socket::IP +- Drop old init system support (systems before 12.x) + +------------------------------------------------------------------- Old: ---- init.spamd init.spampd New: ---- spampd-2.42_git_20170226.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.9saUH1/_old 2017-02-28 23:43:17.266941011 +0100 +++ /var/tmp/diff_new_pack.9saUH1/_new 2017-02-28 23:43:17.266941011 +0100 @@ -37,9 +37,7 @@ Source2: %{IXHASH}.tar.gz Source3: %{SPAMPD}.tar.bz2 Source10: local.cf -Source11: init.spamd Source12: sysconfig.spamd -Source13: init.spampd Source14: sysconfig.spampd Source15: suse.cron-sa-update Source16: spamd.service @@ -48,12 +46,10 @@ Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff +Patch7: spampd-2.42_git_20170226.patch Patch10: iXhash2-meta-rules.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} -%if %suse_version <= 1140 -PreReq: %insserv_prereq -%endif PreReq: %fillup_prereq BuildRequires: dos2unix BuildRequires: openssl-devel @@ -63,10 +59,8 @@ Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) -%if 0%{?suse_version} > 1140 BuildRequires: systemd %{?systemd_requires} -%endif %description spamassassin adds a header line that shows if the mail has been @@ -83,9 +77,6 @@ Group: Development/Libraries/Perl BuildRequires: perl BuildRequires: perl-Error -%if 0%{?suse_version} && 0%{?suse_version} <= 1210 -BuildRequires: perl-macros -%endif BuildRequires: perl(Archive::Tar) >= 1.23 BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Errno) @@ -101,14 +92,12 @@ BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) -%if 0%{?suse_version} >= 1100 -BuildRequires: perl(Mail::SPF) -%endif BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::SSL) BuildRequires: perl(IP::Country) +BuildRequires: perl(Mail::SPF) BuildRequires: perl(Net::Ident) BuildRequires: perl(Razor2::Client::Agent) >= 2.61 # @@ -119,10 +108,7 @@ Requires: perl(File::Copy) >= 2.02 Requires: perl(File::Spec) >= 0.8 Requires: perl(HTML::Parser) >= 3.43 -%if 0%{?suse_version} > 1210 -# Required perl(Socket) version 1.97+ is only available in 12.2+ Requires: perl(IO::Socket::IP) -%endif Requires: perl(IO::Zlib) >= 1.04 Requires: perl(Mail::DKIM) >= 0.37 Requires: perl(Net::DNS) >= 0.34 @@ -132,9 +118,7 @@ Requires: perl(Time::HiRes) Requires: perl(Time::Local) # optional -%if 0%{?suse_version} >= 1100 Recommends: perl(Mail::SPF) -%endif Recommends: perl(Net::Patricia) Recommends: perl(Razor2::Client::Agent) >= 2.61 Recommends: perl(IO::Socket::INET6) @@ -177,6 +161,7 @@ %patch2 -p1 %patch3 -p0 %patch6 -p0 +%patch7 -p0 %patch10 -p0 %build @@ -222,15 +207,8 @@ %{__install} -D -m0755 %{SPAMPD}/spampd.pl $RPM_BUILD_ROOT%{_sbindir}/spampd mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ %{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf -%if 0%{?suse_version} > 1140 %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd -%else -%{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd -%{__install} -m 0755 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd -%{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd -%{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd -%endif echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE %{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd %{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ @@ -241,46 +219,28 @@ %{__install} -d $RPM_BUILD_ROOT/usr/share/spamassassin pushd $RPM_BUILD_ROOT/usr/share/spamassassin && tar -xjf %{S:1} && popd -%if 0%{?suse_version} > 1140 ## systemd stuff mkdir -p %{buildroot}/%{_unitdir} %{__install} -D -m 644 %{S:16} %{buildroot}/%{_unitdir} %{__install} -D -m 644 %{S:17} %{buildroot}/%{_unitdir} -%endif %post -%if %suse_version > 1140 %service_add_post spamd.service %service_add_post spampd.service %{fillup_only -n spamd} %{fillup_only -n spampd} -%else -%{fillup_and_insserv -n spamd} -%{fillup_and_insserv -n spampd} -%endif %pre -%if %suse_version > 1140 %service_add_pre spamd.service %service_add_pre spampd.service -%endif %preun -%if %suse_version > 1140 %service_del_preun spamd.service %service_del_preun spampd.service -%else -%stop_on_removal spamd -%endif %postun -%if %suse_version > 1140 %service_del_postun spamd.service %service_del_postun spampd.service -%else -%restart_on_update spamd -%insserv_cleanup -%endif %files %defattr(-,root,root) @@ -290,13 +250,8 @@ %{_sbindir}/* /var/adm/fillup-templates/sysconfig.spamd /var/adm/fillup-templates/sysconfig.spampd -%if 0%{?suse_version} > 1140 %{_unitdir}/spamd.service %{_unitdir}/spampd.service -%else -%config %attr(744,root,root) /etc/init.d/spamd -%config %attr(744,root,root) /etc/init.d/spampd -%endif %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) ++++++ spampd-2.42_git_20170226.patch ++++++ diff -ur spampd-2.42/spampd.html spampd-2.42_20170226/spampd.html --- spampd-2.42.orig/spampd.html 2013-12-08 12:34:02.000000000 +0100 +++ spampd-2.42/spampd.html 2015-10-18 01:22:58.000000000 +0200 @@ -96,7 +96,7 @@ <DD> <DT><STRONG><A NAME="item_IO%3A%3AFile"><STRONG>IO::File</STRONG></A></STRONG><BR> <DD> -<DT><STRONG><A NAME="item_IO%3A%3ASocket"><STRONG>IO::Socket</STRONG></A></STRONG><BR> +<DT><STRONG><A NAME="item_IO%3A%3ASocket"><STRONG>IO::Socket::IP</STRONG></A></STRONG><BR> <DD> <DT><STRONG><A NAME="item_HiRes"><STRONG>Time::HiRes</STRONG> (not actually required but recommended)</A></STRONG><BR> <DD> diff -ur spampd-2.42/spampd.pl spampd-2.42_20170226/spampd.pl --- spampd-2.42/spampd.pl 2013-12-08 12:34:02.000000000 +0100 +++ spampd-2.42_20170226/spampd.pl 2015-10-18 01:22:58.000000000 +0200 @@ -307,19 +307,19 @@ # =cut use strict; -use IO::Socket; +use IO::Socket::IP; # =item new(interface => $interface, port => $port[, timeout = 300]); # # The interface and port to talk to must be specified. The interface # must be a valid numeric IP address; the port must be numeric. If # this call succeeds, it returns a client structure with an open -# IO::Socket::INET in it, ready to talk to. If it fails it dies, +# IO::Socket::IP in it, ready to talk to. If it fails it dies, # so if you want anything other than an exit with an explanatory # error message, wrap the constructor call in an eval block and pull # the error out of $@ as usual. This is also the case for all other # methods; they succeed or they die. The timeout parameter is passed -# on into the IO::Socket::INET constructor. +# on into the IO::Socket::IP constructor. # # =cut @@ -327,7 +327,7 @@ my ($this, @opts) = @_; my $class = ref($this) || $this; my $self = bless { timeout => 300, @opts }, $class; - $self->{sock} = IO::Socket::INET->new( + $self->{sock} = IO::Socket::IP->new( PeerAddr => $self->{interface}, PeerPort => $self->{port}, Timeout => $self->{timeout}, @@ -1171,7 +1171,7 @@ =item B<IO::File> -=item B<IO::Socket> +=item B<IO::Socket::IP> =item B<Time::HiRes> (not actually required but recommended)
