Hello community, here is the log from the commit of package mailx for openSUSE:Factory checked in at 2018-06-15 14:35:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailx (Old) and /work/SRC/openSUSE:Factory/.mailx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailx" Fri Jun 15 14:35:15 2018 rev:39 rq:615953 version:12.5 Changes: -------- --- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2017-06-17 10:17:29.826236179 +0200 +++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2018-06-15 14:35:17.740439181 +0200 @@ -1,0 +2,12 @@ +Sun Jun 10 23:54:07 UTC 2018 - [email protected] + +- Remove redundant %clean section. +- Replace old $RPM_* shell vars by macros. + +------------------------------------------------------------------- +Thu Jun 7 09:35:26 UTC 2018 - [email protected] + +- Use update-alternatives to allow an other package like mailutils + to provide /usr/bin/mail as well + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailx.spec ++++++ --- /var/tmp/diff_new_pack.DgUmkO/_old 2018-06-15 14:35:18.524410506 +0200 +++ /var/tmp/diff_new_pack.DgUmkO/_new 2018-06-15 14:35:18.524410506 +0200 @@ -1,7 +1,7 @@ # # spec file for package mailx # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -24,14 +24,17 @@ BuildRequires: pcre BuildRequires: pkg-config BuildRequires: postfix +BuildRequires: update-alternatives BuildRequires: pkgconfig(openssl) +Requires(post): update-alternatives +Requires(preun): update-alternatives Url: http://heirloom.sourceforge.net/mailx.html Provides: mail Recommends: smtp_daemon Version: 12.5 Release: 0 Summary: A MIME-Capable Implementation of the mailx Command -License: BSD-4-Clause and MPL-1.1 +License: BSD-4-Clause AND MPL-1.1 Group: Productivity/Networking/Email/Utilities Source: mailx-%{version}.tar.bz2 Patch: mailx-%{version}.dif @@ -83,33 +86,47 @@ %build CC=gcc - CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN $(pkg-config --cflags openssl)" + CFLAGS="%{optflags} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN $(pkg-config --cflags openssl)" export CC CFLAGS $SHELL ./makeconfig - make %{?jobs:-j%jobs} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS" + make %{?_smp_mflags} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS" tbl < mailx.1 | groff -mandocdb -Tps | grep -v %%%%CreationDate > manual.ps gzip -9fn manual.ps %install - make install PREFIX=/usr DESTDIR=${RPM_BUILD_ROOT} - rm -rf ${RPM_BUILD_ROOT}/bin - mkdir ${RPM_BUILD_ROOT}/bin - ln -sf ../usr/bin/mailx ${RPM_BUILD_ROOT}/bin/mail - ln -sf mailx ${RPM_BUILD_ROOT}/usr/bin/Mail - ln -sf mailx ${RPM_BUILD_ROOT}/usr/bin/mail - ln -sf mailx.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/Mail.1.gz - ln -sf mailx.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/mail.1.gz - install -m 0644 mail.rc ${RPM_BUILD_ROOT}/etc - mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name} + %make_install PREFIX=/usr + rm -rf %{buildroot}/bin + mkdir %{buildroot}/bin + ln -sf ../usr/bin/mailx %{buildroot}/bin/mail + ln -sf mailx %{buildroot}/usr/bin/Mail + ln -sf mailx %{buildroot}/usr/bin/mail + ln -sf mailx.1.gz %{buildroot}%{_mandir}/man1/Mail.1.gz + ln -sf mailx.1.gz %{buildroot}%{_mandir}/man1/mail.1.gz + install -m 0644 mail.rc %{buildroot}/etc + mkdir -p %{buildroot}%{_defaultdocdir}/%{name} + +%post +%{_sbindir}/update-alternatives --quiet --force \ + --install %{_bindir}/mail mail %{_bindir}/mailx 20 \ + --slave /bin/mail binmail %{_bindir}/mailx \ + --slave %{_bindir}/Mail Mail %{_bindir}/mailx \ + --slave %{_mandir}/man1/mail.1%{?ext_man} mail.1%{?ext_man} %{_mandir}/man1/mailx.1%{?ext_man} \ + --slave %{_mandir}/man1/Mail.1%{?ext_man} Mail.1%{?ext_man} %{_mandir}/man1/mailx.1%{?ext_man} -%clean - rm -rf $RPM_BUILD_ROOT +%preun +%{_sbindir}/update-alternatives --quiet --force --remove mail %{_bindir}/mu-mail %files %defattr(-,root,root) -%doc COPYING README manual.ps.gz nail.rc +%license COPYING +%doc README manual.ps.gz nail.rc /bin/mail %config /etc/mail.rc +%ghost %config %{_sysconfdir}/alternatives/binmail +%ghost %config %{_sysconfdir}/alternatives/Mail +%ghost %config %{_sysconfdir}/alternatives/mail +%ghost %config %{_sysconfdir}/alternatives/Mail.1%{?ext_man} +%ghost %config %{_sysconfdir}/alternatives/mail.1%{?ext_man} /usr/bin/Mail /usr/bin/mail /usr/bin/mailx ++++++ mailx-12.5-openssl-1.1.0f.patch ++++++ --- /var/tmp/diff_new_pack.DgUmkO/_old 2018-06-15 14:35:18.572408750 +0200 +++ /var/tmp/diff_new_pack.DgUmkO/_new 2018-06-15 14:35:18.572408750 +0200 @@ -1,9 +1,31 @@ --- + mailx.1 | 5 +++++ openssl.c | 29 ++++++++++++++++++++++++++--- - 1 file changed, 26 insertions(+), 3 deletions(-) + 2 files changed, 31 insertions(+), 3 deletions(-) +--- mailx.1 ++++ mailx.1 2017-06-13 10:10:21.024015088 +0000 +@@ -2723,6 +2723,8 @@ Only applicable if SSL/TLS support is bu + Accept SSLv2 connections. + These are normally not allowed + because this protocol version is insecure. ++.br ++.B WARNING: on modern systems SSLv2 as well as SSLv3 are deprecated! + .TP + .B stealthmua + Inhibits the generation of +@@ -3609,6 +3611,9 @@ for a specific account. + Gives the pathname to an entropy daemon socket, + see + .IR RAND_egd (3). ++.br ++.B WARNING: On Linux this API is ignored, use the string option ++.B ssl-rand-file. + .TP + .B ssl-rand-file + Gives the pathname to a file with entropy data, --- openssl.c -+++ openssl.c 2017-06-12 12:57:43.048652634 +0200 ++++ openssl.c 2017-06-13 10:05:15.133697760 +0000 @@ -138,7 +138,12 @@ ssl_rand_init(void) if ((cp = value("ssl-rand-egd")) != NULL) {
