Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 10 years ago
parent
commit
6a78bc12e7
2 changed files with 8 additions and 2 deletions
  1. 1 1
      package/kbd/Makefile
  2. 7 1
      package/sudo/Makefile

+ 1 - 1
package/kbd/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		kbd
 PKG_VERSION:=		2.0.1
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		cc0ee9f2537d8636cae85a8c6541ed2e
+PKG_MD5SUM:=		e9f2b7046312c11cec9e52e22f307b6a
 PKG_DESCR:=		keyboard utility
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libcheck

+ 7 - 1
package/sudo/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		sudo
 PKG_VERSION:=		1.8.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		954d64906c3f6e2436f33445a049c58b
 PKG_DESCR:=		su do
 PKG_SECTION:=		admin
@@ -21,6 +21,12 @@ CONFIGURE_ARGS+=	--without-pam \
 			--without-sendmail \
 			--with-env-editor
 
+ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+CONFIGURE_ARGS+=	--enable-hardening
+else
+CONFIGURE_ARGS+=	--disable-hardening
+endif
+
 sudo-install:
 	$(INSTALL_DIR) $(IDIR_SUDO)/usr/bin
 	$(INSTALL_DIR) $(IDIR_SUDO)/usr/sbin