diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-24 20:44:07 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-11-25 08:59:43 +0100 |
commit | 6b0434cfef488f332faad7efd1359d5f07b02a49 (patch) | |
tree | 91d2f8553617c5a33ab7abb899ced54559cf74cb /source/n/mailx | |
parent | 8a98ceb6bd8b2b73b4b386e6435862f51ddb197e (diff) | |
download | current-6b0434cfef488f332faad7efd1359d5f07b02a49.tar.gz current-6b0434cfef488f332faad7efd1359d5f07b02a49.tar.xz |
Sat Nov 24 20:44:07 UTC 201820181124204407
a/tree-1.8.0-x86_64-1.txz: Upgraded.
ap/cups-filters-1.21.4-x86_64-1.txz: Upgraded.
ap/itstool-2.0.5-x86_64-1.txz: Upgraded.
d/Cython-0.29.1-x86_64-1.txz: Upgraded.
l/dconf-0.30.1-x86_64-1.txz: Upgraded.
l/elfutils-0.175-x86_64-1.txz: Upgraded.
l/gc-8.0.0-x86_64-1.txz: Upgraded.
l/gobject-introspection-1.58.1-x86_64-1.txz: Upgraded.
l/json-glib-1.4.4-x86_64-1.txz: Upgraded.
l/keyutils-1.6-x86_64-1.txz: Upgraded.
l/libjpeg-turbo-2.0.1-x86_64-1.txz: Upgraded.
l/libpsl-0.20.2-x86_64-1.txz: Upgraded.
l/libsecret-0.18.6-x86_64-3.txz: Rebuilt.
Recompiled with --enable-introspection (also picks up Vala support).
n/cyrus-sasl-2.1.27-x86_64-1.txz: Upgraded.
n/dovecot-2.3.4-x86_64-1.txz: Upgraded.
n/mailx-12.5-x86_64-4.txz: Removed.
n/s-nail-14.9.11-x86_64-1.txz: Added.
This package replaces mailx. Thanks to Johannes Schoepfer.
tcl/tcl-8.6.9-x86_64-1.txz: Upgraded.
tcl/tk-8.6.9.1-x86_64-1.txz: Upgraded.
xap/gucharmap-11.0.3-x86_64-1.txz: Upgraded.
xfce/xfce4-clipman-plugin-1.4.3-x86_64-1.txz: Upgraded.
xfce/xfce4-screenshooter-1.9.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/mailx')
-rw-r--r-- | source/n/mailx/doinst.sh | 14 | ||||
-rw-r--r-- | source/n/mailx/mailx-12.5-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch | 25 | ||||
-rw-r--r-- | source/n/mailx/mailx-12.5-openssl.patch | 41 | ||||
-rw-r--r-- | source/n/mailx/mailx-12.5-outof-Introduce-expandaddr-flag.patch | 64 | ||||
-rwxr-xr-x | source/n/mailx/mailx.SlackBuild | 153 | ||||
-rw-r--r-- | source/n/mailx/slack-desc | 19 |
6 files changed, 0 insertions, 316 deletions
diff --git a/source/n/mailx/doinst.sh b/source/n/mailx/doinst.sh deleted file mode 100644 index 62c288b48..000000000 --- a/source/n/mailx/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -config() { - NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -config etc/nail.rc.new -# Make symlinks: diff --git a/source/n/mailx/mailx-12.5-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch b/source/n/mailx/mailx-12.5-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch deleted file mode 100644 index a7fb9d362..000000000 --- a/source/n/mailx/mailx-12.5-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 73fefa0c1ac70043ec84f2d8b8f9f683213f168d Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Mon, 17 Nov 2014 13:11:32 +0100 -Subject: [PATCH 4/4] globname: Invoke wordexp with WRDE_NOCMD (CVE-2004-2771) - ---- - fio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fio.c b/fio.c -index 1529236..774a204 100644 ---- a/fio.c -+++ b/fio.c -@@ -497,7 +497,7 @@ globname(char *name) - sigemptyset(&nset); - sigaddset(&nset, SIGCHLD); - sigprocmask(SIG_BLOCK, &nset, NULL); -- i = wordexp(name, &we, 0); -+ i = wordexp(name, &we, WRDE_NOCMD); - sigprocmask(SIG_UNBLOCK, &nset, NULL); - switch (i) { - case 0: --- -1.9.3 - diff --git a/source/n/mailx/mailx-12.5-openssl.patch b/source/n/mailx/mailx-12.5-openssl.patch deleted file mode 100644 index 210890bc4..000000000 --- a/source/n/mailx/mailx-12.5-openssl.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/openssl.c b/openssl.c -index b4e33fc..9d1eaf4 100644 ---- a/openssl.c -+++ b/openssl.c -@@ -136,6 +136,7 @@ ssl_rand_init(void) - int state = 0; - - if ((cp = value("ssl-rand-egd")) != NULL) { -+#ifndef OPENSSL_NO_EGD - cp = expand(cp); - if (RAND_egd(cp) == -1) { - fprintf(stderr, catgets(catd, CATSET, 245, -@@ -143,6 +144,9 @@ ssl_rand_init(void) - cp); - } else - state = 1; -+#else -+ fprintf(stderr, "entropy daemon not available\n"); -+#endif - } else if ((cp = value("ssl-rand-file")) != NULL) { - cp = expand(cp); - if (RAND_load_file(cp, 1024) == -1) { -@@ -216,9 +220,16 @@ ssl_select_method(const char *uhp) - - cp = ssl_method_string(uhp); - if (cp != NULL) { -- if (equal(cp, "ssl2")) -+ if (equal(cp, "ssl2")) { -+#if OPENSSL_VERSION_NUMBER < 0x10100000 - method = SSLv2_client_method(); -- else if (equal(cp, "ssl3")) -+#else -+ /* SSLv2 support was removed in OpenSSL 1.1.0 */ -+ fprintf(stderr, catgets(catd, CATSET, 244, -+ "Unsupported SSL method \"%s\"\n"), cp); -+ method = SSLv23_client_method(); -+#endif -+ } else if (equal(cp, "ssl3")) - method = SSLv3_client_method(); - else if (equal(cp, "tls1")) - method = TLSv1_client_method(); diff --git a/source/n/mailx/mailx-12.5-outof-Introduce-expandaddr-flag.patch b/source/n/mailx/mailx-12.5-outof-Introduce-expandaddr-flag.patch deleted file mode 100644 index c3479e284..000000000 --- a/source/n/mailx/mailx-12.5-outof-Introduce-expandaddr-flag.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9984ae5cb0ea0d61df1612b06952a61323c083d9 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -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 - diff --git a/source/n/mailx/mailx.SlackBuild b/source/n/mailx/mailx.SlackBuild deleted file mode 100755 index 9a2b28795..000000000 --- a/source/n/mailx/mailx.SlackBuild +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/bash - -# Copyright 2008, 2009, 2010, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=mailx -VERSION=12.5 -BUILD=${BUILD:-4} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -else - SLKCFLAGS="-O2" -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-mailx -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf mailx-$VERSION -tar xvf $CWD/mailx-$VERSION.tar.?z* || exit 1 -cd mailx-$VERSION || exit 1 - -zcat $CWD/mailx-12.5-openssl.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/mailx-12.5-globname-Invoke-wordexp-with-WRDE_NOCMD-CVE-2004-277.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/mailx-12.5-outof-Introduce-expandaddr-flag.patch.gz | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -make CFLAGS="$SLKCFLAGS" \ - PREFIX=/usr \ - MANDIR=/usr/man \ - MAILSPOOL=/var/spool/mail \ - UCBINSTALL=/usr/bin/install \ - SENDMAIL=/usr/sbin/sendmail || exit 1 - -make install DESTDIR=$PKG \ - CFLAGS="$SLKCFLAGS" \ - PREFIX=/usr \ - MANDIR=/usr/man \ - MAILSPOOL=/var/spool/mail \ - UCBINSTALL=/usr/bin/install \ - SENDMAIL=/usr/sbin/sendmail || exit 1 - -# We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail': -mkdir -p $PKG/bin -( cd $PKG/bin - ln -sf /usr/bin/mailx Mail - ln -sf /usr/bin/mailx mail - ln -sf /usr/bin/mailx nail -) -# Likewise, we make some compat symlinks in /usr/bin: -( cd $PKG/usr/bin - ln -sf mailx Mail - ln -sf mailx mail - ln -sf mailx nail -) -mv $PKG/etc/nail.rc $PKG/etc/nail.rc.new -strip $PKG/usr/bin/mailx - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Manpage links: -( cd $PKG/usr/man/man1 - ln -sf mailx.1.gz mail.1.gz - ln -sf mailx.1.gz nail.1.gz - ln -sf mailx.1.gz Mail.1.gz -) - -mkdir -p $PKG/usr/doc/mailx-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL README TODO \ - $PKG/usr/doc/mailx-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/mailx-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/mailx/slack-desc b/source/n/mailx/slack-desc deleted file mode 100644 index 76c010d76..000000000 --- a/source/n/mailx/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -mailx: mailx (a simple mail client) -mailx: -mailx: Mailx is derived from Berkeley Mail and is intended provide the -mailx: functionality of the POSIX mailx command with additional support -mailx: for MIME, IMAP, POP3, SMTP, and S/MIME. It provides enhanced -mailx: features for interactive use, such as caching and disconnected -mailx: operation for IMAP, message threading, scoring, and filtering. -mailx: It is also usable as a mail batch language, both for sending -mailx: and receiving mail. -mailx: -mailx: The maintainer and primary developer of mailx is Gunnar Ritter. |