head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.10 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.8 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.6 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.1.0.4 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.2; locks; strict; comment @# @; 1.2 date 2009.01.13.13.48.33; author cegger; state dead; branches; next 1.1; 1.1 date 2008.10.08.19.13.41; author cegger; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2008.10.08.19.13.41; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2008.10.11.18.27.49; author tron; state Exp; branches; next ; desc @@ 1.2 log @Update to Xen 3.3.1. This is a mainenance release with a number of stability fixes. @ text @$NetBSD: patch-gd,v 1.1 2008/10/08 19:13:41 cegger Exp $ --- python/xen/xend/server/netif.py.orig 2008-08-22 09:49:08.000000000 +0000 +++ python/xen/xend/server/netif.py @@@@ -142,10 +142,6 @@@@ class NetifController(DevController): if sec_lab: back['security_label'] = sec_lab - config_path = "device/%s/%d/" % (self.deviceClass, devid) - for x in back: - self.vm._writeVm(config_path + x, back[x]) - back['handle'] = "%i" % devid back['script'] = os.path.join(xoptions.network_script_dir, script) if rate: @@@@ -189,40 +185,14 @@@@ class NetifController(DevController): result = DevController.getDeviceConfiguration(self, devid, transaction) - config_path = "device/%s/%d/" % (self.deviceClass, devid) - devinfo = () for x in ( 'script', 'ip', 'bridge', 'mac', 'type', 'vifname', 'rate', 'uuid', 'model', 'accel', 'security_label'): if transaction is None: - y = self.vm._readVm(config_path + x) + y = self.readBackend(devid, x) else: - y = self.vm._readVmTxn(transaction, config_path + x) - devinfo += (y,) - (script, ip, bridge, mac, typ, vifname, rate, uuid, - model, accel, security_label) = devinfo - - if script: - result['script'] = script - if ip: - result['ip'] = ip - if bridge: - result['bridge'] = bridge - if mac: - result['mac'] = mac - if typ: - result['type'] = typ - if vifname: - result['vifname'] = vifname - if rate: - result['rate'] = rate - if uuid: - result['uuid'] = uuid - if model: - result['model'] = model - if accel: - result['accel'] = accel - if security_label: - result['security_label'] = security_label + y = self.readBackendTxn(transaction, devid, x) + if y: + result[x] = y return result @ 1.1 log @Apply changeset 18434 from upstream xen-3.3-testing tree. This fixes security issue http://secunia.com/advisories/32064/ @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-gd was added on branch pkgsrc-2008Q3 on 2008-10-11 18:27:49 +0000 @ text @d1 60 @ 1.1.2.2 log @Pullup ticket #2548 - requested by cegger xentools33: security patch Revisions pulled up: - sysutils/xentools33/Makefile 1.10 - sysutils/xentools33/distinfo 1.13 - sysutils/xentools33/patches/patch-ga 1.1 - sysutils/xentools33/patches/patch-gc 1.1 - sysutils/xentools33/patches/patch-gd 1.1 --- Module Name: pkgsrc Committed By: cegger Date: Wed Oct 8 19:13:41 UTC 2008 Modified Files: pkgsrc/sysutils/xentools33: Makefile distinfo Added Files: pkgsrc/sysutils/xentools33/patches: patch-ga patch-gb patch-gc patch-gd Log Message: Apply changeset 18434 from upstream xen-3.3-testing tree. This fixes security issue http://secunia.com/advisories/32064/ @ text @a0 60 $NetBSD: patch-gd,v 1.1 2008/10/08 19:13:41 cegger Exp $ --- python/xen/xend/server/netif.py.orig 2008-08-22 09:49:08.000000000 +0000 +++ python/xen/xend/server/netif.py @@@@ -142,10 +142,6 @@@@ class NetifController(DevController): if sec_lab: back['security_label'] = sec_lab - config_path = "device/%s/%d/" % (self.deviceClass, devid) - for x in back: - self.vm._writeVm(config_path + x, back[x]) - back['handle'] = "%i" % devid back['script'] = os.path.join(xoptions.network_script_dir, script) if rate: @@@@ -189,40 +185,14 @@@@ class NetifController(DevController): result = DevController.getDeviceConfiguration(self, devid, transaction) - config_path = "device/%s/%d/" % (self.deviceClass, devid) - devinfo = () for x in ( 'script', 'ip', 'bridge', 'mac', 'type', 'vifname', 'rate', 'uuid', 'model', 'accel', 'security_label'): if transaction is None: - y = self.vm._readVm(config_path + x) + y = self.readBackend(devid, x) else: - y = self.vm._readVmTxn(transaction, config_path + x) - devinfo += (y,) - (script, ip, bridge, mac, typ, vifname, rate, uuid, - model, accel, security_label) = devinfo - - if script: - result['script'] = script - if ip: - result['ip'] = ip - if bridge: - result['bridge'] = bridge - if mac: - result['mac'] = mac - if typ: - result['type'] = typ - if vifname: - result['vifname'] = vifname - if rate: - result['rate'] = rate - if uuid: - result['uuid'] = uuid - if model: - result['model'] = model - if accel: - result['accel'] = accel - if security_label: - result['security_label'] = security_label + y = self.readBackendTxn(transaction, devid, x) + if y: + result[x] = y return result @