Hi Adam, On Tue, Jan 13, 2009 at 09:16:29AM -0600, Adam Williams wrote: > will the mount.cifs compile error on Fedora 10 i386 and x86_64 be fixed > when running packing/RHEL/makerpms.sh? I've submitted bug reports and got > a patch on 12/23/08 from you and reported that the patch didn't fix the > error and never got a reply.
yes, three patches concerning RHEL packaging will be included. These patches fix the problem for me. Please report if it they don't work for you. Please find attached the patches. Karolin -- Samba http://www.samba.org SerNet http://www.sernet.de sambaXP http://www.sambaxp.org
From c93a5131913a1a18645c4f972be6f6b2c1715f28 Mon Sep 17 00:00:00 2001
From: Michael Adam <ob...@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 <ob...@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
From 097e9d64ade609da9f920156c98b466dc6c42dab Mon Sep 17 00:00:00 2001
From: Karolin Seeger <ksee...@samba.org>
Date: Thu, 8 Jan 2009 13:10:59 +0100
Subject: [PATCH] packaging RHEL: Fix syntax error in samba.spec.tmpl.
Karolin
---
packaging/RHEL/samba.spec.tmpl | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index a93b5d9..e0e772c 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -222,8 +222,7 @@ install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss
# Samba 3.2.2 installs them into /usr/lib{,64}/samba/ .
# This step will become unnecessary in 3.3.0.
#
-for library in libsmbclient libsmbsharemodes libwbclient libtalloc libtdb
-libnetapi
+for library in libsmbclient libsmbsharemodes libwbclient libtalloc libtdb libnetapi
do
mv -f ${RPM_BUILD_ROOT}%{_libarchdir}/samba/${library}.* \
${RPM_BUILD_ROOT}%{_libarchdir}/
--
1.6.0.2
From 9995378cf3f28af183030c3867513552d85bf935 Mon Sep 17 00:00:00 2001
From: Michael Adam <ob...@samba.org>
Date: Wed, 17 Dec 2008 22:27:39 +0100
Subject: [PATCH] packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
(cherry picked from commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9)
---
packaging/RHEL/samba.spec.tmpl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 1e43116..a93b5d9 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -245,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 bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/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
pgp5M5rtnOKYT.pgp
Description: PGP signature
-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
