Merge branch 'rspezial' of git://git.ipfire.org/ipfire-2.x into rspezial

This commit is contained in:
Michael Tremer
2008-05-28 08:12:07 +02:00
10 changed files with 1780 additions and 0 deletions

View File

@@ -0,0 +1,87 @@
lib/iptables
#lib/iptables/libipt_CLASSIFY.so
#lib/iptables/libipt_CONNMARK.so
#lib/iptables/libipt_DNAT.so
#lib/iptables/libipt_DSCP.so
#lib/iptables/libipt_ECN.so
#lib/iptables/libipt_LOG.so
#lib/iptables/libipt_MARK.so
#lib/iptables/libipt_MASQUERADE.so
#lib/iptables/libipt_MIRROR.so
#lib/iptables/libipt_NETMAP.so
#lib/iptables/libipt_NFQUEUE.so
#lib/iptables/libipt_NOTRACK.so
#lib/iptables/libipt_REDIRECT.so
#lib/iptables/libipt_REJECT.so
#lib/iptables/libipt_SAME.so
#lib/iptables/libipt_SNAT.so
#lib/iptables/libipt_TARPIT.so
#lib/iptables/libipt_TCPMSS.so
#lib/iptables/libipt_TOS.so
#lib/iptables/libipt_TRACE.so
#lib/iptables/libipt_TTL.so
#lib/iptables/libipt_ULOG.so
#lib/iptables/libipt_addrtype.so
#lib/iptables/libipt_ah.so
#lib/iptables/libipt_comment.so
#lib/iptables/libipt_connlimit.so
#lib/iptables/libipt_connmark.so
#lib/iptables/libipt_conntrack.so
#lib/iptables/libipt_dscp.so
#lib/iptables/libipt_ecn.so
#lib/iptables/libipt_esp.so
#lib/iptables/libipt_hashlimit.so
#lib/iptables/libipt_helper.so
#lib/iptables/libipt_icmp.so
#lib/iptables/libipt_iprange.so
#lib/iptables/libipt_length.so
#lib/iptables/libipt_limit.so
#lib/iptables/libipt_mac.so
#lib/iptables/libipt_mark.so
#lib/iptables/libipt_multiport.so
#lib/iptables/libipt_owner.so
#lib/iptables/libipt_physdev.so
#lib/iptables/libipt_pkttype.so
#lib/iptables/libipt_policy.so
#lib/iptables/libipt_realm.so
#lib/iptables/libipt_rpc.so
#lib/iptables/libipt_sctp.so
#lib/iptables/libipt_standard.so
#lib/iptables/libipt_state.so
#lib/iptables/libipt_tcp.so
#lib/iptables/libipt_tcpmss.so
#lib/iptables/libipt_tos.so
#lib/iptables/libipt_ttl.so
#lib/iptables/libipt_udp.so
#lib/iptables/libipt_unclean.so
sbin/iptables
#sbin/iptables-restore
#sbin/iptables-save
#usr/share/man/man8/iptables-restore.8
#usr/share/man/man8/iptables-save.8
#usr/share/man/man8/iptables.8
#lib/iptables/libipt_IMQ.so
#usr/include/libnetfilter_queue
#usr/include/libnetfilter_queue/libipq.h
#usr/include/libnetfilter_queue/libnetfilter_queue.h
#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h
#usr/include/libnfnetlink
#usr/include/libnfnetlink/libnfnetlink.h
#usr/include/libnfnetlink/linux_nfnetlink.h
#usr/lib/libnetfilter_queue.a
#usr/lib/libnetfilter_queue.la
usr/lib/libnetfilter_queue.so
usr/lib/libnetfilter_queue.so.1
usr/lib/libnetfilter_queue.so.1.1.0
#usr/lib/libnetfilter_queue_libipq.a
#usr/lib/libnetfilter_queue_libipq.la
usr/lib/libnetfilter_queue_libipq.so
usr/lib/libnetfilter_queue_libipq.so.1
usr/lib/libnetfilter_queue_libipq.so.1.0.0
#usr/lib/libnfnetlink.a
#usr/lib/libnfnetlink.la
usr/lib/libnfnetlink.so
usr/lib/libnfnetlink.so.0
usr/lib/libnfnetlink.so.0.2.0
#usr/lib/pkgconfig/libnetfilter_queue.pc
#usr/lib/pkgconfig/libnfnetlink.pc

View File

@@ -0,0 +1,267 @@
#etc/l7-protocols
#etc/l7-protocols/CHANGELOG
#etc/l7-protocols/HOWTO
#etc/l7-protocols/LICENSE
#etc/l7-protocols/Makefile
#etc/l7-protocols/README
#etc/l7-protocols/WANTED
#etc/l7-protocols/extra
#etc/l7-protocols/extra/README
#etc/l7-protocols/extra/audiogalaxy.pat
#etc/l7-protocols/extra/http-dap.pat
#etc/l7-protocols/extra/http-freshdownload.pat
#etc/l7-protocols/extra/http-itunes.pat
#etc/l7-protocols/extra/httpaudio.pat
#etc/l7-protocols/extra/httpcachehit.pat
#etc/l7-protocols/extra/httpcachemiss.pat
#etc/l7-protocols/extra/httpvideo.pat
#etc/l7-protocols/extra/pressplay.pat
#etc/l7-protocols/extra/quicktime.pat
#etc/l7-protocols/extra/snmp-mon.pat
#etc/l7-protocols/extra/snmp-trap.pat
#etc/l7-protocols/file_types
#etc/l7-protocols/file_types/README
#etc/l7-protocols/file_types/exe.pat
#etc/l7-protocols/file_types/flash.pat
#etc/l7-protocols/file_types/gif.pat
#etc/l7-protocols/file_types/html.pat
#etc/l7-protocols/file_types/jpeg.pat
#etc/l7-protocols/file_types/ogg.pat
#etc/l7-protocols/file_types/pdf.pat
#etc/l7-protocols/file_types/perl.pat
#etc/l7-protocols/file_types/postscript.pat
#etc/l7-protocols/file_types/rar.pat
#etc/l7-protocols/file_types/rpm.pat
#etc/l7-protocols/file_types/rtf.pat
#etc/l7-protocols/file_types/tar.pat
#etc/l7-protocols/file_types/zip.pat
#etc/l7-protocols/groups.sh
#etc/l7-protocols/l7-protocols.spec
#etc/l7-protocols/malware
#etc/l7-protocols/malware/README
#etc/l7-protocols/malware/code_red.pat
#etc/l7-protocols/malware/nimda.pat
etc/l7-protocols/protocols
#etc/l7-protocols/protocols/100bao.pat
#etc/l7-protocols/protocols/aim.pat
#etc/l7-protocols/protocols/aimwebcontent.pat
#etc/l7-protocols/protocols/applejuice.pat
#etc/l7-protocols/protocols/ares.pat
#etc/l7-protocols/protocols/battlefield1942.pat
#etc/l7-protocols/protocols/battlefield2.pat
#etc/l7-protocols/protocols/bgp.pat
#etc/l7-protocols/protocols/biff.pat
#etc/l7-protocols/protocols/bittorrent.pat
#etc/l7-protocols/protocols/ciscovpn.pat
#etc/l7-protocols/protocols/citrix.pat
#etc/l7-protocols/protocols/counterstrike-source.pat
#etc/l7-protocols/protocols/cvs.pat
#etc/l7-protocols/protocols/dayofdefeat-source.pat
#etc/l7-protocols/protocols/dhcp.pat
#etc/l7-protocols/protocols/directconnect.pat
#etc/l7-protocols/protocols/dns.pat
#etc/l7-protocols/protocols/doom3.pat
#etc/l7-protocols/protocols/edonkey.pat
#etc/l7-protocols/protocols/fasttrack.pat
#etc/l7-protocols/protocols/finger.pat
#etc/l7-protocols/protocols/freenet.pat
#etc/l7-protocols/protocols/ftp.pat
#etc/l7-protocols/protocols/gkrellm.pat
#etc/l7-protocols/protocols/gnucleuslan.pat
#etc/l7-protocols/protocols/gnutella.pat
#etc/l7-protocols/protocols/goboogy.pat
#etc/l7-protocols/protocols/gopher.pat
#etc/l7-protocols/protocols/h323.pat
#etc/l7-protocols/protocols/halflife2-deathmatch.pat
#etc/l7-protocols/protocols/hddtemp.pat
#etc/l7-protocols/protocols/hotline.pat
#etc/l7-protocols/protocols/http-rtsp.pat
#etc/l7-protocols/protocols/http.pat
#etc/l7-protocols/protocols/ident.pat
#etc/l7-protocols/protocols/imap.pat
#etc/l7-protocols/protocols/imesh.pat
#etc/l7-protocols/protocols/ipp.pat
#etc/l7-protocols/protocols/irc.pat
#etc/l7-protocols/protocols/jabber.pat
#etc/l7-protocols/protocols/kugoo.pat
#etc/l7-protocols/protocols/live365.pat
#etc/l7-protocols/protocols/lpd.pat
#etc/l7-protocols/protocols/mohaa.pat
#etc/l7-protocols/protocols/msn-filetransfer.pat
#etc/l7-protocols/protocols/msnmessenger.pat
#etc/l7-protocols/protocols/mute.pat
#etc/l7-protocols/protocols/napster.pat
#etc/l7-protocols/protocols/nbns.pat
#etc/l7-protocols/protocols/ncp.pat
#etc/l7-protocols/protocols/netbios.pat
#etc/l7-protocols/protocols/nntp.pat
#etc/l7-protocols/protocols/ntp.pat
#etc/l7-protocols/protocols/openft.pat
#etc/l7-protocols/protocols/pcanywhere.pat
#etc/l7-protocols/protocols/poco.pat
#etc/l7-protocols/protocols/pop3.pat
#etc/l7-protocols/protocols/qq.pat
#etc/l7-protocols/protocols/quake-halflife.pat
#etc/l7-protocols/protocols/quake1.pat
#etc/l7-protocols/protocols/rdp.pat
#etc/l7-protocols/protocols/rlogin.pat
#etc/l7-protocols/protocols/rtsp.pat
#etc/l7-protocols/protocols/shoutcast.pat
#etc/l7-protocols/protocols/sip.pat
#etc/l7-protocols/protocols/skypeout.pat
#etc/l7-protocols/protocols/skypetoskype.pat
#etc/l7-protocols/protocols/smb.pat
#etc/l7-protocols/protocols/smtp.pat
#etc/l7-protocols/protocols/snmp.pat
#etc/l7-protocols/protocols/socks.pat
#etc/l7-protocols/protocols/soribada.pat
#etc/l7-protocols/protocols/soulseek.pat
#etc/l7-protocols/protocols/ssdp.pat
#etc/l7-protocols/protocols/ssh.pat
#etc/l7-protocols/protocols/ssl.pat
#etc/l7-protocols/protocols/subspace.pat
#etc/l7-protocols/protocols/subversion.pat
#etc/l7-protocols/protocols/teamspeak.pat
#etc/l7-protocols/protocols/telnet.pat
#etc/l7-protocols/protocols/tesla.pat
#etc/l7-protocols/protocols/testing.pat
#etc/l7-protocols/protocols/tftp.pat
#etc/l7-protocols/protocols/thecircle.pat
#etc/l7-protocols/protocols/tls.pat
#etc/l7-protocols/protocols/tsp.pat
#etc/l7-protocols/protocols/unknown.pat
#etc/l7-protocols/protocols/uucp.pat
#etc/l7-protocols/protocols/validcertssl.pat
#etc/l7-protocols/protocols/ventrilo.pat
#etc/l7-protocols/protocols/vnc.pat
#etc/l7-protocols/protocols/whois.pat
#etc/l7-protocols/protocols/worldofwarcraft.pat
#etc/l7-protocols/protocols/x11.pat
#etc/l7-protocols/protocols/xboxlive.pat
#etc/l7-protocols/protocols/xunlei.pat
#etc/l7-protocols/protocols/yahoo.pat
#etc/l7-protocols/protocols/zmaap.pat
#etc/l7-protocols/testing
#etc/l7-protocols/testing/Makefile
#etc/l7-protocols/testing/README
#etc/l7-protocols/testing/add.sh
#etc/l7-protocols/testing/data
#etc/l7-protocols/testing/data/aim-1
#etc/l7-protocols/testing/data/aim-2
#etc/l7-protocols/testing/data/aim-3
#etc/l7-protocols/testing/data/aim-4
#etc/l7-protocols/testing/data/aim-5
#etc/l7-protocols/testing/data/aim-6
#etc/l7-protocols/testing/data/bittorrent-a-1
#etc/l7-protocols/testing/data/bittorrent-a-2
#etc/l7-protocols/testing/data/bittorrent-a-3
#etc/l7-protocols/testing/data/bittorrent-a-4
#etc/l7-protocols/testing/data/bittorrent-b-1
#etc/l7-protocols/testing/data/bittorrent-b-2
#etc/l7-protocols/testing/data/bittorrent-b-3
#etc/l7-protocols/testing/data/bittorrent-b-4
#etc/l7-protocols/testing/data/dce-rpc-spam-a-1
#etc/l7-protocols/testing/data/dce-rpc-spam-b-1
#etc/l7-protocols/testing/data/dns-1
#etc/l7-protocols/testing/data/dns-2
#etc/l7-protocols/testing/data/edonkey-tcp-a-1
#etc/l7-protocols/testing/data/edonkey-tcp-a-2
#etc/l7-protocols/testing/data/edonkey-tcp-b-1
#etc/l7-protocols/testing/data/edonkey-tcp-b-2
#etc/l7-protocols/testing/data/edonkey-tcp-b-3
#etc/l7-protocols/testing/data/edonkey-tcp-b-4
#etc/l7-protocols/testing/data/edonkey-tcp-b-5
#etc/l7-protocols/testing/data/edonkey-tcp-b-6
#etc/l7-protocols/testing/data/edonkey-udp-a-1
#etc/l7-protocols/testing/data/edonkey-udp-b-1
#etc/l7-protocols/testing/data/ftp-1
#etc/l7-protocols/testing/data/ftp-2
#etc/l7-protocols/testing/data/ftp-3
#etc/l7-protocols/testing/data/ftp-4
#etc/l7-protocols/testing/data/ftp-5
#etc/l7-protocols/testing/data/gnutella-1
#etc/l7-protocols/testing/data/gnutella-2
#etc/l7-protocols/testing/data/gnutella-3
#etc/l7-protocols/testing/data/gnutella-connect-1
#etc/l7-protocols/testing/data/gnutella-connect-2
#etc/l7-protocols/testing/data/gnutella-udp-a-1
#etc/l7-protocols/testing/data/gnutella-udp-b-1
#etc/l7-protocols/testing/data/gnutella-udp-c-1
#etc/l7-protocols/testing/data/http-digg-304-1
#etc/l7-protocols/testing/data/http-digg-304-2
#etc/l7-protocols/testing/data/http-wunderground-1
#etc/l7-protocols/testing/data/http-wunderground-2
#etc/l7-protocols/testing/data/imap-1
#etc/l7-protocols/testing/data/imap-2
#etc/l7-protocols/testing/data/imap-3
#etc/l7-protocols/testing/data/imap-4
#etc/l7-protocols/testing/data/imap-5
#etc/l7-protocols/testing/data/imap-6
#etc/l7-protocols/testing/data/ipp-1
#etc/l7-protocols/testing/data/jabber-1
#etc/l7-protocols/testing/data/jabber-2
#etc/l7-protocols/testing/data/jabber-3
#etc/l7-protocols/testing/data/jabber-4
#etc/l7-protocols/testing/data/jabber-5
#etc/l7-protocols/testing/data/jabber-6
#etc/l7-protocols/testing/data/skypeout-a-1
#etc/l7-protocols/testing/data/skypeout-a-2
#etc/l7-protocols/testing/data/skypeout-a-3
#etc/l7-protocols/testing/data/skypeout-a-4
#etc/l7-protocols/testing/data/skypeout-a-5
#etc/l7-protocols/testing/data/skypeout-a-6
#etc/l7-protocols/testing/data/skypeout-b-1
#etc/l7-protocols/testing/data/skypeout-b-2
#etc/l7-protocols/testing/data/skypeout-b-3
#etc/l7-protocols/testing/data/skypeout-b-4
#etc/l7-protocols/testing/data/skypeout-b-5
#etc/l7-protocols/testing/data/skypeout-b-6
#etc/l7-protocols/testing/data/skypeout-b-7
#etc/l7-protocols/testing/data/skypeout-b-8
#etc/l7-protocols/testing/data/skypeout-b-9
#etc/l7-protocols/testing/data/skypeout-c-1
#etc/l7-protocols/testing/data/skypeout-c-2
#etc/l7-protocols/testing/data/skypeout-c-3
#etc/l7-protocols/testing/data/skypeout-c-4
#etc/l7-protocols/testing/data/skypeout-c-5
#etc/l7-protocols/testing/data/skypeout-c-6
#etc/l7-protocols/testing/data/skypeout-c-7
#etc/l7-protocols/testing/data/skypeout-c-8
#etc/l7-protocols/testing/data/skypeout-c-9
#etc/l7-protocols/testing/data/ssdp-1
#etc/l7-protocols/testing/data/ssh-1
#etc/l7-protocols/testing/data/ssh-2
#etc/l7-protocols/testing/data/ssh-3
#etc/l7-protocols/testing/data/ssh-4
#etc/l7-protocols/testing/data/ssh-5
#etc/l7-protocols/testing/data/ssh-6
#etc/l7-protocols/testing/data/validcertssl-1
#etc/l7-protocols/testing/data/validcertssl-2
#etc/l7-protocols/testing/data/validcertssl-3
#etc/l7-protocols/testing/data/validcertssl-4
#etc/l7-protocols/testing/data/validcertssl-5
#etc/l7-protocols/testing/data/validcertssl-6
#etc/l7-protocols/testing/data/winmx-1
#etc/l7-protocols/testing/data/winmx-2
#etc/l7-protocols/testing/data/winmx-3
#etc/l7-protocols/testing/data/x11-1
#etc/l7-protocols/testing/data/x11-2
#etc/l7-protocols/testing/data/x11-3
#etc/l7-protocols/testing/data/x11-4
#etc/l7-protocols/testing/data/x11-5
#etc/l7-protocols/testing/data/yahoo-1
#etc/l7-protocols/testing/data/yahoo-2
#etc/l7-protocols/testing/data/yahoo-3
#etc/l7-protocols/testing/data/yahoo-4
#etc/l7-protocols/testing/match.c
#etc/l7-protocols/testing/randchars.c
#etc/l7-protocols/testing/randprintable.c
#etc/l7-protocols/testing/regexp
#etc/l7-protocols/testing/regexp/regerror.c
#etc/l7-protocols/testing/regexp/regexp.c
#etc/l7-protocols/testing/regexp/regexp.h
#etc/l7-protocols/testing/regexp/regmagic.h
#etc/l7-protocols/testing/regexp/regsub.c
#etc/l7-protocols/testing/test_match.sh
#etc/l7-protocols/testing/test_speed.c
#etc/l7-protocols/testing/timeit.sh

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,24 @@
etc/sensors3.conf
usr/bin/sensors
usr/bin/sensors-conf-convert
#usr/include/sensors
#usr/include/sensors/error.h
#usr/include/sensors/sensors.h
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
usr/lib/libsensors.so.4.0.2
#usr/man/man1/sensors.1
#usr/man/man3
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
#usr/man/man8/fancontrol.8
#usr/man/man8/isadump.8
#usr/man/man8/isaset.8
#usr/man/man8/pwmconfig.8
#usr/local/man/man8/sensors-detect.8
usr/sbin/fancontrol
usr/sbin/isadump
usr/sbin/isaset
usr/sbin/pwmconfig
usr/sbin/sensors-detect

View File

@@ -0,0 +1,9 @@
#etc/pcmcia
etc/pcmcia/config.opts
etc/udev/rules.d/60-pcmcia.rules
sbin/lspcmcia
sbin/pccardctl
sbin/pcmcia-check-broken-cis
sbin/pcmcia-socket-startup
#usr/share/man/man8/lspcmcia.8
#usr/share/man/man8/pccardctl.8

View File

@@ -0,0 +1,6 @@
/etc/cron.d
/etc/cron.d/vnstat
/etc/vnstat.conf
/usr/bin/vnstat
#usr/share/man/man1/vnstat.1
/var/log/vnstat

View File

@@ -0,0 +1,2 @@
/usr/bin/vnstati
#usr/share/man/man1/vnstati.1.gz

View File

@@ -0,0 +1,3 @@
#
# update.sh is not finished yet ...
#

75
lfs/updater Normal file
View File

@@ -0,0 +1,75 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = ipfire
THISAPP = updater
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
install : $(TARGET)
check :
download :
md5 :
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -rf /install/updater /tmp/*
# Compress files of filelists
# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
mkdir -p /install/updater
find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
tar -c -C / --files-from=/tmp/ROOTFILES \
-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
--exclude='proc/*' --exclude='tmp/ROOTFILES'
rm -f /tmp/ROOTFILES
tar -x -C /tmp -f /$(SNAME).tar
rm -f /$(SNAME).tar
cd /tmp && tar cf /install/updater/files * && rm -rf *
tar tf /install/updater/files > /install/updater/ROOTFILES
# Other files
cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
chmod 755 /install/updater/update.sh
cd /install/updater && tar cf ../packages/updater-$(SNAME)-$(VERSION).ipfire \
update.sh files ROOTFILES
rm -rf /install/updater
# sed -e "s/NAME/updater/g" \
# -e "s/VER/$(VERSION)/g" \
# -e "s/RELEASE/$$(basename $@)/g" \
# -e "s/DEPS/$(DEPS)/g" \
# -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-$(VERSION)-$$(basename $@).ipfire | awk '{ print $$5 }'`/g" \
# < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-$$(basename $@)

View File

@@ -649,6 +649,9 @@ buildpackages() {
fi
mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
# Create updater package
ipfiremake updater
ipfirepackages
# Cleanup