aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Nurpmeso <steffen@sdaoden.eu>2018-08-08 22:38:29 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2018-08-14 13:40:08 +0000
commit13ba2874e59791deb26fa084af36df2c1d83edbc (patch)
treeb425e89946efc0995088a69f367526165e941a29
parent6eac6b334af0e110c8254cb30b5ea0adeef2601b (diff)
downloadaports-13ba2874e59791deb26fa084af36df2c1d83edbc.tar.bz2
aports-13ba2874e59791deb26fa084af36df2c1d83edbc.tar.xz
testing/s-nail: update to v14.9.11
-rw-r--r--testing/s-nail/APKBUILD18
-rw-r--r--testing/s-nail/fix-inv-mem-access.patch10
2 files changed, 9 insertions, 19 deletions
diff --git a/testing/s-nail/APKBUILD b/testing/s-nail/APKBUILD
index e18df69cc0..e43d1cb28b 100644
--- a/testing/s-nail/APKBUILD
+++ b/testing/s-nail/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Ivan Tham <pickfire@riseup.net>
# Maintainer: Steffen Nurpmeso <steffen@sdaoden.eu>
pkgname=s-nail
-pkgver=14.9.9
-pkgrel=2
+pkgver=14.9.11
+pkgrel=1
pkgdesc="SysV mail/BSD Mail/POSIX mailx: send and receive Internet mail"
url="https://www.sdaoden.eu/code.html#s-mailx"
arch="all"
@@ -12,8 +12,7 @@ makedepends="libressl-dev libidn-dev ncurses-dev krb5-dev"
options="suid"
replaces="mailx"
subpackages="$pkgname-doc"
-source="https://ftp.sdaoden.eu/s-nail-$pkgver.tar.xz
- fix-inv-mem-access.patch"
+source="https://ftp.sdaoden.eu/s-nail-$pkgver.tar.xz"
builddir="$srcdir/"$pkgname-$pkgver
# LD_LIBRARY_PATH is included via -rpath, so use system defaults only.
@@ -27,14 +26,17 @@ export PATH C_INCLUDE_PATH LD_LIBRARY_PATH
build() {
cd "$builddir"
make \
+ EXTRA_CFLAGS=-Os \
+ \
VAL_SID= VAL_MAILX=mail \
VAL_PREFIX=/usr \
VAL_SYSCONFDIR=/etc \
\
- OPT_AUTOCC=no \
+ VAL_IDNA=idn \
+ VAL_RANDOM="libgetrandom sysgetrandom urandom builtin" \
\
config &&
- make build # XXX unite with config in v14.9.10
+ make build # XXX unite with config in v14.9.12
}
check() {
@@ -49,6 +51,4 @@ package() {
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="f0004952f7189a2549e01489b600a10a36f1fa3ba0b6c6a871c4ee99d3d3d49e97ed5a8068fa1692b7fd91d2b243d05dbc5d61fe3f1dc2e9ba9187d9d31707c4 s-nail-14.9.9.tar.xz
-47639f0f013724040aa70a47180b5e286f4143d2ecef960c27eef43bcf5d8f60db8c7c1aedb4d158779b783f79409cbd7c5b703ed28666e8cf80eb4448f86125 fix-inv-mem-access.patch"
-
+sha512sums="e33de63e9c938a466c9c894e6a04ead0ccf42923bc1afaa52e7d7d7f763498567c3033b74be41b633b73d16c8f6baf6a3bec14db16975493ffc402a70a1395d3 s-nail-14.9.11.tar.xz"
diff --git a/testing/s-nail/fix-inv-mem-access.patch b/testing/s-nail/fix-inv-mem-access.patch
deleted file mode 100644
index 1ef30a719e..0000000000
--- a/testing/s-nail/fix-inv-mem-access.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mime.c 2018-03-09 20:24:35.737754669 +0100
-+++ b/mime.c 2018-03-09 20:24:39.107748465 +0100
-@@ -678,7 +678,6 @@ mime_write_tohdr_a(struct str *in, FILE
- xin.l = PTR2SIZE(cp - lastcp);
- if ((sz = a_mime__convhdra(&xin, f, colp, msh)) < 0)
- goto jleave;
-- xin.s[xin.l] = '<';
- lastcp = cp;
- } else {
- cp = lastcp;