Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

This commit is contained in:
Dirk Wagner
2014-10-15 22:38:13 +02:00
280 changed files with 29981 additions and 6966 deletions

View File

@@ -1,21 +1,15 @@
#usr/include/gmp.h
#usr/include/gmpxx.h
#usr/include/mp.h
#usr/lib/libgmp.a
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
usr/lib/libgmp.so.10.0.5
usr/lib/libgmp.so.10.2.0
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
usr/lib/libgmpxx.so.4.2.5
#usr/lib/libmp.a
#usr/lib/libmp.la
#usr/lib/libmp.so
usr/lib/libmp.so.3
usr/lib/libmp.so.3.1.25
usr/lib/libgmpxx.so.4.4.0
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2

View File

@@ -74,13 +74,13 @@ etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.down/20-RL-firewall
etc/rc.d/init.d/networking/red.down/20-firewall
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
etc/rc.d/init.d/networking/red.up/10-miniupnpd
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/20-RL-firewall
etc/rc.d/init.d/networking/red.up/20-firewall
etc/rc.d/init.d/networking/red.up/23-RS-snort
etc/rc.d/init.d/networking/red.up/24-RS-qos
etc/rc.d/init.d/networking/red.up/27-RS-squid
@@ -132,7 +132,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vdradmin
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d