Update loggerhead to 1.18.1.

(contains security fix for CVE-2011-0728).

What's changed in loggerhead?
=============================

1.18.1 [24Mar2011]
------------------

    - Fix escaping of filenames in revision views.
      (William Grant, #740142)

    - Add missing import to loggerhead.trace, allowing start-loggerhead
      to run when a log.roll config option is set.
      (Max Kanat-Alexander, #673999)


1.18 [10Nov2010]
----------------

    - Syntax highlighting is no longer applied for files greater than 512K,
      reducing codebrowse.launchpad.net overloading.
      (Max Kanat-Alexander, #513044)

    - Documentation added in the docs directory. README simplified
      accordingly. (Tres Seaver).

    - Show svn/git/hg revision ids in loggerhead revision view.
      (Jelmer Vernooij)

    - Fix .bzr/smart access to branches in shared repos. (You also need
      a version of bzr with bug #348308 fixed.) (Andrew Bennetts)

    - Support FastCGI, SCGI and AJP using flup. (Denis Martinez)

    - Repository.get_revision_inventory() was removed in bzr 2.2; use
      Repository.get_inventory() instead. (Matt Nordhoff, #528194)

    - Ignore readonly+ prefix when checking if Loggerhead is serving a
      local location. (Reported by Tres Seaver.) (Matt Nordhoff)

    - Set Cache-Control and Expires headers on static pages.
      (John Arbash Meinel)

    - Generate relative links where possible (everywhere but HTTP
      redirects and feed IDs). (Michael Hudson, Matt Nordhoff)

    - Fix bad redirect when visiting "/download" or "/download/".
      (Matt Nordhoff, #247992)

4 files changed, 31 insertions, 28 deletions

diff --git a/www/loggerhead/Makefile b/www/loggerhead/Makefile
index 70972efda05..bcf3d113d52 100644
--- a/www/loggerhead/Makefile
+++ b/www/loggerhead/Makefile
@@ -1,33 +1,32 @@
-# $NetBSD: Makefile,v 1.7 2011/03/26 07:12:56 obache Exp $
+# $NetBSD: Makefile,v 1.8 2011/03/26 08:02:38 obache Exp $
 
 DISTNAME=	loggerhead-${VER}
-PKGREVISION=	1
 CATEGORIES=	www scm
-MASTER_SITES=	http://launchpad.net/loggerhead/${VER}/${VER}/+download/
-VER=		1.17
-
-WRKSRC=		${WRKDIR}/loggerhead
+MASTER_SITES=	http://launchpad.net/loggerhead/1.18/${VER}/+download/
+VER=		1.18.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://launchpad.net/loggerhead
 COMMENT=	Web viewer for Bazaar branches
+LICENSE=	gnu-gpl-v2 # or later
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	bzr>=1.13:../../devel/bzr
+DEPENDS+=	bzr>=1.17:../../devel/bzr
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-Paste>=1.2:../../www/py-paste
 DEPENDS+=	${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c8:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
 
-PYDISTUTILSPKG=	yes
-# Requires wsgi, which is available for older versions of Python, but not in
-# pkgsrc yet.  Also requires 'sqlite3', which seems not to be available
-# separately (py-sqlite2 is for sqlite3 but is 'pysqlite2').
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
+.include "../../lang/python/pyversion.mk"
+
+.if defined(PYPACKAGE) && ${PYPACKAGE} == "python24"
+DEPENDS+=	${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2
+.else
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+.endif
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/loggerhead/PLIST b/www/loggerhead/PLIST
index 982da266e48..831028d9efd 100644
--- a/www/loggerhead/PLIST
+++ b/www/loggerhead/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/09 05:45:23 epg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/03/26 08:02:38 obache Exp $
 bin/serve-branches
 bin/start-loggerhead
 bin/stop-loggerhead
 ${PYSITELIB}/bzrlib/plugins/loggerhead/__init__.py
 ${PYSITELIB}/bzrlib/plugins/loggerhead/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/loggerhead/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/loggerhead/info.py
+${PYSITELIB}/bzrlib/plugins/loggerhead/info.pyc
+${PYSITELIB}/bzrlib/plugins/loggerhead/info.pyo
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/loggerhead/__init__.py
 ${PYSITELIB}/loggerhead/__init__.pyc
 ${PYSITELIB}/loggerhead/__init__.pyo
diff --git a/www/loggerhead/distinfo b/www/loggerhead/distinfo
index c82dcd1d7bd..582ce18cc7a 100644
--- a/www/loggerhead/distinfo
+++ b/www/loggerhead/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/09/09 05:45:23 epg Exp $
+$NetBSD: distinfo,v 1.4 2011/03/26 08:02:38 obache Exp $
 
-SHA1 (loggerhead-1.17.tar.gz) = 910b5f569c8647294cabfa45698909b1fffda1ee
-RMD160 (loggerhead-1.17.tar.gz) = 847e3c12eff66e9fdf617e0ef7523f7f74e3c82c
-Size (loggerhead-1.17.tar.gz) = 706897 bytes
-SHA1 (patch-aa) = 92b3c29fb0320ebe65bee7f872251ba4b6c81fb7
+SHA1 (loggerhead-1.18.1.tar.gz) = dad804c194ddc278d8f4a65460cc480eff937a73
+RMD160 (loggerhead-1.18.1.tar.gz) = a03a119ff82470cba2bccf215bce8c468daf7357
+Size (loggerhead-1.18.1.tar.gz) = 695475 bytes
+SHA1 (patch-aa) = 8cc7793fe682e9ed690be784eb510020b22fca39
diff --git a/www/loggerhead/patches/patch-aa b/www/loggerhead/patches/patch-aa
index 0f19a88a3fe..473a23f1e69 100644
--- a/www/loggerhead/patches/patch-aa
+++ b/www/loggerhead/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2008/12/26 19:51:56 epg Exp $
+$NetBSD: patch-aa,v 1.3 2011/03/26 08:02:38 obache Exp $
 
---- setup.py.orig	2008-12-22 11:58:32.000000000 -0800
+--- setup.py.orig	2011-03-24 23:14:27.000000000 +0000
 +++ setup.py
-@@ -19,6 +19,7 @@
- """Loggerhead is a web viewer for projects in bazaar"""
+@@ -18,6 +18,7 @@
  
+ """Loggerhead is a web viewer for projects in bazaar"""
  
 +import os
  from distutils.core import setup
- import loggerhead
  
-@@ -62,7 +63,7 @@ setup(
+ import loggerhead
+@@ -64,7 +65,7 @@ setup(
                                     "static/javascript/yui/build/yui-base/*",
                                     "static/images/*"]},
      data_files = [
 -        ('share/man/man1', ['start-loggerhead.1',
-+        (os.getenv('PKGMANDIR', 'man') + '/man1', ['start-loggerhead.1',
++        (os.getenv('PKGMANDIR', 'share/man') + '/man1', ['start-loggerhead.1',
                              'stop-loggerhead.1',
                              'serve-branches.1']),
          ('share/doc/loggerhead', ['loggerhead.conf.example']),