[Pkg-samba-maint] r2626 - in trunk/samba/debian: . patches

vorlon at alioth.debian.org vorlon at alioth.debian.org
Sun Mar 1 21:12:32 UTC 2009 

Author: vorlon
Date: 2009-03-01 21:12:31 +0000 (Sun, 01 Mar 2009)
New Revision: 2626

Added:
   trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/autoconf.patch
   trunk/samba/debian/patches/series
Log:
debian/patches/fix_wrong_gnu_ld_version_check.patch: new patch to fix
wrong detection of the GNU ld version, so that the symbol export scripts
will be properly applied when building.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-03-01 15:46:25 UTC (rev 2625)
+++ trunk/samba/debian/changelog	2009-03-01 21:12:31 UTC (rev 2626)
@@ -25,6 +25,9 @@
     auto-configure itself
   * debian/control: make libpam-smbpass depend on
     libpam-runtime (>= 1.0.1-2ubuntu1) for the above
+  * debian/patches/fix_wrong_gnu_ld_version_check.patch: new patch to fix
+    wrong detection of the GNU ld version, so that the symbol export scripts
+    will be properly applied when building.
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 25 Feb 2009 17:34:26 +0100
 

Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch	2009-03-01 15:46:25 UTC (rev 2625)
+++ trunk/samba/debian/patches/autoconf.patch	2009-03-01 21:12:31 UTC (rev 2626)
@@ -25,10 +25,10 @@
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: samba-3.3.1/source/configure
+Index: samba-deb/source/configure
 ===================================================================
---- samba-3.3.1.orig/source/configure
-+++ samba-3.3.1/source/configure
+--- samba-deb.orig/source/configure
++++ samba-deb/source/configure
 @@ -1,11 +1,11 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -11242,15 +11242,16 @@
          if test -n "$ac_cv_gnu_ld_date"; then
   	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
   		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-@@ -12589,21 +12002,21 @@
+@@ -12589,25 +12002,25 @@
  		ac_cv_gnu_ld_version_script=yes
  	fi
          else
 -           { $as_echo "$as_me:$LINENO: checking GNU ld release version" >&5
 -$as_echo_n "checking GNU ld release version... " >&6; }
+-                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
 +           { echo "$as_me:$LINENO: checking GNU ld release version" >&5
 +echo $ECHO_N "checking GNU ld release version... $ECHO_C" >&6; }
-                       ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
++                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
             ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
             ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
 -                      { $as_echo "$as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr}" >&5
@@ -11276,6 +11277,11 @@
             if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
               ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
             fi
+-           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
++           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
+              ac_cv_gnu_ld_version_script=yes
+            fi
+         fi
 @@ -12616,16 +12029,16 @@
  
  
@@ -70195,10 +70201,10 @@
 +	{ echo "$as_me:$LINENO: result:       \$ eval \\`dmalloc samba\\`." >&5
 +echo "${ECHO_T}      \$ eval \\`dmalloc samba\\`." >&6; }
  fi
-Index: samba-3.3.1/source/include/config.h.in
+Index: samba-deb/source/include/config.h.in
 ===================================================================
---- samba-3.3.1.orig/source/include/config.h.in
-+++ samba-3.3.1/source/include/config.h.in
+--- samba-deb.orig/source/include/config.h.in
++++ samba-deb/source/include/config.h.in
 @@ -69,6 +69,9 @@
  /* Whether to use fully FHS-compatible paths */
  #undef FHS_COMPATIBLE

Added: trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch
===================================================================
--- trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch	                        (rev 0)
+++ trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch	2009-03-01 21:12:31 UTC (rev 2626)
@@ -0,0 +1,30 @@
+Goal: Fix bugs in the detection of the GNU ld version, which results in
+a failure to use linker scripts to limit the set of symbols exported by
+our shared libraries.
+
+Author: Steve Langasek <vorlon at debian.org>
+
+Upstream status: submitted as bugzilla bug #6147
+
+Index: samba-deb/source/configure.in
+===================================================================
+--- samba-deb.orig/source/configure.in
++++ samba-deb/source/configure.in
+@@ -250,7 +250,7 @@
+         else
+            AC_MSG_CHECKING(GNU ld release version)
+            changequote(,)dnl
+-           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
++           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*[^0-9\.]\+\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+            ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
+            ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
+            changequote([,])dnl
+@@ -262,7 +262,7 @@
+            if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
+              ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
+            fi
+-           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
++           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
+              ac_cv_gnu_ld_version_script=yes
+            fi
+         fi

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2009-03-01 15:46:25 UTC (rev 2625)
+++ trunk/samba/debian/patches/series	2009-03-01 21:12:31 UTC (rev 2626)
@@ -11,6 +11,7 @@
 VERSION.patch
 adapt_machine_creation_script.patch
 proper-static-lib-linking.patch 
+fix_wrong_gnu_ld_version_check.patch
 autoconf.patch
 smbpasswd-syslog.patch
 usershare.patch

More information about the Pkg-samba-maint mailing list