Attachment #133009 for bug #177382

View | Details | Raw Unified | Return to bug 177382
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	trac
PORTVERSION=	1.0.1
CATEGORIES=	www devel python
MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
		ftp://ftp.edgewall.com/pub/trac/

MAINTAINER=	clsung@FreeBSD.org
COMMENT=	An enhanced wiki and issue tracking system for software projects

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:${PORTSDIR}/textproc/py-genshi \
		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel
RUN_DEPENDS=	${BUILD_DEPENDS}
		${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel

OPTIONS_DEFINE=		SILVERCITY DOCUTILS PYGMENTS TZ PGSQL SVN
OPTIONS_DEFAULT=	SILVERCITY DOCUTILS PYGMENTS TZ SVN


CONFLICTS=	ja-trac-[0-9]*

USE_PYTHON=	2.7-
USE_PYDISTUTILS=	easy_install
PYDISTUTILS_PKGNAME=	Trac
PYDISTUTILS_NOEGGINFO=	yes

USE_RC_SUBR=	tracd
SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}

.include <bsd.port.options.mk>


		' | ${TR} -s '\n') > temp-pkg-plist

pre-install:
	@${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/contrib/cgi-bin/trac.fcgi \
	    ${WRKSRC}/contrib/cgi-bin/trac.cgi

post-install:
	@${MKDIR} -p ${EXAMPLESDIR}/sample-plugins
	@${MKDIR} ${EXAMPLESDIR}/rpm
	@${INSTALL_DATA} ${WRKSRC}/contrib/rpm/* ${EXAMPLESDIR}/rpm
	@${FIND} ${WRKSRC}/contrib -type f -maxdepth 1 -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/ \;
. for d in permissions workflow
	@${MKDIR} ${EXAMPLESDIR}/sample-plugins/${d}
	@${INSTALL_DATA} ${WRKSRC}/sample-plugins/${d}/* ${EXAMPLESDIR}/sample-plugins/${d}/
	@${RM} -rf ${WRKSRC}/contrib/${d}
. endfor
	@${INSTALL_DATA} ${WRKSRC}/sample-plugins/*.py ${EXAMPLESDIR}/sample-plugins/
	@${MKDIR} ${DATADIR}/cgi-bin
	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/cgi-bin/* ${DATADIR}/cgi-bin
	@${ECHO_CMD}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Trac-0.12.3.tar.gz) = 0eefacc5ebb91158ed7351b8f9b2eec7f45ce03b692bdc72a3c8061951174506	1	SHA256 (Trac-1.0.1.tar.gz) = 9dd49065696a8d4dfcb1a1af81e51d6bd487f5a1e72b3325c1fe4ecb5c490adb
2	SIZE (Trac-0.12.3.tar.gz) = 2239934	2	SIZE (Trac-1.0.1.tar.gz) = 3479896




Revert r10799 which breaks tracd startup

beta# /usr/local/etc/rc.d/tracd start
Starting tracd.
Error writing to pid file: IOError: [Errno 2] No such file or directory: '/var/db/trac/redports/tracd.pid'
/usr/local/etc/rc.d/tracd: WARNING: failed to start tracd

See:	http://trac.edgewall.org/changeset/10799/
--- trac/util/daemon.py.orig	2012-02-06 21:53:52.000000000 +0100
+++ trac/util/daemon.py	2012-02-07 10:38:32.414621956 +0100
@@ -44,14 +44,6 @@
                 if e.errno != errno.ESRCH:
                     raise
 
-        # The pid file must be writable
-        try:
-            fileobj = open(pidfile, 'r+')
-            fileobj.close()
-        except IOError, e:
-            from trac.util.text import exception_to_unicode
-            sys.exit('Error writing to pid file: %s' % exception_to_unicode(e))
-
     # Perform first fork
     pid = os.fork()
     if pid > 0:




*******************************************************************************

From 0.12.x to 1.0.x
---------------------
You should be careful to check that the plugins you depend on have
been ported to 1.0.1, as they most probably won't work without adaptation
due to the numerous internal changes that occurred during 1.0.1 development.

See:	http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0

Consult the upgrade instructions at:





bin/trac-admin
bin/tracd
%%DATADIR%%/cgi-bin/trac.cgi
%%DATADIR%%/cgi-bin/trac.fcgi
@dirrm %%DATADIR%%/cgi-bin
@dirrm %%DATADIR%%
%%EXAMPLESDIR%%/rpm/installscript
%%EXAMPLESDIR%%/rpm/makerpm
%%EXAMPLESDIR%%/workflow/README
%%EXAMPLESDIR%%/workflow/enterprise-workflow.ini
%%EXAMPLESDIR%%/workflow/migrate_original_to_basic.py
%%EXAMPLESDIR%%/workflow/opensource-workflow.ini
%%EXAMPLESDIR%%/workflow/showworkflow
%%EXAMPLESDIR%%/workflow/simple-workflow.ini
%%EXAMPLESDIR%%/workflow/trivial-workflow.ini
%%EXAMPLESDIR%%/workflow/workflow_parser.py
%%EXAMPLESDIR%%/README
%%EXAMPLESDIR%%/bugzilla2trac.py
%%EXAMPLESDIR%%/checkwiki.py
%%EXAMPLESDIR%%/emailfilter.py
%%EXAMPLESDIR%%/htdigest.py
%%EXAMPLESDIR%%/htpasswd.py
%%EXAMPLESDIR%%/l10n_diff_index.py
%%EXAMPLESDIR%%/l10n_reset_en_GB.py
%%EXAMPLESDIR%%/l10n_revert_lineno_conflicts.py
%%EXAMPLESDIR%%/migrateticketmodel.py
%%EXAMPLESDIR%%/rpm/installscript
%%EXAMPLESDIR%%/rpm/makerpm
%%EXAMPLESDIR%%/sample-plugins/HelloWorld.py
%%EXAMPLESDIR%%/sample-plugins/Timestamp.py
%%EXAMPLESDIR%%/sample-plugins/milestone_to_version.py
%%EXAMPLESDIR%%/sample-plugins/permissions/debug_perm.py
%%EXAMPLESDIR%%/sample-plugins/permissions/public_wiki_policy.py
%%EXAMPLESDIR%%/sample-plugins/permissions/vulnerability_tickets.py
%%EXAMPLESDIR%%/sample-plugins/revision_links.py
%%EXAMPLESDIR%%/sample-plugins/workflow/CodeReview.py
%%EXAMPLESDIR%%/sample-plugins/workflow/DeleteTicket.py
%%EXAMPLESDIR%%/sample-plugins/workflow/MilestoneOperation.py
%%EXAMPLESDIR%%/sample-plugins/workflow/StatusFixer.py
%%EXAMPLESDIR%%/sample-plugins/workflow/VoteOperation.py
%%EXAMPLESDIR%%/sample-plugins/workflow/enterprise-review-workflow.ini
%%EXAMPLESDIR%%/sourceforge2trac.py
%%EXAMPLESDIR%%/trac-pre-commit-hook
%%EXAMPLESDIR%%/trac-svn-hook
%%EXAMPLESDIR%%/trac-svn-post-commit-hook.cmd
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
bin/trac-admin
bin/tracd
@dirrm %%DATADIR%%/cgi-bin
@dirrm %%DATADIR%%
@dirrm %%EXAMPLESDIR%%/sample-plugins/workflow
@dirrm %%EXAMPLESDIR%%/sample-plugins/permissions
@dirrm %%EXAMPLESDIR%%/sample-plugins
@dirrm %%EXAMPLESDIR%%/rpm
@dirrm %%EXAMPLESDIR%%
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%

Return to bug 177382

Lines 2-8 Link Here

(-)Makefile (-15 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= trac	4	PORTNAME= trac
5	PORTVERSION= 0.12.3	5	PORTVERSION= 1.0.1
6	CATEGORIES= www devel python	6	CATEGORIES= www devel python
7	MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \	7	MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \
8	ftp://ftp.edgewall.com/pub/trac/	8	ftp://ftp.edgewall.com/pub/trac/
Lines 11-20 Link Here
11	MAINTAINER= clsung@FreeBSD.org	11	MAINTAINER= clsung@FreeBSD.org
12	COMMENT= An enhanced wiki and issue tracking system for software projects	12	COMMENT= An enhanced wiki and issue tracking system for software projects
13		13
14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \	14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:${PORTSDIR}/textproc/py-genshi \
15	${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel	15	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \	16	RUN_DEPENDS= ${BUILD_DEPENDS}
17	${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
18		17
19	OPTIONS_DEFINE= SILVERCITY DOCUTILS PYGMENTS TZ PGSQL SVN	18	OPTIONS_DEFINE= SILVERCITY DOCUTILS PYGMENTS TZ PGSQL SVN
20	OPTIONS_DEFAULT= SILVERCITY DOCUTILS PYGMENTS TZ SVN	19	OPTIONS_DEFAULT= SILVERCITY DOCUTILS PYGMENTS TZ SVN
Lines 25-37 Link Here
25		24
26	CONFLICTS= ja-trac-[0-9]*	25	CONFLICTS= ja-trac-[0-9]*
27		26
28	USE_PYTHON= 2.5+	27	USE_PYTHON= 2.7-
29	USE_PYDISTUTILS= easy_install	28	USE_PYDISTUTILS= easy_install
30	PYDISTUTILS_PKGNAME= Trac	29	PYDISTUTILS_PKGNAME= Trac
31	PYDISTUTILS_NOEGGINFO= yes	30	PYDISTUTILS_NOEGGINFO= yes
32		31
33	USE_RC_SUBR= tracd	32	USE_RC_SUBR= tracd
34	SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
35		33
36	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
37		35
Lines 74-92 Link Here
74	' \| ${TR} -s '\n') > temp-pkg-plist	72	' \| ${TR} -s '\n') > temp-pkg-plist
75		73
76	pre-install:	74	pre-install:
77	@${REINPLACE_CMD} -i '' -e 's\|/usr/bin/python\|${PYTHON_CMD}\|' ${WRKSRC}/cgi-bin/trac.fcgi \	75	@${REINPLACE_CMD} -i '' -e 's\|/usr/bin/python\|${PYTHON_CMD}\|' ${WRKSRC}/contrib/cgi-bin/trac.fcgi \
78	${WRKSRC}/cgi-bin/trac.cgi	76	${WRKSRC}/contrib/cgi-bin/trac.cgi
79		77
80	post-install:	78	post-install:
81	@${MKDIR} ${EXAMPLESDIR}	79	@${MKDIR} -p ${EXAMPLESDIR}/sample-plugins
82	. for d in rpm workflow	80	@${MKDIR} ${EXAMPLESDIR}/rpm
83	@${MKDIR} ${EXAMPLESDIR}/${d}	81	@${INSTALL_DATA} ${WRKSRC}/contrib/rpm/* ${EXAMPLESDIR}/rpm
84	@${INSTALL_DATA} ${WRKSRC}/contrib/${d}/* ${EXAMPLESDIR}/${d}/	82	@${FIND} ${WRKSRC}/contrib -type f -maxdepth 1 -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/ \;
		83	. for d in permissions workflow
		84	@${MKDIR} ${EXAMPLESDIR}/sample-plugins/${d}
		85	@${INSTALL_DATA} ${WRKSRC}/sample-plugins/${d}/* ${EXAMPLESDIR}/sample-plugins/${d}/
85	@${RM} -rf ${WRKSRC}/contrib/${d}	86	@${RM} -rf ${WRKSRC}/contrib/${d}
86	. endfor	87	. endfor
87	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${EXAMPLESDIR}	88	@${INSTALL_DATA} ${WRKSRC}/sample-plugins/*.py ${EXAMPLESDIR}/sample-plugins/
88	@${MKDIR} ${DATADIR}/cgi-bin	89	@${MKDIR} ${DATADIR}/cgi-bin
89	@${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/* ${DATADIR}/cgi-bin	90	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/cgi-bin/* ${DATADIR}/cgi-bin
90	@${ECHO_CMD}	91	@${ECHO_CMD}
91	@${CAT} ${PKGMESSAGE}	92	@${CAT} ${PKGMESSAGE}
92	@${ECHO_CMD}	93	@${ECHO_CMD}

Lines 1-25 Link Here

(-)files/patch-trac__util__daemon.py (-25 lines)
1	Revert r10799 which breaks tracd startup
2
3	beta# /usr/local/etc/rc.d/tracd start
4	Starting tracd.
5	Error writing to pid file: IOError: [Errno 2] No such file or directory: '/var/db/trac/redports/tracd.pid'
6	/usr/local/etc/rc.d/tracd: WARNING: failed to start tracd
7
8	See: http://trac.edgewall.org/changeset/10799/
9	--- trac/util/daemon.py.orig 2012-02-06 21:53:52.000000000 +0100
10	+++ trac/util/daemon.py 2012-02-07 10:38:32.414621956 +0100
11	@@ -44,14 +44,6 @@
12	if e.errno != errno.ESRCH:
13	raise
14
15	- # The pid file must be writable
16	- try:
17	- fileobj = open(pidfile, 'r+')
18	- fileobj.close()
19	- except IOError, e:
20	- from trac.util.text import exception_to_unicode
21	- sys.exit('Error writing to pid file: %s' % exception_to_unicode(e))
22	-
23	# Perform first fork
24	pid = os.fork()
25	if pid > 0:

Lines 1-12 Link Here

(-)pkg-message (-4 / +4 lines)
1	*******************************************************************************	1	*******************************************************************************
2		2
3	From 0.11.x to 0.12.x	3	From 0.12.x to 1.0.x
4	---------------------	4	---------------------
5	You should be careful to check that the plugins you depend on have	5	You should be careful to check that the plugins you depend on have
6	been ported to 0.12, as they most probably won't work without adaptation	6	been ported to 1.0.1, as they most probably won't work without adaptation
7	due to the numerous internal changes that occurred during 0.12 development.	7	due to the numerous internal changes that occurred during 1.0.1 development.
8		8
9	See: http://trac.edgewall.org/wiki/TracDev/ApiChanges/0.12	9	See: http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0
10		10
11	Consult the upgrade instructions at:	11	Consult the upgrade instructions at:
12		12

Lines 1-31 Link Here

(-)pkg-plist (-16 / +26 lines)
1	bin/trac-admin
2	bin/tracd
3	%%DATADIR%%/cgi-bin/trac.cgi	1	%%DATADIR%%/cgi-bin/trac.cgi
4	%%DATADIR%%/cgi-bin/trac.fcgi	2	%%DATADIR%%/cgi-bin/trac.fcgi
5	@dirrm %%DATADIR%%/cgi-bin
6	@dirrm %%DATADIR%%
7	%%EXAMPLESDIR%%/rpm/installscript
8	%%EXAMPLESDIR%%/rpm/makerpm
9	%%EXAMPLESDIR%%/workflow/README
10	%%EXAMPLESDIR%%/workflow/enterprise-workflow.ini
11	%%EXAMPLESDIR%%/workflow/migrate_original_to_basic.py
12	%%EXAMPLESDIR%%/workflow/opensource-workflow.ini
13	%%EXAMPLESDIR%%/workflow/showworkflow
14	%%EXAMPLESDIR%%/workflow/simple-workflow.ini
15	%%EXAMPLESDIR%%/workflow/trivial-workflow.ini
16	%%EXAMPLESDIR%%/workflow/workflow_parser.py
17	%%EXAMPLESDIR%%/README	3	%%EXAMPLESDIR%%/README
18	%%EXAMPLESDIR%%/bugzilla2trac.py	4	%%EXAMPLESDIR%%/bugzilla2trac.py
19	%%EXAMPLESDIR%%/checkwiki.py	5	%%EXAMPLESDIR%%/checkwiki.py
20	%%EXAMPLESDIR%%/emailfilter.py	6	%%EXAMPLESDIR%%/emailfilter.py
21	%%EXAMPLESDIR%%/htdigest.py	7	%%EXAMPLESDIR%%/htdigest.py
22	%%EXAMPLESDIR%%/htpasswd.py	8	%%EXAMPLESDIR%%/htpasswd.py
		9	%%EXAMPLESDIR%%/l10n_diff_index.py
		10	%%EXAMPLESDIR%%/l10n_reset_en_GB.py
		11	%%EXAMPLESDIR%%/l10n_revert_lineno_conflicts.py
23	%%EXAMPLESDIR%%/migrateticketmodel.py	12	%%EXAMPLESDIR%%/migrateticketmodel.py
		13	%%EXAMPLESDIR%%/rpm/installscript
		14	%%EXAMPLESDIR%%/rpm/makerpm
		15	%%EXAMPLESDIR%%/sample-plugins/HelloWorld.py
		16	%%EXAMPLESDIR%%/sample-plugins/Timestamp.py
		17	%%EXAMPLESDIR%%/sample-plugins/milestone_to_version.py
		18	%%EXAMPLESDIR%%/sample-plugins/permissions/debug_perm.py
		19	%%EXAMPLESDIR%%/sample-plugins/permissions/public_wiki_policy.py
		20	%%EXAMPLESDIR%%/sample-plugins/permissions/vulnerability_tickets.py
		21	%%EXAMPLESDIR%%/sample-plugins/revision_links.py
		22	%%EXAMPLESDIR%%/sample-plugins/workflow/CodeReview.py
		23	%%EXAMPLESDIR%%/sample-plugins/workflow/DeleteTicket.py
		24	%%EXAMPLESDIR%%/sample-plugins/workflow/MilestoneOperation.py
		25	%%EXAMPLESDIR%%/sample-plugins/workflow/StatusFixer.py
		26	%%EXAMPLESDIR%%/sample-plugins/workflow/VoteOperation.py
		27	%%EXAMPLESDIR%%/sample-plugins/workflow/enterprise-review-workflow.ini
24	%%EXAMPLESDIR%%/sourceforge2trac.py	28	%%EXAMPLESDIR%%/sourceforge2trac.py
25	%%EXAMPLESDIR%%/trac-pre-commit-hook	29	%%EXAMPLESDIR%%/trac-pre-commit-hook
26	%%EXAMPLESDIR%%/trac-svn-hook	30	%%EXAMPLESDIR%%/trac-svn-hook
27	%%EXAMPLESDIR%%/trac-svn-post-commit-hook.cmd	31	%%EXAMPLESDIR%%/trac-svn-post-commit-hook.cmd
28	@dirrm %%EXAMPLESDIR%%/workflow	32	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
		33	bin/trac-admin
		34	bin/tracd
		35	@dirrm %%DATADIR%%/cgi-bin
		36	@dirrm %%DATADIR%%
		37	@dirrm %%EXAMPLESDIR%%/sample-plugins/workflow
		38	@dirrm %%EXAMPLESDIR%%/sample-plugins/permissions
		39	@dirrm %%EXAMPLESDIR%%/sample-plugins
29	@dirrm %%EXAMPLESDIR%%/rpm	40	@dirrm %%EXAMPLESDIR%%/rpm
30	@dirrm %%EXAMPLESDIR%%	41	@dirrm %%EXAMPLESDIR%%
31	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%