--- a/components/sudo/Makefile Fri Mar 04 16:04:58 2016 -0800
+++ b/components/sudo/Makefile Thu Mar 03 05:57:08 2016 -0800
@@ -19,29 +19,38 @@
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= sudo
-SRC_VERSION= 1.8.9
-SRC_PATCH_VERSION= 5
+SRC_VERSION= 1.8.15
+SRC_PATCH_VERSION=
+ifdef SRC_PATCH_VERSION
COMPONENT_VERSION= $(SRC_VERSION).$(SRC_PATCH_VERSION)
COMPONENT_SRC= $(COMPONENT_NAME)-$(SRC_VERSION)p$(SRC_PATCH_VERSION)
+else
+COMPONENT_VERSION= $(SRC_VERSION)
+COMPONENT_SRC= $(COMPONENT_NAME)-$(SRC_VERSION)
+endif
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21
+ sha256:4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308
COMPONENT_ARCHIVE_URL= http://www.sudo.ws/sudo/dist/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://www.sudo.ws/
COMPONENT_BUGDB= utility/sudo
-TPNO= 16733
+TPNO= 26593
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
+# Allows zero-sized struct/union declarations and void functions with return
+# statements returning a value to work.
+CFLAGS += -features=extensions
+
COMPONENT_PREP_ACTION = ( cd $(@D) ; $(AUTORECONF) -f -I m4 )
CONFIGURE_ENV += "CC=$(CC)"
@@ -52,7 +61,7 @@
CONFIGURE_OPTIONS += --with-ldap
CONFIGURE_OPTIONS += --with-project
-CONFIGURE_OPTIONS += --with-timedir=/system/volatile/sudo
+CONFIGURE_OPTIONS += --with-rundir=/system/volatile/sudo
CONFIGURE_OPTIONS += --with-pam
CONFIGURE_OPTIONS += --with-pam-login
CONFIGURE_OPTIONS += --disable-pam-session
@@ -71,6 +80,8 @@
COMPONENT_INSTALL_ARGS += bindir=$(USRBINDIR)
COMPONENT_INSTALL_ARGS += sbindir=$(USRSBINDIR)
+# Avoid calling "chown 0" on installed files
+COMPONENT_INSTALL_ARGS += INSTALL_OWNER=
# Enable aslr for this component
ASLR_MODE = $(ASLR_ENABLE)