summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2004-04-29 03:53:12 +0000
committerNed Ludd <solar@gentoo.org>2004-04-29 03:53:12 +0000
commitb4ad74194fbd93c0e9b00e5f311c149dbaf8cb4a (patch)
tree8a5668a32ca8f7b0383f38153983073d49662b17 /sys-boot
parent~amd64 (Manifest recommit) (diff)
downloadgentoo-2-b4ad74194fbd93c0e9b00e5f311c149dbaf8cb4a.tar.gz
gentoo-2-b4ad74194fbd93c0e9b00e5f311c149dbaf8cb4a.tar.bz2
gentoo-2-b4ad74194fbd93c0e9b00e5f311c149dbaf8cb4a.zip
Marked syslinux-2.06 stable. Added version syslinux-2.09 ~x86. Added patches which force -fno-stack-protector to be used for both
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/syslinux/ChangeLog9
-rw-r--r--sys-boot/syslinux/Manifest8
-rw-r--r--sys-boot/syslinux/files/digest-syslinux-2.091
-rw-r--r--sys-boot/syslinux/files/syslinux-2.06-nossp.patch36
-rw-r--r--sys-boot/syslinux/files/syslinux-2.09-nossp.patch48
-rw-r--r--sys-boot/syslinux/syslinux-2.06.ebuild6
-rw-r--r--sys-boot/syslinux/syslinux-2.09.ebuild34
7 files changed, 137 insertions, 5 deletions
diff --git a/sys-boot/syslinux/ChangeLog b/sys-boot/syslinux/ChangeLog
index f51564270edd..4cdbda61520e 100644
--- a/sys-boot/syslinux/ChangeLog
+++ b/sys-boot/syslinux/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-boot/syslinux
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.4 2004/04/27 21:41:20 agriffis Exp $
+# $Id: ChangeLog,v 1.5 2004/04/29 03:53:12 solar Exp $
+
+*syslinux-2.09 (28 Apr 2004)
+
+ 28 Apr 2004; <solar@gentoo.org> syslinux-2.06.ebuild, syslinux-2.09.ebuild,
+ files/syslinux-2.06-nossp.patch, files/syslinux-2.09-nossp.patch:
+ Marked syslinux-2.06 stable. Added version syslinux-2.09 ~x86. Added patches
+ which force -fno-stack-protector to be used for both
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> syslinux-2.05.ebuild,
syslinux-2.06.ebuild:
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index df06b756dc0a..e52e6965acb5 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,9 +1,13 @@
+MD5 24c66e472f884f6cdf930eee2602c757 ChangeLog 2161
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 d7198b55f3f822dc53de23616ee54c4f syslinux-1.75.ebuild 609
MD5 7e1f16de0ad84d74e93c6b24012d0e79 syslinux-2.05.ebuild 761
-MD5 1d6530d597ca9933740a7bc2ce7636eb syslinux-2.06.ebuild 763
-MD5 24c66e472f884f6cdf930eee2602c757 ChangeLog 2161
+MD5 59f105831529326c1fff7d3cda2025cc syslinux-2.06.ebuild 879
+MD5 76d82dbedc1552c1678f61bdf85ab1ea syslinux-2.09.ebuild 879
MD5 5c685d9bd473e15d95fd52707ff69cfa files/2.06-nasm.patch 1159
MD5 f1655e42e2fb00292a8887d6d3369ad5 files/digest-syslinux-1.75 65
MD5 cec0b5961400b850b9a5e42fac2e8a73 files/digest-syslinux-2.05 66
MD5 12b2f15ac9a150bd439145bca82fd320 files/digest-syslinux-2.06 66
+MD5 cef56845517154743833aa8ced0d52a6 files/syslinux-2.06-nossp.patch 1535
+MD5 c1fedca0dc3d60aae3efd8edfe2f4e8c files/digest-syslinux-2.09 66
+MD5 f38ec993dba486ddbaf4a50773db388e files/syslinux-2.09-nossp.patch 2257
diff --git a/sys-boot/syslinux/files/digest-syslinux-2.09 b/sys-boot/syslinux/files/digest-syslinux-2.09
new file mode 100644
index 000000000000..3dccffd4dce8
--- /dev/null
+++ b/sys-boot/syslinux/files/digest-syslinux-2.09
@@ -0,0 +1 @@
+MD5 703f11a01acf67a9f83ec082ca395565 syslinux-2.09.tar.bz2 379684
diff --git a/sys-boot/syslinux/files/syslinux-2.06-nossp.patch b/sys-boot/syslinux/files/syslinux-2.06-nossp.patch
new file mode 100644
index 000000000000..a1175ada2e82
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-2.06-nossp.patch
@@ -0,0 +1,36 @@
+diff -Nrup syslinux-2.06/Makefile syslinux-2.06-solar/Makefile
+--- syslinux-2.06/Makefile 2004-04-28 23:31:56.000000000 -0400
++++ syslinux-2.06-solar/Makefile 2004-04-28 23:32:40.000000000 -0400
+@@ -18,7 +18,7 @@
+ OSTYPE = $(shell uname -msr)
+ CC = gcc
+ INCLUDE =
+-CFLAGS = -Wall -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
++CFLAGS = -Wall -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
+ PIC = -fPIC
+ LDFLAGS = -O2 -s
+ AR = ar
+diff -Nrup syslinux-2.06/memdisk/Makefile syslinux-2.06-solar/memdisk/Makefile
+--- syslinux-2.06/memdisk/Makefile 2004-04-28 23:31:55.000000000 -0400
++++ syslinux-2.06-solar/memdisk/Makefile 2004-04-28 23:33:34.000000000 -0400
+@@ -14,7 +14,7 @@
+ VERSION := $(shell cat ../version)
+
+ CC = gcc
+-CFLAGS = -g -Wall -O2 -fomit-frame-pointer -march=i386 \
++CFLAGS = -g -Wall -fno-stack-protector -O2 -fomit-frame-pointer -march=i386 \
+ -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
+ -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
+ LDFLAGS = -g
+diff -Nrup syslinux-2.06/sample/Makefile syslinux-2.06-solar/sample/Makefile
+--- syslinux-2.06/sample/Makefile 2002-11-18 20:00:31.000000000 -0500
++++ syslinux-2.06-solar/sample/Makefile 2004-04-28 23:33:56.000000000 -0400
+@@ -17,7 +17,7 @@
+
+ CC = gcc
+ LD = ld
+-CFLAGS = -march=i386 -O2 -fomit-frame-pointer -I../com32/include
++CFLAGS = -march=i386 -O2 -fomit-frame-pointer -I../com32/include -fno-stack-protector
+ SFLAGS = -march=i386
+ LDFLAGS = -s
+ OBJCOPY = objcopy
diff --git a/sys-boot/syslinux/files/syslinux-2.09-nossp.patch b/sys-boot/syslinux/files/syslinux-2.09-nossp.patch
new file mode 100644
index 000000000000..1390e17d478f
--- /dev/null
+++ b/sys-boot/syslinux/files/syslinux-2.09-nossp.patch
@@ -0,0 +1,48 @@
+diff -Nru syslinux-2.09/Makefile syslinux-2.09-solar/Makefile
+--- syslinux-2.09/Makefile 2004-02-02 03:47:24.000000000 -0500
++++ syslinux-2.09-solar/Makefile 2004-04-28 23:43:00.000000000 -0400
+@@ -18,7 +18,7 @@
+ OSTYPE = $(shell uname -msr)
+ CC = gcc
+ INCLUDE =
+-CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
++CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
+ PIC = -fPIC
+ LDFLAGS = -O2 -s
+ AR = ar
+diff -Nru syslinux-2.09/memdisk/Makefile syslinux-2.09-solar/memdisk/Makefile
+--- syslinux-2.09/memdisk/Makefile 2004-01-24 16:37:22.000000000 -0500
++++ syslinux-2.09-solar/memdisk/Makefile 2004-04-28 23:43:20.000000000 -0400
+@@ -20,7 +20,7 @@
+ ALIGN := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0)
+
+ CC = gcc $(M32)
+-CFLAGS = -g -W -Wall -Os -fomit-frame-pointer -march=i386 $(ALIGN) \
++CFLAGS = -g -W -Wall -Os -fomit-frame-pointer -march=i386 $(ALIGN) -fno-stack-protector \
+ -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
+ LDFLAGS = -g
+ INCLUDE = -I../com32/include
+diff -Nru syslinux-2.09/menu/Makefile syslinux-2.09-solar/menu/Makefile
+--- syslinux-2.09/menu/Makefile 2004-02-25 01:48:05.000000000 -0500
++++ syslinux-2.09-solar/menu/Makefile 2004-04-28 23:43:50.000000000 -0400
+@@ -5,7 +5,7 @@
+ ALIGN := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0)
+
+ CC = gcc
+-CFLAGS = $(M32) -funsigned-char -g -W -Wall -march=i386 $(ALIGN) -Os
++CFLAGS = $(M32) -funsigned-char -g -W -Wall -march=i386 $(ALIGN) -Os -fno-stack-protector
+ AR = ar
+ AS = as
+ LD = ld -m elf_i386
+diff -Nru syslinux-2.09/sample/Makefile syslinux-2.09-solar/sample/Makefile
+--- syslinux-2.09/sample/Makefile 2004-01-24 16:37:22.000000000 -0500
++++ syslinux-2.09-solar/sample/Makefile 2004-04-28 23:44:09.000000000 -0400
+@@ -25,7 +25,7 @@
+ AR = ar
+ NASM = nasm
+ RANLIB = ranlib
+-CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
++CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include -fno-stack-protector
+ SFLAGS = -march=i386
+ LDFLAGS = -s
+ OBJCOPY = objcopy
diff --git a/sys-boot/syslinux/syslinux-2.06.ebuild b/sys-boot/syslinux/syslinux-2.06.ebuild
index 0b8d482f55ba..88df4baa84cd 100644
--- a/sys-boot/syslinux/syslinux-2.06.ebuild
+++ b/sys-boot/syslinux/syslinux-2.06.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.06.ebuild,v 1.3 2004/04/27 21:41:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.06.ebuild,v 1.4 2004/04/29 03:53:12 solar Exp $
inherit eutils
@@ -8,7 +8,7 @@ DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
HOMEPAGE="http://syslinux.zytor.com/"
SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
-KEYWORDS="~x86 -ppc -sparc"
+KEYWORDS="x86 -ppc -sparc"
LICENSE="GPL-2"
SLOT="0"
@@ -19,6 +19,8 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${PV}-nasm.patch
+ # -fstack-protector really does not play along well with any boot loader
+ epatch ${FILESDIR}/${PN}-2.06-nossp.patch
sed -i 's:$(MAKE) -C win32 all::' Makefile
}
diff --git a/sys-boot/syslinux/syslinux-2.09.ebuild b/sys-boot/syslinux/syslinux-2.09.ebuild
new file mode 100644
index 000000000000..2ebd0aa82c4e
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-2.09.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-2.09.ebuild,v 1.1 2004/04/29 03:53:12 solar Exp $
+
+inherit eutils
+
+DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
+HOMEPAGE="http://syslinux.zytor.com/"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
+
+KEYWORDS="~x86 -ppc -sparc"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-lang/nasm
+ sys-fs/mtools"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/2.06-nasm.patch
+ # -fstack-protector really does not play along well with any boot loader
+ epatch ${FILESDIR}/${PN}-2.09-nossp.patch
+ sed -i 's:$(MAKE) -C win32 all::' Makefile
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ make INSTALLROOT=${D} install || die
+ dodoc README NEWS TODO *.doc memdisk/memdisk.doc
+}