mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 11:13:24 +02:00
Merge branch 'master' into perl_5.12.2
Conflicts: config/rootfiles/core/47/filelists/files config/rootfiles/core/47/update.sh
This commit is contained in:
@@ -10,15 +10,15 @@ usr/bin/sigtool
|
||||
#usr/lib/libclamav.la
|
||||
usr/lib/libclamav.so
|
||||
usr/lib/libclamav.so.6
|
||||
usr/lib/libclamav.so.6.1.7
|
||||
usr/lib/libclamav.so.6.1.9
|
||||
#usr/lib/libclamunrar.la
|
||||
usr/lib/libclamunrar.so
|
||||
usr/lib/libclamunrar.so.6
|
||||
usr/lib/libclamunrar.so.6.1.7
|
||||
usr/lib/libclamunrar.so.6.1.9
|
||||
#usr/lib/libclamunrar_iface.la
|
||||
usr/lib/libclamunrar_iface.so
|
||||
usr/lib/libclamunrar_iface.so.6
|
||||
usr/lib/libclamunrar_iface.so.6.1.7
|
||||
usr/lib/libclamunrar_iface.so.6.1.9
|
||||
#usr/lib/pkgconfig/libclamav.pc
|
||||
usr/sbin/clamd
|
||||
usr/share/clamav
|
||||
|
||||
@@ -106,7 +106,7 @@ usr/lib/libcupsmime.so
|
||||
usr/lib/libcupsmime.so.1
|
||||
usr/lib/libcupsppdc.so
|
||||
usr/lib/libcupsppdc.so.1
|
||||
#usr/lib/php/extensions/no-debug-non-zts-20060613/phpcups.so
|
||||
#usr/lib/php/extensions/no-debug-non-zts-20090626/phpcups.so
|
||||
usr/sbin/accept
|
||||
usr/sbin/cupsaccept
|
||||
usr/sbin/cupsaddsmb
|
||||
@@ -1047,4 +1047,4 @@ var/run/cups
|
||||
var/run/cups/certs
|
||||
var/spool/cups
|
||||
var/spool/cups/tmp
|
||||
etc/rc.d/init.d/cups
|
||||
etc/rc.d/init.d/cups
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
#opt/icecream
|
||||
#opt/icecream/bin
|
||||
#opt/icecream/bin/c++
|
||||
#opt/icecream/bin/cc
|
||||
#opt/icecream/bin/g++
|
||||
#opt/icecream/bin/gcc
|
||||
#opt/icecream/bin/icecc
|
||||
#opt/icecream/bin/icerun
|
||||
#opt/icecream/include
|
||||
#opt/icecream/include/icecc
|
||||
#opt/icecream/include/icecc/comm.h
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
etc/rc.d/init.d/ipfireseeder
|
||||
#var/ipfire/seeder
|
||||
var/ipfire/seeder/ipfire-2.9.i586-full-core45.iso.torrent
|
||||
var/ipfire/seeder/ipfire-2.9.i586-full-core46.iso.torrent
|
||||
#var/log/seeder
|
||||
var/log/seeder/info
|
||||
|
||||
Reference in New Issue
Block a user