[or-cvs] r16614: {incognito} Just a bunch of minor stuff to get things working on hardene (in incognito/branches/hardened: . arch/x86 portage.config)

[anonym at seul.org]

Author: anonym
Date: 2008-08-20 19:12:25 -0400 (Wed, 20 Aug 2008)
New Revision: 16614

Modified:
   incognito/branches/hardened/arch/x86/livecd-stage1.spec
   incognito/branches/hardened/arch/x86/livecd-stage2.spec
   incognito/branches/hardened/fsscript.sh
   incognito/branches/hardened/portage.config/package.keywords
   incognito/branches/hardened/portage.config/package.mask
   incognito/branches/hardened/portage.config/package.use
Log:
Just a bunch of minor stuff to get things working on hardened.


Modified: incognito/branches/hardened/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/branches/hardened/arch/x86/livecd-stage1.spec	2008-08-20 23:09:26 UTC (rev 16613)
+++ incognito/branches/hardened/arch/x86/livecd-stage1.spec	2008-08-20 23:12:25 UTC (rev 16614)
@@ -230,6 +230,7 @@
 	net-wireless/zd1211-firmware
 	net-www/mplayerplug-in-bin
 	net-www/netscape-flash
+	sys-apps/chpax
 	sys-apps/eject
 	sys-apps/ethtool
 	sys-apps/fxload
@@ -238,13 +239,14 @@
 	sys-apps/hwsetup
         sys-apps/iproute2
 	sys-apps/netplug
+	sys-apps/paxctl
 	sys-boot/syslinux
 	sys-fs/dosfstools
 	sys-fs/lsscsi
 	sys-libs/gpm
 	sys-power/acpid
 	www-client/links
-	www-client/mozilla-firefox-bin
+	www-client/mozilla-firefox
 	www-servers/lighttpd
 	x11-base/xorg-x11
 	x11-drivers/synaptics

Modified: incognito/branches/hardened/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/branches/hardened/arch/x86/livecd-stage2.spec	2008-08-20 23:09:26 UTC (rev 16613)
+++ incognito/branches/hardened/arch/x86/livecd-stage2.spec	2008-08-20 23:12:25 UTC (rev 16614)
@@ -25,6 +25,7 @@
 
 livecd/rcadd:
 	acpid|boot
+	chpax|default
 	consolefont|boot
 	cupsd|default
 	external-config-setup|boot
@@ -156,7 +157,7 @@
 #	man
 #	man-pages
 	miscfiles
-	pax-utils
+#	pax-utils
 #	patch
 #	perl
 	perl-cleaner

Modified: incognito/branches/hardened/fsscript.sh
===================================================================
--- incognito/branches/hardened/fsscript.sh	2008-08-20 23:09:26 UTC (rev 16613)
+++ incognito/branches/hardened/fsscript.sh	2008-08-20 23:12:25 UTC (rev 16614)
@@ -173,7 +173,7 @@
 
 	# Firefox config, and setting up first run walkthrough
 	echo "Setting up Firefox"
-	if [[ -x /usr/bin/firefox-bin ]]; then
+	if [[ -x /usr/bin/firefox-bin ]] || [[ -x /usr/bin/firefox ]]; then
 		cp -a /var/lib/firefox-config ${USERDIR}/.mozilla
 	fi
 	if [[ -x /usr/sbin/first-run ]]; then

Modified: incognito/branches/hardened/portage.config/package.keywords
===================================================================
--- incognito/branches/hardened/portage.config/package.keywords	2008-08-20 23:09:26 UTC (rev 16613)
+++ incognito/branches/hardened/portage.config/package.keywords	2008-08-20 23:12:25 UTC (rev 16614)
@@ -83,3 +83,5 @@
 <sys-kernel/genkernel-9999 ~*
 x11-libs/libsynaptics ~*
 x11-misc/xdialog ~*
+=x11-drivers/xf86-video-sis-0.9.4 ~*
+=media-gfx/splashutils-1.5.4.2 ~*

Modified: incognito/branches/hardened/portage.config/package.mask
===================================================================
--- incognito/branches/hardened/portage.config/package.mask	2008-08-20 23:09:26 UTC (rev 16613)
+++ incognito/branches/hardened/portage.config/package.mask	2008-08-20 23:12:25 UTC (rev 16614)
@@ -1,5 +1,3 @@
-<sys-devel/gcc-4
-
 # we use split ebuilds for KDE, so we block kdebase to prevent blocks
 kde-base/kdebase
 
@@ -16,6 +14,6 @@
 # We don't want to pull in privoxy by mistake now that we have polipo
 net-proxy/privoxy
 
-# We don't want to compile Firefox from sources as we cannot brand it
-# as such then. We use www-client/mozilla-firefox-bin instead.
-www-client/mozilla-firefox
+# We want to compile Firefox (IceWeasel) to get it hardened, so explicitly
+# avoid the binary package
+www-client/mozilla-firefox-bin

Modified: incognito/branches/hardened/portage.config/package.use
===================================================================
--- incognito/branches/hardened/portage.config/package.use	2008-08-20 23:09:26 UTC (rev 16613)
+++ incognito/branches/hardened/portage.config/package.use	2008-08-20 23:12:25 UTC (rev 16614)
@@ -9,6 +9,7 @@
 app-crypt/truecrypt X
 x11-libs/wxGTK X
 net-irc/xchat tcl
+net-analyzer/nmap -gtk
 
 # When pidgin uses gadu, libgadu must be compiled with -ssl unfortunately
 net-im/pidgin gadu groupwise meanwhile msn ncurses qq zephyr
@@ -20,9 +21,13 @@
 # hal needs the following
 sys-apps/pciutils -zlib
 
-# otherwise mplayer breaks, see: http://forums.gentoo.org/viewtopic-t-678110.html
-media-video/mplayer quicktime
+# qt makes mplayer break, see: http://forums.gentoo.org/viewtopic-t-678110.html
+# custom-cflags will filter out fPIC which makes gcc cry
+media-video/mplayer quicktime custom-cflags
 
 # apply log rotation patch for tor 0.1.2.x series
 net-misc/tor logrotate
 
+# Re-brand Firefox as IceWeasel as we want to redistribute it
+www-client/mozilla-firefox iceweasel
+