sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (83ae721638736f21384f94f87d877480cc0ac750)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (83ae721638736f21384f94f87d877480cc0ac750)
- Date: Wed, 23 Dec 2015 14:36:04 +0000
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
dev/null |binary
devel/git/DETAILS | 11 ++----
devel/git/HISTORY | 45 +++++++++++++++++++++++++
devel/gitk/DEPENDS | 2 -
devel/gitk/DETAILS | 33 +++---------------
devel/gitk/DOWNLOAD | 1
devel/gitk/HISTORY | 5 ++
devel/gitk/INSTALL | 2 -
devel/gitk/PRE_BUILD | 1
devel/gitk/UP_TRIGGERS | 2 +
disk/mtpfs/DETAILS | 6 +--
disk/mtpfs/HISTORY | 3 +
graphics-libs/freetype2/DEPENDS | 17 +++++++--
graphics-libs/freetype2/HISTORY | 4 ++
graphics-libs/harfbuzz/DEPENDS | 28 +++++++++++++--
graphics-libs/harfbuzz/HISTORY | 5 ++
libs/glibc/DETAILS | 63
++++++++++++++++++++---------------
libs/glibc/HISTORY | 3 +
libs/glibc/PREPARE | 4 +-
libs/glibc/PRE_BUILD | 12 +++---
net/proxychains-ng/DETAILS | 5 +-
net/proxychains-ng/HISTORY | 3 +
utils/kbd/DEPENDS | 7 ++-
utils/kbd/HISTORY | 4 ++
utils/kbd/PRE_BUILD | 5 ++
utils/kbd/kbd-2.0.0-tests.patch | 31 +++++++++++++++++
x11-toolkits/qt4/CVE-2014-0190.patch | 32 -----------------
x11-toolkits/qt4/DETAILS | 6 +--
x11-toolkits/qt4/HISTORY | 8 ++++
x11-toolkits/qt4/PRE_BUILD | 2 -
30 files changed, 230 insertions(+), 120 deletions(-)
New commits:
commit 83ae721638736f21384f94f87d877480cc0ac750
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
harfbuzz: fixed dependencies
(cherry picked from commit 5cd7b58bd60bfa64937184925c7a84fe39efdcb8)
Conflicts:
graphics-libs/harfbuzz/HISTORY
commit fb88b7471e0bf787df84f234a66865ac5e3d1b72
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
freetype2: fixed dependencies
(cherry picked from commit d5b6aee657bc3bb8e696b6bc5ebed6db309c013f)
Conflicts:
graphics-libs/freetype2/HISTORY
commit 04f0c4c2ea8c508b92f0706d64478ca8576e8db6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
proxychains-ng: => 4.9 [security]
(cherry picked from commit 3113d974da76d52a94dee0f106bf87186fe8d855)
Conflicts:
net/proxychains-ng/DETAILS
net/proxychains-ng/HISTORY
commit 655eceaba7cfd46d76eabd28894ea74c12de7dc8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
qt4 4.8.7, SECURITY_PATCH=7
(cherry picked from commit 2282d2508462a4ab5fcc365e1afae95a04b8ab45)
commit 851990aa69f9adaf9ad27e69d0b7e89aea170021
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
x11-toolkits/qt4: fix build with gcc 5
(cherry picked from commit 7c0ea5f0c40e2b026799e9ea3911e7c444932652)
commit 0032b1ca70d6ea3a871e4b412c1b40903f47d062
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
kbd: make check dependency optional
(cherry picked from commit c695505fb03286fa0f9c8b982ad8b3312383c941)
commit 1f5f829754294faa781ccef5d1a66a01b6012085
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
glibc: support kernel headers 4.x
(cherry picked from commit f6353fc305dab7815e7754f3e212d1b203e43223)
commit afb084c710c8d2e4115dfe8693ce93001bda3029
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gitk: spell deprecated, part of git since long ago
(cherry picked from commit 11d90f8b1c1b2a987429dd6391a90ad42abc29a0)
commit a7d293c25d8aaf86af7e00f3a01318ef165f915b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git: => 2.6.1 [security]
(cherry picked from commit 1bbffd37f28fddd2bb15ba6bc8330f745ca76350)
commit 9fff7dcae92de8da445b8843f5991e7678fe2d0d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git 2.6.0
(cherry picked from commit 82e7dd7996e287fceb910a6fa84fd1e23a03fc6c)
commit 70c22088c7b302f86c79bceda582d1d2a186b193
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: version 2.5.2
(cherry picked from commit 29c33c33561b746438fc5b30ce24a6edb644fe70)
commit 16f3245537341e44dc234964910b8c3b0298476b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git: => 2.5.0
(cherry picked from commit cc7e0348a0b7db808641a93eb3f464e472a48767)
commit bb684c5ea9d4021f66ceeaebb8a947292e913970
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git 2.4.6
(cherry picked from commit 8ff1ee81155fce126d956fa14bc552ddcbb39708)
commit 36072bf8d84045109bf2abd0aef64f92c9406757
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git 2.4.5
(cherry picked from commit 02b050c20656b36be90638b8de0cc7fc4cca8655)
commit b8e89159e1208a8e7167066a3b40124140113b31
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git 2.4.4
(cherry picked from commit f9f7037fce0c8bd0362565513227b257e46324d9)
commit 7eb433f4f867702b8fb8a42d0ec53e7c1c7ecdc6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git 2.4.3
(cherry picked from commit f336745104b99bf722f53d85ff1a10f5d84620f7)
commit 9dfa92f056872e8e6e1a60e1cb6c41987141b208
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: fix hash of html docs
(cherry picked from commit 5b142380e3df2967304fc94836820cb9dca77dd8)
commit 091b9d4a95645a33504af41f7dad0730b09198be
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
git 2.4.1
(cherry picked from commit 9eb8186cd6b51ac3ca081975c0e43496392ebd7d)
commit 0741cff8f4aa40c27a349ab88c7a631d0bfb4bb6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: version 2.4.0
(cherry picked from commit d5686d07dec3ddc41738c04ea048edf4f264e733)
commit 7a4b01d55dca3c4fcdd0eef9d13cd02f04fcdd72
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: version 2.3.5
(cherry picked from commit ded146ff18eeb20aa06d225f9a4aa264da4e347b)
commit 9fa3a921866b2d3eb358737eb4cdeef834ba1c75
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: version 2.3.4
(cherry picked from commit 93e69fcb1a7ea08bed6d0dc4da8766701a04d962)
commit 198b71f580d75798a9dd117c8959180effcbfc88
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: version 2.3.3
(cherry picked from commit 13ee01b9dd6a5fc378af55477ec2223e4de182c1)
Conflicts:
devel/git/HISTORY
commit 00c48cee914783f7720f15e7b9b645d22ba9fcca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
devel/git: version 2.3.2
(cherry picked from commit cfc5f53e4679e57da2fad14972b5c3b75033a2d7)
Conflicts:
devel/git/HISTORY
commit f62fe2012e3fc4879e35324f539cc3ae997cd306
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mtpfs: bump to 1.1 (old source gone)
(cherry picked from commit 2ff7819857dfd3235e5ba07cd283c0dfa9007d7b)
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index f9a4af7..8c78074 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,8 +1,7 @@
SPELL=git
- VERSION=2.3.0
-
SOURCE_HASH=sha512:4be85d3ba3ffac6c55cce648ab6c0a6fe89164e9657480aeee0def79289dbcba486722756b1729d0cedda6012cd582b88129d483ce916bfe06cde5a423f05bc7
- SECURITY_PATCH=2
- PATCHLEVEL=1
+ VERSION=2.6.1
+
SOURCE_HASH=sha512:55516aeaa73baf180135a0812bfcb35e26699db034688049a11b4ec98faa6c23582e78a1a72a87332116bb88a2d7e9565ccc7891de883b82ad7524ee2809a25e
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
@@ -13,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.xz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:aa54b9fd96831a690848ef6df708d45999f03bc45aab3600bf578c998bbb225f54a8999ee5012996cb9d6f28d0d18c97209329cfba557b86d3dd0da7a23b1c1b
+
SOURCE3_HASH=sha512:513a0692ef2b7db12c8eddcd69e6cb465d39138a5d7a6703458f262c8623fdf6324da64f434fef6f1bb7cf3705c9e17ed4555394a609aa4f8ae24c205dadc3a6
SOURCE3_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -22,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.xz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:c4d226784d89469c8faa72f29ab87594682ba46b1887769e29f87ce0db1ac241c9568a8b1530e6d28d43a9861acf803f93dddcc1db59cbe97e21d7b9e374c565
+
SOURCE5_HASH=sha512:da0500da633deb185c59c45296ca9ffa631f0e1fc2e8bb5163b4c1913cc21610dc723aa415706e7433246b2604fa2e84222a25f97987f55a9d544d9c2ddac300
SOURCE5_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 5363759..12230d6 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,7 +1,52 @@
+2015-10-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.1; SECURITY_PATCH++
+
+2015-10-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6.0
+
+2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.2
+
+2015-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.0
+
+2015-07-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.6
+
+2015-06-25 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.5
+
+2015-06-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.4
+
+2015-06-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.3
+
+2015-05-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix hash of html docs
+
+2015-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.1
+
+2015-05-01 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.0
+
+2015-04-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.5
+
+2015-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.4
+
2015-03-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: re-enabled staged install; PATCHLEVEL=1
* INSTALL: do not use hardlinks -- fixes resurrection process
+2015-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.3
+
+2015-03-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.2
+
2015-02-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 2.3.0
diff --git a/devel/gitk/DEPENDS b/devel/gitk/DEPENDS
deleted file mode 100755
index 7223c36..0000000
--- a/devel/gitk/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends git &&
-depends tk
diff --git a/devel/gitk/DETAILS b/devel/gitk/DETAILS
index dc3ea7a..a4a3029 100755
--- a/devel/gitk/DETAILS
+++ b/devel/gitk/DETAILS
@@ -1,26 +1,7 @@
- SPELL=gitk
- VERSION=1.1
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL=http://ozlabs.org/~paulus/gitk/gitk-1.1.tar.gz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- LICENSE[0]=GPL
- WEB_SITE=http://ozlabs.org/~paulus/gitk/
- ENTERED=20050820
- KEYWORDS="git devel"
- SHORT="Tk commit viewer for git"
- DOCS="README"
-cat << EOF
-Gitk is a git commit viewer with the following features:
-
-* Clear and compact representation of the commit graph
-* Displays headline, author and date of each commit in the
- summary window
-* Displays the full details of one commit - the comments,
- list of files and colorized diff - in the details window
-* Find function for searching through commits
-* Displays the SHA1 ID of the selected commit and makes it
- the X selection so it can be pasted into other windows
-* Convenient key bindings for scanning through each commit
- in turn
-EOF
+ SPELL=gitk
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by git]
+ EOF
diff --git a/devel/gitk/DOWNLOAD b/devel/gitk/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/gitk/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/devel/gitk/HISTORY b/devel/gitk/HISTORY
index ab699d4..8384246 100644
--- a/devel/gitk/HISTORY
+++ b/devel/gitk/HISTORY
@@ -1,3 +1,8 @@
+2015-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * spell deprecated [Included in Git since long ago]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/devel/gitk/INSTALL b/devel/gitk/INSTALL
index 708e513..27ba77d 100755
--- a/devel/gitk/INSTALL
+++ b/devel/gitk/INSTALL
@@ -1 +1 @@
-install -m 0755 -o root -g root gitk $INSTALL_ROOT/usr/bin/gitk
+true
diff --git a/devel/gitk/PRE_BUILD b/devel/gitk/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/gitk/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/gitk/UP_TRIGGERS b/devel/gitk/UP_TRIGGERS
new file mode 100755
index 0000000..9a38d61
--- /dev/null
+++ b/devel/gitk/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger gitk dispel_self
+up_trigger git cast_self
diff --git a/devel/gitk/gitk-1.1.tar.gz.sig b/devel/gitk/gitk-1.1.tar.gz.sig
deleted file mode 100644
index b01f6da..0000000
Binary files a/devel/gitk/gitk-1.1.tar.gz.sig and /dev/null differ
diff --git a/disk/mtpfs/DETAILS b/disk/mtpfs/DETAILS
index da49bfe..ca40281 100755
--- a/disk/mtpfs/DETAILS
+++ b/disk/mtpfs/DETAILS
@@ -1,8 +1,8 @@
SPELL=mtpfs
- VERSION=0.9
+ VERSION=1.1
SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=http://www.adebenham.com/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2db98e8375ce238ea754de51c20bddb8de88542fa5b09f8d7ddd9deee25c8e2f2f8c28af31bf6ea14db6133e7a331de8ea49b6f7ecbc248d513ebfcd7c81d5cb
+ SOURCE_URL[0]=http://www.adebenham.com/files/mtp/$SOURCE
+
SOURCE_HASH=sha512:627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
WEB_SITE="http://www.adebenham.com/mtpfs/";
LICENSE[0]=GPL
diff --git a/disk/mtpfs/HISTORY b/disk/mtpfs/HISTORY
index cfe3cb6..8a179d6 100644
--- a/disk/mtpfs/HISTORY
+++ b/disk/mtpfs/HISTORY
@@ -1,3 +1,6 @@
+2015-05-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.1, fix SOURCE_URL
+
2008-10-25 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.9, fix SOURCE_URL
diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS
index 7a36fa6..cc17202 100755
--- a/graphics-libs/freetype2/DEPENDS
+++ b/graphics-libs/freetype2/DEPENDS
@@ -1,13 +1,22 @@
-depends glib2 &&
-depends libpng &&
-depends pcre &&
+optional_depends libpng \
+ "--with-png=yes" \
+ "--with-png=no" \
+ "to support png compressed OpenType embedded bitmaps" &&
# freetype2 with harfbuzz requires harfbuzz built against freetype2 first
if spell_ok ${SPELL}; then
optional_depends -sub 'FT' 'harfbuzz' \
'--with-harfbuzz=yes' \
'--with-harfbuzz=no' \
- 'to improve auto-hinting of OpenType fonts'
+ 'to improve auto-hinting of OpenType fonts' &&
+
+ # LDFLAGS are taken from /usr/lib/libharfbuzz.la
+ if is_depends_enabled $SPELL harfbuzz; then
+ if is_depends_enabled harfbuzz glib2; then
+ depends glib2 &&
+ depends pcre
+ fi
+ fi
else
message "${PROBLEM_COLOR}harfbuzz optional dependency disabled until
${DEFAULT_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${PROBLEM_COLOR} is
cast.${DEFAULT_COLOR}"
fi
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 882c95e..2f4b381 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,7 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: made libpng optional; glib2 and pcre are required only if
+ it was built against harfbuzz with glib support
+
2015-01-31 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 2.5.5
diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 219c4e0..733efae 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,12 +1,32 @@
-depends glib2 &&
-depends libpng &&
-depends pcre &&
depends ragel &&
+optional_depends glib2 \
+ "--with-glib=yes --with-gobject=yes" \
+ "--with-glib=no --with-gobject=no" \
+ "to use glib" &&
+
+persistent_add HARFBUZZ_OPTS &&
+
+if is_depends_enabled $SPELL glib2; then
+ depends pcre &&
+
+ optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no" \
+ "to enable introspection for this build"
+else
+ list_add "HARFBUZZ_OPTS" "--enable-introspection=no"
+fi &&
+
if spell_ok cairo; then
optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
- "Enable tools used for command-line utilities?"
+ "Enable tools used for command-line utilities?" &&
+
+ if is_depends_enabled $SPELL cairo; then
+ depends libpng
+ fi
else
+ list_add "HARFBUZZ_OPTS" "--with-cairo=no" &&
message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}cairo${PROBLEM_COLOR}
optional dependency disabled until ${SPELL_COLOR}cairo${PROBLEM_COLOR} is
cast${DEFAULT_COLOR}"
fi &&
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 8704c71..8485c2b 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,8 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: libpng is required only if it was built with cairo support;
+ glib2 is optional; added missing gobject-introspection dependency;
+ pcre is required only if it was built with glib2 support
+
2015-03-18 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: added ICU
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 164a0c1..16a7833 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -52,45 +52,56 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
. $LINUX_DIRECTORY/latest.defaults
- if [[ $(uname -r) = 3.* ]]; then
+ case $(uname -r) in
+ 2.*)
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
+ SOURCE3=linux-${LATEST_2_6}.tar.bz2
+ SOURCE6="${SOURCE3}.sign"
+ HEADERS_VDIR=v2.6
+ ;;
+ 3.*)
HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
SOURCE3=linux-${LATEST_3}.tar.xz
- SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
- case $HEADERS_VERSION in
- 3.[1-9]*)
- SOURCE6="linux-${LATEST_3}.tar.sign"
- SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE6}"
- ;;
- *)
+ if [[ $HEADERS_VERSION = 3.0* ]]; then
SOURCE6="${SOURCE3}.sign"
- SOURCE6_URL="${SOURCE3_URL}.sign"
- ;;
- esac
- SOURCE6_IGNORE=signature
- SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+ else
+ SOURCE6="linux-${LATEST_3}.tar.sign"
+ fi
+ HEADERS_VDIR=v3.x
if [[ ${HEADERS_VERSION} != $LATEST_3 ]]; then
SOURCE7=patch-${HEADERS_VERSION}.xz
- SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
SOURCE8="patch-${HEADERS_VERSION}.sign"
- SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE8}"
else
SOURCE8="${SOURCE7}.sign"
- SOURCE8_URL="${SOURCE7_URL}.sign"
fi
- SOURCE8_IGNORE=signature
- SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
fi
- else
- HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
- HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
- SOURCE3=linux-${LATEST_2_6}.tar.bz2
- SOURCE6="${SOURCE3}.sign"
- SOURCE6_IGNORE=signature
+ ;;
+ 4.*)
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches_4 | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_4}
+ SOURCE3=linux-${LATEST_4}.tar.xz
+ SOURCE6="linux-${LATEST_4}.tar.sign"
+ HEADERS_VDIR=v4.x
+ if [[ ${HEADERS_VERSION} != $LATEST_4 ]]; then
+ SOURCE7=patch-${HEADERS_VERSION}.xz
+ SOURCE8="patch-${HEADERS_VERSION}.sign"
+ fi
+ ;;
+ esac
+
SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
- SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
- SOURCE6_URL="${SOURCE3_URL}.sign"
+ SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE3}"
+ SOURCE6_IGNORE=signature
+ SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE6}"
+
+ if [[ -n $SOURCE7 ]]; then
+ SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
+ SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE7}"
+ SOURCE8_IGNORE=signature
+ SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE8}"
fi
fi
fi
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index ecc62d0..9353c50 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: support kernel headers 4.x
+
2015-02-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.21, SECURITY_PATCH++, (CVE-2015-1472),
(CVE-2014-7817). (CVE-2012-3406). (CVE-2014-9402)
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 3b664ef..b92b081 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,5 +1,7 @@
. ${GRIMOIRE}/FUNCTIONS &&
-if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.* ]]; then
+if [[ $(uname -r) = 2.6.* ]] \
+ || [[ $(uname -r) = 3.* ]] \
+ || [[ $(uname -r) = 4.* ]]; then
if test "$HOST" == "i386-pc-linux-gnu"; then
message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]" &&
config_set_option GLIBC_NPTL n
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index da03e83..16973e0 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -14,7 +14,11 @@ if [ "$GLIBC_NPTL" = "y" ]; then
persistent_add GLIBC_HEADERS_DIR &&
case ${HEADERS_VERSION} in
- 3.[1-9]*)
+ 2.*|3.0*)
+ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
+ unpack_file 3 || return 1
+ ;;
+ *)
GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.xz}
message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
xz -d -k $SOURCE_CACHE/$SOURCE3
@@ -25,13 +29,9 @@ if [ "$GLIBC_NPTL" = "y" ]; then
rm $SOURCE_CACHE/$SOURCE3
SOURCE3=$SOURCE3_ORI
;;
- *)
- GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}
- unpack_file 3 || return 1
- ;;
esac
cd $GLIBC_HEADERS_DIR &&
- if [ ! -z $SOURCE7 ]; then
+ if [[ -n $SOURCE7 ]]; then
if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
xz -d -k ${SOURCE_CACHE}/$SOURCE7 &&
diff --git a/net/proxychains-ng/DETAILS b/net/proxychains-ng/DETAILS
index 91ec229..a760588 100755
--- a/net/proxychains-ng/DETAILS
+++ b/net/proxychains-ng/DETAILS
@@ -1,9 +1,10 @@
SPELL=proxychains-ng
SPELLX=${SPELL/-ng}
- VERSION=4.8.1
+ VERSION=4.9
+ SECURITY_PATCH=1
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[1]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:6e1673b331722ea5f6282a055d9552e387a2d68cc5e0c3fbb310ebbf58d47f1c9de46f11bbe5977b328d7a0abf1a5f77c544ccea799cb047da5c8521ee7ec949
+
SOURCE_HASH=sha512:ce1a4d55f3f401e2397e138d4fa0254b82e323cbb3eb92f3e7917b09442960f6fa054bfb3a1380a81f0842210050cc13fe3f7fc64f4ac0e55d870856af497043
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
DOCS="AUTHORS ChangeLog TODO $DOCS"
WEB_SITE=https://github.com/rofl0r/proxychains-ng
diff --git a/net/proxychains-ng/HISTORY b/net/proxychains-ng/HISTORY
index 13c0c22..c067f60 100644
--- a/net/proxychains-ng/HISTORY
+++ b/net/proxychains-ng/HISTORY
@@ -1,3 +1,6 @@
+2015-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.9; SECURITY_PATCH++ (CVE-2015-3887)
+
2014-08-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.8.1
diff --git a/utils/kbd/DEPENDS b/utils/kbd/DEPENDS
index 3861054..df928af 100755
--- a/utils/kbd/DEPENDS
+++ b/utils/kbd/DEPENDS
@@ -2,10 +2,13 @@ depends gnupg &&
depends smgl-fhs &&
depends autoconf &&
depends automake &&
-depends check &&
optional_depends linux-pam "" "--disable-vlock" "build vlock" &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
- "for Native Language Support"
+ "for Native Language Support" &&
+optional_depends check \
+ "--enable-tests" \
+ "--disable-tests" \
+ "to build unit tests"
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 1b32178..068489b 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, DEPENDS, kbd-2.0.0-tests.patch:
+ make check dependency optional, patch from Gentoo
+
2014-09-03 Treeve Jelbert <treeve AT sourcemage.org
* DETAILS: version 2.0.2
download from KERNEL_URL
diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
new file mode 100755
index 0000000..d3aa27d
--- /dev/null
+++ b/utils/kbd/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch < "$SPELL_DIRECTORY"/kbd-2.0.0-tests.patch &&
+autoreconf -fi
diff --git a/utils/kbd/kbd-2.0.0-tests.patch b/utils/kbd/kbd-2.0.0-tests.patch
new file mode 100644
index 0000000..7a4e186
--- /dev/null
+++ b/utils/kbd/kbd-2.0.0-tests.patch
@@ -0,0 +1,31 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,13 @@
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++AC_ARG_ENABLE(tests,
++ AS_HELP_STRING(--enable-tests, [build tests]),
++ [BUILD_TESTS=$enableval],[BUILD_TESTS=no])
++AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
++if test "$BUILD_TESTS" = "yes"; then
++ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++fi
+
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+--- Makefile.am
++++ Makefile.am
+@@ -8,7 +8,10 @@
+ CREDITS \
+ contrib docs rc
+
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
++if BUILD_TESTS
++SUBDIRS += tests
++endif
+
+ kbd-$(VERSION).tar.xz:
+ make distcheck
diff --git a/x11-toolkits/qt4/CVE-2014-0190.patch
b/x11-toolkits/qt4/CVE-2014-0190.patch
deleted file mode 100644
index e97ee7b..0000000
--- a/x11-toolkits/qt4/CVE-2014-0190.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Don't crash on broken GIF images
-
-Broken GIF images could set invalid width and height
-values inside the image, leading to Qt creating a null
-QImage for it. In that case we need to abort decoding
-the image and return an error.
-
-Initial patch by Rich Moore.
-
-Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
-Task-number: QTBUG-38367
-Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
-Security-advisory: CVE-2014-0190
-
-diff -up
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
----
qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp.QTBUG-38367
2014-04-10 13:37:12.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/image/qgifhandler.cpp
2014-04-24 15:58:54.515862458 -0500
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, co
- memset(bits, 0, image->byteCount());
- }
-
-+ // Check if the previous attempt to create the image
failed. If it
-+ // did then the image is broken and we should give up.
-+ if (image->isNull()) {
-+ state = Error;
-+ return -1;
-+ }
-+
- disposePrevious(image);
- disposed = false;
-
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index c18ebf7..fc4a27f 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,11 +2,11 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.6
+ VERSION=4.8.7
PATCHLEVEL=0
-
SOURCE_HASH=sha512:c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692
+
SOURCE_HASH=sha512:f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
SOURCE=$SPELLX-$VERSION.tar.gz
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=http://download.qt-project.org/official_releases/qt/4.8/$VERSION/$SOURCE
WEB_SITE=http://qt-project.org/
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ba1d122..523bdd4 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,11 @@
+2015-05-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.7, SECURITY_PATCH=7
+ * PRE_BUILD, *.patch: patches removed
+
+2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, qt-everywhere-opensource-src-4.8.6-gcc5_fixes-1.patch:
+ add patch from LFS to fix build with gcc 5
+
2015-03-03 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected syntax for message
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index dd7ef9f..7ab841c 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2014-0190.patch &&
-
sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
# fix bad .pro file for 4.6.0-beta1
- [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (83ae721638736f21384f94f87d877480cc0ac750), Vlad Glagolev, 12/23/2015
Archive powered by MHonArc 2.6.24.