From fe6d84cbb56f3f331865ff603693c4f73c254b82 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 14 Oct 2006 21:10:36 +0000 Subject: [PATCH] Zwischencommit fuer LFS. Noch zahlreiche Errors :( git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@323 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/isapnptools | 8 +------- lfs/kudzu | 14 +++----------- lfs/l7-protocols | 9 +++------ lfs/logrotate | 14 ++++---------- lfs/logwatch | 16 +++++----------- lfs/mingetty | 18 ++++++------------ lfs/misc-progs | 8 ++------ lfs/mtools | 14 ++++---------- lfs/nano | 18 +++++++----------- make.sh | 8 ++++---- 10 files changed, 39 insertions(+), 88 deletions(-) diff --git a/lfs/isapnptools b/lfs/isapnptools index be5e0e31ef..5d5331f272 100644 --- a/lfs/isapnptools +++ b/lfs/isapnptools @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: isapnptools,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -36,7 +30,7 @@ VER = 1.26 THISAPP = isapnptools-$(VER) DL_FILE = $(THISAPP).tgz -DL_FROM = ftp://ftp.ibiblio.org/pub/Linux/system/hardware +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/kudzu b/lfs/kudzu index c17cb2cd23..81f3d77a86 100644 --- a/lfs/kudzu +++ b/lfs/kudzu @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: kudzu,v 1.9.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 0.99.50 +VER = 1.1.67 THISAPP = kudzu-$(VER) DL_FILE = kudzu_$(VER).orig.tar.gz -DL_FROM = $(URL_DEBIAN)/k/kudzu +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(LFS_PASS)" "install" TARGET = $(DIR_INFO)/$(THISAPP)-install @@ -52,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1f59043bb9b17c1709b4fcd4cae97711 +$(DL_FILE)_MD5 = bfd122f24d3a6a5b3e63a311d1be492d install : $(TARGET) @@ -82,8 +76,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-pam.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-updfstab.conf.patch ifeq "$(LFS_PASS)" "install" cd $(DIR_APP) && make CFLAGS="-Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -I. -I/install/include" libkudzu.a cd $(DIR_APP) && install -m 0644 libkudzu.a /install/lib diff --git a/lfs/l7-protocols b/lfs/l7-protocols index 2474845a52..2c6be1a1c6 100644 --- a/lfs/l7-protocols +++ b/lfs/l7-protocols @@ -26,7 +26,7 @@ include Config -VER = 2006-05-29 +VER = 2006-09-10 THISAPP = l7-protocols-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4c0173dcce3d9c4ee716e39eeecb5b42 +$(DL_FILE)_MD5 = 2496c8e2a3ff2a4fc07a4b144c76ce40 install : $(TARGET) @@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: -# make-packages.sh l7-protocols $(THISAPP)-ipfire-beta-1 - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -77,4 +74,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) mkdir -p /etc/l7-protocols && cp -Rfv $(DIR_APP)/* /etc/l7-protocols @rm -rf $(DIR_APP) - @$(POSTBUILD) \ No newline at end of file + @$(POSTBUILD) diff --git a/lfs/logrotate b/lfs/logrotate index 0c14dc5db2..37a465a46b 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: logrotate,v 1.5.2.4 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 3.7 +VER = 3.7.1 THISAPP = logrotate-$(VER) DL_FILE = logrotate_$(VER).orig.tar.gz -DL_FROM = $(URL_DEBIAN)/l/logrotate +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bf0de3a495294300f32e71f136119c41 +$(DL_FILE)_MD5 = 552639142e163745f6bcd4f1f3816d8a install : $(TARGET) @@ -78,7 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install touch /var/lib/logrotate.status @rm -rf $(DIR_APP) diff --git a/lfs/logwatch b/lfs/logwatch index 0bbb54e198..646ec6d90c 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: logwatch,v 1.8.2.10 2005/10/18 21:30:32 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,12 +26,12 @@ include Config -VER = 6.1.2 +VER = 7.3.1 -THISAPP = logwatch-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = logwatch_$(VER) +DL_FILE = $(THISAPP).orig.tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/logwatch-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a764bf80a31ab04ca788ac1303cba297 +$(DL_FILE)_MD5 = c43a783e791ad4851f44c6af98d71b38 install : $(TARGET) diff --git a/lfs/mingetty b/lfs/mingetty index 65acca039a..d46d673fae 100644 --- a/lfs/mingetty +++ b/lfs/mingetty @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: mingetty,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,12 +26,12 @@ include Config -VER = 1.06 +VER = 1.07 -THISAPP = mingetty-$(VER) +THISAPP = mingetty_$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_SFNET)/mingetty -DIR_APP = $(DIR_SRC)/$(THISAPP) +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/mingetty-$(VER).orig TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f43a493f4ab3aecdba298eab9362f800 +$(DL_FILE)_MD5 = 491dedf1ceff0e0f5f7bb9f55bf5213e install : $(TARGET) @@ -78,7 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/misc-progs b/lfs/misc-progs index f0e5e00f88..f4f4ad8827 100644 --- a/lfs/misc-progs +++ b/lfs/misc-progs @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: misc-progs,v 1.5.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,6 +26,8 @@ include Config +VER = ipfire + THISAPP = misc-progs DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(LFS_PASS)" "install" diff --git a/lfs/mtools b/lfs/mtools index 0323a1f8b6..1d7f29df75 100644 --- a/lfs/mtools +++ b/lfs/mtools @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: mtools,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 3.9.9 +VER = 3.9.10 THISAPP = mtools-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://mtools.linux.lu +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3e68b857b4e1f3a6521d1dfefbd30a36 +$(DL_FILE)_MD5 = 19bc1f06e9c5865b8ad20b1ddd976f5f install : $(TARGET) @@ -79,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nano b/lfs/nano index d69b0de819..46c1899488 100644 --- a/lfs/nano +++ b/lfs/nano @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: nano,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 1.2.4 +VER = 1.2.5 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://www.nano-editor.org/dist/v1.2 +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2c513310ec5e8b63abaecaf48670ac7a +$(DL_FILE)_MD5 = f2b3efbf1cf356d736740d531b6b22c4 install : $(TARGET) @@ -78,9 +72,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --enable-tiny - cd $(DIR_APP) && make + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/nano \ + --enable-color --enable-multibuffer --enable-nanorc --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + cd $(DIR_APP) && install -v -m644 -D nanorc.sample /etc/nano/nanorc.sample ln -sf /usr/bin/nano /usr/bin/pico @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index e76dc57d40..48940fb696 100644 --- a/make.sh +++ b/make.sh @@ -411,17 +411,17 @@ buildipfire() { ipfiremake ipaddr ipfiremake iptstate # ipfiremake iputils -exit 1 ipfiremake l7-protocols - ipfiremake isapnptools - ipfiremake isdn4k-utils - ipfiremake kudzu +# ipfiremake isapnptools # ERROR :( +# ipfiremake isdn4k-utils # What about mISDN??? +# ipfiremake kudzu # ERROR :( ipfiremake logrotate ipfiremake logwatch ipfiremake mingetty ipfiremake misc-progs ipfiremake mtools ipfiremake nano +exit 1 ipfiremake nash ipfiremake nasm ipfiremake URI -- 2.39.2