commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2018-11-20 22:30:36
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new.19453 (New)
Package is "mailx"
Tue Nov 20 22:30:36 2018 rev:41 rq:650161 version:12.5
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2018-11-18
23:19:52.638363075 +0100
+++ /work/SRC/openSUSE:Factory/.mailx.new.19453/mailx.changes 2018-11-20
22:30:47.270656663 +0100
@@ -1,0 +2,5 @@
+Mon Nov 19 09:47:38 UTC 2018 - Dr. Werner Fink
+
+- Repair ghost links used by update-alternatives
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.tEIqER/_old 2018-11-20 22:30:49.798655128 +0100
+++ /var/tmp/diff_new_pack.tEIqER/_new 2018-11-20 22:30:49.806655122 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -96,11 +96,18 @@
%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
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+ln -sf %{_sysconfdir}/alternatives/binmail %{buildroot}/bin/mail
+ln -sf %{_sysconfdir}/alternatives/Mail%{buildroot}/usr/bin/Mail
+ln -sf %{_sysconfdir}/alternatives/mail%{buildroot}/usr/bin/mail
+ln -sf %{_sysconfdir}/alternatives/Mail.1%{?ext_man}
%{buildroot}%{_mandir}/man1/Mail.1%{?ext_man}
+ln -sf %{_sysconfdir}/alternatives/mail.1%{?ext_man}
%{buildroot}%{_mandir}/man1/mail.1%{?ext_man}
+#
+ln -sf %{_bindir}/mailx %{buildroot}%{_sysconfdir}/alternatives/binmail
+ln -sf %{_bindir}/mailx %{buildroot}%{_sysconfdir}/alternatives/Mail
+ln -sf %{_bindir}/mailx %{buildroot}%{_sysconfdir}/alternatives/mail
+ln -sf %{_mandir}/man1/mailx.1%{?ext_man}
%{buildroot}%{_sysconfdir}/alternatives/Mail.1%{?ext_man}
+ln -sf %{_mandir}/man1/mailx.1%{?ext_man}
%{buildroot}%{_sysconfdir}/alternatives/mail.1%{?ext_man}
install -m 0644 mail.rc %{buildroot}/etc
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
@@ -113,7 +120,9 @@
--slave %{_mandir}/man1/Mail.1%{?ext_man} Mail.1%{?ext_man}
%{_mandir}/man1/mailx.1%{?ext_man}
%preun
-%{_sbindir}/update-alternatives --quiet --force --remove mail
%{_bindir}/mu-mail
+if test ! -e %{_bindir}/mailx; then
+ %{_sbindir}/update-alternatives --quiet --force --remove mail
%{_bindir}/mailx
+fi
%files
%defattr(-,root,root)
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2018-11-18 23:19:38
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Sun Nov 18 23:19:38 2018 rev:40 rq:648674 version:12.5
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2018-06-15
14:35:17.740439181 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2018-11-18
23:19:52.638363075 +0100
@@ -1,0 +2,17 @@
+Wed Oct 31 18:30:32 UTC 2018 - Cristian RodrÃguez
+
+- Updates to mailx-12.5-openssl-1.1.0f.patch
+ * If the openssl RNG is already
+ seeded (on linux it always is) skip snake-oil reeseeding from
+ file. Update man page accordingly.
+ * Update man page with information that ssl2 and ssl3 are
+ not only deprecated but currently unavailable and that
+ tls1 forces TLS 1.0 but not later versions.
+ * RAND_EGD is also unavailable, not just unused.
+ * set SSL_OP_NO_TICKET, many servers accept session
+ tickets, but almost never rotate them properly, TLS 1.3
+ session tickets are not affected by this flag.
+ * When using client certificates, check if the cert and key
+ match each other.
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.FKQvSD/_old 2018-11-18 23:19:54.342361217 +0100
+++ /var/tmp/diff_new_pack.FKQvSD/_new 2018-11-18 23:19:54.346361212 +0100
@@ -12,7 +12,7 @@
# 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/
#
@@ -20,7 +20,6 @@
BuildRequires: groff
BuildRequires: krb5-devel
BuildRequires: man
-BuildRequires: openssl-devel
BuildRequires: pcre
BuildRequires: pkg-config
BuildRequires: postfix
++ mailx-12.5-openssl-1.1.0f.patch ++
--- /var/tmp/diff_new_pack.FKQvSD/_old 2018-11-18 23:19:54.394361161 +0100
+++ /var/tmp/diff_new_pack.FKQvSD/_new 2018-11-18 23:19:54.394361161 +0100
@@ -3,30 +3,57 @@
openssl.c | 29 ++---
2 files changed, 31 insertions(+), 3 deletions(-)
mailx.1
-+++ mailx.12017-06-13 10:10:21.024015088 +
+Index: mailx.1
+===
+--- mailx.1.orig
mailx.1
@@ -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!
++.B WARNING: on modern systems SSLv2 as well as SSLv3 are unavailable!
.TP
.B stealthmua
Inhibits the generation of
-@@ -3609,6 +3611,9 @@ for a specific account.
+@@ -3599,6 +3601,8 @@ Selects a SSL/TLS protocol version;
+ valid values are `ssl2', `ssl3', and `tls1'.
+ If unset, the method is selected automatically,
+ if possible.
++.br
++.B WARNING: Do not use this option. 'ssl2', 'ssl3' are no longer available
and 'tls1' forces use of TLS 1.0
+ .TP
+ \fBssl-method-\fIuser\fB@\fIhost\fR
+ Overrides
+@@ -3609,6 +3613,8 @@ 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.
++.B WARNING: On Linux this API is unavailable.
.TP
.B ssl-rand-file
Gives the pathname to a file with entropy data,
openssl.c
-+++ openssl.c 2017-06-13 10:05:15.133697760 +
-@@ -138,7 +138,12 @@ ssl_rand_init(void)
+@@ -3617,6 +3623,8 @@ see
+ If the file is a regular file writable by the invoking user,
+ new data is written to it after it has been loaded.
+ Only applicable if SSL/TLS support is built using OpenSSL.
++.br
++.B WARNING: On linux the CSPRNG is seeded automatically and this option has
no effect.
+ .TP
+ .B ssl-verify
+ Sets the action to be performed if an error occurs
+Index: openssl.c
+===
+--- openssl.c.orig
openssl.c
+@@ -135,10 +135,18 @@ ssl_rand_init(void)
+ {
+ char *cp;
+ int state = 0;
++
++ if(RAND_status())
++ return 1;
if ((cp = value("ssl-rand-egd")) != NULL) {
cp = expand(cp);
@@ -40,7 +67,7 @@
fprintf(stderr, catgets(catd, CATSET, 245,
"entropy daemon at \"%s\" not available\n"),
cp);
-@@ -221,12 +226,13 @@ ssl_select_method(const char *uhp)
+@@ -221,12 +229,13 @@ ssl_select_method(const char *uhp)
commit mailx for openSUSE:Factory
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 - jeng...@inai.de
+
+- Remove redundant %clean section.
+- Replace old $RPM_* shell vars by macros.
+
+---
+Thu Jun 7 09:35:26 UTC 2018 - wer...@suse.de
+
+- 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 +
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2017-06-17 10:17:28
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Sat Jun 17 10:17:28 2017 rev:38 rq:503073 version:12.5
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2017-05-20
10:07:06.743419910 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2017-06-17
10:17:29.826236179 +0200
@@ -1,0 +2,6 @@
+Mon Jun 12 11:11:38 UTC 2017 - wer...@suse.de
+
+- Add patch mailx-12.5-openssl-1.1.0f.patch
+ Avoid deprecated/unavailable openSSL client methods (boo#1042663)
+
+---
New:
mailx-12.5-openssl-1.1.0f.patch
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.7zask3/_old 2017-06-17 10:17:30.578130115 +0200
+++ /var/tmp/diff_new_pack.7zask3/_new 2017-06-17 10:17:30.582129551 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mailx
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,7 +22,9 @@
BuildRequires: man
BuildRequires: openssl-devel
BuildRequires: pcre
+BuildRequires: pkg-config
BuildRequires: postfix
+BuildRequires: pkgconfig(openssl)
Url:http://heirloom.sourceforge.net/mailx.html
Provides: mail
Recommends: smtp_daemon
@@ -51,6 +53,8 @@
Patch11:0003-fio.c-Unconditionally-require-wordexp-support.patch
#PATCH-FIX-SUSE: bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell
command injection via crafted email addresses
Patch12:0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch
+#PATCH-FIX-SUSE: bsc#1042663 -- mailx fails to build with openssl-1.1
+Patch13:mailx-12.5-openssl-1.1.0f.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -74,11 +78,12 @@
%patch10 -p1 -b .0002
%patch11 -p1 -b .0003
%patch12 -p1 -b .0004
-%patch -p0 -b .0
+%patch13 -p0 -b .ssl11f
+%patch -p1 -b .0
%build
CC=gcc
-CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN"
+CFLAGS="${RPM_OPT_FLAGS} -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"
++ mailx-12.5-openssl-1.1.0f.patch ++
---
openssl.c | 29 ++---
1 file changed, 26 insertions(+), 3 deletions(-)
--- openssl.c
+++ openssl.c 2017-06-12 12:57:43.048652634 +0200
@@ -138,7 +138,12 @@ ssl_rand_init(void)
if ((cp = value("ssl-rand-egd")) != NULL) {
cp = expand(cp);
- if (RAND_egd(cp) == -1) {
+#ifndef OPENSSL_NO_EGD
+ if (RAND_egd(cp) == -1)
+#else
+ if (1)
+#endif
+ {
fprintf(stderr, catgets(catd, CATSET, 245,
"entropy daemon at \"%s\" not available\n"),
cp);
@@ -221,12 +226,13 @@ ssl_select_method(const char *uhp)
cp = ssl_method_string(uhp);
if (cp != NULL) {
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL
#ifndef OPENSSL_NO_SSL2
if (equal(cp, "ssl2"))
method = SSLv2_client_method();
else
-#endif
-if (equal(cp, "ssl3"))
+#endif
+ if (equal(cp, "ssl3"))
method = SSLv3_client_method();
else if (equal(cp, "tls1"))
method = TLSv1_client_method();
@@ -235,8 +241,25 @@ ssl_select_method(const char *uhp)
"Invalid SSL method \"%s\"\n"), cp);
method = SSLv23_client_method();
}
+#else
+ method = NULL;
+ if (equal(cp, "tls"))
+ method = TLS_client_method();
+ else if (equal(cp, "dtls"))
+ method = DTLS_client_method();
+
+ if (!method) {
+ fprintf(stderr, catgets(catd, CATSET, 244,
+ "Invalid SSL method \"%s\"\n"), cp);
+ method = TLS_client_method();
+ }
+#endif
} else
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL
method = SSLv23_client_method();
+#else
+ method = TLS_client_method();
+#endif
return
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2017-05-20 10:07:01
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Sat May 20 10:07:01 2017 rev:37 rq:494520 version:12.5
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2016-04-30
23:27:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2017-05-20
10:07:06.743419910 +0200
@@ -1,0 +2,6 @@
+Sat Apr 29 18:56:02 UTC 2017 - bwiedem...@suse.com
+
+- call gzip -n and drop CreationDate from manual.ps
+ to make build fully reproducible
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.FbhwR6/_old 2017-05-20 10:07:09.211071230 +0200
+++ /var/tmp/diff_new_pack.FbhwR6/_new 2017-05-20 10:07:09.211071230 +0200
@@ -82,8 +82,8 @@
export CC CFLAGS
$SHELL ./makeconfig
make %{?jobs:-j%jobs} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS"
-tbl < mailx.1 | groff -mandocdb -Tps > manual.ps
-gzip -9f manual.ps
+tbl < mailx.1 | groff -mandocdb -Tps | grep -v CreationDate > manual.ps
+gzip -9fn manual.ps
%install
make install PREFIX=/usr DESTDIR=${RPM_BUILD_ROOT}
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2016-04-30 23:27:32
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2015-03-19
20:48:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2016-04-30
23:27:33.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 8 15:02:17 UTC 2016 - wer...@suse.de
+
+- Correct parenthese expansion to fulfill natural order (bnc#974561)
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.Ldf55V/_old 2016-04-30 23:27:34.0 +0200
+++ /var/tmp/diff_new_pack.Ldf55V/_new 2016-04-30 23:27:34.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mailx
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
++ mailx-12.5-mime.dif ++
--- /var/tmp/diff_new_pack.Ldf55V/_old 2016-04-30 23:27:34.0 +0200
+++ /var/tmp/diff_new_pack.Ldf55V/_new 2016-04-30 23:27:34.0 +0200
@@ -1,5 +1,11 @@
+---
+ def.h |4 +
+ mime.c| 144
++
+ sendout.c | 40 +
+ 3 files changed, 172 insertions(+), 16 deletions(-)
+
--- def.h
-+++ def.h 2012-03-23 13:57:44.0 +
def.h 2016-04-08 14:58:42.729798789 +
@@ -142,7 +142,9 @@ enum mimeclean {
MIME_LONGLINES = 002, /* has lines too long for RFC 2822 */
MIME_CTRLCHAR = 004, /* contains control characters */
@@ -12,7 +18,7 @@
enum tdflags {
--- mime.c
-+++ mime.c 2013-07-02 10:25:35.0 +
mime.c 2016-04-08 15:00:05.808259514 +
@@ -302,13 +302,78 @@ gettcharset(void)
return t;
}
@@ -101,7 +107,7 @@
if (w & GIDENT) {
if (hp->h_from && name_highbit(hp->h_from))
goto needs;
-@@ -355,7 +422,7 @@ need_hdrconv(struct header *hp, enum gfi
+@@ -355,7 +421,7 @@ need_hdrconv(struct header *hp, enum gfi
if (w & GSUBJECT && has_highbit(hp->h_subject))
goto needs;
return NULL;
@@ -128,7 +134,7 @@
match = 1;
break;
}
-@@ -748,16 +814,66 @@ mime_isclean(FILE *f)
+@@ -748,14 +814,62 @@ mime_isclean(FILE *f)
maxlen = curlen;
curlen = 1;
} else if (c & 0200) {
@@ -172,10 +178,8 @@
+ continue;
+ }
+ latin:
-+ if (text_chars[i & 0377] == I) {
++ if (text_chars[i & 0377] == I)
+ isclean |= MIME_LATIN;
-+ continue;
-+ }
+ if (text_chars[i & 0377] == X) {
+ isclean |= MIME_CTRLCHAR;
+ break;
@@ -189,14 +193,12 @@
+ break;
}
} while (c != EOF);
- if (lastc != '\n')
- isclean |= MIME_NOTERMNL;
+ if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
+ isclean &= (MIME_CTRLCHAR|MIME_HASNUL);
+ if (lastc != '\n')
+ isclean |= MIME_NOTERMNL;
clearerr(f);
- fseek(f, initial_pos, SEEK_SET);
- if ((cp = value("maximum-unencoded-line-length")) != NULL)
-@@ -826,11 +942,16 @@ get_mime_convert(FILE *fp, char **conten
+@@ -826,11 +940,16 @@ get_mime_convert(FILE *fp, char **conten
* ^I or ^L in text/plain bodies. However, some
* obscure character sets actually contain these
* characters, so the content type can be set.
@@ -213,7 +215,7 @@
}
return convert;
}
-@@ -989,8 +1110,14 @@ mime_fromhdr(struct str *in, struct str
+@@ -989,8 +1108,14 @@ mime_fromhdr(struct str *in, struct str
#ifdefHAVE_ICONV
iconv_t fhicd = (iconv_t)-1;
#endif
@@ -228,7 +230,7 @@
maxstor = in->l;
out->s = smalloc(maxstor + 1);
out->l = 0;
-@@ -1010,7 +1137,7 @@ mime_fromhdr(struct str *in, struct str
+@@ -1010,7 +1135,7 @@ mime_fromhdr(struct str *in, struct str
#ifdefHAVE_ICONV
if (fhicd != (iconv_t)-1)
iconv_close(fhicd);
@@ -237,7 +239,7 @@
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2015-03-19 20:48:52
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2014-12-19
09:37:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2015-03-19
20:48:54.0 +0100
@@ -1,0 +2,6 @@
+Tue Mar 17 10:05:20 UTC 2015 - wer...@suse.de
+
+- Modify patch mailx-12.5-mime.dif to allow Form Feed as valid
+ characters within mail messages (bsc#922543)
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.9SC183/_old 2015-03-19 20:48:55.0 +0100
+++ /var/tmp/diff_new_pack.9SC183/_new 2015-03-19 20:48:55.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mailx
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ mailx-12.5-mime.dif ++
--- /var/tmp/diff_new_pack.9SC183/_old 2015-03-19 20:48:55.0 +0100
+++ /var/tmp/diff_new_pack.9SC183/_new 2015-03-19 20:48:55.0 +0100
@@ -23,8 +23,8 @@
+#define X 3 /* character appears in non-ISO extended ASCII (Mac, IBM PC) */
+
+static char text_chars[256] = {
-+/* NUL BEL BS HT LFFF CR*/
-+ F, F, F, F, F, F, F, F, T, T, T, F, F, T, F, F, /* 0x0X */
++ /* NUL BEL BS HT LFFF CR*/
++ F, F, F, F, F, F, F, F, T, T, T, F, T, T, F, F, /* 0x0X */
+ /* ESC */
+ F, F, F, F, F, F, F, F, F, F, F, T, F, F, F, F, /* 0x1X */
+ T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, /* 0x2X */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2014-12-19 09:38:14
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2014-05-02
09:51:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2014-12-19
09:37:05.0 +0100
@@ -1,0 +2,11 @@
+Thu Dec 11 11:46:53 UTC 2014 - wer...@suse.de
+
+- Add patches
+ 0001-outof-Introduce-expandaddr-flag.patch
+ 0002-unpack-Disable-option-processing-for-email-addresses.patch
+ 0003-fio.c-Unconditionally-require-wordexp-support.patch
+ 0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch
+ to fix bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell
+ command injection via crafted email addresses
+
+---
@@ -11 +22 @@
-- Correct commnet in spec file
+- Correct comment in spec file
New:
0001-outof-Introduce-expandaddr-flag.patch
0002-unpack-Disable-option-processing-for-email-addresses.patch
0003-fio.c-Unconditionally-require-wordexp-support.patch
0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.r93ErQ/_old 2014-12-19 09:37:06.0 +0100
+++ /var/tmp/diff_new_pack.r93ErQ/_new 2014-12-19 09:37:06.0 +0100
@@ -43,6 +43,14 @@
Patch7: mailx-12.5-parentheses.dif
#PATCH-FIX-SUSE: Fix IPv6 address handling
Patch8: mailx-12.5-ipv6.dif
+#PATCH-FIX-SUSE: bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell
command injection via crafted email addresses
+Patch9: 0001-outof-Introduce-expandaddr-flag.patch
+#PATCH-FIX-SUSE: bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell
command injection via crafted email addresses
+Patch10:0002-unpack-Disable-option-processing-for-email-addresses.patch
+#PATCH-FIX-SUSE: bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell
command injection via crafted email addresses
+Patch11:0003-fio.c-Unconditionally-require-wordexp-support.patch
+#PATCH-FIX-SUSE: bsc#909208 -- CVE-2004-2771, CVE-2014-7844: mailx: shell
command injection via crafted email addresses
+Patch12:0004-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -62,6 +70,10 @@
%patch6 -p0 -b .ssl
%patch7 -p0 -b .par
%patch8 -p0 -b .ipv6
+%patch9 -p1 -b .0001
+%patch10 -p1 -b .0002
+%patch11 -p1 -b .0003
+%patch12 -p1 -b .0004
%patch -p0 -b .0
%build
++ 0001-outof-Introduce-expandaddr-flag.patch ++
>From 9984ae5cb0ea0d61df1612b06952a61323c083d9 Mon Sep 17 00:00:00 2001
From: Florian Weimer
Date: Mon, 17 Nov 2014 11:13:38 +0100
Subject: [PATCH 1/4] outof: Introduce expandaddr flag
Document that address expansion is disabled unless the expandaddr
binary option is set.
This has been assigned CVE-2014-7844 for BSD mailx, but it is not
a vulnerability in Heirloom mailx because this feature was documented.
---
mailx.1 | 14 ++
names.c | 3 +++
2 files changed, 17 insertions(+)
diff --git a/mailx.1 b/mailx.1
index 70a7859..22a171b 100644
--- a/mailx.1
+++ b/mailx.1
@@ -656,6 +656,14 @@ but any reply returned to the machine
will have the system wide alias expanded
as all mail goes through sendmail.
.SS "Recipient address specifications"
+If the
+.I expandaddr
+option is not set (the default), recipient addresses must be names of
+local mailboxes or Internet mail addresses.
+.PP
+If the
+.I expandaddr
+option is set, the following rules apply:
When an address is used to name a recipient
(in any of To, Cc, or Bcc),
names of local mail folders
@@ -2391,6 +2399,12 @@ and exits immediately.
If this option is set,
\fImailx\fR starts even with an empty mailbox.
.TP
+.B expandaddr
+Causes
+.I mailx
+to expand message recipient addresses, as explained in the section,
+Recipient address specifications.
+.TP
.B flipr
Exchanges the
.I Respond
diff --git a/names.c b/names.c
index 66e976b..c69560f 100644
--- a/names.c
+++ b/names.c
@@ -268,6 +268,9 @@ outof(struct name *names, FILE *fo, struct header *hp)
FILE *fout, *fin;
int ispipe;
+ if (value("expandaddr") == NULL)
+ return names;
+
top = names;
np = names;
time(&now);
--
1.9.3
++ 0002-unpack-Disable-option-processing-for-email-addresses.patch ++
>From e34e2ac67b80497080ebecccec40c3b61456167d Mon Sep 17 00:00:00 2001
From: Florian Weimer
Date: Mon, 17 Nov 2014 11:14:06 +0100
Subject: [PATCH 2/4] unpack: Disable option processing for email addre
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2014-05-02 09:51:42
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2013-12-16
07:07:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2014-05-02
09:51:45.0 +0200
@@ -1,0 +2,7 @@
+Sat Apr 19 19:57:00 UTC 2014 - crrodrig...@opensuse.org
+
+- Build with -DOPENSSL_NO_SSL_INTERN asserting that this
+ package does not (and should not) use openSSL internals
+ that are subject to binary incompatible changes.
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.xGMKb8/_old 2014-05-02 09:51:46.0 +0200
+++ /var/tmp/diff_new_pack.xGMKb8/_new 2014-05-02 09:51:46.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mailx
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -53,7 +53,7 @@
minor enhancements like the ability to set a "From:" address.
%prep
-%setup -n mailx-%{version}
+%setup -q -n mailx-%{version}
%patch1 -p0 -b .path
%patch2 -p0 -b .rplyto
%patch3 -p0 -b .ttychr
@@ -66,7 +66,7 @@
%build
CC=gcc
-CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE"
+CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN"
export CC CFLAGS
$SHELL ./makeconfig
make %{?jobs:-j%jobs} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2013-12-16 07:07:58
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2013-12-05
21:39:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2013-12-16
07:07:59.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec 6 12:48:27 UTC 2013 - wer...@suse.de
+
+- Correct commnet in spec file
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.546c7N/_old 2013-12-16 07:08:00.0 +0100
+++ /var/tmp/diff_new_pack.546c7N/_new 2013-12-16 07:08:00.0 +0100
@@ -41,7 +41,7 @@
Patch6: mailx-fix-openssl.patch
#PATCH-FIX-OPENSUSE: Try to tranquilize gcc warning about parentheses (please
check!)
Patch7: mailx-12.5-parentheses.dif
-#PATCH-FIX-SUSE: Try to tranquilize gcc warning about parentheses (please
check!)
+#PATCH-FIX-SUSE: Fix IPv6 address handling
Patch8: mailx-12.5-ipv6.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2013-12-05 21:39:57
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2013-12-03
14:26:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2013-12-05
21:39:58.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 4 08:54:21 UTC 2013 - wer...@suse.de
+
+- Crop off the brackets of an ipv6 addresse if found (bnc#853246)
+
+---
Other differences:
--
++ mailx-12.5-ipv6.dif ++
--- /var/tmp/diff_new_pack.eQBplx/_old 2013-12-05 21:39:58.0 +0100
+++ /var/tmp/diff_new_pack.eQBplx/_new 2013-12-05 21:39:58.0 +0100
@@ -10,21 +10,23 @@
#
# Binaries are stripped with this command after installation.
--- fio.c
-+++ fio.c 2013-12-03 08:55:19.158236784 +
-@@ -1024,6 +1024,16 @@ sopen(const char *xserver, struct sock *
fio.c 2013-12-04 07:46:41.302735482 +
+@@ -1023,7 +1023,17 @@ sopen(const char *xserver, struct sock *
char*cp;
char*server = (char *)xserver;
-+#ifdefHAVE_IPv6_FUNCS
-+ if ((cp = strchr(server, ']')) != NULL) {
+- if ((cp = strchr(server, ':')) != NULL) {
++ if (*server == '[' && (cp = strchr(server, ']')) != NULL) {
+ if (cp[1] == ':') {
+ portstr = &cp[2];
-+ server = salloc(cp+1 - xserver+1);
-+ memcpy(server, xserver, cp+1 - xserver);
-+ server[cp+1 - xserver] = '\0';
++#ifndef HAVE_IPv6_FUNCS
++ port = strtol(portstr, NULL, 10);
++#endif/* HAVE_IPv6_FUNCS */
+ }
-+ } else
-+#endif /* HAVE_IPv6_FUNCS */
- if ((cp = strchr(server, ':')) != NULL) {
++ server = salloc(cp - xserver);
++ memcpy(server, xserver+1, cp - xserver - 1);
++ server[cp - xserver - 1] = '\0';
++ } else if ((cp = strchr(server, ':')) != NULL) {
portstr = &cp[1];
#ifndef HAVE_IPv6_FUNCS
+ port = strtol(portstr, NULL, 10);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2013-12-03 14:26:20
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2013-07-03
10:24:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2013-12-03
14:26:22.0 +0100
@@ -1,0 +2,6 @@
+Tue Dec 3 09:06:50 UTC 2013 - wer...@suse.de
+
+- Add patch mailx-12.5-ipv6.dif to enable mailx to parse IPv6 addresses
+ including a port. We do only support the [ipv6]:port syntax (bnc#853246)
+
+---
New:
mailx-12.5-ipv6.dif
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.clZbGa/_old 2013-12-03 14:26:23.0 +0100
+++ /var/tmp/diff_new_pack.clZbGa/_new 2013-12-03 14:26:23.0 +0100
@@ -41,6 +41,8 @@
Patch6: mailx-fix-openssl.patch
#PATCH-FIX-OPENSUSE: Try to tranquilize gcc warning about parentheses (please
check!)
Patch7: mailx-12.5-parentheses.dif
+#PATCH-FIX-SUSE: Try to tranquilize gcc warning about parentheses (please
check!)
+Patch8: mailx-12.5-ipv6.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -59,7 +61,8 @@
%patch5 -p0 -b .mime
%patch6 -p0 -b .ssl
%patch7 -p0 -b .par
-%patch -p0
+%patch8 -p0 -b .ipv6
+%patch -p0 -b .0
%build
CC=gcc
++ mailx-12.5-ipv6.dif ++
--- Makefile
+++ Makefile2013-12-03 08:14:47.362446079 +
@@ -46,7 +67,7 @@ SHELL = /bin/sh
# If you know that the IPv6 functions work on your machine, you can enable
# them here.
-##IPv6 = -DHAVE_IPv6_FUNCS
+IPv6 = -DHAVE_IPv6_FUNCS
#
# Binaries are stripped with this command after installation.
--- fio.c
+++ fio.c 2013-12-03 08:55:19.158236784 +
@@ -1024,6 +1024,16 @@ sopen(const char *xserver, struct sock *
char*cp;
char*server = (char *)xserver;
+#ifdef HAVE_IPv6_FUNCS
+ if ((cp = strchr(server, ']')) != NULL) {
+ if (cp[1] == ':') {
+ portstr = &cp[2];
+ server = salloc(cp+1 - xserver+1);
+ memcpy(server, xserver, cp+1 - xserver);
+ server[cp+1 - xserver] = '\0';
+ }
+ } else
+#endif /* HAVE_IPv6_FUNCS */
if ((cp = strchr(server, ':')) != NULL) {
portstr = &cp[1];
#ifndefHAVE_IPv6_FUNCS
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2013-07-03 10:24:38
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2013-06-27
11:38:42.0 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2013-07-03
10:24:39.0 +0200
@@ -1,0 +2,7 @@
+Tue Jul 2 10:29:35 UTC 2013 - wer...@suse.de
+
+- Do not pseudo detect Latin nor UTF-8 in binary attachments (bnc#827010)
+- Add patch mailx-12.5-parentheses.dif, that is try to tranquilize
+ gcc due warning about parentheses (please check!)
+
+---
New:
mailx-12.5-parentheses.dif
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.va5ccL/_old 2013-07-03 10:24:39.0 +0200
+++ /var/tmp/diff_new_pack.va5ccL/_new 2013-07-03 10:24:39.0 +0200
@@ -39,6 +39,8 @@
Patch4: nail-11.25-toaddr.dif
Patch5: mailx-%{version}-mime.dif
Patch6: mailx-fix-openssl.patch
+#PATCH-FIX-OPENSUSE: Try to tranquilize gcc warning about parentheses (please
check!)
+Patch7: mailx-12.5-parentheses.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -56,6 +58,7 @@
%patch4 -p0 -b .toaddr
%patch5 -p0 -b .mime
%patch6 -p0 -b .ssl
+%patch7 -p0 -b .par
%patch -p0
%build
++ mailx-12.5-mime.dif ++
--- /var/tmp/diff_new_pack.va5ccL/_old 2013-07-03 10:24:39.0 +0200
+++ /var/tmp/diff_new_pack.va5ccL/_new 2013-07-03 10:24:39.0 +0200
@@ -12,7 +12,7 @@
enum tdflags {
--- mime.c
-+++ mime.c 2012-03-30 14:50:10.318065066 +
mime.c 2013-07-02 10:25:35.0 +
@@ -302,13 +302,78 @@ gettcharset(void)
return t;
}
@@ -101,7 +101,7 @@
if (w & GIDENT) {
if (hp->h_from && name_highbit(hp->h_from))
goto needs;
-@@ -355,7 +421,7 @@ need_hdrconv(struct header *hp, enum gfi
+@@ -355,7 +422,7 @@ need_hdrconv(struct header *hp, enum gfi
if (w & GSUBJECT && has_highbit(hp->h_subject))
goto needs;
return NULL;
@@ -128,7 +128,7 @@
match = 1;
break;
}
-@@ -748,11 +814,54 @@ mime_isclean(FILE *f)
+@@ -748,16 +814,66 @@ mime_isclean(FILE *f)
maxlen = curlen;
curlen = 1;
} else if (c & 0200) {
@@ -172,19 +172,31 @@
+ continue;
+ }
+ latin:
-+ if (text_chars[i & 0377] == I)
++ if (text_chars[i & 0377] == I) {
+ isclean |= MIME_LATIN;
-+ if (text_chars[i & 0377] == X)
++ continue;
++ }
++ if (text_chars[i & 0377] == X) {
+ isclean |= MIME_CTRLCHAR;
++ break;
++ }
} else if (c == '\0') {
isclean |= MIME_HASNUL;
break;
- } else if ((c < 040 && (c != '\t' && c != '\f')) || c == 0177) {
+ } else if (text_chars[c & 0377] == F) {
isclean |= MIME_CTRLCHAR;
++ break;
}
} while (c != EOF);
-@@ -826,11 +935,16 @@ get_mime_convert(FILE *fp, char **conten
+ if (lastc != '\n')
+ isclean |= MIME_NOTERMNL;
++ if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
++ isclean &= (MIME_CTRLCHAR|MIME_HASNUL);
+ clearerr(f);
+ fseek(f, initial_pos, SEEK_SET);
+ if ((cp = value("maximum-unencoded-line-length")) != NULL)
+@@ -826,11 +942,16 @@ get_mime_convert(FILE *fp, char **conten
* ^I or ^L in text/plain bodies. However, some
* obscure character sets actually contain these
* characters, so the content type can be set.
@@ -201,7 +213,7 @@
}
return convert;
}
-@@ -989,8 +1103,14 @@ mime_fromhdr(struct str *in, struct str
+@@ -989,8 +1110,14 @@ mime_fromhdr(struct str *in, struct str
#ifdefHAVE_ICONV
iconv_t fhicd = (iconv_t)-1;
#endif
@@ -216,7 +228,7 @@
maxstor = in->l;
out->s = smalloc(maxstor + 1);
out->l = 0;
-@@ -1010,7 +1130,7 @@ mime_fromhdr(struct str *in, struct str
+@@ -1010,7 +1137,7 @@ mime_fromhdr(struct str *in, struct str
#ifdefHAVE_ICONV
if (fhicd != (iconv_t)
commit mailx for openSUSE:Factory
Hello community, here is the log from the commit of package mailx for openSUSE:Factory checked in at 2013-06-27 11:38:42 Comparing /work/SRC/openSUSE:Factory/mailx (Old) and /work/SRC/openSUSE:Factory/.mailx.new (New) Package is "mailx" Changes: --- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2013-06-13 16:56:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2013-06-27 11:38:42.0 +0200 @@ -1,0 +2,5 @@ +Tue Jun 25 11:58:06 UTC 2013 - co...@suse.com + +- buildrequire groff explicitly + +--- Other differences: -- ++ mailx.spec ++ --- /var/tmp/diff_new_pack.ddVsjA/_old 2013-06-27 11:38:43.0 +0200 +++ /var/tmp/diff_new_pack.ddVsjA/_new 2013-06-27 11:38:43.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package mailx # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,6 +17,7 @@ Name: mailx +BuildRequires: groff BuildRequires: krb5-devel BuildRequires: man BuildRequires: openssl-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2013-06-13 16:56:43
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2012-09-17
14:00:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2013-06-13
16:56:44.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 11 07:51:37 UTC 2013 - cfarr...@suse.com
+
+- license update: BSD-4-Clause and MPL-1.1
+ See COPYING. Fedora also uses this license designation
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.omHJnY/_old 2013-06-13 16:56:46.0 +0200
+++ /var/tmp/diff_new_pack.omHJnY/_new 2013-06-13 16:56:46.0 +0200
@@ -28,7 +28,7 @@
Version:12.5
Release:0
Summary:A MIME-Capable Implementation of the mailx Command
-License:BSD-3-Clause
+License:BSD-4-Clause and MPL-1.1
Group: Productivity/Networking/Email/Utilities
Source: mailx-%{version}.tar.bz2
Patch: mailx-%{version}.dif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community, here is the log from the commit of package mailx for openSUSE:Factory checked in at 2012-09-17 14:00:16 Comparing /work/SRC/openSUSE:Factory/mailx (Old) and /work/SRC/openSUSE:Factory/.mailx.new (New) Package is "mailx", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2012-04-17 21:59:58.0 +0200 +++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2012-09-17 14:00:18.0 +0200 @@ -1,0 +2,5 @@ +Fri Sep 14 19:52:31 UTC 2012 - idon...@suse.com + +- Add BuildRequires on man to fix build for Factory + +--- Other differences: -- ++ mailx.spec ++ --- /var/tmp/diff_new_pack.pqYykf/_old 2012-09-17 14:00:23.0 +0200 +++ /var/tmp/diff_new_pack.pqYykf/_new 2012-09-17 14:00:23.0 +0200 @@ -18,6 +18,7 @@ Name: mailx BuildRequires: krb5-devel +BuildRequires: man BuildRequires: openssl-devel BuildRequires: pcre BuildRequires: postfix -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory checked
in at 2012-04-17 21:59:37
Comparing /work/SRC/openSUSE:Factory/mailx (Old)
and /work/SRC/openSUSE:Factory/.mailx.new (New)
Package is "mailx", Maintainer is "wer...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/mailx/mailx.changes 2011-09-23
02:12:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.mailx.new/mailx.changes 2012-04-17
21:59:58.0 +0200
@@ -1,0 +2,11 @@
+Fri Mar 23 18:39:38 UTC 2012 - wer...@suse.de
+
+- Avoid header rewrite in case of specified ttycharset in wrong
+ locale but subject in ttycharset (bnc#753340)
+
+---
+Fri Mar 23 14:01:02 UTC 2012 - wer...@suse.de
+
+- Try to support not only UTF-8 but also latin text encodings (bnc#753340)
+
+---
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.mBzQp4/_old 2012-04-17 22:00:00.0 +0200
+++ /var/tmp/diff_new_pack.mBzQp4/_new 2012-04-17 22:00:00.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mailx
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: mailx
-BuildRequires: krb5-devel openssl-devel pcre postfix
+BuildRequires: krb5-devel
+BuildRequires: openssl-devel
+BuildRequires: pcre
+BuildRequires: postfix
Url:http://heirloom.sourceforge.net/mailx.html
-License:BSD-3-Clause
-Group: Productivity/Networking/Email/Utilities
Provides: mail
Recommends: smtp_daemon
-AutoReqProv:on
Version:12.5
-Release:1
+Release:0
Summary:A MIME-Capable Implementation of the mailx Command
+License:BSD-3-Clause
+Group: Productivity/Networking/Email/Utilities
Source: mailx-%{version}.tar.bz2
Patch: mailx-%{version}.dif
Patch1: nail-11.25-path.dif
++ mailx-12.5-mime.dif ++
--- /var/tmp/diff_new_pack.mBzQp4/_old 2012-04-17 22:00:00.0 +0200
+++ /var/tmp/diff_new_pack.mBzQp4/_new 2012-04-17 22:00:00.0 +0200
@@ -1,42 +1,138 @@
--- def.h
-+++ def.h 2011-05-13 11:04:51.779926337 +
-@@ -142,7 +142,8 @@ enum mimeclean {
def.h 2012-03-23 13:57:44.0 +
+@@ -142,7 +142,9 @@ enum mimeclean {
MIME_LONGLINES = 002, /* has lines too long for RFC 2822 */
MIME_CTRLCHAR = 004, /* contains control characters */
MIME_HASNUL = 010, /* contains \0 characters */
- MIME_NOTERMNL = 020 /* lacks a terminating newline */
+ MIME_NOTERMNL = 020, /* lacks a terminating newline */
-+ MIME_UTF8 = 040 /* UTF-8 high bit characters */
++ MIME_UTF8 = 040, /* UTF-8 high bit multi byte characters
*/
++ MIME_LATIN = 0100 /* Latin high bit single byte
characters */
};
enum tdflags {
--- mime.c
-+++ mime.c 2011-05-13 11:04:51.779926337 +
-@@ -258,8 +258,11 @@ getcharset(int isclean)
- if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
- charset = NULL;
- else if (isclean & MIME_HIGHBIT) {
-- charset = (wantcharset && wantcharset != (char *)-1) ?
-- wantcharset : value("charset");
-+ if (isclean & MIME_UTF8)
-+ charset = defcharset;
-+ if (charset == NULL)
-+ charset = (wantcharset && wantcharset != (char *)-1) ?
-+ wantcharset : value("charset");
- if (charset == NULL) {
- char *t = value("ttycharset");
- if (t == NULL || (ascncasecmp("ANSI_X3.4", t, 9) == 0))
-@@ -737,6 +740,7 @@ mime_isclean(FILE *f)
- lastc = c;
- c = getc(f);
- curlen++;
-+ check:
- if (c == '\n' || c == EOF) {
- /*
-* RFC 821 imposes a maximum line length of 1000
-@@ -749,10 +753,38 @@ mime_isclean(FILE *f)
mime.c 2012-03-30 14:50:10.318065066 +
+@@ -302,13 +302,78 @@ gettcharset(void)
+ return t;
+ }
+
++#define F 0 /* character never appears in mail text */
++#define T 1 /* character appears in plain ASCII text */
++#define I 2 /* character appears
commit mailx for openSUSE:Factory
Hello community, here is the log from the commit of package mailx for openSUSE:Factory checked in at 2011-12-06 18:28:07 Comparing /work/SRC/openSUSE:Factory/mailx (Old) and /work/SRC/openSUSE:Factory/.mailx.new (New) Package is "mailx", Maintainer is "wer...@suse.com" Changes: Other differences: -- ++ mailx.spec ++ --- /var/tmp/diff_new_pack.w1EQAz/_old 2011-12-06 18:50:21.0 +0100 +++ /var/tmp/diff_new_pack.w1EQAz/_new 2011-12-06 18:50:21.0 +0100 @@ -21,7 +21,7 @@ Name: mailx BuildRequires: krb5-devel openssl-devel pcre postfix Url:http://heirloom.sourceforge.net/mailx.html -License:BSD3c(or similar) +License:BSD-3-Clause Group: Productivity/Networking/Email/Utilities Provides: mail Recommends: smtp_daemon -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory
checked in at Mon May 16 09:25:55 CEST 2011.
--- mailx/mailx.changes 2011-04-09 23:31:39.0 +0200
+++ /mounts/work_src_done/STABLE/mailx/mailx.changes2011-05-13
13:37:35.0 +0200
@@ -1,0 +2,38 @@
+Fri May 13 13:29:52 CEST 2011 - wer...@suse.de
+
+- Update to heirloom mailx 12.5
+ * Better detection of base64 encoded text if acrossed a line
+ * A null pointer dereference that lead to a segmentation fault
+when the user hit return at a yes/no question has been fixed
+ * When both standard input and standard output refer to a
+terminal, ignore SIGPIPE
+ * With the "-E" command line option or if the "skipemptybody"
+variable is set, outgoing messages that contain no text in
+their first or only part are not sent but silently discarded.
+ * When an attachment that would have a "text/something" content
+type contains illegal byte sequences, it is now reliably sent
+out with the "application/octet-stream" content type instead
+ * Fixed a bug that caused messages to be truncated with IMAP servers that
+use LF as line ending in message data, such as Google Mail (reported by
+Matthew L. Shobe).
+ * Do not run filename expansion for IMAP or POP3 mailboxes names, making
+it possible to select mailboxes that contain both brackets and spaces
+in their names (reported by Matthew L. Shobe).
+ * Fixed the format of the timezone in "Date" header fields for zones in
+the Western Hemisphere whose offsets are not an integral number of hours
+(patch by Matthew Fischer).
+ * Fixed a message corruption that occurred when the "inc" command was used
+with a mbox format mailbox after encrypted messages had been viewed
+(reported by Martin Neitzel).
+ * Fixed a condition that caused mailx to hang when looking at a message,
+copying that message, and issuing a "z" command evaluating an uncached
+portion of an IMAP folder.
+ * Make it compile with OpenSSL 1.0.0-beta2
+ * For RFC 2047 MIME "encoded-word" parts in headers, assume that the end of
+each word resets the conversion state (Yedidyah Bar-David).
+ * When the ORGANIZATION variable has an empty value, do not generate an
+"Organization:" header field. Previously, this condition resulted in
+mailx refusing to send mail
+- Fix my Reply-To patch found by milli
+
+--
calling whatdependson for head-i586
Old:
mailx-12.1-replyto.patch
mailx-12.2-mime.dif
mailx-12.2.dif
mailx-12.2.tar.bz2
New:
mailx-12.5-mime.dif
mailx-12.5-replyto.patch
mailx-12.5.dif
mailx-12.5.tar.bz2
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.LCmmfh/_old 2011-05-16 09:24:48.0 +0200
+++ /var/tmp/diff_new_pack.LCmmfh/_new 2011-05-16 09:24:48.0 +0200
@@ -26,13 +26,13 @@
Provides: mail
Recommends: smtp_daemon
AutoReqProv:on
-Version:12.2
-Release:158
+Version:12.5
+Release:1
Summary:A MIME-Capable Implementation of the mailx Command
Source: mailx-%{version}.tar.bz2
Patch: mailx-%{version}.dif
Patch1: nail-11.25-path.dif
-Patch2: mailx-12.1-replyto.patch
+Patch2: mailx-%{version}-replyto.patch
Patch3: nail-11.25-ttychar.dif
Patch4: nail-11.25-toaddr.dif
Patch5: mailx-%{version}-mime.dif
@@ -53,8 +53,8 @@
%patch3 -p0 -b .ttychr
%patch4 -p0 -b .toaddr
%patch5 -p0 -b .mime
+%patch6 -p0 -b .ssl
%patch -p0
-%patch6
%build
CC=gcc
++ mailx-12.2-mime.dif -> mailx-12.5-mime.dif ++
--- mailx/mailx-12.2-mime.dif 2011-02-03 12:05:00.0 +0100
+++ /mounts/work_src_done/STABLE/mailx/mailx-12.5-mime.dif 2011-05-13
13:37:33.0 +0200
@@ -1,5 +1,5 @@
--- def.h
-+++ def.h 2007-04-17 11:32:43.960721000 +
def.h 2011-05-13 11:04:51.779926337 +
@@ -142,7 +142,8 @@ enum mimeclean {
MIME_LONGLINES = 002, /* has lines too long for RFC 2822 */
MIME_CTRLCHAR = 004, /* contains control characters */
@@ -11,20 +11,22 @@
enum tdflags {
--- mime.c
-+++ mime.c 2007-04-17 13:08:06.352702764 +
-@@ -258,7 +258,10 @@ getcharset(int isclean)
mime.c 2011-05-13 11:04:51.779926337 +
+@@ -258,8 +258,11 @@ getcharset(int isclean)
if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
charset = NULL;
else if (isclean & MIME_HIGHBIT) {
-- charset = wantcharset ? wantcharset : value("charset");
+- charset = (wantcharset && wantcharset != (char *)-1) ?
+- wantcharset : value("charset");
+ if (isclean & MIME_UTF8)
+ charset = defcharset;
+ if (charset == NULL)
-
commit mailx for openSUSE:Factory
Hello community,
here is the log from the commit of package mailx for openSUSE:Factory
checked in at Mon Apr 11 09:01:31 CEST 2011.
--- mailx/mailx.changes 2011-02-01 12:10:35.0 +0100
+++ /mounts/work_src_done/STABLE/mailx/mailx.changes2011-04-09
23:31:39.0 +0200
@@ -1,0 +2,6 @@
+Sat Apr 9 21:30:46 UTC 2011 - crrodrig...@opensuse.org
+
+- Allow mailx to compile properly when openSSL is built without
+ SSLv2 support.
+
+---
calling whatdependson for head-i586
Other differences:
--
++ mailx.spec ++
--- /var/tmp/diff_new_pack.8q2MyO/_old 2011-04-11 09:00:28.0 +0200
+++ /var/tmp/diff_new_pack.8q2MyO/_new 2011-04-11 09:00:28.0 +0200
@@ -27,7 +27,7 @@
Recommends: smtp_daemon
AutoReqProv:on
Version:12.2
-Release:153
+Release:158
Summary:A MIME-Capable Implementation of the mailx Command
Source: mailx-%{version}.tar.bz2
Patch: mailx-%{version}.dif
@@ -54,7 +54,7 @@
%patch4 -p0 -b .toaddr
%patch5 -p0 -b .mime
%patch -p0
-%patch6 -p1
+%patch6
%build
CC=gcc
++ mailx-fix-openssl.patch ++
--- /var/tmp/diff_new_pack.8q2MyO/_old 2011-04-11 09:00:28.0 +0200
+++ /var/tmp/diff_new_pack.8q2MyO/_new 2011-04-11 09:00:28.0 +0200
@@ -1,8 +1,14 @@
-Index: mailx-12.2/openssl.c
-===
mailx-12.2.orig/openssl.c
-+++ mailx-12.2/openssl.c
-@@ -105,7 +105,7 @@ static SSL_METHOD *ssl_select_method(con
+--- openssl.c.orig
openssl.c
+@@ -63,6 +63,7 @@ static sigjmp_bufssljmp;
+ #include
+ #include
+ #include
++#include
+
+ #include "rcv.h"
+ #include
+@@ -105,7 +106,7 @@ static SSL_METHOD *ssl_select_method(con
static void ssl_load_verifications(struct sock *sp);
static void ssl_certificate(struct sock *sp, const char *uhp);
static enum okay ssl_check_host(const char *server, struct sock *sp);
@@ -11,7 +17,32 @@
X509_STORE *store);
static EVP_CIPHER *smime_cipher(const char *name);
static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
-@@ -308,7 +308,7 @@ ssl_check_host(const char *server, struc
+@@ -166,6 +167,10 @@ ssl_init(void)
+ verbose = value("verbose") != NULL;
+ if (initialized == 0) {
+ SSL_library_init();
++/* Load all bundled ENGINEs into memory and make them visible */
++ ENGINE_load_builtin_engines();
++ /* Register all of them for every algorithm they collectively implement */
++ ENGINE_register_all_complete();
+ initialized = 1;
+ }
+ if (rand_init == 0)
+@@ -211,9 +216,12 @@ ssl_select_method(const char *uhp)
+
+ cp = ssl_method_string(uhp);
+ if (cp != NULL) {
++#ifndef OPENSSL_NO_SSL2
+ if (equal(cp, "ssl2"))
+ method = SSLv2_client_method();
+- else if (equal(cp, "ssl3"))
++ else
++#endif
++if (equal(cp, "ssl3"))
+ method = SSLv3_client_method();
+ else if (equal(cp, "tls1"))
+ method = TLSv1_client_method();
+@@ -308,7 +316,7 @@ ssl_check_host(const char *server, struc
X509 *cert;
X509_NAME *subj;
char data[256];
@@ -20,7 +51,7 @@
GENERAL_NAME*gen;
int i;
-@@ -494,7 +494,7 @@ smime_sign(FILE *ip, struct header *head
+@@ -494,7 +502,7 @@ smime_sign(FILE *ip, struct header *head
}
static int
@@ -29,7 +60,7 @@
{
struct message *x;
char*cp, *sender, *to, *cc, *cnttype;
-@@ -503,7 +503,8 @@ smime_verify(struct message *m, int n, S
+@@ -503,7 +511,8 @@ smime_verify(struct message *m, int n, S
off_t size;
BIO *fb, *pb;
PKCS7 *pkcs7;
@@ -39,7 +70,7 @@
X509*cert;
X509_NAME *subj;
chardata[LINESIZE];
-@@ -612,7 +613,7 @@ cverify(void *vp)
+@@ -612,7 +621,7 @@ cverify(void *vp)
{
int *msgvec = vp, *ip;
int ec = 0;
@@ -48,7 +79,7 @@
X509_STORE *store;
char*ca_dir, *ca_file;
-@@ -685,7 +686,7 @@ smime_encrypt(FILE *ip, const char *cert
+@@ -685,7 +694,7 @@ smime_encrypt(FILE *ip, const char *cert
X509*cert;
PKCS7 *pkcs7;
BIO *bb, *yb;
@@ -57,7 +88,7 @@
EVP_CIPHER *cipher;
certfile = expand((char *)certfile);
-@@ -948,9 +949,9 @@ smime_certsave(struct message *m, int n,
+@@ -948,9 +957,9 @@ smime_certsave(struct message *m, int n,
off_t size;
BIO *fb, *pb;
PKCS7 *pkcs7;
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.o
