Hinzugefügt:

  * Samba - Erste Test-Version
  * STUNNEL - bisher nicht verwendet, aber SWAT sendet das root-Passwort im Klartext über die Leitung
Geändert:
  * Linux-PAM - Libs waren falsch verlinkt

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@100 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/etc/group b/config/etc/group
index 05706d0ec1243be21c8952f664dd9658fa7a37aa..9d64bdf3dfee59b7dd3ad8e7d0de008850daebd1 100644 (file)
--- a/config/etc/group
+++ b/config/etc/group
@@ -17,6 +17,7 @@ utmp:x:22:
 squid:x:23:
 ntp:x:38:
 dip:x:40:
+stunnel:x:51:
 lock:x:54:
 sshd:x:74:
 pcap:x:77:

diff --git a/config/etc/passwd b/config/etc/passwd
index 90d078268d2368d3f2280346e608f8badb3fc253..124cca8a6c84a20aa8ba079e6ec90deaa060a566 100644 (file)
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -13,3 +13,4 @@ cron:x:104:104::/:/bin/false
 syslogd:x:105:105:/var/empty:/bin/false
 klogd:x:106:106:/var/empty:/bin/false
 postfix:x:1000:100::/var/spool/postfix:/bin/false
+stunnel:x:51:51:Stunnel Daemon:/var/lib/stunnel:/bin/false

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 658cf04527ee3262b2cd3c20027e2f00d8825510..bd1d335066a70d996dc40ee4d4324d232a2bc20f 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -147,6 +147,7 @@
   * pwlib_1.5.2
   * rp-pppoe-3.5
   * rrdtool-1.0.49
+  * samba-3.0.22
   * sed-4.0.9
   * setserial-2.17
   * shadow-4.0.4.1
@@ -156,6 +157,7 @@
   * squid-2.5.STABLE13
   * squid-graph-3.1
   * stund_0.96_Aug13
+  * stunnel-4.15
   * sudo-1.6.8p12
   * sysklogd-1.4.1
   * syslinux-2.11

diff --git a/lfs/pam b/lfs/pam
index 85f700dd46eef80593beb216270d9a01867ec320..90dd18c9c5c8d3717fba6665a14cd75869d9764c 100644 (file)
--- a/lfs/pam
+++ b/lfs/pam
@@ -89,8 +89,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        mv -v /lib/security/pam_tally /sbin
        mv -v /usr/lib/libpam*.so.0* /lib
-       ln -v -sf ../../lib/libpam.so.0.81.1 /usr/lib/libpam.so
+       ln -v -sf ../../lib/libpam.so.0.81.2 /usr/lib/libpam.so
        ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so
-       ln -v -sf ../../lib/libpam_misc.so.0.81.1 /usr/lib/libpam_misc.so
+       ln -v -sf ../../lib/libpam_misc.so.0.81.2 /usr/lib/libpam_misc.so
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/samba b/lfs/samba
new file mode 100644 (file)
index 0000000..dfd25fc
--- /dev/null
+++ b/lfs/samba
@@ -0,0 +1,125 @@
+###############################################################################
+# 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 <rod@sunsetsystems.com>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.0.22
+
+THISAPP    = samba-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = ftp://ftp.samba.org/pub/samba
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 5c39505af17cf5caf3d6ed8bab135036
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh samba $(THISAPP)
+
+###############################################################################
+# 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)/source && ./configure \
+                                   --prefix=/usr \
+                                   --sysconfdir=/etc \
+                                   --localstatedir=/var \
+                                   --with-piddir=/var/run \
+                                   --with-fhs \
+                                   --with-smbmount \
+                                   --with-winbind \
+                                   --with-pam
+       cd $(DIR_APP)/source && make && make nsswitch
+       cd $(DIR_APP)/source && make install
+       cd $(DIR_APP)/source && mv -v /usr/lib/samba/libsmbclient.so /usr/lib
+       cd $(DIR_APP)/source && ln -v -sf ../libsmbclient.so /usr/lib/samba
+       cd $(DIR_APP)/source && ln -v -sf libsmbclient.so /usr/lib/libsmbclient.so.0
+       cd $(DIR_APP)/source && chmod -v 644 /usr/include/lib{smbclient,msrpc}.h
+       cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_wins.so /lib
+       cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_winbind.so /lib
+       cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
+       cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
+       cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
+       cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /etc/samba
+       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 /etc/xinetd.d/swat"               >> /etc/xinetd.d/swat
+       echo ""                                 >> /etc/xinetd.d/swat
+       echo "service swat"                             >> /etc/xinetd.d/swat
+       echo "{"                                        >> /etc/xinetd.d/swat
+       echo "    port            = 901"                >> /etc/xinetd.d/swat
+       echo "    socket_type     = stream"     >> /etc/xinetd.d/swat
+       echo "    wait            = no"         >> /etc/xinetd.d/swat
+       echo "    only_from       = 127.0.0.1"  >> /etc/xinetd.d/swat
+       echo "    user            = root"               >> /etc/xinetd.d/swat
+       echo "    server          = /usr/sbin/swat"     >> /etc/xinetd.d/swat
+       echo "    log_on_failure  += USERID"    >> /etc/xinetd.d/swat
+       echo "}"                                        >> /etc/xinetd.d/swat
+       echo ""                                 >> /etc/xinetd.d/swat
+       echo "# End /etc/xinetd.d/swat"         >> /etc/xinetd.d/swat
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/stunnel b/lfs/stunnel
new file mode 100644 (file)
index 0000000..ede0527
--- /dev/null
+++ b/lfs/stunnel
@@ -0,0 +1,99 @@
+###############################################################################
+# 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 <rod@sunsetsystems.com>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 4.15
+
+THISAPP    = stunnel-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = ftp://stunnel.mirt.net/stunnel
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2c00153ad099a5f9c5609e8d1dbbe470
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh stunnel $(THISAPP)
+
+###############################################################################
+# 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) && install -v -m 1770 -o stunnel -g stunnel -d /var/lib/stunnel/run
+       cd $(DIR_APP) && sed -i -e 's|nogroup|stunnel|' -e 's|$(prefix)/var/lib|$(localstatedir)|' tools/Makefile.in
+       cd $(DIR_APP) && sed -i 's|doc/stunnel|&-$(VERSION)|' {,doc/,tools/}Makefile.in
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-libwrap
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       echo "# File: /etc/stunnel/stunnel.conf"        > /etc/stunnel/stunnel.conf
+       echo ""                                         >> /etc/stunnel/stunnel.conf
+       echo "pid = /run/stunnel.pid"           >> /etc/stunnel/stunnel.conf
+       echo "chroot = /var/lib/stunnel"                >> /etc/stunnel/stunnel.conf
+       echo "client = no"                              >> /etc/stunnel/stunnel.conf
+       echo "setuid = stunnel"                         >> /etc/stunnel/stunnel.conf
+       echo "setgid = stunnel"                         >> /etc/stunnel/stunnel.conf
+       chmod -v 644 /etc/stunnel/stunnel.conf
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
\ No newline at end of file

diff --git a/make.sh b/make.sh
index 187e4dfec34e5b617c3fbbe08bc096d3009978bf..5f47f1a2f120abdc036711de76c429aad8ce9375 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -648,6 +648,7 @@ buildipcop() {
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
   ipcopmake sudo
+##ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
   ipcopmake xinetd
   ipcopmake pkg-config
   ipcopmake glib
@@ -660,7 +661,7 @@ buildipcop() {
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
-#  ipcopmake samba
+  ipcopmake samba
   ipcopmake mc
   ipcopmake postfix
   ipcopmake stund

diff --git a/src/paks/samba/CONFFILES b/src/paks/samba/CONFFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/samba/ROOTFILES b/src/paks/samba/ROOTFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
+++ b/src/paks/samba/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/samba/uninstall.sh b/src/paks/samba/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
+++ b/src/paks/samba/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

diff --git a/src/paks/stunnel/CONFFILES b/src/paks/stunnel/CONFFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/stunnel/ROOTFILES b/src/paks/stunnel/ROOTFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/stunnel/install.sh b/src/paks/stunnel/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
+++ b/src/paks/stunnel/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/stunnel/uninstall.sh b/src/paks/stunnel/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
+++ b/src/paks/stunnel/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