diff options
Diffstat (limited to 'dev-libs/libreport')
11 files changed, 951 insertions, 0 deletions
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest new file mode 100644 index 00000000..acce5f79 --- /dev/null +++ b/dev-libs/libreport/Manifest @@ -0,0 +1,2 @@ +DIST libreport-2.0.20.tar.gz 1323225 SHA256 a2a66b97e1e345f18837f39657210931bd6cb9bebc33f56736e56380ddbf743e SHA512 f57e0819351fecbd37e8511b3ef88eeb3885fdfc51bb1c7835ef70929fb7c59177db4f967b069674f3521c805d90a795436f509a63211638bd0c82cf4d58782b WHIRLPOOL 605f9e3f39f98fbd6903238e5b861f1bf61caff68a14dec6265eca72df94de8d299bae07a27d1588abcb19d88c138f7ab18074b3359992e0288b43b1948be51b +DIST libreport-2.1.9.tar.gz 1567949 SHA256 ebc4db230e915c6d8d2f97b9ee148524ed017d8fb09c5b4607bdbeb9f435052a SHA512 442ecbb2029e550fb0737555c6d7c5e29bf34fcd89e52da767b42816ee2bb7f5fc8e8d58833e40ded72ffa016d3b1cb1782d0c1ede94f0210341c09752113fd4 WHIRLPOOL 3bd4e7776f768e772716d1fc5ed3f07b2913b60343379baba3071d8f70c591946af50d412830ee551505b2ba80b7367a6d96d4f8e10d618527dc779cb9727500 diff --git a/dev-libs/libreport/files/0001-Add-Kogaion-customizations.patch b/dev-libs/libreport/files/0001-Add-Kogaion-customizations.patch new file mode 100644 index 00000000..8fa847b5 --- /dev/null +++ b/dev-libs/libreport/files/0001-Add-Kogaion-customizations.patch @@ -0,0 +1,108 @@ +From 1b071a4f6529e4753519b0a9c5a68ac258f4a03a Mon Sep 17 00:00:00 2001 +From: Stefan Cristian B. <stefan.cristian@rogentos.ro> +Date: Sat, 10 May 2014 15:45:58 +0100 +Subject: [PATCH] Add Sabayon customizations + +--- + src/include/internal_libreport.h | 4 ++-- + src/lib/dump_dir.c | 2 +- + src/plugins/bugzilla.conf | 2 +- + src/plugins/report_Bugzilla.conf | 2 +- + src/plugins/reporter-bugzilla.c | 2 +- + src/report-python/__init__.py | 6 +++--- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h +index db2ffd8..e61a80f 100644 +--- a/src/include/internal_libreport.h ++++ b/src/include/internal_libreport.h +@@ -840,13 +840,13 @@ struct dump_dir *open_directory_for_writing( + #define FILENAME_KERNEL "kernel" + /* + * From /etc/os-release +- * os_release filename name is alredy occupied by /etc/redhat-release (see ++ * os_release filename name is alredy occupied by /etc/kogaion-release (see + * below) in sake of backward compatibility /etc/os-release is stored in + * os_info file + */ + #define FILENAME_OS_INFO "os_info" + #define FILENAME_OS_INFO_IN_ROOTDIR "os_info_in_rootdir" +-// From /etc/system-release or /etc/redhat-release ++// From /etc/system-release or /etc/kogaion-release + #define FILENAME_OS_RELEASE "os_release" + #define FILENAME_OS_RELEASE_IN_ROOTDIR "os_release_in_rootdir" + // Filled by <what?> +diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c +index 83f898b..63b6492 100644 +--- a/src/lib/dump_dir.c ++++ b/src/lib/dump_dir.c +@@ -672,7 +672,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 | DD_OPEN_FOLLOW); + if (!release) +- release = load_text_file("/etc/redhat-release", ++ release = load_text_file("/etc/kogaion-release", + DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE | DD_OPEN_FOLLOW); + if (!release) + release = load_text_file("/etc/SuSE-release", DD_OPEN_FOLLOW); +diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf +index 29c44b3..c495f13 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.rogentos.ro/ + # 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/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf +index f1a77f5..9e6f875 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.rogentos.ro + Bugzilla_Login = + Bugzilla_Password = + Bugzilla_SSLVerify = yes +diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c +index a45419c..01e2b6d 100644 +--- a/src/plugins/reporter-bugzilla.c ++++ b/src/plugins/reporter-bugzilla.c +@@ -696,7 +696,7 @@ static void set_settings(struct bugzilla_struct *b, map_string_t *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.rogentos.ro"; + else + { + /* We don't want trailing '/': "https://host/dir/" -> "https://host/dir" */ +diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py +index 2c58736..26368bd 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/rogentos-release"] ++SYSTEM_RELEASE_DEPS = ["kogaion-version"] + + _hardcoded_default_product = "" + _hardcoded_default_version = "" +@@ -178,7 +178,7 @@ def createPythonUnhandledExceptionSignature(**kwargs): + version = getVersion() + if version: + pd.add("version", version) +- #libreport expect the os_release as in /etc/redhat-release ++ #libreport expect the os_release as in /etc/rogentos-release + if (version and product): + # need to add "release", parse_release() expects format "<product> release <version>" + pd.add("os_release", product +" release "+ version) +-- +1.9.2 + diff --git a/dev-libs/libreport/files/0002-Drop-Fedora-workflows-add-Sabayon-one.patch b/dev-libs/libreport/files/0002-Drop-Fedora-workflows-add-Sabayon-one.patch new file mode 100644 index 00000000..4758e866 --- /dev/null +++ b/dev-libs/libreport/files/0002-Drop-Fedora-workflows-add-Sabayon-one.patch @@ -0,0 +1,376 @@ +From bc95f13701e018f4dc07e6c206c8b638acc6113a Mon Sep 17 00:00:00 2001 +From: Fabio Erculiani <lxnay@sabayon.org> +Date: Sat, 10 May 2014 18:05:10 +0100 +Subject: [PATCH 2/2] Drop Fedora workflows, add Sabayon one + +--- + src/workflows/Makefile.am | 33 ++++---------------------- + src/workflows/anaconda_event.conf | 3 +-- + src/workflows/report_fedora.conf | 19 --------------- + src/workflows/report_rhel.conf | 19 --------------- + src/workflows/workflow_AnacondaFedora.xml.in | 9 ------- + src/workflows/workflow_AnacondaRHEL.xml.in | 9 ------- + src/workflows/workflow_AnacondaSabayon.xml.in | 9 +++++++ + src/workflows/workflow_FedoraCCpp.xml.in | 13 ---------- + src/workflows/workflow_FedoraKerneloops.xml.in | 12 ---------- + src/workflows/workflow_FedoraPython.xml.in | 12 ---------- + src/workflows/workflow_FedoraVmcore.xml.in | 13 ---------- + src/workflows/workflow_FedoraXorg.xml.in | 9 ------- + src/workflows/workflow_RHELCCpp.xml.in | 10 -------- + src/workflows/workflow_RHELKerneloops.xml.in | 10 -------- + src/workflows/workflow_RHELPython.xml.in | 10 -------- + src/workflows/workflow_RHELvmcore.xml.in | 10 -------- + src/workflows/workflow_RHELxorg.xml.in | 9 ------- + 17 files changed, 14 insertions(+), 195 deletions(-) + delete mode 100644 src/workflows/report_fedora.conf + delete mode 100644 src/workflows/report_rhel.conf + delete mode 100644 src/workflows/workflow_AnacondaFedora.xml.in + delete mode 100644 src/workflows/workflow_AnacondaRHEL.xml.in + create mode 100644 src/workflows/workflow_AnacondaSabayon.xml.in + delete mode 100644 src/workflows/workflow_FedoraCCpp.xml.in + delete mode 100644 src/workflows/workflow_FedoraKerneloops.xml.in + delete mode 100644 src/workflows/workflow_FedoraPython.xml.in + delete mode 100644 src/workflows/workflow_FedoraVmcore.xml.in + delete mode 100644 src/workflows/workflow_FedoraXorg.xml.in + delete mode 100644 src/workflows/workflow_RHELCCpp.xml.in + delete mode 100644 src/workflows/workflow_RHELKerneloops.xml.in + delete mode 100644 src/workflows/workflow_RHELPython.xml.in + delete mode 100644 src/workflows/workflow_RHELvmcore.xml.in + delete mode 100644 src/workflows/workflow_RHELxorg.xml.in + +diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am +index 7f1e676..33fb8e6 100644 +--- a/src/workflows/Makefile.am ++++ b/src/workflows/Makefile.am +@@ -1,30 +1,17 @@ + workflowsdir = $(WORKFLOWS_DIR) + + dist_workflows_DATA = \ +- workflow_FedoraCCpp.xml \ +- workflow_FedoraKerneloops.xml \ +- workflow_FedoraPython.xml \ +- workflow_FedoraVmcore.xml \ +- workflow_FedoraXorg.xml \ +- workflow_Upload.xml \ +- workflow_RHELCCpp.xml \ +- workflow_RHELKerneloops.xml \ +- workflow_RHELPython.xml \ +- workflow_RHELvmcore.xml \ +- workflow_RHELxorg.xml ++ workflow_Upload.xml + + if BUILD_BUGZILLA + dist_workflows_DATA += \ +- workflow_AnacondaFedora.xml \ +- workflow_AnacondaRHEL.xml \ ++ workflow_AnacondaSabayon.xml \ + workflow_AnacondaUpload.xml + endif + + workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR) + +-dist_workflowsdef_DATA =\ +- report_fedora.conf \ +- report_rhel.conf ++dist_workflowsdef_DATA = + + if BUILD_BUGZILLA + dist_workflowsdef_DATA += \ +@@ -34,21 +21,9 @@ endif + @INTLTOOL_XML_RULE@ + + EXTRA_DIST = \ +- workflow_FedoraCCpp.xml.in \ +- workflow_FedoraKerneloops.xml.in \ +- workflow_FedoraPython.xml.in \ +- workflow_FedoraVmcore.xml.in \ +- workflow_FedoraXorg.xml.in \ +- workflow_Upload.xml.in \ +- workflow_RHELCCpp.xml.in \ +- workflow_RHELKerneloops.xml.in \ +- workflow_RHELPython.xml.in \ +- workflow_RHELvmcore.xml.in \ +- workflow_RHELxorg.xml.in ++ workflow_Upload.xml.in + + if BUILD_BUGZILLA + EXTRA_DIST += \ +- workflow_AnacondaFedora.xml.in \ +- workflow_AnacondaRHEL.xml.in \ + workflow_AnacondaUpload.xml.in + endif +diff --git a/src/workflows/anaconda_event.conf b/src/workflows/anaconda_event.conf +index 5828b5a..91a2e14 100644 +--- a/src/workflows/anaconda_event.conf ++++ b/src/workflows/anaconda_event.conf +@@ -1,3 +1,2 @@ +-EVENT=workflow_AnacondaFedora component=anaconda +-EVENT=workflow_AnacondaRHEL component=anaconda ++EVENT=workflow_AnacondaSabayon component=anaconda + EVENT=workflow_AnacondaUpload component=anaconda +diff --git a/src/workflows/report_fedora.conf b/src/workflows/report_fedora.conf +deleted file mode 100644 +index 84009bf..0000000 +--- a/src/workflows/report_fedora.conf ++++ /dev/null +@@ -1,19 +0,0 @@ +-EVENT=workflow_FedoraCCpp analyzer=CCpp +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_FedoraPython analyzer=Python component!=anaconda +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_FedoraKerneloops analyzer=Kerneloops +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_FedoraVmcore analyzer=vmcore +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_FedoraXorg analyzer=xorg +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +diff --git a/src/workflows/report_rhel.conf b/src/workflows/report_rhel.conf +deleted file mode 100644 +index 104bcc3..0000000 +--- a/src/workflows/report_rhel.conf ++++ /dev/null +@@ -1,19 +0,0 @@ +-EVENT=workflow_RHELCCpp analyzer=CCpp +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_RHELPython analyzer=Python component!=anaconda +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_RHELKerneloops analyzer=Kerneloops +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_RHELvmcore analyzer=vmcore +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +- +-EVENT=workflow_RHELxorg analyzer=xorg +-# this is just a meta event which consists of other events +-# the list is defined in the xml file +diff --git a/src/workflows/workflow_AnacondaFedora.xml.in b/src/workflows/workflow_AnacondaFedora.xml.in +deleted file mode 100644 +index 6322d9a..0000000 +--- a/src/workflows/workflow_AnacondaFedora.xml.in ++++ /dev/null +@@ -1,9 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report a bug to Fedora maintainers</_name> +- <_description>Process the report using the Fedora infrastructure</_description> +- +- <events> +- <event>report_Bugzilla</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_AnacondaRHEL.xml.in b/src/workflows/workflow_AnacondaRHEL.xml.in +deleted file mode 100644 +index 6d401ff..0000000 +--- a/src/workflows/workflow_AnacondaRHEL.xml.in ++++ /dev/null +@@ -1,9 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report a bug to Red Hat Support Tool</_name> +- <_description>Process the report using the Red Hat infrastructure</_description> +- +- <events> +- <event>report_RHTSupport</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_AnacondaSabayon.xml.in b/src/workflows/workflow_AnacondaSabayon.xml.in +new file mode 100644 +index 0000000..bf27e52 +--- /dev/null ++++ b/src/workflows/workflow_AnacondaSabayon.xml.in +@@ -0,0 +1,9 @@ ++<?xml version="1.0" encoding="UTF-8" ?> ++<workflow> ++ <_name>Report a bug to Sabayon maintainers</_name> ++ <_description>Process the report using the Sabayon infrastructure</_description> ++ ++ <events> ++ <event>report_Bugzilla</event> ++ </events> ++</workflow> +diff --git a/src/workflows/workflow_FedoraCCpp.xml.in b/src/workflows/workflow_FedoraCCpp.xml.in +deleted file mode 100644 +index b48d25a..0000000 +--- a/src/workflows/workflow_FedoraCCpp.xml.in ++++ /dev/null +@@ -1,13 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Fedora</_name> +- <_description>Process the C/C++ crash using the Fedora infrastructure</_description> +- +- <events> +- <event>report_uReport</event> +- <event>collect_*</event> +- <event>analyze_CCpp</event> +- <event>report_Bugzilla</event> +- <event>post_report</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_FedoraKerneloops.xml.in b/src/workflows/workflow_FedoraKerneloops.xml.in +deleted file mode 100644 +index a3aa867..0000000 +--- a/src/workflows/workflow_FedoraKerneloops.xml.in ++++ /dev/null +@@ -1,12 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Fedora</_name> +- <_description>Process the kerneloops using the Fedora infrastructure</_description> +- +- <events> +- <event>report_uReport</event> +- <event>collect_*</event> +- <event>report_Bugzilla</event> +- <event>post_report</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_FedoraPython.xml.in b/src/workflows/workflow_FedoraPython.xml.in +deleted file mode 100644 +index 520f406..0000000 +--- a/src/workflows/workflow_FedoraPython.xml.in ++++ /dev/null +@@ -1,12 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Fedora</_name> +- <_description>Process the python exception using the Fedora infrastructure</_description> +- +- <events> +- <event>report_uReport</event> +- <event>collect_*</event> +- <event>report_Bugzilla</event> +- <event>post_report</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_FedoraVmcore.xml.in b/src/workflows/workflow_FedoraVmcore.xml.in +deleted file mode 100644 +index b6b9cd9..0000000 +--- a/src/workflows/workflow_FedoraVmcore.xml.in ++++ /dev/null +@@ -1,13 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Fedora</_name> +- <_description>Process the kernel crash using the Fedora infrastructure</_description> +- +- <events> +- <event>analyze_VMcore</event> +- <event>report_uReport</event> +- <event>collect_*</event> +- <event>report_Bugzilla</event> +- <event>post_report</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_FedoraXorg.xml.in b/src/workflows/workflow_FedoraXorg.xml.in +deleted file mode 100644 +index d796bae..0000000 +--- a/src/workflows/workflow_FedoraXorg.xml.in ++++ /dev/null +@@ -1,9 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Fedora</_name> +- <_description>Process the X Server problem using the Fedora infrastructure</_description> +- +- <events> +- <event>report_Bugzilla</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_RHELCCpp.xml.in b/src/workflows/workflow_RHELCCpp.xml.in +deleted file mode 100644 +index 026062a..0000000 +--- a/src/workflows/workflow_RHELCCpp.xml.in ++++ /dev/null +@@ -1,10 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Red Hat</_name> +- <_description>Process the C/C++ crash using the Red Hat infrastructure</_description> +- +- <events> +- <event>collect_*</event> +- <event>report_RHTSupport</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_RHELKerneloops.xml.in b/src/workflows/workflow_RHELKerneloops.xml.in +deleted file mode 100644 +index 7f84822..0000000 +--- a/src/workflows/workflow_RHELKerneloops.xml.in ++++ /dev/null +@@ -1,10 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Red Hat</_name> +- <_description>Process the kerneloops using the Red Hat infrastructure</_description> +- +- <events> +- <event>collect_*</event> +- <event>report_RHTSupport</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_RHELPython.xml.in b/src/workflows/workflow_RHELPython.xml.in +deleted file mode 100644 +index a0a4aeb..0000000 +--- a/src/workflows/workflow_RHELPython.xml.in ++++ /dev/null +@@ -1,10 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Red Hat</_name> +- <_description>Process the python exception using the Red Hat infrastructure</_description> +- +- <events> +- <event>collect_*</event> +- <event>report_RHTSupport</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_RHELvmcore.xml.in b/src/workflows/workflow_RHELvmcore.xml.in +deleted file mode 100644 +index 31712e0..0000000 +--- a/src/workflows/workflow_RHELvmcore.xml.in ++++ /dev/null +@@ -1,10 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Red Hat</_name> +- <_description>Process the kernel crash using the Red Hat infrastructure</_description> +- +- <events> +- <event>collect_*</event> +- <event>report_RHTSupport</event> +- </events> +-</workflow> +diff --git a/src/workflows/workflow_RHELxorg.xml.in b/src/workflows/workflow_RHELxorg.xml.in +deleted file mode 100644 +index 7dfda52..0000000 +--- a/src/workflows/workflow_RHELxorg.xml.in ++++ /dev/null +@@ -1,9 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8" ?> +-<workflow> +- <_name>Report to Red Hat</_name> +- <_description>Process the X Server problem using the Red Hat infrastructure</_description> +- +- <events> +- <event>report_RHTSupport</event> +- </events> +-</workflow> +-- +1.9.2 + diff --git a/dev-libs/libreport/files/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch b/dev-libs/libreport/files/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch new file mode 100644 index 00000000..561323ef --- /dev/null +++ b/dev-libs/libreport/files/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch @@ -0,0 +1,27 @@ +From af93a79ebe914934552c4343e928c4cfc7a70184 Mon Sep 17 00:00:00 2001 +From: Fabio Erculiani <lxnay@sabayon.org> +Date: Sat, 10 May 2014 18:09:05 +0100 +Subject: [PATCH 3/3] Make report_Bugzilla use Sabayon's bugzilla URL + +--- + src/plugins/report_Bugzilla.xml.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in +index 9ffe90f..368573a 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.sabayon.org</default-value> ++ <_note-html>You can create bugs.sabayon.org account <a href="https://bugs.sabayon.org/createaccount.cgi">here</a></_note-html> + </option> + <option type="text" name="Bugzilla_Login"> + <_label>User name</_label> +-- +1.9.2 + diff --git a/dev-libs/libreport/files/libreport-2.0.20-json-c.patch b/dev-libs/libreport/files/libreport-2.0.20-json-c.patch new file mode 100644 index 00000000..4e0f3d49 --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.20-json-c.patch @@ -0,0 +1,51 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -158,7 +158,14 @@ AS_HELP_STRING([--with-ureport],[use uRe + LIBREPORT_PARSE_WITH([ureport])) + if test -z "$NO_UREPORT"; then + AM_CONDITIONAL(BUILD_UREPORT, true) +-PKG_CHECK_MODULES([JSON_C], [json]) ++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]) + else + AM_CONDITIONAL(BUILD_UREPORT, false) + fi dnl end NO_UREPORT +--- 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 ++Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client @JSON_C_PACKAGE@ btparser libreport + Libs: -L${libdir} -lreport-web + Cflags: + +--- a/src/lib/json.c ++++ b/src/lib/json.c +@@ -17,7 +17,7 @@ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include <json/json.h> ++#include <json-c/json.h> + #include <btparser/thread.h> + #include <btparser/core-backtrace.h> + +--- a/src/plugins/ureport.c ++++ b/src/plugins/ureport.c +@@ -17,7 +17,7 @@ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include <json/json.h> ++#include <json-c/json.h> + #include "internal_libreport.h" + #include "ureport.h" + #include "libreport_curl.h" diff --git a/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch b/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch new file mode 100644 index 00000000..5ad4cdb7 --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch @@ -0,0 +1,157 @@ +diff -Nurp libreport-2.0.20.orig/doc/reporter-bugzilla.txt libreport-2.0.20/doc/reporter-bugzilla.txt +--- libreport-2.0.20.orig/doc/reporter-bugzilla.txt 2012-11-23 14:36:38.000000000 +0000 ++++ libreport-2.0.20/doc/reporter-bugzilla.txt 2014-04-29 08:57:43.665256679 +0100 +@@ -52,7 +52,7 @@ Configuration file lines should have 'PA + Password to Bugzilla account. + + 'BugzillaURL':: +- Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com) ++ Bugzilla HTTP(S) address. (default: https://bugs.rogentos.ro) + + 'SSLVerify':: + Use yes/true/on/1 to verify server's SSL certificate. (default: yes) +diff -Nurp libreport-2.0.20.orig/src/include/internal_libreport.h libreport-2.0.20/src/include/internal_libreport.h +--- libreport-2.0.20.orig/src/include/internal_libreport.h 2012-12-18 12:53:59.000000000 +0000 ++++ libreport-2.0.20/src/include/internal_libreport.h 2014-04-29 09:02:37.934552423 +0100 +@@ -722,7 +722,7 @@ struct dump_dir *open_directory_for_writ + #define FILENAME_CRASH_FUNCTION "crash_function" + #define FILENAME_ARCHITECTURE "architecture" + #define FILENAME_KERNEL "kernel" +-// From /etc/system-release or /etc/redhat-release ++// From /etc/system-release or /etc/kogaion-release + #define FILENAME_OS_RELEASE "os_release" + #define FILENAME_OS_RELEASE_IN_ROOTDIR "os_release_in_rootdir" + // Filled by <what?> +diff -Nurp libreport-2.0.20.orig/src/lib/dump_dir.c libreport-2.0.20/src/lib/dump_dir.c +--- libreport-2.0.20.orig/src/lib/dump_dir.c 2012-11-29 10:42:38.000000000 +0000 ++++ libreport-2.0.20/src/lib/dump_dir.c 2014-04-29 09:02:29.942680183 +0100 +@@ -556,7 +556,7 @@ void dd_create_basic_files(struct dump_d + 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/kogaion-release", /*flags:*/ 0); + dd_save_text(dd, FILENAME_OS_RELEASE, release); + if (chroot_dir) + { +diff -Nurp libreport-2.0.20.orig/src/plugins/bugzilla.conf libreport-2.0.20/src/plugins/bugzilla.conf +--- libreport-2.0.20.orig/src/plugins/bugzilla.conf 2012-11-10 09:39:39.000000000 +0000 ++++ libreport-2.0.20/src/plugins/bugzilla.conf 2014-04-29 09:01:23.660739782 +0100 +@@ -1,5 +1,5 @@ + # Bugzilla URL +-BugzillaURL = https://bugzilla.redhat.com/ ++BugzillaURL = https://bugs.rogentos.ro/ + # yes means that ssl certificates will be checked + SSLVerify = yes + # your login has to exist, if you don have any, please create one +diff -Nurp libreport-2.0.20.orig/src/plugins/Makefile.am libreport-2.0.20/src/plugins/Makefile.am +--- libreport-2.0.20.orig/src/plugins/Makefile.am 2012-12-18 18:15:11.000000000 +0000 ++++ libreport-2.0.20/src/plugins/Makefile.am 2014-04-29 08:57:12.568753794 +0100 +@@ -10,7 +10,6 @@ reporters_bin += reporter-ureport + endif + + bin_PROGRAMS = $(reporters_bin) \ +- reporter-rhtsupport \ + reporter-kerneloops \ + reporter-upload \ + reporter-mailx \ +@@ -31,7 +30,6 @@ reporters_plugin_conf += bugzilla.conf \ + endif + + dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \ +- rhtsupport.conf \ + mailx.conf + + eventsdir = $(EVENTS_DIR) +@@ -49,7 +47,6 @@ dist_events_DATA = $(reporters_events) \ + report_Logger.conf \ + report_Logger.xml \ + report_Mailx.xml \ +- report_RHTSupport.xml \ + report_Kerneloops.xml \ + report_Uploader.xml + +@@ -61,7 +58,6 @@ dist_eventsconf_DATA = \ + mailx_event.conf \ + print_event.conf \ + bugzilla_event.conf \ +- rhtsupport_event.conf \ + uploader_event.conf + + reporters_extra_dist = +@@ -80,7 +76,6 @@ EXTRA_DIST = $(reporters_extra_dist) \ + report_Logger.conf \ + report_Logger.xml.in \ + report_Mailx.xml.in \ +- report_RHTSupport.xml.in \ + report_Kerneloops.xml.in \ + report_Uploader.xml.in + +@@ -113,32 +108,6 @@ reporter_bugzilla_LDADD = \ + ../lib/libreport.la + endif + +-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) \ +- $(LIBXML_CFLAGS) \ +- -D_GNU_SOURCE +-reporter_rhtsupport_LDFLAGS = -ltar +-reporter_rhtsupport_LDADD = \ +- $(GLIB_LIBS) \ +- $(LIBXML_LIBS) \ +- ../lib/libreport-web.la \ +- ../lib/libreport.la +- + reporter_upload_SOURCES = \ + reporter-upload.c + reporter_upload_CPPFLAGS = \ +diff -Nurp libreport-2.0.20.orig/src/plugins/report_Bugzilla.conf libreport-2.0.20/src/plugins/report_Bugzilla.conf +--- libreport-2.0.20.orig/src/plugins/report_Bugzilla.conf 2012-11-10 09:39:39.000000000 +0000 ++++ libreport-2.0.20/src/plugins/report_Bugzilla.conf 2014-04-29 09:01:36.588533115 +0100 +@@ -1,4 +1,4 @@ +-Bugzilla_BugzillaURL = https://bugzilla.redhat.com ++Bugzilla_BugzillaURL = https://bugs.rogentos.ro + Bugzilla_Login = + Bugzilla_Password = + Bugzilla_SSLVerify = yes +diff -Nurp libreport-2.0.20.orig/src/plugins/reporter-bugzilla.c libreport-2.0.20/src/plugins/reporter-bugzilla.c +--- libreport-2.0.20.orig/src/plugins/reporter-bugzilla.c 2012-12-06 15:44:02.000000000 +0000 ++++ libreport-2.0.20/src/plugins/reporter-bugzilla.c 2014-04-29 08:59:22.419677969 +0100 +@@ -691,7 +691,7 @@ static void set_settings(struct bugzilla + 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.rogentos.ro"; + else + { + /* We don't want trailing '/': "https://host/dir/" -> "https://host/dir" */ +diff -Nurp libreport-2.0.20.orig/src/report-python/__init__.py libreport-2.0.20/src/report-python/__init__.py +--- libreport-2.0.20.orig/src/report-python/__init__.py 2012-11-10 09:39:39.000000000 +0000 ++++ libreport-2.0.20/src/report-python/__init__.py 2014-04-29 09:02:55.591270159 +0100 +@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, New + + 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/kogaion-release"] ++SYSTEM_RELEASE_DEPS = ["system-release", "kogaion-version"] + + _hardcoded_default_product = "" + _hardcoded_default_version = "" 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 00000000..4f43ec90 --- /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/files/libreport-2.1.9-json-c.patch b/dev-libs/libreport/files/libreport-2.1.9-json-c.patch new file mode 100644 index 00000000..d7257192 --- /dev/null +++ b/dev-libs/libreport/files/libreport-2.1.9-json-c.patch @@ -0,0 +1,24 @@ +diff -Nurp libreport-2.1.9.orig/src/lib/json.c libreport-2.1.9/src/lib/json.c +--- libreport-2.1.9.orig/src/lib/json.c 2013-10-22 15:32:23.000000000 +0100 ++++ libreport-2.1.9/src/lib/json.c 2014-05-10 16:12:52.436219734 +0100 +@@ -17,7 +17,7 @@ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include <json/json.h> ++#include <json-c/json.h> + + #include <satyr/abrt.h> + #include <satyr/report.h> +diff -Nurp libreport-2.1.9.orig/src/plugins/ureport.c libreport-2.1.9/src/plugins/ureport.c +--- libreport-2.1.9.orig/src/plugins/ureport.c 2013-10-23 16:07:05.000000000 +0100 ++++ libreport-2.1.9/src/plugins/ureport.c 2014-05-10 16:12:45.532339236 +0100 +@@ -17,7 +17,7 @@ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include <json/json.h> ++#include <json-c/json.h> + #include "internal_libreport.h" + #include "ureport.h" + #include "libreport_curl.h" diff --git a/dev-libs/libreport/libreport-2.0.20-r1.ebuild b/dev-libs/libreport/libreport-2.0.20-r1.ebuild new file mode 100644 index 00000000..6efccdcb --- /dev/null +++ b/dev-libs/libreport/libreport-2.0.20-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +PYTHON_COMPAT=( python{2_6,2_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-python/python-report + >=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:= + 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}" +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.20-kogaion.patch" + + # json-c-0.11, https://github.com/abrt/libreport/pull/{159,174} + epatch "${FILESDIR}/${PN}-2.0.20-json-c.patch" + + # Modify uploader_event so that the gui recognizes it + epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch" + + mkdir -p m4 + eautoreconf + + python_copy_sources +} + +src_configure() { + python_foreach_impl run_in_build_dir econf \ + --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 + + # Drop Fedora specific files + rm "${D}/etc/libreport/workflows/workflow_Fedora.xml" + rm "${D}/etc/libreport/workflows/workflow_AnacondaFedora.xml" + rm "${D}/etc/libreport/workflows/workflow_Upload.xml" +} diff --git a/dev-libs/libreport/libreport-2.1.9.ebuild b/dev-libs/libreport/libreport-2.1.9.ebuild new file mode 100644 index 00000000..6cc7313b --- /dev/null +++ b/dev-libs/libreport/libreport-2.1.9.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +PYTHON_COMPAT=( python{2_6,2_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 +gtk" + +COMMON_DEPEND="!dev-python/python-report + >=dev-libs/glib-2.21:2 + dev-libs/satyr + dev-libs/json-c:= + dev-libs/libtar + dev-libs/libxml2:2 + dev-libs/newt:= + dev-libs/nss:= + dev-libs/xmlrpc-c:= + net-libs/libproxy:= + net-misc/curl:=[ssl] + sys-apps/dbus + gtk? ( >=x11-libs/gtk+-3.3.12:3 ) + x11-misc/xdg-utils + ${PYTHON_DEPS} +" +RDEPEND="${COMMON_DEPEND}" +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}/0001-Add-Kogaion-customizations.patch" + epatch "${FILESDIR}/0002-Drop-Fedora-workflows-add-Sabayon-one.patch" + epatch "${FILESDIR}/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch" + + # json-c support + epatch "${FILESDIR}/libreport-2.1.9-json-c.patch" + + mkdir -p m4 + eautoreconf + + python_copy_sources +} + +src_configure() { + python_foreach_impl run_in_build_dir econf \ + --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 00000000..da6fd63d --- /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> |