? xorg-x11-6.8.2-r2.ebuild.hardened.patch Index: xorg-x11-6.8.2-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v retrieving revision 1.3 diff -p -u -4 -r1.3 xorg-x11-6.8.2-r2.ebuild --- xorg-x11-6.8.2-r2.ebuild 15 Apr 2005 22:53:03 -0000 1.3 +++ xorg-x11-6.8.2-r2.ebuild 15 Apr 2005 22:56:05 -0000 @@ -44,9 +44,9 @@ inherit eutils flag-o-matic toolchain-fu # that only we only strip stuff that are safe to strip ... RESTRICT="nostrip" # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004) -IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened +IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server insecure-drivers ipv6 minimal mmx nls opengl pam sdk sse static truetype-fonts type1-fonts uclibc xprint xv" # IUSE_INPUT_DEVICES="synaptics wacom" @@ -353,9 +353,9 @@ cflag_setup() { # -fomit-frame-pointer known to break things and is pointless # according to ciaranm # And hardened compiler must be softened. -- fmccor, 20.viii.04 sparc) filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer" - if use hardened && ! use dlloader; then + if has_hardened && ! use dlloader; then einfo "Softening gcc for sparc." ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE" append-flags -fno-pie -fno-PIE fi @@ -625,9 +625,9 @@ host_def_setup() { if use dlloader; then einfo "Setting DoLoadableServer/MakeDllModules to YES." echo "#define DoLoadableServer YES" >> ${HOSTCONF} echo "#define MakeDllModules YES" >> ${HOSTCONF} - if use hardened; then + if has_hardened; then echo "#define HardenedGccSpecs YES" >> ${HOSTCONF} fi fi fi @@ -729,9 +729,9 @@ host_def_setup() { echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ XF86OSCardDrivers XF86ExtraCardDrivers \ DevelDrivers" >> ${HOSTCONF} - if use hardened && ! use dlloader; then + if has_hardened && ! use dlloader; then einfo "Softening the assembler so cfb modules will play nice with sunffb." echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} fi