Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (71c6b6d42f3696e2e6a30900f9a7d8bf8ab1c575)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (71c6b6d42f3696e2e6a30900f9a7d8bf8ab1c575)
  • Date: Sat, 20 Jun 2015 14:30:53 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/libpng/DETAILS | 12 +++---
graphics-libs/libpng/HISTORY | 55
++++++++++++++++++++++++++----
graphics-libs/libpng/PRE_BUILD | 2 -
graphics-libs/libpng/UP_TRIGGERS | 18 +++++++++
http/xulrunner/HISTORY | 3 +
http/xulrunner/PRE_BUILD | 2 +
http/xulrunner/xulrunner_libpng-1.4.patch | 12 ++++++
mail/thunderbird/HISTORY | 3 +
mail/thunderbird/xulrunner-png14.patch | 11 ++++++
x11-libs/cairo/HISTORY | 6 +++
10 files changed, 110 insertions(+), 14 deletions(-)

New commits:
commit 841e893268f1f0f86d3519a7b9e8e8a3bb8547b5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libpng 1.6.17

commit 4df9f7e369e856563f470226c8a54593b017b35c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.16

commit bdd00ea2d593d992e80f52ee9beb3f0044a47470
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng-1.6.15 - SECURITY FIX

commit 203f7d78e549f63c9feba1d4ce58612ced483541
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.13

commit dabae5e14ab44d3bc40e8845e43a601102c302f2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.12

commit ee9893773b12f823287fdf7332f3c79d36de042a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng-1.6.10 - SECURITY fix

commit 6f1b9a17540d725390e9e4a6480c0613c37f0975
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.9

commit c4ca5c8085e7f99cf94b32c529f0252efff1e340
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.8

commit e441f18c8862524fa4b020a8dc31f136bea05c70
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.7

commit 3688fd88184b45e9cae147ee632de939eeec182e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.6

commit 521584fbb09bf0f6d1f2ab14c7f78259a5b4cae0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.5

commit cbf0afb2f620fc077edf7d04c39031aa02aa920e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

Revert "libpng: => 1.6.3"
it was in the wrong branch

This reverts commit e24c0aa712971dccfea803899447e2b1d028fda7.

commit c2556e29687576fab56d67d72ab75a77c01fa861
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.3

commit e24c0aa712971dccfea803899447e2b1d028fda7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.3

commit 6afdccda523a74e49f715316ab0687a4aa15ebce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.2

commit 26ad55ebd688e6b84435d4cff666e108055c81e0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.1

commit eb58cf0aa6845dc82bc8be210a68a5b916f8c0e7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libpng: => 1.6.0

commit 85be105a0bf7dd76d025399752685a70f3aca7ca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libpng 1.4.8, SECURITY_PATCH=6, CVE-2004-0421 related

commit d4b088e1ab3e623178fd290503b07cbb85c19597
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

thunderbird 3.1.8, SECURITY_PATCH=25

commit e010aad8d62cf48b4604f800fa4925c3d18f906c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

thunderbird: libpng 1.4 fix

commit 29225103d81521c374f8934e20c37f68da37b38a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libpng 1.4.5

commit 33ff71c73e13a4a1bf6c2f50d3ce46a5509bcbe3
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

graphics-libs/libpng: updated to 1.4.4

commit 061ca2467ae9cbf45de742762a5e047d1c4d3206
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

cairo: back to 1.8.8 again

commit 587df0340a1fef5da597d2ae5cd609caf2136533
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

graphics/xaralx: added fix for libpng 1.4, patch is bzipped and appliable
to stable too
(cherry picked from commit 321d00818944b1390dcd9b74a5192a281d8bd907)

commit efb39d84af74d140bf972a0ce35a2c10c209515a
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xulrunner: patch for libpng 1.4

commit 0fb29c3e88bfada0b80fcd4f9786aba081324c8e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

qt-x11: patch for libpng 1.4

commit c2cc243e7ccb983f13b5a9dd4d02b40410c0b93a
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

cairo: 1.8.10

commit 9acdc11796c75b02d932542e74ec85c4cbb123f9
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libpng: 1.4

diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 124e2b0..9e29cfd 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,18 +1,18 @@
SPELL=libpng
- VERSION=1.2.52
-
SOURCE_HASH=sha512:08d305ed07e10b4976d6897e35d745cfa592a9c27027d120a9e61a0566afe08c88abaa150e6e56325a8905b29b79fb5cfdf069a8d23d111c563a002a0dd230d3
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ VERSION=1.6.17
+
SOURCE_HASH=sha512:f22a48b355adea197a2d79f90ccc6b3edef2b5e8f6fb17319bd38652959126bbecb9442fd95e5147a894484446e87e535667fbfcf3b1e901b8375e5bb00a3bf3
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
if [[ $ANI_PNG == y ]]; then
SOURCE2=$SPELL-$VERSION-apng.patch.gz
+
SOURCE2_HASH=sha512:5abfe55ad8e2778572fa5c1543c23b01c7f7fc4fea1aec535ac5749ae1ba1e209e7b94641d34d4b6514be7abbf176b957e3690832d4358d0590754063303eeb0

SOURCE2_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL-apng/$SOURCE2
-
SOURCE2_HASH=sha512:2ae930002ed2f1a00d2cabe762ac4345e5f125e6d3fd5909e4f3ce30df95a8a88682334f49fe22e7857fe7d83d83b8f7a014f1f433fdf2b10956fdec035de997
fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=ZLIB
WEB_SITE=http://www.libpng.org/pub/png/libpng.html
ENTERED=20010922
- SECURITY_PATCH=9
+ SECURITY_PATCH=11
KEYWORDS="graphics libs"
SHORT="library that supports the PNG graphics format"
cat << EOF
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index 97de65d..b62bc52 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,15 +1,53 @@
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

-2015-01-11 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Fixed APNG patch checksum
+2015-03-27 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.17

-2015-01-10 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Fixed SOURCE_URL[1]
- updated spell to 1.2.52
+2014-12-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.16

-2014-02-18 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.51
+2014-11-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.15
+ SECURITY_PATCH++
+
+2014-08-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.13
+
+2014-06-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.12
+
+2014-03-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.10
+ SECURITY_PATCH++, fixes CVE-2014-0333
+
+2014-02-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.9
+
+2013-12-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.8
+
+2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.7
+
+2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.6
+
+2013-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.5
+
+2013-07-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.3
+ * PRE_BUILD: generalise
+
+2013-04-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.2
+
+2013-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.1
+
+2013-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.0

2012-07-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.50, SECURITY_PATCH=9, CVE-2012-3386
@@ -27,6 +65,9 @@
CVE-2011-2690, CVE-2011-2691, CVE-2011-2692, CVE-2004-042
see <http://www.libpng.org/pub/png/src/libpng-1.2.46-README.txt>

+2010-08-10 Remko van der Vossen <wich AT sourcemage.org>
+ * UP_TRIGGERS: find spells to recast on ABI incompatible upgrade
+
2010-06-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.44, SECURITY_PATCH=5

diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD
index 55240b0..7f772e0 100755
--- a/graphics-libs/libpng/PRE_BUILD
+++ b/graphics-libs/libpng/PRE_BUILD
@@ -3,5 +3,5 @@ cd "$SOURCE_DIRECTORY" &&

if [[ $ANI_PNG == y ]]; then
unpack_file 2 &&
- zcat "$SOURCE_CACHE/$SPELL-$VERSION-apng.patch.gz" | patch -p1
+ zcat "$SOURCE_CACHE/$SOURCE2" | patch -p1
fi
diff --git a/graphics-libs/libpng/UP_TRIGGERS
b/graphics-libs/libpng/UP_TRIGGERS
new file mode 100755
index 0000000..256c094
--- /dev/null
+++ b/graphics-libs/libpng/UP_TRIGGERS
@@ -0,0 +1,18 @@
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+ message "This is an ABI incompatible update of libpng..."
+ message "Determining which spells need to be recast, this may take a
while."
+
+ for other_spell in $(gaze installed | cut -d: -f1); do
+ if gaze install $other_spell \
+ | xargs file -e apptype -e ascii -e compress -e tar \
+ | grep '\<ELF\>.*\<dynamically linked\>' \
+ | cut -d: -f1 \
+ | xargs readelf -d 2> /dev/null \
+ | grep -q -P 'NEEDED\)\s*Shared library: \[libpng'; then
+ up_trigger $other_spell cast_self
+ fi
+ done
+ fi
+fi
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index c5898c3..897bc82 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -25,6 +25,9 @@
* DETAILS: 1.9.2.9, FFVERSION=3.6.9, SECURITY_PATCH=17
* DEPENDS: added -sub SECURE_DELETE to sqlite

+2010-08-11 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, xulrunner_libpng-1.4.patch: patch for libpng 1.4
+
2010-08-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: forced optimizations to -O2 to prevent segfault

diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 933f54b..d01882c 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -8,6 +8,8 @@ patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&

patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&

+patch -p2 < $SCRIPT_DIRECTORY/xulrunner_libpng-1.4.patch &&
+
# Needed to make things using XUL find NSPR.
echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&

diff --git a/http/xulrunner/xulrunner_libpng-1.4.patch
b/http/xulrunner/xulrunner_libpng-1.4.patch
new file mode 100644
index 0000000..19368e4
--- /dev/null
+++ b/http/xulrunner/xulrunner_libpng-1.4.patch
@@ -0,0 +1,12 @@
+diff -Naur
xulrunner-1.9.2.8.orig/mozilla-1.9.2/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
xulrunner-1.9.2.8/mozilla-1.9.2/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
+---
xulrunner-1.9.2.8.orig/mozilla-1.9.2/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
2010-07-22 23:55:10.000000000 +0200
++++
xulrunner-1.9.2.8/mozilla-1.9.2/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
2010-08-11 09:05:38.000000000 +0200
+@@ -135,7 +135,7 @@
+
+ // initialize
+ mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
++ nsnull,
+ ErrorCallback,
+ ErrorCallback);
+ if (! mPNG)
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 430791b..719fe82 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -120,6 +120,9 @@
* DETAILS: 3.1.8, SECURITY_PATCH=25
* thunderbird.gpg: added F4E9976A, new key of Mozilla Messaging Inc.

+2010-12-13 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, xulrunner-png14.patch: added patch from Arch Linux
+
2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.7, SECURITY_PATCH=24

diff --git a/mail/thunderbird/xulrunner-png14.patch
b/mail/thunderbird/xulrunner-png14.patch
new file mode 100644
index 0000000..1dc0ecd
--- /dev/null
+++ b/mail/thunderbird/xulrunner-png14.patch
@@ -0,0 +1,11 @@
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17
00:15:53.979744638 +0100
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17
00:16:07.855993411 +0100
+@@ -135,7 +135,7 @@
+
+ // initialize
+ mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
++ NULL,
+ ErrorCallback,
+ ErrorCallback);
+ if (! mPNG)
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 1f733cc..d860475 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -109,6 +109,9 @@
* libpng14.patch: removed, no longer needed
* PRE_BUILD: removed, no longer needed

+2010-08-21 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: reverted stable to 1.8.8, compiles now with patch
+
2010-08-21 Bor Kraljič <pyrobor AT ver.si>
* PRE_BUILD: apply the patch if VERSION is 1.8.8
* libpng14.patch: added to compile with libpng 1.4*. Based on
upstream patch:
@@ -119,6 +122,9 @@
* PRE_SUB_DEPENDS: Added option for devel version
* SUB_DEPENDS: Added option for devel version

+2010-08-10 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: updated stable to 1.8.10, 1.8.8 doesn't build with libpng
1.4
+
2010-07-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: reverted stable to 1.8.8; 1.8.10 has been detected buggy
for
the last 4 months



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (71c6b6d42f3696e2e6a30900f9a7d8bf8ab1c575), Treeve Jelbert, 06/20/2015

Archive powered by MHonArc 2.6.24.

Top of Page