Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ae43cf22c4eb46d05d769908fba42f1897f9cc88)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ae43cf22c4eb46d05d769908fba42f1897f9cc88)
  • Date: Fri, 30 Mar 2007 15:27:47 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
disk/cdrtools/DETAILS | 10 +--
disk/cdrtools/HISTORY | 3 +
disk/cdrtools/cdrtools-2.01.01a22.tar.bz2.sig | 0
disk/cdrtools/cdrtools-2.01.01a24.tar.bz2.sig |binary
doc/xpdf/BUILD | 1
doc/xpdf/DETAILS | 18 ++----
doc/xpdf/HISTORY | 9 +++
doc/xpdf/PRE_BUILD | 4 -
doc/xpdf/xpdf-3.01-noftinternals.patch | 78
--------------------------
doc/xpdf/xpdf-3.02.tar.gz.sig |binary
11 files changed, 25 insertions(+), 98 deletions(-)

New commits:
commit ae43cf22c4eb46d05d769908fba42f1897f9cc88
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xpdf: Updated to 3.02 and SECURITY_PATCH=2

commit a4c0819c0ff8a0973c370b08d9146a3deb8d5d71
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cdrtools: Updated to 2.01.01a24
Removed old 2.01.01a22 signature

diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS
index 8de6be9..12a6a1c 100755
--- a/disk/cdrtools/DETAILS
+++ b/disk/cdrtools/DETAILS
@@ -1,15 +1,15 @@
SPELL=cdrtools
- VERSION=2.01.01a23
-
SOURCE_HASH=sha512:2d1a52c6d9e6fa751ce1e16f0fd30bece0e57c0b7148988da3f1c05dcd2a69d7f6f9f9a7880a92320f51e4b84dddeced03cd28ce3f27478ccc6c2853db98d786
+ VERSION=2.01.01a24
ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*}
SOURCE_URL[0]=ftp://ftp.berlios.de/pub/cdrecord/${ALPHA:+alpha/}${SOURCE}
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
- WEB_SITE=http://cdrecord.berlios.de/old/private/cdrecord.html
- ENTERED=20010922
+#
SOURCE_HASH=sha512:2d1a52c6d9e6fa751ce1e16f0fd30bece0e57c0b7148988da3f1c05dcd2a69d7f6f9f9a7880a92320f51e4b84dddeced03cd28ce3f27478ccc6c2853db98d786
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
KEYWORDS="disk"
+ WEB_SITE=http://cdrecord.berlios.de/old/private/cdrecord.html
+ ENTERED=20010922
SHORT="Create home-burned CDs with a CD-R/CD-RW recorder"
cat << EOF
cdrtools, formerly Cdrecord creates home-burned CDs with a CD-R/CD-RW
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index cee7591..75cd5a3 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,6 @@
+2007-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.01.01a24
+
2007-03-18 Thomas Orgis <sobukus AT sourcemage.org>
* INSTALL: create bin group/user which is used by make install

diff --git a/disk/cdrtools/cdrtools-2.01.01a22.tar.bz2.sig
b/disk/cdrtools/cdrtools-2.01.01a22.tar.bz2.sig
deleted file mode 100644
index e1ed1b6..0000000
Binary files a/disk/cdrtools/cdrtools-2.01.01a22.tar.bz2.sig and /dev/null
differ
diff --git a/disk/cdrtools/cdrtools-2.01.01a24.tar.bz2.sig
b/disk/cdrtools/cdrtools-2.01.01a24.tar.bz2.sig
new file mode 100644
index 0000000..e290086
Binary files /dev/null and b/disk/cdrtools/cdrtools-2.01.01a24.tar.bz2.sig
differ
diff --git a/doc/xpdf/BUILD b/doc/xpdf/BUILD
index b5b4a7a..e59d6b5 100755
--- a/doc/xpdf/BUILD
+++ b/doc/xpdf/BUILD
@@ -3,5 +3,4 @@ CXXFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
OPTS="$OPTS --enable-multithreaded $A4_PAPER"

-patch -p1 < $SOURCE_CACHE/$SOURCE2 &&
default_build
diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 3efb31b..54ad161 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -1,18 +1,16 @@
SPELL=xpdf
- VERSION=3.01pl2
- SECURITY_PATCH=1
- SOURCE=$SPELL-3.01.tar.gz
- SOURCE2=$SPELL-$VERSION.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-3.01
+ VERSION=3.02
+ SECURITY_PATCH=2
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/$SOURCE
- SOURCE2_URL[1]=ftp://ftp.foolabs.com/pub/xpdf/$SOURCE2
WEB_SITE=http://www.foolabs.com/xpdf
-
SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e
-
SOURCE2_HASH=sha512:a6752adc588168562ddcfe5c1de9ef0ce4a196622ccf8825f2e69f5ecc5df2c6a401a9fd21f7119b9062fdcd489cd9cc9e26dde633152c9356f966ab9b8316ef
- ENTERED=20010923
+#
SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
PATCHLEVEL=2
- LICENSE=GPL
KEYWORDS="pdf doc"
+ ENTERED=20010923
+ LICENSE=GPL
SHORT="xpdf: a PDF viewer for X11R6."
cat << EOF
Xpdf is a viewer for Portable Document Format (PDF) files. It also
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index acf8479..a986237 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,12 @@
+2007-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.02
+ Removed SOURCE2 (unneeded patch)
+ SECURITY_PATCH=2: Fixed security holes (bounds checking issues) in
+ several places.
+ * PRE_BUILD: Removed, no more patches to apply
+ * BUILD: No longer apply patch that was SOURCE2
+ * xpdf-3.01-noftinternals.patch: Removed, no longer needed
+
2006-11-12 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated PATCH_LEVEL
* PRE_BUILD: Added patch
diff --git a/doc/xpdf/PRE_BUILD b/doc/xpdf/PRE_BUILD
deleted file mode 100755
index 31b01a9..0000000
--- a/doc/xpdf/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-unpack_file 2 &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/xpdf-3.01-noftinternals.patch
diff --git a/doc/xpdf/xpdf-3.01-noftinternals.patch
b/doc/xpdf/xpdf-3.01-noftinternals.patch
deleted file mode 100644
index 29a65b2..0000000
--- a/doc/xpdf/xpdf-3.01-noftinternals.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN splash/SplashFTFont.cc splash/SplashFTFont.cc
---- splash/SplashFTFont.cc 2005-12-23 16:57:18.076514614 +0100
-+++ splash/SplashFTFont.cc 2005-12-23 17:33:42.731318339 +0100
-@@ -14,7 +14,8 @@
-
- #include <ft2build.h>
- #include FT_OUTLINE_H
--#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
-+#include FT_SIZES_H // needed for FT_New_Size decl
-+#include FT_GLYPH_H
- #include "gmem.h"
- #include "SplashMath.h"
- #include "SplashGlyphBitmap.h"
-@@ -25,11 +26,12 @@
-
- //------------------------------------------------------------------------
-
--static int glyphPathMoveTo(FT_Vector *pt, void *path);
--static int glyphPathLineTo(FT_Vector *pt, void *path);
--static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
--static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
-- FT_Vector *pt, void *path);
-+static int glyphPathMoveTo( const FT_Vector *pt, void *path);
-+static int glyphPathLineTo( const FT_Vector *pt, void *path);
-+static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
-+ void* path );
-+static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
-+ const FT_Vector *pt, void *path);
-
- //------------------------------------------------------------------------
- // SplashFTFont
-@@ -210,7 +212,7 @@
- };
-
- SplashPath *SplashFTFont::getGlyphPath(int c) {
-- static FT_Outline_Funcs outlineFuncs = {
-+ static const FT_Outline_Funcs outlineFuncs = {
- &glyphPathMoveTo,
- &glyphPathLineTo,
- &glyphPathConicTo,
-@@ -249,7 +251,7 @@
- return path.path;
- }
-
--static int glyphPathMoveTo(FT_Vector *pt, void *path) {
-+static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
- SplashFTFontPath *p = (SplashFTFontPath *)path;
-
- if (p->needClose) {
-@@ -260,7 +262,7 @@
- return 0;
- }
-
--static int glyphPathLineTo(FT_Vector *pt, void *path) {
-+static int glyphPathLineTo(const FT_Vector *pt, void *path) {
- SplashFTFontPath *p = (SplashFTFontPath *)path;
-
- p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
-@@ -268,7 +270,7 @@
- return 0;
- }
-
--static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
-+static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt,
void *path) {
- SplashFTFontPath *p = (SplashFTFontPath *)path;
- SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
-
-@@ -306,8 +308,8 @@
- return 0;
- }
-
--static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
-- FT_Vector *pt, void *path) {
-+static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
-+ const FT_Vector *pt, void *path) {
- SplashFTFontPath *p = (SplashFTFontPath *)path;
-
- p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,
diff --git a/doc/xpdf/xpdf-3.02.tar.gz.sig b/doc/xpdf/xpdf-3.02.tar.gz.sig
new file mode 100644
index 0000000..3b80f36
Binary files /dev/null and b/doc/xpdf/xpdf-3.02.tar.gz.sig differ




Archive powered by MHonArc 2.6.24.

Top of Page