[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (bf9ca19d0c25c18973a9986650bc9a1a1594ffd7)

Jaka Kranjc scm at sourcemage.org
Fri Jun 13 05:51:46 EDT 2008


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 net/samba/HISTORY                    |    3 +++
 net/samba/PRE_BUILD                  |    1 +
 net/samba/wrong_python_ldflags.patch |   25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+)

New commits:
commit bf9ca19d0c25c18973a9986650bc9a1a1594ffd7
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    samba: fixed python support #14522

diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index d660bf4..5442e0c 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2008-06-13 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* wrong_python_ldflags.patch, PRE_BUILD: added gentoo patch to fix #14522
+
 2008-05-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.0.30, SECURITY_PATCH=8, CVE-2008-1105
 
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 775e18c..f83d950 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -3,6 +3,7 @@ cd  $SOURCE_DIRECTORY  &&
 
 patch -p1 < $SCRIPT_DIRECTORY/libcap.patch  &&
 patch -p1 < $SCRIPT_DIRECTORY/valgrind-include.patch  &&
+patch -p1 < $SCRIPT_DIRECTORY/wrong_python_ldflags.patch  &&
 
 sedit  's!libsmbclient.*\$(LIBDIR)!&/..!'  source/Makefile.in  &&
 
diff --git a/net/samba/wrong_python_ldflags.patch b/net/samba/wrong_python_ldflags.patch
new file mode 100644
index 0000000..6f5c8ba
--- /dev/null
+++ b/net/samba/wrong_python_ldflags.patch
@@ -0,0 +1,25 @@
+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



More information about the SM-Commit mailing list