[Pkg-samba-maint] r2686 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-04-02 20:25:57 +0000 (Thu, 02 Apr 2009)
New Revision: 2686

Removed:
   trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch
Modified:
   trunk/samba/debian/patches/series
Log:
Drop patch that was applied upstream


Deleted: trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch
===================================================================
--- trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch	2009-04-02 20:25:24 UTC (rev 2685)
+++ trunk/samba/debian/patches/fix_wrong_gnu_ld_version_check.patch	2009-04-02 20:25:57 UTC (rev 2686)
@@ -1,30 +0,0 @@
-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-04-02 20:25:24 UTC (rev 2685)
+++ trunk/samba/debian/patches/series	2009-04-02 20:25:57 UTC (rev 2686)
@@ -11,7 +11,6 @@
 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