diff options
| author | Treeve Jelbert | 2019-07-15 09:09:29 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2019-07-15 09:09:29 +0200 |
| commit | cea45ab1ab1cf727ca78e4cd300a349220731249 (patch) | |
| tree | c1a86347521aea7ae36b23f8fca4061eb4c8f8fe /xorg-lib | |
| parent | 570491fd5ca336790d69e86021f5d4b97e5385eb (diff) | |
libice-1.0.10 SECURITY FIX
Diffstat (limited to 'xorg-lib')
| -rwxr-xr-x | xorg-lib/libice/DETAILS | 14 | ||||
| -rw-r--r-- | xorg-lib/libice/HISTORY | 6 | ||||
| -rwxr-xr-x | xorg-lib/libice/PRE_BUILD | 4 | ||||
| -rw-r--r-- | xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch | 80 |
4 files changed, 14 insertions, 90 deletions
diff --git a/xorg-lib/libice/DETAILS b/xorg-lib/libice/DETAILS index a2f177f6aa..6387377a55 100755 --- a/xorg-lib/libice/DETAILS +++ b/xorg-lib/libice/DETAILS @@ -1,13 +1,15 @@ SPELL=libice PKG=libICE - VERSION=1.0.9 - SOURCE_HASH=sha512:daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7 + VERSION=1.0.10 + SECURITY_PATCH=1 SOURCE=${PKG}-${VERSION}.tar.bz2 - SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE} -# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH" + SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/lib/${SOURCE} + SOURCE2=$SOURCE.sig + SOURCE2_URL[0]=${SOURCE_URL[0]}.sig + SOURCE_GPG=xorg.gpg:$SOURCE.sig:UPSTREAM_KEY + SOURCE2_IGNORE=signature SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION} - PATCHLEVEL=1 - WEB_SITE=http://xorg.freedesktop.org + WEB_SITE=https://xorg.freedesktop.org ENTERED=20051125 LICENSE[0]=XCL SHORT="Inter-Client Exchange library for X11" diff --git a/xorg-lib/libice/HISTORY b/xorg-lib/libice/HISTORY index 2e1fa23f51..278e76fc48 100644 --- a/xorg-lib/libice/HISTORY +++ b/xorg-lib/libice/HISTORY @@ -1,3 +1,9 @@ +2019-07-15 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.0.10 + SECURITY_PATCH=1 fixes CVE-2017-2626 + * DETAILS: add gpg checking + * PRE_BUILD libICE-1.0.9-gcc-array-bound-fix.patch: deleted + 2018-02-09 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: remove trailing && diff --git a/xorg-lib/libice/PRE_BUILD b/xorg-lib/libice/PRE_BUILD deleted file mode 100755 index 68258a0248..0000000000 --- a/xorg-lib/libice/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 718822b47c..0000000000 --- a/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -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}}; - |