3e2964487a
as well as other bug fixes. CVE-2013-0271, CVE-2013-0272, CVE-2013-0273, CVE-2013-0274 ok sthen@
116 lines
6.9 KiB
Plaintext
116 lines
6.9 KiB
Plaintext
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.28 2013/03/08 01:03:09 brad Exp $
|
|
--- libpurple/plugins/ssl/Makefile.in.orig Mon Feb 11 04:17:19 2013
|
|
+++ libpurple/plugins/ssl/Makefile.in Wed Feb 13 14:55:46 2013
|
|
@@ -92,6 +92,20 @@ am__uninstall_files_from_dir = { \
|
|
am__installdirs = "$(DESTDIR)$(plugindir)"
|
|
LTLIBRARIES = $(plugin_LTLIBRARIES)
|
|
am__DEPENDENCIES_1 =
|
|
+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
+@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
|
|
+am__ssl_openssl_la_SOURCES_DIST = ssl-openssl.c
|
|
+@PLUGINS_TRUE@am_ssl_openssl_la_OBJECTS = ssl_openssl_la-ssl-openssl.lo
|
|
+ssl_openssl_la_OBJECTS = $(am_ssl_openssl_la_OBJECTS)
|
|
+ssl_openssl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
|
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ssl_openssl_la_CFLAGS) \
|
|
+ $(CFLAGS) $(ssl_openssl_la_LDFLAGS) $(LDFLAGS) -o $@
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@am_ssl_openssl_la_rpath = \
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@ -rpath \
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@ $(plugindir)
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@am_ssl_openssl_la_rpath = \
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@ -rpath \
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@ $(plugindir)
|
|
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
|
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
|
|
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
|
|
@@ -169,7 +183,7 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
|
am__v_GEN_0 = @echo " GEN " $@;
|
|
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
|
|
$(ssl_la_SOURCES)
|
|
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
|
|
+DIST_SOURCES = $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_gnutls_la_SOURCES_DIST) \
|
|
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
|
|
am__can_run_installinfo = \
|
|
case $$AM_UPDATE_INFO_DIR in \
|
|
@@ -243,6 +257,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
|
|
GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
|
|
GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
|
|
GNT_VERSION = @GNT_VERSION@
|
|
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
|
|
+OPENSSL_LIBS = @OPENSSL_LIBS@
|
|
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
|
|
GNUTLS_LIBS = @GNUTLS_LIBS@
|
|
GREP = @GREP@
|
|
@@ -434,6 +450,7 @@ EXTRA_DIST = \
|
|
|
|
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
|
|
ssl_la_LDFLAGS = -module -avoid-version
|
|
+ssl_openssl_la_LDFLAGS = -module -avoid-version
|
|
ssl_gnutls_la_LDFLAGS = -module -avoid-version
|
|
ssl_nss_la_LDFLAGS = -module -avoid-version
|
|
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
|
|
@@ -447,19 +464,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
|
|
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
|
|
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
|
|
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@plugin_LTLIBRARIES = \
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@ ssl.la \
|
|
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@ ssl-openssl.la
|
|
|
|
# I'm sorry to report that Automake Conditionals don't support
|
|
# if USE_GNUTLS && USE_NSS
|
|
# but only support testing a single variable. Hence:
|
|
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@plugin_LTLIBRARIES = \
|
|
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl.la \
|
|
+@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-openssl.la \
|
|
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-gnutls.la \
|
|
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-nss.la
|
|
|
|
@PLUGINS_TRUE@ssl_la_SOURCES = ssl.c
|
|
+@PLUGINS_TRUE@ssl_openssl_la_SOURCES = ssl-openssl.c
|
|
@PLUGINS_TRUE@ssl_gnutls_la_SOURCES = ssl-gnutls.c
|
|
@PLUGINS_TRUE@ssl_nss_la_SOURCES = ssl-nss.c
|
|
@PLUGINS_TRUE@ssl_la_LIBADD = $(GLIB_LIBS)
|
|
+@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
|
|
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
|
|
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
|
|
AM_CPPFLAGS = \
|
|
@@ -471,6 +494,7 @@ AM_CPPFLAGS = \
|
|
$(GLIB_CFLAGS) \
|
|
$(PLUGIN_CFLAGS)
|
|
|
|
+ssl_openssl_la_CFLAGS = $(AM_CPPFLGS) $(OPENSSL_CFLAGS)
|
|
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
|
|
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
|
|
all: all-am
|
|
@@ -539,6 +563,8 @@ clean-pluginLTLIBRARIES:
|
|
echo "rm -f \"$${dir}/so_locations\""; \
|
|
rm -f "$${dir}/so_locations"; \
|
|
done
|
|
+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES) $(EXTRA_ssl_openssl_la_DEPENDENCIES)
|
|
+ $(AM_V_CCLD)$(ssl_openssl_la_LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
|
|
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES) $(EXTRA_ssl_gnutls_la_DEPENDENCIES)
|
|
$(AM_V_CCLD)$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
|
|
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES) $(EXTRA_ssl_nss_la_DEPENDENCIES)
|
|
@@ -553,6 +579,7 @@ distclean-compile:
|
|
-rm -f *.tab.c
|
|
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl-openssl.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_gnutls_la-ssl-gnutls.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_nss_la-ssl-nss.Plo@am__quote@
|
|
|
|
@@ -576,6 +603,13 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
|
+
|
|
+ssl_openssl_la-ssl-openssl.lo: ssl-openssl.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ssl_openssl_la_CFLAGS) $(CFLAGS) -MT ssl_openssl_la-ssl-openssl.lo -MD -MP -MF $(DEPDIR)/ssl_openssl_la-ssl-openssl.Tpo -c -o ssl_openssl_la-ssl-openssl.lo `test -f 'ssl-openssl.c' || echo '$(srcdir)/'`ssl-openssl.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ssl_openssl_la-ssl-openssl.Tpo $(DEPDIR)/ssl_openssl_la-ssl-openssl.Plo
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ssl-openssl.c' object='ssl_openssl_la-ssl-openssl.lo' libtool=yes @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ssl_openssl_la_CFLAGS) $(CFLAGS) -c -o ssl_openssl_la-ssl-openssl.lo `test -f 'ssl-openssl.c' || echo '$(srcdir)/'`ssl-openssl.c
|
|
|
|
ssl_gnutls_la-ssl-gnutls.lo: ssl-gnutls.c
|
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ssl_gnutls_la_CFLAGS) $(CFLAGS) -MT ssl_gnutls_la-ssl-gnutls.lo -MD -MP -MF $(DEPDIR)/ssl_gnutls_la-ssl-gnutls.Tpo -c -o ssl_gnutls_la-ssl-gnutls.lo `test -f 'ssl-gnutls.c' || echo '$(srcdir)/'`ssl-gnutls.c
|