Browse Source

sudo: bump to version 1.9.8p1

This drops patch 010-cross-compile-fixes.patch
No longer required after:
- https://github.com/sudo-project/sudo/pull/109
- https://github.com/sudo-project/sudo/pull/111

The host-build part can be dropped as the build can now handle building the
mksigname & mksiglist tools with the host tools.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
lilik-openwrt-22.03
Alexandru Ardelean 3 years ago
committed by Rosen Penev
parent
commit
aab8012438
2 changed files with 2 additions and 30 deletions
  1. +2
    -15
      admin/sudo/Makefile
  2. +0
    -15
      admin/sudo/patches/010-cross-compile-fixes.patch

+ 2
- 15
admin/sudo/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sudo PKG_NAME:=sudo
PKG_VERSION:=1.9.7p2
PKG_VERSION:=1.9.8p1
PKG_RELEASE:=$(AUTORELEASE) PKG_RELEASE:=$(AUTORELEASE)
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:=28b5ee725dbf89a7852f42f309ca877d2810a9531b4eecfe59f3a84b6b4afca8
PKG_HASH:=0939ee24df7095a92e0ca4aa3bd53b2a10965a7b921d51a26ab70cdd24388d69
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
@ -23,10 +23,8 @@ PKG_CPE_ID:=cpe:/a:todd_miller:sudo
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
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
@ -61,16 +59,6 @@ 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
define Host/Compile
cd $(HOST_BUILD_DIR)/lib/util; \
$(MAKE) mksiglist; $(MAKE) mksigname
endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin
$(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOSTPKG)/bin/
endef
define Package/sudo/install define Package/sudo/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/etc/{init.d,sudoers.d} \ $(1)/etc/{init.d,sudoers.d} \
@ -95,5 +83,4 @@ define Package/sudo/postinst
} }
endef endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,sudo)) $(eval $(call BuildPackage,sudo))

+ 0
- 15
admin/sudo/patches/010-cross-compile-fixes.patch View File

@ -1,15 +0,0 @@
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -223,10 +223,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
esac
siglist.c: mksiglist
- ./mksiglist > $@
+ mksiglist > $@
signame.c: mksigname
- ./mksigname > $@
+ mksigname > $@
mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@

Loading…
Cancel
Save