summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-12-05 17:14:16 +0000
committerGerald Carter <jerry@samba.org>2003-12-05 17:14:16 +0000
commite24850dce1698621fc08aa838c55330c4bef2cbd (patch)
treea96b7aa100b84f68eaaccb5ca8eb0f321df733ee
parent26dab8d9ddf3f5658b3b3a047c4c3690955e728e (diff)
downloadsamba-e24850dce1698621fc08aa838c55330c4bef2cbd.tar.gz
samba-e24850dce1698621fc08aa838c55330c4bef2cbd.tar.bz2
samba-e24850dce1698621fc08aa838c55330c4bef2cbd.zip
packaging updates from Buchan
(This used to be commit b67929cc3e2339e0865f2924b930f1d834c20ed9)
-rw-r--r--packaging/Mandrake/samba2.spec.tmpl13
-rw-r--r--packaging/Mandrake/winbind.init2
2 files changed, 11 insertions, 4 deletions
diff --git a/packaging/Mandrake/samba2.spec.tmpl b/packaging/Mandrake/samba2.spec.tmpl
index cff54d146b..127aee48d8 100644
--- a/packaging/Mandrake/samba2.spec.tmpl
+++ b/packaging/Mandrake/samba2.spec.tmpl
@@ -14,11 +14,12 @@
%define pkg_name samba
%define ver 3.0.1pre3
-%define rel 3mdk
+%define rel 5mdk
%define vscanver 0.3.3beta1
%define libsmbmajor 0
-%{!?mklibname: %define mklibname %lib%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}}
+%{!?lib: %global lib lib}
+%{!?mklibname: %global mklibname(ds) %lib%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}}
%define libname %mklibname smbclient %libsmbmajor
@@ -1647,7 +1648,13 @@ update-alternatives --auto smbclient
%exclude %{_mandir}/man1/smbsh*.1*
%changelog
-* Sun Nov 16 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.rpe3.3mdk
+* Fri Dec 05 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.5mdk
+- Allow winbind to start if old winbind ranges are used (ease upgrades)
+
+* Tue Nov 18 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.4mdk
+- Fix build as system on 8.2 (and probably earlier)
+
+* Sun Nov 16 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.3mdk
- Ensure printer drivers keep permissions by default (setgid and inherit perms)
* Fri Nov 14 2003 Buchan Milne <bgmilne@linux-mandrake.com> 3.0.1-0.pre3.2mdk
diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
index e5bc9adcbf..06e5b375d0 100644
--- a/packaging/Mandrake/winbind.init
+++ b/packaging/Mandrake/winbind.init
@@ -28,7 +28,7 @@ RETVAL=0
start() {
echo -n "Starting Winbind services: "
RETVAL=1
- if [ "`grep -i 'idmap uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i 'idmap gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
+ if [ "`grep -i -E '(idmap|winbind) uid' /etc/samba/smb.conf | egrep -v [\#\;]`" -a "`grep -i -E '(idmap|winbind) gid' /etc/samba/smb.conf | egrep -v [\#\;]`" ]; then
daemon winbindd
RETVAL=$?
else