From: ms Date: Sun, 26 Mar 2006 18:46:32 +0000 (+0000) Subject: Update Squid to 2.5STABLE13. X-Git-Tag: v2.3-beta1~1168 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1fe6c87bf3995d09f1e2c4be7135860127805c21 Update Squid to 2.5STABLE13. Added WGET/HDDTEMP/BRIDGE-UTILS. SCSI-GRUB-Konfiguration angepasst. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@85 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/etc/ld.so.conf b/config/etc/ld.so.conf index 2c5046a040..8a7d12aa79 100644 --- a/config/etc/ld.so.conf +++ b/config/etc/ld.so.conf @@ -1,5 +1,5 @@ # Begin /etc/ld.so.conf # Lampp-LIBS -/opt/lampp/lib +#/opt/lampp/lib /opt/lampp/lib/mysql # End /etc/ld.so.conf diff --git a/config/grub/scsigrub.conf b/config/grub/scsigrub.conf index d58e78102b..bdceb5b47e 100644 --- a/config/grub/scsigrub.conf +++ b/config/grub/scsigrub.conf @@ -2,23 +2,23 @@ timeout 5 default saved foreground = 16064e background = ffffff -splashimage (hd0,0)/grub/ipcop.xpm.gz -title IPCop +splashimage (hd0,0)/grub/ipfire.xpm.gz +title IPFire root (hd0,0) kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off rw initrd /ipcoprd.img savedefault -title IPCop SMP +title IPFire SMP root (hd0,0) kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off rw initrd /ipcoprd-smp.img savedefault -title IPCop (ACPI enabled) +title IPFire (ACPI enabled) root (hd0,0) kernel /vmlinuz root=ROOT panic=10 init=/linuxrc rw initrd /ipcoprd.img savedefault -title IPCop SMP (ACPI HT enabled) +title IPFire SMP (ACPI HT enabled) root (hd0,0) kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht rw initrd /ipcoprd-smp.img diff --git a/config/kernel/kernel.config.i386 b/config/kernel/kernel.config.i386 index 379e9c80e2..db2e779fce 100644 --- a/config/kernel/kernel.config.i386 +++ b/config/kernel/kernel.config.i386 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_X86=y # CONFIG_SBUS is not set @@ -156,9 +156,6 @@ CONFIG_PARPORT_PC_CML1=m CONFIG_PARPORT_SERIAL=m CONFIG_PARPORT_PC_FIFO=y CONFIG_PARPORT_PC_SUPERIO=y -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_PARPORT_PC_PCMCIA is not set # CONFIG_PARPORT_AMIGA is not set # CONFIG_PARPORT_MFC3 is not set @@ -168,11 +165,6 @@ CONFIG_SCSI_IMM=m # CONFIG_PARPORT_IP22 is not set CONFIG_PARPORT_OTHER=y # CONFIG_PARPORT_1284 is not set -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_TIPAR=m -# CONFIG_SCSI_IZIP_SLOW_CTR is not set # # Plug and Play configuration @@ -338,7 +330,6 @@ CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_IP_NF_COMPAT_IPCHAINS is not set # CONFIG_IP_NF_COMPAT_IPFWADM is not set -CONFIG_IMQ=m # # IP: Virtual Server Configuration @@ -358,19 +349,10 @@ CONFIG_ATM_CLIP_NO_ICMP=y CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_VLAN_8021Q=m - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set - -# -# Appletalk devices -# -# CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set -# CONFIG_BRIDGE is not set +CONFIG_BRIDGE=m # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set @@ -415,10 +397,6 @@ CONFIG_NET_CLS_POLICE=y # # CONFIG_NET_PKTGEN is not set CONFIG_IPSEC=m - -# -# IPSec options (FreeS/WAN) -# CONFIG_IPSEC_IPIP=y CONFIG_IPSEC_AH=y CONFIG_IPSEC_AUTH_HMAC_MD5=y @@ -458,10 +436,6 @@ CONFIG_IDE=y # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_IDE_SATA is not set @@ -475,10 +449,6 @@ CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# CONFIG_BLK_DEV_CMD640=y # CONFIG_BLK_DEV_CMD640_ENHANCED is not set # CONFIG_BLK_DEV_ISAPNP is not set @@ -536,10 +506,6 @@ CONFIG_BLK_DEV_ATARAID_SII=m # SCSI support # CONFIG_SCSI=m - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=m CONFIG_SD_EXTRA_DEVS=8 # CONFIG_CHR_DEV_ST is not set @@ -548,10 +514,6 @@ CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_SR_EXTRA_DEVS=2 CONFIG_CHR_DEV_SG=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set @@ -627,6 +589,10 @@ CONFIG_IBMMCA_SCSI_DEV_RESET=y CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_NCR53C406A=m CONFIG_SCSI_NCR_D700=m CONFIG_53C700_IO_MAPPED=y @@ -718,6 +684,7 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m +CONFIG_IMQ=m CONFIG_TUN=m # CONFIG_ETHERTAP is not set # CONFIG_NET_SB1000 is not set @@ -857,17 +824,9 @@ CONFIG_HERMES=m CONFIG_PLX_HERMES=m CONFIG_TMD_HERMES=m CONFIG_PCI_HERMES=m - -# -# Wireless Pcmcia cards support -# CONFIG_PCMCIA_HERMES=m CONFIG_AIRO_CS=m # CONFIG_PCMCIA_ATMEL is not set - -# -# Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) -# CONFIG_PRISM54=m CONFIG_FW_LOADER=m CONFIG_NET_WIRELESS=y @@ -953,19 +912,11 @@ CONFIG_ISDN_AUDIO=y # CONFIG_ISDN_DRV_LOOP is not set # CONFIG_ISDN_DIVERSION is not set -# -# low-level hardware drivers -# - # # Passive ISDN cards # CONFIG_ISDN_DRV_HISAX=m CONFIG_ISDN_HISAX=y - -# -# D-channel protocol features -# CONFIG_HISAX_EURO=y CONFIG_DE_AOC=y CONFIG_HISAX_NO_SENDCOMPLETE=y @@ -974,10 +925,6 @@ CONFIG_HISAX_NO_KEYPAD=y CONFIG_HISAX_1TR6=y CONFIG_HISAX_NI1=y CONFIG_HISAX_MAX_CARDS=8 - -# -# HiSax supported cards -# CONFIG_HISAX_16_0=y CONFIG_HISAX_16_3=y CONFIG_HISAX_AVM_A1=y @@ -1090,6 +1037,10 @@ CONFIG_N_HDLC=m # CONFIG_STALDRV is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_TIPAR=m # # I2C support @@ -1113,10 +1064,6 @@ CONFIG_UNIX98_PTY_COUNT=256 # CONFIG_INPUT_EMU10K1 is not set # CONFIG_INPUT_SERIO is not set # CONFIG_INPUT_SERPORT is not set - -# -# Joysticks -# # CONFIG_INPUT_ANALOG is not set # CONFIG_INPUT_A3D is not set # CONFIG_INPUT_ADI is not set @@ -1344,26 +1291,14 @@ CONFIG_VIDEO_SELECT=y # CONFIG_USB=m # CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# CONFIG_USB_DEVICEFS=y # CONFIG_USB_BANDWIDTH is not set - -# -# USB Host Controller Drivers -# CONFIG_USB_EHCI_HCD=m CONFIG_USB_UHCI=m CONFIG_USB_UHCI_ALT=m CONFIG_USB_OHCI=m # CONFIG_USB_SL811HS_ALT is not set # CONFIG_USB_SL811HS is not set - -# -# USB Device Class drivers -# # CONFIG_USB_AUDIO is not set # CONFIG_USB_EMI26 is not set # CONFIG_USB_BLUETOOTH is not set @@ -1380,10 +1315,6 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_JUMPSHOT is not set CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m - -# -# USB Human Interface Devices (HID) -# CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y CONFIG_USB_HIDDEV=y @@ -1393,47 +1324,23 @@ CONFIG_USB_HIDDEV=y # CONFIG_USB_WACOM is not set # CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set - -# -# USB Imaging devices -# # CONFIG_USB_DC2XX is not set # CONFIG_USB_MDC800 is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_MICROTEK is not set # CONFIG_USB_HPUSBSCSI is not set - -# -# USB Multimedia devices -# - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# -# USB Network adaptors -# CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_KAWETH=m CONFIG_USB_CATC=m CONFIG_USB_CDCETHER=m CONFIG_USB_USBNET=m - -# -# USB port drivers -# # CONFIG_USB_USS720 is not set # # USB Serial Converter support # # CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# # CONFIG_USB_RIO500 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_TIGL is not set diff --git a/config/kernel/kernel.config.i386.smp b/config/kernel/kernel.config.i386.smp index a7a7b72d94..7ac1f589dd 100644 --- a/config/kernel/kernel.config.i386.smp +++ b/config/kernel/kernel.config.i386.smp @@ -361,7 +361,7 @@ CONFIG_VLAN_8021Q=m # # CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set -# CONFIG_BRIDGE is not set +CONFIG_BRIDGE=m # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 342c21f632..4ef275450c 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -28,6 +28,7 @@ * bind-9.2.5 * binutils-2.15.90.0.3 * bison-1.875 + * bridge-utils-1.1 * busybox-0.60.5 * bzip2-1.0.3 * capi4k-utils-2004-10-06 @@ -70,6 +71,7 @@ * groff-1.19 * grub-0.95 * gzip-1.3.5 + * hddtemp-0.3-beta14 * hdparm-6.3 * iana-etc-2.00 * ibod @@ -145,7 +147,7 @@ * slang-1.4.5-mini * snort-2.3.3 * speedtouch-1.2 - * squid-2.5.STABLE12 + * squid-2.5.STABLE13 * squid-graph-3.1 * stund_0.96_Aug13 * sysklogd-1.4.1 @@ -160,6 +162,7 @@ * util-linux-2.12r * vim-6.3 * vlan.1.9 + * wget-1.10.2 * wireless_tools.27 * xampp-linux-1.5.1 * zlib-1.2.3 diff --git a/lfs/bridge-utils b/lfs/bridge-utils new file mode 100644 index 0000000000..a014adb13a --- /dev/null +++ b/lfs/bridge-utils @@ -0,0 +1,88 @@ +############################################################################### +# 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 # +# # +# 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 $ +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.1 + +THISAPP = /bridge-utils-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = http://switch.dl.sourceforge.net/sourceforge/bridge +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 43bbd2a67b59cac3e15d545f8b51df68 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +#dist: +# make-packages.sh postfix $(THISAPP) + +############################################################################### +# 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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) \ No newline at end of file diff --git a/lfs/hddtemp b/lfs/hddtemp new file mode 100644 index 0000000000..c5eaeddc1c --- /dev/null +++ b/lfs/hddtemp @@ -0,0 +1,88 @@ +############################################################################### +# 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 # +# # +# 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 $ +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.3-beta14 + +THISAPP = hddtemp-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://www.guzu.net/linux +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = bbf8be4539495e18bec54af77511a680 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + make-packages.sh hddtemp $(THISAPP) + +############################################################################### +# 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) && wget http://www.guzu.net/linux/hddtemp.db && cp hddtemp.db /etc/hddtemp.db + cd $(DIR_APP) && ./configure --with-db-path=/etc/hddtemp.db + cd $(DIR_APP) && make && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) \ No newline at end of file diff --git a/lfs/iptables b/lfs/iptables index b51b1cdf30..13b162c85a 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -87,11 +87,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/iptables-fixed.tar.gz @rm -rf $(DIR_DL)/netfilter-layer7-v2.1 && cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.1.tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.1/iptables-layer7-2.1.patch - # Appears that libipt_set/SET maybe a little broken, fix it for now... - cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_set.c - cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_SET.c + +# # Appears that libipt_set/SET maybe a little broken, fix it for now... +# cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_set.c +# cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_SET.c + cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/iptables-1.3.0-imq1.diff chmod +x $(DIR_APP)/extensions/.IMQ-test* $(DIR_APP)/extensions/.layer7-test* + + # hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present + cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile + cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install @rm -rf $(DIR_APP) diff --git a/lfs/squid b/lfs/squid index 391123f98a..c903f2b77a 100644 --- a/lfs/squid +++ b/lfs/squid @@ -32,7 +32,7 @@ include Config -VER = 2.5.STABLE12 +VER = 2.5.STABLE13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7354255015b3772a1e024dfac173e48c +$(DL_FILE)_MD5 = 3e64468e123be1246d17486dab6bee87 install : $(TARGET) diff --git a/lfs/wget b/lfs/wget new file mode 100644 index 0000000000..c7b16dafe6 --- /dev/null +++ b/lfs/wget @@ -0,0 +1,88 @@ +############################################################################### +# 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 # +# # +# 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 $ +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.10.2 + +THISAPP = wget-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = http://ftp.gnu.org/pub/gnu/wget +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 795fefbb7099f93e2d346b026785c4b8 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + make-packages.sh postfix $(THISAPP) + +############################################################################### +# 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 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 install + @rm -rf $(DIR_APP) + @$(POSTBUILD) \ No newline at end of file diff --git a/make.sh b/make.sh index 0743d0627f..928220e418 100644 --- a/make.sh +++ b/make.sh @@ -652,8 +652,10 @@ buildipcop() { ipcopmake libsafe ipcopmake 3c5x9setup echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE + ipcopmake wget ipcopmake berkeley-DB ipcopmake xampp + ipcopmake bridge-utils ipcopmake pam ipcopmake pammysql ipcopmake saslauthd @@ -662,6 +664,8 @@ buildipcop() { ipcopmake lpd ipcopmake pwlib ipcopmake openh323 + wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db + ipcopmake hddtemp } diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 318562d275..7ccc789799 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -309,6 +309,8 @@ lib/modules/2.4.31/kernel #lib/modules/2.4.31/kernel/net/atm/pppoatm.o.gz #lib/modules/2.4.31/kernel/net/atm/atm.o.gz #lib/modules/2.4.31/kernel/net/atm/br2684.o.gz +#lib/modules/2.4.31/kernel/net/bridge +#lib/modules/2.4.31/kernel/net/bridge/bridge.o.gz #lib/modules/2.4.31/kernel/net/ipsec #lib/modules/2.4.31/kernel/net/ipsec/alg #lib/modules/2.4.31/kernel/net/ipsec/alg/ipsec_blowfish.o.gz @@ -32149,3 +32151,10 @@ var/spool/postfix/private var/spool/postfix/public var/spool/postfix/saved var/spool/postfix/trace +## +## bridge-utils +## +usr/include/libbridge.h +usr/lib/libbridge.a +usr/sbin/brctl +#usr/share/man/man8/brctl.8