ISAPNPTOOLS entfernt, da wir kein ISA mehr unterstuetzen.

Squid und Samba aktualisiert.
Soundtreiber im Kernel eingeschaltet.
Time-Server funzt nun auch.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@572 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cdrom/README.txt b/config/cdrom/README.txt
index 9159321086e1aae4f6ae4f95c823911f8068ca5d..22ad5ce886a6979abca60d95d62abff23da9f06c 100644 (file)
--- a/config/cdrom/README.txt
+++ b/config/cdrom/README.txt
@@ -9,24 +9,10 @@ This document is located in the \doc directory on the cdrom.  It will
 guide you through the installation process and will help you make the
 necessary decisions during the installation process.
 
 guide you through the installation process and will help you make the
 necessary decisions during the installation process.
 

-
-DOS Image utility tools
------------------------
-
-The dosutils directory contains the following DOS and Windows applications,
-please use with caution and please can we draw your attention to the 
-documentation on the IPFire CD or install image on your network drive. 
-We also draw your attention to the disclaimer of Warranty below.
-
-rawrite.exe    - rawrite executable
-rawwritewin.exe - rawwrite for Windows
-diskio.dll     - this MUST be in the same directory as rawrite for Windows
-copying.txt    - text file
-
-

 License
 -------
 
 License
 -------
 

+IPFire is licensed under the terms of the GPL (Version 2).

 Please read the file COPYING for more information on the license.
 
 
 Please read the file COPYING for more information on the license.
 
 


@@ -34,9 +20,8 @@ Disclaimer of Warranty
 ----------------------
 
 Users of this software must accept this disclaimer of warranty:  "This
 ----------------------
 
 Users of this software must accept this disclaimer of warranty:  "This

-software is supplied AS IS.  IPFire disclaims all warranties, expressed
+software is supplied AS IS. IPFire disclaims all warranties, expressed

 or implied, including, without limitation, the warranties of merchantability
 or implied, including, without limitation, the warranties of merchantability

-and of fitness for any purpose.  IPFire assumes no liability for
+and of fitness for any purpose. IPFire assumes no liability for

 damages, direct or consequential, which may result from the use of this
 software."
 damages, direct or consequential, which may result from the use of this
 software."

-

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index d23b19f2631a570befffeaa60c60b11c87ec13b5..9ce3dce85154a9967940b8001b673b382df85b40 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire

-# Thu May 17 13:06:57 2007
+# Tue May 22 15:36:59 2007

 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y


@@ -1612,7 +1612,141 @@ CONFIG_BOOTSPLASH=y
 #
 # Sound
 #
 #
 # Sound
 #

-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_AC97_BUS=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# ISA devices
+#
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_DT019X is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_WAVEFRONT is not set
+
+#
+# PCI devices
+#
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+# CONFIG_SND_CS46XX_NEW_DSP is not set
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+# CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_USX2Y=m
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set

 
 #
 # USB support
 
 #
 # USB support


@@ -1647,6 +1781,7 @@ CONFIG_USB_SL811_HCD=m
 #
 # USB Device Class drivers
 #
 #
 # USB Device Class drivers
 #

+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index c3f258a2201eef3c4ad4ea912dbdf1a8bc2e48b8..75133d71f97d70241f8469279fc2d4a525bcd09c 100644 (file)
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire

-# Thu May 17 13:07:20 2007
+# Tue May 22 15:37:18 2007

 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y


@@ -1615,7 +1615,141 @@ CONFIG_BOOTSPLASH=y
 #
 # Sound
 #
 #
 # Sound
 #

-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_RTCTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_AC97_BUS=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# ISA devices
+#
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_DT019X is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_WAVEFRONT is not set
+
+#
+# PCI devices
+#
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+# CONFIG_SND_CS46XX_NEW_DSP is not set
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+# CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_USX2Y=m
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set

 
 #
 # USB support
 
 #
 # USB support


@@ -1650,6 +1784,7 @@ CONFIG_USB_SL811_HCD=m
 #
 # USB Device Class drivers
 #
 #
 # USB Device Class drivers
 #

+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 

diff --git a/config/rootfiles/common/isapnptools b/config/rootfiles/common/isapnptools
deleted file mode 100644 (file)
index a6535b9..0000000
--- a/config/rootfiles/common/isapnptools
+++ /dev/null
@@ -1,20 +0,0 @@
-#usr/include/isapnp
-#usr/include/isapnp/callbacks.h
-#usr/include/isapnp/errcodes.h
-#usr/include/isapnp/errenum.h
-#usr/include/isapnp/iopl.h
-#usr/include/isapnp/mysnprtf.h
-#usr/include/isapnp/pnp-access.h
-#usr/include/isapnp/pnp.h
-#usr/include/isapnp/realtime.h
-#usr/include/isapnp/release.h
-#usr/include/isapnp/res-access.h
-#usr/include/isapnp/resource.h
-#usr/lib/libisapnp.a
-#usr/man/man5/isapnp.conf.5
-#usr/man/man8/isapnp.8
-#usr/man/man8/pnpdump.8
-usr/sbin/isapnp
-#usr/sbin/pnpdump
-#var/ipfire/isapnp
-#var/ipfire/isapnp/isapnp.conf

diff --git a/config/rootfiles/common/screen b/config/rootfiles/common/screen
index 78e642ae76e90d59c9e82570f20afcdeddb8dbf1..c7db22d5af53aa793f704e8fd42275a17ac11034 100644 (file)
--- a/config/rootfiles/common/screen
+++ b/config/rootfiles/common/screen
@@ -1,6 +1,6 @@
 #etc/screenrc
 usr/bin/screen
 #etc/screenrc
 usr/bin/screen

-#usr/bin/screen-4.0.2
+usr/bin/screen-4.0.2

 #usr/info/screen.info
 #usr/info/screen.info-1
 #usr/info/screen.info-2
 #usr/info/screen.info
 #usr/info/screen.info-1
 #usr/info/screen.info-2

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 9ed06bcfd8923af98369814225d7fa7acef35e22..0cdfc8cc9b5e9a2796680673d48bff84e70c7135 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -212,6 +212,7 @@
 * rrdtool-1.2.15
 * rsync-2.6.8
 * samba-3.0.24
 * rrdtool-1.2.15
 * rsync-2.6.8
 * samba-3.0.24

+* samba-3.0.25

 * screen-4.0.2
 * sed-4.1.5
 * setserial-2.17
 * screen-4.0.2
 * sed-4.1.5
 * setserial-2.17


@@ -223,6 +224,7 @@
 * spandsp-0.0.3pre24
 * squashfs3.2-r2
 * squid-2.6.STABLE12
 * spandsp-0.0.3pre24
 * squashfs3.2-r2
 * squid-2.6.STABLE12

+* squid-2.6.STABLE13

 * squid-graph-3.2
 * squidGuard-1.2.0
 * stund_0.96_Aug13
 * squid-graph-3.2
 * squidGuard-1.2.0
 * stund_0.96_Aug13

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 689f988c81bead7ec087933eb35a934a8a047124..0ff559434f1c14abcb0a3547bee28cde104d488b 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -38,11 +38,6 @@ $timesettings{'UPDATE_METHOD'} = 'manually';
 $timesettings{'UPDATE_VALUE'} = '0';
 $timesettings{'UPDATE_PERIOD'} = '';
 $timesettings{'ENABLECLNTP'} = 'off';
 $timesettings{'UPDATE_VALUE'} = '0';
 $timesettings{'UPDATE_PERIOD'} = '';
 $timesettings{'ENABLECLNTP'} = 'off';

-$timesettings{'SETHOUR'} = '';
-$timesettings{'SETMINUTES'} = '';
-$timesettings{'SETDAY'} = '';
-$timesettings{'SETMONTH'} = '';
-$timesettings{'SETYEAR'} = '';

 
 &Header::getcgihash(\%timesettings);
 
 
 &Header::getcgihash(\%timesettings);
 


@@ -162,7 +157,6 @@ $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
        system ('/usr/bin/touch', "${General::swroot}/time/settimenow");
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
        system ('/usr/bin/touch', "${General::swroot}/time/settimenow");

-       system ('/usr/local/bin/timecheck >& /dev/null');

 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);
 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);

diff --git a/lfs/isapnptools b/lfs/isapnptools
deleted file mode 100644 (file)
index 3535e0d..0000000
--- a/lfs/isapnptools
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# 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 <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.26
-
-THISAPP    = isapnptools-$(VER)
-DL_FILE    = $(THISAPP).tgz
-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 = 26def2016548edeafe383113f0bc8ac6
-
-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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP)/src && sed -i -e 's/#ifdef\ ENABLE_PCI/#ifdef\ ENABLE_PCI\n#define\ __KERNEL__\n#include\ <linux\/mod_devicetable.h>\n#undef __KERNEL__/' resource.c
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/isapnptools-1.26-gcc-4.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-       -mkdir -p $(CONFIG_ROOT)/isapnp
-       chown -R 99:99 $(CONFIG_ROOT)/isapnp
-       touch $(CONFIG_ROOT)/isapnp/isapnp.conf
-       chown -R 99:99 $(CONFIG_ROOT)/isapnp/isapnp.conf
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/samba b/lfs/samba
index 5fd52de3ad8f7f375207e700749358b38b80a303..f127393eaa3e32dc1d2e493e7c2436171bddb1bb 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -26,7 +26,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 3.0.24
+VER        = 3.0.25

 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz


@@ -38,7 +38,7 @@ PAK_VER    = 1
 
 DESCDE     = "Samba ist ein Windows-File- und Printserver."
 DESCEN     = "Samba is a file- and printserver for Windows."
 
 DESCDE     = "Samba ist ein Windows-File- und Printserver."
 DESCEN     = "Samba is a file- and printserver for Windows."

-DEPS       = cups
+DEPS       = "cups openldap cyrus-sasl"

 
 ###############################################################################
 # Top-level Rules
 
 ###############################################################################
 # Top-level Rules


@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 89273f67a6d8067cbbecefaa13747153
+$(DL_FILE)_MD5 = 267bd56b178a1b1285a41ec4cc1b75f0

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                    --with-smbmount \
                                    --with-winbind \
                                    --without-pam
                                    --with-smbmount \
                                    --with-winbind \
                                    --without-pam

-       cd $(DIR_APP)/source && make && make nsswitch
+       cd $(DIR_APP)/source && make #&& make nsswitch

        cd $(DIR_APP)/source && make install
        cd $(DIR_APP)/source && mv -v /usr/lib/samba/libsmbclient.so /usr/lib
        cd $(DIR_APP)/source && ln -v -sf ../libsmbclient.so /usr/lib/samba
        cd $(DIR_APP)/source && make install
        cd $(DIR_APP)/source && mv -v /usr/lib/samba/libsmbclient.so /usr/lib
        cd $(DIR_APP)/source && ln -v -sf ../libsmbclient.so /usr/lib/samba

diff --git a/lfs/squid b/lfs/squid
index 4a9d8543097f4ed5e6732b11a51a778ee1e8bc4e..f545ee1ab4f7a5ef7cd8b4d2a32b1fa1e2431777 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -26,7 +26,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 2.6.STABLE12
+VER        = 2.6.STABLE13

 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2


@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = a830ccc95cb39cdfa5e5b773add0bb0d
+$(DL_FILE)_MD5 = fdc4ece264b47bab1b112d8f6f842b8b

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index d6123f94db8a94951149e1a13aa047d0a3ade20a..a6dc5fa7becd46d5e1ed31c88e4f65d8fcf9301d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -414,7 +414,6 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols

-  ipfiremake isapnptools

 #  ipfiremake isdn4k-utils # What about mISDN???
   ipfiremake hwdata
   ipfiremake kudzu
 #  ipfiremake isdn4k-utils # What about mISDN???
   ipfiremake hwdata
   ipfiremake kudzu

diff --git a/src/patches/isapnptools-1.26-gcc-4.patch b/src/patches/isapnptools-1.26-gcc-4.patch
deleted file mode 100644 (file)
index 33c0750..0000000
--- a/src/patches/isapnptools-1.26-gcc-4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/isapnp_main.l~ 2007-01-05 00:56:44.000000000 +0000
-+++ src/isapnp_main.l  2007-01-05 01:00:18.000000000 +0000
-@@ -363,7 +363,7 @@
-       return 0;
- }
- 
--static unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
-+unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
- static char *boardid[NUM_CARDS+1];
- static unsigned long serno[NUM_CARDS+1];
-