Compare commits
9 Commits
master
...
samba-3_5_
Author | SHA1 | Date | |
---|---|---|---|
|
407926417d | ||
|
7021ac8149 | ||
|
7ca128e451 | ||
|
e305e4f90a | ||
|
6db39a9882 | ||
|
44398852c8 | ||
|
7a6cf149f5 | ||
|
33143d8d35 | ||
|
fe3572be5f |
@ -1 +1 @@
|
|||||||
samba-3.5.0rc2.tar.gz
|
samba-3.5.4.tar.gz
|
||||||
|
2
nmb.init
2
nmb.init
@ -71,7 +71,7 @@ reload() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rhstatus() {
|
rhstatus() {
|
||||||
status nmbd
|
status -l nmb nmbd
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
64
samba.spec
64
samba.spec
@ -1,9 +1,9 @@
|
|||||||
%define main_release 54
|
%define main_release 62
|
||||||
%define samba_version 3.5.0
|
%define samba_version 3.5.4
|
||||||
%define tdb_version 1.1.7
|
%define tdb_version 1.2.1
|
||||||
%define talloc_version 2.0.1
|
%define talloc_version 2.0.1
|
||||||
#%define pre_release %nil
|
#%define pre_release rc3
|
||||||
%define pre_release rc2
|
%define pre_release %nil
|
||||||
|
|
||||||
%define samba_release %{main_release}%{pre_release}%{?dist}
|
%define samba_release %{main_release}%{pre_release}%{?dist}
|
||||||
|
|
||||||
@ -37,7 +37,6 @@ Source999: filter-requires-samba.sh
|
|||||||
|
|
||||||
# upstream patches. Applied first so that they'll break our patches rather
|
# upstream patches. Applied first so that they'll break our patches rather
|
||||||
# than the other way around
|
# than the other way around
|
||||||
# (none right now)
|
|
||||||
|
|
||||||
# generic patches
|
# generic patches
|
||||||
Patch102: samba-3.2.0pre1-pipedir.patch
|
Patch102: samba-3.2.0pre1-pipedir.patch
|
||||||
@ -83,15 +82,6 @@ The samba-client package provides some SMB/CIFS clients to complement
|
|||||||
the built-in SMB/CIFS filesystem in Linux. These clients allow access
|
the built-in SMB/CIFS filesystem in Linux. These clients allow access
|
||||||
of SMB/CIFS shares and printing to SMB/CIFS printers.
|
of SMB/CIFS shares and printing to SMB/CIFS printers.
|
||||||
|
|
||||||
%package -n cifs-utils
|
|
||||||
Summary: Helper programs for mounting shares using the in-kernel CIFS client
|
|
||||||
Group: Applications/System
|
|
||||||
Requires: samba-common = %{epoch}:%{samba_version}-%{release}
|
|
||||||
|
|
||||||
%description -n cifs-utils
|
|
||||||
The cifs-utils package contains helper programs for mounting shares
|
|
||||||
using the in-kernel Linux CIFS client.
|
|
||||||
|
|
||||||
%package common
|
%package common
|
||||||
Summary: Files used by both Samba servers and clients
|
Summary: Files used by both Samba servers and clients
|
||||||
Requires: libtdb >= 0:%{tdb_version}
|
Requires: libtdb >= 0:%{tdb_version}
|
||||||
@ -203,7 +193,6 @@ cp %{SOURCE10} packaging/Fedora/
|
|||||||
cp %{SOURCE11} packaging/Fedora/
|
cp %{SOURCE11} packaging/Fedora/
|
||||||
|
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
#(none)
|
|
||||||
# generic patches
|
# generic patches
|
||||||
%patch102 -p1 -b .pipedir
|
%patch102 -p1 -b .pipedir
|
||||||
#%patch103 -p1 -b .logfiles
|
#%patch103 -p1 -b .logfiles
|
||||||
@ -262,7 +251,6 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
|
|||||||
--with-pammodulesdir=%{_lib}/security \
|
--with-pammodulesdir=%{_lib}/security \
|
||||||
--with-swatdir=%{_datadir}/swat \
|
--with-swatdir=%{_datadir}/swat \
|
||||||
--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
|
--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
|
||||||
--with-cifsupcall \
|
|
||||||
--with-cluster-support=auto \
|
--with-cluster-support=auto \
|
||||||
--with-libtalloc=no \
|
--with-libtalloc=no \
|
||||||
--enable-external-libtalloc=yes \
|
--enable-external-libtalloc=yes \
|
||||||
@ -281,7 +269,7 @@ make LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%sam
|
|||||||
%{?_smp_mflags} \
|
%{?_smp_mflags} \
|
||||||
-C lib/netapi/examples
|
-C lib/netapi/examples
|
||||||
|
|
||||||
make debug2html smbfilter bin/cifs.upcall
|
make debug2html smbfilter
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -370,7 +358,6 @@ install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
|
|||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
||||||
install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
|
install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
|
||||||
install -m755 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
|
|
||||||
|
|
||||||
install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
|
install -m 755 %samba_source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
|
||||||
@ -388,10 +375,11 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1*
|
|||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
|
||||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/umount.cifs.8*
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}mount.cifs.8*
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man8/{u,}cifs.upcall.8*
|
||||||
|
|
||||||
# why are these getting installed in the wrong place?
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
|
rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
|
||||||
|
|
||||||
#Rename ldb tools, as samba3 has an old copy of ldb.
|
#Rename ldb tools, as samba3 has an old copy of ldb.
|
||||||
mv -f $RPM_BUILD_ROOT%{_bindir}/ldbadd $RPM_BUILD_ROOT%{_bindir}/ldb3add
|
mv -f $RPM_BUILD_ROOT%{_bindir}/ldbadd $RPM_BUILD_ROOT%{_bindir}/ldb3add
|
||||||
@ -538,13 +526,6 @@ exit 0
|
|||||||
%{_mandir}/man1/sharesec.1*
|
%{_mandir}/man1/sharesec.1*
|
||||||
%{_mandir}/man8/smbspool.8*
|
%{_mandir}/man8/smbspool.8*
|
||||||
|
|
||||||
%files -n cifs-utils
|
|
||||||
%defattr(-,root,root)
|
|
||||||
/sbin/mount.cifs
|
|
||||||
%{_sbindir}/cifs.upcall
|
|
||||||
%{_mandir}/man8/mount.cifs.8*
|
|
||||||
%{_mandir}/man8/cifs.upcall.8*
|
|
||||||
|
|
||||||
%files common
|
%files common
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
|
%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
|
||||||
@ -667,6 +648,33 @@ exit 0
|
|||||||
%{_datadir}/pixmaps/samba/logo-small.png
|
%{_datadir}/pixmaps/samba/logo-small.png
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 23 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.4-62
|
||||||
|
- Update to 3.5.4
|
||||||
|
|
||||||
|
* Wed May 19 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.3-61
|
||||||
|
- Update to 3.5.3
|
||||||
|
- Make sure nmb and smb initscripts return LSB compliant return codes
|
||||||
|
- Fix winbind over ipv6
|
||||||
|
|
||||||
|
* Sat May 01 2010 Simo Sorce <ssorce@redhat.com> - 3.5.2-60
|
||||||
|
- Fix segfault bug #586511
|
||||||
|
|
||||||
|
* Wed Apr 07 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.2-59
|
||||||
|
- Update to 3.5.2
|
||||||
|
|
||||||
|
* Mon Mar 08 2010 Simo Sorce <ssorce@redhat.com> - 3.5.1-58
|
||||||
|
- Security update to 3.5.1
|
||||||
|
- Fixes CVE-2010-0728
|
||||||
|
|
||||||
|
* Mon Mar 08 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0-57
|
||||||
|
- Remove cifs.upcall and mount.cifs entirely
|
||||||
|
|
||||||
|
* Wed Mar 03 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0-56
|
||||||
|
- Update to 3.5.0
|
||||||
|
|
||||||
|
* Mon Feb 22 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0rc3-55
|
||||||
|
- Update to 3.5.0rc3
|
||||||
|
|
||||||
* Tue Jan 26 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0rc2-54
|
* Tue Jan 26 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.0rc2-54
|
||||||
- Update to 3.5.0rc2
|
- Update to 3.5.0rc2
|
||||||
|
|
||||||
|
2
smb.init
2
smb.init
@ -71,7 +71,7 @@ reload() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rhstatus() {
|
rhstatus() {
|
||||||
status smbd
|
status -l smb smbd
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user