sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (c4937fa93fc0d46ff07e3d31f10e9824faadb89f)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c4937fa93fc0d46ff07e3d31f10e9824faadb89f)
- Date: Thu, 22 Sep 2016 11:17:59 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
ChangeLog | 4 +++-
crypto/openssl/DETAILS | 4 ++--
crypto/openssl/HISTORY | 4 ++++
python-pypi/cherrypy/DEPENDS | 2 +-
python-pypi/cherrypy/DETAILS | 13 +++----------
python-pypi/cherrypy/HISTORY | 5 +++++
python-pypi/cherrypy/PREPARE | 1 -
python-pypi/python-cherrymusic/DEPENDS | 2 +-
python-pypi/python-cherrymusic/HISTORY | 3 +++
python-pypi/python-cherrypy/DEPENDS | 2 --
python-pypi/python-cherrypy/DETAILS | 15 ---------------
python-pypi/python-cherrypy/HISTORY | 3 ---
12 files changed, 22 insertions(+), 36 deletions(-)
New commits:
commit c4937fa93fc0d46ff07e3d31f10e9824faadb89f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/openssl: version 1.0.2i, security update
commit 655052019bcbc14ee37f67024c2ebc3fa07bd41c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/python-cherrypy: removed
commit eefefcf64a720a07b3470210a6a3c3a4e4cd3d39
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/python-cherrymusic: depend on cherrypy instead of
python-cherrypy
commit e5c08f7b0d4c1c305311b5ab3075e59ff1dffa91
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/cherrypy: version 8.1.0
diff --git a/ChangeLog b/ChangeLog
index 7b85cee..02a24ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
+2016-09-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python/python-cherrypy: removed
+
2016-09-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * python/python-cherrypy: new spell, an object-oriented web framework
* python/python-cherrymusic: new spell, a music streaming server
2016-09-19 Eric Sandall <sandalle AT sourcemage.org>
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index aed3cd3..9a210da 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,6 +1,6 @@
SPELL=openssl
- VERSION=1.0.2h
- SECURITY_PATCH=33
+ VERSION=1.0.2i
+ SECURITY_PATCH=34
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
SOURCE_URL[1]=ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/$SOURCE
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 5dd0a6f..1544973 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2016-01-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.2i, SECURITY_PATCH++. This fixes CVE-2016-2183,
+ CVE-2016-6303, CVE-2016-6302, CVE-2016-2182, CVE-2016-2180,
CVE-2016-2177,
+ CVE-2016-2178, CVE-2016-2179, CVE-2016-2181 and CVE-2016-6306
2016-05-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.2h, SECURITY_PATCH=33
diff --git a/python-pypi/cherrypy/DEPENDS b/python-pypi/cherrypy/DEPENDS
index ced7c27..8f9c9d6 100755
--- a/python-pypi/cherrypy/DEPENDS
+++ b/python-pypi/cherrypy/DEPENDS
@@ -1,4 +1,4 @@
-depends python &&
+. $SECTION_DIRECTORY/PY_DEPENDS &&
depends SETUPTOOLS &&
suggest_depends pyopenssl "" "" "for OpenSSL support" &&
diff --git a/python-pypi/cherrypy/DETAILS b/python-pypi/cherrypy/DETAILS
index 2da1db4..4614c82 100755
--- a/python-pypi/cherrypy/DETAILS
+++ b/python-pypi/cherrypy/DETAILS
@@ -1,16 +1,9 @@
SPELL=cherrypy
SPELLX=CherryPy
-if [[ $BRANCH == 3 ]]; then
- VERSION=3.8.2
+ VERSION=8.1.0
SOURCE=$SPELLX-$VERSION.tar.gz
- SOURCE_URL[0]=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:2b8fd9b0660d69040f1f6f69a97c000acf8ea11e1d5b7e8d49431d8e177baaabca4656519a3b5ce021ef6f49c9cf0f5e5b38ff93315f587c150f3f7311b1a1f2
-else
- VERSION=2.3.0
- SOURCE=$SPELLX-$VERSION.tar.gz
- SOURCE_URL[0]=http://download.cherrypy.org/cherrypy/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:71359ff92354abc7c2156d0f66e361c16b145180e04bb14c9bb2ebae474de6a3c8a3b266363dd6df370c21b559112cbe122fcdf08d68f03f755000bb8ca4eca8
-fi
+
SOURCE_URL[0]=https://pypi.python.org/packages/f8/74/4a17240440813c94d22d70837002dc1fce8d40a0daa762af4cf016265fce/${SOURCE}#md5=d981ad6bd9685a3ba16ea5b7a54fb01f
+
SOURCE_HASH=sha512:967374231337089bfa3f45ec1be9cf5b3f8b7040d78887a15aac298995218369ea6cb0127cac85af290aa45fe709e0e3c4e1a228b9559ba14054ac778ccca0fb
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.cherrypy.org/
LICENSE[0]=BSD
diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY
index 4bc8ac9..dca6f2e 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,8 @@
+2016-09-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.1.0
+ * DEPENDS: use section depends
+ * PREPARE: removed
+
2015-12-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.8.2 (3)
diff --git a/python-pypi/cherrypy/PREPARE b/python-pypi/cherrypy/PREPARE
deleted file mode 100755
index 6a3cb41..0000000
--- a/python-pypi/cherrypy/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list BRANCH "which branch?" 3 2
diff --git a/python-pypi/python-cherrymusic/DEPENDS
b/python-pypi/python-cherrymusic/DEPENDS
index a9f05a3..b4fb64f 100755
--- a/python-pypi/python-cherrymusic/DEPENDS
+++ b/python-pypi/python-cherrymusic/DEPENDS
@@ -1,6 +1,6 @@
depends python3 &&
depends SETUPTOOLS &&
-depends python-cherrypy &&
+depends cherrypy &&
depends imagemagick &&
depends vorbis-tools &&
depends lame &&
diff --git a/python-pypi/python-cherrymusic/HISTORY
b/python-pypi/python-cherrymusic/HISTORY
index 1ddc1e3..43391a6 100644
--- a/python-pypi/python-cherrymusic/HISTORY
+++ b/python-pypi/python-cherrymusic/HISTORY
@@ -1,3 +1,6 @@
+2016-09-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on cherrypy instead of python-cherrypy
+
2016-09-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/python-pypi/python-cherrypy/DEPENDS
b/python-pypi/python-cherrypy/DEPENDS
deleted file mode 100755
index 0fec1c5..0000000
--- a/python-pypi/python-cherrypy/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-. $SECTION_DIRECTORY/PY_DEPENDS &&
-depends SETUPTOOLS
diff --git a/python-pypi/python-cherrypy/DETAILS
b/python-pypi/python-cherrypy/DETAILS
deleted file mode 100755
index 9381daa..0000000
--- a/python-pypi/python-cherrypy/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=python-cherrypy
- VERSION=8.1.0
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://pypi.python.org/packages/f8/74/4a17240440813c94d22d70837002dc1fce8d40a0daa762af4cf016265fce/CherryPy-${VERSION}.tar.gz#md5=d981ad6bd9685a3ba16ea5b7a54fb01f
-
SOURCE_HASH=sha512:967374231337089bfa3f45ec1be9cf5b3f8b7040d78887a15aac298995218369ea6cb0127cac85af290aa45fe709e0e3c4e1a228b9559ba14054ac778ccca0fb
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/CherryPy-${VERSION}"
- WEB_SITE="http://www.cherrypy.org"
- LICENSE[0]=BSD
- ENTERED=20160920
- SHORT="a pythonic, object-oriented web framework"
-cat << EOF
-CherryPy allows developers to build web applications in much the same way
-they would build any other object-oriented Python program. This results in
-smaller source code developed in less time.
-EOF
diff --git a/python-pypi/python-cherrypy/HISTORY
b/python-pypi/python-cherrypy/HISTORY
deleted file mode 100644
index 1ddc1e3..0000000
--- a/python-pypi/python-cherrypy/HISTORY
+++ /dev/null
@@ -1,3 +0,0 @@
-2016-09-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS, DETAILS: spell created
-
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c4937fa93fc0d46ff07e3d31f10e9824faadb89f), Florian Franzmann, 09/22/2016
Archive powered by MHonArc 2.6.24.