From: ms Date: Sun, 30 Jul 2006 20:13:22 +0000 (+0000) Subject: Hinzugefügt: X-Git-Tag: v2.3-beta1~1021 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=b734d091870f7141e9a92813361e1dc714801a02 Hinzugefügt: * Ein tftp-Server für space. * xinetd standardmäßig installiert in der ISO. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@233 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/xinetd/swat b/config/xinetd/swat new file mode 100644 index 0000000000..2083beca31 --- /dev/null +++ b/config/xinetd/swat @@ -0,0 +1,28 @@ +# Begin /var/ipfire/xinetd/xinetd.d/swat + +service swat +{ + port = 901 + socket_type = stream + wait = no +# only_from = 127.0.0.1 + user = root + server = /usr/sbin/swat + log_on_failure += USERID +} + +# End /var/ipfire/xinetd/xinetd.d/swat +# Begin /var/ipfire/xinetd/xinetd.d/swat + +service swat +{ + port = 901 + socket_type = stream + wait = no +# only_from = 127.0.0.1 + user = root + server = /usr/sbin/swat + log_on_failure += USERID +} + +# End /var/ipfire/xinetd/xinetd.d/swat diff --git a/config/xinetd/tftpd-hpa b/config/xinetd/tftpd-hpa new file mode 100644 index 0000000000..18298de446 --- /dev/null +++ b/config/xinetd/tftpd-hpa @@ -0,0 +1,17 @@ +# description: The tftp server serves files using the trivial file transfer \ +# protocol. The tftp protocol is often used to boot diskless \ +# workstations, download configuration files to network-aware printers, \ +# and to start the installation process for some operating systems. +service tftp +{ + socket_type = dgram + protocol = udp + wait = yes + user = root + server = /usr/sbin/in.tftpd + server_args = -s /var/log/tftpboot + disable = no + per_source = 11 + cps = 100 2 + flags = IPv4 +} diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 6e61b7424d..6a402ac794 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -198,6 +198,7 @@ * razor-agents-2.81 * rp-pppoe-3.5 * rrdtool-1.0.49 + * samba-3.0.22 * samba-3.0.23a * sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15 * screen-4.0.2 diff --git a/lfs/samba b/lfs/samba index eaffd938da..b1a8ddda66 100644 --- a/lfs/samba +++ b/lfs/samba @@ -101,20 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # cd $(DIR_APP)/source && install -v -m755 -d /usr/share/doc/samba-3.0.22 # cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22 # cd $(DIR_APP)/source && ln -v -s ../../samba/swat /usr/share/doc/samba-3.0.22 - echo "swat 901/tcp" >> /etc/services - echo "# Begin /var/ipfire/xinetd/xinetd.d/swat" >> /var/ipfire/xinetd/xinetd.d/swat - echo "" >> /var/ipfire/xinetd/xinetd.d/swat - echo "service swat" >> /var/ipfire/xinetd/xinetd.d/swat - echo "{" >> /var/ipfire/xinetd/xinetd.d/swat - echo " port = 901" >> /var/ipfire/xinetd/xinetd.d/swat - echo " socket_type = stream" >> /var/ipfire/xinetd/xinetd.d/swat - echo " wait = no" >> /var/ipfire/xinetd/xinetd.d/swat - echo "# only_from = 127.0.0.1" >> /var/ipfire/xinetd/xinetd.d/swat - echo " user = root" >> /var/ipfire/xinetd/xinetd.d/swat - echo " server = /usr/sbin/swat" >> /var/ipfire/xinetd/xinetd.d/swat - echo " log_on_failure += USERID" >> /var/ipfire/xinetd/xinetd.d/swat - echo "}" >> /var/ipfire/xinetd/xinetd.d/swat - echo "" >> /var/ipfire/xinetd/xinetd.d/swat - echo "# End /var/ipfire/xinetd/xinetd.d/swat" >> /var/ipfire/xinetd/xinetd.d/swat + cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/tftp-hpa b/lfs/tftp-hpa new file mode 100644 index 0000000000..cd871bb187 --- /dev/null +++ b/lfs/tftp-hpa @@ -0,0 +1,86 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop 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 IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.42 + +THISAPP = tftp-hpa-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = tftp-hpa +PAK_VER = ipfire-beta1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 98ecf77f8558b4f562794f71e29fed86 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --without-tcpwrappers + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + -mkdir /var/log/tftpboot + cp -f $(DIR_CONF)/xinetd/tftpd-hpa /var/ipfire/xinetd/xinetd.d/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 2aa472489a..273ab1a198 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -27743,3 +27743,16 @@ usr/sbin/smartctl #usr/share/man/man5/smartd.conf.5 #usr/share/man/man8/smartctl.8 #usr/share/man/man8/smartd.8 +## +## xinetd +## +#usr/sbin/itox +#usr/sbin/xconv.pl +usr/sbin/xinetd +#usr/share/man/man5/xinetd.conf.5 +#usr/share/man/man8/itox.8 +#usr/share/man/man8/xconv.pl.8 +#usr/share/man/man8/xinetd.8 +#usr/share/man/man8/xinetd.log.8 +var/ipfire/xinetd/xinetd.conf +#var/ipfire/xinetd/xinetd.d diff --git a/src/boot.d/98-xinetd b/src/boot.d/98-xinetd new file mode 100644 index 0000000000..0d34a01868 --- /dev/null +++ b/src/boot.d/98-xinetd @@ -0,0 +1,3 @@ +#!/bin/sh +echo "Starting xinetd" +/usr/sbin/xinetd -f /var/ipfire/xinetd/xinetd.conf diff --git a/src/paks/tftp-hpa/ROOTFILES b/src/paks/tftp-hpa/ROOTFILES new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/paks/tftp-hpa/install.sh b/src/paks/tftp-hpa/install.sh new file mode 100644 index 0000000000..3a9ce551bf --- /dev/null +++ b/src/paks/tftp-hpa/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Extract the files +tar xfz files.tgz -C / +cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2 diff --git a/src/paks/tftp-hpa/uninstall.sh b/src/paks/tftp-hpa/uninstall.sh new file mode 100644 index 0000000000..ad6122665e --- /dev/null +++ b/src/paks/tftp-hpa/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash +################################################################# +# # +# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org # +# # +################################################################# +# +# Delete the files +## Befehl fehlt noch +rm -f /opt/pakfire/installed/ROOTFILES.$2