diff options
Diffstat (limited to 'source/n')
| -rwxr-xr-x | source/n/dovecot/dovecot.SlackBuild | 8 | ||||
| -rw-r--r-- | source/n/dovecot/dovecot.glibc228.patch | 45 | ||||
| -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 | ||||
| -rw-r--r-- | source/n/mailx/slack-desc | 19 | ||||
| -rw-r--r-- | source/n/s-nail/doinst.sh (renamed from source/n/mailx/doinst.sh) | 7 | ||||
| -rwxr-xr-x | source/n/s-nail/s-nail.SlackBuild (renamed from source/n/mailx/mailx.SlackBuild) | 132 | ||||
| -rw-r--r-- | source/n/s-nail/s-nail.url | 1 | ||||
| -rw-r--r-- | source/n/s-nail/slack-desc | 19 |
10 files changed, 84 insertions, 277 deletions
diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index 81bcac08d..5f175de9b 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dovecot VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -101,12 +101,6 @@ zcat $CWD/dovecot.default.shadow.auth.diff.gz | patch -p1 --verbose || exit 1 # any need to send people to /usr/doc. Also, make sure that TLS is recommended. zcat $CWD/dovecot.config.README.diff.gz | patch -p1 --verbose || exit 1 -# Fix crypt() usage with glibc-2.28: -zcat $CWD/dovecot.glibc228.patch.gz | patch -p1 --verbose || exit 1 - -# Since the crypt() patch patches configure.ac: -autoreconf -vif - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/source/n/dovecot/dovecot.glibc228.patch b/source/n/dovecot/dovecot.glibc228.patch deleted file mode 100644 index 76ef33aa4..000000000 --- a/source/n/dovecot/dovecot.glibc228.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <aki.tuomi@dovecot.fi> -Date: Wed, 8 Aug 2018 12:33:20 +0300 -Subject: [PATCH] auth: mycrypt - include crypt.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes crypt usage on glibc-2.28 - -Reported by Reuben Farrelly -Patch provided by Thore Bödecker ---- - configure.ac | 2 +- - src/auth/mycrypt.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd545ebfdc..c5d8fae666 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \ - quota.h sys/fs/quota_common.h \ - mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \ - xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \ -- sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h) -+ sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h) - - CC_CLANG - AC_CC_PIE -diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c -index c49fcf842e..0bd00bc238 100644 ---- a/src/auth/mycrypt.c -+++ b/src/auth/mycrypt.c -@@ -14,6 +14,9 @@ - # define _XPG6 /* Some Solaris versions require this, some break with this */ - #endif - #include <unistd.h> -+#ifdef HAVE_CRYPT_H -+# include <crypt.h> -+#endif - - #include "mycrypt.h" - - 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/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. diff --git a/source/n/mailx/doinst.sh b/source/n/s-nail/doinst.sh index 62c288b48..b541fb201 100644 --- a/source/n/mailx/doinst.sh +++ b/source/n/s-nail/doinst.sh @@ -1,14 +1,13 @@ -#!/bin/sh config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + 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 + 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.SlackBuild b/source/n/s-nail/s-nail.SlackBuild index 9a2b28795..2795c9117 100755 --- a/source/n/mailx/mailx.SlackBuild +++ b/source/n/s-nail/s-nail.SlackBuild @@ -1,6 +1,9 @@ -#!/bin/bash +#!/bin/sh + +# Slackware build script for S-nail # Copyright 2008, 2009, 2010, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2018 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,17 +25,15 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=mailx -VERSION=12.5 -BUILD=${BUILD:-4} +PKGNAM=s-nail +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} -# 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 ) ;; + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; esac fi @@ -48,49 +49,57 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi TMP=${TMP:-/tmp} -PKG=$TMP/package-mailx +PKG=$TMP/package-$PKGNAM + 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 - +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || 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 +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +make $NUMJOBS \ + VAL_PREFIX=/usr \ + VAL_SYSCONFDIR=/etc \ + VAL_MANDIR=/usr/man \ + VAL_MAIL=/var/spool/mail \ + VAL_MTA=/usr/sbin/sendmail \ + OPT_AUTOCC=0 \ + VAL_SID= \ + VAL_MAILX=mailx \ + VAL_SYSCONFRC=nail.rc \ + VAL_RANDOM="libgetrandom,sysgetrandom,urandom" \ + config || exit 1 + +make $NUMJOBS build || exit 1 +make $NUMJOBS test || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Tighten up the perms a bit: +chmod 4711 $PKG//usr/libexec/mailx-privsep + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail': mkdir -p $PKG/bin @@ -99,29 +108,18 @@ mkdir -p $PKG/bin 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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Manpage links: ( cd $PKG/usr/man/man1 @@ -130,24 +128,14 @@ fi ln -sf mailx.1.gz Mail.1.gz ) -mkdir -p $PKG/usr/doc/mailx-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$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 + COPYING* INSTALL* NEWS* README* THANKS* \ + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -# Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/mailx-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/s-nail/s-nail.url b/source/n/s-nail/s-nail.url new file mode 100644 index 000000000..02474a4d6 --- /dev/null +++ b/source/n/s-nail/s-nail.url @@ -0,0 +1 @@ +http://www.sdaoden.eu/downloads diff --git a/source/n/s-nail/slack-desc b/source/n/s-nail/slack-desc new file mode 100644 index 000000000..157bc7df7 --- /dev/null +++ b/source/n/s-nail/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +s-nail: s-nail (mail sending and receiving utility) +s-nail: +s-nail: S-nail provides a simple and friendly environment for sending and +s-nail: receiving mail. It is intended to provide the functionality of the +s-nail: POSIX mailx command, but is MIME capable and optionally offers +s-nail: extensions for line editing, S/MIME, SMTP and POP3, among others. +s-nail: +s-nail: Homepage: http://www.sdaoden.eu/code.html#s-nail +s-nail: +s-nail: +s-nail: |