From fd3e7da032513d6319db71588d250d1228b5dc2b Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 15 Oct 2006 20:25:07 +0000 Subject: [PATCH] Zwischencommit fuer LFS. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@324 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/amavisd | 2 +- lfs/bridge-utils | 2 +- lfs/clamav | 2 +- lfs/cups | 8 +- lfs/cyrusimap | 6 +- lfs/fetchmail | 2 +- lfs/fwhits | 5 +- lfs/ghostscript | 11 +- lfs/glib | 2 +- lfs/hddtemp | 2 +- lfs/htop | 5 +- lfs/iputils | 3 + lfs/libart | 79 +++++++++ lfs/libpcap | 9 +- lfs/libsafe | 2 +- lfs/lynx | 4 +- lfs/lzo | 10 +- lfs/mailx | 2 +- lfs/mc | 8 +- lfs/nash | 8 +- lfs/nasm | 19 +-- lfs/ntp | 10 +- lfs/oinkmaster | 6 - lfs/openssh | 25 ++- lfs/openswan | 30 ++-- lfs/openvpn | 13 +- lfs/pakfire | 2 + lfs/postfix | 2 +- lfs/pptpclient | 14 +- lfs/procmail | 2 +- lfs/rrdtool | 19 +-- lfs/samba | 2 +- lfs/screen | 5 +- lfs/setserial | 8 +- lfs/setup | 8 +- lfs/smartmontools | 2 +- lfs/snort | 2 +- lfs/spandsp | 21 +-- lfs/squid | 2 +- lfs/squidguard | 2 +- lfs/startscripts | 2 + lfs/sudo | 8 +- lfs/tcpdump | 2 +- lfs/traceroute | 10 +- lfs/vlan | 2 +- lfs/wget | 2 +- lfs/wireless | 2 +- lfs/wput | 2 +- lfs/xinetd | 6 +- make.sh | 16 +- src/patches/iputils-20020927-headers.patch | 150 ++++++++++++++++++ src/patches/iputils-20020927-rh.patch | 31 ++++ src/patches/iputils-glibckernheaders.patch | 74 +++++++++ src/patches/nasm-0.98.39-security_fix-1.patch | 21 +++ 54 files changed, 476 insertions(+), 218 deletions(-) create mode 100644 lfs/libart create mode 100644 src/patches/iputils-20020927-headers.patch create mode 100644 src/patches/iputils-20020927-rh.patch create mode 100644 src/patches/iputils-glibckernheaders.patch create mode 100644 src/patches/nasm-0.98.39-security_fix-1.patch diff --git a/lfs/amavisd b/lfs/amavisd index 4245ad6492..97e73dea52 100644 --- a/lfs/amavisd +++ b/lfs/amavisd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = amavisd -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules diff --git a/lfs/bridge-utils b/lfs/bridge-utils index baea41926b..1191993bed 100644 --- a/lfs/bridge-utils +++ b/lfs/bridge-utils @@ -73,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) \ No newline at end of file diff --git a/lfs/clamav b/lfs/clamav index e1379d20a0..a41ea9728a 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -78,7 +78,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 --sysconfdir=/var/ipfire/clamav - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index 8750936f20..47d7c54e8c 100644 --- a/lfs/cups +++ b/lfs/cups @@ -28,13 +28,13 @@ include Config VER = 1.2.2 -THISAPP = cups-$(VER)-source -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = cups-$(VER) +DL_FILE = $(THISAPP)-source.tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules @@ -78,10 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) # cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure} -# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire cd $(DIR_APP) && make -# cd $(DIR_APP) && make check cd $(DIR_APP) && make install cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb @rm -rf $(DIR_APP) diff --git a/lfs/cyrusimap b/lfs/cyrusimap index cc3b7c4f27..3122f3c4f0 100644 --- a/lfs/cyrusimap +++ b/lfs/cyrusimap @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cyrusimap -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules @@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-acceptinvalidfrom.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.3.3-deleteacl_invalid_identifier_fix.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-notify_sms.patch - # cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/timsieved_reset_sasl_conn.patch cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/allow_auth_plain_proxying.patch cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/authid_normalize.patch @@ -104,7 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-auth=unix --with-perl --with-sasl --with-idle=idled \ --with-syslogfacility=MAIL --enable-listext --without-snmp cd $(DIR_APP) && make depend - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -mkdir /var/imap chown cyrus:mail /var/imap diff --git a/lfs/fetchmail b/lfs/fetchmail index d61174b684..472f7ea6f1 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl --disable-nls --enable-fallback=procmail - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install echo "set logfile /var/log/fetchmail.log" > ~/.fetchmailrc echo "set no bouncemail" >> ~/.fetchmailrc diff --git a/lfs/fwhits b/lfs/fwhits index c7d5ae637b..acb2e20e38 100644 --- a/lfs/fwhits +++ b/lfs/fwhits @@ -26,6 +26,8 @@ include Config +VER = ipfire + THISAPP = fwhits DL_FILE = logtailfwhits DL_FROM = $(URL_IPFIRE) @@ -49,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: -# make-packages.sh fwhits $(THISAPP)-ipfire-beta-1 - ############################################################################### # Downloading, checking, md5sum ############################################################################### diff --git a/lfs/ghostscript b/lfs/ghostscript index 9983611770..425362b9c3 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -28,8 +28,8 @@ include Config VER = 8.15.1 -THISAPP = espgs-$(VER)-source -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = espgs-$(VER) +DL_FILE = $(THISAPP)-source.tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/espgs-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) @@ -86,13 +86,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make cd $(DIR_APP) && make install rmdir -v /usr/lib/ghostscript/8.15 /usr/lib/ghostscript -# ln -v -s ../ghostscript/8.15/doc /usr/share/doc/espgs-8.15.1 -# for INSTFILE in `ls doc` -# do -# if [ ! -f /usr/share/doc/espgs-8.15.1/$INSTFILE ]; then -# install -v -m644 doc/$INSTFILE /usr/share/doc/espgs-8.15.1/ -# fi -# done tar xfz $(DIR_SRC)/cache/ghostscript-fonts-std-8.11.tar.gz -C /usr/share/ghostscript tar xfz $(DIR_SRC)/cache/gnu-gs-fonts-other-6.0.tar.gz -C /usr/share/ghostscript chown -v root:root /usr/share/ghostscript/fonts/* diff --git a/lfs/glib b/lfs/glib index 0e7fc99dc3..7df983154b 100644 --- a/lfs/glib +++ b/lfs/glib @@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) \ No newline at end of file diff --git a/lfs/hddtemp b/lfs/hddtemp index f18e44a7df..3a9769a45f 100644 --- a/lfs/hddtemp +++ b/lfs/hddtemp @@ -77,6 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp -fv $(DIR_DL)/hddtemp.db /etc/hddtemp.db cd $(DIR_APP) && ./configure --prefix=/usr --with-db-path=/etc/hddtemp.db - cd $(DIR_APP) && make && make install + cd $(DIR_APP) && make $(MAKETUNING) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/htop b/lfs/htop index 24cd5a896d..465a7bdf50 100644 --- a/lfs/htop +++ b/lfs/htop @@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: -# make-packages.sh htop $(THISAPP)-ipfire-beta-1 - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -76,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/iputils b/lfs/iputils index e7ad9d70c2..4bbbd3e8f7 100644 --- a/lfs/iputils +++ b/lfs/iputils @@ -72,6 +72,9 @@ $(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 -i $(DIR_SRC)/src/patches/iputils-20020927-headers.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-rh.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-glibckernheaders.patch cd $(DIR_APP) && make ping cd $(DIR_APP) && install -m 0755 ping /usr/bin @rm -rf $(DIR_APP) diff --git a/lfs/libart b/lfs/libart new file mode 100644 index 0000000000..9c6763df68 --- /dev/null +++ b/lfs/libart @@ -0,0 +1,79 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3.17 + +THISAPP = libart_lgpl-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = dfca42529393c8a8f59dc4dc10675a46 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libpcap b/lfs/libpcap index f18d2d6032..5d0ba6a9a3 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -26,7 +26,7 @@ include Config -VER = 0.9.4 +VER = 0.8.3 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 79025766e8027df154cb1f32de8a7974 +$(DL_FILE)_MD5 = 56a9d4615d8354fcfe8cff8c8443c77b install : $(TARGET) @@ -72,8 +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) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make cd $(DIR_APP) && make install + cd $(DIR_APP) && cp -vf pcap-int.h /usr/include @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libsafe b/lfs/libsafe index 5a31ae8f8a..f95031b1cd 100644 --- a/lfs/libsafe +++ b/lfs/libsafe @@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-functioncaching.diff cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-alpha.diff - cd $(DIR_APP) && make libsafe + cd $(DIR_APP) && make libsafe $(MAKETUNING) cd $(DIR_APP) && yes | make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/lynx b/lfs/lynx index 6576d423ff..772dfb77a2 100644 --- a/lfs/lynx +++ b/lfs/lynx @@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - make-packages.sh lynx $(THISAPP)-ipfire-beta-1 + @$(PAK) ############################################################################### # Downloading, checking, md5sum @@ -76,7 +76,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 --libdir=/etc --with-zlib --with-bzlib - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make docdir=/usr/share/doc/lynx-2.8.5/doc helpdir=/usr/share/doc/lynx-2.8.5/help install-full cd $(DIR_APP) && chgrp -v -R root /usr/share/doc/lynx-2.8.5/doc @rm -rf $(DIR_APP) diff --git a/lfs/lzo b/lfs/lzo index c1e88d50df..5b44750e73 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -36,7 +30,7 @@ VER = 2.02 THISAPP = lzo-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = ftp://ftp.uni-koeln.de/util/arc +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -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 --enable-shared - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mailx b/lfs/mailx index 47f90e4f05..6660b70fba 100644 --- a/lfs/mailx +++ b/lfs/mailx @@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make SENDMAIL=/usr/sbin/sendmail + cd $(DIR_APP) && make $(MAKETUNING) SENDMAIL=/usr/sbin/sendmail cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail diff --git a/lfs/mc b/lfs/mc index 8b27ba042d..0623c8c121 100644 --- a/lfs/mc +++ b/lfs/mc @@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -80,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --without-x --disable-nls \ --with-screen=mcslang # --with-samba - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nash b/lfs/nash index 0ff6fc0d7f..73adec1a9a 100644 --- a/lfs/nash +++ b/lfs/nash @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# 30-12-2003 Alan Hourihane # -# - Modified Makefile for IPCop build # -# # -# $Id: nash,v 1.2.2.2 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,6 +26,8 @@ include Config +VER = ipfire + THISAPP = nash DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/nasm b/lfs/nasm index 463034e1a3..67fa7241f9 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -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: nasm,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 0.98.36 +VER = 0.98.39 THISAPP = nasm-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_SFNET)/nasm +DL_FILE = $(THISAPP).tar.bz2 +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 = bb18ea66db23712fd055e7c609e2156e +$(DL_FILE)_MD5 = 2032ad44c7359f7a9a166a40a633e772 install : $(TARGET) @@ -77,9 +71,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fix-1.patch cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/ntp b/lfs/ntp index 334acd2ebf..428fb18ab1 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -26,7 +26,7 @@ include Config -VER = 4.2.0 +VER = 4.2.2 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0f8fabe87cf54f409b57c6283f0c0c3d +$(DL_FILE)_MD5 = 111d879acdcc955e60f527575ab0a71a install : $(TARGET) @@ -72,9 +72,9 @@ $(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)-linuxcaps.patch - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --enable-linuxcaps - cd $(DIR_APP) && make + cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/usr/sbin \ + --sysconfdir=/etc --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -mkdir /etc/ntp chown -R ntp:ntp /etc/ntp diff --git a/lfs/oinkmaster b/lfs/oinkmaster index d9224a007c..d4f1ce9cf4 100644 --- a/lfs/oinkmaster +++ b/lfs/oinkmaster @@ -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: oinkmaster,v 1.1.2.3 2005/09/04 20:13:13 gespinasse Exp $ -# # ############################################################################### ############################################################################### diff --git a/lfs/openssh b/lfs/openssh index b9db94f86d..6c34632145 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -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: openssh,v 1.7.2.5 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 3.9p1 +VER = 4.3p2 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable +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 = 8e1774d0b52aff08f817f3987442a16e +$(DL_FILE)_MD5 = 7e9880ac20a9b9db0d3fea30a9ff3d46 install : $(TARGET) @@ -78,13 +72,12 @@ $(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 --sysconfdir=/etc/ssh --disable-nls \ - --prefix=/usr --target=$(MACHINE) \ - --with-privsep-path=/var/empty \ - --with-ipv4-default \ - --with-default-path=/bin:/usr/bin \ - --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin - cd $(DIR_APP) && make -j 3 + cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \ + --libexecdir=/usr/lib/openssh --with-md5-passwords \ + --with-privsep-path=/var/empty --disable-nls \ + --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install sed -i -e 's/^#\?Port .*$$/Port 222/' \ -e 's/^#\?Protocol .*$$/Protocol 2/' \ diff --git a/lfs/openswan b/lfs/openswan index b6f99a1bde..114f0f10e5 100644 --- a/lfs/openswan +++ b/lfs/openswan @@ -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: openswan,v 1.6.2.17 2005/12/01 23:00:25 franck78 Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 1.0.10 +VER = 2.4.6 THISAPP = openswan-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://www.openswan.org/download/ +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 = 3767814e3c080d146a8c7233dc31e0a9 +$(DL_FILE)_MD5 = b34d71ca49dedad017879b0e912d40dd install : $(TARGET) @@ -78,19 +72,13 @@ $(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/openswan-1.0.1-plutoctl.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.6-numif.patch cd $(DIR_APP) && sed -i \ - -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \ - -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \ - -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc - #remove keywords that may be used to run scripts sf bug#1350181 (bash file=> easy to recover) - cd $(DIR_APP)/utils && sed -i \ - -e 's% prepluto postpluto%%' \ - -e 's% leftupdown%%' _confread - cd $(DIR_APP) && make programs - cd $(DIR_APP) && make install - mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/ + -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \ + -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \ + -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc + cd $(DIR_APP) && make $(MAKETUNING) programs + cd $(DIR_APP) && make $(MAKETUNING) install + #mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/ rm -f /etc/ipsec.conf /etc/ipsec.secrets ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets diff --git a/lfs/openvpn b/lfs/openvpn index 65747db4e8..710d820ff3 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -36,7 +30,7 @@ VER = 2.0.7 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://openvpn.net/release +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -78,8 +72,9 @@ $(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 --enable-pthread --sysconfdir=/var/ipfire/ovpn --prefix=/usr - cd $(DIR_APP) && make + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/ovpn \ + --enable-pthread + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire chown -R nobody:nobody /var/ipfire/ovpn diff --git a/lfs/pakfire b/lfs/pakfire index ff0077b72f..bf462fbfb7 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -26,6 +26,8 @@ include Config +VER = 0.99 + THISAPP = pakfire DIR_APP = /opt/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/postfix b/lfs/postfix index 997cc7249f..a294b32ebb 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -80,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make -f Makefile.init makefiles \ 'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SALS_AUTH -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \ 'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm -lssl -lcrypto -lmysqlclient -L/usr/lib/mysql -lsasl2 -L/usr/lib' - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && sh postfix-install -non-interactive ## Install configuration rm -vf /etc/postfix/main.cf.default diff --git a/lfs/pptpclient b/lfs/pptpclient index 8f25bd04f7..ce51358c2b 100644 --- a/lfs/pptpclient +++ b/lfs/pptpclient @@ -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: pptpclient,v 1.4.2.4 2005/04/13 23:52:04 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 1.6.0 +VER = 1.7.1 THISAPP = pptp-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_SFNET)/pptpclient +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 = 9a706327fb9827541d7c86d48ceb9631 +$(DL_FILE)_MD5 = b47735ba5d6d37dfdbccb85afc044ede 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/procmail b/lfs/procmail index 4cd7683efc..97abe0a0cf 100644 --- a/lfs/procmail +++ b/lfs/procmail @@ -40,7 +40,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = procmail -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules diff --git a/lfs/rrdtool b/lfs/rrdtool index f5a2dc0f39..bbc5420b79 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -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: rrdtool,v 1.5.2.6 2005/12/21 09:56:21 eoberlander Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 1.0.49 +VER = 1.2.15 THISAPP = rrdtool-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x +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 = fbe492dbf3d68abb1d86c2322e7ed44a +$(DL_FILE)_MD5 = bde8b12c202bc4e27fb9a9588a0aaddf install : $(TARGET) @@ -78,10 +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) && sh configure --prefix=/usr/share/$(THISAPP) \ + cd $(DIR_APP) && ./configure --prefix=/usr/share/$(THISAPP) \ --exec-prefix=/usr --mandir=/usr/share/man \ - --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2 - cd $(DIR_APP) && make + --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2 \ + --disable-python --disable-tcl + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && make site-perl-install -mkdir -p /home/httpd/html/graphs/ diff --git a/lfs/samba b/lfs/samba index 7d5381139c..6104dcb50b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules diff --git a/lfs/screen b/lfs/screen index d59eaa57af..bd134e1d5d 100644 --- a/lfs/screen +++ b/lfs/screen @@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: -# make-packages.sh screen $(THISAPP)-ipfire-beta-1 - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -77,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --with-socket-dir=/var/run/screen --with-sys-screenrc=/etc/screenrc cd $(DIR_APP) && sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -m 644 etc/etcscreenrc /etc/screenrc @rm -rf $(DIR_APP) diff --git a/lfs/setserial b/lfs/setserial index c3d0c7dd83..3f97c82ec7 100644 --- a/lfs/setserial +++ b/lfs/setserial @@ -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: setserial,v 1.3.2.2 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -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 --disable-nls - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/setup b/lfs/setup index e7bbf1c570..e172b75712 100644 --- a/lfs/setup +++ b/lfs/setup @@ -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: setup,v 1.4.2.3 2006/01/11 01:01:38 franck78 Exp $ -# # ############################################################################### ############################################################################### @@ -32,6 +26,8 @@ include Config +VER = ipfire + THISAPP = setup DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/smartmontools b/lfs/smartmontools index bf394c9e45..7fbbf7b906 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -73,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/snort b/lfs/snort index 35d2c64636..ac519778ac 100644 --- a/lfs/snort +++ b/lfs/snort @@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \ --sysconfdir=/etc/snort \ --enable-linux-smp-stats - cd $(DIR_APP) && make -j 3 + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install mv /usr/bin/snort /usr/sbin/ -mkdir /etc/snort diff --git a/lfs/spandsp b/lfs/spandsp index 83c0e3bc9f..16554166ce 100644 --- a/lfs/spandsp +++ b/lfs/spandsp @@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,12 +26,12 @@ include Config -VER = 0.0.2pre25 +VER = 0.0.3pre24 THISAPP = spandsp-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://soft-switch.org/downloads/spandsp/spandsp-0.0.2pre25 -DIR_APP = $(DIR_SRC)/spandsp-0.0.2 +DL_FILE = $(THISAPP).tgz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/spandsp-0.0.3 TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2bbd518eec1ac0214d1d0f8abb6772a3 +$(DL_FILE)_MD5 = 1546abc89df5b36170acac6622784799 install : $(TARGET) @@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - make-packages.sh spandsp $(THISAPP)-ipfire-beta-1 - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -82,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/squid b/lfs/squid index d07fdf6f08..3db063e135 100644 --- a/lfs/squid +++ b/lfs/squid @@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-referer-log \ --with-pthreads --with-dl - cd $(DIR_APP) && make -j 3 + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install rm -f /etc/squid/squid.conf diff --git a/lfs/squidguard b/lfs/squidguard index 5145ba460c..39aa7c0585 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \ --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install # URL-Filter diff --git a/lfs/startscripts b/lfs/startscripts index f31212100a..67e4f7a8c8 100644 --- a/lfs/startscripts +++ b/lfs/startscripts @@ -26,6 +26,8 @@ include Config +VER = ipfire + THISAPP = startscripts DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/sudo b/lfs/sudo index 67abe6c3ed..9aa1a8cd6d 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -82,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-noargs-shell --with-ignore-dot --with-all-insults \ --enable-shell-sets-home && \ - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/tcpdump b/lfs/tcpdump index 923907ace0..94625d2797 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-isis-dos.patch #CAN 2005-1278 cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-ldp-dos.patch #CAN 2005-1279 cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make DEFS="-D_U_=\"\" -DHAVE_CONFIG_H" + cd $(DIR_APP) && make $(MAKETUNING) DEFS="-D_U_=\"\" -DHAVE_CONFIG_H" cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/traceroute b/lfs/traceroute index 8e861661a0..704179ddb7 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -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: traceroute,v 1.4.2.2 2005/02/05 15:38:16 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -36,7 +30,7 @@ VER = 1.4a12 THISAPP = traceroute-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = ftp://ftp.ee.lbl.gov +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -80,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i 's|@prefix@|/usr|' Makefile.in cd $(DIR_APP) && ./configure - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && make install-man chmod u-s /usr/sbin/traceroute diff --git a/lfs/vlan b/lfs/vlan index 0b81050505..6cd4a7cc76 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -72,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) && install -c -p -m 0755 vconfig /sbin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/wget b/lfs/wget index 866f16e9fa..f716246b1a 100644 --- a/lfs/wget +++ b/lfs/wget @@ -73,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 --with-ssl --disable-nls --disable-ipv6 - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/wireless b/lfs/wireless index d4a7a1ba7c..f7096e8f80 100644 --- a/lfs/wireless +++ b/lfs/wireless @@ -73,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) && sed -i 's#\# KERNEL_SRC#KERNEL_SRC#' Makefile - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/wput b/lfs/wput index 6cdb081f4b..8095454f0a 100644 --- a/lfs/wput +++ b/lfs/wput @@ -73,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 --disable-nls - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xinetd b/lfs/xinetd index 9de9a842c3..86774bad4f 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -17,7 +17,7 @@ # # # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # - +# # ############################################################################### ############################################################################### @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = xinetd -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules @@ -78,7 +78,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 --with-loadavg --sysconfdir=/var/ipfire/xinetd - cd $(DIR_APP) && make + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd/xinetd.d echo "# Begin /var/ipfire/xinetd/xinetd.conf" > /var/ipfire/xinetd/xinetd.conf diff --git a/make.sh b/make.sh index 48940fb696..b984c17fbf 100644 --- a/make.sh +++ b/make.sh @@ -325,7 +325,7 @@ buildipfire() { ipfiremake ppp ipfiremake rp-pppoe ipfiremake unzip - ipfiremake linux PASS=I +# ipfiremake linux PASS=I # Can we remove the installer kernel? ipfiremake linux PASS=S # ipfiremake 3cp4218 PASS=SMP # ipfiremake amedyn PASS=SMP @@ -374,12 +374,13 @@ buildipfire() { ipfiremake lcms ipfiremake libmng ipfiremake freetype + ipfiremake libart ipfiremake gd ipfiremake popt ipfiremake pcre ipfiremake slang ipfiremake newt -# ipfiremake libcap + ipfiremake libcap ipfiremake pciutils ipfiremake libxml2 ipfiremake BerkeleyDB @@ -410,7 +411,7 @@ buildipfire() { ipfiremake ipac-ng ipfiremake ipaddr ipfiremake iptstate -# ipfiremake iputils + ipfiremake iputils ipfiremake l7-protocols # ipfiremake isapnptools # ERROR :( # ipfiremake isdn4k-utils # What about mISDN??? @@ -421,9 +422,9 @@ buildipfire() { ipfiremake misc-progs ipfiremake mtools ipfiremake nano -exit 1 ipfiremake nash ipfiremake nasm +### The Perl Modules have to be updated! I will skip this now! ipfiremake URI ipfiremake HTML-Tagset ipfiremake HTML-Parser @@ -447,6 +448,7 @@ exit 1 ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake GeoIP +### ipfiremake fwhits ipfiremake noip_updater ipfiremake ntp @@ -461,7 +463,7 @@ exit 1 ipfiremake squid ipfiremake squid-graph ipfiremake squidguard - ipfiremake tcpdump +# ipfiremake tcpdump ipfiremake traceroute ipfiremake vlan ipfiremake wireless @@ -477,7 +479,6 @@ exit 1 ipfiremake pkg-config ipfiremake glib ipfiremake pammysql - ipfiremake saslauthd PASS=2 ipfiremake xinetd ipfiremake ghostscript ipfiremake cups @@ -501,8 +502,9 @@ exit 1 ipfiremake clamav ipfiremake razor ipfiremake spamassassin -# ipfiremake amavisd + ipfiremake amavisd ipfiremake stund +exiterror Bis hierhin und nicht weiter! ipfiremake zaptel ipfiremake libpri ipfiremake bristuff diff --git a/src/patches/iputils-20020927-headers.patch b/src/patches/iputils-20020927-headers.patch new file mode 100644 index 0000000000..3f8be1647b --- /dev/null +++ b/src/patches/iputils-20020927-headers.patch @@ -0,0 +1,150 @@ +diff -urN iputils/clockdiff.c iputils.new/clockdiff.c +--- iputils/clockdiff.c 2002-02-22 19:10:59.000000000 -0500 ++++ iputils.new/clockdiff.c 2003-09-10 09:20:28.000000000 -0400 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urN iputils/ping6.c iputils.new/ping6.c +--- iputils/ping6.c 2003-09-10 17:27:48.000000000 -0400 ++++ iputils.new/ping6.c 2003-09-10 17:22:43.000000000 -0400 +@@ -68,8 +68,44 @@ + */ + #include "ping_common.h" + +-#include +-#include ++struct ipv6_rt_hdr { ++ __u8 nexthdr; ++ __u8 hdrlen; ++ __u8 type; ++ __u8 segments_left; ++ ++ /* ++ * type specific data ++ * variable length field ++ */ ++}; ++ ++struct rt0_hdr { ++ struct ipv6_rt_hdr rt_hdr; ++ __u32 bitmap; /* strict/loose bit map */ ++ struct in6_addr addr[0]; ++ ++#define rt0_type rt_hdr.type; ++}; ++#define IPV6_SRCRT_TYPE_0 0 /* IPv6 type 0 Routing Header */ ++struct ipv6hdr { ++#if defined(__LITTLE_ENDIAN) ++ __u8 priority:4, ++ version:4; ++#elif defined(__BIG_ENDIAN) ++ __u8 version:4, ++ priority:4; ++#endif ++ __u8 flow_lbl[3]; ++ ++ __u16 payload_len; ++ __u8 nexthdr; ++ __u8 hop_limit; ++ ++ struct in6_addr saddr; ++ struct in6_addr daddr; ++}; ++ + #include + + #define BIT_CLEAR(nr, addr) do { ((__u32 *)(addr))[(nr) >> 5] &= ~(1U << ((nr) & 31)); } while(0) +diff -urN iputils/ping.c iputils.new/ping.c +--- iputils/ping.c 2003-09-10 17:27:48.000000000 -0400 ++++ iputils.new/ping.c 2003-09-10 17:18:16.000000000 -0400 +@@ -60,8 +60,8 @@ + + #include "ping_common.h" + ++#include + #include +-#include + + + #define MAXIPLEN 60 +diff -urN iputils/ping_common.h iputils.new/ping_common.h +--- iputils/ping_common.h 2002-09-20 11:08:11.000000000 -0400 ++++ iputils.new/ping_common.h 2003-09-10 17:16:16.000000000 -0400 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + + #include "SNAPSHOT.h" +diff -urN iputils/tftpd.c iputils.new/tftpd.c +--- iputils/tftpd.c 2002-01-23 19:31:41.000000000 -0500 ++++ iputils.new/tftpd.c 2003-09-10 09:39:45.000000000 -0400 +@@ -57,7 +57,6 @@ + + #include + #include +-#include + #include + + #include +diff -urN iputils/tracepath6.c iputils.new/tracepath6.c +--- iputils/tracepath6.c 2001-09-01 22:03:46.000000000 -0400 ++++ iputils.new/tracepath6.c 2003-09-10 09:40:18.000000000 -0400 +@@ -14,8 +14,7 @@ + #include + #include + #include +- +-#include ++#include + #include + #include + #include +diff -urN iputils/tracepath.c iputils.new/tracepath.c +--- iputils/tracepath.c 2002-02-22 19:10:59.000000000 -0500 ++++ iputils.new/tracepath.c 2003-09-10 06:14:35.000000000 -0400 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urN iputils/traceroute6.c iputils.new/traceroute6.c +--- iputils/traceroute6.c 2002-09-20 11:44:22.000000000 -0400 ++++ iputils.new/traceroute6.c 2003-09-10 10:12:47.000000000 -0400 +@@ -246,9 +246,24 @@ + #include + #include + +-#include +-#include ++#include ++struct ipv6hdr { ++#if defined(__LITTLE_ENDIAN) ++ __u8 priority:4, ++ version:4; ++#elif defined(__BIG_ENDIAN) ++ __u8 version:4, ++ priority:4; ++#endif ++ __u8 flow_lbl[3]; ++ ++ __u16 payload_len; ++ __u8 nexthdr; ++ __u8 hop_limit; + ++ struct in6_addr saddr; ++ struct in6_addr daddr; ++}; + #include + + #include diff --git a/src/patches/iputils-20020927-rh.patch b/src/patches/iputils-20020927-rh.patch new file mode 100644 index 0000000000..23d6fd8024 --- /dev/null +++ b/src/patches/iputils-20020927-rh.patch @@ -0,0 +1,31 @@ +--- iputils/doc/Makefile.rh7 2002-02-23 01:17:57.000000000 +0100 ++++ iputils/doc/Makefile 2004-05-12 14:55:16.724448173 +0200 +@@ -2,7 +2,7 @@ + HTMLFILES=$(subst .sgml,.html,$(SGMLFILES)) index.html + MANFILES=$(subst .sgml,.8,$(SGMLFILES)) + +-all: html ++all: + + html: $(HTMLFILES) iputils.html + +--- iputils/Makefile.rh7 2002-09-20 20:23:55.000000000 +0200 ++++ iputils/Makefile 2004-05-12 15:08:25.638310270 +0200 +@@ -24,14 +24,14 @@ + CC=gcc + # What a pity, all new gccs are buggy and -Werror does not work. Sigh. + #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror +-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g +-CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) ++#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g ++#CFLAGS=$(CCOPT) $(DEFINES) + + IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd + IPV6_TARGETS=tracepath6 traceroute6 ping6 + TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) + +-all: check-kernel $(TARGETS) ++all: $(TARGETS) + + + tftpd: tftpd.o tftpsubs.o diff --git a/src/patches/iputils-glibckernheaders.patch b/src/patches/iputils-glibckernheaders.patch new file mode 100644 index 0000000000..88a54b1bb4 --- /dev/null +++ b/src/patches/iputils-glibckernheaders.patch @@ -0,0 +1,74 @@ +diff -ru iputils/include-glibc/netinet/in.h iputils-clean/include-glibc/netinet/in.h +--- iputils/include-glibc/netinet/in.h 2000-06-18 14:57:25.000000000 -0400 ++++ iputils-clean/include-glibc/netinet/in.h 2003-09-03 11:21:55.000000000 -0400 +@@ -8,4 +8,45 @@ + + #define SOL_IP 0 + +-#endif /* netinet/in.h */ ++/* Functions to convert between host and network byte order. ++ ++ Please note that these functions normally take `unsigned long int' or ++ `unsigned short int' values as arguments and also return them. But ++ this was a short-sighted decision since on different systems the types ++ may have different representations but the values are always the same. */ ++ ++extern u_int32_t ntohl (u_int32_t __netlong) __THROW __attribute__ ((__const__)); ++extern u_int16_t ntohs (u_int16_t __netshort) ++ __THROW __attribute__ ((__const__)); ++extern u_int32_t htonl (u_int32_t __hostlong) ++ __THROW __attribute__ ((__const__)); ++extern u_int16_t htons (u_int16_t __hostshort) ++ __THROW __attribute__ ((__const__)); ++ ++#include ++ ++/* Get machine dependent optimized versions of byte swapping functions. */ ++#include ++ ++#ifdef __OPTIMIZE__ ++/* We can optimize calls to the conversion functions. Either nothing has ++ to be done or we are using directly the byte-swapping functions which ++ often can be inlined. */ ++# if __BYTE_ORDER == __BIG_ENDIAN ++/* The host byte order is the same as network byte order, ++ so these functions are all just identity. */ ++# define ntohl(x) (x) ++# define ntohs(x) (x) ++# define htonl(x) (x) ++# define htons(x) (x) ++# else ++# if __BYTE_ORDER == __LITTLE_ENDIAN ++# define ntohl(x) __bswap_32 (x) ++# define ntohs(x) __bswap_16 (x) ++# define htonl(x) __bswap_32 (x) ++# define htons(x) __bswap_16 (x) ++# endif ++# endif ++#endif ++ ++#endif /* netinet/in.h */ +diff -ru iputils/ping6.c iputils-clean/ping6.c +--- iputils/ping6.c 2003-09-03 11:22:46.000000000 -0400 ++++ iputils-clean/ping6.c 2003-09-03 11:15:42.000000000 -0400 +@@ -879,7 +879,7 @@ + once = 1; + + /* Patch bpflet for current identifier. */ +- insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); ++ insns[1] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); + + if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) + perror("WARNING: failed to install socket filter\n"); +diff -ru iputils/ping.c iputils-clean/ping.c +--- iputils/ping.c 2003-09-03 11:22:46.000000000 -0400 ++++ iputils-clean/ping.c 2003-09-03 11:15:26.000000000 -0400 +@@ -1196,7 +1196,7 @@ + once = 1; + + /* Patch bpflet for current identifier. */ +- insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __constant_htons(ident), 0, 1); ++ insns[2] = (struct sock_filter)BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, htons(ident), 0, 1); + + if (setsockopt(icmp_sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter))) + perror("WARNING: failed to install socket filter\n"); diff --git a/src/patches/nasm-0.98.39-security_fix-1.patch b/src/patches/nasm-0.98.39-security_fix-1.patch new file mode 100644 index 0000000000..795d0a370e --- /dev/null +++ b/src/patches/nasm-0.98.39-security_fix-1.patch @@ -0,0 +1,21 @@ +Submitted By: Ken Moffat +Date: 2005-08-08 +Initial Package Version: 0.98.39 +Upstream Status: From upstream cvs +Origin: Extracted by Ken Moffat +Description: This is Jindrich Novy's patch to fix another buffer overrun +in nasm, CAN-2005-1194 (users who can be persuaded to assemble and run a +malicious source file can have arbitrary code executed via a buffer +overflow). + +--- nasm-0.98.39/output/outieee.c.orig 2005-01-15 22:16:08.000000000 +0000 ++++ nasm-0.98.39/output/outieee.c 2005-08-08 22:12:46.000000000 +0100 +@@ -1120,7 +1120,7 @@ + va_list ap; + + va_start(ap, format); +- vsprintf(buffer, format, ap); ++ vsnprintf(buffer, sizeof(buffer), format, ap); + l = strlen(buffer); + for (i = 0; i < l; i++) + if ((buffer[i] & 0xff) > 31) -- 2.39.5