diff -u dante-1.1.19.dfsg/debian/changelog dante-1.1.19.dfsg/debian/changelog --- dante-1.1.19.dfsg/debian/changelog +++ dante-1.1.19.dfsg/debian/changelog @@ -1,3 +1,16 @@ +dante (1.1.19.dfsg-3ubuntu9) saucy; urgency=low + + * debian/patches/03-configure.patch + - Revert hardcoded libdl.so path + * debian/patches/15-fixlibc-search.patch + - Fix dante-server using the wrong libc.so (LP: #816153) + by changing the search patch for the libc.so + * debian/patches/16-fix-dlopen.patch + - Fix socksify fails to run (LP: #857598) + by adding search logic to locate the proper libdl.so + + -- Louis Bouchard Wed, 12 Jul 2013 14:39:18 +0200 + dante (1.1.19.dfsg-3ubuntu8) raring; urgency=low * No-change rebuild to update the dependency on the current libc6. diff -u dante-1.1.19.dfsg/debian/patches/03-configure.patch dante-1.1.19.dfsg/debian/patches/03-configure.patch --- dante-1.1.19.dfsg/debian/patches/03-configure.patch +++ dante-1.1.19.dfsg/debian/patches/03-configure.patch @@ -26,9 +25,0 @@ -@@ -29645,7 +29645,7 @@ - ;; - - *) -- LIBRARY_DLOPEN="${base_library_path}libdl.${SOLIB_POSTFIX}" -+ LIBRARY_DLOPEN="/lib/libdl.so.2" - ;; - esac - SOCKSIFY_PRELOAD_LIBS="${SOCKSIFY_PRELOAD_LIBS}${LIBRARY_DLOPEN:+${PRELOAD_SEPERATOR}}${LIBRARY_DLOPEN}" diff -u dante-1.1.19.dfsg/debian/patches/series dante-1.1.19.dfsg/debian/patches/series --- dante-1.1.19.dfsg/debian/patches/series +++ dante-1.1.19.dfsg/debian/patches/series @@ -13,0 +14,2 @@ +15-fixlibc-search.patch +16-fix-dlopen.patch only in patch2: unchanged: --- dante-1.1.19.dfsg.orig/debian/patches/15-fixlibc-search.patch +++ dante-1.1.19.dfsg/debian/patches/15-fixlibc-search.patch @@ -0,0 +1,17 @@ +Description: Fix danted failure to start + Path to libc.so is now correctly searched +Author: Louis Bouchard +Bug-Ubuntu: https://bugs.launchpad.net/bugs/816153 +--- + +--- a/configure ++++ b/configure +@@ -29687,7 +29687,7 @@ + *-*-linux-*) + #XXX attempt to find latest c library + #can't set it to libc.so directly, might be ld script +- LIBC_NAME=`ls /usr/lib/libc.so* /lib/libc.so* | sed -e 's/.*\///' | sort -nr | head -n 1` ++ LIBC_NAME=`ls /usr/lib/libc.so* /lib/libc.so* /lib/*/libc.so* | sed -e 's/.*\///' | sort -nr | head -n 1` + if test "x${LIBC_NAME}" = x; then + #nothing found, set libc.so anyway + LIBC_NAME="${base_library_path}libc.so" only in patch2: unchanged: --- dante-1.1.19.dfsg.orig/debian/patches/16-fix-dlopen.patch +++ dante-1.1.19.dfsg/debian/patches/16-fix-dlopen.patch @@ -0,0 +1,29 @@ +Description: Fix socksify failure to run + Path to dlopen.so is no longer hardcoded but searched + for in potential library paths + + The logic used may lead to incorrect results on systems + where multiarch packages are present but is not of any + concern when built using buildd +Author: Louis Bouchard +Bug-Ubuntu: https://bugs.launchpad.net/bugs/857598 +--- +--- a/configure ++++ b/configure +@@ -29644,6 +29644,16 @@ + fi + ;; + ++ *linux*) ++ LIBDL_NAME=`ls /usr/lib/libdl.so* /lib/libdl.so* /lib/*/libdl.so* | sed -e 's/.*\///' | sort -nr | head -n 1` ++ if test "x${LIBDL_NAME}" = x; then ++ #nothing found, set to libdl.so anyway ++ LIBDL_NAME="${base_library_path}libdl.so" ++ fi ++ LIBRARY_DLOPEN=`ls /usr/lib/${LIBDL_NAME}* /lib/${LIBDL_NAME}* /lib/*/${LIBDL_NAME}*` ++ ++ ;; ++ + *) + LIBRARY_DLOPEN="${base_library_path}libdl.${SOLIB_POSTFIX}" + ;;