Merge remote-tracking branch 'ferstl/dynu-ddns-fix' into next

diff --git a/config/rootfiles/core/77/exclude b/config/rootfiles/core/80/exclude
similarity index 100%
rename from config/rootfiles/core/77/exclude
rename to config/rootfiles/core/80/exclude

diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue

diff --git a/config/rootfiles/core/77/meta b/config/rootfiles/core/80/meta
similarity index 100%
rename from config/rootfiles/core/77/meta
rename to config/rootfiles/core/80/meta

diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
new file mode 100644 (file)
index 0000000..f878cfe
--- /dev/null
+++ b/config/rootfiles/core/80/update.sh
@@ -0,0 +1,54 @@
+#!/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) 2014 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=80
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Start services
+
+# Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/core/79/exclude b/config/rootfiles/oldcore/77/exclude
similarity index 100%
rename from config/rootfiles/core/79/exclude
rename to config/rootfiles/oldcore/77/exclude

diff --git a/config/rootfiles/core/77/filelists/GeoIP b/config/rootfiles/oldcore/77/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/77/filelists/GeoIP
rename to config/rootfiles/oldcore/77/filelists/GeoIP

diff --git a/config/rootfiles/core/77/filelists/Net_SSLeay b/config/rootfiles/oldcore/77/filelists/Net_SSLeay
similarity index 100%
rename from config/rootfiles/core/77/filelists/Net_SSLeay
rename to config/rootfiles/oldcore/77/filelists/Net_SSLeay

diff --git a/config/rootfiles/core/77/filelists/apache2 b/config/rootfiles/oldcore/77/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/77/filelists/apache2
rename to config/rootfiles/oldcore/77/filelists/apache2

diff --git a/config/rootfiles/core/77/filelists/armv5tel/binutils b/config/rootfiles/oldcore/77/filelists/armv5tel/binutils
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/binutils
rename to config/rootfiles/oldcore/77/filelists/armv5tel/binutils

diff --git a/config/rootfiles/core/77/filelists/armv5tel/dracut b/config/rootfiles/oldcore/77/filelists/armv5tel/dracut
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/dracut
rename to config/rootfiles/oldcore/77/filelists/armv5tel/dracut

diff --git a/config/rootfiles/core/77/filelists/armv5tel/gcc b/config/rootfiles/oldcore/77/filelists/armv5tel/gcc
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/gcc
rename to config/rootfiles/oldcore/77/filelists/armv5tel/gcc

diff --git a/config/rootfiles/core/77/filelists/armv5tel/glibc b/config/rootfiles/oldcore/77/filelists/armv5tel/glibc
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/glibc
rename to config/rootfiles/oldcore/77/filelists/armv5tel/glibc

diff --git a/config/rootfiles/core/77/filelists/armv5tel/initscripts b/config/rootfiles/oldcore/77/filelists/armv5tel/initscripts
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/initscripts
rename to config/rootfiles/oldcore/77/filelists/armv5tel/initscripts

diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood
rename to config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood

diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi

diff --git a/config/rootfiles/core/77/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/linux-rpi
rename to config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi

diff --git a/config/rootfiles/core/77/filelists/armv5tel/lm_sensors b/config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/lm_sensors
rename to config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors

diff --git a/config/rootfiles/core/77/filelists/armv5tel/rpi-firmware b/config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/rpi-firmware
rename to config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware

diff --git a/config/rootfiles/core/77/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/77/filelists/armv5tel/u-boot
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/u-boot
rename to config/rootfiles/oldcore/77/filelists/armv5tel/u-boot

diff --git a/config/rootfiles/core/77/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/77/filelists/armv5tel/util-linux
similarity index 100%
rename from config/rootfiles/core/77/filelists/armv5tel/util-linux
rename to config/rootfiles/oldcore/77/filelists/armv5tel/util-linux

diff --git a/config/rootfiles/core/77/filelists/beep b/config/rootfiles/oldcore/77/filelists/beep
similarity index 100%
rename from config/rootfiles/core/77/filelists/beep
rename to config/rootfiles/oldcore/77/filelists/beep

diff --git a/config/rootfiles/core/77/filelists/bridge-utils b/config/rootfiles/oldcore/77/filelists/bridge-utils
similarity index 100%
rename from config/rootfiles/core/77/filelists/bridge-utils
rename to config/rootfiles/oldcore/77/filelists/bridge-utils

diff --git a/config/rootfiles/core/77/filelists/coreutils b/config/rootfiles/oldcore/77/filelists/coreutils
similarity index 100%
rename from config/rootfiles/core/77/filelists/coreutils
rename to config/rootfiles/oldcore/77/filelists/coreutils

diff --git a/config/rootfiles/core/77/filelists/cyrus-sasl b/config/rootfiles/oldcore/77/filelists/cyrus-sasl
similarity index 100%
rename from config/rootfiles/core/77/filelists/cyrus-sasl
rename to config/rootfiles/oldcore/77/filelists/cyrus-sasl

diff --git a/config/rootfiles/core/77/filelists/dosfstools b/config/rootfiles/oldcore/77/filelists/dosfstools
similarity index 100%
rename from config/rootfiles/core/77/filelists/dosfstools
rename to config/rootfiles/oldcore/77/filelists/dosfstools

diff --git a/config/rootfiles/core/77/filelists/dvb-firmwares b/config/rootfiles/oldcore/77/filelists/dvb-firmwares
similarity index 100%
rename from config/rootfiles/core/77/filelists/dvb-firmwares
rename to config/rootfiles/oldcore/77/filelists/dvb-firmwares

diff --git a/config/rootfiles/core/77/filelists/e2fsprogs b/config/rootfiles/oldcore/77/filelists/e2fsprogs
similarity index 100%
rename from config/rootfiles/core/77/filelists/e2fsprogs
rename to config/rootfiles/oldcore/77/filelists/e2fsprogs

diff --git a/config/rootfiles/core/77/filelists/files b/config/rootfiles/oldcore/77/filelists/files
similarity index 100%
rename from config/rootfiles/core/77/filelists/files
rename to config/rootfiles/oldcore/77/filelists/files

diff --git a/config/rootfiles/core/77/filelists/fireinfo b/config/rootfiles/oldcore/77/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/77/filelists/fireinfo
rename to config/rootfiles/oldcore/77/filelists/fireinfo

diff --git a/config/rootfiles/core/77/filelists/firewall b/config/rootfiles/oldcore/77/filelists/firewall
similarity index 100%
rename from config/rootfiles/core/77/filelists/firewall
rename to config/rootfiles/oldcore/77/filelists/firewall

diff --git a/config/rootfiles/core/77/filelists/hwdata b/config/rootfiles/oldcore/77/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/77/filelists/hwdata
rename to config/rootfiles/oldcore/77/filelists/hwdata

diff --git a/config/rootfiles/core/77/filelists/i586/binutils b/config/rootfiles/oldcore/77/filelists/i586/binutils
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/binutils
rename to config/rootfiles/oldcore/77/filelists/i586/binutils

diff --git a/config/rootfiles/core/77/filelists/i586/dracut b/config/rootfiles/oldcore/77/filelists/i586/dracut
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/dracut
rename to config/rootfiles/oldcore/77/filelists/i586/dracut

diff --git a/config/rootfiles/core/77/filelists/i586/gcc b/config/rootfiles/oldcore/77/filelists/i586/gcc
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/gcc
rename to config/rootfiles/oldcore/77/filelists/i586/gcc

diff --git a/config/rootfiles/core/77/filelists/i586/glibc b/config/rootfiles/oldcore/77/filelists/i586/glibc
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/glibc
rename to config/rootfiles/oldcore/77/filelists/i586/glibc

diff --git a/config/rootfiles/core/77/filelists/i586/grub b/config/rootfiles/oldcore/77/filelists/i586/grub
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/grub
rename to config/rootfiles/oldcore/77/filelists/i586/grub

diff --git a/config/rootfiles/core/77/filelists/i586/initscripts b/config/rootfiles/oldcore/77/filelists/i586/initscripts
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/initscripts
rename to config/rootfiles/oldcore/77/filelists/i586/initscripts

diff --git a/config/rootfiles/core/77/filelists/i586/linux b/config/rootfiles/oldcore/77/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/linux
rename to config/rootfiles/oldcore/77/filelists/i586/linux

diff --git a/config/rootfiles/core/77/filelists/i586/lm_sensors b/config/rootfiles/oldcore/77/filelists/i586/lm_sensors
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/lm_sensors
rename to config/rootfiles/oldcore/77/filelists/i586/lm_sensors

diff --git a/config/rootfiles/core/77/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/strongswan-padlock
rename to config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock

diff --git a/config/rootfiles/core/77/filelists/i586/util-linux b/config/rootfiles/oldcore/77/filelists/i586/util-linux
similarity index 100%
rename from config/rootfiles/core/77/filelists/i586/util-linux
rename to config/rootfiles/oldcore/77/filelists/i586/util-linux

diff --git a/config/rootfiles/core/77/filelists/iptables b/config/rootfiles/oldcore/77/filelists/iptables
similarity index 100%
rename from config/rootfiles/core/77/filelists/iptables
rename to config/rootfiles/oldcore/77/filelists/iptables

diff --git a/config/rootfiles/core/77/filelists/iw b/config/rootfiles/oldcore/77/filelists/iw
similarity index 100%
rename from config/rootfiles/core/77/filelists/iw
rename to config/rootfiles/oldcore/77/filelists/iw

diff --git a/config/rootfiles/core/77/filelists/jquery b/config/rootfiles/oldcore/77/filelists/jquery
similarity index 100%
rename from config/rootfiles/core/77/filelists/jquery
rename to config/rootfiles/oldcore/77/filelists/jquery

diff --git a/config/rootfiles/core/77/filelists/kmod b/config/rootfiles/oldcore/77/filelists/kmod
similarity index 100%
rename from config/rootfiles/core/77/filelists/kmod
rename to config/rootfiles/oldcore/77/filelists/kmod

diff --git a/config/rootfiles/core/77/filelists/libnl b/config/rootfiles/oldcore/77/filelists/libnl
similarity index 100%
rename from config/rootfiles/core/77/filelists/libnl
rename to config/rootfiles/oldcore/77/filelists/libnl

diff --git a/config/rootfiles/core/77/filelists/libusbx b/config/rootfiles/oldcore/77/filelists/libusbx
similarity index 100%
rename from config/rootfiles/core/77/filelists/libusbx
rename to config/rootfiles/oldcore/77/filelists/libusbx

diff --git a/config/rootfiles/core/77/filelists/libxml2 b/config/rootfiles/oldcore/77/filelists/libxml2
similarity index 100%
rename from config/rootfiles/core/77/filelists/libxml2
rename to config/rootfiles/oldcore/77/filelists/libxml2

diff --git a/config/rootfiles/core/77/filelists/linux-firmware b/config/rootfiles/oldcore/77/filelists/linux-firmware
similarity index 100%
rename from config/rootfiles/core/77/filelists/linux-firmware
rename to config/rootfiles/oldcore/77/filelists/linux-firmware

diff --git a/config/rootfiles/core/77/filelists/lzo b/config/rootfiles/oldcore/77/filelists/lzo
similarity index 100%
rename from config/rootfiles/core/77/filelists/lzo
rename to config/rootfiles/oldcore/77/filelists/lzo

diff --git a/config/rootfiles/core/77/filelists/misc-progs b/config/rootfiles/oldcore/77/filelists/misc-progs
similarity index 100%
rename from config/rootfiles/core/77/filelists/misc-progs
rename to config/rootfiles/oldcore/77/filelists/misc-progs

diff --git a/config/rootfiles/core/77/filelists/mysql-libs b/config/rootfiles/oldcore/77/filelists/mysql-libs
similarity index 100%
rename from config/rootfiles/core/77/filelists/mysql-libs
rename to config/rootfiles/oldcore/77/filelists/mysql-libs

diff --git a/config/rootfiles/core/77/filelists/net-tools b/config/rootfiles/oldcore/77/filelists/net-tools
similarity index 100%
rename from config/rootfiles/core/77/filelists/net-tools
rename to config/rootfiles/oldcore/77/filelists/net-tools

diff --git a/config/rootfiles/core/77/filelists/ntp b/config/rootfiles/oldcore/77/filelists/ntp
similarity index 100%
rename from config/rootfiles/core/77/filelists/ntp
rename to config/rootfiles/oldcore/77/filelists/ntp

diff --git a/config/rootfiles/core/77/filelists/openssh b/config/rootfiles/oldcore/77/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/77/filelists/openssh
rename to config/rootfiles/oldcore/77/filelists/openssh

diff --git a/config/rootfiles/core/77/filelists/openssl b/config/rootfiles/oldcore/77/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/77/filelists/openssl
rename to config/rootfiles/oldcore/77/filelists/openssl

diff --git a/config/rootfiles/core/77/filelists/openssl-compat b/config/rootfiles/oldcore/77/filelists/openssl-compat
similarity index 100%
rename from config/rootfiles/core/77/filelists/openssl-compat
rename to config/rootfiles/oldcore/77/filelists/openssl-compat

diff --git a/config/rootfiles/core/77/filelists/openvpn b/config/rootfiles/oldcore/77/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/77/filelists/openvpn
rename to config/rootfiles/oldcore/77/filelists/openvpn

diff --git a/config/rootfiles/core/77/filelists/pakfire b/config/rootfiles/oldcore/77/filelists/pakfire
similarity index 100%
rename from config/rootfiles/core/77/filelists/pakfire
rename to config/rootfiles/oldcore/77/filelists/pakfire

diff --git a/config/rootfiles/core/77/filelists/paxctl b/config/rootfiles/oldcore/77/filelists/paxctl
similarity index 100%
rename from config/rootfiles/core/77/filelists/paxctl
rename to config/rootfiles/oldcore/77/filelists/paxctl

diff --git a/config/rootfiles/core/77/filelists/php b/config/rootfiles/oldcore/77/filelists/php
similarity index 100%
rename from config/rootfiles/core/77/filelists/php
rename to config/rootfiles/oldcore/77/filelists/php

diff --git a/config/rootfiles/core/77/filelists/rng-tools b/config/rootfiles/oldcore/77/filelists/rng-tools
similarity index 100%
rename from config/rootfiles/core/77/filelists/rng-tools
rename to config/rootfiles/oldcore/77/filelists/rng-tools

diff --git a/config/rootfiles/core/77/filelists/setup b/config/rootfiles/oldcore/77/filelists/setup
similarity index 100%
rename from config/rootfiles/core/77/filelists/setup
rename to config/rootfiles/oldcore/77/filelists/setup

diff --git a/config/rootfiles/core/77/filelists/strongswan b/config/rootfiles/oldcore/77/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/77/filelists/strongswan
rename to config/rootfiles/oldcore/77/filelists/strongswan

diff --git a/config/rootfiles/core/77/filelists/tzdata b/config/rootfiles/oldcore/77/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/77/filelists/tzdata
rename to config/rootfiles/oldcore/77/filelists/tzdata

diff --git a/config/rootfiles/core/77/filelists/udev b/config/rootfiles/oldcore/77/filelists/udev
similarity index 100%
rename from config/rootfiles/core/77/filelists/udev
rename to config/rootfiles/oldcore/77/filelists/udev

diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch b/config/rootfiles/oldcore/77/filelists/usb_modeswitch
similarity index 100%
rename from config/rootfiles/core/77/filelists/usb_modeswitch
rename to config/rootfiles/oldcore/77/filelists/usb_modeswitch

diff --git a/config/rootfiles/core/77/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/77/filelists/usb_modeswitch_data
similarity index 100%
rename from config/rootfiles/core/77/filelists/usb_modeswitch_data
rename to config/rootfiles/oldcore/77/filelists/usb_modeswitch_data

diff --git a/config/rootfiles/core/77/filelists/usbutils b/config/rootfiles/oldcore/77/filelists/usbutils
similarity index 100%
rename from config/rootfiles/core/77/filelists/usbutils
rename to config/rootfiles/oldcore/77/filelists/usbutils

diff --git a/config/rootfiles/core/77/filelists/vim b/config/rootfiles/oldcore/77/filelists/vim
similarity index 100%
rename from config/rootfiles/core/77/filelists/vim
rename to config/rootfiles/oldcore/77/filelists/vim

diff --git a/config/rootfiles/core/77/filelists/wget b/config/rootfiles/oldcore/77/filelists/wget
similarity index 100%
rename from config/rootfiles/core/77/filelists/wget
rename to config/rootfiles/oldcore/77/filelists/wget

diff --git a/config/rootfiles/core/77/filelists/wpa_supplicant b/config/rootfiles/oldcore/77/filelists/wpa_supplicant
similarity index 100%
rename from config/rootfiles/core/77/filelists/wpa_supplicant
rename to config/rootfiles/oldcore/77/filelists/wpa_supplicant

diff --git a/config/rootfiles/core/77/filelists/xz b/config/rootfiles/oldcore/77/filelists/xz
similarity index 100%
rename from config/rootfiles/core/77/filelists/xz
rename to config/rootfiles/oldcore/77/filelists/xz

diff --git a/config/rootfiles/core/79/meta b/config/rootfiles/oldcore/77/meta
similarity index 100%
rename from config/rootfiles/core/79/meta
rename to config/rootfiles/oldcore/77/meta

diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/oldcore/77/update.sh
similarity index 100%
rename from config/rootfiles/core/77/update.sh
rename to config/rootfiles/oldcore/77/update.sh

diff --git a/config/rootfiles/oldcore/79/exclude b/config/rootfiles/oldcore/79/exclude
new file mode 100644 (file)
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/oldcore/79/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache

diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood
similarity index 100%
rename from config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood
rename to config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood

diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/79/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi

diff --git a/config/rootfiles/core/79/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi
similarity index 100%
rename from config/rootfiles/core/79/filelists/armv5tel/linux-rpi
rename to config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi

diff --git a/config/rootfiles/core/79/filelists/daq b/config/rootfiles/oldcore/79/filelists/daq
similarity index 100%
rename from config/rootfiles/core/79/filelists/daq
rename to config/rootfiles/oldcore/79/filelists/daq

diff --git a/config/rootfiles/core/79/filelists/files b/config/rootfiles/oldcore/79/filelists/files
similarity index 100%
rename from config/rootfiles/core/79/filelists/files
rename to config/rootfiles/oldcore/79/filelists/files

diff --git a/config/rootfiles/core/79/filelists/hostname b/config/rootfiles/oldcore/79/filelists/hostname
similarity index 100%
rename from config/rootfiles/core/79/filelists/hostname
rename to config/rootfiles/oldcore/79/filelists/hostname

diff --git a/config/rootfiles/core/79/filelists/i586/grub b/config/rootfiles/oldcore/79/filelists/i586/grub
similarity index 100%
rename from config/rootfiles/core/79/filelists/i586/grub
rename to config/rootfiles/oldcore/79/filelists/i586/grub

diff --git a/config/rootfiles/core/79/filelists/i586/linux b/config/rootfiles/oldcore/79/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/79/filelists/i586/linux
rename to config/rootfiles/oldcore/79/filelists/i586/linux

diff --git a/config/rootfiles/core/79/filelists/i586/syslinux b/config/rootfiles/oldcore/79/filelists/i586/syslinux
similarity index 100%
rename from config/rootfiles/core/79/filelists/i586/syslinux
rename to config/rootfiles/oldcore/79/filelists/i586/syslinux

diff --git a/config/rootfiles/core/79/filelists/libpcap b/config/rootfiles/oldcore/79/filelists/libpcap
similarity index 100%
rename from config/rootfiles/core/79/filelists/libpcap
rename to config/rootfiles/oldcore/79/filelists/libpcap

diff --git a/config/rootfiles/core/79/filelists/openssh b/config/rootfiles/oldcore/79/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/79/filelists/openssh
rename to config/rootfiles/oldcore/79/filelists/openssh

diff --git a/config/rootfiles/core/79/filelists/openssl b/config/rootfiles/oldcore/79/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/79/filelists/openssl
rename to config/rootfiles/oldcore/79/filelists/openssl

diff --git a/config/rootfiles/core/79/filelists/openvpn b/config/rootfiles/oldcore/79/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/79/filelists/openvpn
rename to config/rootfiles/oldcore/79/filelists/openvpn

diff --git a/config/rootfiles/core/79/filelists/perl-Device-Modem b/config/rootfiles/oldcore/79/filelists/perl-Device-Modem
similarity index 100%
rename from config/rootfiles/core/79/filelists/perl-Device-Modem
rename to config/rootfiles/oldcore/79/filelists/perl-Device-Modem

diff --git a/config/rootfiles/core/79/filelists/perl-Device-SerialPort b/config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort
similarity index 100%
rename from config/rootfiles/core/79/filelists/perl-Device-SerialPort
rename to config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort

diff --git a/config/rootfiles/core/79/filelists/ppp b/config/rootfiles/oldcore/79/filelists/ppp
similarity index 100%
rename from config/rootfiles/core/79/filelists/ppp
rename to config/rootfiles/oldcore/79/filelists/ppp

diff --git a/config/rootfiles/core/79/filelists/snort b/config/rootfiles/oldcore/79/filelists/snort
similarity index 100%
rename from config/rootfiles/core/79/filelists/snort
rename to config/rootfiles/oldcore/79/filelists/snort

diff --git a/config/rootfiles/core/79/filelists/squid b/config/rootfiles/oldcore/79/filelists/squid
similarity index 100%
rename from config/rootfiles/core/79/filelists/squid
rename to config/rootfiles/oldcore/79/filelists/squid

diff --git a/config/rootfiles/core/79/filelists/sudo b/config/rootfiles/oldcore/79/filelists/sudo
similarity index 100%
rename from config/rootfiles/core/79/filelists/sudo
rename to config/rootfiles/oldcore/79/filelists/sudo

diff --git a/config/rootfiles/core/79/filelists/vnstat b/config/rootfiles/oldcore/79/filelists/vnstat
similarity index 100%
rename from config/rootfiles/core/79/filelists/vnstat
rename to config/rootfiles/oldcore/79/filelists/vnstat

diff --git a/config/rootfiles/oldcore/79/meta b/config/rootfiles/oldcore/79/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/79/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/79/update.sh b/config/rootfiles/oldcore/79/update.sh
similarity index 100%
rename from config/rootfiles/core/79/update.sh
rename to config/rootfiles/oldcore/79/update.sh

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index e27eba6e5923888fb1a4e1f216f17bbc298535d8..c2aee7cf5964009e7f416890de833b6eeda37ab0 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -11,15 +11,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.22
+usr/lib/libclamav.so.6.1.23
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.22
+usr/lib/libclamunrar.so.6.1.23
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.22
+usr/lib/libclamunrar_iface.so.6.1.23
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane
index 411243e39c9c19f9290c51e00465b08990376809..4fd9b98ed228d1f6b0ca8480513eb9de4bbe4389 100644 (file)
--- a/config/rootfiles/packages/sane
+++ b/config/rootfiles/packages/sane
@@ -36,6 +36,7 @@ etc/sane.d/hp5400.conf
 etc/sane.d/hs2p.conf
 etc/sane.d/ibm.conf
 etc/sane.d/kodak.conf
+etc/sane.d/kodakaio.conf
 etc/sane.d/leo.conf
 etc/sane.d/lexmark.conf
 etc/sane.d/ma1509.conf
@@ -79,427 +80,440 @@ usr/bin/gamma4scanimage
 usr/bin/sane-config
 usr/bin/sane-find-scanner
 usr/bin/scanimage
-usr/doc/sane-1.0.22
-usr/doc/sane-1.0.22/AUTHORS
-usr/doc/sane-1.0.22/COPYING
-usr/doc/sane-1.0.22/ChangeLog
-usr/doc/sane-1.0.22/LICENSE
-usr/doc/sane-1.0.22/NEWS
-usr/doc/sane-1.0.22/PROBLEMS
-usr/doc/sane-1.0.22/PROJECTS
-usr/doc/sane-1.0.22/README
-#usr/doc/sane-1.0.22/README.aix
-#usr/doc/sane-1.0.22/README.beos
-#usr/doc/sane-1.0.22/README.darwin
-usr/doc/sane-1.0.22/README.djpeg
-#usr/doc/sane-1.0.22/README.freebsd
-#usr/doc/sane-1.0.22/README.hp-ux
-usr/doc/sane-1.0.22/README.linux
-#usr/doc/sane-1.0.22/README.netbsd
-#usr/doc/sane-1.0.22/README.openbsd
-#usr/doc/sane-1.0.22/README.os2
-#usr/doc/sane-1.0.22/README.solaris
-#usr/doc/sane-1.0.22/README.unixware2
-#usr/doc/sane-1.0.22/README.unixware7
-#usr/doc/sane-1.0.22/README.windows
-#usr/doc/sane-1.0.22/README.zeta
-#usr/doc/sane-1.0.22/backend-writing.txt
-usr/doc/sane-1.0.22/canon
-usr/doc/sane-1.0.22/canon/canon.changes
-usr/doc/sane-1.0.22/canon/canon.install2700F.txt
-#usr/doc/sane-1.0.22/gt68xx
-usr/doc/sane-1.0.22/gt68xx/gt68xx.CHANGES
-usr/doc/sane-1.0.22/gt68xx/gt68xx.TODO
-#usr/doc/sane-1.0.22/leo
-usr/doc/sane-1.0.22/leo/leo.txt
-#usr/doc/sane-1.0.22/matsushita
-usr/doc/sane-1.0.22/matsushita/matsushita.txt
-#usr/doc/sane-1.0.22/mustek
-usr/doc/sane-1.0.22/mustek/mustek.CHANGES
-#usr/doc/sane-1.0.22/mustek_usb
-usr/doc/sane-1.0.22/mustek_usb/mustek_usb.CHANGES
-usr/doc/sane-1.0.22/mustek_usb/mustek_usb.TODO
-#usr/doc/sane-1.0.22/mustek_usb2
-usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.CHANGES
-usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.TODO
-#usr/doc/sane-1.0.22/niash
-usr/doc/sane-1.0.22/niash/niash.TODO
-#usr/doc/sane-1.0.22/plustek
-usr/doc/sane-1.0.22/plustek/FAQ
-usr/doc/sane-1.0.22/plustek/MakeModule.sh
-#usr/doc/sane-1.0.22/plustek/Makefile.kernel24
-usr/doc/sane-1.0.22/plustek/Makefile.kernel26
-usr/doc/sane-1.0.22/plustek/Plustek-PARPORT-TODO.txt
-usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.changes
-usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.txt
-usr/doc/sane-1.0.22/plustek/Plustek-USB-TODO.txt
-usr/doc/sane-1.0.22/plustek/Plustek-USB.changes
-usr/doc/sane-1.0.22/plustek/Plustek-USB.txt
-usr/doc/sane-1.0.22/sane-backends-external.html
-usr/doc/sane-1.0.22/sane-backends.html
-usr/doc/sane-1.0.22/sane-mfgs-external.html
-usr/doc/sane-1.0.22/sane-mfgs.html
-#usr/doc/sane-1.0.22/sceptre
-usr/doc/sane-1.0.22/sceptre/s1200.txt
-#usr/doc/sane-1.0.22/teco
-usr/doc/sane-1.0.22/teco/teco1.txt
-usr/doc/sane-1.0.22/teco/teco2.txt
-usr/doc/sane-1.0.22/teco/teco3.txt
-#usr/doc/sane-1.0.22/u12
-usr/doc/sane-1.0.22/u12/U12.changes
-usr/doc/sane-1.0.22/u12/U12.todo
-#usr/doc/sane-1.0.22/umax
-usr/doc/sane-1.0.22/umax/negative-types.txt
-usr/doc/sane-1.0.22/umax/sane-logo.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-advanced-options-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-advanced.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-astra-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-config-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-histogram.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-mirage-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-not-listed-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-others-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-parport-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-powerlook-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-scanner-clones-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-speed-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-standard-options-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-standard.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-text.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-text2.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-text4.jpg
-usr/doc/sane-1.0.22/umax/sane-umax-uc-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax-vista-doc.html
-usr/doc/sane-1.0.22/umax/sane-umax.jpg
-usr/doc/sane-1.0.22/umax/umax.BUGS
-usr/doc/sane-1.0.22/umax/umax.CHANGES
-usr/doc/sane-1.0.22/umax/umax.FAQ
-usr/doc/sane-1.0.22/umax/umax.TODO
+usr/doc/sane-1.0.24
+#usr/doc/sane-1.0.24/AUTHORS
+#usr/doc/sane-1.0.24/COPYING
+#usr/doc/sane-1.0.24/ChangeLog
+#usr/doc/sane-1.0.24/LICENSE
+#usr/doc/sane-1.0.24/NEWS
+#usr/doc/sane-1.0.24/PROBLEMS
+#usr/doc/sane-1.0.24/PROJECTS
+#usr/doc/sane-1.0.24/README
+#usr/doc/sane-1.0.24/README.aix
+#usr/doc/sane-1.0.24/README.beos
+#usr/doc/sane-1.0.24/README.darwin
+#usr/doc/sane-1.0.24/README.djpeg
+#usr/doc/sane-1.0.24/README.freebsd
+#usr/doc/sane-1.0.24/README.hp-ux
+#usr/doc/sane-1.0.24/README.linux
+#usr/doc/sane-1.0.24/README.netbsd
+#usr/doc/sane-1.0.24/README.openbsd
+#usr/doc/sane-1.0.24/README.os2
+#usr/doc/sane-1.0.24/README.solaris
+#usr/doc/sane-1.0.24/README.unixware2
+#usr/doc/sane-1.0.24/README.unixware7
+#usr/doc/sane-1.0.24/README.windows
+#usr/doc/sane-1.0.24/README.zeta
+#usr/doc/sane-1.0.24/backend-writing.txt
+#usr/doc/sane-1.0.24/canon
+#usr/doc/sane-1.0.24/canon/canon.changes
+#usr/doc/sane-1.0.24/canon/canon.install2700F.txt
+#usr/doc/sane-1.0.24/gt68xx
+#usr/doc/sane-1.0.24/gt68xx/gt68xx.CHANGES
+#usr/doc/sane-1.0.24/gt68xx/gt68xx.TODO
+#usr/doc/sane-1.0.24/leo
+#usr/doc/sane-1.0.24/leo/leo.txt
+#usr/doc/sane-1.0.24/matsushita
+#usr/doc/sane-1.0.24/matsushita/matsushita.txt
+#usr/doc/sane-1.0.24/mustek
+#usr/doc/sane-1.0.24/mustek/mustek.CHANGES
+#usr/doc/sane-1.0.24/mustek_usb
+#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.CHANGES
+#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.TODO
+#usr/doc/sane-1.0.24/mustek_usb2
+#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.CHANGES
+#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.TODO
+#usr/doc/sane-1.0.24/niash
+#usr/doc/sane-1.0.24/niash/niash.TODO
+#usr/doc/sane-1.0.24/plustek
+#usr/doc/sane-1.0.24/plustek/FAQ
+#usr/doc/sane-1.0.24/plustek/MakeModule.sh
+#usr/doc/sane-1.0.24/plustek/Makefile.kernel24
+#usr/doc/sane-1.0.24/plustek/Makefile.kernel26
+#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT-TODO.txt
+#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.changes
+#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.txt
+#usr/doc/sane-1.0.24/plustek/Plustek-USB-TODO.txt
+#usr/doc/sane-1.0.24/plustek/Plustek-USB.changes
+#usr/doc/sane-1.0.24/plustek/Plustek-USB.txt
+#usr/doc/sane-1.0.24/sane-backends-external.html
+#usr/doc/sane-1.0.24/sane-backends.html
+#usr/doc/sane-1.0.24/sane-mfgs-external.html
+#usr/doc/sane-1.0.24/sane-mfgs.html
+#usr/doc/sane-1.0.24/sceptre
+#usr/doc/sane-1.0.24/sceptre/s1200.txt
+#usr/doc/sane-1.0.24/teco
+#usr/doc/sane-1.0.24/teco/teco1.txt
+#usr/doc/sane-1.0.24/teco/teco2.txt
+#usr/doc/sane-1.0.24/teco/teco3.txt
+#usr/doc/sane-1.0.24/u12
+#usr/doc/sane-1.0.24/u12/U12.changes
+#usr/doc/sane-1.0.24/u12/U12.todo
+#usr/doc/sane-1.0.24/umax
+#usr/doc/sane-1.0.24/umax/negative-types.txt
+#usr/doc/sane-1.0.24/umax/sane-logo.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-advanced-options-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-advanced.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-astra-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-config-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-histogram.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-mirage-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-not-listed-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-others-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-parport-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-powerlook-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-scanner-clones-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-speed-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-standard-options-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-standard.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-text.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-text2.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-text4.jpg
+#usr/doc/sane-1.0.24/umax/sane-umax-uc-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax-vista-doc.html
+#usr/doc/sane-1.0.24/umax/sane-umax.jpg
+#usr/doc/sane-1.0.24/umax/umax.BUGS
+#usr/doc/sane-1.0.24/umax/umax.CHANGES
+#usr/doc/sane-1.0.24/umax/umax.FAQ
+#usr/doc/sane-1.0.24/umax/umax.TODO
 #usr/include/sane
 usr/include/sane/sane.h
 usr/include/sane/saneopts.h
 #usr/lib/libsane.la
 usr/lib/libsane.so
 usr/lib/libsane.so.1
-usr/lib/libsane.so.1.0.22
+usr/lib/libsane.so.1.0.24
+#usr/lib/pkgconfig/sane-backends.pc
 #usr/lib/sane
 #usr/lib/sane/libsane-abaton.la
 usr/lib/sane/libsane-abaton.so
 usr/lib/sane/libsane-abaton.so.1
-usr/lib/sane/libsane-abaton.so.1.0.22
+usr/lib/sane/libsane-abaton.so.1.0.24
 #usr/lib/sane/libsane-agfafocus.la
 usr/lib/sane/libsane-agfafocus.so
 usr/lib/sane/libsane-agfafocus.so.1
-usr/lib/sane/libsane-agfafocus.so.1.0.22
+usr/lib/sane/libsane-agfafocus.so.1.0.24
 #usr/lib/sane/libsane-apple.la
 usr/lib/sane/libsane-apple.so
 usr/lib/sane/libsane-apple.so.1
-usr/lib/sane/libsane-apple.so.1.0.22
+usr/lib/sane/libsane-apple.so.1.0.24
 #usr/lib/sane/libsane-artec.la
 usr/lib/sane/libsane-artec.so
 usr/lib/sane/libsane-artec.so.1
-usr/lib/sane/libsane-artec.so.1.0.22
+usr/lib/sane/libsane-artec.so.1.0.24
 #usr/lib/sane/libsane-artec_eplus48u.la
 usr/lib/sane/libsane-artec_eplus48u.so
 usr/lib/sane/libsane-artec_eplus48u.so.1
-usr/lib/sane/libsane-artec_eplus48u.so.1.0.22
+usr/lib/sane/libsane-artec_eplus48u.so.1.0.24
 #usr/lib/sane/libsane-as6e.la
 usr/lib/sane/libsane-as6e.so
 usr/lib/sane/libsane-as6e.so.1
-usr/lib/sane/libsane-as6e.so.1.0.22
+usr/lib/sane/libsane-as6e.so.1.0.24
 #usr/lib/sane/libsane-avision.la
 usr/lib/sane/libsane-avision.so
 usr/lib/sane/libsane-avision.so.1
-usr/lib/sane/libsane-avision.so.1.0.22
+usr/lib/sane/libsane-avision.so.1.0.24
 #usr/lib/sane/libsane-bh.la
 usr/lib/sane/libsane-bh.so
 usr/lib/sane/libsane-bh.so.1
-usr/lib/sane/libsane-bh.so.1.0.22
+usr/lib/sane/libsane-bh.so.1.0.24
 #usr/lib/sane/libsane-canon.la
 usr/lib/sane/libsane-canon.so
 usr/lib/sane/libsane-canon.so.1
-usr/lib/sane/libsane-canon.so.1.0.22
+usr/lib/sane/libsane-canon.so.1.0.24
 #usr/lib/sane/libsane-canon630u.la
 usr/lib/sane/libsane-canon630u.so
 usr/lib/sane/libsane-canon630u.so.1
-usr/lib/sane/libsane-canon630u.so.1.0.22
+usr/lib/sane/libsane-canon630u.so.1.0.24
 #usr/lib/sane/libsane-canon_dr.la
 usr/lib/sane/libsane-canon_dr.so
 usr/lib/sane/libsane-canon_dr.so.1
-usr/lib/sane/libsane-canon_dr.so.1.0.22
+usr/lib/sane/libsane-canon_dr.so.1.0.24
 #usr/lib/sane/libsane-cardscan.la
 usr/lib/sane/libsane-cardscan.so
 usr/lib/sane/libsane-cardscan.so.1
-usr/lib/sane/libsane-cardscan.so.1.0.22
+usr/lib/sane/libsane-cardscan.so.1.0.24
 #usr/lib/sane/libsane-coolscan.la
 usr/lib/sane/libsane-coolscan.so
 usr/lib/sane/libsane-coolscan.so.1
-usr/lib/sane/libsane-coolscan.so.1.0.22
+usr/lib/sane/libsane-coolscan.so.1.0.24
 #usr/lib/sane/libsane-coolscan2.la
 usr/lib/sane/libsane-coolscan2.so
 usr/lib/sane/libsane-coolscan2.so.1
-usr/lib/sane/libsane-coolscan2.so.1.0.22
+usr/lib/sane/libsane-coolscan2.so.1.0.24
 #usr/lib/sane/libsane-coolscan3.la
 usr/lib/sane/libsane-coolscan3.so
 usr/lib/sane/libsane-coolscan3.so.1
-usr/lib/sane/libsane-coolscan3.so.1.0.22
+usr/lib/sane/libsane-coolscan3.so.1.0.24
 #usr/lib/sane/libsane-dc210.la
 usr/lib/sane/libsane-dc210.so
 usr/lib/sane/libsane-dc210.so.1
-usr/lib/sane/libsane-dc210.so.1.0.22
+usr/lib/sane/libsane-dc210.so.1.0.24
 #usr/lib/sane/libsane-dc240.la
 usr/lib/sane/libsane-dc240.so
 usr/lib/sane/libsane-dc240.so.1
-usr/lib/sane/libsane-dc240.so.1.0.22
+usr/lib/sane/libsane-dc240.so.1.0.24
 #usr/lib/sane/libsane-dc25.la
 usr/lib/sane/libsane-dc25.so
 usr/lib/sane/libsane-dc25.so.1
-usr/lib/sane/libsane-dc25.so.1.0.22
+usr/lib/sane/libsane-dc25.so.1.0.24
 #usr/lib/sane/libsane-dell1600n_net.la
 usr/lib/sane/libsane-dell1600n_net.so
 usr/lib/sane/libsane-dell1600n_net.so.1
-usr/lib/sane/libsane-dell1600n_net.so.1.0.22
+usr/lib/sane/libsane-dell1600n_net.so.1.0.24
 #usr/lib/sane/libsane-dll.la
 usr/lib/sane/libsane-dll.so
 usr/lib/sane/libsane-dll.so.1
-usr/lib/sane/libsane-dll.so.1.0.22
+usr/lib/sane/libsane-dll.so.1.0.24
 #usr/lib/sane/libsane-dmc.la
 usr/lib/sane/libsane-dmc.so
 usr/lib/sane/libsane-dmc.so.1
-usr/lib/sane/libsane-dmc.so.1.0.22
+usr/lib/sane/libsane-dmc.so.1.0.24
 #usr/lib/sane/libsane-epjitsu.la
 usr/lib/sane/libsane-epjitsu.so
 usr/lib/sane/libsane-epjitsu.so.1
-usr/lib/sane/libsane-epjitsu.so.1.0.22
+usr/lib/sane/libsane-epjitsu.so.1.0.24
 #usr/lib/sane/libsane-epson.la
 usr/lib/sane/libsane-epson.so
 usr/lib/sane/libsane-epson.so.1
-usr/lib/sane/libsane-epson.so.1.0.22
+usr/lib/sane/libsane-epson.so.1.0.24
 #usr/lib/sane/libsane-epson2.la
 usr/lib/sane/libsane-epson2.so
 usr/lib/sane/libsane-epson2.so.1
-usr/lib/sane/libsane-epson2.so.1.0.22
+usr/lib/sane/libsane-epson2.so.1.0.24
 #usr/lib/sane/libsane-fujitsu.la
 usr/lib/sane/libsane-fujitsu.so
 usr/lib/sane/libsane-fujitsu.so.1
-usr/lib/sane/libsane-fujitsu.so.1.0.22
+usr/lib/sane/libsane-fujitsu.so.1.0.24
 #usr/lib/sane/libsane-genesys.la
 usr/lib/sane/libsane-genesys.so
 usr/lib/sane/libsane-genesys.so.1
-usr/lib/sane/libsane-genesys.so.1.0.22
+usr/lib/sane/libsane-genesys.so.1.0.24
 #usr/lib/sane/libsane-gt68xx.la
 usr/lib/sane/libsane-gt68xx.so
 usr/lib/sane/libsane-gt68xx.so.1
-usr/lib/sane/libsane-gt68xx.so.1.0.22
+usr/lib/sane/libsane-gt68xx.so.1.0.24
 #usr/lib/sane/libsane-hp.la
 usr/lib/sane/libsane-hp.so
 usr/lib/sane/libsane-hp.so.1
-usr/lib/sane/libsane-hp.so.1.0.22
+usr/lib/sane/libsane-hp.so.1.0.24
 #usr/lib/sane/libsane-hp3500.la
 usr/lib/sane/libsane-hp3500.so
 usr/lib/sane/libsane-hp3500.so.1
-usr/lib/sane/libsane-hp3500.so.1.0.22
+usr/lib/sane/libsane-hp3500.so.1.0.24
 #usr/lib/sane/libsane-hp3900.la
 usr/lib/sane/libsane-hp3900.so
 usr/lib/sane/libsane-hp3900.so.1
-usr/lib/sane/libsane-hp3900.so.1.0.22
+usr/lib/sane/libsane-hp3900.so.1.0.24
 #usr/lib/sane/libsane-hp4200.la
 usr/lib/sane/libsane-hp4200.so
 usr/lib/sane/libsane-hp4200.so.1
-usr/lib/sane/libsane-hp4200.so.1.0.22
+usr/lib/sane/libsane-hp4200.so.1.0.24
 #usr/lib/sane/libsane-hp5400.la
 usr/lib/sane/libsane-hp5400.so
 usr/lib/sane/libsane-hp5400.so.1
-usr/lib/sane/libsane-hp5400.so.1.0.22
+usr/lib/sane/libsane-hp5400.so.1.0.24
 #usr/lib/sane/libsane-hp5590.la
 usr/lib/sane/libsane-hp5590.so
 usr/lib/sane/libsane-hp5590.so.1
-usr/lib/sane/libsane-hp5590.so.1.0.22
+usr/lib/sane/libsane-hp5590.so.1.0.24
 #usr/lib/sane/libsane-hpljm1005.la
 usr/lib/sane/libsane-hpljm1005.so
 usr/lib/sane/libsane-hpljm1005.so.1
-usr/lib/sane/libsane-hpljm1005.so.1.0.22
+usr/lib/sane/libsane-hpljm1005.so.1.0.24
 #usr/lib/sane/libsane-hs2p.la
 usr/lib/sane/libsane-hs2p.so
 usr/lib/sane/libsane-hs2p.so.1
-usr/lib/sane/libsane-hs2p.so.1.0.22
+usr/lib/sane/libsane-hs2p.so.1.0.24
 #usr/lib/sane/libsane-ibm.la
 usr/lib/sane/libsane-ibm.so
 usr/lib/sane/libsane-ibm.so.1
-usr/lib/sane/libsane-ibm.so.1.0.22
+usr/lib/sane/libsane-ibm.so.1.0.24
 #usr/lib/sane/libsane-kodak.la
 usr/lib/sane/libsane-kodak.so
 usr/lib/sane/libsane-kodak.so.1
-usr/lib/sane/libsane-kodak.so.1.0.22
+usr/lib/sane/libsane-kodak.so.1.0.24
+#usr/lib/sane/libsane-kodakaio.la
+usr/lib/sane/libsane-kodakaio.so
+usr/lib/sane/libsane-kodakaio.so.1
+usr/lib/sane/libsane-kodakaio.so.1.0.24
 #usr/lib/sane/libsane-kvs1025.la
 usr/lib/sane/libsane-kvs1025.so
 usr/lib/sane/libsane-kvs1025.so.1
-usr/lib/sane/libsane-kvs1025.so.1.0.22
+usr/lib/sane/libsane-kvs1025.so.1.0.24
 #usr/lib/sane/libsane-kvs20xx.la
 usr/lib/sane/libsane-kvs20xx.so
 usr/lib/sane/libsane-kvs20xx.so.1
-usr/lib/sane/libsane-kvs20xx.so.1.0.22
+usr/lib/sane/libsane-kvs20xx.so.1.0.24
+#usr/lib/sane/libsane-kvs40xx.la
+usr/lib/sane/libsane-kvs40xx.so
+usr/lib/sane/libsane-kvs40xx.so.1
+usr/lib/sane/libsane-kvs40xx.so.1.0.24
 #usr/lib/sane/libsane-leo.la
 usr/lib/sane/libsane-leo.so
 usr/lib/sane/libsane-leo.so.1
-usr/lib/sane/libsane-leo.so.1.0.22
+usr/lib/sane/libsane-leo.so.1.0.24
 #usr/lib/sane/libsane-lexmark.la
 usr/lib/sane/libsane-lexmark.so
 usr/lib/sane/libsane-lexmark.so.1
-usr/lib/sane/libsane-lexmark.so.1.0.22
+usr/lib/sane/libsane-lexmark.so.1.0.24
 #usr/lib/sane/libsane-ma1509.la
 usr/lib/sane/libsane-ma1509.so
 usr/lib/sane/libsane-ma1509.so.1
-usr/lib/sane/libsane-ma1509.so.1.0.22
+usr/lib/sane/libsane-ma1509.so.1.0.24
 #usr/lib/sane/libsane-magicolor.la
 usr/lib/sane/libsane-magicolor.so
 usr/lib/sane/libsane-magicolor.so.1
-usr/lib/sane/libsane-magicolor.so.1.0.22
+usr/lib/sane/libsane-magicolor.so.1.0.24
 #usr/lib/sane/libsane-matsushita.la
 usr/lib/sane/libsane-matsushita.so
 usr/lib/sane/libsane-matsushita.so.1
-usr/lib/sane/libsane-matsushita.so.1.0.22
+usr/lib/sane/libsane-matsushita.so.1.0.24
 #usr/lib/sane/libsane-microtek.la
 usr/lib/sane/libsane-microtek.so
 usr/lib/sane/libsane-microtek.so.1
-usr/lib/sane/libsane-microtek.so.1.0.22
+usr/lib/sane/libsane-microtek.so.1.0.24
 #usr/lib/sane/libsane-microtek2.la
 usr/lib/sane/libsane-microtek2.so
 usr/lib/sane/libsane-microtek2.so.1
-usr/lib/sane/libsane-microtek2.so.1.0.22
+usr/lib/sane/libsane-microtek2.so.1.0.24
 #usr/lib/sane/libsane-mustek.la
 usr/lib/sane/libsane-mustek.so
 usr/lib/sane/libsane-mustek.so.1
-usr/lib/sane/libsane-mustek.so.1.0.22
+usr/lib/sane/libsane-mustek.so.1.0.24
 #usr/lib/sane/libsane-mustek_pp.la
 usr/lib/sane/libsane-mustek_pp.so
 usr/lib/sane/libsane-mustek_pp.so.1
-usr/lib/sane/libsane-mustek_pp.so.1.0.22
+usr/lib/sane/libsane-mustek_pp.so.1.0.24
 #usr/lib/sane/libsane-mustek_usb.la
 usr/lib/sane/libsane-mustek_usb.so
 usr/lib/sane/libsane-mustek_usb.so.1
-usr/lib/sane/libsane-mustek_usb.so.1.0.22
+usr/lib/sane/libsane-mustek_usb.so.1.0.24
+#usr/lib/sane/libsane-mustek_usb2.la
+usr/lib/sane/libsane-mustek_usb2.so
+usr/lib/sane/libsane-mustek_usb2.so.1
+usr/lib/sane/libsane-mustek_usb2.so.1.0.24
 #usr/lib/sane/libsane-nec.la
 usr/lib/sane/libsane-nec.so
 usr/lib/sane/libsane-nec.so.1
-usr/lib/sane/libsane-nec.so.1.0.22
+usr/lib/sane/libsane-nec.so.1.0.24
 #usr/lib/sane/libsane-net.la
 usr/lib/sane/libsane-net.so
 usr/lib/sane/libsane-net.so.1
-usr/lib/sane/libsane-net.so.1.0.22
+usr/lib/sane/libsane-net.so.1.0.24
 #usr/lib/sane/libsane-niash.la
 usr/lib/sane/libsane-niash.so
 usr/lib/sane/libsane-niash.so.1
-usr/lib/sane/libsane-niash.so.1.0.22
+usr/lib/sane/libsane-niash.so.1.0.24
 #usr/lib/sane/libsane-p5.la
 usr/lib/sane/libsane-p5.so
 usr/lib/sane/libsane-p5.so.1
-usr/lib/sane/libsane-p5.so.1.0.22
+usr/lib/sane/libsane-p5.so.1.0.24
 #usr/lib/sane/libsane-pie.la
 usr/lib/sane/libsane-pie.so
 usr/lib/sane/libsane-pie.so.1
-usr/lib/sane/libsane-pie.so.1.0.22
+usr/lib/sane/libsane-pie.so.1.0.24
 #usr/lib/sane/libsane-pixma.la
 usr/lib/sane/libsane-pixma.so
 usr/lib/sane/libsane-pixma.so.1
-usr/lib/sane/libsane-pixma.so.1.0.22
+usr/lib/sane/libsane-pixma.so.1.0.24
 #usr/lib/sane/libsane-plustek.la
 usr/lib/sane/libsane-plustek.so
 usr/lib/sane/libsane-plustek.so.1
-usr/lib/sane/libsane-plustek.so.1.0.22
+usr/lib/sane/libsane-plustek.so.1.0.24
 #usr/lib/sane/libsane-plustek_pp.la
 usr/lib/sane/libsane-plustek_pp.so
 usr/lib/sane/libsane-plustek_pp.so.1
-usr/lib/sane/libsane-plustek_pp.so.1.0.22
+usr/lib/sane/libsane-plustek_pp.so.1.0.24
 #usr/lib/sane/libsane-qcam.la
 usr/lib/sane/libsane-qcam.so
 usr/lib/sane/libsane-qcam.so.1
-usr/lib/sane/libsane-qcam.so.1.0.22
+usr/lib/sane/libsane-qcam.so.1.0.24
 #usr/lib/sane/libsane-ricoh.la
 usr/lib/sane/libsane-ricoh.so
 usr/lib/sane/libsane-ricoh.so.1
-usr/lib/sane/libsane-ricoh.so.1.0.22
+usr/lib/sane/libsane-ricoh.so.1.0.24
 #usr/lib/sane/libsane-rts8891.la
 usr/lib/sane/libsane-rts8891.so
 usr/lib/sane/libsane-rts8891.so.1
-usr/lib/sane/libsane-rts8891.so.1.0.22
+usr/lib/sane/libsane-rts8891.so.1.0.24
 #usr/lib/sane/libsane-s9036.la
 usr/lib/sane/libsane-s9036.so
 usr/lib/sane/libsane-s9036.so.1
-usr/lib/sane/libsane-s9036.so.1.0.22
+usr/lib/sane/libsane-s9036.so.1.0.24
 #usr/lib/sane/libsane-sceptre.la
 usr/lib/sane/libsane-sceptre.so
 usr/lib/sane/libsane-sceptre.so.1
-usr/lib/sane/libsane-sceptre.so.1.0.22
+usr/lib/sane/libsane-sceptre.so.1.0.24
 #usr/lib/sane/libsane-sharp.la
 usr/lib/sane/libsane-sharp.so
 usr/lib/sane/libsane-sharp.so.1
-usr/lib/sane/libsane-sharp.so.1.0.22
+usr/lib/sane/libsane-sharp.so.1.0.24
 #usr/lib/sane/libsane-sm3600.la
 usr/lib/sane/libsane-sm3600.so
 usr/lib/sane/libsane-sm3600.so.1
-usr/lib/sane/libsane-sm3600.so.1.0.22
+usr/lib/sane/libsane-sm3600.so.1.0.24
 #usr/lib/sane/libsane-sm3840.la
 usr/lib/sane/libsane-sm3840.so
 usr/lib/sane/libsane-sm3840.so.1
-usr/lib/sane/libsane-sm3840.so.1.0.22
+usr/lib/sane/libsane-sm3840.so.1.0.24
 #usr/lib/sane/libsane-snapscan.la
 usr/lib/sane/libsane-snapscan.so
 usr/lib/sane/libsane-snapscan.so.1
-usr/lib/sane/libsane-snapscan.so.1.0.22
+usr/lib/sane/libsane-snapscan.so.1.0.24
 #usr/lib/sane/libsane-sp15c.la
 usr/lib/sane/libsane-sp15c.so
 usr/lib/sane/libsane-sp15c.so.1
-usr/lib/sane/libsane-sp15c.so.1.0.22
+usr/lib/sane/libsane-sp15c.so.1.0.24
 #usr/lib/sane/libsane-st400.la
 usr/lib/sane/libsane-st400.so
 usr/lib/sane/libsane-st400.so.1
-usr/lib/sane/libsane-st400.so.1.0.22
+usr/lib/sane/libsane-st400.so.1.0.24
 #usr/lib/sane/libsane-stv680.la
 usr/lib/sane/libsane-stv680.so
 usr/lib/sane/libsane-stv680.so.1
-usr/lib/sane/libsane-stv680.so.1.0.22
+usr/lib/sane/libsane-stv680.so.1.0.24
 #usr/lib/sane/libsane-tamarack.la
 usr/lib/sane/libsane-tamarack.so
 usr/lib/sane/libsane-tamarack.so.1
-usr/lib/sane/libsane-tamarack.so.1.0.22
+usr/lib/sane/libsane-tamarack.so.1.0.24
 #usr/lib/sane/libsane-teco1.la
 usr/lib/sane/libsane-teco1.so
 usr/lib/sane/libsane-teco1.so.1
-usr/lib/sane/libsane-teco1.so.1.0.22
+usr/lib/sane/libsane-teco1.so.1.0.24
 #usr/lib/sane/libsane-teco2.la
 usr/lib/sane/libsane-teco2.so
 usr/lib/sane/libsane-teco2.so.1
-usr/lib/sane/libsane-teco2.so.1.0.22
+usr/lib/sane/libsane-teco2.so.1.0.24
 #usr/lib/sane/libsane-teco3.la
 usr/lib/sane/libsane-teco3.so
 usr/lib/sane/libsane-teco3.so.1
-usr/lib/sane/libsane-teco3.so.1.0.22
+usr/lib/sane/libsane-teco3.so.1.0.24
 #usr/lib/sane/libsane-test.la
 usr/lib/sane/libsane-test.so
 usr/lib/sane/libsane-test.so.1
-usr/lib/sane/libsane-test.so.1.0.22
+usr/lib/sane/libsane-test.so.1.0.24
 #usr/lib/sane/libsane-u12.la
 usr/lib/sane/libsane-u12.so
 usr/lib/sane/libsane-u12.so.1
-usr/lib/sane/libsane-u12.so.1.0.22
+usr/lib/sane/libsane-u12.so.1.0.24
 #usr/lib/sane/libsane-umax.la
 usr/lib/sane/libsane-umax.so
 usr/lib/sane/libsane-umax.so.1
-usr/lib/sane/libsane-umax.so.1.0.22
+usr/lib/sane/libsane-umax.so.1.0.24
 #usr/lib/sane/libsane-umax1220u.la
 usr/lib/sane/libsane-umax1220u.so
 usr/lib/sane/libsane-umax1220u.so.1
-usr/lib/sane/libsane-umax1220u.so.1.0.22
+usr/lib/sane/libsane-umax1220u.so.1.0.24
 #usr/lib/sane/libsane-umax_pp.la
 usr/lib/sane/libsane-umax_pp.so
 usr/lib/sane/libsane-umax_pp.so.1
-usr/lib/sane/libsane-umax_pp.so.1.0.22
+usr/lib/sane/libsane-umax_pp.so.1.0.24
 #usr/lib/sane/libsane-xerox_mfp.la
 usr/lib/sane/libsane-xerox_mfp.so
 usr/lib/sane/libsane-xerox_mfp.so.1
-usr/lib/sane/libsane-xerox_mfp.so.1.0.22
+usr/lib/sane/libsane-xerox_mfp.so.1.0.24
 usr/sbin/saned
 #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo
 #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo
@@ -560,8 +574,10 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo
 #usr/share/man/man5/sane-hs2p.5
 #usr/share/man/man5/sane-ibm.5
 #usr/share/man/man5/sane-kodak.5
+#usr/share/man/man5/sane-kodakaio.5
 #usr/share/man/man5/sane-kvs1025.5
 #usr/share/man/man5/sane-kvs20xx.5
+#usr/share/man/man5/sane-kvs40xx.5
 #usr/share/man/man5/sane-leo.5
 #usr/share/man/man5/sane-lexmark.5
 #usr/share/man/man5/sane-ma1509.5
@@ -572,6 +588,7 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo
 #usr/share/man/man5/sane-mustek.5
 #usr/share/man/man5/sane-mustek_pp.5
 #usr/share/man/man5/sane-mustek_usb.5
+#usr/share/man/man5/sane-mustek_usb2.5
 #usr/share/man/man5/sane-nec.5
 #usr/share/man/man5/sane-net.5
 #usr/share/man/man5/sane-niash.5
@@ -611,7 +628,6 @@ usr/share/sane/artec_eplus48u
 usr/share/sane/epjitsu
 usr/share/sane/gt68xx
 usr/share/sane/snapscan
-#usr/var
 #usr/var/lock
 usr/var/lock/sane
 var/ipfire/backup/addons/includes/sane

diff --git a/lfs/clamav b/lfs/clamav
index 8cb849b5cd2e0c1256db52232d1f4433aa6f89d9..58f03417ad1175a1c59fdfbb985d0e5f29a7e53b 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.98.3
+VER        = 0.98.4
 
 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    = 25
+PAK_VER    = 26
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17
+$(DL_FILE)_MD5 = 6d409eab6c311de05a0a591fccd2ec83
 
 install : $(TARGET)
 

diff --git a/lfs/sane b/lfs/sane
index 96341b6e0cce6f9bc4a561051a5f89263582d5b7..842b5484610ae9013a4275a0efd17a900084f9ce 100644 (file)
--- a/lfs/sane
+++ b/lfs/sane
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.22
+VER        = 1.0.24
 
 THISAPP    = sane-$(VER)
 DL_FILE    = sane-backends-$(VER).tar.gz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = sane
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "libtiff"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5
+$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 1c10f32348b714555f690142afa36f0212fb36f0..162128def8e6b28c0bcb0a0860b1ddb15d7fd4d1 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
-CORE="79"                                                      # Core Level (Filename)
+CORE="80"                                                      # Core Level (Filename)
 PAKFIRE_CORE="79"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan