IPFire-SCM August 2010

ipfire-scm@lists.ipfire.org

1 participants
47 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 927eb20ae3c6ecaa0a5795335263f636fd549382
by git＠ipfire.org 19 Aug '10

19 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 927eb20ae3c6ecaa0a5795335263f636fd549382 (commit) via a9a26c5a95cc9b5adbfbd53d37cc1c3ccd79a79b (commit) from 908719c955c7af7752ee09bcb6a79d2a3919a22e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 927eb20ae3c6ecaa0a5795335263f636fd549382 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 19 11:28:33 2010 +0200 Installer: remove USB wait and clean some comments. commit a9a26c5a95cc9b5adbfbd53d37cc1c3ccd79a79b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 19 11:20:48 2010 +0200 Installer: use UUID's. ----------------------------------------------------------------------- Summary of changes: src/install+setup/install/main.c | 73 +++++++------------------------------- 1 files changed, 13 insertions(+), 60 deletions(-) Difference in files: diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index d023b69..a46de92 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -108,31 +108,10 @@ int main(int argc, char *argv[]) } } - // Load ata-piix prior kudzu because kudzu use ata-generic for ich7 -// mysystem("/sbin/modprobe ata_piix"); - - // Starting hardware detection -// runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ..."); - // Load common modules -// mysystem("/sbin/modprobe ide-generic"); -// mysystem("/sbin/modprobe ide-cd"); -// mysystem("/sbin/modprobe ide-disk"); -// mysystem("/sbin/modprobe ehci-hcd"); -// mysystem("/sbin/modprobe uhci-hcd"); -// mysystem("/sbin/modprobe ohci-hcd"); -// mysystem("/sbin/modprobe ohci1394"); -// mysystem("/sbin/modprobe sd_mod"); -// mysystem("/sbin/modprobe sr_mod"); -// mysystem("/sbin/modprobe usb-storage"); -// mysystem("/sbin/modprobe usbhid"); -// mysystem("/sbin/modprobe ahci"); - mysystem("/sbin/modprobe iso9660"); // CDROM mysystem("/sbin/modprobe ext2"); // Boot patition mysystem("/sbin/modprobe vfat"); // USB key - - runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ..."); /* German is the default */ for (choice = 0; langnames[choice]; choice++) @@ -231,11 +210,6 @@ int main(int argc, char *argv[]) sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : ""); /* Now the names after the machine is booted. Only scsi is affected and we only install on the first scsi disk. */ - { char tmp[30]; - strcpy(tmp, scsi_disk ? "sda" : harddrive); - sprintf(hdparams.devnode_disk_run, "/dev/%s", tmp); - sprintf(hdparams.devnode_part_run, "/dev/%s%s", tmp, raid_disk ? "p" : ""); - } fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk); @@ -453,17 +427,6 @@ int main(int argc, char *argv[]) /* Save language und local settings */ write_lang_configs(shortlangname); -// /* touch the modules.dep files */ -// snprintf(commandstring, STRING_SIZE, -// "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep", -// KERNEL_VERSION); -// mysystem(commandstring); -/* snprintf(commandstring, STRING_SIZE, - "/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep", - KERNEL_VERSION); - mysystem(commandstring); -*/ - /* Rename uname */ rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname"); @@ -482,8 +445,15 @@ int main(int argc, char *argv[]) } /* Update /etc/fstab */ - replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run); - + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + if (fstype == EXT2) { replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); @@ -491,20 +461,6 @@ int main(int argc, char *argv[]) replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } else if (fstype == EXT3) { - //snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part); - //if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3])) - //{ - // errorbox(ctr[TR_JOURNAL_ERROR]); - // replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); - // goto NOJOURNAL; - //} - //snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part); - //if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3])) - //{ - // errorbox(ctr[TR_JOURNAL_ERROR]); - // replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); - // goto NOJOURNAL; - //} replace("/harddisk/etc/fstab", "FSTYPE", "ext3"); NOJOURNAL: replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); @@ -512,15 +468,12 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION); - /* Going to make our initrd... */ -/* snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd"); - runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); -*/ - sprintf(string, "root=%s3", hdparams.devnode_part_run); - replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part); + system(commandstring); + mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst"); - system("sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab"); + system("/bin/sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab"); snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7829d1d0195d99cdb30790909d9edf25ec0e40da
by git＠ipfire.org 19 Aug '10

19 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 7829d1d0195d99cdb30790909d9edf25ec0e40da (commit) from 8190e95105d0398862f0be73b6b4e4fbd8b27214 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7829d1d0195d99cdb30790909d9edf25ec0e40da Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Thu Aug 19 04:44:02 2010 +0200 Added latest openvpn stable to core40. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/40/filelists/files | 1 + config/rootfiles/core/40/update.sh | 3 ++- doc/packages-list.txt | 2 +- lfs/openvpn | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 188e539..883eb86 100644 --- a/config/rootfiles/core/40/filelists/files +++ b/config/rootfiles/core/40/filelists/files @@ -19,3 +19,4 @@ lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/usbserial.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko +usr/sbin/openvpn diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 16a7dec..8878200 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -26,7 +26,7 @@ # #Stop services - +/usr/local/bin/openvpnctrl -k # #Extract files extract_files @@ -36,6 +36,7 @@ rm -rf /usr/lib/python2.4 # #Start services +/usr/local/bin/openvpnctrl -s # #Update Language cache diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ef64f05..8f11d12 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -264,7 +264,7 @@ * openmailadmin-1.0.0 * openssh-5.4p1 * openssl-0.9.8o -* openvpn-2.1.1 +* openvpn-2.1.2 * p7zip_4.65 * pam_mysql-0.7RC1 * patch-2.5.4 diff --git a/lfs/openvpn b/lfs/openvpn index b7d651f..8c8ad71 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,7 +24,7 @@ include Config -VER = 2.1.1 +VER = 2.1.2 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b273ed2b5ec8616fb9834cde8634bce7 +$(DL_FILE)_MD5 = 543a30dafcdefe1d67c0e47b80741755 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 908719c955c7af7752ee09bcb6a79d2a3919a22e
by git＠ipfire.org 18 Aug '10

18 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 908719c955c7af7752ee09bcb6a79d2a3919a22e (commit) via 3cbeb8c7a14843ea43695efa6bf02cceb2579ba5 (commit) via 3b50eb81be2d25f254d24c0795fd2ce3f97c481a (commit) via 8190e95105d0398862f0be73b6b4e4fbd8b27214 (commit) via ee788c9e4607e6dca23baee4292d1be0dff27dfb (commit) via ec3573fc83603317b0e9dd195426d8947a1c25f2 (commit) from 063191c490226cbb673a3549b9dc329360aeec5c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 908719c955c7af7752ee09bcb6a79d2a3919a22e Merge: 3cbeb8c 8190e95 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 18 21:54:42 2010 +0200 Merge branch 'master' into next Conflicts: config/rootfiles/core/40/filelists/files config/rootfiles/core/40/update.sh commit 3cbeb8c7a14843ea43695efa6bf02cceb2579ba5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 18 21:52:57 2010 +0200 Flashimage use UUID for fstab. commit 3b50eb81be2d25f254d24c0795fd2ce3f97c481a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 18 21:52:29 2010 +0200 Skip checkfstab if root is set by UUID. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +++--- doc/packages-list.txt | 2 +- html/cgi-bin/qos.cgi | 4 ++-- lfs/clamav | 6 +++--- lfs/flash-images | 6 ++++-- src/initscripts/init.d/checkfstab | 4 ++++ 6 files changed, 17 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 4e05795..10d15ac 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.3 +usr/lib/libclamav.so.6.1.4 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.3 +usr/lib/libclamunrar.so.6.1.4 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.3 +usr/lib/libclamunrar_iface.so.6.1.4 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/doc/packages-list.txt b/doc/packages-list.txt index e281e50..e1ed310 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -64,7 +64,7 @@ * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 -* clamav-0.96.1 +* clamav-0.96.2 * cmake-2.4.8 * collectd-4.9.1 * compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 1beb9e3..26e0eef 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -1117,10 +1117,10 @@ END print <<END </select><td width='33%' align='center'>  <tr><td width='33%' align='right'>$Lang::tr{'source port'}: - <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value='$qossettings{'QPORT'}' /> + <td width='33%' align='left'><input type='text' name='QPORT' maxlength='11' value='$qossettings{'QPORT'}' /> <td width='33%' align='center'>  <tr><td width='33%' align='right'>$Lang::tr{'destination port'}: - <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value='$qossettings{'DPORT'}' /> + <td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' /> <td width='33%' align='center'>  <tr><td width='33%' align='right'>$Lang::tr{'source ip'}: <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' /> diff --git a/lfs/clamav b/lfs/clamav index fdc44ad..c680f96 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.96.1 +VER = 0.96.2 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 12 +PAK_VER = 13 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 38e7870db6e9ad0e569518499a6f3651 +$(DL_FILE)_MD5 = a2c2555d86868f91a01d0e2c2403bbec install : $(TARGET) diff --git a/lfs/flash-images b/lfs/flash-images index 52fde64..99ed45f 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -94,10 +94,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf sed -i -e "s|KVER|$(KVER)|g" $(MNThdd)/boot/grub/grub.conf - sed -i -e "s|ROOT|/dev/sda3|g" $(MNThdd)/boot/grub/grub.conf + sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst + sed -i -e "s|DEVICE1|UUID=$$(blkid -sUUID $(IMGboot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab - sed -i -e "s|DEVICE|/dev/sda|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE3|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE4|UUID=$$(blkid -sUUID $(IMGvar) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab # Copy grub files manually diff --git a/src/initscripts/init.d/checkfstab b/src/initscripts/init.d/checkfstab index c9fa2bc..2fe80bf 100644 --- a/src/initscripts/init.d/checkfstab +++ b/src/initscripts/init.d/checkfstab @@ -17,6 +17,10 @@ case "${1}" in start) + #Skip if root is set by UUID + if (grep "root=UUID=" /proc/cmdline); then + exit 0; + fi boot_mesg "Checking fstab bootdevice ..." read CMDLINE < /proc/cmdline ROOTPOS=`expr index "$CMDLINE" root=` hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8190e95105d0398862f0be73b6b4e4fbd8b27214
by git＠ipfire.org 18 Aug '10

18 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 8190e95105d0398862f0be73b6b4e4fbd8b27214 (commit) via ee788c9e4607e6dca23baee4292d1be0dff27dfb (commit) via ec3573fc83603317b0e9dd195426d8947a1c25f2 (commit) from 40228ef46f523a151affc034e0510aa9075e2f3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8190e95105d0398862f0be73b6b4e4fbd8b27214 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Wed Aug 18 11:26:51 2010 +0200 Added latest changes to core40. commit ee788c9e4607e6dca23baee4292d1be0dff27dfb Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Wed Aug 18 11:26:27 2010 +0200 Upgraded clamav to latest stable. commit ec3573fc83603317b0e9dd195426d8947a1c25f2 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Wed Aug 18 11:25:38 2010 +0200 Change QoS Port Field to enter Port Ranges. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/40/filelists/files | 1 + config/rootfiles/core/40/update.sh | 7 ++++++- config/rootfiles/packages/clamav | 6 +++--- doc/packages-list.txt | 2 +- html/cgi-bin/qos.cgi | 4 ++-- lfs/clamav | 6 +++--- 6 files changed, 16 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 79518f2..188e539 100644 --- a/config/rootfiles/core/40/filelists/files +++ b/config/rootfiles/core/40/filelists/files @@ -8,6 +8,7 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/time.cgi +srv/web/ipfire/cgi-bin/qos.cgi usr/lib/python2.7/ipaddr.pyc usr/lib/python2.7/site-packages/drv_libxml2.py usr/lib/python2.7/site-packages/libxml2.py diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 11e0395..16a7dec 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -41,7 +41,12 @@ rm -rf /usr/lib/python2.4 #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# +# Change var lock size to 8MB +grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp +mv /tmp/fstab.tmp /etc/fstab +echo non /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab + + #Rebuild module dep's depmod 2.6.32.15-ipfire depmod 2.6.32.15-ipfire-xen diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 4e05795..10d15ac 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.3 +usr/lib/libclamav.so.6.1.4 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.3 +usr/lib/libclamunrar.so.6.1.4 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.3 +usr/lib/libclamunrar_iface.so.6.1.4 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 7cec76a..ef64f05 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -65,7 +65,7 @@ * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 -* clamav-0.96.1 +* clamav-0.96.2 * cmake-2.4.8 * collectd-4.9.1 * compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 1beb9e3..26e0eef 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -1117,10 +1117,10 @@ END print <<END </select><td width='33%' align='center'>  <tr><td width='33%' align='right'>$Lang::tr{'source port'}: - <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value='$qossettings{'QPORT'}' /> + <td width='33%' align='left'><input type='text' name='QPORT' maxlength='11' value='$qossettings{'QPORT'}' /> <td width='33%' align='center'>  <tr><td width='33%' align='right'>$Lang::tr{'destination port'}: - <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value='$qossettings{'DPORT'}' /> + <td width='33%' align='left'><input type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' /> <td width='33%' align='center'>  <tr><td width='33%' align='right'>$Lang::tr{'source ip'}: <td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' /> diff --git a/lfs/clamav b/lfs/clamav index fdc44ad..c680f96 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.96.1 +VER = 0.96.2 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 12 +PAK_VER = 13 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 38e7870db6e9ad0e569518499a6f3651 +$(DL_FILE)_MD5 = a2c2555d86868f91a01d0e2c2403bbec install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 063191c490226cbb673a3549b9dc329360aeec5c
by git＠ipfire.org 17 Aug '10

17 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 063191c490226cbb673a3549b9dc329360aeec5c (commit) via b0ab1b098ed35da40aebc5bb3ab77839d9f17a53 (commit) from c32eea083ba011e46abca44fa26cda8875769768 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 063191c490226cbb673a3549b9dc329360aeec5c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 18 00:03:00 2010 +0200 Remove emergency grub entry. commit b0ab1b098ed35da40aebc5bb3ab77839d9f17a53 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 18 00:01:50 2010 +0200 Start updater (test). ----------------------------------------------------------------------- Summary of changes: config/grub/grub.conf | 5 -- config/rootfiles/core/test/exclude | 1 + config/rootfiles/core/test/filelists/dracut | 1 + config/rootfiles/core/test/filelists/files | 3 + .../{oldcore/38 => core/test}/filelists/grub | 0 .../{oldcore/28 => core/test}/filelists/linux | 0 .../28 => core/test}/filelists/linux-firmware | 0 config/rootfiles/core/test/filelists/tcl | 1 + .../{oldcore/28 => core/test}/filelists/udev | 0 .../34 => core/test}/filelists/usb_modeswitch | 0 .../core/test/filelists/usb_modeswitch_data | 1 + config/rootfiles/{oldcore/24 => core/test}/meta | 0 .../rootfiles/{oldcore/34 => core/test}/update.sh | 56 ++++++------------- 13 files changed, 25 insertions(+), 43 deletions(-) create mode 100644 config/rootfiles/core/test/exclude create mode 120000 config/rootfiles/core/test/filelists/dracut create mode 100644 config/rootfiles/core/test/filelists/files copy config/rootfiles/{oldcore/38 => core/test}/filelists/grub (100%) copy config/rootfiles/{oldcore/28 => core/test}/filelists/linux (100%) copy config/rootfiles/{oldcore/28 => core/test}/filelists/linux-firmware (100%) create mode 120000 config/rootfiles/core/test/filelists/tcl copy config/rootfiles/{oldcore/28 => core/test}/filelists/udev (100%) copy config/rootfiles/{oldcore/34 => core/test}/filelists/usb_modeswitch (100%) create mode 120000 config/rootfiles/core/test/filelists/usb_modeswitch_data copy config/rootfiles/{oldcore/24 => core/test}/meta (100%) copy config/rootfiles/{oldcore/34 => core/test}/update.sh (74%) Difference in files: diff --git a/config/grub/grub.conf b/config/grub/grub.conf index b4e2796..c3f2ebd 100644 --- a/config/grub/grub.conf +++ b/config/grub/grub.conf @@ -39,8 +39,3 @@ title IPFire (single Processor) kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT initrd /ipfirerd-KVER.img savedefault 5 -title IPFire (all storage drivers) - root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT - initrd /ipfirerd-KVER-emergency.img - savedefault 6 diff --git a/config/rootfiles/core/test/exclude b/config/rootfiles/core/test/exclude new file mode 100644 index 0000000..759e081 --- /dev/null +++ b/config/rootfiles/core/test/exclude @@ -0,0 +1 @@ +etc/udev/rules.d/30-persistent-network.rules diff --git a/config/rootfiles/core/test/filelists/dracut b/config/rootfiles/core/test/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/core/test/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files new file mode 100644 index 0000000..509483d --- /dev/null +++ b/config/rootfiles/core/test/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/rc.d/init.d/checkfstab +usr/local/bin/rebuild-initrd diff --git a/config/rootfiles/core/test/filelists/grub b/config/rootfiles/core/test/filelists/grub new file mode 120000 index 0000000..050745c --- /dev/null +++ b/config/rootfiles/core/test/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/linux b/config/rootfiles/core/test/filelists/linux new file mode 120000 index 0000000..c469fe1 --- /dev/null +++ b/config/rootfiles/core/test/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/linux-firmware b/config/rootfiles/core/test/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/core/test/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/tcl b/config/rootfiles/core/test/filelists/tcl new file mode 120000 index 0000000..7f620c6 --- /dev/null +++ b/config/rootfiles/core/test/filelists/tcl @@ -0,0 +1 @@ +../../../common/tcl \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/udev b/config/rootfiles/core/test/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/core/test/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch b/config/rootfiles/core/test/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/test/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch_data b/config/rootfiles/core/test/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/test/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/test/meta b/config/rootfiles/core/test/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/test/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh new file mode 100644 index 0000000..1a18fce --- /dev/null +++ b/config/rootfiles/core/test/update.sh @@ -0,0 +1,115 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.19" +ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES +echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES +echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES + +# Backup the files +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 + +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# Remove mkinitcpio +rm -rf /etc/mkinitcpio.* +rm -rf /lib/initcpio +rm -rf /sbin/mkinitcpio +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** " hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c32eea083ba011e46abca44fa26cda8875769768
by git＠ipfire.org 16 Aug '10

16 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c32eea083ba011e46abca44fa26cda8875769768 (commit) via 40228ef46f523a151affc034e0510aa9075e2f3f (commit) from d4d0ea202e7a6ede668d2d9d2cb7905e5879e6a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c32eea083ba011e46abca44fa26cda8875769768 Merge: d4d0ea2 40228ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 16 13:05:24 2010 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/pakfire.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/es/cgi-bin/es.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index ca7a4ad..9cfe83e 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -64,7 +64,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){ system("$command"); system("/bin/sleep 1"); } else { - &Header::openbox("100%", "center", "Abfrage"); + &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; print <<END; <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} @@ -104,7 +104,7 @@ END system("$command"); system("/bin/sleep 1"); } else { - &Header::openbox("100%", "center", "Abfrage"); + &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; print <<END; <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0394315..7d55857 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1445,6 +1445,7 @@ 'remove x509' => 'Lösche x509', 'reportfile' => 'Reportfile', 'reportlevel' => 'Report Level', +'request' => 'Abfrage', 'requested data' => '1. Verbindungs Einstellungen', 'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPFire reserviert:', 'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPFire reserviert:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 55d24c4..a66ec67 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1475,6 +1475,7 @@ 'remove x509' => 'Remove x509', 'reportfile' => 'Reportfile', 'reportlevel' => 'Reportlevel', +'request' => 'Request', 'requested data' => '1. Connection Settings:', 'reserved dst port' => 'Destination port is reserved for IPFire use only:', 'reserved src port' => 'Source port is reserved for IPFire use only:', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 5edbade..5a2fbe3 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1465,6 +1465,7 @@ 'remove x509' => 'Remover x509', 'reportfile' => 'Archivo de reporte', 'reportlevel' => 'Nivel reporte', +'request' => 'Consulta', 'requested data' => 'Configuraciones de conexión:', 'reserved dst port' => 'Puerto de destino está reservado para uso exclusivo de IPFire', 'reserved src port' => 'Puerto de orígen está reservado para uso exclusivo de IPFire:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index bda9a4a..dbc11bf 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1471,6 +1471,7 @@ 'remove x509' => 'enlever x509', 'reportfile' => 'Fichier de rapport', 'reportlevel' => 'Niveau de rapport', +'request' => 'Interrogation', 'requested data' => '1. Paramètres de connexion :', 'reserved dst port' => 'Le port de destination est réservé pour l\'usage d\'IPFire :', 'reserved src port' => 'Le port source est réservé pour l\'usage d\'IPFire :', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 40228ef46f523a151affc034e0510aa9075e2f3f
by git＠ipfire.org 16 Aug '10

16 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 40228ef46f523a151affc034e0510aa9075e2f3f (commit) from 9f3e557b55cb8c8fd62cffad457eb346492a79fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 40228ef46f523a151affc034e0510aa9075e2f3f Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Mon Aug 16 12:02:25 2010 +0200 Translated german header in packfire.cgi ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/pakfire.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/es/cgi-bin/es.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index ca7a4ad..9cfe83e 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -64,7 +64,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){ system("$command"); system("/bin/sleep 1"); } else { - &Header::openbox("100%", "center", "Abfrage"); + &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; print <<END; <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} @@ -104,7 +104,7 @@ END system("$command"); system("/bin/sleep 1"); } else { - &Header::openbox("100%", "center", "Abfrage"); + &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; print <<END; <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0394315..7d55857 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1445,6 +1445,7 @@ 'remove x509' => 'Lösche x509', 'reportfile' => 'Reportfile', 'reportlevel' => 'Report Level', +'request' => 'Abfrage', 'requested data' => '1. Verbindungs Einstellungen', 'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPFire reserviert:', 'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPFire reserviert:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 55d24c4..a66ec67 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1475,6 +1475,7 @@ 'remove x509' => 'Remove x509', 'reportfile' => 'Reportfile', 'reportlevel' => 'Reportlevel', +'request' => 'Request', 'requested data' => '1. Connection Settings:', 'reserved dst port' => 'Destination port is reserved for IPFire use only:', 'reserved src port' => 'Source port is reserved for IPFire use only:', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 5edbade..5a2fbe3 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1465,6 +1465,7 @@ 'remove x509' => 'Remover x509', 'reportfile' => 'Archivo de reporte', 'reportlevel' => 'Nivel reporte', +'request' => 'Consulta', 'requested data' => 'Configuraciones de conexión:', 'reserved dst port' => 'Puerto de destino está reservado para uso exclusivo de IPFire', 'reserved src port' => 'Puerto de orígen está reservado para uso exclusivo de IPFire:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index bda9a4a..dbc11bf 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1471,6 +1471,7 @@ 'remove x509' => 'enlever x509', 'reportfile' => 'Fichier de rapport', 'reportlevel' => 'Niveau de rapport', +'request' => 'Interrogation', 'requested data' => '1. Paramètres de connexion :', 'reserved dst port' => 'Le port de destination est réservé pour l\'usage d\'IPFire :', 'reserved src port' => 'Le port source est réservé pour l\'usage d\'IPFire :', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d4d0ea202e7a6ede668d2d9d2cb7905e5879e6a2
by git＠ipfire.org 16 Aug '10

16 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d4d0ea202e7a6ede668d2d9d2cb7905e5879e6a2 (commit) from bed16d4f435080044546380850b27ede31355ff5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d4d0ea202e7a6ede668d2d9d2cb7905e5879e6a2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 16 04:59:47 2010 +0200 Fix xen patchset download. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index c848e58..3b96464 100644 --- a/lfs/linux +++ b/lfs/linux @@ -64,7 +64,7 @@ netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 -xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2 +xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2 $(DL_FILE)_MD5 = 7f32112095a164e1330c07be72966ccb netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bed16d4f435080044546380850b27ede31355ff5
by git＠ipfire.org 15 Aug '10

15 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via bed16d4f435080044546380850b27ede31355ff5 (commit) from 5e61ca6bc42d48445337ff2666b4431cfc9ca789 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bed16d4f435080044546380850b27ede31355ff5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 15 21:24:04 2010 +0200 Update Kernel (2.6.32.18). ----------------------------------------------------------------------- Summary of changes: doc/packages-list.txt | 54 ++++++++++++++++++++-------------------- lfs/linux | 17 +++++------- src/paks/linux-xen/install.sh | 2 +- 3 files changed, 35 insertions(+), 38 deletions(-) Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f646d55..e281e50 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -37,7 +37,7 @@ * Unix-Syslog-0.100 * XML-Parser-2.34 * alsa-lib-1.0.23 -* alsa-lib-1.0.23-kmod-2.6.32.18-ipfire +* alsa-lib-1.0.23-kmod-2.6.32.19-ipfire * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 @@ -67,20 +67,20 @@ * clamav-0.96.1 * cmake-2.4.8 * collectd-4.9.1 -* compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire -* compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire-xen +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpufrequtils-007 -* cryptodev-20091126-kmod-2.6.32.18-ipfire -* cryptodev-20091126-kmod-2.6.32.18-ipfire-xen +* cryptodev-20091126-kmod-2.6.32.19-ipfire +* cryptodev-20091126-kmod-2.6.32.19-ipfire-xen * cups-1.4.2 * curl-7.19.5 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 * dahdi-2.2.1 -* dahdi-2.2.1-kmod-2.6.32.18-ipfire -* dahdi-2.2.1-kmod-2.6.32.18-ipfire-xen +* dahdi-2.2.1-kmod-2.6.32.19-ipfire +* dahdi-2.2.1-kmod-2.6.32.19-ipfire-xen * db-4.4.20 * dbus-1.0.3 * ddrescue-1.12 @@ -90,10 +90,10 @@ * dnsmasq-2.45 * dosfstools-3.0.9 * dracut-006 -* e1000-8.0.19-kmod-2.6.32.18-ipfire -* e1000-8.0.19-kmod-2.6.32.18-ipfire-xen -* e1000e-1.1.19-kmod-2.6.32.18-ipfire -* e1000e-1.1.19-kmod-2.6.32.18-ipfire-xen +* e1000-8.0.19-kmod-2.6.32.19-ipfire +* e1000-8.0.19-kmod-2.6.32.19-ipfire-xen +* e1000e-1.1.19-kmod-2.6.32.19-ipfire +* e1000e-1.1.19-kmod-2.6.32.19-ipfire-xen * e2fsprogs-1.41.11 * ebtables-v2.0.8-2 * ed-0.2 @@ -162,8 +162,8 @@ * joe-3.7 * jpegsrc.v6b * kbd-1.12 -* kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire -* kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire-xen +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire-xen * kudzu-1.2.64 * l7-protocols-2009-05-10 * lame-3.97 @@ -197,8 +197,8 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.32.18-ipfire -* linux-2.6.32.18-ipfire-xen +* linux-2.6.32.19-ipfire +* linux-2.6.32.19-ipfire-xen * linux-atm-2.4.1 * linux-firmware-20100318 * linux-libc-headers-2.6.12.0 @@ -209,11 +209,11 @@ * lynis-1.2.9 * lzo-2.02 * m4-1.4.4 -* mISDN-20100525-kmod-2.6.32.18-ipfire -* mISDN-20100525-kmod-2.6.32.18-ipfire-xen +* mISDN-20100525-kmod-2.6.32.19-ipfire +* mISDN-20100525-kmod-2.6.32.19-ipfire-xen * mISDNuser-20100525 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire-xen +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -282,12 +282,12 @@ * psmisc-22.2 * qemu-0.11.1-kqemu * qemu-0.12.3 -* r8101-1.016.00-kmod-2.6.32.18-ipfire -* r8101-1.016.00-kmod-2.6.32.18-ipfire-xen -* r8168-8.018.00-kmod-2.6.32.18-ipfire -* r8168-8.018.00-kmod-2.6.32.18-ipfire-xen -* r8169-6.013.00-kmod-2.6.32.18-ipfire -* r8169-6.013.00-kmod-2.6.32.18-ipfire-xen +* r8101-1.016.00-kmod-2.6.32.19-ipfire +* r8101-1.016.00-kmod-2.6.32.19-ipfire-xen +* r8168-8.018.00-kmod-2.6.32.19-ipfire +* r8168-8.018.00-kmod-2.6.32.19-ipfire-xen +* r8169-6.013.00-kmod-2.6.32.19-ipfire +* r8169-6.013.00-kmod-2.6.32.19-ipfire-xen * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 @@ -343,8 +343,8 @@ * usb-modeswitch-data-20100707 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire -* v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire-xen +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.7 * vim-7.0 diff --git a/lfs/linux b/lfs/linux index f6799d0..c848e58 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .18 -VER = 2.6.32.18 +PATCHLEVEL = .19 +VER = 2.6.32.19 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -57,21 +57,21 @@ objects =$(DL_FILE) \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \ - xen-patches-2.6.32-2b.tar.bz2 + xen-patches-2.6.32-2c.tar.bz2 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 -xen-patches-2.6.32-2b.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2 +xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2 -$(DL_FILE)_MD5 = 8c8b82d4bf607ddb233deaf7f1c44f0f +$(DL_FILE)_MD5 = 7f32112095a164e1330c07be72966ccb netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4 -xen-patches-2.6.32-2b.tar.bz2_MD5 = a1798dc2de1ce4329c9580730f6c0096 +xen-patches-2.6.32-2c.tar.bz2_MD5 = 62a75ddcba43894b20f754a94b299ce6 install : $(TARGET) @@ -109,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(XEN)" "1" # Apply gentoo Xen patches mkdir -p $(DIR_SRC)/xen-patches - cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2b.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2c.tar.bz2 for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ @@ -144,9 +144,6 @@ endif # Add some more LED triggers cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch - # Huawei (Vodafone) K3765 & K4505 Usbids - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch - # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 4313f23..68c36ea 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.18 +KVER=2.6.32.19 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5e61ca6bc42d48445337ff2666b4431cfc9ca789
by git＠ipfire.org 14 Aug '10

14 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5e61ca6bc42d48445337ff2666b4431cfc9ca789 (commit) from d1c956e88e2dcd4c6bb282d112fede7f9b409bf9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5e61ca6bc42d48445337ff2666b4431cfc9ca789 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 15 00:39:31 2010 +0200 Disabled legacy IDE and Firewire modules. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 105 +-------------------------- config/kernel/kernel.config.i586-ipfire-xen | 90 +---------------------- lfs/linux | 6 -- 3 files changed, 6 insertions(+), 195 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index ac38a78..0303349 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.18 -# Thu Aug 12 21:04:01 2010 +# Sat Aug 14 21:21:26 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1120,90 +1120,7 @@ CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -CONFIG_IDE_LEGACY=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -# CONFIG_BLK_DEV_4DRIVES is not set -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -1489,17 +1406,7 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -CONFIG_IEEE1394=m -CONFIG_IEEE1394_OHCI1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_VIDEO1394=m -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394 is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y @@ -2744,11 +2651,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_DVB_DM1105 is not set # -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set - -# # Supported Earthsoft PT1 Adapters # # CONFIG_DVB_PT1 is not set @@ -3363,7 +3265,6 @@ CONFIG_LEDS_BD2802=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 1ff15a8..9dc576b 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.18 -# Thu Aug 12 20:32:37 2010 +# Sat Aug 14 21:05:53 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -994,75 +994,7 @@ CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -1313,17 +1245,7 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -CONFIG_IEEE1394=m -CONFIG_IEEE1394_OHCI1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_VIDEO1394=m -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394 is not set # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y @@ -2435,11 +2357,6 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # CONFIG_DVB_DM1105 is not set # -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set - -# # Supported Earthsoft PT1 Adapters # # CONFIG_DVB_PT1 is not set @@ -3094,7 +3011,6 @@ CONFIG_LEDS_BD2802=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m diff --git a/lfs/linux b/lfs/linux index b2d71fc..f6799d0 100644 --- a/lfs/linux +++ b/lfs/linux @@ -177,12 +177,6 @@ ifeq "$(XEN)" "" cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ endif - # Rename ide-cd module to match with old kernel - mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \ - /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko - mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \ - /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko - # Remove mISDN modules rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2010