From 9297899ccfe48eb6886560291c68d830924d28ef Mon Sep 17 00:00:00 2001 From: delaco Date: Tue, 19 Sep 2006 19:46:43 +0000 Subject: [PATCH] Hinzugefuegt: * SysLinux Patch vergessen. * Workaround um PHP5 zu kompilieren. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@286 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/httpd/httpd.conf | 2 + doc/packages-list.txt | 10 +- lfs/php | 4 +- src/patches/syslinux-3.11-nossp.patch | 173 ++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 src/patches/syslinux-3.11-nossp.patch diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf index 7e00b88268..a3affb8abf 100644 --- a/config/httpd/httpd.conf +++ b/config/httpd/httpd.conf @@ -49,6 +49,8 @@ ErrorLog /var/log/httpd/error_log # Load Modules here Include /etc/httpd/conf/loadmodule.conf +LoadModule php5_module /usr/lib/apache/libphp5.so +# This is only a fake for compiling php - libphp5.so # IP addresses / ports to listen on Include /etc/httpd/conf/listen.conf diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 306dd3fb6f..0a8bed3a97 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -102,6 +102,7 @@ * grep-2.5.1 * groff-1.19 * grub-0.97 + * grub-0.97_old * gzip-1.3.5 * hddtemp-0.3-beta14 * hdparm-6.3 @@ -113,7 +114,10 @@ * inetutils-1.4.2 * ipac-ng-1.31 * ipaddr-1.2 - * ipfire-logs-2006-09-16-21:02.tgz + * ipfire-logs-2006-09-19-07:50.tgz + * ipfire-logs-2006-09-19-16:45.tgz + * ipfire-logs-2006-09-19-17:08.tgz + * ipfire-logs-2006-09-19-19:48.tgz * iproute2-2.4.7-now-ss010824 * iptables-1.3.5 * iptraf-3.0.0 @@ -142,7 +146,7 @@ * libvorbis-1.1.2 * libwww-perl-5.803 * libxml2-2.6.22 - * linux-2.4.33 + * linux-2.4.33.3 * linux-atm-2.4.1 * logrotate-3.7 * logwatch-6.1.2 @@ -226,7 +230,7 @@ * stund_0.96_Aug13 * sudo-1.6.8p12 * sysklogd-1.4.1 - * syslinux-2.11 + * syslinux-3.20 * sysvinit-2.86 * tar-1.13.25 * tcp_wrappers_7.6 diff --git a/lfs/php b/lfs/php index 70a2aa1fd3..fa0c76c250 100644 --- a/lfs/php +++ b/lfs/php @@ -101,6 +101,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/php-$(VER) cd $(DIR_APP) && install -v -m644 CODING_STANDARDS EXTENSIONS INSTALL NEWS README* TODO* UPGRADING php.gif \ /usr/share/doc/php-$(VER) - cd $(DIR_APP) && ln -v -s /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt /usr/share/doc/php-$(VER) + cd $(DIR_APP) && ln -v -sf /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt /usr/share/doc/php-$(VER) + grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak + mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/syslinux-3.11-nossp.patch b/src/patches/syslinux-3.11-nossp.patch new file mode 100644 index 0000000000..5fb804ac70 --- /dev/null +++ b/src/patches/syslinux-3.11-nossp.patch @@ -0,0 +1,173 @@ +borrowed from gentoo +--- syslinux/Makefile ++++ syslinux/Makefile +@@ -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 -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 + PIC = -fPIC + LDFLAGS = -O2 -s + AR = ar +@@ -194,9 +194,8 @@ libsyslinux.a: bootsect_bin.o ldlinux_bi + $(LIB_SO): bootsect_bin.o ldlinux_bin.o syslxmod.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^ + +-gethostip.o: gethostip.c +- +-gethostip: gethostip.o ++gethostip: gethostip.c ++ $(CC) $(LDFLAGS) gethostip.c -o gethostip -fno-stack-protector + + mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl + $(PERL) bin2hex.pl < mbr.bin | cat mkdiskimage.in - > $@ +--- syslinux/com32/lib/MCONFIG ++++ syslinux/com32/lib/MCONFIG +@@ -18,7 +18,7 @@ LIBFLAGS = -DDYNAMIC_CRC_TABLE -DPNG_NO_ + + REQFLAGS = -g -m32 -mregparm=3 -DREGPARM=3 -D__COM32__ -I. -I./sys -I../include + OPTFLAGS = -Os -march=i386 -falign-functions=0 -falign-jumps=0 \ +- -falign-labels=0 ++ -falign-labels=0 -fno-stack-protector + WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline + + CFLAGS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d $(OPTFLAGS) \ +--- syslinux/com32/libutil/Makefile ++++ syslinux/com32/libutil/Makefile +@@ -40,10 +40,10 @@ LD = ld -m elf_i386 + AR = ar + NASM = nasm + RANLIB = ranlib +-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include ++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -D__COM32__ -W -Wall -march=i386 -Os -fomit-frame-pointer -I./include -I../include $(call gcc_ok,-fno-stack-protector,) + SFLAGS = $(M32) -D__COM32__ -march=i386 + LDFLAGS = -T ../lib/com32.ld +-LNXCFLAGS = -I./include -W -Wall -O -g ++LNXCFLAGS = -I./include -W -Wall -O -g $(call gcc_ok,-fno-stack-protector,) + LNXSFLAGS = -g + LNXLDFLAGS = -g + OBJCOPY = objcopy +--- syslinux/com32/modules/Makefile ++++ syslinux/com32/modules/Makefile +@@ -25,8 +25,8 @@ LD = ld -m elf_i386 + AR = ar + NASM = nasm + RANLIB = ranlib +-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ +-LNXCFLAGS = -W -Wall -O -g -I../libutil/include ++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ $(call gcc_ok,-fno-stack-protector,) ++LNXCFLAGS = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,) + LNXSFLAGS = -g + LNXLDFLAGS = -g + SFLAGS = -D__COM32__ -march=i386 +--- syslinux/com32/samples/Makefile ++++ syslinux/com32/samples/Makefile +@@ -25,8 +25,8 @@ LD = ld -m elf_i386 + AR = ar + NASM = nasm + RANLIB = ranlib +-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ +-LNXCFLAGS = -W -Wall -O -g -I../libutil/include ++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I../libutil/include -I../include -D__COM32__ $(call gcc_ok,-fno-stack-protector,) ++LNXCFLAGS = -W -Wall -O -g -I../libutil/include $(call gcc_ok,-fno-stack-protector,) + LNXSFLAGS = -g + LNXLDFLAGS = -g + SFLAGS = -D__COM32__ -march=i386 +--- syslinux/dos/Makefile ++++ syslinux/dos/Makefile +@@ -3,7 +3,7 @@ LD = ld -m elf_i386 + OBJCOPY = objcopy + OPTFLAGS = -g -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-loops=0 -fomit-frame-pointer + INCLUDES = -include code16.h -I. -I.. -I../libfat +-CFLAGS = -W -Wall -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) ++CFLAGS = -W -Wall -fno-stack-protector -ffreestanding -msoft-float $(OPTFLAGS) $(INCLUDES) + LDFLAGS = -T com16.ld + AR = ar + RANLIB = ranlib +--- syslinux/extlinux/Makefile ++++ syslinux/extlinux/Makefile +@@ -1,7 +1,7 @@ + CC = gcc + OPTFLAGS = -g -Os + INCLUDES = -I. -I.. -I../libfat +-CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) ++CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) + LDFLAGS = -s + + SRCS = extlinux.c ../extlinux_bss_bin.c ../extlinux_sys_bin.c +--- syslinux/memdisk/Makefile ++++ syslinux/memdisk/Makefile +@@ -20,7 +20,7 @@ M32 := $(call gcc_ok,-m32,) + FREE := $(call gcc_ok,-ffreestanding,) + + CC = gcc $(M32) $(FREE) +-CFLAGS = -g -W -Wall -Wno-sign-compare \ ++CFLAGS = -g -W -Wall -Wno-sign-compare $(call gcc_ok,-fno-stack-protector,) \ + -Os -fomit-frame-pointer -march=i386 $(ALIGN) \ + -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' + LDFLAGS = -g +--- syslinux/menu/Makefile ++++ syslinux/menu/Makefile +@@ -5,7 +5,7 @@ M32 := $(call gcc_ok,-m32,) + COM32DIR = ../com32 + LUDIR = $(COM32DIR)/libutil + LDIR = $(COM32DIR)/lib +-CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include -Ilibmenu -D__COM32__ ++CFLAGS = $(M32) -mregparm=3 -DREGPARM=3 -W -Wall -march=i386 -Os -fomit-frame-pointer -I$(LUDIR)/include -I$(COM32DIR)/include -Ilibmenu -D__COM32__ $(call gcc_ok,-fno-stack-protector,) + SFLAGS = -D__COM32__ -march=i386 + LDFLAGS = -T $(LDIR)/com32.ld + OBJCOPY = objcopy +--- syslinux/mtools/Makefile ++++ syslinux/mtools/Makefile +@@ -1,7 +1,7 @@ + CC = gcc + OPTFLAGS = -g -Os + INCLUDES = -I. -I.. -I../libfat +-CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) ++CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) + LDFLAGS = -s + + SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c) +--- syslinux/sample/Makefile ++++ syslinux/sample/Makefile +@@ -25,7 +25,7 @@ LD = ld -m elf_i386 + 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 $(call gcc_ok,-fno-stack-protector,) + SFLAGS = -march=i386 + LDFLAGS = -s + OBJCOPY = objcopy +--- syslinux/unix/Makefile ++++ syslinux/unix/Makefile +@@ -1,7 +1,7 @@ + CC = gcc + OPTFLAGS = -g -Os + INCLUDES = -I. -I.. -I../libfat +-CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) ++CFLAGS = -W -Wall -fno-stack-protector -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) + LDFLAGS = -s + + SRCS = syslinux.c ../syslxmod.c ../bootsect_bin.c ../ldlinux_bin.c $(wildcard ../libfat/*.c) +--- syslinux/win32/Makefile ++++ syslinux/win32/Makefile +@@ -23,7 +23,7 @@ ifeq ($(findstring CYGWIN,$(OSTYPE)),CYG + CC = gcc + AR = ar + RANLIB = ranlib +-CFLAGS = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 ++CFLAGS = -mno-cygwin -W -Wall -fno-stack-protector -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 + PIC = + LDFLAGS = -mno-cygwin -Os -s + else +@@ -37,7 +37,7 @@ AR = mingw-ar + RANLIB = mingw-ranlib + endif + +-CFLAGS = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 ++CFLAGS = -W -Wall -fno-stack-protector -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 + PIC = + LDFLAGS = -Os -s + endif -- 2.39.2