Merge pull request #119 from Beginner-Go/master

sudo: update to 1.9.5p2
This commit is contained in:
coolsnowwolf 2021-02-04 17:32:23 +08:00 committed by GitHub
commit 71129086ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,24 +8,25 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sudo PKG_NAME:=sudo
PKG_VERSION:=1.8.31 PKG_VERSION:=1.9.5p2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.sudo.ws/dist PKG_SOURCE_URL:=https://www.sudo.ws/dist
PKG_HASH:=7ea8d97a3cee4c844e0887ea7a1bd80eb54cc98fd77966776cb1a80653ad454f PKG_HASH:=539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_MAINTAINER:=
PKG_LICENSE:=ISC PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=doc/LICENSE PKG_LICENSE_FILES:=doc/LICENSE
PKG_CPE_ID:=cpe:/a:todd_miller:sudo PKG_CPE_ID:=cpe:/a:todd_miller:sudo
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=sudo/host PKG_BUILD_DEPENDS:=sudo/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/sudo define Package/sudo
SECTION:=admin SECTION:=admin
@ -46,7 +47,7 @@ define Package/sudo/conffiles
/etc/sudoers.d/ /etc/sudoers.d/
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS += \
--without-pam \ --without-pam \
--disable-pam-session \ --disable-pam-session \
--with-editor=/bin/vi \ --with-editor=/bin/vi \
@ -55,12 +56,10 @@ CONFIGURE_ARGS+= \
--with-rundir=/var/lib/sudo \ --with-rundir=/var/lib/sudo \
--with-vardir=/var/lib/sudo --with-vardir=/var/lib/sudo
CONFIGURE_VARS+= \ CONFIGURE_VARS += \
sudo_cv_uid_t_len=10 \ sudo_cv_uid_t_len=10 \
sudo_cv_func_unsetenv_void=no sudo_cv_func_unsetenv_void=no
include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
cd $(HOST_BUILD_DIR)/lib/util; \ cd $(HOST_BUILD_DIR)/lib/util; \
$(MAKE) mksiglist; $(MAKE) mksigname $(MAKE) mksiglist; $(MAKE) mksigname
@ -71,21 +70,18 @@ define Host/Install
$(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOSTPKG)/bin/ $(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOSTPKG)/bin/
endef endef
$(eval $(call HostBuild))
define Package/sudo/install define Package/sudo/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) \
$(1)/etc/{init.d,sudoers.d} \
$(1)/usr/{bin,sbin} \
$(1)/usr/lib/sudo
$(CP) $(PKG_INSTALL_DIR)/usr/bin/sudo $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/sudo $(1)/usr/bin/
chmod 4755 $(1)/usr/bin/sudo chmod 4755 $(1)/usr/bin/sudo
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/visudo $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/visudo $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc
$(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/ $(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/
chmod 0440 $(1)/etc/sudoers chmod 0440 $(1)/etc/sudoers
$(INSTALL_DIR) $(1)/etc/sudoers.d
$(INSTALL_DIR) $(1)/usr/lib/sudo
$(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo/*.so* $(1)/usr/lib/sudo/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo/*.so* $(1)/usr/lib/sudo/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/sudo.init $(1)/etc/init.d/sudo $(INSTALL_BIN) ./files/sudo.init $(1)/etc/init.d/sudo
endef endef
@ -98,4 +94,5 @@ define Package/sudo/postinst
} }
endef endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,sudo)) $(eval $(call BuildPackage,sudo))