From 3141567875cc04d64590844689b9db36fb770827 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 28 Feb 2012 11:42:23 +0000 Subject: Update per proxy-maintainer request. Remove overshadowed versions. (Portage version: 2.2.0_alpha89/cvs/Linux x86_64) --- net-firewall/ufw/files/ufw-0.30.1-encoding.patch | 15 +++++++++++++++ net-firewall/ufw/files/ufw-0.30.1-python-abis.patch | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 net-firewall/ufw/files/ufw-0.30.1-encoding.patch create mode 100644 net-firewall/ufw/files/ufw-0.30.1-python-abis.patch (limited to 'net-firewall/ufw/files') diff --git a/net-firewall/ufw/files/ufw-0.30.1-encoding.patch b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch new file mode 100644 index 000000000000..a4626ef0cff0 --- /dev/null +++ b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch @@ -0,0 +1,15 @@ +Fixes usage with ufw-frontends. +upstream bug report: https://bugs.launchpad.net/ufw/+bug/921758 +--- src/util.py ++++ src/util.py +@@ -205,8 +205,9 @@ + + def open_file_read(f): + '''Opens the specified file read-only''' ++ import codecs + try: +- orig = open(f, 'r') ++ orig = codecs.open(f, 'r', "UTF-8") + except Exception: + raise + diff --git a/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch b/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch new file mode 100644 index 000000000000..b924012790e4 --- /dev/null +++ b/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch @@ -0,0 +1,21 @@ +This patch fixes strings substitution in common.py during package +build with ebuild supporting installation for multiple Python versions. + +With support for multiple Python versions in the ebuild, seems the +file isn't copied from staging/ to build-*/lib/ufw/ after being +modified. That's why the copy needs to be done "manually" here. +The issue occurs with "setup.py build -b build-XXX" followed by +"setup.py build -b build-XXX install". + +probably related: https://bugs.launchpad.net/ufw/+bug/819600 +--- setup.py ++++ setup.py +@@ -89,6 +89,8 @@ + "-i", + "s%#SHARE_DIR#%" + real_sharedir + "%g", + os.path.join('staging', file)]) ++ self.copy_file(os.path.join('staging', file), ++ os.path.join(self.build_base, "lib", "ufw")) + + # Now byte-compile everything + super(Install, self).run() -- cgit v1.2.3-65-gdbad