diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-libs/libreport |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-libs/libreport')
-rw-r--r-- | dev-libs/libreport/Manifest | 10 | ||||
-rw-r--r-- | dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch | 80 | ||||
-rw-r--r-- | dev-libs/libreport/files/libreport-2.0.13-gentoo.patch | 295 | ||||
-rw-r--r-- | dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch | 51 | ||||
-rw-r--r-- | dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch | 35 | ||||
-rw-r--r-- | dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch | 19 | ||||
-rw-r--r-- | dev-libs/libreport/libreport-2.0.13-r1.ebuild | 94 | ||||
-rw-r--r-- | dev-libs/libreport/metadata.xml | 8 |
8 files changed, 592 insertions, 0 deletions
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest new file mode 100644 index 000000000000..dca04475b551 --- /dev/null +++ b/dev-libs/libreport/Manifest @@ -0,0 +1,10 @@ +AUX libreport-2.0.13-automake-1.12.patch 2285 SHA256 b4c764e104cf76336661d96228786ce2d347ca6339e44c85a993c3c10fc0a215 SHA512 59a6f857604ab45c049030ab351cef28dc51b78aabd5575ff45abdd607d6b973020f32687666fd11a879e0ee18aca75650fa9e3fa2284a8e05c6b65216479b9f WHIRLPOOL 660303844f839d8d7f494d22f041d4543b502074603183801def34741f7a3e5fddb06a54d0b8372c49e508ca1076b1c81063e36c426134f0903efb642b17cb4c +AUX libreport-2.0.13-gentoo.patch 10369 SHA256 7dec2b0708121c5deb5e8036d9ef5ee20aebd9713ee191d701b27920a4ab0f49 SHA512 762e389c62efaeaad08a04871e5dec05aadc26fb9457291bf2308835128241068b2e799585060b3ce4f7bd17f275a4e5c7da37835d4e8940651ea5e5928402f0 WHIRLPOOL 0b253ba384ee40aa60c36564739101e328e326fcf5e3543644ed46b71a89fbb34d8567ce5892a162ba7b26f6bc780514601e6fc32f883f3276c7a1229529ac92 +AUX libreport-2.0.13-json-c-0.11-pc.patch 1780 SHA256 272e146d715c723097f2d09cba3b1d66f3de9fc78e0ca37a057b978293d6d67f SHA512 8eb64ac64b0bfb42dafda02c7c65c5becaf27d16233b941f0d0594a3fc0314b33b793b05e3bda07dc6225854d2dcb1cfeca1ae8bf5fa959a84fd01ac9179cdfa WHIRLPOOL 75daa7b98dad3963459fa9948c680051b4e06ab5006b06c58206ad75d75a10965b8d03c00223b734994027eac01c0d03a30f9f3e94a04a2bb8d38b78ee61ab34 +AUX libreport-2.0.13-json-c-0.11.patch 1145 SHA256 e47adb08f2c4d844e8ee824f33f6861331773308520e75714fe07b4e9f9126f2 SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67 WHIRLPOOL 4b0dab98d5390443296d26c808fb095d45b7977b55073f69556905e4e60d6326b993ef3c031fd6d9b9fb28db40a35bcb765b348624cba04a1a6230ac578bdb2f +AUX libreport-2.0.7-uploader_event-syntax.patch 610 SHA256 b93e9e05396b70754fcacf7e7358ccfa4cc995fa3e1a3fbe598c540ae4f0c148 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0 WHIRLPOOL 9c0e00a502a216ce47c513f052e1a63b0d57910d8790d180978522f860d980f8f216cf5773830f9ba3b5fdbf8dd7e3f661e41e008398a8d6de5e525a2e95c8d3 +DIST libreport-2.0.13.tar.gz 1190147 SHA256 4a0609abe80b9432ae81c5a512680a7035b547cd1fef29c63c730d92c1be8b05 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181 WHIRLPOOL 647da27bf88cf77dbb25ace9f446dfe9a875370c27fef05999843dcee1f653ba07af44d4e5a36107dbf69f0241f1f66d3a6a58ae7897faca7b049d2b1aa00301 +EBUILD libreport-2.0.13-r1.ebuild 2166 SHA256 9b47d65f6113710d89f1963c8c09697e2b55ce2abefec652e296e44911423bde SHA512 ba7fe4dbef24205529dc647e868ac369963abfded775e6b39bf715ae8fea6f91a436b324d545601e0ea7224b939dce58e36e9d5417b7c034806fc360966c5d35 WHIRLPOOL 36f13717d477204bd54371e23adfb8df8ca8d61b88ad1643db2c1e832035692f6d4981a5bcfdc73148b2b7da978fac6dca9aac748b467a550a30f86e40bb4d81 +MISC ChangeLog 2675 SHA256 b699ca85878e190da860c56ad15585923458f1e71f8a4a6a798b2ecfd6807297 SHA512 b73842d8e2c102f7582e1358dbb3b6a08dfceb359e3763ad44d8db2fd9021444233ffa6b830f519dd0288a091f7795339e36744a3e35287bf04015efeeb1f209 WHIRLPOOL 2e0cc7f05c38cda8d87db9579889cc875a8e32513f787f568a24dff2fc550da91553e882bdb03b75f7037262b04e79e3ac86197c38dc4659b84f063b5cc60d17 +MISC ChangeLog-2015 4365 SHA256 76ea050ae6c482a22ed2767980cf53929c8f241928fc3b2975bc15c4f6ff21aa SHA512 dfedaf11aa3f1e1a3fcba44efdb2d9525925b17170a799889ab78a8e56b3ea36a89056a49dcda7d4f7b92b23cc07368597699f98e5ce4f381e54b607e9f92192 WHIRLPOOL aff2f919222da41935a0dc4718bef592bb9d51a484ad853f3dc7fe5b2ad1da89245b95d6f8d51db5f71d4898b29f6f47f11775e05c72f9a30d814bc699039b06 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch b/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch new file mode 100644 index 000000000000..4baaedd4d8eb --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch @@ -0,0 +1,80 @@ +From cb7d7fe5b2daf4dac3b8a1616461a0c840e18b73 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sat, 22 Sep 2012 03:06:03 -0400 +Subject: [PATCH] Fix automake-1.12 autoreconf issues. + +Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am + +Need AM_PROG_CC_C_O for src/cli/cli.c + +gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing +problems for automake-1.12. +--- + configure.ac | 8 +++----- + src/lib/Makefile.am | 2 +- + src/plugins/Makefile.am | 2 +- + 3 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dd50bcf..3955689 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT([libreport], + [crash-catcher@fedorahosted.org]) + + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign]) + # Support silent build rules. Disable by either passing --disable-silent-rules + # to ./configure or passing V=1 to make + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) +@@ -11,8 +11,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + AM_SILENT_RULES([yes]) + + AC_DISABLE_STATIC ++AM_PROG_AR + AC_PROG_LIBTOOL +-AC_PROG_CC ++AM_PROG_CC_C_O + AC_PROG_LN_S + + AC_SYS_LARGEFILE +@@ -33,9 +34,6 @@ GETTEXT_PACKAGE=libreport + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) + +-AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.17]) +- + IT_PROG_INTLTOOL([0.35.0]) + + dnl ****** END **************************************** +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 5befe7d..2c51931 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -121,7 +121,7 @@ libreport_web_la_LIBADD = \ + libreport.la + + $(DESTDIR)/$(DEBUG_DUMPS_DIR): +- $(mkdir_p) '$@' ++ $(MKDIR_P) '$@' + # no need to chmod it here + #chmod 1777 '$@' + install-data-local: $(DESTDIR)/$(DEBUG_DUMPS_DIR) +diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am +index 3f9dfd7..795d198 100644 +--- a/src/plugins/Makefile.am ++++ b/src/plugins/Makefile.am +@@ -40,7 +40,7 @@ EXTRA_DIST = \ + report_Uploader.xml.in + + $(DESTDIR)/$(DEBUG_INFO_DIR): +- $(mkdir_p) '$@' ++ $(MKDIR_P) '$@' + + reporter_upload_SOURCES = \ + reporter-upload.c +-- +1.7.12 + diff --git a/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch b/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch new file mode 100644 index 000000000000..89c6a17354a3 --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch @@ -0,0 +1,295 @@ +From 624d523361dcf8c10742cbcb1a017e21675002ff Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sat, 22 Sep 2012 02:17:08 -0400 +Subject: [PATCH] Replace Fedora defaults with Gentoo ones, and disable code + not relevant for Gentoo + +Disable bugzilla and ureport plugins (they require Gentoo infrastructure +changes). Fix libreport-web.pc to not rely on xmlrpc.pc, which Gentoo +does not have. + +Disble mailx post-create by default to avoid "abrtd: 'post-create' ... +exited with 141" errors. +--- + doc/Makefile.am | 2 - + doc/reporter-bugzilla.txt | 2 +- + libreport-web.pc.in | 6 +-- + src/lib/dump_dir.c | 2 +- + src/plugins/Makefile.am | 83 ++------------------------------------ + src/plugins/bugzilla.conf | 2 +- + src/plugins/mailx_event.conf | 2 +- + src/plugins/report_Bugzilla.conf | 2 +- + src/plugins/report_Bugzilla.xml.in | 4 +- + src/plugins/reporter-bugzilla.c | 2 +- + src/report-python/__init__.py | 4 +- + 11 files changed, 16 insertions(+), 95 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 542fe4c..863b6d1 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -9,11 +9,9 @@ XMLTO_SILENT_0 = @echo " XMLTO " $@; + + MAN1_TXT = + MAN1_TXT += report-cli.txt +-MAN1_TXT += reporter-bugzilla.txt + MAN1_TXT += reporter-kerneloops.txt + MAN1_TXT += reporter-mailx.txt + MAN1_TXT += reporter-print.txt +-MAN1_TXT += reporter-rhtsupport.txt + MAN1_TXT += reporter-upload.txt + MAN1_TXT += report.txt + +diff --git a/doc/reporter-bugzilla.txt b/doc/reporter-bugzilla.txt +index 3cedf73..734d598 100644 +--- a/doc/reporter-bugzilla.txt ++++ b/doc/reporter-bugzilla.txt +@@ -44,7 +44,7 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are: + Password to Bugzilla account. + + 'BugzillaURL':: +- Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com) ++ Bugzilla HTTP(S) address. (default: https://bugs.gentoo.org/) + + 'SSLVerify':: + Use yes/true/on/1 to verify server's SSL certificate. (default: yes) +diff --git a/libreport-web.pc.in b/libreport-web.pc.in +index c9af1d2..14505f8 100644 +--- a/libreport-web.pc.in ++++ b/libreport-web.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libreport + Description: Library providing network API for libreport + Version: @VERSION@ +-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json btparser libreport +-Libs: -L${libdir} -lreport-web +-Cflags: ++Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 json btparser libreport ++Libs: -L${libdir} @XMLRPC_LIBS@ @XMLRPC_CLIENT_LIBS@ -lreport-web ++Cflags: @XMLRPC_CFLAGS@ @XMLRPC_CLIENT_CFLAGS@ + +diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c +index 0fc7da7..41e4f55 100644 +--- a/src/lib/dump_dir.c ++++ b/src/lib/dump_dir.c +@@ -556,7 +556,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid, const char *chroot_di + release = load_text_file("/etc/system-release", + DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE); + if (!release) +- release = load_text_file("/etc/redhat-release", /*flags:*/ 0); ++ release = load_text_file("/etc/gentoo-release", /*flags:*/ 0); + dd_save_text(dd, FILENAME_OS_RELEASE, release); + if (chroot_dir) + { +diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am +index 967596f..3f9dfd7 100644 +--- a/src/plugins/Makefile.am ++++ b/src/plugins/Makefile.am +@@ -1,36 +1,27 @@ + pluginslibdir = $(PLUGINS_LIB_DIR) + + bin_PROGRAMS = \ +- reporter-bugzilla \ +- reporter-rhtsupport \ + reporter-kerneloops \ + reporter-upload \ + reporter-mailx \ + reporter-print \ +- report \ +- reporter-ureport ++ report + + pluginsconfdir = $(PLUGINS_CONF_DIR) + + reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR) + + dist_reportpluginsconf_DATA = \ +- bugzilla.conf \ +- rhtsupport.conf \ + mailx.conf + + eventsdir = $(EVENTS_DIR) + + dist_events_DATA = \ +- report_Bugzilla.xml \ +- report_Bugzilla.conf \ + report_Logger.conf \ + report_Logger.xml \ + report_Mailx.xml \ +- report_RHTSupport.xml \ + report_Kerneloops.xml \ +- report_Uploader.xml \ +- report_uReport.xml ++ report_Uploader.xml + + @INTLTOOL_XML_RULE@ + +@@ -39,74 +30,18 @@ eventsconfdir = $(EVENTS_CONF_DIR) + dist_eventsconf_DATA = \ + mailx_event.conf \ + print_event.conf \ +- bugzilla_event.conf \ +- rhtsupport_event.conf \ + uploader_event.conf + + EXTRA_DIST = \ +- report_Bugzilla.xml.in \ +- report_Bugzilla.conf \ + report_Logger.conf \ + report_Logger.xml.in \ + report_Mailx.xml.in \ +- report_RHTSupport.xml.in \ + report_Kerneloops.xml.in \ +- report_Uploader.xml.in \ +- report_uReport.xml.in ++ report_Uploader.xml.in + + $(DESTDIR)/$(DEBUG_INFO_DIR): + $(mkdir_p) '$@' + +-reporter_bugzilla_SOURCES = \ +- reporter-bugzilla.c rhbz.c rhbz.h +-reporter_bugzilla_CPPFLAGS = \ +- -I$(srcdir)/../include \ +- -I$(srcdir)/../lib \ +- -DBIN_DIR=\"$(bindir)\" \ +- -DCONF_DIR=\"$(CONF_DIR)\" \ +- -DLOCALSTATEDIR='"$(localstatedir)"' \ +- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ +- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ +- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ +- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ +- $(GLIB_CFLAGS) \ +- $(LIBREPORT_CFLAGS) \ +- $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ +- -D_GNU_SOURCE +-reporter_bugzilla_LDADD = \ +- $(GLIB_LIBS) \ +- $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ +- ../lib/libreport-web.la \ +- ../lib/libreport.la +- +-reporter_rhtsupport_SOURCES = \ +- abrt_rh_support.h abrt_rh_support.c \ +- reporter-rhtsupport.h \ +- reporter-rhtsupport-parse.c \ +- reporter-rhtsupport.c +-reporter_rhtsupport_CPPFLAGS = \ +- -I$(srcdir)/../include \ +- -I$(srcdir)/../lib \ +- -DBIN_DIR=\"$(bindir)\" \ +- -DCONF_DIR=\"$(CONF_DIR)\" \ +- -DLOCALSTATEDIR='"$(localstatedir)"' \ +- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ +- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ +- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ +- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ +- $(GLIB_CFLAGS) \ +- $(LIBREPORT_CFLAGS) \ +- $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ +- $(LIBXML_CFLAGS) \ +- -D_GNU_SOURCE +-reporter_rhtsupport_LDFLAGS = -ltar +-reporter_rhtsupport_LDADD = \ +- $(GLIB_LIBS) \ +- $(LIBXML_LIBS) \ +- $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ +- ../lib/libreport-web.la \ +- ../lib/libreport.la +- + reporter_upload_SOURCES = \ + reporter-upload.c + reporter_upload_CPPFLAGS = \ +@@ -200,16 +135,4 @@ report_CPPFLAGS = \ + report_LDADD = \ + ../lib/libreport.la + +-reporter_ureport_SOURCES = \ +- ureport.c +-reporter_ureport_CPPFLAGS = \ +- -I$(srcdir)/../include \ +- -I$(srcdir)/../lib \ +- $(GLIB_CFLAGS) \ +- $(LIBREPORT_CFLAGS) \ +- -D_GNU_SOURCE +-reporter_ureport_LDADD = \ +- ../lib/libreport.la \ +- ../lib/libreport-web.la +- + DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ +diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf +index 18eba5a..f5afe6f 100644 +--- a/src/plugins/bugzilla.conf ++++ b/src/plugins/bugzilla.conf +@@ -1,5 +1,5 @@ + # Bugzilla URL +-BugzillaURL = https://bugzilla.redhat.com/ ++BugzillaURL = https://bugs.gentoo.org/ + # yes means that ssl certificates will be checked + SSLVerify = yes + # your login has to exist, if you don have any, please create one +diff --git a/src/plugins/mailx_event.conf b/src/plugins/mailx_event.conf +index a8c5d11..1c07a73 100644 +--- a/src/plugins/mailx_event.conf ++++ b/src/plugins/mailx_event.conf +@@ -1,3 +1,3 @@ +-EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf ++# EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf + + EVENT=report_Mailx reporter-mailx +diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf +index f1a77f5..bb2e651 100644 +--- a/src/plugins/report_Bugzilla.conf ++++ b/src/plugins/report_Bugzilla.conf +@@ -1,4 +1,4 @@ +-Bugzilla_BugzillaURL = https://bugzilla.redhat.com ++Bugzilla_BugzillaURL = https://bugs.gentoo.org/ + Bugzilla_Login = + Bugzilla_Password = + Bugzilla_SSLVerify = yes +diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in +index 8151d32..acaf7fb 100644 +--- a/src/plugins/report_Bugzilla.xml.in ++++ b/src/plugins/report_Bugzilla.xml.in +@@ -16,8 +16,8 @@ + <_label>Bugzilla URL</_label> + <allow-empty>no</allow-empty> + <_description>Address of Bugzilla server</_description> +- <default-value>https://bugzilla.redhat.com</default-value> +- <_note-html>You can create bugzilla.redhat.com account <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></_note-html> ++ <default-value>https://bugs.gentoo.org/</default-value> ++ <_note-html>You can create bugs.gentoo.org account <a href="https://bugs.gentoo.org/createaccount.cgi">here</a></_note-html> + </option> + <option type="text" name="Bugzilla_Login"> + <_label>User name</_label> +diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c +index a3e8855..17a686d 100644 +--- a/src/plugins/reporter-bugzilla.c ++++ b/src/plugins/reporter-bugzilla.c +@@ -34,7 +34,7 @@ static void set_settings(struct bugzilla_struct *b, map_string_h *settings) + environ = getenv("Bugzilla_BugzillaURL"); + b->b_bugzilla_url = environ ? environ : get_map_string_item_or_empty(settings, "BugzillaURL"); + if (!b->b_bugzilla_url[0]) +- b->b_bugzilla_url = "https://bugzilla.redhat.com"; ++ b->b_bugzilla_url = "https://bugs.gentoo.org/"; + b->b_bugzilla_xmlrpc = xasprintf("%s"XML_RPC_SUFFIX, b->b_bugzilla_url); + + environ = getenv("Bugzilla_SSLVerify"); +diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py +index 9c5e6b3..7188392 100644 +--- a/src/report-python/__init__.py ++++ b/src/report-python/__init__.py +@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, NewtIO + + import os + +-SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/redhat-release"] +-SYSTEM_RELEASE_DEPS = ["system-release", "redhat-release"] ++SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/gentoo-release"] ++SYSTEM_RELEASE_DEPS = ["system-release", "gentoo-release"] + + _hardcoded_default_product = "" + _hardcoded_default_version = "" +-- +1.7.12 + diff --git a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch new file mode 100644 index 000000000000..bd764c82cc87 --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch @@ -0,0 +1,51 @@ +From 438344fe7ce2edbd23f4df2dfd8e7b6be0a2d7c2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 11 Sep 2013 11:10:32 +0200 +Subject: [PATCH] Use proper json-c requirement in libreport-web.pc. + +Depending on whether json-c was found as 'json' or 'json-c', require the +same package in the generated .pc file. + +[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.0.13] +--- + configure.ac | 9 +++++++-- + libreport-web.pc.in | 2 +- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1e32c64..ace4cde 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,9 +102,14 @@ PKG_CHECK_MODULES([DBUS], [dbus-1]) + PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) + PKG_CHECK_MODULES([NSS], [nss]) + PKG_CHECK_MODULES([CURL], [libcurl]) +-PKG_CHECK_MODULES([JSON_C], [json],,[ +- PKG_CHECK_MODULES([JSON_C], [json-c]) ++PKG_CHECK_MODULES([JSON_C], [json], [ ++ JSON_C_PACKAGE=json ++], [ ++ PKG_CHECK_MODULES([JSON_C], [json-c], [ ++ JSON_C_PACKAGE=json-c ++ ]) + ]) ++AC_SUBST([JSON_C_PACKAGE]) + PKG_CHECK_MODULES([BTPARSER], [btparser]) + PKG_CHECK_MODULES([NEWT], [libnewt]) + PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [ +diff --git a/libreport-web.pc.in b/libreport-web.pc.in +index 14505f8..2a7c926 100644 +--- a/libreport-web.pc.in ++++ b/libreport-web.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: libreport + Description: Library providing network API for libreport + Version: @VERSION@ +-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 json btparser libreport ++Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 @JSON_C_PACKAGE@ btparser libreport + Libs: -L${libdir} @XMLRPC_LIBS@ @XMLRPC_CLIENT_LIBS@ -lreport-web + Cflags: @XMLRPC_CFLAGS@ @XMLRPC_CLIENT_CFLAGS@ + +-- +1.8.3.2 + diff --git a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch new file mode 100644 index 000000000000..e5191e8e313d --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch @@ -0,0 +1,35 @@ +From 4a874dde53cf6acca7db2e7be3c10106fb50ec62 Mon Sep 17 00:00:00 2001 +From: Markos Chandras <hwoarang@gentoo.org> +Date: Sun, 28 Apr 2013 12:27:57 +0100 +Subject: [PATCH] configure.ac: Fix json-c detection for json-c >= 0.11 + +json-c-0.11 renamed the pkgconfig file to json-c +https://github.com/json-c/json-c/blob/master/ChangeLog +The configure.ac file was fixed to look for json-c if json +is not available. + +[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.0.13] + +Signed-off-by: Markos Chandras <hwoarang@gentoo.org> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index dd50bcf..0ca5e67 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,7 +104,9 @@ PKG_CHECK_MODULES([DBUS], [dbus-1]) + PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) + PKG_CHECK_MODULES([NSS], [nss]) + PKG_CHECK_MODULES([CURL], [libcurl]) +-PKG_CHECK_MODULES([JSON_C], [json]) ++PKG_CHECK_MODULES([JSON_C], [json],,[ ++ PKG_CHECK_MODULES([JSON_C], [json-c]) ++]) + PKG_CHECK_MODULES([BTPARSER], [btparser]) + PKG_CHECK_MODULES([NEWT], [libnewt]) + PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [ +-- +1.8.2.1 + diff --git a/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch b/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch new file mode 100644 index 000000000000..4f43ec90591c --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch @@ -0,0 +1,19 @@ +From 88e39835f1f94eff58e6d0cc0bee20ceae10bdd2 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Wed, 16 Nov 2011 02:07:24 -0500 +Subject: [PATCH] fix uploader_event syntax + +--- + src/plugins/uploader_event.conf | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/plugins/uploader_event.conf b/src/plugins/uploader_event.conf +index 2406008..bd13c5e 100644 +--- a/src/plugins/uploader_event.conf ++++ b/src/plugins/uploader_event.conf +@@ -1 +1 @@ +-EVENT=report_Uploader analyzer=libreport reporter-upload ++EVENT=report_Uploader reporter-upload +-- +1.7.8.rc1 + diff --git a/dev-libs/libreport/libreport-2.0.13-r1.ebuild b/dev-libs/libreport/libreport-2.0.13-r1.ebuild new file mode 100644 index 000000000000..0fde323e9f36 --- /dev/null +++ b/dev-libs/libreport/libreport-2.0.13-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils python-r1 user + +DESCRIPTION="Generic library for reporting software bugs" +HOMEPAGE="https://fedorahosted.org/abrt/" +SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="debug" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=">=dev-libs/btparser-0.18:= + >=dev-libs/glib-2.21:2 + dev-libs/json-c:= + dev-libs/libtar + dev-libs/libxml2:2 + dev-libs/newt:= + dev-libs/nss:= + dev-libs/xmlrpc-c:=[curl] + net-libs/libproxy:= + net-misc/curl:=[ssl] + sys-apps/dbus + >=x11-libs/gtk+-3.3.12:3 + x11-misc/xdg-utils + ${PYTHON_DEPS} +" +RDEPEND="${COMMON_DEPEND} + || ( gnome-base/gnome-keyring >=kde-frameworks/kwallet-5.34.0-r1 >=kde-apps/kwalletd-4.8 ) +" +DEPEND="${COMMON_DEPEND} + app-text/asciidoc + app-text/xmlto + >=dev-util/intltool-0.3.50 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +# Tests require python-meh, which is highly redhat-specific. +RESTRICT="test" + +pkg_setup() { + enewgroup abrt + enewuser abrt -1 -1 -1 abrt +} + +src_prepare() { + # Replace redhat- and fedora-specific defaults with gentoo ones, and disable + # code that requires gentoo infra support. + epatch "${FILESDIR}/${PN}-2.0.13-gentoo.patch" + + # Modify uploader_event so that the gui recognizes it + epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch" + + # automake-1.12 + epatch "${FILESDIR}/${PN}-2.0.13-automake-1.12.patch" + + # json-c-0.11, https://github.com/abrt/libreport/pull/{159,174} + epatch "${FILESDIR}/${PN}-2.0.13-json-c-0.11"{,-pc}.patch + + mkdir -p m4 + eautoreconf + + python_copy_sources +} + +src_configure() { + python_foreach_impl run_in_build_dir econf \ + --disable-bodhi \ + --localstatedir="${EPREFIX}/var" \ + $(usex debug --enable-debug "") + # --disable-debug enables debug! +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + python_foreach_impl run_in_build_dir default + + # Need to set correct ownership for use by app-admin/abrt + diropts -o abrt -g abrt + keepdir /var/spool/abrt + + prune_libtool_files --modules +} diff --git a/dev-libs/libreport/metadata.xml b/dev-libs/libreport/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/dev-libs/libreport/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> |