Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (59dbb9e9d7b86b3d2152d333c9dbc0036f6fab06)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (59dbb9e9d7b86b3d2152d333c9dbc0036f6fab06)
  • Date: Mon, 24 Mar 2008 17:44:14 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

net/samba/HISTORY | 3 ++
net/samba/PRE_BUILD | 2 +
net/samba/libcap.patch | 52
+++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 57 insertions(+)

New commits:
commit 59dbb9e9d7b86b3d2152d333c9dbc0036f6fab06
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

samba: Apply patch to use proper capget after libcap update

diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index bd88f7a..1c2ca75 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,5 +1,8 @@
2008-03-24 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on libcap
+ * PRE_BUILD: Apply libcap.patch
+ * libcap.patch: Fix conflicting declarations of capget
+ From http://bugs.gentoo.org/show_bug.cgi?id=210527

2008-03-21 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on e2fsprogs for libcom_err and libss
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 0292bd6..dd1e6db 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < $SCRIPT_DIRECTORY/libcap.patch &&
+
sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/net/samba/libcap.patch b/net/samba/libcap.patch
new file mode 100644
index 0000000..d097173
--- /dev/null
+++ b/net/samba/libcap.patch
@@ -0,0 +1,52 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=210527
+#
+Revision: 1.1 - (download) (annotate)
+Wed Feb 20 20:02:54 2008 UTC (4 weeks, 5 days ago) by dev-zero
+Branch: MAIN
+CVS Tags: HEAD
+
+Added patches to fix bugs #210527 and #210662 and the broken-readdir
detection.
+(Portage version: 2.1.4.4)
+
+diff -Naurb samba-3.0.28.orig/source/configure.in
samba-3.0.28/source/configure.in
+--- samba-3.0.28.orig/source/configure.in 2007-11-21 04:58:01.000000000
+0100
++++ samba-3.0.28/source/configure.in 2008-02-20 14:31:05.167709211 +0100
+@@ -2663,6 +2663,7 @@
+ if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
+ AC_DEFINE(HAVE_POSIX_CAPABILITIES, 1,
+ [Whether POSIX capabilities are available])
++ AC_CHECK_DECLS([capget], , , [#include <sys/capability.h>])
+ else
+ LIBS=$ac_save_LIBS
+ fi
+diff -Naurb samba-3.0.28.orig/source/include/config.h.in
samba-3.0.28/source/include/config.h.in
+--- samba-3.0.28.orig/source/include/config.h.in 2007-12-10
17:04:29.000000000 +0100
++++ samba-3.0.28/source/include/config.h.in 2008-02-20 14:32:41.246837408
+0100
+@@ -1211,6 +1211,9 @@
+ /* Whether POSIX capabilities are available */
+ #undef HAVE_POSIX_CAPABILITIES
+
++/* Whether the capget (and capset) function is available (libcap-2.x has
it) */
++#undef HAVE_DECL_CAPGET
++
+ /* Whether posix_fadvise is available */
+ #undef HAVE_POSIX_FADVISE
+
+diff -Naurb samba-3.0.28.orig/source/smbd/oplock_linux.c
samba-3.0.28/source/smbd/oplock_linux.c
+--- samba-3.0.28.orig/source/smbd/oplock_linux.c 2007-11-15
04:15:04.000000000 +0100
++++ samba-3.0.28/source/smbd/oplock_linux.c 2008-02-20 14:31:48.327720338
+0100
+@@ -34,10 +34,12 @@
+ uint32 inheritable;
+ } data;
+
++#if defined HAVE_DECL_CAPGET && !HAVE_DECL_CAPGET
+ extern int capget(struct cap_user_header * hdrp,
+ struct cap_user_data * datap);
+ extern int capset(struct cap_user_header * hdrp,
+ const struct cap_user_data * datap);
++#endif
+
+ static SIG_ATOMIC_T signals_received;
+ #define FD_PENDING_SIZE 100
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (59dbb9e9d7b86b3d2152d333c9dbc0036f6fab06), Eric Sandall, 03/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page