← Back to branch summary

~ubuntu-branches/ubuntu/saucy/curl/saucy-security

« back to all changes in this revision

Viewing changes to acinclude.m4

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-05-22 14:53:29 UTC
  • mfrom: (3.4.28 sid)
  • Revision ID: package-import@ubuntu.com-20120522145329-hbf1n3zr7qh08qab
Tags: 7.25.0-1ubuntu1
https://launchpad.net/bugs/1003049
https://launchpad.net/bugs/855291
* Merge from Debian testing (LP: #1003049).  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
  - Also closes (LP: #855291)
* debian/patches/CVE-2012-0036.patch: Dropped. CVE resolved upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
acinclude.m4
51
51
  ],[
52
52
    tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \
53
53
      "$GREP" CURL_DEF_TOKEN 2>/dev/null | \
54
 
      "$SED" 's/.*CURL_DEF_TOKEN[[ ]]//' 2>/dev/null | \
 
54
      "$SED" 's/.*CURL_DEF_TOKEN[[ ]][[ ]]*//' 2>/dev/null | \
55
55
      "$SED" 's/[["]][[ ]]*[["]]//g' 2>/dev/null`
56
56
    if test -z "$tmp_exp" || test "$tmp_exp" = "$1"; then
57
57
      tmp_exp=""