From c000da928ddab3c137151830516c70d3771eaacd Mon Sep 17 00:00:00 2001 From: Alexander Khryukin Date: Tue, 30 Oct 2012 15:41:49 +0400 Subject: [PATCH] version update 3.6.9, mageia spec merge with our policy --- .abf.yml | 9 +- README.samba-mandrake-rpm | 4 - ...ng.patch => samba-3.0-rosa-packaging.patch | 64 +- samba-3.0.30-fix-recursive-ac-macro.patch | 14 - samba-3.5.14.tar.asc | 7 - samba-3.6.9.tar.asc | 7 + samba-print-pdf.sh | 111 ++ samba.spec | 1345 ++++------------- smb-migrate | 197 +++ smb.conf | 17 +- smb.init | 1 + swat_16.png | Bin 0 -> 918 bytes swat_32.png | Bin 0 -> 2484 bytes swat_48.png | Bin 0 -> 4724 bytes winbind.init | 5 +- 15 files changed, 614 insertions(+), 1167 deletions(-) delete mode 100644 README.samba-mandrake-rpm rename samba-3.0-mandriva-packaging.patch => samba-3.0-rosa-packaging.patch (96%) delete mode 100644 samba-3.0.30-fix-recursive-ac-macro.patch delete mode 100644 samba-3.5.14.tar.asc create mode 100644 samba-3.6.9.tar.asc create mode 100644 samba-print-pdf.sh create mode 100644 smb-migrate create mode 100644 swat_16.png create mode 100644 swat_32.png create mode 100644 swat_48.png diff --git a/.abf.yml b/.abf.yml index 3e3b25f..32a82ce 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,8 +1,3 @@ sources: - "samba-3.5.14.tar.gz": 2dbcfb7e35c6e4169f6a74019d28813563c3fd21 - "samba-print-pdf.sh.bz2": 2be00043c467032fc381b2a9ba4aeedecfafa6e5 - "samba-vscan-0.3.6c-beta5.tar.gz": 9e1b37225246ff2f19e37aceb97a680afc82cdda - "smb-migrate.bz2": 93db82036fdb8657f7270da11a3f3375be069c1a - "swat_16.png.bz2": c3f02d2504d2f6f38121889f5ec80b5c0c5f2333 - "swat_32.png.bz2": 755b993752d0c040500e786b6863d2febe55b3f2 - "swat_48.png.bz2": aae908642e9294d606e7c2e8a38585efc89da678 + "samba-3.6.9.tar.gz": 004b5eba346f18961cf02a0b3471bba02d36ee7d + "samba-virusfilter-0.1.3.tar.bz2": 80064106ec56c2ae6f58022823bff9975b69bc5c diff --git a/README.samba-mandrake-rpm b/README.samba-mandrake-rpm deleted file mode 100644 index 6f37c4f..0000000 --- a/README.samba-mandrake-rpm +++ /dev/null @@ -1,4 +0,0 @@ -This rpm was built with default options - -samba-3.5.9-1 - diff --git a/samba-3.0-mandriva-packaging.patch b/samba-3.0-rosa-packaging.patch similarity index 96% rename from samba-3.0-mandriva-packaging.patch rename to samba-3.0-rosa-packaging.patch index 1a4ca7b..c1d01bd 100644 --- a/samba-3.0-mandriva-packaging.patch +++ b/samba-3.0-rosa-packaging.patch @@ -1,5 +1,5 @@ ---- samba-3.0.23/packaging/Mandrake/findsmb.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/findsmb 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/findsmb.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/findsmb 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,141 @@ +#!/usr/bin/perl +# @@ -142,8 +142,8 @@ + } +} + ---- samba-3.0.23/packaging/Mandrake/samba.log.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/samba.log 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/samba.log.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/samba.log 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,15 @@ +/var/log/samba/log.nmb { + notifempty @@ -160,16 +160,16 @@ + /usr/bin/killall -HUP smbd + endscript +} ---- samba-3.0.23/packaging/Mandrake/samba.pamd.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/samba.pamd 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/samba.pamd.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/samba.pamd 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required /lib/security/pam_nologin.so +auth required /lib/security/pam_stack.so service=system-auth +account required /lib/security/pam_stack.so service=system-auth +session required /lib/security/pam_stack.so service=system-auth ---- samba-3.0.23/packaging/Mandrake/samba.xinetd.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/samba.xinetd 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/samba.xinetd.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/samba.xinetd 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,15 @@ +# default: on +# description: SWAT is the Samba Web Admin Tool. Use swat \ @@ -186,8 +186,8 @@ + log_on_failure += USERID + disable = no +} ---- samba-3.0.23/packaging/Mandrake/smb.conf.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/smb.conf 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/smb.conf.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/smb.conf 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,533 @@ + +# This is the main Samba configuration file. You should read the @@ -208,7 +208,7 @@ + +# 1. Server Naming Options: +# workgroup = NT-Domain-Name or Workgroup-Name -+ workgroup = MDKGROUP ++ workgroup = MGAGROUP + +# netbios name is the name you will see in "Network Neighbourhood", +# but defaults to your hostname @@ -722,8 +722,8 @@ +; printable = no +; create mask = 0765 + ---- samba-3.0.23/packaging/Mandrake/smbprint.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/smbprint 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/smbprint.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/smbprint 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,77 @@ +#!/bin/sh + @@ -802,14 +802,14 @@ + echo "print -" + cat +) | /usr/bin/smbclient "//$server/$service" $password -U $server -N >> $logfile ---- samba-3.0.23/packaging/Mandrake/smbusers.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/smbusers 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/smbusers.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/smbusers 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,3 @@ +# Unix_name = SMB_name1 SMB_name2 ... +root = administrator admin +nobody = guest pcguest smbguest ---- samba-3.0.23/packaging/Mandrake/smb-winbind.conf.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/smb-winbind.conf 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/smb-winbind.conf.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/smb-winbind.conf 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,539 @@ + +# This is the main Samba configuration file. You should read the @@ -830,7 +830,7 @@ + +# 1. Server Naming Options: +# workgroup = NT-Domain-Name or Workgroup-Name -+ workgroup = MDKGROUP ++ workgroup = MGAGROUP + +# netbios name is the name you will see in "Network Neighbourhood", +# but defaults to your hostname @@ -1350,8 +1350,8 @@ +; printable = no +; create mask = 0765 + ---- samba-3.0.23/packaging/Mandrake/system-auth-winbind.pamd.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/system-auth-winbind.pamd 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/system-auth-winbind.pamd.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/system-auth-winbind.pamd 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,17 @@ +#%PAM-1.0 + @@ -1370,8 +1370,8 @@ +session required /lib/security/pam_mkhomedir.so skel=/etc/skel/ umask=0022 +session required /lib/security/pam_limits.so +session required /lib/security/pam_unix.so ---- samba-3.0.23/packaging/Mandrake/winbind.init.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/winbind.init 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/winbind.init.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/winbind.init 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,93 @@ +#!/bin/sh +# @@ -1437,7 +1437,7 @@ + echo + return $RETVAL +} -+mdkstatus() { ++mdvstatus() { + status winbindd +} + @@ -1455,7 +1455,7 @@ + reload + ;; + status) -+ mdkstatus ++ mdvstatus + ;; + condrestart) + [ -f /var/lock/subsys/winbindd ] && restart || : @@ -1466,8 +1466,8 @@ +esac + +exit $? ---- samba-3.0.23/packaging/Mandrake/wrepld.init.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/wrepld.init 2006-07-11 13:28:27.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/wrepld.init.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/wrepld.init 2006-07-11 13:28:27.000000000 +0200 @@ -0,0 +1,93 @@ +#!/bin/sh +# @@ -1533,7 +1533,7 @@ + echo + return $RETVAL +} -+mdkstatus() { ++mdvstatus() { + status wrepld +} + @@ -1551,7 +1551,7 @@ + reload + ;; + status) -+ mdkstatus ++ mdvstatus + ;; + condrestart) + [ -f /var/lock/subsys/wrepld ] && restart || : @@ -1562,8 +1562,8 @@ +esac + +exit $? ---- samba-3.0.23/packaging/Mandrake/smb.init.mdk 2006-07-11 13:28:27.000000000 +0200 -+++ samba-3.0.23/packaging/Mandrake/smb.init 2006-07-11 13:31:22.000000000 +0200 +--- samba-3.0.23/packaging/Rosa/smb.init.mdv 2006-07-11 13:28:27.000000000 +0200 ++++ samba-3.0.23/packaging/Rosa/smb.init 2006-07-11 13:31:22.000000000 +0200 @@ -0,0 +1,95 @@ +#!/bin/sh +# @@ -1630,7 +1630,7 @@ + echo + return $RETVAL +} -+mdkstatus() { ++mdvstatus() { + status smbd + status nmbd +} @@ -1649,7 +1649,7 @@ + reload + ;; + status) -+ mdkstatus ++ mdvstatus + ;; + condrestart) + [ -f /var/lock/subsys/smb ] && restart || : diff --git a/samba-3.0.30-fix-recursive-ac-macro.patch b/samba-3.0.30-fix-recursive-ac-macro.patch deleted file mode 100644 index c26549a..0000000 --- a/samba-3.0.30-fix-recursive-ac-macro.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -p -up samba-3.0.30/source/lib/replace/autoconf-2.60.m4~ samba-3.0.30/source/lib/replace/autoconf-2.60.m4 ---- samba-3.0.30/lib/replace/autoconf-2.60.m4~ 2008-05-28 14:41:11.000000000 +0200 -+++ samba-3.0.30/lib/replace/autoconf-2.60.m4 2008-06-03 21:33:20.000000000 +0200 -@@ -185,8 +185,8 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], - AC_BEFORE([$0], [AC_RUN_IFELSE]) - - AC_REQUIRE([AC_GNU_SOURCE]) -- AC_REQUIRE([AC_AIX]) -- AC_REQUIRE([AC_MINIX]) -+ dnl AC_REQUIRE([AC_AIX]) -+ dnl AC_REQUIRE([AC_MINIX]) - - AH_VERBATIM([__EXTENSIONS__], - [/* Enable extensions on Solaris. */ diff --git a/samba-3.5.14.tar.asc b/samba-3.5.14.tar.asc deleted file mode 100644 index da52122..0000000 --- a/samba-3.5.14.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iD8DBQBPgEj6bzORW2Vot+oRAgMHAKDCBlhME9DNzB2ILcUWZDW2KEtPTgCePljc -qNfFH9yWOYdO+IHYpy8CGx4= -=lO2y ------END PGP SIGNATURE----- diff --git a/samba-3.6.9.tar.asc b/samba-3.6.9.tar.asc new file mode 100644 index 0000000..c67d972 --- /dev/null +++ b/samba-3.6.9.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iD8DBQBQjj57bzORW2Vot+oRAkz1AKCevaDdt2j5VgtHQZO8O4JNHbs+sACfdQhy +XQLkp26HPaLSq+GStSL057A= +=rMtp +-----END PGP SIGNATURE----- diff --git a/samba-print-pdf.sh b/samba-print-pdf.sh new file mode 100644 index 0000000..973bb4f --- /dev/null +++ b/samba-print-pdf.sh @@ -0,0 +1,111 @@ +#!/bin/bash +# samba-print-pdf +# This is a script which allows you to set up a virtual printer on samba +# which will take the file (generated by a postscript filter on windows) +# and turn it into a PDF, informing the user of where it is when it +# is done +# +# (c) Buchan Milne 2002 +# License: GPLv2 +# Changelog +# v0.0.6 20030428 +# - Allow options passed as env. variables from print command +# - Inline and simplify sed (use tr) clean script +# - Ensure file arrives in PREFIX even if TEMP is used without provided name +# - Changes from Joshua M. Schmidlkofer 20030425 +# - Debugging, adjustments, and corrections. +# - Stupid sed sanitizing script. [probably horribly inefficient also]. +# - Temp file usage cleanup. +# v0.0.5 20020723 +# - Add support for preset settings +# - Allow passing of filename provided by client as final filename +# +# Arguments: +# $1 = file (usually passed with %s from samba) +# $2 = unix prefix to where to place the file (~%u should work) +# $3 = windows prefix to the same location (//%L/%u should work) +# $4 = user/computer to send a notification to (%u or %m) +# $5 = IP address of client (%I) +# $6 = Name of destination file without extension (%J) +# $7 = PDF setting (prepress,print,screen etc) +# +# If you want to customise any of the following configuration defaults, +# you can place them in the file /etc/samba/print-pdf.conf. +# If you need to modify anything in this script, please provide me with your +# changes, preferably in such a way that the changes are configurable. + +PS2PDF=ps2pdf13 +OPTIONS="-dAutoFilterColorImages=false -sColorImageFilter=FlateEncode" +#Values taken from arguments: +INPUT=$1 +PREFIX="$2" +WINBASE=$(echo "$3"|sed -e 's,/,\\\\,g') +#NAME=`echo "$6"|sed -e 's/[&/:{}\\\[<>$#@*^!?=|]/-/g;s/\]/-/g'` +NAME=`echo "$6"|tr '[:punct:]' '[-*]'` + +# Source config file if it exists: +CONFFILE=/etc/samba/print-pdf.conf +[ -e $CONFFILE ] && . $CONFFILE + +#Values not taken as arguments, could be set via env. vars (?) or config file +KEEP_PS=${KEEP_PS=0} +PERMS=${PERMS=640} +BASEFILE=${BASEFILE=pdf-service} +TEMP="${TEMP=$2}" +UMASK=${UMASK=006} + +#Make sure that destination directory exists +mkdir -p "$PREFIX" + +INFILE=$(basename $INPUT) + +umask $UMASK + +[ -n "$NAME" ] && TEMP="$PREFIX" + +#make a temp file to use for the output of the PDF +OUTPUT=`mktemp -q $TEMP/$BASEFILE-XXXXXX` +if [ $? -ne 0 ]; then + echo "$0: Can't create temp file $TEMP/$OUTPUT, exiting..." + exit 1 +fi +if [ -n "$NAME" ]; then + FINALOUTPUT="$PREFIX/$NAME" +else + FINALOUTPUT="$OUTPUT" +fi +if [ -n "$7" ]; then + OPTIONS="$OPTIONS -dPDFSETTINGS=/${7#pdf-}" +else + OPTIONS="$OPTIONS -dPDFSETTINGS=/default" +fi + +WIN_OUTPUT="$WINBASE\\"`basename "$FINALOUTPUT"` +#mv "$INPUT" "$INPUT.ps";INPUT="$INPUT.ps" + +# create the pdf +$PS2PDF $OPTIONS "$INPUT" "$OUTPUT.pdf" >/dev/null 2>&1 +mv -f "${OUTPUT}.pdf" "${FINALOUTPUT}".pdf + +# Generate a message to send to the user, and deal with the original file: +MESSAGE=$(echo "Your PDF file has been created as $WIN_OUTPUT.pdf\n") + + +# Cleanup +if [ $KEEP_PS != 0 ];then + mv -f $INPUT "${FINALOUTPUT}".ps + MESSAGE=$(echo "$MESSAGE and your postscript file as $WIN_OUTPUT.ps") + # Fix permissions on the generated files + chmod $PERMS "${FINALOUTPUT}".ps "${FINALOUTPUT}".pdf +else + rm -f $INPUT + # Fix permissions on the generated files + chmod $PERMS "${FINALOUTPUT}".pdf +fi + +#Remove empty file from mktemp: +rm -f $OUTPUT + +# Send notification to user +echo -e $MESSAGE|smbclient -M $4 -I $5 -U "PDF Generator" >/dev/null 2>&1 + diff --git a/samba.spec b/samba.spec index af6db82..930662a 100644 --- a/samba.spec +++ b/samba.spec @@ -1,17 +1,24 @@ %define pkg_name samba -%define version 3.5.14 -%define rel 4 +%define version 3.6.9 +%define rel 1 #define subrel 1 -%define vscanver 0.3.6c-beta5 +%define vscanver 0.1.3 %define libsmbmajor 0 %define netapimajor 0 %define smbsharemodesmajor 0 %define tallocmajor 1 %define tdbmajor 1 %define wbclientmajor 0 + +%define check_sig() export GNUPGHOME=%{_tmppath}/rpm-gpghome \ +if [ -d "$GNUPGHOME" ] \ +then echo "Error, GNUPGHOME $GNUPGHOME exists, remove it and try again"; exit 1 \ +fi \ +install -d -m700 $GNUPGHOME \ +gpg --import %{1} \ +gpg --trust-model always --verify %{2} %{?3} \ +rm -Rf $GNUPGHOME \ -# temporary fix (can't find %{_mandir}/man8/cifs.upcall*.8* on 32-bit) -# %define _unpackaged_files_terminate_build 0 # Samba has started using -Wl,z,nodefs upstream, without libtool (after patch # submission to them, handled in samba bug 6792. To allow @@ -20,20 +27,11 @@ # or, instead, filter them out of the right line in the Makefile, like before # see LDSHFLAGS_MODULES below -# CS3 is based on mdk10.0 and whoever told maintainers %mdkversion would be -# monotonic lied -%if %mdkversion == 300 -%define mdkversion 1000 -%define distversion C30 -%endif - -%{?!mdkversion: %define mdkversion %(perl -pe '/(\d+)\.(\d)\.?(\d)?/; $_="$1$2".($3||0)' /etc/mandrake-release)} -%{!?mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*\\D\+)?(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}} -%{?!mkver:%define mkver(r:) %{-r:%(perl -e '$_="%{1}";m/(((\\d\\.?)+)(\\w\*))(.\*)/;$pre=$4;print "0.$pre." if $pre =~ /\\w\{2,\}/;print "%{-r*}"')}%{!-r:%(perl -e '$_="%{1}";m/(((\\d\\.?)+)(\\w\*))(.\*)/;$pre=$4;print "$2";print $pre if $pre !~ /\\w{2,}/')}} - %{!?lib: %global lib lib} %{!?mklibname: %global mklibname(ds) %lib%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}} +%{?!mdkversion:%global mdkversion(r:) %{-r:%(perl -e '$_="%{1}";m/(((\\d\\.?)+)(\\w\*))(.\*)/;$pre=$4;print "0.$pre." if $pre =~ /\\w\{2,\}/;print "%{-r*}"')}%{!-r:%(perl -e '$_="%{1}";m/(((\\d\\.?)+)(\\w\*))(.\*)/;$pre=$4;print "$2";print $pre if $pre !~ /\\w{2,}/')}} + %define libname %mklibname smbclient %libsmbmajor %define libnetapi %mklibname netapi %netapimajor %define netapidevel %mklibname -d netapi @@ -63,35 +61,27 @@ %define source_ver %{version} %endif -%define prerel %mkver -r %rel %source_ver -%define real_version %mkver %source_ver +%define prerel %mdkversion -r %rel %source_ver +%define real_version %mdkversion %source_ver %define release %mkrel %prerel %define have_pre %([ "%version" == "%source_ver" ]; echo $?) # Check to see if we are running a build from a tarball release from samba.org # (%have_pversion) If so, disable vscan, unless explicitly requested # (--with vscan). -#FIXME -%define build_vscan 0 +%define build_vscan 1 %if %have_pversion %define build_vscan 0 %{?_with_vscan: %define build_vscan 1} %endif -# We now do detection of the Mandrake release we are building on: -%define build_mdk82 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.2 ];then echo 1; else echo 0; fi) -%define build_mdk81 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.1 ];then echo 1; else echo 0; fi) -%define build_mdk80 %(if [ `awk '{print $4}' /etc/mandrake-release` = 8.0 ];then echo 1; else echo 0; fi) -%define build_mdk72 %(if [ `awk '{print $4}' /etc/mandrake-release` = 7.2 ];then echo 1; else echo 0; fi) -%define build_non_default 0 - # Default options -%define build_talloc 1 -%define build_tdb 1 -%define build_ldb 1 -%define build_ctdb 1 -%define build_alternatives 0 -%define build_system 0 +%define build_talloc 0 +%define build_tdb 0 +%define build_ldb 0 +%define build_ctdb 0 +%define build_alternatives 1 +%define build_system 1 %define build_acl 1 %define build_winbind 1 %define build_wins 1 @@ -100,58 +90,12 @@ %define build_scanners 0 %define build_test 0 # CUPS supports functionality for 'printcap name = cups' (9.0 and later): -%define build_cupspc 0 +%define build_cupspc 1 # %_{pre,postun}_service are provided by rpm-helper in 9.0 and later %define have_rpmhelper 1 %define build_mysql 0 %define build_pgsql 0 -# Set defaults for each version -%if %mdkversion >= 200910 -%define build_talloc 0 -%define build_tdb 0 -%define build_ldb 0 -%endif - -%if %mdkversion >= 1000 -%define build_system 1 -%endif - -%if %mdkversion >= 920 -%define build_alternatives 1 -%endif - -%if %mdkversion >= 910 -%define build_cupspc 1 -%endif - -%if %build_mdk82 -%define have_rpmhelper 0 -%endif - -%if %build_mdk81 -%define build_winbind 0 -%define build_wins 0 -%define have_rpmhelper 0 -%endif - -%if %build_mdk80 -%define build_acl 0 -%define build_winbind 0 -%define build_wins 0 -%define build_ads 0 -%define have_rpmhelper 1 -%endif - -%if %build_mdk72 -%define build_acl 0 -%define build_winbind 0 -%define build_wins 0 -%define build_ads 0 -%define have_rpmhelper 1 -%endif - - # Allow commandline option overrides (borrowed from Vince's qmail srpm): # To use it, do rpm [-ba|--rebuild] --with 'xxx' # Check if the rpm was built with the defaults, otherwise we inform the user @@ -209,19 +153,19 @@ %if %build_vscan # These we build by default %global build_clamav 1 -%global build_icap 1 +%global build_icap 0 +%global build_fsav 1 +%global build_sophos 1 %endif %if %build_vscan && %build_scanners # These scanners are built if scanners are selected -# symantec requires their library present and must be selected +# symantec requires their library present and must be selected # individually %global build_fprot 1 -%global build_fsav 1 %global build_kaspersky 1 %global build_mks 1 %global build_nai 1 %global build_openav 1 -%global build_sophos 1 %global build_trend 1 %endif %if %build_vscan @@ -232,12 +176,12 @@ %{?_with_sophos: %{expand: %%global build_sophos 1}} #%{?_with_symantec: %{expand: %%global build_symantec 1}} %{?_with_trend: %{expand: %%global build_trend 1}} -%global vscandir samba-vscan-%{vscanver} +%global vscandir samba-virusfilter-%{vscanver} %endif %global vfsdir examples.bin/VFS #Standard texts for descriptions: -%define message_bugzilla() %(echo -e -n "Please file bug reports for this package at Mandriva bugzilla \\n(http://qa.mandriva.com) under the product name %{1}") +%define message_bugzilla() %(echo -e -n "Please file bug reports for this package at Rosa bugzilla \\n(http://bugs.rosalinux.ru) under the product name %{1}") %define message_system %(echo -e -n "NOTE: These packages of samba-%{version}, are provided, parallel installable\\nwith samba-2.2.x, to allow easy migration from samba-2.2.x to samba-%{version},\\nbut are not officially supported") #check gcc version to disable some optimisations on gcc-3.3.1 @@ -248,7 +192,7 @@ #Define sets of binaries that we can use in globs and loops: %global commonbin net,ntlm_auth,rpcclient,smbcacls,smbcquotas,smbpasswd,smbtree,testparm -%global serverbin pdbedit,profiles,smbcontrol,smbstatus,sharesec +%global serverbin pdbedit,profiles,smbcontrol,smbstatus,sharesec,smbta-util %if %build_ldb %global serverldbbin ldbadd,ldbdel,ldbedit,ldbmodify,ldbsearch,ldbrename %endif @@ -256,11 +200,6 @@ %global clientbin findsmb,nmblookup,smbclient,smbprint,smbspool,smbtar,smbget %global client_sbin mount.smb,mount.smbfs -%if %mdkversion >= 200800 -%global cifs_bin mount.cifs,umount.cifs,cifs.upcall -%else -%global cifs_bin mount.cifs,umount.cifs -%endif %global client_man man1/findsmb.1,man1/nmblookup.1,man1/smbclient.1,man1/smbget.1,man1/smbtar.1,man5/smbgetrc.5,man8/smbspool.8 %global testbin debug2html,smbtorture,msgtest,masktest,locktest,locktest2,nsstest,vfstest @@ -271,9 +210,6 @@ %define build_expsam xml%{?_with_pgsql:,pgsql}%{?_with_mysql:,mysql} %endif -#Workaround missing macros in 8.x: -%{!?perl_vendorlib: %{expand: %%global perl_vendorlib %{perl_sitearch}/../}} - # Determine whether this is the system samba or not. %if %build_system %define samba_major %{nil} @@ -290,29 +226,29 @@ Summary: Samba SMB server Name: %{pkg_name}%{samba_major} -Version: %{real_version} -Release: %{release} +Version: %{source_ver} +Release: %mkrel %rel License: GPLv3 Group: System/Servers -Source: http://www.samba.org/samba/ftp/stable/samba-%{source_ver}.tar.gz -Source99: http://www.samba.org/samba/ftp/stable/samba-%{source_ver}.tar.asc -Source98: http://www.samba.org/samba/ftp/samba-pubkey.asc +Source: http://ftp.samba.org/pub/samba/stable/samba-%{source_ver}.tar.gz +Source99: http://ftp.samba.org/pub/samba/stable/samba-%{source_ver}.tar.asc +Source98: http://ftp.samba.org/pub/samba/samba-pubkey.asc URL: http://www.samba.org Source1: samba.log Source3: samba.xinetd -Source4: swat_48.png.bz2 -Source5: swat_32.png.bz2 -Source6: swat_16.png.bz2 -Source7: README.%{name}-mandrake-rpm -Source8: samba-vscan-%{vscanver}.tar.gz +Source4: swat_48.png +Source5: swat_32.png +Source6: swat_16.png +Source7: README.%{name}-rosa-rpm +Source8: https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilter-%{vscanver}.tar.bz2 %if %build_vscan %endif -%if %build_vscan && %mdkversion >= 920 -BuildRequires: file-devel +%if %build_vscan +BuildRequires: magic-devel %endif -Source10: samba-print-pdf.sh.bz2 -Source11: smb-migrate.bz2 +Source10: samba-print-pdf.sh +Source11: smb-migrate #Sources that used to be in packaging patch: Source20: smbusers @@ -330,10 +266,9 @@ Source30: smb.conf %if !%have_pversion # Version specific patches: current version -Patch11: samba-3.0-mandriva-packaging.patch +Patch11: samba-3.0-rosa-packaging.patch # https://bugzilla.samba.org/show_bug.cgi?id=3571, bug 21387 Patch19: samba-3.0.21c-swat-fr-translaction.patch -Patch22: samba-3.0.30-fix-recursive-ac-macro.patch Patch30: samba-3.5-check-undefined-before-zdefs.patch Patch31: samba-3.5.3-fix-nss-wins-syslog.patch Patch33: samba-3.5.8-fix-netapi-examples-linking.patch @@ -345,7 +280,7 @@ Patch33: samba-3.5.8-fix-netapi-examples-linking.patch %if %have_pversion && %have_pre %endif Requires: pam >= 0.64, samba-common = %{version} -BuildRequires: pam-devel readline-devel pkgconfig(ncurses) popt-devel +BuildRequires: pam-devel readline-devel pkgconfig(ncurses) pkgconfig(popt) BuildRequires: libxml2-devel # Samba 3.2 and later should be built with capabilities support: # http://lists.samba.org/archive/samba/2009-March/146821.html @@ -355,7 +290,7 @@ BuildRequires: avahi-client-devel BuildRequires: libaio-devel BuildRequires: libuuid-devel %if %build_ctdb -BuildRequires: ctdb-devel > 1.0.77 +BuildRequires: pkgconfig(ctdb) %endif %if %build_pgsql BuildRequires: postgresql-devel @@ -368,18 +303,12 @@ BuildRequires: mysql-devel %if %build_acl BuildRequires: acl-devel %endif -%if %build_mdk72 -BuildRequires: cups-devel -%else BuildRequires: cups-devel cups-common -%endif BuildRequires: libldap-devel %if %build_ads BuildRequires: libldap-devel krb5-devel %endif -%if %mdkversion >= 200800 BuildRequires: keyutils-devel -%endif %if !%build_tdb BuildRequires: tdb-devel %endif @@ -391,7 +320,6 @@ BuildRequires: talloc-devel %endif # for domain-join gui BuildRequires: gtk2-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires(pre): chkconfig mktemp psmisc Requires(pre): coreutils sed grep @@ -419,13 +347,13 @@ Please read the smb.conf file and ENCRYPTION.txt in the docs directory for implementation details. %if %have_pversion %message_bugzilla samba3 -%endif +%endif %if !%build_system %message_system %endif %if %build_non_default WARNING: This RPM was built with command-line options. Please -see README.%{name}-mandrake-rpm in the documentation for +see README.%{name}-rosa-rpm in the documentation for more information. %endif @@ -433,6 +361,7 @@ more information. URL: http://www.samba.org Summary: Samba (SMB) server programs Requires: %{name}-common = %{version} +Requires: %libwbclient >= %{version} %if %have_rpmhelper Requires(pre): rpm-helper %endif @@ -479,7 +408,7 @@ URL: http://www.samba.org Summary: Samba (SMB) client programs Group: Networking/Other Requires: %{name}-common = %{version} -Requires: mount-cifs >= %{version} +Requires: cifs-utils >= 4.4 %if %build_alternatives #Conflicts: samba-client < 2.2.8a-9mdk %endif @@ -493,9 +422,6 @@ Obsoletes: smbfs %if !%build_system && %build_alternatives Provides: samba-client %endif -%ifarch x86_64 -Conflicts: cups < 1.2.0-0.5361.0mdk -%endif %description client Samba-client provides some SMB clients, which complement the built-in @@ -512,6 +438,7 @@ printing to SMB printers. URL: http://www.samba.org Summary: Files used by both Samba servers and clients Group: System/Servers +Conflicts: %{name}-server < 3.6.6-2 %if %build_system Provides: samba-common-ldap Obsoletes: samba-common-ldap @@ -599,7 +526,7 @@ Conflicts: samba-winbind %endif %if %build_winbind %description winbind -Provides the winbind daemon and testing tools to allow authentication +Provides the winbind daemon and testing tools to allow authentication and group/user enumeration from a Windows or Samba domain controller. %endif %if %have_pversion @@ -622,7 +549,7 @@ Conflicts: nss_wins %endif %if %build_wins %description -n nss_wins%{samba_major} -Provides the libnss_wins shared library which resolves NetBIOS names to +Provides the libnss_wins shared library which resolves NetBIOS names to IP addresses. %endif %if %have_pversion @@ -782,6 +709,7 @@ Library providing access to winbindd Group: Development/C Summary: Library providing access to winbindd Provides: wbclient-devel = %{version}-%{release} +Requires: %libwbclient >= %{version} %description -n %wbclientdevel Library providing access to winbindd @@ -813,8 +741,8 @@ Requires: %{name}-server = %{version}-%{release} %endif %ifnarch alpha %if %build_system && %{build_mysql} -Obsoletes: samba3-passdb-mysql -Provides: samba3-passdb-mysql +Obsoletes: samba3-passdb-mysql +Provides: samba3-passdb-mysql %endif %endif %ifnarch alpha @@ -864,15 +792,21 @@ Antivir antivirus scanner daemon. %if %build_clamav -%package vscan-clamav +%package virusfilter-clamav Summary: On-access virus scanning for samba using Clam Antivirus Group: System/Servers +URL: https://github.com/fumiyas/samba-virusfilter Requires: %{name}-server = %{version} Provides: %{name}-vscan +Provides: %{name}-virusfilter Requires: clamd -%description vscan-clamav -A vfs-module for samba to implement on-access scanning using the -Clam antivirus scanner daemon. +%description virusfilter-clamav +This is a Samba VFS module to scan and filter virus files on Samba file +services with an anti-virus scanner. + +This package includes the VFS module supporting: +* ClamAV (clamd daemon) http://www.clamav.net + %endif %if %build_fprot @@ -887,14 +821,20 @@ FPROT antivirus software (which must be installed to use this). %endif %if %build_fsav -%package vscan-fsecure +%package virusfilter-fsecure Summary: On-access virus scanning for samba using F-Secure Group: System/Servers +URL: https://github.com/fumiyas/samba-virusfilter Requires: %{name}-server = %{version} Provides: %{name}-vscan -%description vscan-fsecure -A vfs-module for samba to implement on-access scanning using the -F-Secure antivirus software (which must be installed to use this). +Provides: %{name}-virusfilter +%description virusfilter-fsecure +This is a Samba VFS module to scan and filter virus files on Samba file +services with an anti-virus scanner. + +This package provides the VFS module supporting: +* F-Secure Anti-Virus (fsavd daemon) http://www.f-secure.com + %endif %if %build_icap @@ -953,14 +893,18 @@ OpenAntivirus antivirus software (which must be installed to use this). %endif %if %build_sophos -%package vscan-sophos +%package virusfilter-sophos Summary: On-access virus scanning for samba using Sophos Group: System/Servers +URL: https://github.com/fumiyas/samba-virusfilter Requires: %{name}-server = %{version} Provides: %{name}-vscan -%description vscan-sophos -A vfs-module for samba to implement on-access scanning using the -Sophos antivirus software (which must be installed to use this). +%description virusfilter-sophos +This is a Samba VFS module to scan and filter virus files on Samba file +services with an anti-virus scanner. + +This package includes the VFS module supporting: +* Sophos Anti-Virus (savdid daemon) http://www.sophos.com %endif %if %build_symantec @@ -987,17 +931,6 @@ A vfs-module for samba to implement on-access scanning using the Trend antivirus software (which must be installed to use this). %endif -%package -n mount-cifs%{samba_major} -URL: http://www.samba.org -Summary: CIFS filesystem mount helper -Group: Networking/Other -Conflicts: %{name}-client <= 3.0.11-1mdk -Requires: keyutils > 1.2-%{mkrel 4} - -%description -n mount-cifs%{samba_major} -This package provides the mount.cifs helper to mount cifs filesystems -using the cifs filesystem driver - %package domainjoin-gui Summary: Domainjoin GUI Requires: samba-common = %{version} @@ -1079,32 +1012,10 @@ echo -e "\n%{name}-%{version}-%{release}\n">>%{SOURCE7} #Try and validate signatures on source: -export GNUPGHOME=%{_tmppath}/samba-gpghome -if [ -d "$GNUPGHOME" ] -then echo "Error, GNUPGHOME $GNUPGHOME exists, remove it and try again"; exit 1 -fi -install -d -m700 $GNUPGHOME -gpg --import %{SOURCE98} -VERIFYSOURCE=`basename %{SOURCE0}` -VERIFYSOURCE=%{_tmppath}/${VERIFYSOURCE%%.gz} +VERIFYSOURCE=%{SOURCE0} +VERIFYSOURCE=${VERIFYSOURCE%%.gz} gzip -dc %{SOURCE0} > $VERIFYSOURCE -pushd %{_tmppath} -cp %{SOURCE99} . -gpg --trust-model always --verify `basename %{SOURCE99}` -VERIFIED=$? -rm -f `basename %{SOURCE99}` -popd -rm -Rf $GNUPGHOME - -rm -f $VERIFYSOURCE -if [ "$VERIFIED" -eq 0 ] -then - echo "Verification of %{SOURCE0} against %{SOURCE99} with key %{SOURCE98} succeeded" -else - echo "Source verification failed!" >&2 - exit 1 -fi - +%check_sig %{SOURCE98} %{SOURCE99} $VERIFYSOURCE %if %build_vscan %setup -q -a 8 -n %{pkg_name}-%{source_ver} @@ -1114,13 +1025,12 @@ fi # Version specific patches: current version %if !%have_pversion echo "Applying patches for current version: %{ver}" -%patch11 -p1 -b .mdk +%patch11 -p1 -b .rosa pushd source3 popd -%patch22 -p1 %patch30 -p1 -b .checkflags -%patch31 -p1 -b .nss_wins_log -%patch33 -p1 -b .netapilinking +#patch31 -p1 -b .nss_wins_log +%patch33 -p1 -b .netapi_link # patches from cvs/samba team pushd source3 @@ -1135,33 +1045,15 @@ echo "Applying patches for new versions: %{pversion}" echo "Appling patches which should only be applied to prereleases" %endif -# Fix quota compilation in glibc>2.3 -%if %mdkversion >= 910 && %mdkversion < 1000 -#grep "" source/smbd/quotas.c >/dev/null && \ -perl -pi -e 's@@@' source3/smbd/quotas.c -%endif - cp %{SOURCE7} . # Make a copy of examples so that we have a clean one for doc: cp -a examples examples.bin %if %build_vscan -cp -a %{vscandir} %{vfsdir} -#fix stupid directory names: -#mv %{vfsdir}/%{vscandir}/openantivirus %{vfsdir}/%{vscandir}/oav -# Inline replacement of config dir -for av in antivir clamav fprotd fsav icap kavp mksd mcdaemon oav sophos symantec trend - do - [ -e %{vfsdir}/%{vscandir}/*/vscan-$av.h ] && perl -pi -e \ - 's,^#define PARAMCONF "/etc/samba,#define PARAMCONF "/etc/%{name},' \ - %{vfsdir}/%{vscandir}/*/vscan-$av.h -done -#Inline edit vscan header: -perl -pi -e 's/^# define SAMBA_VERSION_MAJOR 2/# define SAMBA_VERSION_MAJOR 3/g;s/# define SAMBA_VERSION_MINOR 2/# define SAMBA_VERSION_MINOR 0/g' %{vfsdir}/%{vscandir}/include/vscan-global.h -# dunno why samba-vscan keeps copmatability with ancient versions -# of samba but breaks on samba versions with alpha chars in the name ... -perl -pi -e 's/SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_RELEASE>=4/SAMBA_VERSION_MAJOR==2/g' %{vfsdir}/%{vscandir}/*/vscan-*.c +pushd samba-virusfilter-%{vscanver} +perl -pi -e 's,/var/run/clamav/clamd.ctl,/var/lib/clamav/clamd.socket,g' clamav/svf-clamav.c +popd %endif # Edit some files when not building system samba: @@ -1191,9 +1083,9 @@ CFLAGS="`echo "$RPM_OPT_FLAGS"|sed -e 's/ -g / /g'` -DLDAP_DEPRECATED" CFLAGS=`echo "$CFLAGS"|sed -e 's/-O2/-O/g'` %endif ./autogen.sh -# Don't use --with-fhs now, since it overrides libdir, it sets configdir, +# Don't use --with-fhs now, since it overrides libdir, it sets configdir, # lockdir,piddir logfilebase,privatedir and swatdir -%configure --prefix=%{_prefix} \ +%configure2_5x --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir}/%{name} \ --localstatedir=/var \ --with-modulesdir=%{_libdir}/%{name} \ @@ -1214,9 +1106,8 @@ CFLAGS=`echo "$CFLAGS"|sed -e 's/-O2/-O/g'` --with-libtdb = yes \ %else --enable-external-libtdb=yes \ -%endif +%endif %if %build_ctdb - --with-ctdb \ --with-cluster-support \ %endif %if !%build_ads @@ -1236,18 +1127,15 @@ CFLAGS=`echo "$CFLAGS"|sed -e 's/-O2/-O/g'` --with-acl-support \ %endif --with-shared-modules=idmap_rid,idmap_ad \ - --with-cifsmount \ - --with-cifsumount \ - --with-cifsupcall \ --enable-avahi \ --with-dnsupdate \ - --program-suffix=%{samba_major} + --program-suffix=%{samba_major} # --with-expsam=%build_expsam \ # --with-shared-modules=pdb_ldap,idmap_ldap \ # --with-manpages-langs=en,ja,pl \ #_if !%build_system # --with-smbwrapper \ -#_endif +#_endif # --with-nisplussam \ # --with-fhs \ @@ -1256,11 +1144,6 @@ grep ^LDSHFLAGS_MODULES Makefile perl -pi -e 'if ( m/^LDSHFLAGS_MODULES/ ) { $_ =~ s/-Wl,--no-undefined//g;};' Makefile grep ^LDSHFLAGS_MODULES Makefile -#Fix the make file so we don't create debug information on 9.2 -%if %mdkversion == 920 -perl -pi -e 's/-g //g' Makefile -%endif - #Should be a patch instead? %if !%build_talloc perl -pi -e 's,-I./lib/talloc,,g;s,bin/libtalloc.so,,g;s,^(installlibs:: )installlibtalloc,$1,g' Makefile @@ -1281,10 +1164,8 @@ make -C lib/netapi/examples %if %build_vscan echo -e "\n\nBuild antivirus VFS modules\n\n" -pushd %{vfsdir}/%{vscandir} -%configure -#sed -i -e 's,openantivirus,oav,g' Makefile -sed -i -e 's,^\(.*clamd socket name.*=\).*,\1 /var/lib/clamav/clamd.socket,g' clamav/vscan-clamav.conf +pushd %{vscandir} +%configure --with-samba-source=../ make popd %endif @@ -1296,19 +1177,19 @@ make -C %{vfsdir}/%{vscandir} symantec %endif %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT +rm -rf %{buildroot} +mkdir -p %{buildroot} #Ensure all docs are readable chmod a+r docs -R # Any entries here mean samba makefile is *really* broken: -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -mkdir -p $RPM_BUILD_ROOT/%{_datadir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/vfs +mkdir -p %{buildroot}%{_sysconfdir}/%{name} +mkdir -p %{buildroot}/%{_datadir} +mkdir -p %{buildroot}%{_libdir}/%{name}/vfs (cd source3 -make DESTDIR=$RPM_BUILD_ROOT install installclientlib installmodules) +make DESTDIR=%{buildroot} install installclientlib installmodules) # we ship docs in the docs supackage, and lik it into swat, delete the extra copy: rm -Rf %{buildroot}/%{_datadir}/swat/using_samba @@ -1317,94 +1198,96 @@ rm -Rf %{buildroot}/%{_datadir}/swat/using_samba #need to stay -mkdir -p $RPM_BUILD_ROOT/{sbin,bin} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{logrotate.d,pam.d,xinetd.d} -mkdir -p $RPM_BUILD_ROOT/%{_initrddir} -mkdir -p $RPM_BUILD_ROOT/var/cache/%{name} -mkdir -p $RPM_BUILD_ROOT/var/log/%{name} -mkdir -p $RPM_BUILD_ROOT/var/run/%{name} -mkdir -p $RPM_BUILD_ROOT/var/spool/%{name} -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/{netlogon,profiles,printers} -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC} -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/codepages/src -mkdir -p $RPM_BUILD_ROOT/%{_lib}/security -mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/vfs -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts +mkdir -p %{buildroot}/{sbin,bin} +mkdir -p %{buildroot}%{_sysconfdir}/{logrotate.d,pam.d,xinetd.d} +mkdir -p %{buildroot}/%{_initrddir} +mkdir -p %{buildroot}/var/cache/%{name} +mkdir -p %{buildroot}/var/log/%{name} +mkdir -p %{buildroot}/var/run/%{name} +mkdir -p %{buildroot}/var/spool/%{name} +mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}/{netlogon,profiles,printers} +mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC} +mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}/codepages/src +mkdir -p %{buildroot}/%{_lib}/security +mkdir -p %{buildroot}%{_libdir}/pkgconfig +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libdir}/%{name}/vfs +mkdir -p %{buildroot}%{_datadir}/%{name}/scripts -install -m755 source3/bin/lib*.a $RPM_BUILD_ROOT%{_libdir}/ +install -m755 source3/bin/lib*.a %{buildroot}%{_libdir}/ # smbsh forgotten -#install -m 755 source/bin/smbsh $RPM_BUILD_ROOT%{_bindir}/ +#install -m 755 source/bin/smbsh %{buildroot}%{_bindir}/ %if %build_vscan -%makeinstall_std -C %{vfsdir}/%{vscandir} -install -m 644 %{vfsdir}/%{vscandir}/*/vscan-*.conf %{buildroot}/%{_sysconfdir}/%{name} +%makeinstall_std -C %{vscandir} +install -m 644 %{vscandir}/etc/*.conf.example %{buildroot}/%{_sysconfdir}/%{name} +for i in %{buildroot}/%{_sysconfdir}/%{name}/*.example +do mv $i ${i%%.example} +done +#mv %{buildroot}/%{_datadir}/%{name}/bin/svf-notify %{buildroot}/%{_datadir}/%{name}/scripts +# script uses ksh, which we don't have +rm %{buildroot}/%{_datadir}/%{name}/bin/svf-notify +perl -pi -e 's,%{_datadir}/%{name}/bin,%{_datadir}/%{name}/scripts,g' %{buildroot}/%{_sysconfdir}/%{name}/smb.svf-*.conf %endif #libnss_* still not handled by make: # Install the nsswitch library extension file for i in wins winbind; do - install -m755 nsswitch/libnss_${i}.so $RPM_BUILD_ROOT/%{_lib}/libnss_${i}.so + install -m755 nsswitch/libnss_${i}.so %{buildroot}/%{_lib}/libnss_${i}.so done # Make link for wins and winbind resolvers -( cd $RPM_BUILD_ROOT/%{_lib}; ln -s libnss_wins.so libnss_wins.so.2; ln -s libnss_winbind.so libnss_winbind.so.2) +( cd %{buildroot}/%{_lib}; ln -s libnss_wins.so libnss_wins.so.2; ln -s libnss_winbind.so libnss_winbind.so.2) install -d %{buildroot}/%{_libdir}/krb5/plugins install -m755 source3/bin/winbind_krb5_locator.so %{buildroot}/%{_libdir}/krb5/plugins -install -m 755 source3/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name} -install -m 644 source3/lib/netapi/examples/netdomjoin-gui/samba.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/samba.ico -install -m 644 source3/lib/netapi/examples/netdomjoin-gui/logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo.png -install -m 644 source3/lib/netapi/examples/netdomjoin-gui/logo-small.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/logo-small.png +install -m 755 source3/lib/netapi/examples/bin/netdomjoin-gui %{buildroot}/%{_sbindir}/netdomjoin-gui +mkdir -p %{buildroot}%{_datadir}/pixmaps/%{name} +install -m 644 source3/lib/netapi/examples/netdomjoin-gui/samba.ico %{buildroot}/%{_datadir}/pixmaps/%{name}/samba.ico +install -m 644 source3/lib/netapi/examples/netdomjoin-gui/logo.png %{buildroot}/%{_datadir}/pixmaps/%{name}/logo.png +install -m 644 source3/lib/netapi/examples/netdomjoin-gui/logo-small.png %{buildroot}/%{_datadir}/pixmaps/%{name}/logo-small.png %if %{build_test} for i in {%{testbin}};do - #install -m755 source/bin/${i} $RPM_BUILD_ROOT/%{_bindir}/${i}%{samba_major} + #install -m755 source/bin/${i} %{buildroot}/%{_bindir}/${i}%{samba_major} done %endif # Install other stuff -# install -m644 examples/VFS/recycle/recycle.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/ - install -m644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/smbusers - install -m755 %{SOURCE21} $RPM_BUILD_ROOT/%{_bindir} - #install -m755 %{SOURCE22} $RPM_BUILD_ROOT/usr/bin - install -m755 %{SOURCE23} $RPM_BUILD_ROOT/%{_bindir} - install -m755 %{SOURCE24} $RPM_BUILD_ROOT/%{_initrddir}/smb%{samba_major} - install -m755 %{SOURCE24} $RPM_BUILD_ROOT/%{_sbindir}/%{name} - install -m755 %{SOURCE25} $RPM_BUILD_ROOT/%{_initrddir}/winbind - install -m755 %{SOURCE25} $RPM_BUILD_ROOT/%{_sbindir}/winbind -# install -m755 %{SOURCE26} $RPM_BUILD_ROOT/%{_initrddir}/wrepld%{samba_major} -%if %mdkversion < 200700 - install -m644 %{SOURCE27} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name} -%else - install -m644 %{SOURCE28} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name} -%endif - install -m644 %{SOURCE29} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/system-auth-winbind +# install -m644 examples/VFS/recycle/recycle.conf %{buildroot}%{_sysconfdir}/samba/ + install -m644 %{SOURCE20} %{buildroot}%{_sysconfdir}/%{name}/smbusers + install -m755 %{SOURCE21} %{buildroot}/%{_bindir} + #install -m755 %{SOURCE22} %{buildroot}/usr/bin + install -m755 %{SOURCE23} %{buildroot}/%{_bindir} + install -m755 %{SOURCE24} %{buildroot}/%{_initrddir}/smb%{samba_major} + install -m755 %{SOURCE24} %{buildroot}/%{_sbindir}/%{name} + install -m755 %{SOURCE25} %{buildroot}/%{_initrddir}/winbind + install -m755 %{SOURCE25} %{buildroot}/%{_sbindir}/winbind +# install -m755 %{SOURCE26} %{buildroot}/%{_initrddir}/wrepld%{samba_major} + install -m644 %{SOURCE28} %{buildroot}/%{_sysconfdir}/pam.d/%{name} + install -m644 %{SOURCE29} %{buildroot}/%{_sysconfdir}/pam.d/system-auth-winbind # - install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name} -# install -m644 packaging/Mandrake/samba-slapd-include.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/samba-slapd.include + install -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # install pam_winbind.conf sample file mkdir -p %{buildroot}%{_sysconfdir}/security install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}%{_sysconfdir}/security/pam_winbind.conf -install -m755 examples/LDAP/convertSambaAccount $RPM_BUILD_ROOT/%{_datadir}/%{name}/scripts/ +install -m755 examples/LDAP/convertSambaAccount %{buildroot}/%{_datadir}/%{name}/scripts/ # make a conf file for winbind from the default one: - cat %{SOURCE30}|sed -e 's/^; winbind/ winbind/g;s/^; obey pam/ obey pam/g;s/ printer admin = @adm/# printer admin = @adm/g; s/^# printer admin = @"D/ printer admin = @"D/g;s/^; password server = \*/ password server = \*/g;s/^; template/ template/g; s/^ security = user/ security = domain/g' > packaging/Mandrake/smb-winbind.conf - install -m644 packaging/Mandrake/smb-winbind.conf $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb-winbind.conf + cat %{SOURCE30}|sed -e 's/^; winbind/ winbind/g;s/^; obey pam/ obey pam/g;s/ printer admin = @adm/# printer admin = @adm/g; s/^# printer admin = @"D/ printer admin = @"D/g;s/^; password server = \*/ password server = \*/g;s/^; template/ template/g; s/^ security = user/ security = domain/g' > packaging/Rosa/smb-winbind.conf + install -m644 packaging/Rosa/smb-winbind.conf %{buildroot}/%{_sysconfdir}/%{name}/smb-winbind.conf # Some inline fixes for smb.conf for non-winbind use -install -m644 %{SOURCE30} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf +install -m644 %{SOURCE30} %{buildroot}/%{_sysconfdir}/%{name}/smb.conf cat %{SOURCE30} | \ -sed -e 's/^; printer admin = @adm/ printer admin = @adm/g' >$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf +sed -e 's/^; printer admin = @adm/ printer admin = @adm/g' >%{buildroot}/%{_sysconfdir}/%{name}/smb.conf %if %build_cupspc -perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf -perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb-winbind.conf +perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' %{buildroot}/%{_sysconfdir}/%{name}/smb.conf +perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' %{buildroot}/%{_sysconfdir}/%{name}/smb-winbind.conf %endif #%if !%build_system @@ -1413,32 +1296,22 @@ perl -pi -e 's/printcap name = lpstat/printcap name = cups/g' $RPM_BUILD_ROOT/%{ #%endif -# cifs.upcall moved for no reason -rm -f %{buildroot}/%{_sbindir}/cifs.upcall.old -mv %{buildroot}/%{_sbindir}/cifs.upcall %{buildroot}/bin -#install mount.cifs -for i in {%{cifs_bin}};do -#install -m755 source3/bin/${i} %{buildroot}/bin/${i}%{alternative_major} -mv %{buildroot}/bin/${i} %{buildroot}/bin/${i}%{alternative_major} -ln -s ../bin/${i}%{alternative_major} %{buildroot}/sbin/${i}%{alternative_major} -done - - echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/lmhosts + echo 127.0.0.1 localhost > %{buildroot}/%{_sysconfdir}/%{name}/lmhosts # Link smbspool to CUPS (does not require installed CUPS) - mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/cups/backend - ln -s %{_bindir}/smbspool%{alternative_major} $RPM_BUILD_ROOT/%{_prefix}/lib/cups/backend/smb%{alternative_major} + mkdir -p %{buildroot}/%{_prefix}/lib/cups/backend + ln -s %{_bindir}/smbspool%{alternative_major} %{buildroot}/%{_prefix}/lib/cups/backend/smb%{alternative_major} # xinetd support - mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d - install -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/swat%{samba_major} + mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d + install -m644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/xinetd.d/swat%{samba_major} # menu support mkdir -p %{buildroot}/%{_datadir}/applications -cat > %{buildroot}/%{_datadir}/applications/mandriva-%{name}-swat.desktop << EOF +cat > %{buildroot}/%{_datadir}/applications/rosa-%{name}-swat.desktop << EOF [Desktop Entry] Name=Samba Configuration (SWAT) Comment=The Swat Samba Administration Tool @@ -1450,30 +1323,30 @@ StartupNotify=true Categories=X-MandrivaLinux-System-Configuration-Networking; EOF -mkdir -p $RPM_BUILD_ROOT%{_liconsdir} $RPM_BUILD_ROOT%{_iconsdir} $RPM_BUILD_ROOT%{_miconsdir} +mkdir -p %{buildroot}%{_liconsdir} %{buildroot}%{_iconsdir} %{buildroot}%{_miconsdir} # install html man pages for swat install -d %{buildroot}/%{_datadir}/swat%{samba_major}/help/manpages #install -m644 docs/htmldocs/manpages-3/* %{buildroot}/%{_datadir}/swat%{samba_major}/help/manpages -bzcat %{SOURCE4} > $RPM_BUILD_ROOT%{_liconsdir}/swat%{samba_major}.png -bzcat %{SOURCE5} > $RPM_BUILD_ROOT%{_iconsdir}/swat%{samba_major}.png -bzcat %{SOURCE6} > $RPM_BUILD_ROOT%{_miconsdir}/swat%{samba_major}.png +install %{SOURCE4} %{buildroot}%{_liconsdir}/swat%{samba_major}.png +install %{SOURCE5} %{buildroot}%{_iconsdir}/swat%{samba_major}.png +install %{SOURCE6} %{buildroot}%{_miconsdir}/swat%{samba_major}.png -bzcat %{SOURCE10}> $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/print-pdf -bzcat %{SOURCE11}> $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/smb-migrate +install %{SOURCE10} %{buildroot}%{_datadir}/%{name}/scripts/print-pdf +install %{SOURCE11} %{buildroot}%{_datadir}/%{name}/scripts/smb-migrate # Fix configs when not building system samba: #Client binaries will have suffixes while we use alternatives, even # if we are system samba %if !%build_system || %build_alternatives -for OLD in %{buildroot}/%{_bindir}/{%{clientbin},eventlogadm} %{buildroot}/bin/{%{cifs_bin}} %{buildroot}/%{_prefix}/lib/cups/backend/smb +for OLD in %{buildroot}/%{_bindir}/{%{clientbin},eventlogadm} %{buildroot}/%{_prefix}/lib/cups/backend/smb do NEW=`echo ${OLD}%{alternative_major}` [ -e $OLD ] && mv -f $OLD $NEW done -for OLD in %{buildroot}/%{_mandir}/man?/{%{clientbin},eventlogadm}* %{buildroot}/%{_mandir}/man?/{%{cifs_bin}}* +for OLD in %{buildroot}/%{_mandir}/man?/{%{clientbin},eventlogadm}* do if [ -e $OLD ] then @@ -1482,7 +1355,7 @@ do NEW=`echo ${BASE}%{alternative_major}${EXT}` mv $OLD $NEW fi -done +done %endif # Server/common binaries are versioned only if not system samba: %if !%build_system @@ -1502,16 +1375,16 @@ do NEW=`echo ${BASE}%{samba_major}${EXT}` mv $OLD $NEW fi -done +done # Replace paths in config files and init scripts: for i in smb ;do - perl -pi -e 's,/subsys/'$i',/subsys/'$i'%{samba_major},g' $RPM_BUILD_ROOT/%{_initrddir}/${i}%{samba_major} + perl -pi -e 's,/subsys/'$i',/subsys/'$i'%{samba_major},g' %{buildroot}/%{_initrddir}/${i}%{samba_major} done for i in %{_sysconfdir}/%{name}/smb.conf %{_initrddir}/smb%{samba_major} %{_sbindir}/%{name} %{_initrddir}/winbind /%{_sysconfdir}/logrotate.d/%{name} /%{_sysconfdir}/xinetd.d/swat%{samba_major} %{_initrddir}/wrepld%{samba_major}; do - perl -pi -e 's,/%{pkg_name},/%{name},g; s,smbd,%{_sbindir}/smbd%{samba_major},g; s,nmbd,%{_sbindir}/nmbd%{samba_major},g; s,/usr/sbin/swat,%{_sbindir}/swat%{samba_major},g;s,wrepld,%{_sbindir}/wrepld%{samba_major},g' $RPM_BUILD_ROOT/$i; + perl -pi -e 's,/%{pkg_name},/%{name},g; s,smbd,%{_sbindir}/smbd%{samba_major},g; s,nmbd,%{_sbindir}/nmbd%{samba_major},g; s,/usr/sbin/swat,%{_sbindir}/swat%{samba_major},g;s,wrepld,%{_sbindir}/wrepld%{samba_major},g' %{buildroot}/$i; done # Fix xinetd file for swat: -perl -pi -e 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/swat%{samba_major} +perl -pi -e 's,/usr/sbin,%{_sbindir},g' %{buildroot}/%{_sysconfdir}/xinetd.d/swat%{samba_major} %endif #Clean up unpackaged files: @@ -1523,10 +1396,10 @@ rm -f %{buildroot}/%{_mandir}/man1/testprns* # (sb) make a smb.conf.clean we can use for the merge, since an existing # smb.conf won't get overwritten -cp $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smb.conf $RPM_BUILD_ROOT/%{_datadir}/%{name}/smb.conf.clean +cp %{buildroot}/%{_sysconfdir}/%{name}/smb.conf %{buildroot}/%{_datadir}/%{name}/smb.conf.clean -# (sb) leave a README.mdk.conf to explain what has been done -cat << EOF > $RPM_BUILD_ROOT/%{_datadir}/%{name}/README.mdk.conf +# (sb) leave a README.rosa.conf to explain what has been done +cat << EOF > %{buildroot}/%{_datadir}/%{name}/README.rosa.conf In order to facilitate upgrading an existing samba install, and merging previous configuration data with any new syntax used by samba3, a merge script has attempted to combine your local configuration data with the @@ -1535,7 +1408,7 @@ new conf file format. The merged data is in smb.conf, with comments like # *** merged from original smb.conf: *** near the additional entries. Any local shares should have been appended to -smb.conf. A log of what took place should be in: +smb.conf. A log of what took place should be in: /var/log/samba/smb-migrate.log @@ -1561,18 +1434,33 @@ tdb \ pushd lib/$i ./autogen.sh -V && ./configure --prefix=%{_prefix} --libdir=%{_libdir} popd - install -m 644 lib/$i/$i.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ + install -m 644 lib/$i/$i.pc %{buildroot}%{_libdir}/pkgconfig/ done # 2. Install them for i in smbclient smbsharemodes netapi wbclient; do - install -m 644 source3/pkgconfig/$i.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ + install -m 644 source3/pkgconfig/$i.pc %{buildroot}%{_libdir}/pkgconfig/ done %if !%build_ldb rm -f %{buildroot}/%{_bindir}/ldb* +rm -fr %{buildroot}%{_mandir}/man1/ldbadd.1 +rm -fr %{buildroot}%{_mandir}/man1/ldbdel.1 +rm -fr %{buildroot}%{_mandir}/man1/ldbedit.1 +rm -fr %{buildroot}%{_mandir}/man1/ldbmodify.1 +rm -fr %{buildroot}%{_mandir}/man1/ldbrename.1 +rm -fr %{buildroot}%{_mandir}/man1/ldbsearch.1 %endif +%if %{build_test} +rm -fr %{buildroot}%{_mandir}/man1/log2pcap*.1* +%else +rm -fr %{buildroot}%{_mandir}/man1/vfstest%{samba_major}*.1* +rm -fr %{buildroot}%{_mandir}/man1/log2pcap*.1* +%endif + +rm -fr %{buildroot}%{_mandir}/man8/tdb*.8* + %if %build_winbind %find_lang pam_winbind %endif @@ -1593,7 +1481,7 @@ rm -f %{_libdir}/pkgconfig/smbclient.pc %endif %if %build_vscan -rm -f %{buildroot} %{_libdir}/%{name}/vfs/vscan*.so +#rm -f %{buildroot}%{_libdir}/%{name}/vfs/vscan*.so %if !%build_antivir rm -f %{buildroot}%{_libdir}/%{name}/vfs/vscan-antivir.so @@ -1601,8 +1489,8 @@ rm -f %{buildroot}%{_sysconfdir}/%{name}/vscan-antivir.conf %endif %if !%build_clamav -rm -f %{buildroot}%{_libdir}/%{name}/vfs/vscan-clamav.so -rm -f %{buildroot}%{_sysconfdir}/%{name}/vscan-clamav.conf +rm -f %{buildroot}%{_libdir}/%{name}/vfs/svf-clamav.so +rm -f %{buildroot}%{_sysconfdir}/%{name}/smb.svf-clamav.conf %endif %if !%build_fprot @@ -1611,8 +1499,8 @@ rm -f %{buildroot}%{_sysconfdir}/%{name}/vscan-fprotd.conf %endif %if !%build_fsav -rm -f %{buildroot}%{_libdir}/%{name}/vfs/vscan-fsav.so -rm -f %{buildroot}%{_sysconfdir}/%{name}/vscan-fsav.conf +rm -f %{buildroot}%{_libdir}/%{name}/vfs/svf-fsav.so +rm -f %{buildroot}%{_sysconfdir}/%{name}/smb.svf-fsav.conf %endif %if !%build_icap @@ -1641,8 +1529,8 @@ rm -f %{buildroot}%{_sysconfdir}/%{name}/vscan-oav.conf %endif %if !%build_sophos -rm -f %{buildroot}%{_libdir}/%{name}/vfs/vscan-sophos.so -rm -f %{buildroot}%{_sysconfdir}/%{name}/vscan-sophos.conf +rm -f %{buildroot}%{_libdir}/%{name}/vfs/svf-sophos.so +rm -f %{buildroot}%{_sysconfdir}/%{name}/smb.svf-sophos.conf %endif %if !%build_symantec @@ -1671,16 +1559,11 @@ rm -f %{buildroot}%{_mandir}/man8/tdbtool.8* # these are not built rm -f %{buildroot}%{_mandir}/man1/log2pcap.1* rm -f %{buildroot}%{_mandir}/man1/vfstest.1* -rm -f %{buildroot}%{_mandir}/man8/cifs.upcall*.8* %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post server -#add additional directory for support filesharing through 'net' command -mkdir /var/cache/samba/usershares -chmod 1770 /var/cache/samba/usershares -chown root:users /var/cache/samba/usershares %_post_service smb%{samba_major} #%_post_service wrepld%{samba_major} @@ -1725,6 +1608,7 @@ fi # And not loose our machine account SID [ -f %{_sysconfdir}/MACHINE.SID ] && mv -f %{_sysconfdir}/MACHINE.SID %{_sysconfdir}/%{name}/ ||: +# FIXME: Can be removed in rosa ? %triggerpostun common -- samba-common < 3.0.1-3mdk # (sb) merge any existing smb.conf with new syntax file if [ $1 = 2 ]; then @@ -1734,13 +1618,13 @@ if [ $1 = 2 ]; then echo "Upgrade: merging previous smb.conf..." if [ -f %{_datadir}/%{name}/smb.conf.clean ]; then cp %{_datadir}/%{name}/smb.conf.clean %{_sysconfdir}/%{name}/smb.conf - cp %{_datadir}/%{name}/README.mdk.conf %{_sysconfdir}/%{name}/ + cp %{_datadir}/%{name}/README.rosa.conf %{_sysconfdir}/%{name}/ %{_datadir}/%{name}/scripts/smb-migrate commit fi fi %postun common -if [ -f %{_sysconfdir}/%{name}/README.mdk.conf ];then rm -f %{_sysconfdir}/%{name}/README.mdk.conf;fi +if [ -f %{_sysconfdir}/%{name}/README.rosa.conf ];then rm -f %{_sysconfdir}/%{name}/README.rosa.conf;fi %if %build_winbind %post winbind @@ -1812,9 +1696,6 @@ fi if [ -f /var/lock/subsys/xinetd ]; then service xinetd reload >/dev/null 2>&1 || : fi -%if %mdkversion < 200900 -%update_menus -%endif %postun swat @@ -1826,25 +1707,12 @@ fi if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi -%if %mdkversion < 200900 -%clean_menus -%endif - -%if %build_system -%if %mdkversion < 200900 -%post -n %{libname} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{libname} -p /sbin/ldconfig -%endif -%endif - %if %build_alternatives %post client update-alternatives --install %{_bindir}/smbclient smbclient \ %{_bindir}/smbclient%{alternative_major} 10 \ -$(for i in {/sbin/{%{client_sbin}},%{_bindir}/{%{clientbin},eventlogadm}};do +$(for i in %{_bindir}/{%{clientbin},eventlogadm};do j=`basename $i` [ "$j" = "smbclient" ] || \ echo -n " --slave ${i} ${j} ${i}%{alternative_major}";done) \ @@ -1862,35 +1730,41 @@ update-alternatives --auto smbclient [ ! -e %{_bindir}/smbclient ] && update-alternatives --auto smbclient || : %endif -%if %build_alternatives -%post -n mount-cifs%{samba_major} -update-alternatives --install /bin/mount.cifs mount.cifs \ -/bin/mount.cifs%{alternative_major} 10 \ ---slave /sbin/mount.cifs smount.cifs /sbin/mount.cifs%{alternative_major} \ ---slave /bin/umount.cifs umount.cifs /bin/umount.cifs%{alternative_major} \ ---slave /sbin/umount.cifs sumount.cifs /sbin/umount.cifs%{alternative_major} \ ---slave /sbin/cifs.upcall cifs.upcall /sbin/cifs.upcall%{alternative_major} \ ---slave %{_mandir}/man8/mount.cifs.8%{_extension} mount.cifs.8 %{_mandir}/man8/mount.cifs%{alternative_major}.8%{_extension} \ ---slave %{_mandir}/man8/umount.cifs.8%{_extension} umount.cifs.8 %{_mandir}/man8/umount.cifs%{alternative_major}.8%{_extension} \ ---slave %{_mandir}/man8/cifs.upcall.8%{_extension} cifs.upcall.8 %{_mandir}/man8/cifs.upcall%{alternative_major}.8%{_extension} \ -|| update-alternatives --auto mount.cifs - -%preun -n mount-cifs%{samba_major} -[ $1 = 0 ] && update-alternatives --remove mount.cifs /bin/mount.cifs%{alternative_major} ||: - -%triggerpostun -n mount-cifs%{samba_major} -- %{name}-client < 3.0.11-1mdk -update-alternatives --auto mount.cifs - -%endif - - %files server %defattr(-,root,root) %(for i in %{_sbindir}/{%{serversbin}}%{samba_major};do echo $i;done) %(for i in %{_bindir}/{%{serverbin}%{?serverldbbin:,%serverldbbin}}%{samba_major};do echo $i;done) %attr(755,root,root) /%{_lib}/security/pam_smbpass* %dir %{_libdir}/%{name}/vfs -%{_libdir}/%{name}/vfs/*.so +#%{_libdir}/%{name}/vfs/*.so + +%{_libdir}/%{name}/vfs/acl*.so +%{_libdir}/%{name}/vfs/aio_fork.so +%{_libdir}/%{name}/vfs/fileid.so +%{_libdir}/%{name}/vfs/fake_perms.so +%{_libdir}/%{name}/vfs/extd_audit.so +%{_libdir}/%{name}/vfs/expand_msdfs.so +%{_libdir}/%{name}/vfs/dirsort.so +%{_libdir}/%{name}/vfs/default_quota.so +%{_libdir}/%{name}/vfs/crossrename.so +%{_libdir}/%{name}/vfs/catia.so +%{_libdir}/%{name}/vfs/cap.so +%{_libdir}/%{name}/vfs/audit.so +%{_libdir}/%{name}/vfs/shadow*.so +%{_libdir}/%{name}/vfs/scannedonly.so +%{_libdir}/%{name}/vfs/recycle.so +%{_libdir}/%{name}/vfs/read*.so +%{_libdir}/%{name}/vfs/preopen.so +%{_libdir}/%{name}/vfs/notify_fam.so +%{_libdir}/%{name}/vfs/netatalk.so +%{_libdir}/%{name}/vfs/linux_xfs_sgid.so +%{_libdir}/%{name}/vfs/full_audit.so +%{_libdir}/%{name}/vfs/smb_traffic_analyzer.so +%{_libdir}/%{name}/vfs/time_audit.so +%{_libdir}/%{name}/vfs/syncops.so +%{_libdir}/%{name}/vfs/stream*.so +%{_libdir}/%{name}/vfs/xattr_tdb.so + %dir %{_libdir}/%{name}/pdb %{_libdir}/%{name}/auth #{_libdir}/%{name}/*.so @@ -1912,8 +1786,8 @@ update-alternatives --auto mount.cifs %attr(1777,root,root) %dir /var/spool/%{name} %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/scripts -%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf -%attr(0755,root,root) %{_datadir}/%{name}/scripts/convertSambaAccount +%attr(0755,root,root) %{_datadir}/%{name}/scripts/* +%exclude %{_datadir}/%{name}/scripts/smb-migrate %{_mandir}/man8/idmap_*.8* %{_mandir}/man8/vfs_*.8* @@ -1921,7 +1795,7 @@ update-alternatives --auto mount.cifs %defattr(-,root,root) %doc README COPYING Manifest Read-Manifest-Now %doc WHATSNEW.txt Roadmap -%doc README.%{name}-mandrake-rpm +%doc README.%{name}-rosa-rpm %doc clean-docs/samba-doc/docs/* %doc clean-docs/samba-doc/examples #%attr(-,root,root) %{_datadir}/swat%{samba_major}/using_samba/ @@ -1932,7 +1806,7 @@ update-alternatives --auto mount.cifs %config(noreplace) %{_sysconfdir}/xinetd.d/swat%{samba_major} #%attr(-,root,root) /sbin/* %{_sbindir}/swat%{samba_major} -%{_datadir}/applications/mandriva-%{name}-swat.desktop +%{_datadir}/applications/rosa-%{name}-swat.desktop %{_miconsdir}/*.png %{_liconsdir}/*.png %{_iconsdir}/*.png @@ -1992,7 +1866,7 @@ update-alternatives --auto mount.cifs %dir %{_datadir}/swat%{samba_major} %attr(0750,root,adm) %{_datadir}/%{name}/scripts/smb-migrate %attr(-,root,root) %{_datadir}/%{name}/smb.conf.clean -%attr(-,root,root) %{_datadir}/%{name}/README.mdk.conf +%attr(-,root,root) %{_datadir}/%{name}/README.rosa.conf %if %build_winbind %files winbind -f pam_winbind.lang @@ -2012,7 +1886,6 @@ update-alternatives --auto mount.cifs %{_mandir}/man5/pam_winbind.conf.5.* %{_mandir}/man7/winbind_krb5_locator.7.* %{_mandir}/man1/wbinfo*.1* - %endif %if %build_wins @@ -2102,7 +1975,6 @@ update-alternatives --auto mount.cifs %defattr(-,root,root) %{_libdir}/libwbclient.so %{_includedir}/wbclient.h -%{_includedir}/wbc_async.h %{_libdir}/pkgconfig/wbclient.pc #%files passdb-ldap @@ -2129,15 +2001,13 @@ update-alternatives --auto mount.cifs %defattr(-,root,root) %{_libdir}/%{name}/vfs/vscan-antivir.so %config(noreplace) %{_sysconfdir}/%{name}/vscan-antivir.conf -%doc %{vfsdir}/%{vscandir}/INSTALL %endif %if %build_clamav -%files vscan-clamav +%files virusfilter-clamav %defattr(-,root,root) -%{_libdir}/%{name}/vfs/vscan-clamav.so -%config(noreplace) %{_sysconfdir}/%{name}/vscan-clamav.conf -%doc %{vfsdir}/%{vscandir}/INSTALL +%{_libdir}/%{name}/vfs/svf-clamav.so +%config(noreplace) %{_sysconfdir}/%{name}/smb.svf-clamav.conf %endif %if %build_fprot @@ -2149,11 +2019,10 @@ update-alternatives --auto mount.cifs %endif %if %build_fsav -%files vscan-fsecure +%files virusfilter-fsecure %defattr(-,root,root) -%{_libdir}/%{name}/vfs/vscan-fsav.so -%config(noreplace) %{_sysconfdir}/%{name}/vscan-fsav.conf -%doc %{vfsdir}/%{vscandir}/INSTALL +%{_libdir}/%{name}/vfs/svf-fsav.so +%config(noreplace) %{_sysconfdir}/%{name}/smb.svf-fsav.conf %endif %if %build_icap @@ -2197,11 +2066,10 @@ update-alternatives --auto mount.cifs %endif %if %build_sophos -%files vscan-sophos +%files virusfilter-sophos %defattr(-,root,root) -%{_libdir}/%{name}/vfs/vscan-sophos.so -%config(noreplace) %{_sysconfdir}/%{name}/vscan-sophos.conf -%doc %{vfsdir}/%{vscandir}/INSTALL +%{_libdir}/%{name}/vfs/svf-sophos.so +%config(noreplace) %{_sysconfdir}/%{name}/smb.svf-sophos.conf %endif %if %build_symantec @@ -2220,13 +2088,6 @@ update-alternatives --auto mount.cifs %doc %{vfsdir}/%{vscandir}/INSTALL %endif -%files -n mount-cifs%{samba_major} -%defattr(-,root,root) -%attr(4755,root,root) /*bin/*mount.cifs%{alternative_major} -/*bin/cifs.upcall%{alternative_major} -%{_mandir}/man8/*mount.cifs*.8* -# %{_mandir}/man8/cifs.upcall*.8* - %files domainjoin-gui %defattr(-,root,root) %{_sbindir}/netdomjoin-gui @@ -2235,694 +2096,4 @@ update-alternatives --auto mount.cifs %{_datadir}/pixmaps/samba/logo.png %{_datadir}/pixmaps/samba/logo-small.png -#%exclude %{_mandir}/man1/smbsh*.1* -#%exclude %{_mandir}/man1/editreg* -# todo: -# fix alternatives for mount.cifs - - -%changelog -* Wed Apr 18 2012 Eugene Budanov 3.5.14-3 -- Fixed smb.conf option for net usershare command -- Fixed wrong permissions in some directories - -* Wed Apr 11 2012 Eugene Budanov 3.5.14-2 -- KDE fileshare through Samba was added - -* Thu Apr 10 2012 akdengi 3.5.14-1 -- CVE-2012-1182 -- Fix a crash bug in cldap_socket_recv_dgram() -- Fully observe password change settings -- Fix NT ACL issue. -- Fix segfault in Winbind if we can't map the last user. -- Fix race condition in Winbind. -- The VFS ACL modules are no longer experimental but production-ready. -- Fix access to Samba shares when Windows security patch KB2536276 is installed -- Fix Winbind panics if verify_idpool() fails. - -* Wed Jul 27 2011 Oden Eriksson 3.5.10-1mdv2011.0 -+ Revision: 691879 -- 3.5.10 - -* Tue Jun 28 2011 Buchan Milne 3.5.9-1 -+ Revision: 687769 -- update to new version 3.5.9 - -* Mon May 02 2011 Buchan Milne 3.5.8-1 -+ Revision: 662322 -- Explicitly request external tdb and talloc -- Try and fix netapi example linking -- Enable dns updates -- Remove some old patches -- Revert some pointless (taking into account samba4) non-maintainer changes -- Fix build with gcc-4.6 optflags - - + Funda Wang - - more file list cleanup - - merge various scripts and conf files - - about to mergeback - - + Per Øyvind Karlsen - - fix %%exclude abuse - - escape wildcards in shell so that they won't get expanded before %%files - - + Oden Eriksson - - also add the sources... - - a futile version bump... - - giving up on this because it's too complex to fix and i have no time... - - fix file list - - 3.5.7 - -* Wed Sep 15 2010 Buchan Milne 3.5.5-1mdv2011.0 -+ Revision: 578669 -- update to new version 3.5.5 - -* Thu Sep 02 2010 Thierry Vignaud 3.5.4-2mdv2011.0 -+ Revision: 575203 -- let the doc subpackage be noarch - -* Sat Jul 31 2010 Funda Wang 3.5.4-1mdv2011.0 -+ Revision: 563896 -- new version 3.5.4 - -* Tue Jun 08 2010 Buchan Milne 3.5.3-3mdv2010.1 -+ Revision: 547249 -- Add group to domainjoin-gui package -- Correct license tag -- Commit missing patch that tries to fix 'not a string literal' in netdomjoin-gui -- Cleaner fix for NULL pname in setup_logging (mdv#59677) (samba#7499) -- Enable domain join gui -- Prevent segfault due to previous patch if setup_logging is called with NULL pname - - + Thomas Backlund - - fix typo - - + Luca Berra - - fix nss_wins overwriting daemon syslog ident (#59677) - -* Thu Jun 03 2010 Frederic Crozat 3.5.3-2mdv2010.1 -+ Revision: 547046 -+ rebuild (emptylog) - -* Tue Jun 01 2010 Buchan Milne 3.5.3-1mdv2010.1 -+ Revision: 546828 -- New release 3.5.3 -- Should fix Mdv bug #58877, Mdv bug #59265 and possibly others related to - accessing files via libsmbclient (smb:// in Dolphin, Nautilus etc.) - -* Thu Apr 08 2010 Buchan Milne 3.5.2-1mdv2010.1 -+ Revision: 533210 -- update to new version 3.5.2 - -* Thu Apr 08 2010 Buchan Milne 3.5.1-1mdv2010.1 -+ Revision: 533162 -- Try alternate method for removing --no-undefined from plugin flags, and show - plugin flags along with other flags -- Require newer ctdb -- New version 3.5.1 -- Drop patch 29 (upstreamed), and disable undefined as upstream now sets -z defs - by default - not doing this results in undefined symbols in plugins -- Other minor changes (files,excludes) -- Notable upstream change: mount.cifs no longer allows undefined non-root mounts - -* Tue Mar 09 2010 Buchan Milne 3.4.7-1mdv2010.1 -+ Revision: 517012 -- update to new version 3.4.7 -- update to new version 3.4.6 - -* Thu Feb 25 2010 Zombie Ryushu 3.4.6-1mdv2010.1 -+ Revision: 511083 -- First Attempt at Samba 3.4.6 -- First Attempt at Samba 3.4.6 - - + Buchan Milne - - Fix Buildrequires and add explicit options to configure - -* Mon Jan 25 2010 Zombie Ryushu 3.4.5-1mdv2010.1 -+ Revision: 496286 -- Attempt to update to 3.4.5 in cooker -- Attempt to update to 3.4.5 in cooker - -* Fri Jan 08 2010 Buchan Milne 3.4.4-1mdv2010.1 -+ Revision: 487529 -- New version 3.4.4 -- Update some items in the default smb.conf (bug #56894) - -* Wed Dec 16 2009 Buchan Milne 3.4.3-2mdv2010.1 -+ Revision: 479214 -- Fix libsmbclient workgroup browsing (Mdv bug #56063) -- Fix build on 2009.0 and older (without samba4 providing ldb/tdb/talloc) - -* Thu Oct 29 2009 Buchan Milne 3.4.3-1mdv2010.1 -+ Revision: 460067 -- New version 3.4.3 -- Drop patches 24 and 26, applied upstream with bug 6791 - -* Thu Oct 01 2009 Oden Eriksson 3.4.2-1mdv2010.0 -+ Revision: 452236 -- 3.4.2 - -* Sun Sep 13 2009 Buchan Milne 3.4.1-1mdv2010.0 -+ Revision: 438980 -- New version 3.4.1 -- Disable patches merged since 3.4.1 -- New version 3.4.0 -- Adjust paths which have changed in source tree since 3.3.x -- Move some swat translations to swat package (with conflicts) -- Add suggests on samba-doc to samba-swat - -* Fri Aug 14 2009 Thomas Backlund 3.3.7-2mdv2010.0 -+ Revision: 416267 -- rebuild due to missing mount-cifs-3.3.7 on x86_64 - -* Wed Aug 12 2009 Buchan Milne 3.3.7-1mdv2010.0 -+ Revision: 415582 -- New version 3.3.7 -- Change default server string, as some Windows versions dont like it to change -- Move smb.conf out of packaging patch so it is under direct version control - -* Wed Jun 24 2009 Buchan Milne 3.3.6-1mdv2010.0 -+ Revision: 388816 -- update to new version 3.3.6 - -* Wed Jun 17 2009 Buchan Milne 3.3.5-1mdv2010.0 -+ Revision: 386659 -- New version 3.3.5 - -* Wed Jun 17 2009 Buchan Milne 3.3.4-1mdv2010.0 -+ Revision: 386579 -- update to new version 3.3.4 - -* Wed Jun 17 2009 Buchan Milne 3.3.3-1mdv2010.0 -+ Revision: 386571 -+ rebuild (emptylog) - -* Thu Apr 16 2009 Buchan Milne 3.3.3-0mdv2009.1 -+ Revision: 367753 -- New version 3.3.3 -- Buildrequire avahi-client-devel to enable (new) avahi support -- Fix winbind password expiry (Samba bug #6253), from Emmanuel Blindauer -- Enable ctdb support - -* Sat Mar 28 2009 Anssi Hannula 3.3.2-3mdv2009.1 -+ Revision: 361796 -- fix linking order of rpcclient and libwbclient (fix-linking-order.patch, - with the libwbclient case fixing undefined references in libwbclient.so) - -* Fri Mar 27 2009 Buchan Milne 3.3.2-2mdv2009.1 -+ Revision: 361668 -- Build against system (samba4) libtalloc, libtdb, and dont ship talloc, tdb, ldb - on 2009.1 or later - -* Fri Mar 13 2009 Buchan Milne 3.3.2-1mdv2009.1 -+ Revision: 354732 -- New version 3.3.2 -- Buildrequire libcap-devel, oplock buffering requires it on 3.2 and later - -* Wed Feb 25 2009 Buchan Milne 3.3.1-3mdv2009.1 -+ Revision: 344895 -- Fix conflict between libsmbclient-devel and other devel packages - -* Wed Feb 25 2009 Oden Eriksson 3.3.1-2mdv2009.1 -+ Revision: 344715 -- rebuilt against new readline - - + Buchan Milne - - New version 3.3.1 - -* Thu Feb 19 2009 Oden Eriksson 3.2.8-3mdv2009.1 -+ Revision: 343000 -- add "BuildConflicts: libcap-devel" to prevent unknown future borkiness and fjukiness... - -* Thu Feb 19 2009 Oden Eriksson 3.2.8-2mdv2009.1 -+ Revision: 342815 -- fix a silly typo -- fix deps because /usr/include/tdb.h was moved from - libsmbclient0-devel to libtdb-devel. - - + Guillaume Rousse - - new release - - rediff modules separation patch - -* Tue Feb 03 2009 Guillaume Rousse 3.2.7-2mdv2009.1 -+ Revision: 337185 -- keep bash completion in its own package - -* Tue Jan 06 2009 Buchan Milne 3.2.7-1mdv2009.1 -+ Revision: 325478 -- update to new version 3.2.7 - -* Mon Jan 05 2009 Oden Eriksson 3.2.6-3mdv2009.1 -+ Revision: 325110 -- fix deps -- fix a file conflict - -* Sun Jan 04 2009 Oden Eriksson 3.2.6-2mdv2009.1 -+ Revision: 324355 -- fix php-tdb build (P20 from debian) - -* Sat Dec 13 2008 Buchan Milne 3.2.6-1mdv2009.1 -+ Revision: 313997 --New version 3.2.6 - -* Fri Nov 28 2008 Buchan Milne 3.2.4-3mdv2009.1 -+ Revision: 307414 -- Security fix (CVE-2008-4314) -- Add patch fixing LDAP password modify exop (samba bug #5886) - -* Thu Oct 30 2008 Buchan Milne 3.2.4-2mdv2009.1 -+ Revision: 298718 -- Drop dangling mount.smb/mount.smbfs symlinks -- Make mount-cifs require new enough keyutils for krb5 support - -* Thu Oct 16 2008 Buchan Milne 3.2.4-1mdv2009.1 -+ Revision: 294197 -- New version 3.2.4 - -* Thu Oct 02 2008 Buchan Milne 3.2.3-3mdv2009.0 -+ Revision: 290748 -- Include the rest of the MODULESDIR-related changes (fixes bug #43924) - -* Sat Sep 13 2008 Colin Guthrie 3.2.3-2mdv2009.0 -+ Revision: 284482 -- Install pkgconfig .pc files for the various libraries - -* Tue Sep 02 2008 Buchan Milne 3.2.2-1mdv2009.0 -+ Revision: 279222 -- New version 3.2.3 -- New version 3.2.2 -- Use patch from git to fix separation of shared libraries and plugins -- Fix configure options, and avoid overriding variables at install time -- Ship cifs.upcall, and buildrequire keyutils on distributions with keyutils -- Fix linking order for cifs.upcall - -* Thu Aug 07 2008 Buchan Milne 3.2.1-1mdv2009.0 -+ Revision: 265872 -- New version 3.2.1 -- Add verification of source signatures - -* Mon Jul 28 2008 Buchan Milne 3.2.0-1mdv2009.0 -+ Revision: 251195 -- New version 3.2.0 -- Drop smbmount et al and related patches -- Add new library packages -- Conditionalise postgresql and mysql buildrequires -- Disable vscan support for now - - + Pixel - - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Tue Jun 03 2008 Buchan Milne 3.0.30-1mdv2009.0 -+ Revision: 214823 -- Remove recursive autoconf macros - Drop some obsolete patches -- New version 3.0.30 - Drop upstreamed patches (CVE-2008-1105) - Drop packaging of internal smbldap-tools (dropped upstream) - - + Pixel - - adapt to %%_localstatedir now being /var instead of /var/lib (#22312) - - + Oden Eriksson - - P22: security fix for CVE-2008-1105 - -* Sun Mar 23 2008 Emmanuel Andry 3.0.28a-2mdv2008.1 -+ Revision: 189635 -- Fix static-devel group -- protect major - -* Tue Mar 11 2008 Buchan Milne 3.0.28a-1mdv2008.1 -+ Revision: 186720 -- New version 3.0.28a - - + Thierry Vignaud - - fix summary-not-capitalized - -* Sun Jan 13 2008 Funda Wang 3.0.28-4mdv2008.1 -+ Revision: 150850 -- rebuild against latest gnutls - - + Thierry Vignaud - - drop old menu - - + Olivier Blin - - restore BuildRoot - -* Fri Dec 21 2007 Buchan Milne 3.0.28-3mdv2008.1 -+ Revision: 136361 -- Rebuild for new openldap (2.4) with new soname - -* Fri Dec 21 2007 Thierry Vignaud 3.0.28-2mdv2008.1 -+ Revision: 136255 -- rebuild with latest ldap -- kill re-definition of %%buildroot on Pixel's request - -* Mon Dec 10 2007 Buchan Milne 3.0.28-1mdv2008.1 -+ Revision: 117061 -- New version 3.0.28 - -* Wed Nov 21 2007 Buchan Milne 3.0.27a-1mdv2008.1 -+ Revision: 110969 -- New version 3.0.27a - -* Sun Nov 18 2007 Funda Wang 3.0.27-1mdv2008.1 -+ Revision: 109971 -- New version 3.0.27 - -* Wed Oct 10 2007 Buchan Milne 3.0.26a-1mdv2008.1 -+ Revision: 96878 -- Update to 3.0.26a and samba-vscan 0.3.6c-beta5 - - + Oden Eriksson - - make mount.cifs umount.cifs build - - + Thierry Vignaud - - s/Mandrake/Mandriva/ - -* Wed Sep 12 2007 Buchan Milne 3.0.25b-4mdv2008.0 -+ Revision: 84705 -- Add patch for CVE-2007-4138 - - + Thierry Vignaud - - kill desktop-file-validate's error: string list key "Categories" in group "Desktop Entry" does not have a semicolon (";") as trailing character - -* Mon Aug 27 2007 Guillaume Rousse 3.0.25b-3mdv2008.0 -+ Revision: 71811 -- bash completion - -* Thu Aug 23 2007 Thierry Vignaud 3.0.25b-2mdv2008.0 -+ Revision: 69948 -- fileutils, sh-utils & textutils have been obsoleted by coreutils a long time ago -- fix man pages extension - -* Mon Jul 02 2007 Andreas Hasenack 3.0.25b-1mdv2008.0 -+ Revision: 47103 -- updated to version 3.0.25b - -* Wed Jun 27 2007 Andreas Hasenack 3.0.25a-2mdv2008.0 -+ Revision: 44948 -- re-enable serverbuild, rebuild with new rpm-mandriva-setup (-fstack-protector) - -* Thu May 31 2007 Buchan Milne 3.0.25a-1mdv2008.0 -+ Revision: 33289 -- Update default-quota-ignore-error patch - - + Andreas Hasenack - - updated to version 3.0.25a - - updated vscan to 0.3.6c-beta4 (this one builds with samba 3.0.25a) - - dropped smbw patch, target is not available anymore - - -* Tue Mar 27 2007 Buchan Milne 3.0.24-2mdv2007.1 -+ Revision: 148953 -- Drop socket options (bug #28459) -- Unzip patches - -* Mon Feb 05 2007 Buchan Milne 3.0.24-1mdv2007.1 -+ Revision: 116478 -- Better change to accomodate the build system -- Use a different method for telling users that options exist (to fix submit-ing) -- New version 3.0.24 - -* Wed Dec 06 2006 Buchan Milne 3.0.23d-2mdv2007.1 -+ Revision: 91717 -- drop old quota patch that is no longer relevant - -* Thu Nov 23 2006 Buchan Milne 3.0.23d-1mdv2007.1 -+ Revision: 86629 -- New version 3.0.23d - -* Tue Nov 14 2006 Andreas Hasenack 3.0.23b-7mdv2007.1 -+ Revision: 84192 -- don't overengineer -- gcc is not mandatory to do rpm queries on a .src.rpm, which is what the - buildsystem ends up doing, so we need to guard against that -- include pam_winbind.conf configuration file for pam_winbind - in samba-winbind package -- rebuild with new ncurses (5.5-1.20051029.3mdv2007.0) - - + Buchan Milne - - move pam_nologin to account, it does not work in auth - - fix badly migrated pam file (#26122) - -* Wed Sep 06 2006 Buchan Milne 3.0.23b-6mdv2007.0 -+ Revision: 60160 -- buildrequire cups-comon until new cups-devel is available, to ensure we get - cups-config (requiredd for cups support) - -* Thu Aug 31 2006 Buchan Milne 3.0.23b-5mdv2007.0 -+ Revision: 58827 -- Drop bad partial update-alternatives call in triggerpostun in mount-cifs on samba-client (should fix #24900) - Revert change to versioning of this trigger, as the update to the alternatives - works on upgrades without it -- bump release, as previous commit fixes #24864 -- add line continuation in mount-cifs postinstall -- fix man page alternatives on upgrade too -- 2nd additional slave is for *u*mount -- (minor) again -- (minor) %%_extension has a . -- rebuild, among others to get samba to link to cups on x86_64 -- add alternatives for mount.cifs man pages - -* Mon Aug 14 2006 Buchan Milne 3.0.23b-1mdv2007.0 -+ Revision: 55828 -- xdg menu, use www-browser on all desktops -- New version 3.0.23b - Fix default and example passdb backend entries in smb.conf (#23919) -- Use pam 0.9x-compatible pam file on 2007.0 and later (#24201) - Drop absolute paths from pam files -- Convert winbind.init to parallel/LSB format (#24226) -- Convert smb.init to parallel/LSB format (#24218) -- Move files from packaging patch to be sources -- Import samba - -* Thu Jul 13 2006 Buchan Milne 3.0.23-2mdv2007.0 -- put back the libsmbclient symlink fix (bug #23684) - -* Wed Jul 12 2006 Buchan Milne 3.0.23-1mdv2007.0 -- New release 3.0.23 -- dont set subrel by default, since mkrel is used on cooker -- dont hup smbd for CUPS, we use printcap cache time by default (#23149) -- drop pdb_xml too -- clean macro usage in changelog - -* Thu Apr 06 2006 Till Kamppeter 3.0.22-2mdk -- Moved CUPS backend directory from /usr/lib64/cups/backend to - /usr/lib/cups/backend on 64-bit systems. - -* Thu Apr 06 2006 Buchan Milne 3.0.22-1mdk -- New release 3.0.22 - -* Thu Mar 02 2006 Buchan Milne 3.0.21c-2mdk -- fix fr translation for swat - bug #21387 (neoclust) - -* Tue Feb 28 2006 Buchan Milne 3.0.21c-1mdk -- New release 3.0.21c -- fix prereq issues -- fix alternative for smbtar man page - -* Tue Jan 31 2006 Buchan Milne 3.0.21b-1mdk -- New release 3.0.21b -- switch pgsql and mysql passdb backends to be optional (non-default) - -* Tue Jan 03 2006 Buchan Milne 3.0.21a-1mdk -- New release 3.0.21a -- rpmbuildupdate-able - -* Wed Dec 21 2005 Buchan Milne 3.0.21-1mdk -- 3.0.21 - -* Thu Nov 24 2005 Buchan Milne 3.0.20b-4mdk -- fix pdb_ldap segfault on x86_64 -- update to patches for 3.0.20b -- latest quota fixes (thx maxxik) - -* Mon Nov 14 2005 Oden Eriksson 3.0.20b-3mdk -- rebuilt against openssl-0.9.8a - -* Sun Oct 30 2005 Oden Eriksson 3.0.20b-2mdk -- rebuilt against MySQL-5.0.15 - -* Sat Oct 15 2005 Buchan Milne 3.0.20b-1mdk -- New release 3.0.20b -- use smbldap config patch from smbldap-tools package - -* Fri Oct 14 2005 Buchan Milne 3.0.20a-2mdk -- quota crash fix from samba bug 3070 - -* Wed Oct 05 2005 Buchan Milne 3.0.20a-1mdk -- New release 3.0.20a -- drop upstream patches (p15-p18) - -* Tue Sep 13 2005 Buchan Milne 3.0.20-3mdk -- more post-3.0.20 patches -- minor chnages to default smb.conf - -* Wed Aug 31 2005 Buchan Milne 3.0.20-2mdk -- update group enumeration patch, add winbind patch from - http://www.samba.org/samba/patches/ - -* Wed Aug 31 2005 Buchan Milne 3.0.20-1mdk -- 3.0.20 -- patch config files back into packaging dir for now -- alternativise client man pages -- add new docs, fix documentation paths -- add new idmap_ad plugin -- group enumeration patch from Jerry - -* Wed Aug 31 2005 Buchan Milne 3.0.14a-5mdk -- Rebuild for libldap2.3 - -* Fri Jun 10 2005 Buchan Milne 3.0.14a-4mdk -- Rebuild for libkrb53-devel 1.4.1 - -* Wed Jun 08 2005 Buchan Milne 3.0.14a-3mdk -- drop gcc4 patch (unnecessary,broken) - -* Sat May 07 2005 Oden Eriksson 3.0.14a-2mdk -- added one gcc4 patch (debian) - -* Fri Apr 22 2005 Buchan Milne 3.0.14a-1mdk -- 3.0.14a -- drop patch12 -- samba-vscan 0.3.6, including fixes and adding antivir -- update local definition of mkrel - -* Thu Apr 21 2005 Oden Eriksson 3.0.13-3mdk -- rebuilt against new postgresql libs - -* Tue Apr 05 2005 Buchan Milne 3.0.13-2mdk -- add patch for winbind compatability with win2k3-sp1 (p12) - -* Sat Apr 02 2005 Buchan Milne 3.0.13-1mdk -- 3.0.13 (#14873) -- fix smbldap paths (#15138) and new entries (#15133) - -* Wed Mar 09 2005 Buchan Milne 3.0.11-4mdk -- fix upgrade por people who had 3.0.11-1mdk - -* Wed Mar 02 2005 Buchan Milne 3.0.11-3mdk -- also replace suffix variable in smbldap configurations -- only migrate smbldap config once -- some config tweaks (p11) -- fix example winbind smb.conf -- only link/remove our smbldap-tools - -* Thu Feb 24 2005 Buchan Milne 3.0.11-2mdk -- add idmap_rid (#13678) -- split mount.cifs as mount-cifs (as agreed with SUSE) -- split smbldap-tools off for 10.1 and older (don't ship files for 10.2 and - later), and provide script to migrate previous config upon installation - of -smbldap-tools subpackage -- drop the unnecessary cache file backup - -* Thu Feb 10 2005 Buchan Milne 3.0.11-1mdk -- 3.0.11 -- new smbldap-tools (redo patch etc) -- drop editreg - -* Fri Feb 04 2005 Buchan Milne 3.0.10-3mdk -- rebuild for ldap2.2_7 - -* Tue Jan 25 2005 Oden Eriksson 3.0.10-2mdk -- rebuilt against MySQL-4.1.x system libs -- fix summary-ended-with-dot - -* Tue Dec 21 2004 Buchan Milne 3.0.10-1mdk -- 3.0.10 -- use mkrel-based distro-specific release tag - -* Tue Nov 30 2004 Buchan Milne 3.0.9-4mdk -- fix --with test (and show it in --with options) -- let the build configuration depend on the buildhost name for i586 - -* Tue Nov 23 2004 Christiaan Welvaart 3.0.9-3mdk -- don't let build configuration depend on buildhostname - -* Fri Nov 19 2004 Buchan Milne 3.0.9-2mdk -- fix build when not system (tdbtool must be suffixed also), bug 12417 - -* Thu Nov 18 2004 Buchan Milne 3.0.9-1mdk -- 3.0.9 -- drop packaging patch (merged) - -* Wed Nov 17 2004 Buchan Milne 3.0.8-2mdk -- add a symlink for mount.cifs in /sbin, so mount -t cifs works - -* Tue Nov 09 2004 Buchan Milne 3.0.8-1mdk -- 3.0.8 -- add tdbtool to common -- fix doc permissions (broken in tarball) - -* Fri Nov 05 2004 Buchan Milne 3.0.8-0.pre2.1mdk -- 3.0.8pre2 - -* Thu Oct 07 2004 Buchan Milne 3.0.7-3mdk -- drop patch 23 to ldap schema (patch in 3.0.6 was to bring schema up-to-date - with pre-3.0.7 cvs) (#11960) -- merge winbind init script fix into packaging patch -- Don't set printcap name in pdf printer share (#11861) -- allow official builds off-cluster (with _with_official macro defined) - -* Wed Sep 15 2004 Stew Benedict 3.0.7-2mdk -- fix typo in winbind init script that prevented stop - (in 3.0.6 too, patch27) - -* Tue Sep 14 2004 Stew Benedict 3.0.7-1mdk -- 3.0.7 (drop patch10,21,22,24,25,26; rediff patch23) - -* Fri Sep 10 2004 Buchan Milne 3.0.6-5mdk -- patch for samba bug 1464 -- make release-depenent release tag more like security updates tags -- sync smb.conf with drakwizard (which also fixes quoting of macros which - can have spaces) -- add example admin share -- patches from Gerald Carter - -* Wed Sep 01 2004 Buchan Milne 3.0.6-4mdk -- Add Jerry's post-3.0.6 patches -- fix bug 11088 - -* Sat Aug 28 2004 Buchan Milne 3.0.6-3mdk -- patch from Urban Widmark via Robert Sim (anthill bug 1086) to be able - to diable unix extensions in smbmount (and via 'unix extensions' in smb.conf) -- magic-devel only available on 9.2 and up -- allow building for stable release on the chroots on the cluster -- fix patch8 -- fix build on older releases - -* Sat Aug 21 2004 Buchan Milne 3.0.6-2mdk -- 3.0.6 --drop P6 (merged), P7 (broken for now) --keep libsmbclient where it belongs (on x86 for now) --implement mandrake version-specific release number - -* Fri Aug 13 2004 Buchan Milne 3.0.5-2mdk -- 3.0.5 -- fix pid file location (#10666) -- merge amd64 fixes (P7) -- make pdf printer work again, and other misc fixes to default config - -* Mon Jun 21 2004 Oden Eriksson 3.0.5-0.pre1.3mdk -- fix rpm group in libsmbclient0-devel (Goetz Waschk) - -* Sun Jun 20 2004 Oden Eriksson 3.0.5-0.pre1.2mdk -- fix deps - -* Thu May 27 2004 Buchan Milne 3.0.5-0.pre1.1mdk -- fix building without scanners -- 3.0.5pre1 (and drop patch from CVS) - -* Sat May 22 2004 Buchan Milne 3.0.4-3mdk -- re-work scanner support - -* Fri May 14 2004 Buchan Milne 3.0.4-2mdk -- 3.0.4 -- Patch for winbind (from samba bug 1315) - -* Fri Apr 30 2004 Buchan Milne 3.0.2a-4mdk -- Fix samba-vscan (0.3.5), add clamav and icap, and build scanners by default -- Fix default vscan-clamav config and add sample config for homes share -- Add pgsql passdb backend diff --git a/smb-migrate b/smb-migrate new file mode 100644 index 0000000..08a5023 --- /dev/null +++ b/smb-migrate @@ -0,0 +1,197 @@ +#!/usr/bin/perl + +# migrate old samba2 smb.conf settings to new samba3 setup +# as well as merge local configuration settings +# Dec 3 2003 Stew Benedict +# revised Jan 6 2004 - dropping some parameters +# revised Feb 11 2004 - don't try to process a config a second time + +# check command line arguments +my $numargs = @ARGV; +if ($numargs lt 1) { + print "useage: smb-migrate test|test-commit|commit\n"; + exit(1); +} + +# define some variables +my $user_parms = 0; +my $new_conf_file = "/etc/samba/smb.conf"; +my @new_conf; +my $merged_conf_file = "/etc/samba/smb.conf"; +my $merge_comment = "# *** merged from original smb.conf: ***\n"; +my $uncomment_comment = "# *** uncommented from original smb.conf: ***\n"; +my $unique_comment = "# *** unique added from original smb.conf: ***\n"; +my @merge_log; +my $log_file = "/var/log/samba/smb-migrate.log"; +my $to_merge = "/etc/samba/smb.conf.tomerge"; + +if ($ARGV[0] eq "test" || $ARGV[0] eq "test-commit") { + $to_merge = "smb.conf"; + $log_file = "smb-migrate.log"; + $merged_conf_file = "smb.conf.merged"; +} + +# if the file has already been processed, don't do it again +my $processed = `grep -c 'original smb.conf: ***' $to_merge`; +if ($processed > 0) { + `cp $to_merge $new_conf_file`; + print "Already processed, aborting.\n"; + exit 0; +} + +# get the stripped, uncommented data from old smb.conf +my @old_conf = `grep -v "^#" $to_merge | grep -v "^;" | grep -v "^\$"` or die; + +# use a clean config file as a starting point +`cp /usr/share/samba/smb.conf.clean $new_conf_file` if $ARGV[0] !~ /test/; + +# and the whole new conf file we're going to merge with +my @new_conf_org = `cat $new_conf_file` or die; + +mlog("Data to change/add in standard sections of smb.conf:\n\n"); + +sub mlog { + my (@dstring) = @_; + if ($ARGV[0] eq "test") { + print "@dstring"; + } else { + push @merge_log, @dstring; + } +} + +sub merge_conf { + my ($header, $new_value) = @_; + my @parmlist = split " = ", $new_value; + my $match = 0; + my $comment = ''; + $comment = $unique_comment if $continuation = 0; + $continuation = 1; + + # find the header in question + $index = 0; + foreach (@new_conf_org) { + if (/^\[$header\]|;\[$header\]|^; \[$header\]|^\[$header\$\]|;\[$header\$\]|^; \[$header\$\]/) { + # restore print$ + $header = "print" . '$' if $header eq "print"; + # if the header is commented, remove the comment + if (/^;\[|^#\[|^; \[/) { + my $entry = $_; + @new_conf_org[$index] =~ s/^;|^; |^#//g; + mlog("uncomment: $header line $index: $entry -> @new_conf_org[$index]"); + splice(@new_conf_org, $index, 0, $uncomment_comment); + $index++ + } + $start_loc = $index; +# print "[$header]: $start_loc\n"; + last; + } + $index++ + } + + my $elements = @new_conf_org; + + # walk through this header's entries, update as needed + for ($i = $start_loc + 1; $i < $elements; $i++) { + # if we hit a new header, may be commented - bail out + my $is_header = @new_conf_org[$i]; + $is_header =~ s/^ |\t|\n//; + if ($is_header =~ /^\[|;\[|#\[/) { +# print "new header: $is_header at $i\n"; + if ($match == 0) { + # it's possible the parameter is continued across multiple lines + $continuation = 0 if $new_value !~ /\\$/; + # completely new entry, try to place it under the correct header +# print "new entry for [$header]: $new_value\n"; + mlog("unique: $header line $last_index: $new_value"); + splice(@new_conf_org, $last_index + 1, 0, $comment, $new_value); + $last_index++;$last_index++; + } + return; + } + + # some syntax changes + if ($new_value =~ /winbind/) { + $old_value = $new_value; + $new_value =~ s/winbind/idmap/; + mlog("syntax: $header: $old_value -> $new_value"); + } + + # partial match, decide whether to add or replace + if (@new_conf_org[$i] =~ /@parmlist[0]/) { + if (@new_conf_org[$i] !~ /^;|^#/) { + if (@new_conf_org[$i] ne $_) { + mlog("update: $header line $i: @new_conf_org[$i] -> $new_value"); + @new_conf_org[$i] = ";" . $new_conf_org[$i]; + splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value); +# $match = 1; + } + $match = 1; + } else { + # is it really a definition or just a comment? + if (@new_conf_org[$i] =~ / = /) { + # commented in new config, add the old entry + mlog("add: $header line $i: @new_conf_org[$i] -> $new_value"); + splice(@new_conf_org, $i + 1, 0, $merge_comment, $new_value); + $i++;$i++; + $match = 1; + } + } +# $match = 1 if $new_value eq @new_conf_org[$i]; + $last_index = $i; + return if ($match eq 1); + $match = 0; + } + } + return; +} + +foreach (@old_conf) { + # check for section headers + if (/^\[/) { + # standard headers? + if (!/^\[global\]|^\[homes\]|^\[netlogon\]|^\[Profiles\]|^\[printers\]|^\[print\$\]|^\[pdf-generator\]/) { + # non-standard - add to new config + $user_parms = 1; + push (@new_conf, $_); + } else { + $user_parms = 0; + chop; + $header = $_; + s/\[|\]|\$//g; + $bare_header = $_; + } + } else { + # non-standard - add to new config + if ($user_parms == 1) { + push (@new_conf, $_); + } else { + # now we're working with standard settings + # update new config with values if they differ or are commented out + # translate any old nomenclature to the new style + # may still be some commented lines buried + # throw those out and try to merge into new config + if (!/^[ ]+#|^[ ]+;|^#|^;/) { +# print "$header: $_\n"; + merge_conf($bare_header, $_); + } + } + } +} + +# write the user config data to new smb.conf + +mlog("\nNew data for smb.conf:\n\n"); +mlog("@new_conf"); + +if ($ARGV[0] eq "commit" || $ARGV[0] eq "test-commit") { + local *NEWCONF; + open(NEWCONF, "> $merged_conf_file"); + print NEWCONF @new_conf_org; + print NEWCONF @new_conf; + close NEWCONF; + local *LOGFILE; + open(LOGFILE, "> $log_file"); + print LOGFILE @merge_log; + close LOGFILE +} + diff --git a/smb.conf b/smb.conf index 70b2499..36d78d8 100644 --- a/smb.conf +++ b/smb.conf @@ -1,3 +1,4 @@ + # This is the main Samba configuration file. You should read the # smb.conf(5) manual page in order to understand the options listed # here. Samba has a huge number of configurable options (perhaps too @@ -16,11 +17,11 @@ # 1. Server Naming Options: # workgroup = NT-Domain-Name or Workgroup-Name - workgroup = WORKGROUP + workgroup = MGAGROUP # netbios name is the name you will see in "Network Neighbourhood", # but defaults to your hostname -# netbios name = +# netbios name = # server string is the equivalent of the NT Description field server string = %h @@ -342,18 +343,6 @@ # dos charset = 850 # unix charset = ISO8859-1 -# 9. Allow usershares through 'net' command: - - usershare max shares = 100 - -# 10. Guest mode support for usershares. This is need for properly browsing machine through -# "Network neighborhood" in Windows. - - usershare allow guests = Yes - -# 11. - - usershare owner only = False #============================ Share Definitions ============================== [homes] diff --git a/smb.init b/smb.init index e480460..3b26c45 100644 --- a/smb.init +++ b/smb.init @@ -9,6 +9,7 @@ # Required-Start: $network # Required-Stop: $network # Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 # Short-Description: Samba servers (nmbd and smbd) # Description:Starts and stops the Samba smbd and nmbd daemons # used to provide SMB network services. diff --git a/swat_16.png b/swat_16.png new file mode 100644 index 0000000000000000000000000000000000000000..a75223a3e695ad72ec3a7233c5d3e16af1cf905f GIT binary patch literal 918 zcmV;H18Mw;P)qfo&aUDz}l>{2mZxw9}; zY!$lDt##MG;A87X_u5q#r6EeRO3|Rk2R@=kJBe6=8Iuq(A-9VVBlJN_-4uE@-`(8% zoqNvtKHxw86+D05-QC?y^x}o8sw&Z4%{3N_$B&zvo12NAJ@b0KUZAC=wY8-M5ClP} zs3@F*0Qh`9-^Y)@)YSC!^z`2oxK}I`MV4h57#@E8dSCz`ibf+5V05&nr>hI-?S1>U zs|&E%Y&N_7?v%YDaC{tzL?XcXc`jF024u7GcsvfoVpgjt0uLVCzn{+oHk;l4D+1Nk zk|asLZ_$kfu~;k?ivj!lXJ;1|z`}wky4^ro*^?(kfYWIR znM@|bFvU3&6XWCK;{ea|JkJv?EiEqx0zfdhy88Ju@afa?^4c1pX_}^Kx0qP1R;$%Y zbaE1j93K-Ulc`iHMU+Ye-m z$wb6)EX#4FuwGtXT*TwR)m0{wP6O$5I-O1fCnu+;r>D0v@bYC}Utb^5t5^N~{rx~7 z5C{YUz|qm+;o%`LKR-7&HwS21G#ZT-GgH!_7*2!1XfzmrswzRKssajD0f~gJr&0jR zo}YjH3g~)40b|L#U@#a2CMVr)xBExp{u;%BBO`C#jEn%XEX#@l)YsS7KY9c>91e%W z0c>q;ZEbEA2!vFvP07*qoM6N<$f=K$Jy8r+H literal 0 HcmV?d00001 diff --git a/swat_32.png b/swat_32.png new file mode 100644 index 0000000000000000000000000000000000000000..86972dc861d68fbccce52dc195facb23b33834bc GIT binary patch literal 2484 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 V56)>l9pE+$aC35ZtUpP){C_Weo!I~Y literal 0 HcmV?d00001 diff --git a/swat_48.png b/swat_48.png new file mode 100644 index 0000000000000000000000000000000000000000..0a147a17d86415dd573c143235c5d9efa74a8ecc GIT binary patch literal 4724 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 literal 0 HcmV?d00001 diff --git a/winbind.init b/winbind.init index 2c8d44c..9404751 100644 --- a/winbind.init +++ b/winbind.init @@ -2,16 +2,17 @@ # # chkconfig: 345 81 45 # description: Starts and stops the Samba winbind daemon to provide \ -# user and group information from a domain controller to linux. +# user and group information from a domain controller to linux. # ### BEGIN INIT INFO # Provides: winbind # Required-Start: $network # Required-Stop: $network # Default-Start: 3 4 5 +# Default-Stop: 0 1 2 6 # Short-Description: Winbind naming service (winbindd) # Description: Starts and stops the Samba winbind daemon to provide -# user and group information from a domain controller to linux. +# user and group information from a domain controller to linux. ### END INIT INFO # Source function library.