← Back to branch summary

~ubuntu-branches/ubuntu/wily/curl/wily

« back to all changes in this revision

Viewing changes to debian/patches/99_nss.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-11-10 08:48:21 UTC
  • mfrom: (3.4.52 sid)
  • Revision ID: package-import@ubuntu.com-20141110084821-inwi9tek417xe4te
Tags: 7.38.0-3ubuntu1
* Merge from Debian. Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Dropped patches:
  - debian/patches/09_fix-timeout-in-poll-and-wait.patch: upstream
  - debian/patches/CVE-2014-3613.patch: upstream
  - debian/patches/CVE-2014-3620.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99_nss.patch
93
93
 checksrc:
94
94
--- a/src/Makefile.am
95
95
+++ b/src/Makefile.am
96
 
@@ -57,14 +57,14 @@
 
96
@@ -60,14 +60,14 @@
97
97
 LIBS = $(BLANK_AT_MAKETIME)
98
98
 
99
99
 if USE_EXPLICIT_LIB_DEPS
100
 
-curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @LIBCURL_LIBS@
101
 
+curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @LIBCURL_LIBS@
 
100
-curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
 
101
+curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
102
102
 else
103
103
-curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
104
104
+curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@