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

This commit is contained in:
Matthias Fischer
2015-03-08 09:49:44 +01:00
161 changed files with 7783 additions and 3224 deletions

View File

@@ -121,7 +121,6 @@ etc/rc.d/init.d/swap
etc/rc.d/init.d/swconfig
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/teamspeak
etc/rc.d/init.d/template
#etc/rc.d/init.d/tftpd
etc/rc.d/init.d/tmpfs

View File

@@ -1,5 +1,6 @@
#etc/init.d
#etc/init.d/fuse
#etc/rc.d/init.d/fuse
etc/udev/rules.d/99-fuse.rules
sbin/mount.fuse
usr/bin/fusermount
@@ -19,10 +20,13 @@ usr/bin/ulockmgr_server
#usr/lib/libfuse.la
usr/lib/libfuse.so
usr/lib/libfuse.so.2
usr/lib/libfuse.so.2.8.3
usr/lib/libfuse.so.2.9.3
#usr/lib/libulockmgr.a
#usr/lib/libulockmgr.la
usr/lib/libulockmgr.so
usr/lib/libulockmgr.so.1
usr/lib/libulockmgr.so.1.0.1
#usr/lib/pkgconfig/fuse.pc
#usr/share/man/man1/fusermount.1
#usr/share/man/man1/ulockmgr_server.1
#usr/share/man/man8/mount.fuse.8

View File

@@ -122,7 +122,6 @@ etc/rc.d/init.d/static-routes
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/teamspeak
etc/rc.d/init.d/template
#etc/rc.d/init.d/tftpd
etc/rc.d/init.d/tmpfs

View File

@@ -21,7 +21,6 @@
#usr/share/locale/id/LC_MESSAGES/installer.mo
#usr/share/locale/it/LC_MESSAGES/installer.mo
#usr/share/locale/ja/LC_MESSAGES/installer.mo
#usr/share/locale/ja_JP/LC_MESSAGES/installer.mo
#usr/share/locale/jv/LC_MESSAGES/installer.mo
#usr/share/locale/km_KH/LC_MESSAGES/installer.mo
#usr/share/locale/nl/LC_MESSAGES/installer.mo
@@ -30,7 +29,6 @@
#usr/share/locale/pt_PT/LC_MESSAGES/installer.mo
#usr/share/locale/ro_RO/LC_MESSAGES/installer.mo
#usr/share/locale/ru/LC_MESSAGES/installer.mo
#usr/share/locale/ru_RU/LC_MESSAGES/installer.mo
#usr/share/locale/rw/LC_MESSAGES/installer.mo
#usr/share/locale/sk/LC_MESSAGES/installer.mo
#usr/share/locale/sq/LC_MESSAGES/installer.mo

View File

@@ -1,3 +1,5 @@
#etc/logrotate.d
etc/logrotate.d/.empty
#usr/man/man8/logrotate.8
usr/sbin/logrotate
var/lib/logrotate.status

View File

@@ -1,13 +1,20 @@
bin/lowntfs-3g
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.80
lib/libntfs-3g.so.80.0.0
#lib/libntfs-3g.so
lib/libntfs-3g.so.85
lib/libntfs-3g.so.85.0.0
sbin/mkfs.ntfs
sbin/mount.lowntfs-3g
sbin/mount.ntfs-3g
usr/bin/ntfs-3g.probe
usr/bin/ntfs-3g.secaudit
usr/bin/ntfs-3g.usermap
usr/bin/ntfscat
usr/bin/ntfscluster
usr/bin/ntfscmp
usr/bin/ntfsfix
usr/bin/ntfsinfo
usr/bin/ntfsls
#usr/include/ntfs-3g
#usr/include/ntfs-3g/acls.h
#usr/include/ntfs-3g/attrib.h
@@ -36,6 +43,7 @@ usr/bin/ntfs-3g.usermap
#usr/include/ntfs-3g/ntfstime.h
#usr/include/ntfs-3g/object_id.h
#usr/include/ntfs-3g/param.h
#usr/include/ntfs-3g/realpath.h
#usr/include/ntfs-3g/reparse.h
#usr/include/ntfs-3g/runlist.h
#usr/include/ntfs-3g/security.h
@@ -46,13 +54,33 @@ usr/bin/ntfs-3g.usermap
#usr/include/ntfs-3g/xattrs.h
#usr/lib/libntfs-3g.a
#usr/lib/libntfs-3g.la
usr/lib/libntfs-3g.so
#usr/lib/libntfs-3g.so
usr/lib/pkgconfig/libntfs-3g.pc
usr/sbin/mkntfs
usr/sbin/ntfsclone
usr/sbin/ntfscp
usr/sbin/ntfslabel
usr/sbin/ntfsresize
usr/sbin/ntfsundelete
#usr/share/doc/ntfs-3g
#usr/share/doc/ntfs-3g/README
#usr/share/man/man8/mkfs.ntfs.8
#usr/share/man/man8/mkntfs.8
#usr/share/man/man8/mount.lowntfs-3g.8
#usr/share/man/man8/mount.ntfs-3g.8
#usr/share/man/man8/ntfs-3g.8
#usr/share/man/man8/ntfs-3g.probe.8
#usr/share/man/man8/ntfs-3g.secaudit.8
#usr/share/man/man8/ntfs-3g.usermap.8
#usr/share/man/man8/ntfscat.8
#usr/share/man/man8/ntfsclone.8
#usr/share/man/man8/ntfscluster.8
#usr/share/man/man8/ntfscmp.8
#usr/share/man/man8/ntfscp.8
#usr/share/man/man8/ntfsfix.8
#usr/share/man/man8/ntfsinfo.8
#usr/share/man/man8/ntfslabel.8
#usr/share/man/man8/ntfsls.8
#usr/share/man/man8/ntfsprogs.8
#usr/share/man/man8/ntfsresize.8
#usr/share/man/man8/ntfsundelete.8

View File

@@ -18,9 +18,6 @@ usr/share/locale/hu/LC_MESSAGES/setup.mo
usr/share/locale/id/LC_MESSAGES/setup.mo
usr/share/locale/it/LC_MESSAGES/setup.mo
usr/share/locale/ja/LC_MESSAGES/setup.mo
#usr/share/locale/ja_JP
#usr/share/locale/ja_JP/LC_MESSAGES
usr/share/locale/ja_JP/LC_MESSAGES/setup.mo
#usr/share/locale/jv
#usr/share/locale/jv/LC_MESSAGES
usr/share/locale/jv/LC_MESSAGES/setup.mo
@@ -37,9 +34,6 @@ usr/share/locale/pt_PT/LC_MESSAGES/setup.mo
#usr/share/locale/ro_RO/LC_MESSAGES
usr/share/locale/ro_RO/LC_MESSAGES/setup.mo
usr/share/locale/ru/LC_MESSAGES/setup.mo
#usr/share/locale/ru_RU
#usr/share/locale/ru_RU/LC_MESSAGES
usr/share/locale/ru_RU/LC_MESSAGES/setup.mo
usr/share/locale/rw/LC_MESSAGES/setup.mo
usr/share/locale/sk/LC_MESSAGES/setup.mo
usr/share/locale/sq/LC_MESSAGES/setup.mo