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 21d7908cf365228d3facd0c2b83c49a3fb05a641 (commit) via 50373f360ca45d4b2489e9441a4e3d38ffed8730 (commit) via ee8a12b6998e7b169b61bf2148386ba4fa9990bb (commit) from dafc8fbea2ce4313a48938ba9a94718dfc59db3b (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 21d7908cf365228d3facd0c2b83c49a3fb05a641 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Aug 1 19:01:08 2010 +0200

Disabled core38 and 39 build.

commit 50373f360ca45d4b2489e9441a4e3d38ffed8730 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Aug 1 19:00:27 2010 +0200

xen-image: use dracut to build initrd.

commit ee8a12b6998e7b169b61bf2148386ba4fa9990bb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Aug 1 18:59:38 2010 +0200

nut: remove patch that convert udev rules to old format.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/40/filelists/mkinitcpio | 1 - config/rootfiles/{core => oldcore}/38/exclude | 0 .../{core => oldcore}/38/filelists/Net_SSLeay | 0 .../{core => oldcore}/38/filelists/collectd | 0 .../{core => oldcore}/38/filelists/compat-wireless | 0 .../{core => oldcore}/38/filelists/dosfstools | 0 .../{core => oldcore}/38/filelists/e2fsprogs | 0 .../rootfiles/{core => oldcore}/38/filelists/files | 0 .../rootfiles/{core => oldcore}/38/filelists/fuse | 0 .../rootfiles/{core => oldcore}/38/filelists/grub | 0 .../{core => oldcore}/38/filelists/iptables | 0 .../{core => oldcore}/38/filelists/liboping | 0 .../rootfiles/{core => oldcore}/38/filelists/linux | 0 .../{core => oldcore}/38/filelists/linux-firmware | 0 .../rootfiles/{core => oldcore}/38/filelists/mISDN | 0 .../{core => oldcore}/38/filelists/mISDNuser | 0 .../rootfiles/{core => oldcore}/38/filelists/menu | 0 .../{core => oldcore}/38/filelists/mkinitcpio | 0 .../{core => oldcore}/38/filelists/openssh | 0 .../{core => oldcore}/38/filelists/openssl | 0 .../rootfiles/{core => oldcore}/38/filelists/pcre | 0 .../{core => oldcore}/38/filelists/reiser4progs | 0 .../{core => oldcore}/38/filelists/reiserfsprogs | 0 .../{core => oldcore}/38/filelists/rrdtool | 0 .../{core => oldcore}/38/filelists/smartmontools | 0 .../rootfiles/{core => oldcore}/38/filelists/snort | 0 .../{core => oldcore}/38/filelists/strongswan | 0 .../{core => oldcore}/38/filelists/usb_modeswitch | 0 config/rootfiles/{core => oldcore}/38/filelists/xz | 0 .../rootfiles/{core => oldcore}/38/filelists/zlib | 0 config/rootfiles/{core => oldcore}/38/meta | 0 config/rootfiles/{core => oldcore}/38/update.sh | 0 config/rootfiles/{core => oldcore}/39/exclude | 0 .../rootfiles/{core => oldcore}/39/filelists/files | 0 .../{core => oldcore}/39/filelists/libevent | 0 .../{core => oldcore}/39/filelists/libpng | 0 .../rootfiles/{core => oldcore}/39/filelists/ppp | 0 .../{core => oldcore}/39/filelists/strongswan | 0 .../{core => oldcore}/39/filelists/terminfo-screen | 0 config/rootfiles/{core => oldcore}/39/meta | 0 config/rootfiles/{core => oldcore}/39/update.sh | 0 doc/packages-list.txt | 8 +++----- lfs/nut | 4 ++-- lfs/xen-image | 5 +---- 44 files changed, 6 insertions(+), 12 deletions(-) delete mode 120000 config/rootfiles/core/40/filelists/mkinitcpio rename config/rootfiles/{core => oldcore}/38/exclude (100%) rename config/rootfiles/{core => oldcore}/38/filelists/Net_SSLeay (100%) rename config/rootfiles/{core => oldcore}/38/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/38/filelists/compat-wireless (100%) rename config/rootfiles/{core => oldcore}/38/filelists/dosfstools (100%) rename config/rootfiles/{core => oldcore}/38/filelists/e2fsprogs (100%) rename config/rootfiles/{core => oldcore}/38/filelists/files (100%) rename config/rootfiles/{core => oldcore}/38/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/38/filelists/grub (100%) rename config/rootfiles/{core => oldcore}/38/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/38/filelists/liboping (100%) rename config/rootfiles/{core => oldcore}/38/filelists/linux (100%) rename config/rootfiles/{core => oldcore}/38/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/38/filelists/mISDN (100%) rename config/rootfiles/{core => oldcore}/38/filelists/mISDNuser (100%) rename config/rootfiles/{core => oldcore}/38/filelists/menu (100%) rename config/rootfiles/{core => oldcore}/38/filelists/mkinitcpio (100%) rename config/rootfiles/{core => oldcore}/38/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/38/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/38/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/38/filelists/reiser4progs (100%) rename config/rootfiles/{core => oldcore}/38/filelists/reiserfsprogs (100%) rename config/rootfiles/{core => oldcore}/38/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/38/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/38/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/38/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/38/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/38/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/38/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/38/meta (100%) rename config/rootfiles/{core => oldcore}/38/update.sh (100%) rename config/rootfiles/{core => oldcore}/39/exclude (100%) rename config/rootfiles/{core => oldcore}/39/filelists/files (100%) rename config/rootfiles/{core => oldcore}/39/filelists/libevent (100%) rename config/rootfiles/{core => oldcore}/39/filelists/libpng (100%) rename config/rootfiles/{core => oldcore}/39/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/39/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/39/filelists/terminfo-screen (100%) rename config/rootfiles/{core => oldcore}/39/meta (100%) rename config/rootfiles/{core => oldcore}/39/update.sh (100%)

Difference in files: diff --git a/config/rootfiles/core/38/exclude b/config/rootfiles/core/38/exclude deleted file mode 100644 index e69de29..0000000 diff --git a/config/rootfiles/core/38/filelists/Net_SSLeay b/config/rootfiles/core/38/filelists/Net_SSLeay deleted file mode 120000 index 13fe056..0000000 --- a/config/rootfiles/core/38/filelists/Net_SSLeay +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/collectd b/config/rootfiles/core/38/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/38/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/compat-wireless b/config/rootfiles/core/38/filelists/compat-wireless deleted file mode 120000 index 5b5ac9e..0000000 --- a/config/rootfiles/core/38/filelists/compat-wireless +++ /dev/null @@ -1 +0,0 @@ -../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/dosfstools b/config/rootfiles/core/38/filelists/dosfstools deleted file mode 120000 index 087ccb0..0000000 --- a/config/rootfiles/core/38/filelists/dosfstools +++ /dev/null @@ -1 +0,0 @@ -../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/e2fsprogs b/config/rootfiles/core/38/filelists/e2fsprogs deleted file mode 120000 index 37b55de..0000000 --- a/config/rootfiles/core/38/filelists/e2fsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files deleted file mode 100644 index c6e13b7..0000000 --- a/config/rootfiles/core/38/filelists/files +++ /dev/null @@ -1,169 +0,0 @@ -etc/system-release -etc/issue -etc/e2fsck.conf -etc/httpd/conf/vhosts.d/ipfire-interface.conf -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -etc/rc.d/init.d/leds -etc/rc.d/init.d/rc -etc/rc.d/init.d/snort -etc/rc.d/init.d/networking/red.up/50-ovpn -etc/rc.d/init.d/networking/dhcpcd.exe -etc/rc.d/rc0.d/K78snort -etc/rc.d/rc0.d/K79leds -etc/rc.d/rc3.d/S21leds -etc/rc.d/rc6.d/K78snort -etc/rc.d/rc6.d/K79leds -etc/udev/rules.d/52-nut-usbups.rules -etc/udev/rules.d/xpp.rules -var/ipfire/backup/bin/backup.pl -var/ipfire/header.pl -var/ipfire/menu.d/50-firewall.menu -var/ipfire/outgoing/bin/outgoingfw.pl -var/ipfire/graphs.pl -var/ipfire/general-functions.pl -etc/modprobe.d/cfg80211 -etc/modprobe.d/pcspeaker -var/ipfire/qos/bin/makeqosscripts.pl -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/extrahd.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/iptables.cgi -srv/web/ipfire/cgi-bin/logs.cgi/config.dat -srv/web/ipfire/cgi-bin/netother.cgi -srv/web/ipfire/cgi-bin/outgoingfw.cgi -srv/web/ipfire/cgi-bin/outgoinggrp.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/time.cgi -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/cgi-bin/wireless.cgi -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/maniac/include/functions.pl -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl -var/ipfire/langs/list -var/ipfire/main/disable_nf_sip -var/ipfire/outgoing/groups -etc/rc.d/init.d/firewall -etc/rc.d/init.d/ipsec -etc/rc.d/init.d/network -etc/rc.d/init.d/ntp -etc/rc.d/init.d/modules -usr/local/bin/ipsecctrl -usr/local/bin/rebuildhosts -usr/local/bin/syslogdctrl -usr/local/bin/wirelessctrl -usr/local/sbin/setup -usr/sbin/openvpn -opt/pakfire/lib/functions.sh -usr/local/share/GeoIP/GeoIP.dat -usr/share/hwdata/pci.ids -usr/share/hwdata/usb.ids -usr/bin/squidGuard -usr/sbin/redirect_wrapper -var/lib/squidguard -var/urlrepo -usr/sbin/klogd -usr/sbin/syslogd -etc/squid/cachemgr.conf -etc/squid/errors -etc/squid/mime.conf -etc/squid/msntauth.conf -etc/squid/squid.conf -srv/web/ipfire/cgi-bin/cachemgr.cgi -usr/bin/squidclient -usr/lib/squid/auth -usr/lib/squid/diskd-daemon -usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED -usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD -usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL -usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL -usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED -usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED -usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE -usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN -usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND -usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED -usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR -usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED -usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE -usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ -usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP -usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL -usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP -usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY -usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS -usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR -usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT -usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN -usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE -usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG -usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ -usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE -usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR -usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED -usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD -usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL -usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL -usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED -usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED -usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE -usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN -usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND -usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED -usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR -usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED -usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE -usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ -usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP -usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL -usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP -usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY -usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS -usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR -usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT -usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN -usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE -usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG -usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ -usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE -usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR -usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/English -usr/lib/squid/errors/German -usr/lib/squid/icons -usr/lib/squid/logfile-daemon -usr/lib/squid/mib.txt -usr/lib/squid/msnt_auth -usr/lib/squid/ncsa_auth -usr/lib/squid/ntlm_auth -usr/lib/squid/smb_auth -usr/lib/squid/smb_auth.pl -usr/lib/squid/smb_auth.sh -usr/lib/squid/squid_ldap_auth -usr/lib/squid/unlinkd -usr/sbin/squid -usr/sbin/updxlrator -var/ipfire/updatexlrator/autocheck/cron.daily -var/ipfire/updatexlrator/autocheck/cron.monthly -var/ipfire/updatexlrator/autocheck/cron.weekly -var/ipfire/updatexlrator/bin/checkdeaddl -var/ipfire/updatexlrator/bin/checkup -var/ipfire/updatexlrator/bin/convert -var/ipfire/updatexlrator/bin/download -var/ipfire/updatexlrator/bin/lscache -var/ipfire/updatexlrator/updxlrator-lib.pl -var/log/cache -var/log/updatexlrator -usr/local/bin/vpn-watch -srv/web/ipfire/html/images/go-down.png diff --git a/config/rootfiles/core/38/filelists/fuse b/config/rootfiles/core/38/filelists/fuse deleted file mode 120000 index 570edaa..0000000 --- a/config/rootfiles/core/38/filelists/fuse +++ /dev/null @@ -1 +0,0 @@ -../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/grub b/config/rootfiles/core/38/filelists/grub deleted file mode 120000 index 050745c..0000000 --- a/config/rootfiles/core/38/filelists/grub +++ /dev/null @@ -1 +0,0 @@ -../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/iptables b/config/rootfiles/core/38/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/38/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/liboping b/config/rootfiles/core/38/filelists/liboping deleted file mode 120000 index 3ae1904..0000000 --- a/config/rootfiles/core/38/filelists/liboping +++ /dev/null @@ -1 +0,0 @@ -../../../common/liboping \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/linux b/config/rootfiles/core/38/filelists/linux deleted file mode 120000 index c469fe1..0000000 --- a/config/rootfiles/core/38/filelists/linux +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/linux-firmware b/config/rootfiles/core/38/filelists/linux-firmware deleted file mode 120000 index 4bf91bc..0000000 --- a/config/rootfiles/core/38/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/mISDN b/config/rootfiles/core/38/filelists/mISDN deleted file mode 120000 index 5707154..0000000 --- a/config/rootfiles/core/38/filelists/mISDN +++ /dev/null @@ -1 +0,0 @@ -../../../common/mISDN \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/mISDNuser b/config/rootfiles/core/38/filelists/mISDNuser deleted file mode 120000 index 78537d4..0000000 --- a/config/rootfiles/core/38/filelists/mISDNuser +++ /dev/null @@ -1 +0,0 @@ -../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/menu b/config/rootfiles/core/38/filelists/menu deleted file mode 100644 index 0c629b0..0000000 --- a/config/rootfiles/core/38/filelists/menu +++ /dev/null @@ -1,8 +0,0 @@ -var/ipfire/menu.d/00-menu.main -var/ipfire/menu.d/10-system.menu -var/ipfire/menu.d/20-status.menu -var/ipfire/menu.d/30-network.menu -var/ipfire/menu.d/40-services.menu -var/ipfire/menu.d/50-firewall.menu -var/ipfire/menu.d/60-ipfire.menu -var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/core/38/filelists/mkinitcpio b/config/rootfiles/core/38/filelists/mkinitcpio deleted file mode 120000 index f9b3fde..0000000 --- a/config/rootfiles/core/38/filelists/mkinitcpio +++ /dev/null @@ -1 +0,0 @@ -../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/openssh b/config/rootfiles/core/38/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/38/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/openssl b/config/rootfiles/core/38/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/38/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/pcre b/config/rootfiles/core/38/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/38/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/reiser4progs b/config/rootfiles/core/38/filelists/reiser4progs deleted file mode 120000 index f5ea556..0000000 --- a/config/rootfiles/core/38/filelists/reiser4progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/reiser4progs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/reiserfsprogs b/config/rootfiles/core/38/filelists/reiserfsprogs deleted file mode 120000 index 008c3e8..0000000 --- a/config/rootfiles/core/38/filelists/reiserfsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/rrdtool b/config/rootfiles/core/38/filelists/rrdtool deleted file mode 120000 index 7a82e41..0000000 --- a/config/rootfiles/core/38/filelists/rrdtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/smartmontools b/config/rootfiles/core/38/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/38/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/snort b/config/rootfiles/core/38/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/38/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/strongswan b/config/rootfiles/core/38/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/38/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/usb_modeswitch b/config/rootfiles/core/38/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/38/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/xz b/config/rootfiles/core/38/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/38/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/zlib b/config/rootfiles/core/38/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/38/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/38/meta b/config/rootfiles/core/38/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/38/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh deleted file mode 100644 index dc643fe..0000000 --- a/config/rootfiles/core/38/update.sh +++ /dev/null @@ -1,277 +0,0 @@ -#!/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@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 -# -OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` -# -# Test if we running on xen -# -uname -r | grep "ipfire-xen"; -if [ ${?} = 0 ]; then - #Xen Kernel is active - NEWVERSION="2.7-xen" -else - #Normal Kernel - NEWVERSION="2.7" -fi -# -KVER="2.6.32.15" -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/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES -echo usr/lib/ipsec >> /opt/pakfire/tmp/ROOTFILES -echo usr/libexec/ipsec >> /opt/pakfire/tmp/ROOTFILES -# exclude squid cache from backup -sed -i -e "s|^var/log/cache|#var/log/cache|g" /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 - -# -# Stop Sevices -# -/etc/init.d/collectd stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/snort stop - -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 -# Don't remove all old xen modules. Kernel may stored outside. -# only from 2.6.27.25 and 31 -rm -rf /lib/modules/2.6.27.25-ipfire-xen -rm -rf /lib/modules/2.6.27.31-ipfire-xen -# -# remove openswan libs ... -# -rm -rf /usr/lib/ipsec -rm -rf /usr/libexec/ipsec -# -# old snort libs and rules ... -# -rm -rf /usr/lib/snort_* -rm -rf /etc/snort -# -# mISDN Files that was moved to sbin -# -rm -rf /usr/bin/misdn_rename -rm -rf /usr/bin/misdn_cleanl2 -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org -# -# Stop sysklogd -/etc/init.d/sysklogd stop -# -# Unpack the updated files -# -echo -echo Unpack the updated files ... -# -tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ - --no-overwrite-dir -# -# Start sysklogd -/etc/init.d/sysklogd start -# -# 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 -# -# Made emergency - initramdisk -# -echo -echo Create new Initramdisks ... -cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org -sed -i "s| autodetect | |g" /etc/mkinitcpio.conf -mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img -cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf -# -# Made initramdisk -# -if [ "${ROOT:0:7}" == "/dev/sd" ]; then - # Remove ide hook if root is on sda - sed -i "s| ide | |g" /etc/mkinitcpio.conf -else -if [ "${ROOT:0:7}" == "/dev/hd" ]; then - # Remove pata & sata hook if root is on hda - sed -i "s| pata | |g" /etc/mkinitcpio.conf - sed -i "s| sata | |g" /etc/mkinitcpio.conf -fi -fi -mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck -# -# Rebuild Language -# -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# -# Cleanup Collectd statistics... -# -PRECLEAN=`du -sh /var/log/rrd/collectd` -# -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm* -# -rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors* -rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets* -# -rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged* -rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops* -rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time* -# -rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput* -rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward* -rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW -POSTCLEAN=`du -sh /var/log/rrd/collectd` -# -echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. -# -# Start collectd -/etc/init.d/collectd start -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors -# -# USB Modeswitch conf now called setup, rename ... -# -if [ -e /etc/usb_modeswitch.conf ]; then -mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup -fi -# -# rebuild qosscript if enabled... -if [ -e /var/ipfire/qos/enable ]; then - /usr/local/bin/qosctrl stop - /usr/local/bin/qosctrl generate - /usr/local/bin/qosctrl start -fi -# -# -# convert ipsec.conf from openswan to strongswan... -mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org -cat /var/ipfire/vpn/ipsec.conf.org | \ -grep -v "disablearrivalcheck=" | \ -grep -v "klipsdebug=" | \ -grep -v "leftfirewall=" | \ -grep -v "lefthostaccess=" | \ -grep -v "charonstart=" | \ -grep -v "aggrmode=" > /var/ipfire/vpn/ipsec.conf -sed -i "s|ipsec[0-9]=||g" /var/ipfire/vpn/ipsec.conf -sed -i "s|nat_t ||g" /var/ipfire/vpn/ipsec.conf -sed -i "s|klips ||g" /var/ipfire/vpn/ipsec.conf -sed -i "s|^conn [A-Za-z].*$|&\n\tleftfirewall=yes\n\tlefthostaccess=yes|g" /var/ipfire/vpn/ipsec.conf -sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf -chown nobody:nobody /var/ipfire/vpn/ipsec.conf -chmod 644 /var/ipfire/vpn/ipsec.conf -# -# Add cryptodev to /etc/sysconfig/modules -mv /etc/sysconfig/modules /etc/sysconfig/modules.org -cat /etc/sysconfig/modules.org | \ -grep -v "cryptodev" | \ -grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules -echo "" >> /etc/sysconfig/modules -echo "### cryptodev" >> /etc/sysconfig/modules -echo "#" >> /etc/sysconfig/modules -echo "cryptodev" >> /etc/sysconfig/modules -echo "" >> /etc/sysconfig/modules -echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules -chmod 644 /etc/sysconfig/modules -# Change version of Pakfire.conf -# -sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pak_update -# -chmod +x /tmp/pak_update -/tmp/pak_update & -# -# Start squid -/etc/init.d/squid start -# -echo -echo Please wait until pakfire has ended... -echo diff --git a/config/rootfiles/core/39/exclude b/config/rootfiles/core/39/exclude deleted file mode 100644 index 778cdf7..0000000 --- a/config/rootfiles/core/39/exclude +++ /dev/null @@ -1,2 +0,0 @@ -etc/ppp/chap-secrets -etc/ppp/pap-secrets diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files deleted file mode 100644 index b83814e..0000000 --- a/config/rootfiles/core/39/filelists/files +++ /dev/null @@ -1,17 +0,0 @@ -etc/system-release -etc/rc.d/init.d/dnsmasq -etc/rc.d/init.d/networking/red -etc/rc.d/helper/getdnsfromdhcpc.pl -srv/web/ipfire/cgi-bin/pppsetup.cgi -usr/local/bin/backupiso -usr/local/bin/updxlratorctrl -usr/local/bin/urlfilterctrl -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -/opt/pakfire/lib/functions.pl -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl diff --git a/config/rootfiles/core/39/filelists/libevent b/config/rootfiles/core/39/filelists/libevent deleted file mode 120000 index 3bbbc1a..0000000 --- a/config/rootfiles/core/39/filelists/libevent +++ /dev/null @@ -1 +0,0 @@ -../../../common/libevent \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/libpng b/config/rootfiles/core/39/filelists/libpng deleted file mode 120000 index 8ef96e2..0000000 --- a/config/rootfiles/core/39/filelists/libpng +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/ppp b/config/rootfiles/core/39/filelists/ppp deleted file mode 120000 index 4844a9b..0000000 --- a/config/rootfiles/core/39/filelists/ppp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/strongswan b/config/rootfiles/core/39/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/39/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/terminfo-screen b/config/rootfiles/core/39/filelists/terminfo-screen deleted file mode 100644 index 98962f5..0000000 --- a/config/rootfiles/core/39/filelists/terminfo-screen +++ /dev/null @@ -1,11 +0,0 @@ -usr/share/terminfo/s/screen -usr/share/terminfo/s/screen-bce -usr/share/terminfo/s/screen-s -usr/share/terminfo/s/screen-w -usr/share/terminfo/s/screen.linux -usr/share/terminfo/s/screen.teraterm -usr/share/terminfo/s/screen.xterm-new -usr/share/terminfo/s/screen.xterm-r6 -usr/share/terminfo/s/screen.xterm-xfree86 -usr/share/terminfo/s/screen2 -usr/share/terminfo/s/screen3 diff --git a/config/rootfiles/core/39/meta b/config/rootfiles/core/39/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/39/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/39/update.sh b/config/rootfiles/core/39/update.sh deleted file mode 100644 index a54f5b8..0000000 --- a/config/rootfiles/core/39/update.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/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@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Cleanup crontab -cat /var/spool/cron/root.orig | grep -v updatexlrator | grep -v urlfilter > /var/spool/cron/root.orig.temp -mv -f /var/spool/cron/root.orig.temp /var/spool/cron/root.orig -fcrontab -z - -# -#Stop services - -# -#Extract files -extract_files -# -#Start services - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# -#Finish -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/40/filelists/mkinitcpio b/config/rootfiles/core/40/filelists/mkinitcpio deleted file mode 120000 index f9b3fde..0000000 --- a/config/rootfiles/core/40/filelists/mkinitcpio +++ /dev/null @@ -1 +0,0 @@ -../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/exclude b/config/rootfiles/oldcore/38/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/oldcore/38/filelists/Net_SSLeay b/config/rootfiles/oldcore/38/filelists/Net_SSLeay new file mode 120000 index 0000000..13fe056 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/Net_SSLeay @@ -0,0 +1 @@ +../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/collectd b/config/rootfiles/oldcore/38/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/compat-wireless b/config/rootfiles/oldcore/38/filelists/compat-wireless new file mode 120000 index 0000000..5b5ac9e --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/compat-wireless @@ -0,0 +1 @@ +../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/dosfstools b/config/rootfiles/oldcore/38/filelists/dosfstools new file mode 120000 index 0000000..087ccb0 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/dosfstools @@ -0,0 +1 @@ +../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/e2fsprogs b/config/rootfiles/oldcore/38/filelists/e2fsprogs new file mode 120000 index 0000000..37b55de --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/files b/config/rootfiles/oldcore/38/filelists/files new file mode 100644 index 0000000..c6e13b7 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/files @@ -0,0 +1,169 @@ +etc/system-release +etc/issue +etc/e2fsck.conf +etc/httpd/conf/vhosts.d/ipfire-interface.conf +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/rc.d/init.d/leds +etc/rc.d/init.d/rc +etc/rc.d/init.d/snort +etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/rc0.d/K78snort +etc/rc.d/rc0.d/K79leds +etc/rc.d/rc3.d/S21leds +etc/rc.d/rc6.d/K78snort +etc/rc.d/rc6.d/K79leds +etc/udev/rules.d/52-nut-usbups.rules +etc/udev/rules.d/xpp.rules +var/ipfire/backup/bin/backup.pl +var/ipfire/header.pl +var/ipfire/menu.d/50-firewall.menu +var/ipfire/outgoing/bin/outgoingfw.pl +var/ipfire/graphs.pl +var/ipfire/general-functions.pl +etc/modprobe.d/cfg80211 +etc/modprobe.d/pcspeaker +var/ipfire/qos/bin/makeqosscripts.pl +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi/config.dat +srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/outgoingfw.cgi +srv/web/ipfire/cgi-bin/outgoinggrp.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/time.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/functions.pl +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl +var/ipfire/langs/list +var/ipfire/main/disable_nf_sip +var/ipfire/outgoing/groups +etc/rc.d/init.d/firewall +etc/rc.d/init.d/ipsec +etc/rc.d/init.d/network +etc/rc.d/init.d/ntp +etc/rc.d/init.d/modules +usr/local/bin/ipsecctrl +usr/local/bin/rebuildhosts +usr/local/bin/syslogdctrl +usr/local/bin/wirelessctrl +usr/local/sbin/setup +usr/sbin/openvpn +opt/pakfire/lib/functions.sh +usr/local/share/GeoIP/GeoIP.dat +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids +usr/bin/squidGuard +usr/sbin/redirect_wrapper +var/lib/squidguard +var/urlrepo +usr/sbin/klogd +usr/sbin/syslogd +etc/squid/cachemgr.conf +etc/squid/errors +etc/squid/mime.conf +etc/squid/msntauth.conf +etc/squid/squid.conf +srv/web/ipfire/cgi-bin/cachemgr.cgi +usr/bin/squidclient +usr/lib/squid/auth +usr/lib/squid/diskd-daemon +usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD +usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL +usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL +usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED +usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED +usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE +usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN +usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND +usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED +usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR +usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ +usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP +usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL +usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP +usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY +usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR +usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT +usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN +usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE +usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG +usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ +usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE +usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR +usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD +usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL +usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL +usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED +usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED +usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE +usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN +usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND +usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED +usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR +usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ +usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP +usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL +usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP +usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY +usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR +usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT +usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN +usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE +usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG +usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ +usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE +usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR +usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/English +usr/lib/squid/errors/German +usr/lib/squid/icons +usr/lib/squid/logfile-daemon +usr/lib/squid/mib.txt +usr/lib/squid/msnt_auth +usr/lib/squid/ncsa_auth +usr/lib/squid/ntlm_auth +usr/lib/squid/smb_auth +usr/lib/squid/smb_auth.pl +usr/lib/squid/smb_auth.sh +usr/lib/squid/squid_ldap_auth +usr/lib/squid/unlinkd +usr/sbin/squid +usr/sbin/updxlrator +var/ipfire/updatexlrator/autocheck/cron.daily +var/ipfire/updatexlrator/autocheck/cron.monthly +var/ipfire/updatexlrator/autocheck/cron.weekly +var/ipfire/updatexlrator/bin/checkdeaddl +var/ipfire/updatexlrator/bin/checkup +var/ipfire/updatexlrator/bin/convert +var/ipfire/updatexlrator/bin/download +var/ipfire/updatexlrator/bin/lscache +var/ipfire/updatexlrator/updxlrator-lib.pl +var/log/cache +var/log/updatexlrator +usr/local/bin/vpn-watch +srv/web/ipfire/html/images/go-down.png diff --git a/config/rootfiles/oldcore/38/filelists/fuse b/config/rootfiles/oldcore/38/filelists/fuse new file mode 120000 index 0000000..570edaa --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/grub b/config/rootfiles/oldcore/38/filelists/grub new file mode 120000 index 0000000..050745c --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/iptables b/config/rootfiles/oldcore/38/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/liboping b/config/rootfiles/oldcore/38/filelists/liboping new file mode 120000 index 0000000..3ae1904 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/liboping @@ -0,0 +1 @@ +../../../common/liboping \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/linux b/config/rootfiles/oldcore/38/filelists/linux new file mode 120000 index 0000000..c469fe1 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/linux-firmware b/config/rootfiles/oldcore/38/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/mISDN b/config/rootfiles/oldcore/38/filelists/mISDN new file mode 120000 index 0000000..5707154 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/mISDN @@ -0,0 +1 @@ +../../../common/mISDN \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/mISDNuser b/config/rootfiles/oldcore/38/filelists/mISDNuser new file mode 120000 index 0000000..78537d4 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/menu b/config/rootfiles/oldcore/38/filelists/menu new file mode 100644 index 0000000..0c629b0 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/menu @@ -0,0 +1,8 @@ +var/ipfire/menu.d/00-menu.main +var/ipfire/menu.d/10-system.menu +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/30-network.menu +var/ipfire/menu.d/40-services.menu +var/ipfire/menu.d/50-firewall.menu +var/ipfire/menu.d/60-ipfire.menu +var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/oldcore/38/filelists/mkinitcpio b/config/rootfiles/oldcore/38/filelists/mkinitcpio new file mode 120000 index 0000000..f9b3fde --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/mkinitcpio @@ -0,0 +1 @@ +../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/openssh b/config/rootfiles/oldcore/38/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/openssl b/config/rootfiles/oldcore/38/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/pcre b/config/rootfiles/oldcore/38/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/reiser4progs b/config/rootfiles/oldcore/38/filelists/reiser4progs new file mode 120000 index 0000000..f5ea556 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/reiser4progs @@ -0,0 +1 @@ +../../../common/reiser4progs \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/reiserfsprogs b/config/rootfiles/oldcore/38/filelists/reiserfsprogs new file mode 120000 index 0000000..008c3e8 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/rrdtool b/config/rootfiles/oldcore/38/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/smartmontools b/config/rootfiles/oldcore/38/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/snort b/config/rootfiles/oldcore/38/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/strongswan b/config/rootfiles/oldcore/38/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/usb_modeswitch b/config/rootfiles/oldcore/38/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/xz b/config/rootfiles/oldcore/38/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/zlib b/config/rootfiles/oldcore/38/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/meta b/config/rootfiles/oldcore/38/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/38/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/38/update.sh b/config/rootfiles/oldcore/38/update.sh new file mode 100644 index 0000000..dc643fe --- /dev/null +++ b/config/rootfiles/oldcore/38/update.sh @@ -0,0 +1,277 @@ +#!/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@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` +# +# Test if we running on xen +# +uname -r | grep "ipfire-xen"; +if [ ${?} = 0 ]; then + #Xen Kernel is active + NEWVERSION="2.7-xen" +else + #Normal Kernel + NEWVERSION="2.7" +fi +# +KVER="2.6.32.15" +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/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES +echo usr/lib/ipsec >> /opt/pakfire/tmp/ROOTFILES +echo usr/libexec/ipsec >> /opt/pakfire/tmp/ROOTFILES +# exclude squid cache from backup +sed -i -e "s|^var/log/cache|#var/log/cache|g" /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 + +# +# Stop Sevices +# +/etc/init.d/collectd stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/snort stop + +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 +# Don't remove all old xen modules. Kernel may stored outside. +# only from 2.6.27.25 and 31 +rm -rf /lib/modules/2.6.27.25-ipfire-xen +rm -rf /lib/modules/2.6.27.31-ipfire-xen +# +# remove openswan libs ... +# +rm -rf /usr/lib/ipsec +rm -rf /usr/libexec/ipsec +# +# old snort libs and rules ... +# +rm -rf /usr/lib/snort_* +rm -rf /etc/snort +# +# mISDN Files that was moved to sbin +# +rm -rf /usr/bin/misdn_rename +rm -rf /usr/bin/misdn_cleanl2 +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Stop sysklogd +/etc/init.d/sysklogd stop +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir +# +# Start sysklogd +/etc/init.d/sysklogd start +# +# 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 +# +# Made emergency - initramdisk +# +echo +echo Create new Initramdisks ... +cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org +sed -i "s| autodetect | |g" /etc/mkinitcpio.conf +mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img +cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf +# +# Made initramdisk +# +if [ "${ROOT:0:7}" == "/dev/sd" ]; then + # Remove ide hook if root is on sda + sed -i "s| ide | |g" /etc/mkinitcpio.conf +else +if [ "${ROOT:0:7}" == "/dev/hd" ]; then + # Remove pata & sata hook if root is on hda + sed -i "s| pata | |g" /etc/mkinitcpio.conf + sed -i "s| sata | |g" /etc/mkinitcpio.conf +fi +fi +mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Cleanup Collectd statistics... +# +PRECLEAN=`du -sh /var/log/rrd/collectd` +# +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm* +# +rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors* +rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets* +# +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged* +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops* +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time* +# +rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput* +rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward* +rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW +POSTCLEAN=`du -sh /var/log/rrd/collectd` +# +echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. +# +# Start collectd +/etc/init.d/collectd start +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +# +# USB Modeswitch conf now called setup, rename ... +# +if [ -e /etc/usb_modeswitch.conf ]; then +mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup +fi +# +# rebuild qosscript if enabled... +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi +# +# +# convert ipsec.conf from openswan to strongswan... +mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org +cat /var/ipfire/vpn/ipsec.conf.org | \ +grep -v "disablearrivalcheck=" | \ +grep -v "klipsdebug=" | \ +grep -v "leftfirewall=" | \ +grep -v "lefthostaccess=" | \ +grep -v "charonstart=" | \ +grep -v "aggrmode=" > /var/ipfire/vpn/ipsec.conf +sed -i "s|ipsec[0-9]=||g" /var/ipfire/vpn/ipsec.conf +sed -i "s|nat_t ||g" /var/ipfire/vpn/ipsec.conf +sed -i "s|klips ||g" /var/ipfire/vpn/ipsec.conf +sed -i "s|^conn [A-Za-z].*$|&\n\tleftfirewall=yes\n\tlefthostaccess=yes|g" /var/ipfire/vpn/ipsec.conf +sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf +chown nobody:nobody /var/ipfire/vpn/ipsec.conf +chmod 644 /var/ipfire/vpn/ipsec.conf +# +# Add cryptodev to /etc/sysconfig/modules +mv /etc/sysconfig/modules /etc/sysconfig/modules.org +cat /etc/sysconfig/modules.org | \ +grep -v "cryptodev" | \ +grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules +echo "" >> /etc/sysconfig/modules +echo "### cryptodev" >> /etc/sysconfig/modules +echo "#" >> /etc/sysconfig/modules +echo "cryptodev" >> /etc/sysconfig/modules +echo "" >> /etc/sysconfig/modules +echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules +chmod 644 /etc/sysconfig/modules +# Change version of Pakfire.conf +# +sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & +# +# Start squid +/etc/init.d/squid start +# +echo +echo Please wait until pakfire has ended... +echo diff --git a/config/rootfiles/oldcore/39/exclude b/config/rootfiles/oldcore/39/exclude new file mode 100644 index 0000000..778cdf7 --- /dev/null +++ b/config/rootfiles/oldcore/39/exclude @@ -0,0 +1,2 @@ +etc/ppp/chap-secrets +etc/ppp/pap-secrets diff --git a/config/rootfiles/oldcore/39/filelists/files b/config/rootfiles/oldcore/39/filelists/files new file mode 100644 index 0000000..b83814e --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/files @@ -0,0 +1,17 @@ +etc/system-release +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/networking/red +etc/rc.d/helper/getdnsfromdhcpc.pl +srv/web/ipfire/cgi-bin/pppsetup.cgi +usr/local/bin/backupiso +usr/local/bin/updxlratorctrl +usr/local/bin/urlfilterctrl +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +/opt/pakfire/lib/functions.pl +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl diff --git a/config/rootfiles/oldcore/39/filelists/libevent b/config/rootfiles/oldcore/39/filelists/libevent new file mode 120000 index 0000000..3bbbc1a --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/libevent @@ -0,0 +1 @@ +../../../common/libevent \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/libpng b/config/rootfiles/oldcore/39/filelists/libpng new file mode 120000 index 0000000..8ef96e2 --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/libpng @@ -0,0 +1 @@ +../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/ppp b/config/rootfiles/oldcore/39/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/strongswan b/config/rootfiles/oldcore/39/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/terminfo-screen b/config/rootfiles/oldcore/39/filelists/terminfo-screen new file mode 100644 index 0000000..98962f5 --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/terminfo-screen @@ -0,0 +1,11 @@ +usr/share/terminfo/s/screen +usr/share/terminfo/s/screen-bce +usr/share/terminfo/s/screen-s +usr/share/terminfo/s/screen-w +usr/share/terminfo/s/screen.linux +usr/share/terminfo/s/screen.teraterm +usr/share/terminfo/s/screen.xterm-new +usr/share/terminfo/s/screen.xterm-r6 +usr/share/terminfo/s/screen.xterm-xfree86 +usr/share/terminfo/s/screen2 +usr/share/terminfo/s/screen3 diff --git a/config/rootfiles/oldcore/39/meta b/config/rootfiles/oldcore/39/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/39/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/39/update.sh b/config/rootfiles/oldcore/39/update.sh new file mode 100644 index 0000000..a54f5b8 --- /dev/null +++ b/config/rootfiles/oldcore/39/update.sh @@ -0,0 +1,48 @@ +#!/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@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Cleanup crontab +cat /var/spool/cron/root.orig | grep -v updatexlrator | grep -v urlfilter > /var/spool/cron/root.orig.temp +mv -f /var/spool/cron/root.orig.temp /var/spool/cron/root.orig +fcrontab -z + +# +#Stop services + +# +#Extract files +extract_files +# +#Start services + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f0b0afc..6bd1176 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -90,6 +90,7 @@ * diffutils-2.8.1 * dnsmasq-2.45 * dosfstools-3.0.9 +* dracut-006 * e1000-8.0.19-kmod-2.6.32.15-ipfire * e1000-8.0.19-kmod-2.6.32.15-ipfire-xen * e1000e-1.1.19-kmod-2.6.32.15-ipfire @@ -162,7 +163,6 @@ * joe-3.7 * jpegsrc.v6b * kbd-1.12 -* klibc-1.5.14 * kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire * kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen * kudzu-1.2.64 @@ -228,7 +228,6 @@ * miau-0.6.5 * minicom-2.4 * misc-progs -* mkinitcpio-0.5.9 * mktemp-1.5 * mldonkey-3.0.0 * module-init-tools-3.5 @@ -324,7 +323,7 @@ * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.5 -* syslinux-3.62 +* syslinux-3.86 * sysstat-6.0.2 * sysvinit-2.86 * taglib-1.5 @@ -338,8 +337,7 @@ * traceroute-2.0.12 * tripwire-2.4.1.2 * tunctl -* udev-096 -* udev-096-klibc +* udev-125 * unzip552 * urlgrabber-3.1.0 * usb-modeswitch-1.1.2 diff --git a/lfs/nut b/lfs/nut index b5a5eda..c0b7c57 100644 --- a/lfs/nut +++ b/lfs/nut @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 1 +PAK_VER = 2

DEPS = ""

@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-wrap=no --with-udev-dir=/etc/udev cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules +# sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules -mkdir -p /var/state/ups install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \ /var/ipfire/backup/addons/includes/nut diff --git a/lfs/xen-image b/lfs/xen-image index a6e4f36..09e7671 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -127,11 +127,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e "s|DEVICE4|/dev/xvda4|g" $(MNThdd)/etc/fstab

sed -i -e "s|FSTYPE|ext3|g" $(MNThdd)/etc/fstab - cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org - sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf

- chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen - cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf + chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen

# Create a script for rebuild-initrd and setup

hooks/post-receive -- IPFire 2.x development tree