diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index 16779a7b1b..466d699a68 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -8,15 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo -PKG_VERSION:=1.8.21p2 +PKG_VERSION:=1.8.24 PKG_RELEASE:=1 -PKG_LICENSE:=ISC -PKG_LICENSE_FILES:=doc/LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.sudo.ws/dist -PKG_HASH:=74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368 +PKG_SOURCE_URL:=https://www.sudo.ws/dist +PKG_HASH:=b488557a198ecef30b7ad4011b59a66232dec2364ad956e11d8e17906c225be8 +PKG_LICENSE:=ISC +PKG_LICENSE_FILES:=doc/LICENSE +PKG_CPE_ID:=cpe:/a:todd_miller:sudo + +PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=sudo/host @@ -27,7 +30,7 @@ define Package/sudo SECTION:=admin CATEGORY:=Administration TITLE:=Delegate authority to run commands - URL:=http://www.sudo.ws/ + URL:=https://www.sudo.ws/ MAINTAINER:=Gergely Kiss endef diff --git a/admin/sudo/patches/010-cross-compile-fixes.patch b/admin/sudo/patches/010-cross-compile-fixes.patch index b9c1e79956..6288fe4a1a 100644 --- a/admin/sudo/patches/010-cross-compile-fixes.patch +++ b/admin/sudo/patches/010-cross-compile-fixes.patch @@ -1,7 +1,6 @@ -diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefile.in ---- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200 -+++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-09 21:44:35.610041162 +0100 -@@ -142,10 +142,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ +--- a/lib/util/Makefile.in ++++ b/lib/util/Makefile.in +@@ -161,10 +161,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ esac siglist.c: mksiglist @@ -13,4 +12,4 @@ diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefi + mksigname > $@ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h - $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@ diff --git a/admin/sudo/patches/020-no-owner-change.patch b/admin/sudo/patches/020-no-owner-change.patch index 417e95dee0..b1d29ad193 100644 --- a/admin/sudo/patches/020-no-owner-change.patch +++ b/admin/sudo/patches/020-no-owner-change.patch @@ -1,7 +1,6 @@ -diff -rupN sudo-1.8.11p2.orig/Makefile.in sudo-1.8.11p2/Makefile.in ---- sudo-1.8.11p2.orig/Makefile.in 2014-10-07 22:26:20.000000000 +0200 -+++ sudo-1.8.11p2/Makefile.in 2014-12-09 22:00:27.256934143 +0100 -@@ -62,7 +62,7 @@ SHELL = @SHELL@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -63,7 +63,7 @@ SHELL = @SHELL@ SED = @SED@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c diff --git a/admin/sudo/patches/030-musl-fix-missing-header.patch b/admin/sudo/patches/030-musl-fix-missing-header.patch deleted file mode 100644 index efb7d8703f..0000000000 --- a/admin/sudo/patches/030-musl-fix-missing-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN sudo-1.8.14p3.orig/include/sudo_util.h sudo-1.8.14p3/include/sudo_util.h ---- sudo-1.8.14p3.orig/include/sudo_util.h 2015-07-22 14:22:49.000000000 +0200 -+++ sudo-1.8.14p3/include/sudo_util.h 2015-08-30 18:41:24.509814946 +0200 -@@ -23,6 +23,8 @@ - # include "compat/stdbool.h" - #endif /* HAVE_STDBOOL_H */ - -+#include -+ - /* - * Macros for operating on struct timeval. - */