]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 May 2011 19:52:13 +0000 (21:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 May 2011 19:52:13 +0000 (21:52 +0200)
105 files changed:
config/kernel/kernel.config.i586-ipfire
config/kernel/kernel.config.i586-ipfire-pae
config/kernel/kernel.config.i586-ipfire-xen
config/rootfiles/common/MIME-Tools
config/rootfiles/common/cmake
config/rootfiles/common/gmp
config/rootfiles/common/strongswan
config/rootfiles/core/48/filelists/perl-GD [deleted symlink]
config/rootfiles/core/next/exclude [moved from config/rootfiles/core/44/exclude with 100% similarity]
config/rootfiles/core/next/filelists/dracut [moved from config/rootfiles/core/44/filelists/dracut with 100% similarity]
config/rootfiles/core/next/filelists/files [new file with mode: 0644]
config/rootfiles/core/next/filelists/gmp [new symlink]
config/rootfiles/core/next/filelists/grub [moved from config/rootfiles/core/44/filelists/grub with 100% similarity]
config/rootfiles/core/next/filelists/linux [moved from config/rootfiles/core/44/filelists/linux with 100% similarity]
config/rootfiles/core/next/filelists/strongswan [moved from config/rootfiles/core/44/filelists/strongswan with 100% similarity]
config/rootfiles/core/next/meta [moved from config/rootfiles/core/44/meta with 100% similarity]
config/rootfiles/core/next/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/44/exclude [new file with mode: 0644]
config/rootfiles/oldcore/44/filelists/acl [moved from config/rootfiles/core/44/filelists/acl with 100% similarity]
config/rootfiles/oldcore/44/filelists/apache2 [moved from config/rootfiles/core/44/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/44/filelists/attr [moved from config/rootfiles/core/44/filelists/attr with 100% similarity]
config/rootfiles/oldcore/44/filelists/cpio [moved from config/rootfiles/core/44/filelists/cpio with 100% similarity]
config/rootfiles/oldcore/44/filelists/daq [moved from config/rootfiles/core/44/filelists/daq with 100% similarity]
config/rootfiles/oldcore/44/filelists/dhcpcd [moved from config/rootfiles/core/44/filelists/dhcpcd with 100% similarity]
config/rootfiles/oldcore/44/filelists/dnsmasq [moved from config/rootfiles/core/44/filelists/dnsmasq with 100% similarity]
config/rootfiles/oldcore/44/filelists/dracut [new symlink]
config/rootfiles/oldcore/44/filelists/files [moved from config/rootfiles/core/44/filelists/files with 100% similarity]
config/rootfiles/oldcore/44/filelists/findutils [moved from config/rootfiles/core/44/filelists/findutils with 100% similarity]
config/rootfiles/oldcore/44/filelists/fireinfo [moved from config/rootfiles/core/44/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/44/filelists/grub [new symlink]
config/rootfiles/oldcore/44/filelists/hwdata [moved from config/rootfiles/core/44/filelists/hwdata with 100% similarity]
config/rootfiles/oldcore/44/filelists/iw [moved from config/rootfiles/core/44/filelists/iw with 100% similarity]
config/rootfiles/oldcore/44/filelists/libcap [moved from config/rootfiles/core/44/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/44/filelists/libdnet [moved from config/rootfiles/core/44/filelists/libdnet with 100% similarity]
config/rootfiles/oldcore/44/filelists/linux [new symlink]
config/rootfiles/oldcore/44/filelists/linux-firmware [moved from config/rootfiles/core/44/filelists/linux-firmware with 100% similarity]
config/rootfiles/oldcore/44/filelists/smartmontools [moved from config/rootfiles/core/44/filelists/smartmontools with 100% similarity]
config/rootfiles/oldcore/44/filelists/snort [moved from config/rootfiles/core/44/filelists/snort with 100% similarity]
config/rootfiles/oldcore/44/filelists/squid [moved from config/rootfiles/core/44/filelists/squid with 100% similarity]
config/rootfiles/oldcore/44/filelists/strongswan [new symlink]
config/rootfiles/oldcore/44/filelists/tcl [moved from config/rootfiles/core/44/filelists/tcl with 100% similarity]
config/rootfiles/oldcore/44/filelists/udev [moved from config/rootfiles/core/44/filelists/udev with 100% similarity]
config/rootfiles/oldcore/44/filelists/usb_modeswitch [moved from config/rootfiles/core/44/filelists/usb_modeswitch with 100% similarity]
config/rootfiles/oldcore/44/filelists/usb_modeswitch_data [moved from config/rootfiles/core/44/filelists/usb_modeswitch_data with 100% similarity]
config/rootfiles/oldcore/44/filelists/vim [moved from config/rootfiles/core/44/filelists/vim with 100% similarity]
config/rootfiles/oldcore/44/filelists/wireless [moved from config/rootfiles/core/44/filelists/wireless with 100% similarity]
config/rootfiles/oldcore/44/filelists/wpa_supplicant [moved from config/rootfiles/core/44/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/oldcore/44/meta [moved from config/rootfiles/core/45/meta with 100% similarity]
config/rootfiles/oldcore/44/update.sh [moved from config/rootfiles/core/44/update.sh with 100% similarity]
config/rootfiles/oldcore/45/exclude [moved from config/rootfiles/core/45/exclude with 100% similarity]
config/rootfiles/oldcore/45/filelists/files [moved from config/rootfiles/core/45/filelists/files with 100% similarity]
config/rootfiles/oldcore/45/filelists/fireinfo [moved from config/rootfiles/core/45/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/45/filelists/snort [moved from config/rootfiles/core/45/filelists/snort with 100% similarity]
config/rootfiles/oldcore/45/filelists/squid [moved from config/rootfiles/core/45/filelists/squid with 100% similarity]
config/rootfiles/oldcore/45/meta [moved from config/rootfiles/core/46/meta with 100% similarity]
config/rootfiles/oldcore/45/update.sh [moved from config/rootfiles/core/45/update.sh with 100% similarity]
config/rootfiles/oldcore/46/exclude [moved from config/rootfiles/core/46/exclude with 100% similarity]
config/rootfiles/oldcore/46/filelists/compat-wireless [moved from config/rootfiles/core/46/filelists/compat-wireless with 100% similarity]
config/rootfiles/oldcore/46/filelists/compat-wireless-modules [moved from config/rootfiles/core/46/filelists/compat-wireless-modules with 99% similarity]
config/rootfiles/oldcore/46/filelists/crda [moved from config/rootfiles/core/46/filelists/crda with 100% similarity]
config/rootfiles/oldcore/46/filelists/files [moved from config/rootfiles/core/46/filelists/files with 100% similarity]
config/rootfiles/oldcore/46/filelists/openssh [moved from config/rootfiles/core/46/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/46/filelists/openssl [moved from config/rootfiles/core/46/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/46/filelists/squid [moved from config/rootfiles/core/46/filelists/squid with 100% similarity]
config/rootfiles/oldcore/46/meta [moved from config/rootfiles/core/47/meta with 100% similarity]
config/rootfiles/oldcore/46/update.sh [moved from config/rootfiles/core/46/update.sh with 100% similarity]
config/rootfiles/oldcore/47/exclude [moved from config/rootfiles/core/47/exclude with 100% similarity]
config/rootfiles/oldcore/47/filelists/files [moved from config/rootfiles/core/47/filelists/files with 100% similarity]
config/rootfiles/oldcore/47/filelists/fireinfo [moved from config/rootfiles/core/47/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/47/filelists/php [moved from config/rootfiles/core/47/filelists/php with 100% similarity]
config/rootfiles/oldcore/47/meta [moved from config/rootfiles/core/48/meta with 100% similarity]
config/rootfiles/oldcore/47/update.sh [moved from config/rootfiles/core/47/update.sh with 100% similarity]
config/rootfiles/oldcore/48/exclude [moved from config/rootfiles/core/48/exclude with 100% similarity]
config/rootfiles/oldcore/48/filelists/daq [moved from config/rootfiles/core/48/filelists/daq with 100% similarity]
config/rootfiles/oldcore/48/filelists/files [moved from config/rootfiles/core/48/filelists/files with 100% similarity]
config/rootfiles/oldcore/48/filelists/perl [moved from config/rootfiles/core/48/filelists/perl with 100% similarity]
config/rootfiles/oldcore/48/filelists/perl-modules [moved from config/rootfiles/core/48/filelists/perl-modules with 100% similarity]
config/rootfiles/oldcore/48/filelists/snort [moved from config/rootfiles/core/48/filelists/snort with 100% similarity]
config/rootfiles/oldcore/48/filelists/squid [moved from config/rootfiles/core/48/filelists/squid with 100% similarity]
config/rootfiles/oldcore/48/meta [new file with mode: 0644]
config/rootfiles/oldcore/48/update.sh [moved from config/rootfiles/core/48/update.sh with 100% similarity]
config/rootfiles/packages/alsa
config/rootfiles/packages/python-satsolver [new file with mode: 0644]
lfs/alsa
lfs/cmake
lfs/compat-wireless
lfs/e1000
lfs/e1000e
lfs/gmp
lfs/igb
lfs/kvm-kmod
lfs/libsatsolver
lfs/linux
lfs/python-satsolver [new file with mode: 0644]
lfs/strongswan
lfs/v4l-dvb
make.sh
src/paks/linux-pae/install.sh
src/paks/linux-pae/uninstall.sh
src/paks/linux-xen/install.sh
src/paks/linux-xen/update.sh
src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch [new file with mode: 0644]
src/patches/python-satsolver-only-python-bindings.patch [new file with mode: 0644]
src/patches/python-satsover-fix-building-without-rpm.patch [new file with mode: 0644]
src/patches/v4l-dvb_remove_backport_warning.patch [deleted file]

index 0a947675f90df8637a85bdb7a446e84d8a10a4bb..3fd80c88648519f0e11f5dbd8e265585a2241127 100644 (file)
@@ -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
index 94810b6547ebeddf3c6d7b9be771dc8e1d60b6ef..8c7cf4b7d18b0417c2656e4222df31682713a70c 100644 (file)
@@ -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,9 +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_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
@@ -313,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
@@ -362,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
@@ -391,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
index 1a6ab28a6dd7f14f10c53fc526b5d9caa1a92eeb..e5122a97d2ba1cd6e53382014745ae2fbe7c0c64 100644 (file)
@@ -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
index 6b55d7b7c12ef6106b3d25b50e9a064ab5b61773..76e5a2c3a0e584fec0ed03806a8a2358c52ef7fa 100644 (file)
@@ -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
index 8cefc88d889454a36bc78ed2a33030427b586b5f..4a1d702c095f375d148241c2512cd46988296d69 100644 (file)
 #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
index 6bf3940c8f12c6a2a93b2d6be529c9a9c1afacd7..669d1913333406597061f7cdaef41614eed9e4d1 100644 (file)
@@ -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
index df093b0751114d98b212dccfb7f34e5199c38789..6e97b170fd79671372eca64f0e109618a6e6725a 100644 (file)
@@ -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/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD
deleted file mode 120000 (symlink)
index 962d937..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/perl-GD
\ 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 (file)
index 0000000..409e5fe
--- /dev/null
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/next/filelists/gmp b/config/rootfiles/core/next/filelists/gmp
new file mode 120000 (symlink)
index 0000000..8662a89
--- /dev/null
@@ -0,0 +1 @@
+../../../common/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh
new file mode 100644 (file)
index 0000000..68c3af5
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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... *** "
diff --git a/config/rootfiles/oldcore/44/exclude b/config/rootfiles/oldcore/44/exclude
new file mode 100644 (file)
index 0000000..c2bceb8
--- /dev/null
@@ -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/oldcore/44/filelists/dracut b/config/rootfiles/oldcore/44/filelists/dracut
new file mode 120000 (symlink)
index 0000000..1608699
--- /dev/null
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/44/filelists/grub b/config/rootfiles/oldcore/44/filelists/grub
new file mode 120000 (symlink)
index 0000000..050745c
--- /dev/null
@@ -0,0 +1 @@
+../../../common/grub
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/44/filelists/linux b/config/rootfiles/oldcore/44/filelists/linux
new file mode 120000 (symlink)
index 0000000..c469fe1
--- /dev/null
@@ -0,0 +1 @@
+../../../common/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/44/filelists/strongswan b/config/rootfiles/oldcore/44/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
similarity index 99%
rename from config/rootfiles/core/46/filelists/compat-wireless-modules
rename to config/rootfiles/oldcore/46/filelists/compat-wireless-modules
index aa2580483f8e37f4ef412ab5df60dd3664590dbf..3f12c8a07f822ca3011e2c471413d40e863ff730 100644 (file)
@@ -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/config/rootfiles/oldcore/48/meta b/config/rootfiles/oldcore/48/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
index d87664d7f7cf4cd82776a399c0f63e1607aff50f..c9db15008c853ce7cc0e189977dfd870d758d6ad 100644 (file)
@@ -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/config/rootfiles/packages/python-satsolver b/config/rootfiles/packages/python-satsolver
new file mode 100644 (file)
index 0000000..6b5e576
--- /dev/null
@@ -0,0 +1,2 @@
+usr/lib/python2.7/site-packages/_satsolver.so
+usr/lib/python2.7/site-packages/satsolver.py
index d2eaadbbaf6865ec7ca6e88ef6eb416240bfedc9..f6f6df8046fe6eaf08b931d6c90342aee0798884 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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)
 
index 56e0016a3f4c02c545870b2bbc3c74e555ece621..6b7aff61cef6c513094309478d1316bb6d7e06e3 100644 (file)
--- 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)
 
index 60a76c6179839f9bbd6bc39a560a534ab3b98b9e..22223d7d7a80e9b671c4f3b39ce910aafe958e40 100644 (file)
@@ -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)
index 1d61e5bb277d31884e354dd7e65f20fa284d4214..66e4fdd6e6c61020e2ae7aa3fc1e74ebf510c969 100644 (file)
--- a/lfs/e1000
+++ b/lfs/e1000
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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)
 
index cce53673551bbb1542360cb46a1ea28ae4c178b9..ba465952bda6d25478e919dc6d809a9b921a8aa2 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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/gmp b/lfs/gmp
index 5d723e54ee3d724281512fc991aedeadff007e06..10cd28f1bad1d8e39ed6ad133ff31facc9427068 100644 (file)
--- 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)
diff --git a/lfs/igb b/lfs/igb
index 830564795047f583c2a02304323c599e71f9f64f..678c7036708e06509e23f6b682dedd4e49c388e8 100644 (file)
--- a/lfs/igb
+++ b/lfs/igb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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)
 
index e443b703447a1dfe922c582de6e2045c5ee2103c..b6418acb17dbaae7ce905d04a82c59d6626a0054 100644 (file)
@@ -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 \
index 771430b6b407ed39a9e60db8f23b3008545c4762..778375a2e64c70af7fb20f0160fac0ce6f2e6e04 100644 (file)
@@ -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 \
index 26c7b837b94abeb3eb8314b4af32f9b19124c329..16ae152b40677a3cbea700d8222add73ee202937 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .28
-VER        = 2.6.32.28
+PATCHLEVEL = .40
+VER        = 2.6.32.40
 
 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-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-2d.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
+xen-patches-2.6.32-2f.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
 
-$(DL_FILE)_MD5                         = 9ee6d4023f34eb055ec32f201b5f9206
+$(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
-xen-patches-2.6.32-2d.tar.bz2_MD5      = d1690d2b8b0c9124897981aea505f8f7
+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-2d.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/lfs/python-satsolver b/lfs/python-satsolver
new file mode 100644 (file)
index 0000000..0974a15
--- /dev/null
@@ -0,0 +1,102 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.16.0-20110429-868eae9
+
+THISAPP    = sat-solver-bindings-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+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
+###############################################################################
+
+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))
+
+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)
+
+       # 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
+
+       # 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 \
+               -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.
+       cd $(DIR_APP)/build/bindings/python && make install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index 380d351d9fd864aed723ca18f5d3d970080503a0..8c27b1b45f0eced9bff6bac7eec6d9e0179b7e78 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 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)
 
index e8f2e54f156eaf7f354fc59218fc082fa0720a7d..6c6a5fc5bba69ac63a04eb483110cfb1807a34e6 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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/make.sh b/make.sh
index d53d0ec840ee51c8ce5b39daf86da7a5f6fd971d..ccb1dbca44dc58205b543c764ba6fc139be1fac3 100755 (executable)
--- 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
@@ -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
@@ -700,7 +701,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
index 445af204f2f1e3a43c5c46f0378890b05b9d5f2c..1a663e95da02bc1b4abe68dbc7a4e5d75918949e 100644 (file)
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.28
+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
index 9a453004633919ed356a7e96e8ed64a71dcc4321..959fdb1a7e2c818d5eb84cf52382f64294138b50 100644 (file)
@@ -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
index 2015b5d178509e31935a9a2db3d8792e61c77403..5e03a740c637f7853de6dac4025e5e3a93f93efe 100644 (file)
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.28
+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
index abbaf47c3cdefc976257ad3dcd052b658b3002b7..89c40d0d7c5d3dd57b5944f3af4977d5f8d76760 100644 (file)
@@ -22,6 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-#Don't remove old xen kernel at update
-#./uninstall.sh
+./uninstall.sh
 ./install.sh
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 (file)
index 0000000..331e8a1
--- /dev/null
@@ -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)
diff --git a/src/patches/python-satsolver-only-python-bindings.patch b/src/patches/python-satsolver-only-python-bindings.patch
new file mode 100644 (file)
index 0000000..36905d0
--- /dev/null
@@ -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 (file)
index 0000000..68e2767
--- /dev/null
@@ -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
+
diff --git a/src/patches/v4l-dvb_remove_backport_warning.patch b/src/patches/v4l-dvb_remove_backport_warning.patch
deleted file mode 100644 (file)
index 7f57822..0000000
+++ /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)