From a1aaaf08136401e87ab6d0781116d2ff1ca75fb4 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Nov 19 2013 11:59:08 +0000 Subject: import libreport-2.1.7-4.el7.src.rpm --- diff --git a/.libreport.metadata b/.libreport.metadata new file mode 100644 index 0000000..399ce87 --- /dev/null +++ b/.libreport.metadata @@ -0,0 +1 @@ +5fe11874abd0e7759457249366382af7e738444d SOURCES/libreport-2.1.7.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0015-enable-reporting-to-Red-Hat-Support-tool-for-anacond.patch b/SOURCES/0015-enable-reporting-to-Red-Hat-Support-tool-for-anacond.patch new file mode 100644 index 0000000..b2d23fe --- /dev/null +++ b/SOURCES/0015-enable-reporting-to-Red-Hat-Support-tool-for-anacond.patch @@ -0,0 +1,24 @@ +From 1ec6f1844035a1fa33a2eea534661bd9d54f6cc6 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 22 Oct 2013 10:37:57 +0200 +Subject: [LIBREPORT PATCH 15/33] enable reporting to Red Hat Support tool for + anaconda bugs + +Related to rhbz#1015554 + +Signed-off-by: Jakub Filak +--- + src/workflows/anaconda_event.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/workflows/anaconda_event.conf b/src/workflows/anaconda_event.conf +index f369acd..5828b5a 100644 +--- a/src/workflows/anaconda_event.conf ++++ b/src/workflows/anaconda_event.conf +@@ -1,2 +1,3 @@ + EVENT=workflow_AnacondaFedora component=anaconda ++#EVENT=workflow_AnacondaRHEL component=anaconda + EVENT=workflow_AnacondaUpload component=anaconda +-- +1.8.3.1 + diff --git a/SOURCES/0033-enable-reporting-to-Red-Hat-Bugzilla-for-RHEL-anacon.patch b/SOURCES/0033-enable-reporting-to-Red-Hat-Bugzilla-for-RHEL-anacon.patch new file mode 100644 index 0000000..40a9db4 --- /dev/null +++ b/SOURCES/0033-enable-reporting-to-Red-Hat-Bugzilla-for-RHEL-anacon.patch @@ -0,0 +1,76 @@ +From 85cfaa9fb36757ae1bd4fe9df998a76515b5fcd1 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Thu, 7 Nov 2013 14:52:54 +0100 +Subject: [LIBREPORT PATCH 33/33] enable reporting to Red Hat Bugzilla for RHEL + anaconda bugs + +Related to rhbz#1015554 + +Signed-off-by: Jakub Filak +--- + libreport.spec.in | 5 +++-- + po/POTFILES.in | 1 + + src/workflows/Makefile.am | 2 ++ + src/workflows/anaconda_event.conf | 1 + + src/workflows/workflow_AnacondaRHELBugzilla.xml.in | 9 +++++++++ + 5 files changed, 16 insertions(+), 2 deletions(-) + create mode 100644 src/workflows/workflow_AnacondaRHELBugzilla.xml.in + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 97d7d4d..8cd54f8 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -45,6 +45,7 @@ src/plugins/ureport.c + src/report-newt/report-newt.c + src/workflows/workflow_AnacondaFedora.xml.in + src/workflows/workflow_AnacondaRHEL.xml.in ++src/workflows/workflow_AnacondaRHELBugzilla.xml.in + src/workflows/workflow_AnacondaUpload.xml.in + src/workflows/workflow_FedoraCCpp.xml.in + src/workflows/workflow_FedoraKerneloops.xml.in +diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am +index 7f1e676..29b09b4 100644 +--- a/src/workflows/Makefile.am ++++ b/src/workflows/Makefile.am +@@ -17,6 +17,7 @@ if BUILD_BUGZILLA + dist_workflows_DATA += \ + workflow_AnacondaFedora.xml \ + workflow_AnacondaRHEL.xml \ ++ workflow_AnacondaRHELBugzilla.xml \ + workflow_AnacondaUpload.xml + endif + +@@ -50,5 +51,6 @@ if BUILD_BUGZILLA + EXTRA_DIST += \ + workflow_AnacondaFedora.xml.in \ + workflow_AnacondaRHEL.xml.in \ ++ workflow_AnacondaRHELBugzilla.xml.in \ + workflow_AnacondaUpload.xml.in + endif +diff --git a/src/workflows/anaconda_event.conf b/src/workflows/anaconda_event.conf +index 5828b5a..f9ade8e 100644 +--- a/src/workflows/anaconda_event.conf ++++ b/src/workflows/anaconda_event.conf +@@ -1,3 +1,4 @@ + EVENT=workflow_AnacondaFedora component=anaconda + #EVENT=workflow_AnacondaRHEL component=anaconda ++EVENT=workflow_AnacondaRHELBugzilla component=anaconda + EVENT=workflow_AnacondaUpload component=anaconda +diff --git a/src/workflows/workflow_AnacondaRHELBugzilla.xml.in b/src/workflows/workflow_AnacondaRHELBugzilla.xml.in +new file mode 100644 +index 0000000..fd7853f +--- /dev/null ++++ b/src/workflows/workflow_AnacondaRHELBugzilla.xml.in +@@ -0,0 +1,9 @@ ++ ++ ++ <_name>Report a bug to Red Hat Bugzilla ++ <_description>Process the report using the Red Hat infrastructure ++ ++ ++ report_Bugzilla ++ ++ +-- +1.8.3.1 + diff --git a/SOURCES/autogen.sh b/SOURCES/autogen.sh new file mode 100755 index 0000000..c6e1729 --- /dev/null +++ b/SOURCES/autogen.sh @@ -0,0 +1,70 @@ +#! /bin/sh + +print_help() +{ +cat << EOH +Prepares the source tree for configuration + +Usage: + autogen.sh [sydeps [--install]] + +Options: + + sysdeps prints out all dependencies + --install install all dependencies ('sudo yum install \$DEPS') + +EOH +} + +build_depslist() +{ + DEPS_LIST=`grep "^\(Build\)\?Requires:" *.spec.in | grep -v "%{name}" | tr -s " " | tr "," "\n" | cut -f2 -d " " | grep -v "^libreport" | sort -u | tr "\n" " "` +} + +case "$1" in + "--help"|"-h") + print_help + exit 0 + ;; + "sysdeps") + build_depslist + + if [ "$2" == "--install" ]; then + set -x verbose + sudo yum install $DEPS_LIST + set +x verbose + else + echo $DEPS_LIST + fi + exit 0 + ;; + *) + echo "Running gen-version" + ./gen-version + + mkdir -p m4 + echo "Creating m4/aclocal.m4 ..." + test -r m4/aclocal.m4 || touch m4/aclocal.m4 + + echo "Running autopoint" + autopoint --force || exit 1 + + echo "Running intltoolize..." + intltoolize --force --copy --automake || exit 1 + + echo "Running aclocal..." + aclocal || exit 1 + + echo "Running libtoolize..." + libtoolize || exit 1 + + echo "Running autoheader..." + autoheader || return 1 + + echo "Running autoconf..." + autoconf --force || exit 1 + + echo "Running automake..." + automake --add-missing --force --copy || exit 1 + ;; +esac diff --git a/SOURCES/libreport-2.1.6-do_not_offer_uploading_on_failure_in_report_gtk.patch b/SOURCES/libreport-2.1.6-do_not_offer_uploading_on_failure_in_report_gtk.patch new file mode 100644 index 0000000..5765a97 --- /dev/null +++ b/SOURCES/libreport-2.1.6-do_not_offer_uploading_on_failure_in_report_gtk.patch @@ -0,0 +1,18 @@ +diff -ruN libreport-2.1.6/src/gui-wizard-gtk/wizard.c libreport-2.1.6.rhel7/src/gui-wizard-gtk/wizard.c +--- libreport-2.1.6/src/gui-wizard-gtk/wizard.c 2013-07-26 06:19:00.000000000 +0200 ++++ libreport-2.1.6.rhel7/src/gui-wizard-gtk/wizard.c 2013-07-29 15:22:50.383899811 +0200 +@@ -1702,14 +1702,7 @@ + "\t▫ network connection problems\n"\ + "\t▫ corrupted problem data\n")); + +- add_warning( +-_("If you want to help us, please click on the upload button and provide all problem data for a deep analysis.\n"\ +-"Before you do that, please consider the security risks. Problem data may contain sensitive information like passwords.\n"\ +-"The uploaded data are stored in a protected storage and only a limited number of persons can read them.")); +- + show_warnings(); +- +- gtk_widget_show(g_btn_onfail); + } + + static gboolean consume_cmd_output(GIOChannel *source, GIOCondition condition, gpointer data) diff --git a/SOURCES/libreport-2.1.6-no_fedoraproject_urls.patch b/SOURCES/libreport-2.1.6-no_fedoraproject_urls.patch new file mode 100644 index 0000000..c55c398 --- /dev/null +++ b/SOURCES/libreport-2.1.6-no_fedoraproject_urls.patch @@ -0,0 +1,36 @@ +diff -ruN libreport-2.1.6/src/plugins/report_EmergencyAnalysis.xml.in libreport-2.1.6.rhel7/src/plugins/report_EmergencyAnalysis.xml.in +--- libreport-2.1.6/src/plugins/report_EmergencyAnalysis.xml.in 2013-07-10 13:20:16.000000000 +0200 ++++ libreport-2.1.6.rhel7/src/plugins/report_EmergencyAnalysis.xml.in 2013-07-29 15:19:11.114687095 +0200 +@@ -15,7 +15,7 @@ + + + +