aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-09-13 19:57:18 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2018-09-13 20:09:06 +0200
commita6ab92c57331d1550173e944fb15cc579c9c31eb (patch)
treeb0e25222c41622d3df413271004fc6dfbff6f9a3
parent41abc974b649b0839a1fe9b2f355feb8dd0fc224 (diff)
downloadaports-a6ab92c57331d1550173e944fb15cc579c9c31eb.tar.bz2
main/sudo: upgrade to 1.8.25_p1
-rw-r--r--main/sudo/APKBUILD8
-rw-r--r--main/sudo/libcrypt.patch17
-rw-r--r--main/sudo/musl-fix-headers.patch10
3 files changed, 12 insertions, 23 deletions
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
index 11d7f6d..d3864dc 100644
--- a/main/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sudo
-pkgver=1.8.23
+pkgver=1.8.25_p1
if [ "${pkgver%_*}" != "$pkgver" ]; then
_realver=${pkgver%_*}${pkgver#*_}
else
@@ -20,7 +20,6 @@ source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz
fix-cross-compile.patch
fix-tests.patch
libcrypt.patch
- musl-fix-headers.patch
"
options="suid"
@@ -65,8 +64,7 @@ package() {
rm -rf "$pkgdir"/var/run
}
-sha512sums="a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342 sudo-1.8.23.tar.gz
+sha512sums="b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72 sudo-1.8.25p1.tar.gz
f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch
b2d7816d334826545420c578114e5af361ced65c00e5bfc2e0b16f3c9325aa9d2b902defeebb181da3cf7bc6aba3a59a496293d2f11d83c9793f11138ba50343 fix-tests.patch
-5ad20254aa587ef615f794081ecd55344eada5cf8c1a1d7956cc3f73375554716c483eeb74081da9a8501afce92cfbaf2abe59d1067aac67ce6e4874eb5a23e1 libcrypt.patch
-113416fed7532c6092687c8bdd9913d04888d2f0a32e4333dd27a6b3d39145717ad5c3b3f05ba11bd6462612a9a013d446d254d50b2b651c33eeebe670f41ab5 musl-fix-headers.patch"
+0fa06d13d202ee5ab58596413a7498b3e9b6925e87385bb876f5e0b29b22010a84918686a5974de87392ab18158e883da343fe6a14448a4e273eaa1bb81f5995 libcrypt.patch"
diff --git a/main/sudo/libcrypt.patch b/main/sudo/libcrypt.patch
index e83b691..6240144 100644
--- a/main/sudo/libcrypt.patch
+++ b/main/sudo/libcrypt.patch
@@ -1,11 +1,12 @@
---- ./plugins/sudoers/Makefile.in.orig
-+++ ./plugins/sudoers/Makefile.in
-@@ -52,7 +52,7 @@
+diff -upr sudo-1.8.25p1.orig/plugins/sudoers/Makefile.in sudo-1.8.25p1/plugins/sudoers/Makefile.in
+--- sudo-1.8.25p1.orig/plugins/sudoers/Makefile.in 2018-09-13 20:01:23.128250324 +0200
++++ sudo-1.8.25p1/plugins/sudoers/Makefile.in 2018-09-13 20:01:49.428417557 +0200
+@@ -54,7 +54,7 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
- LIBS = $(LT_LIBS) @LIBINTL@
+ LIBS = $(LT_LIBS)
NET_LIBS = @NET_LIBS@
--SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@
-+SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@ -lcrypt
+-SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@
++SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ -lcrypt
REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@
- VISUDO_LIBS = $(NET_LIBS) @LIBMD@
- TESTSUDOERS_LIBS = $(NET_LIBS) @LIBMD@
+ VISUDO_LIBS = $(NET_LIBS)
+ CVTSUDOERS_LIBS = $(NET_LIBS)
diff --git a/main/sudo/musl-fix-headers.patch b/main/sudo/musl-fix-headers.patch
deleted file mode 100644
index 18a19b7..0000000
--- a/main/sudo/musl-fix-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./include/sudo_compat.h.orig
-+++ ./include/sudo_compat.h
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <stddef.h> /* for rsize_t */
-+#include <sys/types.h> /* for id_t */
-
- /*
- * Macros and functions that may be missing on some operating systems.