Geändert:

[ipfire-2.x.git] / lfs / samba

diff --git a/lfs/samba b/lfs/samba
index e7b3d9d75c99b6b146dc8ed924f1bcc40d6d6248..f74eeb959f9f0c420ab4430044421b31ce67697a 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -39,6 +39,8 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = ftp://ftp.samba.org/pub/samba
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = samba
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -59,7 +61,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh samba $(THISAPP)
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -83,13 +85,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP)/source && ./configure \
                                    --prefix=/usr \
-                                   --sysconfdir=/var/ipfire/samba \
+                                   --sysconfdir=/var/ipfire \
                                    --localstatedir=/var \
                                    --with-piddir=/var/run \
                                    --with-fhs \
                                    --with-smbmount \
                                    --with-winbind \
-                                   --with-pam
+                                   --without-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
@@ -100,25 +102,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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 -m755 nsswitch/pam_winbind.so /lib/security
        cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/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 /var/ipfire/xinetd.d/swat"                >> /var/ipfire/xinetd.d/swat
-       echo ""                                 >> /var/ipfire/xinetd.d/swat
-       echo "service swat"                             >> /var/ipfire/xinetd.d/swat
-       echo "{"                                        >> /var/ipfire/xinetd.d/swat
-       echo "    port            = 901"                >> /var/ipfire/xinetd.d/swat
-       echo "    socket_type     = stream"     >> /var/ipfire/xinetd.d/swat
-       echo "    wait            = no"         >> /var/ipfire/xinetd.d/swat
-       echo "    only_from       = 127.0.0.1"  >> /var/ipfire/xinetd.d/swat
-       echo "    user            = root"               >> /var/ipfire/xinetd.d/swat
-       echo "    server          = /usr/sbin/swat"     >> /var/ipfire/xinetd.d/swat
-       echo "    log_on_failure  += USERID"    >> /var/ipfire/xinetd.d/swat
-       echo "}"                                        >> /var/ipfire/xinetd.d/swat
-       echo ""                                 >> /var/ipfire/xinetd.d/swat
-       echo "# End /var/ipfire/xinetd.d/swat"          >> /var/ipfire/xinetd.d/swat
+       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
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)