bug#307523: fixed init script wrt stopping, and revbumped

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 66 insertions, 14 deletions

diff --git a/net-proxy/cntlm/ChangeLog b/net-proxy/cntlm/ChangeLog
index a5c06fdb9c52..80888381b5c1 100644
--- a/net-proxy/cntlm/ChangeLog
+++ b/net-proxy/cntlm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/cntlm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/cntlm/ChangeLog,v 1.1 2010/02/24 13:18:15 mduft Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/cntlm/ChangeLog,v 1.2 2011/11/07 07:29:31 mduft Exp $
+
+*cntlm-0.35.1-r2 (07 Nov 2011)
+
+  07 Nov 2011; Markus Duft <mduft@gentoo.org> +cntlm-0.35.1-r2.ebuild,
+  files/cntlm.initd:
+  bug#307523: fixed init script wrt stopping, and revbumped
 
 *cntlm-0.35.1-r1 (24 Feb 2010)
 
diff --git a/net-proxy/cntlm/Manifest b/net-proxy/cntlm/Manifest
index 80247aeac707..f900beac3e3d 100644
--- a/net-proxy/cntlm/Manifest
+++ b/net-proxy/cntlm/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX cntlm.confd 150 RMD160 d77ff0b0c6f319cfe3fb09ccef7f0376c9693134 SHA1 537b40e1290abe461c932ae97aaa99f834f4f216 SHA256 5a5e6b44ea784bf667308d79f7df3b8519f7a5741a6939c810e0a5eecbbe2afe
-AUX cntlm.initd 532 RMD160 1b2f74d0400cbd3d6ccb30e5ee4e634a6681737d SHA1 09847d853a942ca157a7b14ad8c88a9022944565 SHA256 f07aa93ffaac37d2affbbc2aaf4f8354c17d78e92cd7c83fbc02692c2633d69a
+AUX cntlm.initd 563 RMD160 7c2960e60717e9d8bc8a2015d4ae75bba3010944 SHA1 37ad9f5e459c3ef7494e4f9f69f4b4e41a89d5d3 SHA256 fc36641def33a160e59e58f200978340a5155159ff262467aa786a3df86896ce
 DIST cntlm-0.35.1.tar.gz 74188 RMD160 65a2b97a6ec8340b41acbd0f29dc1096148a02ac SHA1 4bf9f75b0f5fdb4469b5e81013c40ac166c9d235 SHA256 7b3fb7184e72cc3f1743bb8e503a5305e96458bc630a7e1ebfc9f3c07ffa6c5e
 EBUILD cntlm-0.35.1-r1.ebuild 1026 RMD160 bd9b9c891c9da5490081614a86047349ca94a1f5 SHA1 66ca52f8d805597227a1130bf8eead944e07844e SHA256 d9a614a7cacd48c6a767931fc66821984de2535814e2a4288ea4c024c4796594
-MISC ChangeLog 395 RMD160 774d09f48c8b726b6dc7680894c518decac085c1 SHA1 4c271d67334601805c365ef76a53e9443eb958b5 SHA256 606c8ab835d87ddb0034418b3a279f4ea3cfeaa6574a82e349b38add724a6834
+EBUILD cntlm-0.35.1-r2.ebuild 1026 RMD160 c24ff611745d999c73c9fe74929ed8df97d44cae SHA1 686058779444526615fa45bbdff08bf47f3998dc SHA256 4ea3eafd5f338556d5d00d23a46d5ecb4390d90f5ebf9a0dad36d003bd06518a
+MISC ChangeLog 580 RMD160 766ad519154cbb52d36e79a180073c434a4a2021 SHA1 fe61781f02f6ba0922514ce419f13b7317ce8531 SHA256 95c3f3da7ff8bf156022b8eb3ff8131160cf502598203ce8647a07dd501fdd83
 MISC metadata.xml 439 RMD160 b04b5061a7ae7031b2f154ea8cd70baeff7b0306 SHA1 0268c1813a57ad32559ca381bb152ad0664f22af SHA256 4a7a82df26f5aec08e2591785e61b0191f6816fc30b98e5b4c06c67c1f0fa815
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ruMACgkQfXuS5UK5QB01VAQAlqqp6lyoUn8ExXL5yJcLgGCO
-DuzEcJm3eHF0QZrGbIOg6O0XEbs2nRy4MQ5qGNjk+5OOO5HIXscsvqZpGvBjG5+e
-kIRMpm6PJdv3edC4dBEywhop1jXsTWlJVLv58E9XkqfsNGsR7AJbVkppbNDUr/mp
-/Am/mm+gQxF1MPp0CT8=
-=cwcI
+iEYEARECAAYFAk63iOQACgkQaBSIl5HlrrIVtwCdEmD4kv/mit1SoP60TPU0N3Qy
+/HkAn2IqEGdmLzQc4CGqpZbA4wj8+u9z
+=KTmu
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/cntlm/cntlm-0.35.1-r2.ebuild b/net-proxy/cntlm/cntlm-0.35.1-r2.ebuild
new file mode 100644
index 000000000000..c2941fe679c0
--- /dev/null
+++ b/net-proxy/cntlm/cntlm-0.35.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/cntlm/cntlm-0.35.1-r2.ebuild,v 1.1 2011/11/07 07:29:31 mduft Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy"
+HOMEPAGE="http://cntlm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cntlm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+	econf || die "econf failed"
+
+	# Replace default config file path in Makefile
+	sed -i -e 's~SYSCONFDIR=/usr/local/etc~SYSCONFDIR=/etc~' \
+				"${S}"/Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin cntlm
+	dodoc COPYRIGHT README VERSION doc/cntlm.conf
+	doman doc/cntlm.1
+	newinitd "${FILESDIR}"/cntlm.initd cntlm
+	newconfd "${FILESDIR}"/cntlm.confd cntlm
+	insinto /etc
+	insopts -m0600
+	doins doc/cntlm.conf
+}
+
+pkg_postinst() {
+	enewgroup cntlm
+	enewuser cntlm -1 -1 -1 cntlm
+}
diff --git a/net-proxy/cntlm/files/cntlm.initd b/net-proxy/cntlm/files/cntlm.initd
index ae2ff0b95a2d..52042d3bb80d 100644
--- a/net-proxy/cntlm/files/cntlm.initd
+++ b/net-proxy/cntlm/files/cntlm.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/cntlm/files/cntlm.initd,v 1.1 2010/02/24 13:18:14 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/cntlm/files/cntlm.initd,v 1.2 2011/11/07 07:29:31 mduft Exp $
 
 PIDFILE=${PIDFILE:-/var/run/cntlm.pid}
 
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting cntlm"
-	start-stop-daemon --start --pidfile ${PIDFILE} --exec /usr/bin/cntlm -- -U cntlm ${CNTLM_OPTS}
+	start-stop-daemon --start --background --make-pidfile --pidfile ${PIDFILE} --exec /usr/bin/cntlm -- -f -U cntlm ${CNTLM_OPTS}
 	eend $?
 }