sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e71b5018a98567b88d4ea562f36127fb2e8978a3)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e71b5018a98567b88d4ea562f36127fb2e8978a3)
- Date: Tue, 30 Jun 2009 11:16:23 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
devel/cvs/DETAILS | 8 +++----
devel/cvs/HISTORY | 3 ++
disk/ddrescue/DETAILS | 2 -
disk/ddrescue/HISTORY | 3 ++
graphics-libs/jasper/DETAILS | 1
graphics-libs/jasper/HISTORY | 12 +++++++++++
graphics-libs/jasper/PRE_BUILD | 3 --
graphics-libs/jasper/jasper-memory-leak.patch | 28
--------------------------
graphics-libs/jasper/ubuntu.diff.bz2 |binary
9 files changed, 25 insertions(+), 35 deletions(-)
New commits:
commit bc4e3f3eba87610317f565e9ab98add9fc686a45
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
jasper - fix bug #15275
commit 942b93f57d69c723789bdf2420da12d39c28614c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
ddrescue - use GNU_URL for downloads
commit 0899a89c000a8ffee560ad001b978b749bae1379
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cvs - use GNU_URL for downloads
diff --git a/devel/cvs/DETAILS b/devel/cvs/DETAILS
index 8df5e0b..bd7c1f4 100755
--- a/devel/cvs/DETAILS
+++ b/devel/cvs/DETAILS
@@ -3,14 +3,14 @@ if [ "$CVS_FEATURES" == "y" ]; then
VERSION=1.12.13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SPELL-$VERSION.tar.bz2.sig
-
SOURCE_URL=http://ftp.gnu.org/non-gnu/cvs/source/feature/$VERSION/$SOURCE
-
SOURCE2_URL=http://ftp.gnu.org/non-gnu/cvs/source/feature/$VERSION/$SOURCE2
+ SOURCE_URL=$GNU_URL/non-gnu/cvs/source/feature/$VERSION/$SOURCE
+ SOURCE2_URL=$GNU_URL/non-gnu/cvs/source/feature/$VERSION/$SOURCE2
else
VERSION=1.11.23
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SPELL-$VERSION.tar.bz2.sig
-
SOURCE_URL=http://ftp.gnu.org/non-gnu/cvs/source/stable/$VERSION/$SOURCE
-
SOURCE2_URL=http://ftp.gnu.org/non-gnu/cvs/source/stable/$VERSION/$SOURCE2
+ SOURCE_URL=$GNU_URL/non-gnu/cvs/source/stable/$VERSION/$SOURCE
+ SOURCE2_URL=$GNU_URL/non-gnu/cvs/source/stable/$VERSION/$SOURCE2
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_IGNORE=signature
diff --git a/devel/cvs/HISTORY b/devel/cvs/HISTORY
index f1aaac7..82ef6dd 100644
--- a/devel/cvs/HISTORY
+++ b/devel/cvs/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: use GNU_URL for downloads, much faster
+
2009-01-18 George Sherwood <gsherwood AT sourcemage.org>
* POST_REMOVE: Deleted
* PRE_REMOVE: Added to properly delete info file from dir
diff --git a/disk/ddrescue/DETAILS b/disk/ddrescue/DETAILS
index fbd8894..538e930 100755
--- a/disk/ddrescue/DETAILS
+++ b/disk/ddrescue/DETAILS
@@ -3,7 +3,7 @@
SOURCE_HASH=sha512:bc05df9b71f3890bef5e22c42bed418831d3c1e52ee08662d9209f17093c9d74816c6b147aed63ebedfb5a31c8e269127ad0443d4c5965bda591185f25bac989
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
- SOURCE_URL[1]=http://ftp.gnu.org/gnu/$SPELL/$SOURCE
+ SOURCE_URL[1]=$GNU_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://www.gnu.org/software/ddrescue/ddrescue.html
LICENSE[0]=GPL
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index 63797aa..70e22c6 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,6 @@
+2009-06-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: use generic GNU_URL
+
2009-06-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.11-rc3
diff --git a/graphics-libs/jasper/DETAILS b/graphics-libs/jasper/DETAILS
index 05f9910..7606832 100755
--- a/graphics-libs/jasper/DETAILS
+++ b/graphics-libs/jasper/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ece.uvic.ca/~mdadams/jasper/
LICENSE[0]=http://www.ece.uvic.ca/~mdadams/jasper/LICENSE
ENTERED=20040118
+ SECURITY_PATCH=1
KEYWORDS="images graphics libs"
SHORT="A JPEG-2000 library."
cat << EOF
diff --git a/graphics-libs/jasper/HISTORY b/graphics-libs/jasper/HISTORY
index 0f1a451..672970d 100644
--- a/graphics-libs/jasper/HISTORY
+++ b/graphics-libs/jasper/HISTORY
@@ -1,3 +1,15 @@
+2009-06-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1
+ * PRE_BUILD: apply ubuntu patch
+ * jasper-memory-leak.patch: deleted, already in ubuntu patch
+ * ubuntu.diff.bz2: added, derived from file at
+ <https://launchpad.net/ubuntu/karmic/+source/jasper/1.900.1-6>
+ multiple security patches
+ CVE-2008-3522[0]: Buffer overflow.
+ CVE-2008-3521[1]: unsecure temporary files handling.
+ CVE-2008-3520[2]: Multiple integer overflows.
+ fixes bug #15275
+
2008-07-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: removed STAGED_INSTALL=off; works fine
diff --git a/graphics-libs/jasper/PRE_BUILD b/graphics-libs/jasper/PRE_BUILD
index 3e2758f..cd614db 100755
--- a/graphics-libs/jasper/PRE_BUILD
+++ b/graphics-libs/jasper/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SCRIPT_DIRECTORY/jasper-memory-leak.patch"
+bzcat $SCRIPT_DIRECTORY/ubuntu.diff.bz2 | patch -p1
diff --git a/graphics-libs/jasper/jasper-memory-leak.patch
b/graphics-libs/jasper/jasper-memory-leak.patch
deleted file mode 100644
index a37977b..0000000
--- a/graphics-libs/jasper/jasper-memory-leak.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur jasper-1.700.2/src/libjasper/base/jas_stream.c
jasper-1.700.2-local/src/libjasper/base/jas_stream.c
---- jasper-1.700.2/src/libjasper/base/jas_stream.c Sun Feb 9 10:27:29
2003
-+++ jasper-1.700.2-local/src/libjasper/base/jas_stream.c Tue Jun 17
23:06:57 2003
-@@ -408,11 +408,11 @@
- }
- obj->fd = -1;
- obj->flags = 0;
-- obj->pathname[0] = '\0';
-+ strncpy(obj->pathname, "jasXXXXXX", sizeof(obj->pathname));
- stream->obj_ = obj;
-
- /* Choose a file name. */
-- tmpnam(obj->pathname);
-+ mkstemp(obj->pathname);
-
- /* Open the underlying file. */
- if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR |
O_TRUNC | O_BINARY,
-diff -ur jasper-1.700.2/src/libjasper/jpg/jpg_enc.c
jasper-1.700.2-local/src/libjasper/jpg/jpg_enc.c
---- jasper-1.700.2/src/libjasper/jpg/jpg_enc.c Sun Feb 9 11:38:25 2003
-+++ jasper-1.700.2-local/src/libjasper/jpg/jpg_enc.c Tue Jun 17 22:46:16
2003
-@@ -380,6 +380,7 @@
- rewind(output_file);
- jpg_copyfiletostream(out, output_file);
- fclose(output_file);
-+ jas_matrix_destroy(src_mgr->data);
- output_file = 0;
-
- return 0;
diff --git a/graphics-libs/jasper/ubuntu.diff.bz2
b/graphics-libs/jasper/ubuntu.diff.bz2
new file mode 100644
index 0000000..ab491b7
Binary files /dev/null and b/graphics-libs/jasper/ubuntu.diff.bz2 differ
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e71b5018a98567b88d4ea562f36127fb2e8978a3), Treeve Jelbert, 06/30/2009
Archive powered by MHonArc 2.6.24.