summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2006-06-29 16:30:13 +0000
committerCédric Krier <cedk@gentoo.org>2006-06-29 16:30:13 +0000
commit65b6d00849ace07e8c59dbbdccfc0bae5f3f71da (patch)
tree80f2651ed4a5694e884419351b12f885fee02591
parentSend a message with commit this time (diff)
downloadsunrise-65b6d00849ace07e8c59dbbdccfc0bae5f3f71da.tar.gz
sunrise-65b6d00849ace07e8c59dbbdccfc0bae5f3f71da.tar.bz2
sunrise-65b6d00849ace07e8c59dbbdccfc0bae5f3f71da.zip
net-firewall/nufw - add use flag, fix depend
svn path=/sunrise/; revision=372
-rw-r--r--net-firewall/nufw/Manifest16
-rw-r--r--net-firewall/nufw/files/nuauth-init.d13
-rw-r--r--net-firewall/nufw/nufw-2.0.3.ebuild38
-rw-r--r--profiles/use.local.desc2
4 files changed, 45 insertions, 24 deletions
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index 742e08986..93d6e0055 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -2,10 +2,10 @@ AUX nuauth-conf.d 19 RMD160 be74e62976926a6ebe6930a2d2bf2032dd3ae704 SHA1 2ac3ff
MD5 e67375cd91e75b4b456a97396c5a566f files/nuauth-conf.d 19
RMD160 be74e62976926a6ebe6930a2d2bf2032dd3ae704 files/nuauth-conf.d 19
SHA256 dc562afba21239a5a30889b04c021b36b9c19ca17a6d8071bb848eab2d70c538 files/nuauth-conf.d 19
-AUX nuauth-init.d 293 RMD160 18d9201175d7f5bcef80d649b6a37c97d2fa959b SHA1 9f45a89cacd8c345cd6714247855701a50281a6f SHA256 12ec0644a18db7fd8db1eff6dbe0f45316810b70d7f792b286c6954add64f27c
-MD5 8334a53b3e58623e1adb6fd9d743391e files/nuauth-init.d 293
-RMD160 18d9201175d7f5bcef80d649b6a37c97d2fa959b files/nuauth-init.d 293
-SHA256 12ec0644a18db7fd8db1eff6dbe0f45316810b70d7f792b286c6954add64f27c files/nuauth-init.d 293
+AUX nuauth-init.d 522 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc SHA1 0d9c6b0d3434da7f29967e9a727c9b6dbe2a8f8e SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3
+MD5 65f60dfaa7909e33329c7c605767bda8 files/nuauth-init.d 522
+RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc files/nuauth-init.d 522
+SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3 files/nuauth-init.d 522
AUX nufw-2.0.3-configure.patch 2583 RMD160 7ce7bf80574927b33665674baa77cdf14f5c4a16 SHA1 998909192928bb1dee0be4f4ce05fc8a6db036c0 SHA256 61b2fd30d218c94a965b6adf39a1ca57270fee46810e10ccd962622516037493
MD5 cb9b263f7902d6bbf689c3b6c8ade487 files/nufw-2.0.3-configure.patch 2583
RMD160 7ce7bf80574927b33665674baa77cdf14f5c4a16 files/nufw-2.0.3-configure.patch 2583
@@ -19,10 +19,10 @@ 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.3.tar.gz 976961 RMD160 47ec2bb290e5370a7dc10f27cab8b1b0f202aa47 SHA1 e68c3975e02e755ab166672caa4288060e07cf72 SHA256 89d2b16c2813e34c0efa11070f1f084254f09d09ed136889289a252e3de559cd
-EBUILD nufw-2.0.3.ebuild 1499 RMD160 5e03dd56489465417cd2aa0381792b5abd0c9642 SHA1 0f1fce53c59236568289555559c0b8daead61bf2 SHA256 3b75a031e50e0048aea8fe5c8dafcb69d5124c0b1936d5b2eea7b30a46cca8a5
-MD5 41772ad045f3772d6377b55237e442ef nufw-2.0.3.ebuild 1499
-RMD160 5e03dd56489465417cd2aa0381792b5abd0c9642 nufw-2.0.3.ebuild 1499
-SHA256 3b75a031e50e0048aea8fe5c8dafcb69d5124c0b1936d5b2eea7b30a46cca8a5 nufw-2.0.3.ebuild 1499
+EBUILD nufw-2.0.3.ebuild 1745 RMD160 35e5a160cb117896d16298c9be7c9f60c1144257 SHA1 05379c383a9d8b04f2e54aff9a8158acfe3e845f SHA256 14e5e2027a712ba83d94f1af346d91a24643def4f30ed0d457e53b213cc8adcb
+MD5 46554cbaaff9ad0b5cfda54afa9d8b17 nufw-2.0.3.ebuild 1745
+RMD160 35e5a160cb117896d16298c9be7c9f60c1144257 nufw-2.0.3.ebuild 1745
+SHA256 14e5e2027a712ba83d94f1af346d91a24643def4f30ed0d457e53b213cc8adcb nufw-2.0.3.ebuild 1745
MISC ChangeLog 208 RMD160 d521291eb88fd2e60543f8f48ed035ca83544ee4 SHA1 38a20fc70a419dc638d972c825570c2cd32d85ab SHA256 0540fbab1a86024f89c850e6367017c2fc2780b715bd25195cf1ef4363aea68a
MD5 dc42d040068ceb4998526719a8e8e815 ChangeLog 208
RMD160 d521291eb88fd2e60543f8f48ed035ca83544ee4 ChangeLog 208
diff --git a/net-firewall/nufw/files/nuauth-init.d b/net-firewall/nufw/files/nuauth-init.d
index bde2e4b9b..6e2788890 100644
--- a/net-firewall/nufw/files/nuauth-init.d
+++ b/net-firewall/nufw/files/nuauth-init.d
@@ -4,14 +4,23 @@ depend() {
before net
}
+checkconfig() {
+ if [ ! -e /etc/nufw/nuauth.conf ]; then
+ eerror "You need a /etc/nufw/nuauth.conf file to run nuauth"
+ eerror "There is sample file in /usr/share/doc/nufw-version/"
+ return 1
+ fi
+}
+
start() {
+ checkconfig || return 1
ebegin "Starting nuauth"
- start-stop-daemon --start --quiet --exec /usr/sbin/nuauth -- -D ${NUAUTH_OPTIONS}
+ start-stop-daemon --start --quiet --exec /usr/sbin/nuauth -- -D ${NUAUTH_OPTIONS}
eend $?
}
stop() {
ebegin "Stopping nuauth"
- start-stop-daemon --stop --quiet --pidfile /var/run/nuauth/nuauth.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/nuauth/nuauth.pid
eend $?
}
diff --git a/net-firewall/nufw/nufw-2.0.3.ebuild b/net-firewall/nufw/nufw-2.0.3.ebuild
index 47f85d1c8..15e44428a 100644
--- a/net-firewall/nufw/nufw-2.0.3.ebuild
+++ b/net-firewall/nufw/nufw-2.0.3.ebuild
@@ -4,23 +4,26 @@
inherit eutils
-DESCRIPTION="NuFW is an authenticating gateway"
+DESCRIPTION="an authenticating gateway"
HOMEPAGE="http://www.nufw.org/"
SRC_URI="http://www.nufw.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86"
-IUSE="prelude postgres mysql ldap gdbm pam"
+IUSE="pam_nuauth pic prelude mysql postgres pam ldap gdbm ident unicode doc"
DEPEND=">=dev-libs/glib-2
net-firewall/iptables
>=net-libs/gnutls-1.1
+ dev-libs/libgcrypt
>=dev-libs/cyrus-sasl-2
+ pam_auth? ( sys-libs/pam )
mysql? ( dev-db/mysql )
postgres? ( dev-db/postgresql )
ldap? ( >=net-nds/openldap-2 )
- gdbm? ( sys-libs/gdbm )"
+ gdbm? ( sys-libs/gdbm )
+ ident? ( net-libs/libident )"
RDEPEND=""
src_unpack() {
@@ -32,12 +35,16 @@ src_unpack() {
src_compile() {
econf \
+ $(use_enable pam_nuauth pam-nuauth) \
+ $(use_with pic) \
$(use_with prelude prelude-log) \
- $(use_with postgres pgsql-log) \
$(use_with mysql mysql-log) \
+ $(use_with postgres pgsql-log) \
+ $(use_with pam system-auth) \
$(use_with ldap) \
$(use_with gdbm) \
- $(use_with pam system-auth) \
+ $(use_with indent) \
+ $(use_with unicode utf8) \
--sysconfdir="/etc/nufw" \
--localstatedir="/var" \
--disable-debug \
@@ -47,23 +54,26 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
+
newinitd ${FILESDIR}/nufw-init.d nufw
newconfd ${FILESDIR}/nufw-conf.d nufw
+
newinitd ${FILESDIR}/nuauth-init.d nuauth
newconfd ${FILESDIR}/nuauth-conf.d nuauth
insinto /etc/nufw
doins conf/nuauth.conf
-
keepdir /var/run/nuauth
dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
- docinto doc
- dodoc doc/*
- docinto doc/modules
- dodoc doc/modules/*
- docinto scripts
- dodoc scripts/*
- docinto conf
- dodoc conf/*
+ if use doc; then
+ docinto doc
+ dodoc doc/*
+ docinto doc/modules
+ dodoc doc/modules/*
+ docinto scripts
+ dodoc scripts/*
+ docinto conf
+ dodoc conf/*
+ fi
}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b52028b7d..6799c22c1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -27,3 +27,5 @@ net-dns/nsd:dnssec - Enable DNSSEC support
net-dns/nsd:plugins - Enable plugin support
net-dns/nsd:root-server - Configure NSD as a root server
net-dns/nsd:tsig - Enable TSIG support
+net-firewall/nufw:pam_nufw - Adds support for pam nufw from PAM
+net-firewall/nufw:ident - Add support ident users authentication