add ntlmaps user and group; change configuration file permissions to a secure defaultadd ntlmaps user and group; change configuration file permissions to a secure default (#107766)

(Portage version: 2.0.51.22-r2)

7 files changed, 112 insertions, 18 deletions

diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index 5f2468adfd0a..a173680f0902 100644
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/ntlmaps
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.5 2005/09/16 05:00:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.6 2005/10/06 21:39:47 mrness Exp $
+
+*ntlmaps-0.9.9.5-r1 (06 Oct 2005)
+*ntlmaps-0.9.9-r2 (06 Oct 2005)
+
+  06 Oct 2005; Alin Nastac <mrness@gentoo.org> files/ntlmaps.init,
+  +ntlmaps-0.9.9-r2.ebuild, -ntlmaps-0.9.9.5.ebuild,
+  +ntlmaps-0.9.9.5-r1.ebuild:
+  Run service as user ntlmaps. Fix insecure configuration file permissions (#107766).
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> ntlmaps-0.9.9-r1.ebuild:
   Mark 0.9.9-r1 stable on alpha
diff --git a/net-proxy/ntlmaps/Manifest b/net-proxy/ntlmaps/Manifest
index 37fc1946509b..7f997279eb53 100644
--- a/net-proxy/ntlmaps/Manifest
+++ b/net-proxy/ntlmaps/Manifest
@@ -1,9 +1,13 @@
-MD5 a65bb25d95d5de35ca0f2727b1e8e7c9 metadata.xml 489
-MD5 04e94a03696ac53a3f48a3031b24629f ChangeLog 2458
 MD5 facbf9ba94e6cadf744a22d15bf6ad28 ntlmaps-0.9.9-r1.ebuild 1352
+MD5 ff503743f6e8e39822b30ef3ee698572 ntlmaps-0.9.9.5-r1.ebuild 1816
 MD5 3299fc41dc2862f119e8dd3146ebc9c5 ntlmaps-0.9.9.5.ebuild 1414
-MD5 2c97eb4d589e8a9f9e9968be5aa96daa files/ntlmaps-0.9.9.5-gentoo.patch 1183
+MD5 81e29678940daadc615c19e201bdd375 ntlmaps-0.9.9-r2.ebuild 1824
+MD5 04e94a03696ac53a3f48a3031b24629f ChangeLog 2458
+MD5 a65bb25d95d5de35ca0f2727b1e8e7c9 metadata.xml 489
+MD5 fab53f4bb4eeeafcab9f174ff03260de files/ntlmaps.init 727
+MD5 89d940c1a5df0a265c10c920498f1a03 files/ntlmaps-0.9.9-gentoo.patch 1165
 MD5 f80ba6da97c9b6ecf9589fcbe791abf6 files/digest-ntlmaps-0.9.9.5 66
+MD5 2c97eb4d589e8a9f9e9968be5aa96daa files/ntlmaps-0.9.9.5-gentoo.patch 1183
 MD5 677c6c0d28b021c5c460dcd020ca6dce files/digest-ntlmaps-0.9.9-r1 64
-MD5 89d940c1a5df0a265c10c920498f1a03 files/ntlmaps-0.9.9-gentoo.patch 1165
-MD5 8986ad96cdc57db74518ce83fc0fbfee files/ntlmaps.init 725
+MD5 677c6c0d28b021c5c460dcd020ca6dce files/digest-ntlmaps-0.9.9-r2 64
+MD5 f80ba6da97c9b6ecf9589fcbe791abf6 files/digest-ntlmaps-0.9.9.5-r1 66
diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2
new file mode 100644
index 000000000000..9d4bc473464f
--- /dev/null
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2
@@ -0,0 +1 @@
+MD5 02d0f83f499eaf988de4ffab2dfd3618 ntlmaps-0.9.9.tar.gz 55459
diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5-r1
index 04e4e66df51b..04e4e66df51b 100644
--- a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5-r1
diff --git a/net-proxy/ntlmaps/files/ntlmaps.init b/net-proxy/ntlmaps/files/ntlmaps.init
index b56d01b9a66c..5f638f5a3b91 100644
--- a/net-proxy/ntlmaps/files/ntlmaps.init
+++ b/net-proxy/ntlmaps/files/ntlmaps.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/files/ntlmaps.init,v 1.2 2005/07/03 08:57:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/files/ntlmaps.init,v 1.3 2005/10/06 21:39:47 mrness Exp $
 
 PID_FILE="/var/run/ntlmaps.pid"
 
@@ -12,10 +12,10 @@ depend() {
 start() {
 	ebegin "Starting ntlmaps"
 	touch ${PID_FILE}
-	chown nobody:nogroup ${PID_FILE}
+	chown ntlmaps:ntlmaps ${PID_FILE}
 	cd /var/log/ntlmaps && \
 		start-stop-daemon --quiet --start --background --exec /usr/bin/python \
-			--make-pidfile --pidfile ${PID_FILE} --chuid nobody -- /usr/bin/ntlmaps < /dev/null && \
+			--make-pidfile --pidfile ${PID_FILE} --chuid ntlmaps -- /usr/bin/ntlmaps < /dev/null && \
 		sleep 1
 	eend $?
 }
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
new file mode 100644
index 000000000000..080e7cac9222
--- /dev/null
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9-r2.ebuild,v 1.1 2005/10/06 21:39:47 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="NTLM proxy Authentication against MS proxy/web server"
+HOMEPAGE="http://ntlmaps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86"
+IUSE=""
+
+DEPEND="dev-lang/python"
+
+pkg_setup() {
+	enewgroup ntlmaps
+	enewuser ntlmaps -1 -1 -1 ntlmaps
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	#stupid windoze style
+	cd ${S}
+	sed -i -e 's/\r//' lib/*.py server.cfg *.txt doc/*.{txt,htm}
+}
+
+src_install() {
+	# exes ------------------------------------------------------------------
+	exeinto /usr/bin
+	newexe main.py ntlmaps || die "failed to install main program"
+	insinto /usr/lib/ntlmaps
+	doins lib/* || die "failed to install python modules"
+	# doc -------------------------------------------------------------------
+	dodoc *.txt doc/*.txt
+	dohtml doc/*
+	# conf ------------------------------------------------------------------
+	insopts -m0640 -g ntlmaps
+	insinto /etc/ntlmaps
+	doins server.cfg
+	newinitd ${FILESDIR}/ntlmaps.init ntlmaps
+	# log -------------------------------------------------------------------
+	diropts -m 0770 -g ntlmaps
+	keepdir /var/log/ntlmaps
+}
+
+pkg_preinst() {
+	pkg_setup
+	#Remove the following lines sometime in December 2005
+	#Their purpose is to fix security bug #107766 
+	if [ -f "${ROOT}/etc/ntlmaps/server.cfg" ]; then
+		chmod 0640 "${ROOT}/etc/ntlmaps/server.cfg"
+		chgrp ntlmaps "${ROOT}/etc/ntlmaps/server.cfg"
+	fi
+}
+
+pkg_prerm() {
+	einfo "Removing python compiled bytecode"
+	rm -f ${ROOT}/usr/lib/ntlmaps/*.py?
+}
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.5.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.5-r1.ebuild
index 772c73a3bb28..361c12bc5618 100644
--- a/net-proxy/ntlmaps/ntlmaps-0.9.9.5.ebuild
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.5.ebuild,v 1.1 2005/07/03 08:57:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ntlmaps-0.9.9.5-r1.ebuild,v 1.1 2005/10/06 21:39:47 mrness Exp $
 
 inherit eutils
 
@@ -15,35 +15,51 @@ IUSE=""
 
 DEPEND="dev-lang/python"
 
+pkg_setup() {
+	enewgroup ntlmaps
+	enewuser ntlmaps -1 -1 -1 ntlmaps
+}
+
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	#stupid windoze style
+	cd ${S}
 	sed -i -e 's/\r//' lib/*.py server.cfg doc/*.{txt,htm}
 }
 
 src_install() {
 	# exes ------------------------------------------------------------------
 	exeinto /usr/bin
-	newexe main.py ${PN} || die "failed to install main program"
-	insinto /usr/lib/${PN}
+	newexe main.py ntlmaps || die "failed to install main program"
+	insinto /usr/lib/ntlmaps
 	doins lib/* || die "failed to install python modules"
 	# doc -------------------------------------------------------------------
 	dodoc *.txt doc/*.txt
 	dohtml doc/*
 	# conf ------------------------------------------------------------------
-	insinto /etc/${PN}
+	insopts -m0640 -g ntlmaps
+	insinto /etc/ntlmaps
 	doins server.cfg
-	newinitd ${FILESDIR}/${PN}.init ${PN}
+	newinitd ${FILESDIR}/ntlmaps.init ntlmaps
 	# log -------------------------------------------------------------------
-	diropts -m 0770 -g nobody
-	keepdir /var/log/${PN}
+	diropts -m 0770 -g ntlmaps
+	keepdir /var/log/ntlmaps
+}
+
+pkg_preinst() {
+	pkg_setup
+	#Remove the following lines sometime in December 2005
+	#Their purpose is to fix security bug #107766 
+	if [ -f "${ROOT}/etc/ntlmaps/server.cfg" ]; then
+		chmod 0640 "${ROOT}/etc/ntlmaps/server.cfg"
+		chgrp ntlmaps "${ROOT}/etc/ntlmaps/server.cfg"
+	fi
 }
 
 pkg_prerm() {
 	einfo "Removing python compiled bytecode"
-	rm -f /usr/lib/${PN}/*.py?
+	rm -f ${ROOT}/usr/lib/ntlmaps/*.py?
 }