Blame 0017-reporter-rhtsupport-Remove-dependency-on-redhat-acce.patch

0c5c2d
From 8fddcea966d381ffb3003dbde088e6fdafe57c04 Mon Sep 17 00:00:00 2001
0c5c2d
From: Martin Kutlak <mkutlak@redhat.com>
0c5c2d
Date: Thu, 11 Jan 2018 15:51:19 +0100
0c5c2d
Subject: [PATCH 17/22] reporter-rhtsupport: Remove dependency on
0c5c2d
 redhat-access-insights
0c5c2d
0c5c2d
The package is going away/will no longer include the certificate.
0c5c2d
0c5c2d
Libreport will package the certificate directly.
0c5c2d
0c5c2d
Related to #1524481
0c5c2d
0c5c2d
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
0c5c2d
---
0c5c2d
 configure.ac                               | 11 +++++
0c5c2d
 libreport.spec.in                          |  9 ++--
0c5c2d
 src/lib/ureport.c                          |  2 +-
0c5c2d
 src/plugins/Makefile.am                    |  6 +++
0c5c2d
 src/plugins/cert-api.access.redhat.com.pem | 74 ++++++++++++++++++++++++++++++
0c5c2d
 5 files changed, 98 insertions(+), 4 deletions(-)
0c5c2d
 create mode 100644 src/plugins/cert-api.access.redhat.com.pem
0c5c2d
0c5c2d
diff --git a/configure.ac b/configure.ac
0c5c2d
index 73ebe3a9..5717248a 100644
0c5c2d
--- a/configure.ac
0c5c2d
+++ b/configure.ac
0c5c2d
@@ -172,6 +172,17 @@ do
0c5c2d
 done
0c5c2d
 fi dnl end NO_MANTISBT
0c5c2d
 
0c5c2d
+dnl enable import of certificate for rhtsupport plugin
0c5c2d
+AC_ARG_ENABLE([import-rhtsupport-cert],
0c5c2d
+AS_HELP_STRING([--enable-import-rhtsupport-cert],
0c5c2d
+    [import certificate needed for rhtsupport plugin (default is NO)]),
0c5c2d
+[], [enable_import_rhtsupport_cert="no"])
0c5c2d
+
0c5c2d
+AS_IF([test "x$enable_import_rhtsupport_cert" != "xno"],
0c5c2d
+AM_CONDITIONAL(ENABLE_IMPORT_RHTSUPPORT_CERT, true),
0c5c2d
+AM_CONDITIONAL(ENABLE_IMPORT_RHTSUPPORT_CERT, false))
0c5c2d
+
0c5c2d
+
0c5c2d
 AC_ARG_WITH(python2,
0c5c2d
 AS_HELP_STRING([--with-python2],[use python2 (default is YES)]),
0c5c2d
 LIBREPORT_PARSE_WITH([python2]))
0c5c2d
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
0c5c2d
index a595015c..6f1c05a3 100644
0c5c2d
--- a/src/lib/ureport.c
0c5c2d
+++ b/src/lib/ureport.c
0c5c2d
@@ -40,7 +40,7 @@
0c5c2d
  * macro for cert name. Cert path can be easily modified for example by reading
0c5c2d
  * an environment variable LIBREPORT_DEBUG_AUTHORITY_CERT_DIR_PATH
0c5c2d
  */
0c5c2d
-#define CERT_AUTHORITY_CERT_PATH "/etc/redhat-access-insights"
0c5c2d
+#define CERT_AUTHORITY_CERT_PATH "/etc/libreport"
0c5c2d
 #define CERT_AUTHORITY_CERT_NAME "cert-api.access.redhat.com.pem"
0c5c2d
 
0c5c2d
 static char *
0c5c2d
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
0c5c2d
index f73e7dce..b228602a 100644
0c5c2d
--- a/src/plugins/Makefile.am
0c5c2d
+++ b/src/plugins/Makefile.am
0c5c2d
@@ -28,6 +28,12 @@ pluginsconfdir = $(PLUGINS_CONF_DIR)
0c5c2d
 
0c5c2d
 reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
0c5c2d
 
0c5c2d
+if ENABLE_IMPORT_RHTSUPPORT_CERT
0c5c2d
+libreportconfdir = $(CONF_DIR)
0c5c2d
+dist_libreportconf_DATA = \
0c5c2d
+    cert-api.access.redhat.com.pem
0c5c2d
+endif
0c5c2d
+
0c5c2d
 reporters_plugin_conf =
0c5c2d
 reporters_plugin_format_conf =
0c5c2d
 if BUILD_BUGZILLA
0c5c2d
diff --git a/src/plugins/cert-api.access.redhat.com.pem b/src/plugins/cert-api.access.redhat.com.pem
0c5c2d
new file mode 100644
0c5c2d
index 00000000..20ef8c00
0c5c2d
--- /dev/null
0c5c2d
+++ b/src/plugins/cert-api.access.redhat.com.pem
0c5c2d
@@ -0,0 +1,74 @@
0c5c2d
+-----BEGIN CERTIFICATE-----
0c5c2d
+MIIHZDCCBUygAwIBAgIJAOb+QiglyeZeMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
0c5c2d
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
0c5c2d
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
0c5c2d
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
0c5c2d
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTAwMzE3MTkwMDQ0WhcNMzAw
0c5c2d
+MzEyMTkwMDQ0WjCBsDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9s
0c5c2d
+aW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgw
0c5c2d
+FgYDVQQLDA9SZWQgSGF0IE5ldHdvcmsxHjAcBgNVBAMMFUVudGl0bGVtZW50IE1h
0c5c2d
+c3RlciBDQTEkMCIGCSqGSIb3DQEJARYVY2Etc3VwcG9ydEByZWRoYXQuY29tMIIC
0c5c2d
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2Z+mW7OYcBcGxWS+RSKG2GJ2
0c5c2d
+csMXiGGfEp36vKVsIvypmNS60SkicKENMYREalbdSjrgfXxPJygZWsVWJ5lHPfBV
0c5c2d
+o3WkFrFHTIXd/R6LxnaHD1m8Cx3GwEeuSlE/ASjc1ePtMnsHH7xqZ9wdl85b1C8O
0c5c2d
+scgO7fwuM192kvv/veI/BogIqUQugtG6szXpV8dp4ml029LXFoNIy2lfFoa2wKYw
0c5c2d
+MiUHwtYgAz7TDY63e8qGhd5PoqTv9XKQogo2ze9sF9y/npZjliNy5qf6bFE+24oW
0c5c2d
+E8pGsp3zqz8h5mvw4v+tfIx5uj7dwjDteFrrWD1tcT7UmNrBDWXjKMG81zchq3h4
0c5c2d
+etgF0iwMHEuYuixiJWNzKrLNVQbDmcLGNOvyJfq60tM8AUAd72OUQzivBegnWMit
0c5c2d
+CLcT5viCT1AIkYXt7l5zc/duQWLeAAR2FmpZFylSukknzzeiZpPclRziYTboDYHq
0c5c2d
+revM97eER1xsfoSYp4mJkBHfdlqMnf3CWPcNgru8NbEPeUGMI6+C0YvknPlqDDtU
0c5c2d
+ojfl4qNdf6nWL+YNXpR1YGKgWGWgTU6uaG8Sc6qGfAoLHh6oGwbuz102j84OgjAJ
0c5c2d
+DGv/S86svmZWSqZ5UoJOIEqFYrONcOSgztZ5tU+gP4fwRIkTRbTEWSgudVREOXhs
0c5c2d
+bfN1YGP7HYvS0OiBKZUCAwEAAaOCAX0wggF5MB0GA1UdDgQWBBSIS6ZFxEbsj9bP
0c5c2d
+pvYazyY8kMx/FzCB5QYDVR0jBIHdMIHagBSIS6ZFxEbsj9bPpvYazyY8kMx/F6GB
0c5c2d
+tqSBszCBsDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAw
0c5c2d
+DgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgwFgYDVQQL
0c5c2d
+DA9SZWQgSGF0IE5ldHdvcmsxHjAcBgNVBAMMFUVudGl0bGVtZW50IE1hc3RlciBD
0c5c2d
+QTEkMCIGCSqGSIb3DQEJARYVY2Etc3VwcG9ydEByZWRoYXQuY29tggkA5v5CKCXJ
0c5c2d
+5l4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgEG
0c5c2d
+MCAGA1UdEQQZMBeBFWNhLXN1cHBvcnRAcmVkaGF0LmNvbTAgBgNVHRIEGTAXgRVj
0c5c2d
+YS1zdXBwb3J0QHJlZGhhdC5jb20wDQYJKoZIhvcNAQEFBQADggIBAJ1hEdNBDTRr
0c5c2d
+6kI6W6stoogSUwjuiWPDY8DptwGhdpyIfbCoxvBR7F52DlwyXOpCunogfKMRklnE
0c5c2d
+gH1Wt66RYkgNuJcenKHAhR5xgSLoPCOVF9rDjMunyyBuxjIbctM21R7BswVpsEIE
0c5c2d
+OpV5nlJ6wkHsrn0/E+Zk5UJdCzM+Fp4hqHtEn/c97nvRspQcpWeDg6oUvaJSZTGM
0c5c2d
+8yFpzR90X8ZO4rOgpoERukvYutUfJUzZuDyS3LLc6ysamemH93rZXr52zc4B+C9G
0c5c2d
+Em8zemDgIPaH42ce3C3TdVysiq/yk+ir7pxW8toeavFv75l1UojFSjND+Q2AlNQn
0c5c2d
+pYkmRznbD5TZ3yDuPFQG2xYKnMPACepGgKZPyErtOIljQKCdgcvb9EqNdZaJFz1+
0c5c2d
+/iWKYBL077Y0CKwb+HGIDeYdzrYxbEd95YuVU0aStnf2Yii2tLcpQtK9cC2+DXjL
0c5c2d
+Yf3kQs4xzH4ZejhG9wzv8PGXOS8wHYnfVNA3+fclDEQ1mEBKWHHmenGI6QKZUP8f
0c5c2d
+g0SQ3PNRnSZu8R+rhABOEuVFIBRlaYijg2Pxe0NgL9FlHsNyRfo6EUrB2QFRKACW
0c5c2d
+3Mo6pZyDjQt7O8J7l9B9IIURoJ1niwygf7VSJTMl2w3fFleNJlZTGgdXw0V+5g+9
0c5c2d
+Kg6Ay0rrsi4nw1JHue2GvdjdfVOaWSWC
0c5c2d
+-----END CERTIFICATE-----
0c5c2d
+-----BEGIN CERTIFICATE-----
0c5c2d
+MIIFfTCCA2WgAwIBAgIJAJGKz8qFAAADMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
0c5c2d
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
0c5c2d
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
0c5c2d
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
0c5c2d
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTUwNTA1MTMwMzQ4WhcNMjUw
0c5c2d
+NTAyMTMwMzQ4WjCBiTELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5PUlRIIENBUk9M
0c5c2d
+SU5BMRAwDgYDVQQHEwdSYWxlaWdoMRAwDgYDVQQKEwdSZWQgSGF0MRgwFgYDVQQL
0c5c2d
+Ew9SZWQgSGF0IE5ldHdvcmsxIzAhBgNVBAMTGmNlcnQtYXBpLmFjY2Vzcy5yZWRo
0c5c2d
+YXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9hTNMtZMa7Kg
0c5c2d
+Jlux6pnuUinP0Rv0aiiPFr7qNHFore4loGrPlpzUvQbUByy3xm7lhf4R4qbINCls
0c5c2d
+veWg6HDidvQr174RXb5YLMXuBrYAiPWQTrRRLNuvXFHKzREghRWTv48IXTIDEo0G
0c5c2d
+fZJUO+myY2RfwqugZKic5dR6ZakHSSpQO70O6H5R0eHlKa13k4eEpG2fVY/xqFto
0c5c2d
+WkfZyEmSacZpqxp7gIjZqreLc4MFwpiVjGFrK3Jk+Px1Z6J94LTLx2SxrYzWIeUs
0c5c2d
+5j+lceQOvpV4/pkClnRCW1pkCKTccjFKQkpNPGwdIusRXUGl9IYc20Fa/7g9iUQc
0c5c2d
+5fXu9EAzfwIDAQABo4G+MIG7MAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
0c5c2d
+MAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcDATA5BglghkgBhvhCAQ0E
0c5c2d
+LBYqTWFuYWdlZCBieSBSZWQgSGF0IChjYS1zdXBwb3J0QHJlZGhhdC5jb20pMB0G
0c5c2d
+A1UdDgQWBBRfgCjd8aXf0U4VX8DKTVIn+paGBzAfBgNVHSMEGDAWgBSIS6ZFxEbs
0c5c2d
+j9bPpvYazyY8kMx/FzANBgkqhkiG9w0BAQUFAAOCAgEAlC+r6UEEp5BUkI0Rj2T+
0c5c2d
+1PH7oUCaGQeQoyVbGddz/WUcBk/lMMtyCEoxU+3tTwNWmCWWjYXtjoL9MlSAC/q+
0c5c2d
+NZfBi1iq0uuSus9JI/Uu8aRhoxTK56qGRed/JNixOHEmFn891cahIPpF0exWwtYD
0c5c2d
+ThwXo7Z6PI7t8EMKdSrGTOowp58yho8xYFL/Z7JmjL55Pf85GIrdiniNZd4i178J
0c5c2d
+07R9zsiLvdXq9mT33iJwkm+uhO+FA9d8OE3ji21pBbGUAQSWOdkemvUCsy8zANW9
0c5c2d
+fT+dBrMr5Buk7eaBBJ2PxECNiWLCRQJWmyff1O5zMT0daS2lBdEGUNhBZ0hnX13Q
0c5c2d
+kabUp0bxRrNRq+WkomP7onZhfZS6SjKm0UmwoV6o3V1ED6y7muQNRmgDpA5PcbvO
0c5c2d
+gl7OexNL4zcpyfMdAmTYf5yTRSvB42Yg5hVfuzPEnOIqupwES3mWkEHRlqbMUkHw
0c5c2d
+qIQAxIwQqZd5PdPpElQ/6j/ZT9DwW/I6zgndX2rsS0oGYcwFTkSj0/rKKkC13hk7
0c5c2d
+LchXMZu5ckdustM79U6OZIBairrJaL2OpR08un2nwIjgEGqhVFYc44UK1VpkE8mr
0c5c2d
+qvqJS6OHVlTlKcEDnhVkPS3i5qjuS/PtSq0CwH8bzYKFJayLDY/z36Zv6PdttzmU
0c5c2d
+Yb1NSDcJejHJ80pMINutyYQ=
0c5c2d
+-----END CERTIFICATE-----
0c5c2d
-- 
0c5c2d
2.14.3
0c5c2d