Reinstate and refresh the hurd_fixes patch (#833539).

It mostly still applies.

diff --git a/debian/changelog b/debian/changelog
index 5378c4564c8024a98af7a4cd0bebed9ea22fb85e..8ff370ede43ec6dfef35f9fb86a19ba8be878669 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ ncbi-blast+ (2.4.0-3) UNRELEASED; urgency=medium
   * NOT YET RELEASED.
   * debian/rules: Properly build (but don't install) run_with_lock.
     (Closes: #833538.)
+  * Reinstate and refresh the hurd_fixes patch, which mostly still applies.
+    (Closes: #833539.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Fri, 05 Aug 2016 19:37:34 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 05 Aug 2016 19:40:28 -0400
 
 ncbi-blast+ (2.4.0-2) unstable; urgency=medium
 

diff --git a/debian/patches/hurd_fixes b/debian/patches/hurd_fixes
index 97b76d66c88260e0221c0db9d2d609eb679827d8..6d2c913abbedc722edda6c4332ec926df300c895 100644 (file)
--- a/debian/patches/hurd_fixes
+++ b/debian/patches/hurd_fixes
@@ -9,7 +9,7 @@ Author: Aaron M. Ucko <ucko@debian.org>
 Last-Update: 2011-06-10
 --- a/c++/src/build-system/configure
 +++ b/c++/src/build-system/configure
-@@ -7420,7 +7420,7 @@
+@@ -9000,7 +9000,7 @@ if test -z "$CONF_f_runpath" ; then
      solaris* )
        CONF_f_runpath="-R"
        ;;
@@ -20,7 +20,7 @@ Last-Update: 2011-06-10
      irix*:* | linux*:KCC | *:Compaq )
 --- a/c++/src/build-system/configure.ac
 +++ b/c++/src/build-system/configure.ac
-@@ -1558,7 +1558,7 @@
+@@ -1894,7 +1894,7 @@ if test -z "$CONF_f_runpath" ; then
      solaris* )
        CONF_f_runpath="-R"
        ;;
@@ -40,16 +40,3 @@ Last-Update: 2011-06-10
  #  define PATH_MAX 512                  // will actually use less than 32 chars
  #endif // NCBI_OS_MSWIN && !PATH_MAX
  
---- a/c++/src/connect/ext/ncbi_localnet.c
-+++ b/c++/src/connect/ext/ncbi_localnet.c
-@@ -62,6 +62,10 @@
- #  endif /*_MAX_PATH*/
- #endif /*NCBI_OS_MSWIN && !PATH_MAX*/
- 
-+#if !defined(PATH_MAX)
-+#  define PATH_MAX 4096
-+#endif /*Patch added for Ubuntu build*/
-+
- #if PATH_MAX < 256
- #  define BUFSIZE  256
- #else

diff --git a/debian/patches/series b/debian/patches/series
index ad2f27101273c339d207081f237994cbca04c691..7b3674e6431831547de172845f259fa628869b27 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 enable_clean_after_failed_compile
-#hurd_fixes
+hurd_fixes
 legacy_rename_rpsblast
 fix_lib_deps
 no_multiarch_rpath