Make kernel configuration checks non-fatal (#103396)

(Portage version: 2.0.51.22-r2)

4 files changed, 45 insertions, 35 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 60617632d0ec..e578b2f95566 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.126 2005/09/20 15:21:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.127 2005/09/22 23:00:36 mrness Exp $
+
+  22 Sep 2005; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r15.ebuild,
+  ppp-2.4.3-r8.ebuild:
+  Make kernel configuration checks non-fatal (#103396).
 
   20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> ppp-2.4.2-r15.ebuild:
   Stable on sparc
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index dd8d9a119dd4..7be8853a5abe 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9d56ca7dbe1de4d0c1d0ba925053cf01 ChangeLog 22596
-MD5 764b6781ca7e9efe12ed934f674573b1 ppp-2.4.3-r8.ebuild 7825
 MD5 06756b9843bf54824792153605bcac28 ppp-2.4.2-r12.ebuild 6935
+MD5 764b6781ca7e9efe12ed934f674573b1 ppp-2.4.3-r8.ebuild 7825
+MD5 9d56ca7dbe1de4d0c1d0ba925053cf01 ChangeLog 22596
+MD5 8eb03dd4c0c1637ebda12caab2bb6af2 ppp-2.4.2-r15.ebuild 7412
 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
-MD5 2704d3f4b3662bc193d5e5e719a06179 ppp-2.4.2-r15.ebuild 7156
 MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209
-MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
+MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
-MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271
+MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
+MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
+MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
-MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
-MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
-MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
-MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
+MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271
+MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r12 271
 MD5 23a7e77ad13ddd12f281fe134508e52f files/digest-ppp-2.4.2-r15 271
-MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
-MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
 MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
-MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r12 271
+MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
 MD5 b7ba474b501edf4a1179142b306bdcd0 files/digest-ppp-2.4.3-r8 195
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDMCj6KRy60XGEcJIRAnp5AJ4mCWhd/EdQkQlkKrUuTGCUTOYqdACgm7t1
-8zmiv3o3lPklEFjWVYFFnlM=
-=V/d0
------END PGP SIGNATURE-----
+MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
+MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
+MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
diff --git a/net-dialup/ppp/ppp-2.4.2-r15.ebuild b/net-dialup/ppp/ppp-2.4.2-r15.ebuild
index 0bc049ed740e..1142a9d07fe9 100644
--- a/net-dialup/ppp/ppp-2.4.2-r15.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r15.ebuild,v 1.7 2005/09/20 15:21:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r15.ebuild,v 1.8 2005/09/22 23:00:36 mrness Exp $
 
 inherit eutils gnuconfig flag-o-matic linux-info
 
@@ -24,10 +24,6 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 pkg_setup() {
-	CONFIG_CHECK="PPP"
-	use activefilter && CONFIG_CHECK="${CONFIG_CHECK} PPP_FILTER"
-	linux-info_pkg_setup
-
 	if ! use radius; then
 		echo
 		ewarn "RADIUS plugins installation is now controled by radius useflag!"
@@ -204,6 +200,17 @@ src_install() {
 }
 
 pkg_postinst() {
+	if get_version ; then
+		echo
+		ewarn "If any of the following kernel configuration options is missing,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP"
+		use activefilter && CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_BSDCOMP ~PPP_DEFLATE"
+		check_extra_config
+		echo
+	fi
+
 	if ! [ -e ${ROOT}/dev/.devfsd ] || [ -e ${ROOT}/dev/.udev ];	then
 		if [ ! -e ${ROOT}/dev/ppp ]; then
 			mknod ${ROOT}/dev/ppp c 108 0
@@ -212,6 +219,7 @@ pkg_postinst() {
 	if [ "$ROOT" = "/" ]; then
 		/sbin/update-modules
 	fi
+
 	#create *-secrets files if not exists
 	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
 		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
diff --git a/net-dialup/ppp/ppp-2.4.3-r8.ebuild b/net-dialup/ppp/ppp-2.4.3-r8.ebuild
index d5ae690cedc3..6eaf0b2954f7 100644
--- a/net-dialup/ppp/ppp-2.4.3-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r8.ebuild,v 1.2 2005/08/29 05:55:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r8.ebuild,v 1.3 2005/09/22 23:00:36 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -24,10 +24,6 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 pkg_setup() {
-	CONFIG_CHECK="PPP"
-	use activefilter && CONFIG_CHECK="${CONFIG_CHECK} PPP_FILTER"
-	linux-info_pkg_setup
-
 	if ! use radius; then
 		echo
 		ewarn "RADIUS plugins installation is now controled by radius useflag!"
@@ -229,12 +225,24 @@ src_install() {
 }
 
 pkg_postinst() {
+	if get_version ; then
+		echo
+		ewarn "If any of the following kernel configuration options is missing,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP"
+		use activefilter && CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_BSDCOMP ~PPP_DEFLATE"
+		check_extra_config
+		echo
+	fi
+
 	if [ ! -e ${ROOT}/dev/.devfsd ] && [ ! -e ${ROOT}/dev/.udev ] && [ ! -e ${ROOT}/dev/ppp ]; then
 		mknod ${ROOT}/dev/ppp c 108 0
 	fi
 	if [ "$ROOT" = "/" ]; then
 		/sbin/update-modules
 	fi
+
 	#create *-secrets files if not exists
 	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
 		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"