6 files changed, 116 insertions, 1 deletions
diff --git a/net-proxy/ntlmaps/ChangeLog b/net-proxy/ntlmaps/ChangeLog
index c8b48dc2b283..df5c946466dd 100644
--- a/net-proxy/ntlmaps/ChangeLog
+++ b/net-proxy/ntlmaps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/ntlmaps
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.10 2006/05/23 20:09:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ntlmaps/ChangeLog,v 1.11 2006/09/20 11:59:55 mrness Exp $
+
+*ntlmaps-0.9.9.6 (20 Sep 2006)
+
+  20 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  +files/ntlmaps-0.9.9.6-gentoo.patch, +ntlmaps-0.9.9.6.ebuild:
+  Version bump.
 
   23 May 2006; Markus Rothe <corsair@gentoo.org> ntlmaps-0.9.9-r2.ebuild:
   Stable on ppc64
diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2
index 9d4bc473464f..326ddbb14c74 100644
--- a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9-r2
@@ -1 +1,3 @@
 MD5 02d0f83f499eaf988de4ffab2dfd3618 ntlmaps-0.9.9.tar.gz 55459
+RMD160 95bb90f04ceb7696bfaa848e506e6b7d7f297f51 ntlmaps-0.9.9.tar.gz 55459
+SHA256 6f955ef0a8f3e944df0a9b2d22e385ee4399fa4e16f4c30ccdcb6f4c92fdccd1 ntlmaps-0.9.9.tar.gz 55459
diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5-r1 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5-r1
index 04e4e66df51b..f636d0aef82b 100644
--- a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5-r1
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.5-r1
@@ -1 +1,3 @@
 MD5 bf7c0038765bdc97acd5eb726fa74f7f ntlmaps-0.9.9.5.tar.gz 61013
+RMD160 0ad8cb8cda4e8a9d229f00e49f38ad1f13ae0a3a ntlmaps-0.9.9.5.tar.gz 61013
+SHA256 d5c28a910d8382b89f14126759bafc9917bb2962db04dc78d17b1ac561ea63b6 ntlmaps-0.9.9.5.tar.gz 61013
diff --git a/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.6 b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.6
new file mode 100644
index 000000000000..28279a2b4320
--- /dev/null
+++ b/net-proxy/ntlmaps/files/digest-ntlmaps-0.9.9.6
@@ -0,0 +1,3 @@
+MD5 1f4bc8228d46b3f02213fb829b27b9f9 ntlmaps-0.9.9.6.tar.gz 60760
+RMD160 7d46394f0f975bda384bd9f82e2a11897fcb12ba ntlmaps-0.9.9.6.tar.gz 60760
+SHA256 005c66a84f535951dc6ad558b301b7b49b96a3bbc56e3a83a553a5500e3f6a2a ntlmaps-0.9.9.6.tar.gz 60760
diff --git a/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
new file mode 100644
index 000000000000..d94d3db0adc2
--- /dev/null
+++ b/net-proxy/ntlmaps/files/ntlmaps-0.9.9.6-gentoo.patch
@@ -0,0 +1,37 @@
+diff -Nru ntlmaps-0.9.9.6.orig/__init__.py ntlmaps-0.9.9.6/__init__.py
+--- ntlmaps-0.9.9.6.orig/__init__.py	2005-06-10 06:49:35.000000000 +0300
++++ ntlmaps-0.9.9.6/__init__.py	2006-09-20 14:52:58.000000000 +0300
+@@ -22,8 +22,7 @@
+ 
+ import os, sys
+ 
+-ntlmaps_dir = os.path.dirname(os.path.abspath(__file__))
+-ntlmaps_libdir = ntlmaps_dir + '/lib'
++ntlmaps_dir = '/usr/lib/ntlmaps'
+ sys.path.append(ntlmaps_libdir)
+ 
+ del os, sys
+diff -Nru ntlmaps-0.9.9.6.orig/main.py ntlmaps-0.9.9.6/main.py
+--- ntlmaps-0.9.9.6.orig/main.py	2005-07-05 06:13:43.000000000 +0300
++++ ntlmaps-0.9.9.6/main.py	2006-09-20 14:52:58.000000000 +0300
+@@ -18,17 +18,17 @@
+ # Free Software Foundation, Inc.,
+ # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ #
+-import __init__
+-
+ import sys
+ 
++sys.path.append('/usr/lib/ntlmaps')
++
+ import server, config, config_affairs
+ 
+ 
+ #--------------------------------------------------------------
+ # config affairs
+ # look for default config name in lib/config.py
+-conf = config.read_config(config.findConfigFileNameInArgv(sys.argv, __init__.ntlmaps_dir+'/'))
++conf = config.read_config('/etc/ntlmaps/server.cfg')
+ 
+ conf['GENERAL']['VERSION'] = '0.9.9.6'
+ 
diff --git a/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild b/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild
new file mode 100644
index 000000000000..537410ed4ca0
--- /dev/null
+++ b/net-proxy/ntlmaps/ntlmaps-0.9.9.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 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.6.ebuild,v 1.1 2006/09/20 11:59:55 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 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?
+}