Marked ~amd64 too. Use /run not /var/run. USE=pam_nuauth requires USE=plaintext.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

10 files changed, 121 insertions, 80 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 57bc2ceeea2f..2a02a43496f1 100644
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/nufw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.41 2014/03/01 22:49:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.42 2014/07/18 14:06:38 jer Exp $
+
+*nufw-2.2.22-r1 (18 Jul 2014)
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> -nufw-2.2.22.ebuild,
+  +nufw-2.2.22-r1.ebuild, files/nufw-2.2.21-fix-gnutls.patch,
+  +files/nufw-2.2.22-var-run.patch, files/nuauth-conf.d, files/nuauth-init.d,
+  files/nufw-conf.d, files/nufw-init.d, metadata.xml:
+  Marked ~amd64 too. Use /run not /var/run. USE=pam_nuauth requires
+  USE=plaintext.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> nufw-2.2.21.ebuild,
   nufw-2.2.22.ebuild:
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index 7663b9eeaa27..48f05836cf50 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -1,33 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nuauth-conf.d 19 SHA256 dc562afba21239a5a30889b04c021b36b9c19ca17a6d8071bb848eab2d70c538 SHA512 0a091aa770e6b87196f8dc3850b21f32332298c6bf62f5e09ae01ff35146013e8dde7bb601511fc9b4bacb17a3719b96d9535e01bdd34ca760e3d80d81a8c1ec WHIRLPOOL f0d9dbce868c024e7c71be0551e59933239bf539cb1179f5e0c524f3d3df9a663d8473caaced6e5b354f0226b0b3e2696cacff91242fcc718eff2a6790494a77
-AUX nuauth-init.d 522 SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3 SHA512 ec224496574c5b6145fd3776905895ec497a9e8c0340170d0eb8c52106f4b332ea10f1dbddb8c2b750f287399b724e15498c8ee7216c934e424834ccb7d85608 WHIRLPOOL 2a60a513794b182b1ba191067711cab9797c1865b78bd29f866f555becd1545442577d76fac6d611de46015175909a5b71841c2f2964c6221739cbe08039ce70
-AUX nufw-2.2.21-fix-gnutls.patch 950 SHA256 36ce80e16e71bf5c2800f7f90311d80677ffca1761842679ea55621062cec698 SHA512 14e726207fd9f98e6977240dde318db08568140adc385bede77926b01226b4632c4657e6f39f25dd25f3205f148e0a5820a3d5fa02ddd98be0df848d46cabcf7 WHIRLPOOL fdb8662d8893294a7c27044c35871047fabb0a59618d8236574369991086818c92185abe6e2530718cb86a51c572a1a73475459894cdc594fee9f77f43837a52
-AUX nufw-conf.d 81 SHA256 c616bb91451f7bf34cfe3139a972be01a562ece6c372d2ee39c3cd5009d2354d SHA512 e0eb5650ec9578a1faa926860698289e8b4c4d2f0a3f8457210481fed72b2ea8d4cc089b980d806f3dd4013f3f1b5f739dd27728495607bb1d41a64621673ad4 WHIRLPOOL cd2d7665d030d8ddafd91e8a36b77b88d584eb18e35c7cb68719040771100e1f11273817f58f387d025e89aa5bc7aaccc7a33797f3cf66c2367c9e215b36e4ca
-AUX nufw-init.d 276 SHA256 972c3c94a7e290985cc7e8a0ccc40dfa0e10d7eee44e218c70f6fc7f8ed73f9d SHA512 473baef05978888c69f3dd22bf2b495039804e947bc387cbfd924713839d393c3eaf1cd0ad7dad27e5cb72b94fc678fc4628663288c8b1ccbd7fce3391c9a3cc WHIRLPOOL 713eee35460abe8eba97242a3f0f1e61dbd3a123fe42e68cc3c24bd8f448e2382620fabeec509117d7bc36222b0a9254748bbe0d7d0104739cced095e694b112
+AUX nuauth-conf.d 62 SHA256 0ab7686ef414e37fb1cae532134ffda6958f0a492fcdc4e28245f70b7366ec2c SHA512 2304d60917eab68c8268205d006dddbacfc68c876ee6a36d90f5f21eceb6f5ba6b9bc82a3173b55dde825df44dee766e300848936f0629e650730f16112f2558 WHIRLPOOL 6f43825a5dc5c6a6720b04f5cebc8aca11487a9f4bc4db05a37c78985731e1c67cf87f48448164c5a5bd330c8b6f39b781d61e6a84e15ba6369aea55e26eb6ef
+AUX nuauth-init.d 544 SHA256 b2d0d51c9ee2a5ff94c52c88f57a19e6d8f5962528bf7f3e2bbde70245964b7e SHA512 2d915271cfdc88132b8fc21abe65fccac8e8484dec39ec6eeb145d86d50b951337102aa8842a6a0c0670ac398c20c69086d218c8b687296649abd38193b8df48 WHIRLPOOL 987ffb797e7a09fc8814e23fe366bb9b37b1efe3db97c1c58679d3228dee09d7a4b96bec0de415ba30e46c11a8fdacc4a21d0d19ab2c6db688971fd4433c4dc2
+AUX nufw-2.2.21-fix-gnutls.patch 797 SHA256 763d030b9ab3b5d678f339fa13e16bc6122cb76334e34c6742841383ece9932a SHA512 4cb085197478862b54b8e84d33d28a2909eb3c9d634d760a12bcda5260f4c1df31371e91fcb693acff0044fbd11cc224ba9db80ec5958596da282e694b4d9d61 WHIRLPOOL b80f851f1e95cf2f2b4705dbe2134707b751fb11dbebc2eabcd2d9fb634aef1e737e51cdb7d317ff2d45447e590aadb46c0512c935e39d7c194ed1f894890148
+AUX nufw-2.2.22-var-run.patch 1438 SHA256 e68591a7b780ff514d7f5a66c8ee12e299d58fd96777491488960d75d61cb5f1 SHA512 f299a373e67f910fd816037fb916d1c116a98b6a8d1487e0e9e4c35713839d7f6f7189b31390a9616bb0cf77bcc2abb9077d9dc60c8b83571aa07291981c3383 WHIRLPOOL 131550c94e02c2650e01fd9f89437c968b6cd9a67f2f1d1bc09ccf202f71942d8475043f49b286fddeb71e63ec453924bb0acf157cef83634d1ac7acb9aaea9b
+AUX nufw-conf.d 122 SHA256 65df231f179c64d007efc1bb3dc09b6220af8c2793eb7fc11dc29e2631e687e8 SHA512 df48fc1843bf07e7ccfacd647caafc43752fdfa76da09a89d9ec0d76b79746c60c70f68c004c7e37899f195ae63adefc7d1c1b2c7b41da27911eb4cdc54212fb WHIRLPOOL a710ca94b0d942f8976b6a6fd5bf9fa971466581c439729357254b590dcd8b20dd4b62a5d59afacccf5e3fd4be9d044f34ff604e16998ef8cb32cdfd865e0bb9
+AUX nufw-init.d 272 SHA256 9855db91620f7cd698e99a29753a831288e797f50b91a004458b6e01e913fa01 SHA512 64ab2d30b600f3ad463d3c0e0d036c3a4abfd6df44171a1ad9411614d320bf6ea5b982739699a17fc05d281295a4ec7d721bb573167c9726a97ed4d99503dafb WHIRLPOOL f28c148d65237c50e33179125671e1a0cbd4bd9e0a549ac5c46242e69eb75f2bc1084b86dfddac31670bbee8b080308fcf296bb8608b70f918efc0f11fed4029
 DIST nufw-2.2.21.tar.bz2 593079 SHA256 7dab7b2e06cc9f72d365680c206ec2e58a4984eec0427f854c686a990656a669
 DIST nufw-2.2.22.tar.bz2 597491 SHA256 92603813b4138bfd52b5873c68d7c6e43f78885a414067e57bd2c1e8eba66b8c SHA512 cc9f43b9ebf6aabbab4c83799ca1735fc456c085959cfb24d17571302c71518660424195b2cc62ed615f811bd6b3c45e1b99db99138d1caa6a744370775acaee WHIRLPOOL 5e493d2aa2c661dd9766670bb805f98849c82f1962d39ff3692481f7049740cc73455e6aa45b7ca20632b2e254be8bb953f9aebdeb7a46c525578fc7a9d007ba
 EBUILD nufw-2.2.21.ebuild 3017 SHA256 01e1fe254225bb094ce377631abdfbc498d78db16069600a0db0b25026d09614 SHA512 226e40a7e514dd05d145a830cb6db64c19c43cce854d19ebd0927ed1704896e77b5403b17cfef9c061d6fe9d7d45fd3a94d8abe0cf4be20080d2fc592f931d15 WHIRLPOOL 2c1349b212fac7697cdd31adea805a5a3e82249f7a0bb926eec22b0bff95c56d5b54a3d852d8ac06494fded5fa0fb568eee3ebdc686985787209006469fc0ca1
-EBUILD nufw-2.2.22.ebuild 2729 SHA256 3b9630448316014050ac7b7e39d7045c7c5f9638604998b3fab7429a85c98405 SHA512 c279a87039bdede6a11821ee1d82b6e0c3604de681349146be1272cb0a011a6bb674b02ded551915405853a28aad21110a0c8f7a6dbda7eaaa534b70c9a55378 WHIRLPOOL 084a92d38936593cceca99fd4cabf84c1683a9eca0c587dffc8140995ed3e8a84f3db05c0c130ca26c4740c22908ed723d21e04438189eeba9e367b5126db0eb
-MISC ChangeLog 5625 SHA256 7f5a82da74decfcb63ee79d74bfdfbf6c60bc0f6176e15c594abb94d6828cb73 SHA512 9f8a3ce99c1d7be044633a907388069c782ad9eac8137a250e5bf80219310927c87ce80d933d41bebc49b209275d66b123cb106058e090a5cd71cb6f2f8d19bc WHIRLPOOL 4e405cbe1d714ae1a90636ae2e96972529e341b1fcb5d17043efd4aa5009fe9ba7dc9d1e488b929ef5adf76ce33f7520c16ded795966d72ef1e36a2bfbcf816f
-MISC metadata.xml 536 SHA256 15dc9b7b706214042818b8f2aabdb6a438e6d3a04bd9a51aadda2fa7c9f65694 SHA512 7391b2cca1d2d3412f6990edf5b54153bcecf7f4c1912ebfcd7942d4a0528e8b566565b3c6f807991452b272eac0dfae010dbaae86e3e6f8df45dc0f0b5eaf17 WHIRLPOOL eaa7f8c23231bd930e5c278e492121f3f10177e27a52be5e141dd1056dcbeb8fad0e099ba65597303df6fecbb8f00a379242ef519a7fc1d3ba1bb57583275673
+EBUILD nufw-2.2.22-r1.ebuild 2742 SHA256 99b45aeebaf41e66c23e1479ffc7edf3c97f682ef238310cc4bb7d1cebf0b917 SHA512 1149e266cfbe07603089e60fa1010843c022323af15586682fb2f052d2071a6454ef673c52d6979816ad2708391a45032abe1bfc7529ca383158d66f917bc3f8 WHIRLPOOL deb1cf5f37366c7c971d8f7b9fbefb80336126ac305bad74365e9d6bb71396c37bd973716e0b12047d96a1f7bff6da34d6fa92a65e1b229856a73fb633f27047
+MISC ChangeLog 6001 SHA256 26d208b3ef5855ecfbfa7cfb0627b5e2c489fa6c7db080d2f52f0fae50626f2d SHA512 d99da97dcc79fd896b86a7ad93188f100f8ad9f904157e9d3e7b5e75a5081d6826b8d917546bcd9092da99d77232b3131d89cf7521befb60dc852826f2928942 WHIRLPOOL 16dee6f802595edab5227082e55260b70a2a1a03bd6df50a5b9070f9f5710e1c6aeb4cb3b45e36b011a60c2d79c961c2ff490d2854a2e960a0653c4f71eea923
+MISC metadata.xml 432 SHA256 e475a6592e6a0c4a6bc02306750a9c1a51353183e2d18b6904d7b9f862b1ae30 SHA512 78bdcd3e0ed08e66d039b9d21c2ba2697464c3de94bd312b5935d4dafe0a46991ed534642b6657f332580916118dcc7147f52fcb1529d1b4f923fdfeffcec56e WHIRLPOOL d9402a023bf75dd4e942189dd877b6a7cd50fe9ba22de71581af9ec269a9f31e91f25e463512e1d7cafa2b68ca8628a2ae2f8dd4c3fe9c0879c1a3060c327197
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTEmPvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBCkP/j1iq4qXjvxOEyNZA+VqocDS
-wP0KCgdXaMy3Juho+mbfyNxZv0nOz19KNFqirF98HF7lxZ7M8gfqI0jCgvWtA3ns
-Hh6RMW2a6L9T+si/x7WRMpZNXPZA2NifEEkFazPUl3H+juroP2kgLR1t3L7+zi60
-sGWbhotlus/6ULW+iCJZ8io23AIVpojrDqp4b3WhHg1eLbiXwfrZUugF008wLHYs
-JmiYx4M07MtyU6dzEjRV6j/juBomBn53SvLj959Iv/ZXuZRBLqg1b9f9JRmFlLTY
-HTGI/e8HzPhPlbOQxMyUuWIsH8lthtUOcJpV8JQ6af+gcHvZAfOmT3hiEXyoYAfw
-oLLAf7Qro1ajlDemAPusK2d/Vtpyw3maW+7vDEPQQjB1j/2dlRuxJAvb9X3N/M5G
-YVFSpLS1eB1Hajxocpgmdyqy6S5n88nlRFJj0HcUJrNXhuwwUEc2fAocFv0+PbWo
-Qw5BN9u7uHimotKPQ8m5fVqR4bInTVfVnEKJ6d/RhHBNGsdVpbkHi2pcnbe8Encp
-wGQb3sUv5EsU/f5ZzxM/uVIiHPMJ4v/lq09uC20pT8uSTka7EpH4XbKxSWltKZBR
-eKVNPl+v0MBwLJIbZ/3XzDG3LRbwYQcMIylbkIxKzTS43HibPOF0gAofI3TEvFkz
-kEr7D9VEKCAS5PTdJ9BQ
-=B+Wp
+iEYEAREIAAYFAlPJKfAACgkQVWmRsqeSphNN7wCdFSjl5ImwZ77rszfCD60BcNy+
+zK4Anj7uWzVwF4XY1O4Mf5cAxNFrL98U
+=YMj6
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/nufw/files/nuauth-conf.d b/net-firewall/nufw/files/nuauth-conf.d
index f7f7401b628d..1ac750cf49fd 100644
--- a/net-firewall/nufw/files/nuauth-conf.d
+++ b/net-firewall/nufw/files/nuauth-conf.d
@@ -1,2 +1,2 @@
-
+# configuration file for /etc/init.d/nuauth
 NUAUTH_OPTIONS=""
diff --git a/net-firewall/nufw/files/nuauth-init.d b/net-firewall/nufw/files/nuauth-init.d
index 6e2788890e25..21bad8ff132f 100644
--- a/net-firewall/nufw/files/nuauth-init.d
+++ b/net-firewall/nufw/files/nuauth-init.d
@@ -13,6 +13,7 @@ checkconfig() {
 }
 
 start() {
+	checkpath -d /run/nuauth
 	checkconfig || return 1
 	ebegin "Starting nuauth"
 		start-stop-daemon --start --quiet --exec /usr/sbin/nuauth -- -D ${NUAUTH_OPTIONS}
@@ -21,6 +22,6 @@ start() {
 
 stop() {
 	ebegin "Stopping nuauth"
-		start-stop-daemon --stop --quiet --pidfile /var/run/nuauth/nuauth.pid
+		start-stop-daemon --stop --quiet --pidfile /run/nuauth/nuauth.pid
 	eend $?
 }
diff --git a/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch b/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
index 0700c84b06d8..b5e8048cd051 100644
--- a/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
+++ b/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
@@ -1,6 +1,5 @@
-diff -ru nufw-2.2.21~/configure.ac nufw-2.2.21/configure.ac
---- nufw-2.2.21~/configure.ac	2009-08-02 19:39:52.000000000 +0200
-+++ nufw-2.2.21/configure.ac	2009-08-02 19:42:38.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -87,6 +87,7 @@
  #AM_CHECK_PATH([libgcrypt], [gcry_md_open],AC_DEFINE([HAVE_LIBRARY_GCRYPT],[1],[Gcrypt lib flag]), check_gcrypt=no,[-L/usr/local/lib])
  #AM_CHECK_PATH(libgnutls], [gnutls_init],AC_DEFINE([HAVE_LIBRARY_GNUTLS],[1],[Gnutls lib flag]), check_gnutls=no)
diff --git a/net-firewall/nufw/files/nufw-2.2.22-var-run.patch b/net-firewall/nufw/files/nufw-2.2.22-var-run.patch
new file mode 100644
index 000000000000..f6bcc95e0006
--- /dev/null
+++ b/net-firewall/nufw/files/nufw-2.2.22-var-run.patch
@@ -0,0 +1,45 @@
+--- a/src/nuauth/auth_srv.h
++++ b/src/nuauth/auth_srv.h
+@@ -162,7 +162,7 @@
+ #ifdef S_SPLINT_S
+ #  define NUAUTH_PID_FILE  "/usr/local/var/run/nuauth/nuauth.pid"
+ #else
+-#  define NUAUTH_PID_FILE  LOCAL_STATE_DIR "/run/nuauth/nuauth.pid"
++#  define NUAUTH_PID_FILE  "/run/nuauth/nuauth.pid"
+ #endif
+ 
+ /* define the number of threads that will do user check */
+--- a/src/nuauth/command.c
++++ b/src/nuauth/command.c
+@@ -26,7 +26,7 @@
+ #include <sys/un.h>		/* unix socket */
+ #include <sys/stat.h>		/* fchmod() */
+ 
+-#define SOCKET_FILENAME LOCAL_STATE_DIR "/run/nuauth/nuauth-command.socket"
++#define SOCKET_FILENAME "/run/nuauth/nuauth-command.socket"
+ 
+ const char* COMMAND_HELP =
+ "version: display nuauth version\n"
+--- a/src/nufw/main.c
++++ b/src/nufw/main.c
+@@ -54,7 +54,7 @@
+ 
+ /*! Name of pid file prefixed by LOCAL_STATE_DIR (variable defined
+  * during compilation/installation) */
+-#define NUFW_PID_FILE  LOCAL_STATE_DIR "/run/nufw.pid"
++#define NUFW_PID_FILE   "/run/nufw.pid"
+ 
+ /**
+  * Stop threads and then wait until threads exit.
+--- a/src/nuauth/Makefile.am
++++ b/src/nuauth/Makefile.am
+@@ -26,9 +26,6 @@
+ 
+ nuauth_LDADD = $(GLIB_LIBS) -lm  -lgnutls -lsasl2 -lnufw -L$(top_builddir)/src/include/
+ 
+-install-exec-local:
+-	install -d "$(DESTDIR)$(localstatedir)/run/nuauth/"
+-
+ nuauth$(EXEEXT): $(nuauth_OBJECTS) $(nuauth_DEPENDENCIES)
+ 	@rm -f nuauth$(EXEEXT)
+ 	$(LINK) $(nuauth_LDFLAGS) $(nuauth_OBJECTS) $(nuauth_LDADD)
diff --git a/net-firewall/nufw/files/nufw-conf.d b/net-firewall/nufw/files/nufw-conf.d
index f6d1d272e36e..b2ea527744ec 100644
--- a/net-firewall/nufw/files/nufw-conf.d
+++ b/net-firewall/nufw/files/nufw-conf.d
@@ -1,2 +1,2 @@
-
+# configuration file for /etc/init.d/nufw
 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/files/nufw-init.d b/net-firewall/nufw/files/nufw-init.d
index c83b6614c02f..6cfcfd793248 100644
--- a/net-firewall/nufw/files/nufw-init.d
+++ b/net-firewall/nufw/files/nufw-init.d
@@ -12,6 +12,6 @@ start() {
 
 stop() {
 	ebegin "Stopping nufw"
-	start-stop-daemon --stop --quiet --pidfile /var/run/nufw.pid
+	start-stop-daemon --stop --quiet --pidfile /run/nufw.pid
 	eend $?
 }
diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index 53e071cc1eda..983d41997af1 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/metadata.xml
@@ -2,12 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>An enterprise grade authenticating firewall based on netfilter</longdescription>
 <use>
-	<flag name='nfconntrack'>Use netfilter_conntrack</flag>
-	<flag name='nfqueue'>Use NFQUEUE instead of QUEUE</flag>
-	<flag name='pam_nuauth'>Add support for pam nufw from PAM</flag>
-	<flag name='plaintext'>Add support for authentication with plaintext
-		files</flag>
+<flag name='nfconntrack'>Use netfilter_conntrack</flag>
+<flag name='nfqueue'>Use NFQUEUE instead of QUEUE</flag>
+<flag name='pam_nuauth'>Add support for pam nufw from PAM</flag>
+<flag name='plaintext'>Add support for authentication with plaintext files</flag>
 </use>
 </pkgmetadata>
diff --git a/net-firewall/nufw/nufw-2.2.22.ebuild b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
index ac9fb6c304ae..25668e69f997 100644
--- a/net-firewall/nufw/nufw-2.2.22.ebuild
+++ b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22.ebuild,v 1.4 2014/03/01 22:49:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22-r1.ebuild,v 1.1 2014/07/18 14:06:38 jer Exp $
 
-EAPI=1
-SSL_CERT_MANDATORY=1
+EAPI=5
 
-inherit ssl-cert eutils pam
+SSL_CERT_MANDATORY=1
+inherit autotools eutils multilib pam ssl-cert
 
 DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
 HOMEPAGE="http://www.nufw.org/"
@@ -13,69 +13,68 @@ SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude \
-unicode nfqueue nfconntrack static syslog test"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
 
-DEPEND=">=dev-libs/glib-2
+REQUIRED_USE="pam_nuauth? ( plaintext )"
+DEPEND="
+	dev-libs/cyrus-sasl
+	dev-libs/glib:2
 	dev-libs/libgcrypt:0
-	>=dev-libs/cyrus-sasl-2
+	dev-python/ipy
 	net-firewall/iptables
-	>=net-libs/gnutls-1.1
+	net-libs/gnutls
 	ldap? ( >=net-nds/openldap-2 )
 	mysql? ( virtual/mysql )
+	nfconntrack? ( net-libs/libnetfilter_conntrack )
+	nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
 	pam? ( sys-libs/pam )
 	pam_nuauth? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql-server )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )
 	prelude? ( dev-libs/libprelude )
-	dev-python/ipy"
+"
 RDEPEND=${DEPEND}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-var-run.patch
 	sed -i \
 		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
 		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
-		conf/nuauth.conf || die "sed failed"
+		conf/nuauth.conf || die
+	sed -i \
+		-e "/^modulesdir/s|=.*|= /$(get_libdir)/security|g" \
+		src/clients/pam_nufw/Makefile.am || die
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
-		--with-shared \
-		$(use_enable static) \
+		$(use_enable debug) \
 		$(use_enable pam_nuauth pam-nufw) \
-		$(use_with prelude prelude-log) \
-		$(use_with mysql mysql-log) \
+		$(use_enable static) \
+		$(use_with ldap) \
 		$(use_with mysql mysql-auth) \
+		$(use_with mysql mysql-log) \
+		$(use_with nfconntrack) \
+		$(use_with nfqueue) \
+		$(use_with pam system-auth) \
+		$(use_with plaintext plaintext-auth) \
 		$(use_with postgres pgsql-log) \
+		$(use_with prelude prelude-log) \
 		$(use_with syslog syslog-log) \
-		$(use_with plaintext plaintext-auth) \
-		--with-mark-group \
-		$(use_with pam system-auth) \
-		$(use_with ldap) \
-		$(use_with nfqueue) \
-		$(use_with nfconntrack) \
 		$(use_with unicode utf8) \
-		$(use_enable debug) \
-		--with-user-mark \
-		--sysconfdir="/etc/nufw" \
-		--localstatedir="/var" \
+		--enable-shared \
 		--includedir="/usr/include/nufw" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	ewarn "Tests are skiped! They require root privileges."
-	true
+		--localstatedir="/var" \
+		--sysconfdir="/etc/nufw" \
+		--with-mark-group \
+		--with-user-mark
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	newinitd "${FILESDIR}"/nufw-init.d nufw
 	newconfd "${FILESDIR}"/nufw-conf.d nufw
@@ -85,7 +84,6 @@ src_install() {
 
 	insinto /etc/nufw
 	doins conf/nuauth.conf
-	keepdir /var/run/nuauth
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	docinto scripts
@@ -96,6 +94,8 @@ src_install() {
 	if use pam; then
 		pamd_mimic system-auth nufw auth account password session
 	fi
+
+	prune_libtool_files
 }
 
 pkg_postinst() {