Pullup ticket #5823 - requested by bsiegert x11/libX11: security update Revisions pulled up: - x11/libX11/Makefile 1.46 - x11/libX11/PLIST 1.14 - x11/libX11/distinfo 1.28 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: wiz Date: Tue Aug 21 19:29:48 UTC 2018 Modified Files: pkgsrc/x11/libX11: Makefile PLIST distinfo Log Message: libX11: update to 1.6.6. Security fix release. Alan Coopersmith (6): Make Xkb{Get,Set}NamedIndicator spec & manpages match code Clarify state parameter to XkbSetNamedDeviceIndicator Improve table formatting in XkbChangeControls & XkbKeyNumGroups man pages If XGetImage fails to create image, don't dereference it to bounds check Use size_t for buffer sizes in SetHints.c Change fall through comment in lcDB.c to match gcc's requirements Arthur Huillet (1): _XDefaultError: set XlibDisplayIOError flag before calling exit Bhavi Dhingra (1): Fix possible memory leak in cmsProp.c:140 Martin Natano (1): Don't rebuild ks_tables.h if nothing changed. Matthieu Herrb (2): Remove statement with no effect. libX11 1.6.6 Michal Srb (1): Use flexible array member instead of fake size. Ryan C. Gordon (1): Valgrind fix for XStoreColor and XStoreColors. Samuel Thibault (1): XkbOpenDisplay.3: fix typo Tobias Stoeckmann (4): Validation of server response in XListHosts. Fixed off-by-one writes (CVE-2018-14599). Fixed out of boundary write (CVE-2018-14600). Fixed crash on invalid reply (CVE-2018-14598). walter harms (13): fix shadow warning _XIOError(dpy); will never return so remore dead remove argument check for free() adjust one inden fix shadow char_size fix more shadow warning no need to check argument for _XkbFree() remove stray extern no need to check args for Xfree() fix memleak in error path fix memleak in error path no need to check XFree arguments mark _XDefaultIOError as no_return Fixes: warning: variable 'req' set but not,used wharms (3): add _X_UNUSED to avoid unused variable warnings remove empty line silence gcc warning assignment discards 'const' qualifier from pointer target type To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/libX11/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libX11/PLIST cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/libX11/distinfodiff -r1.45 -r1.45.4.1 pkgsrc/x11/libX11/Makefile
(spz)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.45 2018/03/07 11:57:35 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.45.4.1 2018/09/10 07:14:59 spz Exp $ | |
2 | 2 | |||
3 | DISTNAME= libX11-1.6.5 | 3 | DISTNAME= libX11-1.6.6 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= x11 devel | 4 | CATEGORIES= x11 devel | |
6 | MASTER_SITES= ${MASTER_SITE_XORG:=lib/} | 5 | MASTER_SITES= ${MASTER_SITE_XORG:=lib/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
8 | 7 | |||
9 | MAINTAINER= joerg@NetBSD.org | 8 | MAINTAINER= joerg@NetBSD.org | |
10 | HOMEPAGE= http://xorg.freedesktop.org/ | 9 | HOMEPAGE= http://xorg.freedesktop.org/ | |
11 | COMMENT= Base X libraries from modular Xorg X11 | 10 | COMMENT= Base X libraries from modular Xorg X11 | |
12 | LICENSE= mit | 11 | LICENSE= mit | |
13 | 12 | |||
14 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
15 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
16 | USE_TOOLS+= gmake pkg-config | 15 | USE_TOOLS+= gmake pkg-config | |
17 | 16 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.13 2016/10/04 21:58:10 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.13.16.1 2018/09/10 07:14:59 spz Exp $ | |
2 | include/X11/ImUtil.h | 2 | include/X11/ImUtil.h | |
3 | include/X11/XKBlib.h | 3 | include/X11/XKBlib.h | |
4 | include/X11/Xcms.h | 4 | include/X11/Xcms.h | |
5 | include/X11/Xlib-xcb.h | 5 | include/X11/Xlib-xcb.h | |
6 | include/X11/Xlib.h | 6 | include/X11/Xlib.h | |
7 | include/X11/XlibConf.h | 7 | include/X11/XlibConf.h | |
8 | include/X11/Xlibint.h | 8 | include/X11/Xlibint.h | |
9 | include/X11/Xlocale.h | 9 | include/X11/Xlocale.h | |
10 | include/X11/Xregion.h | 10 | include/X11/Xregion.h | |
11 | include/X11/Xresource.h | 11 | include/X11/Xresource.h | |
12 | include/X11/Xutil.h | 12 | include/X11/Xutil.h | |
13 | include/X11/cursorfont.h | 13 | include/X11/cursorfont.h | |
14 | lib/libX11-xcb.la | 14 | lib/libX11-xcb.la | |
@@ -668,26 +668,27 @@ man/man3/XkbGetIndicatorChanges.3 | @@ -668,26 +668,27 @@ man/man3/XkbGetIndicatorChanges.3 | |||
668 | man/man3/XkbGetIndicatorMap.3 | 668 | man/man3/XkbGetIndicatorMap.3 | |
669 | man/man3/XkbGetIndicatorState.3 | 669 | man/man3/XkbGetIndicatorState.3 | |
670 | man/man3/XkbGetKeyActions.3 | 670 | man/man3/XkbGetKeyActions.3 | |
671 | man/man3/XkbGetKeyBehaviors.3 | 671 | man/man3/XkbGetKeyBehaviors.3 | |
672 | man/man3/XkbGetKeyExplicitComponents.3 | 672 | man/man3/XkbGetKeyExplicitComponents.3 | |
673 | man/man3/XkbGetKeyModifierMap.3 | 673 | man/man3/XkbGetKeyModifierMap.3 | |
674 | man/man3/XkbGetKeySyms.3 | 674 | man/man3/XkbGetKeySyms.3 | |
675 | man/man3/XkbGetKeyTypes.3 | 675 | man/man3/XkbGetKeyTypes.3 | |
676 | man/man3/XkbGetKeyVirtualModMap.3 | 676 | man/man3/XkbGetKeyVirtualModMap.3 | |
677 | man/man3/XkbGetKeyboard.3 | 677 | man/man3/XkbGetKeyboard.3 | |
678 | man/man3/XkbGetKeyboardByName.3 | 678 | man/man3/XkbGetKeyboardByName.3 | |
679 | man/man3/XkbGetMap.3 | 679 | man/man3/XkbGetMap.3 | |
680 | man/man3/XkbGetNameChanges.3 | 680 | man/man3/XkbGetNameChanges.3 | |
681 | man/man3/XkbGetNamedDeviceIndicator.3 | |||
681 | man/man3/XkbGetNamedGeometry.3 | 682 | man/man3/XkbGetNamedGeometry.3 | |
682 | man/man3/XkbGetNamedIndicator.3 | 683 | man/man3/XkbGetNamedIndicator.3 | |
683 | man/man3/XkbGetNames.3 | 684 | man/man3/XkbGetNames.3 | |
684 | man/man3/XkbGetSlowKeysDelay.3 | 685 | man/man3/XkbGetSlowKeysDelay.3 | |
685 | man/man3/XkbGetState.3 | 686 | man/man3/XkbGetState.3 | |
686 | man/man3/XkbGetStickyKeysOptions.3 | 687 | man/man3/XkbGetStickyKeysOptions.3 | |
687 | man/man3/XkbGetUpdatedMap.3 | 688 | man/man3/XkbGetUpdatedMap.3 | |
688 | man/man3/XkbGetVirtualMods.3 | 689 | man/man3/XkbGetVirtualMods.3 | |
689 | man/man3/XkbGetXlibControls.3 | 690 | man/man3/XkbGetXlibControls.3 | |
690 | man/man3/XkbIgnoreExtension.3 | 691 | man/man3/XkbIgnoreExtension.3 | |
691 | man/man3/XkbInitCanonicalKeyTypes.3 | 692 | man/man3/XkbInitCanonicalKeyTypes.3 | |
692 | man/man3/XkbKeyAction.3 | 693 | man/man3/XkbKeyAction.3 | |
693 | man/man3/XkbKeyActionEntry.3 | 694 | man/man3/XkbKeyActionEntry.3 | |
@@ -748,26 +749,27 @@ man/man3/XkbSetAccessXTimeout.3 | @@ -748,26 +749,27 @@ man/man3/XkbSetAccessXTimeout.3 | |||
748 | man/man3/XkbSetAutoRepeatRate.3 | 749 | man/man3/XkbSetAutoRepeatRate.3 | |
749 | man/man3/XkbSetAutoResetControls.3 | 750 | man/man3/XkbSetAutoResetControls.3 | |
750 | man/man3/XkbSetBounceKeysDelay.3 | 751 | man/man3/XkbSetBounceKeysDelay.3 | |
751 | man/man3/XkbSetCompatMap.3 | 752 | man/man3/XkbSetCompatMap.3 | |
752 | man/man3/XkbSetControls.3 | 753 | man/man3/XkbSetControls.3 | |
753 | man/man3/XkbSetDebuggingFlags.3 | 754 | man/man3/XkbSetDebuggingFlags.3 | |
754 | man/man3/XkbSetDetectableAutoRepeat.3 | 755 | man/man3/XkbSetDetectableAutoRepeat.3 | |
755 | man/man3/XkbSetDeviceButtonActions.3 | 756 | man/man3/XkbSetDeviceButtonActions.3 | |
756 | man/man3/XkbSetDeviceInfo.3 | 757 | man/man3/XkbSetDeviceInfo.3 | |
757 | man/man3/XkbSetIgnoreLockMods.3 | 758 | man/man3/XkbSetIgnoreLockMods.3 | |
758 | man/man3/XkbSetIndicatorMap.3 | 759 | man/man3/XkbSetIndicatorMap.3 | |
759 | man/man3/XkbSetMap.3 | 760 | man/man3/XkbSetMap.3 | |
760 | man/man3/XkbSetModActionVMods.3 | 761 | man/man3/XkbSetModActionVMods.3 | |
762 | man/man3/XkbSetNamedDeviceIndicator.3 | |||
761 | man/man3/XkbSetNamedIndicator.3 | 763 | man/man3/XkbSetNamedIndicator.3 | |
762 | man/man3/XkbSetNames.3 | 764 | man/man3/XkbSetNames.3 | |
763 | man/man3/XkbSetPtrActionX.3 | 765 | man/man3/XkbSetPtrActionX.3 | |
764 | man/man3/XkbSetPtrActionY.3 | 766 | man/man3/XkbSetPtrActionY.3 | |
765 | man/man3/XkbSetServerInternalMods.3 | 767 | man/man3/XkbSetServerInternalMods.3 | |
766 | man/man3/XkbSetXlibControls.3 | 768 | man/man3/XkbSetXlibControls.3 | |
767 | man/man3/XkbTranslateKeyCode.3 | 769 | man/man3/XkbTranslateKeyCode.3 | |
768 | man/man3/XkbTranslateKeySym.3 | 770 | man/man3/XkbTranslateKeySym.3 | |
769 | man/man3/XkbUpdateMapFromCore.3 | 771 | man/man3/XkbUpdateMapFromCore.3 | |
770 | man/man3/XkbVirtualModsToReal.3 | 772 | man/man3/XkbVirtualModsToReal.3 | |
771 | man/man3/XmbDrawImageString.3 | 773 | man/man3/XmbDrawImageString.3 | |
772 | man/man3/XmbDrawString.3 | 774 | man/man3/XmbDrawString.3 | |
773 | man/man3/XmbDrawText.3 | 775 | man/man3/XmbDrawText.3 |
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.27 2017/02/27 09:09:50 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.27.14.1 2018/09/10 07:14:59 spz Exp $ | |
2 | 2 | |||
3 | SHA1 (libX11-1.6.5.tar.bz2) = c32155467508dfe783f9296ef22ee6ed53cae7df | 3 | SHA1 (libX11-1.6.6.tar.bz2) = b29cf4362b58188cb27fed2294788004af7428a9 | |
4 | RMD160 (libX11-1.6.5.tar.bz2) = 2839f7f1510e5f7da5744a693c2a577d1390c84b | 4 | RMD160 (libX11-1.6.6.tar.bz2) = 9a770d0209c2e6ea77aa8e73e699772dc58d685e | |
5 | SHA512 (libX11-1.6.5.tar.bz2) = 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0 | 5 | SHA512 (libX11-1.6.6.tar.bz2) = 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7 | |
6 | Size (libX11-1.6.5.tar.bz2) = 2361556 bytes | 6 | Size (libX11-1.6.6.tar.bz2) = 2342730 bytes | |
7 | SHA1 (patch-Makefile.in) = 93d3b8d9882babf70788e984884a9db46a5367ef | 7 | SHA1 (patch-Makefile.in) = 93d3b8d9882babf70788e984884a9db46a5367ef | |
8 | SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649 | 8 | SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649 | |
9 | SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e | 9 | SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e |