ports/160844: [PATCH] devel/py-mercurialserver update to v1.2.0

Tue Sep 20 09:00:22 UTC 2011

>Number:         160844
>Category:       ports
>Synopsis:       [PATCH] devel/py-mercurialserver update to v1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 20 09:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Aldis Berjoza
>Release:        
>Organization:
>Environment:
>Description:
Update devel/py-mercurialserver update to v1.2.0 (v1.2)

This will fix mercurialserver with latest mercurial.
This PR can be closed: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/159991

NOTE: I'm originator of PR mentioned above (different email)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN py-mercurialserver.bak/Makefile py-mercurialserver/Makefile

--- py-mercurialserver.bak/Makefile	2011-09-20 09:52:35.739657694 +0300
+++ py-mercurialserver/Makefile	2011-09-20 11:53:54.961321727 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurialserver
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://dev.lshift.net/paul/mercurial-server/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,12 +15,13 @@
 MAINTAINER=	graudeejs at gmail.com
 COMMENT=	Software for hosting mercurial repositories
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
 
-WRKSRC=		${WRKDIR}/${SNAME}_${SVERSION}
-LICENSE=	GPLv2
+WRKSRC=		${WRKDIR}/${SNAME}_${SVERSION}.orig
 SNAME=		mercurial-server
-SVERSION=	1.1
+SVERSION=	1.2
 
 HGUSER=		hg
 HGGROUP=	hg
@@ -47,15 +48,12 @@
 .for i in ${HGSVCONF_FILES}
 	${INSTALL_DATA} ${WRKSRC}/src/init/conf/${i} ${PREFIX}/etc/${PORTNAME}/${i}
 .endfor
-	${MV} ${PREFIX}/hg/dot-mercurial-server ${PREFIX}/hg/.mercurial-server
-	${MV} ${PREFIX}/hg/hgadmin-hgrc ${PREFIX}/hg/.hgadmin-hgrc
-	${RM} ${PREFIX}/hg/hginit
-	${MKDIR} ${PREFIX}/hg/.ssh
-	${MKDIR} ${PREFIX}/hg/repos
-	${CHOWN} -R ${HGUSER}:${HGGROUP} ${PREFIX}/hg
 	@${ECHO_MSG}
 	@${ECHO_MSG} "NOTE: ${PORTNAME} has been patched to use ${PREFIX}/etc/${PORTNAME}"
 	@${ECHO_MSG} "      instead of /etc/mercurial-server"
 	@${ECHO_MSG}
+	@${ECHO_MSG} "Now you need to create ${HGUSER} home (if nessacery) and run"
+	@${ECHO_MSG} "      ${PREFIX}/etc/hginit as ${HGUSER} user from home directory"
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff -ruN py-mercurialserver.bak/distinfo py-mercurialserver/distinfo
--- py-mercurialserver.bak/distinfo	2011-09-20 09:52:35.746658407 +0300
+++ py-mercurialserver/distinfo	2011-09-20 09:57:39.146622537 +0300
@@ -1,2 +1,2 @@
-SHA256 (mercurial-server_1.1.tar.gz) = 34b18275d48397122aed519f91eb3602983ef952597ed807de868b413ead7091
-SIZE (mercurial-server_1.1.tar.gz) = 21166
+SHA256 (mercurial-server_1.2.tar.gz) = c6693bc19d1d8d44593e792af95a402ca112a7fa29efba6b9851bc696b258a91
+SIZE (mercurial-server_1.2.tar.gz) = 21560
diff -ruN py-mercurialserver.bak/files/patch-setup.py py-mercurialserver/files/patch-setup.py
--- py-mercurialserver.bak/files/patch-setup.py	2011-09-20 09:52:35.729647178 +0300
+++ py-mercurialserver/files/patch-setup.py	2011-09-20 11:02:58.875787105 +0300
@@ -1,11 +1,18 @@
---- ./setup.py.orig	2010-11-06 17:40:20.926497770 +0200
-+++ ./setup.py	2010-11-06 17:40:39.706412807 +0200
-@@ -13,7 +13,7 @@
+--- ./setup.py.orig	2011-09-06 13:40:10.000000000 +0300
++++ ./setup.py	2011-09-20 11:01:50.960960465 +0300
+@@ -7,13 +7,13 @@
+     name="mercurial-server",
+     description="Centralized Mercurial repository manager",
+     url="http://www.lshift.net/mercurial-server.html",
+-    version="1.1", # FIXME: infer this
++    version="1.2", # FIXME: infer this
+     package_dir = {'': 'src'},
+     packages = ["mercurialserver"],
      requires = ["mercurial"], # FIXME: what version?
      scripts = ['src/hg-ssh', 'src/refresh-auth'],
      data_files = [
 -        ('init', [
-+        ('hg', [
-             'src/init/hginit', 
-             'src/init/dot-mercurial-server', 
++        ('etc/mercurialserver', [
+             'src/init/hginit',
+             'src/init/dot-mercurial-server',
              'src/init/hgadmin-hgrc'
diff -ruN py-mercurialserver.bak/files/patch-src__init__hginit py-mercurialserver/files/patch-src__init__hginit
--- py-mercurialserver.bak/files/patch-src__init__hginit	1970-01-01 03:00:00.000000000 +0300
+++ py-mercurialserver/files/patch-src__init__hginit	2011-09-20 11:02:58.883793779 +0300
@@ -0,0 +1,13 @@
+--- ./src/init/hginit.orig	2011-09-06 13:40:10.000000000 +0300
++++ ./src/init/hginit	2011-09-20 11:02:54.724372572 +0300
+@@ -9,8 +9,8 @@
+     exit -1
+ fi
+ 
+-cp $1/init/dot-mercurial-server .mercurial-server
++cp /usr/local/etc/mercurialserver/dot-mercurial-server .mercurial-server
+ mkdir -p repos/hgadmin .ssh
+ cd repos/hgadmin
+ hg init .
+-cp $1/init/hgadmin-hgrc .hg/hgrc
++cp /usr/local/etc/mercurialserver/hgadmin-hgrc .hg/hgrc
diff -ruN py-mercurialserver.bak/pkg-plist py-mercurialserver/pkg-plist
--- py-mercurialserver.bak/pkg-plist	2011-09-20 09:52:35.750658814 +0300
+++ py-mercurialserver/pkg-plist	2011-09-20 11:30:25.844226193 +0300
@@ -19,19 +19,16 @@
 %%PYTHON_SITELIBDIR%%/mercurialserver/servelog.py
 %%PYTHON_SITELIBDIR%%/mercurialserver/servelog.pyc
 %%PYTHON_SITELIBDIR%%/mercurialserver/servelog.pyo
+
 bin/hg-ssh
 bin/refresh-auth
 etc/mercurialserver/access.conf
+etc/mercurialserver/dot-mercurial-server
+etc/mercurialserver/hgadmin-hgrc
+etc/mercurialserver/hginit
 etc/mercurialserver/remote-hgrc.d/access.rc
 etc/mercurialserver/remote-hgrc.d/logging.rc
-hg/.hgadmin-hgrc
-hg/.mercurial-server
-
- at dirrm %%PYTHON_SITELIBDIR%%/mercurialserver
 
- at dirrmtry hg/repos
- at dirrmtry hg/.ssh
- at dirrmtry hg
 @dirrmtry etc/mercurialserver/remote-hgrc.d
 @dirrmtry etc/mercurialserver/keys/users
 @dirrmtry etc/mercurialserver/keys/root


>Release-Note:
>Audit-Trail:
>Unformatted:

