net-firewall/nufw: Add certificates

svn path=/sunrise/; revision=1887

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 71c2a80f648e04b0fa5be045cf5b4df9988810d0..65ad72442ea7e2a54d0f5cb2268605fe41bd65d2 100644 (file)
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Nov 2006; Cedric Krier <ced@ced.homedns.org> nufw-2.0.10.ebuild,
+  files/nufw-conf.d:
+  Add certificates
+
   28 Oct 2006; Cedric Krier <ced@ced.homedns.org> -nufw-2.0.4.ebuild,
   -files/nufw-2.0.4-configure.patch, -nufw-2.0.7.ebuild,
   -files/nufw-2.0.7-configure_ac.patch, -nufw-2.0.8.ebuild,

diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index 3f87518771393baca6dccc1055ff258d49b2c151..401e7a24967ede56c18df03d6889e2d25bc6de36 100644 (file)
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -6,23 +6,23 @@ AUX nuauth-init.d 522 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc SHA1 0d9c6
 MD5 65f60dfaa7909e33329c7c605767bda8 files/nuauth-init.d 522
 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc files/nuauth-init.d 522
 SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3 files/nuauth-init.d 522
-AUX nufw-conf.d 90 RMD160 a09db3fcdd129b512f0e8395914ede2ad66818dc SHA1 2cf4eb09a5c53cf1df2420636585ffa85246f336 SHA256 8f7b580ac0e362e570cbe80d62392b9477321cfcaef5e928a2d02e67dec20c6e
-MD5 25aed9bba908f3e0c2d61cf4aa8b3479 files/nufw-conf.d 90
-RMD160 a09db3fcdd129b512f0e8395914ede2ad66818dc files/nufw-conf.d 90
-SHA256 8f7b580ac0e362e570cbe80d62392b9477321cfcaef5e928a2d02e67dec20c6e files/nufw-conf.d 90
+AUX nufw-conf.d 81 RMD160 7bb1a7172915561570f0839e553e9021144421a8 SHA1 1b75760cb661366c8dc1e4307796e3c7e2c25c8d SHA256 c616bb91451f7bf34cfe3139a972be01a562ece6c372d2ee39c3cd5009d2354d
+MD5 6b50505adbb2699687984a213d57ca38 files/nufw-conf.d 81
+RMD160 7bb1a7172915561570f0839e553e9021144421a8 files/nufw-conf.d 81
+SHA256 c616bb91451f7bf34cfe3139a972be01a562ece6c372d2ee39c3cd5009d2354d files/nufw-conf.d 81
 AUX nufw-init.d 276 RMD160 3aae0f4b5d77f4af5c1966570112fed29dda17a1 SHA1 8154d2a7c2c70077b81ae19cd53e98ae8380774a SHA256 972c3c94a7e290985cc7e8a0ccc40dfa0e10d7eee44e218c70f6fc7f8ed73f9d
 MD5 7b79848ae7a975b23eed5e1ad223f220 files/nufw-init.d 276
 RMD160 3aae0f4b5d77f4af5c1966570112fed29dda17a1 files/nufw-init.d 276
 SHA256 972c3c94a7e290985cc7e8a0ccc40dfa0e10d7eee44e218c70f6fc7f8ed73f9d files/nufw-init.d 276
 DIST nufw-2.0.10-1.tar.bz2 652723 RMD160 84d8585caa1b2567eed10946bba78f44f6ed0c44 SHA1 7715610c270639cdad7892bae6d650a2130b347a SHA256 f99e416e907974bcc87717d45129530eea8be7fce1bfd39d7132380e4e91dec9
-EBUILD nufw-2.0.10.ebuild 1898 RMD160 a9416356e463de6e96f111c6b00a1fe1222203b0 SHA1 fd8206aa6a480477fd65dca35156f73fa869f0ac SHA256 e534aeff8227ff3a992fb2be9f57cdbc2b897c23dc50045b96581fce4197ad47
-MD5 e5071dff0df6140a9be5a4a7124e8577 nufw-2.0.10.ebuild 1898
-RMD160 a9416356e463de6e96f111c6b00a1fe1222203b0 nufw-2.0.10.ebuild 1898
-SHA256 e534aeff8227ff3a992fb2be9f57cdbc2b897c23dc50045b96581fce4197ad47 nufw-2.0.10.ebuild 1898
-MISC ChangeLog 1449 RMD160 1db225cbadb58ec56ce9af38ac0d13e428b81216 SHA1 45c766b378df55cfd83f22913c2b1872d387f291 SHA256 bb3bf9c2f600d73586efb9277daa23c8c36473ba0f16ca5e6eeb7c6ba6837e38
-MD5 1a624fc99979843762d1926e5ea152cb ChangeLog 1449
-RMD160 1db225cbadb58ec56ce9af38ac0d13e428b81216 ChangeLog 1449
-SHA256 bb3bf9c2f600d73586efb9277daa23c8c36473ba0f16ca5e6eeb7c6ba6837e38 ChangeLog 1449
+EBUILD nufw-2.0.10.ebuild 2100 RMD160 f06e6bc04b457c9d98b7bccd89b8636867d95de8 SHA1 dee66e235951f4e0a44b7d17555610125749c8a0 SHA256 ea714471630f8099e30e84471e762c8f2160dda3a79eff42624a7ed4d7d0f1eb
+MD5 a952fd7aff9ce6a0c6a7fbc0b65dd7c4 nufw-2.0.10.ebuild 2100
+RMD160 f06e6bc04b457c9d98b7bccd89b8636867d95de8 nufw-2.0.10.ebuild 2100
+SHA256 ea714471630f8099e30e84471e762c8f2160dda3a79eff42624a7ed4d7d0f1eb nufw-2.0.10.ebuild 2100
+MISC ChangeLog 1560 RMD160 daa6cff25f84ab19d9fce2b94b1538f7993699c9 SHA1 1413264fe4ef91c316ff4c01cf870b1975228118 SHA256 61159d44d66330c561404b266cd32ef7e1869f626c56704a015b52f2e1db6fb5
+MD5 684c9a8ad44ccdb8c94596b1a0c3efe4 ChangeLog 1560
+RMD160 daa6cff25f84ab19d9fce2b94b1538f7993699c9 ChangeLog 1560
+SHA256 61159d44d66330c561404b266cd32ef7e1869f626c56704a015b52f2e1db6fb5 ChangeLog 1560
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

diff --git a/net-firewall/nufw/files/nufw-conf.d b/net-firewall/nufw/files/nufw-conf.d
index a3fb068078ae5731b3e6318d1c0f42d28e3b1826..f6d1d272e36e754de07384badcec75de208e8191 100644 (file)
--- a/net-firewall/nufw/files/nufw-conf.d
+++ b/net-firewall/nufw/files/nufw-conf.d
@@ -1,2 +1,2 @@
 
-NUFW_OPTIONS="-k /etc/nufw/nufw-key.pem -c /etc/nufw/nufw-cert.pem -d 127.0.0.1 -p 4129"
+NUFW_OPTIONS="-k /etc/nufw/nufw.key -c /etc/nufw/nufw.pem -d 127.0.0.1 -p 4129"

diff --git a/net-firewall/nufw/nufw-2.0.10.ebuild b/net-firewall/nufw/nufw-2.0.10.ebuild
index ee1488a5f3d8f0c1ea8d20590da87bfded7c53f0..ad9be23981044bee8e523cdc8c6842600d7fa7e1 100644 (file)
--- a/net-firewall/nufw/nufw-2.0.10.ebuild
+++ b/net-firewall/nufw/nufw-2.0.10.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit ssl-cert
+
 DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
 HOMEPAGE="http://www.nufw.org/"
 SRC_URI="http://www.nufw.org/download/${PN}/${P}-1.tar.bz2"
@@ -29,6 +31,15 @@ DEPEND=">=dev-libs/glib-2
        nfconntrack? ( net-firewall/libnetfilter_conntrack )"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       sed -i \
+               -e "s/nuauth-key.pem/nuauth.key/" \
+               -e "s/nuauth-cert.pem/nuauth.pem/" \
+               conf/nuauth.conf || die "sed failed"
+}
+
 src_compile() {
        econf \
                $(use_enable static) \
@@ -62,13 +73,13 @@ src_install() {
 
        insinto /etc/nufw
        doins conf/nuauth.conf
+       docert nufw
+       docert nuauth
        keepdir /var/run/nuauth
 
        dodoc AUTHORS ChangeLog NEWS README TODO
        docinto scripts
        dodoc scripts/*
        docinto conf
-       dodoc conf/*
-       docinto conf/certs
-       dodoc conf/certs/*
+       dodoc conf/*.{nufw,schema,conf,dump,xml}
 }