sudo: update to 1.9.3p1
authorRosen Penev <rosenp@gmail.com>
Tue, 1 Dec 2020 00:44:06 +0000 (16:44 -0800)
committerAlexandru Ardelean <ardeleanalex@gmail.com>
Tue, 15 Dec 2020 12:47:15 +0000 (14:47 +0200)
Reorder several things for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
admin/sudo/Makefile

index 2cd3c311b594a72d9c6f727d986ecfe798c1f924..a1c253f01d362272a17688f21354ab7b27fa9716 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sudo
-PKG_VERSION:=1.8.31
+PKG_VERSION:=1.9.3p1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.sudo.ws/dist
-PKG_HASH:=7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f
+PKG_HASH:=dcb9de53e45e1c39042074b847f5e0d8ae1890725dd6a9d9101a81569e6eb49e
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 
@@ -21,12 +21,12 @@ 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_PARALLEL:=1
 PKG_BUILD_DEPENDS:=sudo/host
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 define Package/sudo
   SECTION:=admin
@@ -47,7 +47,7 @@ define Package/sudo/conffiles
 /etc/sudoers.d/
 endef
 
-CONFIGURE_ARGS+= \
+CONFIGURE_ARGS += \
        --without-pam \
        --disable-pam-session \
        --with-editor=/bin/vi \
@@ -56,12 +56,10 @@ CONFIGURE_ARGS+= \
        --with-rundir=/var/lib/sudo \
        --with-vardir=/var/lib/sudo
 
-CONFIGURE_VARS+= \
+CONFIGURE_VARS += \
        sudo_cv_uid_t_len=10 \
        sudo_cv_func_unsetenv_void=no
 
-include $(INCLUDE_DIR)/host-build.mk
-
 define Host/Compile
        cd $(HOST_BUILD_DIR)/lib/util; \
            $(MAKE) mksiglist; $(MAKE) mksigname
@@ -72,8 +70,6 @@ define Host/Install
        $(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOSTPKG)/bin/
 endef
 
-$(eval $(call HostBuild))
-
 define Package/sudo/install
        $(INSTALL_DIR) \
                $(1)/etc/{init.d,sudoers.d} \
@@ -98,4 +94,5 @@ define Package/sudo/postinst
 }
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,sudo))