From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 13 Jun 2008 13:53:06 +0000 (+0000)
Subject: Temporarily disabled capabilities.
X-Git-Tag: v3.0-alpha1~963
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f52d47bfa4ef4a91c3de0c9e46e9b9a13dd81d25;p=ipfire-3.x.git

Temporarily disabled capabilities.
---

diff --git a/lfs/inetutils b/lfs/inetutils
index 450bd5d4b..b9fe5a19b 100644
--- a/lfs/inetutils
+++ b/lfs/inetutils
@@ -54,6 +54,7 @@ $(TARGET) :
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-no_server_man_pages-2.patch
+	#cd $(DIR_APP) && sed 's/4775/0755/' -i.orig2 ping/Makefile.in
 	cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
 		--sysconfdir=/etc --localstatedir=/var \
 		--disable-ifconfig --disable-logger --disable-syslogd \
@@ -62,6 +63,6 @@ $(TARGET) :
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	mv -v /usr/bin/ping /bin
-	setcap cap_net_admin=ep /bin/ping
+	#setcap cap_net_admin=ep /bin/ping
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng
index 350ab4543..26a7b9ad8 100644
--- a/lfs/util-linux-ng
+++ b/lfs/util-linux-ng
@@ -69,10 +69,10 @@ ifeq "$(STAGE)" "base"
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 
-	chmod -v -s /bin/mount
-	setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/mount
-	chmod -v -s /bin/umount
-	setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/umount
+	#chmod -v -s /bin/mount
+	#setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/mount
+	#chmod -v -s /bin/umount
+	#setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/umount
 endif
 
 ifeq "$(STAGE)" "installer"