summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2007-07-31 20:53:00 +0200
committerTreeve Jelbert2007-07-31 20:53:00 +0200
commit70fbc1280bee6d0f0067913d5cb61a48b38afe50 (patch)
treec230df4b6e240db457a943385e2d07ade2b20c6e
parent30a7b38504f89d45593523161ec94fb4d5a98364 (diff)
parentccd8675a7ef5d7c589c3e7d3258a5cebc755a7c2 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xdoc/xpdf/DETAILS6
-rw-r--r--doc/xpdf/HISTORY4
-rwxr-xr-xdoc/xpdf/PRE_BUILD3
3 files changed, 11 insertions, 2 deletions
diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 54ad161047..78689d7e6e 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -1,11 +1,13 @@
SPELL=xpdf
VERSION=3.02
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=xpdf-${VERSION}pl1.patch
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/${SOURCE2}
WEB_SITE=http://www.foolabs.com/xpdf
-# SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e
+ SOURCE2_HASH=sha512:2ec6610ac5993c9d443b80311b7bec7a1bb3165f9f5b2f0ecb576c4b37470a07ed6a1e0c3e16ce9e3671492cb15cd4ffd1d5f05d6adaa11ef22f3343b40b6695
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
PATCHLEVEL=2
KEYWORDS="pdf doc"
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index b7bedbadde..6af60c2742 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,7 @@
+2007-07-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD: added security related patch, cf.
+ http://www.kde.org/info/security/advisory-20070730-1.txt
+
2007-03-30 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.02
Removed SOURCE2 (unneeded patch)
diff --git a/doc/xpdf/PRE_BUILD b/doc/xpdf/PRE_BUILD
new file mode 100755
index 0000000000..3d9ab6f12a
--- /dev/null
+++ b/doc/xpdf/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SOURCE_CACHE}/${SOURCE2}