diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/libreport | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/libreport')
-rw-r--r-- | dev-libs/libreport/Manifest | 1 | ||||
-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 | 5 |
8 files changed, 580 insertions, 0 deletions
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest new file mode 100644 index 000000000000..46d6147c7453 --- /dev/null +++ b/dev-libs/libreport/Manifest @@ -0,0 +1 @@ +DIST libreport-2.0.13.tar.gz 1190147 SHA256 4a0609abe80b9432ae81c5a512680a7035b547cd1fef29c63c730d92c1be8b05 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181 WHIRLPOOL 647da27bf88cf77dbb25ace9f446dfe9a875370c27fef05999843dcee1f653ba07af44d4e5a36107dbf69f0241f1f66d3a6a58ae7897faca7b049d2b1aa00301 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..02d53da4f44b --- /dev/null +++ b/dev-libs/libreport/libreport-2.0.13-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" + +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-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..da6fd63d0085 --- /dev/null +++ b/dev-libs/libreport/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>gnome</herd> +</pkgmetadata> |