pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/libX11 libX11: update to 1.7.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/7d05b8685140
branches: trunk
changeset: 454162:7d05b8685140
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Jun 06 21:05:08 2021 +0000
description:
libX11: update to 1.7.2.
This is a bug fix release, correcting a regression [1] introduced by and
improving the checks from the fix for CVE-2021-31535.
[1] https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/133
Alan Coopersmith (1):
libX11 1.7.2
Matthieu Herrb (2):
include <limits.h> always, not if HAVE_CONFIG_H is set.
Check for NULL strings before getting their lengths
Tobias Stoeckmann (1):
Protect against overly long strings
diffstat:
x11/libX11/Makefile | 4 +-
x11/libX11/distinfo | 14 ++++----
x11/libX11/patches/patch-Makefile.in | 12 +++---
x11/libX11/patches/patch-ac | 61 +++++++++++++++++------------------
4 files changed, 44 insertions(+), 47 deletions(-)
diffs (152 lines):
diff -r dd4c2cd09404 -r 7d05b8685140 x11/libX11/Makefile
--- a/x11/libX11/Makefile Sun Jun 06 17:00:02 2021 +0000
+++ b/x11/libX11/Makefile Sun Jun 06 21:05:08 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2021/05/18 16:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2021/06/06 21:05:08 wiz Exp $
-DISTNAME= libX11-1.7.1
+DISTNAME= libX11-1.7.2
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
diff -r dd4c2cd09404 -r 7d05b8685140 x11/libX11/distinfo
--- a/x11/libX11/distinfo Sun Jun 06 17:00:02 2021 +0000
+++ b/x11/libX11/distinfo Sun Jun 06 21:05:08 2021 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.37 2021/05/18 16:31:33 wiz Exp $
+$NetBSD: distinfo,v 1.38 2021/06/06 21:05:08 wiz Exp $
-SHA1 (libX11-1.7.1.tar.bz2) = 5c605b8e3f0d310d68193555d95f11c7e002945a
-RMD160 (libX11-1.7.1.tar.bz2) = c43b7769bd9443d014a7e07257254d39516bd4ea
-SHA512 (libX11-1.7.1.tar.bz2) = a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
-Size (libX11-1.7.1.tar.bz2) = 2426509 bytes
-SHA1 (patch-Makefile.in) = a38502ac45908a4a8d57de42e301894a2e9f8a15
+SHA1 (libX11-1.7.2.tar.bz2) = ff503c816f1e812070ac0e1841bc3634c3b370b6
+RMD160 (libX11-1.7.2.tar.bz2) = ea685d299dc697d81747c2abcbd018d3d523796f
+SHA512 (libX11-1.7.2.tar.bz2) = d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
+Size (libX11-1.7.2.tar.bz2) = 2392982 bytes
+SHA1 (patch-Makefile.in) = fc23ec24244e1c7213fca3bdc09adca6b379839a
SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
-SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e
+SHA1 (patch-ac) = 84bad85defd7cdac82fe4448d723c80469507f73
SHA1 (patch-src_xkb_XKBBind.c) = 3ad94bd3265c3c4a85bcf3e2da0782c16fd461d1
diff -r dd4c2cd09404 -r 7d05b8685140 x11/libX11/patches/patch-Makefile.in
--- a/x11/libX11/patches/patch-Makefile.in Sun Jun 06 17:00:02 2021 +0000
+++ b/x11/libX11/patches/patch-Makefile.in Sun Jun 06 21:05:08 2021 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.6 2020/11/20 20:42:53 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.7 2021/06/06 21:05:08 wiz Exp $
Avoid unnecessary auto* due to patch-aa modifying configure.ac.
---- Makefile.in.orig 2020-11-20 19:08:19.000000000 +0000
+--- Makefile.in.orig 2021-06-06 16:49:02.000000000 +0000
+++ Makefile.in
-@@ -95,8 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+@@ -92,8 +92,7 @@ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
+ $(top_srcdir)/m4/ax_gcc_builtin.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
+am__configure_deps =
diff -r dd4c2cd09404 -r 7d05b8685140 x11/libX11/patches/patch-ac
--- a/x11/libX11/patches/patch-ac Sun Jun 06 17:00:02 2021 +0000
+++ b/x11/libX11/patches/patch-ac Sun Jun 06 21:05:08 2021 +0000
@@ -1,63 +1,60 @@
-$NetBSD: patch-ac,v 1.13 2014/05/30 12:51:29 wiz Exp $
+$NetBSD: patch-ac,v 1.14 2021/06/06 21:05:08 wiz Exp $
See patch-aa.
---- configure.orig 2013-09-09 01:37:35.000000000 +0000
+--- configure.orig 2021-06-06 16:49:01.000000000 +0000
+++ configure
-@@ -20104,43 +20104,18 @@ $as_echo "#define XUSE_MTSAFE_API 1" >>c
+@@ -22009,42 +22009,16 @@ printf "%s\n" "#define XUSE_MTSAFE_API 1
;;
esac
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5
--$as_echo_n "checking for pthread_self in -lc... " >&6; }
--if ${ac_cv_lib_c_pthread_self+:} false; then :
-- $as_echo_n "(cached) " >&6
-+ac_fn_c_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h>
-+"
-+if test "x$ac_cv_have_decl_pthread_self" = xyes; then :
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5
+-printf %s "checking for pthread_self in -lc... " >&6; }
+-if test ${ac_cv_lib_c_pthread_self+y}
++ac_fn_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h>
++" "$ac_c_undeclared_builtin_options" "CFLAGS"
++if test "x$ac_cv_have_decl_pthread_self" = xyes
+ then :
+- printf %s "(cached) " >&6
+ ac_have_decl=1
- else
+ else $as_nop
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-+ ac_have_decl=0
-+fi
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
-char pthread_self ();
-int
--main ()
+-main (void)
-{
-return pthread_self ();
- ;
- return 0;
-}
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_PTHREAD_SELF $ac_have_decl
- _ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"
+-then :
- ac_cv_lib_c_pthread_self=yes
--else
+-else $as_nop
- ac_cv_lib_c_pthread_self=no
-fi
--rm -f core conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5
--$as_echo "$ac_cv_lib_c_pthread_self" >&6; }
--if test "x$ac_cv_lib_c_pthread_self" = xyes; then :
-+if test $ac_have_decl = 1; then :
++ ac_have_decl=0
+ fi
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5
+-printf "%s\n" "$ac_cv_lib_c_pthread_self" >&6; }
+-if test "x$ac_cv_lib_c_pthread_self" = xyes
++printf "%s\n" "#define HAVE_DECL_PTHREAD_SELF $ac_have_decl" >>confdefs.h
++if test $ac_have_decl = 1
+ then :
thrstubs="no"
- else
- thrstubs="yes"
-@@ -20161,12 +20136,12 @@ if test x$xthreads = xyes ; then
+ else $as_nop
+@@ -22066,12 +22040,12 @@ if test x$xthreads = xyes ; then
linux*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
netbsd*)
Home |
Main Index |
Thread Index |
Old Index