From a727dcf7279d8d65548c957879d813de1714344b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 21 Mar 2011 14:02:14 +0100 Subject: [PATCH 001/159] compat-wireless: update to 2.6.38-3-ns. --- config/rootfiles/core/46/filelists/compat-wireless-modules | 6 +++--- lfs/compat-wireless | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/core/46/filelists/compat-wireless-modules b/config/rootfiles/core/46/filelists/compat-wireless-modules index aa2580483..3f12c8a07 100644 --- a/config/rootfiles/core/46/filelists/compat-wireless-modules +++ b/config/rootfiles/core/46/filelists/compat-wireless-modules @@ -94,7 +94,7 @@ lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko -lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko +#lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko lib/modules/2.6.32.28-ipfire/kernel/drivers/ssb/ssb.ko lib/modules/2.6.32.28-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko @@ -208,7 +208,7 @@ lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180.ko lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187.ko lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko -lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko +#lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/ssb/ssb.ko lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko @@ -322,7 +322,7 @@ lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko -lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko +#lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/ssb/ssb.ko lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 60a76c617..22223d7d7 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -34,7 +34,7 @@ else endif endif -VER = 2.6.37-4-sn +VER = 2.6.38-3-ns THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2 -$(DL_FILE)_MD5 = be07898fa2e28a06c1b90dd424270ad2 +$(DL_FILE)_MD5 = c4c78d1d41c28f0e9c48ab8098a0a9f2 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7 install : $(TARGET) From 9f0b9436d83a7a97dbeb26060325567eb61fc627 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 12:16:53 +0200 Subject: [PATCH 002/159] kernel: Updated to 2.6.32.26. --- config/kernel/kernel.config.i586-ipfire | 1 + config/kernel/kernel.config.i586-ipfire-pae | 1 + config/kernel/kernel.config.i586-ipfire-xen | 6 +- config/rootfiles/common/MIME-Tools | 7 +- config/rootfiles/common/Mail-Tools | 33 +- config/rootfiles/{core => oldcore}/44/exclude | 0 .../{core => oldcore}/44/filelists/acl | 0 .../{core => oldcore}/44/filelists/apache2 | 0 .../{core => oldcore}/44/filelists/attr | 0 .../{core => oldcore}/44/filelists/cpio | 0 .../{core => oldcore}/44/filelists/daq | 0 .../{core => oldcore}/44/filelists/dhcpcd | 0 .../{core => oldcore}/44/filelists/dnsmasq | 0 .../{core => oldcore}/44/filelists/dracut | 0 .../{core => oldcore}/44/filelists/files | 0 .../{core => oldcore}/44/filelists/findutils | 0 .../{core => oldcore}/44/filelists/fireinfo | 0 .../{core => oldcore}/44/filelists/grub | 0 .../{core => oldcore}/44/filelists/hwdata | 0 .../{core => oldcore}/44/filelists/iw | 0 .../{core => oldcore}/44/filelists/libcap | 0 .../{core => oldcore}/44/filelists/libdnet | 0 .../{core => oldcore}/44/filelists/linux | 0 .../44/filelists/linux-firmware | 0 .../44/filelists/smartmontools | 0 .../{core => oldcore}/44/filelists/snort | 0 .../{core => oldcore}/44/filelists/squid | 0 .../{core => oldcore}/44/filelists/strongswan | 0 .../{core => oldcore}/44/filelists/tcl | 0 .../{core => oldcore}/44/filelists/udev | 0 .../44/filelists/usb_modeswitch | 0 .../44/filelists/usb_modeswitch_data | 0 .../{core => oldcore}/44/filelists/vim | 0 .../{core => oldcore}/44/filelists/wireless | 0 .../44/filelists/wpa_supplicant | 0 config/rootfiles/{core => oldcore}/44/meta | 0 .../rootfiles/{core => oldcore}/44/update.sh | 0 config/rootfiles/{core => oldcore}/45/exclude | 0 .../{core => oldcore}/45/filelists/files | 0 .../{core => oldcore}/45/filelists/fireinfo | 0 .../{core => oldcore}/45/filelists/snort | 0 .../{core => oldcore}/45/filelists/squid | 0 config/rootfiles/{core => oldcore}/45/meta | 0 .../rootfiles/{core => oldcore}/45/update.sh | 0 config/rootfiles/{core => oldcore}/46/exclude | 0 .../46/filelists/compat-wireless | 0 .../46/filelists/compat-wireless-modules | 342 ++++++++++++++++++ .../{core => oldcore}/46/filelists/crda | 0 .../{core => oldcore}/46/filelists/files | 0 .../{core => oldcore}/46/filelists/openssh | 0 .../{core => oldcore}/46/filelists/openssl | 0 .../{core => oldcore}/46/filelists/squid | 0 config/rootfiles/{core => oldcore}/46/meta | 0 .../rootfiles/{core => oldcore}/46/update.sh | 0 config/rootfiles/{core => oldcore}/47/exclude | 0 .../{core => oldcore}/47/filelists/files | 0 .../{core => oldcore}/47/filelists/fireinfo | 0 .../{core => oldcore}/47/filelists/php | 0 config/rootfiles/{core => oldcore}/47/meta | 0 .../rootfiles/{core => oldcore}/47/update.sh | 0 config/rootfiles/{core => oldcore}/48/exclude | 0 .../{core => oldcore}/48/filelists/daq | 0 .../{core => oldcore}/48/filelists/files | 0 .../{core => oldcore}/48/filelists/perl | 0 .../48/filelists/perl-modules | 0 .../{core => oldcore}/48/filelists/snort | 0 .../{core => oldcore}/48/filelists/squid | 0 config/rootfiles/{core => oldcore}/48/meta | 0 .../rootfiles/{core => oldcore}/48/update.sh | 0 lfs/linux | 16 +- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-pae/uninstall.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- src/paks/linux-xen/update.sh | 3 +- 74 files changed, 379 insertions(+), 36 deletions(-) rename config/rootfiles/{core => oldcore}/44/exclude (100%) rename config/rootfiles/{core => oldcore}/44/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/44/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/44/filelists/attr (100%) rename config/rootfiles/{core => oldcore}/44/filelists/cpio (100%) rename config/rootfiles/{core => oldcore}/44/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/44/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/44/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/44/filelists/dracut (100%) rename config/rootfiles/{core => oldcore}/44/filelists/files (100%) rename config/rootfiles/{core => oldcore}/44/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/44/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/44/filelists/grub (100%) rename config/rootfiles/{core => oldcore}/44/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/44/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/44/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/44/filelists/libdnet (100%) rename config/rootfiles/{core => oldcore}/44/filelists/linux (100%) rename config/rootfiles/{core => oldcore}/44/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/44/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/44/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/44/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/44/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/44/filelists/tcl (100%) rename config/rootfiles/{core => oldcore}/44/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/44/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/44/filelists/usb_modeswitch_data (100%) rename config/rootfiles/{core => oldcore}/44/filelists/vim (100%) rename config/rootfiles/{core => oldcore}/44/filelists/wireless (100%) rename config/rootfiles/{core => oldcore}/44/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/44/meta (100%) rename config/rootfiles/{core => oldcore}/44/update.sh (100%) rename config/rootfiles/{core => oldcore}/45/exclude (100%) rename config/rootfiles/{core => oldcore}/45/filelists/files (100%) rename config/rootfiles/{core => oldcore}/45/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/45/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/45/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/45/meta (100%) rename config/rootfiles/{core => oldcore}/45/update.sh (100%) rename config/rootfiles/{core => oldcore}/46/exclude (100%) rename config/rootfiles/{core => oldcore}/46/filelists/compat-wireless (100%) create mode 100644 config/rootfiles/oldcore/46/filelists/compat-wireless-modules rename config/rootfiles/{core => oldcore}/46/filelists/crda (100%) rename config/rootfiles/{core => oldcore}/46/filelists/files (100%) rename config/rootfiles/{core => oldcore}/46/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/46/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/46/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/46/meta (100%) rename config/rootfiles/{core => oldcore}/46/update.sh (100%) rename config/rootfiles/{core => oldcore}/47/exclude (100%) rename config/rootfiles/{core => oldcore}/47/filelists/files (100%) rename config/rootfiles/{core => oldcore}/47/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/47/filelists/php (100%) rename config/rootfiles/{core => oldcore}/47/meta (100%) rename config/rootfiles/{core => oldcore}/47/update.sh (100%) rename config/rootfiles/{core => oldcore}/48/exclude (100%) rename config/rootfiles/{core => oldcore}/48/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/48/filelists/files (100%) rename config/rootfiles/{core => oldcore}/48/filelists/perl (100%) rename config/rootfiles/{core => oldcore}/48/filelists/perl-modules (100%) rename config/rootfiles/{core => oldcore}/48/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/48/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/48/meta (100%) rename config/rootfiles/{core => oldcore}/48/update.sh (100%) diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 0a947675f..3fd80c886 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -277,6 +277,7 @@ CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y CONFIG_NR_CPUS=8 +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 94810b654..6d82de48b 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -281,6 +281,7 @@ CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y CONFIG_NR_CPUS=8 +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 1a6ab28a6..e5122a97d 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.27-ipfire-xen -# Thu Dec 30 14:49:34 2010 +# Linux kernel version: 2.6.32.33 +# Mon Mar 21 14:20:43 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -89,7 +89,6 @@ CONFIG_RCU_FANOUT=32 # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -243,6 +242,7 @@ CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_IOMMU_API is not set CONFIG_NR_CPUS=8 +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/config/rootfiles/common/MIME-Tools b/config/rootfiles/common/MIME-Tools index 6b55d7b7c..76e5a2c3a 100644 --- a/config/rootfiles/common/MIME-Tools +++ b/config/rootfiles/common/MIME-Tools @@ -1,6 +1,6 @@ #usr/lib/perl5/site_perl/5.12.3/MIME usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm -usr/lib/perl5/site_perl/5.12.3/MIME/Decoder +#usr/lib/perl5/site_perl/5.12.3/MIME/Decoder usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/Base64.pm usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/BinHex.pm @@ -24,8 +24,9 @@ usr/lib/perl5/site_perl/5.12.3/MIME/Parser/Results.pm usr/lib/perl5/site_perl/5.12.3/MIME/Tools.pm usr/lib/perl5/site_perl/5.12.3/MIME/WordDecoder.pm usr/lib/perl5/site_perl/5.12.3/MIME/Words.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools/.packlist +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools/.packlist #usr/share/man/man3/MIME::Body.3 #usr/share/man/man3/MIME::Decoder.3 #usr/share/man/man3/MIME::Decoder::Base64.3 diff --git a/config/rootfiles/common/Mail-Tools b/config/rootfiles/common/Mail-Tools index a9ee82899..24920e9a1 100644 --- a/config/rootfiles/common/Mail-Tools +++ b/config/rootfiles/common/Mail-Tools @@ -1,45 +1,44 @@ #usr/lib/perl5/site_perl/5.12.3/Mail usr/lib/perl5/site_perl/5.12.3/Mail/Address.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Address.pod usr/lib/perl5/site_perl/5.12.3/Mail/Cap.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Cap.pod #usr/lib/perl5/site_perl/5.12.3/Mail/Field usr/lib/perl5/site_perl/5.12.3/Mail/Field.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field.pod usr/lib/perl5/site_perl/5.12.3/Mail/Field/AddrList.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field/AddrList.pod usr/lib/perl5/site_perl/5.12.3/Mail/Field/Date.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field/Date.pod +usr/lib/perl5/site_perl/5.12.3/Mail/Field/Generic.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field/Generic.pod usr/lib/perl5/site_perl/5.12.3/Mail/Filter.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Filter.pod usr/lib/perl5/site_perl/5.12.3/Mail/Header.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Header.pod usr/lib/perl5/site_perl/5.12.3/Mail/Internet.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Internet.pod #usr/lib/perl5/site_perl/5.12.3/Mail/Mailer usr/lib/perl5/site_perl/5.12.3/Mail/Mailer.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Mailer.pod usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/qmail.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/rfc822.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/sendmail.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtp.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtps.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Send.pod usr/lib/perl5/site_perl/5.12.3/Mail/Util.pm -#usr/lib/perl5/site_perl/5.12.3/auto/Mail -#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al -#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al +#usr/lib/perl5/site_perl/5.12.3/Mail/Util.pod #usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail #usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail/.packlist #usr/share/man/man3/Mail::Address.3 #usr/share/man/man3/Mail::Cap.3 #usr/share/man/man3/Mail::Field.3 #usr/share/man/man3/Mail::Field::AddrList.3 +#usr/share/man/man3/Mail::Field::Date.3 +#usr/share/man/man3/Mail::Field::Generic.3 #usr/share/man/man3/Mail::Filter.3 #usr/share/man/man3/Mail::Header.3 #usr/share/man/man3/Mail::Internet.3 diff --git a/config/rootfiles/core/44/exclude b/config/rootfiles/oldcore/44/exclude similarity index 100% rename from config/rootfiles/core/44/exclude rename to config/rootfiles/oldcore/44/exclude diff --git a/config/rootfiles/core/44/filelists/acl b/config/rootfiles/oldcore/44/filelists/acl similarity index 100% rename from config/rootfiles/core/44/filelists/acl rename to config/rootfiles/oldcore/44/filelists/acl diff --git a/config/rootfiles/core/44/filelists/apache2 b/config/rootfiles/oldcore/44/filelists/apache2 similarity index 100% rename from config/rootfiles/core/44/filelists/apache2 rename to config/rootfiles/oldcore/44/filelists/apache2 diff --git a/config/rootfiles/core/44/filelists/attr b/config/rootfiles/oldcore/44/filelists/attr similarity index 100% rename from config/rootfiles/core/44/filelists/attr rename to config/rootfiles/oldcore/44/filelists/attr diff --git a/config/rootfiles/core/44/filelists/cpio b/config/rootfiles/oldcore/44/filelists/cpio similarity index 100% rename from config/rootfiles/core/44/filelists/cpio rename to config/rootfiles/oldcore/44/filelists/cpio diff --git a/config/rootfiles/core/44/filelists/daq b/config/rootfiles/oldcore/44/filelists/daq similarity index 100% rename from config/rootfiles/core/44/filelists/daq rename to config/rootfiles/oldcore/44/filelists/daq diff --git a/config/rootfiles/core/44/filelists/dhcpcd b/config/rootfiles/oldcore/44/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/44/filelists/dhcpcd rename to config/rootfiles/oldcore/44/filelists/dhcpcd diff --git a/config/rootfiles/core/44/filelists/dnsmasq b/config/rootfiles/oldcore/44/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/44/filelists/dnsmasq rename to config/rootfiles/oldcore/44/filelists/dnsmasq diff --git a/config/rootfiles/core/44/filelists/dracut b/config/rootfiles/oldcore/44/filelists/dracut similarity index 100% rename from config/rootfiles/core/44/filelists/dracut rename to config/rootfiles/oldcore/44/filelists/dracut diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/oldcore/44/filelists/files similarity index 100% rename from config/rootfiles/core/44/filelists/files rename to config/rootfiles/oldcore/44/filelists/files diff --git a/config/rootfiles/core/44/filelists/findutils b/config/rootfiles/oldcore/44/filelists/findutils similarity index 100% rename from config/rootfiles/core/44/filelists/findutils rename to config/rootfiles/oldcore/44/filelists/findutils diff --git a/config/rootfiles/core/44/filelists/fireinfo b/config/rootfiles/oldcore/44/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/44/filelists/fireinfo rename to config/rootfiles/oldcore/44/filelists/fireinfo diff --git a/config/rootfiles/core/44/filelists/grub b/config/rootfiles/oldcore/44/filelists/grub similarity index 100% rename from config/rootfiles/core/44/filelists/grub rename to config/rootfiles/oldcore/44/filelists/grub diff --git a/config/rootfiles/core/44/filelists/hwdata b/config/rootfiles/oldcore/44/filelists/hwdata similarity index 100% rename from config/rootfiles/core/44/filelists/hwdata rename to config/rootfiles/oldcore/44/filelists/hwdata diff --git a/config/rootfiles/core/44/filelists/iw b/config/rootfiles/oldcore/44/filelists/iw similarity index 100% rename from config/rootfiles/core/44/filelists/iw rename to config/rootfiles/oldcore/44/filelists/iw diff --git a/config/rootfiles/core/44/filelists/libcap b/config/rootfiles/oldcore/44/filelists/libcap similarity index 100% rename from config/rootfiles/core/44/filelists/libcap rename to config/rootfiles/oldcore/44/filelists/libcap diff --git a/config/rootfiles/core/44/filelists/libdnet b/config/rootfiles/oldcore/44/filelists/libdnet similarity index 100% rename from config/rootfiles/core/44/filelists/libdnet rename to config/rootfiles/oldcore/44/filelists/libdnet diff --git a/config/rootfiles/core/44/filelists/linux b/config/rootfiles/oldcore/44/filelists/linux similarity index 100% rename from config/rootfiles/core/44/filelists/linux rename to config/rootfiles/oldcore/44/filelists/linux diff --git a/config/rootfiles/core/44/filelists/linux-firmware b/config/rootfiles/oldcore/44/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/44/filelists/linux-firmware rename to config/rootfiles/oldcore/44/filelists/linux-firmware diff --git a/config/rootfiles/core/44/filelists/smartmontools b/config/rootfiles/oldcore/44/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/44/filelists/smartmontools rename to config/rootfiles/oldcore/44/filelists/smartmontools diff --git a/config/rootfiles/core/44/filelists/snort b/config/rootfiles/oldcore/44/filelists/snort similarity index 100% rename from config/rootfiles/core/44/filelists/snort rename to config/rootfiles/oldcore/44/filelists/snort diff --git a/config/rootfiles/core/44/filelists/squid b/config/rootfiles/oldcore/44/filelists/squid similarity index 100% rename from config/rootfiles/core/44/filelists/squid rename to config/rootfiles/oldcore/44/filelists/squid diff --git a/config/rootfiles/core/44/filelists/strongswan b/config/rootfiles/oldcore/44/filelists/strongswan similarity index 100% rename from config/rootfiles/core/44/filelists/strongswan rename to config/rootfiles/oldcore/44/filelists/strongswan diff --git a/config/rootfiles/core/44/filelists/tcl b/config/rootfiles/oldcore/44/filelists/tcl similarity index 100% rename from config/rootfiles/core/44/filelists/tcl rename to config/rootfiles/oldcore/44/filelists/tcl diff --git a/config/rootfiles/core/44/filelists/udev b/config/rootfiles/oldcore/44/filelists/udev similarity index 100% rename from config/rootfiles/core/44/filelists/udev rename to config/rootfiles/oldcore/44/filelists/udev diff --git a/config/rootfiles/core/44/filelists/usb_modeswitch b/config/rootfiles/oldcore/44/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/44/filelists/usb_modeswitch rename to config/rootfiles/oldcore/44/filelists/usb_modeswitch diff --git a/config/rootfiles/core/44/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/44/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/44/filelists/usb_modeswitch_data rename to config/rootfiles/oldcore/44/filelists/usb_modeswitch_data diff --git a/config/rootfiles/core/44/filelists/vim b/config/rootfiles/oldcore/44/filelists/vim similarity index 100% rename from config/rootfiles/core/44/filelists/vim rename to config/rootfiles/oldcore/44/filelists/vim diff --git a/config/rootfiles/core/44/filelists/wireless b/config/rootfiles/oldcore/44/filelists/wireless similarity index 100% rename from config/rootfiles/core/44/filelists/wireless rename to config/rootfiles/oldcore/44/filelists/wireless diff --git a/config/rootfiles/core/44/filelists/wpa_supplicant b/config/rootfiles/oldcore/44/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/44/filelists/wpa_supplicant rename to config/rootfiles/oldcore/44/filelists/wpa_supplicant diff --git a/config/rootfiles/core/44/meta b/config/rootfiles/oldcore/44/meta similarity index 100% rename from config/rootfiles/core/44/meta rename to config/rootfiles/oldcore/44/meta diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/oldcore/44/update.sh similarity index 100% rename from config/rootfiles/core/44/update.sh rename to config/rootfiles/oldcore/44/update.sh diff --git a/config/rootfiles/core/45/exclude b/config/rootfiles/oldcore/45/exclude similarity index 100% rename from config/rootfiles/core/45/exclude rename to config/rootfiles/oldcore/45/exclude diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/oldcore/45/filelists/files similarity index 100% rename from config/rootfiles/core/45/filelists/files rename to config/rootfiles/oldcore/45/filelists/files diff --git a/config/rootfiles/core/45/filelists/fireinfo b/config/rootfiles/oldcore/45/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/45/filelists/fireinfo rename to config/rootfiles/oldcore/45/filelists/fireinfo diff --git a/config/rootfiles/core/45/filelists/snort b/config/rootfiles/oldcore/45/filelists/snort similarity index 100% rename from config/rootfiles/core/45/filelists/snort rename to config/rootfiles/oldcore/45/filelists/snort diff --git a/config/rootfiles/core/45/filelists/squid b/config/rootfiles/oldcore/45/filelists/squid similarity index 100% rename from config/rootfiles/core/45/filelists/squid rename to config/rootfiles/oldcore/45/filelists/squid diff --git a/config/rootfiles/core/45/meta b/config/rootfiles/oldcore/45/meta similarity index 100% rename from config/rootfiles/core/45/meta rename to config/rootfiles/oldcore/45/meta diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/oldcore/45/update.sh similarity index 100% rename from config/rootfiles/core/45/update.sh rename to config/rootfiles/oldcore/45/update.sh diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/oldcore/46/exclude similarity index 100% rename from config/rootfiles/core/46/exclude rename to config/rootfiles/oldcore/46/exclude diff --git a/config/rootfiles/core/46/filelists/compat-wireless b/config/rootfiles/oldcore/46/filelists/compat-wireless similarity index 100% rename from config/rootfiles/core/46/filelists/compat-wireless rename to config/rootfiles/oldcore/46/filelists/compat-wireless diff --git a/config/rootfiles/oldcore/46/filelists/compat-wireless-modules b/config/rootfiles/oldcore/46/filelists/compat-wireless-modules new file mode 100644 index 000000000..3f12c8a07 --- /dev/null +++ b/config/rootfiles/oldcore/46/filelists/compat-wireless-modules @@ -0,0 +1,342 @@ +lib/modules/2.6.32.28-ipfire/kernel/compat/compat.ko +lib/modules/2.6.32.28-ipfire/kernel/compat/compat_firmware_class.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/atl1c/atl1c.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/atl1e/atl1e.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/atlx/atl1.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/atlx/atl2.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/b44.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/carl9170 +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko +#lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko +lib/modules/2.6.32.28-ipfire/kernel/drivers/staging/brcm80211/brcm80211.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/l2cap.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.28-ipfire/kernel/net/bluetooth/sco.ko +lib/modules/2.6.32.28-ipfire/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.28-ipfire/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.28-ipfire/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.28-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.28-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.28-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/compat/compat.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/compat/compat_firmware_class.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/atl1c/atl1c.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/atl1e/atl1e.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/atlx/atl1.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/atlx/atl2.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/b44.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170 +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko +#lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/staging/brcm80211/brcm80211.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/l2cap.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/bluetooth/sco.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.28-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/compat/compat.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/compat/compat_firmware_class.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/atlx/atl1.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/atlx/atl2.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/b44.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170 +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko +#lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/staging/brcm80211/brcm80211.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/l2cap.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/bluetooth/sco.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.28-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko diff --git a/config/rootfiles/core/46/filelists/crda b/config/rootfiles/oldcore/46/filelists/crda similarity index 100% rename from config/rootfiles/core/46/filelists/crda rename to config/rootfiles/oldcore/46/filelists/crda diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/oldcore/46/filelists/files similarity index 100% rename from config/rootfiles/core/46/filelists/files rename to config/rootfiles/oldcore/46/filelists/files diff --git a/config/rootfiles/core/46/filelists/openssh b/config/rootfiles/oldcore/46/filelists/openssh similarity index 100% rename from config/rootfiles/core/46/filelists/openssh rename to config/rootfiles/oldcore/46/filelists/openssh diff --git a/config/rootfiles/core/46/filelists/openssl b/config/rootfiles/oldcore/46/filelists/openssl similarity index 100% rename from config/rootfiles/core/46/filelists/openssl rename to config/rootfiles/oldcore/46/filelists/openssl diff --git a/config/rootfiles/core/46/filelists/squid b/config/rootfiles/oldcore/46/filelists/squid similarity index 100% rename from config/rootfiles/core/46/filelists/squid rename to config/rootfiles/oldcore/46/filelists/squid diff --git a/config/rootfiles/core/46/meta b/config/rootfiles/oldcore/46/meta similarity index 100% rename from config/rootfiles/core/46/meta rename to config/rootfiles/oldcore/46/meta diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/oldcore/46/update.sh similarity index 100% rename from config/rootfiles/core/46/update.sh rename to config/rootfiles/oldcore/46/update.sh diff --git a/config/rootfiles/core/47/exclude b/config/rootfiles/oldcore/47/exclude similarity index 100% rename from config/rootfiles/core/47/exclude rename to config/rootfiles/oldcore/47/exclude diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/oldcore/47/filelists/files similarity index 100% rename from config/rootfiles/core/47/filelists/files rename to config/rootfiles/oldcore/47/filelists/files diff --git a/config/rootfiles/core/47/filelists/fireinfo b/config/rootfiles/oldcore/47/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/47/filelists/fireinfo rename to config/rootfiles/oldcore/47/filelists/fireinfo diff --git a/config/rootfiles/core/47/filelists/php b/config/rootfiles/oldcore/47/filelists/php similarity index 100% rename from config/rootfiles/core/47/filelists/php rename to config/rootfiles/oldcore/47/filelists/php diff --git a/config/rootfiles/core/47/meta b/config/rootfiles/oldcore/47/meta similarity index 100% rename from config/rootfiles/core/47/meta rename to config/rootfiles/oldcore/47/meta diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/oldcore/47/update.sh similarity index 100% rename from config/rootfiles/core/47/update.sh rename to config/rootfiles/oldcore/47/update.sh diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/oldcore/48/exclude similarity index 100% rename from config/rootfiles/core/48/exclude rename to config/rootfiles/oldcore/48/exclude diff --git a/config/rootfiles/core/48/filelists/daq b/config/rootfiles/oldcore/48/filelists/daq similarity index 100% rename from config/rootfiles/core/48/filelists/daq rename to config/rootfiles/oldcore/48/filelists/daq diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/oldcore/48/filelists/files similarity index 100% rename from config/rootfiles/core/48/filelists/files rename to config/rootfiles/oldcore/48/filelists/files diff --git a/config/rootfiles/core/48/filelists/perl b/config/rootfiles/oldcore/48/filelists/perl similarity index 100% rename from config/rootfiles/core/48/filelists/perl rename to config/rootfiles/oldcore/48/filelists/perl diff --git a/config/rootfiles/core/48/filelists/perl-modules b/config/rootfiles/oldcore/48/filelists/perl-modules similarity index 100% rename from config/rootfiles/core/48/filelists/perl-modules rename to config/rootfiles/oldcore/48/filelists/perl-modules diff --git a/config/rootfiles/core/48/filelists/snort b/config/rootfiles/oldcore/48/filelists/snort similarity index 100% rename from config/rootfiles/core/48/filelists/snort rename to config/rootfiles/oldcore/48/filelists/snort diff --git a/config/rootfiles/core/48/filelists/squid b/config/rootfiles/oldcore/48/filelists/squid similarity index 100% rename from config/rootfiles/core/48/filelists/squid rename to config/rootfiles/oldcore/48/filelists/squid diff --git a/config/rootfiles/core/48/meta b/config/rootfiles/oldcore/48/meta similarity index 100% rename from config/rootfiles/core/48/meta rename to config/rootfiles/oldcore/48/meta diff --git a/config/rootfiles/core/48/update.sh b/config/rootfiles/oldcore/48/update.sh similarity index 100% rename from config/rootfiles/core/48/update.sh rename to config/rootfiles/oldcore/48/update.sh diff --git a/lfs/linux b/lfs/linux index 26c7b837b..c4eea8c33 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .28 -VER = 2.6.32.28 +PATCHLEVEL = .36 +VER = 2.6.32.36 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -60,19 +60,19 @@ objects =$(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ - xen-patches-2.6.32-2d.tar.bz2 + xen-patches-2.6.32-2e.tar.bz2 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 -xen-patches-2.6.32-2d.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2 +xen-patches-2.6.32-2e.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2e.tar.bz2 -$(DL_FILE)_MD5 = 9ee6d4023f34eb055ec32f201b5f9206 +$(DL_FILE)_MD5 = 71cd2ab6060fb929fc0d81f4d13b88a8 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 -xen-patches-2.6.32-2d.tar.bz2_MD5 = d1690d2b8b0c9124897981aea505f8f7 +xen-patches-2.6.32-2e.tar.bz2_MD5 = ec9f2a4a321cdfb887c03592bc6fad94 install : $(TARGET) @@ -110,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(XEN)" "1" # Apply gentoo Xen patches mkdir -p $(DIR_SRC)/xen-patches - cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2d.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2e.tar.bz2 for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 445af204f..bb9d0bc3f 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.28 +KVER=2.6.32.36 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh index 9a4530046..959fdb1a7 100644 --- a/src/paks/linux-pae/uninstall.sh +++ b/src/paks/linux-pae/uninstall.sh @@ -23,4 +23,4 @@ # . /opt/pakfire/lib/functions.sh remove_files -mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf +#mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 2015b5d17..07c11e3c9 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.28 +KVER=2.6.32.36 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/update.sh b/src/paks/linux-xen/update.sh index abbaf47c3..89c40d0d7 100644 --- a/src/paks/linux-xen/update.sh +++ b/src/paks/linux-xen/update.sh @@ -22,6 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -#Don't remove old xen kernel at update -#./uninstall.sh +./uninstall.sh ./install.sh From 7f8e1a3dac33e70f088fa2691cc02fa8c9d154f1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 18 Apr 2011 20:44:50 +0200 Subject: [PATCH 003/159] extrahd: add mmcblk card reader support. --- src/scripts/scanhd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scripts/scanhd b/src/scripts/scanhd index 9d47e3d63..7de68fbf4 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -6,6 +6,12 @@ case "$1" in if [ -e /dev/md ]; then echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan fi + if [ -e /dev/mmcblk0 ]; then + echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan + fi + if [ -e /dev/mmcblk1 ]; then + echo 'mmcblk1;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan + fi ;; partitions) cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \ From 09e923afefd4cdf1279bb6d62c3a3c46fd9cda0e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 18 Apr 2011 20:46:50 +0200 Subject: [PATCH 004/159] kernel: update to 2.7.32.38. --- config/rootfiles/core/48/filelists/perl-GD | 1 - lfs/linux | 6 +++--- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) delete mode 120000 config/rootfiles/core/48/filelists/perl-GD diff --git a/config/rootfiles/core/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD deleted file mode 120000 index 962d937da..000000000 --- a/config/rootfiles/core/48/filelists/perl-GD +++ /dev/null @@ -1 +0,0 @@ -../../../common/perl-GD \ No newline at end of file diff --git a/lfs/linux b/lfs/linux index c4eea8c33..9273c6ad8 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .36 -VER = 2.6.32.36 +PATCHLEVEL = .38 +VER = 2.6.32.38 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2e.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2e.tar.bz2 -$(DL_FILE)_MD5 = 71cd2ab6060fb929fc0d81f4d13b88a8 +$(DL_FILE)_MD5 = 7aee33b26864e31d5d0859d0ed10a88d netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index bb9d0bc3f..cc46e5c69 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.36 +KVER=2.6.32.38 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 07c11e3c9..70bf6f584 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.36 +KVER=2.6.32.38 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then From b635757a46fbf3ce9931e1744484ce678b17e20f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 28 Apr 2011 18:37:05 +0200 Subject: [PATCH 005/159] Updated intel network modules. e1000: 8.0.30 e1000e: 1.3.10a igb: 3.0.19 --- lfs/e1000 | 6 +++--- lfs/e1000e | 6 +++--- lfs/igb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lfs/e1000 b/lfs/e1000 index 1d61e5bb2..66e4fdd6e 100644 --- a/lfs/e1000 +++ b/lfs/e1000 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,7 +34,7 @@ else endif endif -VER = 8.0.19 +VER = 8.0.30 THISAPP = e1000-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dc66dcbfd7c2e48af8cfc86f4f174fce +$(DL_FILE)_MD5 = d85a64fdde2987b27ac6fbab5be605a0 install : $(TARGET) diff --git a/lfs/e1000e b/lfs/e1000e index cce536735..ba465952b 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,7 +34,7 @@ else endif endif -VER = 1.1.19 +VER = 1.3.10a THISAPP = e1000e-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 94e86507f139226c1add173dafdbbd52 +$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5 install : $(TARGET) diff --git a/lfs/igb b/lfs/igb index 830564795..678c70367 100644 --- a/lfs/igb +++ b/lfs/igb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,7 +34,7 @@ else endif endif -VER = 2.3.4 +VER = 3.0.19 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b0ea2a70198746b69392ef935b61454a +$(DL_FILE)_MD5 = 8fdc04600bea4a4188672a1a8d0eb73b install : $(TARGET) From dfca89d77de16bbad9f0a008fefd8dc6d29c3909 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 28 Apr 2011 18:41:49 +0200 Subject: [PATCH 006/159] alsa: updated to 1.0.24.x --- config/rootfiles/packages/alsa | 82 +++++++++++++++++++--------------- lfs/alsa | 20 ++++----- 2 files changed, 56 insertions(+), 46 deletions(-) diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index d87664d7f..c9db15008 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -1,3 +1,4 @@ +etc/rc.d/init.d/alsa lib/firmware/aica_firmware.bin #lib/firmware/asihpi lib/firmware/asihpi/dsp2400.bin @@ -45,22 +46,25 @@ lib/firmware/emagic/emi26-bitstream.bin lib/firmware/emagic/emi26-firmware.bin lib/firmware/emagic/emi26-loader.bin lib/firmware/emagic/emi62-bitstream.bin +lib/firmware/emagic/emi62-firmware.bin lib/firmware/emagic/emi62-firmware-midi.bin lib/firmware/emagic/emi62-firmware-spdif.bin -lib/firmware/emagic/emi62-firmware.bin lib/firmware/emagic/emi62-loader.bin lib/firmware/emagic/license.txt #lib/firmware/emu lib/firmware/emu/audio_dock.fw lib/firmware/emu/emu0404.fw -lib/firmware/emu/emu1010_notebook.fw lib/firmware/emu/emu1010b.fw +lib/firmware/emu/emu1010_notebook.fw lib/firmware/emu/hana.fw lib/firmware/emu/micro_dock.fw +lib/firmware/ess/maestro3_assp_kernel.fw +lib/firmware/ess/maestro3_assp_minisrc.fw +lib/firmware/korg/k1212.dsp #lib/firmware/mixart +lib/firmware/mixart/miXart8AES.xlx lib/firmware/mixart/miXart8.elf lib/firmware/mixart/miXart8.xlx -lib/firmware/mixart/miXart8AES.xlx lib/firmware/multiface_firmware.bin lib/firmware/multiface_firmware_rev11.bin #lib/firmware/pcxhr @@ -86,6 +90,12 @@ lib/firmware/pcxhr/xlxc882e.dat lib/firmware/pcxhr/xlxc882hr.dat lib/firmware/pcxhr/xlxc924.dat lib/firmware/pcxhr/xlxint.dat +lib/firmware/rpm_firmware.bin +lib/firmware/sb16/alaw_main.csp +lib/firmware/sb16/ima_adpcm_capture.csp +lib/firmware/sb16/ima_adpcm_init.csp +lib/firmware/sb16/ima_adpcm_playback.csp +lib/firmware/sb16/mulaw_main.csp #lib/firmware/turtlebeach lib/firmware/turtlebeach/msndinit.bin lib/firmware/turtlebeach/msndperm.bin @@ -105,9 +115,15 @@ lib/firmware/vx/x1_1_vp4.xlx lib/firmware/vx/x1_1_vx2.xlx lib/firmware/vx/x1_1_vxp.xlx lib/firmware/vx/x1_2_v22.xlx +lib/firmware/yamaha/ds1_ctrl.fw +lib/firmware/yamaha/ds1_dsp.fw +lib/firmware/yamaha/ds1e_ctrl.fw lib/firmware/yamaha/yss225_registers.bin +lib/udev/rules.d/90-alsa-restore.rules usr/bin/aconnect +usr/bin/alsaloop usr/bin/alsamixer +usr/bin/alsaucm usr/bin/amidi usr/bin/amixer usr/bin/aplay @@ -124,36 +140,38 @@ usr/bin/speaker-test #usr/include/alsa/asoundef.h #usr/include/alsa/asoundlib.h #usr/include/alsa/conf.h -#usr/include/alsa/control.h #usr/include/alsa/control_external.h +#usr/include/alsa/control.h #usr/include/alsa/error.h #usr/include/alsa/global.h #usr/include/alsa/hwdep.h #usr/include/alsa/iatomic.h #usr/include/alsa/input.h -#usr/include/alsa/mixer.h #usr/include/alsa/mixer_abst.h +#usr/include/alsa/mixer.h #usr/include/alsa/output.h -#usr/include/alsa/pcm.h #usr/include/alsa/pcm_external.h #usr/include/alsa/pcm_extplug.h +#usr/include/alsa/pcm.h #usr/include/alsa/pcm_ioplug.h #usr/include/alsa/pcm_old.h #usr/include/alsa/pcm_plugin.h #usr/include/alsa/pcm_rate.h #usr/include/alsa/rawmidi.h -#usr/include/alsa/seq.h #usr/include/alsa/seq_event.h -#usr/include/alsa/seq_midi_event.h +#usr/include/alsa/seq.h #usr/include/alsa/seqmid.h +#usr/include/alsa/seq_midi_event.h #usr/include/alsa/sound #usr/include/alsa/sound/asound_fm.h #usr/include/alsa/sound/emu10k1.h #usr/include/alsa/sound/hdsp.h +usr/include/alsa/sound/hdspm.h #usr/include/alsa/sound/sb16_csp.h #usr/include/alsa/sound/sscape_ioctl.h #usr/include/alsa/sound/type_compat.h #usr/include/alsa/timer.h +#usr/include/alsa/use-case.h #usr/include/alsa/version.h #usr/include/sys/asoundlib.h #usr/lib/alsa-lib @@ -183,11 +201,12 @@ usr/local/share/alsa #usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin #usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin #usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin +usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/mixartloader -#usr/local/share/alsa/firmware/mixartloader/miXart.conf +#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx #usr/local/share/alsa/firmware/mixartloader/miXart8.elf #usr/local/share/alsa/firmware/mixartloader/miXart8.xlx -#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx +#usr/local/share/alsa/firmware/mixartloader/miXart.conf #usr/local/share/alsa/firmware/pcxhrloader #usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56 #usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56 @@ -202,13 +221,13 @@ usr/local/share/alsa #usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56 #usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56 #usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56 -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf #usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf #usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf #usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf #usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf #usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf #usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf +#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf #usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat #usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat #usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat @@ -221,17 +240,17 @@ usr/local/share/alsa #usr/local/share/alsa/firmware/usx2yloader #usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx #usr/local/share/alsa/firmware/usx2yloader/us122.conf +#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx #usr/local/share/alsa/firmware/usx2yloader/us122.prepad #usr/local/share/alsa/firmware/usx2yloader/us122.rbt -#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx #usr/local/share/alsa/firmware/usx2yloader/us224.conf +#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx #usr/local/share/alsa/firmware/usx2yloader/us224.prepad #usr/local/share/alsa/firmware/usx2yloader/us224.rbt -#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx #usr/local/share/alsa/firmware/usx2yloader/us428.conf +#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx #usr/local/share/alsa/firmware/usx2yloader/us428.prepad #usr/local/share/alsa/firmware/usx2yloader/us428.rbt -#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx #usr/local/share/alsa/firmware/vxloader #usr/local/share/alsa/firmware/vxloader/bd56002.boot #usr/local/share/alsa/firmware/vxloader/bd563s3.boot @@ -257,19 +276,21 @@ usr/share/alsa #usr/share/alsa/alsa.conf #usr/share/alsa/cards #usr/share/alsa/cards/AACI.conf +#usr/share/alsa/cards/aliases.alisp +#usr/share/alsa/cards/aliases.conf +#usr/share/alsa/cards/ATIIXP.conf #usr/share/alsa/cards/ATIIXP-MODEM.conf #usr/share/alsa/cards/ATIIXP-SPDMA.conf -#usr/share/alsa/cards/ATIIXP.conf #usr/share/alsa/cards/AU8810.conf #usr/share/alsa/cards/AU8820.conf #usr/share/alsa/cards/AU8830.conf -#usr/share/alsa/cards/Audigy.conf #usr/share/alsa/cards/Audigy2.conf +#usr/share/alsa/cards/Audigy.conf #usr/share/alsa/cards/Aureon51.conf #usr/share/alsa/cards/Aureon71.conf #usr/share/alsa/cards/CA0106.conf -#usr/share/alsa/cards/CMI8338-SWIEC.conf #usr/share/alsa/cards/CMI8338.conf +#usr/share/alsa/cards/CMI8338-SWIEC.conf #usr/share/alsa/cards/CMI8738-MC6.conf #usr/share/alsa/cards/CMI8738-MC8.conf #usr/share/alsa/cards/CMI8788.conf @@ -284,9 +305,9 @@ usr/share/alsa #usr/share/alsa/cards/HDA-Intel.conf #usr/share/alsa/cards/ICE1712.conf #usr/share/alsa/cards/ICE1724.conf -#usr/share/alsa/cards/ICH-MODEM.conf -#usr/share/alsa/cards/ICH.conf #usr/share/alsa/cards/ICH4.conf +#usr/share/alsa/cards/ICH.conf +#usr/share/alsa/cards/ICH-MODEM.conf #usr/share/alsa/cards/Maestro3.conf #usr/share/alsa/cards/NFORCE.conf #usr/share/alsa/cards/PC-Speaker.conf @@ -303,15 +324,13 @@ usr/share/alsa #usr/share/alsa/cards/TRID4DWAVENX.conf #usr/share/alsa/cards/USB-Audio.conf #usr/share/alsa/cards/VIA686A.conf -#usr/share/alsa/cards/VIA8233.conf #usr/share/alsa/cards/VIA8233A.conf +#usr/share/alsa/cards/VIA8233.conf #usr/share/alsa/cards/VIA8237.conf #usr/share/alsa/cards/VX222.conf -#usr/share/alsa/cards/VXPocket.conf #usr/share/alsa/cards/VXPocket440.conf +#usr/share/alsa/cards/VXPocket.conf #usr/share/alsa/cards/YMF744.conf -#usr/share/alsa/cards/aliases.alisp -#usr/share/alsa/cards/aliases.conf #usr/share/alsa/init #usr/share/alsa/init/00main #usr/share/alsa/init/default @@ -341,12 +360,14 @@ usr/share/alsa #usr/share/alsa/speaker-test #usr/share/alsa/speaker-test/sample_map.csv #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo -#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo +#usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo #usr/share/locale/ja/LC_MESSAGES/alsaconf.mo +#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo #usr/share/locale/ru/LC_MESSAGES/alsaconf.mo #usr/share/man/fr/man8/alsaconf.8 #usr/share/man/man1/aconnect.1 #usr/share/man/man1/alsactl.1 +#usr/share/man/man1/alsaloop.1 #usr/share/man/man1/alsamixer.1 #usr/share/man/man1/amidi.1 #usr/share/man/man1/amixer.1 @@ -370,15 +391,4 @@ usr/share/sounds/alsa #usr/share/sounds/alsa/Rear_Right.wav #usr/share/sounds/alsa/Side_Left.wav #usr/share/sounds/alsa/Side_Right.wav -etc/rc.d/init.d/alsa -lib/firmware/ess/maestro3_assp_kernel.fw -lib/firmware/ess/maestro3_assp_minisrc.fw -lib/firmware/korg/k1212.dsp -lib/firmware/sb16/alaw_main.csp -lib/firmware/sb16/ima_adpcm_capture.csp -lib/firmware/sb16/ima_adpcm_init.csp -lib/firmware/sb16/ima_adpcm_playback.csp -lib/firmware/sb16/mulaw_main.csp -lib/firmware/yamaha/ds1_ctrl.fw -lib/firmware/yamaha/ds1_dsp.fw -lib/firmware/yamaha/ds1e_ctrl.fw +var/lib/alsa diff --git a/lfs/alsa b/lfs/alsa index d2eaadbba..f6f6df804 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,17 +34,17 @@ else endif endif -VER = 1.0.23 -UVER = 1.0.23 -FVER = 1.0.23 -DVER = 1.0.23 +VER = 1.0.24.1 +UVER = 1.0.24.2 +FVER = 1.0.24.1 +DVER = 1.0.24 THISAPP = alsa-lib-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 8 +PAK_VER = 9 DEPS = "" @@ -66,10 +66,10 @@ alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2 alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2 -$(DL_FILE)_MD5 = f48b50421d8a69d2d806d9c47e534f0d -alsa-utils-$(UVER).tar.bz2_MD5 = cb0cf46029ac9549cf3a31bff6a4f4e1 -alsa-firmware-$(FVER).tar.bz2_MD5 = e3f755331d6d485f6fd697249b90f877 -alsa-driver-$(DVER).tar.bz2_MD5 = 4be102f995bd4cc68e6e8178b0d19ec2 +$(DL_FILE)_MD5 = 7cc05f25e1d5b65da8fb3fdcd540f226 +alsa-utils-$(UVER).tar.bz2_MD5 = 8238cd57cb301d1c36bcf0ecb59ce6b2 +alsa-firmware-$(FVER).tar.bz2_MD5 = d37434dfcfececd8581d2f0bbe2fcf1b +alsa-driver-$(DVER).tar.bz2_MD5 = a4ffd80745ce5098dfd48d83c2769e0e install : $(TARGET) From 152b57c8fc231cdae8e2334e9e9906c4e6bc554b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 28 Apr 2011 18:42:42 +0200 Subject: [PATCH 007/159] kernel: updated to 2.6.32.39. --- lfs/linux | 14 +++++++------- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lfs/linux b/lfs/linux index 9273c6ad8..d9df8fc8a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .38 -VER = 2.6.32.38 +PATCHLEVEL = .39 +VER = 2.6.32.39 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -60,19 +60,19 @@ objects =$(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ - xen-patches-2.6.32-2e.tar.bz2 + xen-patches-2.6.32-2f.tar.bz2 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 -xen-patches-2.6.32-2e.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2e.tar.bz2 +xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 7aee33b26864e31d5d0859d0ed10a88d +$(DL_FILE)_MD5 = e0e741937640a875392b1820e945be25 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 -xen-patches-2.6.32-2e.tar.bz2_MD5 = ec9f2a4a321cdfb887c03592bc6fad94 +xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b install : $(TARGET) @@ -110,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(XEN)" "1" # Apply gentoo Xen patches mkdir -p $(DIR_SRC)/xen-patches - cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2e.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2 for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index cc46e5c69..01e59ebce 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.38 +KVER=2.6.32.39 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 70bf6f584..f3ffbdb8b 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.38 +KVER=2.6.32.39 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then From 2775d49b7048df84e7a4c25ac0fc59ec55d8c59a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 28 Apr 2011 18:43:08 +0200 Subject: [PATCH 008/159] v4l-dvb: updated to git20110427. --- lfs/v4l-dvb | 17 +++++++---------- .../v4l-dvb_remove_backport_warning.patch | 12 ------------ 2 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 src/patches/v4l-dvb_remove_backport_warning.patch diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index e8f2e54f1..6c6a5fc5b 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,10 +34,10 @@ else endif endif -VER = abd3aac6644e +VER = git20110427 THISAPP = v4l-dvb-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PAK_VER = 2 @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fca89ad531c5d04dadbbc65997c92aac +$(DL_FILE)_MD5 = 8b83a89332fe8468ebffd516a4a47128 install : $(TARGET) @@ -83,12 +83,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - # Remove backported warning... - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch - cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX) - cd $(DIR_APP) && make $(MAKETUNING) all - cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32 + cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32 ln -sf $(DIR_APP)/ /usr/src/v4l-dvb # @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/v4l-dvb_remove_backport_warning.patch b/src/patches/v4l-dvb_remove_backport_warning.patch deleted file mode 100644 index 7f578222c..000000000 --- a/src/patches/v4l-dvb_remove_backport_warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h ---- v4l-dvb-abd3aac6644e.org/v4l/compat.h 2010-07-02 05:38:54.000000000 +0200 -+++ v4l-dvb-abd3aac6644e/v4l/compat.h 2010-12-04 12:19:09.531056981 +0100 -@@ -14,8 +14,6 @@ - #define INIT_DELAYED_WORK(a,b,c) INIT_WORK(a,b,c) - #endif - --#define EXPERIMENTAL_TREE -- - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) - #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma) - #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma) From 713a08524620fd24fbebdf1691508d12ad23fc72 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 28 Apr 2011 18:47:37 +0200 Subject: [PATCH 009/159] make.sh set branch to next and version to 2.10. --- make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index f572b9304..e9b3f8888 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.9" # Version number +VERSION="2.10" # Version number CORE="49" # Core Level (Filename) PAKFIRE_CORE="48" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch @@ -698,7 +698,7 @@ buildipfire() { echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "master" ]; then + if [ "$GIT_BRANCH" = "next" ]; then echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release else echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release From 0b776fba15e1724b290722d8f6b84ef54afe996d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 May 2011 16:25:21 +0200 Subject: [PATCH 010/159] gmp: Update to 4.2.4. Needed this update to fix building php without an executable stack that was caused by gmp. --- config/rootfiles/common/gmp | 8 ++++---- lfs/gmp | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp index 6bf3940c8..669d19133 100644 --- a/config/rootfiles/common/gmp +++ b/config/rootfiles/common/gmp @@ -8,14 +8,14 @@ #usr/lib/libgmp.la usr/lib/libgmp.so usr/lib/libgmp.so.3 -usr/lib/libgmp.so.3.3.0 +usr/lib/libgmp.so.3.4.4 #usr/lib/libgmpxx.a #usr/lib/libgmpxx.la #usr/lib/libgmpxx.so -#usr/lib/libgmpxx.so.3 -#usr/lib/libgmpxx.so.3.0.2 +#usr/lib/libgmpxx.so.4 +#usr/lib/libgmpxx.so.4.0.4 #usr/lib/libmp.a #usr/lib/libmp.la #usr/lib/libmp.so #usr/lib/libmp.so.3 -#usr/lib/libmp.so.3.1.4 +#usr/lib/libmp.so.3.1.13 diff --git a/lfs/gmp b/lfs/gmp index 5d723e54e..10cd28f1b 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -24,7 +24,7 @@ include Config -VER = 4.2 +VER = 4.2.4 THISAPP = gmp-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = aa4a4534e8870ab8ba3c093239057cca +$(DL_FILE)_MD5 = fc1e3b3a2a5038d4d74138d0b9cf8dbe install : $(TARGET) @@ -70,7 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-cxx --enable-mpbsd --build=$(BUILDTARGET) --disable-nls + cd $(DIR_APP) && ABI=32 ./configure --prefix=/usr --enable-cxx \ + --enable-mpbsd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) From 66befe59522b9b4721f4318cc69063304c1da448 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Wed, 11 May 2011 22:13:59 +0200 Subject: [PATCH 011/159] python-satsolver: New package. Only initial commit - package doesn't build atm - needs fixing. Signed-off-by: Michael Tremer --- lfs/python-satsolver | 89 +++++++++++++++++++ make.sh | 1 + ...ython-satsolver-only-python-bindings.patch | 27 ++++++ ...on-satsover-fix-building-without-rpm.patch | 37 ++++++++ 4 files changed, 154 insertions(+) create mode 100644 lfs/python-satsolver create mode 100644 src/patches/python-satsolver-only-python-bindings.patch create mode 100644 src/patches/python-satsover-fix-building-without-rpm.patch diff --git a/lfs/python-satsolver b/lfs/python-satsolver new file mode 100644 index 000000000..b1a47f95b --- /dev/null +++ b/lfs/python-satsolver @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.16.0-20110429-868eae9 + +THISAPP = sat-solver-bindings-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 479f3b57a9f9a59c7b24e37aedda7469 + +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) + + # Workaround for weak tarball + @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) -C $(DIR_APP) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsover-fix-building-without-rpm.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsolver-only-python-bindings.patch + + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. -DDEBIAN=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) + + # Install only the python bindings. That's all we need. + cd $(DIR_APP)/build/bindings/python && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 22af83963..ccb1dbca4 100755 --- a/make.sh +++ b/make.sh @@ -691,6 +691,7 @@ buildipfire() { ipfiremake python-m2crypto ipfiremake crda ipfiremake libsatsolver + ipfiremake python-satsolver 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/patches/python-satsolver-only-python-bindings.patch b/src/patches/python-satsolver-only-python-bindings.patch new file mode 100644 index 000000000..36905d00c --- /dev/null +++ b/src/patches/python-satsolver-only-python-bindings.patch @@ -0,0 +1,27 @@ +diff -Nur old/bindings/CMakeLists.txt new/bindings/CMakeLists.txt +--- old/bindings/CMakeLists.txt 2011-04-11 22:51:37.891109001 +0200 ++++ new/bindings/CMakeLists.txt 2011-04-11 22:55:52.859108992 +0200 +@@ -21,17 +21,17 @@ + #FIND_PACKAGE(PerlLibs) + FIND_PACKAGE(Perl) + +-IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +- ADD_SUBDIRECTORY(ruby) +-ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ++#IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ++# ADD_SUBDIRECTORY(ruby) ++#ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + + IF (PYTHON_LIBRARY) + ADD_SUBDIRECTORY(python) + ENDIF(PYTHON_LIBRARY) + +-IF (PERL_EXECUTABLE) +- ADD_SUBDIRECTORY(perl) +-ENDIF (PERL_EXECUTABLE) ++#IF (PERL_EXECUTABLE) ++# ADD_SUBDIRECTORY(perl) ++#ENDIF (PERL_EXECUTABLE) + + SET(bindings_devel_dir "${CMAKE_CURRENT_BINARY_DIR}/satsolver-bindings") + ADD_CUSTOM_COMMAND ( diff --git a/src/patches/python-satsover-fix-building-without-rpm.patch b/src/patches/python-satsover-fix-building-without-rpm.patch new file mode 100644 index 000000000..68e276735 --- /dev/null +++ b/src/patches/python-satsover-fix-building-without-rpm.patch @@ -0,0 +1,37 @@ +diff -Nur src/bindings/pool.i sat-solver-bindings/bindings/pool.i +--- src/bindings/pool.i 2011-04-25 12:03:31.000000000 +0000 ++++ sat-solver-bindings/bindings/pool.i 2011-04-29 18:40:59.645929695 +0000 +@@ -474,6 +474,7 @@ + return repo; + } + ++#if defined(FEDORA) + /* + * Add RPM database to Pool. + * +@@ -493,6 +494,7 @@ + repo_add_rpmdb( repo, NULL, rootdir, 0 ); + return repo; + } ++#endif + + %newobject create_repo; + /* +diff -Nur src/bindings/repo.i sat-solver-bindings/bindings/repo.i +--- src/bindings/repo.i 2011-04-25 12:03:31.000000000 +0000 ++++ sat-solver-bindings/bindings/repo.i 2011-04-29 18:37:13.856570319 +0000 +@@ -139,11 +139,13 @@ + } + } + ++#if defined(FEDORA) + /* + * Add RPM database, optionally passing a _root_ directory + */ + void add_rpmdb( const char *rootdir ) + { repo_add_rpmdb( $self, NULL, rootdir, 0); } ++#endif + + /* + * Create solvable with +name+ and +evr+ in the Repo + From ebc354b84632f51581191d542e6571e30b731601 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 May 2011 18:19:12 +0200 Subject: [PATCH 012/159] python-satsolver: Fix download location. Signed-off-by: Michael Tremer --- lfs/python-satsolver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/python-satsolver b/lfs/python-satsolver index b1a47f95b..b549af7a2 100644 --- a/lfs/python-satsolver +++ b/lfs/python-satsolver @@ -28,7 +28,7 @@ VER = 0.16.0-20110429-868eae9 THISAPP = sat-solver-bindings-$(VER) DL_FILE = $(THISAPP).tar.xz -DL_FROM = $(URL_IPFIRE) +DL_FROM = http://source.ipfire.org/source-3.x DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) From 081f097387e30b25f694197d460e31571b0cd386 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 May 2011 19:48:18 +0200 Subject: [PATCH 013/159] cmake: Update to 2.6.4. Needed to build python-satsolver. --- lfs/cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/cmake b/lfs/cmake index 56e0016a3..6b7aff61c 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -24,7 +24,7 @@ include Config -VER = 2.4.8 +VER = 2.6.4 THISAPP = cmake-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f5dd061c31765a49dc17ae8bdc986779 +$(DL_FILE)_MD5 = 50f387d0436696c4a68b5512a72c9cde install : $(TARGET) From d4e634955c76cc787b661890df3dabfbf39b39f0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 May 2011 19:48:43 +0200 Subject: [PATCH 014/159] libsatsolver: Fix missing __qsort_r. Our version of glibc does not provide __qsort_r so we need to ship another one. --- lfs/libsatsolver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lfs/libsatsolver b/lfs/libsatsolver index 771430b6b..778375a2e 100644 --- a/lfs/libsatsolver +++ b/lfs/libsatsolver @@ -93,6 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # do not support RPM. cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt + # Our version of glibc has no __qsort_r + cd $(DIR_APP) && echo "#define USE_OWN_QSORT" >> src/util.h + cd $(DIR_APP) && mkdir build cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ -DCMAKE_INSTALL_PREFIX=/usr \ From 5943bf3ecc42ce8c8b1f95b92f38f093f4115607 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 May 2011 19:56:18 +0200 Subject: [PATCH 015/159] python-satsolver: Make package working. --- lfs/python-satsolver | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lfs/python-satsolver b/lfs/python-satsolver index b549af7a2..0974a151d 100644 --- a/lfs/python-satsolver +++ b/lfs/python-satsolver @@ -32,6 +32,10 @@ DL_FROM = http://source.ipfire.org/source-3.x DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python-satsolver +DEPS = "libsatsolver" +PAK_VER = 1 + ############################################################################### # Top-level Rules ############################################################################### @@ -50,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) +dist : + $(PAK) + ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -75,11 +82,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsover-fix-building-without-rpm.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsolver-only-python-bindings.patch + # Aaaahh! + cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt + cd $(DIR_APP) && mkdir build cd $(DIR_APP)/build && cmake .. -DDEBIAN=1 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 + -DCMAKE_SKIP_RPATH=1 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) # Install only the python bindings. That's all we need. From 7124bb3468cfd230c32a752b1844c1a7fdec04d8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 May 2011 19:58:18 +0200 Subject: [PATCH 016/159] python-satsolver: Oops - a rootfile. --- config/rootfiles/packages/python-satsolver | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 config/rootfiles/packages/python-satsolver diff --git a/config/rootfiles/packages/python-satsolver b/config/rootfiles/packages/python-satsolver new file mode 100644 index 000000000..6b5e5761d --- /dev/null +++ b/config/rootfiles/packages/python-satsolver @@ -0,0 +1,2 @@ +usr/lib/python2.7/site-packages/_satsolver.so +usr/lib/python2.7/site-packages/satsolver.py From 0c345920dd97a4f7cf8b246ef8044cbd7a04a8eb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 14 May 2011 10:51:06 +0200 Subject: [PATCH 017/159] kernel: update to 2.6.32.40. --- lfs/linux | 6 +++--- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/linux b/lfs/linux index d9df8fc8a..16ae152b4 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .39 -VER = 2.6.32.39 +PATCHLEVEL = .40 +VER = 2.6.32.40 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = e0e741937640a875392b1820e945be25 +$(DL_FILE)_MD5 = 043403f6264c1ec0aea67a5f039d0a31 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 01e59ebce..1a663e95d 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.39 +KVER=2.6.32.40 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index f3ffbdb8b..5e03a740c 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.39 +KVER=2.6.32.40 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then From de02755c2bf93dac51ac0623244efca718aac06d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 14 May 2011 15:53:03 +0200 Subject: [PATCH 018/159] kernel: enabled bigsmp and set 256 cpus. --- config/kernel/kernel.config.i586-ipfire-pae | 32 ++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 6d82de48b..8c7cf4b7d 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.27-ipfire -# Thu Dec 30 13:35:50 2010 +# Linux kernel version: 2.6.32.40 +# Sat May 14 09:27:43 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -96,7 +96,6 @@ CONFIG_RCU_FANOUT=32 # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -203,8 +202,9 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y CONFIG_SPARSE_IRQ=y +CONFIG_NUMA_IRQ_DESC=y CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set +CONFIG_X86_BIGSMP=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_ELAN is not set # CONFIG_X86_MRST is not set @@ -280,10 +280,10 @@ CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y -CONFIG_NR_CPUS=8 -CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_NR_CPUS=256 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -314,19 +314,29 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y CONFIG_X86_PAE=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_NUMA=y +CONFIG_NODES_SHIFT=3 +CONFIG_HAVE_ARCH_BOOTMEM=y +CONFIG_ARCH_HAVE_MEMORY_PRESENT=y +CONFIG_NEED_NODE_MEMMAP_SIZE=y +CONFIG_HAVE_ARCH_ALLOC_REMAP=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y +CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y @@ -363,6 +373,7 @@ CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +# CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID is not set # # Power management and ACPI options @@ -392,6 +403,7 @@ CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_NUMA is not set CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 From a947a7a6474ca88db006652fe7a0d37433af4fd3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 14 May 2011 19:01:16 +0200 Subject: [PATCH 019/159] Create "next" core update for testing. --- config/rootfiles/core/next/exclude | 6 + config/rootfiles/core/next/filelists/dracut | 1 + config/rootfiles/core/next/filelists/files | 2 + config/rootfiles/core/next/filelists/grub | 1 + config/rootfiles/core/next/filelists/linux | 1 + config/rootfiles/core/next/meta | 1 + config/rootfiles/core/next/update.sh | 163 ++++++++++++++++++++ 7 files changed, 175 insertions(+) create mode 100644 config/rootfiles/core/next/exclude create mode 120000 config/rootfiles/core/next/filelists/dracut create mode 100644 config/rootfiles/core/next/filelists/files create mode 120000 config/rootfiles/core/next/filelists/grub create mode 120000 config/rootfiles/core/next/filelists/linux create mode 100644 config/rootfiles/core/next/meta create mode 100644 config/rootfiles/core/next/update.sh diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude new file mode 100644 index 000000000..c2bceb866 --- /dev/null +++ b/config/rootfiles/core/next/exclude @@ -0,0 +1,6 @@ +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache diff --git a/config/rootfiles/core/next/filelists/dracut b/config/rootfiles/core/next/filelists/dracut new file mode 120000 index 000000000..160869946 --- /dev/null +++ b/config/rootfiles/core/next/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files new file mode 100644 index 000000000..409e5fe8a --- /dev/null +++ b/config/rootfiles/core/next/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/next/filelists/grub b/config/rootfiles/core/next/filelists/grub new file mode 120000 index 000000000..050745c10 --- /dev/null +++ b/config/rootfiles/core/next/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/linux b/config/rootfiles/core/next/filelists/linux new file mode 120000 index 000000000..c469fe188 --- /dev/null +++ b/config/rootfiles/core/next/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/next/meta b/config/rootfiles/core/next/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/next/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh new file mode 100644 index 000000000..68c3af506 --- /dev/null +++ b/config/rootfiles/core/next/update.sh @@ -0,0 +1,163 @@ +#!/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) 2011 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.40" +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES + +# Backup the files +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 + +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + +# +# Stop services to save memory +# +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop + +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir + +# +# Start services +# +/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 + +# +# 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,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +## +## Change version of Pakfire.conf +## +#OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` +#NEWVERSION="2.9" +#sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf +## +## After pakfire has ended run it again and update the lists and do upgrade +## +#echo '#!/bin/bash' > /tmp/pak_update +#echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +#echo ' sleep 1' >> /tmp/pak_update +#echo 'done' >> /tmp/pak_update +#echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +#echo ' sleep 1' >> /tmp/pak_update +#echo 'done' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Check it before reboot !!!"' >> /tmp/pak_update +#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 " *** Please reboot... *** "' >> /tmp/pak_update +#echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +#chmod +x /tmp/pak_update +#/tmp/pak_update & +#echo +#echo Please wait until pakfire has ended... +#echo +/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t core-upgrade-next " *** Please reboot... *** " From 6925b8ef5815cab2d1ea290c8413fd42d0c55b7b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 14 May 2011 19:24:47 +0200 Subject: [PATCH 020/159] openvpn: Add control options to openvpnctrl binary for n2n. --- src/misc-progs/openvpnctrl.c | 117 ++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 3 deletions(-) diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 93aff3e05..e6a8d3f1a 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -24,7 +24,16 @@ char enableorange[STRING_SIZE] = "off"; char OVPNRED[STRING_SIZE] = "OVPN"; char OVPNBLUE[STRING_SIZE] = "OVPN_BLUE_"; char OVPNORANGE[STRING_SIZE] = "OVPN_ORANGE_"; -char WRAPPERVERSION[STRING_SIZE] = "2.0.1.6"; +char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.1.0"; + +struct connection_struct { + char name[STRING_SIZE]; + char proto[STRING_SIZE]; + int port; + struct connection_struct *next; +}; + +typedef struct connection_struct connection; void exithandler(void) { @@ -62,6 +71,56 @@ void usage(void) exit(1); } +connection *getConnections() { + FILE *fp = NULL; + + if (!(fp = fopen(CONFIG_ROOT "/ovpn/ovpnconfig", "r"))) { + fprintf(stderr, "Could not open openvpn n2n configuration file.\n"); + exit(1); + } + + char line[STRING_SIZE] = ""; + char *result; + int count; + connection *conn_first = NULL; + connection *conn_last = NULL; + connection *conn_curr; + + while ((fgets(line, STRING_SIZE, fp) != NULL)) { + if (line[strlen(line) - 1] == '\n') + line[strlen(line) - 1] = '\0'; + + conn_curr = (connection *)malloc(sizeof(connection)); + memset(conn_curr, 0, sizeof(connection)); + + if (conn_first == NULL) { + conn_first = conn_curr; + } else { + conn_last->next = conn_curr; + } + conn_last = conn_curr; + + count = 0; + result = strtok(line, ","); + while (result) { + if (count == 2) { + strcpy(conn_curr->name, result); + } else if (count == 12) { + strcpy(conn_curr->proto, result); + } else if (count == 13) { + conn_curr->port = atoi(result); + } + + result = strtok(NULL, ","); + count++; + } + } + + fclose(fp); + + return conn_first; +} + void ovpnInit(void) { // Read OpenVPN configuration @@ -280,6 +339,9 @@ void setFirewallRules(void) { } freekeyvalues(kv); + // read connection configuration + connection *conn = getConnections(); + // set firewall rules if (!strcmp(enablered, "on") && strlen(redif)) setChainRules(OVPNRED, redif, protocol, dport); @@ -287,6 +349,14 @@ void setFirewallRules(void) { setChainRules(OVPNBLUE, blueif, protocol, dport); if (!strcmp(enableorange, "on") && strlen(orangeif)) setChainRules(OVPNORANGE, orangeif, protocol, dport); + + // set firewall rules for n2n connections + char port[STRING_SIZE]; + while (conn) { + sprintf(port, "%d", conn->port); + setChainRules(OVPNRED, redif, &conn->proto, &port); + conn = conn->next; + } } void stopDaemon(void) { @@ -314,6 +384,34 @@ void startDaemon(void) { } } +void startNet2Net(char *name) { + connection *conn = NULL; + connection *conn_iter; + + conn_iter = getConnections(); + + while (conn_iter) { + if (strcmp(conn_iter->name, name) == 0) { + conn = conn_iter; + break; + } + conn_iter = conn_iter->next; + } + + if (conn == NULL) { + fprintf(stderr, "Connection not found.\n"); + exit(1); + } + + char command[STRING_SIZE]; + sprintf(command, "/usr/sbin/openvpn --config " CONFIG_ROOT "/ovpn/n2nconf/%s/%s.conf", conn->name, conn->name); + executeCommand(command); +} + +void killNet2Net(char *conn) { + printf("TO BE DONE %s\n", conn); +} + void displayopenvpn(void) { char command[STRING_SIZE]; @@ -326,8 +424,21 @@ int main(int argc, char *argv[]) { exit(1); if(argc < 2) usage(); - - if(argc == 2) { + + if(argc == 3) { + if( (strcmp(argv[1], "-sn2n") == 0) || (strcmp(argv[1], "--start-net-2-net") == 0) ) { + startNet2Net(argv[2]); + return 0; + } + else if( (strcmp(argv[1], "-kn2n") == 0) || (strcmp(argv[1], "--kill-net-2-net") == 0) ) { + killNet2Net(argv[2]); + return 0; + } else { + usage(); + return 1; + } + } + else if(argc == 2) { if( (strcmp(argv[1], "-k") == 0) || (strcmp(argv[1], "--kill") == 0) ) { stopDaemon(); return 0; From e601770587377e3913cf39be8f2c58eafc217321 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 15 May 2011 12:17:21 +0200 Subject: [PATCH 021/159] cmake: rootfile update. --- config/rootfiles/common/cmake | 684 ++++++++++++++++++++-------------- 1 file changed, 414 insertions(+), 270 deletions(-) diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake index 8cefc88d8..4a1d702c0 100644 --- a/config/rootfiles/common/cmake +++ b/config/rootfiles/common/cmake @@ -3,278 +3,422 @@ #usr/local/bin/cpack #usr/local/bin/ctest #usr/local/doc -#usr/local/doc/cmake-2.4 -#usr/local/doc/cmake-2.4/Copyright.txt -#usr/local/doc/cmake-2.4/ccmake.html -#usr/local/doc/cmake-2.4/ccmake.txt -#usr/local/doc/cmake-2.4/cmake.html -#usr/local/doc/cmake-2.4/cmake.txt -#usr/local/doc/cmake-2.4/ctest.html -#usr/local/doc/cmake-2.4/ctest.txt +#usr/local/doc/cmake-2.6 +#usr/local/doc/cmake-2.6/ccmake.docbook +#usr/local/doc/cmake-2.6/ccmake.html +#usr/local/doc/cmake-2.6/ccmake.txt +#usr/local/doc/cmake-2.6/cmake-commands.html +#usr/local/doc/cmake-2.6/cmake-commands.txt +#usr/local/doc/cmake-2.6/cmake-compatcommands.html +#usr/local/doc/cmake-2.6/cmake-compatcommands.txt +#usr/local/doc/cmake-2.6/cmake-modules.html +#usr/local/doc/cmake-2.6/cmake-modules.txt +#usr/local/doc/cmake-2.6/cmake-policies.html +#usr/local/doc/cmake-2.6/cmake-policies.txt +#usr/local/doc/cmake-2.6/cmake-properties.html +#usr/local/doc/cmake-2.6/cmake-properties.txt +#usr/local/doc/cmake-2.6/cmake-variables.html +#usr/local/doc/cmake-2.6/cmake-variables.txt +#usr/local/doc/cmake-2.6/cmake.docbook +#usr/local/doc/cmake-2.6/cmake.html +#usr/local/doc/cmake-2.6/cmake.txt +#usr/local/doc/cmake-2.6/cpack.docbook +#usr/local/doc/cmake-2.6/cpack.html +#usr/local/doc/cmake-2.6/cpack.txt +#usr/local/doc/cmake-2.6/ctest.docbook +#usr/local/doc/cmake-2.6/ctest.html +#usr/local/doc/cmake-2.6/ctest.txt #usr/local/man #usr/local/man/man1 #usr/local/man/man1/ccmake.1 #usr/local/man/man1/cmake.1 +#usr/local/man/man1/cmakecommands.1 +#usr/local/man/man1/cmakecompat.1 +#usr/local/man/man1/cmakemodules.1 +#usr/local/man/man1/cmakepolicies.1 +#usr/local/man/man1/cmakeprops.1 +#usr/local/man/man1/cmakevars.1 +#usr/local/man/man1/cpack.1 #usr/local/man/man1/ctest.1 -#usr/local/share/cmake-2.4 -#usr/local/share/cmake-2.4/Modules -#usr/local/share/cmake-2.4/Modules/AddFileDependencies.cmake -#usr/local/share/cmake-2.4/Modules/CMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeBackwardCompatibilityC.cmake -#usr/local/share/cmake-2.4/Modules/CMakeBackwardCompatibilityCXX.cmake -#usr/local/share/cmake-2.4/Modules/CMakeBorlandFindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeBuildSettings.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeCCompiler.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeCInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeCXXCompiler.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeCXXInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeCommonLanguageInclude.cmake -#usr/local/share/cmake-2.4/Modules/CMakeConfigurableFile.in -#usr/local/share/cmake-2.4/Modules/CMakeDependentOption.cmake -#usr/local/share/cmake-2.4/Modules/CMakeDetermineCCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeDetermineCXXCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeDetermineFortranCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeDetermineJavaCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeDetermineRCCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeDetermineSystem.cmake -#usr/local/share/cmake-2.4/Modules/CMakeExportBuildSettings.cmake -#usr/local/share/cmake-2.4/Modules/CMakeFindFrameworks.cmake -#usr/local/share/cmake-2.4/Modules/CMakeFindWMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeFindXCode.cmake -#usr/local/share/cmake-2.4/Modules/CMakeFortranCompiler.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeFortranInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeGenericSystem.cmake -#usr/local/share/cmake-2.4/Modules/CMakeImportBuildSettings.cmake -#usr/local/share/cmake-2.4/Modules/CMakeJavaCompiler.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeJavaInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeMSYSFindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeMinGWFindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeNMakeFindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakePrintSystemInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeRCCompiler.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeRCInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeSystem.cmake.in -#usr/local/share/cmake-2.4/Modules/CMakeSystemSpecificInformation.cmake -#usr/local/share/cmake-2.4/Modules/CMakeTestCCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeTestCXXCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeTestForFreeVC.cxx -#usr/local/share/cmake-2.4/Modules/CMakeTestFortranCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeTestGNU.c -#usr/local/share/cmake-2.4/Modules/CMakeTestJavaCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeTestNMakeCLVersion.c -#usr/local/share/cmake-2.4/Modules/CMakeTestRCCompiler.cmake -#usr/local/share/cmake-2.4/Modules/CMakeUnixFindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVCManifest.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVCManifestExe.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS6BackwardCompatibility.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS6FindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS71FindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS7BackwardCompatibility.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS7FindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS8FindMake.cmake -#usr/local/share/cmake-2.4/Modules/CMakeVS9FindMake.cmake -#usr/local/share/cmake-2.4/Modules/CPack.Description.plist.in -#usr/local/share/cmake-2.4/Modules/CPack.Info.plist.in -#usr/local/share/cmake-2.4/Modules/CPack.STGZ_Header.sh.in -#usr/local/share/cmake-2.4/Modules/CPack.cmake -#usr/local/share/cmake-2.4/Modules/CTest.cmake -#usr/local/share/cmake-2.4/Modules/CTestTargets.cmake -#usr/local/share/cmake-2.4/Modules/CheckCCompilerFlag.cmake -#usr/local/share/cmake-2.4/Modules/CheckCSourceCompiles.cmake -#usr/local/share/cmake-2.4/Modules/CheckCSourceRuns.cmake -#usr/local/share/cmake-2.4/Modules/CheckCXXCompilerFlag.cmake -#usr/local/share/cmake-2.4/Modules/CheckCXXSourceCompiles.cmake -#usr/local/share/cmake-2.4/Modules/CheckCXXSourceRuns.cmake -#usr/local/share/cmake-2.4/Modules/CheckForPthreads.c -#usr/local/share/cmake-2.4/Modules/CheckFunctionExists.c -#usr/local/share/cmake-2.4/Modules/CheckFunctionExists.cmake -#usr/local/share/cmake-2.4/Modules/CheckIncludeFile.c.in -#usr/local/share/cmake-2.4/Modules/CheckIncludeFile.cmake -#usr/local/share/cmake-2.4/Modules/CheckIncludeFile.cxx.in -#usr/local/share/cmake-2.4/Modules/CheckIncludeFileCXX.cmake -#usr/local/share/cmake-2.4/Modules/CheckIncludeFiles.cmake -#usr/local/share/cmake-2.4/Modules/CheckLibraryExists.cmake -#usr/local/share/cmake-2.4/Modules/CheckLibraryExists.lists.in -#usr/local/share/cmake-2.4/Modules/CheckSizeOf.cmake -#usr/local/share/cmake-2.4/Modules/CheckSymbolExists.cmake -#usr/local/share/cmake-2.4/Modules/CheckTypeSize.c.in -#usr/local/share/cmake-2.4/Modules/CheckTypeSize.cmake -#usr/local/share/cmake-2.4/Modules/CheckVariableExists.c -#usr/local/share/cmake-2.4/Modules/CheckVariableExists.cmake -#usr/local/share/cmake-2.4/Modules/Dart.cmake -#usr/local/share/cmake-2.4/Modules/DartConfiguration.tcl.in -#usr/local/share/cmake-2.4/Modules/Documentation.cmake -#usr/local/share/cmake-2.4/Modules/DummyCXXFile.cxx -#usr/local/share/cmake-2.4/Modules/FindASPELL.cmake -#usr/local/share/cmake-2.4/Modules/FindAVIFile.cmake -#usr/local/share/cmake-2.4/Modules/FindBZip2.cmake -#usr/local/share/cmake-2.4/Modules/FindBoost.cmake -#usr/local/share/cmake-2.4/Modules/FindCABLE.cmake -#usr/local/share/cmake-2.4/Modules/FindCURL.cmake -#usr/local/share/cmake-2.4/Modules/FindCurses.cmake -#usr/local/share/cmake-2.4/Modules/FindCygwin.cmake -#usr/local/share/cmake-2.4/Modules/FindDCMTK.cmake -#usr/local/share/cmake-2.4/Modules/FindDart.cmake -#usr/local/share/cmake-2.4/Modules/FindDoxygen.cmake -#usr/local/share/cmake-2.4/Modules/FindEXPAT.cmake -#usr/local/share/cmake-2.4/Modules/FindFLTK.cmake -#usr/local/share/cmake-2.4/Modules/FindGCCXML.cmake -#usr/local/share/cmake-2.4/Modules/FindGLU.cmake -#usr/local/share/cmake-2.4/Modules/FindGLUT.cmake -#usr/local/share/cmake-2.4/Modules/FindGTK.cmake -#usr/local/share/cmake-2.4/Modules/FindGnuplot.cmake -#usr/local/share/cmake-2.4/Modules/FindHSPELL.cmake -#usr/local/share/cmake-2.4/Modules/FindHTMLHelp.cmake -#usr/local/share/cmake-2.4/Modules/FindITK.cmake -#usr/local/share/cmake-2.4/Modules/FindImageMagick.cmake -#usr/local/share/cmake-2.4/Modules/FindJNI.cmake -#usr/local/share/cmake-2.4/Modules/FindJPEG.cmake -#usr/local/share/cmake-2.4/Modules/FindJasper.cmake -#usr/local/share/cmake-2.4/Modules/FindJava.cmake -#usr/local/share/cmake-2.4/Modules/FindKDE.cmake -#usr/local/share/cmake-2.4/Modules/FindKDE3.cmake -#usr/local/share/cmake-2.4/Modules/FindKDE4.cmake -#usr/local/share/cmake-2.4/Modules/FindLATEX.cmake -#usr/local/share/cmake-2.4/Modules/FindLibXml2.cmake -#usr/local/share/cmake-2.4/Modules/FindLibXslt.cmake -#usr/local/share/cmake-2.4/Modules/FindMFC.cmake -#usr/local/share/cmake-2.4/Modules/FindMPEG.cmake -#usr/local/share/cmake-2.4/Modules/FindMPEG2.cmake -#usr/local/share/cmake-2.4/Modules/FindMPI.cmake -#usr/local/share/cmake-2.4/Modules/FindMatlab.cmake -#usr/local/share/cmake-2.4/Modules/FindMotif.cmake -#usr/local/share/cmake-2.4/Modules/FindOpenAL.cmake -#usr/local/share/cmake-2.4/Modules/FindOpenGL.cmake -#usr/local/share/cmake-2.4/Modules/FindOpenSSL.cmake -#usr/local/share/cmake-2.4/Modules/FindPHP4.cmake -#usr/local/share/cmake-2.4/Modules/FindPNG.cmake -#usr/local/share/cmake-2.4/Modules/FindPerl.cmake -#usr/local/share/cmake-2.4/Modules/FindPerlLibs.cmake -#usr/local/share/cmake-2.4/Modules/FindPhysFS.cmake -#usr/local/share/cmake-2.4/Modules/FindPike.cmake -#usr/local/share/cmake-2.4/Modules/FindPkgConfig.cmake -#usr/local/share/cmake-2.4/Modules/FindPythonInterp.cmake -#usr/local/share/cmake-2.4/Modules/FindPythonLibs.cmake -#usr/local/share/cmake-2.4/Modules/FindQt.cmake -#usr/local/share/cmake-2.4/Modules/FindQt3.cmake -#usr/local/share/cmake-2.4/Modules/FindQt4.cmake -#usr/local/share/cmake-2.4/Modules/FindRuby.cmake -#usr/local/share/cmake-2.4/Modules/FindSDL.cmake -#usr/local/share/cmake-2.4/Modules/FindSDL_image.cmake -#usr/local/share/cmake-2.4/Modules/FindSDL_mixer.cmake -#usr/local/share/cmake-2.4/Modules/FindSDL_net.cmake -#usr/local/share/cmake-2.4/Modules/FindSDL_sound.cmake -#usr/local/share/cmake-2.4/Modules/FindSDL_ttf.cmake -#usr/local/share/cmake-2.4/Modules/FindSWIG.cmake -#usr/local/share/cmake-2.4/Modules/FindSelfPackers.cmake -#usr/local/share/cmake-2.4/Modules/FindSubversion.cmake -#usr/local/share/cmake-2.4/Modules/FindTCL.cmake -#usr/local/share/cmake-2.4/Modules/FindTIFF.cmake -#usr/local/share/cmake-2.4/Modules/FindTclsh.cmake -#usr/local/share/cmake-2.4/Modules/FindThreads.cmake -#usr/local/share/cmake-2.4/Modules/FindUnixCommands.cmake -#usr/local/share/cmake-2.4/Modules/FindVTK.cmake -#usr/local/share/cmake-2.4/Modules/FindWget.cmake -#usr/local/share/cmake-2.4/Modules/FindWish.cmake -#usr/local/share/cmake-2.4/Modules/FindX11.cmake -#usr/local/share/cmake-2.4/Modules/FindXMLRPC.cmake -#usr/local/share/cmake-2.4/Modules/FindZLIB.cmake -#usr/local/share/cmake-2.4/Modules/FindwxWidgets.cmake -#usr/local/share/cmake-2.4/Modules/FindwxWindows.cmake -#usr/local/share/cmake-2.4/Modules/InstallRequiredSystemLibraries.cmake -#usr/local/share/cmake-2.4/Modules/KDE3Macros.cmake -#usr/local/share/cmake-2.4/Modules/MacOSXBundleInfo.plist.in -#usr/local/share/cmake-2.4/Modules/MacroAddFileDependencies.cmake -#usr/local/share/cmake-2.4/Modules/NSIS.InstallOptions.ini.in -#usr/local/share/cmake-2.4/Modules/NSIS.template.in -#usr/local/share/cmake-2.4/Modules/Platform -#usr/local/share/cmake-2.4/Modules/Platform/AIX.cmake -#usr/local/share/cmake-2.4/Modules/Platform/BSDOS.cmake -#usr/local/share/cmake-2.4/Modules/Platform/CYGWIN-g77.cmake -#usr/local/share/cmake-2.4/Modules/Platform/CYGWIN.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Darwin-xlc.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Darwin.cmake -#usr/local/share/cmake-2.4/Modules/Platform/DragonFly.cmake -#usr/local/share/cmake-2.4/Modules/Platform/FreeBSD.cmake -#usr/local/share/cmake-2.4/Modules/Platform/GNU.cmake -#usr/local/share/cmake-2.4/Modules/Platform/HP-UX.cmake -#usr/local/share/cmake-2.4/Modules/Platform/IRIX.cmake -#usr/local/share/cmake-2.4/Modules/Platform/IRIX64.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Linux-como.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Linux-icpc.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Linux-ifort.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Linux.cmake -#usr/local/share/cmake-2.4/Modules/Platform/MP-RAS.cmake -#usr/local/share/cmake-2.4/Modules/Platform/NetBSD.cmake -#usr/local/share/cmake-2.4/Modules/Platform/OSF1.cmake -#usr/local/share/cmake-2.4/Modules/Platform/OpenBSD.cmake -#usr/local/share/cmake-2.4/Modules/Platform/QNX.cmake -#usr/local/share/cmake-2.4/Modules/Platform/RISCos.cmake -#usr/local/share/cmake-2.4/Modules/Platform/SCO_SV.cmake -#usr/local/share/cmake-2.4/Modules/Platform/SINIX.cmake -#usr/local/share/cmake-2.4/Modules/Platform/SunOS.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Tru64.cmake -#usr/local/share/cmake-2.4/Modules/Platform/ULTRIX.cmake -#usr/local/share/cmake-2.4/Modules/Platform/UNIX_SV.cmake -#usr/local/share/cmake-2.4/Modules/Platform/UnixPaths.cmake -#usr/local/share/cmake-2.4/Modules/Platform/UnixWare.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-bcc32.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-cl.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-cl.cmake.in -#usr/local/share/cmake-2.4/Modules/Platform/Windows-g++.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-g77.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-gcc.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-icl.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-ifort.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows-wcl386.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Windows.cmake -#usr/local/share/cmake-2.4/Modules/Platform/WindowsPaths.cmake -#usr/local/share/cmake-2.4/Modules/Platform/Xenix.cmake -#usr/local/share/cmake-2.4/Modules/Platform/g77.cmake -#usr/local/share/cmake-2.4/Modules/Platform/gcc.cmake -#usr/local/share/cmake-2.4/Modules/Platform/kFreeBSD.cmake -#usr/local/share/cmake-2.4/Modules/TestBigEndian.c -#usr/local/share/cmake-2.4/Modules/TestBigEndian.cmake -#usr/local/share/cmake-2.4/Modules/TestCXXAcceptsFlag.cmake -#usr/local/share/cmake-2.4/Modules/TestForANSIForScope.cmake -#usr/local/share/cmake-2.4/Modules/TestForANSIStreamHeaders.cmake -#usr/local/share/cmake-2.4/Modules/TestForANSIStreamHeaders.cxx -#usr/local/share/cmake-2.4/Modules/TestForAnsiForScope.cxx -#usr/local/share/cmake-2.4/Modules/TestForSSTREAM.cmake -#usr/local/share/cmake-2.4/Modules/TestForSSTREAM.cxx -#usr/local/share/cmake-2.4/Modules/TestForSTDNamespace.cmake -#usr/local/share/cmake-2.4/Modules/TestForSTDNamespace.cxx -#usr/local/share/cmake-2.4/Modules/UseEcos.cmake -#usr/local/share/cmake-2.4/Modules/UsePkgConfig.cmake -#usr/local/share/cmake-2.4/Modules/UseQt4.cmake -#usr/local/share/cmake-2.4/Modules/UseSWIG.cmake -#usr/local/share/cmake-2.4/Modules/UseVTK40.cmake -#usr/local/share/cmake-2.4/Modules/UseVTKBuildSettings40.cmake -#usr/local/share/cmake-2.4/Modules/UseVTKConfig40.cmake -#usr/local/share/cmake-2.4/Modules/Use_wxWindows.cmake -#usr/local/share/cmake-2.4/Modules/UsewxWidgets.cmake -#usr/local/share/cmake-2.4/Modules/VTKCompatibility.cmake -#usr/local/share/cmake-2.4/Modules/kde3init_dummy.cpp.in -#usr/local/share/cmake-2.4/Modules/kde3uic.cmake -#usr/local/share/cmake-2.4/Modules/readme.txt -#usr/local/share/cmake-2.4/Templates -#usr/local/share/cmake-2.4/Templates/CMakeLists.txt -#usr/local/share/cmake-2.4/Templates/CMakeVisualStudio6Configurations.cmake -#usr/local/share/cmake-2.4/Templates/CMakeWindowsSystemConfig.cmake -#usr/local/share/cmake-2.4/Templates/CPack.GenericDescription.txt -#usr/local/share/cmake-2.4/Templates/CPack.GenericLicense.txt -#usr/local/share/cmake-2.4/Templates/CPack.GenericWelcome.txt -#usr/local/share/cmake-2.4/Templates/CPackConfig.cmake.in -#usr/local/share/cmake-2.4/Templates/CTestScript.cmake.in -#usr/local/share/cmake-2.4/Templates/DLLFooter.dsptemplate -#usr/local/share/cmake-2.4/Templates/DLLHeader.dsptemplate -#usr/local/share/cmake-2.4/Templates/EXEFooter.dsptemplate -#usr/local/share/cmake-2.4/Templates/EXEHeader.dsptemplate -#usr/local/share/cmake-2.4/Templates/EXEWinHeader.dsptemplate -#usr/local/share/cmake-2.4/Templates/TestDriver.cxx.in -#usr/local/share/cmake-2.4/Templates/UtilityFooter.dsptemplate -#usr/local/share/cmake-2.4/Templates/UtilityHeader.dsptemplate -#usr/local/share/cmake-2.4/Templates/staticLibFooter.dsptemplate -#usr/local/share/cmake-2.4/Templates/staticLibHeader.dsptemplate -#usr/local/share/cmake-2.4/include -#usr/local/share/cmake-2.4/include/cmCPluginAPI.h +#usr/local/share/cmake-2.6 +#usr/local/share/cmake-2.6/Modules +#usr/local/share/cmake-2.6/Modules/AddFileDependencies.cmake +#usr/local/share/cmake-2.6/Modules/BundleUtilities.cmake +#usr/local/share/cmake-2.6/Modules/CMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeASM-ATTInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeASMCompiler.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeASMInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeASM_MASMInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeBackwardCompatibilityC.cmake +#usr/local/share/cmake-2.6/Modules/CMakeBackwardCompatibilityCXX.cmake +#usr/local/share/cmake-2.6/Modules/CMakeBorlandFindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeBuildSettings.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeCCompiler.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeCCompilerABI.c +#usr/local/share/cmake-2.6/Modules/CMakeCCompilerId.c.in +#usr/local/share/cmake-2.6/Modules/CMakeCInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeCXXCompiler.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeCXXCompilerABI.cpp +#usr/local/share/cmake-2.6/Modules/CMakeCXXCompilerId.cpp.in +#usr/local/share/cmake-2.6/Modules/CMakeCXXInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeCommonLanguageInclude.cmake +#usr/local/share/cmake-2.6/Modules/CMakeCompilerABI.h +#usr/local/share/cmake-2.6/Modules/CMakeConfigurableFile.in +#usr/local/share/cmake-2.6/Modules/CMakeDependentOption.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineASM-ATTCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineASMCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineASM_MASMCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineCCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineCXXCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineCompilerABI.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineCompilerId.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineFortranCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineJavaCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineRCCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeDetermineSystem.cmake +#usr/local/share/cmake-2.6/Modules/CMakeExportBuildSettings.cmake +#usr/local/share/cmake-2.6/Modules/CMakeFindBinUtils.cmake +#usr/local/share/cmake-2.6/Modules/CMakeFindFrameworks.cmake +#usr/local/share/cmake-2.6/Modules/CMakeFindWMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeFindXCode.cmake +#usr/local/share/cmake-2.6/Modules/CMakeForceCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeFortranCompiler.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeFortranCompilerId.F90.in +#usr/local/share/cmake-2.6/Modules/CMakeFortranInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeGenericSystem.cmake +#usr/local/share/cmake-2.6/Modules/CMakeImportBuildSettings.cmake +#usr/local/share/cmake-2.6/Modules/CMakeJavaCompiler.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeJavaInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeMSYSFindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeMinGWFindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeNMakeFindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakePlatformId.h.in +#usr/local/share/cmake-2.6/Modules/CMakePrintSystemInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeRCCompiler.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeRCInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeSystem.cmake.in +#usr/local/share/cmake-2.6/Modules/CMakeSystemSpecificInformation.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestASM-ATTCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestASMCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestASM_MASMCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestCCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestCXXCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestForFreeVC.cxx +#usr/local/share/cmake-2.6/Modules/CMakeTestFortranCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestGNU.c +#usr/local/share/cmake-2.6/Modules/CMakeTestJavaCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeTestNMakeCLVersion.c +#usr/local/share/cmake-2.6/Modules/CMakeTestRCCompiler.cmake +#usr/local/share/cmake-2.6/Modules/CMakeUnixFindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS6BackwardCompatibility.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS6FindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS71FindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS7BackwardCompatibility.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS7FindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS8FindMake.cmake +#usr/local/share/cmake-2.6/Modules/CMakeVS9FindMake.cmake +#usr/local/share/cmake-2.6/Modules/CPack.DS_Store.in +#usr/local/share/cmake-2.6/Modules/CPack.Description.plist.in +#usr/local/share/cmake-2.6/Modules/CPack.Info.plist.in +#usr/local/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.in +#usr/local/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.rsrc.in +#usr/local/share/cmake-2.6/Modules/CPack.OSXX11.Info.plist.in +#usr/local/share/cmake-2.6/Modules/CPack.OSXX11.main.scpt.in +#usr/local/share/cmake-2.6/Modules/CPack.RuntimeScript.in +#usr/local/share/cmake-2.6/Modules/CPack.STGZ_Header.sh.in +#usr/local/share/cmake-2.6/Modules/CPack.VolumeIcon.icns.in +#usr/local/share/cmake-2.6/Modules/CPack.background.png.in +#usr/local/share/cmake-2.6/Modules/CPack.cmake +#usr/local/share/cmake-2.6/Modules/CPack.distribution.dist.in +#usr/local/share/cmake-2.6/Modules/CPackDeb.cmake +#usr/local/share/cmake-2.6/Modules/CPackRPM.cmake +#usr/local/share/cmake-2.6/Modules/CPackZIP.cmake +#usr/local/share/cmake-2.6/Modules/CTest.cmake +#usr/local/share/cmake-2.6/Modules/CTestTargets.cmake +#usr/local/share/cmake-2.6/Modules/CheckCCompilerFlag.cmake +#usr/local/share/cmake-2.6/Modules/CheckCSourceCompiles.cmake +#usr/local/share/cmake-2.6/Modules/CheckCSourceRuns.cmake +#usr/local/share/cmake-2.6/Modules/CheckCXXCompilerFlag.cmake +#usr/local/share/cmake-2.6/Modules/CheckCXXSourceCompiles.cmake +#usr/local/share/cmake-2.6/Modules/CheckCXXSourceRuns.cmake +#usr/local/share/cmake-2.6/Modules/CheckForPthreads.c +#usr/local/share/cmake-2.6/Modules/CheckFortranFunctionExists.cmake +#usr/local/share/cmake-2.6/Modules/CheckFunctionExists.c +#usr/local/share/cmake-2.6/Modules/CheckFunctionExists.cmake +#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.c.in +#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.cmake +#usr/local/share/cmake-2.6/Modules/CheckIncludeFile.cxx.in +#usr/local/share/cmake-2.6/Modules/CheckIncludeFileCXX.cmake +#usr/local/share/cmake-2.6/Modules/CheckIncludeFiles.cmake +#usr/local/share/cmake-2.6/Modules/CheckLibraryExists.cmake +#usr/local/share/cmake-2.6/Modules/CheckLibraryExists.lists.in +#usr/local/share/cmake-2.6/Modules/CheckSizeOf.cmake +#usr/local/share/cmake-2.6/Modules/CheckStructHasMember.cmake +#usr/local/share/cmake-2.6/Modules/CheckSymbolExists.cmake +#usr/local/share/cmake-2.6/Modules/CheckTypeSize.cmake +#usr/local/share/cmake-2.6/Modules/CheckTypeSizeC.c.in +#usr/local/share/cmake-2.6/Modules/CheckVariableExists.c +#usr/local/share/cmake-2.6/Modules/CheckVariableExists.cmake +#usr/local/share/cmake-2.6/Modules/Dart.cmake +#usr/local/share/cmake-2.6/Modules/DartConfiguration.tcl.in +#usr/local/share/cmake-2.6/Modules/Documentation.cmake +#usr/local/share/cmake-2.6/Modules/DummyCXXFile.cxx +#usr/local/share/cmake-2.6/Modules/FLTKCompatibility.cmake +#usr/local/share/cmake-2.6/Modules/FeatureSummary.cmake +#usr/local/share/cmake-2.6/Modules/FindASPELL.cmake +#usr/local/share/cmake-2.6/Modules/FindAVIFile.cmake +#usr/local/share/cmake-2.6/Modules/FindBLAS.cmake +#usr/local/share/cmake-2.6/Modules/FindBZip2.cmake +#usr/local/share/cmake-2.6/Modules/FindBoost.cmake +#usr/local/share/cmake-2.6/Modules/FindCABLE.cmake +#usr/local/share/cmake-2.6/Modules/FindCURL.cmake +#usr/local/share/cmake-2.6/Modules/FindCVS.cmake +#usr/local/share/cmake-2.6/Modules/FindCoin3D.cmake +#usr/local/share/cmake-2.6/Modules/FindCups.cmake +#usr/local/share/cmake-2.6/Modules/FindCurses.cmake +#usr/local/share/cmake-2.6/Modules/FindCxxTest.cmake +#usr/local/share/cmake-2.6/Modules/FindCygwin.cmake +#usr/local/share/cmake-2.6/Modules/FindDCMTK.cmake +#usr/local/share/cmake-2.6/Modules/FindDart.cmake +#usr/local/share/cmake-2.6/Modules/FindDevIL.cmake +#usr/local/share/cmake-2.6/Modules/FindDoxygen.cmake +#usr/local/share/cmake-2.6/Modules/FindEXPAT.cmake +#usr/local/share/cmake-2.6/Modules/FindFLTK.cmake +#usr/local/share/cmake-2.6/Modules/FindFLTK2.cmake +#usr/local/share/cmake-2.6/Modules/FindFreetype.cmake +#usr/local/share/cmake-2.6/Modules/FindGCCXML.cmake +#usr/local/share/cmake-2.6/Modules/FindGDAL.cmake +#usr/local/share/cmake-2.6/Modules/FindGIF.cmake +#usr/local/share/cmake-2.6/Modules/FindGLU.cmake +#usr/local/share/cmake-2.6/Modules/FindGLUT.cmake +#usr/local/share/cmake-2.6/Modules/FindGTK.cmake +#usr/local/share/cmake-2.6/Modules/FindGettext.cmake +#usr/local/share/cmake-2.6/Modules/FindGnuplot.cmake +#usr/local/share/cmake-2.6/Modules/FindHSPELL.cmake +#usr/local/share/cmake-2.6/Modules/FindHTMLHelp.cmake +#usr/local/share/cmake-2.6/Modules/FindITK.cmake +#usr/local/share/cmake-2.6/Modules/FindImageMagick.cmake +#usr/local/share/cmake-2.6/Modules/FindJNI.cmake +#usr/local/share/cmake-2.6/Modules/FindJPEG.cmake +#usr/local/share/cmake-2.6/Modules/FindJasper.cmake +#usr/local/share/cmake-2.6/Modules/FindJava.cmake +#usr/local/share/cmake-2.6/Modules/FindKDE3.cmake +#usr/local/share/cmake-2.6/Modules/FindKDE4.cmake +#usr/local/share/cmake-2.6/Modules/FindLAPACK.cmake +#usr/local/share/cmake-2.6/Modules/FindLATEX.cmake +#usr/local/share/cmake-2.6/Modules/FindLibXml2.cmake +#usr/local/share/cmake-2.6/Modules/FindLibXslt.cmake +#usr/local/share/cmake-2.6/Modules/FindLua50.cmake +#usr/local/share/cmake-2.6/Modules/FindLua51.cmake +#usr/local/share/cmake-2.6/Modules/FindMFC.cmake +#usr/local/share/cmake-2.6/Modules/FindMPEG.cmake +#usr/local/share/cmake-2.6/Modules/FindMPEG2.cmake +#usr/local/share/cmake-2.6/Modules/FindMPI.cmake +#usr/local/share/cmake-2.6/Modules/FindMatlab.cmake +#usr/local/share/cmake-2.6/Modules/FindMotif.cmake +#usr/local/share/cmake-2.6/Modules/FindOpenAL.cmake +#usr/local/share/cmake-2.6/Modules/FindOpenGL.cmake +#usr/local/share/cmake-2.6/Modules/FindOpenMP.cmake +#usr/local/share/cmake-2.6/Modules/FindOpenSSL.cmake +#usr/local/share/cmake-2.6/Modules/FindOpenSceneGraph.cmake +#usr/local/share/cmake-2.6/Modules/FindOpenThreads.cmake +#usr/local/share/cmake-2.6/Modules/FindPHP4.cmake +#usr/local/share/cmake-2.6/Modules/FindPNG.cmake +#usr/local/share/cmake-2.6/Modules/FindPackageHandleStandardArgs.cmake +#usr/local/share/cmake-2.6/Modules/FindPackageMessage.cmake +#usr/local/share/cmake-2.6/Modules/FindPerl.cmake +#usr/local/share/cmake-2.6/Modules/FindPerlLibs.cmake +#usr/local/share/cmake-2.6/Modules/FindPhysFS.cmake +#usr/local/share/cmake-2.6/Modules/FindPike.cmake +#usr/local/share/cmake-2.6/Modules/FindPkgConfig.cmake +#usr/local/share/cmake-2.6/Modules/FindProducer.cmake +#usr/local/share/cmake-2.6/Modules/FindPythonInterp.cmake +#usr/local/share/cmake-2.6/Modules/FindPythonLibs.cmake +#usr/local/share/cmake-2.6/Modules/FindQt.cmake +#usr/local/share/cmake-2.6/Modules/FindQt3.cmake +#usr/local/share/cmake-2.6/Modules/FindQt4.cmake +#usr/local/share/cmake-2.6/Modules/FindQuickTime.cmake +#usr/local/share/cmake-2.6/Modules/FindRTI.cmake +#usr/local/share/cmake-2.6/Modules/FindRuby.cmake +#usr/local/share/cmake-2.6/Modules/FindSDL.cmake +#usr/local/share/cmake-2.6/Modules/FindSDL_image.cmake +#usr/local/share/cmake-2.6/Modules/FindSDL_mixer.cmake +#usr/local/share/cmake-2.6/Modules/FindSDL_net.cmake +#usr/local/share/cmake-2.6/Modules/FindSDL_sound.cmake +#usr/local/share/cmake-2.6/Modules/FindSDL_ttf.cmake +#usr/local/share/cmake-2.6/Modules/FindSWIG.cmake +#usr/local/share/cmake-2.6/Modules/FindSelfPackers.cmake +#usr/local/share/cmake-2.6/Modules/FindSquish.cmake +#usr/local/share/cmake-2.6/Modules/FindSubversion.cmake +#usr/local/share/cmake-2.6/Modules/FindTCL.cmake +#usr/local/share/cmake-2.6/Modules/FindTIFF.cmake +#usr/local/share/cmake-2.6/Modules/FindTclStub.cmake +#usr/local/share/cmake-2.6/Modules/FindTclsh.cmake +#usr/local/share/cmake-2.6/Modules/FindThreads.cmake +#usr/local/share/cmake-2.6/Modules/FindUnixCommands.cmake +#usr/local/share/cmake-2.6/Modules/FindVTK.cmake +#usr/local/share/cmake-2.6/Modules/FindWget.cmake +#usr/local/share/cmake-2.6/Modules/FindWish.cmake +#usr/local/share/cmake-2.6/Modules/FindX11.cmake +#usr/local/share/cmake-2.6/Modules/FindXMLRPC.cmake +#usr/local/share/cmake-2.6/Modules/FindZLIB.cmake +#usr/local/share/cmake-2.6/Modules/Findosg.cmake +#usr/local/share/cmake-2.6/Modules/FindosgAnimation.cmake +#usr/local/share/cmake-2.6/Modules/FindosgDB.cmake +#usr/local/share/cmake-2.6/Modules/FindosgFX.cmake +#usr/local/share/cmake-2.6/Modules/FindosgGA.cmake +#usr/local/share/cmake-2.6/Modules/FindosgIntrospection.cmake +#usr/local/share/cmake-2.6/Modules/FindosgManipulator.cmake +#usr/local/share/cmake-2.6/Modules/FindosgParticle.cmake +#usr/local/share/cmake-2.6/Modules/FindosgProducer.cmake +#usr/local/share/cmake-2.6/Modules/FindosgShadow.cmake +#usr/local/share/cmake-2.6/Modules/FindosgSim.cmake +#usr/local/share/cmake-2.6/Modules/FindosgTerrain.cmake +#usr/local/share/cmake-2.6/Modules/FindosgText.cmake +#usr/local/share/cmake-2.6/Modules/FindosgUtil.cmake +#usr/local/share/cmake-2.6/Modules/FindosgViewer.cmake +#usr/local/share/cmake-2.6/Modules/FindosgVolume.cmake +#usr/local/share/cmake-2.6/Modules/FindosgWidget.cmake +#usr/local/share/cmake-2.6/Modules/Findosg_functions.cmake +#usr/local/share/cmake-2.6/Modules/FindwxWidgets.cmake +#usr/local/share/cmake-2.6/Modules/FindwxWindows.cmake +#usr/local/share/cmake-2.6/Modules/FortranCInterface.cmake +#usr/local/share/cmake-2.6/Modules/FortranCInterface.h.in +#usr/local/share/cmake-2.6/Modules/GetPrerequisites.cmake +#usr/local/share/cmake-2.6/Modules/ITKCompatibility.cmake +#usr/local/share/cmake-2.6/Modules/InstallRequiredSystemLibraries.cmake +#usr/local/share/cmake-2.6/Modules/KDE3Macros.cmake +#usr/local/share/cmake-2.6/Modules/MacOSXBundleInfo.plist.in +#usr/local/share/cmake-2.6/Modules/MacOSXFrameworkInfo.plist.in +#usr/local/share/cmake-2.6/Modules/MacroAddFileDependencies.cmake +#usr/local/share/cmake-2.6/Modules/NSIS.InstallOptions.ini.in +#usr/local/share/cmake-2.6/Modules/NSIS.template.in +#usr/local/share/cmake-2.6/Modules/Platform +#usr/local/share/cmake-2.6/Modules/Platform/AIX-VisualAge-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/AIX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/BSDOS.cmake +#usr/local/share/cmake-2.6/Modules/Platform/BeOS.cmake +#usr/local/share/cmake-2.6/Modules/Platform/BlueGeneL.cmake +#usr/local/share/cmake-2.6/Modules/Platform/CYGWIN-g77.cmake +#usr/local/share/cmake-2.6/Modules/Platform/CYGWIN.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Catamount.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Darwin-icc.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Darwin-icpc.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Darwin-xlc.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Darwin.cmake +#usr/local/share/cmake-2.6/Modules/Platform/DragonFly.cmake +#usr/local/share/cmake-2.6/Modules/Platform/FreeBSD.cmake +#usr/local/share/cmake-2.6/Modules/Platform/GNU.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-ASM.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-C.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-CXX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Generic-ADSP-Common.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Generic-SDCC-C.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Generic.cmake +#usr/local/share/cmake-2.6/Modules/Platform/HP-UX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Haiku.cmake +#usr/local/share/cmake-2.6/Modules/Platform/IRIX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/IRIX64.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-GNU-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-C.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-CXX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-Intel-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-C.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-CXX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-PGI-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-C.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-CXX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-SunPro-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-VisualAge-C.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-VisualAge-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-como.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-icpc.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux-ifort.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Linux.cmake +#usr/local/share/cmake-2.6/Modules/Platform/MP-RAS.cmake +#usr/local/share/cmake-2.6/Modules/Platform/NetBSD.cmake +#usr/local/share/cmake-2.6/Modules/Platform/OSF1.cmake +#usr/local/share/cmake-2.6/Modules/Platform/OpenBSD.cmake +#usr/local/share/cmake-2.6/Modules/Platform/QNX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/RISCos.cmake +#usr/local/share/cmake-2.6/Modules/Platform/SCO_SV.cmake +#usr/local/share/cmake-2.6/Modules/Platform/SINIX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/SunOS-SunPro-Fortran.cmake +#usr/local/share/cmake-2.6/Modules/Platform/SunOS.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Tru64.cmake +#usr/local/share/cmake-2.6/Modules/Platform/ULTRIX.cmake +#usr/local/share/cmake-2.6/Modules/Platform/UNIX_SV.cmake +#usr/local/share/cmake-2.6/Modules/Platform/UnixPaths.cmake +#usr/local/share/cmake-2.6/Modules/Platform/UnixWare.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-bcc32.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-cl.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-cl.cmake.in +#usr/local/share/cmake-2.6/Modules/Platform/Windows-df.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-g++.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-g77.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-gcc.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-icl.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-ifort.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows-wcl386.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Windows.cmake +#usr/local/share/cmake-2.6/Modules/Platform/WindowsPaths.cmake +#usr/local/share/cmake-2.6/Modules/Platform/Xenix.cmake +#usr/local/share/cmake-2.6/Modules/Platform/cl.cmake +#usr/local/share/cmake-2.6/Modules/Platform/eCos.cmake +#usr/local/share/cmake-2.6/Modules/Platform/g77.cmake +#usr/local/share/cmake-2.6/Modules/Platform/gas.cmake +#usr/local/share/cmake-2.6/Modules/Platform/gcc.cmake +#usr/local/share/cmake-2.6/Modules/Platform/kFreeBSD.cmake +#usr/local/share/cmake-2.6/Modules/Platform/syllable.cmake +#usr/local/share/cmake-2.6/Modules/Platform/xlf.cmake +#usr/local/share/cmake-2.6/Modules/SquishTestScript.cmake +#usr/local/share/cmake-2.6/Modules/SystemInformation.cmake +#usr/local/share/cmake-2.6/Modules/SystemInformation.in +#usr/local/share/cmake-2.6/Modules/TestBigEndian.cmake +#usr/local/share/cmake-2.6/Modules/TestCXXAcceptsFlag.cmake +#usr/local/share/cmake-2.6/Modules/TestEndianess.c.in +#usr/local/share/cmake-2.6/Modules/TestForANSIForScope.cmake +#usr/local/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cmake +#usr/local/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cxx +#usr/local/share/cmake-2.6/Modules/TestForAnsiForScope.cxx +#usr/local/share/cmake-2.6/Modules/TestForSSTREAM.cmake +#usr/local/share/cmake-2.6/Modules/TestForSSTREAM.cxx +#usr/local/share/cmake-2.6/Modules/TestForSTDNamespace.cmake +#usr/local/share/cmake-2.6/Modules/TestForSTDNamespace.cxx +#usr/local/share/cmake-2.6/Modules/UseEcos.cmake +#usr/local/share/cmake-2.6/Modules/UsePkgConfig.cmake +#usr/local/share/cmake-2.6/Modules/UseQt4.cmake +#usr/local/share/cmake-2.6/Modules/UseSWIG.cmake +#usr/local/share/cmake-2.6/Modules/UseVTK40.cmake +#usr/local/share/cmake-2.6/Modules/UseVTKBuildSettings40.cmake +#usr/local/share/cmake-2.6/Modules/UseVTKConfig40.cmake +#usr/local/share/cmake-2.6/Modules/Use_wxWindows.cmake +#usr/local/share/cmake-2.6/Modules/UsewxWidgets.cmake +#usr/local/share/cmake-2.6/Modules/VTKCompatibility.cmake +#usr/local/share/cmake-2.6/Modules/ecos_clean.cmake +#usr/local/share/cmake-2.6/Modules/kde3init_dummy.cpp.in +#usr/local/share/cmake-2.6/Modules/kde3uic.cmake +#usr/local/share/cmake-2.6/Modules/readme.txt +#usr/local/share/cmake-2.6/Templates +#usr/local/share/cmake-2.6/Templates/CMakeLists.txt +#usr/local/share/cmake-2.6/Templates/CMakeVSMacros1.vsmacros +#usr/local/share/cmake-2.6/Templates/CMakeVSMacros2.vsmacros +#usr/local/share/cmake-2.6/Templates/CMakeVisualStudio6Configurations.cmake +#usr/local/share/cmake-2.6/Templates/CPack.GenericDescription.txt +#usr/local/share/cmake-2.6/Templates/CPack.GenericLicense.txt +#usr/local/share/cmake-2.6/Templates/CPack.GenericWelcome.txt +#usr/local/share/cmake-2.6/Templates/CPackConfig.cmake.in +#usr/local/share/cmake-2.6/Templates/CTestScript.cmake.in +#usr/local/share/cmake-2.6/Templates/DLLFooter.dsptemplate +#usr/local/share/cmake-2.6/Templates/DLLHeader.dsptemplate +#usr/local/share/cmake-2.6/Templates/EXEFooter.dsptemplate +#usr/local/share/cmake-2.6/Templates/EXEHeader.dsptemplate +#usr/local/share/cmake-2.6/Templates/EXEWinHeader.dsptemplate +#usr/local/share/cmake-2.6/Templates/TestDriver.cxx.in +#usr/local/share/cmake-2.6/Templates/UtilityFooter.dsptemplate +#usr/local/share/cmake-2.6/Templates/UtilityHeader.dsptemplate +#usr/local/share/cmake-2.6/Templates/cygwin-package.sh.in +#usr/local/share/cmake-2.6/Templates/staticLibFooter.dsptemplate +#usr/local/share/cmake-2.6/Templates/staticLibHeader.dsptemplate +#usr/local/share/cmake-2.6/include +#usr/local/share/cmake-2.6/include/cmCPluginAPI.h From 52bc0ab96f2cb0b2fce4fd348f2b5102a33d9bf7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 15 May 2011 17:54:56 +0200 Subject: [PATCH 022/159] next-core: add gmp to updater. --- config/rootfiles/core/next/filelists/gmp | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/next/filelists/gmp diff --git a/config/rootfiles/core/next/filelists/gmp b/config/rootfiles/core/next/filelists/gmp new file mode 120000 index 000000000..8662a8982 --- /dev/null +++ b/config/rootfiles/core/next/filelists/gmp @@ -0,0 +1 @@ +../../../common/gmp \ No newline at end of file From 62b923f9dfbf0c86ac49405c884d0b1167c71b5f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 21 May 2011 15:22:35 +0200 Subject: [PATCH 023/159] kvm-kmod: update to 2.6.38.6. --- lfs/kvm-kmod | 5 ++- ...ove_pvclock_scale_delta_redifinition.patch | 45 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod index e443b7034..b6418acb1 100644 --- a/lfs/kvm-kmod +++ b/lfs/kvm-kmod @@ -34,7 +34,7 @@ else endif endif -VER = 2.6.34.1 +VER = 2.6.38.6 THISAPP = kvm-kmod-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c227b58ee33f6035f16abd258bcd92ec +$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5 install : $(TARGET) @@ -83,6 +83,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && install -m 644 x86/*.ko \ diff --git a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch new file mode 100644 index 000000000..331e8a187 --- /dev/null +++ b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch @@ -0,0 +1,45 @@ +diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.38.6/x86/external-module-compat.h +--- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200 ++++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.529469540 +0200 +@@ -1064,41 +1064,6 @@ + + #endif /* >= 2.6.36 */ + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) +-static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) +-{ +- u64 product; +-#ifdef __i386__ +- u32 tmp1, tmp2; +-#endif +- +- if (shift < 0) +- delta >>= -shift; +- else +- delta <<= shift; +- +-#ifdef __i386__ +- __asm__ ( +- "mul %5 ; " +- "mov %4,%%eax ; " +- "mov %%edx,%4 ; " +- "mul %5 ; " +- "xor %5,%5 ; " +- "add %4,%%eax ; " +- "adc %5,%%edx ; " +- : "=A" (product), "=r" (tmp1), "=r" (tmp2) +- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); +-#elif defined(__x86_64__) +- __asm__ ( +- "mul %%rdx ; shrd $32,%%rdx,%%rax" +- : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); +-#else +-#error implement me! +-#endif +- +- return product; +-} +-#endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \ + LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64) From c8796dfba88eb17832cfc60f96c92e626d7cabf7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 21 May 2011 23:37:15 +0200 Subject: [PATCH 024/159] strongswan: update to 4.5.2. --- config/rootfiles/common/strongswan | 8 +++----- config/rootfiles/core/next/filelists/strongswan | 1 + lfs/strongswan | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/strongswan diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index df093b075..6e97b170f 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -40,6 +40,9 @@ usr/libexec/ipsec/plugins/libstrongswan-aes.so #usr/libexec/ipsec/plugins/libstrongswan-attr.a #usr/libexec/ipsec/plugins/libstrongswan-attr.la usr/libexec/ipsec/plugins/libstrongswan-attr.so +#usr/libexec/ipsec/plugins/libstrongswan-constraints.a +#usr/libexec/ipsec/plugins/libstrongswan-constraints.la +usr/libexec/ipsec/plugins/libstrongswan-constraints.so #usr/libexec/ipsec/plugins/libstrongswan-curl.a #usr/libexec/ipsec/plugins/libstrongswan-curl.la usr/libexec/ipsec/plugins/libstrongswan-curl.so @@ -118,14 +121,11 @@ usr/sbin/ipsec #usr/share/man/man3/anyaddr.3 #usr/share/man/man3/atoaddr.3 #usr/share/man/man3/atoasr.3 -#usr/share/man/man3/atosa.3 #usr/share/man/man3/atoul.3 #usr/share/man/man3/goodmask.3 #usr/share/man/man3/initaddr.3 #usr/share/man/man3/initsubnet.3 -#usr/share/man/man3/keyblobtoid.3 #usr/share/man/man3/portof.3 -#usr/share/man/man3/prng.3 #usr/share/man/man3/rangetosubnet.3 #usr/share/man/man3/sameaddr.3 #usr/share/man/man3/subnetof.3 @@ -136,13 +136,11 @@ usr/sbin/ipsec #usr/share/man/man5/ipsec.conf.5 #usr/share/man/man5/ipsec.secrets.5 #usr/share/man/man5/strongswan.conf.5 -#usr/share/man/man8/_copyright.8 #usr/share/man/man8/_updown.8 #usr/share/man/man8/_updown_espmark.8 #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/pluto.8 #usr/share/man/man8/scepclient.8 -#usr/share/man/man8/starter.8 etc/ipsec.user.conf etc/ipsec.user.secrets diff --git a/config/rootfiles/core/next/filelists/strongswan b/config/rootfiles/core/next/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/next/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/lfs/strongswan b/lfs/strongswan index 380d351d9..8c27b1b45 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.5.0 +VER = 4.5.2 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cfbd6efef87830a2e7cc4175bde7ac84 +$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953 install : $(TARGET) From e1aa5a9bece1ac86808bbc26e54e133a3d7d61e6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 23 May 2011 23:54:50 +0200 Subject: [PATCH 025/159] kernel: update to 2.6.32.41. --- config/rootfiles/core/next/update.sh | 2 +- lfs/linux | 6 +++--- src/paks/linux-pae/install.sh | 4 ++-- src/paks/linux-pae/update.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 68c3af506..444fccebc 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.40" +KVER="2.6.32.41" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/linux b/lfs/linux index 16ae152b4..fcae433b2 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .40 -VER = 2.6.32.40 +PATCHLEVEL = .41 +VER = 2.6.32.41 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 043403f6264c1ec0aea67a5f039d0a31 +$(DL_FILE)_MD5 = 919fe13fe57f903eb03e291dcaeabf57 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 1a663e95d..83e9f4900 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -17,14 +17,14 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2010 IPFire-Team . # +# Copyright (C) 2007-2011 IPFire-Team . # # # ############################################################################ # . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.40 +KVER=2.6.32.41 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh index abbaf47c3..2878dfb4f 100644 --- a/src/paks/linux-pae/update.sh +++ b/src/paks/linux-pae/update.sh @@ -17,11 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team . # +# Copyright (C) 2007-2011 IPFire-Team . # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -#Don't remove old xen kernel at update +#Don't remove old pae kernel at update #./uninstall.sh ./install.sh From 02d7d49c91b18b9f2086578fae8d26afdab8c8bb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 May 2011 07:13:05 +0200 Subject: [PATCH 026/159] kernel: missed kernel-version at linux-xen install script. --- src/paks/linux-xen/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 5e03a740c..55c376b3b 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.40 +KVER=2.6.32.41 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then From cc03d52ee45e30af94e909f2bab4b4a838369cb6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 May 2011 08:22:51 +0200 Subject: [PATCH 027/159] autoupdate kernel version at package install and core update scripts. --- config/rootfiles/core/next/update.sh | 2 +- lfs/Config | 1 + lfs/core-updates | 5 ++++- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 444fccebc..070a12b74 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.41" +KVER="xxxKVERxxx" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/Config b/lfs/Config index 01b9cf1c9..fac10eba2 100644 --- a/lfs/Config +++ b/lfs/Config @@ -196,6 +196,7 @@ define PAK fi cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES + sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh chmod 755 /install/packages/package/{{,un}install,update}.sh cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \ -p --numeric-owner diff --git a/lfs/core-updates b/lfs/core-updates index f7f50cf5d..0dd2ecccb 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -63,7 +63,7 @@ core/%: #Change KVER to Kernelversion sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES - + #Remove doubled files with tar/untar/tar to save space tar -c -C / --files-from=/tmp/ROOTFILES \ -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ @@ -80,6 +80,9 @@ core/%: #build package cp -f $(DIR_SRC)/config/rootfiles/$@/update.sh /install/packages/package chmod 755 /install/packages/package/update.sh + #Change xxxKVERxxx to Kernelversion + sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh + cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \ update.sh files ROOTFILES rm -rf /install/packages/package diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 83e9f4900..60f8bbb42 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.41 +KVER=xxxKVERxxx ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 55c376b3b..70efa9db7 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.41 +KVER=xxxKVERxxx ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then From f793992b717349a28425642b3b61bc752fc53949 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 May 2011 21:17:50 +0200 Subject: [PATCH 028/159] compat-wireless: update to 2.6.39-1-sn. --- config/kernel/kernel.config.i586-ipfire | 10 +--------- config/kernel/kernel.config.i586-ipfire-pae | 10 +--------- config/kernel/kernel.config.i586-ipfire-xen | 10 +--------- config/rootfiles/common/compat-wireless | 1 - config/rootfiles/core/next/update.sh | 4 ++++ lfs/compat-wireless | 10 +++++----- .../compat-wireless-2.6.39_kfifo_module_info.patch | 14 ++++++++++++++ 7 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 src/patches/compat-wireless-2.6.39_kfifo_module_info.patch diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 3fd80c886..43bba2237 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1729,15 +1729,7 @@ CONFIG_IPW2200=m # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 8c7cf4b7d..f37b6552c 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1747,15 +1747,7 @@ CONFIG_IPW2200=m # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index e5122a97d..fa50c9543 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1525,15 +1525,7 @@ CONFIG_IPW2200=m # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index adc4ab333..80018c84d 100644 --- a/config/rootfiles/common/compat-wireless +++ b/config/rootfiles/common/compat-wireless @@ -1,3 +1,2 @@ -etc/modprobe.d/ralink_wireless etc/udev/rules.d/50-compat_firmware.rules lib/udev/compat_firmware.sh diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 070a12b74..38a1f7821 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -81,6 +81,10 @@ echo Unpack the updated files ... tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ --no-overwrite-dir +# +# Enable ralink rt73 hardware encryption again +rm -f /etc/modprobe.d/ralink_wireless + # # Start services # diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 22223d7d7..71f3bc9f3 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -34,7 +34,7 @@ else endif endif -VER = 2.6.38-3-ns +VER = 2.6.39-1-sn THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2 -$(DL_FILE)_MD5 = c4c78d1d41c28f0e9c48ab8098a0a9f2 +$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7 install : $(TARGET) @@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) + # kfifo has no license info and taints kernel + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch + # Copy USB-Net drivers from Kernel... mkdir $(DIR_APP)/drivers/net/usb/new cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new @@ -101,8 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/ cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/ - # Disable hwcrypt on rt73 ... - echo "options rt73usb nohwcrypt=1" > /etc/modprobe.d/ralink_wireless - -rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch new file mode 100644 index 000000000..eb5d2806b --- /dev/null +++ b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch @@ -0,0 +1,14 @@ +diff -Naur compat-wireless-2.6.39-1-sn.org/compat/kfifo.c compat-wireless-2.6.39-1-sn/compat/kfifo.c +--- compat-wireless-2.6.39-1-sn.org/compat/kfifo.c 2011-05-24 01:43:48.000000000 +0200 ++++ compat-wireless-2.6.39-1-sn/compat/kfifo.c 2011-05-24 17:20:06.956818313 +0200 +@@ -27,6 +27,10 @@ + #include + #include + ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Stefani Seibold "); ++MODULE_DESCRIPTION("A generic kernel FIFO implementation"); ++ + /* + * internal helper to calculate the unused elements in a fifo + */ From 2311154f58a3e71b87ee6ad67a59fafd8f2aa058 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 25 May 2011 13:33:39 +0200 Subject: [PATCH 029/159] linux-firmware: updated to 20110518. --- config/rootfiles/common/linux-firmware | 220 +++++++++++++++++- .../core/next/filelists/linux-firmware | 1 + lfs/linux-firmware | 6 +- 3 files changed, 219 insertions(+), 8 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/linux-firmware diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware index 434366635..d4b907106 100644 --- a/config/rootfiles/common/linux-firmware +++ b/config/rootfiles/common/linux-firmware @@ -1,17 +1,33 @@ #lib/firmware/3com lib/firmware/3com/3C359.bin lib/firmware/3com/typhoon.bin +lib/firmware/GPL-3 +lib/firmware/LICENCE.Marvell lib/firmware/LICENCE.agere lib/firmware/LICENCE.atheros_firmware +lib/firmware/LICENCE.broadcom_bcm43xx +lib/firmware/LICENCE.chelsio_firmware lib/firmware/LICENCE.i2400m lib/firmware/LICENCE.iwlwifi_firmware -lib/firmware/LICENCE.libertas -lib/firmware/LICENCE.mwl8k +lib/firmware/LICENCE.mwl8335 +lib/firmware/LICENCE.myri10ge_firmware +lib/firmware/LICENCE.phanfw lib/firmware/LICENCE.qla2xxx lib/firmware/LICENCE.ralink-firmware.txt +lib/firmware/LICENCE.rtlwifi_firmware.txt +lib/firmware/LICENCE.tda7706-firmware.txt +lib/firmware/LICENCE.ti-connectivity +lib/firmware/LICENCE.ueagle-atm4-firmware +lib/firmware/LICENCE.via_vt6656 lib/firmware/LICENCE.xc5000 lib/firmware/LICENSE.dib0700 lib/firmware/LICENSE.radeon_rlc +#lib/firmware/RTL8192E +lib/firmware/RTL8192E/boot.img +lib/firmware/RTL8192E/data.img +lib/firmware/RTL8192E/main.img +lib/firmware/TDA7706_OM_v2.5.1_boot.txt +lib/firmware/TDA7706_OM_v3.0.2_boot.txt lib/firmware/WHENCE #lib/firmware/acenic lib/firmware/acenic/tg1.bin @@ -26,27 +42,96 @@ lib/firmware/advansys/38C1600.bin lib/firmware/advansys/mcode.bin lib/firmware/agere_ap_fw.bin lib/firmware/agere_sta_fw.bin +#lib/firmware/ar3k +#lib/firmware/ar3k/1020200 +lib/firmware/ar3k/1020200/PS_ASIC.pst +lib/firmware/ar3k/1020200/RamPatch.txt +lib/firmware/ar3k/1020200/ar3kbdaddr.pst +#lib/firmware/ar3k/30000 +lib/firmware/ar3k/30000/PS_ASIC.pst +lib/firmware/ar3k/30000/RamPatch.txt +lib/firmware/ar3k/30000/ar3kbdaddr.pst +#lib/firmware/ar3k/30101 +lib/firmware/ar3k/30101/PS_ASIC.pst +lib/firmware/ar3k/30101/RamPatch.txt +lib/firmware/ar3k/30101/ar3kbdaddr.pst +lib/firmware/ar3k/AthrBT_0x01020001.dfu +lib/firmware/ar3k/AthrBT_0x01020200.dfu +lib/firmware/ar3k/ramps_0x01020001_26.dfu +lib/firmware/ar3k/ramps_0x01020200_26.dfu +lib/firmware/ar3k/ramps_0x01020200_40.dfu +lib/firmware/ar7010.fw +lib/firmware/ar7010_1_1.fw lib/firmware/ar9170-1.fw lib/firmware/ar9170-2.fw lib/firmware/ar9271.fw lib/firmware/ath3k-1.fw +#lib/firmware/ath6k +#lib/firmware/ath6k/AR6002 +lib/firmware/ath6k/AR6002/athwlan.bin.z77 +lib/firmware/ath6k/AR6002/data.patch.hw2_0.bin +lib/firmware/ath6k/AR6002/eeprom.bin +lib/firmware/ath6k/AR6002/eeprom.data +#lib/firmware/ath6k/AR6003 +#lib/firmware/ath6k/AR6003/hw1.0 +lib/firmware/ath6k/AR6003/hw1.0/athwlan.bin.z77 +lib/firmware/ath6k/AR6003/hw1.0/bdata.SD31.bin +lib/firmware/ath6k/AR6003/hw1.0/bdata.SD32.bin +lib/firmware/ath6k/AR6003/hw1.0/bdata.WB31.bin +lib/firmware/ath6k/AR6003/hw1.0/data.patch.bin +lib/firmware/ath6k/AR6003/hw1.0/otp.bin.z77 +#lib/firmware/ath6k/AR6003/hw2.0 +lib/firmware/ath6k/AR6003/hw2.0/athwlan.bin.z77 +lib/firmware/ath6k/AR6003/hw2.0/bdata.SD31.bin +lib/firmware/ath6k/AR6003/hw2.0/bdata.SD32.bin +lib/firmware/ath6k/AR6003/hw2.0/bdata.WB31.bin +lib/firmware/ath6k/AR6003/hw2.0/data.patch.bin +lib/firmware/ath6k/AR6003/hw2.0/otp.bin.z77 +#lib/firmware/ath6k/AR6003/hw2.1.1 +lib/firmware/ath6k/AR6003/hw2.1.1/athwlan.bin +lib/firmware/ath6k/AR6003/hw2.1.1/bdata.SD31.bin +lib/firmware/ath6k/AR6003/hw2.1.1/bdata.SD32.bin +lib/firmware/ath6k/AR6003/hw2.1.1/bdata.WB31.bin +lib/firmware/ath6k/AR6003/hw2.1.1/data.patch.bin +lib/firmware/ath6k/AR6003/hw2.1.1/endpointping.bin +lib/firmware/ath6k/AR6003/hw2.1.1/otp.bin lib/firmware/atmsar11.fw #lib/firmware/av7110 lib/firmware/av7110/bootcode.bin #lib/firmware/bnx2 lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw +lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw +lib/firmware/bnx2/bnx2-mips-06-6.0.15.fw +lib/firmware/bnx2/bnx2-mips-06-6.2.1.fw lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw +lib/firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw +lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw +lib/firmware/bnx2/bnx2-mips-09-6.0.17.fw +lib/firmware/bnx2/bnx2-mips-09-6.2.1.fw +lib/firmware/bnx2/bnx2-mips-09-6.2.1a.fw lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw +lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw lib/firmware/bnx2/bnx2-rv2p-09-4.6.15.fw +lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw +lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw +lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw +lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw lib/firmware/bnx2x-e1-4.8.53.0.fw +lib/firmware/bnx2x-e1-5.2.13.0.fw lib/firmware/bnx2x-e1-5.2.7.0.fw lib/firmware/bnx2x-e1h-4.8.53.0.fw +lib/firmware/bnx2x-e1h-5.2.13.0.fw lib/firmware/bnx2x-e1h-5.2.7.0.fw +#lib/firmware/brcm +lib/firmware/brcm/bcm4329-fullmac-4.bin +lib/firmware/brcm/bcm4329-fullmac-4.txt +lib/firmware/brcm/bcm43xx-0.fw +lib/firmware/brcm/bcm43xx_hdr-0.fw #lib/firmware/cis lib/firmware/cis/3CCFEM556.cis lib/firmware/cis/3CXEM556.cis @@ -58,10 +143,25 @@ lib/firmware/cis/MT5634ZLX.cis lib/firmware/cis/NE2K.cis lib/firmware/cis/PCMLM28.cis lib/firmware/cis/PE-200.cis +lib/firmware/cis/PE520.cis lib/firmware/cis/RS-COM-2P.cis lib/firmware/cis/SW_555_SER.cis lib/firmware/cis/SW_7xx_SER.cis lib/firmware/cis/SW_8xx_SER.cis +#lib/firmware/cis/src +lib/firmware/cis/src/3CCFEM556.cis +lib/firmware/cis/src/3CXEM556.cis +lib/firmware/cis/src/COMpad2.cis +lib/firmware/cis/src/COMpad4.cis +lib/firmware/cis/src/DP83903.cis +lib/firmware/cis/src/LA-PCM.cis +lib/firmware/cis/src/MT5634ZLX.cis +lib/firmware/cis/src/NE2K.cis +lib/firmware/cis/src/PCMLM28.cis +lib/firmware/cis/src/PE-200.cis +lib/firmware/cis/src/PE520.cis +lib/firmware/cis/src/RS-COM-2P.cis +lib/firmware/cis/src/tamarack.cis lib/firmware/cis/tamarack.cis #lib/firmware/cpia2 lib/firmware/cpia2/stv0672_vp4.bin @@ -73,7 +173,10 @@ lib/firmware/cxgb3/t3b_psram-1.1.0.bin lib/firmware/cxgb3/t3c_psram-1.1.0.bin lib/firmware/cxgb3/t3fw-7.0.0.bin lib/firmware/cxgb3/t3fw-7.1.0.bin +lib/firmware/cxgb3/t3fw-7.10.0.bin lib/firmware/cxgb3/t3fw-7.4.0.bin +#lib/firmware/cxgb4 +lib/firmware/cxgb4/t4fw.bin #lib/firmware/dabusb lib/firmware/dabusb/bitstream.bin lib/firmware/dabusb/firmware.fw @@ -105,16 +208,25 @@ lib/firmware/emi62/spdif.fw lib/firmware/ess/maestro3_assp_kernel.fw lib/firmware/ess/maestro3_assp_minisrc.fw lib/firmware/f2255usb.bin -lib/firmware/i2400m-fw-usb-1.3.sbcf +lib/firmware/htc_7010.fw +lib/firmware/htc_9271.fw lib/firmware/i2400m-fw-usb-1.4.sbcf +lib/firmware/i2400m-fw-usb-1.5.sbcf +lib/firmware/i6050-fw-usb-1.5.sbcf lib/firmware/intelliport2.bin +lib/firmware/iwlwifi-100-5.ucode lib/firmware/iwlwifi-1000-3.ucode lib/firmware/iwlwifi-3945-2.ucode lib/firmware/iwlwifi-4965-2.ucode lib/firmware/iwlwifi-5000-1.ucode lib/firmware/iwlwifi-5000-2.ucode +lib/firmware/iwlwifi-5000-5.ucode lib/firmware/iwlwifi-5150-2.ucode lib/firmware/iwlwifi-6000-4.ucode +lib/firmware/iwlwifi-6000g2a-5.ucode +lib/firmware/iwlwifi-6000g2b-5.ucode +lib/firmware/iwlwifi-6050-4.ucode +lib/firmware/iwlwifi-6050-5.ucode #lib/firmware/kaweth lib/firmware/kaweth/new_code.bin lib/firmware/kaweth/new_code_fix.bin @@ -140,6 +252,7 @@ lib/firmware/keyspan_pda/keyspan_pda.fw lib/firmware/keyspan_pda/xircom_pgs.fw #lib/firmware/korg lib/firmware/korg/k1212.dsp +lib/firmware/lgs8g75.fw #lib/firmware/libertas lib/firmware/libertas/cf8385.bin lib/firmware/libertas/cf8385_helper.bin @@ -165,16 +278,30 @@ lib/firmware/libertas/usb8682.bin #lib/firmware/matrox lib/firmware/matrox/g200_warp.fw lib/firmware/matrox/g400_warp.fw +#lib/firmware/mrvl +lib/firmware/mrvl/sd8787_uapsta.bin lib/firmware/mts_cdma.fw lib/firmware/mts_edge.fw lib/firmware/mts_gsm.fw +lib/firmware/mts_mt9234mu.fw +lib/firmware/mts_mt9234zba.fw +lib/firmware/mwl8335_duplex.fw #lib/firmware/mwl8k +lib/firmware/mwl8k/fmimage_8366.fw +lib/firmware/mwl8k/fmimage_8366_ap-1.fw +lib/firmware/mwl8k/fmimage_8366_ap-2.fw lib/firmware/mwl8k/fmimage_8687.fw +lib/firmware/mwl8k/helper_8366.fw lib/firmware/mwl8k/helper_8687.fw +lib/firmware/myri10ge_eth_z8e.dat +lib/firmware/myri10ge_ethp_z8e.dat +lib/firmware/myri10ge_rss_eth_z8e.dat +lib/firmware/myri10ge_rss_ethp_z8e.dat #lib/firmware/myricom lib/firmware/myricom/lanai.bin #lib/firmware/ositech lib/firmware/ositech/Xilinx7OD.bin +lib/firmware/phanfw.bin lib/firmware/ql2100_fw.bin lib/firmware/ql2200_fw.bin lib/firmware/ql2300_fw.bin @@ -186,9 +313,32 @@ lib/firmware/qlogic/1040.bin lib/firmware/qlogic/12160.bin lib/firmware/qlogic/1280.bin lib/firmware/qlogic/isp1000.bin +lib/firmware/qlogic/sd7220.fw #lib/firmware/r128 lib/firmware/r128/r128_cce.bin #lib/firmware/radeon +lib/firmware/radeon/BARTS_mc.bin +lib/firmware/radeon/BARTS_me.bin +lib/firmware/radeon/BARTS_pfp.bin +lib/firmware/radeon/BTC_rlc.bin +lib/firmware/radeon/CAICOS_mc.bin +lib/firmware/radeon/CAICOS_me.bin +lib/firmware/radeon/CAICOS_pfp.bin +lib/firmware/radeon/CAYMAN_mc.bin +lib/firmware/radeon/CAYMAN_me.bin +lib/firmware/radeon/CAYMAN_pfp.bin +lib/firmware/radeon/CAYMAN_rlc.bin +lib/firmware/radeon/CEDAR_me.bin +lib/firmware/radeon/CEDAR_pfp.bin +lib/firmware/radeon/CEDAR_rlc.bin +lib/firmware/radeon/CYPRESS_me.bin +lib/firmware/radeon/CYPRESS_pfp.bin +lib/firmware/radeon/CYPRESS_rlc.bin +lib/firmware/radeon/JUNIPER_me.bin +lib/firmware/radeon/JUNIPER_pfp.bin +lib/firmware/radeon/JUNIPER_rlc.bin +lib/firmware/radeon/PALM_me.bin +lib/firmware/radeon/PALM_pfp.bin lib/firmware/radeon/R100_cp.bin lib/firmware/radeon/R200_cp.bin lib/firmware/radeon/R300_cp.bin @@ -198,6 +348,9 @@ lib/firmware/radeon/R600_me.bin lib/firmware/radeon/R600_pfp.bin lib/firmware/radeon/R600_rlc.bin lib/firmware/radeon/R700_rlc.bin +lib/firmware/radeon/REDWOOD_me.bin +lib/firmware/radeon/REDWOOD_pfp.bin +lib/firmware/radeon/REDWOOD_rlc.bin lib/firmware/radeon/RS600_cp.bin lib/firmware/radeon/RS690_cp.bin lib/firmware/radeon/RS780_me.bin @@ -218,12 +371,32 @@ lib/firmware/radeon/RV730_me.bin lib/firmware/radeon/RV730_pfp.bin lib/firmware/radeon/RV770_me.bin lib/firmware/radeon/RV770_pfp.bin +lib/firmware/radeon/SUMO_rlc.bin +lib/firmware/radeon/TURKS_mc.bin +lib/firmware/radeon/TURKS_me.bin +lib/firmware/radeon/TURKS_pfp.bin lib/firmware/rt2561.bin lib/firmware/rt2561s.bin lib/firmware/rt2661.bin lib/firmware/rt2860.bin lib/firmware/rt2870.bin +lib/firmware/rt3070.bin +lib/firmware/rt3071.bin +lib/firmware/rt3090.bin lib/firmware/rt73.bin +#lib/firmware/rtl_nic +lib/firmware/rtl_nic/rtl8105e-1.fw +lib/firmware/rtl_nic/rtl8168d-1.fw +lib/firmware/rtl_nic/rtl8168d-2.fw +lib/firmware/rtl_nic/rtl8168e-1.fw +lib/firmware/rtl_nic/rtl8168e-2.fw +lib/firmware/rtl_nic/rtl8168e-3.fw +#lib/firmware/rtlwifi +lib/firmware/rtlwifi/rtl8192cfw.bin +lib/firmware/rtlwifi/rtl8192cufw.bin +lib/firmware/rtlwifi/rtl8192defw.bin +lib/firmware/rtlwifi/rtl8192sefw.bin +lib/firmware/rtlwifi/rtl8712u.bin lib/firmware/s2250.fw lib/firmware/s2250_loader.fw #lib/firmware/sb16 @@ -245,15 +418,50 @@ lib/firmware/sxg/saharadbgdownloadB.sys lib/firmware/sxg/saharadownloadB.sys #lib/firmware/tehuti lib/firmware/tehuti/bdx.bin +#lib/firmware/ti-connectivity +lib/firmware/ti-connectivity/TIInit_7.2.31.bts +lib/firmware/ti-connectivity/wl1271-fw-2.bin +lib/firmware/ti-connectivity/wl1271-fw-ap.bin +lib/firmware/ti-connectivity/wl1271-fw.bin +lib/firmware/ti-connectivity/wl1271-nvs-example-wl128x.bin +lib/firmware/ti-connectivity/wl1271-nvs.bin +lib/firmware/ti-connectivity/wl128x-fw-ap.bin +lib/firmware/ti-connectivity/wl128x-fw.bin lib/firmware/ti_3410.fw lib/firmware/ti_5052.fw #lib/firmware/tigon lib/firmware/tigon/tg3.bin lib/firmware/tigon/tg3_tso.bin lib/firmware/tigon/tg3_tso5.bin +lib/firmware/tlg2300_firmware.bin lib/firmware/tr_smctr.bin #lib/firmware/ttusb-budget lib/firmware/ttusb-budget/dspbootcode.bin +#lib/firmware/ueagle-atm +lib/firmware/ueagle-atm/930-fpga.bin +lib/firmware/ueagle-atm/CMV4p.bin.v2 +lib/firmware/ueagle-atm/CMV9i.bin +lib/firmware/ueagle-atm/CMV9p.bin +lib/firmware/ueagle-atm/CMVei.bin +lib/firmware/ueagle-atm/CMVeiWO.bin +lib/firmware/ueagle-atm/CMVep.bin +lib/firmware/ueagle-atm/CMVepES.bin +lib/firmware/ueagle-atm/CMVepES03.bin +lib/firmware/ueagle-atm/CMVepFR.bin +lib/firmware/ueagle-atm/CMVepFR04.bin +lib/firmware/ueagle-atm/CMVepFR10.bin +lib/firmware/ueagle-atm/CMVepIT.bin +lib/firmware/ueagle-atm/CMVepWO.bin +lib/firmware/ueagle-atm/DSP4p.bin +lib/firmware/ueagle-atm/DSP9i.bin +lib/firmware/ueagle-atm/DSP9p.bin +lib/firmware/ueagle-atm/DSPei.bin +lib/firmware/ueagle-atm/DSPep.bin +lib/firmware/ueagle-atm/adi930.fw +lib/firmware/ueagle-atm/eagleI.fw +lib/firmware/ueagle-atm/eagleII.fw +lib/firmware/ueagle-atm/eagleIII.fw +lib/firmware/ueagle-atm/eagleIV.fw #lib/firmware/usbdux #lib/firmware/usbdux/Makefile_dux #lib/firmware/usbdux/README.dux @@ -271,6 +479,10 @@ lib/firmware/v4l-cx23885-enc.fw lib/firmware/v4l-cx25840.fw #lib/firmware/vicam lib/firmware/vicam/firmware.fw +lib/firmware/vntwusb.fw +#lib/firmware/vxge +lib/firmware/vxge/X3fw-pxe.ncf +lib/firmware/vxge/X3fw.ncf lib/firmware/whiteheat.fw lib/firmware/whiteheat_loader.fw #lib/firmware/yam @@ -281,5 +493,3 @@ lib/firmware/yamaha/ds1_ctrl.fw lib/firmware/yamaha/ds1_dsp.fw lib/firmware/yamaha/ds1e_ctrl.fw lib/firmware/yamaha/yss225_registers.bin -lib/firmware/bnx2x-e1-5.0.21.0.fw -lib/firmware/bnx2x-e1h-5.0.21.0.fw diff --git a/config/rootfiles/core/next/filelists/linux-firmware b/config/rootfiles/core/next/filelists/linux-firmware new file mode 120000 index 000000000..4bf91bca9 --- /dev/null +++ b/config/rootfiles/core/next/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/lfs/linux-firmware b/lfs/linux-firmware index eb9c4ffeb..6a7f95652 100644 --- a/lfs/linux-firmware +++ b/lfs/linux-firmware @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 20100318 +VER = 20110518 THISAPP = linux-firmware-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 57e3ec91c81eee2443b0ab6d83c43633 +$(DL_FILE)_MD5 = 3b215b5ec9a5e8784dd971c039e9b948 install : $(TARGET) From 162d2e2fc78b65b48fa84b7399a5a647b5c6534b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 25 May 2011 13:34:47 +0200 Subject: [PATCH 030/159] zd1211-firmware: package added. --- config/rootfiles/common/zd1211-firmware | 19 +++++ .../core/next/filelists/zd1211-firmware | 1 + lfs/zd1211-firmware | 76 +++++++++++++++++++ make.sh | 1 + 4 files changed, 97 insertions(+) create mode 100644 config/rootfiles/common/zd1211-firmware create mode 120000 config/rootfiles/core/next/filelists/zd1211-firmware create mode 100644 lfs/zd1211-firmware diff --git a/config/rootfiles/common/zd1211-firmware b/config/rootfiles/common/zd1211-firmware new file mode 100644 index 000000000..389c73a33 --- /dev/null +++ b/config/rootfiles/common/zd1211-firmware @@ -0,0 +1,19 @@ +#lib/firmware/zd1211 +#lib/firmware/zd1211/COPYING +#lib/firmware/zd1211/README +#lib/firmware/zd1211/WS11UPh.h +#lib/firmware/zd1211/WS11UPhR.h +#lib/firmware/zd1211/WS11UPhR_Turbo.h +#lib/firmware/zd1211/WS11UPhm.h +#lib/firmware/zd1211/WS11Ub.h +#lib/firmware/zd1211/WS11Ur.h +lib/firmware/zd1211/zd1211_ub +lib/firmware/zd1211/zd1211_uph +lib/firmware/zd1211/zd1211_uphm +lib/firmware/zd1211/zd1211_uphr +lib/firmware/zd1211/zd1211_ur +lib/firmware/zd1211/zd1211b_ub +lib/firmware/zd1211/zd1211b_uph +lib/firmware/zd1211/zd1211b_uphm +lib/firmware/zd1211/zd1211b_uphr +lib/firmware/zd1211/zd1211b_ur diff --git a/config/rootfiles/core/next/filelists/zd1211-firmware b/config/rootfiles/core/next/filelists/zd1211-firmware new file mode 120000 index 000000000..33985ced8 --- /dev/null +++ b/config/rootfiles/core/next/filelists/zd1211-firmware @@ -0,0 +1 @@ +../../../common/zd1211-firmware \ No newline at end of file diff --git a/lfs/zd1211-firmware b/lfs/zd1211-firmware new file mode 100644 index 000000000..25a9c4ab2 --- /dev/null +++ b/lfs/zd1211-firmware @@ -0,0 +1,76 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2011 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.4 + +THISAPP = zd1211-firmware-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/zd1211-firmware +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 19f28781d76569af8551c9d11294c870 + +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 jxf $(DIR_DL)/$(DL_FILE) + mkdir -p /lib/firmware/zd1211 + cd $(DIR_APP) && cp -v * /lib/firmware/zd1211 + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index ccb1dbca4..5f595e86f 100755 --- a/make.sh +++ b/make.sh @@ -358,6 +358,7 @@ buildipfire() { ipfiremake which ipfiremake xz ipfiremake linux-firmware + ipfiremake zd1211-firmware ipfiremake linux XEN=1 ipfiremake kqemu XEN=1 ipfiremake v4l-dvb XEN=1 From 86ec950263487aeebbb73c77f3840738904f419f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 26 May 2011 07:30:58 +0200 Subject: [PATCH 031/159] openvpn: build down-root plugin. --- config/rootfiles/common/openvpn | 1 + lfs/openvpn | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 23742b3d8..1ecaff83b 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -1,4 +1,5 @@ lib/openvpn-auth-pam.so +lib/openvpn-down-root.so usr/sbin/openvpn #usr/share/doc/openvpn #usr/share/man/man8/openvpn.8 diff --git a/lfs/openvpn b/lfs/openvpn index 792de60da..925c2ad96 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -77,6 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire cd $(DIR_APP)/plugin/auth-pam && make cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/ + cd $(DIR_APP)/plugin/down-root && make + cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /lib/ -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/crls touch /var/ipfire/ovpn/ovpn-leases.db From 20730a6feee96496d4933fc2cba54e0c87b7ef84 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 27 May 2011 14:00:57 +0200 Subject: [PATCH 032/159] extrahd.cgi: removed controller names from list, corrected translation. --- html/cgi-bin/extrahd.cgi | 56 +++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 3bb6afd8d..7cdad0161 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -79,11 +79,11 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) @deviceline = split( /\;/, $deviceentry ); if ( "$extrahdsettings{'PATH'}" eq "$deviceline[2]" ) { $ok = "false"; - $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to $extrahdsettings{'PATH'}, because there is already a device mounted."; + $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd because there is already a device mounted'}."; } if ( "$extrahdsettings{'PATH'}" eq "/" ) { $ok = "false"; - $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to root /."; + $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to root'}."; } } @@ -113,7 +113,7 @@ elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'}) } close FILE; } else { - $errormessage = "Can't umount $extrahdsettings{'PATH'}. Maybe the device is in use?"; + $errormessage = "$Lang::tr{'extrahd cant umount'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd maybe the device is in use'}?"; } } @@ -143,10 +143,10 @@ END $color=$Header::colourgreen; } print <  - $deviceline[0] - $deviceline[1] - $deviceline[2] +   + $deviceline[0] + $deviceline[1] + $deviceline[2]
@@ -154,7 +154,7 @@ END -
+ END ; } @@ -179,21 +179,26 @@ END foreach $scanentry (sort @scans) { @scanline = split( /\;/, $scanentry ); - print <  - /dev/$scanline[0] - $scanline[1] + # remove wrong entries like usb controller name + if ($scanline[1] ne "\n") + { + print <  + /dev/$scanline[0] + $scanline[1] END ; + + } foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); if ( "$partitionline[0]" eq "$scanline[0]" ) { $size = int($partitionline[1] / 1024); print <$Lang::tr{'size'} $size MB -   -   + $Lang::tr{'size'} $size MB +   +   END ; } @@ -202,28 +207,31 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { $size = int($partitionline[1] / 1024); print < - UUID=$partitionline[2] + UUID=$partitionline[2] /dev/$partitionline[0] - $Lang::tr{'size'} $size MB + $Lang::tr{'size'} $size MB - + + - + +END +; END ; @@ -232,7 +240,9 @@ END } print <If your device isn't listed here, you need to install or load the driver.
If you can see your device but no partitions you have to create them first. +   +   + $Lang::tr{'extrahd install or load driver'} END ; From ddb6262fe588a487f61c8565b399f480b46932ce Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 27 May 2011 14:03:08 +0200 Subject: [PATCH 033/159] extrahd.cgi: insert new translation strings. --- langs/de/cgi-bin/de.pl | 9 +++++++++ langs/en/cgi-bin/en.pl | 9 +++++++++ langs/es/cgi-bin/es.pl | 9 +++++++++ langs/fr/cgi-bin/fr.pl | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b78efc5da..81cc3ee5c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -775,6 +775,15 @@ 'external aliases configuration' => 'Externe Alias-Konfiguration', 'extrahd' => 'ExtraHD', 'extrahd detected drives' => 'gefundene Laufwerke', +'extrahd unable to read' => 'Lesefehler von', +'extrahd unable to write' => 'Schreibfehler von', +'extrahd you cant mount' => 'Sie können', +'extrahd to' => 'nicht nach', +'extrahd to root' => 'nicht nach root mounten', +'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Geräte gemountet ist', +'extrahd cant umount' => 'Konnte', +'extrahd maybe the device is in use' => 'nicht mounten. Vielleicht wird das Gerät bereits verwendet', +'extrahd install or load driver' => 'Wenn Ihre Festplatte nicht angezeigt wird, müssen Sie zuerst den Treiber laden oder ggf. auch nach installieren. Wenn diese jedoch angezeigt wird, aber keine Partitionen zu sehen sind, müssen diese erst angelegt werden.', 'false classnumber' => 'Die Klassennummer passt nicht zum angegebenen Interface.', 'false max bandwith' => 'Maximalbandbreite ist ungültig.', 'false min bandwith' => 'Mindestbandbreite ist ungültig.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 20a2681da..ad48b4a36 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -799,6 +799,15 @@ 'external aliases configuration' => 'External aliases configuration', 'extrahd' => 'ExtraHD', 'extrahd detected drives' => 'detected drives', +'extrahd unable to read' => 'Unable to read', +'extrahd unable to write' => 'Unable to write', +'extrahd you cant mount' => 'You can\'t mount', +'extrahd to' => 'to', +'extrahd to root' => 'to root', +'extrahd because there is already a device mounted' => ', because there is already a device mounted', +'extrahd cant umount' => 'Can\'t umount', +'extrahd maybe the device is in use' => '. Maybe the device is in use', +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.
If you can see your device but no partitions you have to create them first.', 'false classnumber' => 'The Class-Number does not match the interface.', 'false max bandwith' => 'Maximum bandwith is false.', 'false min bandwith' => 'Minimum bandwith is false.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index e35c680b9..1b3c62f98 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -797,6 +797,15 @@ 'external aliases configuration' => 'Configuración de Alias externo', 'extrahd' => 'Disco duro Adicional', 'extrahd detected drives' => 'Unidades encontradas', +'extrahd unable to read' => 'Unable to read', +'extrahd unable to write' => 'Unable to write', +'extrahd you cant mount' => 'You can\'t mount', +'extrahd to' => 'to', +'extrahd to root' => 'to root', +'extrahd because there is already a device mounted' => ', because there is already a device mounted', +'extrahd cant umount' => 'Can\'t umount', +'extrahd maybe the device is in use' => '. Maybe the device is in use', +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.
If you can see your device but no partitions you have to create them first.', 'false classnumber' => 'El número de clase no coincide con la interfaz', 'false max bandwith' => 'El ancho de banda máximo es falso', 'false min bandwith' => 'El ancho de banda mínimo es falso', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 8d52e1d36..f2069378d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -798,6 +798,15 @@ 'external aliases configuration' => 'Configuration des alias externes', 'extrahd' => 'ExtraHD', 'extrahd founded drives' => 'Périphériques trouvés', +'extrahd unable to read' => 'Unable to read', +'extrahd unable to write' => 'Unable to write', +'extrahd you cant mount' => 'You can\'t mount', +'extrahd to' => 'to', +'extrahd to root' => 'to root', +'extrahd because there is already a device mounted' => ', because there is already a device mounted', +'extrahd cant umount' => 'Can\'t umount', +'extrahd maybe the device is in use' => '. Maybe the device is in use', +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.
If you can see your device but no partitions you have to create them first.', 'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.', 'false max bandwith' => 'La bande passante maximum est fausse.', 'false min bandwith' => 'La bande passante minimum est fausse.', From 156337976b33ca58a94b6a4fbb03bae7f1b9b38b Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Mon, 30 May 2011 18:14:42 +0200 Subject: [PATCH 034/159] extrahd.cgi: French translation. Thx Lalsacien! --- langs/fr/cgi-bin/fr.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index f2069378d..c2ac5b4b4 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -797,16 +797,16 @@ 'external access rule removed' => 'Règle d\'accès externe supprimée; redémarrage du controleur d\'accès', 'external aliases configuration' => 'Configuration des alias externes', 'extrahd' => 'ExtraHD', -'extrahd founded drives' => 'Périphériques trouvés', -'extrahd unable to read' => 'Unable to read', -'extrahd unable to write' => 'Unable to write', -'extrahd you cant mount' => 'You can\'t mount', -'extrahd to' => 'to', -'extrahd to root' => 'to root', -'extrahd because there is already a device mounted' => ', because there is already a device mounted', -'extrahd cant umount' => 'Can\'t umount', -'extrahd maybe the device is in use' => '. Maybe the device is in use', -'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.
If you can see your device but no partitions you have to create them first.', +'extrahd detected drives' => 'Périphériques trouvés', +'extrahd unable to read' => 'Impossible de lire', +'extrahd unable to write' => 'Impossible d\'écrire', +'extrahd you cant mount' => 'Vous ne pouvez pas monter', +'extrahd to' => 'vers', +'extrahd to root' => 'vers root', +'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté', +'extrahd cant umount' => 'Impossible de démonter', +'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation', +'extrahd install or load driver' => 'Si votre support n\'est pas visible ici, vous devez installer ou charger son pilote.
Si vous voyez votre support mais pas de partitions, vous devez tout d\'abord les créer.', 'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.', 'false max bandwith' => 'La bande passante maximum est fausse.', 'false min bandwith' => 'La bande passante minimum est fausse.', From 63ca66d438520e9c613922e4f419ed50eaf1bc6c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 31 May 2011 21:16:31 +0200 Subject: [PATCH 035/159] kernel: disabled more wireles modules that will be replaced by compat-wireless. --- config/kernel/kernel.config.i586-ipfire | 109 ++++---------------- config/kernel/kernel.config.i586-ipfire-pae | 103 ++++-------------- config/kernel/kernel.config.i586-ipfire-xen | 103 ++++-------------- 3 files changed, 59 insertions(+), 256 deletions(-) diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 43bba2237..ae35efbb7 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.27-ipfire -# Thu Dec 30 13:29:23 2010 +# Linux kernel version: 2.6.32.41-ipfire +# Tue May 31 14:26:02 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -96,7 +96,6 @@ CONFIG_RCU_FANOUT=32 # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -277,9 +276,9 @@ CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y CONFIG_NR_CPUS=8 -CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -1686,13 +1685,8 @@ CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -1703,32 +1697,15 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -# CONFIG_IPW2100_MONITOR is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_MONITOR is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_MWL8K is not set +# CONFIG_P54_COMMON is not set +# CONFIG_ATH_COMMON is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set # CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1736,56 +1713,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SDIO=m -CONFIG_IWM=m +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +# CONFIG_HERMES is not set +# CONFIG_WL12XX is not set +# CONFIG_IWM is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -2490,10 +2424,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_SSB=m CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y +# CONFIG_SSB_B43_PCI_BRIDGE is not set CONFIG_SSB_PCMCIAHOST_POSSIBLE=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST_POSSIBLE=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f37b6552c..7eeb130ad 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.40 -# Sat May 14 09:27:43 2011 +# Linux kernel version: 2.6.32.41-ipfire-pae +# Sat May 31 15:00:00 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1704,13 +1704,8 @@ CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -1721,32 +1716,15 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -# CONFIG_IPW2100_MONITOR is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_MONITOR is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_MWL8K is not set +# CONFIG_P54_COMMON is not set +# CONFIG_ATH_COMMON is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set # CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1754,56 +1732,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SDIO=m -CONFIG_IWM=m +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +# CONFIG_HERMES is not set +# CONFIG_WL12XX is not set +# CONFIG_IWM is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index fa50c9543..4051184d1 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.33 -# Mon Mar 21 14:20:43 2011 +# Linux kernel version: 2.6.32.41-ipfire-xen +# Mon May 31 15:00:00 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1482,13 +1482,8 @@ CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -1499,32 +1494,15 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -# CONFIG_IPW2100_MONITOR is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_MONITOR is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_MWL8K is not set +# CONFIG_P54_COMMON is not set +# CONFIG_ATH_COMMON is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set # CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1532,56 +1510,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SDIO=m -CONFIG_IWM=m +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +# CONFIG_HERMES is not set +# CONFIG_WL12XX is not set +# CONFIG_IWM is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers From 1eaa29b151b6b923041e612f7f0c588b44dbdbeb Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Tue, 31 May 2011 23:02:23 +0200 Subject: [PATCH 036/159] extrahd.cgi: added again display also non-partitioned disks from Arne. --- html/cgi-bin/extrahd.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 7cdad0161..86b0de5c3 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -207,7 +207,7 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) { $size = int($partitionline[1] / 1024); print < From d823e491307129c91edb2857c5368de4eaf08d15 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 10:13:49 +0200 Subject: [PATCH 037/159] iw: update to 0.9.22. --- lfs/iw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/iw b/lfs/iw index c3304206a..ec59f23ca 100644 --- a/lfs/iw +++ b/lfs/iw @@ -24,7 +24,7 @@ include Config -VER = 0.9.20 +VER = 0.9.22 THISAPP = iw-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1055799b544b3e08169d155bb6c21bb0 +$(DL_FILE)_MD5 = 561c2602c5ce7c65a590118286c0892a install : $(TARGET) From 35f4e9668ec7c043f04b8167380eebde0a913e8e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 14:10:08 +0200 Subject: [PATCH 038/159] next-core: add extrahd.cgi and language files. --- config/rootfiles/core/next/filelists/files | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 409e5fe8a..89c4631f9 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,2 +1,7 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/extrahd.cgi +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl From 39d4fe16c51fc484058626cbb57a34f1a68f179d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 14:12:18 +0200 Subject: [PATCH 039/159] next-core: add iw to update. --- config/rootfiles/core/next/filelists/iw | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/next/filelists/iw diff --git a/config/rootfiles/core/next/filelists/iw b/config/rootfiles/core/next/filelists/iw new file mode 120000 index 000000000..7c58a2089 --- /dev/null +++ b/config/rootfiles/core/next/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file From 3ced8695afbc62b95b52d53be4ca64086a700e39 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 14:13:39 +0200 Subject: [PATCH 040/159] crda: move wireless-regdb to own package. update crda to 1.1.1. update wireless-regdb to 2011.04.28. --- config/rootfiles/common/crda | 2 - config/rootfiles/common/wireless-regdb | 5 ++ config/rootfiles/core/next/filelists/crda | 1 + .../core/next/filelists/wireless-regdb | 1 + lfs/crda | 16 ++-- lfs/wireless-regdb | 76 +++++++++++++++++++ make.sh | 1 + 7 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 config/rootfiles/common/wireless-regdb create mode 120000 config/rootfiles/core/next/filelists/crda create mode 120000 config/rootfiles/core/next/filelists/wireless-regdb create mode 100644 lfs/wireless-regdb diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda index abda70176..3c932a154 100644 --- a/config/rootfiles/common/crda +++ b/config/rootfiles/common/crda @@ -5,7 +5,5 @@ lib/udev/rules.d/85-regulatory.rules #root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto/__m2crypto.so sbin/crda sbin/regdbdump -#usr/lib/crda -usr/lib/crda/regulatory.bin #usr/share/man/man8/crda.8.gz #usr/share/man/man8/regdbdump.8.gz diff --git a/config/rootfiles/common/wireless-regdb b/config/rootfiles/common/wireless-regdb new file mode 100644 index 000000000..2dcdbca32 --- /dev/null +++ b/config/rootfiles/common/wireless-regdb @@ -0,0 +1,5 @@ +#usr/lib/crda +#usr/lib/crda/pubkeys +usr/lib/crda/pubkeys/linville.key.pub.pem +usr/lib/crda/regulatory.bin +#usr/share/man/man5/regulatory.bin.5.gz diff --git a/config/rootfiles/core/next/filelists/crda b/config/rootfiles/core/next/filelists/crda new file mode 120000 index 000000000..d68c46e55 --- /dev/null +++ b/config/rootfiles/core/next/filelists/crda @@ -0,0 +1 @@ +../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/wireless-regdb b/config/rootfiles/core/next/filelists/wireless-regdb new file mode 120000 index 000000000..c9205b3cf --- /dev/null +++ b/config/rootfiles/core/next/filelists/wireless-regdb @@ -0,0 +1 @@ +../../../common/wireless-regdb \ No newline at end of file diff --git a/lfs/crda b/lfs/crda index f97fdcb81..521eb933d 100644 --- a/lfs/crda +++ b/lfs/crda @@ -24,12 +24,10 @@ include Config -VER = 20110202-git - -REGDB = regulatory-20110202 +VER = 1.1.1 THISAPP = crda-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -39,13 +37,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(REGDB).tar.xz +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(REGDB).tar.xz = $(DL_FROM)/$(REGDB).tar.xz -$(DL_FILE)_MD5 = 1da048b854cca1f1087c1250df335ca8 -$(REGDB).tar.xz_MD5 = 620621172d18d6f8cdc2db423dcb6381 +$(DL_FILE)_MD5 = 5fc77af68b3e21736b8ef2f8b061c810 install : $(TARGET) @@ -74,9 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir /usr/lib/crda - tar Jxf $(DIR_DL)/$(REGDB).tar.xz -C /usr/lib/crda/ - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && USE_OPENSSL=1 make $(MAKETUNING) cd $(DIR_APP) && USE_OPENSSL=1 make install @rm -rf $(DIR_APP) diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb new file mode 100644 index 000000000..2228c22b0 --- /dev/null +++ b/lfs/wireless-regdb @@ -0,0 +1,76 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2011 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2011.04.28 + +THISAPP = wireless-regdb-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 16b7fabd4d7761ccf206702a3f18cce9 + +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 jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4a7e37461..ba25ec3b4 100755 --- a/make.sh +++ b/make.sh @@ -690,6 +690,7 @@ buildipfire() { ipfiremake parted ipfiremake swig ipfiremake python-m2crypto + ipfiremake wireless-regdb ipfiremake crda ipfiremake libsatsolver ipfiremake python-satsolver From 1d43a0fb89f66c94a4e96f005ddd694c1a402385 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 24 Jun 2011 19:18:58 +0200 Subject: [PATCH 041/159] kernel: update to 2.6.32.42. --- lfs/linux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/linux b/lfs/linux index fcae433b2..940b36bbb 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .41 -VER = 2.6.32.41 +PATCHLEVEL = .42 +VER = 2.6.32.42 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 919fe13fe57f903eb03e291dcaeabf57 +$(DL_FILE)_MD5 = f1bb2e5ff5ae8d552e6cedeaa70da25e netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 From 0708113765903d21a5479e5462c6383e0812caf3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 25 Jun 2011 10:59:47 +0200 Subject: [PATCH 042/159] openvpnctrl: Update firewall rules when starting a n2n connection. This makes sure, that all rules (esp. for new connections) are up and running. --- src/misc-progs/openvpnctrl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index e6a8d3f1a..5167d0541 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -24,7 +24,7 @@ char enableorange[STRING_SIZE] = "off"; char OVPNRED[STRING_SIZE] = "OVPN"; char OVPNBLUE[STRING_SIZE] = "OVPN_BLUE_"; char OVPNORANGE[STRING_SIZE] = "OVPN_ORANGE_"; -char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.1.0"; +char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.1.1"; struct connection_struct { char name[STRING_SIZE]; @@ -46,9 +46,9 @@ void exithandler(void) void usage(void) { #ifdef ovpndebug - printf("Wrapper for OpenVPN v%s-debug\n", WRAPPERVERSION); + printf("Wrapper for OpenVPN %s-debug\n", WRAPPERVERSION); #else - printf("Wrapper for OpenVPN v%s\n", WRAPPERVERSION); + printf("Wrapper for OpenVPN %s\n", WRAPPERVERSION); #endif printf("openvpnctrl + diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index 2c7c947f5..f66b841d7 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -515,6 +515,36 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server)"); } } + #namecheap test + elsif ($settings{'SERVICE'} eq 'namecheap') { + # use proxy ? + my %proxysettings; + &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); + if ($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); + Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); + } + + my ($out, $response) = Net::SSLeay::get_https( 'dynamicdns.park-your-domain.com', + 443, + "/update?host=$settings{'HOSTNAME'}&domain=$settings{'DOMAIN'}&password=$settings{'PASSWORD'}&ip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire' ) + ); + #Valid responses from service are: + # wait confirmation!! + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ( $out !~ m/0<\/ErrCount>/ ) { + $out =~ m/(.*)<\/Err1>/; + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure ($1)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); + } + } + #end namecheap test elsif ($settings{'SERVICE'} eq 'dynu') { # use proxy ? my %proxysettings; From 6e2ba31bff62dc8eda9450139961cfb3c668240f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 22 Aug 2011 20:47:35 +0200 Subject: [PATCH 103/159] ipsec: change ipsecctrl and vpn-watch to restart a single tunnel. --- src/misc-progs/ipsecctrl.c | 39 +++++++++++++++++++++++++++++++++++--- src/scripts/vpn-watch | 11 +++-------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index a018289f6..0b0517713 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -142,10 +142,42 @@ int decode_line (char *s, */ void turn_connection_on (char *name, char *type) { /* - if you find a way to start a single connection without changing all add it - here. Change also vpn-watch. + Rename the connection and run ipsec update and rename it back to readd + a deleted connection. Because ipsec update ignores connection that have + not changed since last load. */ - safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null"); + char command[STRING_SIZE]; + memset(command, 0, STRING_SIZE); + snprintf(command, STRING_SIZE - 1, + "sed -i -e 's|^conn %s$|conn %s-renamed|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name); + safe_system(command); + + // Down and delete IKEv2 Tunnel before ipsec update + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke down %s >/dev/null", name); + safe_system(command); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke delete %s >/dev/null", name); + safe_system(command); + + safe_system("/etc/rc.d/init.d/ipsec update >/dev/null"); + + sleep(1); + + // Back to original name + snprintf(command, STRING_SIZE - 1, + "sed -i -e 's|^conn %s-renamed$|conn %s|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name); + safe_system(command); + + // Down and delete IKEv2 Tunnel before ipsec update + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke down %s-renamed >/dev/null", name); + safe_system(command); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke delete %s-renamed >/dev/null", name); + safe_system(command); + + safe_system("/etc/rc.d/init.d/ipsec update >/dev/null"); } /* issue ipsec commmands to turn off connection 'name' @@ -162,6 +194,7 @@ void turn_connection_off (char *name) { snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec stroke delete %s >/dev/null", name); safe_system(command); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null"); diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index 63b2442ca..563c14c47 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -1,6 +1,6 @@ #!/usr/bin/perl ################################################## -##### VPN-Watch.pl Version 0.6a ##### +##### VPN-Watch.pl Version 0.7 ##### ################################################## # # # VPN-Watch is part of the IPFire Firewall # @@ -39,12 +39,11 @@ while ( $i == 0){ unless(@vpnsettings) {exit 1;} } -my $status = `ipsec whack --status`; +my $status = `ipsec status`; foreach (@vpnsettings){ my @settings = split(/,/,$_); chomp($settings[30]); - if ($settings[30] eq 'ikev2'){next;} if ($settings[27] ne 'RED'){next;} if ($settings[4] ne 'net'){next;} if ($settings[1] ne 'on'){next;}chomp($settings[29]); @@ -57,15 +56,13 @@ foreach (@vpnsettings){ my $remoteip = `/usr/bin/ping -c 1 $remotehostname 2>/dev/null | head -n1 | awk '{print \$3}' | tr -d '()' | tr -d ':'`;chomp($remoteip); if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}} my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`; - my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`; + my $established= `echo "$status" | grep '$settings[2]' | grep -e 'erouted;' -e 'INSTALLED'`; my $known= `echo "$status" | grep '$settings[2]'`; if ( $ipmatch eq '' && $known ne '' ){ logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec."); system("/usr/local/bin/ipsecctrl S $settings[0]"); $round=0; - last; #all connections will reloaded - #remove this if ipsecctrl can restart single con again } if ($debug){logger("Round=".$round." and established=".$established);} @@ -74,8 +71,6 @@ foreach (@vpnsettings){ logger("Connection to $remotehostname($remoteip) not erouted, restarting ipsec."); system("/usr/local/bin/ipsecctrl S $settings[0]"); $round=0; - last; #all connections will reloaded - #remove this if ipsecctrl can restart single con again } } From 553e4a0462416b06932d4c6da653bc10f8302387 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 23 Aug 2011 09:50:13 +0200 Subject: [PATCH 104/159] core51: add some sync's after update. --- config/rootfiles/core/51/update.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 201c2db4a..58a47da0d 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -143,6 +143,11 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # rm -rf /etc/sysconfig/lm_sensors +# Ensure that all data was written... +sync +sync +sync + # Reboot message to console /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg" /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!" @@ -155,5 +160,12 @@ touch /var/run/need_reboot #Finish /etc/init.d/fireinfo start sendprofile + +# Ensure that all data was written... +sync +sync +sync + +# #Don't report the exitcode last command exit 0 From aee8d1413941782f833d1baa0ac50ec5787cfeac Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 24 Aug 2011 09:17:34 +0200 Subject: [PATCH 105/159] strongswan: update to 4.5.3. --- config/rootfiles/common/strongswan | 188 +++++++++++++-------------- config/rootfiles/core/next/update.sh | 13 ++ lfs/strongswan | 4 +- 3 files changed, 109 insertions(+), 96 deletions(-) diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 6e97b170f..0ad067b24 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -10,21 +10,21 @@ etc/ipsec.d/private etc/ipsec.d/reqs etc/ipsec.secrets etc/strongswan.conf -#usr/lib/libcharon.a -#usr/lib/libcharon.la -usr/lib/libcharon.so -usr/lib/libcharon.so.0 -usr/lib/libcharon.so.0.0.0 -#usr/lib/libhydra.a -#usr/lib/libhydra.la -usr/lib/libhydra.so -usr/lib/libhydra.so.0 -usr/lib/libhydra.so.0.0.0 -#usr/lib/libstrongswan.a -#usr/lib/libstrongswan.la -usr/lib/libstrongswan.so -usr/lib/libstrongswan.so.0 -usr/lib/libstrongswan.so.0.0.0 +#usr/lib/ipsec/libcharon.a +#usr/lib/ipsec/libcharon.la +usr/lib/ipsec/libcharon.so +usr/lib/ipsec/libcharon.so.0 +usr/lib/ipsec/libcharon.so.0.0.0 +#usr/lib/ipsec/libhydra.a +#usr/lib/ipsec/libhydra.la +usr/lib/ipsec/libhydra.so +usr/lib/ipsec/libhydra.so.0 +usr/lib/ipsec/libhydra.so.0.0.0 +#usr/lib/ipsec/libstrongswan.a +#usr/lib/ipsec/libstrongswan.la +usr/lib/ipsec/libstrongswan.so +usr/lib/ipsec/libstrongswan.so.0 +usr/lib/ipsec/libstrongswan.so.0.0.0 #usr/libexec/ipsec usr/libexec/ipsec/_copyright usr/libexec/ipsec/_pluto_adns @@ -33,85 +33,85 @@ usr/libexec/ipsec/_updown_espmark usr/libexec/ipsec/charon usr/libexec/ipsec/openac usr/libexec/ipsec/pki -#usr/libexec/ipsec/plugins -#usr/libexec/ipsec/plugins/libstrongswan-aes.a -#usr/libexec/ipsec/plugins/libstrongswan-aes.la -usr/libexec/ipsec/plugins/libstrongswan-aes.so -#usr/libexec/ipsec/plugins/libstrongswan-attr.a -#usr/libexec/ipsec/plugins/libstrongswan-attr.la -usr/libexec/ipsec/plugins/libstrongswan-attr.so -#usr/libexec/ipsec/plugins/libstrongswan-constraints.a -#usr/libexec/ipsec/plugins/libstrongswan-constraints.la -usr/libexec/ipsec/plugins/libstrongswan-constraints.so -#usr/libexec/ipsec/plugins/libstrongswan-curl.a -#usr/libexec/ipsec/plugins/libstrongswan-curl.la -usr/libexec/ipsec/plugins/libstrongswan-curl.so -#usr/libexec/ipsec/plugins/libstrongswan-des.a -#usr/libexec/ipsec/plugins/libstrongswan-des.la -usr/libexec/ipsec/plugins/libstrongswan-des.so -#usr/libexec/ipsec/plugins/libstrongswan-dnskey.a -#usr/libexec/ipsec/plugins/libstrongswan-dnskey.la -usr/libexec/ipsec/plugins/libstrongswan-dnskey.so -#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.a -#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.la -usr/libexec/ipsec/plugins/libstrongswan-fips-prf.so -#usr/libexec/ipsec/plugins/libstrongswan-gmp.a -#usr/libexec/ipsec/plugins/libstrongswan-gmp.la -usr/libexec/ipsec/plugins/libstrongswan-gmp.so -#usr/libexec/ipsec/plugins/libstrongswan-hmac.a -#usr/libexec/ipsec/plugins/libstrongswan-hmac.la -usr/libexec/ipsec/plugins/libstrongswan-hmac.so -#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.a -#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.la -usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.so -#usr/libexec/ipsec/plugins/libstrongswan-md5.a -#usr/libexec/ipsec/plugins/libstrongswan-md5.la -usr/libexec/ipsec/plugins/libstrongswan-md5.so -#usr/libexec/ipsec/plugins/libstrongswan-pem.a -#usr/libexec/ipsec/plugins/libstrongswan-pem.la -usr/libexec/ipsec/plugins/libstrongswan-pem.so -#usr/libexec/ipsec/plugins/libstrongswan-pgp.a -#usr/libexec/ipsec/plugins/libstrongswan-pgp.la -usr/libexec/ipsec/plugins/libstrongswan-pgp.so -#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.a -#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.la -usr/libexec/ipsec/plugins/libstrongswan-pkcs1.so -#usr/libexec/ipsec/plugins/libstrongswan-pubkey.a -#usr/libexec/ipsec/plugins/libstrongswan-pubkey.la -usr/libexec/ipsec/plugins/libstrongswan-pubkey.so -#usr/libexec/ipsec/plugins/libstrongswan-random.a -#usr/libexec/ipsec/plugins/libstrongswan-random.la -usr/libexec/ipsec/plugins/libstrongswan-random.so -#usr/libexec/ipsec/plugins/libstrongswan-resolve.a -#usr/libexec/ipsec/plugins/libstrongswan-resolve.la -usr/libexec/ipsec/plugins/libstrongswan-resolve.so -#usr/libexec/ipsec/plugins/libstrongswan-revocation.a -#usr/libexec/ipsec/plugins/libstrongswan-revocation.la -usr/libexec/ipsec/plugins/libstrongswan-revocation.so -#usr/libexec/ipsec/plugins/libstrongswan-sha1.a -#usr/libexec/ipsec/plugins/libstrongswan-sha1.la -usr/libexec/ipsec/plugins/libstrongswan-sha1.so -#usr/libexec/ipsec/plugins/libstrongswan-sha2.a -#usr/libexec/ipsec/plugins/libstrongswan-sha2.la -usr/libexec/ipsec/plugins/libstrongswan-sha2.so -#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.a -#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.la -usr/libexec/ipsec/plugins/libstrongswan-socket-raw.so -#usr/libexec/ipsec/plugins/libstrongswan-stroke.a -#usr/libexec/ipsec/plugins/libstrongswan-stroke.la -usr/libexec/ipsec/plugins/libstrongswan-stroke.so -#usr/libexec/ipsec/plugins/libstrongswan-updown.a -#usr/libexec/ipsec/plugins/libstrongswan-updown.la -usr/libexec/ipsec/plugins/libstrongswan-updown.so -#usr/libexec/ipsec/plugins/libstrongswan-x509.a -#usr/libexec/ipsec/plugins/libstrongswan-x509.la -usr/libexec/ipsec/plugins/libstrongswan-x509.so -#usr/libexec/ipsec/plugins/libstrongswan-xauth.a -#usr/libexec/ipsec/plugins/libstrongswan-xauth.la -usr/libexec/ipsec/plugins/libstrongswan-xauth.so -#usr/libexec/ipsec/plugins/libstrongswan-xcbc.a -#usr/libexec/ipsec/plugins/libstrongswan-xcbc.la -usr/libexec/ipsec/plugins/libstrongswan-xcbc.so +#usr/lib/ipsec/plugins +#usr/lib/ipsec/plugins/libstrongswan-aes.a +#usr/lib/ipsec/plugins/libstrongswan-aes.la +usr/lib/ipsec/plugins/libstrongswan-aes.so +#usr/lib/ipsec/plugins/libstrongswan-attr.a +#usr/lib/ipsec/plugins/libstrongswan-attr.la +usr/lib/ipsec/plugins/libstrongswan-attr.so +#usr/lib/ipsec/plugins/libstrongswan-constraints.a +#usr/lib/ipsec/plugins/libstrongswan-constraints.la +usr/lib/ipsec/plugins/libstrongswan-constraints.so +#usr/lib/ipsec/plugins/libstrongswan-curl.a +#usr/lib/ipsec/plugins/libstrongswan-curl.la +usr/lib/ipsec/plugins/libstrongswan-curl.so +#usr/lib/ipsec/plugins/libstrongswan-des.a +#usr/lib/ipsec/plugins/libstrongswan-des.la +usr/lib/ipsec/plugins/libstrongswan-des.so +#usr/lib/ipsec/plugins/libstrongswan-dnskey.a +#usr/lib/ipsec/plugins/libstrongswan-dnskey.la +usr/lib/ipsec/plugins/libstrongswan-dnskey.so +#usr/lib/ipsec/plugins/libstrongswan-fips-prf.a +#usr/lib/ipsec/plugins/libstrongswan-fips-prf.la +usr/lib/ipsec/plugins/libstrongswan-fips-prf.so +#usr/lib/ipsec/plugins/libstrongswan-gmp.a +#usr/lib/ipsec/plugins/libstrongswan-gmp.la +usr/lib/ipsec/plugins/libstrongswan-gmp.so +#usr/lib/ipsec/plugins/libstrongswan-hmac.a +#usr/lib/ipsec/plugins/libstrongswan-hmac.la +usr/lib/ipsec/plugins/libstrongswan-hmac.so +#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.a +#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.la +usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so +#usr/lib/ipsec/plugins/libstrongswan-md5.a +#usr/lib/ipsec/plugins/libstrongswan-md5.la +usr/lib/ipsec/plugins/libstrongswan-md5.so +#usr/lib/ipsec/plugins/libstrongswan-pem.a +#usr/lib/ipsec/plugins/libstrongswan-pem.la +usr/lib/ipsec/plugins/libstrongswan-pem.so +#usr/lib/ipsec/plugins/libstrongswan-pgp.a +#usr/lib/ipsec/plugins/libstrongswan-pgp.la +usr/lib/ipsec/plugins/libstrongswan-pgp.so +#usr/lib/ipsec/plugins/libstrongswan-pkcs1.a +#usr/lib/ipsec/plugins/libstrongswan-pkcs1.la +usr/lib/ipsec/plugins/libstrongswan-pkcs1.so +#usr/lib/ipsec/plugins/libstrongswan-pubkey.a +#usr/lib/ipsec/plugins/libstrongswan-pubkey.la +usr/lib/ipsec/plugins/libstrongswan-pubkey.so +#usr/lib/ipsec/plugins/libstrongswan-random.a +#usr/lib/ipsec/plugins/libstrongswan-random.la +usr/lib/ipsec/plugins/libstrongswan-random.so +#usr/lib/ipsec/plugins/libstrongswan-resolve.a +#usr/lib/ipsec/plugins/libstrongswan-resolve.la +usr/lib/ipsec/plugins/libstrongswan-resolve.so +#usr/lib/ipsec/plugins/libstrongswan-revocation.a +#usr/lib/ipsec/plugins/libstrongswan-revocation.la +usr/lib/ipsec/plugins/libstrongswan-revocation.so +#usr/lib/ipsec/plugins/libstrongswan-sha1.a +#usr/lib/ipsec/plugins/libstrongswan-sha1.la +usr/lib/ipsec/plugins/libstrongswan-sha1.so +#usr/lib/ipsec/plugins/libstrongswan-sha2.a +#usr/lib/ipsec/plugins/libstrongswan-sha2.la +usr/lib/ipsec/plugins/libstrongswan-sha2.so +#usr/lib/ipsec/plugins/libstrongswan-socket-raw.a +#usr/lib/ipsec/plugins/libstrongswan-socket-raw.la +usr/lib/ipsec/plugins/libstrongswan-socket-raw.so +#usr/lib/ipsec/plugins/libstrongswan-stroke.a +#usr/lib/ipsec/plugins/libstrongswan-stroke.la +usr/lib/ipsec/plugins/libstrongswan-stroke.so +#usr/lib/ipsec/plugins/libstrongswan-updown.a +#usr/lib/ipsec/plugins/libstrongswan-updown.la +usr/lib/ipsec/plugins/libstrongswan-updown.so +#usr/lib/ipsec/plugins/libstrongswan-x509.a +#usr/lib/ipsec/plugins/libstrongswan-x509.la +usr/lib/ipsec/plugins/libstrongswan-x509.so +#usr/lib/ipsec/plugins/libstrongswan-xauth.a +#usr/lib/ipsec/plugins/libstrongswan-xauth.la +usr/lib/ipsec/plugins/libstrongswan-xauth.so +#usr/lib/ipsec/plugins/libstrongswan-xcbc.a +#usr/lib/ipsec/plugins/libstrongswan-xcbc.la +usr/lib/ipsec/plugins/libstrongswan-xcbc.so usr/libexec/ipsec/pluto usr/libexec/ipsec/scepclient usr/libexec/ipsec/starter diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 38a1f7821..3632ff238 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -72,6 +72,19 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org /etc/init.d/squid stop /etc/init.d/ipsec stop +# +# Remove old strongswan libs +rm -rf /usr/lib/libcharon.so +rm -rf /usr/lib/libcharon.so.0 +rm -rf /usr/lib/libcharon.so.0.0.0 +rm -rf /usr/lib/libhydra.so +rm -rf /usr/lib/libhydra.so.0 +rm -rf /usr/lib/libhydra.so.0.0.0 +rm -rf /usr/lib/libstrongswan.so +rm -rf /usr/lib/libstrongswan.so.0 +rm -rf /usr/lib/libstrongswan.so.0.0.0 +rm -rf /usr/libexec/ipsec/plugins + # # Unpack the updated files # diff --git a/lfs/strongswan b/lfs/strongswan index 7f92c19b4..1efd283bb 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 4.5.3dr7 +VER = 4.5.3 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 72036d309e254c0b3cad8e5473d68218 +$(DL_FILE)_MD5 = ee7c50a90c91307b111e8085f2479890 install : $(TARGET) From 42e0012dfd9a372b4244af38e1da48e388c7675c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 24 Aug 2011 20:26:57 +0200 Subject: [PATCH 106/159] rootfile-update: strongswan, initskripts. --- config/rootfiles/common/initscripts | 1 + config/rootfiles/common/strongswan | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 58bbf8c6a..9393aec50 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -110,6 +110,7 @@ etc/rc.d/init.d/snort etc/rc.d/init.d/squid etc/rc.d/init.d/sshd #etc/rc.d/init.d/sslh +etc/rc.d/init.d/static-routes etc/rc.d/init.d/swap etc/rc.d/init.d/sysctl etc/rc.d/init.d/sysklogd diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 0ad067b24..c7d4bbd45 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -33,6 +33,7 @@ usr/libexec/ipsec/_updown_espmark usr/libexec/ipsec/charon usr/libexec/ipsec/openac usr/libexec/ipsec/pki +#usr/lib/ipsec #usr/lib/ipsec/plugins #usr/lib/ipsec/plugins/libstrongswan-aes.a #usr/lib/ipsec/plugins/libstrongswan-aes.la From 3693372e08d945a38e900aa9186724f7c9bd655f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 24 Aug 2011 20:50:43 +0200 Subject: [PATCH 107/159] remove obsolete satsolver rootfiles. --- config/rootfiles/packages/libsatsolver | 52 ---------------------- config/rootfiles/packages/python-satsolver | 2 - 2 files changed, 54 deletions(-) delete mode 100644 config/rootfiles/packages/libsatsolver delete mode 100644 config/rootfiles/packages/python-satsolver diff --git a/config/rootfiles/packages/libsatsolver b/config/rootfiles/packages/libsatsolver deleted file mode 100644 index eba54fb60..000000000 --- a/config/rootfiles/packages/libsatsolver +++ /dev/null @@ -1,52 +0,0 @@ -#usr/include/satsolver -#usr/include/satsolver/bitmap.h -#usr/include/satsolver/chksum.h -#usr/include/satsolver/dirpool.h -#usr/include/satsolver/evr.h -#usr/include/satsolver/hash.h -#usr/include/satsolver/knownid.h -#usr/include/satsolver/md5.h -#usr/include/satsolver/policy.h -#usr/include/satsolver/pool.h -#usr/include/satsolver/pool_fileconflicts.h -#usr/include/satsolver/poolarch.h -#usr/include/satsolver/poolid.h -#usr/include/satsolver/pooltypes.h -#usr/include/satsolver/poolvendor.h -#usr/include/satsolver/problems.h -#usr/include/satsolver/queue.h -#usr/include/satsolver/repo.h -#usr/include/satsolver/repo_content.h -#usr/include/satsolver/repo_deb.h -#usr/include/satsolver/repo_deltainfoxml.h -#usr/include/satsolver/repo_helix.h -#usr/include/satsolver/repo_products.h -#usr/include/satsolver/repo_releasefile_products.h -#usr/include/satsolver/repo_repomdxml.h -#usr/include/satsolver/repo_rpmdb.h -#usr/include/satsolver/repo_rpmmd.h -#usr/include/satsolver/repo_solv.h -#usr/include/satsolver/repo_susetags.h -#usr/include/satsolver/repo_updateinfoxml.h -#usr/include/satsolver/repo_write.h -#usr/include/satsolver/repo_zyppdb.h -#usr/include/satsolver/repodata.h -#usr/include/satsolver/repopage.h -#usr/include/satsolver/rules.h -#usr/include/satsolver/sat_xfopen.h -#usr/include/satsolver/satversion.h -#usr/include/satsolver/sha1.h -#usr/include/satsolver/sha2.h -#usr/include/satsolver/solvable.h -#usr/include/satsolver/solver.h -#usr/include/satsolver/solverdebug.h -#usr/include/satsolver/strpool.h -#usr/include/satsolver/tools_util.h -#usr/include/satsolver/transaction.h -#usr/include/satsolver/util.h -usr/lib/libsatsolver.so -usr/lib/libsatsolver.so.0 -usr/lib/libsatsolver.so.0.17 -usr/lib/libsatsolverext.so -usr/lib/libsatsolverext.so.0 -usr/lib/libsatsolverext.so.0.17 diff --git a/config/rootfiles/packages/python-satsolver b/config/rootfiles/packages/python-satsolver deleted file mode 100644 index 6b5e5761d..000000000 --- a/config/rootfiles/packages/python-satsolver +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python2.7/site-packages/_satsolver.so -usr/lib/python2.7/site-packages/satsolver.py From f9d4d1f7be02ca48d390a5c92b506b0e9ea7233b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 24 Aug 2011 20:53:33 +0200 Subject: [PATCH 108/159] libsolv: create rootfile. --- config/rootfiles/packages/libsolv | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 config/rootfiles/packages/libsolv diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv new file mode 100644 index 000000000..587d5149f --- /dev/null +++ b/config/rootfiles/packages/libsolv @@ -0,0 +1,47 @@ +#usr/include/solv +#usr/include/solv/bitmap.h +#usr/include/solv/chksum.h +#usr/include/solv/dirpool.h +#usr/include/solv/evr.h +#usr/include/solv/hash.h +#usr/include/solv/knownid.h +#usr/include/solv/policy.h +#usr/include/solv/pool.h +#usr/include/solv/pool_fileconflicts.h +#usr/include/solv/poolarch.h +#usr/include/solv/poolid.h +#usr/include/solv/pooltypes.h +#usr/include/solv/poolvendor.h +#usr/include/solv/problems.h +#usr/include/solv/queue.h +#usr/include/solv/repo.h +#usr/include/solv/repo_content.h +#usr/include/solv/repo_deb.h +#usr/include/solv/repo_deltainfoxml.h +#usr/include/solv/repo_helix.h +#usr/include/solv/repo_products.h +#usr/include/solv/repo_releasefile_products.h +#usr/include/solv/repo_repomdxml.h +#usr/include/solv/repo_rpmdb.h +#usr/include/solv/repo_rpmmd.h +#usr/include/solv/repo_solv.h +#usr/include/solv/repo_susetags.h +#usr/include/solv/repo_updateinfoxml.h +#usr/include/solv/repo_write.h +#usr/include/solv/repo_zyppdb.h +#usr/include/solv/repodata.h +#usr/include/solv/repopage.h +#usr/include/solv/rules.h +#usr/include/solv/solv_xfopen.h +#usr/include/solv/solvable.h +#usr/include/solv/solver.h +#usr/include/solv/solverdebug.h +#usr/include/solv/solvversion.h +#usr/include/solv/strpool.h +#usr/include/solv/tools_util.h +#usr/include/solv/transaction.h +#usr/include/solv/util.h +usr/lib/libsolv.so +usr/lib/libsolv.so.0 +usr/lib/libsolvext.so +usr/lib/libsolvext.so.0 From 7c5334e5a563f5d36e1a4c45d26672ab36fba0da Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 24 Aug 2011 20:58:17 +0200 Subject: [PATCH 109/159] cfg80211: removed default regdomain (EU is not supported anymore). --- config/etc/modprobe.d/cfg80211 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211 index 3339ea8fd..9e04ea671 100644 --- a/config/etc/modprobe.d/cfg80211 +++ b/config/etc/modprobe.d/cfg80211 @@ -1,2 +1,2 @@ -options cfg80211 ieee80211_regdom=EU +#options cfg80211 ieee80211_regdom=DE blacklist ieee80211 From 897d5a7e728f28e25863d12e1e3ed254a30a16bc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 25 Aug 2011 11:24:49 +0200 Subject: [PATCH 110/159] core-next: remove kernel-update from update.sh. --- config/rootfiles/core/next/filelists/crda | 1 - config/rootfiles/core/next/filelists/dracut | 1 - config/rootfiles/core/next/filelists/grub | 1 - config/rootfiles/core/next/filelists/iw | 1 - config/rootfiles/core/next/filelists/linux | 1 - .../core/next/filelists/linux-firmware | 1 - .../core/next/filelists/wireless-regdb | 1 - .../core/next/filelists/zd1211-firmware | 1 - config/rootfiles/core/next/update.sh | 122 ++++-------------- 9 files changed, 25 insertions(+), 105 deletions(-) delete mode 120000 config/rootfiles/core/next/filelists/crda delete mode 120000 config/rootfiles/core/next/filelists/dracut delete mode 120000 config/rootfiles/core/next/filelists/grub delete mode 120000 config/rootfiles/core/next/filelists/iw delete mode 120000 config/rootfiles/core/next/filelists/linux delete mode 120000 config/rootfiles/core/next/filelists/linux-firmware delete mode 120000 config/rootfiles/core/next/filelists/wireless-regdb delete mode 120000 config/rootfiles/core/next/filelists/zd1211-firmware diff --git a/config/rootfiles/core/next/filelists/crda b/config/rootfiles/core/next/filelists/crda deleted file mode 120000 index d68c46e55..000000000 --- a/config/rootfiles/core/next/filelists/crda +++ /dev/null @@ -1 +0,0 @@ -../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/dracut b/config/rootfiles/core/next/filelists/dracut deleted file mode 120000 index 160869946..000000000 --- a/config/rootfiles/core/next/filelists/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/grub b/config/rootfiles/core/next/filelists/grub deleted file mode 120000 index 050745c10..000000000 --- a/config/rootfiles/core/next/filelists/grub +++ /dev/null @@ -1 +0,0 @@ -../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/iw b/config/rootfiles/core/next/filelists/iw deleted file mode 120000 index 7c58a2089..000000000 --- a/config/rootfiles/core/next/filelists/iw +++ /dev/null @@ -1 +0,0 @@ -../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/linux b/config/rootfiles/core/next/filelists/linux deleted file mode 120000 index c469fe188..000000000 --- a/config/rootfiles/core/next/filelists/linux +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/linux-firmware b/config/rootfiles/core/next/filelists/linux-firmware deleted file mode 120000 index 4bf91bca9..000000000 --- a/config/rootfiles/core/next/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/wireless-regdb b/config/rootfiles/core/next/filelists/wireless-regdb deleted file mode 120000 index c9205b3cf..000000000 --- a/config/rootfiles/core/next/filelists/wireless-regdb +++ /dev/null @@ -1 +0,0 @@ -../../../common/wireless-regdb \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/zd1211-firmware b/config/rootfiles/core/next/filelists/zd1211-firmware deleted file mode 120000 index 33985ced8..000000000 --- a/config/rootfiles/core/next/filelists/zd1211-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/zd1211-firmware \ No newline at end of file diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 3632ff238..5a4353ff4 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -23,53 +23,18 @@ # . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -# -KVER="xxxKVERxxx" -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - # -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -echo lib/modules >> /opt/pakfire/tmp/ROOTFILES -echo boot >> /opt/pakfire/tmp/ROOTFILES - -# Backup the files -tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 - -echo -echo Update Kernel to $KVER ... -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /lib/modules/*-ipfire -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# Remove old core updates from pakfire cache to save space... +core=52 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done # -# Stop services to save memory -# -/etc/init.d/snort stop -/etc/init.d/squid stop +#Stop services + /etc/init.d/ipsec stop # @@ -86,66 +51,25 @@ rm -rf /usr/lib/libstrongswan.so.0.0.0 rm -rf /usr/libexec/ipsec/plugins # -# Unpack the updated files -# -echo -echo Unpack the updated files ... -# -tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ - --no-overwrite-dir +#Extract files +extract_files # -# Enable ralink rt73 hardware encryption again -rm -f /etc/modprobe.d/ralink_wireless +#Start services -# -# Start services -# -/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 # -# 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,38400n8 panic=10 |g" /boot/grub/grub.conf -fi -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck -# -# Rebuild Language -# +#Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors -## + +#Rebuild module dep's +#depmod 2.6.32.45-ipfire >/dev/null 2>&1 +#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 + ## Change version of Pakfire.conf ## #OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` @@ -175,6 +99,10 @@ rm -rf /etc/sysconfig/lm_sensors #echo #echo Please wait until pakfire has ended... #echo -/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Upgrade finished. If you use a customized grub.cfg" -/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Check it before reboot !!!" -/usr/bin/logger -p syslog.emerg -t core-upgrade-next " *** Please reboot... *** " + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 From 3534ad509882635cb30b28ed28ac8274e14445b2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 25 Aug 2011 11:29:11 +0200 Subject: [PATCH 111/159] ccache: update to 3.1.6. --- lfs/ccache | 4 ++-- ...piler_mtime.patch => ccache-3.1.6-no_compiler_mtime.patch} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename src/patches/{ccache-3.1-no_compiler_mtime.patch => ccache-3.1.6-no_compiler_mtime.patch} (100%) diff --git a/lfs/ccache b/lfs/ccache index 24073209d..6ae52330a 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,7 +24,7 @@ include Config -VER = 3.1 +VER = 3.1.6 THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7961852e1e36f11559039c32142f58df +$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e install : $(TARGET) diff --git a/src/patches/ccache-3.1-no_compiler_mtime.patch b/src/patches/ccache-3.1.6-no_compiler_mtime.patch similarity index 100% rename from src/patches/ccache-3.1-no_compiler_mtime.patch rename to src/patches/ccache-3.1.6-no_compiler_mtime.patch From 9358fb2a8bb468d21c2893c85cd88f1a709c316e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 26 Aug 2011 07:00:42 +0200 Subject: [PATCH 112/159] perl: disabled ssp. enabled nut and netsnmp packages again. --- config/rootfiles/packages/netsnmpd.disabled | 589 -------------------- config/rootfiles/packages/nut.disabled | 131 ----- lfs/netsnmpd | 1 - lfs/perl | 2 +- 4 files changed, 1 insertion(+), 722 deletions(-) delete mode 100644 config/rootfiles/packages/netsnmpd.disabled delete mode 100644 config/rootfiles/packages/nut.disabled diff --git a/config/rootfiles/packages/netsnmpd.disabled b/config/rootfiles/packages/netsnmpd.disabled deleted file mode 100644 index e0858b930..000000000 --- a/config/rootfiles/packages/netsnmpd.disabled +++ /dev/null @@ -1,589 +0,0 @@ -etc/rc.d/rc0.d/K02netsnmpd -etc/rc.d/rc3.d/S65netsnmpd -etc/rc.d/rc6.d/K02netsnmpd -etc/snmpd.conf -usr/bin/encode_keychange -usr/bin/fixproc -usr/bin/ipf-mod.pl -usr/bin/mib2c -usr/bin/mib2c-update -usr/bin/net-snmp-config -usr/bin/snmpbulkget -usr/bin/snmpbulkwalk -usr/bin/snmpcheck -usr/bin/snmpconf -usr/bin/snmpdelta -usr/bin/snmpdf -usr/bin/snmpget -usr/bin/snmpgetnext -usr/bin/snmpinform -usr/bin/snmpnetstat -usr/bin/snmpset -usr/bin/snmpstatus -usr/bin/snmptable -usr/bin/snmptest -usr/bin/snmptranslate -usr/bin/snmptrap -usr/bin/snmpusm -usr/bin/snmpvacm -usr/bin/snmpwalk -usr/bin/tkmib -usr/bin/traptoemail -#usr/include/net-snmp -#usr/include/net-snmp/agent -#usr/include/net-snmp/agent/agent_callbacks.h -#usr/include/net-snmp/agent/agent_handler.h -#usr/include/net-snmp/agent/agent_index.h -#usr/include/net-snmp/agent/agent_module_config.h -#usr/include/net-snmp/agent/agent_read_config.h -#usr/include/net-snmp/agent/agent_registry.h -#usr/include/net-snmp/agent/agent_trap.h -#usr/include/net-snmp/agent/all_helpers.h -#usr/include/net-snmp/agent/auto_nlist.h -#usr/include/net-snmp/agent/baby_steps.h -#usr/include/net-snmp/agent/bulk_to_next.h -#usr/include/net-snmp/agent/cache_handler.h -#usr/include/net-snmp/agent/debug_handler.h -#usr/include/net-snmp/agent/ds_agent.h -#usr/include/net-snmp/agent/instance.h -#usr/include/net-snmp/agent/mfd.h -#usr/include/net-snmp/agent/mib_module_config.h -#usr/include/net-snmp/agent/mib_module_includes.h -#usr/include/net-snmp/agent/mib_modules.h -#usr/include/net-snmp/agent/mode_end_call.h -#usr/include/net-snmp/agent/multiplexer.h -#usr/include/net-snmp/agent/net-snmp-agent-includes.h -#usr/include/net-snmp/agent/null.h -#usr/include/net-snmp/agent/old_api.h -#usr/include/net-snmp/agent/read_only.h -#usr/include/net-snmp/agent/row_merge.h -#usr/include/net-snmp/agent/scalar.h -#usr/include/net-snmp/agent/scalar_group.h -#usr/include/net-snmp/agent/serialize.h -#usr/include/net-snmp/agent/set_helper.h -#usr/include/net-snmp/agent/snmp_agent.h -#usr/include/net-snmp/agent/snmp_vars.h -#usr/include/net-snmp/agent/stash_cache.h -#usr/include/net-snmp/agent/stash_to_next.h -#usr/include/net-snmp/agent/table.h -#usr/include/net-snmp/agent/table_array.h -#usr/include/net-snmp/agent/table_container.h -#usr/include/net-snmp/agent/table_data.h -#usr/include/net-snmp/agent/table_dataset.h -#usr/include/net-snmp/agent/table_iterator.h -#usr/include/net-snmp/agent/table_tdata.h -#usr/include/net-snmp/agent/util_funcs.h -#usr/include/net-snmp/agent/var_struct.h -#usr/include/net-snmp/agent/watcher.h -#usr/include/net-snmp/config_api.h -#usr/include/net-snmp/definitions.h -#usr/include/net-snmp/library -#usr/include/net-snmp/library/README -#usr/include/net-snmp/library/asn1.h -#usr/include/net-snmp/library/callback.h -#usr/include/net-snmp/library/check_varbind.h -#usr/include/net-snmp/library/cmu_compat.h -#usr/include/net-snmp/library/container.h -#usr/include/net-snmp/library/container_binary_array.h -#usr/include/net-snmp/library/container_iterator.h -#usr/include/net-snmp/library/container_list_ssll.h -#usr/include/net-snmp/library/container_null.h -#usr/include/net-snmp/library/data_list.h -#usr/include/net-snmp/library/default_store.h -#usr/include/net-snmp/library/factory.h -#usr/include/net-snmp/library/fd_event_manager.h -#usr/include/net-snmp/library/file_utils.h -#usr/include/net-snmp/library/getopt.h -#usr/include/net-snmp/library/int64.h -#usr/include/net-snmp/library/keytools.h -#usr/include/net-snmp/library/lcd_time.h -#usr/include/net-snmp/library/md5.h -#usr/include/net-snmp/library/mib.h -#usr/include/net-snmp/library/mt_support.h -#usr/include/net-snmp/library/oid_stash.h -#usr/include/net-snmp/library/parse.h -#usr/include/net-snmp/library/read_config.h -#usr/include/net-snmp/library/scapi.h -#usr/include/net-snmp/library/snmp-tc.h -#usr/include/net-snmp/library/snmp.h -#usr/include/net-snmp/library/snmpCallbackDomain.h -#usr/include/net-snmp/library/snmpTCPDomain.h -#usr/include/net-snmp/library/snmpUDPDomain.h -#usr/include/net-snmp/library/snmpUnixDomain.h -#usr/include/net-snmp/library/snmp_alarm.h -#usr/include/net-snmp/library/snmp_api.h -#usr/include/net-snmp/library/snmp_assert.h -#usr/include/net-snmp/library/snmp_client.h -#usr/include/net-snmp/library/snmp_debug.h -#usr/include/net-snmp/library/snmp_enum.h -#usr/include/net-snmp/library/snmp_impl.h -#usr/include/net-snmp/library/snmp_logging.h -#usr/include/net-snmp/library/snmp_parse_args.h -#usr/include/net-snmp/library/snmp_secmod.h -#usr/include/net-snmp/library/snmp_service.h -#usr/include/net-snmp/library/snmp_transport.h -#usr/include/net-snmp/library/snmpusm.h -#usr/include/net-snmp/library/snmpv3-security-includes.h -#usr/include/net-snmp/library/snmpv3.h -#usr/include/net-snmp/library/system.h -#usr/include/net-snmp/library/text_utils.h -#usr/include/net-snmp/library/tools.h -#usr/include/net-snmp/library/transform_oids.h -#usr/include/net-snmp/library/ucd_compat.h -#usr/include/net-snmp/library/vacm.h -#usr/include/net-snmp/library/winpipe.h -#usr/include/net-snmp/library/winservice.h -#usr/include/net-snmp/machine -#usr/include/net-snmp/machine/generic.h -#usr/include/net-snmp/mib_api.h -#usr/include/net-snmp/net-snmp-config.h -#usr/include/net-snmp/net-snmp-includes.h -#usr/include/net-snmp/output_api.h -#usr/include/net-snmp/pdu_api.h -#usr/include/net-snmp/session_api.h -#usr/include/net-snmp/snmpv3_api.h -#usr/include/net-snmp/system -#usr/include/net-snmp/system/aix.h -#usr/include/net-snmp/system/bsd.h -#usr/include/net-snmp/system/bsdi.h -#usr/include/net-snmp/system/bsdi3.h -#usr/include/net-snmp/system/bsdi4.h -#usr/include/net-snmp/system/cygwin.h -#usr/include/net-snmp/system/darwin.h -#usr/include/net-snmp/system/darwin7.h -#usr/include/net-snmp/system/darwin8.h -#usr/include/net-snmp/system/darwin9.h -#usr/include/net-snmp/system/dragonfly.h -#usr/include/net-snmp/system/dynix.h -#usr/include/net-snmp/system/freebsd.h -#usr/include/net-snmp/system/freebsd2.h -#usr/include/net-snmp/system/freebsd3.h -#usr/include/net-snmp/system/freebsd4.h -#usr/include/net-snmp/system/freebsd5.h -#usr/include/net-snmp/system/freebsd6.h -#usr/include/net-snmp/system/generic.h -#usr/include/net-snmp/system/hpux.h -#usr/include/net-snmp/system/irix.h -#usr/include/net-snmp/system/linux.h -#usr/include/net-snmp/system/mingw32.h -#usr/include/net-snmp/system/mips.h -#usr/include/net-snmp/system/netbsd.h -#usr/include/net-snmp/system/openbsd.h -#usr/include/net-snmp/system/osf5.h -#usr/include/net-snmp/system/solaris.h -#usr/include/net-snmp/system/solaris2.3.h -#usr/include/net-snmp/system/solaris2.4.h -#usr/include/net-snmp/system/solaris2.5.h -#usr/include/net-snmp/system/solaris2.6.h -#usr/include/net-snmp/system/sunos.h -#usr/include/net-snmp/system/svr5.h -#usr/include/net-snmp/system/sysv.h -#usr/include/net-snmp/system/ultrix4.h -#usr/include/net-snmp/types.h -#usr/include/net-snmp/utilities.h -#usr/include/net-snmp/varbind_api.h -#usr/include/net-snmp/version.h -#usr/lib/libnetsnmp.a -#usr/lib/libnetsnmp.la -usr/lib/libnetsnmp.so -usr/lib/libnetsnmp.so.15 -usr/lib/libnetsnmp.so.15.1.2 -#usr/lib/libnetsnmpagent.a -#usr/lib/libnetsnmpagent.la -usr/lib/libnetsnmpagent.so -usr/lib/libnetsnmpagent.so.15 -usr/lib/libnetsnmpagent.so.15.1.2 -#usr/lib/libnetsnmphelpers.a -#usr/lib/libnetsnmphelpers.la -usr/lib/libnetsnmphelpers.so -usr/lib/libnetsnmphelpers.so.15 -usr/lib/libnetsnmphelpers.so.15.1.2 -#usr/lib/libnetsnmpmibs.a -#usr/lib/libnetsnmpmibs.la -usr/lib/libnetsnmpmibs.so -usr/lib/libnetsnmpmibs.so.15 -usr/lib/libnetsnmpmibs.so.15.1.2 -#usr/lib/libnetsnmptrapd.a -#usr/lib/libnetsnmptrapd.la -usr/lib/libnetsnmptrapd.so -usr/lib/libnetsnmptrapd.so.15 -usr/lib/libnetsnmptrapd.so.15.1.2 -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle/Makefile.subs.pl -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/ASN.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/OID.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/TrapReceiver.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/Support.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/default_store.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/netsnmp_request_infoPtr.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/default_store.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/SNMP.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle/NetSNMP -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle/NetSNMP/.packlist -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/ASN.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/ASN.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/autosplit.ix -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/OID.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/OID.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/autosplit.ix -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/autosplit.ix -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/agent.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/agent.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/autosplit.ix -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/autosplit.ix -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/autosplit.ix -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/default_store.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/default_store.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/SNMP.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/SNMP.so -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/autosplit.ix -#usr/man/man1/encode_keychange.1 -#usr/man/man1/fixproc.1 -#usr/man/man1/mib2c-update.1 -#usr/man/man1/mib2c.1 -#usr/man/man1/net-snmp-config.1 -#usr/man/man1/snmpbulkget.1 -#usr/man/man1/snmpbulkwalk.1 -#usr/man/man1/snmpcmd.1 -#usr/man/man1/snmpconf.1 -#usr/man/man1/snmpdelta.1 -#usr/man/man1/snmpdf.1 -#usr/man/man1/snmpget.1 -#usr/man/man1/snmpgetnext.1 -#usr/man/man1/snmpinform.1 -#usr/man/man1/snmpnetstat.1 -#usr/man/man1/snmpset.1 -#usr/man/man1/snmpstatus.1 -#usr/man/man1/snmptable.1 -#usr/man/man1/snmptest.1 -#usr/man/man1/snmptranslate.1 -#usr/man/man1/snmptrap.1 -#usr/man/man1/snmpusm.1 -#usr/man/man1/snmpvacm.1 -#usr/man/man1/snmpwalk.1 -#usr/man/man1/tkmib.1 -#usr/man/man1/traptoemail.1 -#usr/man/man3/add_mibdir.3 -#usr/man/man3/add_module_replacement.3 -#usr/man/man3/config_perror.3 -#usr/man/man3/config_pwarn.3 -#usr/man/man3/default_store.3 -#usr/man/man3/fprint_description.3 -#usr/man/man3/fprint_objid.3 -#usr/man/man3/fprint_value.3 -#usr/man/man3/fprint_variable.3 -#usr/man/man3/get_module_node.3 -#usr/man/man3/init_mib.3 -#usr/man/man3/init_mib_internals.3 -#usr/man/man3/mib_api.3 -#usr/man/man3/netsnmp_Container_iterator.3 -#usr/man/man3/netsnmp_agent.3 -#usr/man/man3/netsnmp_baby_steps.3 -#usr/man/man3/netsnmp_bulk_to_next.3 -#usr/man/man3/netsnmp_cache_handler.3 -#usr/man/man3/netsnmp_container.3 -#usr/man/man3/netsnmp_debug.3 -#usr/man/man3/netsnmp_ds_get_boolean.3 -#usr/man/man3/netsnmp_ds_get_int.3 -#usr/man/man3/netsnmp_ds_get_string.3 -#usr/man/man3/netsnmp_ds_register_config.3 -#usr/man/man3/netsnmp_ds_register_premib.3 -#usr/man/man3/netsnmp_ds_set_boolean.3 -#usr/man/man3/netsnmp_ds_set_int.3 -#usr/man/man3/netsnmp_ds_set_string.3 -#usr/man/man3/netsnmp_ds_shutdown.3 -#usr/man/man3/netsnmp_example_scalar_int.3 -#usr/man/man3/netsnmp_handler.3 -#usr/man/man3/netsnmp_instance.3 -#usr/man/man3/netsnmp_iterator_info_s.3 -#usr/man/man3/netsnmp_leaf.3 -#usr/man/man3/netsnmp_library.3 -#usr/man/man3/netsnmp_mib_handler_methods.3 -#usr/man/man3/netsnmp_mib_utilities.3 -#usr/man/man3/netsnmp_mode_end_call.3 -#usr/man/man3/netsnmp_multiplexer.3 -#usr/man/man3/netsnmp_old_api.3 -#usr/man/man3/netsnmp_read_only.3 -#usr/man/man3/netsnmp_row_merge.3 -#usr/man/man3/netsnmp_scalar.3 -#usr/man/man3/netsnmp_scalar_group_group.3 -#usr/man/man3/netsnmp_serialize.3 -#usr/man/man3/netsnmp_stash_cache.3 -#usr/man/man3/netsnmp_table.3 -#usr/man/man3/netsnmp_table_array.3 -#usr/man/man3/netsnmp_table_data.3 -#usr/man/man3/netsnmp_table_dataset.3 -#usr/man/man3/netsnmp_table_iterator.3 -#usr/man/man3/netsnmp_utilities.3 -#usr/man/man3/netsnmp_watcher.3 -#usr/man/man3/print_description.3 -#usr/man/man3/print_mib.3 -#usr/man/man3/print_objid.3 -#usr/man/man3/print_value.3 -#usr/man/man3/print_variable.3 -#usr/man/man3/read_all_mibs.3 -#usr/man/man3/read_config.3 -#usr/man/man3/read_config_print_usage.3 -#usr/man/man3/read_configs.3 -#usr/man/man3/read_mib.3 -#usr/man/man3/read_module.3 -#usr/man/man3/read_module_node.3 -#usr/man/man3/read_objid.3 -#usr/man/man3/read_premib_configs.3 -#usr/man/man3/register_app_config_handler.3 -#usr/man/man3/register_app_premib_handler.3 -#usr/man/man3/register_config_handler.3 -#usr/man/man3/register_mib_handlers.3 -#usr/man/man3/register_premib_handler.3 -#usr/man/man3/send_easy_trap.3 -#usr/man/man3/send_trap_vars.3 -#usr/man/man3/send_v2trap.3 -#usr/man/man3/shutdown_mib.3 -#usr/man/man3/snmp_agent_api.3 -#usr/man/man3/snmp_alarm.3 -#usr/man/man3/snmp_alarm_register.3 -#usr/man/man3/snmp_alarm_register_hr.3 -#usr/man/man3/snmp_alarm_unregister.3 -#usr/man/man3/snmp_api.3 -#usr/man/man3/snmp_api_errstring.3 -#usr/man/man3/snmp_close.3 -#usr/man/man3/snmp_error.3 -#usr/man/man3/snmp_free_pdu.3 -#usr/man/man3/snmp_open.3 -#usr/man/man3/snmp_perror.3 -#usr/man/man3/snmp_read.3 -#usr/man/man3/snmp_select_info.3 -#usr/man/man3/snmp_send.3 -#usr/man/man3/snmp_sess_api.3 -#usr/man/man3/snmp_sess_async_send.3 -#usr/man/man3/snmp_sess_close.3 -#usr/man/man3/snmp_sess_error.3 -#usr/man/man3/snmp_sess_init.3 -#usr/man/man3/snmp_sess_open.3 -#usr/man/man3/snmp_sess_perror.3 -#usr/man/man3/snmp_sess_read.3 -#usr/man/man3/snmp_sess_select_info.3 -#usr/man/man3/snmp_sess_send.3 -#usr/man/man3/snmp_sess_session.3 -#usr/man/man3/snmp_sess_timeout.3 -#usr/man/man3/snmp_set_mib_warnings.3 -#usr/man/man3/snmp_set_save_descriptions.3 -#usr/man/man3/snmp_timeout.3 -#usr/man/man3/snmp_trap_api.3 -#usr/man/man3/snprint_objid.3 -#usr/man/man3/snprint_value.3 -#usr/man/man3/snprint_variable.3 -#usr/man/man3/sprint_realloc_objid.3 -#usr/man/man3/sprint_realloc_value.3 -#usr/man/man3/sprint_realloc_variable.3 -#usr/man/man3/unregister_app_config_handler.3 -#usr/man/man3/unregister_config_handler.3 -#usr/man/man5/mib2c.conf.5 -#usr/man/man5/snmp.conf.5 -#usr/man/man5/snmp_config.5 -#usr/man/man5/snmpd.conf.5 -#usr/man/man5/snmpd.examples.5 -#usr/man/man5/snmpd.internal.5 -#usr/man/man5/snmptrapd.conf.5 -#usr/man/man5/variables.5 -#usr/man/man8/snmpd.8 -#usr/man/man8/snmptrapd.8 -usr/sbin/snmpd -usr/sbin/snmptrapd -#usr/share/man/man3/NetSNMP::ASN.3 -#usr/share/man/man3/NetSNMP::OID.3 -#usr/share/man/man3/NetSNMP::TrapReceiver.3 -#usr/share/man/man3/NetSNMP::agent.3 -#usr/share/man/man3/NetSNMP::agent::default_store.3 -#usr/share/man/man3/NetSNMP::default_store.3 -#usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3 -#usr/share/man/man3/SNMP.3 -usr/share/snmp -usr/share/snmp/mib2c-data -usr/share/snmp/mib2c-data/default-mfd-top.m2c -usr/share/snmp/mib2c-data/details-enums.m2i -usr/share/snmp/mib2c-data/details-node.m2i -usr/share/snmp/mib2c-data/details-table.m2i -usr/share/snmp/mib2c-data/generic-ctx-copy.m2i -usr/share/snmp/mib2c-data/generic-ctx-get.m2i -usr/share/snmp/mib2c-data/generic-ctx-set.m2i -usr/share/snmp/mib2c-data/generic-data-allocate.m2i -usr/share/snmp/mib2c-data/generic-data-context.m2i -usr/share/snmp/mib2c-data/generic-get-char.m2i -usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i -usr/share/snmp/mib2c-data/generic-get-decl.m2i -usr/share/snmp/mib2c-data/generic-get-long.m2i -usr/share/snmp/mib2c-data/generic-get-oid.m2i -usr/share/snmp/mib2c-data/generic-header-bottom.m2i -usr/share/snmp/mib2c-data/generic-header-top.m2i -usr/share/snmp/mib2c-data/generic-source-includes.m2i -usr/share/snmp/mib2c-data/generic-table-constants.m2c -usr/share/snmp/mib2c-data/generic-table-enums.m2c -usr/share/snmp/mib2c-data/generic-table-indexes-from-oid.m2i -usr/share/snmp/mib2c-data/generic-table-indexes-set.m2i -usr/share/snmp/mib2c-data/generic-table-indexes-to-oid.m2i -usr/share/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i -usr/share/snmp/mib2c-data/generic-table-indexes.m2i -usr/share/snmp/mib2c-data/generic-table-oids.m2c -usr/share/snmp/mib2c-data/generic-value-map-func.m2i -usr/share/snmp/mib2c-data/generic-value-map-reverse.m2i -usr/share/snmp/mib2c-data/generic-value-map.m2i -usr/share/snmp/mib2c-data/m2c-internal-warning.m2i -usr/share/snmp/mib2c-data/m2c_setup_enum.m2i -usr/share/snmp/mib2c-data/m2c_setup_node.m2i -usr/share/snmp/mib2c-data/m2c_setup_table.m2i -usr/share/snmp/mib2c-data/m2c_table_save_defaults.m2i -usr/share/snmp/mib2c-data/mfd-access-container-cached-defines.m2i -usr/share/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i -usr/share/snmp/mib2c-data/mfd-data-access.m2c -usr/share/snmp/mib2c-data/mfd-data-get.m2c -usr/share/snmp/mib2c-data/mfd-data-set.m2c -usr/share/snmp/mib2c-data/mfd-doxygen.m2c -usr/share/snmp/mib2c-data/mfd-interactive-setup.m2c -usr/share/snmp/mib2c-data/mfd-interface.m2c -usr/share/snmp/mib2c-data/mfd-makefile.m2m -usr/share/snmp/mib2c-data/mfd-persistence.m2i -usr/share/snmp/mib2c-data/mfd-readme.m2c -usr/share/snmp/mib2c-data/mfd-top.m2c -usr/share/snmp/mib2c-data/node-get.m2i -usr/share/snmp/mib2c-data/node-set.m2i -usr/share/snmp/mib2c-data/node-storage.m2i -usr/share/snmp/mib2c-data/node-validate.m2i -usr/share/snmp/mib2c-data/node-varbind-validate.m2i -usr/share/snmp/mib2c-data/parent-dependencies.m2i -usr/share/snmp/mib2c-data/parent-set.m2i -usr/share/snmp/mib2c-data/subagent.m2c -usr/share/snmp/mib2c-data/syntax-COUNTER64-get.m2i -usr/share/snmp/mib2c-data/syntax-DateAndTime-get.m2d -usr/share/snmp/mib2c-data/syntax-DateAndTime-get.m2i -usr/share/snmp/mib2c-data/syntax-DateAndTime-readme.m2i -usr/share/snmp/mib2c-data/syntax-InetAddress-get.m2i -usr/share/snmp/mib2c-data/syntax-InetAddress-set.m2i -usr/share/snmp/mib2c-data/syntax-InetAddressType-get.m2i -usr/share/snmp/mib2c-data/syntax-InetAddressType-set.m2i -usr/share/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i -usr/share/snmp/mib2c-data/syntax-RowStatus-get.m2i -usr/share/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i -usr/share/snmp/mib2c-data/syntax-StorageType-dependencies.m2i -usr/share/snmp/mib2c-data/syntax-TestAndIncr-get.m2i -usr/share/snmp/mib2c.access_functions.conf -usr/share/snmp/mib2c.array-user.conf -usr/share/snmp/mib2c.check_values.conf -usr/share/snmp/mib2c.check_values_local.conf -usr/share/snmp/mib2c.column_defines.conf -usr/share/snmp/mib2c.column_enums.conf -usr/share/snmp/mib2c.column_storage.conf -usr/share/snmp/mib2c.conf -usr/share/snmp/mib2c.container.conf -usr/share/snmp/mib2c.create-dataset.conf -usr/share/snmp/mib2c.genhtml.conf -usr/share/snmp/mib2c.int_watch.conf -usr/share/snmp/mib2c.iterate.conf -usr/share/snmp/mib2c.iterate_access.conf -usr/share/snmp/mib2c.mfd.conf -usr/share/snmp/mib2c.notify.conf -usr/share/snmp/mib2c.old-api.conf -usr/share/snmp/mib2c.perl.conf -usr/share/snmp/mib2c.scalar.conf -usr/share/snmp/mib2c.table_data.conf -usr/share/snmp/mibs -usr/share/snmp/mibs/AGENTX-MIB.txt -usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt -usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt -usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt -usr/share/snmp/mibs/EtherLike-MIB.txt -usr/share/snmp/mibs/HCNUM-TC.txt -usr/share/snmp/mibs/HOST-RESOURCES-MIB.txt -usr/share/snmp/mibs/HOST-RESOURCES-TYPES.txt -usr/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -usr/share/snmp/mibs/IANA-LANGUAGE-MIB.txt -usr/share/snmp/mibs/IANA-RTPROTO-MIB.txt -usr/share/snmp/mibs/IANAifType-MIB.txt -usr/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt -usr/share/snmp/mibs/IF-MIB.txt -usr/share/snmp/mibs/INET-ADDRESS-MIB.txt -usr/share/snmp/mibs/IP-FORWARD-MIB.txt -usr/share/snmp/mibs/IP-MIB.txt -usr/share/snmp/mibs/IPV6-ICMP-MIB.txt -usr/share/snmp/mibs/IPV6-MIB.txt -usr/share/snmp/mibs/IPV6-TC.txt -usr/share/snmp/mibs/IPV6-TCP-MIB.txt -usr/share/snmp/mibs/IPV6-UDP-MIB.txt -usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt -usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt -usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt -usr/share/snmp/mibs/NET-SNMP-MIB.txt -usr/share/snmp/mibs/NET-SNMP-TC.txt -usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt -usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt -usr/share/snmp/mibs/RFC-1215.txt -usr/share/snmp/mibs/RFC1155-SMI.txt -usr/share/snmp/mibs/RFC1213-MIB.txt -usr/share/snmp/mibs/RMON-MIB.txt -usr/share/snmp/mibs/SCTP-MIB.txt -usr/share/snmp/mibs/SMUX-MIB.txt -usr/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt -usr/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt -usr/share/snmp/mibs/SNMP-MPD-MIB.txt -usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt -usr/share/snmp/mibs/SNMP-PROXY-MIB.txt -usr/share/snmp/mibs/SNMP-TARGET-MIB.txt -usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt -usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt -usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt -usr/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -usr/share/snmp/mibs/SNMPv2-CONF.txt -usr/share/snmp/mibs/SNMPv2-MIB.txt -usr/share/snmp/mibs/SNMPv2-SMI.txt -usr/share/snmp/mibs/SNMPv2-TC.txt -usr/share/snmp/mibs/SNMPv2-TM.txt -usr/share/snmp/mibs/TCP-MIB.txt -usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt -usr/share/snmp/mibs/UCD-DEMO-MIB.txt -usr/share/snmp/mibs/UCD-DISKIO-MIB.txt -usr/share/snmp/mibs/UCD-DLMOD-MIB.txt -usr/share/snmp/mibs/UCD-IPFWACC-MIB.txt -usr/share/snmp/mibs/UCD-SNMP-MIB.txt -usr/share/snmp/mibs/UDP-MIB.txt -usr/share/snmp/snmp_perl.pl -usr/share/snmp/snmp_perl_trapd.pl -usr/share/snmp/snmpconf-data -usr/share/snmp/snmpconf-data/snmp-data -usr/share/snmp/snmpconf-data/snmp-data/authopts -usr/share/snmp/snmpconf-data/snmp-data/debugging -usr/share/snmp/snmpconf-data/snmp-data/mibs -usr/share/snmp/snmpconf-data/snmp-data/output -usr/share/snmp/snmpconf-data/snmp-data/snmpconf-config -usr/share/snmp/snmpconf-data/snmpd-data -usr/share/snmp/snmpconf-data/snmpd-data/acl -usr/share/snmp/snmpconf-data/snmpd-data/basic_setup -usr/share/snmp/snmpconf-data/snmpd-data/extending -usr/share/snmp/snmpconf-data/snmpd-data/monitor -usr/share/snmp/snmpconf-data/snmpd-data/operation -usr/share/snmp/snmpconf-data/snmpd-data/snmpconf-config -usr/share/snmp/snmpconf-data/snmpd-data/system -usr/share/snmp/snmpconf-data/snmpd-data/trapsinks -usr/share/snmp/snmpconf-data/snmptrapd-data -usr/share/snmp/snmpconf-data/snmptrapd-data/authentication -usr/share/snmp/snmpconf-data/snmptrapd-data/formatting -usr/share/snmp/snmpconf-data/snmptrapd-data/logging -usr/share/snmp/snmpconf-data/snmptrapd-data/runtime -usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config -usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle -etc/rc.d/init.d/netsnmpd diff --git a/config/rootfiles/packages/nut.disabled b/config/rootfiles/packages/nut.disabled deleted file mode 100644 index f7d3d2b6f..000000000 --- a/config/rootfiles/packages/nut.disabled +++ /dev/null @@ -1,131 +0,0 @@ -#etc/nut -etc/nut/nut.conf.sample -etc/nut/ups.conf.sample -etc/nut/upsd.conf.sample -etc/nut/upsd.users.sample -etc/nut/upsmon.conf.sample -etc/nut/upssched.conf.sample -etc/udev/rules.d/52-nut-usbups.rules -usr/bin/apcsmart -usr/bin/bcmxcp -usr/bin/bcmxcp_usb -usr/bin/belkin -usr/bin/belkinunv -usr/bin/bestfcom -usr/bin/bestfortress -usr/bin/bestuferrups -usr/bin/bestups -usr/bin/blazer_ser -usr/bin/blazer_usb -usr/bin/clone -usr/bin/clone-outlet -usr/bin/dummy-ups -usr/bin/etapro -usr/bin/everups -usr/bin/gamatronic -usr/bin/genericups -usr/bin/isbmex -usr/bin/ivtscd -usr/bin/liebert -usr/bin/liebertgxt2 -usr/bin/masterguard -usr/bin/megatec -usr/bin/megatec_usb -usr/bin/metasys -usr/bin/mge-shut -usr/bin/mge-utalk -usr/bin/microdowell -usr/bin/newmge-shut -usr/bin/oneac -usr/bin/optiups -usr/bin/powercom -usr/bin/powerpanel -usr/bin/rhino -usr/bin/richcomm_usb -usr/bin/safenet -usr/bin/skel -usr/bin/snmp-ups -usr/bin/solis -usr/bin/tripplite -usr/bin/tripplite_usb -usr/bin/tripplitesu -usr/bin/upsc -usr/bin/upscmd -usr/bin/upscode2 -usr/bin/upsdrvctl -usr/bin/upslog -usr/bin/upsrw -usr/bin/upssched-cmd -usr/bin/usbhid-ups -usr/bin/victronups -#usr/cgi-bin -#usr/html -#usr/lib/libupsclient.la -usr/lib/libupsclient.so -usr/lib/libupsclient.so.1 -usr/lib/libupsclient.so.1.0.0 -usr/sbin/upsd -usr/sbin/upsmon -usr/sbin/upssched -usr/share/cmdvartab -usr/share/driver.list -#usr/share/man/man5/nut.conf.5 -#usr/share/man/man5/ups.conf.5 -#usr/share/man/man5/upsd.conf.5 -#usr/share/man/man5/upsd.users.5 -#usr/share/man/man5/upsmon.conf.5 -#usr/share/man/man5/upssched.conf.5 -#usr/share/man/man8/apcsmart.8 -#usr/share/man/man8/bcmxcp.8 -#usr/share/man/man8/bcmxcp_usb.8 -#usr/share/man/man8/belkin.8 -#usr/share/man/man8/belkinunv.8 -#usr/share/man/man8/bestfcom.8 -#usr/share/man/man8/bestfortress.8 -#usr/share/man/man8/bestuferrups.8 -#usr/share/man/man8/bestups.8 -#usr/share/man/man8/blazer.8 -#usr/share/man/man8/clone.8 -#usr/share/man/man8/dummy-ups.8 -#usr/share/man/man8/etapro.8 -#usr/share/man/man8/everups.8 -#usr/share/man/man8/gamatronic.8 -#usr/share/man/man8/genericups.8 -#usr/share/man/man8/isbmex.8 -#usr/share/man/man8/ivtscd.8 -#usr/share/man/man8/liebert.8 -#usr/share/man/man8/liebertgxt2.8 -#usr/share/man/man8/masterguard.8 -#usr/share/man/man8/megatec.8 -#usr/share/man/man8/megatec_usb.8 -#usr/share/man/man8/metasys.8 -#usr/share/man/man8/mge-shut.8 -#usr/share/man/man8/mge-utalk.8 -#usr/share/man/man8/microdowell.8 -#usr/share/man/man8/nutupsdrv.8 -#usr/share/man/man8/oneac.8 -#usr/share/man/man8/optiups.8 -#usr/share/man/man8/powercom.8 -#usr/share/man/man8/powerpanel.8 -#usr/share/man/man8/rhino.8 -#usr/share/man/man8/richcomm_usb.8 -#usr/share/man/man8/safenet.8 -#usr/share/man/man8/snmp-ups.8 -#usr/share/man/man8/solis.8 -#usr/share/man/man8/tripplite.8 -#usr/share/man/man8/tripplite_usb.8 -#usr/share/man/man8/tripplitesu.8 -#usr/share/man/man8/upsc.8 -#usr/share/man/man8/upscmd.8 -#usr/share/man/man8/upscode2.8 -#usr/share/man/man8/upsd.8 -#usr/share/man/man8/upsdrvctl.8 -#usr/share/man/man8/upslog.8 -#usr/share/man/man8/upsmon.8 -#usr/share/man/man8/upsrw.8 -#usr/share/man/man8/upssched.8 -#usr/share/man/man8/usbhid-ups.8 -#usr/share/man/man8/victronups.8 -var/ipfire/backup/addons/includes/nut -var/state/ups -etc/rc.d/init.d/nut diff --git a/lfs/netsnmpd b/lfs/netsnmpd index e010807e4..388b20b12 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-logfile="/var/log/snmpd.log" \ --with-persistent-directory="/var/net-snmp" \ --libdir=/usr/lib \ - --disable-embedded-perl \ --sysconfdir="/etc" cd $(DIR_APP) && make cd $(DIR_APP) && make install diff --git a/lfs/perl b/lfs/perl index 61c8ef113..c4ddc8e76 100644 --- a/lfs/perl +++ b/lfs/perl @@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifneq "$(ROOT)" "" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-libc-2.patch endif + cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Configure ifeq "$(ROOT)" "" cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR" -Dusethreads @@ -88,7 +89,6 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install else - cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Configure cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO' cd $(DIR_APP) && sed -i 's/^0$$//' makefile cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile From 65cacf80892b6785b091d56dde56facef5a62a89 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 26 Aug 2011 07:04:38 +0200 Subject: [PATCH 113/159] core-next: add glibc to updater. --- config/rootfiles/core/next/exclude | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude index c2bceb866..6bfbbf791 100644 --- a/config/rootfiles/core/next/exclude +++ b/config/rootfiles/core/next/exclude @@ -4,3 +4,4 @@ etc/ipsec.secrets etc/ipsec.user.conf etc/ipsec.user.secrets var/updatecache +etc/localtime From 2878d79fde4c34c980f0be1c1b8a36ac867a2dfd Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 26 Aug 2011 15:25:23 +0200 Subject: [PATCH 114/159] readd missing rootfiles. --- config/rootfiles/packages/netsnmpd | 589 +++++++++++++++++++++++++++++ config/rootfiles/packages/nut | 131 +++++++ 2 files changed, 720 insertions(+) create mode 100644 config/rootfiles/packages/netsnmpd create mode 100644 config/rootfiles/packages/nut diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd new file mode 100644 index 000000000..e0858b930 --- /dev/null +++ b/config/rootfiles/packages/netsnmpd @@ -0,0 +1,589 @@ +etc/rc.d/rc0.d/K02netsnmpd +etc/rc.d/rc3.d/S65netsnmpd +etc/rc.d/rc6.d/K02netsnmpd +etc/snmpd.conf +usr/bin/encode_keychange +usr/bin/fixproc +usr/bin/ipf-mod.pl +usr/bin/mib2c +usr/bin/mib2c-update +usr/bin/net-snmp-config +usr/bin/snmpbulkget +usr/bin/snmpbulkwalk +usr/bin/snmpcheck +usr/bin/snmpconf +usr/bin/snmpdelta +usr/bin/snmpdf +usr/bin/snmpget +usr/bin/snmpgetnext +usr/bin/snmpinform +usr/bin/snmpnetstat +usr/bin/snmpset +usr/bin/snmpstatus +usr/bin/snmptable +usr/bin/snmptest +usr/bin/snmptranslate +usr/bin/snmptrap +usr/bin/snmpusm +usr/bin/snmpvacm +usr/bin/snmpwalk +usr/bin/tkmib +usr/bin/traptoemail +#usr/include/net-snmp +#usr/include/net-snmp/agent +#usr/include/net-snmp/agent/agent_callbacks.h +#usr/include/net-snmp/agent/agent_handler.h +#usr/include/net-snmp/agent/agent_index.h +#usr/include/net-snmp/agent/agent_module_config.h +#usr/include/net-snmp/agent/agent_read_config.h +#usr/include/net-snmp/agent/agent_registry.h +#usr/include/net-snmp/agent/agent_trap.h +#usr/include/net-snmp/agent/all_helpers.h +#usr/include/net-snmp/agent/auto_nlist.h +#usr/include/net-snmp/agent/baby_steps.h +#usr/include/net-snmp/agent/bulk_to_next.h +#usr/include/net-snmp/agent/cache_handler.h +#usr/include/net-snmp/agent/debug_handler.h +#usr/include/net-snmp/agent/ds_agent.h +#usr/include/net-snmp/agent/instance.h +#usr/include/net-snmp/agent/mfd.h +#usr/include/net-snmp/agent/mib_module_config.h +#usr/include/net-snmp/agent/mib_module_includes.h +#usr/include/net-snmp/agent/mib_modules.h +#usr/include/net-snmp/agent/mode_end_call.h +#usr/include/net-snmp/agent/multiplexer.h +#usr/include/net-snmp/agent/net-snmp-agent-includes.h +#usr/include/net-snmp/agent/null.h +#usr/include/net-snmp/agent/old_api.h +#usr/include/net-snmp/agent/read_only.h +#usr/include/net-snmp/agent/row_merge.h +#usr/include/net-snmp/agent/scalar.h +#usr/include/net-snmp/agent/scalar_group.h +#usr/include/net-snmp/agent/serialize.h +#usr/include/net-snmp/agent/set_helper.h +#usr/include/net-snmp/agent/snmp_agent.h +#usr/include/net-snmp/agent/snmp_vars.h +#usr/include/net-snmp/agent/stash_cache.h +#usr/include/net-snmp/agent/stash_to_next.h +#usr/include/net-snmp/agent/table.h +#usr/include/net-snmp/agent/table_array.h +#usr/include/net-snmp/agent/table_container.h +#usr/include/net-snmp/agent/table_data.h +#usr/include/net-snmp/agent/table_dataset.h +#usr/include/net-snmp/agent/table_iterator.h +#usr/include/net-snmp/agent/table_tdata.h +#usr/include/net-snmp/agent/util_funcs.h +#usr/include/net-snmp/agent/var_struct.h +#usr/include/net-snmp/agent/watcher.h +#usr/include/net-snmp/config_api.h +#usr/include/net-snmp/definitions.h +#usr/include/net-snmp/library +#usr/include/net-snmp/library/README +#usr/include/net-snmp/library/asn1.h +#usr/include/net-snmp/library/callback.h +#usr/include/net-snmp/library/check_varbind.h +#usr/include/net-snmp/library/cmu_compat.h +#usr/include/net-snmp/library/container.h +#usr/include/net-snmp/library/container_binary_array.h +#usr/include/net-snmp/library/container_iterator.h +#usr/include/net-snmp/library/container_list_ssll.h +#usr/include/net-snmp/library/container_null.h +#usr/include/net-snmp/library/data_list.h +#usr/include/net-snmp/library/default_store.h +#usr/include/net-snmp/library/factory.h +#usr/include/net-snmp/library/fd_event_manager.h +#usr/include/net-snmp/library/file_utils.h +#usr/include/net-snmp/library/getopt.h +#usr/include/net-snmp/library/int64.h +#usr/include/net-snmp/library/keytools.h +#usr/include/net-snmp/library/lcd_time.h +#usr/include/net-snmp/library/md5.h +#usr/include/net-snmp/library/mib.h +#usr/include/net-snmp/library/mt_support.h +#usr/include/net-snmp/library/oid_stash.h +#usr/include/net-snmp/library/parse.h +#usr/include/net-snmp/library/read_config.h +#usr/include/net-snmp/library/scapi.h +#usr/include/net-snmp/library/snmp-tc.h +#usr/include/net-snmp/library/snmp.h +#usr/include/net-snmp/library/snmpCallbackDomain.h +#usr/include/net-snmp/library/snmpTCPDomain.h +#usr/include/net-snmp/library/snmpUDPDomain.h +#usr/include/net-snmp/library/snmpUnixDomain.h +#usr/include/net-snmp/library/snmp_alarm.h +#usr/include/net-snmp/library/snmp_api.h +#usr/include/net-snmp/library/snmp_assert.h +#usr/include/net-snmp/library/snmp_client.h +#usr/include/net-snmp/library/snmp_debug.h +#usr/include/net-snmp/library/snmp_enum.h +#usr/include/net-snmp/library/snmp_impl.h +#usr/include/net-snmp/library/snmp_logging.h +#usr/include/net-snmp/library/snmp_parse_args.h +#usr/include/net-snmp/library/snmp_secmod.h +#usr/include/net-snmp/library/snmp_service.h +#usr/include/net-snmp/library/snmp_transport.h +#usr/include/net-snmp/library/snmpusm.h +#usr/include/net-snmp/library/snmpv3-security-includes.h +#usr/include/net-snmp/library/snmpv3.h +#usr/include/net-snmp/library/system.h +#usr/include/net-snmp/library/text_utils.h +#usr/include/net-snmp/library/tools.h +#usr/include/net-snmp/library/transform_oids.h +#usr/include/net-snmp/library/ucd_compat.h +#usr/include/net-snmp/library/vacm.h +#usr/include/net-snmp/library/winpipe.h +#usr/include/net-snmp/library/winservice.h +#usr/include/net-snmp/machine +#usr/include/net-snmp/machine/generic.h +#usr/include/net-snmp/mib_api.h +#usr/include/net-snmp/net-snmp-config.h +#usr/include/net-snmp/net-snmp-includes.h +#usr/include/net-snmp/output_api.h +#usr/include/net-snmp/pdu_api.h +#usr/include/net-snmp/session_api.h +#usr/include/net-snmp/snmpv3_api.h +#usr/include/net-snmp/system +#usr/include/net-snmp/system/aix.h +#usr/include/net-snmp/system/bsd.h +#usr/include/net-snmp/system/bsdi.h +#usr/include/net-snmp/system/bsdi3.h +#usr/include/net-snmp/system/bsdi4.h +#usr/include/net-snmp/system/cygwin.h +#usr/include/net-snmp/system/darwin.h +#usr/include/net-snmp/system/darwin7.h +#usr/include/net-snmp/system/darwin8.h +#usr/include/net-snmp/system/darwin9.h +#usr/include/net-snmp/system/dragonfly.h +#usr/include/net-snmp/system/dynix.h +#usr/include/net-snmp/system/freebsd.h +#usr/include/net-snmp/system/freebsd2.h +#usr/include/net-snmp/system/freebsd3.h +#usr/include/net-snmp/system/freebsd4.h +#usr/include/net-snmp/system/freebsd5.h +#usr/include/net-snmp/system/freebsd6.h +#usr/include/net-snmp/system/generic.h +#usr/include/net-snmp/system/hpux.h +#usr/include/net-snmp/system/irix.h +#usr/include/net-snmp/system/linux.h +#usr/include/net-snmp/system/mingw32.h +#usr/include/net-snmp/system/mips.h +#usr/include/net-snmp/system/netbsd.h +#usr/include/net-snmp/system/openbsd.h +#usr/include/net-snmp/system/osf5.h +#usr/include/net-snmp/system/solaris.h +#usr/include/net-snmp/system/solaris2.3.h +#usr/include/net-snmp/system/solaris2.4.h +#usr/include/net-snmp/system/solaris2.5.h +#usr/include/net-snmp/system/solaris2.6.h +#usr/include/net-snmp/system/sunos.h +#usr/include/net-snmp/system/svr5.h +#usr/include/net-snmp/system/sysv.h +#usr/include/net-snmp/system/ultrix4.h +#usr/include/net-snmp/types.h +#usr/include/net-snmp/utilities.h +#usr/include/net-snmp/varbind_api.h +#usr/include/net-snmp/version.h +#usr/lib/libnetsnmp.a +#usr/lib/libnetsnmp.la +usr/lib/libnetsnmp.so +usr/lib/libnetsnmp.so.15 +usr/lib/libnetsnmp.so.15.1.2 +#usr/lib/libnetsnmpagent.a +#usr/lib/libnetsnmpagent.la +usr/lib/libnetsnmpagent.so +usr/lib/libnetsnmpagent.so.15 +usr/lib/libnetsnmpagent.so.15.1.2 +#usr/lib/libnetsnmphelpers.a +#usr/lib/libnetsnmphelpers.la +usr/lib/libnetsnmphelpers.so +usr/lib/libnetsnmphelpers.so.15 +usr/lib/libnetsnmphelpers.so.15.1.2 +#usr/lib/libnetsnmpmibs.a +#usr/lib/libnetsnmpmibs.la +usr/lib/libnetsnmpmibs.so +usr/lib/libnetsnmpmibs.so.15 +usr/lib/libnetsnmpmibs.so.15.1.2 +#usr/lib/libnetsnmptrapd.a +#usr/lib/libnetsnmptrapd.la +usr/lib/libnetsnmptrapd.so +usr/lib/libnetsnmptrapd.so.15 +usr/lib/libnetsnmptrapd.so.15.1.2 +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Bundle/Makefile.subs.pl +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/ASN.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/OID.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/TrapReceiver.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/Support.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/default_store.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/agent/netsnmp_request_infoPtr.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/NetSNMP/default_store.pm +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/SNMP.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle/NetSNMP +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Bundle/NetSNMP/.packlist +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/ASN.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/ASN.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/ASN/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/OID.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/OID.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/OID/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/TrapReceiver/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/agent.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/agent.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/default_store.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/NetSNMP/default_store/default_store.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/SNMP.bs +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/SNMP.so +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/SNMP/autosplit.ix +#usr/man/man1/encode_keychange.1 +#usr/man/man1/fixproc.1 +#usr/man/man1/mib2c-update.1 +#usr/man/man1/mib2c.1 +#usr/man/man1/net-snmp-config.1 +#usr/man/man1/snmpbulkget.1 +#usr/man/man1/snmpbulkwalk.1 +#usr/man/man1/snmpcmd.1 +#usr/man/man1/snmpconf.1 +#usr/man/man1/snmpdelta.1 +#usr/man/man1/snmpdf.1 +#usr/man/man1/snmpget.1 +#usr/man/man1/snmpgetnext.1 +#usr/man/man1/snmpinform.1 +#usr/man/man1/snmpnetstat.1 +#usr/man/man1/snmpset.1 +#usr/man/man1/snmpstatus.1 +#usr/man/man1/snmptable.1 +#usr/man/man1/snmptest.1 +#usr/man/man1/snmptranslate.1 +#usr/man/man1/snmptrap.1 +#usr/man/man1/snmpusm.1 +#usr/man/man1/snmpvacm.1 +#usr/man/man1/snmpwalk.1 +#usr/man/man1/tkmib.1 +#usr/man/man1/traptoemail.1 +#usr/man/man3/add_mibdir.3 +#usr/man/man3/add_module_replacement.3 +#usr/man/man3/config_perror.3 +#usr/man/man3/config_pwarn.3 +#usr/man/man3/default_store.3 +#usr/man/man3/fprint_description.3 +#usr/man/man3/fprint_objid.3 +#usr/man/man3/fprint_value.3 +#usr/man/man3/fprint_variable.3 +#usr/man/man3/get_module_node.3 +#usr/man/man3/init_mib.3 +#usr/man/man3/init_mib_internals.3 +#usr/man/man3/mib_api.3 +#usr/man/man3/netsnmp_Container_iterator.3 +#usr/man/man3/netsnmp_agent.3 +#usr/man/man3/netsnmp_baby_steps.3 +#usr/man/man3/netsnmp_bulk_to_next.3 +#usr/man/man3/netsnmp_cache_handler.3 +#usr/man/man3/netsnmp_container.3 +#usr/man/man3/netsnmp_debug.3 +#usr/man/man3/netsnmp_ds_get_boolean.3 +#usr/man/man3/netsnmp_ds_get_int.3 +#usr/man/man3/netsnmp_ds_get_string.3 +#usr/man/man3/netsnmp_ds_register_config.3 +#usr/man/man3/netsnmp_ds_register_premib.3 +#usr/man/man3/netsnmp_ds_set_boolean.3 +#usr/man/man3/netsnmp_ds_set_int.3 +#usr/man/man3/netsnmp_ds_set_string.3 +#usr/man/man3/netsnmp_ds_shutdown.3 +#usr/man/man3/netsnmp_example_scalar_int.3 +#usr/man/man3/netsnmp_handler.3 +#usr/man/man3/netsnmp_instance.3 +#usr/man/man3/netsnmp_iterator_info_s.3 +#usr/man/man3/netsnmp_leaf.3 +#usr/man/man3/netsnmp_library.3 +#usr/man/man3/netsnmp_mib_handler_methods.3 +#usr/man/man3/netsnmp_mib_utilities.3 +#usr/man/man3/netsnmp_mode_end_call.3 +#usr/man/man3/netsnmp_multiplexer.3 +#usr/man/man3/netsnmp_old_api.3 +#usr/man/man3/netsnmp_read_only.3 +#usr/man/man3/netsnmp_row_merge.3 +#usr/man/man3/netsnmp_scalar.3 +#usr/man/man3/netsnmp_scalar_group_group.3 +#usr/man/man3/netsnmp_serialize.3 +#usr/man/man3/netsnmp_stash_cache.3 +#usr/man/man3/netsnmp_table.3 +#usr/man/man3/netsnmp_table_array.3 +#usr/man/man3/netsnmp_table_data.3 +#usr/man/man3/netsnmp_table_dataset.3 +#usr/man/man3/netsnmp_table_iterator.3 +#usr/man/man3/netsnmp_utilities.3 +#usr/man/man3/netsnmp_watcher.3 +#usr/man/man3/print_description.3 +#usr/man/man3/print_mib.3 +#usr/man/man3/print_objid.3 +#usr/man/man3/print_value.3 +#usr/man/man3/print_variable.3 +#usr/man/man3/read_all_mibs.3 +#usr/man/man3/read_config.3 +#usr/man/man3/read_config_print_usage.3 +#usr/man/man3/read_configs.3 +#usr/man/man3/read_mib.3 +#usr/man/man3/read_module.3 +#usr/man/man3/read_module_node.3 +#usr/man/man3/read_objid.3 +#usr/man/man3/read_premib_configs.3 +#usr/man/man3/register_app_config_handler.3 +#usr/man/man3/register_app_premib_handler.3 +#usr/man/man3/register_config_handler.3 +#usr/man/man3/register_mib_handlers.3 +#usr/man/man3/register_premib_handler.3 +#usr/man/man3/send_easy_trap.3 +#usr/man/man3/send_trap_vars.3 +#usr/man/man3/send_v2trap.3 +#usr/man/man3/shutdown_mib.3 +#usr/man/man3/snmp_agent_api.3 +#usr/man/man3/snmp_alarm.3 +#usr/man/man3/snmp_alarm_register.3 +#usr/man/man3/snmp_alarm_register_hr.3 +#usr/man/man3/snmp_alarm_unregister.3 +#usr/man/man3/snmp_api.3 +#usr/man/man3/snmp_api_errstring.3 +#usr/man/man3/snmp_close.3 +#usr/man/man3/snmp_error.3 +#usr/man/man3/snmp_free_pdu.3 +#usr/man/man3/snmp_open.3 +#usr/man/man3/snmp_perror.3 +#usr/man/man3/snmp_read.3 +#usr/man/man3/snmp_select_info.3 +#usr/man/man3/snmp_send.3 +#usr/man/man3/snmp_sess_api.3 +#usr/man/man3/snmp_sess_async_send.3 +#usr/man/man3/snmp_sess_close.3 +#usr/man/man3/snmp_sess_error.3 +#usr/man/man3/snmp_sess_init.3 +#usr/man/man3/snmp_sess_open.3 +#usr/man/man3/snmp_sess_perror.3 +#usr/man/man3/snmp_sess_read.3 +#usr/man/man3/snmp_sess_select_info.3 +#usr/man/man3/snmp_sess_send.3 +#usr/man/man3/snmp_sess_session.3 +#usr/man/man3/snmp_sess_timeout.3 +#usr/man/man3/snmp_set_mib_warnings.3 +#usr/man/man3/snmp_set_save_descriptions.3 +#usr/man/man3/snmp_timeout.3 +#usr/man/man3/snmp_trap_api.3 +#usr/man/man3/snprint_objid.3 +#usr/man/man3/snprint_value.3 +#usr/man/man3/snprint_variable.3 +#usr/man/man3/sprint_realloc_objid.3 +#usr/man/man3/sprint_realloc_value.3 +#usr/man/man3/sprint_realloc_variable.3 +#usr/man/man3/unregister_app_config_handler.3 +#usr/man/man3/unregister_config_handler.3 +#usr/man/man5/mib2c.conf.5 +#usr/man/man5/snmp.conf.5 +#usr/man/man5/snmp_config.5 +#usr/man/man5/snmpd.conf.5 +#usr/man/man5/snmpd.examples.5 +#usr/man/man5/snmpd.internal.5 +#usr/man/man5/snmptrapd.conf.5 +#usr/man/man5/variables.5 +#usr/man/man8/snmpd.8 +#usr/man/man8/snmptrapd.8 +usr/sbin/snmpd +usr/sbin/snmptrapd +#usr/share/man/man3/NetSNMP::ASN.3 +#usr/share/man/man3/NetSNMP::OID.3 +#usr/share/man/man3/NetSNMP::TrapReceiver.3 +#usr/share/man/man3/NetSNMP::agent.3 +#usr/share/man/man3/NetSNMP::agent::default_store.3 +#usr/share/man/man3/NetSNMP::default_store.3 +#usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3 +#usr/share/man/man3/SNMP.3 +usr/share/snmp +usr/share/snmp/mib2c-data +usr/share/snmp/mib2c-data/default-mfd-top.m2c +usr/share/snmp/mib2c-data/details-enums.m2i +usr/share/snmp/mib2c-data/details-node.m2i +usr/share/snmp/mib2c-data/details-table.m2i +usr/share/snmp/mib2c-data/generic-ctx-copy.m2i +usr/share/snmp/mib2c-data/generic-ctx-get.m2i +usr/share/snmp/mib2c-data/generic-ctx-set.m2i +usr/share/snmp/mib2c-data/generic-data-allocate.m2i +usr/share/snmp/mib2c-data/generic-data-context.m2i +usr/share/snmp/mib2c-data/generic-get-char.m2i +usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i +usr/share/snmp/mib2c-data/generic-get-decl.m2i +usr/share/snmp/mib2c-data/generic-get-long.m2i +usr/share/snmp/mib2c-data/generic-get-oid.m2i +usr/share/snmp/mib2c-data/generic-header-bottom.m2i +usr/share/snmp/mib2c-data/generic-header-top.m2i +usr/share/snmp/mib2c-data/generic-source-includes.m2i +usr/share/snmp/mib2c-data/generic-table-constants.m2c +usr/share/snmp/mib2c-data/generic-table-enums.m2c +usr/share/snmp/mib2c-data/generic-table-indexes-from-oid.m2i +usr/share/snmp/mib2c-data/generic-table-indexes-set.m2i +usr/share/snmp/mib2c-data/generic-table-indexes-to-oid.m2i +usr/share/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i +usr/share/snmp/mib2c-data/generic-table-indexes.m2i +usr/share/snmp/mib2c-data/generic-table-oids.m2c +usr/share/snmp/mib2c-data/generic-value-map-func.m2i +usr/share/snmp/mib2c-data/generic-value-map-reverse.m2i +usr/share/snmp/mib2c-data/generic-value-map.m2i +usr/share/snmp/mib2c-data/m2c-internal-warning.m2i +usr/share/snmp/mib2c-data/m2c_setup_enum.m2i +usr/share/snmp/mib2c-data/m2c_setup_node.m2i +usr/share/snmp/mib2c-data/m2c_setup_table.m2i +usr/share/snmp/mib2c-data/m2c_table_save_defaults.m2i +usr/share/snmp/mib2c-data/mfd-access-container-cached-defines.m2i +usr/share/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i +usr/share/snmp/mib2c-data/mfd-data-access.m2c +usr/share/snmp/mib2c-data/mfd-data-get.m2c +usr/share/snmp/mib2c-data/mfd-data-set.m2c +usr/share/snmp/mib2c-data/mfd-doxygen.m2c +usr/share/snmp/mib2c-data/mfd-interactive-setup.m2c +usr/share/snmp/mib2c-data/mfd-interface.m2c +usr/share/snmp/mib2c-data/mfd-makefile.m2m +usr/share/snmp/mib2c-data/mfd-persistence.m2i +usr/share/snmp/mib2c-data/mfd-readme.m2c +usr/share/snmp/mib2c-data/mfd-top.m2c +usr/share/snmp/mib2c-data/node-get.m2i +usr/share/snmp/mib2c-data/node-set.m2i +usr/share/snmp/mib2c-data/node-storage.m2i +usr/share/snmp/mib2c-data/node-validate.m2i +usr/share/snmp/mib2c-data/node-varbind-validate.m2i +usr/share/snmp/mib2c-data/parent-dependencies.m2i +usr/share/snmp/mib2c-data/parent-set.m2i +usr/share/snmp/mib2c-data/subagent.m2c +usr/share/snmp/mib2c-data/syntax-COUNTER64-get.m2i +usr/share/snmp/mib2c-data/syntax-DateAndTime-get.m2d +usr/share/snmp/mib2c-data/syntax-DateAndTime-get.m2i +usr/share/snmp/mib2c-data/syntax-DateAndTime-readme.m2i +usr/share/snmp/mib2c-data/syntax-InetAddress-get.m2i +usr/share/snmp/mib2c-data/syntax-InetAddress-set.m2i +usr/share/snmp/mib2c-data/syntax-InetAddressType-get.m2i +usr/share/snmp/mib2c-data/syntax-InetAddressType-set.m2i +usr/share/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i +usr/share/snmp/mib2c-data/syntax-RowStatus-get.m2i +usr/share/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i +usr/share/snmp/mib2c-data/syntax-StorageType-dependencies.m2i +usr/share/snmp/mib2c-data/syntax-TestAndIncr-get.m2i +usr/share/snmp/mib2c.access_functions.conf +usr/share/snmp/mib2c.array-user.conf +usr/share/snmp/mib2c.check_values.conf +usr/share/snmp/mib2c.check_values_local.conf +usr/share/snmp/mib2c.column_defines.conf +usr/share/snmp/mib2c.column_enums.conf +usr/share/snmp/mib2c.column_storage.conf +usr/share/snmp/mib2c.conf +usr/share/snmp/mib2c.container.conf +usr/share/snmp/mib2c.create-dataset.conf +usr/share/snmp/mib2c.genhtml.conf +usr/share/snmp/mib2c.int_watch.conf +usr/share/snmp/mib2c.iterate.conf +usr/share/snmp/mib2c.iterate_access.conf +usr/share/snmp/mib2c.mfd.conf +usr/share/snmp/mib2c.notify.conf +usr/share/snmp/mib2c.old-api.conf +usr/share/snmp/mib2c.perl.conf +usr/share/snmp/mib2c.scalar.conf +usr/share/snmp/mib2c.table_data.conf +usr/share/snmp/mibs +usr/share/snmp/mibs/AGENTX-MIB.txt +usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt +usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt +usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt +usr/share/snmp/mibs/EtherLike-MIB.txt +usr/share/snmp/mibs/HCNUM-TC.txt +usr/share/snmp/mibs/HOST-RESOURCES-MIB.txt +usr/share/snmp/mibs/HOST-RESOURCES-TYPES.txt +usr/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +usr/share/snmp/mibs/IANA-LANGUAGE-MIB.txt +usr/share/snmp/mibs/IANA-RTPROTO-MIB.txt +usr/share/snmp/mibs/IANAifType-MIB.txt +usr/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt +usr/share/snmp/mibs/IF-MIB.txt +usr/share/snmp/mibs/INET-ADDRESS-MIB.txt +usr/share/snmp/mibs/IP-FORWARD-MIB.txt +usr/share/snmp/mibs/IP-MIB.txt +usr/share/snmp/mibs/IPV6-ICMP-MIB.txt +usr/share/snmp/mibs/IPV6-MIB.txt +usr/share/snmp/mibs/IPV6-TC.txt +usr/share/snmp/mibs/IPV6-TCP-MIB.txt +usr/share/snmp/mibs/IPV6-UDP-MIB.txt +usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt +usr/share/snmp/mibs/NET-SNMP-MIB.txt +usr/share/snmp/mibs/NET-SNMP-TC.txt +usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt +usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +usr/share/snmp/mibs/RFC-1215.txt +usr/share/snmp/mibs/RFC1155-SMI.txt +usr/share/snmp/mibs/RFC1213-MIB.txt +usr/share/snmp/mibs/RMON-MIB.txt +usr/share/snmp/mibs/SCTP-MIB.txt +usr/share/snmp/mibs/SMUX-MIB.txt +usr/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt +usr/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt +usr/share/snmp/mibs/SNMP-MPD-MIB.txt +usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt +usr/share/snmp/mibs/SNMP-PROXY-MIB.txt +usr/share/snmp/mibs/SNMP-TARGET-MIB.txt +usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt +usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt +usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt +usr/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt +usr/share/snmp/mibs/SNMPv2-CONF.txt +usr/share/snmp/mibs/SNMPv2-MIB.txt +usr/share/snmp/mibs/SNMPv2-SMI.txt +usr/share/snmp/mibs/SNMPv2-TC.txt +usr/share/snmp/mibs/SNMPv2-TM.txt +usr/share/snmp/mibs/TCP-MIB.txt +usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +usr/share/snmp/mibs/UCD-DEMO-MIB.txt +usr/share/snmp/mibs/UCD-DISKIO-MIB.txt +usr/share/snmp/mibs/UCD-DLMOD-MIB.txt +usr/share/snmp/mibs/UCD-IPFWACC-MIB.txt +usr/share/snmp/mibs/UCD-SNMP-MIB.txt +usr/share/snmp/mibs/UDP-MIB.txt +usr/share/snmp/snmp_perl.pl +usr/share/snmp/snmp_perl_trapd.pl +usr/share/snmp/snmpconf-data +usr/share/snmp/snmpconf-data/snmp-data +usr/share/snmp/snmpconf-data/snmp-data/authopts +usr/share/snmp/snmpconf-data/snmp-data/debugging +usr/share/snmp/snmpconf-data/snmp-data/mibs +usr/share/snmp/snmpconf-data/snmp-data/output +usr/share/snmp/snmpconf-data/snmp-data/snmpconf-config +usr/share/snmp/snmpconf-data/snmpd-data +usr/share/snmp/snmpconf-data/snmpd-data/acl +usr/share/snmp/snmpconf-data/snmpd-data/basic_setup +usr/share/snmp/snmpconf-data/snmpd-data/extending +usr/share/snmp/snmpconf-data/snmpd-data/monitor +usr/share/snmp/snmpconf-data/snmpd-data/operation +usr/share/snmp/snmpconf-data/snmpd-data/snmpconf-config +usr/share/snmp/snmpconf-data/snmpd-data/system +usr/share/snmp/snmpconf-data/snmpd-data/trapsinks +usr/share/snmp/snmpconf-data/snmptrapd-data +usr/share/snmp/snmpconf-data/snmptrapd-data/authentication +usr/share/snmp/snmpconf-data/snmptrapd-data/formatting +usr/share/snmp/snmpconf-data/snmptrapd-data/logging +usr/share/snmp/snmpconf-data/snmptrapd-data/runtime +usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config +usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle +etc/rc.d/init.d/netsnmpd diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut new file mode 100644 index 000000000..f7d3d2b6f --- /dev/null +++ b/config/rootfiles/packages/nut @@ -0,0 +1,131 @@ +#etc/nut +etc/nut/nut.conf.sample +etc/nut/ups.conf.sample +etc/nut/upsd.conf.sample +etc/nut/upsd.users.sample +etc/nut/upsmon.conf.sample +etc/nut/upssched.conf.sample +etc/udev/rules.d/52-nut-usbups.rules +usr/bin/apcsmart +usr/bin/bcmxcp +usr/bin/bcmxcp_usb +usr/bin/belkin +usr/bin/belkinunv +usr/bin/bestfcom +usr/bin/bestfortress +usr/bin/bestuferrups +usr/bin/bestups +usr/bin/blazer_ser +usr/bin/blazer_usb +usr/bin/clone +usr/bin/clone-outlet +usr/bin/dummy-ups +usr/bin/etapro +usr/bin/everups +usr/bin/gamatronic +usr/bin/genericups +usr/bin/isbmex +usr/bin/ivtscd +usr/bin/liebert +usr/bin/liebertgxt2 +usr/bin/masterguard +usr/bin/megatec +usr/bin/megatec_usb +usr/bin/metasys +usr/bin/mge-shut +usr/bin/mge-utalk +usr/bin/microdowell +usr/bin/newmge-shut +usr/bin/oneac +usr/bin/optiups +usr/bin/powercom +usr/bin/powerpanel +usr/bin/rhino +usr/bin/richcomm_usb +usr/bin/safenet +usr/bin/skel +usr/bin/snmp-ups +usr/bin/solis +usr/bin/tripplite +usr/bin/tripplite_usb +usr/bin/tripplitesu +usr/bin/upsc +usr/bin/upscmd +usr/bin/upscode2 +usr/bin/upsdrvctl +usr/bin/upslog +usr/bin/upsrw +usr/bin/upssched-cmd +usr/bin/usbhid-ups +usr/bin/victronups +#usr/cgi-bin +#usr/html +#usr/lib/libupsclient.la +usr/lib/libupsclient.so +usr/lib/libupsclient.so.1 +usr/lib/libupsclient.so.1.0.0 +usr/sbin/upsd +usr/sbin/upsmon +usr/sbin/upssched +usr/share/cmdvartab +usr/share/driver.list +#usr/share/man/man5/nut.conf.5 +#usr/share/man/man5/ups.conf.5 +#usr/share/man/man5/upsd.conf.5 +#usr/share/man/man5/upsd.users.5 +#usr/share/man/man5/upsmon.conf.5 +#usr/share/man/man5/upssched.conf.5 +#usr/share/man/man8/apcsmart.8 +#usr/share/man/man8/bcmxcp.8 +#usr/share/man/man8/bcmxcp_usb.8 +#usr/share/man/man8/belkin.8 +#usr/share/man/man8/belkinunv.8 +#usr/share/man/man8/bestfcom.8 +#usr/share/man/man8/bestfortress.8 +#usr/share/man/man8/bestuferrups.8 +#usr/share/man/man8/bestups.8 +#usr/share/man/man8/blazer.8 +#usr/share/man/man8/clone.8 +#usr/share/man/man8/dummy-ups.8 +#usr/share/man/man8/etapro.8 +#usr/share/man/man8/everups.8 +#usr/share/man/man8/gamatronic.8 +#usr/share/man/man8/genericups.8 +#usr/share/man/man8/isbmex.8 +#usr/share/man/man8/ivtscd.8 +#usr/share/man/man8/liebert.8 +#usr/share/man/man8/liebertgxt2.8 +#usr/share/man/man8/masterguard.8 +#usr/share/man/man8/megatec.8 +#usr/share/man/man8/megatec_usb.8 +#usr/share/man/man8/metasys.8 +#usr/share/man/man8/mge-shut.8 +#usr/share/man/man8/mge-utalk.8 +#usr/share/man/man8/microdowell.8 +#usr/share/man/man8/nutupsdrv.8 +#usr/share/man/man8/oneac.8 +#usr/share/man/man8/optiups.8 +#usr/share/man/man8/powercom.8 +#usr/share/man/man8/powerpanel.8 +#usr/share/man/man8/rhino.8 +#usr/share/man/man8/richcomm_usb.8 +#usr/share/man/man8/safenet.8 +#usr/share/man/man8/snmp-ups.8 +#usr/share/man/man8/solis.8 +#usr/share/man/man8/tripplite.8 +#usr/share/man/man8/tripplite_usb.8 +#usr/share/man/man8/tripplitesu.8 +#usr/share/man/man8/upsc.8 +#usr/share/man/man8/upscmd.8 +#usr/share/man/man8/upscode2.8 +#usr/share/man/man8/upsd.8 +#usr/share/man/man8/upsdrvctl.8 +#usr/share/man/man8/upslog.8 +#usr/share/man/man8/upsmon.8 +#usr/share/man/man8/upsrw.8 +#usr/share/man/man8/upssched.8 +#usr/share/man/man8/usbhid-ups.8 +#usr/share/man/man8/victronups.8 +var/ipfire/backup/addons/includes/nut +var/state/ups +etc/rc.d/init.d/nut From c4fe5fb3aba7f16e015c982f755ff4e6d0f8435f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 26 Aug 2011 15:26:44 +0200 Subject: [PATCH 115/159] core-next: glibc rootfile for updater. --- config/rootfiles/core/next/filelists/glibc | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/next/filelists/glibc diff --git a/config/rootfiles/core/next/filelists/glibc b/config/rootfiles/core/next/filelists/glibc new file mode 120000 index 000000000..fbb4a52be --- /dev/null +++ b/config/rootfiles/core/next/filelists/glibc @@ -0,0 +1 @@ +../../../common/glibc \ No newline at end of file From cd7ed8c2e1d2e8fa2087ea9b1374f3a188fd0bfe Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 26 Aug 2011 18:15:57 +0200 Subject: [PATCH 116/159] qemu: enabled arm-emulation support. --- config/rootfiles/packages/qemu | 1 + lfs/qemu | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 8d9b28302..50620663a 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -6,6 +6,7 @@ usr/bin/qemu-i386 usr/bin/qemu-img usr/bin/qemu-io usr/bin/qemu-nbd +usr/bin/qemu-system-arm #usr/share/doc/qemu #usr/share/doc/qemu/qemu-doc.html #usr/share/doc/qemu/qemu-tech.html diff --git a/lfs/qemu b/lfs/qemu index ce0f33de3..20f594241 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --target-list="i386-linux-user i386-softmmu" + --target-list="i386-linux-user i386-softmmu arm-softmmu" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) From 7667a59b28cbda3932574ae198011f40ed19fcc5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 29 Aug 2011 14:28:18 +0200 Subject: [PATCH 117/159] usb_modeswitch: update to 1.1.9 and database to 20110805. --- config/rootfiles/common/usb_modeswitch | 4 +- config/rootfiles/common/usb_modeswitch_data | 347 ++++++++++-------- .../core/next/filelists/usb_modeswitch | 1 + .../core/next/filelists/usb_modeswitch_data | 1 + config/rootfiles/core/next/update.sh | 3 + lfs/usb_modeswitch | 7 +- lfs/usb_modeswitch_data | 6 +- 7 files changed, 211 insertions(+), 158 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/usb_modeswitch create mode 120000 config/rootfiles/core/next/filelists/usb_modeswitch_data diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch index 13c1a38e8..fe60c0553 100644 --- a/config/rootfiles/common/usb_modeswitch +++ b/config/rootfiles/common/usb_modeswitch @@ -1,6 +1,6 @@ -#etc/usb_modeswitch.conf -etc/usb_modeswitch.setup.example +etc/usb_modeswitch.conf #lib/udev/usb_modeswitch usr/sbin/usb_modeswitch usr/sbin/usb_modeswitch_dispatcher #usr/share/man/man1/usb_modeswitch.1 +var/lib/usb_modeswitch diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index e7b3079bc..c3166a0e8 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -1,150 +1,199 @@ -#etc/usb_modeswitch.d -etc/usb_modeswitch.d/0421:060c -etc/usb_modeswitch.d/0421:0610 -etc/usb_modeswitch.d/0421:0622 -etc/usb_modeswitch.d/0421:0627 -etc/usb_modeswitch.d/0471:1210 -etc/usb_modeswitch.d/0471:1237 -etc/usb_modeswitch.d/0482:024d -etc/usb_modeswitch.d/04e8:689a -etc/usb_modeswitch.d/04e8:f000 -etc/usb_modeswitch.d/057c:84ff -etc/usb_modeswitch.d/05c6:1000:sVe=Option -etc/usb_modeswitch.d/05c6:1000:uMa=AnyDATA -etc/usb_modeswitch.d/05c6:1000:uMa=Option -etc/usb_modeswitch.d/05c6:1000:uMa=SAMSUNG -etc/usb_modeswitch.d/05c6:1000:uMa=Vertex -etc/usb_modeswitch.d/05c6:2001 -etc/usb_modeswitch.d/05c6:f000 -etc/usb_modeswitch.d/05c7:1000 -etc/usb_modeswitch.d/072f:100d -etc/usb_modeswitch.d/0930:0d46 -etc/usb_modeswitch.d/0ace:2011 -etc/usb_modeswitch.d/0ace:20ff -etc/usb_modeswitch.d/0af0:6711 -etc/usb_modeswitch.d/0af0:6731 -etc/usb_modeswitch.d/0af0:6751 -etc/usb_modeswitch.d/0af0:6771 -etc/usb_modeswitch.d/0af0:6791 -etc/usb_modeswitch.d/0af0:6811 -etc/usb_modeswitch.d/0af0:6911 -etc/usb_modeswitch.d/0af0:6951 -etc/usb_modeswitch.d/0af0:6971 -etc/usb_modeswitch.d/0af0:7011 -etc/usb_modeswitch.d/0af0:7031 -etc/usb_modeswitch.d/0af0:7051 -etc/usb_modeswitch.d/0af0:7071 -etc/usb_modeswitch.d/0af0:7111 -etc/usb_modeswitch.d/0af0:7211 -etc/usb_modeswitch.d/0af0:7251 -etc/usb_modeswitch.d/0af0:7271 -etc/usb_modeswitch.d/0af0:7301 -etc/usb_modeswitch.d/0af0:7311 -etc/usb_modeswitch.d/0af0:7361 -etc/usb_modeswitch.d/0af0:7381 -etc/usb_modeswitch.d/0af0:7401 -etc/usb_modeswitch.d/0af0:7501 -etc/usb_modeswitch.d/0af0:7601 -etc/usb_modeswitch.d/0af0:7701 -etc/usb_modeswitch.d/0af0:7801 -etc/usb_modeswitch.d/0af0:7901 -etc/usb_modeswitch.d/0af0:8200 -etc/usb_modeswitch.d/0af0:8201 -etc/usb_modeswitch.d/0af0:8300 -etc/usb_modeswitch.d/0af0:8302 -etc/usb_modeswitch.d/0af0:8304 -etc/usb_modeswitch.d/0af0:8400 -etc/usb_modeswitch.d/0af0:c031 -etc/usb_modeswitch.d/0af0:c100 -etc/usb_modeswitch.d/0af0:d013 -etc/usb_modeswitch.d/0af0:d031 -etc/usb_modeswitch.d/0af0:d033 -etc/usb_modeswitch.d/0af0:d035 -etc/usb_modeswitch.d/0af0:d055 -etc/usb_modeswitch.d/0af0:d057 -etc/usb_modeswitch.d/0af0:d058 -etc/usb_modeswitch.d/0af0:d155 -etc/usb_modeswitch.d/0af0:d157 -etc/usb_modeswitch.d/0af0:d255 -etc/usb_modeswitch.d/0af0:d257 -etc/usb_modeswitch.d/0af0:d357 -etc/usb_modeswitch.d/0b3c:c700 -etc/usb_modeswitch.d/0b3c:f000 -etc/usb_modeswitch.d/0cf3:20ff -etc/usb_modeswitch.d/0d46:45a1 -etc/usb_modeswitch.d/0d46:45a5 -etc/usb_modeswitch.d/0e8d:7109 -etc/usb_modeswitch.d/0fce:d0cf -etc/usb_modeswitch.d/0fce:d0e1 -etc/usb_modeswitch.d/0fce:d103 -etc/usb_modeswitch.d/0fd1:1000 -etc/usb_modeswitch.d/1004:1000 -etc/usb_modeswitch.d/1004:607f -etc/usb_modeswitch.d/1004:613a -etc/usb_modeswitch.d/1004:613f -etc/usb_modeswitch.d/1004:6190 -etc/usb_modeswitch.d/1033:0035 -etc/usb_modeswitch.d/106c:3b03 -etc/usb_modeswitch.d/106c:3b05 -etc/usb_modeswitch.d/106c:3b06 -etc/usb_modeswitch.d/1076:7f40 -etc/usb_modeswitch.d/1199:0fff -etc/usb_modeswitch.d/1266:1000 -etc/usb_modeswitch.d/12d1:1001 -etc/usb_modeswitch.d/12d1:1003 -etc/usb_modeswitch.d/12d1:101e -etc/usb_modeswitch.d/12d1:1031 -etc/usb_modeswitch.d/12d1:1414 -etc/usb_modeswitch.d/12d1:1446 -etc/usb_modeswitch.d/12d1:14ad -etc/usb_modeswitch.d/12d1:14c1 -etc/usb_modeswitch.d/12d1:1520 -etc/usb_modeswitch.d/12d1:1521 -etc/usb_modeswitch.d/12d1:1523 -etc/usb_modeswitch.d/12d1:1553 -etc/usb_modeswitch.d/12d1:1557 -etc/usb_modeswitch.d/12d1:1c0b -etc/usb_modeswitch.d/1410:5010 -etc/usb_modeswitch.d/1410:5020 -etc/usb_modeswitch.d/1410:5030 -etc/usb_modeswitch.d/1410:5031 -etc/usb_modeswitch.d/1410:5041 -etc/usb_modeswitch.d/148f:2578 -etc/usb_modeswitch.d/16d8:6281 -etc/usb_modeswitch.d/16d8:6803 -etc/usb_modeswitch.d/16d8:6803:? -etc/usb_modeswitch.d/16d8:700a -etc/usb_modeswitch.d/16d8:f000 -etc/usb_modeswitch.d/198f:bccd -etc/usb_modeswitch.d/19d2:0003 -etc/usb_modeswitch.d/19d2:0026 -etc/usb_modeswitch.d/19d2:0040 -etc/usb_modeswitch.d/19d2:0053 -etc/usb_modeswitch.d/19d2:0083 -etc/usb_modeswitch.d/19d2:0101 -etc/usb_modeswitch.d/19d2:0103 -etc/usb_modeswitch.d/19d2:0115 -etc/usb_modeswitch.d/19d2:1001 -etc/usb_modeswitch.d/19d2:1007 -etc/usb_modeswitch.d/19d2:1009 -etc/usb_modeswitch.d/19d2:1013 -etc/usb_modeswitch.d/19d2:2000 -etc/usb_modeswitch.d/19d2:fff5 -etc/usb_modeswitch.d/19d2:fff6 -etc/usb_modeswitch.d/1a8d:1000 -etc/usb_modeswitch.d/1ab7:5700 -etc/usb_modeswitch.d/1b7d:0700 -etc/usb_modeswitch.d/1bbb:f000 -etc/usb_modeswitch.d/1c9e:1001 -etc/usb_modeswitch.d/1c9e:9200 -etc/usb_modeswitch.d/1c9e:9e00 -etc/usb_modeswitch.d/1c9e:f000 -etc/usb_modeswitch.d/1dd6:1000 -etc/usb_modeswitch.d/1e0e:f000 -etc/usb_modeswitch.d/1edf:6003 -etc/usb_modeswitch.d/1ee8:0009 -etc/usb_modeswitch.d/1ee8:0013 -etc/usb_modeswitch.d/1f28:0021 -etc/usb_modeswitch.d/1fac:0130 -etc/usb_modeswitch.d/230d:0001 +etc/usb_modeswitch.d lib/udev/rules.d/40-usb_modeswitch.rules +#usr/share/usb_modeswitch +usr/share/usb_modeswitch/03f0:002a +usr/share/usb_modeswitch/0421:060c +usr/share/usb_modeswitch/0421:0610 +usr/share/usb_modeswitch/0421:0622 +usr/share/usb_modeswitch/0421:0627 +usr/share/usb_modeswitch/0471:1210:uMa=Philips +usr/share/usb_modeswitch/0471:1210:uMa=Wisue +usr/share/usb_modeswitch/0471:1237 +usr/share/usb_modeswitch/0482:024d +usr/share/usb_modeswitch/04e8:689a +usr/share/usb_modeswitch/04e8:f000 +usr/share/usb_modeswitch/057c:84ff +usr/share/usb_modeswitch/05c6:1000:sVe=GT +usr/share/usb_modeswitch/05c6:1000:sVe=Option +usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA +usr/share/usb_modeswitch/05c6:1000:uMa=Option +usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG +usr/share/usb_modeswitch/05c6:1000:uMa=SSE +usr/share/usb_modeswitch/05c6:1000:uMa=Vertex +usr/share/usb_modeswitch/05c6:2000 +usr/share/usb_modeswitch/05c6:2001 +usr/share/usb_modeswitch/05c6:f000 +usr/share/usb_modeswitch/05c7:1000 +usr/share/usb_modeswitch/072f:100d +usr/share/usb_modeswitch/07d1:a800 +usr/share/usb_modeswitch/07d1:a804 +usr/share/usb_modeswitch/0930:0d46 +usr/share/usb_modeswitch/0ace:2011 +usr/share/usb_modeswitch/0ace:20ff +usr/share/usb_modeswitch/0af0:6711 +usr/share/usb_modeswitch/0af0:6731 +usr/share/usb_modeswitch/0af0:6751 +usr/share/usb_modeswitch/0af0:6771 +usr/share/usb_modeswitch/0af0:6791 +usr/share/usb_modeswitch/0af0:6811 +usr/share/usb_modeswitch/0af0:6911 +usr/share/usb_modeswitch/0af0:6951 +usr/share/usb_modeswitch/0af0:6971 +usr/share/usb_modeswitch/0af0:7011 +usr/share/usb_modeswitch/0af0:7031 +usr/share/usb_modeswitch/0af0:7051 +usr/share/usb_modeswitch/0af0:7071 +usr/share/usb_modeswitch/0af0:7111 +usr/share/usb_modeswitch/0af0:7211 +usr/share/usb_modeswitch/0af0:7251 +usr/share/usb_modeswitch/0af0:7271 +usr/share/usb_modeswitch/0af0:7301 +usr/share/usb_modeswitch/0af0:7311 +usr/share/usb_modeswitch/0af0:7361 +usr/share/usb_modeswitch/0af0:7381 +usr/share/usb_modeswitch/0af0:7401 +usr/share/usb_modeswitch/0af0:7501 +usr/share/usb_modeswitch/0af0:7601 +usr/share/usb_modeswitch/0af0:7701 +usr/share/usb_modeswitch/0af0:7801 +usr/share/usb_modeswitch/0af0:7901 +usr/share/usb_modeswitch/0af0:7a01 +usr/share/usb_modeswitch/0af0:7a05 +usr/share/usb_modeswitch/0af0:8200 +usr/share/usb_modeswitch/0af0:8201 +usr/share/usb_modeswitch/0af0:8300 +usr/share/usb_modeswitch/0af0:8302 +usr/share/usb_modeswitch/0af0:8304 +usr/share/usb_modeswitch/0af0:8400 +usr/share/usb_modeswitch/0af0:8600 +usr/share/usb_modeswitch/0af0:8800 +usr/share/usb_modeswitch/0af0:8900 +usr/share/usb_modeswitch/0af0:9000 +usr/share/usb_modeswitch/0af0:c031 +usr/share/usb_modeswitch/0af0:c100 +usr/share/usb_modeswitch/0af0:d013 +usr/share/usb_modeswitch/0af0:d031 +usr/share/usb_modeswitch/0af0:d033 +usr/share/usb_modeswitch/0af0:d035 +usr/share/usb_modeswitch/0af0:d055 +usr/share/usb_modeswitch/0af0:d057 +usr/share/usb_modeswitch/0af0:d058 +usr/share/usb_modeswitch/0af0:d155 +usr/share/usb_modeswitch/0af0:d157 +usr/share/usb_modeswitch/0af0:d255 +usr/share/usb_modeswitch/0af0:d257 +usr/share/usb_modeswitch/0af0:d357 +usr/share/usb_modeswitch/0b3c:c700 +usr/share/usb_modeswitch/0b3c:f000 +usr/share/usb_modeswitch/0cf3:20ff +usr/share/usb_modeswitch/0d46:45a1 +usr/share/usb_modeswitch/0d46:45a5 +usr/share/usb_modeswitch/0df7:0800 +usr/share/usb_modeswitch/0e8d:7109 +usr/share/usb_modeswitch/0fce:d0cf +usr/share/usb_modeswitch/0fce:d0e1 +usr/share/usb_modeswitch/0fce:d103 +usr/share/usb_modeswitch/0fd1:1000 +usr/share/usb_modeswitch/1004:1000 +usr/share/usb_modeswitch/1004:607f +usr/share/usb_modeswitch/1004:613a +usr/share/usb_modeswitch/1004:613f +usr/share/usb_modeswitch/1004:6190 +usr/share/usb_modeswitch/1033:0035 +usr/share/usb_modeswitch/106c:3b03 +usr/share/usb_modeswitch/106c:3b05 +usr/share/usb_modeswitch/106c:3b06 +usr/share/usb_modeswitch/1076:7f40 +usr/share/usb_modeswitch/1199:0fff +usr/share/usb_modeswitch/1266:1000 +usr/share/usb_modeswitch/12d1:1001 +usr/share/usb_modeswitch/12d1:1003 +usr/share/usb_modeswitch/12d1:1009 +usr/share/usb_modeswitch/12d1:101e +usr/share/usb_modeswitch/12d1:1030 +usr/share/usb_modeswitch/12d1:1031 +usr/share/usb_modeswitch/12d1:1414 +usr/share/usb_modeswitch/12d1:1446 +usr/share/usb_modeswitch/12d1:1449 +usr/share/usb_modeswitch/12d1:14ad +usr/share/usb_modeswitch/12d1:14b5 +usr/share/usb_modeswitch/12d1:14b7 +usr/share/usb_modeswitch/12d1:14c1 +usr/share/usb_modeswitch/12d1:14c4 +usr/share/usb_modeswitch/12d1:14c5 +usr/share/usb_modeswitch/12d1:14d1 +usr/share/usb_modeswitch/12d1:14fe +usr/share/usb_modeswitch/12d1:1505 +usr/share/usb_modeswitch/12d1:1520 +usr/share/usb_modeswitch/12d1:1521 +usr/share/usb_modeswitch/12d1:1523 +usr/share/usb_modeswitch/12d1:1553 +usr/share/usb_modeswitch/12d1:1557 +usr/share/usb_modeswitch/12d1:1c0b +usr/share/usb_modeswitch/12d1:1da1 +usr/share/usb_modeswitch/12d1:380b +usr/share/usb_modeswitch/1307:1169 +usr/share/usb_modeswitch/1410:5010 +usr/share/usb_modeswitch/1410:5020 +usr/share/usb_modeswitch/1410:5030 +usr/share/usb_modeswitch/1410:5031 +usr/share/usb_modeswitch/1410:5041 +usr/share/usb_modeswitch/148e:a000 +usr/share/usb_modeswitch/148f:2578 +usr/share/usb_modeswitch/16d8:6281 +usr/share/usb_modeswitch/16d8:6803 +usr/share/usb_modeswitch/16d8:700a +usr/share/usb_modeswitch/16d8:700b +usr/share/usb_modeswitch/16d8:f000 +usr/share/usb_modeswitch/198a:0003 +usr/share/usb_modeswitch/198f:bccd +usr/share/usb_modeswitch/19d2:0003 +usr/share/usb_modeswitch/19d2:0013 +usr/share/usb_modeswitch/19d2:0026 +usr/share/usb_modeswitch/19d2:0040 +usr/share/usb_modeswitch/19d2:0053 +usr/share/usb_modeswitch/19d2:0083 +usr/share/usb_modeswitch/19d2:0101 +usr/share/usb_modeswitch/19d2:0103 +usr/share/usb_modeswitch/19d2:0110 +usr/share/usb_modeswitch/19d2:0115 +usr/share/usb_modeswitch/19d2:0149 +usr/share/usb_modeswitch/19d2:1001 +usr/share/usb_modeswitch/19d2:1007 +usr/share/usb_modeswitch/19d2:1009 +usr/share/usb_modeswitch/19d2:1013 +usr/share/usb_modeswitch/19d2:1171 +usr/share/usb_modeswitch/19d2:1175 +usr/share/usb_modeswitch/19d2:1179 +usr/share/usb_modeswitch/19d2:1201 +usr/share/usb_modeswitch/19d2:1216 +usr/share/usb_modeswitch/19d2:1224 +usr/share/usb_modeswitch/19d2:2000 +usr/share/usb_modeswitch/19d2:bccd +usr/share/usb_modeswitch/19d2:ffe6 +usr/share/usb_modeswitch/19d2:fff5 +usr/share/usb_modeswitch/19d2:fff6 +usr/share/usb_modeswitch/1a8d:1000 +usr/share/usb_modeswitch/1ab7:5700 +usr/share/usb_modeswitch/1b7d:0700 +usr/share/usb_modeswitch/1bbb:f000 +usr/share/usb_modeswitch/1c9e:1001 +usr/share/usb_modeswitch/1c9e:6061 +usr/share/usb_modeswitch/1c9e:9200 +usr/share/usb_modeswitch/1c9e:9800 +usr/share/usb_modeswitch/1c9e:9e00 +usr/share/usb_modeswitch/1c9e:f000 +usr/share/usb_modeswitch/1dd6:1000 +usr/share/usb_modeswitch/1e0e:f000 +usr/share/usb_modeswitch/1edf:6003 +usr/share/usb_modeswitch/1ee8:0009 +usr/share/usb_modeswitch/1ee8:0013 +usr/share/usb_modeswitch/1ee8:0040 +usr/share/usb_modeswitch/1f28:0021 +usr/share/usb_modeswitch/1fac:0032 +usr/share/usb_modeswitch/1fac:0130 +usr/share/usb_modeswitch/201e:2009 +usr/share/usb_modeswitch/2020:f00e +usr/share/usb_modeswitch/230d:0001 +usr/share/usb_modeswitch/230d:0007 +usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch b/config/rootfiles/core/next/filelists/usb_modeswitch new file mode 120000 index 000000000..acbab6f33 --- /dev/null +++ b/config/rootfiles/core/next/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch_data b/config/rootfiles/core/next/filelists/usb_modeswitch_data new file mode 120000 index 000000000..4cbce46cf --- /dev/null +++ b/config/rootfiles/core/next/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 5a4353ff4..9a4664522 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -50,6 +50,9 @@ rm -rf /usr/lib/libstrongswan.so.0 rm -rf /usr/lib/libstrongswan.so.0.0.0 rm -rf /usr/libexec/ipsec/plugins +# Remove old usb_modeswitch_data +rm -rf /etc/usb_modeswitch.d + # #Extract files extract_files diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 3046171bb..e5ae0ed79 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.1.6 +VER = 1.1.9 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = be3c7fc908e6ab50eb9fd29d187ad176 +$(DL_FILE)_MD5 = 76f6978f18cac41f269a346a5d0f1052 install : $(TARGET) @@ -73,6 +73,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make clean cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install - cp -f $(DIR_APP)/device_reference.txt /etc/usb_modeswitch.setup.example @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index f32208039..9afafada1 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 20101222 +VER = 20110805 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e386386bc389c2a8184c7ea4136fde0e +$(DL_FILE)_MD5 = 0ed8a28f8efd3177a128ecd46fc8bf9f install : $(TARGET) From b57ca7b660025db8fd40aca9f103228cb2d9e727 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 29 Aug 2011 14:55:04 +0200 Subject: [PATCH 118/159] vpn-watch: set established check counter back to 10min. we had raised this to 60min because it has restarted all connections if one connection was permanently down. Now it try to start only this one connection again. --- src/scripts/vpn-watch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index 563c14c47..7eae873ce 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -31,8 +31,8 @@ while ( $i == 0){ $round++; - # Reset roundcounter after 60 min. To do established check. - if ($round > 59) { $round=0; } + # Reset roundcounter after 10 min. To do established check. + if ($round > 9) { $round=0; } if (open(FILE, "<${General::swroot}/vpn/config")) { @vpnsettings = ; close(FILE); From be9dbcb2c04a1fbf3ef28fec02b98723f99ef6d0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 29 Aug 2011 16:36:20 +0200 Subject: [PATCH 119/159] ethtool: Update to 3.0. Version "3" was at least 5 years old and displayed wrong information. --- lfs/ethtool | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/ethtool b/lfs/ethtool index 00b4a13e5..15f0419d8 100644 --- a/lfs/ethtool +++ b/lfs/ethtool @@ -24,10 +24,10 @@ include Config -VER = 3 +VER = 3.0 THISAPP = ethtool-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b4e71f7fa2629250677eefcb338442c5 +$(DL_FILE)_MD5 = cb129398cbbf39859901b55ecac101da install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install From 2b56ee99a882897d0ec0c27e0a871556a5b40038 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 30 Aug 2011 00:20:20 +0200 Subject: [PATCH 120/159] gcc: fix libstdc++ symbol versioning (wrong linker detection). --- lfs/gcc | 1 + .../gcc-4.1.2-fix_linker_version_detection.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 src/patches/gcc-4.1.2-fix_linker_version_detection.patch diff --git a/lfs/gcc b/lfs/gcc index 40d779dcf..af87e2116 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -110,6 +110,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_linker_version_detection.patch @mkdir $(DIR_SRC)/gcc-build ifeq "$(ROOT)" "" cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in diff --git a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch new file mode 100644 index 000000000..c2f43be35 --- /dev/null +++ b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch @@ -0,0 +1,12 @@ +diff -Naur gcc-4.1.2.org/libstdc++-v3/configure gcc-4.1.2/libstdc++-v3/configure +--- gcc-4.1.2.org/libstdc++-v3/configure 2007-01-29 11:51:01.000000000 +0100 ++++ gcc-4.1.2/libstdc++-v3/configure 2011-08-29 19:25:22.973430586 +0200 +@@ -8281,7 +8281,7 @@ + if test x"$with_gnu_ld" = x"yes"; then + + ldver=`$LD --version 2>/dev/null | head -1 | \ +- sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` ++ sed -e 's/GNU ld (GNU binutils) \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ + $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` From ec372b7b519dbc85d2713c3d611d55cf87615490 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 31 Aug 2011 14:42:06 +0200 Subject: [PATCH 121/159] apache2: update to 2.2.20. --- config/rootfiles/core/next/filelists/apache2 | 1 + lfs/apache2 | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/apache2 diff --git a/config/rootfiles/core/next/filelists/apache2 b/config/rootfiles/core/next/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/next/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/lfs/apache2 b/lfs/apache2 index 80e96b724..c5fd75429 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.2.19 +VER = 2.2.20 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = 832f96a6ec4b8fc7cf49b9efd4e89060 +$(DL_FILE)_MD5 = 1ac251431c8c4285f6b085c1d156bb56 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) From 96fc97868b97435776d87a32ff72589a26677476 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 3 Sep 2011 12:30:47 +0200 Subject: [PATCH 122/159] groff: Fix rebuild. --- lfs/groff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/groff b/lfs/groff index d654c05b2..1739fee23 100644 --- a/lfs/groff +++ b/lfs/groff @@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls cd $(DIR_APP) && make cd $(DIR_APP) && make install - ln -sv eqn /usr/bin/geqn - ln -sv tbl /usr/bin/gtbl + ln -svf eqn /usr/bin/geqn + ln -svf tbl /usr/bin/gtbl @rm -rf $(DIR_APP) @$(POSTBUILD) From f68b4b661428552dc580ff92714557e74aac765d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 3 Sep 2011 12:31:09 +0200 Subject: [PATCH 123/159] Add static routing to menu. --- config/menu/30-network.menu | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index abc6bc6af..f4645b8fc 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -35,6 +35,12 @@ 'title' => "$Lang::tr{'edit hosts'}", 'enabled' => 1, }; + $subnetwork->{'51.routes'} = { + 'caption' => $Lang::tr{'static routes'}, + 'uri' => '/cgi-bin/routing.cgi', + 'title' => "$Lang::tr{'static routes'}", + 'enabled' => 1, + }; $subnetwork->{'60.upload'} = { 'caption' => $Lang::tr{'upload'}, 'uri' => '/cgi-bin/upload.cgi', From d175e0b9d30ae78d59460a6891545589826dc628 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 3 Sep 2011 12:55:08 +0200 Subject: [PATCH 124/159] Update translation for static routing. All except en and de are missing. --- doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_missings | 4 ++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 7 files changed, 10 insertions(+) diff --git a/doc/language_issues.es b/doc/language_issues.es index 21aecaec7..0ef2eacd8 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -537,5 +537,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 3b5f3f3be..00cb46278 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -526,6 +526,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snort working +WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: upload new ruleset WARNING: untranslated string: urlfilter file ext block diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 21aecaec7..0ef2eacd8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -537,5 +537,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cf1f645cd..9add81b43 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -509,4 +509,5 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: static routes WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index 229c8a3f5..5dc1daef1 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -32,6 +32,7 @@ < ntp common settings < ntp sync < snort working +< static routes < system information < upload new ruleset < urlfilter file ext block @@ -97,6 +98,7 @@ < outgoing firewall p2p description 3 < outgoing firewall view group < Set time on boot +< static routes < system information < vpn keyexchange ############################################################################ @@ -115,6 +117,7 @@ < extrahd unable to write < extrahd you cant mount < minute +< static routes < vpn keyexchange ############################################################################ # Checking install/setup translations for language: ru # @@ -134,4 +137,5 @@ < extrahd unable to write < extrahd you cant mount < minute +< static routes < vpn keyexchange diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0f95df04e..0d73e61df 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1651,6 +1651,7 @@ 'start ovpn server' => 'Starte OpenVPN Server', 'state or province' => 'Bundesstat oder Provinz', 'static ip' => 'Statisch IP', +'static routes' => 'Statische Routen', 'status' => 'Status', 'status information' => 'Statusinformationen', 'status ovpn' => 'OpenVPN', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 851d3c6a8..e18fc534a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1684,6 +1684,7 @@ 'start ovpn server' => 'Start OpenVPN Server', 'state or province' => 'State or Province', 'static ip' => 'Static IP', +'static routes' => 'Static routes', 'status' => 'Status', 'status information' => 'Status information', 'status ovpn' => '4. OpenVPN Status / Configuration:', From 469ec27c641a4f5c88cd283e18d29c4e9487a614 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 31 Aug 2011 14:42:06 +0200 Subject: [PATCH 125/159] apache2: update to 2.2.20. --- config/rootfiles/core/next/filelists/apache2 | 1 + lfs/apache2 | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/next/filelists/apache2 diff --git a/config/rootfiles/core/next/filelists/apache2 b/config/rootfiles/core/next/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/next/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/lfs/apache2 b/lfs/apache2 index 80e96b724..c5fd75429 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.2.19 +VER = 2.2.20 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = 832f96a6ec4b8fc7cf49b9efd4e89060 +$(DL_FILE)_MD5 = 1ac251431c8c4285f6b085c1d156bb56 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) From 90ae7409ff9989c4870fd8fc541e3b7fd36732a6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 3 Sep 2011 16:02:40 +0200 Subject: [PATCH 126/159] core52: add apache, ethtool and namecheap to updater. --- config/rootfiles/core/52/exclude | 1 + config/rootfiles/core/{next => 52}/filelists/apache2 | 0 config/rootfiles/core/52/filelists/ethtool | 1 + config/rootfiles/core/52/filelists/files | 2 ++ 4 files changed, 4 insertions(+) rename config/rootfiles/core/{next => 52}/filelists/apache2 (100%) create mode 120000 config/rootfiles/core/52/filelists/ethtool diff --git a/config/rootfiles/core/52/exclude b/config/rootfiles/core/52/exclude index ce199d851..bb0d8c84b 100644 --- a/config/rootfiles/core/52/exclude +++ b/config/rootfiles/core/52/exclude @@ -1 +1,2 @@ srv/web/ipfire/html/proxy.pac +var/updatecache diff --git a/config/rootfiles/core/next/filelists/apache2 b/config/rootfiles/core/52/filelists/apache2 similarity index 100% rename from config/rootfiles/core/next/filelists/apache2 rename to config/rootfiles/core/52/filelists/apache2 diff --git a/config/rootfiles/core/52/filelists/ethtool b/config/rootfiles/core/52/filelists/ethtool new file mode 120000 index 000000000..494a53e9d --- /dev/null +++ b/config/rootfiles/core/52/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index dca50befa..331514d94 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -2,3 +2,5 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +usr/local/bin/setddns.pl +srv/web/ipfire/cgi-bin/ddns.cgi From 339310f9f78493b4492fdee55007e4a4b34069a3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 3 Sep 2011 16:04:18 +0200 Subject: [PATCH 127/159] core52: stop/start apache at update. --- config/rootfiles/core/52/update.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh index 16e8368e6..1e2f61e7f 100644 --- a/config/rootfiles/core/52/update.sh +++ b/config/rootfiles/core/52/update.sh @@ -34,6 +34,7 @@ done # #Stop services +/etc/init.d/apache stop # #Extract files @@ -41,6 +42,7 @@ extract_files # #Start services +/etc/init.d/apache start # #Update Language cache From 80337f489444572abcc300aaab6c9bfbf721c19d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Sep 2011 12:14:08 +0200 Subject: [PATCH 128/159] core-next: add compat-wireless modules to update. --- .../core/next/filelists/compat-wireless | 359 ++++++++++++++++++ config/rootfiles/core/next/update.sh | 6 +- 2 files changed, 362 insertions(+), 3 deletions(-) create mode 100644 config/rootfiles/core/next/filelists/compat-wireless diff --git a/config/rootfiles/core/next/filelists/compat-wireless b/config/rootfiles/core/next/filelists/compat-wireless new file mode 100644 index 000000000..5d899bf80 --- /dev/null +++ b/config/rootfiles/core/next/filelists/compat-wireless @@ -0,0 +1,359 @@ +lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/compat/compat_firmware_class.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl1.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/atlx/atl2.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/b44.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl12xx.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/staging/brcm80211/util/brcmutil.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/compat/compat_firmware_class.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1c/atl1c.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atl1e/atl1e.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl1.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/atlx/atl2.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/b44.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl12xx.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/staging/brcm80211/util/brcmutil.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko +lib/modules/2.6.32.45-ipfire/kernel/compat/compat.ko +lib/modules/2.6.32.45-ipfire/kernel/compat/compat_firmware_class.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1c/atl1c.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atl1e/atl1e.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl1.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/atlx/atl2.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/b44.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl-legacy.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/wl12xx/wl12xx.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmfmac/brcmfmac.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/brcmsmac/brcmsmac.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/staging/brcm80211/util/brcmutil.ko +lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.45-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.45-ipfire/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.45-ipfire/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.45-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko +etc/udev/rules.d/50-compat_firmware.rules +lib/udev/compat_firmware.sh diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 9a4664522..e8e20b196 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -69,9 +69,9 @@ fi perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's -#depmod 2.6.32.45-ipfire >/dev/null 2>&1 -#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 -#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 +depmod 2.6.32.45-ipfire >/dev/null 2>&1 +depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 +depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 ## Change version of Pakfire.conf ## From 4e9d6128997f2b9431b8e5d0543554589029f482 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Sep 2011 14:25:07 +0200 Subject: [PATCH 129/159] core-next: add changed files to updater. --- config/rootfiles/common/openvpn | 3 ++- config/rootfiles/core/next/filelists/files | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 1ecaff83b..8791523b6 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -2,6 +2,7 @@ lib/openvpn-auth-pam.so lib/openvpn-down-root.so usr/sbin/openvpn #usr/share/doc/openvpn +#usr/share/doc/openvpn/management-notes.txt #usr/share/man/man8/openvpn.8 var/ipfire/ovpn var/ipfire/ovpn/ca @@ -12,7 +13,7 @@ var/ipfire/ovpn/certs/serial var/ipfire/ovpn/crls #var/ipfire/ovpn/openssl var/ipfire/ovpn/openssl/ovpn.cnf +var/ipfire/ovpn/ovpn-leases.db var/ipfire/ovpn/ovpnconfig var/ipfire/ovpn/settings var/ipfire/ovpn/verify -var/ipfire/ovpn/ovpn-leases.db diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 30727a506..95cde2cd8 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,8 +1,15 @@ etc/sysctl.conf etc/system-release etc/issue +etc/iproute2/rt_tables +etc/rc.d/init.d/networking/red +etc/rc.d/init.d/static-routes srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/outgoinggrp.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl var/ipfire/langs/en.pl @@ -10,4 +17,5 @@ var/ipfire/langs/es.pl var/ipfire/langs/fr.pl var/ipfire/langs/pl.pl usr/local/bin/ipsecctrl +usr/local/bin/openvpnctrl usr/local/bin/vpn-watch From e57d2133a3581a78b80412852dfaf68ebcffadc7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Sep 2011 14:30:19 +0200 Subject: [PATCH 130/159] core-next: remove now unsupported "EU" wireless regdomain. --- config/rootfiles/core/next/update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index e8e20b196..ff6409bd6 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -57,6 +57,11 @@ rm -rf /etc/usb_modeswitch.d #Extract files extract_files +# +#Replace now unsupported EU regdomain by a "DE" comment. +sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \ + /etc/modprobe.d/cfg80211 + # #Start services From 5d2c8f5da1d3f0e31ce9c3c274c5e23a8c4d13cb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 4 Sep 2011 15:39:57 +0200 Subject: [PATCH 131/159] static-routing: Add "proto static" to static kernel routes. --- src/initscripts/init.d/static-routes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/init.d/static-routes index 970083c0d..940a7b45c 100644 --- a/src/initscripts/init.d/static-routes +++ b/src/initscripts/init.d/static-routes @@ -35,7 +35,7 @@ function create_all_routes() { continue fi - ip route add ${network} via ${gateway} table static + ip route add ${network} via ${gateway} table static proto static done < ${file} } From 5de6ca7829b163bbea10ba3ab1b1587b81ac1198 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Sep 2011 15:47:31 +0200 Subject: [PATCH 132/159] ethtool: rootfile update. --- config/rootfiles/common/ethtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/common/ethtool b/config/rootfiles/common/ethtool index 519118c42..930cd05de 100644 --- a/config/rootfiles/common/ethtool +++ b/config/rootfiles/common/ethtool @@ -1,2 +1,2 @@ -#usr/man/man8/ethtool.8 usr/sbin/ethtool +#usr/share/man/man8/ethtool.8 From bb4cfcc1bf35790fdbb6c56019ba23a3367465ed Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 4 Sep 2011 15:50:43 +0200 Subject: [PATCH 133/159] Add static-routing feature to core update. --- config/rootfiles/common/configroot | 1 + config/rootfiles/core/next/filelists/files | 5 +++++ lfs/configroot | 2 +- src/initscripts/init.d/network | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 5ac578a90..8fdd7ac96 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -67,6 +67,7 @@ var/ipfire/mac var/ipfire/main #var/ipfire/main/disable_nf_sip #var/ipfire/main/hosts +#var/ipfire/main/routing #var/ipfire/main/settings #var/ipfire/menu.d var/ipfire/menu.d/00-menu.main diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 30727a506..7b85a5446 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,8 +1,11 @@ +etc/rc.d/init.d/network +etc/rc.d/init.d/static-routing etc/sysctl.conf etc/system-release etc/issue srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl var/ipfire/langs/en.pl @@ -11,3 +14,5 @@ var/ipfire/langs/fr.pl var/ipfire/langs/pl.pl usr/local/bin/ipsecctrl usr/local/bin/vpn-watch +usr/local/bin/rebuildroutes +var/ipfire/main/routing diff --git a/lfs/configroot b/lfs/configroot index 43c2d2155..f35361469 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -65,7 +65,7 @@ $(TARGET) : certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ - isdn/settings mac/settings main/disable_nf_sip main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ + isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 7f27a65a8..c773b83c2 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -51,6 +51,7 @@ init_networking() { fi /etc/rc.d/init.d/dnsmasq start + /etc/rc.d/init.d/static-routing start } DO="${1}" From a86240b11ac5d0577e28ce091784402547bbb46b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 4 Sep 2011 15:55:08 +0200 Subject: [PATCH 134/159] Forgot to add menu entry. --- config/rootfiles/core/next/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index d2a8d6de4..f2fee1b77 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -23,3 +23,4 @@ usr/local/bin/openvpnctrl usr/local/bin/vpn-watch usr/local/bin/rebuildroutes var/ipfire/main/routing +var/ipfire/menu.d/30-network.menu From 6dd8a471e4c9227221b85babd826ef216bf1b932 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Sep 2011 16:25:48 +0200 Subject: [PATCH 135/159] core-next: remove wrong file. --- config/rootfiles/core/next/filelists/files | 1 - 1 file changed, 1 deletion(-) diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index f2fee1b77..9b3987969 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -5,7 +5,6 @@ etc/system-release etc/issue etc/iproute2/rt_tables etc/rc.d/init.d/networking/red -etc/rc.d/init.d/static-routes srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/outgoinggrp.cgi From 7c1d9faf271a1aa8289a8ed16e896d7ed6c519b5 Mon Sep 17 00:00:00 2001 From: Alfred Haas Date: Sun, 4 Sep 2011 17:57:47 +0200 Subject: [PATCH 136/159] Bugfixes on OpenVPN CGI. --- html/cgi-bin/ovpnmain.cgi | 135 ++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 55 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 95eb67a1e..5d4ebffdb 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -397,6 +397,22 @@ sub emptyserverlog{ } +### +# m.a.d net2net +### + +sub validdotmask +{ + my $ipdotmask = $_[0]; + if (&General::validip($ipdotmask)) { return 0; } + if (!($ipdotmask =~ /^(.*?)\/(.*?)$/)) { } + my $mask = $2; + if (($mask =~ /\./ )) { return 0; } + return 1; +} + + + #hier die refresh page if ( -e "${General::swroot}/ovpn/gencanow") { my $refresh = ''; @@ -517,7 +533,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { } ### -# m.a.d Save net2net server config +# m.a.d net2net ### if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'server') @@ -534,13 +550,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General open(SERVERCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; flock SERVERCONF, 2; - print SERVERCONF "# n2n Open VPN Server Config by ummeegge und m.a.d\n"; + print SERVERCONF "# IPFire n2n Open VPN Server Config by ummeegge und m.a.d\n"; print SERVERCONF "\n"; print SERVERCONF "# User Sicherheit\n"; print SERVERCONF "user nobody\n"; print SERVERCONF "group nobody\n"; print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; + print SERVERCONF "script-security 2\n"; print SERVERCONF "\n"; print SERVERCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; @@ -602,8 +619,9 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } ### -# m.a.d Save net2net client config +# m.a.d net2net ### + if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client') { my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); @@ -617,13 +635,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General open(CLIENTCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; flock CLIENTCONF, 2; - print CLIENTCONF "# rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; + print CLIENTCONF "# IPFire rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# User Sicherheit\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; + print CLIENTCONF "script-security 2\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; @@ -632,7 +651,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; - print CLIENTCONF "route @remsubnet[0]/@remsubnet[1]\n"; + print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; print CLIENTCONF "# Device fuer den Tunnel\n"; print CLIENTCONF "dev tun\n"; print CLIENTCONF "#\n"; @@ -683,10 +702,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } -### -# m.a.d Save net2net config end -### - ### ### Save main settings ### @@ -1488,7 +1503,7 @@ END ### ### -# m.a.d net2net Anpassung +# m.a.d net2net ### }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { @@ -1540,8 +1555,8 @@ END my $zippath = "$tempdir/"; ### -# m.a.d net2net DL Client Package -### +# m.a.d net2net +### if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ @@ -1551,18 +1566,20 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ my @ovsubnettemp = split(/\./,$confighash{$cgiparams{'KEY'}}[27]); my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; my $tunmtu = ''; + my @remsubnet = split(/\//,$confighash{$cgiparams{'KEY'}}[8]); open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; my $zip = Archive::Zip->new(); - print CLIENTCONF "# n2n Open VPN Client Config by ummeegge und m.a.d\n"; + print CLIENTCONF "# IPFire n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "# \n"; print CLIENTCONF "# User Sicherheit\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; + print CLIENTCONF "script-security 2\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; @@ -1571,7 +1588,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "#\n"; print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; - print CLIENTCONF "route $confighash{$cgiparams{'KEY'}}[8]\n"; + print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# Device fuer den Tunnel\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; print CLIENTCONF "#\n"; @@ -1642,7 +1659,7 @@ else $clientovpn = "$confighash{$cgiparams{'KEY'}}[1]-TO-IPFire.ovpn"; ### -# m.a.d net2net DL Client Package end +# m.a.d net2net ### open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; @@ -1732,8 +1749,9 @@ else my $temp = `/usr/bin/openssl ca -revoke ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; ### -# m.a.d net2net Anpassung +# m.a.d net2net ### + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { my $conffile = glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); @@ -1743,9 +1761,6 @@ else rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; } -### -# m.a.d net2net Anpassung end -### unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); @@ -2185,7 +2200,7 @@ END ### ### -# m.a.d Anpassung wegen upload n2n Package +# m.a.d net2net ### } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') { @@ -2215,7 +2230,7 @@ END exit (0); ### -# m.a.d uploading a IPFire n2n Client package +# m.a.d net2net ### } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) && ($cgiparams{'TYPE'} eq 'net2net')){ @@ -2288,15 +2303,15 @@ END goto N2N_ERROR; } -### -# m.a.d prepare imported ipfire net2net data +### +# m.a.d net2net ### my @n2nname = split(/\./,$uplconffilename); $n2nname[0] =~ s/\n|\r//g; - if ( !-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]") { - mkdir("${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770); } + unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} + unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename"); @@ -2348,7 +2363,7 @@ chomp ($complzoactive); chomp ($mssfixactive); ### -# m.a.d Write n2n config +# m.a.d net2net ### ### @@ -2446,6 +2461,8 @@ foreach my $dkey (keys %confighash) { $Lang::tr{'protocol'}$confighash{$key}[28] $Lang::tr{'destination port'}:$confighash{$key}[29] $Lang::tr{'comp-lzo'}$confighash{$key}[30] + MSSFIX $confighash{$key}[23] + Fragment $confighash{$key}[24] $Lang::tr{'MTU'}$confighash{$key}[31]    @@ -2497,7 +2514,7 @@ if ($confighash{$cgiparams{'KEY'}}) { ### -# m.a.d end uploading a IPFire n2n Client package +# m.a.d net2net ### @@ -2565,10 +2582,12 @@ if ($confighash{$cgiparams{'KEY'}}) { } ### -# n2n Plausi m.a.d +# m.a.d net2net ### - if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { +if ($cgiparams{'TYPE'} eq 'net') { + + if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; goto VPNCONF_ERROR; } @@ -2587,11 +2606,22 @@ if ($confighash{$cgiparams{'KEY'}}) { $errormessage = 'fragment only allowed with udp'; goto VPNCONF_ERROR; } - -### -# n2n Plausi m.a.d -### + if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { + $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + goto VPNCONF_ERROR; + } + + if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { + $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + goto VPNCONF_ERROR; + } + + if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { + $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + goto VPNCONF_ERROR; + } +} # if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { # $errormessage = $Lang::tr{'ipfire side is invalid'}; @@ -3169,7 +3199,7 @@ END ; ### -# m.a.d Disbale upload cert for n2n connections +# m.a.d net2net ### } else { @@ -3192,7 +3222,7 @@ END } ### -# m.a.d Disbale upload cert for n2n connections end +# m.a.d net2net ### foreach my $country (sort keys %{Countries::countries}) { @@ -3203,7 +3233,7 @@ END print ">$country"; } ### -# m.a.d Disbale pkcs-password for n2n connections +# m.a.d net2net ### if ($cgiparams{'TYPE'} eq 'host') { @@ -3230,7 +3260,7 @@ END } ### -# m.a.d Disbale pkcs-password for n2n connections end +# m.a.d net2net ### ; &Header::closebox(); @@ -3575,7 +3605,7 @@ END if ( -f "${General::swroot}/ovpn/ca/cacert.pem" ) { ### -# m.a.d Client Status Table +# m.a.d net2net ### &Header::openbox('100%', 'LEFT', $Lang::tr{'Client status and controlc' }); @@ -3624,15 +3654,12 @@ END } else { ### -# m.a.d net2net Status -### - - if ($confighash{$cgiparams{'KEY'}}[3] eq 'host'){ - - my $cn; - my @match = (); - foreach my $line (@status) { +# m.a.d net2net +### + my $cn; + my @match = (); + foreach my $line (@status) { chomp($line); if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); @@ -3641,15 +3668,15 @@ END } $cn =~ s/[_]/ /g; if ($cn eq "$confighash{$key}[2]") { - $active = "
$Lang::tr{'capsclosed'}
"; + $active = "
$Lang::tr{'capsopen'}
"; } - } - } - } else { + + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { + my @tempovpnsubnet = split("\/",$confighash{$key}[27]); my @ovpnip = split /\./,$tempovpnsubnet[0]; my $pingip = ""; - + if ($confighash{$key}[6] eq 'server') { $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2"; } else { @@ -3665,10 +3692,8 @@ END } } - -### -# m.a.d net2net Status end -### +} +} my $disable_clientdl = "disabled='disabled'"; From d4f2fb979aa347d6b819e3d6476162b4ba29f086 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 4 Sep 2011 20:37:49 +0200 Subject: [PATCH 137/159] openvpnctrl: Fix adding firewall rules. --- src/misc-progs/openvpnctrl.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 163386b43..5207c240f 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -25,7 +25,7 @@ char enableorange[STRING_SIZE] = "off"; char OVPNRED[STRING_SIZE] = "OVPN"; char OVPNBLUE[STRING_SIZE] = "OVPN_BLUE_"; char OVPNORANGE[STRING_SIZE] = "OVPN_ORANGE_"; -char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.2.0"; +char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.2.1"; struct connection_struct { char name[STRING_SIZE]; @@ -88,7 +88,8 @@ connection *getConnections() { } char line[STRING_SIZE] = ""; - char *result; + char result[STRING_SIZE] = ""; + char *resultptr; int count; connection *conn_first = NULL; connection *conn_last = NULL; @@ -109,19 +110,31 @@ connection *getConnections() { conn_last = conn_curr; count = 0; - result = strtok(line, ","); - while (result) { + char *lineptr = &line; + while (1) { + if (*lineptr == NULL) + break; + + resultptr = result; + while (*lineptr != NULL) { + if (*lineptr == ',') { + lineptr++; + break; + } + *resultptr++ = *lineptr++; + } + *resultptr = '\0'; + if (count == 2) { strcpy(conn_curr->name, result); } else if (count == 4) { strcpy(conn_curr->type, result); - } else if (count == 12) { + } else if (count == 29) { strcpy(conn_curr->proto, result); - } else if (count == 13) { + } else if (count == 30) { conn_curr->port = atoi(result); } - result = strtok(NULL, ","); count++; } } From 2d20dff23384811c321511e88963c060b2ba4109 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 4 Sep 2011 21:14:57 +0200 Subject: [PATCH 138/159] Add openvpn update to core update. --- config/rootfiles/core/next/filelists/openvpn | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/next/filelists/openvpn diff --git a/config/rootfiles/core/next/filelists/openvpn b/config/rootfiles/core/next/filelists/openvpn new file mode 120000 index 000000000..493f3f7a4 --- /dev/null +++ b/config/rootfiles/core/next/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file From 32e754c1b2572ff4d4312c83d0fc72bd791a11af Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 4 Sep 2011 21:18:01 +0200 Subject: [PATCH 139/159] Create folder that keeps the openvpn daemon configuration files. --- config/rootfiles/common/openvpn | 1 + lfs/openvpn | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 8791523b6..0f2aa4718 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -11,6 +11,7 @@ var/ipfire/ovpn/caconfig var/ipfire/ovpn/certs/index.txt var/ipfire/ovpn/certs/serial var/ipfire/ovpn/crls +var/ipfire/ovpn/n2nconf #var/ipfire/ovpn/openssl var/ipfire/ovpn/openssl/ovpn.cnf var/ipfire/ovpn/ovpn-leases.db diff --git a/lfs/openvpn b/lfs/openvpn index 09379308e..41594b709 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /lib/ -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/crls + -mkdir -vp /var/ipfire/ovpn/n2nconf touch /var/ipfire/ovpn/ovpn-leases.db chmod 700 /var/ipfire/ovpn/ovpn-leases.db chown -R nobody:nobody /var/ipfire/ovpn From 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 5 Sep 2011 11:29:08 +0200 Subject: [PATCH 140/159] proxy.cgi: fix ldap utf8 authentification. Fixes: #786 --- config/rootfiles/core/52/filelists/files | 1 + html/cgi-bin/proxy.cgi | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index 331514d94..a0f0ef571 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -4,3 +4,4 @@ etc/rc.d/init.d/console usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a0aa1acd3..6d0fe545e 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3147,6 +3147,7 @@ END if ($proxysettings{'AUTH_METHOD'} eq 'ldap') { + print FILE "auth_param basic utf8 on\n"; print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\""; if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; } if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; } From fd4f39f210c9555a0708af20e316f3d773d6b99b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 5 Sep 2011 16:41:53 +0200 Subject: [PATCH 141/159] squid: update to 3.1.15. --- config/rootfiles/core/52/filelists/squid | 1 + lfs/squid | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 config/rootfiles/core/52/filelists/squid diff --git a/config/rootfiles/core/52/filelists/squid b/config/rootfiles/core/52/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/52/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index f85b5e9a8..a29109fc4 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.14 +VER = 3.1.15 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd +$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92 install : $(TARGET) From 527a5a7756d2b51f5b226c04bd3cd2ab4c7de45b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 5 Sep 2011 20:32:02 +0200 Subject: [PATCH 142/159] graphs/langs: fix graphs with russian language. rrd-graph cannot use UTF-8 chars so the strings are duplicated. --- config/cfgroot/graphs.pl | 36 ++++++++++++------------ config/rootfiles/core/52/filelists/files | 1 + langs/de/cgi-bin/de.pl | 5 ++++ langs/en/cgi-bin/en.pl | 5 ++++ langs/es/cgi-bin/es.pl | 5 ++++ langs/fr/cgi-bin/fr.pl | 5 ++++ langs/pl/cgi-bin/pl.pl | 5 ++++ langs/ru/cgi-bin/ru.pl | 18 +++++------- 8 files changed, 51 insertions(+), 29 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 8d047c2a5..c51e882e2 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -116,7 +116,7 @@ sub updatecpugraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -249,7 +249,7 @@ sub updateloadgraph { "-h 125", "-l 0", "-r", - "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'processes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -288,7 +288,7 @@ sub updatememorygraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'memory usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -350,7 +350,7 @@ sub updateswapgraph { "-l 0", "-u 100", "-r", - "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'swap usage per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'percentage'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -407,7 +407,7 @@ sub updateprocessescpugraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"} @@ -457,7 +457,7 @@ sub updateprocessesmemorygraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -503,7 +503,7 @@ sub updatediskgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -553,7 +553,7 @@ sub updateifgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -597,7 +597,7 @@ sub updatefwhitsgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -645,7 +645,7 @@ sub updatepinggraph { "-h 125", "-l 0", "-r", - "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ms", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -689,7 +689,7 @@ sub updatewirelessgraph { "--alt-y-grid", "-w 600", "-h 125", - "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v dBm", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -733,7 +733,7 @@ sub updatehddgraph { "-w 600", "-h 125", "-r", - "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -773,7 +773,7 @@ sub updatehwtempgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -826,7 +826,7 @@ sub updatehwfangraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -879,7 +879,7 @@ sub updatehwvoltgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, @@ -952,7 +952,7 @@ sub updateqosgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1010,7 +1010,7 @@ sub updatecpufreqgraph { "-w 600", "-h 125", "-r", - "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period}, + "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"}, "-v MHz", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, @@ -1055,7 +1055,7 @@ sub updatethermaltempgraph { "-w 600", "-h 125", "-r", - "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period}, + "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, "-v Grad Celsius", "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index a0f0ef571..8076e026b 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -5,3 +5,4 @@ usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/graphs.pl diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e6d451fe7..6a9e04bbb 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -549,6 +549,7 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', +'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', 'days' => 'Tage', @@ -892,6 +893,7 @@ 'hosts config added' => 'Hosts-Konfiguration hinzugefügt', 'hosts config changed' => 'Hosts-Konfiguration geändert', 'hour' => 'Stunde', +'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', 'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.', @@ -1169,6 +1171,7 @@ 'modulation' => 'Modulation', 'monday' => 'Montag', 'month' => 'Monat', +'month-graph' => 'Monat', 'monthly firewallhits' => 'monatliche Firewalltreffer', 'monthly start day bad' => 'Monatlicher Starttag ist nicht gültig', 'monthly traffic bad' => 'Monatliches Volumen ist nicht gültig', @@ -2103,6 +2106,7 @@ 'website' => 'Website', 'wednesday' => 'Mittwoch', 'week' => 'Woche', +'week-graph' => 'Woche', 'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', @@ -2138,6 +2142,7 @@ 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!', 'year' => 'Jahr', +'year-graph' => 'Jahr', 'yearly firewallhits' => 'jährliche Firewalltreffer', 'yes' => 'Ja', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.
Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 247814505..041659b55 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -570,6 +570,7 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', +'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', 'days' => 'days.', @@ -918,6 +919,7 @@ 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', 'hour' => 'Hour', +'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1196,6 +1198,7 @@ 'modulation' => 'Modulation', 'monday' => 'Monday', 'month' => 'Month', +'month-graph' => 'Month', 'monthly firewallhits' => 'monthly firewallhits', 'monthly start day bad' => 'Monthly start day is not correct', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2137,6 +2140,7 @@ 'website' => 'Website', 'wednesday' => 'Wednesday', 'week' => 'Week', +'week-graph' => 'Week', 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'weeks', 'wildcards' => 'Wildcards', @@ -2172,6 +2176,7 @@ 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !', 'year' => 'Year', +'year-graph' => 'Year', 'yearly firewallhits' => 'yearly firewallhits', 'yes' => 'Yes', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.
Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 861ff2a2a..0433ed577 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -568,6 +568,7 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', +'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', 'days' => 'dias.', @@ -899,6 +900,7 @@ 'hosts config added' => 'Configuración de hosts agregada', 'hosts config changed' => 'Configuración de hosts ha cambiado', 'hour' => 'Hora', +'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', 'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual', @@ -1176,6 +1178,7 @@ 'modulation' => 'Modulación', 'monday' => 'Lun', 'month' => 'Mes', +'month-graph' => 'Mes', 'monthly firewallhits' => 'Hits al firewall mensuales', 'monthly start day bad' => 'Fecha de inicio mensual incorrecta', 'monthly traffic bad' => 'Volúmen mensual incorrecto', @@ -2103,6 +2106,7 @@ 'website' => 'Website', 'wednesday' => 'Miércoles', 'week' => 'Semana', +'week-graph' => 'Semana', 'weekly firewallhits' => 'Hits semanales al firewall', 'weeks' => 'Semanas', 'wildcards' => 'Comodines', @@ -2138,6 +2142,7 @@ 'xtaccess all error' => 'No puede establecer un acceso externo para TODOS, eso se hace en el registro de reenvío-de-puertos.', 'xtaccess bad transfert' => '¡Si ud. especifica un rango de puerto de destino, el rango de origen debe ser idéntico!', 'year' => 'Año', +'year-graph' => 'Ano', 'yearly firewallhits' => 'Hits anuales al Firewall', 'yes' => 'Si', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Solamente puede definir una conexion Roadwarrior cuando utiliza una autenticación por llave pre-compartida.
Puede ser que ya cuente con una conexión Roadwarrior abierta con autenticación por llave pre-compartida, o ud está intentando añadir una nueva ahora', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 778d9d5ae..cbdeda441 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -570,6 +570,7 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', +'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', 'days' => 'jours.', @@ -900,6 +901,7 @@ 'hosts config added' => 'configuration de l\'hôte ajoutée', 'hosts config changed' => 'configuration de l\'hôte changée', 'hour' => 'Heure', +'hour-graph' => 'Heure', 'hours' => 'heures', 'hours2' => 'Heures', 'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.', @@ -1177,6 +1179,7 @@ 'modulation' => 'Modulation', 'monday' => 'Lundi', 'month' => 'Mois', +'month-graph' => 'Mois', 'monthly firewallhits' => 'Attaques mensuelle du pare-feu', 'monthly start day bad' => 'Le jour de début du mois est incorrect', 'monthly traffic bad' => 'Le trafic mensuel est incorrect', @@ -2113,6 +2116,7 @@ 'website' => 'Site Web', 'wednesday' => 'Mercredi', 'week' => 'Semaine', +'week-graph' => 'Semaine', 'weekly firewallhits' => 'Hits hebdomadaire du pare-feu', 'weeks' => 'semaines', 'wildcards' => 'Jokers', @@ -2128,6 +2132,7 @@ 'xtaccess all error' => 'Vous ne pouvez pas donner l\'accès externe à tout ce qui se fait dans le dossier de redirection de port.', 'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !', 'year' => 'Année', +'year-graph' => 'Annee', 'yearly firewallhits' => 'Hits annuels du pare-feu', 'yes' => 'Oui', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion roadwarrior lors de l\'utilisation par pré-authentification par clé partagée.
Soit vous avez déjà une connexion RoadWarrior avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 43599843b..76c49bb8e 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -570,6 +570,7 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', +'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', 'days' => 'dni.', @@ -918,6 +919,7 @@ 'hosts config added' => 'Dodana konfiguracja hostów', 'hosts config changed' => 'Zmieniona konfiguracja hostów', 'hour' => 'Godzina', +'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.', @@ -1195,6 +1197,7 @@ 'modulation' => 'Modulacja', 'monday' => 'Poniedziałek', 'month' => 'Miesiac', +'month-graph' => 'Miesiac', 'monthly firewallhits' => 'miesięczne zdarzenia zapory', 'monthly start day bad' => 'Początek okresu miesięcznego jest niepoprawny', 'monthly traffic bad' => 'Monthly volume is not correct', @@ -2136,6 +2139,7 @@ 'website' => 'Stron WWW', 'wednesday' => 'Środa', 'week' => 'Tydzien', +'week-graph' => 'Tydzien', 'weekly firewallhits' => 'zdarzeń zapory tygodniowo', 'weeks' => 'tygodnie', 'wildcards' => 'Maski', @@ -2171,6 +2175,7 @@ 'xtaccess all error' => 'Nie możesz ustawić zdalnego dostępu dla wszystkich - to robi wpis przekierowujący porty.', 'xtaccess bad transfert' => 'Jeżeli określisz zakres portów docelowy musisz ustawić identyczny zakres portów źródłowych !', 'year' => 'Rok', +'year-graph' => 'Rok', 'yearly firewallhits' => 'zdarzeń zapory w toku', 'yes' => 'Tak', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Możesz zdefiniować tylko jedno połączenie typu Roadwarrior jeżeli używasz autentykacji kluczem współdzielony (pre-shared key).
Albo połączenie typu Roadwarrior uwierzytelniane kluczem współdzielonym już istnieje, albo próbujesz dodać je teraz.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 946e302d9..18c134915 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -550,7 +550,7 @@ 'credits' => 'О Проекте', 'crl' => 'Список отозванных сертификатов', 'cron server' => 'CRON Сервер', -'current' => 'Текущий', +'current' => 'Current', 'current aliases' => 'Действующие псевдонимы:', 'current class' => 'Текущий класс', 'current devices' => 'Текущие устройства', @@ -569,7 +569,7 @@ 'dat without key' => 'Зашифрованный архив не может быть использован без ключа.', 'date' => 'Дата', 'date not in logs' => 'На запрошеный день журналы не найдены или они частично недоступны', -'day' => 'Day', +'day' => 'Сутки', 'day after' => 'Следующий День', 'day before' => 'Предыдущий День', 'days' => 'Дни.', @@ -655,7 +655,6 @@ 'disabled' => 'отключён', 'disconnect' => 'OVPN Остановить / Отключить', 'disconnects' => 'Отключает', -'disk access per' => 'Доступ к диску по', 'disk usage' => 'Использование дисков', 'display' => 'Экран', 'display charset' => 'Таблица символов', @@ -844,9 +843,8 @@ 'forwarding rule removed' => 'Forwarding rule removed; restarting forwarder', 'forwarding rule updated' => 'Forwarding rule updated; restarting forwarder', 'free' => 'Свободно', -'free memory' => 'Свободно Памяти ', -'free swap' => 'Свободно Swap', -'frequency' => 'Частота', +'free memory' => 'Free memory', +'free swap' => 'Free Swap', 'friday' => 'Пятница', 'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire website and then upload the entire fcdsl-(your_version).tgz using the form below.', 'fritzdsl upload' => 'Upload Fritz!DSL driver', @@ -948,7 +946,6 @@ 'inactive' => 'inactive', 'include logfiles' => 'Включить файлы логов', 'incoming' => 'Входящий', -'incoming traffic in bytes per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', @@ -1151,7 +1148,7 @@ 'max retries not set' => 'Не указано максимальное число попыток.', 'max size' => 'Максимальный размер объекта (KB):', 'max throughput' => 'Максимальная пропускная способность', -'maximal' => 'Максимум', +'maximal' => 'Maximal', 'maximum retries' => 'Максимальное число попыток:', 'may' => 'Май', 'mbmon display' => 'Показать', @@ -1339,7 +1336,6 @@ 'outgoing firewall reset' => 'Сбросить всё', 'outgoing firewall view group' => 'Посмотреть группу', 'outgoing firewall warning' => 'Если не указывать ip или mac, то они будут игнорироваться', -'outgoing traffic in bytes per second' => 'Исходящий трафик', 'override mtu' => 'Перезаписать MTU по умолчанию', 'ovpn' => 'OpenVPN', 'ovpn con stat' => 'Статистика подключений OpenVPN', @@ -2081,8 +2077,8 @@ 'use ipfire red ip' => 'Для подключения IPFire использует классический RED IP', 'use only proposed settings' => 'Пожалуйста используйте только предлагаемые настройки.', 'used' => 'Использовано', -'used memory' => 'Использовано памяти ', -'used swap' => 'Использовано Swap', +'used memory' => 'Used memory', +'used swap' => 'Used swap', 'user' => 'Пользователь', 'user log' => 'Журнал пользователя', 'user proxy logs' => 'Журнал proxy пользователя', From b278daf39894ca17e31f76c7f20e641bee419f66 Mon Sep 17 00:00:00 2001 From: Alfred Haas Date: Mon, 5 Sep 2011 22:56:49 +0200 Subject: [PATCH 143/159] Updates :D --- html/cgi-bin/ovpnmain.cgi | 262 ++++++++++++++++++++++---------------- 1 file changed, 152 insertions(+), 110 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5d4ebffdb..4409f77af 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -552,29 +552,25 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General flock SERVERCONF, 2; print SERVERCONF "# IPFire n2n Open VPN Server Config by ummeegge und m.a.d\n"; print SERVERCONF "\n"; - print SERVERCONF "# User Sicherheit\n"; + print SERVERCONF "# User Security\n"; print SERVERCONF "user nobody\n"; print SERVERCONF "group nobody\n"; print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; print SERVERCONF "script-security 2\n"; - print SERVERCONF "\n"; - print SERVERCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print SERVERCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; - print SERVERCONF "\n"; - print SERVERCONF "# IP Adressen des VPN Tunnels\n"; + print SERVERCONF "float\n"; + print SERVERCONF "# IP address of the n2n VPN Subnet\n"; print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Netzwerk auf dem Client Gateway\n"; + print SERVERCONF "# Client gateway network\n"; print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; - print SERVERCONF "# Device fuer den Tunnel\n"; + print SERVERCONF "# tun device\n"; print SERVERCONF "dev tun\n"; - print SERVERCONF "\n"; - print SERVERCONF "#Port und Protokoll\n"; + print SERVERCONF "#Port and protocol\n"; print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; print SERVERCONF "proto $cgiparams{'PROTOCOL'}\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Paketgroessen\n"; + print SERVERCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; if ($cgiparams{'PROTOCOL'} eq 'udp') { @@ -587,32 +583,26 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "mssfix\n"; } } - print SERVERCONF "\n"; print SERVERCONF "# Auth Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n"; print SERVERCONF "dh ${General::swroot}/ovpn/ca/dh1024.pem\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Verschluesselung\n"; + print SERVERCONF "# Cipher\n"; print SERVERCONF "cipher AES-256-CBC\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print SERVERCONF "# Kompression einschalten\n"; + print SERVERCONF "# Enable compession\n"; print SERVERCONF "comp-lzo\r\n"; - print SERVERCONF "#\n"; - } - print SERVERCONF "# Debug Level setzen\n"; + } + print SERVERCONF "# Debug level\n"; print SERVERCONF "verb 3\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Tunnel Ueberwachung\n"; + print SERVERCONF "# Tunnel check\n"; print SERVERCONF "keepalive 10 60\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Als Daemon starten mit Namen ovpnn2n\n"; + print SERVERCONF "# start as daemon\n"; print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print SERVERCONF "\n"; - print SERVERCONF "# Management Interface aktivieren\n"; + print SERVERCONF "# Activate Management Interface on Port\n"; print SERVERCONF "#management localhost 4711\n"; close(SERVERCONF); @@ -637,29 +627,25 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General flock CLIENTCONF, 2; print CLIENTCONF "# IPFire rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "#\n"; - print CLIENTCONF "# User Sicherheit\n"; + print CLIENTCONF "# User Security\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; + print CLIENTCONF "float\n"; + print CLIENTCONF "# IP address of the n2n VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; + print CLIENTCONF "# Server gateway network\n"; print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; - print CLIENTCONF "# Device fuer den Tunnel\n"; + print CLIENTCONF "# tun device\n"; print CLIENTCONF "dev tun\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "#Port und Protokoll\n"; + print CLIENTCONF "#Port and protocol\n"; print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; print CLIENTCONF "proto $cgiparams{'PROTOCOL'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Paketgroessen\n"; + print CLIENTCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; if ($cgiparams{'PROTOCOL'} eq 'udp') { @@ -672,31 +658,23 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "mssfix\n"; } } - print CLIENTCONF "#\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Verschluesselung\n"; + print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; - print CLIENTCONF "#\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print CLIENTCONF "# Kompression einschalten\n"; + print CLIENTCONF "# Enable compession\n"; print CLIENTCONF "comp-lzo\r\n"; - print CLIENTCONF "#\n"; - } - print CLIENTCONF "#\n"; + } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Tunnel Ueberwachung\n"; + print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Als Daemon starten\n"; + print CLIENTCONF "# Start sa daemon\n"; print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Management Interface aktivieren\n"; + print CLIENTCONF "# Activate Management Interface on Port\n"; print CLIENTCONF "# management localhost 4711\n"; close(CLIENTCONF); @@ -1574,29 +1552,25 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ my $zip = Archive::Zip->new(); print CLIENTCONF "# IPFire n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "# \n"; - print CLIENTCONF "# User Sicherheit\n"; + print CLIENTCONF "# User Security\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP/DNS fuer das Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# IP Adressen des VPN Tunnels\n"; + print CLIENTCONF "float\n"; + print CLIENTCONF "# IP adress of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Netzwerk auf dem Server Gateway\n"; + print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; - print CLIENTCONF "# Device fuer den Tunnel\n"; + print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "#Port und Protokoll\n"; + print CLIENTCONF "#Port and Protokoll\n"; print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; print CLIENTCONF "proto $confighash{$cgiparams{'KEY'}}[28]\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Paketgroessen\n"; + print CLIENTCONF "# Paketsize\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { @@ -1609,33 +1583,26 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "mssfix\n"; } } - print CLIENTCONF "#\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Verschluesselung\n"; + print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12\r\n"; $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n"; } - print CLIENTCONF "#\n"; if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') { - print CLIENTCONF "# Kompression einschalten\n"; + print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\r\n"; - print CLIENTCONF "#\n"; - } + } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Tunnel Ueberwachung\n"; + print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Als Daemon starten\n"; + print CLIENTCONF "# Start as daemon\n"; print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; - print CLIENTCONF "#\n"; - print CLIENTCONF "# Management Interface aktivieren\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; print CLIENTCONF "# management localhost 4711\n"; print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n"; @@ -2209,6 +2176,9 @@ END &Header::openpage($Lang::tr{'vpn configuration main'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', ''); &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'}); + +if ( -s "${General::swroot}/ovpn/settings") { + print <$Lang::tr{'connection type'}:
@@ -2224,6 +2194,18 @@ END END ; +} else { + print <$Lang::tr{'connection type'}:
+
+ + +
$Lang::tr{'host to net vpn'}
+END + ; + +} + &Header::closebox(); &Header::closebigbox(); &Header::closepage(); @@ -2322,6 +2304,8 @@ END } move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name"); + chmod 0600, "${General::swroot}/ovpn/certs/$uplp12name"; + if ($? ne 0) { $errormessage = "$Lang::tr{'certificate file move failed'}: $!"; unlink ($filename); @@ -2357,6 +2341,7 @@ $n2nproto[1] =~ s/\n|\r//g; $n2nport[1] =~ s/\n|\r//g; $n2ntunmtu[1] =~ s/\n|\r//g; $n2nremsub[1] =~ s/\n|\r//g; +$n2nremsub[2] =~ s/\n|\r//g; $n2nlocalsub[2] =~ s/\n|\r//g; $n2nfragment[1] =~ s/\n|\r//g; chomp ($complzoactive); @@ -2373,15 +2358,13 @@ chomp ($mssfixactive); foreach my $dkey (keys %confighash) { if ($confighash{$dkey}[1] eq $n2nname[0]) { $errormessage = $Lang::tr{'a connection with this name already exists'}; + unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; + unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; goto N2N_ERROR; } } -### -# Check if RemSubnet is green orange blue -### - - ### # Check if OpenVPN Subnet is valid ### @@ -2389,6 +2372,9 @@ chomp ($mssfixactive); foreach my $dkey (keys %confighash) { if ($confighash{$dkey}[27] eq "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0") { $errormessage = 'The OpenVPN Subnet is already in use'; + unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; + unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; goto N2N_ERROR; } } @@ -2400,6 +2386,9 @@ foreach my $dkey (keys %confighash) { foreach my $dkey (keys %confighash) { if ($confighash{$dkey}[29] eq $n2nport[1] ) { $errormessage = 'The OpenVPN Port is already in use'; + unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; + unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; goto N2N_ERROR; } } @@ -2417,7 +2406,7 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[6] = 'client'; $confighash{$key}[8] = $n2nlocalsub[2]; $confighash{$key}[10] = $n2nremote[1]; - $confighash{$key}[11] = $n2nremsub[1]; + $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; $confighash{$key}[25] = 'IPFire n2n Client'; @@ -2562,22 +2551,38 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } if ($cgiparams{'NAME'} !~ /^[a-zA-Z0-9]+$/) { $errormessage = $Lang::tr{'name must only contain characters'}; - goto VPNCONF_ERROR; - } + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } + goto VPNCONF_ERROR; + } if ($cgiparams{'NAME'} =~ /^(host|01|block|private|clear|packetdefault)$/) { $errormessage = $Lang::tr{'name is invalid'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } if (length($cgiparams{'NAME'}) >60) { $errormessage = $Lang::tr{'name too long'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } @@ -2589,37 +2594,51 @@ if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; - goto VPNCONF_ERROR; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ($cgiparams{'OVPN_SUBNET'} eq $vpnsettings{'DOVPN_SUBNET'}) { $errormessage = 'The OpenVPN Subnet is used by the OpenVPN Server please change'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) { $errormessage = 'mssfix only allowed with udp'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) { $errormessage = 'fragment only allowed with udp'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { - $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; - goto VPNCONF_ERROR; + $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { - $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; - goto VPNCONF_ERROR; + $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { - $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; - goto VPNCONF_ERROR; + $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } } @@ -2633,6 +2652,10 @@ if ($cgiparams{'TYPE'} eq 'net') { foreach my $key (keys %confighash) { if ($confighash{$key}[1] eq $cgiparams{'NAME'}) { $errormessage = $Lang::tr{'a connection with this name already exists'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } } @@ -2640,6 +2663,10 @@ if ($cgiparams{'TYPE'} eq 'net') { if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) { $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } @@ -2647,10 +2674,18 @@ if ($cgiparams{'TYPE'} eq 'net') { if (! &General::validip($cgiparams{'REMOTE'})) { if (! &General::validfqdn ($cgiparams{'REMOTE'})) { $errormessage = $Lang::tr{'invalid input for remote host/ip'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR; } else { if (&valid_dns_host($cgiparams{'REMOTE'})) { $warnmessage = "$Lang::tr{'check vpn lr'} $cgiparams{'REMOTE'}. $Lang::tr{'dns check failed'}"; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } } } } @@ -2658,6 +2693,10 @@ if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'TYPE'} ne 'host') { unless (&General::validipandmask($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'local subnet is invalid'}; + if ($cgiparams{'TYPE'} eq 'net') { + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } goto VPNCONF_ERROR;} } # Check if there is no other entry without IP-address and PSK @@ -2673,7 +2712,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) { $errormessage = $Lang::tr{'remote subnet is invalid'}; - goto VPNCONF_ERROR; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; } if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { @@ -3655,24 +3696,9 @@ END ### # m.a.d net2net -### - - my $cn; - my @match = (); - foreach my $line (@status) { - chomp($line); - if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { - @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); - if ($match[1] ne "Common Name") { - $cn = $match[1]; - } - $cn =~ s/[_]/ /g; - if ($cn eq "$confighash{$key}[2]") { - $active = "
$Lang::tr{'capsopen'}
"; - } - - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') { - +### + + if ($confighash{$key}[3] eq 'net') { my @tempovpnsubnet = split("\/",$confighash{$key}[27]); my @ovpnip = split /\./,$tempovpnsubnet[0]; my $pingip = ""; @@ -3691,6 +3717,22 @@ END $p->close(); } + + my $cn; + my @match = (); + foreach my $line (@status) { + chomp($line); + if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { + @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); + if ($match[1] ne "Common Name") { + $cn = $match[1]; + } + $cn =~ s/[_]/ /g; + if ($cn eq "$confighash{$key}[2]") { + $active = "
$Lang::tr{'capsopen'}
"; + } + + } } } From fc8c4295ac9e33fa73f1d83e3d7567702831e638 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 6 Sep 2011 12:39:26 +0200 Subject: [PATCH 144/159] finisch core52. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 45185ba5d..ee8d073af 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="52" # Core Level (Filename) -PAKFIRE_CORE="51" # Core Level (PAKFIRE) +PAKFIRE_CORE="52" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir From 667a22ed1c86cc969143c626cb9d85040370fd9b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 6 Sep 2011 12:44:45 +0200 Subject: [PATCH 145/159] core52: stop/start squid at update. --- config/rootfiles/core/52/update.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh index 1e2f61e7f..412299d60 100644 --- a/config/rootfiles/core/52/update.sh +++ b/config/rootfiles/core/52/update.sh @@ -34,6 +34,7 @@ done # #Stop services +/etc/init.d/squid stop /etc/init.d/apache stop # @@ -43,6 +44,7 @@ extract_files # #Start services /etc/init.d/apache start +/etc/init.d/squid start # #Update Language cache From 6d7da25360676a96fefbbf6d81886b1e456c4b01 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 7 Sep 2011 13:50:50 +0200 Subject: [PATCH 146/159] start core53. --- config/rootfiles/core/53/exclude | 2 + config/rootfiles/core/53/filelists/files | 1 + config/rootfiles/core/53/meta | 1 + config/rootfiles/core/53/update.sh | 63 ++++++++++++++++++++++++ make.sh | 2 +- 5 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/53/exclude create mode 100644 config/rootfiles/core/53/filelists/files create mode 100644 config/rootfiles/core/53/meta create mode 100644 config/rootfiles/core/53/update.sh diff --git a/config/rootfiles/core/53/exclude b/config/rootfiles/core/53/exclude new file mode 100644 index 000000000..bb0d8c84b --- /dev/null +++ b/config/rootfiles/core/53/exclude @@ -0,0 +1,2 @@ +srv/web/ipfire/html/proxy.pac +var/updatecache diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files new file mode 100644 index 000000000..0037af183 --- /dev/null +++ b/config/rootfiles/core/53/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/53/meta b/config/rootfiles/core/53/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/53/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh new file mode 100644 index 000000000..f13519a6f --- /dev/null +++ b/config/rootfiles/core/53/update.sh @@ -0,0 +1,63 @@ +#!/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) 2011 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=53 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/squid stop +/etc/init.d/apache stop + +# +#Extract files +extract_files + +# +#Start services +/etc/init.d/apache start +/etc/init.d/squid start + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.43-ipfire >/dev/null 2>&1 +#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index ee8d073af..82a671ae4 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="52" # Core Level (Filename) +CORE="53" # Core Level (Filename) PAKFIRE_CORE="52" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan From 8ba4babb91510aa5473929fc9aa28a4e271301cd Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 7 Sep 2011 14:09:53 +0200 Subject: [PATCH 147/159] openvpn-n2n: start/stop at connect/disconnect. --- config/rootfiles/core/next/filelists/files | 3 ++- src/initscripts/init.d/networking/red.down/10-ovpn | 1 + src/initscripts/init.d/networking/red.up/50-ovpn | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 9b3987969..1f432042d 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -4,7 +4,8 @@ etc/sysctl.conf etc/system-release etc/issue etc/iproute2/rt_tables -etc/rc.d/init.d/networking/red +etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.down/10-ovpn srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/outgoinggrp.cgi diff --git a/src/initscripts/init.d/networking/red.down/10-ovpn b/src/initscripts/init.d/networking/red.down/10-ovpn index 59e95addf..948d7b276 100644 --- a/src/initscripts/init.d/networking/red.down/10-ovpn +++ b/src/initscripts/init.d/networking/red.down/10-ovpn @@ -1,5 +1,6 @@ #!/bin/bash /usr/local/bin/openvpnctrl -k & +/usr/local/bin/openvpnctrl -kn2n & exit 0 diff --git a/src/initscripts/init.d/networking/red.up/50-ovpn b/src/initscripts/init.d/networking/red.up/50-ovpn index a53b9207c..f3db648bc 100644 --- a/src/initscripts/init.d/networking/red.up/50-ovpn +++ b/src/initscripts/init.d/networking/red.up/50-ovpn @@ -1,5 +1,6 @@ #!/bin/bash /usr/local/bin/openvpnctrl -s > /dev/null 2>&1 +/usr/local/bin/openvpnctrl -sn2n > /dev/null 2>&1 exit 0 From 18837a6a35f7b4d08aa12432f493f777c8713adb Mon Sep 17 00:00:00 2001 From: Alfred Haas Date: Wed, 7 Sep 2011 19:27:46 +0200 Subject: [PATCH 148/159] Updates :D --- html/cgi-bin/ovpnmain.cgi | 66 ++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 4409f77af..db2f2c1c3 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2549,7 +2549,8 @@ if ($confighash{$cgiparams{'KEY'}}) { } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); - if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { + + if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -3026,6 +3027,33 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[31] = $cgiparams{'MTU'}; # new fileds &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + +### +# m.a.d n2n begin +### + + if ($cgiparams{'TYPE'} eq 'net') { + + if (-e "/var/run/$confighash{$key}[1]n2n.pid") { + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + my $key = $cgiparams{'KEY'}; + if (! $key) { + $key = &General::findhasharraykey (\%confighash); + foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + } + $confighash{$key}[0] = 'on'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); + } + } + +### +# m.a.d n2n end +### + if ($cgiparams{'EDIT_ADVANCED'} eq 'on') { $cgiparams{'KEY'} = $key; $cgiparams{'ACTION'} = $Lang::tr{'advanced'}; @@ -3699,24 +3727,24 @@ END ### if ($confighash{$key}[3] eq 'net') { - my @tempovpnsubnet = split("\/",$confighash{$key}[27]); - my @ovpnip = split /\./,$tempovpnsubnet[0]; - my $pingip = ""; - - if ($confighash{$key}[6] eq 'server') { - $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2"; - } else { - $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].1"; - } - - my $p = Net::Ping->new("udp",1); - - if ($p->ping($pingip)) { - $active = "
$Lang::tr{'capsopen'}
"; - } - $p->close(); - - } +# my @tempovpnsubnet = split("\/",$confighash{$key}[27]); +# my @ovpnip = split /\./,$tempovpnsubnet[0]; +# my $pingip = ""; +# if ($confighash{$key}[6] eq 'server') { +# $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2"; +# } else { +# $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].1"; +# } +# my $p = Net::Ping->new("udp",1); +# if ($p->ping($pingip)) { +# $active = "
$Lang::tr{'capsopen'}
"; +# } +# $p->close(); + + if (-e "/var/run/$confighash{$key}[1]n2n.pid") { + $active = "
$Lang::tr{'capsopen'}
"; + } + } my $cn; my @match = (); From b5c30aea896de76accf63a06952809c957419658 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 7 Sep 2011 21:42:10 +0200 Subject: [PATCH 149/159] fix name of static-routes. --- config/rootfiles/core/next/filelists/files | 2 +- src/initscripts/init.d/network | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files index 1f432042d..d6eaea866 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,5 +1,5 @@ etc/rc.d/init.d/network -etc/rc.d/init.d/static-routing +etc/rc.d/init.d/static-routes etc/sysctl.conf etc/system-release etc/issue diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index c773b83c2..554221433 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -51,7 +51,7 @@ init_networking() { fi /etc/rc.d/init.d/dnsmasq start - /etc/rc.d/init.d/static-routing start + /etc/rc.d/init.d/static-routes start } DO="${1}" From e716d1983629fcedf6a79bdb571a28fe1acf1d86 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 8 Sep 2011 11:12:31 +0200 Subject: [PATCH 150/159] core-next: remove apache from updater. --- config/rootfiles/core/next/filelists/apache2 | 1 - 1 file changed, 1 deletion(-) delete mode 120000 config/rootfiles/core/next/filelists/apache2 diff --git a/config/rootfiles/core/next/filelists/apache2 b/config/rootfiles/core/next/filelists/apache2 deleted file mode 120000 index eef95efa7..000000000 --- a/config/rootfiles/core/next/filelists/apache2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/apache2 \ No newline at end of file From 1074ce9044bd51e021a7a0ffa5c720e8d5e278c8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 8 Sep 2011 11:21:17 +0200 Subject: [PATCH 151/159] jave: remove package. --- config/rootfiles/packages/java | 822 --------------------------------- lfs/java | 83 ---- make.sh | 1 - 3 files changed, 906 deletions(-) delete mode 100644 config/rootfiles/packages/java delete mode 100644 lfs/java diff --git a/config/rootfiles/packages/java b/config/rootfiles/packages/java deleted file mode 100644 index 2d4420763..000000000 --- a/config/rootfiles/packages/java +++ /dev/null @@ -1,822 +0,0 @@ -usr/bin/java -#usr/java -#usr/java/bin -usr/java/bin/ControlPanel -usr/java/bin/java -usr/java/bin/java_vm -usr/java/bin/javaws -#usr/java/bin/jcontrol -usr/java/bin/keytool -usr/java/bin/orbd -usr/java/bin/pack200 -usr/java/bin/policytool -usr/java/bin/rmid -usr/java/bin/rmiregistry -usr/java/bin/servertool -usr/java/bin/tnameserv -usr/java/bin/unpack200 -#usr/java/javaws -usr/java/javaws/javaws -#usr/java/lib -usr/java/lib/applet -usr/java/lib/audio -usr/java/lib/audio/soundbank.gm -usr/java/lib/calendars.properties -usr/java/lib/charsets.jar -usr/java/lib/classlist -usr/java/lib/cmm -usr/java/lib/cmm/CIEXYZ.pf -usr/java/lib/cmm/GRAY.pf -usr/java/lib/cmm/LINEAR_RGB.pf -usr/java/lib/cmm/PYCC.pf -usr/java/lib/cmm/sRGB.pf -usr/java/lib/content-types.properties -usr/java/lib/deploy -usr/java/lib/deploy.jar -usr/java/lib/deploy/ffjcext.zip -usr/java/lib/deploy/java-icon.ico -usr/java/lib/deploy/messages.properties -usr/java/lib/deploy/messages_de.properties -usr/java/lib/deploy/messages_es.properties -usr/java/lib/deploy/messages_fr.properties -usr/java/lib/deploy/messages_it.properties -usr/java/lib/deploy/messages_ja.properties -usr/java/lib/deploy/messages_ko.properties -usr/java/lib/deploy/messages_sv.properties -usr/java/lib/deploy/messages_zh_CN.properties -usr/java/lib/deploy/messages_zh_HK.properties -usr/java/lib/deploy/messages_zh_TW.properties -usr/java/lib/deploy/splash.gif -usr/java/lib/desktop -usr/java/lib/desktop/applications -usr/java/lib/desktop/applications/sun-java.desktop -usr/java/lib/desktop/applications/sun-javaws.desktop -usr/java/lib/desktop/applications/sun_java.desktop -usr/java/lib/desktop/icons -usr/java/lib/desktop/icons/HighContrast -usr/java/lib/desktop/icons/HighContrast/16x16 -usr/java/lib/desktop/icons/HighContrast/16x16/apps -usr/java/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png -usr/java/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png -usr/java/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/HighContrast/16x16/mimetypes -usr/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/HighContrast/48x48 -usr/java/lib/desktop/icons/HighContrast/48x48/apps -usr/java/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png -usr/java/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png -usr/java/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/HighContrast/48x48/mimetypes -usr/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/HighContrastInverse -usr/java/lib/desktop/icons/HighContrastInverse/16x16 -usr/java/lib/desktop/icons/HighContrastInverse/16x16/apps -usr/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png -usr/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png -usr/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes -usr/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/HighContrastInverse/48x48 -usr/java/lib/desktop/icons/HighContrastInverse/48x48/apps -usr/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png -usr/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png -usr/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes -usr/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/LowContrast -usr/java/lib/desktop/icons/LowContrast/16x16 -usr/java/lib/desktop/icons/LowContrast/16x16/apps -usr/java/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png -usr/java/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png -usr/java/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/LowContrast/16x16/mimetypes -usr/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/LowContrast/48x48 -usr/java/lib/desktop/icons/LowContrast/48x48/apps -usr/java/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png -usr/java/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png -usr/java/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/LowContrast/48x48/mimetypes -usr/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/hicolor -usr/java/lib/desktop/icons/hicolor/16x16 -usr/java/lib/desktop/icons/hicolor/16x16/apps -usr/java/lib/desktop/icons/hicolor/16x16/apps/sun-java.png -usr/java/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png -usr/java/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/hicolor/16x16/mimetypes -usr/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/icons/hicolor/48x48 -usr/java/lib/desktop/icons/hicolor/48x48/apps -usr/java/lib/desktop/icons/hicolor/48x48/apps/sun-java.png -usr/java/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png -usr/java/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png -usr/java/lib/desktop/icons/hicolor/48x48/mimetypes -usr/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png -usr/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png -usr/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png -usr/java/lib/desktop/mime -usr/java/lib/desktop/mime/packages -usr/java/lib/desktop/mime/packages/x-java-archive.xml -usr/java/lib/desktop/mime/packages/x-java-jnlp-file.xml -usr/java/lib/ext -usr/java/lib/ext/dnsns.jar -usr/java/lib/ext/localedata.jar -usr/java/lib/ext/meta-index -usr/java/lib/ext/sunjce_provider.jar -usr/java/lib/ext/sunpkcs11.jar -usr/java/lib/flavormap.properties -#usr/java/lib/fontconfig.RedHat.2.1.bfc -#usr/java/lib/fontconfig.RedHat.2.1.properties.src -#usr/java/lib/fontconfig.RedHat.3.bfc -#usr/java/lib/fontconfig.RedHat.3.properties.src -#usr/java/lib/fontconfig.RedHat.4.bfc -#usr/java/lib/fontconfig.RedHat.4.properties.src -#usr/java/lib/fontconfig.RedHat.bfc -#usr/java/lib/fontconfig.RedHat.properties.src -#usr/java/lib/fontconfig.SuSE.bfc -#usr/java/lib/fontconfig.SuSE.properties.src -#usr/java/lib/fontconfig.Sun.bfc -#usr/java/lib/fontconfig.Sun.properties.src -#usr/java/lib/fontconfig.Turbo.bfc -#usr/java/lib/fontconfig.Turbo.properties.src -#usr/java/lib/fontconfig.bfc -#usr/java/lib/fontconfig.properties.src -#usr/java/lib/fonts -#usr/java/lib/fonts/LucidaBrightDemiBold.ttf -#usr/java/lib/fonts/LucidaBrightDemiItalic.ttf -#usr/java/lib/fonts/LucidaBrightItalic.ttf -#usr/java/lib/fonts/LucidaBrightRegular.ttf -#usr/java/lib/fonts/LucidaSansDemiBold.ttf -#usr/java/lib/fonts/LucidaSansRegular.ttf -#usr/java/lib/fonts/LucidaTypewriterBold.ttf -#usr/java/lib/fonts/LucidaTypewriterRegular.ttf -#usr/java/lib/fonts/fonts.dir -#usr/java/lib/i386 -#usr/java/lib/i386/client -usr/java/lib/i386/client/Xusage.txt -usr/java/lib/i386/client/classes.jsa -usr/java/lib/i386/client/libjsig.so -usr/java/lib/i386/client/libjvm.so -#usr/java/lib/i386/headless -usr/java/lib/i386/headless/libmawt.so -usr/java/lib/i386/jli -usr/java/lib/i386/jli/libjli.so -usr/java/lib/i386/jvm.cfg -usr/java/lib/i386/libJdbcOdbc.so -usr/java/lib/i386/libawt.so -usr/java/lib/i386/libcmm.so -usr/java/lib/i386/libdcpr.so -usr/java/lib/i386/libdeploy.so -usr/java/lib/i386/libdt_socket.so -usr/java/lib/i386/libfontmanager.so -usr/java/lib/i386/libhprof.so -usr/java/lib/i386/libinstrument.so -usr/java/lib/i386/libioser12.so -usr/java/lib/i386/libj2gss.so -usr/java/lib/i386/libj2pcsc.so -usr/java/lib/i386/libj2pkcs11.so -usr/java/lib/i386/libjaas_unix.so -usr/java/lib/i386/libjava.so -usr/java/lib/i386/libjava_crw_demo.so -usr/java/lib/i386/libjavaplugin_jni.so -usr/java/lib/i386/libjavaplugin_nscp.so -usr/java/lib/i386/libjavaplugin_nscp_gcc29.so -usr/java/lib/i386/libjawt.so -usr/java/lib/i386/libjdwp.so -usr/java/lib/i386/libjpeg.so -usr/java/lib/i386/libjsig.so -usr/java/lib/i386/libjsound.so -usr/java/lib/i386/libjsoundalsa.so -usr/java/lib/i386/libmanagement.so -usr/java/lib/i386/libmlib_image.so -usr/java/lib/i386/libnative_chmod.so -usr/java/lib/i386/libnative_chmod_g.so -usr/java/lib/i386/libnet.so -usr/java/lib/i386/libnio.so -usr/java/lib/i386/libnpjp2.so -usr/java/lib/i386/libnpt.so -usr/java/lib/i386/librmi.so -usr/java/lib/i386/libsplashscreen.so -usr/java/lib/i386/libunpack.so -usr/java/lib/i386/libverify.so -usr/java/lib/i386/libzip.so -#usr/java/lib/i386/motif21 -#usr/java/lib/i386/motif21/libmawt.so -usr/java/lib/i386/native_threads -usr/java/lib/i386/native_threads/libhpi.so -#usr/java/lib/i386/server -usr/java/lib/i386/server/Xusage.txt -usr/java/lib/i386/server/libjsig.so -usr/java/lib/i386/server/libjvm.so -#usr/java/lib/i386/xawt -#usr/java/lib/i386/xawt/libmawt.so -usr/java/lib/im -usr/java/lib/im/indicim.jar -usr/java/lib/im/thaiim.jar -#usr/java/lib/images -#usr/java/lib/images/cursors -#usr/java/lib/images/cursors/cursors.properties -#usr/java/lib/images/cursors/invalid32x32.gif -#usr/java/lib/images/cursors/motif_CopyDrop32x32.gif -#usr/java/lib/images/cursors/motif_CopyNoDrop32x32.gif -#usr/java/lib/images/cursors/motif_LinkDrop32x32.gif -#usr/java/lib/images/cursors/motif_LinkNoDrop32x32.gif -#usr/java/lib/images/cursors/motif_MoveDrop32x32.gif -#usr/java/lib/images/cursors/motif_MoveNoDrop32x32.gif -#usr/java/lib/images/icons -#usr/java/lib/images/icons/sun-java.png -#usr/java/lib/images/icons/sun-java_HighContrast.png -#usr/java/lib/images/icons/sun-java_HighContrastInverse.png -#usr/java/lib/images/icons/sun-java_LowContrast.png -usr/java/lib/javaws.jar -usr/java/lib/jce.jar -usr/java/lib/jexec -usr/java/lib/jsse.jar -usr/java/lib/jvm.hprof.txt -#usr/java/lib/locale -#usr/java/lib/locale/de -#usr/java/lib/locale/de/LC_MESSAGES -#usr/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/es -#usr/java/lib/locale/es/LC_MESSAGES -#usr/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/fr -#usr/java/lib/locale/fr/LC_MESSAGES -#usr/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/it -#usr/java/lib/locale/it/LC_MESSAGES -#usr/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/ja -#usr/java/lib/locale/ja/LC_MESSAGES -#usr/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/ko -#usr/java/lib/locale/ko.UTF-8 -#usr/java/lib/locale/ko.UTF-8/LC_MESSAGES -#usr/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/ko/LC_MESSAGES -#usr/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/sv -#usr/java/lib/locale/sv/LC_MESSAGES -#usr/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/zh -#usr/java/lib/locale/zh.GBK -#usr/java/lib/locale/zh.GBK/LC_MESSAGES -#usr/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/zh/LC_MESSAGES -#usr/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/zh_HK.BIG5HK -#usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES -#usr/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/zh_TW -#usr/java/lib/locale/zh_TW.BIG5 -#usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES -#usr/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo -#usr/java/lib/locale/zh_TW/LC_MESSAGES -#usr/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo -usr/java/lib/logging.properties -usr/java/lib/management -usr/java/lib/management-agent.jar -#usr/java/lib/management/jmxremote.access -#usr/java/lib/management/jmxremote.password.template -#usr/java/lib/management/management.properties -#usr/java/lib/management/snmp.acl.template -usr/java/lib/meta-index -usr/java/lib/net.properties -#usr/java/lib/oblique-fonts -#usr/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf -#usr/java/lib/oblique-fonts/LucidaSansOblique.ttf -#usr/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf -#usr/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf -#usr/java/lib/oblique-fonts/fonts.dir -usr/java/lib/plugin.jar -#usr/java/lib/psfont.properties.ja -#usr/java/lib/psfontj2d.properties -usr/java/lib/resources.jar -usr/java/lib/rt.jar -usr/java/lib/security -usr/java/lib/security/US_export_policy.jar -usr/java/lib/security/cacerts -usr/java/lib/security/java.policy -usr/java/lib/security/java.security -usr/java/lib/security/javaws.policy -usr/java/lib/security/local_policy.jar -usr/java/lib/servicetag -usr/java/lib/servicetag/jdk_header.png -usr/java/lib/servicetag/registration.xml -#usr/java/lib/sound.properties -#usr/java/lib/zi -#usr/java/lib/zi/Africa -#usr/java/lib/zi/Africa/Abidjan -#usr/java/lib/zi/Africa/Accra -#usr/java/lib/zi/Africa/Addis_Ababa -#usr/java/lib/zi/Africa/Algiers -#usr/java/lib/zi/Africa/Asmara -#usr/java/lib/zi/Africa/Bamako -#usr/java/lib/zi/Africa/Bangui -#usr/java/lib/zi/Africa/Banjul -#usr/java/lib/zi/Africa/Bissau -#usr/java/lib/zi/Africa/Blantyre -#usr/java/lib/zi/Africa/Brazzaville -#usr/java/lib/zi/Africa/Bujumbura -#usr/java/lib/zi/Africa/Cairo -#usr/java/lib/zi/Africa/Casablanca -#usr/java/lib/zi/Africa/Ceuta -#usr/java/lib/zi/Africa/Conakry -#usr/java/lib/zi/Africa/Dakar -#usr/java/lib/zi/Africa/Dar_es_Salaam -#usr/java/lib/zi/Africa/Djibouti -#usr/java/lib/zi/Africa/Douala -#usr/java/lib/zi/Africa/El_Aaiun -#usr/java/lib/zi/Africa/Freetown -#usr/java/lib/zi/Africa/Gaborone -#usr/java/lib/zi/Africa/Harare -#usr/java/lib/zi/Africa/Johannesburg -#usr/java/lib/zi/Africa/Kampala -#usr/java/lib/zi/Africa/Khartoum -#usr/java/lib/zi/Africa/Kigali -#usr/java/lib/zi/Africa/Kinshasa -#usr/java/lib/zi/Africa/Lagos -#usr/java/lib/zi/Africa/Libreville -#usr/java/lib/zi/Africa/Lome -#usr/java/lib/zi/Africa/Luanda -#usr/java/lib/zi/Africa/Lubumbashi -#usr/java/lib/zi/Africa/Lusaka -#usr/java/lib/zi/Africa/Malabo -#usr/java/lib/zi/Africa/Maputo -#usr/java/lib/zi/Africa/Maseru -#usr/java/lib/zi/Africa/Mbabane -#usr/java/lib/zi/Africa/Mogadishu -#usr/java/lib/zi/Africa/Monrovia -#usr/java/lib/zi/Africa/Nairobi -#usr/java/lib/zi/Africa/Ndjamena -#usr/java/lib/zi/Africa/Niamey -#usr/java/lib/zi/Africa/Nouakchott -#usr/java/lib/zi/Africa/Ouagadougou -#usr/java/lib/zi/Africa/Porto-Novo -#usr/java/lib/zi/Africa/Sao_Tome -#usr/java/lib/zi/Africa/Tripoli -#usr/java/lib/zi/Africa/Tunis -#usr/java/lib/zi/Africa/Windhoek -#usr/java/lib/zi/America -#usr/java/lib/zi/America/Adak -#usr/java/lib/zi/America/Anchorage -#usr/java/lib/zi/America/Anguilla -#usr/java/lib/zi/America/Antigua -#usr/java/lib/zi/America/Araguaina -#usr/java/lib/zi/America/Argentina -#usr/java/lib/zi/America/Argentina/Buenos_Aires -#usr/java/lib/zi/America/Argentina/Catamarca -#usr/java/lib/zi/America/Argentina/Cordoba -#usr/java/lib/zi/America/Argentina/Jujuy -#usr/java/lib/zi/America/Argentina/La_Rioja -#usr/java/lib/zi/America/Argentina/Mendoza -#usr/java/lib/zi/America/Argentina/Rio_Gallegos -#usr/java/lib/zi/America/Argentina/Salta -#usr/java/lib/zi/America/Argentina/San_Juan -#usr/java/lib/zi/America/Argentina/San_Luis -#usr/java/lib/zi/America/Argentina/Tucuman -#usr/java/lib/zi/America/Argentina/Ushuaia -#usr/java/lib/zi/America/Aruba -#usr/java/lib/zi/America/Asuncion -#usr/java/lib/zi/America/Atikokan -#usr/java/lib/zi/America/Bahia -#usr/java/lib/zi/America/Barbados -#usr/java/lib/zi/America/Belem -#usr/java/lib/zi/America/Belize -#usr/java/lib/zi/America/Blanc-Sablon -#usr/java/lib/zi/America/Boa_Vista -#usr/java/lib/zi/America/Bogota -#usr/java/lib/zi/America/Boise -#usr/java/lib/zi/America/Cambridge_Bay -#usr/java/lib/zi/America/Campo_Grande -#usr/java/lib/zi/America/Cancun -#usr/java/lib/zi/America/Caracas -#usr/java/lib/zi/America/Cayenne -#usr/java/lib/zi/America/Cayman -#usr/java/lib/zi/America/Chicago -#usr/java/lib/zi/America/Chihuahua -#usr/java/lib/zi/America/Costa_Rica -#usr/java/lib/zi/America/Cuiaba -#usr/java/lib/zi/America/Curacao -#usr/java/lib/zi/America/Danmarkshavn -#usr/java/lib/zi/America/Dawson -#usr/java/lib/zi/America/Dawson_Creek -#usr/java/lib/zi/America/Denver -#usr/java/lib/zi/America/Detroit -#usr/java/lib/zi/America/Dominica -#usr/java/lib/zi/America/Edmonton -#usr/java/lib/zi/America/Eirunepe -#usr/java/lib/zi/America/El_Salvador -#usr/java/lib/zi/America/Fortaleza -#usr/java/lib/zi/America/Glace_Bay -#usr/java/lib/zi/America/Godthab -#usr/java/lib/zi/America/Goose_Bay -#usr/java/lib/zi/America/Grand_Turk -#usr/java/lib/zi/America/Grenada -#usr/java/lib/zi/America/Guadeloupe -#usr/java/lib/zi/America/Guatemala -#usr/java/lib/zi/America/Guayaquil -#usr/java/lib/zi/America/Guyana -#usr/java/lib/zi/America/Halifax -#usr/java/lib/zi/America/Havana -#usr/java/lib/zi/America/Hermosillo -#usr/java/lib/zi/America/Indiana -#usr/java/lib/zi/America/Indiana/Indianapolis -#usr/java/lib/zi/America/Indiana/Knox -#usr/java/lib/zi/America/Indiana/Marengo -#usr/java/lib/zi/America/Indiana/Petersburg -#usr/java/lib/zi/America/Indiana/Tell_City -#usr/java/lib/zi/America/Indiana/Vevay -#usr/java/lib/zi/America/Indiana/Vincennes -#usr/java/lib/zi/America/Indiana/Winamac -#usr/java/lib/zi/America/Inuvik -#usr/java/lib/zi/America/Iqaluit -#usr/java/lib/zi/America/Jamaica -#usr/java/lib/zi/America/Juneau -#usr/java/lib/zi/America/Kentucky -#usr/java/lib/zi/America/Kentucky/Louisville -#usr/java/lib/zi/America/Kentucky/Monticello -#usr/java/lib/zi/America/La_Paz -#usr/java/lib/zi/America/Lima -#usr/java/lib/zi/America/Los_Angeles -#usr/java/lib/zi/America/Maceio -#usr/java/lib/zi/America/Managua -#usr/java/lib/zi/America/Manaus -#usr/java/lib/zi/America/Martinique -#usr/java/lib/zi/America/Mazatlan -#usr/java/lib/zi/America/Menominee -#usr/java/lib/zi/America/Merida -#usr/java/lib/zi/America/Mexico_City -#usr/java/lib/zi/America/Miquelon -#usr/java/lib/zi/America/Moncton -#usr/java/lib/zi/America/Monterrey -#usr/java/lib/zi/America/Montevideo -#usr/java/lib/zi/America/Montreal -#usr/java/lib/zi/America/Montserrat -#usr/java/lib/zi/America/Nassau -#usr/java/lib/zi/America/New_York -#usr/java/lib/zi/America/Nipigon -#usr/java/lib/zi/America/Nome -#usr/java/lib/zi/America/Noronha -#usr/java/lib/zi/America/North_Dakota -#usr/java/lib/zi/America/North_Dakota/Center -#usr/java/lib/zi/America/North_Dakota/New_Salem -#usr/java/lib/zi/America/Panama -#usr/java/lib/zi/America/Pangnirtung -#usr/java/lib/zi/America/Paramaribo -#usr/java/lib/zi/America/Phoenix -#usr/java/lib/zi/America/Port-au-Prince -#usr/java/lib/zi/America/Port_of_Spain -#usr/java/lib/zi/America/Porto_Velho -#usr/java/lib/zi/America/Puerto_Rico -#usr/java/lib/zi/America/Rainy_River -#usr/java/lib/zi/America/Rankin_Inlet -#usr/java/lib/zi/America/Recife -#usr/java/lib/zi/America/Regina -#usr/java/lib/zi/America/Resolute -#usr/java/lib/zi/America/Rio_Branco -#usr/java/lib/zi/America/Santarem -#usr/java/lib/zi/America/Santiago -#usr/java/lib/zi/America/Santo_Domingo -#usr/java/lib/zi/America/Sao_Paulo -#usr/java/lib/zi/America/Scoresbysund -#usr/java/lib/zi/America/St_Johns -#usr/java/lib/zi/America/St_Kitts -#usr/java/lib/zi/America/St_Lucia -#usr/java/lib/zi/America/St_Thomas -#usr/java/lib/zi/America/St_Vincent -#usr/java/lib/zi/America/Swift_Current -#usr/java/lib/zi/America/Tegucigalpa -#usr/java/lib/zi/America/Thule -#usr/java/lib/zi/America/Thunder_Bay -#usr/java/lib/zi/America/Tijuana -#usr/java/lib/zi/America/Toronto -#usr/java/lib/zi/America/Tortola -#usr/java/lib/zi/America/Vancouver -#usr/java/lib/zi/America/Whitehorse -#usr/java/lib/zi/America/Winnipeg -#usr/java/lib/zi/America/Yakutat -#usr/java/lib/zi/America/Yellowknife -#usr/java/lib/zi/Antarctica -#usr/java/lib/zi/Antarctica/Casey -#usr/java/lib/zi/Antarctica/Davis -#usr/java/lib/zi/Antarctica/DumontDUrville -#usr/java/lib/zi/Antarctica/Mawson -#usr/java/lib/zi/Antarctica/McMurdo -#usr/java/lib/zi/Antarctica/Palmer -#usr/java/lib/zi/Antarctica/Rothera -#usr/java/lib/zi/Antarctica/Syowa -#usr/java/lib/zi/Antarctica/Vostok -#usr/java/lib/zi/Asia -#usr/java/lib/zi/Asia/Aden -#usr/java/lib/zi/Asia/Almaty -#usr/java/lib/zi/Asia/Amman -#usr/java/lib/zi/Asia/Anadyr -#usr/java/lib/zi/Asia/Aqtau -#usr/java/lib/zi/Asia/Aqtobe -#usr/java/lib/zi/Asia/Ashgabat -#usr/java/lib/zi/Asia/Baghdad -#usr/java/lib/zi/Asia/Bahrain -#usr/java/lib/zi/Asia/Baku -#usr/java/lib/zi/Asia/Bangkok -#usr/java/lib/zi/Asia/Beirut -#usr/java/lib/zi/Asia/Bishkek -#usr/java/lib/zi/Asia/Brunei -#usr/java/lib/zi/Asia/Choibalsan -#usr/java/lib/zi/Asia/Chongqing -#usr/java/lib/zi/Asia/Colombo -#usr/java/lib/zi/Asia/Damascus -#usr/java/lib/zi/Asia/Dhaka -#usr/java/lib/zi/Asia/Dili -#usr/java/lib/zi/Asia/Dubai -#usr/java/lib/zi/Asia/Dushanbe -#usr/java/lib/zi/Asia/Gaza -#usr/java/lib/zi/Asia/Harbin -#usr/java/lib/zi/Asia/Ho_Chi_Minh -#usr/java/lib/zi/Asia/Hong_Kong -#usr/java/lib/zi/Asia/Hovd -#usr/java/lib/zi/Asia/Irkutsk -#usr/java/lib/zi/Asia/Jakarta -#usr/java/lib/zi/Asia/Jayapura -#usr/java/lib/zi/Asia/Jerusalem -#usr/java/lib/zi/Asia/Kabul -#usr/java/lib/zi/Asia/Kamchatka -#usr/java/lib/zi/Asia/Karachi -#usr/java/lib/zi/Asia/Kashgar -#usr/java/lib/zi/Asia/Katmandu -#usr/java/lib/zi/Asia/Kolkata -#usr/java/lib/zi/Asia/Krasnoyarsk -#usr/java/lib/zi/Asia/Kuala_Lumpur -#usr/java/lib/zi/Asia/Kuching -#usr/java/lib/zi/Asia/Kuwait -#usr/java/lib/zi/Asia/Macau -#usr/java/lib/zi/Asia/Magadan -#usr/java/lib/zi/Asia/Makassar -#usr/java/lib/zi/Asia/Manila -#usr/java/lib/zi/Asia/Muscat -#usr/java/lib/zi/Asia/Nicosia -#usr/java/lib/zi/Asia/Novosibirsk -#usr/java/lib/zi/Asia/Omsk -#usr/java/lib/zi/Asia/Oral -#usr/java/lib/zi/Asia/Phnom_Penh -#usr/java/lib/zi/Asia/Pontianak -#usr/java/lib/zi/Asia/Pyongyang -#usr/java/lib/zi/Asia/Qatar -#usr/java/lib/zi/Asia/Qyzylorda -#usr/java/lib/zi/Asia/Rangoon -#usr/java/lib/zi/Asia/Riyadh -#usr/java/lib/zi/Asia/Riyadh87 -#usr/java/lib/zi/Asia/Riyadh88 -#usr/java/lib/zi/Asia/Riyadh89 -#usr/java/lib/zi/Asia/Sakhalin -#usr/java/lib/zi/Asia/Samarkand -#usr/java/lib/zi/Asia/Seoul -#usr/java/lib/zi/Asia/Shanghai -#usr/java/lib/zi/Asia/Singapore -#usr/java/lib/zi/Asia/Taipei -#usr/java/lib/zi/Asia/Tashkent -#usr/java/lib/zi/Asia/Tbilisi -#usr/java/lib/zi/Asia/Tehran -#usr/java/lib/zi/Asia/Thimphu -#usr/java/lib/zi/Asia/Tokyo -#usr/java/lib/zi/Asia/Ulaanbaatar -#usr/java/lib/zi/Asia/Urumqi -#usr/java/lib/zi/Asia/Vientiane -#usr/java/lib/zi/Asia/Vladivostok -#usr/java/lib/zi/Asia/Yakutsk -#usr/java/lib/zi/Asia/Yekaterinburg -#usr/java/lib/zi/Asia/Yerevan -#usr/java/lib/zi/Atlantic -#usr/java/lib/zi/Atlantic/Azores -#usr/java/lib/zi/Atlantic/Bermuda -#usr/java/lib/zi/Atlantic/Canary -#usr/java/lib/zi/Atlantic/Cape_Verde -#usr/java/lib/zi/Atlantic/Faroe -#usr/java/lib/zi/Atlantic/Madeira -#usr/java/lib/zi/Atlantic/Reykjavik -#usr/java/lib/zi/Atlantic/South_Georgia -#usr/java/lib/zi/Atlantic/St_Helena -#usr/java/lib/zi/Atlantic/Stanley -#usr/java/lib/zi/Australia -#usr/java/lib/zi/Australia/Adelaide -#usr/java/lib/zi/Australia/Brisbane -#usr/java/lib/zi/Australia/Broken_Hill -#usr/java/lib/zi/Australia/Currie -#usr/java/lib/zi/Australia/Darwin -#usr/java/lib/zi/Australia/Eucla -#usr/java/lib/zi/Australia/Hobart -#usr/java/lib/zi/Australia/Lindeman -#usr/java/lib/zi/Australia/Lord_Howe -#usr/java/lib/zi/Australia/Melbourne -#usr/java/lib/zi/Australia/Perth -#usr/java/lib/zi/Australia/Sydney -#usr/java/lib/zi/CET -#usr/java/lib/zi/CST6CDT -#usr/java/lib/zi/EET -#usr/java/lib/zi/EST -#usr/java/lib/zi/EST5EDT -#usr/java/lib/zi/Etc -#usr/java/lib/zi/Etc/GMT -#usr/java/lib/zi/Etc/GMT+1 -#usr/java/lib/zi/Etc/GMT+10 -#usr/java/lib/zi/Etc/GMT+11 -#usr/java/lib/zi/Etc/GMT+12 -#usr/java/lib/zi/Etc/GMT+2 -#usr/java/lib/zi/Etc/GMT+3 -#usr/java/lib/zi/Etc/GMT+4 -#usr/java/lib/zi/Etc/GMT+5 -#usr/java/lib/zi/Etc/GMT+6 -#usr/java/lib/zi/Etc/GMT+7 -#usr/java/lib/zi/Etc/GMT+8 -#usr/java/lib/zi/Etc/GMT+9 -#usr/java/lib/zi/Etc/GMT-1 -#usr/java/lib/zi/Etc/GMT-10 -#usr/java/lib/zi/Etc/GMT-11 -#usr/java/lib/zi/Etc/GMT-12 -#usr/java/lib/zi/Etc/GMT-13 -#usr/java/lib/zi/Etc/GMT-14 -#usr/java/lib/zi/Etc/GMT-2 -#usr/java/lib/zi/Etc/GMT-3 -#usr/java/lib/zi/Etc/GMT-4 -#usr/java/lib/zi/Etc/GMT-5 -#usr/java/lib/zi/Etc/GMT-6 -#usr/java/lib/zi/Etc/GMT-7 -#usr/java/lib/zi/Etc/GMT-8 -#usr/java/lib/zi/Etc/GMT-9 -#usr/java/lib/zi/Etc/UCT -#usr/java/lib/zi/Etc/UTC -#usr/java/lib/zi/Europe -#usr/java/lib/zi/Europe/Amsterdam -#usr/java/lib/zi/Europe/Andorra -#usr/java/lib/zi/Europe/Athens -#usr/java/lib/zi/Europe/Belgrade -#usr/java/lib/zi/Europe/Berlin -#usr/java/lib/zi/Europe/Brussels -#usr/java/lib/zi/Europe/Bucharest -#usr/java/lib/zi/Europe/Budapest -#usr/java/lib/zi/Europe/Chisinau -#usr/java/lib/zi/Europe/Copenhagen -#usr/java/lib/zi/Europe/Dublin -#usr/java/lib/zi/Europe/Gibraltar -#usr/java/lib/zi/Europe/Helsinki -#usr/java/lib/zi/Europe/Istanbul -#usr/java/lib/zi/Europe/Kaliningrad -#usr/java/lib/zi/Europe/Kiev -#usr/java/lib/zi/Europe/Lisbon -#usr/java/lib/zi/Europe/London -#usr/java/lib/zi/Europe/Luxembourg -#usr/java/lib/zi/Europe/Madrid -#usr/java/lib/zi/Europe/Malta -#usr/java/lib/zi/Europe/Minsk -#usr/java/lib/zi/Europe/Monaco -#usr/java/lib/zi/Europe/Moscow -#usr/java/lib/zi/Europe/Oslo -#usr/java/lib/zi/Europe/Paris -#usr/java/lib/zi/Europe/Prague -#usr/java/lib/zi/Europe/Riga -#usr/java/lib/zi/Europe/Rome -#usr/java/lib/zi/Europe/Samara -#usr/java/lib/zi/Europe/Simferopol -#usr/java/lib/zi/Europe/Sofia -#usr/java/lib/zi/Europe/Stockholm -#usr/java/lib/zi/Europe/Tallinn -#usr/java/lib/zi/Europe/Tirane -#usr/java/lib/zi/Europe/Uzhgorod -#usr/java/lib/zi/Europe/Vaduz -#usr/java/lib/zi/Europe/Vienna -#usr/java/lib/zi/Europe/Vilnius -#usr/java/lib/zi/Europe/Volgograd -#usr/java/lib/zi/Europe/Warsaw -#usr/java/lib/zi/Europe/Zaporozhye -#usr/java/lib/zi/Europe/Zurich -#usr/java/lib/zi/GMT -#usr/java/lib/zi/HST -#usr/java/lib/zi/Indian -#usr/java/lib/zi/Indian/Antananarivo -#usr/java/lib/zi/Indian/Chagos -#usr/java/lib/zi/Indian/Christmas -#usr/java/lib/zi/Indian/Cocos -#usr/java/lib/zi/Indian/Comoro -#usr/java/lib/zi/Indian/Kerguelen -#usr/java/lib/zi/Indian/Mahe -#usr/java/lib/zi/Indian/Maldives -#usr/java/lib/zi/Indian/Mauritius -#usr/java/lib/zi/Indian/Mayotte -#usr/java/lib/zi/Indian/Reunion -#usr/java/lib/zi/MET -#usr/java/lib/zi/MST -#usr/java/lib/zi/MST7MDT -#usr/java/lib/zi/PST8PDT -#usr/java/lib/zi/Pacific -#usr/java/lib/zi/Pacific/Apia -#usr/java/lib/zi/Pacific/Auckland -#usr/java/lib/zi/Pacific/Chatham -#usr/java/lib/zi/Pacific/Easter -#usr/java/lib/zi/Pacific/Efate -#usr/java/lib/zi/Pacific/Enderbury -#usr/java/lib/zi/Pacific/Fakaofo -#usr/java/lib/zi/Pacific/Fiji -#usr/java/lib/zi/Pacific/Funafuti -#usr/java/lib/zi/Pacific/Galapagos -#usr/java/lib/zi/Pacific/Gambier -#usr/java/lib/zi/Pacific/Guadalcanal -#usr/java/lib/zi/Pacific/Guam -#usr/java/lib/zi/Pacific/Honolulu -#usr/java/lib/zi/Pacific/Johnston -#usr/java/lib/zi/Pacific/Kiritimati -#usr/java/lib/zi/Pacific/Kosrae -#usr/java/lib/zi/Pacific/Kwajalein -#usr/java/lib/zi/Pacific/Majuro -#usr/java/lib/zi/Pacific/Marquesas -#usr/java/lib/zi/Pacific/Midway -#usr/java/lib/zi/Pacific/Nauru -#usr/java/lib/zi/Pacific/Niue -#usr/java/lib/zi/Pacific/Norfolk -#usr/java/lib/zi/Pacific/Noumea -#usr/java/lib/zi/Pacific/Pago_Pago -#usr/java/lib/zi/Pacific/Palau -#usr/java/lib/zi/Pacific/Pitcairn -#usr/java/lib/zi/Pacific/Ponape -#usr/java/lib/zi/Pacific/Port_Moresby -#usr/java/lib/zi/Pacific/Rarotonga -#usr/java/lib/zi/Pacific/Saipan -#usr/java/lib/zi/Pacific/Tahiti -#usr/java/lib/zi/Pacific/Tarawa -#usr/java/lib/zi/Pacific/Tongatapu -#usr/java/lib/zi/Pacific/Truk -#usr/java/lib/zi/Pacific/Wake -#usr/java/lib/zi/Pacific/Wallis -#usr/java/lib/zi/SystemV -#usr/java/lib/zi/SystemV/AST4 -#usr/java/lib/zi/SystemV/AST4ADT -#usr/java/lib/zi/SystemV/CST6 -#usr/java/lib/zi/SystemV/CST6CDT -#usr/java/lib/zi/SystemV/EST5 -#usr/java/lib/zi/SystemV/EST5EDT -#usr/java/lib/zi/SystemV/HST10 -#usr/java/lib/zi/SystemV/MST7 -#usr/java/lib/zi/SystemV/MST7MDT -#usr/java/lib/zi/SystemV/PST8 -#usr/java/lib/zi/SystemV/PST8PDT -#usr/java/lib/zi/SystemV/YST9 -#usr/java/lib/zi/SystemV/YST9YDT -#usr/java/lib/zi/WET -#usr/java/lib/zi/ZoneInfoMappings -#usr/java/licenses -#usr/java/licenses/COPYRIGHT -#usr/java/licenses/LICENSE -#usr/java/licenses/README -#usr/java/licenses/THIRDPARTYLICENSEREADME.txt -#usr/java/licenses/Welcome.html -#usr/java/man -#usr/java/man/ja -#usr/java/man/ja_JP.eucJP -#usr/java/man/ja_JP.eucJP/man1 -#usr/java/man/ja_JP.eucJP/man1/java.1 -#usr/java/man/ja_JP.eucJP/man1/javaws.1 -#usr/java/man/ja_JP.eucJP/man1/keytool.1 -#usr/java/man/ja_JP.eucJP/man1/orbd.1 -#usr/java/man/ja_JP.eucJP/man1/pack200.1 -#usr/java/man/ja_JP.eucJP/man1/policytool.1 -#usr/java/man/ja_JP.eucJP/man1/rmid.1 -#usr/java/man/ja_JP.eucJP/man1/rmiregistry.1 -#usr/java/man/ja_JP.eucJP/man1/servertool.1 -#usr/java/man/ja_JP.eucJP/man1/tnameserv.1 -#usr/java/man/ja_JP.eucJP/man1/unpack200.1 -#usr/java/man/man1 -#usr/java/man/man1/java.1 -#usr/java/man/man1/javaws.1 -#usr/java/man/man1/keytool.1 -#usr/java/man/man1/orbd.1 -#usr/java/man/man1/pack200.1 -#usr/java/man/man1/policytool.1 -#usr/java/man/man1/rmid.1 -#usr/java/man/man1/rmiregistry.1 -#usr/java/man/man1/servertool.1 -#usr/java/man/man1/tnameserv.1 -#usr/java/man/man1/unpack200.1 -#usr/java/plugin -#usr/java/plugin/desktop -#usr/java/plugin/desktop/sun_java.desktop -#usr/java/plugin/desktop/sun_java.png -#usr/java/plugin/i386 -#usr/java/plugin/i386/ns7 -#usr/java/plugin/i386/ns7-gcc29 -#usr/java/plugin/i386/ns7-gcc29/libjavaplugin_oji.so -#usr/java/plugin/i386/ns7/libjavaplugin_oji.so -usr/java/version diff --git a/lfs/java b/lfs/java deleted file mode 100644 index 7c8d83484..000000000 --- a/lfs/java +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.6.0_12 - -THISAPP = java-$(VER)-for-ipfire -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = java -PAK_VER = 2 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 260b644b3b9f5c4ddba09444db45e19e - -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) -C /usr - ln -s /usr/java/bin/java /usr/bin/java - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index c986ec80e..0abbc6ac6 100755 --- a/make.sh +++ b/make.sh @@ -537,7 +537,6 @@ buildipfire() { ipfiremake wireless ipfiremake libsafe ipfiremake pakfire - ipfiremake java ipfiremake spandsp ipfiremake lzo ipfiremake openvpn From 107d282894cbec55ed91126fc9a7314c26ff883b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 8 Sep 2011 14:31:56 +0200 Subject: [PATCH 152/159] coreutils: hack uname for build on hosts with linux kernel 3.x. --- lfs/coreutils | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lfs/coreutils b/lfs/coreutils index 9b6ddc7c4..5e97941d2 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -105,14 +105,16 @@ ifeq "$(ROOT)" "" #ln -sf ../../bin/install /usr/bin mv -f /bin/uname /bin/uname.bak echo '#!/bin/bash' > /bin/uname - echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname + echo 'kernel=`/bin/uname.bak -r`' >> /bin/uname + echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /bin/uname chmod 755 /bin/uname dircolors -p > /etc/dircolors else rm /tools/bin/hostname mv -f /tools/bin/uname /tools/bin/uname.bak echo '#!/bin/bash' > /tools/bin/uname - echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /tools/bin/uname + echo 'kernel=`/tools/uname.bak -r`' >> /bin/uname + echo '/tools/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /bin/uname chmod 755 /tools/bin/uname endif @rm -rf $(DIR_APP) From d06da205068f4261fd6d5864ec4eb38c6fcee034 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 8 Sep 2011 17:35:32 +0200 Subject: [PATCH 153/159] usb-modeswitch-data: don't reload udev rules while build. --- lfs/usb_modeswitch_data | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 9afafada1..486aa2d8d 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + # don't reload udev rules + cd $(DIR_APP) && sed -i -e "s|/issue|&-off|g" Makefile cd $(DIR_APP) && make clean cd $(DIR_APP) && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install From 1092a072fe30ed11535b0f2b2e29b8b0b9fdf541 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 8 Sep 2011 20:22:23 +0200 Subject: [PATCH 154/159] core-next: exclude ovpn config. --- config/rootfiles/core/next/exclude | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude index 6bfbbf791..e5f677379 100644 --- a/config/rootfiles/core/next/exclude +++ b/config/rootfiles/core/next/exclude @@ -5,3 +5,4 @@ etc/ipsec.user.conf etc/ipsec.user.secrets var/updatecache etc/localtime +var/ipfire/ovpn From 3529923589dbf8824543920f27fc901fcbab67c4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 11 Sep 2011 09:25:16 +0200 Subject: [PATCH 155/159] toolchain: cpu-type fixes. --- lfs/bash | 2 ++ lfs/binutils | 2 ++ lfs/cleanup-toolchain | 22 +++++++++++----------- lfs/coreutils | 8 +++++--- lfs/gcc | 4 ++-- lfs/glibc | 4 ++-- lfs/ncurses | 2 ++ make.sh | 19 ++++++++++--------- 8 files changed, 36 insertions(+), 27 deletions(-) diff --git a/lfs/bash b/lfs/bash index 976d42517..afdb511f1 100644 --- a/lfs/bash +++ b/lfs/bash @@ -48,6 +48,8 @@ else EXTRA_INSTALL = endif +EXTRA_CONFIG += --build=$(BUILDTARGET) + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/binutils b/lfs/binutils index ab28c7978..b6b2c19b5 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -52,6 +52,8 @@ else endif endif +EXTRA_CONFIG += --build=$(BUILDTARGET) + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain index bc6930c9e..cc66a2d2f 100644 --- a/lfs/cleanup-toolchain +++ b/lfs/cleanup-toolchain @@ -51,14 +51,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) ifeq "$(PASS)" "1" mv -v /tools/bin/{ld,ld-old} - mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old} + mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old} cp -v /tools/bin/{ld-new,ld} - ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld - gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs - sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs > tempspecfile - mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs - find /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; - rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/*` + ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld + gcc -dumpspecs > /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs + sed 's@^/lib/ld-linux.so@/tools&@g' /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs > tempspecfile + mv -vf tempspecfile /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs + find /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; + rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/*` endif ifeq "$(PASS)" "2" -strip --strip-debug /tools/lib/* @@ -68,12 +68,12 @@ ifeq "$(PASS)" "2" endif ifeq "$(PASS)" "3" mv -v /tools/bin/{ld,ld-old} - mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old} + mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old} mv -v /tools/bin/{ld-new,ld} - ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld + ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld gcc -dumpspecs | \ - perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \ + perl -p -e 's@/tools/lib/ld-linux.so@/lib/ld-linux.so@g;' \ -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \ - /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs + /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs endif @$(POSTBUILD) diff --git a/lfs/coreutils b/lfs/coreutils index 5e97941d2..71282333a 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -40,11 +40,13 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls --host=$(MACHINE) + EXTRA_CONFIG = --prefix=/tools --disable-nls EXTRA_MAKE = EXTRA_INSTALL = endif +EXTRA_CONFIG += --build=$(BUILDTARGET) + ############################################################################### # Top-level Rules ############################################################################### @@ -113,8 +115,8 @@ else rm /tools/bin/hostname mv -f /tools/bin/uname /tools/bin/uname.bak echo '#!/bin/bash' > /tools/bin/uname - echo 'kernel=`/tools/uname.bak -r`' >> /bin/uname - echo '/tools/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /bin/uname + echo 'kernel=`/tools/bin/uname.bak -r`' >> /tools/bin/uname + echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /tools/bin/uname chmod 755 /tools/bin/uname endif @rm -rf $(DIR_APP) diff --git a/lfs/gcc b/lfs/gcc index af87e2116..95cc681c8 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -30,8 +30,6 @@ THISAPP = gcc-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -CFLAGS = -CXXFLAGS = # Normal build or /tools build. # @@ -73,6 +71,8 @@ else endif endif +EXTRA_CONFIG += --build=$(BUILDTARGET) --host=$(BUILDTARGET) --target=$(BUILDTARGET) + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/glibc b/lfs/glibc index c540b98fa..a81419a67 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -30,8 +30,6 @@ THISAPP = glibc-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -CFLAGS = -CXXFLAGS = # Normal build or /tools build. # @@ -53,6 +51,8 @@ else EXTRA_INSTALL = endif +EXTRA_CONFIG += --build=$(BUILDTARGET) + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/ncurses b/lfs/ncurses index 3c7be4d0e..0b7bbb786 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -48,6 +48,8 @@ else EXTRA_INSTALL = endif +EXTRA_CONFIG += --build=$(BUILDTARGET) + ############################################################################### # Top-level Rules ############################################################################### diff --git a/make.sh b/make.sh index 0abbc6ac6..99fc86f49 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.10" # Version number +VERSION="2.11" # Version number CORE="53" # Core Level (Filename) PAKFIRE_CORE="52" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch @@ -278,6 +278,7 @@ buildtoolchain() { lfsmake1 tar lfsmake1 texinfo lfsmake1 util-linux + lfsmake1 strip lfsmake1 cleanup-toolchain PASS=2 export PATH=$ORG_PATH } @@ -821,7 +822,7 @@ ipfirepackages() { case "$1" in build) clear - PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1` + PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz 2> /dev/null | head -n 1` #only restore on a clean disk if [ ! -f log/cleanup-toolchain-2-tools ]; then if [ ! -n "$PACKAGE" ]; then @@ -951,27 +952,27 @@ toolchain) prepareenv beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`" buildtoolchain - echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains - cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \ + cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \ build/{bin,etc,usr/bin,usr/local} \ build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \ log >> $LOGFILE - md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \ - > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.md5 + md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \ + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5 stdumount ;; gettoolchain) # arbitrary name to be updated in case of new toolchain package upload - PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE + PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'` test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains - echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $MACHINE" | tee -a $LOGFILE cd $BASEDIR/cache/toolchains wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null if [ $? -ne 0 ]; then - echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $MACHINE machine" | tee -a $LOGFILE else if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE From b0dcbdeae448d3fc852c9ee9a4e5e6b9ab75fd34 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 11 Sep 2011 16:06:52 +0200 Subject: [PATCH 156/159] core53: next is core53 now. set version in backupiso and pakfire to 2.11. --- config/rootfiles/core/53/exclude | 7 ++ .../{next => 53}/filelists/compat-wireless | 0 config/rootfiles/core/53/filelists/files | 26 ++++ .../rootfiles/core/{next => 53}/filelists/gcc | 0 .../core/{next => 53}/filelists/glibc | 0 .../rootfiles/core/{next => 53}/filelists/gmp | 0 .../core/{next => 53}/filelists/openvpn | 0 .../core/{next => 53}/filelists/strongswan | 0 .../{next => 53}/filelists/usb_modeswitch | 0 .../filelists/usb_modeswitch_data | 0 config/rootfiles/core/53/update.sh | 64 ++++++++-- config/rootfiles/core/next/exclude | 8 -- config/rootfiles/core/next/filelists/files | 26 ---- config/rootfiles/core/next/meta | 1 - config/rootfiles/core/next/update.sh | 116 ------------------ lfs/xen-image | 4 - src/pakfire/pakfire.conf | 4 +- src/scripts/backupiso | 4 +- 18 files changed, 93 insertions(+), 167 deletions(-) rename config/rootfiles/core/{next => 53}/filelists/compat-wireless (100%) rename config/rootfiles/core/{next => 53}/filelists/gcc (100%) rename config/rootfiles/core/{next => 53}/filelists/glibc (100%) rename config/rootfiles/core/{next => 53}/filelists/gmp (100%) rename config/rootfiles/core/{next => 53}/filelists/openvpn (100%) rename config/rootfiles/core/{next => 53}/filelists/strongswan (100%) rename config/rootfiles/core/{next => 53}/filelists/usb_modeswitch (100%) rename config/rootfiles/core/{next => 53}/filelists/usb_modeswitch_data (100%) delete mode 100644 config/rootfiles/core/next/exclude delete mode 100644 config/rootfiles/core/next/filelists/files delete mode 100644 config/rootfiles/core/next/meta delete mode 100644 config/rootfiles/core/next/update.sh diff --git a/config/rootfiles/core/53/exclude b/config/rootfiles/core/53/exclude index bb0d8c84b..ca3adf5c0 100644 --- a/config/rootfiles/core/53/exclude +++ b/config/rootfiles/core/53/exclude @@ -1,2 +1,9 @@ srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets var/updatecache +etc/localtime +var/ipfire/ovpn diff --git a/config/rootfiles/core/next/filelists/compat-wireless b/config/rootfiles/core/53/filelists/compat-wireless similarity index 100% rename from config/rootfiles/core/next/filelists/compat-wireless rename to config/rootfiles/core/53/filelists/compat-wireless diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files index 0037af183..cdd78c2c1 100644 --- a/config/rootfiles/core/53/filelists/files +++ b/config/rootfiles/core/53/filelists/files @@ -1 +1,27 @@ +etc/rc.d/init.d/network +etc/rc.d/init.d/static-routes +etc/sysctl.conf etc/system-release +etc/issue +etc/iproute2/rt_tables +etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.down/10-ovpn +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/outgoinggrp.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl +var/ipfire/langs/pl.pl +usr/local/bin/ipsecctrl +usr/local/bin/openvpnctrl +usr/local/bin/vpn-watch +usr/local/bin/rebuildroutes +var/ipfire/main/routing +var/ipfire/menu.d/30-network.menu +opt/pakfire/etc/pakfire.conf diff --git a/config/rootfiles/core/next/filelists/gcc b/config/rootfiles/core/53/filelists/gcc similarity index 100% rename from config/rootfiles/core/next/filelists/gcc rename to config/rootfiles/core/53/filelists/gcc diff --git a/config/rootfiles/core/next/filelists/glibc b/config/rootfiles/core/53/filelists/glibc similarity index 100% rename from config/rootfiles/core/next/filelists/glibc rename to config/rootfiles/core/53/filelists/glibc diff --git a/config/rootfiles/core/next/filelists/gmp b/config/rootfiles/core/53/filelists/gmp similarity index 100% rename from config/rootfiles/core/next/filelists/gmp rename to config/rootfiles/core/53/filelists/gmp diff --git a/config/rootfiles/core/next/filelists/openvpn b/config/rootfiles/core/53/filelists/openvpn similarity index 100% rename from config/rootfiles/core/next/filelists/openvpn rename to config/rootfiles/core/53/filelists/openvpn diff --git a/config/rootfiles/core/next/filelists/strongswan b/config/rootfiles/core/53/filelists/strongswan similarity index 100% rename from config/rootfiles/core/next/filelists/strongswan rename to config/rootfiles/core/53/filelists/strongswan diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch b/config/rootfiles/core/53/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/next/filelists/usb_modeswitch rename to config/rootfiles/core/53/filelists/usb_modeswitch diff --git a/config/rootfiles/core/next/filelists/usb_modeswitch_data b/config/rootfiles/core/53/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/next/filelists/usb_modeswitch_data rename to config/rootfiles/core/53/filelists/usb_modeswitch_data diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh index f13519a6f..10b45b98e 100644 --- a/config/rootfiles/core/53/update.sh +++ b/config/rootfiles/core/53/update.sh @@ -26,7 +26,7 @@ # # Remove old core updates from pakfire cache to save space... -core=53 +core=52 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -34,26 +34,74 @@ done # #Stop services -/etc/init.d/squid stop -/etc/init.d/apache stop + +/etc/init.d/ipsec stop + +# +# Remove old strongswan libs +rm -rf /usr/lib/libcharon.so +rm -rf /usr/lib/libcharon.so.0 +rm -rf /usr/lib/libcharon.so.0.0.0 +rm -rf /usr/lib/libhydra.so +rm -rf /usr/lib/libhydra.so.0 +rm -rf /usr/lib/libhydra.so.0.0.0 +rm -rf /usr/lib/libstrongswan.so +rm -rf /usr/lib/libstrongswan.so.0 +rm -rf /usr/lib/libstrongswan.so.0.0.0 +rm -rf /usr/libexec/ipsec/plugins + +# Remove old usb_modeswitch_data +rm -rf /etc/usb_modeswitch.d # #Extract files extract_files +# +#Replace now unsupported EU regdomain by a "DE" comment. +sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \ + /etc/modprobe.d/cfg80211 + # #Start services -/etc/init.d/apache start -/etc/init.d/squid start + +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's -#depmod 2.6.32.43-ipfire >/dev/null 2>&1 -#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1 -#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1 +depmod 2.6.32.45-ipfire >/dev/null 2>&1 +depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 +depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 + +# +# 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 'sync && sync && sync' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-53 " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update + +# +chmod +x /tmp/pak_update +/tmp/pak_update & +echo +echo Please wait until pakfire has ended... +echo # #Finish diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude deleted file mode 100644 index e5f677379..000000000 --- a/config/rootfiles/core/next/exclude +++ /dev/null @@ -1,8 +0,0 @@ -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files deleted file mode 100644 index d6eaea866..000000000 --- a/config/rootfiles/core/next/filelists/files +++ /dev/null @@ -1,26 +0,0 @@ -etc/rc.d/init.d/network -etc/rc.d/init.d/static-routes -etc/sysctl.conf -etc/system-release -etc/issue -etc/iproute2/rt_tables -etc/rc.d/init.d/networking/red.up/50-ovpn -etc/rc.d/init.d/networking/red.down/10-ovpn -srv/web/ipfire/cgi-bin/extrahd.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/outgoinggrp.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/pakfire.cgi -srv/web/ipfire/cgi-bin/routing.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl -var/ipfire/langs/pl.pl -usr/local/bin/ipsecctrl -usr/local/bin/openvpnctrl -usr/local/bin/vpn-watch -usr/local/bin/rebuildroutes -var/ipfire/main/routing -var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/core/next/meta b/config/rootfiles/core/next/meta deleted file mode 100644 index d547fa86f..000000000 --- a/config/rootfiles/core/next/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh deleted file mode 100644 index ff6409bd6..000000000 --- a/config/rootfiles/core/next/update.sh +++ /dev/null @@ -1,116 +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) 2011 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# -# Remove old core updates from pakfire cache to save space... -core=52 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services - -/etc/init.d/ipsec stop - -# -# Remove old strongswan libs -rm -rf /usr/lib/libcharon.so -rm -rf /usr/lib/libcharon.so.0 -rm -rf /usr/lib/libcharon.so.0.0.0 -rm -rf /usr/lib/libhydra.so -rm -rf /usr/lib/libhydra.so.0 -rm -rf /usr/lib/libhydra.so.0.0.0 -rm -rf /usr/lib/libstrongswan.so -rm -rf /usr/lib/libstrongswan.so.0 -rm -rf /usr/lib/libstrongswan.so.0.0.0 -rm -rf /usr/libexec/ipsec/plugins - -# Remove old usb_modeswitch_data -rm -rf /etc/usb_modeswitch.d - -# -#Extract files -extract_files - -# -#Replace now unsupported EU regdomain by a "DE" comment. -sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_regdom=DE|g" \ - /etc/modprobe.d/cfg80211 - -# -#Start services - -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -depmod 2.6.32.45-ipfire >/dev/null 2>&1 -depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 -depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 - -## Change version of Pakfire.conf -## -#OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` -#NEWVERSION="2.9" -#sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf -## -## After pakfire has ended run it again and update the lists and do upgrade -## -#echo '#!/bin/bash' > /tmp/pak_update -#echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -#echo ' sleep 1' >> /tmp/pak_update -#echo 'done' >> /tmp/pak_update -#echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -#echo ' sleep 1' >> /tmp/pak_update -#echo 'done' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Check it before reboot !!!"' >> /tmp/pak_update -#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 " *** Please reboot... *** "' >> /tmp/pak_update -#echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -#chmod +x /tmp/pak_update -#/tmp/pak_update & -#echo -#echo Please wait until pakfire has ended... -#echo - -# -#Finish -/etc/init.d/fireinfo start -sendprofile -#Don't report the exitcode last command -exit 0 diff --git a/lfs/xen-image b/lfs/xen-image index caef9725f..1b123a72d 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -155,10 +155,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e "s|^thermal|#thermal|g" $(MNThdd)/etc/sysconfig/modules sed -i -e "s|^video|#video|g" $(MNThdd)/etc/sysconfig/modules - #Change pakfire trunk - sed -i -e "s|$(VERSION)|$(VERSION)-xen|g" \ - $(MNThdd)/opt/pakfire/etc/pakfire.conf - #Copy initramdisk, kernel and config #cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \ # /install/images/$(SNAME)/boot diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index ae174af98..7e7b8d59b 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -21,7 +21,7 @@ package Conf; -$version = "2.9"; +$version = "2.11"; $mainserver = "pakfire.ipfire.org"; diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 426c1e45f..6bea85578 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -2,8 +2,8 @@ COREVER=`cat /opt/pakfire/db/core/mine` # FIXME: edit this lines before release -URL=http://download.ipfire.org/releases/ipfire-2.x/2.9-core$COREVER/ -ISO=ipfire-2.9.i586-full-core$COREVER.iso +URL=http://download.ipfire.org/releases/ipfire-2.x/2.11-core$COREVER/ +ISO=ipfire-2.11.i586-full-core$COREVER.iso if [ -z "$1" ]; then echo usage: $0 backup-file From 60f396d77d0d67b37e43ba622611a8f90633567f Mon Sep 17 00:00:00 2001 From: Alfred Haas Date: Mon, 12 Sep 2011 12:23:08 +0200 Subject: [PATCH 157/159] Update of ovpnmain.cgi. --- html/cgi-bin/ovpnmain.cgi | 138 ++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 65 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index db2f2c1c3..b66299bf6 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -558,32 +558,35 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; print SERVERCONF "script-security 2\n"; - print SERVERCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print SERVERCONF "# IP/DNS for remote Server Gateway\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; print SERVERCONF "float\n"; - print SERVERCONF "# IP address of the n2n VPN Subnet\n"; + print SERVERCONF "# IP adresses of the VPN Subnet\n"; print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; - print SERVERCONF "# Client gateway network\n"; + print SERVERCONF "# Client Gateway Network\n"; print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; - print SERVERCONF "# tun device\n"; + print SERVERCONF "# tun Device\n"; print SERVERCONF "dev tun\n"; - print SERVERCONF "#Port and protocol\n"; + print SERVERCONF "# Port and Protokol\n"; print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; - print SERVERCONF "proto $cgiparams{'PROTOCOL'}\n"; - print SERVERCONF "# Paketsize\n"; + + if ($cgiparams{'PROTOCOL'} eq 'tcp') { + print SERVERCONF "proto tcp-server\n"; + print SERVERCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; - print SERVERCONF "tun-mtu $tunmtu\n"; + print SERVERCONF "tun-mtu $tunmtu\n"; + } + if ($cgiparams{'PROTOCOL'} eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print SERVERCONF "fragment 1300\r\n"; - } else { - print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n" + print SERVERCONF "proto udp\n"; + print SERVERCONF "# Paketsize\n"; + if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + print SERVERCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n";} } - if ($cgiparams{'MSSFIX'} eq 'on') { - print SERVERCONF "mssfix\n"; - } - } - print SERVERCONF "# Auth Server\n"; + + print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; @@ -592,17 +595,17 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "# Cipher\n"; print SERVERCONF "cipher AES-256-CBC\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print SERVERCONF "# Enable compession\n"; + print SERVERCONF "# Enable Compression\n"; print SERVERCONF "comp-lzo\r\n"; } - print SERVERCONF "# Debug level\n"; + print SERVERCONF "# Debug Level\n"; print SERVERCONF "verb 3\n"; print SERVERCONF "# Tunnel check\n"; print SERVERCONF "keepalive 10 60\n"; - print SERVERCONF "# start as daemon\n"; + print SERVERCONF "# Start as daemon\n"; print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print SERVERCONF "# Activate Management Interface on Port\n"; + print SERVERCONF "# Activate Management Interface and Port\n"; print SERVERCONF "#management localhost 4711\n"; close(SERVERCONF); @@ -633,48 +636,52 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP address of the n2n VPN Subnet\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "# Server gateway network\n"; + print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; - print CLIENTCONF "# tun device\n"; + print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev tun\n"; - print CLIENTCONF "#Port and protocol\n"; + print CLIENTCONF "# Port and Protokol\n"; print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; - print CLIENTCONF "proto $cgiparams{'PROTOCOL'}\n"; - print CLIENTCONF "# Paketsize\n"; + + if ($cgiparams{'PROTOCOL'} eq 'tcp') { + print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; - print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "ns-cert-type server\n"; + } + if ($cgiparams{'PROTOCOL'} eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print CLIENTCONF "fragment 1300\r\n"; - } else { - print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($cgiparams{'MSSFIX'} eq 'on') { - print CLIENTCONF "mssfix\n"; - } + print CLIENTCONF "proto udp\n"; + print CLIENTCONF "# Paketsize\n"; + if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n";} } + print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print CLIENTCONF "# Enable compession\n"; + print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\r\n"; } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "# Start sa daemon\n"; + print CLIENTCONF "# Start as daemon\n"; print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print CLIENTCONF "# Activate Management Interface on Port\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; print CLIENTCONF "# management localhost 4711\n"; close(CLIENTCONF); @@ -1558,31 +1565,35 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP adress of the VPN Subnet\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; - print CLIENTCONF "#Port and Protokoll\n"; + print CLIENTCONF "# Port and Protokoll\n"; print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; - print CLIENTCONF "proto $confighash{$cgiparams{'KEY'}}[28]\n"; - print CLIENTCONF "# Paketsize\n"; + + if ($confighash{$cgiparams{'KEY'}}[28] eq 'tcp') { + print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "# Packet size\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; - print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "ns-cert-type server\n"; + } + if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print CLIENTCONF "fragment 1300\r\n"; - } else { - print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') { - print CLIENTCONF "mssfix\n"; - } + print CLIENTCONF "proto udp\n"; + print CLIENTCONF "# Paketsize\n"; + if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";} } + print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; @@ -1906,8 +1917,8 @@ ADV_ERROR: fragment
- Default: 1300 - + Default: 1300 + mssfix @@ -2315,7 +2326,8 @@ END my $complzoactive; my $mssfixactive; my $n2nfragment; -my @n2nproto = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nproto = split(/-/, @n2nproto2[1]); my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]); my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf; @@ -2329,6 +2341,7 @@ my @n2novpnsub = split(/\./,$n2novpnsuball[1]); my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]); my @n2nlocalsub = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]); + ### # m.a.d delete CR and LF from arrays for this chomp doesnt work ### @@ -2337,7 +2350,7 @@ $n2nremote[1] =~ s/\n|\r//g; $n2novpnsub[0] =~ s/\n|\r//g; $n2novpnsub[1] =~ s/\n|\r//g; $n2novpnsub[2] =~ s/\n|\r//g; -$n2nproto[1] =~ s/\n|\r//g; +$n2nproto[0] =~ s/\n|\r//g; $n2nport[1] =~ s/\n|\r//g; $n2ntunmtu[1] =~ s/\n|\r//g; $n2nremsub[1] =~ s/\n|\r//g; @@ -2412,7 +2425,7 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; - $confighash{$key}[28] = $n2nproto[1]; + $confighash{$key}[28] = $n2nproto[0]; $confighash{$key}[29] = $n2nport[1]; $confighash{$key}[30] = $complzoactive; $confighash{$key}[31] = $n2ntunmtu[1]; @@ -2684,8 +2697,7 @@ if ($cgiparams{'TYPE'} eq 'net') { if (&valid_dns_host($cgiparams{'REMOTE'})) { $warnmessage = "$Lang::tr{'check vpn lr'} $cgiparams{'REMOTE'}. $Lang::tr{'dns check failed'}"; if ($cgiparams{'TYPE'} eq 'net') { - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } } } @@ -3012,11 +3024,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; $confighash{$key}[23] = $cgiparams{'MSSFIX'}; - if ($cgiparams{'FRAGMENT'} eq '') { - $confighash{$key}[24] = '1300'; - } else { $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; - } $confighash{$key}[25] = $cgiparams{'REMARK'}; $confighash{$key}[26] = $cgiparams{'INTERFACE'}; # new fields From 42a1655807987cc2c51cd06cfa832dbf4de0639a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 13 Sep 2011 20:44:48 +0200 Subject: [PATCH 158/159] Remove OpenVPN changes in index.cgi. --- html/cgi-bin/index.cgi | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 0ef95ba8c..b325250a5 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -390,25 +390,6 @@ END END } -### -# m.a.d n2n -### - -if ( -d "${General::swroot}/ovpn/n2nconf") { -my %confighash=(); -&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); -foreach my $dkey (keys %confighash) { -if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') { -my @n2novpnet = split(/\//,$confighash{$dkey}[27]); - print <OpenVPN n2n
- $n2novpnet[0] - $confighash{$dkey}[6] -END -} -} - } - # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "
  • $Lang::tr{'fireinfo please enable'}
    • "; From cd0c0a0de72e975c87426642d09897aaf3d293e9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 16 Sep 2011 11:12:09 +0200 Subject: [PATCH 159/159] Localize new OpenVPN features. --- doc/language_issues.de | 9 +++---- doc/language_issues.en | 9 +++---- doc/language_issues.es | 19 +++++++++++---- doc/language_issues.fr | 19 +++++++++++---- doc/language_issues.pl | 19 +++++++++++---- doc/language_issues.ru | 18 ++++++++++---- doc/language_missings | 49 +++++++++++++++++++++++++++++++++++++++ html/cgi-bin/ovpnmain.cgi | 32 ++++++++++++------------- langs/de/cgi-bin/de.pl | 16 ++++++++++--- langs/en/cgi-bin/en.pl | 16 ++++++++++--- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- 13 files changed, 162 insertions(+), 50 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 0f1b918b1..d182dbb44 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -97,6 +96,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -169,6 +169,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -196,7 +197,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -245,6 +245,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -278,8 +279,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -457,8 +456,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes diff --git a/doc/language_issues.en b/doc/language_issues.en index bffff8044..3ae364c9e 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -490,8 +489,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes diff --git a/doc/language_issues.es b/doc/language_issues.es index 0ef2eacd8..6b2ab8ee6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs @@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 00cb46278..b1a94a1b4 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -492,8 +491,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes @@ -519,6 +520,16 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 0ef2eacd8..6b2ab8ee6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs @@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 9add81b43..ee6787356 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -174,7 +173,6 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update -WARNING: translation string unused: frequency WARNING: translation string unused: fritzdsl help WARNING: translation string unused: fritzdsl upload WARNING: translation string unused: from email adr @@ -221,7 +219,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -304,8 +301,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -495,6 +490,7 @@ WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -502,9 +498,21 @@ WARNING: untranslated string: extrahd maybe the device is in use WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount +WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index 5dc1daef1..16e3ba564 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -31,6 +31,16 @@ < minute < ntp common settings < ntp sync +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < snort working < static routes < system information @@ -83,6 +93,16 @@ < fireinfo why read more < fireinfo your profile id < minute +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -117,6 +137,16 @@ < extrahd unable to write < extrahd you cant mount < minute +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < static routes < vpn keyexchange ############################################################################ @@ -126,6 +156,8 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< day-graph +< disk access per < Edit an existing route < extrahd because there is already a device mounted < extrahd cant umount @@ -136,6 +168,23 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< frequency +< hour-graph +< incoming traffic in bytes per second < minute +< month-graph +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used +< outgoing traffic in bytes per second < static routes < vpn keyexchange +< week-graph +< year-graph diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b66299bf6..b6c5fc0ad 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -33,8 +33,8 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourgreen} ); undef (@dummy); @@ -2607,49 +2607,49 @@ if ($confighash{$cgiparams{'KEY'}}) { if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { - $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; + $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ($cgiparams{'OVPN_SUBNET'} eq $vpnsettings{'DOVPN_SUBNET'}) { - $errormessage = 'The OpenVPN Subnet is used by the OpenVPN Server please change'; + $errormessage = $Lang::tr{'openvpn subnet is used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) { - $errormessage = 'mssfix only allowed with udp'; + $errormessage = $Lang::tr{'openvpn mssfix allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) { - $errormessage = 'fragment only allowed with udp'; + $errormessage = $Lang::tr{'openvpn fragment allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { - $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { - $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix openvpn subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { - $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix remote subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; @@ -3182,8 +3182,8 @@ if ($cgiparams{'TYPE'} eq 'net') {     $Lang::tr{'Act as'} - + $Lang::tr{'remote host/ip'}: $Lang::tr{'local subnet'} @@ -3205,9 +3205,9 @@ if ($cgiparams{'TYPE'} eq 'net') { mssfix   - Fragment   + fragment   - Default: 1300 + $Lang::tr{'openvpn default'}: 1300 $Lang::tr{'MTU'}  @@ -3727,7 +3727,7 @@ END my $active = "
    $Lang::tr{'capsclosed'}
    "; if ($confighash{$key}[0] eq 'off') { - $active = "
    $Lang::tr{'capsclosed'}
    "; + $active = "
    $Lang::tr{'openvpn disabled'}
    "; } else { ### @@ -3750,7 +3750,7 @@ END # $p->close(); if (-e "/var/run/$confighash{$key}[1]n2n.pid") { - $active = "
    $Lang::tr{'capsopen'}
    "; + $active = "
    $Lang::tr{'openvpn enabled'}
    "; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f7aef3103..727470fba 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -551,9 +551,9 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', -'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', +'day-graph' => 'Tag', 'days' => 'Tage', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Tragen Sie Ihre ID (oder ID Liste durch ; getrennt) in das Feld "Hostname" ein', @@ -1283,9 +1283,19 @@ 'only red' => 'Nur ROT', 'open to all' => 'Überschreibe externen Zugang zu ALL', 'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht', -'openvpn client' => 'OpenVPN Client', +'openvpn client' => 'OpenVPN-Client', +'openvpn default' => 'Vorgabe', +'openvpn destination port used' => 'Der Zielport wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.', +'openvpn disabled' => 'DEAKTIVIERT', +'openvpn enabled' => 'AKTIVIERT', +'openvpn fragment allowed with udp' => '"fragment" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.', 'openvpn log' => 'OpenVPN Log', -'openvpn server' => 'OpenVPN Server', +'openvpn mssfix allowed with udp' => '"mssfix" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.', +'openvpn prefix local subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim lokalen Subnetz ein wie z.B. 255.255.255.0.', +'openvpn prefix openvpn subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim OpenVPN-Subnetz ein wie z.B. 255.255.255.0.', +'openvpn prefix remote subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim entfernten Subnetz ein wie z.B. 255.255.255.0.', +'openvpn server' => 'OpenVPN-Server', +'openvpn subnet is used' => 'Das angegebene Subnetz wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.', 'optional at cmd' => 'zusätzlicher Modembefehl', 'optional data' => '3. Optionale Einstellungen', 'options' => 'Optionen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 62925ce44..16df2b96f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -572,9 +572,9 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', -'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', +'day-graph' => 'Day', 'days' => 'days.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)', @@ -1311,9 +1311,19 @@ 'only red' => 'Only RED', 'open to all' => 'Override external access to ALL', 'openssl produced an error' => 'OpenSSL produced an error', -'openvpn client' => 'OpenVPN Client', +'openvpn client' => 'OpenVPN client', +'openvpn default' => 'Default', +'openvpn destination port used' => 'The destination port is already used by another OpenVPN server.', +'openvpn disabled' => 'DISABLED', +'openvpn enabled' => 'ENABLED', +'openvpn fragment allowed with udp' => 'Using fragment is only allowed when using the UDP protocol.', 'openvpn log' => 'OpenVPN Log', -'openvpn server' => 'OpenVPN Server', +'openvpn mssfix allowed with udp' => 'Using "mssfix" is only allowed when using the UDP protocol.', +'openvpn prefix local subnet' => 'Using the prefix notation is not supported for the local subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn prefix openvpn subnet' => 'Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn prefix remote subnet' => 'Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn server' => 'OpenVPN server', +'openvpn subnet is used' => 'The given subnet is used by another OpenVPN server.', 'optional at cmd' => 'optional AT command', 'optional data' => '3. Optional Settings:', 'options' => 'Options', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index d410a56c6..365630a6e 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -570,9 +570,9 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', -'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', +'day-graph' => 'Dia', 'days' => 'dias.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => '"En el campo nombre de host introduzca si ID (o una lista de Ids separados por ; )"', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index daeb9f26b..04edb257c 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -572,9 +572,9 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', -'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', +'day-graph' => 'Jour', 'days' => 'jours.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Entrez votre identifiant dans ce champ pour noms d\'hôtes (ou une liste d\'identifiants séparés par des ;)', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 14160de16..12439e445 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -572,9 +572,9 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', -'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', +'day-graph' => 'Dzien', 'days' => 'dni.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadź twoje ID (lub listę ID oddzielanych średnikami)',