webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated samba to current stable.

Browse Source 
The passsb packend has been change by the samba team, so we need
to fix our config.
This commit is contained in:
Christian Schmidt
2010-03-10 23:03:29 +01:00
parent 762b480cc4
commit 00a5af61dd
5 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
config/rootfiles/packages/samba
View File

@@ -1,7 +1,3 @@
lib/libnss_winbind.so
lib/libnss_winbind.so.2
lib/libnss_wins.so
lib/libnss_wins.so.2
usr/bin/eventlogadm usr/bin/eventlogadm
usr/bin/findsmb usr/bin/findsmb
usr/bin/ldbadd usr/bin/ldbadd
@@ -37,6 +33,7 @@ usr/bin/wbinfo
#usr/include/smb_share_modes.h #usr/include/smb_share_modes.h
#usr/include/talloc.h #usr/include/talloc.h
#usr/include/tdb.h #usr/include/tdb.h
#usr/include/wbc_async.h
#usr/include/wbclient.h #usr/include/wbclient.h
usr/lib/libnetapi.so usr/lib/libnetapi.so
usr/lib/libnetapi.so.0 usr/lib/libnetapi.so.0
@@ -45,7 +42,7 @@ usr/lib/libsmbclient.so.0
usr/lib/libsmbsharemodes.so usr/lib/libsmbsharemodes.so
usr/lib/libsmbsharemodes.so.0 usr/lib/libsmbsharemodes.so.0
usr/lib/libtalloc.so usr/lib/libtalloc.so
usr/lib/libtalloc.so.1 usr/lib/libtalloc.so.2
usr/lib/libtdb.so usr/lib/libtdb.so
usr/lib/libtdb.so.1 usr/lib/libtdb.so.1
usr/lib/libwbclient.so usr/lib/libwbclient.so
@@ -61,6 +58,7 @@ usr/lib/samba/idmap
usr/lib/samba/lowcase.dat usr/lib/samba/lowcase.dat
usr/lib/samba/nss_info usr/lib/samba/nss_info
usr/lib/samba/pdb usr/lib/samba/pdb
usr/lib/samba/perfcount
usr/lib/samba/rpc usr/lib/samba/rpc
usr/lib/samba/upcase.dat usr/lib/samba/upcase.dat
usr/lib/samba/valid.dat usr/lib/samba/valid.dat
@@ -69,6 +67,7 @@ usr/lib/samba/vfs/acl_tdb.so
usr/lib/samba/vfs/acl_xattr.so usr/lib/samba/vfs/acl_xattr.so
usr/lib/samba/vfs/audit.so usr/lib/samba/vfs/audit.so
usr/lib/samba/vfs/cap.so usr/lib/samba/vfs/cap.so
usr/lib/samba/vfs/catia.so
usr/lib/samba/vfs/default_quota.so usr/lib/samba/vfs/default_quota.so
usr/lib/samba/vfs/dirsort.so usr/lib/samba/vfs/dirsort.so
usr/lib/samba/vfs/expand_msdfs.so usr/lib/samba/vfs/expand_msdfs.so
@@ -81,6 +80,7 @@ usr/lib/samba/vfs/preopen.so
usr/lib/samba/vfs/readahead.so usr/lib/samba/vfs/readahead.so
usr/lib/samba/vfs/readonly.so usr/lib/samba/vfs/readonly.so
usr/lib/samba/vfs/recycle.so usr/lib/samba/vfs/recycle.so
usr/lib/samba/vfs/scannedonly.so
usr/lib/samba/vfs/shadow_copy.so usr/lib/samba/vfs/shadow_copy.so
usr/lib/samba/vfs/shadow_copy2.so usr/lib/samba/vfs/shadow_copy2.so
usr/lib/samba/vfs/smb_traffic_analyzer.so usr/lib/samba/vfs/smb_traffic_analyzer.so
@@ -88,12 +88,33 @@ usr/lib/samba/vfs/streams_depot.so
usr/lib/samba/vfs/streams_xattr.so usr/lib/samba/vfs/streams_xattr.so
usr/lib/samba/vfs/syncops.so usr/lib/samba/vfs/syncops.so
usr/lib/samba/vfs/xattr_tdb.so usr/lib/samba/vfs/xattr_tdb.so
usr/lib/security
usr/lib/security/pam_smbpass.so
usr/lib/security/pam_winbind.so
usr/sbin/mount.cifs usr/sbin/mount.cifs
usr/sbin/nmbd usr/sbin/nmbd
usr/sbin/smbd usr/sbin/smbd
usr/sbin/umount.cifs
usr/sbin/winbindd usr/sbin/winbindd
#usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/da/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/de/LC_MESSAGES/net.mo
#usr/share/locale/de/LC_MESSAGES/pam_winbind.mo #usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/es/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/it/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
#usr/share/man/man1/findsmb.1 #usr/share/man/man1/findsmb.1
#usr/share/man/man1/ldbadd.1 #usr/share/man/man1/ldbadd.1
#usr/share/man/man1/ldbdel.1 #usr/share/man/man1/ldbdel.1
@@ -118,6 +139,7 @@ usr/sbin/winbindd
#usr/share/man/man1/testparm.1 #usr/share/man/man1/testparm.1
#usr/share/man/man1/vfstest.1 #usr/share/man/man1/vfstest.1
#usr/share/man/man1/wbinfo.1 #usr/share/man/man1/wbinfo.1
#usr/share/man/man5/pam_winbind.conf.5
#usr/share/man/man5/lmhosts.5 #usr/share/man/man5/lmhosts.5
#usr/share/man/man5/smb.conf.5 #usr/share/man/man5/smb.conf.5
#usr/share/man/man5/smbgetrc.5 #usr/share/man/man5/smbgetrc.5
@@ -169,6 +191,7 @@ usr/sbin/winbindd
#usr/share/man/man8/vfs_readahead.8 #usr/share/man/man8/vfs_readahead.8
#usr/share/man/man8/vfs_readonly.8 #usr/share/man/man8/vfs_readonly.8
#usr/share/man/man8/vfs_recycle.8 #usr/share/man/man8/vfs_recycle.8
#usr/share/man/man8/vfs_scannedonly.8
#usr/share/man/man8/vfs_shadow_copy.8 #usr/share/man/man8/vfs_shadow_copy.8
#usr/share/man/man8/vfs_shadow_copy2.8 #usr/share/man/man8/vfs_shadow_copy2.8
#usr/share/man/man8/vfs_smb_traffic_analyzer.8 #usr/share/man/man8/vfs_smb_traffic_analyzer.8

1
config/samba/default.global
View File

@@ -4,6 +4,7 @@
netbios name = ipfire netbios name = ipfire
server string = Samba server string = Samba
workgroup = homeip.net workgroup = homeip.net
passdb backend = smbpasswd
keep alive = 30 keep alive = 30
os level = 33 os level = 33

1
html/cgi-bin/samba.cgi
View File

@@ -272,6 +272,7 @@ print FILE <<END
netbios name = $sambasettings{'NETBIOSNAME'} netbios name = $sambasettings{'NETBIOSNAME'}
server string = $sambasettings{'SRVSTRING'} server string = $sambasettings{'SRVSTRING'}
workgroup = $sambasettings{'WORKGRP'} workgroup = $sambasettings{'WORKGRP'}
passdb backend = smbpasswd
wide links = $sambasettings{'WIDELINKS'} wide links = $sambasettings{'WIDELINKS'}
unix extensions = $sambasettings{'UNIXEXTENSION'} unix extensions = $sambasettings{'UNIXEXTENSION'}

31
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 3.3.10 VER = 3.5.1
THISAPP = samba-$(VER) THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba PROG = samba
PAK_VER = 24 PAK_VER = 25
DEPS = "cups" DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 84645ff5f0fb213e2371e629507dc8bb $(DL_FILE)_MD5 = 60811195b0507fa151b602684cece743
install : $(TARGET) install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/source && ./configure \ cd $(DIR_APP)/source3 && ./configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib/ \ --libdir=/usr/lib/ \
--sysconfdir=/var/ipfire \ --sysconfdir=/var/ipfire \
@@ -89,21 +89,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-cups \ --enable-cups \
--with-cifsmount \ --with-cifsmount \
--with-syslog --with-syslog
cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/source && make install cd $(DIR_APP)/source3 && make install
# cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib cd $(DIR_APP)/source3 && chmod -v 644 /usr/include/libsmbclient.h
# cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so #cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_wins.so /lib
# cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so #cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib
# cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so #cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
# cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so #cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.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 /var/ipfire/samba
-mkdir -p /var/ipfire/samba -mkdir -p /var/ipfire/samba
cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/ cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
chown nobody:nobody -R /var/ipfire/samba/ chown nobody:nobody -R /var/ipfire/samba/

7
src/paks/samba/update.sh
View File

@@ -17,10 +17,13 @@
# along with IPFire; if not, write to the Free Software # # along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# # # #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # # Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
# # # #
############################################################################ ############################################################################
# #
. /opt/pakfire/lib/functions.sh . /opt/pakfire/lib/functions.sh
./uninstall.sh ./uninstall.sh
./install.sh extract_files
restore_backup ${NAME}
echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf
/usr/local/bin/sambactrl smbstart