summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Whyman <thev00d00@gentoo.org>2012-09-24 12:18:04 +0000
committerIan Whyman <thev00d00@gentoo.org>2012-09-24 12:18:04 +0000
commit21cd3d3c1a3f61eb27060c3f9cc4d9871f96d55b (patch)
tree139d84b70f11deb4e00e8e52a37b3df1a5863786 /net-firewall/ufw
parentLink to upstream bug. (diff)
downloadhistorical-21cd3d3c1a3f61eb27060c3f9cc4d9871f96d55b.tar.gz
historical-21cd3d3c1a3f61eb27060c3f9cc4d9871f96d55b.tar.bz2
historical-21cd3d3c1a3f61eb27060c3f9cc4d9871f96d55b.zip
Bump to 0.33 (with python 3 support), drop old
Package-Manager: portage-2.2.0_alpha130/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/ufw')
-rw-r--r--net-firewall/ufw/ChangeLog10
-rw-r--r--net-firewall/ufw/Manifest10
-rw-r--r--net-firewall/ufw/files/ufw-0.30.1-encoding.patch15
-rw-r--r--net-firewall/ufw/files/ufw-0.30.1-python-abis.patch21
-rw-r--r--net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch46
-rw-r--r--net-firewall/ufw/files/ufw-move-path.patch177
-rw-r--r--net-firewall/ufw/ufw-0.30.1-r4.ebuild100
-rw-r--r--net-firewall/ufw/ufw-0.33.ebuild156
8 files changed, 215 insertions, 320 deletions
diff --git a/net-firewall/ufw/ChangeLog b/net-firewall/ufw/ChangeLog
index 37bdaa2559a1..9a3b83dc2299 100644
--- a/net-firewall/ufw/ChangeLog
+++ b/net-firewall/ufw/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-firewall/ufw
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.8 2012/09/23 18:20:24 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.9 2012/09/24 12:18:04 thev00d00 Exp $
+
+*ufw-0.33 (24 Sep 2012)
+
+ 24 Sep 2012; Ian Whyman <thev00d00@gentoo.org> -ufw-0.30.1-r4.ebuild,
+ -files/ufw-0.30.1-encoding.patch, -files/ufw-0.30.1-python-abis.patch,
+ +ufw-0.33.ebuild, +files/ufw-0.33-dont-check-iptables.patch,
+ -files/ufw-move-path.patch:
+ Bump to 0.33 (with python 3 support), drop old, thanks to Sławomir Nizio
23 Sep 2012; Ian Whyman <thev00d00@gentoo.org> ufw-0.31.1.ebuild:
Fix for bug #428768 by Sławomir Nizio
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 1092347d03f5..3a243e523265 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,17 +1,15 @@
AUX rsyslog/ufw.logrotate 178 SHA256 02d1a00ca68446fbe056a4c3aede319f77b3262e26092cc04ea46de8923d03f8 SHA512 d381a34b23d8656c316af69c07d49042d6c4def4cea3e51367210bce20681376fd0259a95b6b9403171c5d80732927a8880f3d401e13e6f76b505324eecb146b WHIRLPOOL 10b63f8966ad7ad0894a18216a0102fc8a102b14c8f9fb468a4a8d61ae13b1ec3176c7bb9ffb852f8aaa4ac7874584a8f8f5a2d6e98fa3fb56f5945e9bd99139
AUX syslog-ng/syslog-ng.example 381 SHA256 70a795c1b20e2cdef38565d74b9de042c6666f860a2fd1b3bdc6f31dd451bc68 SHA512 f48d2487679fe179ea216bb4259affbf5ab4c86725b45942581ada8dac24dd0c978f755182805ff5350ab169972fcee7bb54a6d14df760d4b5f62c485af1e49e WHIRLPOOL 44874c68257b6f9a53e7fd1affc6ccf2492d9ec09a4700a17239fb3e413e2dcf2ede87eafb1e253d965c27a1c5ead36c413c8c84ec3ed55f5cf2191b927aacbe
AUX syslog-ng/ufw.logrotate 269 SHA256 cddd86613bde19b45f0f935c65bb43721f69aefc14e7d629612b23ea3b5c5c97 SHA512 22d89f04b68a8b4deeb60aca263239255dd01b9c6e6d23a5d77514daf7bb9dc3910a28cfe9c606f70d2a50f0365bb19c3cf00c5859ee2630c00f0df451ee9c5d WHIRLPOOL 5da4f8c615667d829ea4eb318ec01b712adf69002dcf8c3df7deba8fa3e49e426b1c00e468805ba571ed2f2ce05fa81b7e2ac83e7231de3f3305d6ce190264e5
-AUX ufw-0.30.1-encoding.patch 363 SHA256 9f679761dd53a12f630c1331dbcf471ecd11b6334b6cee6765297af7c0eca803 SHA512 7662d4ae25503d187829618d5f0d3a72f1043211594695ecc867d4bb0a56f2f5d3c1577ca6092e769f0c39888433750b39141d189d8ace36c37e225fb5025f03 WHIRLPOOL aa469803a5bdcd1b8b3956ded32e24051b047b3ca55b37dcb7ac9b449e37432b2b9ecce08fefde381fe142ea9cf5464067caa235a1c2cc6cf4dc5d189261f94b
-AUX ufw-0.30.1-python-abis.patch 921 SHA256 bcb6d1846cac9677114fd18058c1acd92c912a92901dfc2f9f52cb11e3e23eaa SHA512 5530a5c9dc2cbd8bf78cb4c9ea97184b297e9998268f15bbb72d0e1e826ff653ed09a51df591b2f574a144afc65f0d95c991b23124bcd93fb4de2417f8385414 WHIRLPOOL 1f9b50ab745792101403333535f85bcc85e080c24f99c8b3cf7355502bf752d18578921c013e98a4eb7d54aa6fc064f4efe48f287182bdeab30edfa02e5dcfff
AUX ufw-0.31.1-move-path.patch 7071 SHA256 88a7b20696b731bac01b3c5d88b0353842b1228d3239cfebe1f2a47c1bdb6768 SHA512 66382ded35437e563c874dc01417a2735a2aa136a1e670fd3707c3311516a6d9a0e62a20679a4f5dcaa2edc0225535cf2410d7f86676b1e10eb309ecc3e24bc2 WHIRLPOOL 89e3165900def8380cade3eb62fc351be9e43c8055f4b71c356f3aa5356b0c57154e18485d94e0ca86462da7c55b1b4755de379a88f1958d313b93c0ec723715
AUX ufw-0.31.1-python-abis.patch 1872 SHA256 1e3094135d71e7e7129b2d268d79c73990f0a6f61f2bb6456d3f3654b4975463 SHA512 fbe65a6775426c66cd82382e62eea3a2179d68a0b6c617cc468e7076e2f58493baffde686b65e6bf3a89ea7fdda48a5a42d152b1be388c943408532f47d4402a WHIRLPOOL 62e68d1ef8aaa4963765599ca6701af18bcdef8f6a20607ce433b5294baa9c5ba75b3d41266d9a8bd82febe3a3ac75c6fcb2326fbc5cafa31634ec96a4407b10
+AUX ufw-0.33-dont-check-iptables.patch 1659 SHA256 8a3ae20d399e83aa9c779dfed1f65d99b277263681b1a3e7e9e86143d5fabd0a SHA512 8f92d4b79f1caf01cb97ec64014c7607a410fb0a36e5e87376707c026d714a060ae554591b6e5b3834b671acd4145dcca68a9373aa41051ef60c9dd409dd008d WHIRLPOOL 8f897654bde85d84b17dc32507c5a469fe04eb2201acb55bfd02a76346620399dbcb9c7d0ce19f48285f6eec5de0a5d96420483d6a0b7a4c31a41fa329f91180
AUX ufw-2.initd 2722 SHA256 657b5305923b2a5de9eb96931aaaa28d6e997ace6c40793d905887798094258c SHA512 54cb84ae5ce2c327a7a7b03deeed3d7507a4716ce929aa563d4fb5baa9aa73d95575ec7d5db7165345310869bd5a60b1033c6691f02a85ab94baa6b4a550daa7 WHIRLPOOL c19a21c93f0c63165715e8da4ab9b16a4596ccc3730118c1bbd7eb4de9a94b2b1475904818a2786b2490a07dee7d761da28ca6dc087926c27598d691cb333ce6
AUX ufw-dont-check-iptables.patch 1572 SHA256 2ea0f9525baa82386690577525631f468e56a0fbde0e7e5a65fba36c922ea96f SHA512 c072e924ed5c7df37d89dd9dc8ecb9a52f16fcd962a31d97f45cecefb971adcceabff183bec386be29f44942d12f8bce595ff4203e390ce464627458843b19cb WHIRLPOOL a1ee6799042353f32a1746b14017403994d60dc1ba7e67581ebdff3d93e37e72c7224708d2c0d1bef25ce311ad5c647cd5f0fa62ea4da60321e47f922f64c54d
-AUX ufw-move-path.patch 7135 SHA256 f8036c343f52e12493d1019e83dfdda505fae68bbc4b46144ec73033a9d4a578 SHA512 66555a260bfd1b7cb965fb40e21518117bb43f495c06b018d4dfb115e2c8671c62405aecbaffdb6eeb06d8b8d38582283b45ac20e1c5105463efeb9a89e58166 WHIRLPOOL fcaaf88874ee199e3f957e0f1e66f23331da7dd9dad5a774c9112211208fd18cfc41a4903d8687e7377e7e6b9a4c3381fcbb2e39dbb411e1721a7f3261339da6
AUX ufw.confd 219 SHA256 069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 WHIRLPOOL e6c4537392921c63f8a57fab7ea269fbeea846468ef8968816d988556557495e8abb77aee9d60648a1483a599683613cf5ea832cbcf498a8828baa9abcd31752
-DIST ufw-0.30.1.tar.gz 297322 SHA256 98da13fe3e9aa8ff29611f20ef6e8b15be42bcdc43c8ef3145755b220f3bae1a SHA512 6f3f729603be91866844886b357c97fa3cdd1ca5c7e0f99b53d1344ace2aa8914af5a990eb7098c738fd65421a1494b2ae520ee3a6cbca9c58a2601705e26cd5 WHIRLPOOL 09a8ca2b2d5664569fe33b1872f74c06bb97c816da6179c27405177a6966a85a1e5df44fda75260fcd81d021f3652055f26d6861acccc90257ce8da3998cdbe0
DIST ufw-0.31.1.tar.gz 322448 SHA256 ccf5e00aa76841b9467ad9506fbf96373fb24a4b26bffd858ea1eb2522491dcb SHA512 3c9e61be7ba18ccdbd8195517f0b74a418b460f91b6efcdf0d883fc1dca2bc376ee317836882b67d2fd4825c2e5374d9c6a5da3d77f98794b64c98071d3ac0dc WHIRLPOOL 35064e73f892d6a94413f3560f5f0af945c972b673da4980af0a60576cc641810a74d76ed196935abaf9c2b395c2cc7250b6d27e710e284cbf2df014a6f0820d
-EBUILD ufw-0.30.1-r4.ebuild 2968 SHA256 f686a433ea8e01b11ea393503db44f7cea3db35c56785fc35da0974278e9d3d6 SHA512 ce0e2550285e594a80e3dd35b3d58a77e37c14f90ba7aad403d3995c1a5fba7538184aa6e8192bafbe241ce0b64a0d33b4d11613628df179c255b3622b5ac574 WHIRLPOOL 926451bc938dcdd6bed2ff862f6f5db9a08c1ff97e8299aab21d8b1a4eb7ec05b47cfacd65816bdd329418a7f44feb997942697311705e3d17310d3ee9ff56fa
+DIST ufw-0.33.tar.gz 332893 SHA256 5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8 SHA512 a908d0a2c74bedef418b28f1701048bc9281f314ff747fb1e9497ddee341dbf86402215c470b605523b03a12b2dec812cd7342c310c04231dbed5b6f8e783309 WHIRLPOOL bdd09fbdc2514061b6971e06fa05d6fee04e29c2cecf0c12b237349071e88d188aa8a7bd5c54f5cf3cccd4ddf8d2e3d2bb6ed0db92538b7d76cea471d74848c1
EBUILD ufw-0.31.1.ebuild 4740 SHA256 1434d557129a07d1b2a5e13de8bdb4d33ba8bb88479b8b78ac3af95f48757127 SHA512 1a8d5d9b0d1cf8da35d8ba861d30cd57f4b285f76d6088c11ac341af35d49abe697eb046efb35ed027305bccf7a00298ee2ef76c9be90f46dbcf922c095ebd34 WHIRLPOOL 0dbf7abecbffa54c4b7d01640ca091c38c4498110149e19087dad9156ecebea2b16b32d246de4e8fc41e1c48319e2102e237db2a142b5b9521e9273c07584b16
-MISC ChangeLog 2047 SHA256 3ca6c193f6c70124f2abe1dbc4bb8d1679c190c6fd0db410e41387bed070ace6 SHA512 2ec510626ee7341b5ee3e893947c2becf1ab3249fe1b56c79073c2b223c0b9228f2229e389a9d60db9bbead48c2eb5e4ab063b59c4b89b36a3bde3018f9c914d WHIRLPOOL 2aaff2736460de091533548b0cf15a34c10252c460249ee03ce4e2480e19965f0effea870f87907159584771e70f97118519169c70c76f24a08f8efbcc1fa0f9
+EBUILD ufw-0.33.ebuild 4636 SHA256 f8228671dc04ebfba062ee31643cbbb0339e6757e131ff53fbf7aa8b447f4608 SHA512 90384086521f7a6e74bd9246d0bd2d71996bd9af3acda4004c8b1303f62073ea215a25c944d8f71e694477408a8eac4d44158b164a7e8397e192c00251e5229d WHIRLPOOL 12094132c8e689ce06e1491cb2b650210e5144d0082625da314f14cc1f4d314ab94b71c003516ea011389670dab2b1574af426dcdec11abb65b85237e64e248a
+MISC ChangeLog 2387 SHA256 ad976a6098b893d61edf7c10f333a491c4faeae6fc5255f71285021b6be14104 SHA512 163359a5b04b356553b6d37d88837f35b467fbf5a7a665760766152ad568f0182c6d9510be65361cb9a6e15465dfe58827b29ee3c025138c53fa8d3999afeebd WHIRLPOOL 1453dca2ffe4d254579d4c69d18b2d9353ef2cd85c98f54e9266e5350ef2d282099c7a4552b1e5b46d5efb7c23bb07548ce0a1260efd29013518e98ad1b61ca1
MISC metadata.xml 622 SHA256 e504f88d893e02ac0bf5aa71b5b153da69205bcc72463a24b551918686afdcc4 SHA512 27a11c5b355ff6cbf5cccc6d852d0b8702cd73641cf0fbcc79cef7ced889cc7aa89ef1e56b3e8fc5a1e0b82c789f0b272ae75db83d32c8e3963bc08d69dc7e38 WHIRLPOOL cda0950c88207d057a8a952e5294e170216f1bef97b18fa29f15dc128a076761cc40a56ec1096a10450dda86585255c54f4eac699671fbe9a5bab049113feee1
diff --git a/net-firewall/ufw/files/ufw-0.30.1-encoding.patch b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch
deleted file mode 100644
index a4626ef0cff0..000000000000
--- a/net-firewall/ufw/files/ufw-0.30.1-encoding.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index b924012790e4..000000000000
--- a/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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()
diff --git a/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch b/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch
new file mode 100644
index 000000000000..b7eae3595cb5
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch
@@ -0,0 +1,46 @@
+diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py
+--- ufw-0.32/setup.py 2012-07-06 17:46:29.000000000 +0200
++++ ufw-0.32.new/setup.py 2012-07-30 15:28:31.874547818 +0200
+@@ -225,41 +225,7 @@
+ os.unlink(os.path.join('staging', 'ufw-init'))
+ os.unlink(os.path.join('staging', 'ufw-init-functions'))
+
+-iptables_exe = ''
+-iptables_dir = ''
+-
+-for e in ['iptables']:
+- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \
+- '/usr/local/bin']:
+- if e == "iptables":
+- if os.path.exists(os.path.join(dir, e)):
+- iptables_dir = dir
+- iptables_exe = os.path.join(iptables_dir, "iptables")
+- print("Found '%s'" % iptables_exe)
+- else:
+- continue
+-
+- if iptables_exe != "":
+- break
+-
+-
+-if iptables_exe == '':
+- print("ERROR: could not find required binary 'iptables'", file=sys.stderr)
+- sys.exit(1)
+-
+-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']:
+- if not os.path.exists(os.path.join(iptables_dir, e)):
+- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr)
+- sys.exit(1)
+-
+-(rc, out) = cmd([iptables_exe, '-V'])
+-if rc != 0:
+- raise OSError(errno.ENOENT, "Could not find version for '%s'" % \
+- (iptables_exe))
+-version = re.sub('^v', '', re.split('\s', str(out))[1])
+-print("Found '%s' version '%s'" % (iptables_exe, version))
+-if version < "1.4":
+- print("WARN: version '%s' has limited IPv6 support. See README for details." % (version), file=sys.stderr)
++iptables_dir = '/sbin'
+
+ setup (name='ufw',
+ version=ufw_version,
diff --git a/net-firewall/ufw/files/ufw-move-path.patch b/net-firewall/ufw/files/ufw-move-path.patch
deleted file mode 100644
index ff5f2b39529d..000000000000
--- a/net-firewall/ufw/files/ufw-move-path.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -Naur ufw-0.30.1.orig/doc/ufw-framework.8 ufw-0.30.1/doc/ufw-framework.8
---- ufw-0.30.1.orig/doc/ufw-framework.8 2011-06-10 19:30:18.499000275 +0200
-+++ ufw-0.30.1/doc/ufw-framework.8 2011-06-10 21:44:32.990000351 +0200
-@@ -18,7 +18,7 @@
- parameters and configuration of IPv6. The framework consists of the following
- files:
- .TP
--#STATE_PREFIX#/ufw\-init
-+#SHARE_DIR#/ufw\-init
- initialization script
- .TP
- #CONFIG_PREFIX#/ufw/before[6].rules
-@@ -41,7 +41,7 @@
-
- .SH "BOOT INITIALIZATION"
- .PP
--\fBufw\fR is started on boot with #STATE_PREFIX#/ufw\-init. This script is a
-+\fBufw\fR is started on boot with #SHARE_DIR#/ufw\-init. This script is a
- standard SysV style initscript used by the \fBufw\fR command and should not be
- modified. It supports the following arguments:
- .TP
-diff -Naur ufw-0.30.1.orig/README ufw-0.30.1/README
---- ufw-0.30.1.orig/README 2011-06-10 19:30:18.487000275 +0200
-+++ ufw-0.30.1/README 2011-06-10 21:44:32.844000351 +0200
-@@ -58,7 +58,7 @@
- on your needs, this can be as simple as adding the following to a startup
- script (eg rc.local for systems that use it):
-
--# /lib/ufw/ufw-init start
-+# /usr/share/ufw/ufw-init start
-
- For systems that use SysV initscripts, an example script is provided in
- doc/initscript.example. See doc/upstart.example for an Upstart example. Consult
-@@ -72,9 +72,9 @@
- /etc/defaults/ufw high level configuration
- /etc/ufw/before[6].rules rules evaluated before UI added rules
- /etc/ufw/after[6].rules rules evaluated after UI added rules
--/lib/ufw/user[6].rules UI added rules (not to be modified)
-+/etc/ufw/user/user[6].rules UI added rules (not to be modified)
- /etc/ufw/sysctl.conf kernel network tunables
--/lib/ufw/ufw-init start script
-+/usr/share/ufw/ufw-init start script
-
-
- Usage
-@@ -149,7 +149,7 @@
- that the primary chains don't move around other non-ufw rules and chains. To
- completely flush the built-in chains with this configuration, you can use:
-
--# /lib/ufw/ufw-init flush-all
-+# /usr/share/ufw/ufw-init flush-all
-
- Alternately, ufw may also take full control of the firewall by setting
- MANAGE_BUILTINS=yes in /etc/defaults/ufw. This will flush all the built-in
-@@ -245,7 +245,7 @@
-
- Remote Management
- -----------------
--On /lib/ufw/ufw-init start and 'ufw enable' the chains are flushed, so
-+On /usr/share/ufw/ufw-init start and 'ufw enable' the chains are flushed, so
- ssh may drop. This is needed so ufw is in a consistent state. Once the ufw is
- 'enabled' it will insert rules into the existing chains, and therefore not
- flush the chains (but will when modifying a rule or changing the default
-@@ -288,7 +288,7 @@
-
- Distributions
- -------------
--While it certainly ok to use /lib/ufw/ufw-init as the initscript for
-+While it certainly ok to use /usr/share/ufw/ufw-init as the initscript for
- ufw, this script is meant to be used by ufw itself, and therefore not
- particularly user friendly. See doc/initscript.example for a simple
- implementation that can be adapted to your distribution.
-diff -Naur ufw-0.30.1.orig/setup.py ufw-0.30.1/setup.py
---- ufw-0.30.1.orig/setup.py 2011-06-10 19:30:18.488000275 +0200
-+++ ufw-0.30.1/setup.py 2011-06-10 21:44:32.846000351 +0200
-@@ -54,7 +54,8 @@
- return
-
- real_confdir = os.path.join('/etc')
-- real_statedir = os.path.join('/lib', 'ufw')
-+ # real_statedir = os.path.join('/lib', 'ufw')
-+ real_statedir = os.path.join('/etc', 'ufw', 'user')
- real_prefix = self.prefix
- if self.home != None:
- real_confdir = self.home + real_confdir
-@@ -116,7 +117,7 @@
- self.copy_file('doc/ufw.8', manpage)
- self.copy_file('doc/ufw-framework.8', manpage_f)
-
-- # Install state files and helper scripts
-+ # Install state files
- statedir = real_statedir
- if self.root != None:
- statedir = self.root + real_statedir
-@@ -127,8 +128,14 @@
- self.copy_file('conf/user.rules', user_rules)
- self.copy_file('conf/user6.rules', user6_rules)
-
-- init_helper = os.path.join(statedir, 'ufw-init')
-- init_helper_functions = os.path.join(statedir, 'ufw-init-functions')
-+ # Install helper scripts
-+ sharedir = real_sharedir
-+ if self.root != None:
-+ sharedir = self.root + real_sharedir
-+ self.mkpath(sharedir)
-+
-+ init_helper = os.path.join(sharedir, 'ufw-init')
-+ init_helper_functions = os.path.join(sharedir, 'ufw-init-functions')
- self.copy_file('src/ufw-init', init_helper)
- self.copy_file('src/ufw-init-functions', init_helper_functions)
-
-@@ -199,13 +206,18 @@
-
- subprocess.call(["sed",
- "-i",
-+ "s%#SHARE_DIR#%" + real_sharedir + "%g",
-+ file])
-+
-+ subprocess.call(["sed",
-+ "-i",
- "s%#VERSION#%" + ufw_version + "%g",
- file])
-
- # Install pristine copies of rules files
-- sharedir = real_sharedir
-- if self.root != None:
-- sharedir = self.root + real_sharedir
-+ #sharedir = real_sharedir
-+ #if self.root != None:
-+ # sharedir = self.root + real_sharedir
- rulesdir = os.path.join(sharedir, 'iptables')
- self.mkpath(rulesdir)
- for file in [ before_rules, after_rules, \
-diff -Naur ufw-0.30.1.orig/src/backend_iptables.py ufw-0.30.1/src/backend_iptables.py
---- ufw-0.30.1.orig/src/backend_iptables.py 2011-06-10 19:30:18.502000275 +0200
-+++ ufw-0.30.1/src/backend_iptables.py 2011-06-10 21:44:33.044000351 +0200
-@@ -24,7 +24,7 @@
- import tempfile
- import time
-
--from ufw.common import UFWError, UFWRule, config_dir, state_dir, prefix_dir
-+from ufw.common import UFWError, UFWRule, config_dir, share_dir, state_dir, prefix_dir
- from ufw.util import warn, debug, msg, cmd, cmd_pipe
- import ufw.backend
-
-@@ -40,7 +40,7 @@
- files['rules6'] = os.path.join(state_dir, 'user6.rules')
- files['before6_rules'] = os.path.join(config_dir, 'ufw/before6.rules')
- files['after6_rules'] = os.path.join(config_dir, 'ufw/after6.rules')
-- files['init'] = os.path.join(state_dir, 'ufw-init')
-+ files['init'] = os.path.join(share_dir, 'ufw-init')
-
- ufw.backend.UFWBackend.__init__(self, "iptables", d, files)
-
-diff -Naur ufw-0.30.1.orig/src/ufw-init ufw-0.30.1/src/ufw-init
---- ufw-0.30.1.orig/src/ufw-init 2011-06-10 19:30:18.502000275 +0200
-+++ ufw-0.30.1/src/ufw-init 2011-06-10 21:44:33.054000351 +0200
-@@ -18,8 +18,8 @@
- #
- set -e
-
--if [ -s "#STATE_PREFIX#/ufw-init-functions" ]; then
-- . "#STATE_PREFIX#/ufw-init-functions"
-+if [ -s "#SHARE_DIR#/ufw-init-functions" ]; then
-+ . "#SHARE_DIR#/ufw-init-functions"
- else
- echo "Could not find $s (aborting)"
- exit 1
-@@ -56,7 +56,7 @@
- flush_builtins || exit "$?"
- ;;
- *)
-- echo "Usage: #STATE_PREFIX#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}"
-+ echo "Usage: #SHARE_DIR#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}"
- exit 1
- ;;
- esac
diff --git a/net-firewall/ufw/ufw-0.30.1-r4.ebuild b/net-firewall/ufw/ufw-0.30.1-r4.ebuild
deleted file mode 100644
index b02258903cb6..000000000000
--- a/net-firewall/ufw/ufw-0.30.1-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.30.1-r4.ebuild,v 1.2 2012/06/18 19:39:03 thev00d00 Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit versionator bash-completion-r1 eutils linux-info distutils
-
-MY_PV_12=$(get_version_component_range 1-2)
-DESCRIPTION="A program used to manage a netfilter firewall"
-HOMEPAGE="http://launchpad.net/ufw"
-SRC_URI="http://launchpad.net/ufw/${MY_PV_12}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=">=net-firewall/iptables-1.4"
-
-# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
-RESTRICT="test"
-
-pkg_pretend() {
- local CONFIG_CHECK="~PROC_FS
- ~NETFILTER_XT_MATCH_COMMENT ~NETFILTER_XT_MATCH_HL
- ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT
- ~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
-
- if kernel_is -ge 2 6 39; then
- CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
- else
- CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
- fi
-
- check_extra_config
-}
-
-pkg_setup() {
- python_pkg_setup
-}
-
-src_prepare() {
- # Allow to remove unnecessary build time dependency
- # on net-firewall/iptables.
- epatch "${FILESDIR}"/${PN}-dont-check-iptables.patch
- # Move files away from /lib/ufw.
- epatch "${FILESDIR}"/${PN}-move-path.patch
- # Allows correct build with SUPPORT_PYTHON_ABIS="1" (see comment in the file).
- epatch "${FILESDIR}"/${P}-python-abis.patch
- # Fixes usage with ufw-frontends (bug ref. inside the patch).
- epatch "${FILESDIR}"/${P}-encoding.patch
- # Set as enabled by default. User can enable or disable
- # the service by adding or removing it to/from a runlevel.
- sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
- || die "sed failed (ufw.conf)"
-}
-
-src_install() {
- newconfd "${FILESDIR}"/ufw.confd ufw
- newinitd "${FILESDIR}"/ufw-2.initd ufw
-
- # users normally would want it
- insinto /usr/share/doc/${PF}/logging
- doins -r "${FILESDIR}"/syslog-ng
-
- insinto /usr/share/doc/${PF}/logging/rsyslog
- doins "${FILESDIR}"/rsyslog/*
- doins doc/rsyslog.example
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins examples/*
- fi
- distutils_src_install
- domo locales/mo/*.mo
- rm -r "${ED}"usr/share/${PN}/messages || die
- newbashcomp shell-completion/bash ${PN}
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- if path_exists -o "${EROOT}"lib/ufw/user{,6}.rules; then
- ewarn "Attention!"
- ewarn "User configuration from /lib/ufw is now placed in /etc/ufw/user."
- ewarn "Please stop ufw, copy .rules files from ${EROOT}lib/ufw"
- ewarn "to ${EROOT}etc/ufw/user/ and start ufw again."
- fi
- echo
- elog "Remember to enable ufw add it to your boot sequence:"
- elog "-- # ufw enable"
- elog "-- # rc-update add ufw boot"
- echo
- elog "If you want to keep ufw logs in a separate file, take a look at"
- elog "/usr/share/doc/${PF}/logging."
-}
diff --git a/net-firewall/ufw/ufw-0.33.ebuild b/net-firewall/ufw/ufw-0.33.ebuild
new file mode 100644
index 000000000000..0fbfc26a3765
--- /dev/null
+++ b/net-firewall/ufw/ufw-0.33.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.33.ebuild,v 1.1 2012/09/24 12:18:04 thev00d00 Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6 3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 *-jython"
+
+inherit versionator bash-completion-r1 eutils linux-info distutils
+
+MY_PV_12=$(get_version_component_range 1-2)
+DESCRIPTION="A program used to manage a netfilter firewall"
+HOMEPAGE="http://launchpad.net/ufw"
+SRC_URI="http://launchpad.net/ufw/${MY_PV_12}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples ipv6"
+
+DEPEND="sys-devel/gettext"
+RDEPEND=">=net-firewall/iptables-1.4[ipv6?]
+ !<kde-misc/kcm-ufw-0.4.2
+ !<net-firewall/ufw-frontends-0.3.2
+"
+
+# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~PROC_FS
+ ~NETFILTER_XT_MATCH_COMMENT ~NETFILTER_XT_MATCH_HL
+ ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT
+ ~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
+
+ if kernel_is -ge 2 6 39; then
+ CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
+ else
+ CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
+ fi
+
+ check_extra_config
+
+ # Check for default, useful optional features.
+ if ! linux_config_exists; then
+ ewarn "Cannot determine configuration of your kernel."
+ return
+ fi
+
+ local nf_nat_ftp_ok="yes"
+ local nf_conntrack_ftp_ok="yes"
+ local nf_conntrack_netbios_ns_ok="yes"
+
+ linux_chkconfig_present \
+ NF_NAT_FTP || nf_nat_ftp_ok="no"
+ linux_chkconfig_present \
+ NF_CONNTRACK_FTP || nf_conntrack_ftp_ok="no"
+ linux_chkconfig_present \
+ NF_CONNTRACK_NETBIOS_NS || nf_conntrack_netbios_ns_ok="no"
+
+ # This is better than an essay for each unset option...
+ if [[ ${nf_nat_ftp_ok} = no ]] || [[ ${nf_conntrack_ftp_ok} = no ]] \
+ || [[ ${nf_conntrack_netbios_ns_ok} = no ]]
+ then
+ echo
+ local mod_msg="Kernel options listed below are not set. They are not"
+ mod_msg+=" mandatory, but they are often useful."
+ mod_msg+=" If you don't need some of them, please remove relevant"
+ mod_msg+=" module name(s) from IPT_MODULES in"
+ mod_msg+=" '${EROOT}etc/default/ufw' before (re)starting ufw."
+ mod_msg+=" Otherwise ufw may fail to start!"
+ ewarn "${mod_msg}"
+ if [[ ${nf_nat_ftp_ok} = no ]]; then
+ ewarn "NF_NAT_FTP: for better support for active mode FTP."
+ fi
+ if [[ ${nf_conntrack_ftp_ok} = no ]]; then
+ ewarn "NF_CONNTRACK_FTP: for better support for active mode FTP."
+ fi
+ if [[ ${nf_conntrack_netbios_ns_ok} = no ]]; then
+ ewarn "NF_CONNTRACK_NETBIOS_NS: for better Samba support."
+ fi
+ fi
+}
+
+src_prepare() {
+ # Allow to remove unnecessary build time dependency
+ # on net-firewall/iptables.
+ epatch "${FILESDIR}"/${P}-dont-check-iptables.patch
+ # Move files away from /lib/ufw.
+ epatch "${FILESDIR}"/${PN}-0.31.1-move-path.patch
+ # Contains fixes related to SUPPORT_PYTHON_ABIS="1" (see comment in the
+ # file).
+ epatch "${FILESDIR}"/${PN}-0.31.1-python-abis.patch
+
+ # Set as enabled by default. User can enable or disable
+ # the service by adding or removing it to/from a runlevel.
+ sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
+ || die "sed failed (ufw.conf)"
+
+ sed -i "s/^IPV6=yes/IPV6=$(usex ipv6)/" conf/ufw.defaults || die
+
+ # If LINGUAS is set install selected translations only.
+ if [[ -n ${LINGUAS+set} ]]; then
+ _EMPTY_LOCALE_LIST="yes"
+ pushd locales/po > /dev/null || die
+
+ local lang
+ for lang in *.po; do
+ if ! has "${lang%.po}" ${LINGUAS}; then
+ rm "${lang}" || die
+ else
+ _EMPTY_LOCALE_LIST="no"
+ fi
+ done
+
+ popd > /dev/null || die
+ else
+ _EMPTY_LOCALE_LIST="no"
+ fi
+}
+
+src_install() {
+ newconfd "${FILESDIR}"/ufw.confd ufw
+ newinitd "${FILESDIR}"/ufw-2.initd ufw
+
+ # users normally would want it
+ insinto /usr/share/doc/${PF}/logging/syslog-ng
+ doins "${FILESDIR}"/syslog-ng/*
+
+ insinto /usr/share/doc/${PF}/logging/rsyslog
+ doins "${FILESDIR}"/rsyslog/*
+ doins doc/rsyslog.example
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*
+ fi
+ distutils_src_install
+ [[ $_EMPTY_LOCALE_LIST != yes ]] && domo locales/mo/*.mo
+ newbashcomp shell-completion/bash ${PN}
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+ echo
+ elog "Remember to enable ufw add it to your boot sequence:"
+ elog "-- # ufw enable"
+ elog "-- # rc-update add ufw boot"
+ echo
+ elog "If you want to keep ufw logs in a separate file, take a look at"
+ elog "/usr/share/doc/${PF}/logging."
+ echo
+ ewarn "Note: once enabled, ufw blocks also incoming SSH connections by"
+ ewarn "default. See README, Remote Management section for more information."
+}