Attachment 3868 Details for Bug 6029 – proposed patch 1

[patch] proposed patch 1

0001-packaging-RHEL-fix-build-of-u-mount.cifs.patch (text/plain), 2.11 KB, created by Karolin Seeger on 2009-01-13 10:05:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2009-01-13 10:05:24 UTC

Size: 2.11 KB

patch

obsolete

>From c93a5131913a1a18645c4f972be6f6b2c1715f28 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Wed, 17 Dec 2008 18:56:34 +0100
>Subject: [PATCH] packaging(RHEL): fix build of [u]mount.cifs
>
>mount.cifs is now built by make everything.
>And it needs extra objects anyways (mtab.o),
>which is why the build of mount.cifs failed.
>
>Michael
>(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
>(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
>(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
>---
> packaging/RHEL/samba.spec.tmpl |   10 ++--------
> 1 files changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
>index 49a0109..1e43116 100644
>--- a/packaging/RHEL/samba.spec.tmpl
>+++ b/packaging/RHEL/samba.spec.tmpl
>@@ -179,12 +179,6 @@ fi
> make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
> 	all modules pam_smbpass
> 
>-## build the cifs fs mount helper
>-cd client
>-gcc  -o mount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c
>-gcc  -o umount.cifs $RPM_OPT_FLAGS  -D_GNU_SOURCE -Wall -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c
>-cd ..
>-
> # Remove some permission bits to avoid to many dependencies
> cd ..
> find examples docs -type f | xargs -r chmod -x
>@@ -251,8 +245,8 @@ install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
> install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
> install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
> install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
>-install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
>-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
>+install -m755 bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
>+install -m755 bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
> install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
> 
> /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
>-- 
>1.6.0.2
>

Actions: View

Attachments on bug 6029: 3868 | 3869 | 3870 | 3874