summaryrefslogtreecommitdiff
path: root/packaging/Debian/debian-sarge/patches/samba.patch
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-07-15 16:51:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:22 -0500
commitb047fd336ad8ce618c293085387f9fe6770926e0 (patch)
tree0c3c807b9b43b126621551a36d331c0f0401a288 /packaging/Debian/debian-sarge/patches/samba.patch
parent5fe140babcbec90ddcbd9a6517c3f5e76844a9e9 (diff)
downloadsamba-b047fd336ad8ce618c293085387f9fe6770926e0.tar.gz
samba-b047fd336ad8ce618c293085387f9fe6770926e0.tar.bz2
samba-b047fd336ad8ce618c293085387f9fe6770926e0.zip
r17063: Update debian-sarge for 3.0.23
(This used to be commit a77b18c78197f40ab51462f3a35d27f300a8359c)
Diffstat (limited to 'packaging/Debian/debian-sarge/patches/samba.patch')
-rw-r--r--packaging/Debian/debian-sarge/patches/samba.patch17
1 files changed, 9 insertions, 8 deletions
diff --git a/packaging/Debian/debian-sarge/patches/samba.patch b/packaging/Debian/debian-sarge/patches/samba.patch
index f4c8ca8742..8e77cfb86e 100644
--- a/packaging/Debian/debian-sarge/patches/samba.patch
+++ b/packaging/Debian/debian-sarge/patches/samba.patch
@@ -39,17 +39,18 @@ diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/we
if (!cli_initialise(&cli))
return False;
---- samba-3.0.1/source/script/installbin.sh.orig 2003-10-10 14:08:36.000000000 -0400
-+++ samba-3.0.1/source/script/installbin.sh 2003-12-17 10:51:45.000000000 -0500
-@@ -24,12 +24,14 @@
- chmod $INSTALLPERMS $BINDIR/$p2
+--- samba-3.0.23/source/script/installbin.sh.in.orig 2006-07-15 09:08:36.000000000 -0400
++++ samba-3.0.23/source/script/installbin.sh.in 2006-07-15 09:51:45.000000000 -0400
+@@ -21,13 +21,14 @@
+ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
# this is a special case, mount needs this in a specific location
- if [ $p2 = smbmount ]; then
-- if [ ! -d $DESTDIR/sbin ]; then
-- mkdir $DESTDIR/sbin
-- fi
-- ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
+- if [ ! -d $DESTDIR/@rootsbindir@ ]; then
+- mkdir $DESTDIR/@rootsbindir@
+- fi
+- echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
+- ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
- fi
+# Commented out for the Debian Samba package. We take care of this
+# important symlink in debian/rules. (peloy@debian.org)