Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Jan Paul Tuecking
2010-07-13 13:13:44 +02:00
26 changed files with 197 additions and 92 deletions

View File

@@ -78,6 +78,7 @@ 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-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-pakfire-update
#etc/rc.d/init.d/openvmtools
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut

View File

@@ -25,21 +25,24 @@ etc/ppp/standardloginscript
#usr/include/pppd/pathnames.h
#usr/include/pppd/pppcrypt.h
#usr/include/pppd/pppd.h
#usr/include/pppd/session.h
#usr/include/pppd/sha1.h
#usr/include/pppd/spinlock.h
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
#usr/lib/pppd
#usr/lib/pppd/2.4.4
usr/lib/pppd/2.4.4/minconn.so
usr/lib/pppd/2.4.4/passprompt.so
usr/lib/pppd/2.4.4/passwordfd.so
usr/lib/pppd/2.4.4/pppoatm.so
usr/lib/pppd/2.4.4/radattr.so
usr/lib/pppd/2.4.4/radius.so
usr/lib/pppd/2.4.4/radrealms.so
usr/lib/pppd/2.4.4/rp-pppoe.so
usr/lib/pppd/2.4.4/winbind.so
usr/lib/pppd
usr/lib/pppd/2.4.5
usr/lib/pppd/2.4.5/minconn.so
usr/lib/pppd/2.4.5/openl2tp.so
usr/lib/pppd/2.4.5/passprompt.so
usr/lib/pppd/2.4.5/passwordfd.so
usr/lib/pppd/2.4.5/pppoatm.so
usr/lib/pppd/2.4.5/pppol2tp.so
usr/lib/pppd/2.4.5/radattr.so
usr/lib/pppd/2.4.5/radius.so
usr/lib/pppd/2.4.5/radrealms.so
usr/lib/pppd/2.4.5/rp-pppoe.so
usr/lib/pppd/2.4.5/winbind.so
usr/sbin/chat
usr/sbin/pppd
usr/sbin/pppdump

View File

@@ -1,33 +0,0 @@
#etc/ppp/firewall-masq
#etc/ppp/firewall-standalone
#etc/ppp/plugins
#etc/ppp/plugins/README
#etc/ppp/pppoe-server-options
etc/ppp/pppoe.conf
#usr/man/man5/pppoe.conf.5
#usr/man/man8/pppoe-connect.8
#usr/man/man8/pppoe-relay.8
#usr/man/man8/pppoe-server.8
#usr/man/man8/pppoe-setup.8
#usr/man/man8/pppoe-sniff.8
#usr/man/man8/pppoe-start.8
#usr/man/man8/pppoe-status.8
#usr/man/man8/pppoe-stop.8
#usr/man/man8/pppoe.8
usr/sbin/pppoe
usr/sbin/pppoe-connect
#usr/sbin/pppoe-relay
#usr/sbin/pppoe-server
usr/sbin/pppoe-setup
usr/sbin/pppoe-sniff
usr/sbin/pppoe-start
usr/sbin/pppoe-status
usr/sbin/pppoe-stop
#usr/share/doc/rp-pppoe-3.8
#usr/share/doc/rp-pppoe-3.8/CHANGES
#usr/share/doc/rp-pppoe-3.8/HOW-TO-CONNECT
#usr/share/doc/rp-pppoe-3.8/KERNEL-MODE-PPPOE
#usr/share/doc/rp-pppoe-3.8/LICENSE
#usr/share/doc/rp-pppoe-3.8/README
#usr/share/doc/rp-pppoe-3.8/SERVPOET
#usr/share/doc/rp-pppoe-3.8/pap-secrets

View File

@@ -0,0 +1,2 @@
etc/ppp/chap-secrets
etc/ppp/pap-secrets

View File

@@ -1 +1,6 @@
etc/system-release
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/networking/red
etc/rc.d/helper/getdnsfromdhcpc.pl
srv/web/ipfire/cgi-bin/pppsetup.cgi
usr/local/bin/backupiso

View File

@@ -0,0 +1 @@
../../../common/ppp

View File

@@ -0,0 +1,3 @@
usr/bin/ddrescue
#usr/share/info/ddrescue.info
#usr/share/man/man1/ddrescue.1

View File

@@ -0,0 +1,26 @@
usr/bin/ascii-xfr
usr/bin/minicom
usr/bin/runscript
usr/bin/xminicom
#usr/share/locale/cs/LC_MESSAGES/minicom.mo
#usr/share/locale/da/LC_MESSAGES/minicom.mo
#usr/share/locale/de/LC_MESSAGES/minicom.mo
#usr/share/locale/es/LC_MESSAGES/minicom.mo
#usr/share/locale/fi/LC_MESSAGES/minicom.mo
#usr/share/locale/fr/LC_MESSAGES/minicom.mo
#usr/share/locale/hu/LC_MESSAGES/minicom.mo
#usr/share/locale/id/LC_MESSAGES/minicom.mo
#usr/share/locale/ja/LC_MESSAGES/minicom.mo
#usr/share/locale/nb/LC_MESSAGES/minicom.mo
#usr/share/locale/pl/LC_MESSAGES/minicom.mo
#usr/share/locale/pt_BR/LC_MESSAGES/minicom.mo
#usr/share/locale/ro/LC_MESSAGES/minicom.mo
#usr/share/locale/ru/LC_MESSAGES/minicom.mo
#usr/share/locale/rw/LC_MESSAGES/minicom.mo
#usr/share/locale/sv/LC_MESSAGES/minicom.mo
#usr/share/locale/vi/LC_MESSAGES/minicom.mo
#usr/share/locale/zh_TW/LC_MESSAGES/minicom.mo
#usr/share/man/man1/ascii-xfr.1
#usr/share/man/man1/minicom.1
#usr/share/man/man1/runscript.1
#usr/share/man/man1/xminicom.1

View File

@@ -1,8 +1,10 @@
etc/watchdog.conf
usr/sbin/watchdog
usr/sbin/wd_identify
usr/sbin/wd_keepalive
#usr/share/man/man5/watchdog.conf.5
#usr/share/man/man8/watchdog.8
#usr/share/man/man8/wd_identify.8
#usr/share/man/man8/wd_keepalive.8
var/ipfire/backup/addons/includes/watchdog
etc/rc.d/init.d/watchdog