From: Tim Yamin <plasmaroo@gentoo.org>
Date: Sun, 19 Sep 2004 09:11:07 +0000 (+0000)
Subject: Disabling dietlibc usage for devfsd and modutils; dietlibc updated to a new
X-Git-Tag: v3.4.10.902~620
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=285047a60037245a13166ad03156129a8be92e3b;p=genkernel.git

Disabling dietlibc usage for devfsd and modutils; dietlibc updated to a new
Hardened-aware version. Bug #60862.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@132 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/gen_compile.sh b/gen_compile.sh
index 9d87a2a..61a7355 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -268,6 +268,9 @@ compile_busybox() {
 }
 
 compile_modutils() {
+	# I've disabled dietlibc support for the time being since the
+	# version we use misses a few needed system calls.
+
 	local ARGS
 	if [ ! -f "${MODUTILS_BINCACHE}" ]
 	then
@@ -281,12 +284,12 @@ compile_modutils() {
 		cd "${MODUTILS_DIR}"
 		print_info 1 "modutils: >> Configuring..."
 
-		if [ "${USE_DIETLIBC}" -eq '1' ]
-		then
-			extract_dietlibc_bincache
-			OLD_CC="${UTILS_CC}"
-			UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
-		fi
+#		if [ "${USE_DIETLIBC}" -eq '1' ]
+#		then
+#			extract_dietlibc_bincache
+#			OLD_CC="${UTILS_CC}"
+#			UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
+#		fi
 
 		export_utils_args
 		export ARCH=${ARCH}
@@ -297,11 +300,11 @@ compile_modutils() {
 		print_info 1 'modutils: >> Compiling...'
 		compile_generic all utils
 
-		if [ "${USE_DIETLIBC}" -eq '1' ]
-		then
-			clean_dietlibc_bincache
-			UTILS_CC="${OLD_CC}"
-		fi
+#		if [ "${USE_DIETLIBC}" -eq '1' ]
+#		then
+#			clean_dietlibc_bincache
+#			UTILS_CC="${OLD_CC}"
+#		fi
 
 		print_info 1 'modutils: >> Copying to cache...'
 		[ -f "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" ] ||
@@ -370,6 +373,9 @@ compile_module_init_tools() {
 }
 
 compile_devfsd() {
+	# I've disabled dietlibc support for the time being since the
+	# version we use misses a few needed system calls.
+
 	local ARGS
 	if [ ! -f "${DEVFSD_BINCACHE}" ]
 	then
@@ -382,26 +388,26 @@ compile_devfsd() {
 			gen_die "Devfsd directory ${DEVFSD_DIR} invalid"
 		cd "${DEVFSD_DIR}"
 
-		if [ "${USE_DIETLIBC}" -eq '1' ]
-		then
-			extract_dietlibc_bincache
-			OLD_CC="${UTILS_CC}"
-			UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
-		fi
+#		if [ "${USE_DIETLIBC}" -eq '1' ]
+#		then
+#			extract_dietlibc_bincache
+#			OLD_CC="${UTILS_CC}"
+#			UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
+#		fi
 
 		print_info 1 'devfsd: >> Compiling...'
-		if [ "${USE_DIETLIBC}" -eq '1' ]
-		then
-			compile_generic 'has_dlopen=0 has_rpcsvc=0' utils
-		else
+#		if [ "${USE_DIETLIBC}" -eq '1' ]
+#		then
+#			compile_generic 'has_dlopen=0 has_rpcsvc=0' utils
+#		else
 			compile_generic 'LDFLAGS=-static' utils
-		fi
+#		fi
 
- 		if [ "${USE_DIETLIBC}" -eq '1' ]
-		then
-			clean_dietlibc_bincache
-			UTILS_CC="${OLD_CC}"
-		fi
+#		if [ "${USE_DIETLIBC}" -eq '1' ]
+#		then
+#			clean_dietlibc_bincache
+#			UTILS_CC="${OLD_CC}"
+#		fi
 
 		print_info 1 '        >> Copying to cache...'
 		[ -f "${TEMP}/${DEVFSD_DIR}/devfsd" ] || gen_die 'The devfsd executable does not exist after the compilation of devfsd!'
diff --git a/genkernel b/genkernel
index ee6c5c8..1470976 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.0.2f'
+GK_V='3.0.2g'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
diff --git a/genkernel.conf b/genkernel.conf
index d568b22..25dc037 100755
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -78,7 +78,7 @@ MODUTILS_SRCTAR="${GK_SHARE}/pkg/modutils-${MODUTILS_VER}.tar.bz2"
 MODUTILS_DIR="modutils-${MODUTILS_VER}"
 MODUTILS_BINCACHE="%%CACHE%%/insmod-%%ARCH%%-static-2.4.bz2"
 
-DIETLIBC_VER="0.24"
+DIETLIBC_VER="0.26"
 DIETLIBC_SRCTAR="${GK_SHARE}/pkg/dietlibc-${DIETLIBC_VER}.tar.bz2"
 DIETLIBC_DIR="dietlibc-${DIETLIBC_VER}"
 DIETLIBC_BINCACHE="%%CACHE%%/dietlibc-${DIETLIBC_VER}-%%ARCH%%.tar.bz2"
diff --git a/pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2 b/pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2
index 3d39ed8..57dac57 100644
Binary files a/pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2 and b/pkg/devfsd-1.3.25-dietlibc-kernel25.tar.bz2 differ
diff --git a/pkg/dietlibc-0.24.tar.bz2 b/pkg/dietlibc-0.24.tar.bz2
deleted file mode 100644
index 75f8e1b..0000000
Binary files a/pkg/dietlibc-0.24.tar.bz2 and /dev/null differ
diff --git a/pkg/dietlibc-0.26.tar.bz2 b/pkg/dietlibc-0.26.tar.bz2
new file mode 100644
index 0000000..204edc0
Binary files /dev/null and b/pkg/dietlibc-0.26.tar.bz2 differ