summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-26 08:38:18 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-26 08:38:18 +0100
commit6a78bc12e72069ed929e8530e0ec729d85bd97c2 (patch)
tree4a1328ede53334d152d3a0e5128d3d657fd99538
parent18616270023fcfd1fc8c9403760cdcd6cadd8622 (diff)
parenta40de865e18537aaafb1050cbc325606d2750cf1 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/kbd/Makefile2
-rw-r--r--package/sudo/Makefile8
2 files changed, 8 insertions, 2 deletions
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index 51f5f05ae..7923783ca 100644
--- a/package/kbd/Makefile
+++ b/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
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 4289c6e5f..0c3d9562f 100644
--- a/package/sudo/Makefile
+++ b/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