Get rid of these old corefiles and dependency conflicts, 2.1 is branched

diff --git a/config/rootfiles/common/oldcore1 b/config/rootfiles/common/oldcore1
deleted file mode 100644 (file)
index 9f88ed2..0000000
--- a/config/rootfiles/common/oldcore1
+++ /dev/null
@@ -1,8 +0,0 @@
-var/ipfire/langs
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-opt/pakfire/lib/functions.sh
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-usr/sbin/updxlrator
-var/ipfire/updatexlrator/bin/download
-etc/httpd/conf/vhosts.d/ipfire-interface.conf

diff --git a/config/rootfiles/common/oldcore10 b/config/rootfiles/common/oldcore10
deleted file mode 100644 (file)
index 5c841e1..0000000
--- a/config/rootfiles/common/oldcore10
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/local/bin/wirelessctrl
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/gui.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/services.cgi
-#srv/web/ipfire/cgi-bin/graphs.cgi
-var/ipfire/langs
-var/ipfire/graphs.pl

diff --git a/config/rootfiles/common/oldcore11 b/config/rootfiles/common/oldcore11
deleted file mode 100644 (file)
index ad42221..0000000
--- a/config/rootfiles/common/oldcore11
+++ /dev/null
@@ -1,24 +0,0 @@
-usr/bin/tunctl
-usr/bin/squidGuard
-var/ipfire/urlfilter/bin/autoupdate.pl
-etc/squid
-usr/lib/squid
-usr/sbin/squid
-bin/ntfs-3g
-#lib/libntfs-3g.so
-#lib/libntfs-3g.so.24
-#lib/libntfs-3g.so.24.0.0
-sbin/mount.ntfs-3g
-usr/bin/php
-usr/lib/apache/libphp5.so
-usr/bin/pear
-usr/bin/peardev
-usr/lib/php/.channels/.alias/pear.txt
-usr/lib/php/.channels/pear.php.net.reg
-usr/lib/php/.registry/pear.reg
-usr/lib/php/data/PEAR/package.dtd
-usr/lib/php/data/PEAR/template.spec
-usr/lib/php/pearcmd.php
-srv/web/ipfire/cgi-bin/proxy.cgi
-usr/sbin/redirect_wrapper
-var/ipfire/langs

diff --git a/config/rootfiles/common/oldcore12 b/config/rootfiles/common/oldcore12
deleted file mode 100644 (file)
index ef20f11..0000000
--- a/config/rootfiles/common/oldcore12
+++ /dev/null
@@ -1,11 +0,0 @@
-etc/udev/dvb.sh
-etc/udev/rules.d/10-dvb.rules
-srv/web/ipfire/cgi-bin/services.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-opt/pakfire/lib/functions.pl
-var/ipfire/langs
-etc/sysconfig/modules

diff --git a/config/rootfiles/common/oldcore13 b/config/rootfiles/common/oldcore13
deleted file mode 100644 (file)
index 0cdd0be..0000000
--- a/config/rootfiles/common/oldcore13
+++ /dev/null
@@ -1,4 +0,0 @@
-opt/pakfire/lib/functions.pl
-var/ipfire/urlfilter/bin/prebuild.pl
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-usr/sbin/redirect_wrapper

diff --git a/config/rootfiles/common/oldcore14 b/config/rootfiles/common/oldcore14
deleted file mode 100644 (file)
index 84d71eb..0000000
--- a/config/rootfiles/common/oldcore14
+++ /dev/null
@@ -1,25 +0,0 @@
-var/ipfire/langs
-etc/squid
-usr/lib/squid
-usr/sbin/squid
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-#srv/web/ipfire/html/images/updxl-src-avg.gif
-usr/sbin/updxlrator
-srv/web/ipfire/html/images/audio-volume-high.png
-srv/web/ipfire/html/images/audio-volume-low.png
-srv/web/ipfire/html/images/audio-x-generic.png
-srv/web/ipfire/html/images/audio-volume-high-red.png
-srv/web/ipfire/html/images/audio-volume-low-red.png
-srv/web/ipfire/html/images/audio-x-generic-red.png
-srv/web/ipfire/html/images/media-flash.png
-srv/web/ipfire/html/images/media-playback-start-all.png
-srv/web/ipfire/html/images/media-repeat.png
-srv/web/ipfire/html/images/media-skip-backward.png
-srv/web/ipfire/html/images/media-floppy.png
-srv/web/ipfire/html/images/media-playback-start.png
-srv/web/ipfire/html/images/media-resume.png
-srv/web/ipfire/html/images/media-skip-forward.png
-srv/web/ipfire/html/images/media-optical.png
-srv/web/ipfire/html/images/media-playback-stop.png
-srv/web/ipfire/html/images/media-shuffle.png
-usr/share/curl/curl-ca-bundle.crt

diff --git a/config/rootfiles/common/oldcore15 b/config/rootfiles/common/oldcore15
deleted file mode 100644 (file)
index 52198eb..0000000
--- a/config/rootfiles/common/oldcore15
+++ /dev/null
@@ -1 +0,0 @@
-usr/sbin/dnsmasq

diff --git a/config/rootfiles/common/oldcore16 b/config/rootfiles/common/oldcore16
deleted file mode 100644 (file)
index 0fc2a8f..0000000
--- a/config/rootfiles/common/oldcore16
+++ /dev/null
@@ -1,17 +0,0 @@
-etc/rc.d/init.d/squid
-etc/ppp/ip-up
-var/ipfire/outgoing/bin/outgoingfw.pl
-var/ipfire/urlfilter/autoupdate/autoupdate.urls
-usr/sbin/redirect_wrapper
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/backup.cgi
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-var/ipfire/langs
-var/ipfire/header.pl
-usr/share/terminfo/x/xterm-color
-sbin/hdparm
-var/ipfire/backup/include

diff --git a/config/rootfiles/common/oldcore17 b/config/rootfiles/common/oldcore17
deleted file mode 100644 (file)
index 6e9946c..0000000
--- a/config/rootfiles/common/oldcore17
+++ /dev/null
@@ -1,17 +0,0 @@
-etc/squid
-etc/rc.d/init.d/connectd
-opt/pakfire/lib/functions.sh
-opt/pakfire/lib/functions.pl
-usr/lib/squid/
-usr/sbin/squid
-bin/ntfs-3g
-lib/libntfs-3g.so
-lib/libntfs-3g.so.40
-lib/libntfs-3g.so.40.0.0
-srv/web/ipfire/cgi-bin/qos.cgi
-usr/local/bin/qosd
-var/ipfire/qos/bin
-usr/lib/collectd/
-var/lib/collectd/
-usr/sbin/collectd
-usr/sbin/collectdmon

diff --git a/config/rootfiles/common/oldcore18 b/config/rootfiles/common/oldcore18
deleted file mode 100644 (file)
index 42a72d2..0000000
--- a/config/rootfiles/common/oldcore18
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/lib/python2.4/htmlentitydefs.pyc
-usr/lib/python2.4/markupbase.pyc
-etc/ssh/moduli
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/rc.d/init.d/sshd
-usr/bin/scp
-usr/bin/sftp
-usr/bin/slogin
-usr/bin/ssh
-usr/bin/ssh-add
-usr/bin/ssh-agent
-usr/bin/ssh-keygen
-usr/bin/ssh-keyscan
-usr/lib/openssh/sftp-server
-usr/lib/openssh/ssh-keysign
-usr/sbin/sshd

diff --git a/config/rootfiles/common/oldcore2 b/config/rootfiles/common/oldcore2
deleted file mode 100644 (file)
index d32d112..0000000
--- a/config/rootfiles/common/oldcore2
+++ /dev/null
@@ -1,19 +0,0 @@
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/html/redirect.cgi
-var/ipfire/qos/bin/makeqosscripts.pl
-var/ipfire/outgoing/bin/outgoingfw.pl
-etc/sysconfig/rc.local
-etc/rc.d/init.d/networking/red.down/10-ipsec
-etc/rc.d/init.d/networking/red.down/10-ovpn
-etc/rc.d/init.d/networking/red.up/10-multicast
-etc/rc.d/init.d/networking/red.up/30-ddns
-etc/rc.d/init.d/networking/red.up/40-ipac
-etc/rc.d/init.d/networking/red.up/50-ipsec
-etc/rc.d/init.d/networking/red.up/50-ovpn
-etc/rc.d/init.d/networking/red.up/99-pakfire-update
-etc/ppp/options
-usr/local/bin/qosctrl

diff --git a/config/rootfiles/common/oldcore3 b/config/rootfiles/common/oldcore3
deleted file mode 100644 (file)
index 2f94b69..0000000
--- a/config/rootfiles/common/oldcore3
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libwrap.so
-usr/lib/libwrap.so.0
-usr/lib/libwrap.so.0.7.6

diff --git a/config/rootfiles/common/oldcore4 b/config/rootfiles/common/oldcore4
deleted file mode 100644 (file)
index dd9e12f..0000000
--- a/config/rootfiles/common/oldcore4
+++ /dev/null
@@ -1,14 +0,0 @@
-etc/rc.d/init.d/firewall
-usr/local/bin/makegraphs
-var/ipfire/langs
-var/ipfire/optionsfw/settings
-var/ipfire/menu.d/50-firewall.menu
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
-usr/local/bin/qosctrl
-opt/pakfire/lib/functions.sh

diff --git a/config/rootfiles/common/oldcore5 b/config/rootfiles/common/oldcore5
deleted file mode 100644 (file)
index b25e41c..0000000
--- a/config/rootfiles/common/oldcore5
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/modules/KVER-ipfire/kernel/fs/nfsd/nfsd.ko
-#lib/modules/KVER-ipfire-smp/kernel/fs/nfsd/nfsd.ko
-usr/local/bin/qosctrl
-etc/rc.d/init.d/squid
-var/ipfire/langs
-var/ipfire/graphs.pl

diff --git a/config/rootfiles/common/oldcore6 b/config/rootfiles/common/oldcore6
deleted file mode 100644 (file)
index 7130213..0000000
--- a/config/rootfiles/common/oldcore6
+++ /dev/null
@@ -1,7 +0,0 @@
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-etc/rc.d/init.d/squid
-#bin/ntfs-3g
-#lib/libntfs-3g.so
-#lib/libntfs-3g.so.21
-#lib/libntfs-3g.so.21.0.0
-#sbin/mount.ntfs-3g

diff --git a/config/rootfiles/common/oldcore7 b/config/rootfiles/common/oldcore7
deleted file mode 100644 (file)
index dbf9785..0000000
--- a/config/rootfiles/common/oldcore7
+++ /dev/null
@@ -1,15 +0,0 @@
-etc/rc.d/rc3.d/S19smartenabler
-etc/rc.d/init.d/smartenabler
-etc/rc.d/init.d/networking/red
-#srv/web/ipfire/cgi-bin/graphs.cgi
-srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-#srv/web/ipfire/cgi-bin/network.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-usr/local/bin/makegraphs
-usr/local/bin/wirelessctrl
-var/ipfire/graphs.pl
-var/ipfire/menu.d/20-status.menu
-var/ipfire/langs
-lib/modules/KVER-ipfire/kernel/drivers/ieee1394/sbp2.ko
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat

diff --git a/config/rootfiles/common/oldcore8 b/config/rootfiles/common/oldcore8
deleted file mode 100644 (file)
index eda5757..0000000
--- a/config/rootfiles/common/oldcore8
+++ /dev/null
@@ -1,3 +0,0 @@
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-etc/ntp
-usr/local/bin/wirelessctrl

diff --git a/config/rootfiles/common/oldcore9 b/config/rootfiles/common/oldcore9
deleted file mode 100644 (file)
index aca0045..0000000
--- a/config/rootfiles/common/oldcore9
+++ /dev/null
@@ -1,17 +0,0 @@
-sbin/hdparm
-etc/rc.d/init.d/networking/red
-etc/squid
-sbin/capiinit
-usr/bin/capiinfo
-usr/lib/libcapi20.so
-usr/lib/libcapi20.so.3
-usr/lib/libcapi20.so.3.0.4
-usr/lib/squid
-usr/sbin/squid
-var/ipfire/graphs.pl
-usr/local/bin/addonctrl
-srv/web/ipfire/cgi-bin/services.cgi
-srv/web/ipfire/cgi-bin/system.cgi
-var/ipfire/menu.d/20-status.menu
-var/ipfire/langs
-opt/pakfire/lib/functions.pl

diff --git a/config/rootfiles/updater/filelists/core15 b/config/rootfiles/updater/filelists/core15
deleted file mode 120000 (symlink)
index a9c2097..0000000
--- a/config/rootfiles/updater/filelists/core15
+++ /dev/null
@@ -1 +0,0 @@
-../../core/15/files
\ No newline at end of file

diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
deleted file mode 120000 (symlink)
index 1900ca0..0000000
--- a/config/rootfiles/updater/filelists/core16
+++ /dev/null
@@ -1 +0,0 @@
-../../core/16/files
\ No newline at end of file

diff --git a/config/rootfiles/updater/filelists/core17 b/config/rootfiles/updater/filelists/core17
deleted file mode 120000 (symlink)
index 2c45f37..0000000
--- a/config/rootfiles/updater/filelists/core17
+++ /dev/null
@@ -1 +0,0 @@
-../../core/17/files
\ No newline at end of file

diff --git a/config/rootfiles/updater/filelists/core18 b/config/rootfiles/updater/filelists/core18
deleted file mode 120000 (symlink)
index 81a7940..0000000
--- a/config/rootfiles/updater/filelists/core18
+++ /dev/null
@@ -1 +0,0 @@
-../../core/18/files
\ No newline at end of file