From b8fff2cc4e3d2903bc009bf2f46459855dad526e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 27 Apr 1998 09:11:28 +0000 Subject: Added SuSE packaging files. Volker (This used to be commit 201330a729db1a45a069ecb5188059a0a84cea52) --- packaging/SuSE/5.2/samba-1.9.18p5.dif | 233 ++++++++++++++++++++++++++++++++++ packaging/SuSE/5.2/samba.spec | 121 ++++++++++++++++++ 2 files changed, 354 insertions(+) create mode 100644 packaging/SuSE/5.2/samba-1.9.18p5.dif create mode 100644 packaging/SuSE/5.2/samba.spec (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/5.2/samba-1.9.18p5.dif b/packaging/SuSE/5.2/samba-1.9.18p5.dif new file mode 100644 index 0000000000..575ed917ca --- /dev/null +++ b/packaging/SuSE/5.2/samba-1.9.18p5.dif @@ -0,0 +1,233 @@ +--- Makefile.Linux ++++ Makefile.Linux 1998/04/27 07:49:10 +@@ -0,0 +1,34 @@ ++# ++# ++# Makefile.Linux to integrate package into source tree of S.u.S.E.-Linux ++# ++# Copyright (C) 1996 S.u.S.E. GmbH Fuerth, Germany. ++# ++# Please send bug-fixes or comments to feedback@suse.de. ++# ++# Author: Florian La Roche ++# Volker Lendecke ++# ++# ++ ++doc=/usr/doc/packages/samba ++ ++compile: ++ make -C source ++ ++install: ++ make install -C source ++ mkdir -p $(doc) ++ cp -a docs/* $(doc) ++ rm -rf $(doc)/*.[0-9] ++ cp -R examples $(doc) ++ chmod 644 `find $(doc) -type f` ++ chmod 755 `find $(doc) -type d` ++ install -m 644 smb.conf /etc/smb.conf ++ install rc /sbin/init.d/smb ++ ln -sf ../smb /sbin/init.d/rc2.d/S20smb ++ ln -sf ../smb /sbin/init.d/rc2.d/K20smb ++ ln -sf ../smb /sbin/init.d/rc3.d/S20smb ++ ln -sf ../smb /sbin/init.d/rc3.d/K20smb ++ mkdir -p /var/adm/fillup-templates ++ cp rc.config.samba /var/adm/fillup-templates +--- doinst.sh ++++ doinst.sh 1998/04/27 07:49:10 +@@ -0,0 +1,15 @@ ++# ++# install/doinst.sh - to be done after extraction ++# ++# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany. ++# ++# ++echo "Updating etc/rc.config..." ++if [ -x bin/fillup ] ; then ++ bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba ++else ++ echo "ERROR: fillup not found. This should not happen. Please compare" ++ echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" ++ echo "update by hand." ++fi ++ +--- rc ++++ rc 1998/04/27 07:49:10 +@@ -0,0 +1,32 @@ ++#! /bin/sh ++# Copyright (c) 1996 StarDivision GmbH. All rights reserved. ++# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. ++# ++# Author: Bastian Epting, StarDivision GmbH ++# Florian La Roche, ++# Volker Lendecke, ++# ++ ++. /etc/rc.config ++ ++test "$START_SMB" = "yes" || exit 0 ++ ++case "$1" in ++ start) ++ echo -n "Starting SMB services." ++ /usr/sbin/nmbd -D ++ /usr/sbin/smbd -D ++ echo ++ ;; ++ stop) ++ echo -n "Shutting down SMB services." ++ killproc -TERM /usr/sbin/nmbd ++ killproc -TERM /usr/sbin/smbd ++ echo ++ ;; ++ *) ++ echo "Usage: $0 {start|stop}" ++ exit 1 ++esac ++ ++exit 0 +--- rc.config.samba ++++ rc.config.samba 1998/04/27 07:49:10 +@@ -0,0 +1,5 @@ ++# ++# start samba? ("yes" or "no") ++# Windows 95 / NT - File- and Printservices ++# ++START_SMB="no" +--- smb.conf ++++ smb.conf 1998/04/27 07:49:10 +@@ -0,0 +1,48 @@ ++[global] ++ workgroup = arbeitsgruppe ++ guest account = nobody ++ keep alive = 30 ++ os level = 2 ++ security = user ++ printing = bsd ++ printcap name = /etc/printcap ++ load printers = yes ++ ++; Please uncomment the following entry and replace the ++; ip number and netmask with the correct numbers for ++; your ethernet interface. ++; interfaces = 192.168.1.1/255.255.255.0 ++ ++; If you want Samba to act as a wins server, please set ++; 'wins support = yes' ++ wins support = no ++ ++; If you want Samba to use an existing wins server, ++; please uncomment the following line and replace ++; the dummy with the wins server's ip number. ++; wins server = 192.168.1.1 ++ ++[homes] ++ comment = Heimatverzeichnis ++ browseable = no ++ read only = no ++ create mode = 0750 ++ ++; The following share gives all users access to the Server's CD drive, ++; assuming it is mounted under /cd. To enable this share, please remove ++; the semicolons before the lines ++; ++; [cdrom] ++; comment = Linux CD-ROM ++; path = /cd ++; read only = yes ++; locking = no ++ ++[printers] ++ comment = All Printers ++ browseable = no ++ printable = yes ++ public = no ++ read only = yes ++ create mode = 0700 ++ directory = /tmp +--- source/Makefile ++++ source/Makefile 1998/04/27 07:49:10 +@@ -5,11 +5,11 @@ + ########################################################################### + + # The base directory for all samba files +-BASEDIR = /usr/local/samba ++BASEDIR = /usr + + # The base manpages directory to put the man pages in + # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. +-MANDIR = /usr/local/man ++MANDIR = /usr/man + + # The directories to put things in. If you use multiple + # architectures or share the samba binaries across NFS then +@@ -18,16 +18,16 @@ + # normally only applies to nmbd and smbd + # SBINDIR implies a secure binary directory + BINDIR = $(BASEDIR)/bin +-SBINDIR = $(BASEDIR)/bin +-LIBDIR = $(BASEDIR)/lib +-VARDIR = $(BASEDIR)/var ++SBINDIR = $(BASEDIR)/sbin ++LIBDIR = $(BASEDIR)/lib/samba ++VARDIR = /var/log + + # The permissions to give the executables + INSTALLPERMS = 0755 + + # Add any optimisation or debugging flags here + # add -DSYSLOG for syslog support +-FLAGS1 = -O ++FLAGS1 = -O2 + LIBS1 = + + # You will need to use a ANSI C compiler. This means under SunOS 4 you can't +@@ -47,15 +47,15 @@ + # or in smb.conf (see smb.conf(5)) + SMBLOGFILE = $(VARDIR)/log.smb + NMBLOGFILE = $(VARDIR)/log.nmb +-CONFIGFILE = $(LIBDIR)/smb.conf +-LMHOSTSFILE = $(LIBDIR)/lmhosts +-DRIVERFILE = $(LIBDIR)/printers.def ++CONFIGFILE = /etc/smb.conf ++LMHOSTSFILE = /etc/lmhosts ++DRIVERFILE = /etc/printers.def + SMB_PASSWD = $(BINDIR)/smbpasswd +-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd +-WEB_ROOT = $(BASEDIR) ++SMB_PASSWD_FILE = /etc/smbpasswd ++WEB_ROOT = /etc + + # the directory where lock files go +-LOCKDIR = $(VARDIR)/locks ++LOCKDIR = /var/lock + + # The directory where code page definition files go + CODEPAGEDIR = $(LIBDIR)/codepages +@@ -206,7 +206,7 @@ + # contributed by Andrew.Tridgell@anu.edu.au + # add -DLINUX_BIGCRYPT is you have shadow passwords but don't have the + # right libraries and includes +-# FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES ++FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES + # LIBSM = -lshadow + + # Use this for Linux without shadow passwords or for any Linux +--- source/includes.h ++++ source/includes.h 1998/04/27 07:49:10 +@@ -244,13 +244,6 @@ + #define USE_SETFS + #endif + #endif +-#ifdef SHADOW_PWD +-#if _LINUX_C_LIB_VERSION_MAJOR < 5 +-#ifndef crypt +-#define crypt pw_encrypt +-#endif +-#endif +-#endif + #endif + + #ifdef SUNOS4 diff --git a/packaging/SuSE/5.2/samba.spec b/packaging/SuSE/5.2/samba.spec new file mode 100644 index 0000000000..6ae54b5066 --- /dev/null +++ b/packaging/SuSE/5.2/samba.spec @@ -0,0 +1,121 @@ +# +# spec file for package samba (Version 1.9.18p1) +# +# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany. +# +# please send bugfixes or comments to feedback@suse.de. +# + +Vendor: S.u.S.E. GmbH, Fuerth, Germany +Distribution: S.u.S.E. Linux 5.1 (i386) +Name: samba +Release: 1 +Copyright: 1992-98 Andrew Tridgell, Karl Auer, Jeremy Allison +Group: +Provides: samba smbfs +Requires: +Conflicts: +Autoreqprov: on +Packager: feedback@suse.de + +Version: 1.9.18p5 +Summary: Samba is a file server for Unix, similar to LanManager. +Source: samba-1.9.18p5.tar.gz +Source1: smbfs-2.0.2.tar.gz +Patch: samba-1.9.18p5.dif +Patch1: smbfs-2.0.2.dif +%prep +%setup +%patch +%setup -T -n smbfs-2.0.2 -b1 +%patch -P 1 +%build +cd ../samba-1.9.18p5 +make -f Makefile.Linux compile +cd ../smbfs-2.0.2 +make -f Makefile.Linux compile +%install +cd ../samba-1.9.18p5 +make -f Makefile.Linux install +cd ../smbfs-2.0.2 +make -f Makefile.Linux install +Check +%post +echo "Updating etc/rc.config..." +if [ -x bin/fillup ] ; then + bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba +else + echo "ERROR: fillup not found. This should not happen. Please compare" + echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" + echo "update by hand." +fi +%files +%docdir /usr/doc/packages/samba +/usr/doc/packages/samba +%config /etc/smb.conf +/usr/lib/samba/codepages +/sbin/init.d/rc2.d/K20smb +/sbin/init.d/rc2.d/S20smb +/sbin/init.d/rc3.d/K20smb +/sbin/init.d/rc3.d/S20smb +%config /sbin/init.d/smb +/usr/bin/addtosmbpass +/usr/bin/make_printerdef +/usr/bin/make_smbcodepage +/usr/bin/nmblookup +/usr/bin/smbclient +/usr/bin/smbmount +/usr/bin/smbpasswd +/usr/bin/smbrun +/usr/bin/smbstatus +/usr/bin/smbtar +/usr/bin/smbumount +/usr/bin/testparm +/usr/bin/testprns +%doc /usr/man/man1/smbclient.1.gz +%doc /usr/man/man1/smbrun.1.gz +%doc /usr/man/man1/smbstatus.1.gz +%doc /usr/man/man1/smbtar.1.gz +%doc /usr/man/man1/testparm.1.gz +%doc /usr/man/man1/testprns.1.gz +%doc /usr/man/man1/make_smbcodepage.1.gz +%doc /usr/man/man5/smb.conf.5.gz +%doc /usr/man/man7/samba.7.gz +%doc /usr/man/man8/nmbd.8.gz +%doc /usr/man/man8/smbd.8.gz +%doc /usr/man/man8/smbmount.8.gz +%doc /usr/man/man8/smbumount.8.gz +%doc /usr/man/man8/smbmnt.8.gz +%doc /usr/man/man8/smbpasswd.8.gz +/usr/sbin/nmbd +/usr/sbin/smbd +/var/adm/fillup-templates/rc.config.samba +%description +Samba is a suite of programs which work together to allow clients to +access Unix filespace and printers via the SMB protocol (Seerver Message +Block). +CAUTION: The samba daemons are started by the init script +/sbin/init.d/samba, not by inetd. The entries for /usr/sbin/smbd +and /usr/sbin/nmbd must be commented out in /etc/inetd.conf. +In practice, this means that you can redirect disks and printers to +Unix disks and printers from LAN Manager clients, Windows for +Workgroups 3.11 clients, Windows'95 clients, Windows NT clients +and OS/2 clients. There is +also a Unix client program supplied as part of the suite which allows +Unix users to use an ftp-like interface to access filespace and +printers on any other SMB server. +Samba includes the following programs (in summary): +* smbd, the SMB server. This handles actual connections from clients. +* nmbd, the Netbios name server, which helps clients locate servers. +* smbclient, the Unix-hosted client program. +* smbrun, a little 'glue' program to help the server run external +programs. +* testprns, a program to test server access to printers. +* testparm, a program to test the Samba configuration file for correctness. +* smb.conf, the Samba configuration file. +* smbprint, a sample script to allow a Unix host to use smbclient +to print to an SMB server. +The suite is supplied with full source and is GPLed. +This package expects its config file under /etc/smb.conf . +Documentation: /usr/doc/packages/samba + -- cgit From a1e1641b84aae432576a3d1b4b9aa724fa61fe5c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 6 May 1998 16:13:31 +0000 Subject: Added mksmbpasswd.sh to binary package (This used to be commit 94f31b95f708a4362fdcc697610d6edc9b72a5fc) --- packaging/SuSE/5.2/samba-1.9.18p5.dif | 17 +++++++++-------- packaging/SuSE/5.2/samba.spec | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/5.2/samba-1.9.18p5.dif b/packaging/SuSE/5.2/samba-1.9.18p5.dif index 575ed917ca..39b13f010d 100644 --- a/packaging/SuSE/5.2/samba-1.9.18p5.dif +++ b/packaging/SuSE/5.2/samba-1.9.18p5.dif @@ -1,6 +1,6 @@ --- Makefile.Linux -+++ Makefile.Linux 1998/04/27 07:49:10 -@@ -0,0 +1,34 @@ ++++ Makefile.Linux 1998/05/06 15:58:42 +@@ -0,0 +1,35 @@ +# +# +# Makefile.Linux to integrate package into source tree of S.u.S.E.-Linux @@ -29,6 +29,7 @@ + chmod 755 `find $(doc) -type d` + install -m 644 smb.conf /etc/smb.conf + install rc /sbin/init.d/smb ++ install -m 755 source/mksmbpasswd.sh /usr/bin/mksmbpasswd.sh + ln -sf ../smb /sbin/init.d/rc2.d/S20smb + ln -sf ../smb /sbin/init.d/rc2.d/K20smb + ln -sf ../smb /sbin/init.d/rc3.d/S20smb @@ -36,7 +37,7 @@ + mkdir -p /var/adm/fillup-templates + cp rc.config.samba /var/adm/fillup-templates --- doinst.sh -+++ doinst.sh 1998/04/27 07:49:10 ++++ doinst.sh 1998/05/06 15:54:52 @@ -0,0 +1,15 @@ +# +# install/doinst.sh - to be done after extraction @@ -54,7 +55,7 @@ +fi + --- rc -+++ rc 1998/04/27 07:49:10 ++++ rc 1998/05/06 15:54:52 @@ -0,0 +1,32 @@ +#! /bin/sh +# Copyright (c) 1996 StarDivision GmbH. All rights reserved. @@ -89,7 +90,7 @@ + +exit 0 --- rc.config.samba -+++ rc.config.samba 1998/04/27 07:49:10 ++++ rc.config.samba 1998/05/06 15:54:52 @@ -0,0 +1,5 @@ +# +# start samba? ("yes" or "no") @@ -97,7 +98,7 @@ +# +START_SMB="no" --- smb.conf -+++ smb.conf 1998/04/27 07:49:10 ++++ smb.conf 1998/05/06 15:54:52 @@ -0,0 +1,48 @@ +[global] + workgroup = arbeitsgruppe @@ -148,7 +149,7 @@ + create mode = 0700 + directory = /tmp --- source/Makefile -+++ source/Makefile 1998/04/27 07:49:10 ++++ source/Makefile 1998/05/06 15:54:52 @@ -5,11 +5,11 @@ ########################################################################### @@ -216,7 +217,7 @@ # Use this for Linux without shadow passwords or for any Linux --- source/includes.h -+++ source/includes.h 1998/04/27 07:49:10 ++++ source/includes.h 1998/05/06 15:54:52 @@ -244,13 +244,6 @@ #define USE_SETFS #endif diff --git a/packaging/SuSE/5.2/samba.spec b/packaging/SuSE/5.2/samba.spec index 6ae54b5066..637af1781e 100644 --- a/packaging/SuSE/5.2/samba.spec +++ b/packaging/SuSE/5.2/samba.spec @@ -60,6 +60,7 @@ fi /sbin/init.d/rc3.d/S20smb %config /sbin/init.d/smb /usr/bin/addtosmbpass +/usr/bin/mksmbpasswd.sh /usr/bin/make_printerdef /usr/bin/make_smbcodepage /usr/bin/nmblookup -- cgit From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Dec 1999 13:27:58 +0000 Subject: first pass at updating head branch to be to be the same as the SAMBA_2_0 branch (This used to be commit 453a822a76780063dff23526c35408866d0c0154) --- packaging/SuSE/5.2/samba.spec | 3 --- 1 file changed, 3 deletions(-) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/5.2/samba.spec b/packaging/SuSE/5.2/samba.spec index 637af1781e..5f20875c9e 100644 --- a/packaging/SuSE/5.2/samba.spec +++ b/packaging/SuSE/5.2/samba.spec @@ -67,7 +67,6 @@ fi /usr/bin/smbclient /usr/bin/smbmount /usr/bin/smbpasswd -/usr/bin/smbrun /usr/bin/smbstatus /usr/bin/smbtar /usr/bin/smbumount @@ -109,8 +108,6 @@ Samba includes the following programs (in summary): * smbd, the SMB server. This handles actual connections from clients. * nmbd, the Netbios name server, which helps clients locate servers. * smbclient, the Unix-hosted client program. -* smbrun, a little 'glue' program to help the server run external -programs. * testprns, a program to test server access to printers. * testparm, a program to test the Samba configuration file for correctness. * smb.conf, the Samba configuration file. -- cgit From 441f61d6bc9c2a11f712add8b08a579bdb4057aa Mon Sep 17 00:00:00 2001 From: David O'Neill Date: Fri, 5 Jan 2001 18:05:52 +0000 Subject: Add SuSE 7.1 packaging (from SAMBA_2_2). (This used to be commit 69f28a868a7e78b8b93bbf7dcf21bf6fd813c12d) --- packaging/SuSE/7.1/samba-2.2.0-alpha0.dif | 224 ++++++++++++++++++ packaging/SuSE/7.1/samba.pamd | 3 + packaging/SuSE/7.1/samba.spec | 381 ++++++++++++++++++++++++++++++ 3 files changed, 608 insertions(+) create mode 100644 packaging/SuSE/7.1/samba-2.2.0-alpha0.dif create mode 100644 packaging/SuSE/7.1/samba.pamd create mode 100644 packaging/SuSE/7.1/samba.spec (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif b/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif new file mode 100644 index 0000000000..75bfdf18c6 --- /dev/null +++ b/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif @@ -0,0 +1,224 @@ +--- lmhosts ++++ lmhosts 2000/08/28 07:32:33 +@@ -0,0 +1,8 @@ ++# This file provides the same function that the ++# lmhosts file does for Windows. ++# It provides another way to map netbios names to ip addresses. ++# See the section on 'name resolve order' in the manual page to ++# smb.conf for more information. ++ ++# Sample entry: ++# 192.168.1.1 samba +--- mount.smbfs ++++ mount.smbfs 2000/08/28 07:32:55 +@@ -0,0 +1,14 @@ ++#!/bin/sh ++# ++# Copyright (c) 1999 SuSE GmbH Nuernberg, Germany. All rights reserved. ++# ++# Author: Carsten Hoeger ++# ++# /sbin/mount.smbfs ++# ++# I'm called by the mount-command and smbmount want's to get ++# called by me, so lets do it. ++# ++# P.S.: This is a very very raw solution and I don't know, if this ++# is intentionally. ++smbmount "$@" +--- rc ++++ rc 2000/08/28 07:32:33 +@@ -0,0 +1,53 @@ ++#! /bin/sh ++# Copyright (c) 1996 StarDivision GmbH. All rights reserved. ++# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. ++# ++# Author: Bastian Epting, StarDivision GmbH ++# Florian La Roche, ++# Volker Lendecke, ++# ++ ++. /etc/rc.config ++ ++# Determine the base and follow a runlevel link name. ++base=${0##*/} ++link=${base#*[SK][0-9][0-9]} ++ ++# Force execution if not called by a runlevel directory. ++test $link = $base && START_SMB=yes ++test "$START_SMB" = "yes" || exit 0 ++ ++# The echo return value for success (defined in /etc/rc.config). ++return=$rc_done ++case "$1" in ++ start) ++ echo -n "Starting SMB services:" ++ startproc /usr/sbin/nmbd -D || return=$rc_failed ++ startproc /usr/sbin/smbd -D || return=$rc_failed ++ echo -e "$return" ++ ;; ++ stop) ++ echo -n "Shutting down SMB services:" ++ killproc -TERM /usr/sbin/nmbd || return=$rc_failed ++ killproc -TERM /usr/sbin/smbd || return=$rc_failed ++ echo -e "$return" ++ ;; ++ restart|reload) ++ echo -n "Reloading SMB services:" ++ killproc -HUP /usr/sbin/nmbd || return=$rc_failed ++ killproc -HUP /usr/sbin/smbd || return=$rc_failed ++ echo -e "$return" ++ ;; ++ status) ++ echo -n "Checking for service smb: " ++ checkproc /usr/sbin/nmbd && echo -n "OK " || echo -n "No process " ++ checkproc /usr/sbin/smbd && echo "OK " || echo "No process" ++ ;; ++ *) ++ echo "Usage: $0 {start|stop|restart|reload|status}" ++ exit 1 ++esac ++ ++# Inform the caller not only verbosely and set an exit status. ++test "$return" = "$rc_done" || exit 1 ++exit 0 +--- rc.config.samba ++++ rc.config.samba 2000/08/28 07:32:33 +@@ -0,0 +1,5 @@ ++# ++# start samba? ("yes" or "no") ++# Windows 95 / NT - File- and Printservices ++# ++START_SMB="no" +--- smb.conf ++++ smb.conf 2000/08/28 07:32:33 +@@ -0,0 +1,80 @@ ++; ++; /etc/smb.conf ++; ++; Copyright (c) 1999 SuSE GmbH Nuernberg, Germany. ++; ++[global] ++ workgroup = arbeitsgruppe ++ guest account = nobody ++ keep alive = 30 ++ os level = 2 ++ kernel oplocks = false ++ security = user ++ ++; Uncomment the following, if you want to use an existing ++; NT-Server to authenticate users, but don't forget that ++; you also have to create them locally!!! ++; security = server ++; password server = 192.168.1.10 ++; encrypt passwords = yes ++ ++ printing = bsd ++ printcap name = /etc/printcap ++ load printers = yes ++ ++ socket options = TCP_NODELAY ++ ++ map to guest = Bad User ++ ++; Uncomment this, if you want to integrate your server ++; into an existing net e.g. with NT-WS to prevent nettraffic ++; local master = no ++ ++; Please uncomment the following entry and replace the ++; ip number and netmask with the correct numbers for ++; your ethernet interface. ++; interfaces = 192.168.1.1/255.255.255.0 ++ ++; If you want Samba to act as a wins server, please set ++; 'wins support = yes' ++ wins support = no ++ ++; If you want Samba to use an existing wins server, ++; please uncomment the following line and replace ++; the dummy with the wins server's ip number. ++; wins server = 192.168.1.1 ++ ++; Do you wan't samba to act as a logon-server for ++; your windows 95/98 clients, so uncomment the ++; following: ++; logon script =%U.bat ++; domain logons = yes ++; domain master = yes ++; [netlogon] ++; path = /netlogon ++ ++ ++[homes] ++ comment = Heimatverzeichnis ++ browseable = no ++ read only = no ++ create mode = 0750 ++ ++; The following share gives all users access to the Server's CD drive, ++; assuming it is mounted under /cd. To enable this share, please remove ++; the semicolons before the lines ++; ++; [cdrom] ++; comment = Linux CD-ROM ++; path = /cdrom ++; read only = yes ++; locking = no ++ ++[printers] ++ comment = All Printers ++ browseable = no ++ printable = yes ++ public = no ++ read only = yes ++ create mode = 0700 ++ directory = /tmp +--- smbfs ++++ smbfs 2000/08/28 07:32:33 +@@ -0,0 +1,40 @@ ++#! /bin/bash ++# Copyright (c) 1996 SuSE GmbH Nuernberg, Germany. All rights reserved. ++# ++# Author: Thomas Fehr , 1999 ++# ++# /sbin/init.d/smbfs ++# ++ ++smbfs=no ++if [ `cat /proc/mounts | grep " smbfs " | wc -l` -gt 0 ] ++then ++ smbfs=yes ++fi ++ ++return=$rc_done ++case "$1" in ++ start|reload) ++ ;; ++ stop) ++ if [ "$smbfs" = "yes" ] ++ then ++ echo -n "Remove SMB File System" ++ # ++ # Unmount in background because during long timeouts ++ # ++ umount -at smbfs & ++ sleep 2 ++ echo -e "$return" ++ fi ++ ;; ++ restart) ++ $0 stop && $0 start || return=$rc_failed ++ ;; ++ status) ++ ;; ++ *) ++ echo "Usage: $0 {start|stop|status|reload|restart}" ++ exit 1 ++esac ++exit 0 +--- smbpasswd ++++ smbpasswd 2000/08/28 07:32:33 +@@ -0,0 +1,3 @@ ++# Sample smbpasswd file. ++# To use this, set 'encrypt passwords = yes' in the [global]-section ++# of /etc/smb.conf diff --git a/packaging/SuSE/7.1/samba.pamd b/packaging/SuSE/7.1/samba.pamd new file mode 100644 index 0000000000..d9e7088bea --- /dev/null +++ b/packaging/SuSE/7.1/samba.pamd @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required /lib/security/pam_unix.so +account required /lib/security/pam_unix.so diff --git a/packaging/SuSE/7.1/samba.spec b/packaging/SuSE/7.1/samba.spec new file mode 100644 index 0000000000..60d8099edb --- /dev/null +++ b/packaging/SuSE/7.1/samba.spec @@ -0,0 +1,381 @@ +# +# spec file for package samba (Version 2.0.7) +# +# Copyright (c) 2000 SuSE GmbH Nuernberg, Germany. +# +# please send bugfixes or comments to feedback@suse.de. +# + +# neededforbuild automake openldap +# usedforbuild aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gppshare groff gzip kbd less libc libtool libz lx_suse make mktemp modules ncurses net_tool netcfg nkita nkitb nssv1 openldap pam patch perl pgp ps rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit texinfo textutil timezone unzip util vim xdevel xf86 xshared + +Vendor: SuSE GmbH, Nuernberg, Germany +Distribution: SuSE Linux 7.1a (i386) +Name: samba +Release: 0 +Packager: feedback@suse.de + +Copyright: 1992-95 Andrew Tridgell, Karl Auer, Jeremy Allison +Group: Networking/Daemons +Url: http://www.samba.org +Provides: samba smbfs +Requires: smbclnt +Autoreqprov: on +Version: 2.2 +Summary: An SMB file server for Unix +Source: samba-2.2.0-alpha0.tar.gz +Source1: samba.pamd +Patch: samba-2.2.0-alpha0.dif +%package -n smbclnt +Summary: Samba client utilities +Autoreqprov: on +Group: Networking +%prep +%setup -n samba-2.2.0-alpha0 +%patch + +%build +cd source +%{?suse_update_config:%{suse_update_config -f}} +LIBS=-lnsl \ +./configure --prefix=/usr --libdir=/etc \ + --with-privatedir=/etc --localstatedir=/var/log \ + --with-smbmount --with-pam \ + --mandir=%{_mandir} \ + --with-swatdir=/usr/lib/samba/swat \ + --with-sambabook=/usr/lib/samba/swat/using_samba +cd .. +make LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \ + CODEPAGEDIR=/usr/lib/samba/codepages -C source + +%install +mkdir -p /usr/lib/samba +make install LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \ + CODEPAGEDIR=/usr/lib/samba/codepages -C source +# cleanup docs +rm -rf docs/*.[0-9] +chmod 644 `find docs examples -type f` +chmod 755 `find docs examples -type d` +#utility scripts +mkdir -p /usr/lib/samba/scripts +cp -a source/script/* /usr/lib/samba/scripts +# configuration files +install -m 644 smb.conf /etc/smb.conf +install -m 644 lmhosts /etc/lmhosts +install -m 600 smbpasswd -o root -g root /etc/smbpasswd +install -d 755 /etc/pam.d +install -m 644 $RPM_SOURCE_DIR/samba.pamd /etc/pam.d/samba +install -m 755 mount.smbfs /sbin/mount.smbfs +# start script +install rc /sbin/init.d/smb +ln -sf ../smb /sbin/init.d/rc2.d/S20smb +ln -sf ../smb /sbin/init.d/rc2.d/K20smb +ln -sf ../smb /sbin/init.d/rc3.d/S20smb +ln -sf ../smb /sbin/init.d/rc3.d/K20smb +ln -sf ../../sbin/init.d/smb /usr/sbin/rcsmb +install smbfs /sbin/init.d/smbfs +ln -sf ../smbfs /sbin/init.d/rc2.d/S21smbfs +ln -sf ../smbfs /sbin/init.d/rc2.d/K19smbfs +ln -sf ../smbfs /sbin/init.d/rc3.d/S21smbfs +ln -sf ../smbfs /sbin/init.d/rc3.d/K19smbfs +ln -sf ../../sbin/init.d/smbfs /usr/sbin/rcsmbfs +# rc.config fragment +mkdir -p /var/adm/fillup-templates +cp rc.config.samba /var/adm/fillup-templates +%{?suse_check} + +%post +echo "Updating etc/rc.config..." +if [ -x bin/fillup ] ; then + bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba +else + echo "ERROR: fillup not found. This should not happen. Please compare" + echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" + echo "update by hand." +fi +if grep -q '^[#[:space:]]*swat' etc/inetd.conf ; then + echo /etc/inetd.conf is up to date +else + echo updating inetd.conf + cat >> etc/inetd.conf << EOF +# swat is the Samba Web Administration Tool +swat stream tcp nowait.400 root /usr/sbin/swat swat +EOF +fi +if grep -q '^swat' etc/services ; then + echo /etc/services is up to date +else + echo updating services + cat >> etc/services << EOF +swat 901/tcp # swat is the Samba Web Administration Tool +EOF +fi +mkdir -p var/adm/notify/messages +cat << EOF > var/adm/notify/messages/samba-notify +Achtung! +======== +Die Syntax des smbmount Kommandos hat sich geaendert! +smbmount kann nicht mehr direkt aufgerufen werden. Es wird von einem +Shellscript /sbin/mount.smbfs aufgerufen, welches wiederum von mount +aufgerufen wird. +Hier ein Beispielaufruf: +mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination +***************************************************************************** +Attention! +========== +The syntax of smbmount has changed! +smbmount can not be called direct anymore. It will be called by a shell +script /sbin/mount.smbfs, which will be called by mount. +A sample call to smbfs: +mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination +EOF + +%files +%config(noreplace) /etc/smb.conf +%config(noreplace) /etc/lmhosts +%config(noreplace) /etc/smbpasswd +%config /etc/pam.d/samba +/usr/lib/samba +/sbin/init.d/rc2.d/K20smb +/sbin/init.d/rc2.d/S20smb +/sbin/init.d/rc3.d/K20smb +/sbin/init.d/rc3.d/S20smb +%config /sbin/init.d/smb +/usr/bin/addtosmbpass +/usr/bin/convert_smbpasswd +/usr/bin/make_printerdef +/usr/bin/make_smbcodepage +/usr/bin/make_unicodemap +/usr/bin/smbpasswd +/usr/bin/smbstatus +/usr/bin/testparm +/usr/bin/testprns +%doc docs/* examples +%doc %{_mandir}/man1/make_smbcodepage.1.gz +%doc %{_mandir}/man1/make_unicodemap.1.gz +%doc %{_mandir}/man1/smbrun.1.gz +%doc %{_mandir}/man1/smbsh.1.gz +%doc %{_mandir}/man1/smbstatus.1.gz +%doc %{_mandir}/man1/testparm.1.gz +%doc %{_mandir}/man1/testprns.1.gz +%doc %{_mandir}/man5/lmhosts.5.gz +%doc %{_mandir}/man5/smb.conf.5.gz +%doc %{_mandir}/man5/smbpasswd.5.gz +%doc %{_mandir}/man7/samba.7.gz +%doc %{_mandir}/man8/nmbd.8.gz +%doc %{_mandir}/man8/smbd.8.gz +%doc %{_mandir}/man8/smbpasswd.8.gz +%doc %{_mandir}/man8/swat.8.gz +/usr/sbin/nmbd +/usr/sbin/rcsmb +/usr/sbin/smbd +/usr/sbin/swat +/var/adm/fillup-templates/rc.config.samba + +%files -n smbclnt +/sbin/init.d/rc2.d/K19smbfs +/sbin/init.d/rc2.d/S21smbfs +/sbin/init.d/rc3.d/K19smbfs +/sbin/init.d/rc3.d/S21smbfs +%config /sbin/init.d/smbfs +/usr/sbin/rcsmbfs +/sbin/mount.smbfs +/usr/bin/nmblookup +/usr/bin/rpcclient +/usr/bin/smbclient +/usr/bin/smbmnt +/usr/bin/smbmount +/usr/bin/smbumount +/usr/bin/smbspool +/usr/bin/smbtar +%doc %{_mandir}/man1/nmblookup.1.gz +%doc %{_mandir}/man1/smbclient.1.gz +%doc %{_mandir}/man1/smbtar.1.gz +%doc %{_mandir}/man8/smbmnt.8.gz +%doc %{_mandir}/man8/smbmount.8.gz +%doc %{_mandir}/man8/smbspool.8.gz +%doc %{_mandir}/man8/smbumount.8.gz + +%description +Samba is a suite of programs which work together to allow clients to +access Unix filespace and printers via the SMB protocol (Server Message +Block). +In practice, this means that you can redirect disks and printers to +Unix disks and printers from LAN Manager clients, Windows for +Workgroups 3.11 clients, Windows'95 clients, Windows NT clients +and OS/2 clients. There is +also a Unix client program supplied as part of the suite which allows +Unix users to use an ftp-like interface to access filespace and +printers on any other SMB server. +Samba includes the following programs (in summary): +* smbd, the SMB server. This handles actual connections from clients. +* nmbd, the Netbios name server, which helps clients locate servers. +* smbclient, the Unix-hosted client program. +* smbrun, a little 'glue' program to help the server run external +programs. +* testprns, a program to test server access to printers. +* testparm, a program to test the Samba configuration file for correctness. +* smb.conf, the Samba configuration file. +* smbprint, a sample script to allow a Unix host to use smbclient +to print to an SMB server. +The suite is supplied with full source and is GPLed. +This package expects its config file under /etc/smb.conf . + +Authors: +-------- + Andrew Tridgell + Karl Auer + Jeremy Allison + +SuSE series: n + + +%description -n smbclnt +This package contains all programs, that are needed to act as a samba +client. This includes also smbmount, of course. + +Authors: +-------- + Andrew Tridgell + Karl Auer + Jeremy Allison + +SuSE series: n + + +%changelog -n samba +* Mon Aug 28 2000 - choeger@suse.de +- changed $* to "$@" in mount.smbfs to make it also + possible to mount shares with spaces +* Mon Jul 31 2000 - choeger@suse.de +- improvement for rcsmb +- fix for spec-file to compile with NIS netgroups +* Thu Jul 20 2000 - choeger@suse.de +- added smbfs initscript that has been removed + by an error +* Tue Jul 11 2000 - choeger@suse.de +- split package into client and server parts + client package name: smbclnt +* Wed Apr 26 2000 - choeger@suse.de +- new version, 2.0.7 +* Thu Apr 06 2000 - ro@suse.de +- removed pam,cracklib from neededforbuild: build handles this +* Wed Apr 05 2000 - bk@suse.de +- s390 team added config.{sub,guess} update macro for s390 +* Mon Mar 27 2000 - choeger@suse.de +- fixed bug in specfile + the multilined configure call missed a "" :-( +* Thu Mar 09 2000 - choeger@suse.de +- fixed typo in specfile +* Wed Mar 01 2000 - choeger@suse.de +- added %{_mandir} +* Tue Feb 08 2000 - choeger@suse.de +- removed /sbin/init.d/smbfs because it is no longer needed +* Mon Jan 03 2000 - choeger@suse.de +- bugfix for ipc.c + to make roaming profiles work again. +* Tue Nov 30 1999 - choeger@suse.de +- changed kernel oplocks = off to + kernel oplocks = false +* Tue Nov 16 1999 - choeger@suse.de +- added kernel oplocks = off in smb.conf +* Fri Nov 12 1999 - choeger@suse.de +- new version, 2.0.6 +* Fri Nov 05 1999 - choeger@suse.de +- Fix for the smbmount lost-connection problem + _seems_ to work... +* Fri Oct 29 1999 - choeger@suse.de +- removed comment sign in /etc/inetd.conf for swat +* Mon Sep 13 1999 - bs@suse.de +- ran old prepare_spec on spec file to switch to new prepare_spec. +* Tue Aug 10 1999 - fehr@suse.de +- set execute permissions for mksmbpasswd.sh and changesmbpasswd.sh +* Thu Jul 29 1999 - fehr@suse.de +- fixed typo in /sbin/init.d/smbfs +* Thu Jul 22 1999 - fehr@suse.de +- changed to new version 2.0.5a +* Wed Jul 21 1999 - fehr@suse.de +- changed to new version 2.0.5 +* Tue Jul 20 1999 - fehr@suse.de +- install /sbin/init.d/smbfs +- changed to new version 2.0.5pre4 +* Mon Jul 19 1999 - fehr@suse.de +- add /sbin/init.d/smbfs +- changed to new version 2.0.5pre3 +* Fri Jul 02 1999 - fehr@suse.de +- removed "umount -a -t smbfs" from start sscript +* Tue Jun 22 1999 - kukuk@suse.de +- 2.0.4b changed default values, enable PAM again +* Fri Jun 18 1999 - kukuk@suse.de +- changed to new version 2.0.4b +* Mon Jun 14 1999 - kukuk@suse.de +- Enable PAM, add samba.pamd +* Mon May 03 1999 - fehr@suse.de +- add umount -a -t smbfs to shutdown sequence of samba +* Thu Mar 11 1999 - ro@suse.de +- smbmount: define NR_OPEN to 1024 if undefined (GLIBC-2.1) +* Wed Mar 10 1999 - choeger@suse.de +- some enhancements for smb.conf +* Wed Mar 10 1999 - choeger@suse.de +- new version 2.0.3 and smbmount now seems to work +* Tue Mar 09 1999 - ro@suse.de +- use samba-2.0.2 for STABLE +- use smbfs-2.1 with kernel 2.2.2 +* Sun Feb 28 1999 - ro@suse.de +- for glibc-2.1 strncat uses strcat for one subcase, so don't + redefine strcat to "ERROR" for glibc-2.1 +* Mon Feb 15 1999 - fehr@suse.de +- fix for umount problem from Volker +* Tue Feb 09 1999 - fehr@suse.de +- changed to version 2.0.2 of samba +* Fri Jan 15 1999 - bs@suse.de +- replaced /sbin/init.d/smb with newer style version (again) +* Fri Jan 15 1999 - fehr@suse.de +- switched to new version 2.0.0 +* Wed Jan 13 1999 - bs@suse.de +- fixed entry in inetd.conf +* Wed Jan 13 1999 - bs@suse.de +- replaced /sbin/init.d/smb with newer style version +* Mon Jan 11 1999 - vl@suse.de +- make 2.0.0beta5 package of samba +* Mon Aug 24 1998 - vl@suse.de +- changed to version 1.9.18p10 +* Mon Jun 29 1998 - vl@suse.de +- changed to version 1.9.18p8 +* Mon Apr 20 1998 - vl@suse.de +- changed to version 1.9.18p4 +* Thu Feb 19 1998 - vl@suse.de +- changed to version 1.9.18p3 +* Tue Feb 03 1998 - vl@suse.de +- changed to version 1.9.18p2 +- fixed some problems in spec-file, some files were missing :-( +- fixed smbfs-2.0.2/Makefile.Linux +* Tue Jan 13 1998 - vl@suse.de +- changed to version 1.9.18p1 +* Fri Jan 09 1998 - vl@suse.de +- changed to version 1.9.18 +* Tue Dec 02 1997 - bs@suse.de +- disable samba by default in /etc/rc.config +* Mon Oct 06 1997 - fehr@suse.de +- package prepared for automatic building +* Mon Sep 29 1997 - fehr@suse.de +- updated to version 1.9.17p2 due to security hole. +* Wed Jul 16 1997 - fehr@suse.de +- add fillup-template for rc.config and install it in doinst.sh +* Fri Jun 27 1997 - bs@suse.de +- update to smbfs-2.0.2, due to security hole. +* Tue Jun 17 1997 - fehr@suse.de +- changed init-skript to recognize entry START_SMB of rc.config +* Mon Jun 02 1997 - vl@suse.de +- update to version 1.9.16p11 +- Starting Samba from /sbin/init.d, not from inetd.conf +* Sun Feb 02 1997 - vl@suse.de +- update to version 1.9.16p10 +- Adapted /etc/smb.conf.sample to 4.4.1 manual +* Thu Jan 02 1997 - florian@suse.de +- update to version 1.9.16p9 +- configuration file is now /etc/smb.conf +- smbd and nmbd are now in /usr/sbin +- added start-script /sbin/init.d/smb and entry in /etc/rc.config +* Thu Jan 02 1997 - florian@suse.de +- Update auf neue Version 1.9.16p6. -- cgit From 6b286811e2ef273806285db95d11dfb10af281b1 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sat, 29 Mar 2003 23:16:24 +0000 Subject: Cleaning up SuSE build area in preparation for adding packaging for SuSE 8.1 Note: Also will work for UnitedLinux (This used to be commit 6bc6c597760fe99e0d08d63a28a7559d61598222) --- packaging/SuSE/7.1/samba-2.2.0-alpha0.dif | 224 ------------------ packaging/SuSE/7.1/samba.pamd | 3 - packaging/SuSE/7.1/samba.spec | 381 ------------------------------ 3 files changed, 608 deletions(-) delete mode 100644 packaging/SuSE/7.1/samba-2.2.0-alpha0.dif delete mode 100644 packaging/SuSE/7.1/samba.pamd delete mode 100644 packaging/SuSE/7.1/samba.spec (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif b/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif deleted file mode 100644 index 75bfdf18c6..0000000000 --- a/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif +++ /dev/null @@ -1,224 +0,0 @@ ---- lmhosts -+++ lmhosts 2000/08/28 07:32:33 -@@ -0,0 +1,8 @@ -+# This file provides the same function that the -+# lmhosts file does for Windows. -+# It provides another way to map netbios names to ip addresses. -+# See the section on 'name resolve order' in the manual page to -+# smb.conf for more information. -+ -+# Sample entry: -+# 192.168.1.1 samba ---- mount.smbfs -+++ mount.smbfs 2000/08/28 07:32:55 -@@ -0,0 +1,14 @@ -+#!/bin/sh -+# -+# Copyright (c) 1999 SuSE GmbH Nuernberg, Germany. All rights reserved. -+# -+# Author: Carsten Hoeger -+# -+# /sbin/mount.smbfs -+# -+# I'm called by the mount-command and smbmount want's to get -+# called by me, so lets do it. -+# -+# P.S.: This is a very very raw solution and I don't know, if this -+# is intentionally. -+smbmount "$@" ---- rc -+++ rc 2000/08/28 07:32:33 -@@ -0,0 +1,53 @@ -+#! /bin/sh -+# Copyright (c) 1996 StarDivision GmbH. All rights reserved. -+# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. -+# -+# Author: Bastian Epting, StarDivision GmbH -+# Florian La Roche, -+# Volker Lendecke, -+# -+ -+. /etc/rc.config -+ -+# Determine the base and follow a runlevel link name. -+base=${0##*/} -+link=${base#*[SK][0-9][0-9]} -+ -+# Force execution if not called by a runlevel directory. -+test $link = $base && START_SMB=yes -+test "$START_SMB" = "yes" || exit 0 -+ -+# The echo return value for success (defined in /etc/rc.config). -+return=$rc_done -+case "$1" in -+ start) -+ echo -n "Starting SMB services:" -+ startproc /usr/sbin/nmbd -D || return=$rc_failed -+ startproc /usr/sbin/smbd -D || return=$rc_failed -+ echo -e "$return" -+ ;; -+ stop) -+ echo -n "Shutting down SMB services:" -+ killproc -TERM /usr/sbin/nmbd || return=$rc_failed -+ killproc -TERM /usr/sbin/smbd || return=$rc_failed -+ echo -e "$return" -+ ;; -+ restart|reload) -+ echo -n "Reloading SMB services:" -+ killproc -HUP /usr/sbin/nmbd || return=$rc_failed -+ killproc -HUP /usr/sbin/smbd || return=$rc_failed -+ echo -e "$return" -+ ;; -+ status) -+ echo -n "Checking for service smb: " -+ checkproc /usr/sbin/nmbd && echo -n "OK " || echo -n "No process " -+ checkproc /usr/sbin/smbd && echo "OK " || echo "No process" -+ ;; -+ *) -+ echo "Usage: $0 {start|stop|restart|reload|status}" -+ exit 1 -+esac -+ -+# Inform the caller not only verbosely and set an exit status. -+test "$return" = "$rc_done" || exit 1 -+exit 0 ---- rc.config.samba -+++ rc.config.samba 2000/08/28 07:32:33 -@@ -0,0 +1,5 @@ -+# -+# start samba? ("yes" or "no") -+# Windows 95 / NT - File- and Printservices -+# -+START_SMB="no" ---- smb.conf -+++ smb.conf 2000/08/28 07:32:33 -@@ -0,0 +1,80 @@ -+; -+; /etc/smb.conf -+; -+; Copyright (c) 1999 SuSE GmbH Nuernberg, Germany. -+; -+[global] -+ workgroup = arbeitsgruppe -+ guest account = nobody -+ keep alive = 30 -+ os level = 2 -+ kernel oplocks = false -+ security = user -+ -+; Uncomment the following, if you want to use an existing -+; NT-Server to authenticate users, but don't forget that -+; you also have to create them locally!!! -+; security = server -+; password server = 192.168.1.10 -+; encrypt passwords = yes -+ -+ printing = bsd -+ printcap name = /etc/printcap -+ load printers = yes -+ -+ socket options = TCP_NODELAY -+ -+ map to guest = Bad User -+ -+; Uncomment this, if you want to integrate your server -+; into an existing net e.g. with NT-WS to prevent nettraffic -+; local master = no -+ -+; Please uncomment the following entry and replace the -+; ip number and netmask with the correct numbers for -+; your ethernet interface. -+; interfaces = 192.168.1.1/255.255.255.0 -+ -+; If you want Samba to act as a wins server, please set -+; 'wins support = yes' -+ wins support = no -+ -+; If you want Samba to use an existing wins server, -+; please uncomment the following line and replace -+; the dummy with the wins server's ip number. -+; wins server = 192.168.1.1 -+ -+; Do you wan't samba to act as a logon-server for -+; your windows 95/98 clients, so uncomment the -+; following: -+; logon script =%U.bat -+; domain logons = yes -+; domain master = yes -+; [netlogon] -+; path = /netlogon -+ -+ -+[homes] -+ comment = Heimatverzeichnis -+ browseable = no -+ read only = no -+ create mode = 0750 -+ -+; The following share gives all users access to the Server's CD drive, -+; assuming it is mounted under /cd. To enable this share, please remove -+; the semicolons before the lines -+; -+; [cdrom] -+; comment = Linux CD-ROM -+; path = /cdrom -+; read only = yes -+; locking = no -+ -+[printers] -+ comment = All Printers -+ browseable = no -+ printable = yes -+ public = no -+ read only = yes -+ create mode = 0700 -+ directory = /tmp ---- smbfs -+++ smbfs 2000/08/28 07:32:33 -@@ -0,0 +1,40 @@ -+#! /bin/bash -+# Copyright (c) 1996 SuSE GmbH Nuernberg, Germany. All rights reserved. -+# -+# Author: Thomas Fehr , 1999 -+# -+# /sbin/init.d/smbfs -+# -+ -+smbfs=no -+if [ `cat /proc/mounts | grep " smbfs " | wc -l` -gt 0 ] -+then -+ smbfs=yes -+fi -+ -+return=$rc_done -+case "$1" in -+ start|reload) -+ ;; -+ stop) -+ if [ "$smbfs" = "yes" ] -+ then -+ echo -n "Remove SMB File System" -+ # -+ # Unmount in background because during long timeouts -+ # -+ umount -at smbfs & -+ sleep 2 -+ echo -e "$return" -+ fi -+ ;; -+ restart) -+ $0 stop && $0 start || return=$rc_failed -+ ;; -+ status) -+ ;; -+ *) -+ echo "Usage: $0 {start|stop|status|reload|restart}" -+ exit 1 -+esac -+exit 0 ---- smbpasswd -+++ smbpasswd 2000/08/28 07:32:33 -@@ -0,0 +1,3 @@ -+# Sample smbpasswd file. -+# To use this, set 'encrypt passwords = yes' in the [global]-section -+# of /etc/smb.conf diff --git a/packaging/SuSE/7.1/samba.pamd b/packaging/SuSE/7.1/samba.pamd deleted file mode 100644 index d9e7088bea..0000000000 --- a/packaging/SuSE/7.1/samba.pamd +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_unix.so -account required /lib/security/pam_unix.so diff --git a/packaging/SuSE/7.1/samba.spec b/packaging/SuSE/7.1/samba.spec deleted file mode 100644 index 60d8099edb..0000000000 --- a/packaging/SuSE/7.1/samba.spec +++ /dev/null @@ -1,381 +0,0 @@ -# -# spec file for package samba (Version 2.0.7) -# -# Copyright (c) 2000 SuSE GmbH Nuernberg, Germany. -# -# please send bugfixes or comments to feedback@suse.de. -# - -# neededforbuild automake openldap -# usedforbuild aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gppshare groff gzip kbd less libc libtool libz lx_suse make mktemp modules ncurses net_tool netcfg nkita nkitb nssv1 openldap pam patch perl pgp ps rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit texinfo textutil timezone unzip util vim xdevel xf86 xshared - -Vendor: SuSE GmbH, Nuernberg, Germany -Distribution: SuSE Linux 7.1a (i386) -Name: samba -Release: 0 -Packager: feedback@suse.de - -Copyright: 1992-95 Andrew Tridgell, Karl Auer, Jeremy Allison -Group: Networking/Daemons -Url: http://www.samba.org -Provides: samba smbfs -Requires: smbclnt -Autoreqprov: on -Version: 2.2 -Summary: An SMB file server for Unix -Source: samba-2.2.0-alpha0.tar.gz -Source1: samba.pamd -Patch: samba-2.2.0-alpha0.dif -%package -n smbclnt -Summary: Samba client utilities -Autoreqprov: on -Group: Networking -%prep -%setup -n samba-2.2.0-alpha0 -%patch - -%build -cd source -%{?suse_update_config:%{suse_update_config -f}} -LIBS=-lnsl \ -./configure --prefix=/usr --libdir=/etc \ - --with-privatedir=/etc --localstatedir=/var/log \ - --with-smbmount --with-pam \ - --mandir=%{_mandir} \ - --with-swatdir=/usr/lib/samba/swat \ - --with-sambabook=/usr/lib/samba/swat/using_samba -cd .. -make LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \ - CODEPAGEDIR=/usr/lib/samba/codepages -C source - -%install -mkdir -p /usr/lib/samba -make install LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \ - CODEPAGEDIR=/usr/lib/samba/codepages -C source -# cleanup docs -rm -rf docs/*.[0-9] -chmod 644 `find docs examples -type f` -chmod 755 `find docs examples -type d` -#utility scripts -mkdir -p /usr/lib/samba/scripts -cp -a source/script/* /usr/lib/samba/scripts -# configuration files -install -m 644 smb.conf /etc/smb.conf -install -m 644 lmhosts /etc/lmhosts -install -m 600 smbpasswd -o root -g root /etc/smbpasswd -install -d 755 /etc/pam.d -install -m 644 $RPM_SOURCE_DIR/samba.pamd /etc/pam.d/samba -install -m 755 mount.smbfs /sbin/mount.smbfs -# start script -install rc /sbin/init.d/smb -ln -sf ../smb /sbin/init.d/rc2.d/S20smb -ln -sf ../smb /sbin/init.d/rc2.d/K20smb -ln -sf ../smb /sbin/init.d/rc3.d/S20smb -ln -sf ../smb /sbin/init.d/rc3.d/K20smb -ln -sf ../../sbin/init.d/smb /usr/sbin/rcsmb -install smbfs /sbin/init.d/smbfs -ln -sf ../smbfs /sbin/init.d/rc2.d/S21smbfs -ln -sf ../smbfs /sbin/init.d/rc2.d/K19smbfs -ln -sf ../smbfs /sbin/init.d/rc3.d/S21smbfs -ln -sf ../smbfs /sbin/init.d/rc3.d/K19smbfs -ln -sf ../../sbin/init.d/smbfs /usr/sbin/rcsmbfs -# rc.config fragment -mkdir -p /var/adm/fillup-templates -cp rc.config.samba /var/adm/fillup-templates -%{?suse_check} - -%post -echo "Updating etc/rc.config..." -if [ -x bin/fillup ] ; then - bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba -else - echo "ERROR: fillup not found. This should not happen. Please compare" - echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" - echo "update by hand." -fi -if grep -q '^[#[:space:]]*swat' etc/inetd.conf ; then - echo /etc/inetd.conf is up to date -else - echo updating inetd.conf - cat >> etc/inetd.conf << EOF -# swat is the Samba Web Administration Tool -swat stream tcp nowait.400 root /usr/sbin/swat swat -EOF -fi -if grep -q '^swat' etc/services ; then - echo /etc/services is up to date -else - echo updating services - cat >> etc/services << EOF -swat 901/tcp # swat is the Samba Web Administration Tool -EOF -fi -mkdir -p var/adm/notify/messages -cat << EOF > var/adm/notify/messages/samba-notify -Achtung! -======== -Die Syntax des smbmount Kommandos hat sich geaendert! -smbmount kann nicht mehr direkt aufgerufen werden. Es wird von einem -Shellscript /sbin/mount.smbfs aufgerufen, welches wiederum von mount -aufgerufen wird. -Hier ein Beispielaufruf: -mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination -***************************************************************************** -Attention! -========== -The syntax of smbmount has changed! -smbmount can not be called direct anymore. It will be called by a shell -script /sbin/mount.smbfs, which will be called by mount. -A sample call to smbfs: -mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination -EOF - -%files -%config(noreplace) /etc/smb.conf -%config(noreplace) /etc/lmhosts -%config(noreplace) /etc/smbpasswd -%config /etc/pam.d/samba -/usr/lib/samba -/sbin/init.d/rc2.d/K20smb -/sbin/init.d/rc2.d/S20smb -/sbin/init.d/rc3.d/K20smb -/sbin/init.d/rc3.d/S20smb -%config /sbin/init.d/smb -/usr/bin/addtosmbpass -/usr/bin/convert_smbpasswd -/usr/bin/make_printerdef -/usr/bin/make_smbcodepage -/usr/bin/make_unicodemap -/usr/bin/smbpasswd -/usr/bin/smbstatus -/usr/bin/testparm -/usr/bin/testprns -%doc docs/* examples -%doc %{_mandir}/man1/make_smbcodepage.1.gz -%doc %{_mandir}/man1/make_unicodemap.1.gz -%doc %{_mandir}/man1/smbrun.1.gz -%doc %{_mandir}/man1/smbsh.1.gz -%doc %{_mandir}/man1/smbstatus.1.gz -%doc %{_mandir}/man1/testparm.1.gz -%doc %{_mandir}/man1/testprns.1.gz -%doc %{_mandir}/man5/lmhosts.5.gz -%doc %{_mandir}/man5/smb.conf.5.gz -%doc %{_mandir}/man5/smbpasswd.5.gz -%doc %{_mandir}/man7/samba.7.gz -%doc %{_mandir}/man8/nmbd.8.gz -%doc %{_mandir}/man8/smbd.8.gz -%doc %{_mandir}/man8/smbpasswd.8.gz -%doc %{_mandir}/man8/swat.8.gz -/usr/sbin/nmbd -/usr/sbin/rcsmb -/usr/sbin/smbd -/usr/sbin/swat -/var/adm/fillup-templates/rc.config.samba - -%files -n smbclnt -/sbin/init.d/rc2.d/K19smbfs -/sbin/init.d/rc2.d/S21smbfs -/sbin/init.d/rc3.d/K19smbfs -/sbin/init.d/rc3.d/S21smbfs -%config /sbin/init.d/smbfs -/usr/sbin/rcsmbfs -/sbin/mount.smbfs -/usr/bin/nmblookup -/usr/bin/rpcclient -/usr/bin/smbclient -/usr/bin/smbmnt -/usr/bin/smbmount -/usr/bin/smbumount -/usr/bin/smbspool -/usr/bin/smbtar -%doc %{_mandir}/man1/nmblookup.1.gz -%doc %{_mandir}/man1/smbclient.1.gz -%doc %{_mandir}/man1/smbtar.1.gz -%doc %{_mandir}/man8/smbmnt.8.gz -%doc %{_mandir}/man8/smbmount.8.gz -%doc %{_mandir}/man8/smbspool.8.gz -%doc %{_mandir}/man8/smbumount.8.gz - -%description -Samba is a suite of programs which work together to allow clients to -access Unix filespace and printers via the SMB protocol (Server Message -Block). -In practice, this means that you can redirect disks and printers to -Unix disks and printers from LAN Manager clients, Windows for -Workgroups 3.11 clients, Windows'95 clients, Windows NT clients -and OS/2 clients. There is -also a Unix client program supplied as part of the suite which allows -Unix users to use an ftp-like interface to access filespace and -printers on any other SMB server. -Samba includes the following programs (in summary): -* smbd, the SMB server. This handles actual connections from clients. -* nmbd, the Netbios name server, which helps clients locate servers. -* smbclient, the Unix-hosted client program. -* smbrun, a little 'glue' program to help the server run external -programs. -* testprns, a program to test server access to printers. -* testparm, a program to test the Samba configuration file for correctness. -* smb.conf, the Samba configuration file. -* smbprint, a sample script to allow a Unix host to use smbclient -to print to an SMB server. -The suite is supplied with full source and is GPLed. -This package expects its config file under /etc/smb.conf . - -Authors: --------- - Andrew Tridgell - Karl Auer - Jeremy Allison - -SuSE series: n - - -%description -n smbclnt -This package contains all programs, that are needed to act as a samba -client. This includes also smbmount, of course. - -Authors: --------- - Andrew Tridgell - Karl Auer - Jeremy Allison - -SuSE series: n - - -%changelog -n samba -* Mon Aug 28 2000 - choeger@suse.de -- changed $* to "$@" in mount.smbfs to make it also - possible to mount shares with spaces -* Mon Jul 31 2000 - choeger@suse.de -- improvement for rcsmb -- fix for spec-file to compile with NIS netgroups -* Thu Jul 20 2000 - choeger@suse.de -- added smbfs initscript that has been removed - by an error -* Tue Jul 11 2000 - choeger@suse.de -- split package into client and server parts - client package name: smbclnt -* Wed Apr 26 2000 - choeger@suse.de -- new version, 2.0.7 -* Thu Apr 06 2000 - ro@suse.de -- removed pam,cracklib from neededforbuild: build handles this -* Wed Apr 05 2000 - bk@suse.de -- s390 team added config.{sub,guess} update macro for s390 -* Mon Mar 27 2000 - choeger@suse.de -- fixed bug in specfile - the multilined configure call missed a "" :-( -* Thu Mar 09 2000 - choeger@suse.de -- fixed typo in specfile -* Wed Mar 01 2000 - choeger@suse.de -- added %{_mandir} -* Tue Feb 08 2000 - choeger@suse.de -- removed /sbin/init.d/smbfs because it is no longer needed -* Mon Jan 03 2000 - choeger@suse.de -- bugfix for ipc.c - to make roaming profiles work again. -* Tue Nov 30 1999 - choeger@suse.de -- changed kernel oplocks = off to - kernel oplocks = false -* Tue Nov 16 1999 - choeger@suse.de -- added kernel oplocks = off in smb.conf -* Fri Nov 12 1999 - choeger@suse.de -- new version, 2.0.6 -* Fri Nov 05 1999 - choeger@suse.de -- Fix for the smbmount lost-connection problem - _seems_ to work... -* Fri Oct 29 1999 - choeger@suse.de -- removed comment sign in /etc/inetd.conf for swat -* Mon Sep 13 1999 - bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Tue Aug 10 1999 - fehr@suse.de -- set execute permissions for mksmbpasswd.sh and changesmbpasswd.sh -* Thu Jul 29 1999 - fehr@suse.de -- fixed typo in /sbin/init.d/smbfs -* Thu Jul 22 1999 - fehr@suse.de -- changed to new version 2.0.5a -* Wed Jul 21 1999 - fehr@suse.de -- changed to new version 2.0.5 -* Tue Jul 20 1999 - fehr@suse.de -- install /sbin/init.d/smbfs -- changed to new version 2.0.5pre4 -* Mon Jul 19 1999 - fehr@suse.de -- add /sbin/init.d/smbfs -- changed to new version 2.0.5pre3 -* Fri Jul 02 1999 - fehr@suse.de -- removed "umount -a -t smbfs" from start sscript -* Tue Jun 22 1999 - kukuk@suse.de -- 2.0.4b changed default values, enable PAM again -* Fri Jun 18 1999 - kukuk@suse.de -- changed to new version 2.0.4b -* Mon Jun 14 1999 - kukuk@suse.de -- Enable PAM, add samba.pamd -* Mon May 03 1999 - fehr@suse.de -- add umount -a -t smbfs to shutdown sequence of samba -* Thu Mar 11 1999 - ro@suse.de -- smbmount: define NR_OPEN to 1024 if undefined (GLIBC-2.1) -* Wed Mar 10 1999 - choeger@suse.de -- some enhancements for smb.conf -* Wed Mar 10 1999 - choeger@suse.de -- new version 2.0.3 and smbmount now seems to work -* Tue Mar 09 1999 - ro@suse.de -- use samba-2.0.2 for STABLE -- use smbfs-2.1 with kernel 2.2.2 -* Sun Feb 28 1999 - ro@suse.de -- for glibc-2.1 strncat uses strcat for one subcase, so don't - redefine strcat to "ERROR" for glibc-2.1 -* Mon Feb 15 1999 - fehr@suse.de -- fix for umount problem from Volker -* Tue Feb 09 1999 - fehr@suse.de -- changed to version 2.0.2 of samba -* Fri Jan 15 1999 - bs@suse.de -- replaced /sbin/init.d/smb with newer style version (again) -* Fri Jan 15 1999 - fehr@suse.de -- switched to new version 2.0.0 -* Wed Jan 13 1999 - bs@suse.de -- fixed entry in inetd.conf -* Wed Jan 13 1999 - bs@suse.de -- replaced /sbin/init.d/smb with newer style version -* Mon Jan 11 1999 - vl@suse.de -- make 2.0.0beta5 package of samba -* Mon Aug 24 1998 - vl@suse.de -- changed to version 1.9.18p10 -* Mon Jun 29 1998 - vl@suse.de -- changed to version 1.9.18p8 -* Mon Apr 20 1998 - vl@suse.de -- changed to version 1.9.18p4 -* Thu Feb 19 1998 - vl@suse.de -- changed to version 1.9.18p3 -* Tue Feb 03 1998 - vl@suse.de -- changed to version 1.9.18p2 -- fixed some problems in spec-file, some files were missing :-( -- fixed smbfs-2.0.2/Makefile.Linux -* Tue Jan 13 1998 - vl@suse.de -- changed to version 1.9.18p1 -* Fri Jan 09 1998 - vl@suse.de -- changed to version 1.9.18 -* Tue Dec 02 1997 - bs@suse.de -- disable samba by default in /etc/rc.config -* Mon Oct 06 1997 - fehr@suse.de -- package prepared for automatic building -* Mon Sep 29 1997 - fehr@suse.de -- updated to version 1.9.17p2 due to security hole. -* Wed Jul 16 1997 - fehr@suse.de -- add fillup-template for rc.config and install it in doinst.sh -* Fri Jun 27 1997 - bs@suse.de -- update to smbfs-2.0.2, due to security hole. -* Tue Jun 17 1997 - fehr@suse.de -- changed init-skript to recognize entry START_SMB of rc.config -* Mon Jun 02 1997 - vl@suse.de -- update to version 1.9.16p11 -- Starting Samba from /sbin/init.d, not from inetd.conf -* Sun Feb 02 1997 - vl@suse.de -- update to version 1.9.16p10 -- Adapted /etc/smb.conf.sample to 4.4.1 manual -* Thu Jan 02 1997 - florian@suse.de -- update to version 1.9.16p9 -- configuration file is now /etc/smb.conf -- smbd and nmbd are now in /usr/sbin -- added start-script /sbin/init.d/smb and entry in /etc/rc.config -* Thu Jan 02 1997 - florian@suse.de -- Update auf neue Version 1.9.16p6. -- cgit From d5cee4991e12333c5bcba9878db522dc70ac0d35 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sat, 29 Mar 2003 23:17:30 +0000 Subject: Packaging files for SuSE 8.1 (This used to be commit bacdf3b15c34991df01a49b47c178b36de048743) --- packaging/SuSE/samba-3.0.0-msdfs.diff | 97 ++++ packaging/SuSE/samba-3.0.0-net_ads.diff | 140 ++++++ packaging/SuSE/samba-3.0.0-pdb.diff | 11 + packaging/SuSE/samba-3.0.0-python.diff | 44 ++ packaging/SuSE/samba-3.0.0-vscan.diff | 80 ++++ packaging/SuSE/samba-3.0.0.files.tar.bz2 | Bin 0 -> 7266 bytes packaging/SuSE/samba-vscan-0.3.1.tar.bz2 | Bin 0 -> 51383 bytes packaging/SuSE/samba3.spec | 766 +++++++++++++++++++++++++++++++ 8 files changed, 1138 insertions(+) create mode 100644 packaging/SuSE/samba-3.0.0-msdfs.diff create mode 100644 packaging/SuSE/samba-3.0.0-net_ads.diff create mode 100644 packaging/SuSE/samba-3.0.0-pdb.diff create mode 100644 packaging/SuSE/samba-3.0.0-python.diff create mode 100644 packaging/SuSE/samba-3.0.0-vscan.diff create mode 100644 packaging/SuSE/samba-3.0.0.files.tar.bz2 create mode 100644 packaging/SuSE/samba-vscan-0.3.1.tar.bz2 create mode 100644 packaging/SuSE/samba3.spec (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba-3.0.0-msdfs.diff b/packaging/SuSE/samba-3.0.0-msdfs.diff new file mode 100644 index 0000000000..1e688e64c4 --- /dev/null +++ b/packaging/SuSE/samba-3.0.0-msdfs.diff @@ -0,0 +1,97 @@ +--- source/param/loadparm.c Wed Oct 9 21:17:05 2002 ++++ source/param/loadparm.c Mon Oct 14 16:33:08 2002 +@@ -386,6 +386,8 @@ + BOOL bInheritPerms; + BOOL bInheritACLS; + BOOL bMSDfsRoot; ++ BOOL bMSDfsProxy; ++ char *bMSDfsLinkName; + BOOL bUseClientDriver; + BOOL bDefaultDevmode; + BOOL bNTAclSupport; +@@ -508,6 +510,8 @@ + False, /* bInheritPerms */ + False, /* bInheritACLS */ + False, /* bMSDfsRoot */ ++ False, /* bMSDfsProxy */ ++ NULL, /* bMSDfsLinkName */ + False, /* bUseClientDriver */ + False, /* bDefaultDevmode */ + True, /* bNTAclSupport */ +@@ -1079,6 +1083,8 @@ + + + {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE}, ++ {"msdfs proxy", P_BOOL, P_LOCAL, &sDefault.bMSDfsProxy, NULL, NULL, FLAG_SHARE}, ++ {"msdfs link name", P_STRING, P_LOCAL, &sDefault.bMSDfsLinkName, NULL, NULL, FLAG_SHARE}, + {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + + {"Winbind options", P_SEP, P_SEPARATOR}, +@@ -1730,6 +1736,8 @@ + FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles) + FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation) + FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot) ++FN_LOCAL_BOOL(lp_msdfs_proxy, bMSDfsProxy) ++FN_LOCAL_STRING(lp_msdfs_link_name, bMSDfsLinkName) + FN_LOCAL_BOOL(lp_autoloaded, autoloaded) + FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose) + FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose) +--- source/msdfs/msdfs.c Tue Jul 2 08:34:24 2002 ++++ source/msdfs/msdfs.c Mon Oct 14 16:49:57 2002 +@@ -600,12 +600,38 @@ + int reply_size = 0; + char *pathnamep = pathname; + ++ struct connection_struct conns; ++ struct connection_struct* conn = &conns; ++ int snum; ++ pstring conn_path; ++ struct dfs_path dpi; ++ ++ struct junction_map junction2; ++ parse_dfs_path(pathname, &dpi); ++ pstrcpy(junction2.service_name, dpi.servicename); ++ snum = lp_servicenumber(junction2.service_name); ++ create_conn_struct(conn, snum, conn_path); ++ ++ + ZERO_STRUCT(junction); + + /* get the junction entry */ + if (!pathnamep) + return -1; + ++ if (lp_msdfs_proxy(SNUM(conn))) { ++ DEBUG(10,("running in proxy mode\n")); ++ pstrcpy(pathnamep, "\\"); ++ pstrcat(pathnamep, dpi.hostname); ++ pstrcat(pathnamep, "\\"); ++ pstrcat(pathnamep, dpi.servicename); ++ pstrcat(pathnamep, "\\"); ++ pstrcat(pathnamep, (char *) lp_msdfs_link_name(SNUM(conn))); ++ } else { ++ DEBUG(10,("running in normal mode\n")); ++ } ++ ++ + /* Trim pathname sent by client so it begins with only one backslash. + Two backslashes confuse some dfs clients + */ +@@ -631,6 +657,17 @@ + } + } + ++ if ( lp_msdfs_proxy(SNUM(conn)) ) { ++ DEBUG(10,("running in proxy mode\n")); ++ pstrcpy ( pathnamep, "\\" ); ++ pstrcat ( pathnamep, dpi.hostname); ++ pstrcat ( pathnamep, "\\" ); ++ pstrcat ( pathnamep, dpi.servicename); ++ } else { ++ DEBUG(10,("running in normal mode\n")); ++ } ++ ++ + /* create the referral depeding on version */ + DEBUG(10,("max_referral_level :%d\n",max_referral_level)); + if(max_referral_level<2 || max_referral_level>3) diff --git a/packaging/SuSE/samba-3.0.0-net_ads.diff b/packaging/SuSE/samba-3.0.0-net_ads.diff new file mode 100644 index 0000000000..b1224c0cef --- /dev/null +++ b/packaging/SuSE/samba-3.0.0-net_ads.diff @@ -0,0 +1,140 @@ +diff -Nur source/utils/net.c source/utils/net.c +--- source/utils/net.c Fri Sep 27 09:42:34 2002 ++++ source/utils/net.c Tue Oct 1 12:22:00 2002 +@@ -68,6 +68,7 @@ + int opt_port = 0; + int opt_maxusers = -1; + char *opt_comment = ""; ++char *opt_container = "cn=Users"; + int opt_flags = -1; + int opt_jobid = 0; + int opt_timeout = 0; +@@ -459,6 +460,7 @@ + {"myname", 'n', POPT_ARG_STRING, &opt_requester_name}, + {"conf", 's', POPT_ARG_STRING, &servicesf}, + {"server", 'S', POPT_ARG_STRING, &opt_host}, ++ {"container", 'c', POPT_ARG_STRING, &opt_container}, + {"comment", 'C', POPT_ARG_STRING, &opt_comment}, + {"maxusers", 'M', POPT_ARG_INT, &opt_maxusers}, + {"flags", 'F', POPT_ARG_INT, &opt_flags}, +diff -Nur source/utils/net.h source/utils/net.h +--- source/utils/net.h Tue Jun 25 04:29:09 2002 ++++ source/utils/net.h Tue Oct 1 12:19:51 2002 +@@ -38,10 +38,8 @@ + + extern int opt_maxusers; + extern char *opt_comment; ++extern char *opt_container; + extern int opt_flags; +- +-extern char *opt_comment; +- + extern char *opt_target_workgroup; + extern int opt_long_list_entries; + extern int opt_reboot; +diff -Nur source/utils/net_ads.c source/utils/net_ads.c +--- source/utils/net_ads.c Tue Sep 17 14:15:52 2002 ++++ source/utils/net_ads.c Tue Oct 1 12:33:44 2002 +@@ -255,7 +255,7 @@ + goto done; + } + +- status = ads_add_user_acct(ads, argv[0], opt_comment); ++ status = ads_add_user_acct(ads, argv[0], opt_container, opt_comment); + + if (!ADS_ERR_OK(status)) { + d_printf("Could not add user %s: %s\n", argv[0], +@@ -431,7 +431,7 @@ + goto done; + } + +- status = ads_add_group_acct(ads, argv[0], opt_comment); ++ status = ads_add_group_acct(ads, argv[0], opt_container, opt_comment); + + if (ADS_ERR_OK(status)) { + d_printf("Group %s added\n", argv[0]); +diff -Nur source/utils/net_help.c source/utils/net_help.c +--- source/utils/net_help.c Tue Sep 24 20:10:30 2002 ++++ source/utils/net_help.c Tue Oct 1 13:01:50 2002 +@@ -69,14 +69,14 @@ + "\n\tDelete specified user\n"); + d_printf("\nnet [] user INFO [misc. options] [targets]"\ + "\n\tList the domain groups of the specified user\n"); +- d_printf("\nnet [] user ADD [password] "\ ++ d_printf("\nnet [] user ADD [password] [-c container] "\ + "[-F user flags] [misc. options]"\ + " [targets]\n\tAdd specified user\n"); + + net_common_methods_usage(argc, argv); + net_common_flags_usage(argc, argv); +- d_printf( +- "\t-C or --comment=\tdescriptive comment (for add only)\n"); ++ d_printf("\t-C or --comment=\tdescriptive comment (for add only)\n"); ++ d_printf("\t-c or --container=\tLDAP container, defaults to cn=Users (for add in ADS only)\n"); + return -1; + } + +@@ -85,12 +85,12 @@ + "\n\tList user groups\n\n"); + d_printf("net [] group DELETE [misc. options] [targets]"\ + "\n\tDelete specified group\n"); +- d_printf("\nnet [] group ADD [-C comment]"\ ++ d_printf("\nnet [] group ADD [-C comment] [-c container]"\ + " [misc. options] [targets]\n\tCreate specified group\n"); + net_common_methods_usage(argc, argv); + net_common_flags_usage(argc, argv); +- d_printf( +- "\t-C or --comment=\tdescriptive comment (for add only)\n"); ++ d_printf("\t-C or --comment=\tdescriptive comment (for add only)\n"); ++ d_printf("\t-c or --container=\tLDAP container, defaults to cn=Users (for add in ADS only)\n"); + return -1; + } + +diff -Nur source/libads/ldap_user.c source/libads/ldap_user.c +--- source/libads/ldap_user.c Wed Aug 7 12:33:22 2002 ++++ source/libads/ldap_user.c Tue Oct 1 12:46:08 2002 +@@ -38,7 +38,7 @@ + } + + ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user, +- const char *fullname) ++ const char *container, const char *fullname) + { + TALLOC_CTX *ctx; + ADS_MODLIST mods; +@@ -57,7 +60,7 @@ + + if (!(upn = talloc_asprintf(ctx, "%s@%s", user, ads->config.realm))) + goto done; +- if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", name, ++ if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container, + ads->config.bind_path))) + goto done; + if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT))) +@@ -80,7 +83,7 @@ + } + + ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group, +- const char *comment) ++ const char *container, const char *comment) + { + TALLOC_CTX *ctx; + ADS_MODLIST mods; +@@ -93,7 +96,7 @@ + + status = ADS_ERROR(LDAP_NO_MEMORY); + +- if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", group, ++ if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", group, container, + ads->config.bind_path))) + goto done; + if (!(mods = ads_init_mods(ctx))) +@@ -102,7 +105,7 @@ + ads_mod_str(ctx, &mods, "cn", group); + ads_mod_strlist(ctx, &mods, "objectClass",objectClass); + ads_mod_str(ctx, &mods, "name", group); +- if (comment) ++ if (comment && *comment) + ads_mod_str(ctx, &mods, "description", comment); + ads_mod_str(ctx, &mods, "sAMAccountName", group); + status = ads_gen_add(ads, new_dn, mods); diff --git a/packaging/SuSE/samba-3.0.0-pdb.diff b/packaging/SuSE/samba-3.0.0-pdb.diff new file mode 100644 index 0000000000..4f767c4ac4 --- /dev/null +++ b/packaging/SuSE/samba-3.0.0-pdb.diff @@ -0,0 +1,11 @@ +--- examples/pdb/Makefile Thu Sep 5 02:11:41 2002 ++++ examples/pdb/Makefile Thu Sep 5 02:11:59 2002 +@@ -8,7 +8,7 @@ + SAMBA_INCL = ../../source/include + UBIQX_SRC = ../../source/ubiqx + SMBWR_SRC = ../../source/smbwrapper +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g ++CFLAGS = -I/usr/include/heimdal -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g + PDB_OBJS = pdb_test.so + + # Default target diff --git a/packaging/SuSE/samba-3.0.0-python.diff b/packaging/SuSE/samba-3.0.0-python.diff new file mode 100644 index 0000000000..8c5931e444 --- /dev/null +++ b/packaging/SuSE/samba-3.0.0-python.diff @@ -0,0 +1,44 @@ +--- source/python/py_common.c 2002-12-22 03:07:40.000000000 +0100 ++++ source/python/py_common.c 2002-11-29 11:50:22.000000000 +0100 +@@ -45,9 +45,6 @@ + + void py_samba_init(void) + { +- extern pstring global_myname; +- char *p; +- + if (initialised) + return; + +@@ -59,11 +56,7 @@ + /* Misc other stuff */ + + load_interfaces(); +- +- fstrcpy(global_myname, myhostname()); +- p = strchr(global_myname, '.'); +- if (p) +- *p = 0; ++ init_names(); + + initialised = True; + } +--- source/python/py_smb.c 2002-11-27 03:54:20.000000000 +0100 ++++ source/python/py_smb.c 2002-11-29 11:50:22.000000000 +0100 +@@ -61,7 +61,6 @@ + static char *kwlist[] = { "called", "calling", NULL }; + char *calling_name = NULL, *called_name; + struct nmb_name calling, called; +- extern pstring global_myname; + BOOL result; + + if (!PyArg_ParseTupleAndKeywords(args, kw, "s|s", kwlist, &called_name, +@@ -69,7 +68,7 @@ + return NULL; + + if (!calling_name) +- calling_name = global_myname; ++ calling_name = global_myname(); + + make_nmb_name(&calling, calling_name, 0x00); + make_nmb_name(&called, called_name, 0x20); diff --git a/packaging/SuSE/samba-3.0.0-vscan.diff b/packaging/SuSE/samba-3.0.0-vscan.diff new file mode 100644 index 0000000000..cb860e3ffb --- /dev/null +++ b/packaging/SuSE/samba-3.0.0-vscan.diff @@ -0,0 +1,80 @@ +--- examples/VFS/samba-vscan-0.3.1/fprot/Makefile 2002-11-26 15:20:17.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/fprot/Makefile 2002-12-19 13:26:19.000000000 +0100 +@@ -14,7 +14,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + VFS_OBJS = vscan-fprotd.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fprotd.lo vscan-fprotd_core.lo +--- examples/VFS/samba-vscan-0.3.1/include/vscan-global.h 2002-11-25 16:48:10.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/include/vscan-global.h 2002-12-19 13:26:34.000000000 +0100 +@@ -93,7 +93,7 @@ + */ + + #ifndef SAMBA_VERSION_MAJOR +-# define SAMBA_VERSION_MAJOR 2 ++# define SAMBA_VERSION_MAJOR 3 + #endif + + #ifndef SAMBA_VERSION_MINOR +--- examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile 2002-11-28 17:40:35.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile 2002-12-19 13:27:23.000000000 +0100 +@@ -23,9 +23,9 @@ + VFS_OBJS = vscan-kavp.so + + ifdef USE_DEBUG +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + else +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + endif + + ifndef USE_KAVPSHAREDLIB +--- examples/VFS/samba-vscan-0.3.1/mks/Makefile 2002-11-26 16:29:55.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/mks/Makefile 2002-12-19 13:27:53.000000000 +0100 +@@ -13,7 +13,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + VFS_OBJS = vscan-mksd.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-mksd.c vscan-mksd_core.c vscan-mksd.h vscan-mksd_core.h mks.h mks_c.c + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-mksd.lo vscan-mksd_core.lo mks_c.lo +--- examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile 2002-11-27 19:24:03.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile 2002-12-19 13:28:10.000000000 +0100 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + VFS_OBJS = vscan-oav.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-oav.lo vscan-oav_core.lo +--- examples/VFS/samba-vscan-0.3.1/sophos/Makefile 2002-11-27 19:24:03.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/sophos/Makefile 2002-12-19 13:29:20.000000000 +0100 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + VFS_OBJS = vscan-sophos.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-sophos.lo vscan-sophos_core.lo +--- examples/VFS/samba-vscan-0.3.1/trend/Makefile 2002-11-27 19:24:03.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.1/trend/Makefile 2002-12-19 13:29:31.000000000 +0100 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal + VFS_OBJS = vscan-trend.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-trend.lo vscan-trend_core.lo diff --git a/packaging/SuSE/samba-3.0.0.files.tar.bz2 b/packaging/SuSE/samba-3.0.0.files.tar.bz2 new file mode 100644 index 0000000000..1e8fc9baf0 Binary files /dev/null and b/packaging/SuSE/samba-3.0.0.files.tar.bz2 differ diff --git a/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 new file mode 100644 index 0000000000..5639279374 Binary files /dev/null and b/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 differ diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec new file mode 100644 index 0000000000..625a7d1283 --- /dev/null +++ b/packaging/SuSE/samba3.spec @@ -0,0 +1,766 @@ +# +# spec file for package samba (Version HEAD) CVS +# +# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# packaged by Guenther Deschner - work is not finished yet ! + +# neededforbuild acl acl-devel attr attr-devel autoconf automake heimdal-devel heimdal-lib libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel +# usedforbuild aaa_base aaa_version acl attr bash bind9-utils bison cpio cpp cyrus-sasl db devs diffutils e2fsprogs file filesystem fileutils fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip kbd less libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail sh-utils shadow strace syslogd sysvinit tar texinfo textutils timezone unzip util-linux vim zlib-devel acl-devel attr-devel autoconf automake binutils bzip2 cracklib gcc gdbm gettext heimdal-devel heimdal-lib libtool libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm zlib + + +Vendor: SuSE Linux AG, GS Berlin, Germany +Distribution: SuSE Linux 8.1 (i386) +Name: samba +Packager: gd@suse.de +License: GPL +Group: Productivity/Networking/Samba +Url: http://www.samba.org +Provides: samba smbfs +Obsoletes: samba-classic samba-ldap +Autoreqprov: on +%define smbwrap 0 +%define mit_kerberos 0 +%define heimdal_kerberos 1 +%define devel 0 +%define head 0 +%define python 1 +%define netatalk 0 +%define newsam 0 +%define samba_ver 3.0.0 +Requires: samba-client = %{samba_ver} +Version: 3.0.0 +Release: %(date +%%j) +Summary: An SMB file server for Unix +Source: %{name}-%{version}.tar.bz2 +Source10: %{name}-%{version}.files.tar.bz2 +Source50: http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2 +Patch1: %{name}-%{version}-pdb.diff +Patch10: %{name}-%{version}-net_ads.diff +Patch22: %{name}-%{version}-msdfs.diff +Patch30: %{name}-%{version}-python.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +%define DOCDIR %{_defaultdocdir}/%{name} +%define SWATDIR %{_datadir}/samba/swat +%define vscan_ver 0.3.1 +%define vscan_modules fprot kaspersky mks openantivirus sophos trend +Patch51: %{name}-%{version}-vscan.diff + +%package client +Summary: Samba client utilities +Autoreqprov: on +Requires: cups-libs +Obsoletes: smbclnt samba-classic-client samba-ldap-client +Group: Productivity/Networking/Samba + +%package winbind +Requires: samba-client samba +Summary: Samba Winbind-package +Autoreqprov: on +Group: Productivity/Networking/Samba + +%package utils +Summary: Samba Testing Utilities +Autoreqprov: on +Group: Productivity/Networking/Samba + +%package doc +Summary: Samba Documentation +Autoreqprov: on +Group: Productivity/Networking/Samba + +%package pdb +Summary: Samba PDB-Modules +Autoreqprov: on +Group: Productivity/Networking/Samba + +%package vfs +Summary: Samba VFS-Modules +Autoreqprov: on +Group: Productivity/Networking/Samba + +%if %{newsam} > 0 +%package sam +Summary: Samba SAM-Modules +Autoreqprov: on +Group: Productivity/Networking/Samba +%endif + +%package vscan +Summary: Samba VFS-Modules for Virusscanners +Autoreqprov: on +Group: Productivity/Networking/Samba +Version: 0.3.1 + +%package python +Summary: Samba Python-Modules +Autoreqprov: on +Group: Productivity/Networking/Samba + + + + +%changelog +* Sat Nov 3 2001 - gd@suse.de +- start + + +%prep +[ $RPM_BUILD_ROOT = "/" ] && (echo "your buildroot is /" && exit 0) || rm -rf $RPM_BUILD_ROOT +mkdir $RPM_BUILD_ROOT + +%setup -n %{name}-%{samba_ver} +%setup -T -D -a 50 +cp -ar samba-vscan-%{vscan_ver} examples/VFS/ + +# untar my configs +%setup -T -D -a 10 + +%if %{heimdal_kerberos} > 0 +%patch1 +%patch51 +%endif +#%patch10 +#%patch22 +#%patch30 + +find . -name CVS -print | xargs rm -rf +find . -name ".cvsignore" -print | xargs rm -rf +find . -name "'*.gd'" -print | xargs rm -rvf +find . -name "'*.orig'" -print | xargs rm -rvf + +%build %{name}-%{samba_ver} +%{?suse_update_config:%{suse_update_config -f}} +cd source +./autogen.sh +libtoolize --force --copy +autoconf +export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" +%ifarch ppc64 +export CFLAGS="$CFLAGS -mminimal-toc" +%endif +CONF_OPTS_BASIC="\ + --prefix=/usr \ + --libdir=/etc/samba \ + --localstatedir=/var/lib/samba \ + --mandir=%{_mandir} \ + --sbindir=/usr/sbin \ + --with-privatedir=/etc/samba \ + --with-piddir=/var/run/samba \ + --with-codepagedir=/usr/share/samba/codepages \ + --with-swatdir=/usr/share/samba/swat \ + --with-smbmount \ + --with-automount \ + --enable-cups \ + --with-msdfs \ + --with-vfs \ + --with-pam \ + --with-pam_smbpass \ + --with-utmp \ + --with-winbind \ + --with-tdbsam \ + --with-ldapsam \ +%if %{smbwrap} + --with-smbwrapper \ +%endif + --with-quotas \ + --with-acl-support \ + --with-python=python2.2 \ + --with-syslog \ +" +CONF_OPTS_HEAD="\ + --with-sam \ +" +CONF_OPTS_HEIMDAL_KERBEROS="\ + --with-krb5impl=heimdal \ +" +CONF_OPTS_HEIMDAL_51_KERBEROS="\ + --with-krb5impl=heimdal \ + --with-krb5includes=/opt/heimdal-0.5.1/include \ + --with-krb5libs=/opt/heimdal-0.5.1/lib \ +" +CONF_OPTS_MIT_KERBEROS="\ + --with-krb5impl=mit \ + --with-krb5includes=/usr/kerberos/include \ + --with-krb5libs=/usr/kerberos/lib \ +" +CONF_OPTS_DEVEL="\ + --enable-developer \ + --enable-krb5developer \ + --with-profiling-data \ +" +CONF_OPTS="$CONF_OPTS_BASIC" +%if %{head} > 0 +CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEAD" +%endif +%if %{heimdal_kerberos} > 0 +CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEIMDAL_KERBEROS" +%endif +%if %{mit_kerberos} > 0 +CONF_OPTS="$CONF_OPTS $CONF_OPTS_MIT_KERBEROS" +%endif +%if %{devel} > 0 +CONF_OPTS="$CONF_OPTS $CONF_OPTS_DEVEL" +%endif + +./configure $CONF_OPTS + +### --with-ldapsam is now standard! +### --with-sendfile-support ---default now +# --with-nisplussam \ +# --with-nisplus_home \ + +# with the new passdb-code we can finaly compile several passdb-backends +# and make our choice at runtime. +# HEAD and thus alpha21 no longer need this +#make proto + +make \ + LOCKDIR=/var/lib/samba \ + LOGFILEBASE=/var/log/samba \ + SBINDIR=/usr/sbin \ + all \ + torture \ + nsswitch/libnss_wins.so \ + debug2html \ + libsmbclient \ + bin/profiles \ + everything + +# everything = nsswitch smbwrapper smbtorture debug2html smbfilter nsswitch/libnss_wins.so + +%if %{newsam} > 0 +make bin/samtest +%endif +make modules + +make -C tdb tdbdump tdbtest tdbtool tdbtorture +# tdbbackup is now in main Makefile + +make talloctort + +# VFS,PDB and SAM +EXAMPLEDIRS="pdb" +for i in $EXAMPLEDIRS; do make -C ../examples/$i; done + +export USE_KAVPSHAREDLIB=0 +for module in %{vscan_modules}; do + make -C ../examples/VFS/%{name}-vscan-%{vscan_ver}/${module}; +done + +# tim potters python +%if %{python} > 0 +make python_ext +%endif + + + +%install + +mkdir -p \ + $RPM_BUILD_ROOT/usr/{bin,sbin} \ + $RPM_BUILD_ROOT/usr/share/{man,samba/{scripts,swat}} \ + $RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,sam,vscan} \ + $RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload \ + $RPM_BUILD_ROOT/usr/include \ + $RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \ + $RPM_BUILD_ROOT/var/adm \ + $RPM_BUILD_ROOT/sbin \ + $RPM_BUILD_ROOT/lib/security \ + $RPM_BUILD_ROOT/%{DOCDIR} \ + $RPM_BUILD_ROOT/%{DOCDIR}-vscan \ + $RPM_BUILD_ROOT/var/spool/samba \ + $RPM_BUILD_ROOT/var/log/samba \ + $RPM_BUILD_ROOT/var/run/samba \ + $RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles} + +cd source/ +make install \ + LIBDIR=$RPM_BUILD_ROOT/etc/samba \ + LOGFILEBASE=$RPM_BUILD_ROOT/var/log/samba \ + CONFIGFILE=$RPM_BUILD_ROOT/etc/samba/smb.conf \ + LMHOSTSFILE=$RPM_BUILD_ROOT/etc/samba/lmhosts \ + SWATDIR=$RPM_BUILD_ROOT/usr/share/samba/swat \ + SBINDIR=$RPM_BUILD_ROOT/usr/sbin \ + LOCKDIR=$RPM_BUILD_ROOT/var/lock/samba \ + CODEPAGEDIR=$RPM_BUILD_ROOT/usr/share/samba/codepages \ + DRIVERFILE=$RPM_BUILD_ROOT/etc/samba/printers.def \ + BINDIR=$RPM_BUILD_ROOT/usr/bin \ + SMB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd \ + TDB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd.tdb \ + MANDIR=$RPM_BUILD_ROOT/usr/share/man +cd .. + +# utility scripts +%if %{head} > 0 +scripts="creategroup cvslog.pl scancvslog.pl" +%else +scripts="scancvslog.pl" +%endif +for i in $scripts; do + cp -a source/script/$i $RPM_BUILD_ROOT/usr/share/samba/scripts/ +done + +# move the man-pages (ugly lang thing, fixed in alpha16) +#mv $RPM_BUILD_ROOT/usr/share/man/lang/* $RPM_BUILD_ROOT/usr/share/man/ + +# configuration files +install -m 644 smb.conf* $RPM_BUILD_ROOT/etc/samba/ +install -m 644 shares.conf $RPM_BUILD_ROOT/etc/samba/ +install -m 644 lmhosts $RPM_BUILD_ROOT/etc/samba/ +install -m 600 smbpasswd -o root -g root $RPM_BUILD_ROOT/etc/samba/ + +# pam +install -m 644 samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba + +# sambamount +ln -sf /usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs + +# start scripts +install rc.smb $RPM_BUILD_ROOT/etc/init.d/smb +ln -sf ../../etc/init.d/smb $RPM_BUILD_ROOT/usr/sbin/rcsmb +install rc.smbfs $RPM_BUILD_ROOT/etc/init.d/smbfs +ln -sf ../../etc/init.d/smbfs $RPM_BUILD_ROOT/usr/sbin/rcsmbfs +install rc.winbind $RPM_BUILD_ROOT/etc/init.d/winbind +ln -sf ../../etc/init.d/winbind $RPM_BUILD_ROOT/usr/sbin/rcwinbind +install rc.wrepl $RPM_BUILD_ROOT/etc/init.d/wrepl +ln -sf ../../etc/init.d/wrepl $RPM_BUILD_ROOT/usr/sbin/rcwrepl + +#### disabled for 8.0 +### rc.config fragment +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +cp rc.config.samba $RPM_BUILD_ROOT/var/adm/fillup-templates +cp rc.config.winbind $RPM_BUILD_ROOT/var/adm/fillup-templates +cp rc.config.wrepl $RPM_BUILD_ROOT/var/adm/fillup-templates + +# libnss_wins.so +cp source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so +ln -sf /lib/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so.2 + +# winbind stuff +cp -a source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security/ +cp -a source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib/ +cp -a source/bin/winbindd $RPM_BUILD_ROOT/usr/sbin/ +ln -sf /lib/libnss_winbind.so $RPM_BUILD_ROOT/lib/libnss_winbind.so.2 + +# pam_smbpass +cp -a source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security/ + +# smbfilter +cp -a source/bin/smbfilter $RPM_BUILD_ROOT/usr/bin/ + + +%{?suse_check} + +## install libsmbclient +install -m0755 source/bin/{libsmbclient.so,libsmbclient.a} $RPM_BUILD_ROOT/%{_libdir} +ln -s /usr/lib/libsmbclient.so $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0 +install -m0644 source/include/libsmbclient.h $RPM_BUILD_ROOT/%{_includedir} + +# install smbtorture and other test-programs +install -m0755 source/bin/smbtorture $RPM_BUILD_ROOT/usr/bin/ +install -m0755 source/bin/talloctort $RPM_BUILD_ROOT/usr/bin/ +install -m0755 source/bin/{msgtest,masktest,locktest*} $RPM_BUILD_ROOT/usr/bin/ +install -m0755 source/bin/{vfstest,nsstest} $RPM_BUILD_ROOT/usr/bin/ +%if %{head} > 0 +%if %{newsam} > 0 +install -m0755 source/bin/samtest $RPM_BUILD_ROOT/usr/bin/ +%endif +%endif + +# install tdb tools +install -m0755 source/tdb/{tdbdump,tdbtest,tdbtool,tdbtorture} $RPM_BUILD_ROOT/usr/bin/ + + +# install VFS-modules +%if %{head} > 0 +install -m0755 source/bin/developer.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +#install -m0755 examples/VFS/block/block.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +#install -m0755 examples/VFS/skel.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +%else +#install -m0755 examples/VFS/block/block.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +#install -m0755 examples/VFS/skel.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +%endif +install -m0755 source/bin/vfs_audit.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +install -m0755 source/bin/vfs_extd_audit.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +install -m0755 source/bin/vfs_recycle.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +%if %{netatalk} +install -m0755 source/bin/vfs_netatalk.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ +%endif + +# install PDB-modules +%if %{head} > 0 +install -m0755 source/bin/xml.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ +install -m0755 source/bin/mysql.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ +%else +install -m0755 source/bin/pdb_xml.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ +install -m0755 source/bin/pdb_mysql.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ +%endif +install -m0755 examples/pdb/pdb_test.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ + +# install SAM-modules +%if %{head} > 0 +%if %{newsam} > 0 +install -m0755 examples/sam/sam_skel.so $RPM_BUILD_ROOT/%{_libdir}/samba/sam/ +%endif +%endif + +# install VSCAN-vfs-modules +install -m0755 examples/VFS/%{name}-vscan-%{vscan_ver}/*/*.so $RPM_BUILD_ROOT/%{_libdir}/samba/vscan/ + +# make examples clean +VFS="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/VFS" +VSCAN="$VFS/%{name}-vscan-%{vscan_ver}" +PDB="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/pdb" +%if %{head} > 0 +%if %{newsam} > 0 +SAM="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/sam" +%endif +%endif +dirs="$PDB $SAM" +(for i in $dirs; do make -C $i clean; done) +(for i in %{vscan_modules}; do make -C $VSCAN/$i clean; done) + +%if %{python} > 0 +# install python +cp -a source/build/lib.*/samba $RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload/ +%endif + +# whats this ? +install -m0755 source/bin/debug2html $RPM_BUILD_ROOT/usr/bin/ + +%if %{smbwrap} +# install smbwrapper +install -m0755 source/bin/smbwrapper.so $RPM_BUILD_ROOT/%{_libdir}/samba/ +install -m0755 source/bin/smbsh $RPM_BUILD_ROOT/usr/bin/ +%endif + +# finally obsolete with alpha17 makefile +# install unicode-codepages +#install -m0755 source/codepages/{lowcase,upcase,valid}.dat $RPM_BUILD_ROOT/etc/samba/ + +# cleanup docs +rm -rf docs/*.[0-9] +chmod 644 `find docs examples -type f` +chmod 755 `find docs examples -type d` +mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt $RPM_BUILD_ROOT/%{DOCDIR}/ +cp source/msdfs/README $RPM_BUILD_ROOT/%{DOCDIR}/README.msdfs +#cp source/nsswitch/README $RPM_BUILD_ROOT/%{DOCDIR}/README.nsswitch +cp source/smbwrapper/README $RPM_BUILD_ROOT/%{DOCDIR}/README.smbwrapper +cp -a docs/* $RPM_BUILD_ROOT/%{DOCDIR} +cp -a examples/ $RPM_BUILD_ROOT/%{DOCDIR} +# save space... +rm -r \ + $RPM_BUILD_ROOT/%{SWATDIR}/using_samba +ln -s %{DOCDIR}/htmldocs/using_samba $RPM_BUILD_ROOT/%{SWATDIR} + + +%post +###### disabled for 8.1 +###echo "Updating etc/rc.config..." +##if [ -x bin/fillup ] ; then +## bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba +## bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.winbind +##else +## echo "ERROR: fillup not found. This should not happen. Please compare" +## echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" +## echo "var/adm/fillup-templates/rc.config.winbind and update by hand." +##fi +mkdir -p $RPM_BUILD_ROOT/var/adm/notify/messages +cat << EOF > var/adm/notify/messages/samba-notify +Achtung! + +This is %{name}-%{samba_ver}. Please do not run on production systems. + +You have been warned. +EOF + +# Initialize runlevel links +# +%{fillup_and_insserv smb} +#sbin/insserv /etc/init.d/smb + +%post client +#sbin/insserv /etc/init.d/smbfs +%{fillup_and_insserv -fpy smbfs} +%{fillup_only -ans samba client} + +%postun +%{insserv_cleanup} +#sbin/insserv /etc/init.d/ + +%postun client +%{insserv_cleanup} +#sbin/insserv /etc/init.d/ + +%post winbind +%{fillup_and_insserv winbind} +#sbin/insserv /etc/init.d/winbind + +%postun winbind +%{insserv_cleanup} +#sbin/insserv /etc/init.d/ + +%clean +#make -C source realclean + +%files +%config(noreplace) /etc/samba/smbpasswd +%config /etc/pam.d/samba +%config /etc/init.d/smb +%config /etc/init.d/wrepl +#/usr/bin/make_printerdef +/usr/bin/addtosmbpass +/usr/bin/convert_smbpasswd +/usr/bin/smbgroupedit +/usr/bin/ntlm_auth +/usr/bin/profiles +/usr/bin/smbfilter +/usr/bin/smbpasswd +/usr/bin/smbstatus +/usr/bin/testparm +/usr/bin/testprns +#%doc %{_mandir}/man1/smbrun.1.gz +%doc %{_mandir}/man1/smbsh.1.gz +%doc %{_mandir}/man1/smbstatus.1.gz +%doc %{_mandir}/man1/testparm.1.gz +%doc %{_mandir}/man1/testprns.1.gz +%doc %{_mandir}/man5/smbpasswd.5.gz +%doc %{_mandir}/man7/samba.7.gz +%doc %{_mandir}/man8/nmbd.8.gz +%doc %{_mandir}/man8/smbd.8.gz +%doc %{_mandir}/man8/smbgroupedit.8.gz +%doc %{_mandir}/man8/smbpasswd.8.gz +%doc %{_mandir}/man8/swat.8.gz +/usr/sbin/nmbd +/usr/sbin/smbd +/usr/sbin/swat +/usr/sbin/wrepld +/usr/sbin/rcsmb +/usr/sbin/rcwrepl +#/var/adm/fillup-templates/rc.config.samba +/var/log/samba +/var/spool/samba +/var/run/samba +/var/lib/samba +/usr/share/samba +/lib/security/pam_smbpass.so + +%files client +%config(noreplace) /etc/samba/smb.conf +%config(noreplace) /etc/samba/lmhosts +/etc/samba/lowcase.dat +/etc/samba/upcase.dat +/etc/samba/valid.dat +%config /etc/init.d/smbfs +/usr/sbin/rcsmbfs +/sbin/mount.smbfs +/usr/bin/findsmb +/usr/bin/net +/usr/bin/nmblookup +/usr/bin/pdbedit +/usr/bin/rpcclient +/usr/bin/smbcacls +/usr/bin/smbcontrol +/usr/bin/smbclient +/usr/bin/smbmnt +/usr/bin/smbmount +%if %{smbwrap} +/usr/bin/smbsh +%endif +/usr/bin/smbumount +/usr/bin/smbspool +/usr/bin/smbtar +/usr/bin/smbtree +%doc %{_mandir}/man1/nmblookup.1.gz +%doc %{_mandir}/man1/rpcclient.1.gz +%doc %{_mandir}/man1/smbclient.1.gz +%doc %{_mandir}/man1/smbcacls.1.gz +%doc %{_mandir}/man1/smbcontrol.1.gz +%doc %{_mandir}/man1/smbtar.1.gz +%doc %{_mandir}/man5/lmhosts.5.gz +%doc %{_mandir}/man5/smb.conf.5.gz +%doc %{_mandir}/man8/net.8.gz +%doc %{_mandir}/man8/pdbedit.8.gz +%doc %{_mandir}/man8/smbmnt.8.gz +%doc %{_mandir}/man8/smbmount.8.gz +%doc %{_mandir}/man8/smbspool.8.gz +%doc %{_mandir}/man8/smbumount.8.gz +/usr/include/libsmbclient.h +%if %{smbwrap} +/usr/lib/samba/smbwrapper.so +%endif +/usr/lib/libsmbclient.a +/usr/lib/libsmbclient.so +/usr/lib/libsmbclient.so.0 + +%files winbind +%config(noreplace) /etc/samba/smb.conf.winbind +%config /etc/init.d/winbind +%doc %{_mandir}/man1/wbinfo.1.gz +%doc %{_mandir}/man8/winbindd.8.gz +/usr/bin/wbinfo +%if %{head} > 0 +/usr/bin/ntlm_auth +%endif +/usr/sbin/winbindd +/usr/sbin/rcwinbind +#/var/adm/fillup-templates/rc.config.winbind +/lib/security/pam_winbind.so +/lib/libnss_winbind.so +/lib/libnss_winbind.so.2 +/lib/libnss_wins.so +/lib/libnss_wins.so.2 + +%files utils +/usr/bin/smbtorture +/usr/bin/msgtest +/usr/bin/masktest +/usr/bin/locktest +/usr/bin/locktest2 +/usr/bin/debug2html +/usr/bin/talloctort +/usr/bin/tdbbackup +/usr/bin/tdbdump +/usr/bin/tdbtest +/usr/bin/tdbtool +/usr/bin/tdbtorture +/usr/bin/vfstest +/usr/bin/nsstest +%if %{head} > 0 +%if %{newsam} > 0 +/usr/bin/samtest +%endif +/usr/bin/profiles +/usr/bin/editreg +%endif +%doc %{_mandir}/man1/vfstest.1.gz + +%files doc +%docdir %{DOCDIR} +%{DOCDIR} + +%files pdb +/usr/lib/samba/pdb +%doc examples/pdb/* + +%files vfs +/usr/lib/samba/vfs +%doc examples/VFS/README* +%doc examples/VFS/Makefile* +#doc examples/VFS/audit* +#%doc examples/VFS/block* +#doc examples/VFS/netatalk* +#doc examples/VFS/recycle* +%doc examples/VFS/skel* + +%if %{newsam} > 0 +%files sam +/usr/lib/samba/sam +%if %{head} > 0 +%doc examples/sam/* +%endif +%endif + +%files vscan +/usr/lib/samba/vscan +%doc %{name}-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO} + + +%files python +%doc source/python/README +%if %{python} > 0 +/usr/lib/python2.2/lib-dynload/samba +%doc source/python/examples +%doc source/python/gprinterdata +%doc source/python/gtdbtool +%doc source/python/gtkdictbrowser.py +%if %{head} > 0 +%doc source/python/gtkdictbrowser.pyc +%doc source/python/printerdata.pyc +%endif +%endif + +%description +Samba is a suite of programs which work together to allow clients to +access Unix filespace and printers via the SMB protocol (Server Message +Block). +In practice, this means that you can redirect disks and printers to +Unix disks and printers from LAN Manager clients, Windows for +Workgroups 3.11 clients, Windows'95 clients, Windows NT clients +and OS/2 clients. There is +also a Unix client program supplied as part of the suite which allows +Unix users to use an ftp-like interface to access filespace and +printers on any other SMB server. +Samba includes the following programs (in summary): +* smbd, the SMB server. This handles actual connections from clients. +* nmbd, the Netbios name server, which helps clients locate servers. +* smbclient, the Unix-hosted client program. +* smbrun, a little 'glue' program to help the server run external +programs. +* testprns, a program to test server access to printers. +* testparm, a program to test the Samba configuration file for correctness. +* smb.conf, the Samba configuration file. +* smbprint, a sample script to allow a Unix host to use smbclient +to print to an SMB server. +The suite is supplied with full source and is GPLed. +This package expects its config file under /etc/smb.conf . + +Authors: +-------- + Andrew Tridgell + Karl Auer + Jeremy Allison + +SuSE series: n + + +%description client +This package contains all programs, that are needed to act as a samba +client. This includes also smbmount, of course. + +Authors: +-------- + Andrew Tridgell + Karl Auer + Jeremy Allison + +SuSE series: n + + +%description winbind +This is the winbind-daemon and the wbinfo-tool. + +%description utils +Some of the debug-tools for developpers. +Contains: + - debug2html + - locktest + - locktest2 + - masktest + - msgtest + - smbtorture + - talloctort + - several tdb-tools + +%description doc +The Samba Documentation. + +%description vfs +The Samba VFS-Modules. + +%description pdb +The Samba PDB-Modules. + +%if %{newsam} > 0 +%description sam +The Samba SAM-Modules. +%endif + +%description vscan +The Samba VFS-Modules for Virusscanners. + +%description python +The Samba python-Modules. -- cgit From 6218079034d2640f85c0328abc003dbedfb1f1ff Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sat, 29 Mar 2003 23:22:07 +0000 Subject: README file to explain that this is not a SuSE update. (This used to be commit 97d6e2fcfb01e3ae4431420407923b267c971bb1) --- packaging/SuSE/README | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packaging/SuSE/README (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/README b/packaging/SuSE/README new file mode 100644 index 0000000000..5d0af9944a --- /dev/null +++ b/packaging/SuSE/README @@ -0,0 +1,18 @@ +Date: March 29, 2003 + +Note: The current packaging files are NOT officially supported files. +--------------------------------------------------------------------- + +While the SPEC file shows who the original author was, these files imply no warranty of +fitness what so ever. These files are NOT official SuSE files and are NOT supported by +them. If you have ANY problems with the use of these files then please email jht@samba.org +and NOT SuSE support. + + +These files may be used to build Samba-3.0 packages for SuSE Linux 8.1 and/or for +UnitedLinux 1.0 systems. + +Note2: You most likely will need to update to heimdal-0.5.1 or later if you intend to +use any Kerberos functionality. + +- John T. -- cgit From efc8dac53869b87d9a18cb3f7943bae9f1e8c306 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 21 Apr 2003 19:42:18 +0000 Subject: remove smbgroupedit from packaging scripts (This used to be commit efa4e08210ff7c3bd703f0bb3ddf8da8bb84850a) --- packaging/SuSE/samba3.spec | 2 -- 1 file changed, 2 deletions(-) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec index 625a7d1283..dd2860b801 100644 --- a/packaging/SuSE/samba3.spec +++ b/packaging/SuSE/samba3.spec @@ -514,7 +514,6 @@ EOF #/usr/bin/make_printerdef /usr/bin/addtosmbpass /usr/bin/convert_smbpasswd -/usr/bin/smbgroupedit /usr/bin/ntlm_auth /usr/bin/profiles /usr/bin/smbfilter @@ -531,7 +530,6 @@ EOF %doc %{_mandir}/man7/samba.7.gz %doc %{_mandir}/man8/nmbd.8.gz %doc %{_mandir}/man8/smbd.8.gz -%doc %{_mandir}/man8/smbgroupedit.8.gz %doc %{_mandir}/man8/smbpasswd.8.gz %doc %{_mandir}/man8/swat.8.gz /usr/sbin/nmbd -- cgit From ea552156a075297b05166eec4ff8b3719f5b2900 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Tue, 12 Aug 2003 01:27:23 +0000 Subject: Deleting obsoleted files in preparation for addition of new files. (This used to be commit ec43558343b036d96f2822490d55eb22edf6124d) --- packaging/SuSE/samba-3.0.0-msdfs.diff | 97 --------------------- packaging/SuSE/samba-3.0.0-net_ads.diff | 140 ------------------------------- packaging/SuSE/samba-3.0.0-pdb.diff | 11 --- packaging/SuSE/samba-3.0.0-python.diff | 44 ---------- packaging/SuSE/samba-3.0.0-vscan.diff | 80 ------------------ packaging/SuSE/samba-vscan-0.3.1.tar.bz2 | Bin 51383 -> 0 bytes 6 files changed, 372 deletions(-) delete mode 100644 packaging/SuSE/samba-3.0.0-msdfs.diff delete mode 100644 packaging/SuSE/samba-3.0.0-net_ads.diff delete mode 100644 packaging/SuSE/samba-3.0.0-pdb.diff delete mode 100644 packaging/SuSE/samba-3.0.0-python.diff delete mode 100644 packaging/SuSE/samba-3.0.0-vscan.diff delete mode 100644 packaging/SuSE/samba-vscan-0.3.1.tar.bz2 (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba-3.0.0-msdfs.diff b/packaging/SuSE/samba-3.0.0-msdfs.diff deleted file mode 100644 index 1e688e64c4..0000000000 --- a/packaging/SuSE/samba-3.0.0-msdfs.diff +++ /dev/null @@ -1,97 +0,0 @@ ---- source/param/loadparm.c Wed Oct 9 21:17:05 2002 -+++ source/param/loadparm.c Mon Oct 14 16:33:08 2002 -@@ -386,6 +386,8 @@ - BOOL bInheritPerms; - BOOL bInheritACLS; - BOOL bMSDfsRoot; -+ BOOL bMSDfsProxy; -+ char *bMSDfsLinkName; - BOOL bUseClientDriver; - BOOL bDefaultDevmode; - BOOL bNTAclSupport; -@@ -508,6 +510,8 @@ - False, /* bInheritPerms */ - False, /* bInheritACLS */ - False, /* bMSDfsRoot */ -+ False, /* bMSDfsProxy */ -+ NULL, /* bMSDfsLinkName */ - False, /* bUseClientDriver */ - False, /* bDefaultDevmode */ - True, /* bNTAclSupport */ -@@ -1079,6 +1083,8 @@ - - - {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE}, -+ {"msdfs proxy", P_BOOL, P_LOCAL, &sDefault.bMSDfsProxy, NULL, NULL, FLAG_SHARE}, -+ {"msdfs link name", P_STRING, P_LOCAL, &sDefault.bMSDfsLinkName, NULL, NULL, FLAG_SHARE}, - {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - - {"Winbind options", P_SEP, P_SEPARATOR}, -@@ -1730,6 +1736,8 @@ - FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles) - FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation) - FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot) -+FN_LOCAL_BOOL(lp_msdfs_proxy, bMSDfsProxy) -+FN_LOCAL_STRING(lp_msdfs_link_name, bMSDfsLinkName) - FN_LOCAL_BOOL(lp_autoloaded, autoloaded) - FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose) - FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose) ---- source/msdfs/msdfs.c Tue Jul 2 08:34:24 2002 -+++ source/msdfs/msdfs.c Mon Oct 14 16:49:57 2002 -@@ -600,12 +600,38 @@ - int reply_size = 0; - char *pathnamep = pathname; - -+ struct connection_struct conns; -+ struct connection_struct* conn = &conns; -+ int snum; -+ pstring conn_path; -+ struct dfs_path dpi; -+ -+ struct junction_map junction2; -+ parse_dfs_path(pathname, &dpi); -+ pstrcpy(junction2.service_name, dpi.servicename); -+ snum = lp_servicenumber(junction2.service_name); -+ create_conn_struct(conn, snum, conn_path); -+ -+ - ZERO_STRUCT(junction); - - /* get the junction entry */ - if (!pathnamep) - return -1; - -+ if (lp_msdfs_proxy(SNUM(conn))) { -+ DEBUG(10,("running in proxy mode\n")); -+ pstrcpy(pathnamep, "\\"); -+ pstrcat(pathnamep, dpi.hostname); -+ pstrcat(pathnamep, "\\"); -+ pstrcat(pathnamep, dpi.servicename); -+ pstrcat(pathnamep, "\\"); -+ pstrcat(pathnamep, (char *) lp_msdfs_link_name(SNUM(conn))); -+ } else { -+ DEBUG(10,("running in normal mode\n")); -+ } -+ -+ - /* Trim pathname sent by client so it begins with only one backslash. - Two backslashes confuse some dfs clients - */ -@@ -631,6 +657,17 @@ - } - } - -+ if ( lp_msdfs_proxy(SNUM(conn)) ) { -+ DEBUG(10,("running in proxy mode\n")); -+ pstrcpy ( pathnamep, "\\" ); -+ pstrcat ( pathnamep, dpi.hostname); -+ pstrcat ( pathnamep, "\\" ); -+ pstrcat ( pathnamep, dpi.servicename); -+ } else { -+ DEBUG(10,("running in normal mode\n")); -+ } -+ -+ - /* create the referral depeding on version */ - DEBUG(10,("max_referral_level :%d\n",max_referral_level)); - if(max_referral_level<2 || max_referral_level>3) diff --git a/packaging/SuSE/samba-3.0.0-net_ads.diff b/packaging/SuSE/samba-3.0.0-net_ads.diff deleted file mode 100644 index b1224c0cef..0000000000 --- a/packaging/SuSE/samba-3.0.0-net_ads.diff +++ /dev/null @@ -1,140 +0,0 @@ -diff -Nur source/utils/net.c source/utils/net.c ---- source/utils/net.c Fri Sep 27 09:42:34 2002 -+++ source/utils/net.c Tue Oct 1 12:22:00 2002 -@@ -68,6 +68,7 @@ - int opt_port = 0; - int opt_maxusers = -1; - char *opt_comment = ""; -+char *opt_container = "cn=Users"; - int opt_flags = -1; - int opt_jobid = 0; - int opt_timeout = 0; -@@ -459,6 +460,7 @@ - {"myname", 'n', POPT_ARG_STRING, &opt_requester_name}, - {"conf", 's', POPT_ARG_STRING, &servicesf}, - {"server", 'S', POPT_ARG_STRING, &opt_host}, -+ {"container", 'c', POPT_ARG_STRING, &opt_container}, - {"comment", 'C', POPT_ARG_STRING, &opt_comment}, - {"maxusers", 'M', POPT_ARG_INT, &opt_maxusers}, - {"flags", 'F', POPT_ARG_INT, &opt_flags}, -diff -Nur source/utils/net.h source/utils/net.h ---- source/utils/net.h Tue Jun 25 04:29:09 2002 -+++ source/utils/net.h Tue Oct 1 12:19:51 2002 -@@ -38,10 +38,8 @@ - - extern int opt_maxusers; - extern char *opt_comment; -+extern char *opt_container; - extern int opt_flags; -- --extern char *opt_comment; -- - extern char *opt_target_workgroup; - extern int opt_long_list_entries; - extern int opt_reboot; -diff -Nur source/utils/net_ads.c source/utils/net_ads.c ---- source/utils/net_ads.c Tue Sep 17 14:15:52 2002 -+++ source/utils/net_ads.c Tue Oct 1 12:33:44 2002 -@@ -255,7 +255,7 @@ - goto done; - } - -- status = ads_add_user_acct(ads, argv[0], opt_comment); -+ status = ads_add_user_acct(ads, argv[0], opt_container, opt_comment); - - if (!ADS_ERR_OK(status)) { - d_printf("Could not add user %s: %s\n", argv[0], -@@ -431,7 +431,7 @@ - goto done; - } - -- status = ads_add_group_acct(ads, argv[0], opt_comment); -+ status = ads_add_group_acct(ads, argv[0], opt_container, opt_comment); - - if (ADS_ERR_OK(status)) { - d_printf("Group %s added\n", argv[0]); -diff -Nur source/utils/net_help.c source/utils/net_help.c ---- source/utils/net_help.c Tue Sep 24 20:10:30 2002 -+++ source/utils/net_help.c Tue Oct 1 13:01:50 2002 -@@ -69,14 +69,14 @@ - "\n\tDelete specified user\n"); - d_printf("\nnet [] user INFO [misc. options] [targets]"\ - "\n\tList the domain groups of the specified user\n"); -- d_printf("\nnet [] user ADD [password] "\ -+ d_printf("\nnet [] user ADD [password] [-c container] "\ - "[-F user flags] [misc. options]"\ - " [targets]\n\tAdd specified user\n"); - - net_common_methods_usage(argc, argv); - net_common_flags_usage(argc, argv); -- d_printf( -- "\t-C or --comment=\tdescriptive comment (for add only)\n"); -+ d_printf("\t-C or --comment=\tdescriptive comment (for add only)\n"); -+ d_printf("\t-c or --container=\tLDAP container, defaults to cn=Users (for add in ADS only)\n"); - return -1; - } - -@@ -85,12 +85,12 @@ - "\n\tList user groups\n\n"); - d_printf("net [] group DELETE [misc. options] [targets]"\ - "\n\tDelete specified group\n"); -- d_printf("\nnet [] group ADD [-C comment]"\ -+ d_printf("\nnet [] group ADD [-C comment] [-c container]"\ - " [misc. options] [targets]\n\tCreate specified group\n"); - net_common_methods_usage(argc, argv); - net_common_flags_usage(argc, argv); -- d_printf( -- "\t-C or --comment=\tdescriptive comment (for add only)\n"); -+ d_printf("\t-C or --comment=\tdescriptive comment (for add only)\n"); -+ d_printf("\t-c or --container=\tLDAP container, defaults to cn=Users (for add in ADS only)\n"); - return -1; - } - -diff -Nur source/libads/ldap_user.c source/libads/ldap_user.c ---- source/libads/ldap_user.c Wed Aug 7 12:33:22 2002 -+++ source/libads/ldap_user.c Tue Oct 1 12:46:08 2002 -@@ -38,7 +38,7 @@ - } - - ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user, -- const char *fullname) -+ const char *container, const char *fullname) - { - TALLOC_CTX *ctx; - ADS_MODLIST mods; -@@ -57,7 +60,7 @@ - - if (!(upn = talloc_asprintf(ctx, "%s@%s", user, ads->config.realm))) - goto done; -- if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", name, -+ if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container, - ads->config.bind_path))) - goto done; - if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT))) -@@ -80,7 +83,7 @@ - } - - ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group, -- const char *comment) -+ const char *container, const char *comment) - { - TALLOC_CTX *ctx; - ADS_MODLIST mods; -@@ -93,7 +96,7 @@ - - status = ADS_ERROR(LDAP_NO_MEMORY); - -- if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", group, -+ if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", group, container, - ads->config.bind_path))) - goto done; - if (!(mods = ads_init_mods(ctx))) -@@ -102,7 +105,7 @@ - ads_mod_str(ctx, &mods, "cn", group); - ads_mod_strlist(ctx, &mods, "objectClass",objectClass); - ads_mod_str(ctx, &mods, "name", group); -- if (comment) -+ if (comment && *comment) - ads_mod_str(ctx, &mods, "description", comment); - ads_mod_str(ctx, &mods, "sAMAccountName", group); - status = ads_gen_add(ads, new_dn, mods); diff --git a/packaging/SuSE/samba-3.0.0-pdb.diff b/packaging/SuSE/samba-3.0.0-pdb.diff deleted file mode 100644 index 4f767c4ac4..0000000000 --- a/packaging/SuSE/samba-3.0.0-pdb.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/pdb/Makefile Thu Sep 5 02:11:41 2002 -+++ examples/pdb/Makefile Thu Sep 5 02:11:59 2002 -@@ -8,7 +8,7 @@ - SAMBA_INCL = ../../source/include - UBIQX_SRC = ../../source/ubiqx - SMBWR_SRC = ../../source/smbwrapper --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -+CFLAGS = -I/usr/include/heimdal -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g - PDB_OBJS = pdb_test.so - - # Default target diff --git a/packaging/SuSE/samba-3.0.0-python.diff b/packaging/SuSE/samba-3.0.0-python.diff deleted file mode 100644 index 8c5931e444..0000000000 --- a/packaging/SuSE/samba-3.0.0-python.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- source/python/py_common.c 2002-12-22 03:07:40.000000000 +0100 -+++ source/python/py_common.c 2002-11-29 11:50:22.000000000 +0100 -@@ -45,9 +45,6 @@ - - void py_samba_init(void) - { -- extern pstring global_myname; -- char *p; -- - if (initialised) - return; - -@@ -59,11 +56,7 @@ - /* Misc other stuff */ - - load_interfaces(); -- -- fstrcpy(global_myname, myhostname()); -- p = strchr(global_myname, '.'); -- if (p) -- *p = 0; -+ init_names(); - - initialised = True; - } ---- source/python/py_smb.c 2002-11-27 03:54:20.000000000 +0100 -+++ source/python/py_smb.c 2002-11-29 11:50:22.000000000 +0100 -@@ -61,7 +61,6 @@ - static char *kwlist[] = { "called", "calling", NULL }; - char *calling_name = NULL, *called_name; - struct nmb_name calling, called; -- extern pstring global_myname; - BOOL result; - - if (!PyArg_ParseTupleAndKeywords(args, kw, "s|s", kwlist, &called_name, -@@ -69,7 +68,7 @@ - return NULL; - - if (!calling_name) -- calling_name = global_myname; -+ calling_name = global_myname(); - - make_nmb_name(&calling, calling_name, 0x00); - make_nmb_name(&called, called_name, 0x20); diff --git a/packaging/SuSE/samba-3.0.0-vscan.diff b/packaging/SuSE/samba-3.0.0-vscan.diff deleted file mode 100644 index cb860e3ffb..0000000000 --- a/packaging/SuSE/samba-3.0.0-vscan.diff +++ /dev/null @@ -1,80 +0,0 @@ ---- examples/VFS/samba-vscan-0.3.1/fprot/Makefile 2002-11-26 15:20:17.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/fprot/Makefile 2002-12-19 13:26:19.000000000 +0100 -@@ -14,7 +14,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - VFS_OBJS = vscan-fprotd.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fprotd.lo vscan-fprotd_core.lo ---- examples/VFS/samba-vscan-0.3.1/include/vscan-global.h 2002-11-25 16:48:10.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/include/vscan-global.h 2002-12-19 13:26:34.000000000 +0100 -@@ -93,7 +93,7 @@ - */ - - #ifndef SAMBA_VERSION_MAJOR --# define SAMBA_VERSION_MAJOR 2 -+# define SAMBA_VERSION_MAJOR 3 - #endif - - #ifndef SAMBA_VERSION_MINOR ---- examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile 2002-11-28 17:40:35.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile 2002-12-19 13:27:23.000000000 +0100 -@@ -23,9 +23,9 @@ - VFS_OBJS = vscan-kavp.so - - ifdef USE_DEBUG --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - else --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - endif - - ifndef USE_KAVPSHAREDLIB ---- examples/VFS/samba-vscan-0.3.1/mks/Makefile 2002-11-26 16:29:55.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/mks/Makefile 2002-12-19 13:27:53.000000000 +0100 -@@ -13,7 +13,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - VFS_OBJS = vscan-mksd.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-mksd.c vscan-mksd_core.c vscan-mksd.h vscan-mksd_core.h mks.h mks_c.c - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-mksd.lo vscan-mksd_core.lo mks_c.lo ---- examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile 2002-11-27 19:24:03.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile 2002-12-19 13:28:10.000000000 +0100 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - VFS_OBJS = vscan-oav.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-oav.lo vscan-oav_core.lo ---- examples/VFS/samba-vscan-0.3.1/sophos/Makefile 2002-11-27 19:24:03.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/sophos/Makefile 2002-12-19 13:29:20.000000000 +0100 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - VFS_OBJS = vscan-sophos.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-sophos.lo vscan-sophos_core.lo ---- examples/VFS/samba-vscan-0.3.1/trend/Makefile 2002-11-27 19:24:03.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.1/trend/Makefile 2002-12-19 13:29:31.000000000 +0100 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal - VFS_OBJS = vscan-trend.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-trend.lo vscan-trend_core.lo diff --git a/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 deleted file mode 100644 index 5639279374..0000000000 Binary files a/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 and /dev/null differ -- cgit From 4bf01670244bd48c185e144ad0487716bff7fac7 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Tue, 12 Aug 2003 01:30:40 +0000 Subject: Updating SuSE build files for Samba3 (This used to be commit 934fefa688fe735e2287c701ed8f913fc6147447) --- packaging/SuSE/samba-mutual-auth.diff | 247 +++++ packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 | Bin 0 -> 69479 bytes packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff | 22 + packaging/SuSE/samba3-3.0.0-pdb.diff | 13 + packaging/SuSE/samba3-Makefile.diff | 16 + packaging/SuSE/samba3-com_err.diff | 60 ++ packaging/SuSE/samba3-net_ads_password.diff | 58 ++ packaging/SuSE/samba3-smbwrapper.diff | 11 + packaging/SuSE/samba3-vscan.diff | 269 ++++++ packaging/SuSE/samba3.spec | 1007 ++++++++++---------- 10 files changed, 1200 insertions(+), 503 deletions(-) create mode 100644 packaging/SuSE/samba-mutual-auth.diff create mode 100755 packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 create mode 100644 packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff create mode 100644 packaging/SuSE/samba3-3.0.0-pdb.diff create mode 100644 packaging/SuSE/samba3-Makefile.diff create mode 100644 packaging/SuSE/samba3-com_err.diff create mode 100644 packaging/SuSE/samba3-net_ads_password.diff create mode 100644 packaging/SuSE/samba3-smbwrapper.diff create mode 100644 packaging/SuSE/samba3-vscan.diff (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba-mutual-auth.diff b/packaging/SuSE/samba-mutual-auth.diff new file mode 100644 index 0000000000..865f91682a --- /dev/null +++ b/packaging/SuSE/samba-mutual-auth.diff @@ -0,0 +1,247 @@ +--- source/configure.in 22 Feb 2003 12:19:18 -0000 1.409 ++++ source/configure.in 24 Feb 2003 06:04:25 -0000 +@@ -627,6 +627,15 @@ + fi + + ############################################ ++# support for using Kerberos keytab instead of secrets database ++ ++AC_ARG_ENABLE(keytab, ++[ --enable-keytab Turn on support for Kerberos keytabs in lieu of secrets DB (default=no)], ++ [if eval "test x$enable_keytab = xyes"; then ++ AC_DEFINE(USE_KEYTAB,1,[Use Kerberos keytab]) ++ fi]) ++ ++############################################ + # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the plugin loading code + AC_SEARCH_LIBS(dlopen, [dl]) + # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then +--- source/passdb/secrets.c 1 Feb 2003 04:39:15 -0000 1.54 ++++ source/passdb/secrets.c 24 Feb 2003 06:04:26 -0000 +@@ -221,6 +221,72 @@ + return True; + } + ++#ifdef USE_KEYTAB ++/************************************************************************ ++ Read local secret from the keytab ++************************************************************************/ ++ ++static BOOL secrets_fetch_keytab_password(uint8 ret_pwd[16], time_t *pass_last_set_time) ++{ ++ char spn[MAXHOSTNAMELEN + 2], *p; ++ krb5_context context; ++ krb5_error_code ret; ++ krb5_principal princ; ++ krb5_keyblock *key; ++ ++ ret = krb5_init_context(&context); ++ if (ret) { ++ DEBUG(1, ("secrets_fetch_keytab_password: failed to initialize Kerberos context\n")); ++ return False; ++ } ++ ++ spn[sizeof(spn) - 1] = '\0'; ++ if (gethostname(spn, sizeof(spn) - 2) < 0) { ++ DEBUG(1, ("secrets_fetch_keytab_password: could not determine local hostname\n")); ++ krb5_free_context(context); ++ return False; ++ } ++ ++ for (p = spn; *p && *p != '.'; p++) ++ *p = toupper(*p); ++ *p++ = '$'; ++ *p = '\0'; ++ ++ ret = krb5_parse_name(context, spn, &princ); ++ if (ret) { ++ DEBUG(1, ("secrets_fetch_keytab_password: failed to parse name %s\n", spn)); ++ krb5_free_context(context); ++ return False; ++ } ++ ++#ifdef ENCTYPE_ARCFOUR_HMAC ++ ret = krb5_kt_read_service_key(context, NULL, princ, 0, ENCTYPE_ARCFOUR_HMAC, &key); ++#elif defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) ++ ret = krb5_kt_read_service_key(context, NULL, princ, 0, ENCTYPE_ARCFOUR_HMAC_MD5, &key); ++#else ++#error ENCTYPE_ARCFOUR_HMAC or ENCTYPE_ARCFOUR_HMAC_MD5 required for keytab secret storage ++#endif ++ if (ret) { ++ DEBUG(1, ("secrets_fetch_keytab_password: failed to read secret for %s\n", spn)); ++ krb5_free_context(context); ++ return False; ++ } ++ if (key->keyvalue.length != 16) { ++ DEBUG(1, ("secrets_fetch_keytab_password: key is incorrect length\n")); ++ krb5_free_context(context); ++ return False; ++ } ++ ++ memcpy(ret_pwd, key->keyvalue.data, key->keyvalue.length); ++ time(pass_last_set_time); /* XXX */ ++ ++ krb5_free_keyblock(context, key); ++ krb5_free_context(context); ++ ++ return True; ++} ++#endif /* USE_KEYTAB */ ++ + /************************************************************************ + Routine to get the trust account password for a domain. + The user of this function must have locked the trust password file using +@@ -243,6 +309,12 @@ + pass_last_set_time = 0; + return True; + } ++ ++#ifdef USE_KEYTAB ++ if (is_myworkgroup(domain)) { ++ return secrets_fetch_keytab_password(ret_pwd, pass_last_set_time); ++ } ++#endif /* USE_KEYTAB */ + + if (!(pass = secrets_fetch(trust_keystr(domain), &size))) { + DEBUG(5, ("secrets_fetch failed!\n")); + +--- source/libsmb/clikrb5.c 2003-07-02 00:32:55.000000000 +0200 ++++ source/libsmb/clikrb5.c 2003-07-02 00:37:22.000000000 +0200 +@@ -316,11 +316,13 @@ + krb5_enctype enc_types[] = { + #ifdef ENCTYPE_ARCFOUR_HMAC + ENCTYPE_ARCFOUR_HMAC, ++#elif defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) ++ ENCTYPE_ARCFOUR_HMAC_MD5, + #endif + ENCTYPE_DES_CBC_MD5, + ENCTYPE_DES_CBC_CRC, + ENCTYPE_NULL}; +- ++ + retval = krb5_init_context(&context); + if (retval) { + DEBUG(1,("krb5_init_context failed (%s)\n", +@@ -367,24 +369,26 @@ + + BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]) + { +-#ifdef ENCTYPE_ARCFOUR_HMAC + krb5_keyblock *skey; +-#endif + BOOL ret = False; + + memset(session_key, 0, 16); + +-#ifdef ENCTYPE_ARCFOUR_HMAC ++#if defined(ENCTYPE_ARCFOUR_HMAC) || defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) + if (krb5_auth_con_getremotesubkey(context, auth_context, &skey) == 0 && skey != NULL) { + if (KRB5_KEY_TYPE(skey) == ++# ifdef ENCTYPE_ARCFOUR_HMAC + ENCTYPE_ARCFOUR_HMAC ++# else ++ ENCTYPE_ARCFOUR_HMAC_MD5 ++# endif /* ENCTYPE_ARCFOUR_HMAC */ + && KRB5_KEY_LENGTH(skey) == 16) { + memcpy(session_key, KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey)); + ret = True; + } + krb5_free_keyblock(context, skey); + } +-#endif /* ENCTYPE_ARCFOUR_HMAC */ ++#endif /* ENCTYPE_ARCFOUR_HMAC || HAVE_ENCTYPE_ARCFOUR_HMAC_MD5 */ + + return ret; + } +@@ -395,5 +399,12 @@ + DEBUG(0,("NO KERBEROS SUPPORT\n")); + return data_blob(NULL, 0); + } ++BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context ac, uint8 session_key[16]) ++ { ++ DEBUG(0,("NO KERBEROS SUPPORT\n")); ++ memset(session_key, 0, 16); ++ return False; ++ } ++ //#endif + + #endif +--- source/libads/kerberos_verify.c 2003-06-28 23:40:55.000000000 +0200 ++++ source/libads/kerberos_verify.c 2003-07-02 00:50:13.000000000 +0200 +@@ -38,7 +38,9 @@ + krb5_keytab keytab = NULL; + krb5_data packet; + krb5_ticket *tkt = NULL; +- int ret, i; ++ int ret; ++#ifndef USE_KEYTAB ++ int i; + krb5_keyblock * key; + krb5_principal host_princ; + char *host_princ_s; +@@ -46,8 +48,10 @@ + char *password_s; + krb5_data password; + krb5_enctype *enctypes = NULL; ++#endif /* USE_KEYTAB */ + BOOL auth_ok = False; + ++#ifndef USE_KEYTAB + if (!secrets_init()) { + DEBUG(1,("secrets_init failed\n")); + return NT_STATUS_LOGON_FAILURE; +@@ -61,6 +65,7 @@ + + password.data = password_s; + password.length = strlen(password_s); ++#endif /* USE_KEYTAB */ + + ret = krb5_init_context(&context); + if (ret) { +@@ -82,7 +87,16 @@ + DEBUG(1,("krb5_auth_con_init failed (%s)\n", error_message(ret))); + return NT_STATUS_LOGON_FAILURE; + } ++#ifdef USE_KEYTAB ++ packet.length = ticket->length; ++ packet.data = (krb5_pointer)ticket->data; + ++ if (!(ret = krb5_rd_req(context, &auth_context, &packet, ++ NULL, keytab, NULL, &tkt))) { ++ auth_ok = True; ++ } ++ ++#else + fstrcpy(myname, global_myname()); + strlower(myname); + asprintf(&host_princ_s, "HOST/%s@%s", myname, lp_realm()); +@@ -121,6 +135,9 @@ + } + } + ++ SAFE_FREE(key); ++#endif /* USE_KEYTAB */ ++ + if (!auth_ok) { + DEBUG(3,("krb5_rd_req with auth failed (%s)\n", + error_message(ret))); +--- source/Makefile.in 2003-07-01 23:35:49.000000000 +0200 ++++ source/Makefile.in 2003-07-02 01:20:09.000000000 +0200 +@@ -806,7 +806,7 @@ + + bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(CC) $(FLAGS) -o $@ $(IDMAP_LIBS) $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDBLIBS) ++ @$(CC) $(FLAGS) -o $@ $(IDMAP_LIBS) $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDBLIBS) $(KRB5LIBS) + + bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +@@ -1062,7 +1062,7 @@ + + bin/wbinfo@EXEEXT@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ +- @$(LINK) -o $@ $(WBINFO_OBJ) $(LIBS) @POPTLIBS@ ++ @$(LINK) -o $@ $(WBINFO_OBJ) $(LIBS) @POPTLIBS@ $(KRB5LIBS) + + bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_OBJ) \ + $(UBIQX_OBJ) @BUILD_POPT@ bin/.dummy diff --git a/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 new file mode 100755 index 0000000000..2680bed82f Binary files /dev/null and b/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 differ diff --git a/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff b/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff new file mode 100644 index 0000000000..13da47e740 --- /dev/null +++ b/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff @@ -0,0 +1,22 @@ +--- examples/pdb/Makefile Thu Sep 5 02:11:41 2002 ++++ examples/pdb/Makefile Thu Sep 5 02:11:59 2002 +@@ -8,7 +8,7 @@ + SAMBA_INCL = ../../source/include + UBIQX_SRC = ../../source/ubiqx + SMBWR_SRC = ../../source/smbwrapper +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal + PDB_OBJS = pdb_test.so + + # Default target +--- examples/VFS/Makefile.in 2003-06-04 15:13:41.000000000 +0200 ++++ examples/VFS/Makefile.in 2003-06-04 22:07:03.000000000 +0200 +@@ -7,7 +7,7 @@ + SAMBA_SOURCE = @SAMBA_SOURCE@ + SHLIBEXT = @SHLIBEXT@ + OBJEXT = @OBJEXT@ +-FLAGS = $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/ubiqx -I$(SAMBA_SOURCE)/smbwrapper -I. $(CPPFLAGS) -I$(SAMBA_SOURCE) ++FLAGS = $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/ubiqx -I$(SAMBA_SOURCE)/smbwrapper -I. $(CPPFLAGS) -I$(SAMBA_SOURCE) -I/usr/include/heimdal + + + prefix = @prefix@ diff --git a/packaging/SuSE/samba3-3.0.0-pdb.diff b/packaging/SuSE/samba3-3.0.0-pdb.diff new file mode 100644 index 0000000000..0c811b57c5 --- /dev/null +++ b/packaging/SuSE/samba3-3.0.0-pdb.diff @@ -0,0 +1,13 @@ +--- examples/pdb/pdb_test.c 26 Sep 2002 18:37:54 -0000 1.1.2.3 ++++ examples/pdb/pdb_test.c 22 Apr 2003 20:06:31 -0000 +@@ -142,8 +142,6 @@ + int init_module(void); + + int init_module() { +- if(smb_register_passdb("testsam", testsam_init, PASSDB_INTERFACE_VERSION)) +- return 0; +- +- return 1; ++ smb_register_passdb(PASSDB_INTERFACE_VERSION, "testsam", testsam_init); ++ return True; + } diff --git a/packaging/SuSE/samba3-Makefile.diff b/packaging/SuSE/samba3-Makefile.diff new file mode 100644 index 0000000000..bc1ad142d9 --- /dev/null +++ b/packaging/SuSE/samba3-Makefile.diff @@ -0,0 +1,16 @@ +--- source/Makefile.in 2003-04-23 10:43:06.000000000 +0200 ++++ source/Makefile.in 2003-04-23 10:45:39.000000000 +0200 +@@ -673,6 +673,13 @@ + @echo "Using FLAGS = $(FLAGS)" + @echo " FLAGS32 = $(FLAGS32)" + @echo " LIBS = $(LIBS)" ++ @echo " TERMLIBS = $(TERMLIBS)" ++ @echo " PRINTLIBS = $(PRINTLIBS)" ++ @echo " AUTHLIBS = $(AUTHLIBS)" ++ @echo " ACLLIBS = $(ACLLIBS)" ++ @echo " PASSDBLIBS = $(PASSDBLIBS)" ++ @echo " ADSLIBS = $(ADSLIBS)" ++ @echo " KRB5LIBS = $(KRB5_LIBS)" + @echo " LDSHFLAGS = $(LDSHFLAGS)" + @echo " LDFLAGS = $(LDFLAGS)" + diff --git a/packaging/SuSE/samba3-com_err.diff b/packaging/SuSE/samba3-com_err.diff new file mode 100644 index 0000000000..c5d04cebe1 --- /dev/null +++ b/packaging/SuSE/samba3-com_err.diff @@ -0,0 +1,60 @@ +--- source/libads/kerberos.c 23 Oct 2002 00:02:26 -0000 1.18 ++++ source/libads/kerberos.c 1 Jul 2003 21:30:17 -0000 +@@ -126,6 +126,7 @@ + return KRB5_LIBOS_CANTREADPWD; + } + ++ initialize_krb5_error_table(); + ret = kerberos_kinit_password(s, ads->auth.password, ads->auth.time_offset); + + if (ret) { +--- source/libads/kerberos_verify.c 6 Jun 2003 14:53:22 -0000 1.10.2.1 ++++ source/libads/kerberos_verify.c 1 Jul 2003 21:30:17 -0000 +@@ -62,6 +62,7 @@ + password.data = password_s; + password.length = strlen(password_s); + ++ initialize_krb5_error_table(); + ret = krb5_init_context(&context); + if (ret) { + DEBUG(1,("krb5_init_context failed (%s)\n", error_message(ret))); +--- source/libads/krb5_setpw.c 6 Jun 2003 14:53:22 -0000 1.16.2.1 ++++ source/libads/krb5_setpw.c 1 Jul 2003 21:30:17 -0000 +@@ -470,6 +470,7 @@ + krb5_creds creds, *credsp; + krb5_ccache ccache; + ++ initialize_krb5_error_table(); + ret = krb5_init_context(&context); + if (ret) { + DEBUG(1,("Failed to init krb5 context (%s)\n", error_message(ret))); +@@ -584,6 +585,7 @@ + krb5_creds creds; + char *chpw_princ = NULL, *password; + ++ initialize_krb5_error_table(); + ret = krb5_init_context(&context); + if (ret) { + DEBUG(1,("Failed to init krb5 context (%s)\n", error_message(ret))); +--- source/libsmb/clikrb5.c 1 Jul 2003 14:40:37 -0000 1.36.2.2 ++++ source/libsmb/clikrb5.c 1 Jul 2003 21:30:20 -0000 +@@ -320,7 +320,8 @@ + ENCTYPE_DES_CBC_MD5, + ENCTYPE_DES_CBC_CRC, + ENCTYPE_NULL}; +- ++ ++ initialize_krb5_error_table(); + retval = krb5_init_context(&context); + if (retval) { + DEBUG(1,("krb5_init_context failed (%s)\n", +--- source/utils/net_lookup.c 1 Jul 2003 14:40:47 -0000 1.8.2.1 ++++ source/utils/net_lookup.c 1 Jul 2003 21:30:24 -0000 +@@ -177,6 +177,7 @@ + krb5_data realm; + char **realms; + ++ initialize_krb5_error_table(); + rc = krb5_init_context(&ctx); + if (rc) { + DEBUG(1,("krb5_init_context failed (%s)\n", diff --git a/packaging/SuSE/samba3-net_ads_password.diff b/packaging/SuSE/samba3-net_ads_password.diff new file mode 100644 index 0000000000..cc800fb7bf --- /dev/null +++ b/packaging/SuSE/samba3-net_ads_password.diff @@ -0,0 +1,58 @@ +Index: source/utils/net_ads.c +=================================================================== +RCS file: /cvsroot/samba/source/utils/net_ads.c,v +retrieving revision 1.37.2.22 +diff -u -r1.37.2.22 net_ads.c +--- source/utils/net_ads.c 10 Jun 2003 04:15:55 -0000 1.37.2.22 ++++ source/utils/net_ads.c 20 Jun 2003 19:59:36 -0000 +@@ -44,9 +44,9 @@ + "\n\tdump the machine account details to stdout\n" + "\nnet ads lookup"\ + "\n\tperform a CLDAP search on the server\n" +-"\nnet ads password -Uadmin_username@realm%%admin_pass"\ ++"\nnet ads password -Uadmin_username@realm%%admin_pass"\ + "\n\tchange a user's password using an admin account"\ +-"\n\t(note: use realm in UPPERCASE)\n"\ ++"\n\t(note: use realm in UPPERCASE, prompts if password is obmitted)\n"\ + "\nnet ads changetrustpw"\ + "\n\tchange the trust account password of this machine in the AD tree\n"\ + "\nnet ads printer [info | publish | remove] "\ +@@ -909,7 +909,7 @@ + } + + +- if (argc != 1) { ++ if (argc < 1) { + d_printf("ERROR: You must say which username to change password for\n"); + return -1; + } +@@ -941,22 +941,24 @@ + return -1; + } + +- asprintf(&prompt, "Enter new password for %s:", user); +- +- new_password = getpass(prompt); ++ if (argv[1]) { ++ new_password = (char *)argv[1]; ++ } else { ++ asprintf(&prompt, "Enter new password for %s:", user); ++ new_password = getpass(prompt); ++ free(prompt); ++ } + + ret = kerberos_set_password(ads->auth.kdc_server, auth_principal, + auth_password, user, new_password, ads->auth.time_offset); + if (!ADS_ERR_OK(ret)) { + d_printf("Password change failed :-( ...\n"); + ads_destroy(&ads); +- free(prompt); + return -1; + } + + d_printf("Password change for %s completed.\n", user); + ads_destroy(&ads); +- free(prompt); + + return 0; + } diff --git a/packaging/SuSE/samba3-smbwrapper.diff b/packaging/SuSE/samba3-smbwrapper.diff new file mode 100644 index 0000000000..0f7b391de0 --- /dev/null +++ b/packaging/SuSE/samba3-smbwrapper.diff @@ -0,0 +1,11 @@ +--- source/smbwrapper/smbsh.c.orig 2003-05-04 19:47:39.000000000 +0200 ++++ source/smbwrapper/smbsh.c 2003-05-04 19:47:47.000000000 +0200 +@@ -36,7 +36,7 @@ + int main(int argc, char *argv[]) + { + char *p, *u; +- const char *libd = dyn_BINDIR; ++ const char *libd = dyn_LIBDIR; + pstring line, wd; + int opt; + extern char *optarg; diff --git a/packaging/SuSE/samba3-vscan.diff b/packaging/SuSE/samba3-vscan.diff new file mode 100644 index 0000000000..330b470af2 --- /dev/null +++ b/packaging/SuSE/samba3-vscan.diff @@ -0,0 +1,269 @@ +--- examples/VFS/samba-vscan-0.3.2b/fprot/Makefile 2003-01-14 00:42:15.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/fprot/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -14,7 +14,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + VFS_OBJS = vscan-fprotd.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-fprotd.lo vscan-fprotd_core.lo +--- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c 2003-02-21 21:37:44.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c 2003-04-09 20:25:25.000000000 +0200 +@@ -432,14 +432,14 @@ + rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); + + /* add/update file. mark file as infected! */ +- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); ++ lrufiles_add(filepath, stat_buf.st_mtime, True); + + /* virus found, deny acces */ + errno = EACCES; + return -1; + } else if ( retval == 0 ) { + /* file is clean, add to lrufiles */ +- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); ++ lrufiles_add(filepath, stat_buf.st_mtime, False); + } + } + +--- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c 2003-01-25 18:40:57.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c 2003-04-09 20:23:31.000000000 +0200 +@@ -110,7 +110,7 @@ + pstring fprotdCommand; /* the command line to be send to daemon */ + char *str; + FILE *fpin, *fpout; +- bool received_data = FALSE; /* indicates, if any response from deamon was received */ ++ bool received_data = False; /* indicates, if any response from deamon was received */ + + /* open stream sockets */ + fpin = fdopen(sockfd, "r"); +@@ -159,7 +159,7 @@ + + while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) { + +- received_data = TRUE; ++ received_data = True; + + /* ignore the HTTP response header, remove any leading + white spaces */ +--- examples/VFS/samba-vscan-0.3.2b/icap/Makefile 2003-01-30 00:53:02.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/icap/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + VFS_OBJS = vscan-icap.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-icap.c vscan-icap_core.c vscan-icap.h vscan-icap_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-icap.lo vscan-icap_core.lo +--- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c 2003-02-21 21:37:50.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c 2003-04-09 20:32:20.000000000 +0200 +@@ -413,14 +413,14 @@ + rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); + + /* add/update file. mark file as infected! */ +- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); ++ lrufiles_add(filepath, stat_buf.st_mtime, True); + + /* virus found, deny acces */ + errno = EACCES; + return -1; + } else if ( retval == 0 ) { + /* file is clean, add to lrufiles */ +- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); ++ lrufiles_add(filepath, stat_buf.st_mtime, False); + } + } + +--- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c 2003-01-15 00:19:18.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c 2003-04-09 20:30:56.000000000 +0200 +@@ -114,8 +114,8 @@ + char buf[BUFLEN]; + char recvline[MAXLINE + 1]; + char *str; +- bool first_line = FALSE; /* first line we've received? */ +- bool infected = FALSE; /* an infected found? */ ++ bool first_line = False; /* first line we've received? */ ++ bool infected = False; /* an infected found? */ + + + /* get file length */ +@@ -213,7 +213,7 @@ + /* set line buffering */ + setvbuf(fpin, (char *)NULL, _IOLBF, 0); + +- first_line = TRUE; ++ first_line = True; + while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) { + str = recvline; + if ( first_line ) { +@@ -226,7 +226,7 @@ + return(0); + } + else if ( strncmp("403", str, 3) == 0 ) { +- infected = TRUE; ++ infected = True; + } else { + if ( verbose_file_logging ) + vscan_syslog("ERROR: file %s not found, not readable or an error occured", scan_file); +@@ -241,7 +241,7 @@ + return(-1); + } + +- first_line = FALSE; ++ first_line = False; + } + if ( infected ) { + if ( strncmp("X-Infection-Found", str, 17) == 0 ) { +--- examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h 2002-11-25 16:48:10.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h 2003-04-09 20:21:37.000000000 +0200 +@@ -93,7 +93,7 @@ + */ + + #ifndef SAMBA_VERSION_MAJOR +-# define SAMBA_VERSION_MAJOR 2 ++# define SAMBA_VERSION_MAJOR 3 + #endif + + #ifndef SAMBA_VERSION_MINOR +--- examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile 2003-02-20 15:41:32.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -23,9 +23,9 @@ + VFS_OBJS = vscan-kavp.so + + ifdef USE_DEBUG +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + else +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + endif + + ifndef USE_KAVPSHAREDLIB +--- examples/VFS/samba-vscan-0.3.2b/mks/Makefile 2003-01-19 18:09:53.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/mks/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -16,10 +16,10 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + + ifdef USE_INCLMKSDLIB +-CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC ++CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC -I/usr/include/heimdal + endif + + VFS_OBJS = vscan-mksd.so +--- examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c 2003-02-21 21:37:50.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c 2003-04-09 20:38:16.000000000 +0200 +@@ -393,14 +393,14 @@ + rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); + + /* add/update file. mark file as infected! */ +- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); ++ lrufiles_add(filepath, stat_buf.st_mtime, True); + + /* virus found, deny acces */ + errno = EACCES; + return -1; + } else if ( retval == 0 ) { + /* file is clean, add to lrufiles */ +- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); ++ lrufiles_add(filepath, stat_buf.st_mtime, False); + } + } + +--- examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile 2003-01-30 00:53:08.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + VFS_OBJS = vscan-oav.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-oav.lo vscan-oav_core.lo +--- examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c 2003-02-21 21:37:51.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c 2003-04-09 20:40:53.000000000 +0200 +@@ -417,14 +417,14 @@ + rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); + + /* add/update file. mark file as infected! */ +- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); ++ lrufiles_add(filepath, stat_buf.st_mtime, True); + + /* virus found, deny acces */ + errno = EACCES; + return -1; + } else if ( retval == 0 ) { + /* file is clean, add to lrufiles */ +- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); ++ lrufiles_add(filepath, stat_buf.st_mtime, False); + } + } + +--- examples/VFS/samba-vscan-0.3.2b/sophos/Makefile 2003-01-30 00:53:08.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/sophos/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + VFS_OBJS = vscan-sophos.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-sophos.lo vscan-sophos_core.lo +--- examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c 2003-02-21 21:37:51.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c 2003-04-09 20:43:11.000000000 +0200 +@@ -399,14 +399,14 @@ + rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); + + /* add/update file. mark file as infected! */ +- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); ++ lrufiles_add(filepath, stat_buf.st_mtime, True); + + /* deny access */ + errno = EACCES; + return -1; + } else if ( retval == 0 ) { + /* file is clean, add to lrufiles */ +- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); ++ lrufiles_add(filepath, stat_buf.st_mtime, False); + } + } + +--- examples/VFS/samba-vscan-0.3.2b/trend/Makefile 2003-01-30 01:03:38.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/trend/Makefile 2003-04-09 20:21:37.000000000 +0200 +@@ -15,7 +15,7 @@ + SMBWR_SRC = ../../../../source/smbwrapper + SMBVS_INCL = ../include + SMBVS_GLB = ../global +-CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC ++CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal + VFS_OBJS = vscan-trend.so + SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h + OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-trend.lo vscan-trend_core.lo +--- examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c 2003-02-21 21:37:52.000000000 +0100 ++++ examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c 2003-04-09 20:46:07.000000000 +0200 +@@ -409,14 +409,14 @@ + rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); + + /* add/update file. mark file as infected! */ +- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); ++ lrufiles_add(filepath, stat_buf.st_mtime, True); + + /* deny access */ + errno = EACCES; + return -1; + } else if ( retval == 0 ) { + /* file is clean, add to lrufiles */ +- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); ++ lrufiles_add(filepath, stat_buf.st_mtime, False); + } + } + diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec index dd2860b801..1b620e60c2 100644 --- a/packaging/SuSE/samba3.spec +++ b/packaging/SuSE/samba3.spec @@ -1,764 +1,765 @@ # -# spec file for package samba (Version HEAD) CVS -# -# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. +# spec file for package samba3 (Version 3.0.0rc1cvs) +# +# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# packaged by Guenther Deschner - work is not finished yet ! - -# neededforbuild acl acl-devel attr attr-devel autoconf automake heimdal-devel heimdal-lib libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel -# usedforbuild aaa_base aaa_version acl attr bash bind9-utils bison cpio cpp cyrus-sasl db devs diffutils e2fsprogs file filesystem fileutils fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip kbd less libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail sh-utils shadow strace syslogd sysvinit tar texinfo textutils timezone unzip util-linux vim zlib-devel acl-devel attr-devel autoconf automake binutils bzip2 cracklib gcc gdbm gettext heimdal-devel heimdal-lib libtool libxml2 libxml2-devel mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm zlib - - -Vendor: SuSE Linux AG, GS Berlin, Germany -Distribution: SuSE Linux 8.1 (i386) -Name: samba -Packager: gd@suse.de -License: GPL -Group: Productivity/Networking/Samba -Url: http://www.samba.org -Provides: samba smbfs -Obsoletes: samba-classic samba-ldap -Autoreqprov: on -%define smbwrap 0 -%define mit_kerberos 0 -%define heimdal_kerberos 1 -%define devel 0 -%define head 0 -%define python 1 -%define netatalk 0 -%define newsam 0 -%define samba_ver 3.0.0 -Requires: samba-client = %{samba_ver} -Version: 3.0.0 -Release: %(date +%%j) -Summary: An SMB file server for Unix -Source: %{name}-%{version}.tar.bz2 -Source10: %{name}-%{version}.files.tar.bz2 -Source50: http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2 -Patch1: %{name}-%{version}-pdb.diff -Patch10: %{name}-%{version}-net_ads.diff -Patch22: %{name}-%{version}-msdfs.diff -Patch30: %{name}-%{version}-python.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -%define DOCDIR %{_defaultdocdir}/%{name} -%define SWATDIR %{_datadir}/samba/swat -%define vscan_ver 0.3.1 -%define vscan_modules fprot kaspersky mks openantivirus sophos trend -Patch51: %{name}-%{version}-vscan.diff +# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# +# Note: The Samba3 tarball should be called: samba3-3.0.0.tar.bz2 +# +# neededforbuild XFree86-libs autoconf automake cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl libacl-devel libattr libattr-devel libgimpprint libpng libtiff libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel te_etex te_latex te_pdf tetex xmlcharent +# usedforbuild aaa_base acl attr bash bind9-utils bison coreutils cpio cpp cvs cyrus-sasl2 db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel XFree86-libs autoconf automake binutils bzip2 cracklib cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 gcc gdbm gettext ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl-devel libattr-devel libgimpprint libpng libtiff libtool libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm te_ams te_etex te_latex te_pdf tetex xmlcharent + +Name: samba3 +License: GPL +Group: Productivity/Networking/Samba +Url: http://www.samba.org +Provides: samba smbfs samba3 +Requires: samba3-client +Obsoletes: samba-classic samba-ldap +Autoreqprov: on +%define krb_heimdal_05 0 +%define new_heimdal /opt/heimdal +%define new_sasl /opt/sasl +%define new_openldap /opt/openldap +%define new_glibc 0 +Version: 3.0.0 +Release: %(date +%%j) +%define head 0 +%define samba_ver 3.0.0 +%define samba_release 0 +%define ul_version 0 +%define suse_ver 820 +%define python_ver python2.2 +%if %{suse_ver} > 810 +%define new_glibc 1 +%endif +%if %{suse_ver} > 821 +%define python_ver python2.3 +%endif +%define make_cifsvfs 1 +%define make_devel 0 +%define make_doc 0 +%define make_python 1 +%define make_shared_mod 0 +%define make_smbwrap 1 +# vscan has not yet updated to the new vfs-api +%define make_vscan 0 +%define make_wrepld 1 +%define use_keytab 0 +Summary: samba3 +Source: %{name}-%{version}.tar.bz2 +Source10: %{name}-%{version}.files.tar.bz2 +Source50: samba-vscan-%{vscan_ver}.tar.bz2 +Patch1: %{name}-%{version}-Makefiles-heimdal.diff +Patch2: samba-mutual-auth.diff +Patch29: %{name}-com_err.diff +Patch30: %{name}-%{version}-heimdal-06.diff +Patch31: %{name}-%{version}-pdb.diff +Patch32: %{name}-net_ads_password.diff +Patch33: %{name}-Makefile.diff +Patch34: %{name}-smbwrapper.diff +Patch51: %{name}-vscan.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define DOCDIR %{_defaultdocdir}/%{name} +%define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook +%define SWATDIR %{_datadir}/samba/swat +%define vscan_ver 0.3.2b +%define vscan_modules fprot icap mks openantivirus sophos trend +#not pdb_nisplussam +%define pdb_modules pdb_xml,pdb_mysql,pdb_ldap,pdb_smbpasswd,pdb_tdbsam,pdb_unix,pdb_guest,pdb_nisplussam +%define rpc_modules rpc_lsa,rpc_samr,rpc_reg,rpc_wks,rpc_net,rpc_dfs,rpc_srv,rpc_spoolss +%define auth_modules auth_rhosts,auth_sam,auth_unix,auth_winbind,auth_server,auth_domain,auth_builtin +%define vfs_modules vfs_recycle,vfs_audit,vfs_extd_audit,vfs_netatalk,vfs_fake_perms +%define idmap_modules idmap_winbind,idmap_ldap,idmap_tdb +%define charset_modules charset_weird %package client -Summary: Samba client utilities -Autoreqprov: on -Requires: cups-libs -Obsoletes: smbclnt samba-classic-client samba-ldap-client -Group: Productivity/Networking/Samba - +Summary: samba3-client +Autoreqprov: on +Requires: cups-libs +Obsoletes: smbclnt samba-classic-client samba-ldap-client +Provides: samba-client samba3-client +Group: Productivity/Networking/Samba %package winbind -Requires: samba-client samba -Summary: Samba Winbind-package -Autoreqprov: on -Group: Productivity/Networking/Samba - +Requires: samba-client samba +Summary: samba3-winbind +Autoreqprov: on +Group: Productivity/Networking/Samba %package utils -Summary: Samba Testing Utilities -Autoreqprov: on -Group: Productivity/Networking/Samba - +Summary: samba3-utils +Autoreqprov: on +Group: Productivity/Networking/Samba %package doc -Summary: Samba Documentation -Autoreqprov: on -Group: Productivity/Networking/Samba - +Summary: samba3-doc +Autoreqprov: on +Group: Productivity/Networking/Samba +%package docbook +Summary: samba3-docbook +Autoreqprov: on +Group: Productivity/Networking/Samba %package pdb -Summary: Samba PDB-Modules -Autoreqprov: on -Group: Productivity/Networking/Samba - -%package vfs -Summary: Samba VFS-Modules -Autoreqprov: on -Group: Productivity/Networking/Samba - -%if %{newsam} > 0 -%package sam -Summary: Samba SAM-Modules -Autoreqprov: on -Group: Productivity/Networking/Samba +Summary: samba3-pdb +Autoreqprov: on +Group: Productivity/Networking/Samba +%if %{make_cifsvfs} +%package cifsmount +Summary: samba3-cifsmount +Autoreqprov: on +Group: Productivity/Networking/Samba +Url: http://us1.samba.org/samba/Linux_CIFS_client.html %endif - +%if %{make_vscan} %package vscan -Summary: Samba VFS-Modules for Virusscanners -Autoreqprov: on -Group: Productivity/Networking/Samba -Version: 0.3.1 - +Summary: samba3-vscan +Autoreqprov: on +Group: Productivity/Networking/Samba +Version: 0.3.2a +Release: 0 +Url: http://www.openantivirus.org/ +%endif +%if %{make_wrepld} +%package wrepld +Summary: samba3-wrepld +Autoreqprov: on +Group: Productivity/Networking/Samba +%endif +%if %{make_python} %package python -Summary: Samba Python-Modules -Autoreqprov: on -Group: Productivity/Networking/Samba - - - - -%changelog -* Sat Nov 3 2001 - gd@suse.de -- start - - +Summary: samba3-python +Autoreqprov: on +Group: Productivity/Networking/Samba +%endif +%package -n libsmbclient +Summary: Samba client library +Autoreqprov: on +Group: System/Libraries +%package -n libsmbclient-devel +Summary: Libraries and header files to develop programs with smbclient support +Autoreqprov: on +Group: Development/Libraries/C and C++ %prep [ $RPM_BUILD_ROOT = "/" ] && (echo "your buildroot is /" && exit 0) || rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT - %setup -n %{name}-%{samba_ver} %setup -T -D -a 50 cp -ar samba-vscan-%{vscan_ver} examples/VFS/ - # untar my configs %setup -T -D -a 10 - -%if %{heimdal_kerberos} > 0 +########### +### PATCHES +########### +# Makefiles-heimdal.diff %patch1 +%if %{use_keytab} +# luke howards keytab-patch +%patch2 +%endif +# some com_err fixes +%patch29 +%if %{suse_ver} > 821 +%patch30 +%endif +# vscan patch %patch51 +# net ads password +%patch32 +# temp Makefile (show more libs) +%patch33 +# temp pdb-test.c +%patch31 +# smbwrapper should use LIBDIR not BINDIR +%patch34 +#find . -name CVS -print | xargs rm -rf +#find . -name ".cvsignore" -print | xargs rm -rf +find . -name "*.gd" -print | xargs rm -rvf +find . -name "*.orig" -print | xargs rm -rvf +%if %{ul_version} >= 1 + echo '#define VERSION "%samba_ver-UL"' > source/include/version.h +%else + echo '#define VERSION "%samba_ver-SuSE"' > source/include/version.h %endif -#%patch10 -#%patch22 -#%patch30 - -find . -name CVS -print | xargs rm -rf -find . -name ".cvsignore" -print | xargs rm -rf -find . -name "'*.gd'" -print | xargs rm -rvf -find . -name "'*.orig'" -print | xargs rm -rvf %build %{name}-%{samba_ver} %{?suse_update_config:%{suse_update_config -f}} cd source ./autogen.sh -libtoolize --force --copy -autoconf export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" +# debugging symbols +%if %{make_devel} +export CFLAGS="$RPM_OPT_FLAGS -g -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" +%endif +%if %{krb_heimdal_05} +export CFLAGS="$CFLAGS -I./include -I%{new_heimdal}/include " +export CFLAGS="$CFLAGS -I%{new_openldap}/include " +export CFLAGS="$CFLAGS -I%{new_sasl}/include " +export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_heimdal}/lib" +export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_openldap}/lib" +export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_sasl}/lib" +%endif %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif -CONF_OPTS_BASIC="\ - --prefix=/usr \ - --libdir=/etc/samba \ +CONF_OPTS="\ + --enable-cups \ + --libdir=/usr/lib/samba \ --localstatedir=/var/lib/samba \ --mandir=%{_mandir} \ + --prefix=/usr \ --sbindir=/usr/sbin \ - --with-privatedir=/etc/samba \ - --with-piddir=/var/run/samba \ - --with-codepagedir=/usr/share/samba/codepages \ - --with-swatdir=/usr/share/samba/swat \ - --with-smbmount \ + --sysconfdir=/etc/samba \ + --with-acl-support \ --with-automount \ - --enable-cups \ + --with-configdir=/etc/samba \ + --with-lockdir=/var/lib/samba \ + --with-logfilebase=/var/log/samba \ --with-msdfs \ - --with-vfs \ --with-pam \ --with-pam_smbpass \ + --with-piddir=/var/run/samba \ + --with-privatedir=/etc/samba \ + --with-quotas \ + --with-smbmount \ + --with-swatdir=/usr/share/samba/swat \ + --with-syslog \ --with-utmp \ + --with-vfs \ --with-winbind \ --with-tdbsam \ - --with-ldapsam \ -%if %{smbwrap} + --with-expsam=xml,mysql \ + --with-profiling-data \ +%if %{use_keytab} + --enable-keytab \ +%endif +%if %{make_smbwrap} --with-smbwrapper \ %endif - --with-quotas \ - --with-acl-support \ - --with-python=python2.2 \ - --with-syslog \ -" -CONF_OPTS_HEAD="\ - --with-sam \ -" -CONF_OPTS_HEIMDAL_KERBEROS="\ - --with-krb5impl=heimdal \ -" -CONF_OPTS_HEIMDAL_51_KERBEROS="\ - --with-krb5impl=heimdal \ - --with-krb5includes=/opt/heimdal-0.5.1/include \ - --with-krb5libs=/opt/heimdal-0.5.1/lib \ -" -CONF_OPTS_MIT_KERBEROS="\ - --with-krb5impl=mit \ - --with-krb5includes=/usr/kerberos/include \ - --with-krb5libs=/usr/kerberos/lib \ -" -CONF_OPTS_DEVEL="\ +%if %{make_python} + --with-python=%{python_ver} \ +%endif +%if %{make_shared_mod} + --with-shared-modules=%{pdb_modules},%{rpc_modules} \ +%endif +%if %{make_devel} --enable-developer \ --enable-krb5developer \ - --with-profiling-data \ +%endif " -CONF_OPTS="$CONF_OPTS_BASIC" -%if %{head} > 0 -CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEAD" -%endif -%if %{heimdal_kerberos} > 0 -CONF_OPTS="$CONF_OPTS $CONF_OPTS_HEIMDAL_KERBEROS" -%endif -%if %{mit_kerberos} > 0 -CONF_OPTS="$CONF_OPTS $CONF_OPTS_MIT_KERBEROS" -%endif -%if %{devel} > 0 -CONF_OPTS="$CONF_OPTS $CONF_OPTS_DEVEL" -%endif - +# --with-nisplus-home \ +# make sure we have a chance to find the krb5-config-tool +export PATH="$PATH:/usr/lib/heimdal/bin" ./configure $CONF_OPTS - -### --with-ldapsam is now standard! -### --with-sendfile-support ---default now -# --with-nisplussam \ -# --with-nisplus_home \ - -# with the new passdb-code we can finaly compile several passdb-backends -# and make our choice at runtime. -# HEAD and thus alpha21 no longer need this -#make proto - make \ - LOCKDIR=/var/lib/samba \ - LOGFILEBASE=/var/log/samba \ - SBINDIR=/usr/sbin \ all \ torture \ nsswitch/libnss_wins.so \ debug2html \ libsmbclient \ - bin/profiles \ - everything - + everything \ + bin/editreg # everything = nsswitch smbwrapper smbtorture debug2html smbfilter nsswitch/libnss_wins.so - -%if %{newsam} > 0 -make bin/samtest -%endif make modules - make -C tdb tdbdump tdbtest tdbtool tdbtorture -# tdbbackup is now in main Makefile - make talloctort - -# VFS,PDB and SAM -EXAMPLEDIRS="pdb" +%if %{make_wrepld} +make bin/wrepld +%endif +%if %{make_doc} +pushd `pwd` +cd ../docs/docbook +autoconf -f +./configure +# gracefully ignore errors... +make -i manpages html html-single pdf htmlfaq htmlman +# ps is not necessary, txt neither +# everything = manpages ps pdf html-single html htmlman txt htmlfaq +popd +%endif +# make examples in VFS,PDB +pushd `pwd` +cd ../examples/VFS/ +sh -x autogen.sh +./configure +popd +EXAMPLEDIRS="pdb VFS" for i in $EXAMPLEDIRS; do make -C ../examples/$i; done - +%if %{make_vscan} export USE_KAVPSHAREDLIB=0 +export USE_INCLMKSDLIB=1 for module in %{vscan_modules}; do - make -C ../examples/VFS/%{name}-vscan-%{vscan_ver}/${module}; + make -C ../examples/VFS/samba-vscan-%{vscan_ver}/${module}; done - -# tim potters python -%if %{python} > 0 +%endif +%if %{make_python} make python_ext %endif - - +%if %{make_cifsvfs} +cd client +export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" +gcc mount.cifs.c -o mount.cifs +cd .. +%endif %install - mkdir -p \ - $RPM_BUILD_ROOT/usr/{bin,sbin} \ - $RPM_BUILD_ROOT/usr/share/{man,samba/{scripts,swat}} \ - $RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,sam,vscan} \ - $RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload \ - $RPM_BUILD_ROOT/usr/include \ - $RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \ - $RPM_BUILD_ROOT/var/adm \ - $RPM_BUILD_ROOT/sbin \ - $RPM_BUILD_ROOT/lib/security \ $RPM_BUILD_ROOT/%{DOCDIR} \ $RPM_BUILD_ROOT/%{DOCDIR}-vscan \ - $RPM_BUILD_ROOT/var/spool/samba \ + $RPM_BUILD_ROOT/%{DOCDIR}/docbook \ + $RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \ + $RPM_BUILD_ROOT/lib/security \ + $RPM_BUILD_ROOT/sbin \ + $RPM_BUILD_ROOT/usr/include \ + $RPM_BUILD_ROOT/usr/lib/%{python_ver}/lib-dynload \ + $RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,vscan,rpc,auth,charset,idmap} \ + $RPM_BUILD_ROOT/usr/share/{man,samba/swat} \ + $RPM_BUILD_ROOT/usr/{bin,sbin} \ + $RPM_BUILD_ROOT/var/adm \ + $RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles} \ $RPM_BUILD_ROOT/var/log/samba \ $RPM_BUILD_ROOT/var/run/samba \ - $RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles} - + $RPM_BUILD_ROOT/var/spool/samba cd source/ make install \ - LIBDIR=$RPM_BUILD_ROOT/etc/samba \ + LIBDIR=$RPM_BUILD_ROOT/usr/lib/samba \ LOGFILEBASE=$RPM_BUILD_ROOT/var/log/samba \ CONFIGFILE=$RPM_BUILD_ROOT/etc/samba/smb.conf \ LMHOSTSFILE=$RPM_BUILD_ROOT/etc/samba/lmhosts \ SWATDIR=$RPM_BUILD_ROOT/usr/share/samba/swat \ SBINDIR=$RPM_BUILD_ROOT/usr/sbin \ - LOCKDIR=$RPM_BUILD_ROOT/var/lock/samba \ - CODEPAGEDIR=$RPM_BUILD_ROOT/usr/share/samba/codepages \ + LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \ DRIVERFILE=$RPM_BUILD_ROOT/etc/samba/printers.def \ BINDIR=$RPM_BUILD_ROOT/usr/bin \ SMB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd \ - TDB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd.tdb \ MANDIR=$RPM_BUILD_ROOT/usr/share/man +make installmodules \ + LIBDIR=$RPM_BUILD_ROOT/usr/lib/samba cd .. - # utility scripts -%if %{head} > 0 +%if %{head} scripts="creategroup cvslog.pl scancvslog.pl" %else scripts="scancvslog.pl" %endif +mkdir -p examples/scripts for i in $scripts; do - cp -a source/script/$i $RPM_BUILD_ROOT/usr/share/samba/scripts/ + cp -a source/script/$i examples/scripts/ done - -# move the man-pages (ugly lang thing, fixed in alpha16) -#mv $RPM_BUILD_ROOT/usr/share/man/lang/* $RPM_BUILD_ROOT/usr/share/man/ - # configuration files +%if %{ul_version} >= 1 + SUFFIX="UnitedLinux" +%else + SUFFIX="SuSE" +%endif +cat smb.conf.vendor | egrep -v '(^$$|^#)' > smb.conf +mv smb.conf.vendor examples/smb.conf.${SUFFIX} install -m 644 smb.conf* $RPM_BUILD_ROOT/etc/samba/ -install -m 644 shares.conf $RPM_BUILD_ROOT/etc/samba/ install -m 644 lmhosts $RPM_BUILD_ROOT/etc/samba/ +install -m 644 smbusers $RPM_BUILD_ROOT/etc/samba/ install -m 600 smbpasswd -o root -g root $RPM_BUILD_ROOT/etc/samba/ - +install -m 600 smbfstab -o root -g root $RPM_BUILD_ROOT/etc/samba/ # pam install -m 644 samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba - # sambamount ln -sf /usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs - +#cifsmount +%if %{make_cifsvfs} +install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin +%endif # start scripts install rc.smb $RPM_BUILD_ROOT/etc/init.d/smb ln -sf ../../etc/init.d/smb $RPM_BUILD_ROOT/usr/sbin/rcsmb +install rc.nmb $RPM_BUILD_ROOT/etc/init.d/nmb +ln -sf ../../etc/init.d/nmb $RPM_BUILD_ROOT/usr/sbin/rcnmb install rc.smbfs $RPM_BUILD_ROOT/etc/init.d/smbfs ln -sf ../../etc/init.d/smbfs $RPM_BUILD_ROOT/usr/sbin/rcsmbfs install rc.winbind $RPM_BUILD_ROOT/etc/init.d/winbind ln -sf ../../etc/init.d/winbind $RPM_BUILD_ROOT/usr/sbin/rcwinbind +%if %{make_wrepld} install rc.wrepl $RPM_BUILD_ROOT/etc/init.d/wrepl ln -sf ../../etc/init.d/wrepl $RPM_BUILD_ROOT/usr/sbin/rcwrepl - -#### disabled for 8.0 -### rc.config fragment -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -cp rc.config.samba $RPM_BUILD_ROOT/var/adm/fillup-templates -cp rc.config.winbind $RPM_BUILD_ROOT/var/adm/fillup-templates -cp rc.config.wrepl $RPM_BUILD_ROOT/var/adm/fillup-templates - +cp -a source/bin/wrepld $RPM_BUILD_ROOT/usr/sbin/ +%endif # libnss_wins.so -cp source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so -ln -sf /lib/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so.2 - +cp source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so.2 +ln -sf /lib/libnss_wins.so.2 $RPM_BUILD_ROOT/lib/libnss_wins.so # winbind stuff cp -a source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security/ -cp -a source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib/ +cp -a source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib/libnss_winbind.so.2 cp -a source/bin/winbindd $RPM_BUILD_ROOT/usr/sbin/ -ln -sf /lib/libnss_winbind.so $RPM_BUILD_ROOT/lib/libnss_winbind.so.2 - +ln -s /lib/libnss_winbind.so.2 $RPM_BUILD_ROOT/lib/libnss_winbind.so # pam_smbpass cp -a source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security/ - # smbfilter cp -a source/bin/smbfilter $RPM_BUILD_ROOT/usr/bin/ - - -%{?suse_check} - -## install libsmbclient -install -m0755 source/bin/{libsmbclient.so,libsmbclient.a} $RPM_BUILD_ROOT/%{_libdir} -ln -s /usr/lib/libsmbclient.so $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0 +# editreg +cp -a source/bin/editreg $RPM_BUILD_ROOT/usr/bin/ +# install libsmbclient +install -m0755 source/bin/libsmbclient.a $RPM_BUILD_ROOT/%{_libdir} +install -m0755 source/bin/libsmbclient.so $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0 +ln -s /usr/lib/libsmbclient.so.0 $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so install -m0644 source/include/libsmbclient.h $RPM_BUILD_ROOT/%{_includedir} - +# install nsswitch-headers (for squid, etc.) +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/samba/nsswitch +cp source/nsswitch/*.h $RPM_BUILD_ROOT/%{_includedir}/samba/nsswitch/ # install smbtorture and other test-programs install -m0755 source/bin/smbtorture $RPM_BUILD_ROOT/usr/bin/ install -m0755 source/bin/talloctort $RPM_BUILD_ROOT/usr/bin/ install -m0755 source/bin/{msgtest,masktest,locktest*} $RPM_BUILD_ROOT/usr/bin/ install -m0755 source/bin/{vfstest,nsstest} $RPM_BUILD_ROOT/usr/bin/ -%if %{head} > 0 -%if %{newsam} > 0 -install -m0755 source/bin/samtest $RPM_BUILD_ROOT/usr/bin/ -%endif -%endif - # install tdb tools install -m0755 source/tdb/{tdbdump,tdbtest,tdbtool,tdbtorture} $RPM_BUILD_ROOT/usr/bin/ - - # install VFS-modules -%if %{head} > 0 -install -m0755 source/bin/developer.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -#install -m0755 examples/VFS/block/block.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -#install -m0755 examples/VFS/skel.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -%else -#install -m0755 examples/VFS/block/block.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -#install -m0755 examples/VFS/skel.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -%endif -install -m0755 source/bin/vfs_audit.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -install -m0755 source/bin/vfs_extd_audit.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -install -m0755 source/bin/vfs_recycle.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -%if %{netatalk} -install -m0755 source/bin/vfs_netatalk.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -%endif - +install -m0755 examples/VFS/*.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ # install PDB-modules -%if %{head} > 0 -install -m0755 source/bin/xml.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ -install -m0755 source/bin/mysql.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ -%else -install -m0755 source/bin/pdb_xml.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ -install -m0755 source/bin/pdb_mysql.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ -%endif install -m0755 examples/pdb/pdb_test.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ - -# install SAM-modules -%if %{head} > 0 -%if %{newsam} > 0 -install -m0755 examples/sam/sam_skel.so $RPM_BUILD_ROOT/%{_libdir}/samba/sam/ -%endif -%endif - +%if %{make_vscan} # install VSCAN-vfs-modules -install -m0755 examples/VFS/%{name}-vscan-%{vscan_ver}/*/*.so $RPM_BUILD_ROOT/%{_libdir}/samba/vscan/ - +install -m0755 examples/VFS/samba-vscan-%{vscan_ver}/*/*.so $RPM_BUILD_ROOT/%{_libdir}/samba/vscan/ +%endif # make examples clean VFS="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/VFS" -VSCAN="$VFS/%{name}-vscan-%{vscan_ver}" +VSCAN="$VFS/samba-vscan-%{vscan_ver}" PDB="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/pdb" -%if %{head} > 0 -%if %{newsam} > 0 -SAM="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/sam" -%endif -%endif -dirs="$PDB $SAM" +dirs="$PDB $SAM $VFS" (for i in $dirs; do make -C $i clean; done) +%if %{make_vscan} (for i in %{vscan_modules}; do make -C $VSCAN/$i clean; done) - -%if %{python} > 0 +%endif # install python -cp -a source/build/lib.*/samba $RPM_BUILD_ROOT/usr/lib/python2.2/lib-dynload/ +%if %{make_python} +cp -a source/build/lib.*/samba $RPM_BUILD_ROOT/usr/lib/%{python_ver}/lib-dynload/ +find source/python -name CVS -print | xargs rm -rf +find source/python -name ".cvsignore" -print | xargs rm -rf %endif - # whats this ? install -m0755 source/bin/debug2html $RPM_BUILD_ROOT/usr/bin/ - -%if %{smbwrap} # install smbwrapper +%if %{make_smbwrap} install -m0755 source/bin/smbwrapper.so $RPM_BUILD_ROOT/%{_libdir}/samba/ install -m0755 source/bin/smbsh $RPM_BUILD_ROOT/usr/bin/ %endif - -# finally obsolete with alpha17 makefile -# install unicode-codepages -#install -m0755 source/codepages/{lowcase,upcase,valid}.dat $RPM_BUILD_ROOT/etc/samba/ - +############## # cleanup docs -rm -rf docs/*.[0-9] -chmod 644 `find docs examples -type f` -chmod 755 `find docs examples -type d` +############## +#chmod 644 `find docs examples -type f` +#chmod 755 `find docs examples -type d` +#find . -name CVS -print | xargs rm -rf +#find . -name ".cvsignore" -print | xargs rm -rf mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt $RPM_BUILD_ROOT/%{DOCDIR}/ cp source/msdfs/README $RPM_BUILD_ROOT/%{DOCDIR}/README.msdfs -#cp source/nsswitch/README $RPM_BUILD_ROOT/%{DOCDIR}/README.nsswitch cp source/smbwrapper/README $RPM_BUILD_ROOT/%{DOCDIR}/README.smbwrapper +%if %{ul_version} >= 1 + SUFFIX="UnitedLinux" +%else + SUFFIX="SuSE" +%endif +cp README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.${SUFFIX} +# pam_smbpass is missing +cp -a source/pam_smbpass/samples examples/pam_smbpass/ +cp -a source/pam_smbpass/{CHANGELOG,INSTALL,README,TODO} examples/pam_smbpass/ +# prepare docbook package +cp -a docs/docbook/* $RPM_BUILD_ROOT/%{DOCBOOKDIR} +#make -C $RPM_BUILD_ROOT/%{DOCBOOKDIR} clean +rm -rf $RPM_BUILD_ROOT/%{DOCBOOKDIR}/autom4te.cache +rm -rf $RPM_BUILD_ROOT/%{DOCBOOKDIR}/config.* +# this is empty +rm -rf docs/yodldocs +rm -rf examples/VFS/samba-vscan-%{vscan_ver} +# zip manpages at least +gzip -f docs/manpages/*.[1-9] cp -a docs/* $RPM_BUILD_ROOT/%{DOCDIR} cp -a examples/ $RPM_BUILD_ROOT/%{DOCDIR} # save space... -rm -r \ - $RPM_BUILD_ROOT/%{SWATDIR}/using_samba +rm -r $RPM_BUILD_ROOT/%{SWATDIR}/using_samba ln -s %{DOCDIR}/htmldocs/using_samba $RPM_BUILD_ROOT/%{SWATDIR} - +# hm... +cp $RPM_BUILD_ROOT/%{SWATDIR}/help/welcome.html $RPM_BUILD_ROOT/%{DOCDIR}/htmldocs/ +rm -r $RPM_BUILD_ROOT/%{SWATDIR}/help +ln -s %{DOCDIR}/htmldocs $RPM_BUILD_ROOT/%{SWATDIR}/help +# remove cvs +find $RPM_BUILD_ROOT/%{DOCDIR} -name CVS -print | xargs rm -rf +find $RPM_BUILD_ROOT/%{DOCDIR} -name ".cvsignore" -print | xargs rm -rf +# finally build a file-list +for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do + # exclude %{DOCDIR} and docbook + case "${file#${RPM_BUILD_ROOT}}" in + %{DOCDIR}|%{DOCDIR}/docbook) continue ;; + esac + echo "%doc ${file#${RPM_BUILD_ROOT}}" >> ${RPM_BUILD_DIR}/%{name}-%{samba_ver}/filelist-doc +done %post -###### disabled for 8.1 -###echo "Updating etc/rc.config..." -##if [ -x bin/fillup ] ; then -## bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba -## bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.winbind -##else -## echo "ERROR: fillup not found. This should not happen. Please compare" -## echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" -## echo "var/adm/fillup-templates/rc.config.winbind and update by hand." -##fi +%{fillup_and_insserv smb} mkdir -p $RPM_BUILD_ROOT/var/adm/notify/messages cat << EOF > var/adm/notify/messages/samba-notify Achtung! - This is %{name}-%{samba_ver}. Please do not run on production systems. - You have been warned. EOF -# Initialize runlevel links -# -%{fillup_and_insserv smb} -#sbin/insserv /etc/init.d/smb - %post client -#sbin/insserv /etc/init.d/smbfs %{fillup_and_insserv -fpy smbfs} %{fillup_only -ans samba client} +%post winbind +%{fillup_and_insserv winbind} + %postun %{insserv_cleanup} -#sbin/insserv /etc/init.d/ %postun client %{insserv_cleanup} -#sbin/insserv /etc/init.d/ - -%post winbind -%{fillup_and_insserv winbind} -#sbin/insserv /etc/init.d/winbind %postun winbind %{insserv_cleanup} -#sbin/insserv /etc/init.d/ %clean #make -C source realclean %files -%config(noreplace) /etc/samba/smbpasswd -%config /etc/pam.d/samba +#/usr/bin/addtosmbpass +#/usr/bin/convert_smbpasswd +%dir /etc/samba +%dir /usr/lib/samba +%config /etc/init.d/nmb %config /etc/init.d/smb -%config /etc/init.d/wrepl -#/usr/bin/make_printerdef -/usr/bin/addtosmbpass -/usr/bin/convert_smbpasswd -/usr/bin/ntlm_auth -/usr/bin/profiles -/usr/bin/smbfilter -/usr/bin/smbpasswd -/usr/bin/smbstatus -/usr/bin/testparm -/usr/bin/testprns -#%doc %{_mandir}/man1/smbrun.1.gz -%doc %{_mandir}/man1/smbsh.1.gz +%config /etc/pam.d/samba +%config(noreplace) /etc/samba/smbpasswd +%config(noreplace) /etc/samba/smbusers +%doc %{_mandir}/man1/smbcontrol.1.gz %doc %{_mandir}/man1/smbstatus.1.gz %doc %{_mandir}/man1/testparm.1.gz %doc %{_mandir}/man1/testprns.1.gz %doc %{_mandir}/man5/smbpasswd.5.gz %doc %{_mandir}/man7/samba.7.gz %doc %{_mandir}/man8/nmbd.8.gz +%doc %{_mandir}/man8/pdbedit.8.gz %doc %{_mandir}/man8/smbd.8.gz %doc %{_mandir}/man8/smbpasswd.8.gz %doc %{_mandir}/man8/swat.8.gz +%doc %{_mandir}/man8/tdbbackup.8.gz +%{_includedir}/samba +/lib/security/pam_smbpass.so +/usr/bin/pdbedit +/usr/bin/smbcontrol +/usr/bin/smbpasswd +/usr/bin/smbstatus +/usr/bin/tdbbackup +/usr/bin/tdbdump +/usr/bin/tdbtest +/usr/bin/tdbtool +/usr/bin/testparm +/usr/bin/testprns +/usr/lib/samba/rpc +/usr/lib/samba/vfs /usr/sbin/nmbd +/usr/sbin/rcnmb +/usr/sbin/rcsmb /usr/sbin/smbd /usr/sbin/swat -/usr/sbin/wrepld -/usr/sbin/rcsmb -/usr/sbin/rcwrepl -#/var/adm/fillup-templates/rc.config.samba +/usr/share/samba +/var/lib/samba /var/log/samba -/var/spool/samba /var/run/samba -/var/lib/samba -/usr/share/samba -/lib/security/pam_smbpass.so +/var/spool/samba %files client -%config(noreplace) /etc/samba/smb.conf -%config(noreplace) /etc/samba/lmhosts -/etc/samba/lowcase.dat -/etc/samba/upcase.dat -/etc/samba/valid.dat %config /etc/init.d/smbfs -/usr/sbin/rcsmbfs +%config(noreplace) /etc/samba/lmhosts +%config(noreplace) /etc/samba/smb.conf +%config(noreplace) /etc/samba/smbfstab +%dir /etc/samba +%dir /usr/lib/samba +%doc %{_mandir}/man1/editreg.1.gz +%doc %{_mandir}/man1/findsmb.1.gz +%doc %{_mandir}/man1/nmblookup.1.gz +%doc %{_mandir}/man1/profiles.1.gz +%doc %{_mandir}/man1/rpcclient.1.gz +%doc %{_mandir}/man1/smbcacls.1.gz +%doc %{_mandir}/man1/smbclient.1.gz +%doc %{_mandir}/man1/smbcquotas.1.gz +%doc %{_mandir}/man1/smbtar.1.gz +%doc %{_mandir}/man1/smbtree.1.gz +%doc %{_mandir}/man5/lmhosts.5.gz +%doc %{_mandir}/man5/smb.conf.5.gz +%doc %{_mandir}/man7/Samba.7.gz +%doc %{_mandir}/man8/net.8.gz +%doc %{_mandir}/man8/smbmnt.8.gz +%doc %{_mandir}/man8/smbmount.8.gz +%doc %{_mandir}/man8/smbspool.8.gz +%doc %{_mandir}/man8/smbumount.8.gz /sbin/mount.smbfs +/usr/bin/editreg /usr/bin/findsmb /usr/bin/net /usr/bin/nmblookup -/usr/bin/pdbedit +/usr/bin/profiles /usr/bin/rpcclient /usr/bin/smbcacls -/usr/bin/smbcontrol /usr/bin/smbclient +/usr/bin/smbcquotas +/usr/bin/smbfilter /usr/bin/smbmnt /usr/bin/smbmount -%if %{smbwrap} -/usr/bin/smbsh -%endif -/usr/bin/smbumount /usr/bin/smbspool /usr/bin/smbtar /usr/bin/smbtree -%doc %{_mandir}/man1/nmblookup.1.gz -%doc %{_mandir}/man1/rpcclient.1.gz -%doc %{_mandir}/man1/smbclient.1.gz -%doc %{_mandir}/man1/smbcacls.1.gz -%doc %{_mandir}/man1/smbcontrol.1.gz -%doc %{_mandir}/man1/smbtar.1.gz -%doc %{_mandir}/man5/lmhosts.5.gz -%doc %{_mandir}/man5/smb.conf.5.gz -%doc %{_mandir}/man8/net.8.gz -%doc %{_mandir}/man8/pdbedit.8.gz -%doc %{_mandir}/man8/smbmnt.8.gz -%doc %{_mandir}/man8/smbmount.8.gz -%doc %{_mandir}/man8/smbspool.8.gz -%doc %{_mandir}/man8/smbumount.8.gz -/usr/include/libsmbclient.h -%if %{smbwrap} +/usr/bin/smbumount +/usr/lib/samba/lowcase.dat +/usr/lib/samba/upcase.dat +/usr/lib/samba/valid.dat +/usr/sbin/rcsmbfs +%if %{make_smbwrap} +/usr/bin/smbsh +%doc %{_mandir}/man1/smbsh.1.gz /usr/lib/samba/smbwrapper.so %endif -/usr/lib/libsmbclient.a -/usr/lib/libsmbclient.so -/usr/lib/libsmbclient.so.0 %files winbind -%config(noreplace) /etc/samba/smb.conf.winbind %config /etc/init.d/winbind +%config(noreplace) /etc/samba/smb.conf +%dir /etc/samba %doc %{_mandir}/man1/wbinfo.1.gz %doc %{_mandir}/man8/winbindd.8.gz -/usr/bin/wbinfo -%if %{head} > 0 +%doc %{_mandir}/man1/ntlm_auth.1.gz +/lib/libnss_winbind.so* +/lib/libnss_wins.so* +/lib/security/pam_winbind.so /usr/bin/ntlm_auth -%endif -/usr/sbin/winbindd +/usr/bin/wbinfo /usr/sbin/rcwinbind -#/var/adm/fillup-templates/rc.config.winbind -/lib/security/pam_winbind.so -/lib/libnss_winbind.so -/lib/libnss_winbind.so.2 -/lib/libnss_wins.so -/lib/libnss_wins.so.2 +/usr/sbin/winbindd %files utils -/usr/bin/smbtorture -/usr/bin/msgtest -/usr/bin/masktest +%doc %{_mandir}/man1/vfstest.1.gz +/usr/bin/debug2html /usr/bin/locktest /usr/bin/locktest2 -/usr/bin/debug2html +/usr/bin/masktest +/usr/bin/msgtest +/usr/bin/nsstest +/usr/bin/smbtorture /usr/bin/talloctort -/usr/bin/tdbbackup -/usr/bin/tdbdump -/usr/bin/tdbtest -/usr/bin/tdbtool /usr/bin/tdbtorture /usr/bin/vfstest -/usr/bin/nsstest -%if %{head} > 0 -%if %{newsam} > 0 -/usr/bin/samtest -%endif -/usr/bin/profiles -/usr/bin/editreg -%endif -%doc %{_mandir}/man1/vfstest.1.gz -%files doc -%docdir %{DOCDIR} -%{DOCDIR} +%files doc -f filelist-doc +%dir /usr/share/doc/packages/samba3 + +%files docbook +%docdir %{DOCBOOKDIR} +%{DOCBOOKDIR} +%dir /usr/share/doc/packages/samba3 %files pdb /usr/lib/samba/pdb -%doc examples/pdb/* - -%files vfs -/usr/lib/samba/vfs -%doc examples/VFS/README* -%doc examples/VFS/Makefile* -#doc examples/VFS/audit* -#%doc examples/VFS/block* -#doc examples/VFS/netatalk* -#doc examples/VFS/recycle* -%doc examples/VFS/skel* +%doc examples/pdb/{Makefile,README,pdb_test.c} +%doc examples/pdb/{mysql/mysql.dump,mysql/smb.conf} +%if %{make_cifsvfs} -%if %{newsam} > 0 -%files sam -/usr/lib/samba/sam -%if %{head} > 0 -%doc examples/sam/* +%files cifsmount +/sbin/mount.cifs %endif +%if %{make_wrepld} + +%files wrepld +%config /etc/init.d/wrepl +/usr/sbin/rcwrepl +/usr/sbin/wrepld %endif +%if %{make_vscan} %files vscan /usr/lib/samba/vscan -%doc %{name}-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO} - +%doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO} +%endif +%if %{make_python} %files python %doc source/python/README -%if %{python} > 0 -/usr/lib/python2.2/lib-dynload/samba %doc source/python/examples %doc source/python/gprinterdata %doc source/python/gtdbtool %doc source/python/gtkdictbrowser.py -%if %{head} > 0 -%doc source/python/gtkdictbrowser.pyc -%doc source/python/printerdata.pyc -%endif +/usr/lib/%{python_ver}/lib-dynload/samba %endif -%description -Samba is a suite of programs which work together to allow clients to -access Unix filespace and printers via the SMB protocol (Server Message -Block). -In practice, this means that you can redirect disks and printers to -Unix disks and printers from LAN Manager clients, Windows for -Workgroups 3.11 clients, Windows'95 clients, Windows NT clients -and OS/2 clients. There is -also a Unix client program supplied as part of the suite which allows -Unix users to use an ftp-like interface to access filespace and -printers on any other SMB server. -Samba includes the following programs (in summary): -* smbd, the SMB server. This handles actual connections from clients. -* nmbd, the Netbios name server, which helps clients locate servers. -* smbclient, the Unix-hosted client program. -* smbrun, a little 'glue' program to help the server run external -programs. -* testprns, a program to test server access to printers. -* testparm, a program to test the Samba configuration file for correctness. -* smb.conf, the Samba configuration file. -* smbprint, a sample script to allow a Unix host to use smbclient -to print to an SMB server. -The suite is supplied with full source and is GPLed. -This package expects its config file under /etc/smb.conf . +%files -n libsmbclient +%{_libdir}/libsmbclient.so.* -Authors: --------- - Andrew Tridgell - Karl Auer - Jeremy Allison +%files -n libsmbclient-devel +%{_includedir}/libsmbclient.h +%{_libdir}/libsmbclient.a +%{_libdir}/libsmbclient.so -SuSE series: n +%description +samba3 %description client -This package contains all programs, that are needed to act as a samba -client. This includes also smbmount, of course. - -Authors: --------- - Andrew Tridgell - Karl Auer - Jeremy Allison - -SuSE series: n +samba3-client %description winbind -This is the winbind-daemon and the wbinfo-tool. +samba3-winbind + %description utils -Some of the debug-tools for developpers. -Contains: - - debug2html - - locktest - - locktest2 - - masktest - - msgtest - - smbtorture - - talloctort - - several tdb-tools +samba3-utils + %description doc -The Samba Documentation. +samba3-doc + + +%description docbook +samba3-docbook -%description vfs -The Samba VFS-Modules. %description pdb -The Samba PDB-Modules. +samba3-pdb + +%if %{make_cifsvfs} + +%description cifsmount +samba3-cifsmount -%if %{newsam} > 0 -%description sam -The Samba SAM-Modules. %endif +%if %{make_vscan} %description vscan -The Samba VFS-Modules for Virusscanners. +samba3-vscan + +%endif +%if %{make_python} %description python -The Samba python-Modules. +samba3-python + +%endif +%if %{make_wrepld} + +%description wrepld +samba3-wrepld + +%endif + +%description -n libsmbclient +This package includes the libsmbclient library. + +Authors: +-------- + The Samba Team + + +%description -n libsmbclient-devel +This package contains static libraries and header files needed to develop +programs which make use of the smbclient programming interface. + +Authors: +-------- + The Samba Team + + -- cgit From 9d24f7c1724523fb276f2c01c8c511fad1ad279d Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Tue, 12 Aug 2003 01:31:34 +0000 Subject: Missed one file. Now it's added. (This used to be commit f2d212950d7e7b0b7c32166ab39b4389791602b6) --- packaging/SuSE/samba3-3.0.0-heimdal-06.diff | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packaging/SuSE/samba3-3.0.0-heimdal-06.diff (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba3-3.0.0-heimdal-06.diff b/packaging/SuSE/samba3-3.0.0-heimdal-06.diff new file mode 100644 index 0000000000..87dd3e1824 --- /dev/null +++ b/packaging/SuSE/samba3-3.0.0-heimdal-06.diff @@ -0,0 +1,14 @@ +--- source/include/ads.h 2003-06-10 08:51:03.000000000 +0200 ++++ source/include/ads.h 2003-06-22 23:14:24.000000000 +0200 +@@ -215,9 +215,11 @@ + #define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5 + #endif + ++#if 0 + /* The older versions of heimdal that don't have this + define don't seem to use it anyway. I'm told they + always use a subkey */ + #ifndef AP_OPTS_USE_SUBKEY + #define AP_OPTS_USE_SUBKEY 0 + #endif ++#endif -- cgit From ae83f19cbd2d2894623975e0a7ce6bc21ccf0bb6 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 9 Sep 2003 03:44:44 +0000 Subject: removing unneeded files (This used to be commit 40795992b8d8082bc164978ab8d97c326c012367) --- packaging/SuSE/5.2/samba-1.9.18p5.dif | 234 ---------------------------------- packaging/SuSE/5.2/samba.spec | 119 ----------------- 2 files changed, 353 deletions(-) delete mode 100644 packaging/SuSE/5.2/samba-1.9.18p5.dif delete mode 100644 packaging/SuSE/5.2/samba.spec (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/5.2/samba-1.9.18p5.dif b/packaging/SuSE/5.2/samba-1.9.18p5.dif deleted file mode 100644 index 39b13f010d..0000000000 --- a/packaging/SuSE/5.2/samba-1.9.18p5.dif +++ /dev/null @@ -1,234 +0,0 @@ ---- Makefile.Linux -+++ Makefile.Linux 1998/05/06 15:58:42 -@@ -0,0 +1,35 @@ -+# -+# -+# Makefile.Linux to integrate package into source tree of S.u.S.E.-Linux -+# -+# Copyright (C) 1996 S.u.S.E. GmbH Fuerth, Germany. -+# -+# Please send bug-fixes or comments to feedback@suse.de. -+# -+# Author: Florian La Roche -+# Volker Lendecke -+# -+# -+ -+doc=/usr/doc/packages/samba -+ -+compile: -+ make -C source -+ -+install: -+ make install -C source -+ mkdir -p $(doc) -+ cp -a docs/* $(doc) -+ rm -rf $(doc)/*.[0-9] -+ cp -R examples $(doc) -+ chmod 644 `find $(doc) -type f` -+ chmod 755 `find $(doc) -type d` -+ install -m 644 smb.conf /etc/smb.conf -+ install rc /sbin/init.d/smb -+ install -m 755 source/mksmbpasswd.sh /usr/bin/mksmbpasswd.sh -+ ln -sf ../smb /sbin/init.d/rc2.d/S20smb -+ ln -sf ../smb /sbin/init.d/rc2.d/K20smb -+ ln -sf ../smb /sbin/init.d/rc3.d/S20smb -+ ln -sf ../smb /sbin/init.d/rc3.d/K20smb -+ mkdir -p /var/adm/fillup-templates -+ cp rc.config.samba /var/adm/fillup-templates ---- doinst.sh -+++ doinst.sh 1998/05/06 15:54:52 -@@ -0,0 +1,15 @@ -+# -+# install/doinst.sh - to be done after extraction -+# -+# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany. -+# -+# -+echo "Updating etc/rc.config..." -+if [ -x bin/fillup ] ; then -+ bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba -+else -+ echo "ERROR: fillup not found. This should not happen. Please compare" -+ echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" -+ echo "update by hand." -+fi -+ ---- rc -+++ rc 1998/05/06 15:54:52 -@@ -0,0 +1,32 @@ -+#! /bin/sh -+# Copyright (c) 1996 StarDivision GmbH. All rights reserved. -+# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. -+# -+# Author: Bastian Epting, StarDivision GmbH -+# Florian La Roche, -+# Volker Lendecke, -+# -+ -+. /etc/rc.config -+ -+test "$START_SMB" = "yes" || exit 0 -+ -+case "$1" in -+ start) -+ echo -n "Starting SMB services." -+ /usr/sbin/nmbd -D -+ /usr/sbin/smbd -D -+ echo -+ ;; -+ stop) -+ echo -n "Shutting down SMB services." -+ killproc -TERM /usr/sbin/nmbd -+ killproc -TERM /usr/sbin/smbd -+ echo -+ ;; -+ *) -+ echo "Usage: $0 {start|stop}" -+ exit 1 -+esac -+ -+exit 0 ---- rc.config.samba -+++ rc.config.samba 1998/05/06 15:54:52 -@@ -0,0 +1,5 @@ -+# -+# start samba? ("yes" or "no") -+# Windows 95 / NT - File- and Printservices -+# -+START_SMB="no" ---- smb.conf -+++ smb.conf 1998/05/06 15:54:52 -@@ -0,0 +1,48 @@ -+[global] -+ workgroup = arbeitsgruppe -+ guest account = nobody -+ keep alive = 30 -+ os level = 2 -+ security = user -+ printing = bsd -+ printcap name = /etc/printcap -+ load printers = yes -+ -+; Please uncomment the following entry and replace the -+; ip number and netmask with the correct numbers for -+; your ethernet interface. -+; interfaces = 192.168.1.1/255.255.255.0 -+ -+; If you want Samba to act as a wins server, please set -+; 'wins support = yes' -+ wins support = no -+ -+; If you want Samba to use an existing wins server, -+; please uncomment the following line and replace -+; the dummy with the wins server's ip number. -+; wins server = 192.168.1.1 -+ -+[homes] -+ comment = Heimatverzeichnis -+ browseable = no -+ read only = no -+ create mode = 0750 -+ -+; The following share gives all users access to the Server's CD drive, -+; assuming it is mounted under /cd. To enable this share, please remove -+; the semicolons before the lines -+; -+; [cdrom] -+; comment = Linux CD-ROM -+; path = /cd -+; read only = yes -+; locking = no -+ -+[printers] -+ comment = All Printers -+ browseable = no -+ printable = yes -+ public = no -+ read only = yes -+ create mode = 0700 -+ directory = /tmp ---- source/Makefile -+++ source/Makefile 1998/05/06 15:54:52 -@@ -5,11 +5,11 @@ - ########################################################################### - - # The base directory for all samba files --BASEDIR = /usr/local/samba -+BASEDIR = /usr - - # The base manpages directory to put the man pages in - # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. --MANDIR = /usr/local/man -+MANDIR = /usr/man - - # The directories to put things in. If you use multiple - # architectures or share the samba binaries across NFS then -@@ -18,16 +18,16 @@ - # normally only applies to nmbd and smbd - # SBINDIR implies a secure binary directory - BINDIR = $(BASEDIR)/bin --SBINDIR = $(BASEDIR)/bin --LIBDIR = $(BASEDIR)/lib --VARDIR = $(BASEDIR)/var -+SBINDIR = $(BASEDIR)/sbin -+LIBDIR = $(BASEDIR)/lib/samba -+VARDIR = /var/log - - # The permissions to give the executables - INSTALLPERMS = 0755 - - # Add any optimisation or debugging flags here - # add -DSYSLOG for syslog support --FLAGS1 = -O -+FLAGS1 = -O2 - LIBS1 = - - # You will need to use a ANSI C compiler. This means under SunOS 4 you can't -@@ -47,15 +47,15 @@ - # or in smb.conf (see smb.conf(5)) - SMBLOGFILE = $(VARDIR)/log.smb - NMBLOGFILE = $(VARDIR)/log.nmb --CONFIGFILE = $(LIBDIR)/smb.conf --LMHOSTSFILE = $(LIBDIR)/lmhosts --DRIVERFILE = $(LIBDIR)/printers.def -+CONFIGFILE = /etc/smb.conf -+LMHOSTSFILE = /etc/lmhosts -+DRIVERFILE = /etc/printers.def - SMB_PASSWD = $(BINDIR)/smbpasswd --SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd --WEB_ROOT = $(BASEDIR) -+SMB_PASSWD_FILE = /etc/smbpasswd -+WEB_ROOT = /etc - - # the directory where lock files go --LOCKDIR = $(VARDIR)/locks -+LOCKDIR = /var/lock - - # The directory where code page definition files go - CODEPAGEDIR = $(LIBDIR)/codepages -@@ -206,7 +206,7 @@ - # contributed by Andrew.Tridgell@anu.edu.au - # add -DLINUX_BIGCRYPT is you have shadow passwords but don't have the - # right libraries and includes --# FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES -+FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES - # LIBSM = -lshadow - - # Use this for Linux without shadow passwords or for any Linux ---- source/includes.h -+++ source/includes.h 1998/05/06 15:54:52 -@@ -244,13 +244,6 @@ - #define USE_SETFS - #endif - #endif --#ifdef SHADOW_PWD --#if _LINUX_C_LIB_VERSION_MAJOR < 5 --#ifndef crypt --#define crypt pw_encrypt --#endif --#endif --#endif - #endif - - #ifdef SUNOS4 diff --git a/packaging/SuSE/5.2/samba.spec b/packaging/SuSE/5.2/samba.spec deleted file mode 100644 index 5f20875c9e..0000000000 --- a/packaging/SuSE/5.2/samba.spec +++ /dev/null @@ -1,119 +0,0 @@ -# -# spec file for package samba (Version 1.9.18p1) -# -# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany. -# -# please send bugfixes or comments to feedback@suse.de. -# - -Vendor: S.u.S.E. GmbH, Fuerth, Germany -Distribution: S.u.S.E. Linux 5.1 (i386) -Name: samba -Release: 1 -Copyright: 1992-98 Andrew Tridgell, Karl Auer, Jeremy Allison -Group: -Provides: samba smbfs -Requires: -Conflicts: -Autoreqprov: on -Packager: feedback@suse.de - -Version: 1.9.18p5 -Summary: Samba is a file server for Unix, similar to LanManager. -Source: samba-1.9.18p5.tar.gz -Source1: smbfs-2.0.2.tar.gz -Patch: samba-1.9.18p5.dif -Patch1: smbfs-2.0.2.dif -%prep -%setup -%patch -%setup -T -n smbfs-2.0.2 -b1 -%patch -P 1 -%build -cd ../samba-1.9.18p5 -make -f Makefile.Linux compile -cd ../smbfs-2.0.2 -make -f Makefile.Linux compile -%install -cd ../samba-1.9.18p5 -make -f Makefile.Linux install -cd ../smbfs-2.0.2 -make -f Makefile.Linux install -Check -%post -echo "Updating etc/rc.config..." -if [ -x bin/fillup ] ; then - bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba -else - echo "ERROR: fillup not found. This should not happen. Please compare" - echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and" - echo "update by hand." -fi -%files -%docdir /usr/doc/packages/samba -/usr/doc/packages/samba -%config /etc/smb.conf -/usr/lib/samba/codepages -/sbin/init.d/rc2.d/K20smb -/sbin/init.d/rc2.d/S20smb -/sbin/init.d/rc3.d/K20smb -/sbin/init.d/rc3.d/S20smb -%config /sbin/init.d/smb -/usr/bin/addtosmbpass -/usr/bin/mksmbpasswd.sh -/usr/bin/make_printerdef -/usr/bin/make_smbcodepage -/usr/bin/nmblookup -/usr/bin/smbclient -/usr/bin/smbmount -/usr/bin/smbpasswd -/usr/bin/smbstatus -/usr/bin/smbtar -/usr/bin/smbumount -/usr/bin/testparm -/usr/bin/testprns -%doc /usr/man/man1/smbclient.1.gz -%doc /usr/man/man1/smbrun.1.gz -%doc /usr/man/man1/smbstatus.1.gz -%doc /usr/man/man1/smbtar.1.gz -%doc /usr/man/man1/testparm.1.gz -%doc /usr/man/man1/testprns.1.gz -%doc /usr/man/man1/make_smbcodepage.1.gz -%doc /usr/man/man5/smb.conf.5.gz -%doc /usr/man/man7/samba.7.gz -%doc /usr/man/man8/nmbd.8.gz -%doc /usr/man/man8/smbd.8.gz -%doc /usr/man/man8/smbmount.8.gz -%doc /usr/man/man8/smbumount.8.gz -%doc /usr/man/man8/smbmnt.8.gz -%doc /usr/man/man8/smbpasswd.8.gz -/usr/sbin/nmbd -/usr/sbin/smbd -/var/adm/fillup-templates/rc.config.samba -%description -Samba is a suite of programs which work together to allow clients to -access Unix filespace and printers via the SMB protocol (Seerver Message -Block). -CAUTION: The samba daemons are started by the init script -/sbin/init.d/samba, not by inetd. The entries for /usr/sbin/smbd -and /usr/sbin/nmbd must be commented out in /etc/inetd.conf. -In practice, this means that you can redirect disks and printers to -Unix disks and printers from LAN Manager clients, Windows for -Workgroups 3.11 clients, Windows'95 clients, Windows NT clients -and OS/2 clients. There is -also a Unix client program supplied as part of the suite which allows -Unix users to use an ftp-like interface to access filespace and -printers on any other SMB server. -Samba includes the following programs (in summary): -* smbd, the SMB server. This handles actual connections from clients. -* nmbd, the Netbios name server, which helps clients locate servers. -* smbclient, the Unix-hosted client program. -* testprns, a program to test server access to printers. -* testparm, a program to test the Samba configuration file for correctness. -* smb.conf, the Samba configuration file. -* smbprint, a sample script to allow a Unix host to use smbclient -to print to an SMB server. -The suite is supplied with full source and is GPLed. -This package expects its config file under /etc/smb.conf . -Documentation: /usr/doc/packages/samba - -- cgit From 6245ac10f9ef27ae36608998fbb7a407d9e42e4c Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 7 Nov 2003 16:55:40 +0000 Subject: Set vendor name. (This used to be commit 9d8cacc4e6d6336455732286e5e6f90ac3f4ec49) --- packaging/SuSE/samba3.spec | 1 + 1 file changed, 1 insertion(+) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec index 1b620e60c2..37d8a4d36f 100644 --- a/packaging/SuSE/samba3.spec +++ b/packaging/SuSE/samba3.spec @@ -14,6 +14,7 @@ # usedforbuild aaa_base acl attr bash bind9-utils bison coreutils cpio cpp cvs cyrus-sasl2 db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel XFree86-libs autoconf automake binutils bzip2 cracklib cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 gcc gdbm gettext ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl-devel libattr-devel libgimpprint libpng libtiff libtool libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm te_ams te_etex te_latex te_pdf tetex xmlcharent Name: samba3 +Vendor: Samba Team License: GPL Group: Productivity/Networking/Samba Url: http://www.samba.org -- cgit From 772c250250f567d9a2429bc619a211f74dee2ef4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 22 Sep 2004 00:50:12 +0000 Subject: r2482: Fix from Arthur van Dongen to fix acces -> access typos. Jeremy. (This used to be commit a278dca1b2c103f368d154aee2d3a1edd5604687) --- packaging/SuSE/samba3-vscan.diff | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/samba3-vscan.diff b/packaging/SuSE/samba3-vscan.diff index 330b470af2..cf474c97d0 100644 --- a/packaging/SuSE/samba3-vscan.diff +++ b/packaging/SuSE/samba3-vscan.diff @@ -18,7 +18,7 @@ - lrufiles_add(filepath, stat_buf.st_mtime, TRUE); + lrufiles_add(filepath, stat_buf.st_mtime, True); - /* virus found, deny acces */ + /* virus found, deny access */ errno = EACCES; return -1; } else if ( retval == 0 ) { @@ -68,7 +68,7 @@ - lrufiles_add(filepath, stat_buf.st_mtime, TRUE); + lrufiles_add(filepath, stat_buf.st_mtime, True); - /* virus found, deny acces */ + /* virus found, deny access */ errno = EACCES; return -1; } else if ( retval == 0 ) { @@ -197,7 +197,7 @@ - lrufiles_add(filepath, stat_buf.st_mtime, TRUE); + lrufiles_add(filepath, stat_buf.st_mtime, True); - /* virus found, deny acces */ + /* virus found, deny access */ errno = EACCES; return -1; } else if ( retval == 0 ) { -- cgit From 7ca50f96f21983acdb0e2505bec057580ec85819 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 4 Feb 2005 14:03:57 +0000 Subject: r5227: removed SuSE spec file @ Lars' request and updated read to point to package download areas (This used to be commit 51211daa4d8dec96c0ba740f702b486e241e8621) --- packaging/SuSE/README | 25 +- packaging/SuSE/samba-3.0.0.files.tar.bz2 | Bin 7266 -> 0 bytes packaging/SuSE/samba-mutual-auth.diff | 247 ------- packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 | Bin 69479 -> 0 bytes packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff | 22 - packaging/SuSE/samba3-3.0.0-heimdal-06.diff | 14 - packaging/SuSE/samba3-3.0.0-pdb.diff | 13 - packaging/SuSE/samba3-Makefile.diff | 16 - packaging/SuSE/samba3-com_err.diff | 60 -- packaging/SuSE/samba3-net_ads_password.diff | 58 -- packaging/SuSE/samba3-smbwrapper.diff | 11 - packaging/SuSE/samba3-vscan.diff | 269 -------- packaging/SuSE/samba3.spec | 766 --------------------- 13 files changed, 12 insertions(+), 1489 deletions(-) delete mode 100644 packaging/SuSE/samba-3.0.0.files.tar.bz2 delete mode 100644 packaging/SuSE/samba-mutual-auth.diff delete mode 100755 packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 delete mode 100644 packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff delete mode 100644 packaging/SuSE/samba3-3.0.0-heimdal-06.diff delete mode 100644 packaging/SuSE/samba3-3.0.0-pdb.diff delete mode 100644 packaging/SuSE/samba3-Makefile.diff delete mode 100644 packaging/SuSE/samba3-com_err.diff delete mode 100644 packaging/SuSE/samba3-net_ads_password.diff delete mode 100644 packaging/SuSE/samba3-smbwrapper.diff delete mode 100644 packaging/SuSE/samba3-vscan.diff delete mode 100644 packaging/SuSE/samba3.spec (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/README b/packaging/SuSE/README index 5d0af9944a..7691d4c8a4 100644 --- a/packaging/SuSE/README +++ b/packaging/SuSE/README @@ -1,18 +1,17 @@ -Date: March 29, 2003 +### SuSE readme begin +Dear SuSE user, -Note: The current packaging files are NOT officially supported files. ---------------------------------------------------------------------- +prebuild Samba RPMs for all SuSE Linux versions are available at: +ftp://ftp.SuSE.com/pub/projects/samba/ -While the SPEC file shows who the original author was, these files imply no warranty of -fitness what so ever. These files are NOT official SuSE files and are NOT supported by -them. If you have ANY problems with the use of these files then please email jht@samba.org -and NOT SuSE support. +The same package are also available at: +http://download.Samba.org/samba/ftp/Binary_Packages/SuSE/ +If you encounter any problem with these packages please don't blame the +Samba Team. Instead file a bug at https://bugzilla.Samba.org/ pick +product Samba 3.0, then select 'component' Packaging and set 'assign to' +to keyvalue.length != 16) { -+ DEBUG(1, ("secrets_fetch_keytab_password: key is incorrect length\n")); -+ krb5_free_context(context); -+ return False; -+ } -+ -+ memcpy(ret_pwd, key->keyvalue.data, key->keyvalue.length); -+ time(pass_last_set_time); /* XXX */ -+ -+ krb5_free_keyblock(context, key); -+ krb5_free_context(context); -+ -+ return True; -+} -+#endif /* USE_KEYTAB */ -+ - /************************************************************************ - Routine to get the trust account password for a domain. - The user of this function must have locked the trust password file using -@@ -243,6 +309,12 @@ - pass_last_set_time = 0; - return True; - } -+ -+#ifdef USE_KEYTAB -+ if (is_myworkgroup(domain)) { -+ return secrets_fetch_keytab_password(ret_pwd, pass_last_set_time); -+ } -+#endif /* USE_KEYTAB */ - - if (!(pass = secrets_fetch(trust_keystr(domain), &size))) { - DEBUG(5, ("secrets_fetch failed!\n")); - ---- source/libsmb/clikrb5.c 2003-07-02 00:32:55.000000000 +0200 -+++ source/libsmb/clikrb5.c 2003-07-02 00:37:22.000000000 +0200 -@@ -316,11 +316,13 @@ - krb5_enctype enc_types[] = { - #ifdef ENCTYPE_ARCFOUR_HMAC - ENCTYPE_ARCFOUR_HMAC, -+#elif defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) -+ ENCTYPE_ARCFOUR_HMAC_MD5, - #endif - ENCTYPE_DES_CBC_MD5, - ENCTYPE_DES_CBC_CRC, - ENCTYPE_NULL}; -- -+ - retval = krb5_init_context(&context); - if (retval) { - DEBUG(1,("krb5_init_context failed (%s)\n", -@@ -367,24 +369,26 @@ - - BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]) - { --#ifdef ENCTYPE_ARCFOUR_HMAC - krb5_keyblock *skey; --#endif - BOOL ret = False; - - memset(session_key, 0, 16); - --#ifdef ENCTYPE_ARCFOUR_HMAC -+#if defined(ENCTYPE_ARCFOUR_HMAC) || defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) - if (krb5_auth_con_getremotesubkey(context, auth_context, &skey) == 0 && skey != NULL) { - if (KRB5_KEY_TYPE(skey) == -+# ifdef ENCTYPE_ARCFOUR_HMAC - ENCTYPE_ARCFOUR_HMAC -+# else -+ ENCTYPE_ARCFOUR_HMAC_MD5 -+# endif /* ENCTYPE_ARCFOUR_HMAC */ - && KRB5_KEY_LENGTH(skey) == 16) { - memcpy(session_key, KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey)); - ret = True; - } - krb5_free_keyblock(context, skey); - } --#endif /* ENCTYPE_ARCFOUR_HMAC */ -+#endif /* ENCTYPE_ARCFOUR_HMAC || HAVE_ENCTYPE_ARCFOUR_HMAC_MD5 */ - - return ret; - } -@@ -395,5 +399,12 @@ - DEBUG(0,("NO KERBEROS SUPPORT\n")); - return data_blob(NULL, 0); - } -+BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context ac, uint8 session_key[16]) -+ { -+ DEBUG(0,("NO KERBEROS SUPPORT\n")); -+ memset(session_key, 0, 16); -+ return False; -+ } -+ //#endif - - #endif ---- source/libads/kerberos_verify.c 2003-06-28 23:40:55.000000000 +0200 -+++ source/libads/kerberos_verify.c 2003-07-02 00:50:13.000000000 +0200 -@@ -38,7 +38,9 @@ - krb5_keytab keytab = NULL; - krb5_data packet; - krb5_ticket *tkt = NULL; -- int ret, i; -+ int ret; -+#ifndef USE_KEYTAB -+ int i; - krb5_keyblock * key; - krb5_principal host_princ; - char *host_princ_s; -@@ -46,8 +48,10 @@ - char *password_s; - krb5_data password; - krb5_enctype *enctypes = NULL; -+#endif /* USE_KEYTAB */ - BOOL auth_ok = False; - -+#ifndef USE_KEYTAB - if (!secrets_init()) { - DEBUG(1,("secrets_init failed\n")); - return NT_STATUS_LOGON_FAILURE; -@@ -61,6 +65,7 @@ - - password.data = password_s; - password.length = strlen(password_s); -+#endif /* USE_KEYTAB */ - - ret = krb5_init_context(&context); - if (ret) { -@@ -82,7 +87,16 @@ - DEBUG(1,("krb5_auth_con_init failed (%s)\n", error_message(ret))); - return NT_STATUS_LOGON_FAILURE; - } -+#ifdef USE_KEYTAB -+ packet.length = ticket->length; -+ packet.data = (krb5_pointer)ticket->data; - -+ if (!(ret = krb5_rd_req(context, &auth_context, &packet, -+ NULL, keytab, NULL, &tkt))) { -+ auth_ok = True; -+ } -+ -+#else - fstrcpy(myname, global_myname()); - strlower(myname); - asprintf(&host_princ_s, "HOST/%s@%s", myname, lp_realm()); -@@ -121,6 +135,9 @@ - } - } - -+ SAFE_FREE(key); -+#endif /* USE_KEYTAB */ -+ - if (!auth_ok) { - DEBUG(3,("krb5_rd_req with auth failed (%s)\n", - error_message(ret))); ---- source/Makefile.in 2003-07-01 23:35:49.000000000 +0200 -+++ source/Makefile.in 2003-07-02 01:20:09.000000000 +0200 -@@ -806,7 +806,7 @@ - - bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(CC) $(FLAGS) -o $@ $(IDMAP_LIBS) $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDBLIBS) -+ @$(CC) $(FLAGS) -o $@ $(IDMAP_LIBS) $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDBLIBS) $(KRB5LIBS) - - bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -@@ -1062,7 +1062,7 @@ - - bin/wbinfo@EXEEXT@: $(WBINFO_OBJ) @BUILD_POPT@ bin/.dummy - @echo Linking $@ -- @$(LINK) -o $@ $(WBINFO_OBJ) $(LIBS) @POPTLIBS@ -+ @$(LINK) -o $@ $(WBINFO_OBJ) $(LIBS) @POPTLIBS@ $(KRB5LIBS) - - bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) $(PARAM_OBJ) $(LIB_OBJ) \ - $(UBIQX_OBJ) @BUILD_POPT@ bin/.dummy diff --git a/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 deleted file mode 100755 index 2680bed82f..0000000000 Binary files a/packaging/SuSE/samba-vscan-0.3.2b.tar.bz2 and /dev/null differ diff --git a/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff b/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff deleted file mode 100644 index 13da47e740..0000000000 --- a/packaging/SuSE/samba3-3.0.0-Makefiles-heimdal.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- examples/pdb/Makefile Thu Sep 5 02:11:41 2002 -+++ examples/pdb/Makefile Thu Sep 5 02:11:59 2002 -@@ -8,7 +8,7 @@ - SAMBA_INCL = ../../source/include - UBIQX_SRC = ../../source/ubiqx - SMBWR_SRC = ../../source/smbwrapper --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal - PDB_OBJS = pdb_test.so - - # Default target ---- examples/VFS/Makefile.in 2003-06-04 15:13:41.000000000 +0200 -+++ examples/VFS/Makefile.in 2003-06-04 22:07:03.000000000 +0200 -@@ -7,7 +7,7 @@ - SAMBA_SOURCE = @SAMBA_SOURCE@ - SHLIBEXT = @SHLIBEXT@ - OBJEXT = @OBJEXT@ --FLAGS = $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/ubiqx -I$(SAMBA_SOURCE)/smbwrapper -I. $(CPPFLAGS) -I$(SAMBA_SOURCE) -+FLAGS = $(CFLAGS) -Iinclude -I$(SAMBA_SOURCE)/include -I$(SAMBA_SOURCE)/ubiqx -I$(SAMBA_SOURCE)/smbwrapper -I. $(CPPFLAGS) -I$(SAMBA_SOURCE) -I/usr/include/heimdal - - - prefix = @prefix@ diff --git a/packaging/SuSE/samba3-3.0.0-heimdal-06.diff b/packaging/SuSE/samba3-3.0.0-heimdal-06.diff deleted file mode 100644 index 87dd3e1824..0000000000 --- a/packaging/SuSE/samba3-3.0.0-heimdal-06.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- source/include/ads.h 2003-06-10 08:51:03.000000000 +0200 -+++ source/include/ads.h 2003-06-22 23:14:24.000000000 +0200 -@@ -215,9 +215,11 @@ - #define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5 - #endif - -+#if 0 - /* The older versions of heimdal that don't have this - define don't seem to use it anyway. I'm told they - always use a subkey */ - #ifndef AP_OPTS_USE_SUBKEY - #define AP_OPTS_USE_SUBKEY 0 - #endif -+#endif diff --git a/packaging/SuSE/samba3-3.0.0-pdb.diff b/packaging/SuSE/samba3-3.0.0-pdb.diff deleted file mode 100644 index 0c811b57c5..0000000000 --- a/packaging/SuSE/samba3-3.0.0-pdb.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- examples/pdb/pdb_test.c 26 Sep 2002 18:37:54 -0000 1.1.2.3 -+++ examples/pdb/pdb_test.c 22 Apr 2003 20:06:31 -0000 -@@ -142,8 +142,6 @@ - int init_module(void); - - int init_module() { -- if(smb_register_passdb("testsam", testsam_init, PASSDB_INTERFACE_VERSION)) -- return 0; -- -- return 1; -+ smb_register_passdb(PASSDB_INTERFACE_VERSION, "testsam", testsam_init); -+ return True; - } diff --git a/packaging/SuSE/samba3-Makefile.diff b/packaging/SuSE/samba3-Makefile.diff deleted file mode 100644 index bc1ad142d9..0000000000 --- a/packaging/SuSE/samba3-Makefile.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- source/Makefile.in 2003-04-23 10:43:06.000000000 +0200 -+++ source/Makefile.in 2003-04-23 10:45:39.000000000 +0200 -@@ -673,6 +673,13 @@ - @echo "Using FLAGS = $(FLAGS)" - @echo " FLAGS32 = $(FLAGS32)" - @echo " LIBS = $(LIBS)" -+ @echo " TERMLIBS = $(TERMLIBS)" -+ @echo " PRINTLIBS = $(PRINTLIBS)" -+ @echo " AUTHLIBS = $(AUTHLIBS)" -+ @echo " ACLLIBS = $(ACLLIBS)" -+ @echo " PASSDBLIBS = $(PASSDBLIBS)" -+ @echo " ADSLIBS = $(ADSLIBS)" -+ @echo " KRB5LIBS = $(KRB5_LIBS)" - @echo " LDSHFLAGS = $(LDSHFLAGS)" - @echo " LDFLAGS = $(LDFLAGS)" - diff --git a/packaging/SuSE/samba3-com_err.diff b/packaging/SuSE/samba3-com_err.diff deleted file mode 100644 index c5d04cebe1..0000000000 --- a/packaging/SuSE/samba3-com_err.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- source/libads/kerberos.c 23 Oct 2002 00:02:26 -0000 1.18 -+++ source/libads/kerberos.c 1 Jul 2003 21:30:17 -0000 -@@ -126,6 +126,7 @@ - return KRB5_LIBOS_CANTREADPWD; - } - -+ initialize_krb5_error_table(); - ret = kerberos_kinit_password(s, ads->auth.password, ads->auth.time_offset); - - if (ret) { ---- source/libads/kerberos_verify.c 6 Jun 2003 14:53:22 -0000 1.10.2.1 -+++ source/libads/kerberos_verify.c 1 Jul 2003 21:30:17 -0000 -@@ -62,6 +62,7 @@ - password.data = password_s; - password.length = strlen(password_s); - -+ initialize_krb5_error_table(); - ret = krb5_init_context(&context); - if (ret) { - DEBUG(1,("krb5_init_context failed (%s)\n", error_message(ret))); ---- source/libads/krb5_setpw.c 6 Jun 2003 14:53:22 -0000 1.16.2.1 -+++ source/libads/krb5_setpw.c 1 Jul 2003 21:30:17 -0000 -@@ -470,6 +470,7 @@ - krb5_creds creds, *credsp; - krb5_ccache ccache; - -+ initialize_krb5_error_table(); - ret = krb5_init_context(&context); - if (ret) { - DEBUG(1,("Failed to init krb5 context (%s)\n", error_message(ret))); -@@ -584,6 +585,7 @@ - krb5_creds creds; - char *chpw_princ = NULL, *password; - -+ initialize_krb5_error_table(); - ret = krb5_init_context(&context); - if (ret) { - DEBUG(1,("Failed to init krb5 context (%s)\n", error_message(ret))); ---- source/libsmb/clikrb5.c 1 Jul 2003 14:40:37 -0000 1.36.2.2 -+++ source/libsmb/clikrb5.c 1 Jul 2003 21:30:20 -0000 -@@ -320,7 +320,8 @@ - ENCTYPE_DES_CBC_MD5, - ENCTYPE_DES_CBC_CRC, - ENCTYPE_NULL}; -- -+ -+ initialize_krb5_error_table(); - retval = krb5_init_context(&context); - if (retval) { - DEBUG(1,("krb5_init_context failed (%s)\n", ---- source/utils/net_lookup.c 1 Jul 2003 14:40:47 -0000 1.8.2.1 -+++ source/utils/net_lookup.c 1 Jul 2003 21:30:24 -0000 -@@ -177,6 +177,7 @@ - krb5_data realm; - char **realms; - -+ initialize_krb5_error_table(); - rc = krb5_init_context(&ctx); - if (rc) { - DEBUG(1,("krb5_init_context failed (%s)\n", diff --git a/packaging/SuSE/samba3-net_ads_password.diff b/packaging/SuSE/samba3-net_ads_password.diff deleted file mode 100644 index cc800fb7bf..0000000000 --- a/packaging/SuSE/samba3-net_ads_password.diff +++ /dev/null @@ -1,58 +0,0 @@ -Index: source/utils/net_ads.c -=================================================================== -RCS file: /cvsroot/samba/source/utils/net_ads.c,v -retrieving revision 1.37.2.22 -diff -u -r1.37.2.22 net_ads.c ---- source/utils/net_ads.c 10 Jun 2003 04:15:55 -0000 1.37.2.22 -+++ source/utils/net_ads.c 20 Jun 2003 19:59:36 -0000 -@@ -44,9 +44,9 @@ - "\n\tdump the machine account details to stdout\n" - "\nnet ads lookup"\ - "\n\tperform a CLDAP search on the server\n" --"\nnet ads password -Uadmin_username@realm%%admin_pass"\ -+"\nnet ads password -Uadmin_username@realm%%admin_pass"\ - "\n\tchange a user's password using an admin account"\ --"\n\t(note: use realm in UPPERCASE)\n"\ -+"\n\t(note: use realm in UPPERCASE, prompts if password is obmitted)\n"\ - "\nnet ads changetrustpw"\ - "\n\tchange the trust account password of this machine in the AD tree\n"\ - "\nnet ads printer [info | publish | remove] "\ -@@ -909,7 +909,7 @@ - } - - -- if (argc != 1) { -+ if (argc < 1) { - d_printf("ERROR: You must say which username to change password for\n"); - return -1; - } -@@ -941,22 +941,24 @@ - return -1; - } - -- asprintf(&prompt, "Enter new password for %s:", user); -- -- new_password = getpass(prompt); -+ if (argv[1]) { -+ new_password = (char *)argv[1]; -+ } else { -+ asprintf(&prompt, "Enter new password for %s:", user); -+ new_password = getpass(prompt); -+ free(prompt); -+ } - - ret = kerberos_set_password(ads->auth.kdc_server, auth_principal, - auth_password, user, new_password, ads->auth.time_offset); - if (!ADS_ERR_OK(ret)) { - d_printf("Password change failed :-( ...\n"); - ads_destroy(&ads); -- free(prompt); - return -1; - } - - d_printf("Password change for %s completed.\n", user); - ads_destroy(&ads); -- free(prompt); - - return 0; - } diff --git a/packaging/SuSE/samba3-smbwrapper.diff b/packaging/SuSE/samba3-smbwrapper.diff deleted file mode 100644 index 0f7b391de0..0000000000 --- a/packaging/SuSE/samba3-smbwrapper.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- source/smbwrapper/smbsh.c.orig 2003-05-04 19:47:39.000000000 +0200 -+++ source/smbwrapper/smbsh.c 2003-05-04 19:47:47.000000000 +0200 -@@ -36,7 +36,7 @@ - int main(int argc, char *argv[]) - { - char *p, *u; -- const char *libd = dyn_BINDIR; -+ const char *libd = dyn_LIBDIR; - pstring line, wd; - int opt; - extern char *optarg; diff --git a/packaging/SuSE/samba3-vscan.diff b/packaging/SuSE/samba3-vscan.diff deleted file mode 100644 index cf474c97d0..0000000000 --- a/packaging/SuSE/samba3-vscan.diff +++ /dev/null @@ -1,269 +0,0 @@ ---- examples/VFS/samba-vscan-0.3.2b/fprot/Makefile 2003-01-14 00:42:15.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/fprot/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -14,7 +14,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - VFS_OBJS = vscan-fprotd.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-fprotd.lo vscan-fprotd_core.lo ---- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c 2003-02-21 21:37:44.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd.c 2003-04-09 20:25:25.000000000 +0200 -@@ -432,14 +432,14 @@ - rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); - - /* add/update file. mark file as infected! */ -- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); -+ lrufiles_add(filepath, stat_buf.st_mtime, True); - - /* virus found, deny access */ - errno = EACCES; - return -1; - } else if ( retval == 0 ) { - /* file is clean, add to lrufiles */ -- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); -+ lrufiles_add(filepath, stat_buf.st_mtime, False); - } - } - ---- examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c 2003-01-25 18:40:57.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/fprot/vscan-fprotd_core.c 2003-04-09 20:23:31.000000000 +0200 -@@ -110,7 +110,7 @@ - pstring fprotdCommand; /* the command line to be send to daemon */ - char *str; - FILE *fpin, *fpout; -- bool received_data = FALSE; /* indicates, if any response from deamon was received */ -+ bool received_data = False; /* indicates, if any response from deamon was received */ - - /* open stream sockets */ - fpin = fdopen(sockfd, "r"); -@@ -159,7 +159,7 @@ - - while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) { - -- received_data = TRUE; -+ received_data = True; - - /* ignore the HTTP response header, remove any leading - white spaces */ ---- examples/VFS/samba-vscan-0.3.2b/icap/Makefile 2003-01-30 00:53:02.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/icap/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - VFS_OBJS = vscan-icap.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-icap.c vscan-icap_core.c vscan-icap.h vscan-icap_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-icap.lo vscan-icap_core.lo ---- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c 2003-02-21 21:37:50.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap.c 2003-04-09 20:32:20.000000000 +0200 -@@ -413,14 +413,14 @@ - rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); - - /* add/update file. mark file as infected! */ -- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); -+ lrufiles_add(filepath, stat_buf.st_mtime, True); - - /* virus found, deny access */ - errno = EACCES; - return -1; - } else if ( retval == 0 ) { - /* file is clean, add to lrufiles */ -- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); -+ lrufiles_add(filepath, stat_buf.st_mtime, False); - } - } - ---- examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c 2003-01-15 00:19:18.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/icap/vscan-icap_core.c 2003-04-09 20:30:56.000000000 +0200 -@@ -114,8 +114,8 @@ - char buf[BUFLEN]; - char recvline[MAXLINE + 1]; - char *str; -- bool first_line = FALSE; /* first line we've received? */ -- bool infected = FALSE; /* an infected found? */ -+ bool first_line = False; /* first line we've received? */ -+ bool infected = False; /* an infected found? */ - - - /* get file length */ -@@ -213,7 +213,7 @@ - /* set line buffering */ - setvbuf(fpin, (char *)NULL, _IOLBF, 0); - -- first_line = TRUE; -+ first_line = True; - while ( (fgets(recvline, MAXLINE, fpin)) != NULL ) { - str = recvline; - if ( first_line ) { -@@ -226,7 +226,7 @@ - return(0); - } - else if ( strncmp("403", str, 3) == 0 ) { -- infected = TRUE; -+ infected = True; - } else { - if ( verbose_file_logging ) - vscan_syslog("ERROR: file %s not found, not readable or an error occured", scan_file); -@@ -241,7 +241,7 @@ - return(-1); - } - -- first_line = FALSE; -+ first_line = False; - } - if ( infected ) { - if ( strncmp("X-Infection-Found", str, 17) == 0 ) { ---- examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h 2002-11-25 16:48:10.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/include/vscan-global.h 2003-04-09 20:21:37.000000000 +0200 -@@ -93,7 +93,7 @@ - */ - - #ifndef SAMBA_VERSION_MAJOR --# define SAMBA_VERSION_MAJOR 2 -+# define SAMBA_VERSION_MAJOR 3 - #endif - - #ifndef SAMBA_VERSION_MINOR ---- examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile 2003-02-20 15:41:32.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/kaspersky/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -23,9 +23,9 @@ - VFS_OBJS = vscan-kavp.so - - ifdef USE_DEBUG --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - else --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - endif - - ifndef USE_KAVPSHAREDLIB ---- examples/VFS/samba-vscan-0.3.2b/mks/Makefile 2003-01-19 18:09:53.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/mks/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -16,10 +16,10 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - - ifdef USE_INCLMKSDLIB --CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC -+CFLAGS=-I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_USE_INCL_MKSD_LIB=1 -fPIC -I/usr/include/heimdal - endif - - VFS_OBJS = vscan-mksd.so ---- examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c 2003-02-21 21:37:50.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/mks/vscan-mksd.c 2003-04-09 20:38:16.000000000 +0200 -@@ -393,14 +393,14 @@ - rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); - - /* add/update file. mark file as infected! */ -- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); -+ lrufiles_add(filepath, stat_buf.st_mtime, True); - - /* virus found, deny acces */ - errno = EACCES; - return -1; - } else if ( retval == 0 ) { - /* file is clean, add to lrufiles */ -- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); -+ lrufiles_add(filepath, stat_buf.st_mtime, False); - } - } - ---- examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile 2003-01-30 00:53:08.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/openantivirus/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - VFS_OBJS = vscan-oav.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-oav.lo vscan-oav_core.lo ---- examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c 2003-02-21 21:37:51.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/openantivirus/vscan-oav.c 2003-04-09 20:40:53.000000000 +0200 -@@ -417,14 +417,14 @@ - rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); - - /* add/update file. mark file as infected! */ -- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); -+ lrufiles_add(filepath, stat_buf.st_mtime, True); - - /* virus found, deny access */ - errno = EACCES; - return -1; - } else if ( retval == 0 ) { - /* file is clean, add to lrufiles */ -- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); -+ lrufiles_add(filepath, stat_buf.st_mtime, False); - } - } - ---- examples/VFS/samba-vscan-0.3.2b/sophos/Makefile 2003-01-30 00:53:08.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/sophos/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - VFS_OBJS = vscan-sophos.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-sophos.lo vscan-sophos_core.lo ---- examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c 2003-02-21 21:37:51.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/sophos/vscan-sophos.c 2003-04-09 20:43:11.000000000 +0200 -@@ -399,14 +399,14 @@ - rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); - - /* add/update file. mark file as infected! */ -- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); -+ lrufiles_add(filepath, stat_buf.st_mtime, True); - - /* deny access */ - errno = EACCES; - return -1; - } else if ( retval == 0 ) { - /* file is clean, add to lrufiles */ -- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); -+ lrufiles_add(filepath, stat_buf.st_mtime, False); - } - } - ---- examples/VFS/samba-vscan-0.3.2b/trend/Makefile 2003-01-30 01:03:38.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/trend/Makefile 2003-04-09 20:21:37.000000000 +0200 -@@ -15,7 +15,7 @@ - SMBWR_SRC = ../../../../source/smbwrapper - SMBVS_INCL = ../include - SMBVS_GLB = ../global --CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -I/usr/include/heimdal - VFS_OBJS = vscan-trend.so - SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c $(SMBVS_GLB)/vscan-fileaccesslog.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h - OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fileaccesslog.lo vscan-trend.lo vscan-trend_core.lo ---- examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c 2003-02-21 21:37:52.000000000 +0100 -+++ examples/VFS/samba-vscan-0.3.2b/trend/vscan-trend.c 2003-04-09 20:46:07.000000000 +0200 -@@ -409,14 +409,14 @@ - rc = vscan_do_infected_file_action(&default_vfs_ops, conn, filepath, quarantine_dir, quarantine_prefix, infected_file_action); - - /* add/update file. mark file as infected! */ -- lrufiles_add(filepath, stat_buf.st_mtime, TRUE); -+ lrufiles_add(filepath, stat_buf.st_mtime, True); - - /* deny access */ - errno = EACCES; - return -1; - } else if ( retval == 0 ) { - /* file is clean, add to lrufiles */ -- lrufiles_add(filepath, stat_buf.st_mtime, FALSE); -+ lrufiles_add(filepath, stat_buf.st_mtime, False); - } - } - diff --git a/packaging/SuSE/samba3.spec b/packaging/SuSE/samba3.spec deleted file mode 100644 index 37d8a4d36f..0000000000 --- a/packaging/SuSE/samba3.spec +++ /dev/null @@ -1,766 +0,0 @@ -# -# spec file for package samba3 (Version 3.0.0rc1cvs) -# -# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. -# -# Please submit bugfixes or comments via http://www.suse.de/feedback/ -# -# Note: The Samba3 tarball should be called: samba3-3.0.0.tar.bz2 -# - -# neededforbuild XFree86-libs autoconf automake cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl libacl-devel libattr libattr-devel libgimpprint libpng libtiff libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel popt popt-devel python python-devel readline readline-devel te_etex te_latex te_pdf tetex xmlcharent -# usedforbuild aaa_base acl attr bash bind9-utils bison coreutils cpio cpp cvs cyrus-sasl2 db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel XFree86-libs autoconf automake binutils bzip2 cracklib cups-devel cups-libs dialog docbook-utils docbook-xsl-stylesheets docbook_4 ed freetype2 gcc gdbm gettext ghostscript-fonts-std ghostscript-library ghostscript-x11 glib heimdal heimdal-devel heimdal-lib iso_ent libacl-devel libattr-devel libgimpprint libpng libtiff libtool libxml2 libxml2-devel libxslt mysql-devel mysql-shared openldap2 openldap2-client openldap2-devel openssl openssl-devel perl popt popt-devel python python-devel readline-devel rpm te_ams te_etex te_latex te_pdf tetex xmlcharent - -Name: samba3 -Vendor: Samba Team -License: GPL -Group: Productivity/Networking/Samba -Url: http://www.samba.org -Provides: samba smbfs samba3 -Requires: samba3-client -Obsoletes: samba-classic samba-ldap -Autoreqprov: on -%define krb_heimdal_05 0 -%define new_heimdal /opt/heimdal -%define new_sasl /opt/sasl -%define new_openldap /opt/openldap -%define new_glibc 0 -Version: 3.0.0 -Release: %(date +%%j) -%define head 0 -%define samba_ver 3.0.0 -%define samba_release 0 -%define ul_version 0 -%define suse_ver 820 -%define python_ver python2.2 -%if %{suse_ver} > 810 -%define new_glibc 1 -%endif -%if %{suse_ver} > 821 -%define python_ver python2.3 -%endif -%define make_cifsvfs 1 -%define make_devel 0 -%define make_doc 0 -%define make_python 1 -%define make_shared_mod 0 -%define make_smbwrap 1 -# vscan has not yet updated to the new vfs-api -%define make_vscan 0 -%define make_wrepld 1 -%define use_keytab 0 -Summary: samba3 -Source: %{name}-%{version}.tar.bz2 -Source10: %{name}-%{version}.files.tar.bz2 -Source50: samba-vscan-%{vscan_ver}.tar.bz2 -Patch1: %{name}-%{version}-Makefiles-heimdal.diff -Patch2: samba-mutual-auth.diff -Patch29: %{name}-com_err.diff -Patch30: %{name}-%{version}-heimdal-06.diff -Patch31: %{name}-%{version}-pdb.diff -Patch32: %{name}-net_ads_password.diff -Patch33: %{name}-Makefile.diff -Patch34: %{name}-smbwrapper.diff -Patch51: %{name}-vscan.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define DOCDIR %{_defaultdocdir}/%{name} -%define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook -%define SWATDIR %{_datadir}/samba/swat -%define vscan_ver 0.3.2b -%define vscan_modules fprot icap mks openantivirus sophos trend -#not pdb_nisplussam -%define pdb_modules pdb_xml,pdb_mysql,pdb_ldap,pdb_smbpasswd,pdb_tdbsam,pdb_unix,pdb_guest,pdb_nisplussam -%define rpc_modules rpc_lsa,rpc_samr,rpc_reg,rpc_wks,rpc_net,rpc_dfs,rpc_srv,rpc_spoolss -%define auth_modules auth_rhosts,auth_sam,auth_unix,auth_winbind,auth_server,auth_domain,auth_builtin -%define vfs_modules vfs_recycle,vfs_audit,vfs_extd_audit,vfs_netatalk,vfs_fake_perms -%define idmap_modules idmap_winbind,idmap_ldap,idmap_tdb -%define charset_modules charset_weird -%package client -Summary: samba3-client -Autoreqprov: on -Requires: cups-libs -Obsoletes: smbclnt samba-classic-client samba-ldap-client -Provides: samba-client samba3-client -Group: Productivity/Networking/Samba -%package winbind -Requires: samba-client samba -Summary: samba3-winbind -Autoreqprov: on -Group: Productivity/Networking/Samba -%package utils -Summary: samba3-utils -Autoreqprov: on -Group: Productivity/Networking/Samba -%package doc -Summary: samba3-doc -Autoreqprov: on -Group: Productivity/Networking/Samba -%package docbook -Summary: samba3-docbook -Autoreqprov: on -Group: Productivity/Networking/Samba -%package pdb -Summary: samba3-pdb -Autoreqprov: on -Group: Productivity/Networking/Samba -%if %{make_cifsvfs} -%package cifsmount -Summary: samba3-cifsmount -Autoreqprov: on -Group: Productivity/Networking/Samba -Url: http://us1.samba.org/samba/Linux_CIFS_client.html -%endif -%if %{make_vscan} -%package vscan -Summary: samba3-vscan -Autoreqprov: on -Group: Productivity/Networking/Samba -Version: 0.3.2a -Release: 0 -Url: http://www.openantivirus.org/ -%endif -%if %{make_wrepld} -%package wrepld -Summary: samba3-wrepld -Autoreqprov: on -Group: Productivity/Networking/Samba -%endif -%if %{make_python} -%package python -Summary: samba3-python -Autoreqprov: on -Group: Productivity/Networking/Samba -%endif -%package -n libsmbclient -Summary: Samba client library -Autoreqprov: on -Group: System/Libraries -%package -n libsmbclient-devel -Summary: Libraries and header files to develop programs with smbclient support -Autoreqprov: on -Group: Development/Libraries/C and C++ -%prep -[ $RPM_BUILD_ROOT = "/" ] && (echo "your buildroot is /" && exit 0) || rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT -%setup -n %{name}-%{samba_ver} -%setup -T -D -a 50 -cp -ar samba-vscan-%{vscan_ver} examples/VFS/ -# untar my configs -%setup -T -D -a 10 -########### -### PATCHES -########### -# Makefiles-heimdal.diff -%patch1 -%if %{use_keytab} -# luke howards keytab-patch -%patch2 -%endif -# some com_err fixes -%patch29 -%if %{suse_ver} > 821 -%patch30 -%endif -# vscan patch -%patch51 -# net ads password -%patch32 -# temp Makefile (show more libs) -%patch33 -# temp pdb-test.c -%patch31 -# smbwrapper should use LIBDIR not BINDIR -%patch34 -#find . -name CVS -print | xargs rm -rf -#find . -name ".cvsignore" -print | xargs rm -rf -find . -name "*.gd" -print | xargs rm -rvf -find . -name "*.orig" -print | xargs rm -rvf -%if %{ul_version} >= 1 - echo '#define VERSION "%samba_ver-UL"' > source/include/version.h -%else - echo '#define VERSION "%samba_ver-SuSE"' > source/include/version.h -%endif - -%build %{name}-%{samba_ver} -%{?suse_update_config:%{suse_update_config -f}} -cd source -./autogen.sh -export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" -# debugging symbols -%if %{make_devel} -export CFLAGS="$RPM_OPT_FLAGS -g -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" -%endif -%if %{krb_heimdal_05} -export CFLAGS="$CFLAGS -I./include -I%{new_heimdal}/include " -export CFLAGS="$CFLAGS -I%{new_openldap}/include " -export CFLAGS="$CFLAGS -I%{new_sasl}/include " -export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_heimdal}/lib" -export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_openldap}/lib" -export LDFLAGS="$LDFLAGS -Wl,-rpath %{new_sasl}/lib" -%endif -%ifarch ppc64 -export CFLAGS="$CFLAGS -mminimal-toc" -%endif -CONF_OPTS="\ - --enable-cups \ - --libdir=/usr/lib/samba \ - --localstatedir=/var/lib/samba \ - --mandir=%{_mandir} \ - --prefix=/usr \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc/samba \ - --with-acl-support \ - --with-automount \ - --with-configdir=/etc/samba \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-msdfs \ - --with-pam \ - --with-pam_smbpass \ - --with-piddir=/var/run/samba \ - --with-privatedir=/etc/samba \ - --with-quotas \ - --with-smbmount \ - --with-swatdir=/usr/share/samba/swat \ - --with-syslog \ - --with-utmp \ - --with-vfs \ - --with-winbind \ - --with-tdbsam \ - --with-expsam=xml,mysql \ - --with-profiling-data \ -%if %{use_keytab} - --enable-keytab \ -%endif -%if %{make_smbwrap} - --with-smbwrapper \ -%endif -%if %{make_python} - --with-python=%{python_ver} \ -%endif -%if %{make_shared_mod} - --with-shared-modules=%{pdb_modules},%{rpc_modules} \ -%endif -%if %{make_devel} - --enable-developer \ - --enable-krb5developer \ -%endif -" -# --with-nisplus-home \ -# make sure we have a chance to find the krb5-config-tool -export PATH="$PATH:/usr/lib/heimdal/bin" -./configure $CONF_OPTS -make \ - all \ - torture \ - nsswitch/libnss_wins.so \ - debug2html \ - libsmbclient \ - everything \ - bin/editreg -# everything = nsswitch smbwrapper smbtorture debug2html smbfilter nsswitch/libnss_wins.so -make modules -make -C tdb tdbdump tdbtest tdbtool tdbtorture -make talloctort -%if %{make_wrepld} -make bin/wrepld -%endif -%if %{make_doc} -pushd `pwd` -cd ../docs/docbook -autoconf -f -./configure -# gracefully ignore errors... -make -i manpages html html-single pdf htmlfaq htmlman -# ps is not necessary, txt neither -# everything = manpages ps pdf html-single html htmlman txt htmlfaq -popd -%endif -# make examples in VFS,PDB -pushd `pwd` -cd ../examples/VFS/ -sh -x autogen.sh -./configure -popd -EXAMPLEDIRS="pdb VFS" -for i in $EXAMPLEDIRS; do make -C ../examples/$i; done -%if %{make_vscan} -export USE_KAVPSHAREDLIB=0 -export USE_INCLMKSDLIB=1 -for module in %{vscan_modules}; do - make -C ../examples/VFS/samba-vscan-%{vscan_ver}/${module}; -done -%endif -%if %{make_python} -make python_ext -%endif -%if %{make_cifsvfs} -cd client -export CFLAGS="$RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE" -gcc mount.cifs.c -o mount.cifs -cd .. -%endif - -%install -mkdir -p \ - $RPM_BUILD_ROOT/%{DOCDIR} \ - $RPM_BUILD_ROOT/%{DOCDIR}-vscan \ - $RPM_BUILD_ROOT/%{DOCDIR}/docbook \ - $RPM_BUILD_ROOT/etc/{pam.d,init.d,samba} \ - $RPM_BUILD_ROOT/lib/security \ - $RPM_BUILD_ROOT/sbin \ - $RPM_BUILD_ROOT/usr/include \ - $RPM_BUILD_ROOT/usr/lib/%{python_ver}/lib-dynload \ - $RPM_BUILD_ROOT/usr/lib/samba/{vfs,pdb,vscan,rpc,auth,charset,idmap} \ - $RPM_BUILD_ROOT/usr/share/{man,samba/swat} \ - $RPM_BUILD_ROOT/usr/{bin,sbin} \ - $RPM_BUILD_ROOT/var/adm \ - $RPM_BUILD_ROOT/var/lib/samba/{netlogon,drivers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC},profiles} \ - $RPM_BUILD_ROOT/var/log/samba \ - $RPM_BUILD_ROOT/var/run/samba \ - $RPM_BUILD_ROOT/var/spool/samba -cd source/ -make install \ - LIBDIR=$RPM_BUILD_ROOT/usr/lib/samba \ - LOGFILEBASE=$RPM_BUILD_ROOT/var/log/samba \ - CONFIGFILE=$RPM_BUILD_ROOT/etc/samba/smb.conf \ - LMHOSTSFILE=$RPM_BUILD_ROOT/etc/samba/lmhosts \ - SWATDIR=$RPM_BUILD_ROOT/usr/share/samba/swat \ - SBINDIR=$RPM_BUILD_ROOT/usr/sbin \ - LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \ - DRIVERFILE=$RPM_BUILD_ROOT/etc/samba/printers.def \ - BINDIR=$RPM_BUILD_ROOT/usr/bin \ - SMB_PASSWD_FILE=$RPM_BUILD_ROOT/etc/samba/smbpasswd \ - MANDIR=$RPM_BUILD_ROOT/usr/share/man -make installmodules \ - LIBDIR=$RPM_BUILD_ROOT/usr/lib/samba -cd .. -# utility scripts -%if %{head} -scripts="creategroup cvslog.pl scancvslog.pl" -%else -scripts="scancvslog.pl" -%endif -mkdir -p examples/scripts -for i in $scripts; do - cp -a source/script/$i examples/scripts/ -done -# configuration files -%if %{ul_version} >= 1 - SUFFIX="UnitedLinux" -%else - SUFFIX="SuSE" -%endif -cat smb.conf.vendor | egrep -v '(^$$|^#)' > smb.conf -mv smb.conf.vendor examples/smb.conf.${SUFFIX} -install -m 644 smb.conf* $RPM_BUILD_ROOT/etc/samba/ -install -m 644 lmhosts $RPM_BUILD_ROOT/etc/samba/ -install -m 644 smbusers $RPM_BUILD_ROOT/etc/samba/ -install -m 600 smbpasswd -o root -g root $RPM_BUILD_ROOT/etc/samba/ -install -m 600 smbfstab -o root -g root $RPM_BUILD_ROOT/etc/samba/ -# pam -install -m 644 samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba -# sambamount -ln -sf /usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs -#cifsmount -%if %{make_cifsvfs} -install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin -%endif -# start scripts -install rc.smb $RPM_BUILD_ROOT/etc/init.d/smb -ln -sf ../../etc/init.d/smb $RPM_BUILD_ROOT/usr/sbin/rcsmb -install rc.nmb $RPM_BUILD_ROOT/etc/init.d/nmb -ln -sf ../../etc/init.d/nmb $RPM_BUILD_ROOT/usr/sbin/rcnmb -install rc.smbfs $RPM_BUILD_ROOT/etc/init.d/smbfs -ln -sf ../../etc/init.d/smbfs $RPM_BUILD_ROOT/usr/sbin/rcsmbfs -install rc.winbind $RPM_BUILD_ROOT/etc/init.d/winbind -ln -sf ../../etc/init.d/winbind $RPM_BUILD_ROOT/usr/sbin/rcwinbind -%if %{make_wrepld} -install rc.wrepl $RPM_BUILD_ROOT/etc/init.d/wrepl -ln -sf ../../etc/init.d/wrepl $RPM_BUILD_ROOT/usr/sbin/rcwrepl -cp -a source/bin/wrepld $RPM_BUILD_ROOT/usr/sbin/ -%endif -# libnss_wins.so -cp source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so.2 -ln -sf /lib/libnss_wins.so.2 $RPM_BUILD_ROOT/lib/libnss_wins.so -# winbind stuff -cp -a source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/lib/security/ -cp -a source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/lib/libnss_winbind.so.2 -cp -a source/bin/winbindd $RPM_BUILD_ROOT/usr/sbin/ -ln -s /lib/libnss_winbind.so.2 $RPM_BUILD_ROOT/lib/libnss_winbind.so -# pam_smbpass -cp -a source/bin/pam_smbpass.so $RPM_BUILD_ROOT/lib/security/ -# smbfilter -cp -a source/bin/smbfilter $RPM_BUILD_ROOT/usr/bin/ -# editreg -cp -a source/bin/editreg $RPM_BUILD_ROOT/usr/bin/ -# install libsmbclient -install -m0755 source/bin/libsmbclient.a $RPM_BUILD_ROOT/%{_libdir} -install -m0755 source/bin/libsmbclient.so $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so.0 -ln -s /usr/lib/libsmbclient.so.0 $RPM_BUILD_ROOT/%{_libdir}/libsmbclient.so -install -m0644 source/include/libsmbclient.h $RPM_BUILD_ROOT/%{_includedir} -# install nsswitch-headers (for squid, etc.) -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/samba/nsswitch -cp source/nsswitch/*.h $RPM_BUILD_ROOT/%{_includedir}/samba/nsswitch/ -# install smbtorture and other test-programs -install -m0755 source/bin/smbtorture $RPM_BUILD_ROOT/usr/bin/ -install -m0755 source/bin/talloctort $RPM_BUILD_ROOT/usr/bin/ -install -m0755 source/bin/{msgtest,masktest,locktest*} $RPM_BUILD_ROOT/usr/bin/ -install -m0755 source/bin/{vfstest,nsstest} $RPM_BUILD_ROOT/usr/bin/ -# install tdb tools -install -m0755 source/tdb/{tdbdump,tdbtest,tdbtool,tdbtorture} $RPM_BUILD_ROOT/usr/bin/ -# install VFS-modules -install -m0755 examples/VFS/*.so $RPM_BUILD_ROOT/%{_libdir}/samba/vfs/ -# install PDB-modules -install -m0755 examples/pdb/pdb_test.so $RPM_BUILD_ROOT/%{_libdir}/samba/pdb/ -%if %{make_vscan} -# install VSCAN-vfs-modules -install -m0755 examples/VFS/samba-vscan-%{vscan_ver}/*/*.so $RPM_BUILD_ROOT/%{_libdir}/samba/vscan/ -%endif -# make examples clean -VFS="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/VFS" -VSCAN="$VFS/samba-vscan-%{vscan_ver}" -PDB="$RPM_BUILD_DIR/%{name}-%{samba_ver}/examples/pdb" -dirs="$PDB $SAM $VFS" -(for i in $dirs; do make -C $i clean; done) -%if %{make_vscan} -(for i in %{vscan_modules}; do make -C $VSCAN/$i clean; done) -%endif -# install python -%if %{make_python} -cp -a source/build/lib.*/samba $RPM_BUILD_ROOT/usr/lib/%{python_ver}/lib-dynload/ -find source/python -name CVS -print | xargs rm -rf -find source/python -name ".cvsignore" -print | xargs rm -rf -%endif -# whats this ? -install -m0755 source/bin/debug2html $RPM_BUILD_ROOT/usr/bin/ -# install smbwrapper -%if %{make_smbwrap} -install -m0755 source/bin/smbwrapper.so $RPM_BUILD_ROOT/%{_libdir}/samba/ -install -m0755 source/bin/smbsh $RPM_BUILD_ROOT/usr/bin/ -%endif -############## -# cleanup docs -############## -#chmod 644 `find docs examples -type f` -#chmod 755 `find docs examples -type d` -#find . -name CVS -print | xargs rm -rf -#find . -name ".cvsignore" -print | xargs rm -rf -mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt $RPM_BUILD_ROOT/%{DOCDIR}/ -cp source/msdfs/README $RPM_BUILD_ROOT/%{DOCDIR}/README.msdfs -cp source/smbwrapper/README $RPM_BUILD_ROOT/%{DOCDIR}/README.smbwrapper -%if %{ul_version} >= 1 - SUFFIX="UnitedLinux" -%else - SUFFIX="SuSE" -%endif -cp README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.${SUFFIX} -# pam_smbpass is missing -cp -a source/pam_smbpass/samples examples/pam_smbpass/ -cp -a source/pam_smbpass/{CHANGELOG,INSTALL,README,TODO} examples/pam_smbpass/ -# prepare docbook package -cp -a docs/docbook/* $RPM_BUILD_ROOT/%{DOCBOOKDIR} -#make -C $RPM_BUILD_ROOT/%{DOCBOOKDIR} clean -rm -rf $RPM_BUILD_ROOT/%{DOCBOOKDIR}/autom4te.cache -rm -rf $RPM_BUILD_ROOT/%{DOCBOOKDIR}/config.* -# this is empty -rm -rf docs/yodldocs -rm -rf examples/VFS/samba-vscan-%{vscan_ver} -# zip manpages at least -gzip -f docs/manpages/*.[1-9] -cp -a docs/* $RPM_BUILD_ROOT/%{DOCDIR} -cp -a examples/ $RPM_BUILD_ROOT/%{DOCDIR} -# save space... -rm -r $RPM_BUILD_ROOT/%{SWATDIR}/using_samba -ln -s %{DOCDIR}/htmldocs/using_samba $RPM_BUILD_ROOT/%{SWATDIR} -# hm... -cp $RPM_BUILD_ROOT/%{SWATDIR}/help/welcome.html $RPM_BUILD_ROOT/%{DOCDIR}/htmldocs/ -rm -r $RPM_BUILD_ROOT/%{SWATDIR}/help -ln -s %{DOCDIR}/htmldocs $RPM_BUILD_ROOT/%{SWATDIR}/help -# remove cvs -find $RPM_BUILD_ROOT/%{DOCDIR} -name CVS -print | xargs rm -rf -find $RPM_BUILD_ROOT/%{DOCDIR} -name ".cvsignore" -print | xargs rm -rf -# finally build a file-list -for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do - # exclude %{DOCDIR} and docbook - case "${file#${RPM_BUILD_ROOT}}" in - %{DOCDIR}|%{DOCDIR}/docbook) continue ;; - esac - echo "%doc ${file#${RPM_BUILD_ROOT}}" >> ${RPM_BUILD_DIR}/%{name}-%{samba_ver}/filelist-doc -done - -%post -%{fillup_and_insserv smb} -mkdir -p $RPM_BUILD_ROOT/var/adm/notify/messages -cat << EOF > var/adm/notify/messages/samba-notify -Achtung! -This is %{name}-%{samba_ver}. Please do not run on production systems. -You have been warned. -EOF - -%post client -%{fillup_and_insserv -fpy smbfs} -%{fillup_only -ans samba client} - -%post winbind -%{fillup_and_insserv winbind} - -%postun -%{insserv_cleanup} - -%postun client -%{insserv_cleanup} - -%postun winbind -%{insserv_cleanup} - -%clean -#make -C source realclean - -%files -#/usr/bin/addtosmbpass -#/usr/bin/convert_smbpasswd -%dir /etc/samba -%dir /usr/lib/samba -%config /etc/init.d/nmb -%config /etc/init.d/smb -%config /etc/pam.d/samba -%config(noreplace) /etc/samba/smbpasswd -%config(noreplace) /etc/samba/smbusers -%doc %{_mandir}/man1/smbcontrol.1.gz -%doc %{_mandir}/man1/smbstatus.1.gz -%doc %{_mandir}/man1/testparm.1.gz -%doc %{_mandir}/man1/testprns.1.gz -%doc %{_mandir}/man5/smbpasswd.5.gz -%doc %{_mandir}/man7/samba.7.gz -%doc %{_mandir}/man8/nmbd.8.gz -%doc %{_mandir}/man8/pdbedit.8.gz -%doc %{_mandir}/man8/smbd.8.gz -%doc %{_mandir}/man8/smbpasswd.8.gz -%doc %{_mandir}/man8/swat.8.gz -%doc %{_mandir}/man8/tdbbackup.8.gz -%{_includedir}/samba -/lib/security/pam_smbpass.so -/usr/bin/pdbedit -/usr/bin/smbcontrol -/usr/bin/smbpasswd -/usr/bin/smbstatus -/usr/bin/tdbbackup -/usr/bin/tdbdump -/usr/bin/tdbtest -/usr/bin/tdbtool -/usr/bin/testparm -/usr/bin/testprns -/usr/lib/samba/rpc -/usr/lib/samba/vfs -/usr/sbin/nmbd -/usr/sbin/rcnmb -/usr/sbin/rcsmb -/usr/sbin/smbd -/usr/sbin/swat -/usr/share/samba -/var/lib/samba -/var/log/samba -/var/run/samba -/var/spool/samba - -%files client -%config /etc/init.d/smbfs -%config(noreplace) /etc/samba/lmhosts -%config(noreplace) /etc/samba/smb.conf -%config(noreplace) /etc/samba/smbfstab -%dir /etc/samba -%dir /usr/lib/samba -%doc %{_mandir}/man1/editreg.1.gz -%doc %{_mandir}/man1/findsmb.1.gz -%doc %{_mandir}/man1/nmblookup.1.gz -%doc %{_mandir}/man1/profiles.1.gz -%doc %{_mandir}/man1/rpcclient.1.gz -%doc %{_mandir}/man1/smbcacls.1.gz -%doc %{_mandir}/man1/smbclient.1.gz -%doc %{_mandir}/man1/smbcquotas.1.gz -%doc %{_mandir}/man1/smbtar.1.gz -%doc %{_mandir}/man1/smbtree.1.gz -%doc %{_mandir}/man5/lmhosts.5.gz -%doc %{_mandir}/man5/smb.conf.5.gz -%doc %{_mandir}/man7/Samba.7.gz -%doc %{_mandir}/man8/net.8.gz -%doc %{_mandir}/man8/smbmnt.8.gz -%doc %{_mandir}/man8/smbmount.8.gz -%doc %{_mandir}/man8/smbspool.8.gz -%doc %{_mandir}/man8/smbumount.8.gz -/sbin/mount.smbfs -/usr/bin/editreg -/usr/bin/findsmb -/usr/bin/net -/usr/bin/nmblookup -/usr/bin/profiles -/usr/bin/rpcclient -/usr/bin/smbcacls -/usr/bin/smbclient -/usr/bin/smbcquotas -/usr/bin/smbfilter -/usr/bin/smbmnt -/usr/bin/smbmount -/usr/bin/smbspool -/usr/bin/smbtar -/usr/bin/smbtree -/usr/bin/smbumount -/usr/lib/samba/lowcase.dat -/usr/lib/samba/upcase.dat -/usr/lib/samba/valid.dat -/usr/sbin/rcsmbfs -%if %{make_smbwrap} -/usr/bin/smbsh -%doc %{_mandir}/man1/smbsh.1.gz -/usr/lib/samba/smbwrapper.so -%endif - -%files winbind -%config /etc/init.d/winbind -%config(noreplace) /etc/samba/smb.conf -%dir /etc/samba -%doc %{_mandir}/man1/wbinfo.1.gz -%doc %{_mandir}/man8/winbindd.8.gz -%doc %{_mandir}/man1/ntlm_auth.1.gz -/lib/libnss_winbind.so* -/lib/libnss_wins.so* -/lib/security/pam_winbind.so -/usr/bin/ntlm_auth -/usr/bin/wbinfo -/usr/sbin/rcwinbind -/usr/sbin/winbindd - -%files utils -%doc %{_mandir}/man1/vfstest.1.gz -/usr/bin/debug2html -/usr/bin/locktest -/usr/bin/locktest2 -/usr/bin/masktest -/usr/bin/msgtest -/usr/bin/nsstest -/usr/bin/smbtorture -/usr/bin/talloctort -/usr/bin/tdbtorture -/usr/bin/vfstest - -%files doc -f filelist-doc -%dir /usr/share/doc/packages/samba3 - -%files docbook -%docdir %{DOCBOOKDIR} -%{DOCBOOKDIR} -%dir /usr/share/doc/packages/samba3 - -%files pdb -/usr/lib/samba/pdb -%doc examples/pdb/{Makefile,README,pdb_test.c} -%doc examples/pdb/{mysql/mysql.dump,mysql/smb.conf} -%if %{make_cifsvfs} - -%files cifsmount -/sbin/mount.cifs -%endif -%if %{make_wrepld} - -%files wrepld -%config /etc/init.d/wrepl -/usr/sbin/rcwrepl -/usr/sbin/wrepld -%endif -%if %{make_vscan} - -%files vscan -/usr/lib/samba/vscan -%doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,NEWS,README,TODO} -%endif -%if %{make_python} - -%files python -%doc source/python/README -%doc source/python/examples -%doc source/python/gprinterdata -%doc source/python/gtdbtool -%doc source/python/gtkdictbrowser.py -/usr/lib/%{python_ver}/lib-dynload/samba -%endif - -%files -n libsmbclient -%{_libdir}/libsmbclient.so.* - -%files -n libsmbclient-devel -%{_includedir}/libsmbclient.h -%{_libdir}/libsmbclient.a -%{_libdir}/libsmbclient.so - -%description -samba3 - - -%description client -samba3-client - - -%description winbind -samba3-winbind - - -%description utils -samba3-utils - - -%description doc -samba3-doc - - -%description docbook -samba3-docbook - - -%description pdb -samba3-pdb - -%if %{make_cifsvfs} - -%description cifsmount -samba3-cifsmount - -%endif -%if %{make_vscan} - -%description vscan -samba3-vscan - -%endif -%if %{make_python} - -%description python -samba3-python - -%endif -%if %{make_wrepld} - -%description wrepld -samba3-wrepld - -%endif - -%description -n libsmbclient -This package includes the libsmbclient library. - -Authors: --------- - The Samba Team - - -%description -n libsmbclient-devel -This package contains static libraries and header files needed to develop -programs which make use of the smbclient programming interface. - -Authors: --------- - The Samba Team - - -- cgit From bc4ed38c03fb0da0b745ee56e8ee7022798cfe26 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 4 Feb 2005 14:38:12 +0000 Subject: r5228: Fix typo, mention officially supported samba3/SLES8 packages on ftp.sernet.de. Volker (This used to be commit 563ec791c660cbcc6ca0e8d7a9b1f87fc78a1c1c) --- packaging/SuSE/README | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/README b/packaging/SuSE/README index 7691d4c8a4..8c3663e762 100644 --- a/packaging/SuSE/README +++ b/packaging/SuSE/README @@ -1,12 +1,15 @@ ### SuSE readme begin Dear SuSE user, -prebuild Samba RPMs for all SuSE Linux versions are available at: +prebuilt Samba RPMs for all SuSE Linux versions are available at: ftp://ftp.SuSE.com/pub/projects/samba/ The same package are also available at: http://download.Samba.org/samba/ftp/Binary_Packages/SuSE/ +Samba 3 is not supported by SuSE on SuSE Linux Enterprise Server 8. You find +SerNet-supported packages on http://ftp.sernet.de/pub/samba/ + If you encounter any problem with these packages please don't blame the Samba Team. Instead file a bug at https://bugzilla.Samba.org/ pick product Samba 3.0, then select 'component' Packaging and set 'assign to' -- cgit From 150b30a669b6d6b56a41a82999d3a34b6427560c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 4 Feb 2005 17:46:30 +0000 Subject: r5233: fixing some typos (This used to be commit b58b1ada29a0cac55e5bc91b3ad4cc39808c2e3b) --- packaging/SuSE/README | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'packaging/SuSE') diff --git a/packaging/SuSE/README b/packaging/SuSE/README index 8c3663e762..e2100ef60c 100644 --- a/packaging/SuSE/README +++ b/packaging/SuSE/README @@ -1,4 +1,3 @@ -### SuSE readme begin Dear SuSE user, prebuilt Samba RPMs for all SuSE Linux versions are available at: @@ -13,8 +12,7 @@ SerNet-supported packages on http://ftp.sernet.de/pub/samba/ If you encounter any problem with these packages please don't blame the Samba Team. Instead file a bug at https://bugzilla.Samba.org/ pick product Samba 3.0, then select 'component' Packaging and set 'assign to' -to . Have a lot of fun... -### SuSE readme end -- cgit