rpm/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

- Remove references to disabled vscan build.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=174
This commit is contained in:
Lars Müller 2011-08-08 15:30:18 +00:00 committed by Git OBS Bridge
parent b4ded83beb
commit bf002b6492
6 changed files with 43 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-source-timestamp
View File

@ -1,2 +1,2 @@
2582 2583
Branch : trunk Branch : trunk

3
samba-doc.spec
View File

@ -108,7 +108,6 @@ BuildRequires: ccache
# requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent
%define make_doc 0 %define make_doc 0
%define make_utils 0 %define make_utils 0
%define make_vscan 0
%define make_ldapsmb 1 %define make_ldapsmb 1
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
%define cifs_init_script cifs %define cifs_init_script cifs
@ -415,7 +414,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%changelog %changelog

3
samba-vscan-0.3.6b.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4
size 164471

5
samba.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 8 15:03:53 UTC 2011 - lmuelle@suse.de
- Remove references to disabled vscan build.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 4 17:12:25 UTC 2011 - lmuelle@suse.de Thu Aug 4 17:12:25 UTC 2011 - lmuelle@suse.de

129
samba.spec
View File

@ -80,7 +80,6 @@ BuildRequires: pkgconfig
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define vscan_ver 0.3.6b
%define ldapsmb_ver 1.34b %define ldapsmb_ver 1.34b
License: GPLv3+ License: GPLv3+
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
@ -104,7 +103,6 @@ Source1: vendor-files.tar.bz2
Source2: patches.tar.bz2 Source2: patches.tar.bz2
Source3: build-source-timestamp Source3: build-source-timestamp
Source4: baselibs.conf Source4: baselibs.conf
Source10: http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2
Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2
# Choose some features / extra packages here # Choose some features / extra packages here
############################################ ############################################
@ -116,7 +114,6 @@ BuildRequires: ccache
# requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent
%define make_doc 0 %define make_doc 0
%define make_utils 0 %define make_utils 0
%define make_vscan 0
%define make_ldapsmb 1 %define make_ldapsmb 1
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
%define cifs_init_script cifs %define cifs_init_script cifs
@ -187,7 +184,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package client %package client
@ -227,7 +224,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -254,7 +251,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%endif %endif
@ -284,7 +281,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%endif %endif
@ -311,7 +308,7 @@ Authors:
-------- --------
Jeremy Allison <jra at samba dot org> Jeremy Allison <jra at samba dot org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%if %{make_utils} %if %{make_utils}
@ -333,6 +330,9 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2583
Branch : trunk
%endif %endif
%package winbind %package winbind
@ -361,7 +361,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -371,6 +371,7 @@ License: GPLv3+
%else %else
%package -n libsmbclient0 %package -n libsmbclient0
License: GPLv3+ License: GPLv3+
Provides: libsmbclient = %{version}-%{release} Provides: libsmbclient = %{version}-%{release}
Obsoletes: libsmbclient Obsoletes: libsmbclient
@ -387,13 +388,16 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%else %else
%description -n libsmbclient0 %description -n libsmbclient0
Source Timestamp: 2583
Branch : trunk
%endif %endif
This package includes the libsmbclient library. This package includes the libsmbclient library.
@ -437,7 +441,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libnetapi0 %package -n libnetapi0
@ -456,7 +460,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libnetapi-devel %package -n libnetapi-devel
@ -481,7 +485,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -491,6 +495,7 @@ License: GPLv3+
%else %else
%package -n libsmbsharemodes0 %package -n libsmbsharemodes0
License: GPLv3+ License: GPLv3+
%endif %endif
Summary: Samba smbsharemodes Library Summary: Samba smbsharemodes Library
@ -502,13 +507,16 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%else %else
%description -n libsmbsharemodes0 %description -n libsmbsharemodes0
Source Timestamp: 2583
Branch : trunk
%endif %endif
This package includes the smbsharemodes library. This package includes the smbsharemodes library.
@ -543,7 +551,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libwbclient0 %package -n libwbclient0
@ -562,7 +570,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libwbclient-devel %package -n libwbclient-devel
@ -587,7 +595,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libtalloc2 %package -n libtalloc2
@ -608,7 +616,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libtalloc-devel %package -n libtalloc-devel
@ -635,7 +643,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libtdb1 %package -n libtdb1
@ -656,7 +664,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libtdb-devel %package -n libtdb-devel
@ -679,7 +687,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libtevent0 %package -n libtevent0
@ -700,7 +708,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libtevent-devel %package -n libtevent-devel
@ -728,7 +736,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libldb1 %package -n libldb1
@ -751,7 +759,7 @@ Authors:
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%package -n libldb-devel %package -n libldb-devel
@ -778,7 +786,7 @@ Authors:
-------- --------
The Samba Team <samba@samba.org> The Samba Team <samba@samba.org>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -802,34 +810,9 @@ Authors:
-------- --------
Guenther Deschner <guenther at deschner dot de> Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2582 Source Timestamp: 2583
Branch : trunk Branch : trunk
%endif
%if %{make_vscan}
%package vscan
License: GPLv2+
Summary: On-Access Virus Scanning with Samba
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 0.3.6b
Release: 268
Requires: samba = %{samba_ver}
Url: http://www.openantivirus.org/
%description vscan
samba-vscan provides on-access scanning of Samba shares with ClamAV,
FRISK F-Prot, F-Secure AV, Kaspersky Anti-Virus, mks32, OAV
ScannerDaemon, Sophos Sweep, Symantec AntiVirus Engine (via ICAP) and
Trend Micro.
Authors:
--------
Rainer Link <rainer@openantivirus.org>
%endif %endif
%prep %prep
@ -857,18 +840,6 @@ for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do
exit 1 exit 1
fi fi
done done
# vscan
%if %{make_vscan}
%setup -T -D -a 10 -n samba-%{samba_ver_full}/examples/VFS -q
pushd samba-vscan-%{vscan_ver}
for patch in $( ../../../patches/tools/guards %{guards_symbols} <../../../patches/vscan/series); do
if ! patch -s -E -p0 --no-backup-if-mismatch -i ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/patches/vscan/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
popd
%endif
# vendor-files (config, scripts, tools) # vendor-files (config, scripts, tools)
%setup -T -D -a 1 -n samba-%{samba_ver_full} -q %setup -T -D -a 1 -n samba-%{samba_ver_full} -q
for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do
@ -994,14 +965,6 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer"
./script/mkversion.sh ./script/mkversion.sh
%{__make} %{build_make_smp_mflags} \ %{__make} %{build_make_smp_mflags} \
all bin/smbfilter all bin/smbfilter
%if %{make_vscan}
pushd ../examples/VFS/samba-vscan-%{vscan_ver}/
%{?suse_update_config:%{suse_update_config -f}}
autoreconf --force --install
./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/
%{__make} %{build_make_smp_mflags}
popd
%endif
%if %{make_ldapsmb} %if %{make_ldapsmb}
pushd ../ldapsmb-%{ldapsmb_ver} pushd ../ldapsmb-%{ldapsmb_ver}
./autogen.sh ./autogen.sh
@ -1094,7 +1057,6 @@ popd
${RPM_BUILD_ROOT}/%{PIDDIR} \ ${RPM_BUILD_ROOT}/%{PIDDIR} \
${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \
${RPM_BUILD_ROOT}/%{_var}/run \ ${RPM_BUILD_ROOT}/%{_var}/run \
${RPM_BUILD_ROOT}/%{DOCDIR}-vscan \
${RPM_BUILD_ROOT}/%{DOCDIR} \ ${RPM_BUILD_ROOT}/%{DOCDIR} \
${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \
${RPM_BUILD_ROOT}/%{SWATDIR}/help \ ${RPM_BUILD_ROOT}/%{SWATDIR}/help \
@ -1265,12 +1227,6 @@ done
%__install -m 0755 source3/bin/nsstest ${RPM_BUILD_ROOT}/%{_bindir}/nsstest %__install -m 0755 source3/bin/nsstest ${RPM_BUILD_ROOT}/%{_bindir}/nsstest
%__install -m 0755 source3/bin/vfstest ${RPM_BUILD_ROOT}/%{_bindir}/vfstest %__install -m 0755 source3/bin/vfstest ${RPM_BUILD_ROOT}/%{_bindir}/vfstest
%endif %endif
%if %{make_vscan}
# install VSCAN-vfs-modules
%{__make} -C examples/VFS/samba-vscan-%{vscan_ver} install \
DESTDIR="${RPM_BUILD_ROOT}" \
MODULESDIR=%{_libdir}/samba
%endif
%if %{make_ldapsmb} %if %{make_ldapsmb}
install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb ${RPM_BUILD_ROOT}/%{_sbindir}/ install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb ${RPM_BUILD_ROOT}/%{_sbindir}/
cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
@ -1278,10 +1234,6 @@ cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
# cups SMB support # cups SMB support
mkdir -p ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/ mkdir -p ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/
touch ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/smb touch ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/smb
# add docs
%if %{make_vscan}
mv examples/VFS/samba-vscan-%{vscan_ver} .
%endif
# pam_smbpass is missing # pam_smbpass is missing
cp -a source3/pam_smbpass/samples examples/pam_smbpass cp -a source3/pam_smbpass/samples examples/pam_smbpass
%__install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG %__install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG
@ -1335,10 +1287,6 @@ rm -f \
%find_lang pam_winbind %find_lang pam_winbind
cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind
%find_lang net %find_lang net
# sort out vscan-modules from the main filelist
for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ! -iname '*vscan*' ); do
echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
done
# copy the schema # copy the schema
%__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema
%__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema %__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema
@ -1840,15 +1788,6 @@ fi
%dir %{cups_lib_dir} %dir %{cups_lib_dir}
%dir %{cups_lib_dir}/backend %dir %{cups_lib_dir}/backend
%ghost %{cups_lib_dir}/backend/smb %ghost %{cups_lib_dir}/backend/smb
%if %{make_vscan}
%files vscan
%defattr(-,root,root)
%{_libdir}/samba/vfs/vscan*
%doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,INSTALL,NEWS,README,TODO}
%doc samba-vscan-%{vscan_ver}/*/vscan-*.conf
%dir %{_libdir}/samba/vfs
%endif
%files -n libnetapi0 %files -n libnetapi0
%defattr(-,root,root) %defattr(-,root,root)

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:fe494221fffe97c0528ce970f0bf615ae26ad3788365c83c82ebff775a52cb71 oid sha256:e82e3795b9ebf485ababf332b34d3e589879eceeb47a0793950b4d2c20b37749
size 51456 size 51454