Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.48 grimoire by George Sherwood (97822c21d5c1696e06764eecedd54997d1e26267)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.48 grimoire by George Sherwood (97822c21d5c1696e06764eecedd54997d1e26267)
  • Date: Sat, 25 Sep 2010 13:33:42 -0500

GIT changes to stable-0.48 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

net/samba/DETAILS | 6 ++--
net/samba/HISTORY | 4 ++
net/samba/libcap.patch | 52
-----------------------------------
net/samba/valgrind-include.patch | 20 -------------
net/samba/wrong_python_ldflags.patch | 25 ----------------
5 files changed, 7 insertions(+), 100 deletions(-)

New commits:
commit 97822c21d5c1696e06764eecedd54997d1e26267
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

samba 3.5.5, SECURITY_PATCH=13
(cherry picked from commit ae2fd21744984b23d7d780d3a976d9d16c1bb3f6)

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 4437c3f..ad3527a 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,18 +1,18 @@
SPELL=samba
- VERSION=3.5.4
+ VERSION=3.5.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:65d95726eb53cce1942270f00b8fc007573783ab6b6401e6acb8d9e05af6d2fa1552c1a2ad9260e09a5a66af5c9696a3a24e0c03028ed56f464e2e4d7ba176b2
+
SOURCE_HASH=sha512:54a469c3c960fea82499b124046affc9b0c81fe6ce9b8ce564da40e4a19bff9c643eb8981a5f2c9ebf36722aa6e4337ef911a2af467639089cd32851c37ffd6e
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=12
+ SECURITY_PATCH=13
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 78c1dcc..eae04fd 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2010-09-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.5.5, SECURITY_PATCH=13
+ * {libcap,valgrind-include,wrong_python_ldflags}.patch: removed
+
2010-06-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.5.4

diff --git a/net/samba/libcap.patch b/net/samba/libcap.patch
deleted file mode 100644
index d097173..0000000
--- a/net/samba/libcap.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# 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
-
diff --git a/net/samba/valgrind-include.patch
b/net/samba/valgrind-include.patch
deleted file mode 100644
index e4f5463..0000000
--- a/net/samba/valgrind-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naupr samba-3.0.29.orig/source/include/includes.h
samba-3.0.29/source/include/includes.h
---- samba-3.0.29.orig/source/include/includes.h 2008-05-25
15:19:04.092291327 +0200
-+++ samba-3.0.29/source/include/includes.h 2008-05-25 15:19:34.167036737
+0200
-@@ -255,6 +255,7 @@ typedef int ber_int_t;
- #include <aio.h>
- #endif
-
-+#if 0
- /* skip valgrind headers on 64bit AMD boxes */
- #ifndef HAVE_64BIT_LINUX
- /* Special macros that are no-ops except when run under Valgrind on
-@@ -275,7 +276,7 @@ typedef int ber_int_t;
- #define VALGRIND
- #endif
- #endif
--
-+#endif
-
- /* we support ADS if we want it and have krb5 and ldap libs */
- #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
diff --git a/net/samba/wrong_python_ldflags.patch
b/net/samba/wrong_python_ldflags.patch
deleted file mode 100644
index 6f5c8ba..0000000
--- a/net/samba/wrong_python_ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur samba-3.0.28a.orig/source/Makefile.in
samba-3.0.28a/source/Makefile.in
---- samba-3.0.28a.orig/source/Makefile.in 2008-05-17 12:20:23.000000000
+0200
-+++ samba-3.0.28a/source/Makefile.in 2008-05-17 12:23:38.000000000 +0200
-@@ -1666,7 +1666,8 @@
- fi
- PYTHON_OBJS="$(PYTHON_OBJ)" \
- PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
-- LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS)
$(LDAP_LIBS)" \
-+ LDFLAGS="$(LDSHFLAGS)" \
-+ LIBS="$(LDSHFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS)
$(LDAP_LIBS)" \
- $(PYTHON) python/setup.py build
-
- python_install: $(PYTHON_OBJ)
-@@ -1676,8 +1677,9 @@
- fi
- PYTHON_OBJS="$(PYTHON_OBJ)" \
- PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
-- LIBS="$(LDFLAGS) $(LIBS)" \
-- $(PYTHON) python/setup.py install --root=$(DESTDIR)
-+ LDFLAGS="$(LDSHFLAGS)" \
-+ LIBS="$(LDSHFLAGS) $(LIBS)" \
-+ $(PYTHON) python/setup.py install --root="$(DESTDIR)"
-
- python_clean:
- @-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi



  • [SM-Commit] GIT changes to stable-0.48 grimoire by George Sherwood (97822c21d5c1696e06764eecedd54997d1e26267), George Sherwood, 09/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page