sablink/for-gentoo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Files
2dc3e5b4ddebf13d72ef920606cc8d501feed910
for-gentoo/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch
T

158 lines
6.6 KiB
Diff
Raw Blame History

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.sabayon.org)
'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/sabayon-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/sabayon-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.sabayon.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 -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.sabayon.org
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.sabayon.org";
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/sabayon-release"]
+SYSTEM_RELEASE_DEPS = ["system-release", "sabayon-version"]
_hardcoded_default_product = ""
_hardcoded_default_version = ""
Reference in New Issue View Git Blame Copy Permalink