diff -ruN abrt-2.1.4/Makefile.in abrt-2.1.4.new/Makefile.in

--- abrt-2.1.4/Makefile.in	2013-04-30 17:04:44.000000000 +0200

+++ abrt-2.1.4.new/Makefile.in	2013-05-03 14:32:16.000000000 +0200

@@ -128,7 +128,8 @@

 am__dist_systemdsystemunit_DATA_DIST = init-scripts/abrtd.service \

 	init-scripts/abrt-ccpp.service init-scripts/abrt-oops.service \

 	init-scripts/abrt-xorg.service \

-	init-scripts/abrt-vmcore.service

+	init-scripts/abrt-vmcore.service \

+	init-scripts/abrt-uefioops.service

 DATA = $(dist_systemdsystemunit_DATA) $(pkgconfig_DATA)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

   distclean-recursive maintainer-clean-recursive

@@ -408,14 +409,16 @@

 @HAVE_SYSTEMD_TRUE@                                  init-scripts/abrt-ccpp.service \

 @HAVE_SYSTEMD_TRUE@                                  init-scripts/abrt-oops.service \

 @HAVE_SYSTEMD_TRUE@                                  init-scripts/abrt-xorg.service \

-@HAVE_SYSTEMD_TRUE@                                  init-scripts/abrt-vmcore.service

+@HAVE_SYSTEMD_TRUE@                                  init-scripts/abrt-vmcore.service \

+@HAVE_SYSTEMD_TRUE@                                  init-scripts/abrt-uefioops.service

 @HAVE_SYSTEMD_FALSE@sysv_initdir = $(sysconfdir)/rc.d/init.d/

 @HAVE_SYSTEMD_FALSE@sysv_init_SCRIPTS = init-scripts/abrtd \

 @HAVE_SYSTEMD_FALSE@                        init-scripts/abrt-ccpp \

 @HAVE_SYSTEMD_FALSE@                        init-scripts/abrt-oops \

 @HAVE_SYSTEMD_FALSE@                        init-scripts/abrt-xorg \

-@HAVE_SYSTEMD_FALSE@                        init-scripts/abrt-vmcore

+@HAVE_SYSTEMD_FALSE@                        init-scripts/abrt-vmcore \

+@HAVE_SYSTEMD_FALSE@                        init-scripts/abrt-uefioops

 RPM_DIRS = --define "_sourcedir `pwd`" \

 	   --define "_rpmdir `pwd`" \

diff -ruN abrt-2.1.4/src/hooks/Makefile.in abrt-2.1.4.new/src/hooks/Makefile.in

--- abrt-2.1.4/src/hooks/Makefile.in	2013-04-30 17:04:47.000000000 +0200

+++ abrt-2.1.4.new/src/hooks/Makefile.in	2013-05-03 14:40:00.468156772 +0200

@@ -52,6 +52,7 @@

 POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

+bin_PROGRAMS = abrt-merge-uefioops$(EXEEXT)

 libexec_PROGRAMS = abrt-hook-ccpp$(EXEEXT)

 subdir = src/hooks

 DIST_COMMON = $(dist_conf_DATA) $(dist_pluginsconf_DATA) \

@@ -65,10 +66,10 @@

 CONFIG_HEADER = $(top_builddir)/config.h

 CONFIG_CLEAN_FILES =

 CONFIG_CLEAN_VPATH_FILES =

-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \

-	"$(DESTDIR)$(pyhookdir)" "$(DESTDIR)$(confdir)" \

-	"$(DESTDIR)$(pluginsconfdir)"

-PROGRAMS = $(libexec_PROGRAMS)

+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \

+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pyhookdir)" \

+	"$(DESTDIR)$(confdir)" "$(DESTDIR)$(pluginsconfdir)"

+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)

 am_abrt_hook_ccpp_OBJECTS = abrt_hook_ccpp-abrt-hook-ccpp.$(OBJEXT)

 abrt_hook_ccpp_OBJECTS = $(am_abrt_hook_ccpp_OBJECTS)

 am__DEPENDENCIES_1 =

@@ -77,6 +78,11 @@

 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)

 am__v_lt_0 = --silent

 am__v_lt_1 = 

+am_abrt_merge_uefioops_OBJECTS =  \

+	abrt_merge_uefioops-abrt-merge-uefioops.$(OBJEXT)

+abrt_merge_uefioops_OBJECTS = $(am_abrt_merge_uefioops_OBJECTS)

+abrt_merge_uefioops_DEPENDENCIES = ../lib/libabrt.la \

+	$(am__DEPENDENCIES_1)

 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

 am__vpath_adj = case $$p in \

     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

@@ -139,8 +145,9 @@

 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)

 am__v_CCLD_0 = @echo "  CCLD    " $@;

 am__v_CCLD_1 = 

-SOURCES = $(abrt_hook_ccpp_SOURCES)

-DIST_SOURCES = $(abrt_hook_ccpp_SOURCES)

+SOURCES = $(abrt_hook_ccpp_SOURCES) $(abrt_merge_uefioops_SOURCES)

+DIST_SOURCES = $(abrt_hook_ccpp_SOURCES) \

+	$(abrt_merge_uefioops_SOURCES)

 am__can_run_installinfo = \

   case $$AM_UPDATE_INFO_DIR in \

     n|no|NO) false;; \

@@ -175,7 +182,7 @@

 DBUS_LIBS = @DBUS_LIBS@

 DEFAULT_DUMP_DIR_MODE = @DEFAULT_DUMP_DIR_MODE@

 DEFAULT_DUMP_LOCATION = @DEFAULT_DUMP_LOCATION@

-DEFS = @DEFS@

+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@

 DEPDIR = @DEPDIR@

 DLLTOOL = @DLLTOOL@

 DOXYGEN = @DOXYGEN@

@@ -364,7 +371,8 @@

 sbin_SCRIPTS = \

     abrt-install-ccpp-hook \

-    abrt-harvest-vmcore

+    abrt-harvest-vmcore \

+    abrt-harvest-uefioops

 # abrt-hook-ccpp

@@ -385,10 +393,33 @@

     ../lib/libabrt.la \

     $(LIBREPORT_LIBS)

-pyhook_PYTHON = abrt_exception_handler.py abrt.pth

+

+# abrt-merge-uefioops

+abrt_merge_uefioops_SOURCES = \

+    abrt-merge-uefioops.c

+

+abrt_merge_uefioops_CPPFLAGS = \

+    -I$(srcdir)/../include \

+    -I$(srcdir)/../lib \

+    -DVAR_RUN=\"$(VAR_RUN)\" \

+    -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \

+    -DDEFAULT_DUMP_DIR_MODE=$(DEFAULT_DUMP_DIR_MODE) \

+    $(GLIB_CFLAGS) \

+    $(LIBREPORT_CFLAGS) \

+    -D_GNU_SOURCE

+

+abrt_merge_uefioops_LDADD = \

+    ../lib/libabrt.la \

+    $(LIBREPORT_LIBS)

+

+pyhook_PYTHON = \

+	abrt_exception_handler.py \

+	abrt.pth

+

 EXTRA_DIST = abrt_exception_handler.py.in \

 	abrt-install-ccpp-hook.in \

-	abrt-harvest-vmcore.in

+	abrt-harvest-vmcore.in \

+	abrt-harvest-uefioops.in

 CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc)) $(man1_MANS)

 all: all-am

@@ -425,6 +456,52 @@

 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)

 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

 $(am__aclocal_m4_deps):

+install-binPROGRAMS: $(bin_PROGRAMS)

+	@$(NORMAL_INSTALL)

+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

+	if test -n "$$list"; then \

+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \

+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \

+	fi; \

+	for p in $$list; do echo "$$p $$p"; done | \

+	sed 's/$(EXEEXT)$$//' | \

+	while read p p1; do if test -f $$p || test -f $$p1; \

+	  then echo "$$p"; echo "$$p"; else :; fi; \

+	done | \

+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

+	sed 'N;N;N;s,\n, ,g' | \

+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \

+	    else { print "f", $$3 "/" $$4, $$1; } } \

+	  END { for (d in files) print "f", d, files[d] }' | \

+	while read type dir files; do \

+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

+	    test -z "$$files" || { \

+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \

+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

+	    } \

+	; done

+

+uninstall-binPROGRAMS:

+	@$(NORMAL_UNINSTALL)

+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

+	files=`for p in $$list; do echo "$$p"; done | \

+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

+	      -e 's/$$/$(EXEEXT)/' `; \

+	test -n "$$list" || exit 0; \

+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

+	cd "$(DESTDIR)$(bindir)" && rm -f $$files

+

+clean-binPROGRAMS:

+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \

+	echo " rm -f" $$list; \

+	rm -f $$list || exit $$?; \

+	test -n "$(EXEEXT)" || exit 0; \

+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

+	echo " rm -f" $$list; \

+	rm -f $$list

 install-libexecPROGRAMS: $(libexec_PROGRAMS)

 	@$(NORMAL_INSTALL)

 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \

@@ -474,6 +551,9 @@

 abrt-hook-ccpp$(EXEEXT): $(abrt_hook_ccpp_OBJECTS) $(abrt_hook_ccpp_DEPENDENCIES) $(EXTRA_abrt_hook_ccpp_DEPENDENCIES) 

 	@rm -f abrt-hook-ccpp$(EXEEXT)

 	$(AM_V_CCLD)$(LINK) $(abrt_hook_ccpp_OBJECTS) $(abrt_hook_ccpp_LDADD) $(LIBS)

+abrt-merge-uefioops$(EXEEXT): $(abrt_merge_uefioops_OBJECTS) $(abrt_merge_uefioops_DEPENDENCIES) $(EXTRA_abrt_merge_uefioops_DEPENDENCIES) 

+	@rm -f abrt-merge-uefioops$(EXEEXT)

+	$(AM_V_CCLD)$(LINK) $(abrt_merge_uefioops_OBJECTS) $(abrt_merge_uefioops_LDADD) $(LIBS)

 install-sbinSCRIPTS: $(sbin_SCRIPTS)

 	@$(NORMAL_INSTALL)

 	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \

@@ -517,6 +597,7 @@

 	-rm -f *.tab.c

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abrt_hook_ccpp-abrt-hook-ccpp.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -553,6 +634,20 @@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_hook_ccpp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abrt_hook_ccpp-abrt-hook-ccpp.obj `if test -f 'abrt-hook-ccpp.c'; then $(CYGPATH_W) 'abrt-hook-ccpp.c'; else $(CYGPATH_W) '$(srcdir)/abrt-hook-ccpp.c'; fi`

+abrt_merge_uefioops-abrt-merge-uefioops.o: abrt-merge-uefioops.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abrt_merge_uefioops-abrt-merge-uefioops.o -MD -MP -MF $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo -c -o abrt_merge_uefioops-abrt-merge-uefioops.o `test -f 'abrt-merge-uefioops.c' || echo '$(srcdir)/'`abrt-merge-uefioops.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='abrt-merge-uefioops.c' object='abrt_merge_uefioops-abrt-merge-uefioops.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abrt_merge_uefioops-abrt-merge-uefioops.o `test -f 'abrt-merge-uefioops.c' || echo '$(srcdir)/'`abrt-merge-uefioops.c

+

+abrt_merge_uefioops-abrt-merge-uefioops.obj: abrt-merge-uefioops.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT abrt_merge_uefioops-abrt-merge-uefioops.obj -MD -MP -MF $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo -c -o abrt_merge_uefioops-abrt-merge-uefioops.obj `if test -f 'abrt-merge-uefioops.c'; then $(CYGPATH_W) 'abrt-merge-uefioops.c'; else $(CYGPATH_W) '$(srcdir)/abrt-merge-uefioops.c'; fi`

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Tpo $(DEPDIR)/abrt_merge_uefioops-abrt-merge-uefioops.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='abrt-merge-uefioops.c' object='abrt_merge_uefioops-abrt-merge-uefioops.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(abrt_merge_uefioops_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o abrt_merge_uefioops-abrt-merge-uefioops.obj `if test -f 'abrt-merge-uefioops.c'; then $(CYGPATH_W) 'abrt-merge-uefioops.c'; else $(CYGPATH_W) '$(srcdir)/abrt-merge-uefioops.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -739,7 +834,7 @@

 check: check-am

 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)

 installdirs:

-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pyhookdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(pluginsconfdir)"; do \

+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pyhookdir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(pluginsconfdir)"; do \

 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \

 	done

 install: install-am

@@ -775,8 +870,8 @@

 	@echo "it deletes files that may require special tools to rebuild."

 clean: clean-am

-clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \

-	mostlyclean-am

+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \

+	clean-libtool mostlyclean-am

 distclean: distclean-am

 	-rm -rf ./$(DEPDIR)

@@ -803,7 +898,8 @@

 install-dvi-am:

-install-exec-am: install-libexecPROGRAMS install-sbinSCRIPTS

+install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \

+	install-sbinSCRIPTS

 install-html: install-html-am

@@ -843,30 +939,30 @@

 ps-am:

-uninstall-am: uninstall-dist_confDATA uninstall-dist_pluginsconfDATA \

-	uninstall-libexecPROGRAMS uninstall-pyhookPYTHON \

-	uninstall-sbinSCRIPTS

+uninstall-am: uninstall-binPROGRAMS uninstall-dist_confDATA \

+	uninstall-dist_pluginsconfDATA uninstall-libexecPROGRAMS \

+	uninstall-pyhookPYTHON uninstall-sbinSCRIPTS

 .MAKE: install-am install-strip

-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \

-	clean-libexecPROGRAMS clean-libtool cscopelist ctags distclean \

-	distclean-compile distclean-generic distclean-libtool \

-	distclean-tags distdir dvi dvi-am html html-am info info-am \

-	install install-am install-data install-data-am \

-	install-data-local install-dist_confDATA \

-	install-dist_pluginsconfDATA install-dvi install-dvi-am \

-	install-exec install-exec-am install-html install-html-am \

-	install-info install-info-am install-libexecPROGRAMS \

-	install-man install-pdf install-pdf-am install-ps \

-	install-ps-am install-pyhookPYTHON install-sbinSCRIPTS \

-	install-strip installcheck installcheck-am installdirs \

-	maintainer-clean maintainer-clean-generic mostlyclean \

-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \

-	pdf pdf-am ps ps-am tags uninstall uninstall-am \

-	uninstall-dist_confDATA uninstall-dist_pluginsconfDATA \

-	uninstall-libexecPROGRAMS uninstall-pyhookPYTHON \

-	uninstall-sbinSCRIPTS

+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \

+	clean-generic clean-libexecPROGRAMS clean-libtool cscopelist \

+	ctags distclean distclean-compile distclean-generic \

+	distclean-libtool distclean-tags distdir dvi dvi-am html \

+	html-am info info-am install install-am install-binPROGRAMS \

+	install-data install-data-am install-data-local \

+	install-dist_confDATA install-dist_pluginsconfDATA install-dvi \

+	install-dvi-am install-exec install-exec-am install-html \

+	install-html-am install-info install-info-am \

+	install-libexecPROGRAMS install-man install-pdf install-pdf-am \

+	install-ps install-ps-am install-pyhookPYTHON \

+	install-sbinSCRIPTS install-strip installcheck installcheck-am \

+	installdirs maintainer-clean maintainer-clean-generic \

+	mostlyclean mostlyclean-compile mostlyclean-generic \

+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \

+	uninstall-am uninstall-binPROGRAMS uninstall-dist_confDATA \

+	uninstall-dist_pluginsconfDATA uninstall-libexecPROGRAMS \

+	uninstall-pyhookPYTHON uninstall-sbinSCRIPTS

 # Generate on build

@@ -893,6 +989,11 @@

 	sed -e s,\@CONF_DIR\@,\$(CONF_DIR)\,g \

 	    -e s,\@DEFAULT_DUMP_LOCATION\@,$(DEFAULT_DUMP_LOCATION),g \

 		$< >$@

+

+abrt-harvest-uefioops: abrt-harvest-uefioops.in

+	sed -e s,\@CONF_DIR\@,\$(CONF_DIR)\,g \

+	    -e s,\@DEFAULT_DUMP_LOCATION\@,$(DEFAULT_DUMP_LOCATION),g \

+		$< >$@

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.