sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (96a2506240ce0bf955e6925c2a5cae076771c892)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (96a2506240ce0bf955e6925c2a5cae076771c892)
Date: Sun, 24 May 2015 09:38:50 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 3
KDE4_DEPENDS | 3
KDE4_FUNCTIONS | 42 ++++++++
audio-players/mpg123/DETAILS | 2
audio-players/mpg123/HISTORY | 3
database/postgresql/DETAILS | 6 -
database/postgresql/HISTORY | 4
disk/fuse/DETAILS | 4
disk/fuse/HISTORY | 3
disk/reiserfsprogs/BUILD | 1
disk/reiserfsprogs/DETAILS | 7 -
disk/reiserfsprogs/HISTORY | 4
kde4-apps/calligra/CONFIGURE | 1
kde4-apps/calligra/DEPENDS | 13 --
kde4-apps/calligra/HISTORY | 3
libs/pcre/DETAILS | 2
libs/pcre/HISTORY | 5 -
libs/vc/DETAILS | 6 -
libs/vc/HISTORY | 3
mail/dovecot/DETAILS | 2
mail/dovecot/HISTORY | 6 +
mail/dovecot/PRE_BUILD | 3
mail/dovecot/ssl_enhancedh.patch | 55 +++++++++++
xorg-app/sessreg/DETAILS | 5 -
xorg-app/sessreg/HISTORY | 4
xorg-app/sessreg/PRE_BUILD | 4
xorg-lib/libice/HISTORY | 4
xorg-lib/libice/PRE_BUILD | 4
xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch | 80
+++++++++++++++++
29 files changed, 252 insertions(+), 30 deletions(-)

New commits:
commit c9e3d7c19092967d449192278da033c5d11adac2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg123: bump to 1.22.2

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

sessreg: 1.1.0, fixed building with recent gcc

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

reiserfsprogs: add missing hash

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

reiserfsprogs: 3.6.24, fix build with gcc 5

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

libice: apply patch to fix build with gcc 5

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

fuse: => 2.9.4

commit 8270b6889dd674e105566ed296bb1f4f6a06fae8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pcre: that was a security update

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

calligra - cleanup depends

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

add missing KDE4* files

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

vc: => 0.7.4

commit c9388f9de62724b3f51dcb5a4a7b08ba7ef22a5b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postgresql: => 9.3.7 [security]

commit 8a08cd3268cee993edb8cfa4cd986090a0e9a510
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dovecot: security update

diff --git a/ChangeLog b/ChangeLog
index d2c9f69..fa474cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE4_DEPENDS, KDE4_FUNCTIONS: add missing files
+
2015-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* http/ziproxy: new spell, compressing non-caching HTTP proxy

diff --git a/KDE4_DEPENDS b/KDE4_DEPENDS
new file mode 100755
index 0000000..e0f63b1
--- /dev/null
+++ b/KDE4_DEPENDS
@@ -0,0 +1,3 @@
+depends cmake &&
+depends qt4 &&
+depends kdelibs
diff --git a/KDE4_FUNCTIONS b/KDE4_FUNCTIONS
new file mode 100755
index 0000000..392efb7
--- /dev/null
+++ b/KDE4_FUNCTIONS
@@ -0,0 +1,42 @@
+QT4DIR="$INSTALL_ROOT/opt/qt4"
+KDE4DIR="$QT4DIR"
+SRC=$SOURCE_DIRECTORY
+
+default_build() {
+ kde4_build
+}
+
+function default_install() {
+ cmake_install
+}
+
+#---------------------------------------------------------------------
+function kde4_build() {
+ export XDG_DATA_DIRS=$KDE4DIR/share:/usr/share
+ OPTS+=" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=1 -Wno-dev"
+ qt4_cmake_build
+}
+
+
+
+# we need a default_final, default_post_remove
+# so that the mime and desktop databases get updated
+update_databases() {
+local DD
+DD=$KDE4DIR
+ if is_depends_enabled $SPELL shared-mime-info;then
+ update-mime-database $DD/share/mime/
+ fir
+ if [[ -e $DD/share/desktop-directories ]]; then
+ update-desktop-database $DD/share/desktop-directories
+ fi
+}
+
+default_final() {
+ update_databases
+}
+
+
+default_post_remove() {
+ update_databases
+}
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 584fec7..7346022 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.22.1
+ VERSION=1.22.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 311b0da..6b2448d 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 1.22.2
+
2015-04-01 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 1.22.1

diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index e8d2495..2a60bef 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,8 +1,8 @@
SPELL=postgresql
- VERSION=9.3.6
- SECURITY_PATCH=15
+ VERSION=9.3.7
+ SECURITY_PATCH=16
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:057d8cc43de445cbc31c08fd056fffb049605fc2eb5ade1d2dcbf61fe8ba26597cb9205a1a61e085d6a02a3a2fe6536dc18aab7f2cb7ea5ea83bd30ccdf498fb
+
SOURCE_HASH=sha512:c7291484dac7a943d381bfd49cdcd841212fd031211416ab234bdf7b50cb9ef00d22c4d4ad62c4289a3a216b93cabb153c3e83f5408eed5fd395c136bde74e4d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE

SOURCE_URL[1]=ftp://ftp9.de.postgresql.org/unix/databases/postgresql/source/v${VERSION}/${SOURCE}
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 022dd20..ee53364 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,7 @@
+2015-05-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.3.7; SECURITY_PATCH++ (CVE-2015-3165,
+ CVE-2015-3166, CVE-2015-3167)
+
2015-02-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.3.6; SECURITY_PATCH++ (CVE-2015-0241,
CVE-2015-0242, CVE-2015-0243, CVE-2015-0244, CVE-2014-8161,
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 290c21c..9278802 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,8 +1,8 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=fuse
if [ "$FUSE_BRANCH" != "scm" ]; then
- VERSION=2.9.3
-
SOURCE_HASH=sha512:03f43f88694ec7e039ff3579a8e76349b5a5a05872c55901fc1d9ee53dbb6b1e69f6dd0005b620f3b5ead0b14da8eeb31d46b922d10f88f4e3f830aa47e8162c
+ VERSION=2.9.4
+
SOURCE_HASH=sha512:055ec2a78793276102bc5a0afea9eebd18b151cf752d0985380ffbde1c554e9fb7bc3a43838618e3957b274aa06624303ea12f32c659365c4768dad887bb557d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index e5de356..b68ef22 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2015-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9.4
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/disk/reiserfsprogs/BUILD b/disk/reiserfsprogs/BUILD
index 7051162..bcadd76 100755
--- a/disk/reiserfsprogs/BUILD
+++ b/disk/reiserfsprogs/BUILD
@@ -1,3 +1,4 @@
# Fixes Bug #1108
OPTS="$OPTS --sbindir=${INSTALL_ROOT}/sbin" &&
+CFLAGS+=" -std=gnu90"
default_build
diff --git a/disk/reiserfsprogs/DETAILS b/disk/reiserfsprogs/DETAILS
index e041ae2..7ebb14b 100755
--- a/disk/reiserfsprogs/DETAILS
+++ b/disk/reiserfsprogs/DETAILS
@@ -1,10 +1,9 @@
SPELL=reiserfsprogs
- VERSION=3.6.21
+ VERSION=3.6.24
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/fs/reiserfs/$SOURCE
-#
SOURCE_HASH=sha512:d7a98e2fd029c0a9f764a635bdad84fc6acaeae2353c17c4a9a38aee39cc84c9e98c3680e511f1efa2092af652f9a517375fe7d973e91a7d2e8b9df403894494
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/people/jeffm/$SPELL/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:476663d3c9021b39665b7f19c33fa911c800c5687173fb61b759b64c845da90a6a88797254b0ba11ac48df4a8198123b6d3c67d8d94cc8f8a34e7bdb8392b9cf
LICENSE[0]=GPL
KEYWORDS="disk"
WEB_SITE=http://www.namesys.com/
diff --git a/disk/reiserfsprogs/HISTORY b/disk/reiserfsprogs/HISTORY
index cf1d8fe..12a1ab4 100644
--- a/disk/reiserfsprogs/HISTORY
+++ b/disk/reiserfsprogs/HISTORY
@@ -1,3 +1,7 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: 3.6.24
+ * BUILD: C standard == gnu90 to build with gcc 5+
+
2009-01-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.21, new SOURCE_URL[0], gz -> bz2
* INSTALL: added to create symlinks fsck.resierfs and mkfs.reiserfs
diff --git a/kde4-apps/calligra/CONFIGURE b/kde4-apps/calligra/CONFIGURE
index 6f26745..c218bff 100755
--- a/kde4-apps/calligra/CONFIGURE
+++ b/kde4-apps/calligra/CONFIGURE
@@ -6,4 +6,3 @@ It is also possible to define your own product sets\n\n\
I have defined\n\
Office: Words + Sheets\n"
config_query_list CPROD "Which product set?" OFFICE CREATIVE DESKTOP
-config_query_option QT3 'build Kexi which needs Qt3 support?' n 'ON' 'OFF'
diff --git a/kde4-apps/calligra/DEPENDS b/kde4-apps/calligra/DEPENDS
index 35dc100..58f880c 100755
--- a/kde4-apps/calligra/DEPENDS
+++ b/kde4-apps/calligra/DEPENDS
@@ -6,12 +6,8 @@ depends OPENGL &&
depends boost &&
depends shared-mime-info &&

-if [[ ${KF5} == 'kde5' ]];then
- depends kio
-else
- depends automoc &&
- optional_depends soprano '' '-DCMAKE_DISABLE_FIND_PACKAGE_Soprano=1'
'handle RDF metadata in ODF'
-fi &&
+depends automoc &&
+optional_depends soprano '' '-DCMAKE_DISABLE_FIND_PACKAGE_Soprano=1'
'handle RDF metadata in ODF' &&

optional_depends freetype2 '' '' 'font support' &&
optional_depends fontconfig '' '' '' &&
@@ -21,13 +17,10 @@ if [[ $CPROD != OFFICE ]];then
optional_depends pstoedit '' '' 'Karbon eps import filter' &&

# Kexi
-if [[ $QT3 == ON ]];then
- sub_depends qt4 QT3
depends bzip2 &&
depends sqlite &&
optional_depends mysql '' '' 'import MySql to Kexi' &&
- optional_depends postgresql '' '' 'import Postgresql to Kexi'
-fi &&
+ optional_depends postgresql '' '' 'import Postgresql to Kexi'&&

#Krita
optional_depends libkdcraw '' '' 'process RAW photos' &&
diff --git a/kde4-apps/calligra/HISTORY b/kde4-apps/calligra/HISTORY
index fe0d325..745dd96 100644
--- a/kde4-apps/calligra/HISTORY
+++ b/kde4-apps/calligra/HISTORY
@@ -1,3 +1,6 @@
+2015-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, CONFIGURE: remove unneeded stuff
+
2014-08-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.8.5
* office.cmake, PRE_BUILD: added
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 1993673..5a46d1f 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,6 +1,6 @@
SPELL=pcre
VERSION=8.37
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 0c93821..9dfe197 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,5 +1,8 @@
+2015-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (CVE-2015-2325, CVE-2015-2326)
+
2015-05-04 Pavel Vinogradov <public AT sourcemage.org>
- * *SUB_DEPENDS: g++ -> gcc with CXX
+ * SUB_DEPENDS: g++ -> gcc with CXX

2015-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.37
diff --git a/libs/vc/DETAILS b/libs/vc/DETAILS
index 323380b..e9cb30a 100755
--- a/libs/vc/DETAILS
+++ b/libs/vc/DETAILS
@@ -1,8 +1,8 @@
SPELL=vc
SPELLX=Vc
- VERSION=0.7.3
- VX=174
-
SOURCE_HASH=sha512:79330ca9d9258ab356d15760550ec6e88421bc7c268a46eb120680a5df6008384cf9b35d28f37f28bcf795be594a4a87c6e31496484f59cec9a611cc55f9ac42
+ VERSION=0.7.4
+ VX=183
+
SOURCE_HASH=sha512:afaa69477fbc97384b4fbfa4900db884ae47176bc9d6d0b64e4d7ebbf0ec986573e82d1e65f689fbf68449c418ceb8d92f79d751ff94656190f17fbec01cd9d7
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://code.compeng.uni-frankfurt.de/projects/vc
diff --git a/libs/vc/HISTORY b/libs/vc/HISTORY
index b49e1c4..0447954 100644
--- a/libs/vc/HISTORY
+++ b/libs/vc/HISTORY
@@ -1,3 +1,6 @@
+2015-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.4
+
2014-01-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.3

diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 8550eac..e16fb3a 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,6 @@
SPELL=dovecot
VERSION=2.0.21
+ SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -18,7 +19,6 @@ if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
ENTERED=20030224
- SECURITY_PATCH=7
LICENSE[0]=LGPL
LICENSE[1]=MIT
LICENSE[2]=BSD
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 3df741c..1cde555 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,9 @@
+2015-05-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (increases the minimum Diffie-Hellman
group
+ size to 2048 bit)
+ * PRE_BUILD: apply patch; added security-related comments
+ * ssl_enhancedh.patch: added
+
2014-11-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++ (allows turning off SSLv3); quoting paths;
unfold LICENSE; updated source urls for pigeonhole
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index bdabc87..78b6cb6 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,7 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+# see CVE-2014-3566
patch -p0 < "$SPELL_DIRECTORY/ssl_protocols.patch" &&
+# see CVE-2015-4000
+patch -p0 < "$SPELL_DIRECTORY/ssl_enhancedh.patch" &&

if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
unpack_file 3
diff --git a/mail/dovecot/ssl_enhancedh.patch
b/mail/dovecot/ssl_enhancedh.patch
new file mode 100644
index 0000000..f9bbb61
--- /dev/null
+++ b/mail/dovecot/ssl_enhancedh.patch
@@ -0,0 +1,55 @@
+--- src/ssl-params/ssl-params-openssl.c.orig
++++ src/ssl-params/ssl-params-openssl.c
+@@ -13,7 +13,7 @@
+ default.. */
+ #define DH_GENERATOR 2
+
+-static int dh_param_bitsizes[] = { 512, 1024 };
++static int dh_param_bitsizes[] = { 512, 2048 };
+
+ static const char *ssl_last_error(void)
+ {
+--- src/login-common/ssl-proxy-openssl.c.orig
++++ src/login-common/ssl-proxy-openssl.c
+@@ -76,7 +76,7 @@
+ time_t last_refresh;
+ int fd;
+
+- DH *dh_512, *dh_1024;
++ DH *dh_512, *dh_2048;
+ };
+
+ struct ssl_server_context {
+@@ -182,8 +182,8 @@
+ case 512:
+ params->dh_512 = d2i_DHparams(NULL, &cbuf, len);
+ break;
+- case 1024:
+- params->dh_1024 = d2i_DHparams(NULL, &cbuf, len);
++ case 2048:
++ params->dh_2048 = d2i_DHparams(NULL, &cbuf, len);
+ break;
+ default:
+ ssl_params_corrupted();
+@@ -199,9 +199,9 @@
+ DH_free(params->dh_512);
+ params->dh_512 = NULL;
+ }
+- if (params->dh_1024 != NULL) {
+- DH_free(params->dh_1024);
+- params->dh_1024 = NULL;
++ if (params->dh_2048 != NULL) {
++ DH_free(params->dh_2048);
++ params->dh_2048 = NULL;
+ }
+ }
+
+@@ -796,7 +796,7 @@
+ if (is_export && keylength == 512 && ssl_params.dh_512 != NULL)
+ return ssl_params.dh_512;
+
+- return ssl_params.dh_1024;
++ return ssl_params.dh_2048;
+ }
+
+ static void ssl_info_callback(const SSL *ssl, int where, int ret)
diff --git a/xorg-app/sessreg/DETAILS b/xorg-app/sessreg/DETAILS
index dd95af3..c9b7a31 100755
--- a/xorg-app/sessreg/DETAILS
+++ b/xorg-app/sessreg/DETAILS
@@ -1,9 +1,8 @@
SPELL=sessreg
- VERSION=1.0.6
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-#
SOURCE_HASH=sha512:db5fd96dec45650112afef9e44ed097ea50804d1a811ddceb2c0bbd875f89e8fe2fa8c8b4aa8b13c28cab6d8eac1dcd713e11cdacdfe6b6bc5649647a5e5db6d
+
SOURCE_HASH=sha512:5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
diff --git a/xorg-app/sessreg/HISTORY b/xorg-app/sessreg/HISTORY
index 2b4245b..9e9c1f5 100644
--- a/xorg-app/sessreg/HISTORY
+++ b/xorg-app/sessreg/HISTORY
@@ -1,3 +1,7 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: 1.1.0
+ * PRE_BUILD: fix building with recent gcc
+
2010-06-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.6
SOURCE matches upstream posted SHA1
diff --git a/xorg-app/sessreg/PRE_BUILD b/xorg-app/sessreg/PRE_BUILD
new file mode 100755
index 0000000..88063ce
--- /dev/null
+++ b/xorg-app/sessreg/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i -e 's,\$(srcdir)/filenames.sed.c,-ftrack-macro-expansion=0 &,'
man/Makefile.in
diff --git a/xorg-lib/libice/HISTORY b/xorg-lib/libice/HISTORY
index 0d2232e..bb7fc19 100644
--- a/xorg-lib/libice/HISTORY
+++ b/xorg-lib/libice/HISTORY
@@ -1,3 +1,7 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * libICE-1.0.9-gcc-array-bound-fix.patch, PRE_BUILD:
+ apply patch to fix building with gcc 5
+
2015-03-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Added proper description

diff --git a/xorg-lib/libice/PRE_BUILD b/xorg-lib/libice/PRE_BUILD
new file mode 100755
index 0000000..68258a0
--- /dev/null
+++ b/xorg-lib/libice/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY"/libICE-1.0.9-gcc-array-bound-fix.patch
diff --git a/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch
b/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch
new file mode 100644
index 0000000..718822b
--- /dev/null
+++ b/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch
@@ -0,0 +1,80 @@
+diff -Naur libICE-1.0.9.orig/src/ICElibint.h libICE-1.0.9/src/ICElibint.h
+--- libICE-1.0.9.orig/src/ICElibint.h 2014-06-07 10:28:43.000000000 +0900
++++ libICE-1.0.9/src/ICElibint.h 2015-05-24 18:18:02.000000000 +0900
+@@ -334,28 +334,28 @@
+ * Extern declarations
+ */
+
+-extern IceConn _IceConnectionObjs[];
+-extern char *_IceConnectionStrings[];
+-extern int _IceConnectionCount;
++extern IceConn _IceConnectionObjs[];
++extern char *_IceConnectionStrings[];
++extern int _IceConnectionCount;
+
+-extern _IceProtocol _IceProtocols[];
+-extern int _IceLastMajorOpcode;
++extern _IceProtocol _IceProtocols[];
++extern int _IceLastMajorOpcode;
+
+-extern int _IceAuthCount;
+-extern const char *_IceAuthNames[];
+-extern IcePoAuthProc _IcePoAuthProcs[];
+-extern IcePaAuthProc _IcePaAuthProcs[];
++extern int _IceAuthCount;
++extern const char *_IceAuthNames[];
++extern IcePoAuthProc _IcePoAuthProcs[];
++extern IcePaAuthProc _IcePaAuthProcs[];
+
+-extern int _IceVersionCount;
+-extern _IceVersion _IceVersions[];
++extern const int _IceVersionCount;
++extern const _IceVersion _IceVersions[];
+
+-extern _IceWatchProc *_IceWatchProcs;
++extern _IceWatchProc *_IceWatchProcs;
+
+-extern IceErrorHandler _IceErrorHandler;
+-extern IceIOErrorHandler _IceIOErrorHandler;
++extern IceErrorHandler _IceErrorHandler;
++extern IceIOErrorHandler _IceIOErrorHandler;
+
+-extern IceAuthDataEntry _IcePaAuthDataEntries[];
+-extern int _IcePaAuthDataEntryCount;
++extern IceAuthDataEntry _IcePaAuthDataEntries[];
++extern int _IcePaAuthDataEntryCount;
+
+ extern void _IceErrorBadMajor (
+ IceConn /* iceConn */,
+diff -Naur libICE-1.0.9.orig/src/process.c libICE-1.0.9/src/process.c
+--- libICE-1.0.9.orig/src/process.c 2014-06-07 10:28:43.000000000 +0900
++++ libICE-1.0.9/src/process.c 2015-05-24 18:20:23.000000000 +0900
+@@ -856,7 +856,8 @@
+ )
+ {
+ iceConnectionSetupMsg *message;
+- int myVersionCount, hisVersionCount;
++ const int myVersionCount = _IceVersionCount;
++ int hisVersionCount;
+ int myVersionIndex, hisVersionIndex;
+ int hisMajorVersion, hisMinorVersion;
+ int myAuthCount, hisAuthCount;
+@@ -926,7 +927,6 @@
+ }
+
+ hisVersionCount = message->versionCount;
+- myVersionCount = _IceVersionCount;
+
+ hisVersionIndex = myVersionIndex = found = 0;
+
+@@ -2551,7 +2551,7 @@
+ *replyReadyRet = replyReady;
+ }
+
+-int _IceVersionCount = 1;
+-_IceVersion _IceVersions[] = {
+- {IceProtoMajor, IceProtoMinor, _IceProcessCoreMessage}};
++const int _IceVersionCount = 1;
++const _IceVersion _IceVersions[] = {
++ {IceProtoMajor, IceProtoMinor,
_IceProcessCoreMessage}};
+

[SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (96a2506240ce0bf955e6925c2a5cae076771c892), Treeve Jelbert, 05/24/2015