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 5ec41d5f9a65441d513517d6fc5693a615264cb4 (commit) via cd84561422a4873607527e3975fafe9965195d21 (commit) via bcd42775333967e2264e7c75d638bd4f9b37a94f (commit) via 5627b4c9f276f480dffd93d264288de4b936bad7 (commit) via cf4657e0091ccee44de0462c77bd64d08aa7b503 (commit) via 180fffd9eeba6aec2030dfee2e5e53793cca8dc1 (commit) via 31901da1edb401590960558b61e31ddd9fda89c1 (commit) via 2795e579303e847e245204fe48141444a66a9235 (commit) via 75559f73dc12ccb4d922fb0a8028341bf02bd4f3 (commit) via bc68985360a0f6177dafc2aeeefb614562cbd4da (commit) via cfd33ae00976825a143f91795cc0d12298f4e9b1 (commit) via 4f6b044f7fcf5b972bab5c9551855eccfdd968f8 (commit) via 81da1b01e95ec7a99513116f816b1fc9ef500b2a (commit) via 4715ddb3f0d6119c7e5e4df74126a84dab5ab756 (commit) via 96096995ed505c5286cebd48ffdcb0e34cbcd196 (commit) via 03189f65a5522001532a455bbd57208839a9cc93 (commit) via f98766eb9eac8dee2cfcbdabb78755e08ec39418 (commit) via c6048d2eef43f7235996accb89d239860dabf645 (commit) from 1b9282639696921f60fc73a1c2d7a73d4b336fe5 (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 5ec41d5f9a65441d513517d6fc5693a615264cb4 Merge: cd84561 1b92826 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 4 07:58:48 2013 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit cd84561422a4873607527e3975fafe9965195d21 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 4 07:57:38 2013 +0100
core66: moved to oldcore.
commit bcd42775333967e2264e7c75d638bd4f9b37a94f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 4 07:56:36 2013 +0100
core67: add last changes.
commit 5627b4c9f276f480dffd93d264288de4b936bad7 Merge: dddb9af cf4657e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 3 23:11:17 2013 +0100
Merge remote-tracking branch 'stevee/core67-merge' into next
Conflicts: make.sh
commit cf4657e0091ccee44de0462c77bd64d08aa7b503 Merge: 180fffd 03189f6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 3 13:59:05 2013 +0100
Merge branch 'nfs-utils-update' into core67-merge
commit 180fffd9eeba6aec2030dfee2e5e53793cca8dc1 Merge: 31901da 4715ddb Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 3 13:58:23 2013 +0100
Merge branch 'ovpn-header-on-index.cgi' into core67-merge
commit 31901da1edb401590960558b61e31ddd9fda89c1 Merge: 2795e57 c6048d2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 3 13:57:39 2013 +0100
Merge branch 'iptables-upnpfw' into core67-merge
commit 2795e579303e847e245204fe48141444a66a9235 Merge: 75559f7 f98766e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 3 13:42:22 2013 +0100
Merge remote-tracking branch 'erik/sendEmail' into core67-merge
Conflicts: make.sh
commit 75559f73dc12ccb4d922fb0a8028341bf02bd4f3 Merge: bc68985 9609699 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 3 13:37:15 2013 +0100
Merge branch 'ovpn-client-pkg-download' into core67-merge
commit bc68985360a0f6177dafc2aeeefb614562cbd4da Author: Joern-Ingo Weigert jiweigert@gmail.com Date: Sat Mar 2 23:06:32 2013 +0100
updateaxelerator: Add extension for Windows 8 updates.
New extension for Windows 8 update files (msu).
Fixes #10326.
commit cfd33ae00976825a143f91795cc0d12298f4e9b1 Author: Joern-Ingo Weigert jiweigert@gmail.com Date: Sat Mar 2 22:34:20 2013 +0100
updatexlrator.cgi: Vendor icon "updxl-src-unknown.gif" are used, regardless of presence in image-dir.
Fixes #10254.
commit 4f6b044f7fcf5b972bab5c9551855eccfdd968f8 Author: Joern-Ingo Weigert jiweigert@gmail.com Date: Sat Mar 2 20:06:03 2013 +0100
updateaxelerator: Adding line to hint where to add new sources.
Fixes #10253.
commit 81da1b01e95ec7a99513116f816b1fc9ef500b2a Author: Alexander Marx amarx@ipfire.org Date: Sat Mar 2 12:48:11 2013 +0100
ovpnmain.cgi: Change check for pushed dhcp domains.
The Domainname is now checked against validdomainname instead of validfqdn, so there's no need of a dotted domainname anymore.
Fixes #10262.
commit 4715ddb3f0d6119c7e5e4df74126a84dab5ab756 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Mar 3 13:05:48 2013 +0100
index.cgi: Show OpenVPN header if server is disabled but N2N connections are used.
If the ovpn server for roadwarrior connections was stopped, there was no OpenVPN header displayed on the index.cgi. If there are configured Net-to-Net connections, they could be established in the background but their status can be found on the VPN (IPsec) section which is wrong. If there is also no IPsec configured there aren't any information about the Net-to-Net connections on the start page.
commit 96096995ed505c5286cebd48ffdcb0e34cbcd196 Author: Alexander Marx amarx@ipfire.org Date: Fri Mar 1 19:25:15 2013 +0100
ovpnmain.cgi: Fix downloading of client packages.
It was only possible to download the client packages if the OpenVPN server is running - which is very confusing.
Fixes #10300.
commit 03189f65a5522001532a455bbd57208839a9cc93 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Feb 22 17:10:02 2013 +0100
nfs: Update to 1.2.7.
Also update libnfsidmap to 0.27.
commit f98766eb9eac8dee2cfcbdabb78755e08ec39418 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Mon Dec 31 16:21:01 2012 +0100
sendEmail: New addon
Fixes #10242
commit c6048d2eef43f7235996accb89d239860dabf645 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Dec 12 20:02:20 2012 +0100
Add iptables rule to add miniupnd rules to forward chain.
Fixes #10043.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/IO-Socket-SSL | 6 ++ config/rootfiles/core/67/filelists/IO-Socket-SSL | 1 + config/rootfiles/core/67/filelists/files | 7 ++ config/rootfiles/{core => oldcore}/66/exclude | 0 .../rootfiles/{core => oldcore}/66/filelists/GeoIP | 0 .../66/filelists/armv5tel/binutils | 0 .../{core => oldcore}/66/filelists/armv5tel/dracut | 0 .../{core => oldcore}/66/filelists/armv5tel/gcc | 0 .../{core => oldcore}/66/filelists/armv5tel/glibc | 0 .../66/filelists/armv5tel/linux-kirkwood | 0 .../66/filelists/armv5tel/linux-omap | 0 .../66/filelists/armv5tel/linux-rpi | 0 .../66/filelists/armv5tel/rpi-firmware | 0 .../{core => oldcore}/66/filelists/armv5tel/u-boot | 0 .../66/filelists/armv5tel/util-linux | 0 .../{core => oldcore}/66/filelists/autoconf | 0 .../{core => oldcore}/66/filelists/automake | 0 .../rootfiles/{core => oldcore}/66/filelists/bash | 0 .../rootfiles/{core => oldcore}/66/filelists/bind | 0 .../{core => oldcore}/66/filelists/bridge-utils | 0 .../rootfiles/{core => oldcore}/66/filelists/cairo | 0 .../{core => oldcore}/66/filelists/capi4k-utils | 0 .../rootfiles/{core => oldcore}/66/filelists/cmake | 0 .../{core => oldcore}/66/filelists/collectd | 0 .../{core => oldcore}/66/filelists/compat-wireless | 0 .../{core => oldcore}/66/filelists/conntrack-tools | 0 .../{core => oldcore}/66/filelists/coreutils | 0 .../rootfiles/{core => oldcore}/66/filelists/curl | 0 .../{core => oldcore}/66/filelists/cyrus-sasl | 0 .../rootfiles/{core => oldcore}/66/filelists/daq | 0 .../66/filelists/dejavu-fonts-ttf | 0 .../rootfiles/{core => oldcore}/66/filelists/dhcp | 0 .../{core => oldcore}/66/filelists/dvb-firmwares | 0 .../{core => oldcore}/66/filelists/e2fsprogs | 0 .../rootfiles/{core => oldcore}/66/filelists/file | 0 .../rootfiles/{core => oldcore}/66/filelists/files | 0 .../{core => oldcore}/66/filelists/fontconfig | 0 .../{core => oldcore}/66/filelists/fstrim | 0 .../rootfiles/{core => oldcore}/66/filelists/gawk | 0 .../{core => oldcore}/66/filelists/gettext | 0 .../rootfiles/{core => oldcore}/66/filelists/glib | 0 .../rootfiles/{core => oldcore}/66/filelists/gmp | 0 .../{core => oldcore}/66/filelists/gmp-compat | 0 .../rootfiles/{core => oldcore}/66/filelists/gnupg | 0 .../rootfiles/{core => oldcore}/66/filelists/grep | 0 .../{core => oldcore}/66/filelists/hdparm | 0 .../{core => oldcore}/66/filelists/i586/acpi-init | 0 .../{core => oldcore}/66/filelists/i586/acpid | 0 .../{core => oldcore}/66/filelists/i586/binutils | 0 .../{core => oldcore}/66/filelists/i586/dracut | 0 .../{core => oldcore}/66/filelists/i586/gcc | 0 .../{core => oldcore}/66/filelists/i586/glibc | 0 .../{core => oldcore}/66/filelists/i586/grub | 0 .../{core => oldcore}/66/filelists/i586/linux | 0 .../66/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/66/filelists/i586/util-linux | 0 .../{core => oldcore}/66/filelists/inetutils | 0 .../{core => oldcore}/66/filelists/iproute2 | 0 .../{core => oldcore}/66/filelists/iptables | 0 .../rootfiles/{core => oldcore}/66/filelists/kbd | 0 .../rootfiles/{core => oldcore}/66/filelists/less | 0 .../{core => oldcore}/66/filelists/libffi | 0 .../{core => oldcore}/66/filelists/libmnl | 0 .../rootfiles/{core => oldcore}/66/filelists/libnl | 0 .../{core => oldcore}/66/filelists/libsigc++ | 0 .../{core => oldcore}/66/filelists/libtool | 0 .../{core => oldcore}/66/filelists/libupnp | 0 .../{core => oldcore}/66/filelists/linux-atm | 0 .../{core => oldcore}/66/filelists/linux-firmware | 0 config/rootfiles/{core => oldcore}/66/filelists/m4 | 0 .../{core => oldcore}/66/filelists/mISDNuser | 0 .../rootfiles/{core => oldcore}/66/filelists/man | 0 .../{core => oldcore}/66/filelists/misc-progs | 0 .../rootfiles/{core => oldcore}/66/filelists/mpfr | 0 .../{core => oldcore}/66/filelists/ncurses | 0 .../rootfiles/{core => oldcore}/66/filelists/newt | 0 .../{core => oldcore}/66/filelists/openldap | 0 .../{core => oldcore}/66/filelists/openssh | 0 .../{core => oldcore}/66/filelists/openssl | 0 .../rootfiles/{core => oldcore}/66/filelists/pam | 0 .../rootfiles/{core => oldcore}/66/filelists/pango | 0 .../{core => oldcore}/66/filelists/pciutils | 0 .../{core => oldcore}/66/filelists/pcmciautils | 0 .../rootfiles/{core => oldcore}/66/filelists/pcre | 0 .../{core => oldcore}/66/filelists/pcre-compat | 0 .../{core => oldcore}/66/filelists/pixman | 0 .../rootfiles/{core => oldcore}/66/filelists/popt | 0 .../rootfiles/{core => oldcore}/66/filelists/pptp | 0 .../{core => oldcore}/66/filelists/readline | 0 .../{core => oldcore}/66/filelists/readline-compat | 0 .../{core => oldcore}/66/filelists/reiserfsprogs | 0 .../{core => oldcore}/66/filelists/rrdtool | 0 .../{core => oldcore}/66/filelists/screen | 0 .../{core => oldcore}/66/filelists/sdparm | 0 .../rootfiles/{core => oldcore}/66/filelists/sed | 0 .../rootfiles/{core => oldcore}/66/filelists/setup | 0 .../{core => oldcore}/66/filelists/shadow | 0 .../rootfiles/{core => oldcore}/66/filelists/slang | 0 .../{core => oldcore}/66/filelists/smartmontools | 0 .../rootfiles/{core => oldcore}/66/filelists/snort | 0 .../rootfiles/{core => oldcore}/66/filelists/squid | 0 .../{core => oldcore}/66/filelists/stage2-partial | 0 .../{core => oldcore}/66/filelists/strongswan | 0 .../{core => oldcore}/66/filelists/sysfsutils | 0 .../{core => oldcore}/66/filelists/sysvinit | 0 .../{core => oldcore}/66/filelists/texinfo | 0 .../{core => oldcore}/66/filelists/tzdata | 0 .../rootfiles/{core => oldcore}/66/filelists/udev | 0 .../{core => oldcore}/66/filelists/usbutils | 0 .../rootfiles/{core => oldcore}/66/filelists/vim | 0 .../rootfiles/{core => oldcore}/66/filelists/wget | 0 .../{core => oldcore}/66/filelists/wpa_supplicant | 0 config/rootfiles/{core => oldcore}/66/filelists/xz | 0 .../rootfiles/{core => oldcore}/66/filelists/zlib | 0 config/rootfiles/{core => oldcore}/66/meta | 0 config/rootfiles/{core => oldcore}/66/update.sh | 0 config/rootfiles/packages/nfs | 9 +- config/rootfiles/packages/sendEmail | 1 + config/updxlrator/updxlrator | 15 ++- html/cgi-bin/index.cgi | 113 ++++++++++++--------- html/cgi-bin/ovpnmain.cgi | 14 +-- html/cgi-bin/updatexlrator.cgi | 57 ++++------- .../html/images/updbooster/updxl-src-microsoft.gif | Bin 0 -> 183 bytes html/html/images/updbooster/updxl-src-windows.gif | Bin 1052 -> 183 bytes lfs/{stress => IO-Socket-SSL} | 21 ++-- lfs/nfs | 11 +- lfs/{stress => sendEmail} | 14 +-- make.sh | 2 + src/initscripts/init.d/firewall | 1 + 129 files changed, 146 insertions(+), 126 deletions(-) create mode 100644 config/rootfiles/common/IO-Socket-SSL create mode 120000 config/rootfiles/core/67/filelists/IO-Socket-SSL rename config/rootfiles/{core => oldcore}/66/exclude (100%) rename config/rootfiles/{core => oldcore}/66/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/dracut (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/linux-omap (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/rpi-firmware (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/u-boot (100%) rename config/rootfiles/{core => oldcore}/66/filelists/armv5tel/util-linux (100%) rename config/rootfiles/{core => oldcore}/66/filelists/autoconf (100%) rename config/rootfiles/{core => oldcore}/66/filelists/automake (100%) rename config/rootfiles/{core => oldcore}/66/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/66/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/66/filelists/bridge-utils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/cairo (100%) rename config/rootfiles/{core => oldcore}/66/filelists/capi4k-utils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/cmake (100%) rename config/rootfiles/{core => oldcore}/66/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/66/filelists/compat-wireless (100%) rename config/rootfiles/{core => oldcore}/66/filelists/conntrack-tools (100%) rename config/rootfiles/{core => oldcore}/66/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/66/filelists/cyrus-sasl (100%) rename config/rootfiles/{core => oldcore}/66/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/66/filelists/dejavu-fonts-ttf (100%) rename config/rootfiles/{core => oldcore}/66/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/66/filelists/dvb-firmwares (100%) rename config/rootfiles/{core => oldcore}/66/filelists/e2fsprogs (100%) rename config/rootfiles/{core => oldcore}/66/filelists/file (100%) rename config/rootfiles/{core => oldcore}/66/filelists/files (100%) rename config/rootfiles/{core => oldcore}/66/filelists/fontconfig (100%) rename config/rootfiles/{core => oldcore}/66/filelists/fstrim (100%) rename config/rootfiles/{core => oldcore}/66/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/66/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/66/filelists/glib (100%) rename config/rootfiles/{core => oldcore}/66/filelists/gmp (100%) rename config/rootfiles/{core => oldcore}/66/filelists/gmp-compat (100%) rename config/rootfiles/{core => oldcore}/66/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/66/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/66/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/acpi-init (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/acpid (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/dracut (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/66/filelists/i586/util-linux (100%) rename config/rootfiles/{core => oldcore}/66/filelists/inetutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/66/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/66/filelists/kbd (100%) rename config/rootfiles/{core => oldcore}/66/filelists/less (100%) rename config/rootfiles/{core => oldcore}/66/filelists/libffi (100%) rename config/rootfiles/{core => oldcore}/66/filelists/libmnl (100%) rename config/rootfiles/{core => oldcore}/66/filelists/libnl (100%) rename config/rootfiles/{core => oldcore}/66/filelists/libsigc++ (100%) rename config/rootfiles/{core => oldcore}/66/filelists/libtool (100%) rename config/rootfiles/{core => oldcore}/66/filelists/libupnp (100%) rename config/rootfiles/{core => oldcore}/66/filelists/linux-atm (100%) rename config/rootfiles/{core => oldcore}/66/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/66/filelists/m4 (100%) rename config/rootfiles/{core => oldcore}/66/filelists/mISDNuser (100%) rename config/rootfiles/{core => oldcore}/66/filelists/man (100%) rename config/rootfiles/{core => oldcore}/66/filelists/misc-progs (100%) rename config/rootfiles/{core => oldcore}/66/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/66/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/66/filelists/newt (100%) rename config/rootfiles/{core => oldcore}/66/filelists/openldap (100%) rename config/rootfiles/{core => oldcore}/66/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/66/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pam (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pango (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pciutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pcmciautils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pcre-compat (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pixman (100%) rename config/rootfiles/{core => oldcore}/66/filelists/popt (100%) rename config/rootfiles/{core => oldcore}/66/filelists/pptp (100%) rename config/rootfiles/{core => oldcore}/66/filelists/readline (100%) rename config/rootfiles/{core => oldcore}/66/filelists/readline-compat (100%) rename config/rootfiles/{core => oldcore}/66/filelists/reiserfsprogs (100%) rename config/rootfiles/{core => oldcore}/66/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/66/filelists/screen (100%) rename config/rootfiles/{core => oldcore}/66/filelists/sdparm (100%) rename config/rootfiles/{core => oldcore}/66/filelists/sed (100%) rename config/rootfiles/{core => oldcore}/66/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/66/filelists/shadow (100%) rename config/rootfiles/{core => oldcore}/66/filelists/slang (100%) rename config/rootfiles/{core => oldcore}/66/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/66/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/66/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/66/filelists/stage2-partial (100%) rename config/rootfiles/{core => oldcore}/66/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/66/filelists/sysfsutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/sysvinit (100%) rename config/rootfiles/{core => oldcore}/66/filelists/texinfo (100%) rename config/rootfiles/{core => oldcore}/66/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/66/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/66/filelists/usbutils (100%) rename config/rootfiles/{core => oldcore}/66/filelists/vim (100%) rename config/rootfiles/{core => oldcore}/66/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/66/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/66/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/66/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/66/meta (100%) rename config/rootfiles/{core => oldcore}/66/update.sh (100%) create mode 100644 config/rootfiles/packages/sendEmail create mode 100644 html/html/images/updbooster/updxl-src-microsoft.gif copy lfs/{stress => IO-Socket-SSL} (85%) copy lfs/{stress => sendEmail} (88%)
Difference in files: diff --git a/config/rootfiles/common/IO-Socket-SSL b/config/rootfiles/common/IO-Socket-SSL new file mode 100644 index 0000000..09b9f31 --- /dev/null +++ b/config/rootfiles/common/IO-Socket-SSL @@ -0,0 +1,6 @@ +usr/lib/perl5/site_perl/5.12.3/IO/Socket +usr/lib/perl5/site_perl/5.12.3/IO/Socket/SSL.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket/SSL +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket/SSL/.packlist +#usr/share/man/man3/IO::Socket::SSL.3 diff --git a/config/rootfiles/core/66/exclude b/config/rootfiles/core/66/exclude deleted file mode 100644 index 18141fd..0000000 --- a/config/rootfiles/core/66/exclude +++ /dev/null @@ -1,16 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/log/cache -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/66/filelists/GeoIP b/config/rootfiles/core/66/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/66/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/66/filelists/armv5tel/binutils b/config/rootfiles/core/66/filelists/armv5tel/binutils deleted file mode 120000 index ac971f9..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/dracut b/config/rootfiles/core/66/filelists/armv5tel/dracut deleted file mode 120000 index 861df3f..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/gcc b/config/rootfiles/core/66/filelists/armv5tel/gcc deleted file mode 120000 index 84f7b93..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/glibc b/config/rootfiles/core/66/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/linux-omap b/config/rootfiles/core/66/filelists/armv5tel/linux-omap deleted file mode 120000 index 50bf786..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/linux-omap +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/linux-rpi b/config/rootfiles/core/66/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/66/filelists/armv5tel/rpi-firmware deleted file mode 120000 index 428fdf8..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/rpi-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/u-boot b/config/rootfiles/core/66/filelists/armv5tel/u-boot deleted file mode 120000 index 3df31a8..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/u-boot +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/util-linux b/config/rootfiles/core/66/filelists/armv5tel/util-linux deleted file mode 120000 index 2596908..0000000 --- a/config/rootfiles/core/66/filelists/armv5tel/util-linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/autoconf b/config/rootfiles/core/66/filelists/autoconf deleted file mode 120000 index aa39ce6..0000000 --- a/config/rootfiles/core/66/filelists/autoconf +++ /dev/null @@ -1 +0,0 @@ -../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/automake b/config/rootfiles/core/66/filelists/automake deleted file mode 120000 index df3ee42..0000000 --- a/config/rootfiles/core/66/filelists/automake +++ /dev/null @@ -1 +0,0 @@ -../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/bash b/config/rootfiles/core/66/filelists/bash deleted file mode 120000 index de970cb..0000000 --- a/config/rootfiles/core/66/filelists/bash +++ /dev/null @@ -1 +0,0 @@ -../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/bind b/config/rootfiles/core/66/filelists/bind deleted file mode 120000 index 48a0eba..0000000 --- a/config/rootfiles/core/66/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/bridge-utils b/config/rootfiles/core/66/filelists/bridge-utils deleted file mode 120000 index 3dee211..0000000 --- a/config/rootfiles/core/66/filelists/bridge-utils +++ /dev/null @@ -1 +0,0 @@ -../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/cairo b/config/rootfiles/core/66/filelists/cairo deleted file mode 120000 index bf48d25..0000000 --- a/config/rootfiles/core/66/filelists/cairo +++ /dev/null @@ -1 +0,0 @@ -../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/capi4k-utils b/config/rootfiles/core/66/filelists/capi4k-utils deleted file mode 120000 index 82982c4..0000000 --- a/config/rootfiles/core/66/filelists/capi4k-utils +++ /dev/null @@ -1 +0,0 @@ -../../../common/capi4k-utils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/cmake b/config/rootfiles/core/66/filelists/cmake deleted file mode 120000 index 491d25f..0000000 --- a/config/rootfiles/core/66/filelists/cmake +++ /dev/null @@ -1 +0,0 @@ -../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/collectd b/config/rootfiles/core/66/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/66/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/compat-wireless b/config/rootfiles/core/66/filelists/compat-wireless deleted file mode 120000 index 5b5ac9e..0000000 --- a/config/rootfiles/core/66/filelists/compat-wireless +++ /dev/null @@ -1 +0,0 @@ -../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/conntrack-tools b/config/rootfiles/core/66/filelists/conntrack-tools deleted file mode 120000 index 88fbe06..0000000 --- a/config/rootfiles/core/66/filelists/conntrack-tools +++ /dev/null @@ -1 +0,0 @@ -../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/coreutils b/config/rootfiles/core/66/filelists/coreutils deleted file mode 120000 index 7351ed2..0000000 --- a/config/rootfiles/core/66/filelists/coreutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/curl b/config/rootfiles/core/66/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/66/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/cyrus-sasl b/config/rootfiles/core/66/filelists/cyrus-sasl deleted file mode 120000 index bb51b4c..0000000 --- a/config/rootfiles/core/66/filelists/cyrus-sasl +++ /dev/null @@ -1 +0,0 @@ -../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/daq b/config/rootfiles/core/66/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/66/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/dejavu-fonts-ttf b/config/rootfiles/core/66/filelists/dejavu-fonts-ttf deleted file mode 120000 index 0007a8b..0000000 --- a/config/rootfiles/core/66/filelists/dejavu-fonts-ttf +++ /dev/null @@ -1 +0,0 @@ -../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/dhcp b/config/rootfiles/core/66/filelists/dhcp deleted file mode 120000 index 32d8da4..0000000 --- a/config/rootfiles/core/66/filelists/dhcp +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/dvb-firmwares b/config/rootfiles/core/66/filelists/dvb-firmwares deleted file mode 120000 index 69d0cdc..0000000 --- a/config/rootfiles/core/66/filelists/dvb-firmwares +++ /dev/null @@ -1 +0,0 @@ -../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/e2fsprogs b/config/rootfiles/core/66/filelists/e2fsprogs deleted file mode 120000 index 37b55de..0000000 --- a/config/rootfiles/core/66/filelists/e2fsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/file b/config/rootfiles/core/66/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/66/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files deleted file mode 100644 index 9d0006f..0000000 --- a/config/rootfiles/core/66/filelists/files +++ /dev/null @@ -1,53 +0,0 @@ -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -etc/issue -etc/modprobe.d/cfg80211 -etc/rc.d/init.d/cleanfs -etc/rc.d/init.d/firewall -etc/rc.d/init.d/fsresize -etc/rc.d/init.d/halt -etc/rc.d/init.d/leds -etc/rc.d/init.d/mountfs -etc/rc.d/init.d/network -etc/rc.d/init.d/networking/dhcpcd.exe -etc/rc.d/init.d/networking/red -etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/98-leds -etc/rc.d/init.d/partresize -etc/rc.d/init.d/reboot -etc/rc.d/init.d/sendsignals -etc/rc.d/init.d/setclock -etc/rc.d/init.d/tmpfs -etc/rc.d/init.d/udev -etc/rc.d/init.d/udev_retry -etc/rc.d/rc0.d/K47setclock -etc/rc.d/rc6.d/K47setclock -etc/securetty -etc/sysctl.conf -etc/system-release -opt/pakfire/db/core/mine -opt/pakfire/etc/pakfire.conf -opt/pakfire/lib/functions.sh -srv/web/ipfire/cgi-bin/backup.cgi -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat -srv/web/ipfire/cgi-bin/media.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/bin/watch -usr/local/bin/backupiso -usr/local/bin/makegraphs -usr/local/bin/readhash -usr/local/bin/scanhd -usr/sbin/ovpn-ccd-convert -var/ipfire/backup/bin/backup.pl -var/ipfire/backup/include -var/ipfire/general-functions.pl -var/ipfire/langs -var/ipfire/outgoing/bin/outgoingfw.pl -var/ipfire/qos/bin/makeqosscripts.pl -var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/core/66/filelists/fontconfig b/config/rootfiles/core/66/filelists/fontconfig deleted file mode 120000 index 6daeffd..0000000 --- a/config/rootfiles/core/66/filelists/fontconfig +++ /dev/null @@ -1 +0,0 @@ -../../../common/fontconfig \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/fstrim b/config/rootfiles/core/66/filelists/fstrim deleted file mode 120000 index 5541351..0000000 --- a/config/rootfiles/core/66/filelists/fstrim +++ /dev/null @@ -1 +0,0 @@ -../../../common/fstrim \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gawk b/config/rootfiles/core/66/filelists/gawk deleted file mode 120000 index a3bbe32..0000000 --- a/config/rootfiles/core/66/filelists/gawk +++ /dev/null @@ -1 +0,0 @@ -../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gettext b/config/rootfiles/core/66/filelists/gettext deleted file mode 120000 index b6c6c6f..0000000 --- a/config/rootfiles/core/66/filelists/gettext +++ /dev/null @@ -1 +0,0 @@ -../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/glib b/config/rootfiles/core/66/filelists/glib deleted file mode 120000 index 4466574..0000000 --- a/config/rootfiles/core/66/filelists/glib +++ /dev/null @@ -1 +0,0 @@ -../../../common/glib \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gmp b/config/rootfiles/core/66/filelists/gmp deleted file mode 120000 index 8662a89..0000000 --- a/config/rootfiles/core/66/filelists/gmp +++ /dev/null @@ -1 +0,0 @@ -../../../common/gmp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gmp-compat b/config/rootfiles/core/66/filelists/gmp-compat deleted file mode 120000 index 10093cd..0000000 --- a/config/rootfiles/core/66/filelists/gmp-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/gmp-compat \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gnupg b/config/rootfiles/core/66/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/66/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/grep b/config/rootfiles/core/66/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/66/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/hdparm b/config/rootfiles/core/66/filelists/hdparm deleted file mode 120000 index b644751..0000000 --- a/config/rootfiles/core/66/filelists/hdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/acpi-init b/config/rootfiles/core/66/filelists/i586/acpi-init deleted file mode 100644 index 982638a..0000000 --- a/config/rootfiles/core/66/filelists/i586/acpi-init +++ /dev/null @@ -1,4 +0,0 @@ -etc/rc.d/init.d/acpid -etc/rc.d/rc0.d/K87acpid -etc/rc.d/rc3.d/S12acpid -etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/core/66/filelists/i586/acpid b/config/rootfiles/core/66/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/66/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/binutils b/config/rootfiles/core/66/filelists/i586/binutils deleted file mode 120000 index 78695d7..0000000 --- a/config/rootfiles/core/66/filelists/i586/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/dracut b/config/rootfiles/core/66/filelists/i586/dracut deleted file mode 120000 index 9a09010..0000000 --- a/config/rootfiles/core/66/filelists/i586/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/gcc b/config/rootfiles/core/66/filelists/i586/gcc deleted file mode 120000 index ba328e3..0000000 --- a/config/rootfiles/core/66/filelists/i586/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/glibc b/config/rootfiles/core/66/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/66/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/grub b/config/rootfiles/core/66/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/66/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/linux b/config/rootfiles/core/66/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/66/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/strongswan-padlock b/config/rootfiles/core/66/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/66/filelists/i586/strongswan-padlock +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/util-linux b/config/rootfiles/core/66/filelists/i586/util-linux deleted file mode 120000 index c973106..0000000 --- a/config/rootfiles/core/66/filelists/i586/util-linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/inetutils b/config/rootfiles/core/66/filelists/inetutils deleted file mode 120000 index bcd329b..0000000 --- a/config/rootfiles/core/66/filelists/inetutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/iproute2 b/config/rootfiles/core/66/filelists/iproute2 deleted file mode 120000 index 05f0f71..0000000 --- a/config/rootfiles/core/66/filelists/iproute2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/iptables b/config/rootfiles/core/66/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/66/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/kbd b/config/rootfiles/core/66/filelists/kbd deleted file mode 120000 index 9b85839..0000000 --- a/config/rootfiles/core/66/filelists/kbd +++ /dev/null @@ -1 +0,0 @@ -../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/less b/config/rootfiles/core/66/filelists/less deleted file mode 120000 index 65c0e07..0000000 --- a/config/rootfiles/core/66/filelists/less +++ /dev/null @@ -1 +0,0 @@ -../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libffi b/config/rootfiles/core/66/filelists/libffi deleted file mode 120000 index c391acd..0000000 --- a/config/rootfiles/core/66/filelists/libffi +++ /dev/null @@ -1 +0,0 @@ -../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libmnl b/config/rootfiles/core/66/filelists/libmnl deleted file mode 120000 index f671c41..0000000 --- a/config/rootfiles/core/66/filelists/libmnl +++ /dev/null @@ -1 +0,0 @@ -../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libnl b/config/rootfiles/core/66/filelists/libnl deleted file mode 120000 index 7181849..0000000 --- a/config/rootfiles/core/66/filelists/libnl +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libsigc++ b/config/rootfiles/core/66/filelists/libsigc++ deleted file mode 120000 index 51f4c75..0000000 --- a/config/rootfiles/core/66/filelists/libsigc++ +++ /dev/null @@ -1 +0,0 @@ -../../../common/libsigc++ \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libtool b/config/rootfiles/core/66/filelists/libtool deleted file mode 120000 index 54f5666..0000000 --- a/config/rootfiles/core/66/filelists/libtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libupnp b/config/rootfiles/core/66/filelists/libupnp deleted file mode 120000 index 7ec2b00..0000000 --- a/config/rootfiles/core/66/filelists/libupnp +++ /dev/null @@ -1 +0,0 @@ -../../../common/libupnp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/linux-atm b/config/rootfiles/core/66/filelists/linux-atm deleted file mode 120000 index 8adccaf..0000000 --- a/config/rootfiles/core/66/filelists/linux-atm +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-atm \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/linux-firmware b/config/rootfiles/core/66/filelists/linux-firmware deleted file mode 120000 index 4bf91bc..0000000 --- a/config/rootfiles/core/66/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/m4 b/config/rootfiles/core/66/filelists/m4 deleted file mode 120000 index 3f009cc..0000000 --- a/config/rootfiles/core/66/filelists/m4 +++ /dev/null @@ -1 +0,0 @@ -../../../common/m4 \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/mISDNuser b/config/rootfiles/core/66/filelists/mISDNuser deleted file mode 120000 index 78537d4..0000000 --- a/config/rootfiles/core/66/filelists/mISDNuser +++ /dev/null @@ -1 +0,0 @@ -../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/man b/config/rootfiles/core/66/filelists/man deleted file mode 120000 index b04d65c..0000000 --- a/config/rootfiles/core/66/filelists/man +++ /dev/null @@ -1 +0,0 @@ -../../../common/man \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/misc-progs b/config/rootfiles/core/66/filelists/misc-progs deleted file mode 120000 index 7223cad..0000000 --- a/config/rootfiles/core/66/filelists/misc-progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/mpfr b/config/rootfiles/core/66/filelists/mpfr deleted file mode 120000 index c8468bf..0000000 --- a/config/rootfiles/core/66/filelists/mpfr +++ /dev/null @@ -1 +0,0 @@ -../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/ncurses b/config/rootfiles/core/66/filelists/ncurses deleted file mode 120000 index 512faef..0000000 --- a/config/rootfiles/core/66/filelists/ncurses +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/newt b/config/rootfiles/core/66/filelists/newt deleted file mode 120000 index fb3eb20..0000000 --- a/config/rootfiles/core/66/filelists/newt +++ /dev/null @@ -1 +0,0 @@ -../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/openldap b/config/rootfiles/core/66/filelists/openldap deleted file mode 120000 index 80c324f..0000000 --- a/config/rootfiles/core/66/filelists/openldap +++ /dev/null @@ -1 +0,0 @@ -../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/openssh b/config/rootfiles/core/66/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/66/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/openssl b/config/rootfiles/core/66/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/66/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pam b/config/rootfiles/core/66/filelists/pam deleted file mode 120000 index 660a1d8..0000000 --- a/config/rootfiles/core/66/filelists/pam +++ /dev/null @@ -1 +0,0 @@ -../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pango b/config/rootfiles/core/66/filelists/pango deleted file mode 120000 index 6c37231..0000000 --- a/config/rootfiles/core/66/filelists/pango +++ /dev/null @@ -1 +0,0 @@ -../../../common/pango \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pciutils b/config/rootfiles/core/66/filelists/pciutils deleted file mode 120000 index aeb45e7..0000000 --- a/config/rootfiles/core/66/filelists/pciutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pcmciautils b/config/rootfiles/core/66/filelists/pcmciautils deleted file mode 120000 index 7cbf821..0000000 --- a/config/rootfiles/core/66/filelists/pcmciautils +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcmciautils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pcre b/config/rootfiles/core/66/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/66/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pcre-compat b/config/rootfiles/core/66/filelists/pcre-compat deleted file mode 120000 index eff8a7d..0000000 --- a/config/rootfiles/core/66/filelists/pcre-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre-compat \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pixman b/config/rootfiles/core/66/filelists/pixman deleted file mode 120000 index fdb6346..0000000 --- a/config/rootfiles/core/66/filelists/pixman +++ /dev/null @@ -1 +0,0 @@ -../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/popt b/config/rootfiles/core/66/filelists/popt deleted file mode 120000 index d71a9ab..0000000 --- a/config/rootfiles/core/66/filelists/popt +++ /dev/null @@ -1 +0,0 @@ -../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pptp b/config/rootfiles/core/66/filelists/pptp deleted file mode 120000 index 2b3dfad..0000000 --- a/config/rootfiles/core/66/filelists/pptp +++ /dev/null @@ -1 +0,0 @@ -../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/readline b/config/rootfiles/core/66/filelists/readline deleted file mode 120000 index 84209f1..0000000 --- a/config/rootfiles/core/66/filelists/readline +++ /dev/null @@ -1 +0,0 @@ -../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/readline-compat b/config/rootfiles/core/66/filelists/readline-compat deleted file mode 120000 index f96bc80..0000000 --- a/config/rootfiles/core/66/filelists/readline-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/reiserfsprogs b/config/rootfiles/core/66/filelists/reiserfsprogs deleted file mode 120000 index 008c3e8..0000000 --- a/config/rootfiles/core/66/filelists/reiserfsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/rrdtool b/config/rootfiles/core/66/filelists/rrdtool deleted file mode 120000 index 7a82e41..0000000 --- a/config/rootfiles/core/66/filelists/rrdtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/screen b/config/rootfiles/core/66/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/66/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sdparm b/config/rootfiles/core/66/filelists/sdparm deleted file mode 120000 index 86d9c24..0000000 --- a/config/rootfiles/core/66/filelists/sdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sed b/config/rootfiles/core/66/filelists/sed deleted file mode 120000 index fc5f5c6..0000000 --- a/config/rootfiles/core/66/filelists/sed +++ /dev/null @@ -1 +0,0 @@ -../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/setup b/config/rootfiles/core/66/filelists/setup deleted file mode 120000 index 209374b..0000000 --- a/config/rootfiles/core/66/filelists/setup +++ /dev/null @@ -1 +0,0 @@ -../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/shadow b/config/rootfiles/core/66/filelists/shadow deleted file mode 120000 index c0824b7..0000000 --- a/config/rootfiles/core/66/filelists/shadow +++ /dev/null @@ -1 +0,0 @@ -../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/slang b/config/rootfiles/core/66/filelists/slang deleted file mode 120000 index 228e45e..0000000 --- a/config/rootfiles/core/66/filelists/slang +++ /dev/null @@ -1 +0,0 @@ -../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/smartmontools b/config/rootfiles/core/66/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/66/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/snort b/config/rootfiles/core/66/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/66/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/squid b/config/rootfiles/core/66/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/66/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/stage2-partial b/config/rootfiles/core/66/filelists/stage2-partial deleted file mode 100644 index df9ad8f..0000000 --- a/config/rootfiles/core/66/filelists/stage2-partial +++ /dev/null @@ -1,17 +0,0 @@ -etc/bashrc -etc/profile -etc/profile.d/colorls.sh -etc/profile.d/extrapaths.sh -etc/profile.d/glib2-locale.sh -etc/profile.d/i18n.sh -etc/profile.d/lang.sh -etc/profile.d/readline.sh -etc/profile.d/term256.sh -etc/profile.d/umask.sh -etc/securetty -etc/sysctl.conf -root/.bash_logout -root/.bash_profile -root/.bashrc -usr/lib/libgcc_s.so.1 -usr/lib/libstdc++.so.6 diff --git a/config/rootfiles/core/66/filelists/strongswan b/config/rootfiles/core/66/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/66/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sysfsutils b/config/rootfiles/core/66/filelists/sysfsutils deleted file mode 120000 index 8f3ee3e..0000000 --- a/config/rootfiles/core/66/filelists/sysfsutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/sysfsutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sysvinit b/config/rootfiles/core/66/filelists/sysvinit deleted file mode 120000 index f3fb330..0000000 --- a/config/rootfiles/core/66/filelists/sysvinit +++ /dev/null @@ -1 +0,0 @@ -../../../common/sysvinit \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/texinfo b/config/rootfiles/core/66/filelists/texinfo deleted file mode 120000 index fa9df02..0000000 --- a/config/rootfiles/core/66/filelists/texinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/texinfo \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/tzdata b/config/rootfiles/core/66/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/66/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/udev b/config/rootfiles/core/66/filelists/udev deleted file mode 120000 index e967a1c..0000000 --- a/config/rootfiles/core/66/filelists/udev +++ /dev/null @@ -1 +0,0 @@ -../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/usbutils b/config/rootfiles/core/66/filelists/usbutils deleted file mode 120000 index 31db5a7..0000000 --- a/config/rootfiles/core/66/filelists/usbutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/vim b/config/rootfiles/core/66/filelists/vim deleted file mode 120000 index 9861317..0000000 --- a/config/rootfiles/core/66/filelists/vim +++ /dev/null @@ -1 +0,0 @@ -../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/wget b/config/rootfiles/core/66/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/66/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/wpa_supplicant b/config/rootfiles/core/66/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/66/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/xz b/config/rootfiles/core/66/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/66/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/zlib b/config/rootfiles/core/66/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/66/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/66/meta b/config/rootfiles/core/66/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/66/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh deleted file mode 100644 index e0a7875..0000000 --- a/config/rootfiles/core/66/update.sh +++ /dev/null @@ -1,379 +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) 2013 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES -} - -# -# Remove old core updates from pakfire cache to save space... -# -core=66 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire-xen ) - BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` - if [ $BOOTSIZE -lt 28000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update because not enough space on boot." - exit 2 - fi - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update. No IPFire Kernel." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; -esac - -if [ ! "$(mount | grep " reiser4 (")" == "" ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update because there is a reiser4 fs mounted." - exit 1 -fi - -# -# -KVER="3.2.38" -MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | 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$core_$KVER.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ - /var/ipfire/backup/core-upgrade$core_$KVER-old.tar.xz -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 -add_to_backup lib/modules -add_to_backup etc/udev -add_to_backup lib/udev -add_to_backup boot -add_to_backup etc/snort -add_to_backup usr/lib/snort_* -add_to_backup usr/share/zoneinfo -add_to_backup lib/libncurses* -add_to_backup etc/dircolors -add_to_backup etc/profile.d -add_to_backup usr/share/terminfo -add_to_backup etc/sysconfig/lm_sensors -add_to_backup etc/sysconfig/rc.local -add_to_backup usr/local/bin/vpn-watch -add_to_backup usr/local/bin/updxsetperms -add_to_backup usr/libexec/ipsec - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 70000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update because not enough free space on root." - exit 2 -fi - -# Add user nobody to group squid. -usermod -a -G squid nobody - -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 /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /lib/modules -rm -rf /etc/dircolors -rm -rf /etc/profile.d -rm -rf /usr/share/terminfo -rm -rf /bin/[ - -# -# Remove old udev rules. -# -if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then - cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ -fi -cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ -rm -rf /etc/udev -rm -rf /lib/udev -mkdir -p /etc/udev/rules.d -if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then - mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ -fi -mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ - -case $(uname -m) in - i?86 ) - # - # Backup grub.conf - # - cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - ;; -esac -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - - -#Remove old snort, zoneinfo and ncurses-libs(wrong path). -rm -rf /etc/snort -rm -rf /usr/lib/snort_* -rm -rf /usr/share/zoneinfo -rm -rf /lib/libncurses* - -# Remove old pluto binaries. -rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack} -rm -f /usr/local/bin/vpn-watch - -# Remove update accelerator permissions script. -rm -f /usr/local/bin/updxsetperms - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - -# -#Reload init to close old linker/glibc -telinit u - -# Regenerate ipsec configuration files. -/srv/web/ipfire/cgi-bin/vpnmain.cgi - -# Convert OpenVPN RW connections. -/usr/sbin/ovpn-ccd-convert - -touch /var/ipfire/ovpn/ccd.conf -touch /var/ipfire/ovpn/ccdroute -touch /var/ipfire/ovpn/ccdroute2 -chown nobody:nobody /var/ipfire/ovpn/ccd.conf -chown nobody:nobody /var/ipfire/ovpn/ccdroute -chown nobody:nobody /var/ipfire/ovpn/ccdroute2 - -# Update crontab. -sed -i /var/spool/cron/root.orig \ - -e 's@^.*fcron.weekly.*$@&nice(10),bootrun 47 2 * * 1\ttest -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly@' -fcrontab -z &>/dev/null - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -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 - -# Remove preloading libsafe. -rm -f /etc/ld.so.preload - -case $(uname -m) in - i?86 ) - # - # Modify grub.conf - # - echo - echo Update grub configuration ... - ROOT=`mount | grep " / " | cut -d" " -f1` - - if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - fi - - if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf - else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf - fi - 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,115200n8 panic=10 |g" /boot/grub/grub.conf - fi - - # - # ReInstall grub - # - echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map - grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} - ;; -esac -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors - -# -# Remove powerbutton loop from rc local. -# -sed -i "/# power button shutdown/,+3d" /etc/sysconfig/rc.local - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# -# Remove meta's of packages that are now common... -# -rm -rf /opt/pakfire/db/*/meta-fontconfig -rm -rf /opt/pakfire/db/*/meta-glib - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 8000 -o $ROOTSPACE -lt 70000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 3.2.38" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 27" >> /opt/pakfire/db/installed/meta-linux-pae - fi -fi - -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-xen - # Add xvc0 to /etc/securetty - echo "xvc0" >> /etc/securetty -fi - -# -# 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 ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -/etc/init.d/fireinfo start -sendprofile - -echo -echo Please wait until pakfire has ended... -echo -#Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/67/filelists/IO-Socket-SSL b/config/rootfiles/core/67/filelists/IO-Socket-SSL new file mode 120000 index 0000000..d244923 --- /dev/null +++ b/config/rootfiles/core/67/filelists/IO-Socket-SSL @@ -0,0 +1 @@ +../../../common/IO-Socket-SSL \ No newline at end of file diff --git a/config/rootfiles/core/67/filelists/files b/config/rootfiles/core/67/filelists/files index ba0d5cc..4a3c2e3 100644 --- a/config/rootfiles/core/67/filelists/files +++ b/config/rootfiles/core/67/filelists/files @@ -1,4 +1,11 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/html/images/updbooster/updxl-src-microsoft.gif +srv/web/ipfire/html/images/updbooster/updxl-src-windows.gif +usr/sbin/updxlrator var/ipfire/langs diff --git a/config/rootfiles/oldcore/66/exclude b/config/rootfiles/oldcore/66/exclude new file mode 100644 index 0000000..18141fd --- /dev/null +++ b/config/rootfiles/oldcore/66/exclude @@ -0,0 +1,16 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/oldcore/66/filelists/GeoIP b/config/rootfiles/oldcore/66/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/binutils b/config/rootfiles/oldcore/66/filelists/armv5tel/binutils new file mode 120000 index 0000000..ac971f9 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/dracut b/config/rootfiles/oldcore/66/filelists/armv5tel/dracut new file mode 120000 index 0000000..861df3f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/dracut @@ -0,0 +1 @@ +../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/gcc b/config/rootfiles/oldcore/66/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/glibc b/config/rootfiles/oldcore/66/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/66/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/linux-omap b/config/rootfiles/oldcore/66/filelists/armv5tel/linux-omap new file mode 120000 index 0000000..50bf786 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/linux-omap @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/66/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/rpi-firmware b/config/rootfiles/oldcore/66/filelists/armv5tel/rpi-firmware new file mode 120000 index 0000000..428fdf8 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/rpi-firmware @@ -0,0 +1 @@ +../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/66/filelists/armv5tel/u-boot new file mode 120000 index 0000000..3df31a8 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/66/filelists/armv5tel/util-linux new file mode 120000 index 0000000..2596908 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/armv5tel/util-linux @@ -0,0 +1 @@ +../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/autoconf b/config/rootfiles/oldcore/66/filelists/autoconf new file mode 120000 index 0000000..aa39ce6 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/autoconf @@ -0,0 +1 @@ +../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/automake b/config/rootfiles/oldcore/66/filelists/automake new file mode 120000 index 0000000..df3ee42 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/automake @@ -0,0 +1 @@ +../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/bash b/config/rootfiles/oldcore/66/filelists/bash new file mode 120000 index 0000000..de970cb --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/bind b/config/rootfiles/oldcore/66/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/bridge-utils b/config/rootfiles/oldcore/66/filelists/bridge-utils new file mode 120000 index 0000000..3dee211 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/bridge-utils @@ -0,0 +1 @@ +../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/cairo b/config/rootfiles/oldcore/66/filelists/cairo new file mode 120000 index 0000000..bf48d25 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/cairo @@ -0,0 +1 @@ +../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/capi4k-utils b/config/rootfiles/oldcore/66/filelists/capi4k-utils new file mode 120000 index 0000000..82982c4 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/capi4k-utils @@ -0,0 +1 @@ +../../../common/capi4k-utils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/cmake b/config/rootfiles/oldcore/66/filelists/cmake new file mode 120000 index 0000000..491d25f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/cmake @@ -0,0 +1 @@ +../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/collectd b/config/rootfiles/oldcore/66/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/compat-wireless b/config/rootfiles/oldcore/66/filelists/compat-wireless new file mode 120000 index 0000000..5b5ac9e --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/compat-wireless @@ -0,0 +1 @@ +../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/conntrack-tools b/config/rootfiles/oldcore/66/filelists/conntrack-tools new file mode 120000 index 0000000..88fbe06 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/conntrack-tools @@ -0,0 +1 @@ +../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/coreutils b/config/rootfiles/oldcore/66/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/curl b/config/rootfiles/oldcore/66/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/cyrus-sasl b/config/rootfiles/oldcore/66/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/daq b/config/rootfiles/oldcore/66/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/dejavu-fonts-ttf b/config/rootfiles/oldcore/66/filelists/dejavu-fonts-ttf new file mode 120000 index 0000000..0007a8b --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/dejavu-fonts-ttf @@ -0,0 +1 @@ +../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/dhcp b/config/rootfiles/oldcore/66/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/dvb-firmwares b/config/rootfiles/oldcore/66/filelists/dvb-firmwares new file mode 120000 index 0000000..69d0cdc --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/dvb-firmwares @@ -0,0 +1 @@ +../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/e2fsprogs b/config/rootfiles/oldcore/66/filelists/e2fsprogs new file mode 120000 index 0000000..37b55de --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/file b/config/rootfiles/oldcore/66/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/files b/config/rootfiles/oldcore/66/filelists/files new file mode 100644 index 0000000..9d0006f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/files @@ -0,0 +1,53 @@ +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/issue +etc/modprobe.d/cfg80211 +etc/rc.d/init.d/cleanfs +etc/rc.d/init.d/firewall +etc/rc.d/init.d/fsresize +etc/rc.d/init.d/halt +etc/rc.d/init.d/leds +etc/rc.d/init.d/mountfs +etc/rc.d/init.d/network +etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/init.d/networking/red +etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup +etc/rc.d/init.d/networking/red.up/98-leds +etc/rc.d/init.d/partresize +etc/rc.d/init.d/reboot +etc/rc.d/init.d/sendsignals +etc/rc.d/init.d/setclock +etc/rc.d/init.d/tmpfs +etc/rc.d/init.d/udev +etc/rc.d/init.d/udev_retry +etc/rc.d/rc0.d/K47setclock +etc/rc.d/rc6.d/K47setclock +etc/securetty +etc/sysctl.conf +etc/system-release +opt/pakfire/db/core/mine +opt/pakfire/etc/pakfire.conf +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/backup.cgi +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/media.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/bin/watch +usr/local/bin/backupiso +usr/local/bin/makegraphs +usr/local/bin/readhash +usr/local/bin/scanhd +usr/sbin/ovpn-ccd-convert +var/ipfire/backup/bin/backup.pl +var/ipfire/backup/include +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/outgoing/bin/outgoingfw.pl +var/ipfire/qos/bin/makeqosscripts.pl +var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/oldcore/66/filelists/fontconfig b/config/rootfiles/oldcore/66/filelists/fontconfig new file mode 120000 index 0000000..6daeffd --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/fontconfig @@ -0,0 +1 @@ +../../../common/fontconfig \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/fstrim b/config/rootfiles/oldcore/66/filelists/fstrim new file mode 120000 index 0000000..5541351 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/fstrim @@ -0,0 +1 @@ +../../../common/fstrim \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/gawk b/config/rootfiles/oldcore/66/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/gettext b/config/rootfiles/oldcore/66/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/glib b/config/rootfiles/oldcore/66/filelists/glib new file mode 120000 index 0000000..4466574 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/glib @@ -0,0 +1 @@ +../../../common/glib \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/gmp b/config/rootfiles/oldcore/66/filelists/gmp new file mode 120000 index 0000000..8662a89 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/gmp @@ -0,0 +1 @@ +../../../common/gmp \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/gmp-compat b/config/rootfiles/oldcore/66/filelists/gmp-compat new file mode 120000 index 0000000..10093cd --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/gmp-compat @@ -0,0 +1 @@ +../../../common/gmp-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/gnupg b/config/rootfiles/oldcore/66/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/grep b/config/rootfiles/oldcore/66/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/hdparm b/config/rootfiles/oldcore/66/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/acpi-init b/config/rootfiles/oldcore/66/filelists/i586/acpi-init new file mode 100644 index 0000000..982638a --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/acpi-init @@ -0,0 +1,4 @@ +etc/rc.d/init.d/acpid +etc/rc.d/rc0.d/K87acpid +etc/rc.d/rc3.d/S12acpid +etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/oldcore/66/filelists/i586/acpid b/config/rootfiles/oldcore/66/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/binutils b/config/rootfiles/oldcore/66/filelists/i586/binutils new file mode 120000 index 0000000..78695d7 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/dracut b/config/rootfiles/oldcore/66/filelists/i586/dracut new file mode 120000 index 0000000..9a09010 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/dracut @@ -0,0 +1 @@ +../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/gcc b/config/rootfiles/oldcore/66/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/glibc b/config/rootfiles/oldcore/66/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/grub b/config/rootfiles/oldcore/66/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/linux b/config/rootfiles/oldcore/66/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/66/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/i586/util-linux b/config/rootfiles/oldcore/66/filelists/i586/util-linux new file mode 120000 index 0000000..c973106 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/i586/util-linux @@ -0,0 +1 @@ +../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/inetutils b/config/rootfiles/oldcore/66/filelists/inetutils new file mode 120000 index 0000000..bcd329b --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/inetutils @@ -0,0 +1 @@ +../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/iproute2 b/config/rootfiles/oldcore/66/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/iptables b/config/rootfiles/oldcore/66/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/kbd b/config/rootfiles/oldcore/66/filelists/kbd new file mode 120000 index 0000000..9b85839 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/less b/config/rootfiles/oldcore/66/filelists/less new file mode 120000 index 0000000..65c0e07 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/libffi b/config/rootfiles/oldcore/66/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/libmnl b/config/rootfiles/oldcore/66/filelists/libmnl new file mode 120000 index 0000000..f671c41 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/libmnl @@ -0,0 +1 @@ +../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/libnl b/config/rootfiles/oldcore/66/filelists/libnl new file mode 120000 index 0000000..7181849 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/libnl @@ -0,0 +1 @@ +../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/libsigc++ b/config/rootfiles/oldcore/66/filelists/libsigc++ new file mode 120000 index 0000000..51f4c75 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/libsigc++ @@ -0,0 +1 @@ +../../../common/libsigc++ \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/libtool b/config/rootfiles/oldcore/66/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/libupnp b/config/rootfiles/oldcore/66/filelists/libupnp new file mode 120000 index 0000000..7ec2b00 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/libupnp @@ -0,0 +1 @@ +../../../common/libupnp \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/linux-atm b/config/rootfiles/oldcore/66/filelists/linux-atm new file mode 120000 index 0000000..8adccaf --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/linux-atm @@ -0,0 +1 @@ +../../../common/linux-atm \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/linux-firmware b/config/rootfiles/oldcore/66/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/m4 b/config/rootfiles/oldcore/66/filelists/m4 new file mode 120000 index 0000000..3f009cc --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/m4 @@ -0,0 +1 @@ +../../../common/m4 \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/mISDNuser b/config/rootfiles/oldcore/66/filelists/mISDNuser new file mode 120000 index 0000000..78537d4 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/man b/config/rootfiles/oldcore/66/filelists/man new file mode 120000 index 0000000..b04d65c --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/man @@ -0,0 +1 @@ +../../../common/man \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/misc-progs b/config/rootfiles/oldcore/66/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/mpfr b/config/rootfiles/oldcore/66/filelists/mpfr new file mode 120000 index 0000000..c8468bf --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/ncurses b/config/rootfiles/oldcore/66/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/newt b/config/rootfiles/oldcore/66/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/openldap b/config/rootfiles/oldcore/66/filelists/openldap new file mode 120000 index 0000000..80c324f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/openssh b/config/rootfiles/oldcore/66/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/openssl b/config/rootfiles/oldcore/66/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pam b/config/rootfiles/oldcore/66/filelists/pam new file mode 120000 index 0000000..660a1d8 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pango b/config/rootfiles/oldcore/66/filelists/pango new file mode 120000 index 0000000..6c37231 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pango @@ -0,0 +1 @@ +../../../common/pango \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pciutils b/config/rootfiles/oldcore/66/filelists/pciutils new file mode 120000 index 0000000..aeb45e7 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pciutils @@ -0,0 +1 @@ +../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pcmciautils b/config/rootfiles/oldcore/66/filelists/pcmciautils new file mode 120000 index 0000000..7cbf821 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pcmciautils @@ -0,0 +1 @@ +../../../common/pcmciautils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pcre b/config/rootfiles/oldcore/66/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pcre-compat b/config/rootfiles/oldcore/66/filelists/pcre-compat new file mode 120000 index 0000000..eff8a7d --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pcre-compat @@ -0,0 +1 @@ +../../../common/pcre-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pixman b/config/rootfiles/oldcore/66/filelists/pixman new file mode 120000 index 0000000..fdb6346 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pixman @@ -0,0 +1 @@ +../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/popt b/config/rootfiles/oldcore/66/filelists/popt new file mode 120000 index 0000000..d71a9ab --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/pptp b/config/rootfiles/oldcore/66/filelists/pptp new file mode 120000 index 0000000..2b3dfad --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/pptp @@ -0,0 +1 @@ +../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/readline b/config/rootfiles/oldcore/66/filelists/readline new file mode 120000 index 0000000..84209f1 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/readline @@ -0,0 +1 @@ +../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/readline-compat b/config/rootfiles/oldcore/66/filelists/readline-compat new file mode 120000 index 0000000..f96bc80 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/readline-compat @@ -0,0 +1 @@ +../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/reiserfsprogs b/config/rootfiles/oldcore/66/filelists/reiserfsprogs new file mode 120000 index 0000000..008c3e8 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/rrdtool b/config/rootfiles/oldcore/66/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/screen b/config/rootfiles/oldcore/66/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/sdparm b/config/rootfiles/oldcore/66/filelists/sdparm new file mode 120000 index 0000000..86d9c24 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/sdparm @@ -0,0 +1 @@ +../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/sed b/config/rootfiles/oldcore/66/filelists/sed new file mode 120000 index 0000000..fc5f5c6 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/setup b/config/rootfiles/oldcore/66/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/shadow b/config/rootfiles/oldcore/66/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/slang b/config/rootfiles/oldcore/66/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/smartmontools b/config/rootfiles/oldcore/66/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/snort b/config/rootfiles/oldcore/66/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/squid b/config/rootfiles/oldcore/66/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/stage2-partial b/config/rootfiles/oldcore/66/filelists/stage2-partial new file mode 100644 index 0000000..df9ad8f --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/stage2-partial @@ -0,0 +1,17 @@ +etc/bashrc +etc/profile +etc/profile.d/colorls.sh +etc/profile.d/extrapaths.sh +etc/profile.d/glib2-locale.sh +etc/profile.d/i18n.sh +etc/profile.d/lang.sh +etc/profile.d/readline.sh +etc/profile.d/term256.sh +etc/profile.d/umask.sh +etc/securetty +etc/sysctl.conf +root/.bash_logout +root/.bash_profile +root/.bashrc +usr/lib/libgcc_s.so.1 +usr/lib/libstdc++.so.6 diff --git a/config/rootfiles/oldcore/66/filelists/strongswan b/config/rootfiles/oldcore/66/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/sysfsutils b/config/rootfiles/oldcore/66/filelists/sysfsutils new file mode 120000 index 0000000..8f3ee3e --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/sysfsutils @@ -0,0 +1 @@ +../../../common/sysfsutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/sysvinit b/config/rootfiles/oldcore/66/filelists/sysvinit new file mode 120000 index 0000000..f3fb330 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/sysvinit @@ -0,0 +1 @@ +../../../common/sysvinit \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/texinfo b/config/rootfiles/oldcore/66/filelists/texinfo new file mode 120000 index 0000000..fa9df02 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/texinfo @@ -0,0 +1 @@ +../../../common/texinfo \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/tzdata b/config/rootfiles/oldcore/66/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/udev b/config/rootfiles/oldcore/66/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/usbutils b/config/rootfiles/oldcore/66/filelists/usbutils new file mode 120000 index 0000000..31db5a7 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/usbutils @@ -0,0 +1 @@ +../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/vim b/config/rootfiles/oldcore/66/filelists/vim new file mode 120000 index 0000000..9861317 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/vim @@ -0,0 +1 @@ +../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/wget b/config/rootfiles/oldcore/66/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/wpa_supplicant b/config/rootfiles/oldcore/66/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/xz b/config/rootfiles/oldcore/66/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/filelists/zlib b/config/rootfiles/oldcore/66/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/oldcore/66/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/oldcore/66/meta b/config/rootfiles/oldcore/66/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/66/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/66/update.sh b/config/rootfiles/oldcore/66/update.sh new file mode 100644 index 0000000..e0a7875 --- /dev/null +++ b/config/rootfiles/oldcore/66/update.sh @@ -0,0 +1,379 @@ +#!/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) 2013 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + +# +# Remove old core updates from pakfire cache to save space... +# +core=66 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire-xen ) + BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` + if [ $BOOTSIZE -lt 28000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update because not enough space on boot." + exit 2 + fi + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update. No IPFire Kernel." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; +esac + +if [ ! "$(mount | grep " reiser4 (")" == "" ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update because there is a reiser4 fs mounted." + exit 1 +fi + +# +# +KVER="3.2.38" +MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | 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$core_$KVER.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ + /var/ipfire/backup/core-upgrade$core_$KVER-old.tar.xz +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 +add_to_backup lib/modules +add_to_backup etc/udev +add_to_backup lib/udev +add_to_backup boot +add_to_backup etc/snort +add_to_backup usr/lib/snort_* +add_to_backup usr/share/zoneinfo +add_to_backup lib/libncurses* +add_to_backup etc/dircolors +add_to_backup etc/profile.d +add_to_backup usr/share/terminfo +add_to_backup etc/sysconfig/lm_sensors +add_to_backup etc/sysconfig/rc.local +add_to_backup usr/local/bin/vpn-watch +add_to_backup usr/local/bin/updxsetperms +add_to_backup usr/libexec/ipsec + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 70000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update because not enough free space on root." + exit 2 +fi + +# Add user nobody to group squid. +usermod -a -G squid nobody + +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 /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /lib/modules +rm -rf /etc/dircolors +rm -rf /etc/profile.d +rm -rf /usr/share/terminfo +rm -rf /bin/[ + +# +# Remove old udev rules. +# +if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then + cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +fi +cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ +rm -rf /etc/udev +rm -rf /lib/udev +mkdir -p /etc/udev/rules.d +if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then + mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +fi +mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ + +case $(uname -m) in + i?86 ) + # + # Backup grub.conf + # + cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + ;; +esac +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + + +#Remove old snort, zoneinfo and ncurses-libs(wrong path). +rm -rf /etc/snort +rm -rf /usr/lib/snort_* +rm -rf /usr/share/zoneinfo +rm -rf /lib/libncurses* + +# Remove old pluto binaries. +rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack} +rm -f /usr/local/bin/vpn-watch + +# Remove update accelerator permissions script. +rm -f /usr/local/bin/updxsetperms + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# +#Reload init to close old linker/glibc +telinit u + +# Regenerate ipsec configuration files. +/srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Convert OpenVPN RW connections. +/usr/sbin/ovpn-ccd-convert + +touch /var/ipfire/ovpn/ccd.conf +touch /var/ipfire/ovpn/ccdroute +touch /var/ipfire/ovpn/ccdroute2 +chown nobody:nobody /var/ipfire/ovpn/ccd.conf +chown nobody:nobody /var/ipfire/ovpn/ccdroute +chown nobody:nobody /var/ipfire/ovpn/ccdroute2 + +# Update crontab. +sed -i /var/spool/cron/root.orig \ + -e 's@^.*fcron.weekly.*$@&nice(10),bootrun 47 2 * * 1\ttest -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly@' +fcrontab -z &>/dev/null + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +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 + +# Remove preloading libsafe. +rm -f /etc/ld.so.preload + +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf + else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf + fi + 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,115200n8 panic=10 |g" /boot/grub/grub.conf + fi + + # + # ReInstall grub + # + echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map + grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} + ;; +esac +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors + +# +# Remove powerbutton loop from rc local. +# +sed -i "/# power button shutdown/,+3d" /etc/sysconfig/rc.local + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-fontconfig +rm -rf /opt/pakfire/db/*/meta-glib + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 8000 -o $ROOTSPACE -lt 70000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 3.2.38" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 27" >> /opt/pakfire/db/installed/meta-linux-pae + fi +fi + +# Force reinstall xen kernel if it was installed +if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then + echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen + echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-xen + # Add xvc0 to /etc/securetty + echo "xvc0" >> /etc/securetty +fi + +# +# 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 ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +/etc/init.d/fireinfo start +sendprofile + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index 7585380..6fa115a 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -1,5 +1,7 @@ +etc/rc.d/init.d/nfs-server sbin/mount.nfs sbin/mount.nfs4 +sbin/osd_login sbin/umount.nfs sbin/umount.nfs4 #usr/include/nfsidmap.h @@ -20,6 +22,9 @@ usr/lib/libnfsidmap/static.so usr/lib/libnfsidmap/umich_ldap.so #usr/lib/pkgconfig/libnfsidmap.pc usr/sbin/exportfs +usr/sbin/mountstats +usr/sbin/nfsdcltrack +usr/sbin/nfsiostat usr/sbin/nfsstat usr/sbin/rpc.idmapd usr/sbin/rpc.mountd @@ -37,7 +42,10 @@ usr/sbin/start-statd #usr/share/man/man8/idmapd.8 #usr/share/man/man8/mount.nfs.8 #usr/share/man/man8/mountd.8 +#usr/share/man/man8/mountstats.8 #usr/share/man/man8/nfsd.8 +#usr/share/man/man8/nfsdcltrack.8 +#usr/share/man/man8/nfsiostat.8 #usr/share/man/man8/nfsstat.8 #usr/share/man/man8/rpc.idmapd.8 #usr/share/man/man8/rpc.mountd.8 @@ -56,5 +64,4 @@ var/lib/nfs/sm #var/lib/nfs/sm.bak var/lib/nfs/state var/lib/nfs/xtab -etc/rc.d/init.d/nfs-server var/ipfire/nfs/nfs-server diff --git a/config/rootfiles/packages/sendEmail b/config/rootfiles/packages/sendEmail new file mode 100644 index 0000000..ee206e2 --- /dev/null +++ b/config/rootfiles/packages/sendEmail @@ -0,0 +1 @@ +usr/local/bin/sendEmail diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator index 4aaa389..d72677c 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -8,6 +8,11 @@ # # $Id: updxlrator,v 2.1 2009/01/10 00:00:00 marco.s Exp $ # +# ChangeLog: +# +# 2012-10-26: nightshift - move curly bracket to capture AVG download source. +# - Adding BIG HINT for new update source# +#
use strict; use HTTP::Date; @@ -75,8 +80,8 @@ while (<>) { # -----------------------------------------------------------
if ( - (($source_url =~ m@^http://%5B%5E/%5D*%5C.microsoft%5C.com/.*%5C.(exe%7Cpsf%7Cmsi%7Cmsp%7Ccab)$@...) || - ($source_url =~ m@^http://%5B%5E/%5D*%5C.windowsupdate%5C.com/.*%5C.(exe%7Cpsf%7Cmsi%7Cmsp%7Cca...)) + (($source_url =~ m@^http://%5B%5E/%5D*%5C.microsoft%5C.com/.*%5C.(exe%7Cpsf%7Cmsi%7Cmsp%7Cmsu%7C...) || + ($source_url =~ m@^http://%5B%5E/%5D*%5C.windowsupdate%5C.com/.*%5C.(exe%7Cpsf%7Cmsi%7Cmsp%7Cms...)) && ($source_url !~ m@^http://%5B%5E/%5D*%5C.microsoft%5C.com/.*(/autoupd%7Cselfupdate/).*%5C.cab@i) && ($source_url !~ m@&@) ) @@ -88,6 +93,7 @@ while (<>) { # Section: Adobe Downloads # -----------------------------------------------------------
+ if ( ($source_url =~ m@^http://(ar)?download%5C.adobe%5C.com/.*%5C.(exe%7Cmsi%7Cbin%7Cdmg%7Cidx%7Cgz...) || ($source_url =~ m@^http://swupdl%5C.adobe%5C.com/updates/.*%5C.(exe%7Cmsi%7Cbin%7Cdmg%7Cidx%7Cg...) || @@ -178,8 +184,6 @@ while (<>) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"IPFire",$mirror); }
- } - # ----------------------------------------------------------- # Section: AVG Downloads # ----------------------------------------------------------- @@ -189,6 +193,9 @@ while (<>) { # $xlrator_url = &check_cache($source_url,$hostaddr,$username,"AVG",$mirror); # }
+# ----------- ADD NEW SOURCES BEFORE THIS LINE !!! ------------------ + } + $request="$xlrator_url $hostaddr $username $method\n";
print $request; diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 6919c8c..ea19e26 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -383,62 +383,79 @@ END print "<td align='center'>$active</td>"; } } - if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` || - `cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` || - `cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) { - my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's/\/255.255.255.0//'`; + +### +# Check if there is any OpenVPN connection configured. +### + +if ( -s "${General::swroot}/ovpn/ovpnconfig") + { + print <<END; + + <tr> + <td align='center' bgcolor='$Header::colourovpn' width='25%'> + <a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br> + </td> +END + # Check if the OpenVPN server for Road Warrior Connections is running and display status information. + my %confighash=(); + + &General::readhash("${General::swroot}/ovpn/settings", %confighash); + + if (($confighash{'ENABLED'} eq "on") || + ($confighash{'ENABLED_BLUE'} eq "on") || + ($confighash{'ENABLED_ORANGE'} eq "on")) { + + my $ovpnip = $confighash{'DOVPN_SUBNET'}; print <<END; - <tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br> <td width='30%' align='center'>$ovpnip - <td width='45%' align='center'><font color=$Header::colourgreen>Online</font> - + <td width='45%' align='center'><font color=$Header::colourgreen>Online</font> END
}
-### -# Print the OpenVPN N2N connection status. -### -if ( -d "${General::swroot}/ovpn/n2nconf") { - my %confighash=(); - - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", %confighash); - foreach my $dkey (keys %confighash) { - if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) { - my $tport = $confighash{$dkey}[22]; - next if ($tport eq ''); - - my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); - $tnet->open('127.0.0.1'); - my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); - my @tustate = split(/,/, $output[1]); - - my $display; - my $display_colour = $Header::colourred; - if ( $tustate[1] eq 'CONNECTED') { - $display_colour = $Header::colourgreen; - $display = $Lang::tr{'capsopen'}; - } else { - $display = $tustate[1]; - } + # Print the OpenVPN N2N connection status. + if ( -d "${General::swroot}/ovpn/n2nconf") { + my %confighash=(); + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", %confighash); + foreach my $dkey (keys %confighash) { + if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) { + my $tport = $confighash{$dkey}[22]; + next if ($tport eq ''); + + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + $tnet->open('127.0.0.1'); + my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); + my @tustate = split(/,/, $output[1]); + + my $display; + my $display_colour = $Header::colourred; + if ( $tustate[1] eq 'CONNECTED') { + $display_colour = $Header::colourgreen; + $display = $Lang::tr{'capsopen'}; + } else { + $display = $tustate[1]; + }
- print <<END; - <tr> - <td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'> - $confighash{$dkey}[1] - </td> - <td align='center'> - $confighash{$dkey}[11] - </td> - <td align='center' bgcolor='$display_colour'> - <b> - <font color='#FFFFFF'> - $display - </font> - </b> - </td> - </tr> + print <<END; + <tr> + <td align='left' nowrap='nowrap' bgcolor='$color{'color22'}'> + $confighash{$dkey}[1] + </td> + <td align='center'> + $confighash{$dkey}[11] + </td> + <td align='center' bgcolor='$display_colour'> + <b> + <font color='#FFFFFF'> + $display + </font> + </b> + </td> + </tr> END + } } } } diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 58ebdf2..cbaecd9 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -863,7 +863,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { } if ($cgiparams{'DHCP_DOMAIN'} ne ''){ - unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) { + unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) { $errormessage = $Lang::tr{'invalid input for dhcp domain'}; goto ADV_ERROR; } @@ -4969,19 +4969,13 @@ END }
- my $disable_clientdl = "disabled='disabled'"; - if (( $cgiparams{'ENABLED'} eq 'on') || - ( $cgiparams{'ENABLED_BLUE'} eq 'on') || - ( $cgiparams{'ENABLED_ORANGE'} eq 'on')){ - $disable_clientdl = ""; - } print <<END <td align='center'>$active</td> <form method='post' name='frm${key}a'><td align='center'> - <input type='image' name='$Lang::tr{'dl client arch'}' $disable_clientdl src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> - <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' $disable_clientdl /> - <input type='hidden' name='KEY' value='$key' $disable_clientdl /> + <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> + <input type='hidden' name='KEY' value='$key' /> </td></form> END ; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index e3e633c..df77a86 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -27,6 +27,11 @@ # along with this program. If not, see http://www.gnu.org/licenses/. # # # ############################################################################### +# +# Changelog: +# 2012-10-27: nightshift - Bugfix regarding showing wrong vendor icon while Download of new Updates +# 2012-10-27: nightshift - Optimizing logic of check for vendor icons +#
use strict;
@@ -75,6 +80,7 @@ my @vendors=(); my %vendorstats=();
my $repository = "/var/updatecache/"; +my $webhome = "/srv/web/ipfire/html"; my $hintcolour = '#FFFFCC'; my $colourgray = '#808080';
@@ -549,46 +555,23 @@ END print "<img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' /> </td>\n"; }
- print "\t\t<td align='center' nowrap='nowrap'> "; - if ($vendorid =~ /^Adobe$/i) - { - print "<img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe'}' /> </td>\n"; - } elsif ($vendorid =~ /^Microsoft$/i) - { - print "<img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft'}' /> </td>\n"; - } elsif ($vendorid =~ /^Symantec$/i) - { - print "<img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec'}' /> </td>\n"; - } elsif ($vendorid =~ /^Linux$/i) - { - print "<img src='/images/updbooster/updxl-src-linux.gif' alt='Linux'}' /> </td>\n"; - } elsif ($vendorid =~ /^TrendMicro$/i) - { - print "<img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro'}' /> </td>\n"; - } elsif ($vendorid =~ /^Apple$/i) - { - print "<img src='/images/updbooster/updxl-src-apple.gif' alt='Apple'}' /> </td>\n"; - } elsif ($vendorid =~ /^Avast$/i) - { - print "<img src='/images/updbooster/updxl-src-avast.gif' alt='Avast'}' /> </td>\n"; - } else - { - if (-e "/home/httpd/html/images/updbooster/updxl-src-" . $vendorid . ".gif") - { - print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; - } else { - print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; - } - } + print "\t\t<td align='center' nowrap='nowrap'> ";
- $shortname = substr($updatefile,rindex($updatefile,"/")+1); - $shortname =~ s/(.*)_[\da-f]*(.(exe|cab|psf)$)/$1_*$2/i; + if (($vendorid ne '') && (-e "$webhome/images/updbooster/updxl-src-$vendorid.gif")) + { + print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; + } else { + print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; + }
- $filesize = $dlinfo{'REMOTESIZE'}; - 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; - $dlinfo{'VENDORID'}=ucfirst $vendorid; + $shortname = substr($updatefile,rindex($updatefile,"/")+1); + $shortname =~ s/(.*)_[\da-f]*(.(exe|cab|psf)$)/$1_*$2/i;
- print <<END + $filesize = $dlinfo{'REMOTESIZE'}; + 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; + $dlinfo{'VENDORID'} = ucfirst $vendorid; + + print <<END <td class='base' align='center'> $dlinfo{'VENDORID'} </td> <td class='base' align='left' title='cache:/$updatefile'>$shortname</td> <td class='base' align='right' nowrap='nowrap'> $filesize </td> diff --git a/html/html/images/updbooster/updxl-src-microsoft.gif b/html/html/images/updbooster/updxl-src-microsoft.gif new file mode 100644 index 0000000..14f3c42 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-microsoft.gif differ diff --git a/html/html/images/updbooster/updxl-src-windows.gif b/html/html/images/updbooster/updxl-src-windows.gif index 3b34016..14f3c42 100644 Binary files a/html/html/images/updbooster/updxl-src-windows.gif and b/html/html/images/updbooster/updxl-src-windows.gif differ diff --git a/lfs/IO-Socket-SSL b/lfs/IO-Socket-SSL new file mode 100644 index 0000000..fef8097 --- /dev/null +++ b/lfs/IO-Socket-SSL @@ -0,0 +1,62 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.78 + +THISAPP = IO-Socket-SSL-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = http://cpan.noris.de/authors/id/S/SU/SULLR/ +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 172201f3ebc400dc3733a0577ac29095 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) \ No newline at end of file diff --git a/lfs/nfs b/lfs/nfs index d7d2166..d18487b 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -24,7 +24,7 @@
include Config
-VER = 1.2.2 +VER = 1.2.7
THISAPP = nfs-utils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,11 +32,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 4 +PAK_VER = 5
DEPS = "portmap"
-LIBNFSIDMAP = 0.23 +LIBNFSIDMAP = 0.25
############################################################################### # Top-level Rules @@ -48,8 +48,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-$(DL_FILE)_MD5 = dad92f64db3266c7757f71bb53ee8f35 -libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 28f3ece648c1dc5d25e8d623d55f8bd6 +$(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716 +libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
install : $(TARGET)
@@ -93,6 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc \ --disable-gss \ --disable-tirpc \ + --disable-nfsv41 \ --without-tcp-wrappers
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/lfs/sendEmail b/lfs/sendEmail new file mode 100644 index 0000000..8611929 --- /dev/null +++ b/lfs/sendEmail @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.56 + +THISAPP = sendEmail-v$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sendEmail +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 5b7bec4373268fa6446fa59416bb99fb + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && cp -pvf sendEmail /usr/local/bin + chmod 755 /usr/local/bin/sendEmail + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index fbd377e..e427929 100755 --- a/make.sh +++ b/make.sh @@ -536,6 +536,7 @@ buildipfire() { ipfiremake Net-IPv4Addr ipfiremake Net_SSLeay ipfiremake IO-Stringy + ipfiremake IO-Socket-SSL ipfiremake Unix-Syslog ipfiremake Mail-Tools ipfiremake MIME-Tools @@ -758,6 +759,7 @@ buildipfire() { ipfiremake libdaemon ipfiremake avahi ipfiremake nginx + ipfiremake sendEmail echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index e54eced..cc6b619 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -252,6 +252,7 @@ case "$1" in # upnp chain for our upnp daemon /sbin/iptables -t nat -N UPNPFW /sbin/iptables -t nat -A PREROUTING -j UPNPFW + /sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW # This chain only contains dummy rules. /sbin/iptables -N UPNPFW
hooks/post-receive -- IPFire 2.x development tree