2 files changed, 5 insertions, 64 deletions
diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index 7706a798047f..91eb26690d28 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/bcfg2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.31 2013/04/21 07:56:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.32 2013/12/23 00:35:07 tomwij Exp $
+
+  23 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+  -files/bcfg2-1.2.2-CVE-2012-3366-Trigger-plugin.patch:
+  [QA] Remove unused files.
 
 *bcfg2-1.2.4 (21 Apr 2013)
 
diff --git a/app-admin/bcfg2/files/bcfg2-1.2.2-CVE-2012-3366-Trigger-plugin.patch b/app-admin/bcfg2/files/bcfg2-1.2.2-CVE-2012-3366-Trigger-plugin.patch
deleted file mode 100644
index 031dfa89d3e0..000000000000
--- a/app-admin/bcfg2/files/bcfg2-1.2.2-CVE-2012-3366-Trigger-plugin.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Downloaded from http://trac.mcs.anl.gov/projects/bcfg2/changeset/a524967e8d5c4c22e49cd619aed20c87a316c0be/
-
-Index: src/lib/Server/Plugins/Trigger.py
-===================================================================
---- src/lib/Server/Plugins/Trigger.py	(revision bf5040f75e71e25af0b9b5c2a9c098c5933d4acc)
-+++ src/lib/Server/Plugins/Trigger.py	(revision a524967e8d5c4c22e49cd619aed20c87a316c0be)
-@@ -1,16 +1,6 @@
- import os
-+import pipes
- import Bcfg2.Server.Plugin
--
--
--def async_run(prog, args):
--    pid = os.fork()
--    if pid:
--        os.waitpid(pid, 0)
--    else:
--        dpid = os.fork()
--        if not dpid:
--            os.system(" ".join([prog] + args))
--        os._exit(0)
--
-+from subprocess import Popen, PIPE
- 
- class Trigger(Bcfg2.Server.Plugin.Plugin,
-@@ -31,8 +21,29 @@
-             raise Bcfg2.Server.Plugin.PluginInitError
- 
-+    def async_run(self, args):
-+        pid = os.fork()
-+        if pid:
-+            os.waitpid(pid, 0)
-+        else:
-+            dpid = os.fork()
-+            if not dpid:
-+                self.debug_log("Running %s" % " ".join(pipes.quote(a)
-+                                                       for a in args))
-+                proc = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-+                (out, err) = proc.communicate()
-+                rv = proc.wait()
-+                if rv != 0:
-+                    self.logger.error("Trigger: Error running %s (%s): %s" %
-+                                      (args[0], rv, err))
-+                elif err:
-+                    self.debug_log("Trigger: Error: %s" % err)
-+            os._exit(0)
-+
-     def process_statistics(self, metadata, _):
-         args = [metadata.hostname, '-p', metadata.profile, '-g',
-                 ':'.join([g for g in metadata.groups])]
-+        self.debug_log("running triggers")
-         for notifier in os.listdir(self.data):
-+            self.debug_log("running %s" % notifier)
-             if ((notifier[-1] == '~') or
-                 (notifier[:2] == '.#') or
-@@ -40,5 +51,4 @@
-                 (notifier in ['SCCS', '.svn', '4913'])):
-                 continue
--            npath = self.data + '/' + notifier
--            self.logger.debug("Running %s %s" % (npath, " ".join(args)))
--            async_run(npath, args)
-+            npath = os.path.join(self.data, notifier)
-+            self.async_run([npath] + args)