Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Aug 2014 20:23:11 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r365594 - in branches/2014Q3/www: py-django py-django-devel py-django14 py-django15
Message-ID:  <201408212023.s7LKNB7X068704@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Aug 21 20:23:11 2014
New Revision: 365594
URL: http://svnweb.freebsd.org/changeset/ports/365594
QAT: https://qat.redports.org/buildarchive/r365594/

Log:
  MFH: r365572
  
  Update all Django ports to new security releases
  
  On August 20, the Django team issued new security releases addressing
  multiple vulnerabilities [1]. Update all of our Django ports accordingly:
  
  - www/py-django: Update to 1.6.6
  - www/py-django14: Update to 1.4.14
  - www/py-django15: Update to 1.5.9
  - www/py-django-devel: Update to 1.7 release candidate 3
  
  While I'm here:
  
  - Switch to USES=python and USE_PYTHON=<features>
  - Deprecate OPTIONSFILE
  - Add CPE information
  - Add LICENSE_FILE
  - Tweak HTMLDOCS option description
  
  And for www/py-django-devel:
  
  - Switch to GITHUB for distribution files
  
  [1] https://www.djangoproject.com/weblog/2014/aug/20/security/
  
  Approved by:	lwhsu (maintainer)
  Security:	3c5579f7-294a-11e4-99f6-00e0814cab4e

Modified:
  branches/2014Q3/www/py-django-devel/Makefile
  branches/2014Q3/www/py-django-devel/distinfo
  branches/2014Q3/www/py-django/Makefile
  branches/2014Q3/www/py-django/distinfo
  branches/2014Q3/www/py-django14/Makefile
  branches/2014Q3/www/py-django14/distinfo
  branches/2014Q3/www/py-django15/Makefile
  branches/2014Q3/www/py-django15/distinfo
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/www/py-django-devel/Makefile
==============================================================================
--- branches/2014Q3/www/py-django-devel/Makefile	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django-devel/Makefile	Thu Aug 21 20:23:11 2014	(r365594)
@@ -4,8 +4,6 @@ PORTNAME=	django
 PORTVERSION=	${SNAPSHOTDATE}
 PORTEPOCH=	1
 CATEGORIES=	www python
-MASTER_SITES=	http://people.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
-MASTER_SITE_SUBDIR=	lwhsu/django
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	Django-${SNAPSHOTDATE}
@@ -16,25 +14,29 @@ COMMENT=	High-level Python Web framework
 
 LICENSE=	BSD3CLAUSE
 
-SNAPSHOTDATE=	20140423
+SNAPSHOTDATE=	20140821
 
-USES=		gettext tar:xz
+USES=		cpe gettext
+USE_GITHUB=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGVERSION=	1.7
 
+GH_ACCOUNT=	${PORTNAME}
+GH_TAGNAME=	ad96254
+GH_COMMIT=	${GH_TAGNAME}
+
 CONFLICTS=	py2[0-9]-django-[0-9]*
+CPE_VENDOR=	djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}-devel/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
-HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
+HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/django-admin.1.gz \
 		man/man1/gather_profile_stats.1.gz

Modified: branches/2014Q3/www/py-django-devel/distinfo
==============================================================================
--- branches/2014Q3/www/py-django-devel/distinfo	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django-devel/distinfo	Thu Aug 21 20:23:11 2014	(r365594)
@@ -1,2 +1,2 @@
-SHA256 (python/Django-20140423.tar.xz) = d40b8d98cac40d40844c552953aa7a6d1faba10b21aebffd765684d54f85cc29
-SIZE (python/Django-20140423.tar.xz) = 4540492
+SHA256 (python/Django-20140821.tar.gz) = c93f6e71e46480f8fe63b015717f784d3f06bbfa7149f4677b67c608efec00ad
+SIZE (python/Django-20140821.tar.gz) = 7536234

Modified: branches/2014Q3/www/py-django/Makefile
==============================================================================
--- branches/2014Q3/www/py-django/Makefile	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django/Makefile	Thu Aug 21 20:23:11 2014	(r365594)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django
-PORTVERSION=	1.6.5
+PORTVERSION=	1.6.6
 CATEGORIES=	www python
 MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION}/ \
 		CHEESESHOP
@@ -14,22 +14,24 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High-level Python Web framework
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		cpe
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
+CPE_VENDOR=	djangoproject
+
 CONFLICTS=	py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].*
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
-HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
+HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/daily_cleanup.1.gz \
 		man/man1/django-admin.1.gz \

Modified: branches/2014Q3/www/py-django/distinfo
==============================================================================
--- branches/2014Q3/www/py-django/distinfo	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django/distinfo	Thu Aug 21 20:23:11 2014	(r365594)
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.6.5.tar.gz) = 36940268c087fede32d3f5887cce9af9e5d27962a0c405aacafc2a3cc1f755c5
-SIZE (python/Django-1.6.5.tar.gz) = 6633768
+SHA256 (python/Django-1.6.6.tar.gz) = 536cbd54e533ba3563d205f0c91988b24e7d74b8b253d7825e42214b50ba7e90
+SIZE (python/Django-1.6.6.tar.gz) = 6645456

Modified: branches/2014Q3/www/py-django14/Makefile
==============================================================================
--- branches/2014Q3/www/py-django14/Makefile	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django14/Makefile	Thu Aug 21 20:23:11 2014	(r365594)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django
-PORTVERSION=	1.4.13
+PORTVERSION=	1.4.14
 CATEGORIES=	www python
 MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
@@ -15,22 +15,23 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High-level Python Web framework
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		cpe
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
 CONFLICTS=	py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-35-9].*
+CPE_VENDOR=	djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
-HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
+HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/daily_cleanup.1.gz \
 		man/man1/django-admin.1.gz \

Modified: branches/2014Q3/www/py-django14/distinfo
==============================================================================
--- branches/2014Q3/www/py-django14/distinfo	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django14/distinfo	Thu Aug 21 20:23:11 2014	(r365594)
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.4.13.tar.gz) = a8fede657378b6862744b19012e7071279b952ecd208fd83227723866068f2c0
-SIZE (python/Django-1.4.13.tar.gz) = 7753532
+SHA256 (python/Django-1.4.14.tar.gz) = 81edad81211fd515677a35ab2d40833557649dd650f150baf8416f416b8a6c9c
+SIZE (python/Django-1.4.14.tar.gz) = 7754876

Modified: branches/2014Q3/www/py-django15/Makefile
==============================================================================
--- branches/2014Q3/www/py-django15/Makefile	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django15/Makefile	Thu Aug 21 20:23:11 2014	(r365594)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django
-PORTVERSION=	1.5.8
+PORTVERSION=	1.5.9
 CATEGORIES=	www python
 MASTER_SITES=	https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
@@ -15,22 +15,23 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	High-level Python Web framework
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		cpe
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
 CONFLICTS=	py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-46-9].*
+CPE_VENDOR=	djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	FASTCGI HTMLDOCS
 OPTIONS_DEFAULT=SQLITE
 OPTIONS_GROUP=	DATABASE
 OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
-HTMLDOCS_DESC=	Install the HTML documentation (requires Sphinx)
+HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 PLIST_FILES=	man/man1/daily_cleanup.1.gz \
 		man/man1/django-admin.1.gz \

Modified: branches/2014Q3/www/py-django15/distinfo
==============================================================================
--- branches/2014Q3/www/py-django15/distinfo	Thu Aug 21 20:00:11 2014	(r365593)
+++ branches/2014Q3/www/py-django15/distinfo	Thu Aug 21 20:23:11 2014	(r365594)
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.5.8.tar.gz) = 01db30f38a081241a9cbc7bef12cb599506b80727613350e427547bed12aaaa3
-SIZE (python/Django-1.5.8.tar.gz) = 8071329
+SHA256 (python/Django-1.5.9.tar.gz) = 47ce505c5046c38817828bee253b7256872f86c4340db1af698cb8548dbaa0d2
+SIZE (python/Django-1.5.9.tar.gz) = 8074400



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408212023.s7LKNB7X068704>