[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/xserver/xorg-server][debian-unstable] 3 commits: Fix fuzz in apple silicon patch

Title: GitLab

Emilio Pozuelo Monfort pushed to branch debian-unstable at X Strike Force / xserver / xorg-server

Commits:

  • 624d67b9
    by Daniel Kahn Gillmor at 2025-02-11T18:44:48-05:00 
    Fix fuzz in apple silicon patch
  • b39f35ef
    by Daniel Kahn Gillmor at 2025-02-11T18:53:47-05:00 
    Use statically linked nettle from upstream

Upstream has merged this change, see
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1756

This should let us build the udeb cleanly, leaving the ability to
build against a non-static nettle in the normal build.
  • 292c59f7
    by Daniel Kahn Gillmor at 2025-02-11T18:58:45-05:00 
    Use nettle for sha1

The udeb build uses nettle for sha1.  There's no reason we can't use
nettle for the mainline build as well.  This reduces one
build-dependency.

6 changed files:

Changes:

  • debian/control
    ... ... @@ -20,7 +20,6 @@ Build-Depends:
    20 20 
      libxkbfile-dev (>= 1:0.99.1),
    21 21 
      libpixman-1-dev (>= 0.27.2),
    22 22 
      libpciaccess-dev (>= 0.12.901),
    23 
    - libgcrypt-dev,
    24 23 
      nettle-dev,
    25 24 
      libudev-dev (>= 151-3) [linux-any],
    26 25 
      libselinux1-dev (>= 2.0.80) [linux-any],

  • debian/patches/03_autotools-enable-static-use-of-Nettle-for-SHA1.diff
    1 
    +From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
    2 
    +Date: Fri, 3 Jan 2025 14:41:59 -0500
    3 
    +Subject: autotools: enable static use of Nettle for SHA1
    4 
    +
    5 
    +Debian builds xserver 21 using autotools.
    6 
    +
    7 
    +When debian builds xserver-xorg for constrained environments like the
    8 
    +installer, it wants to build against the static library of libnettle
    9 
    +for SHA1, see debian/patches/03_static-nettle.diff in the debian
    10 
    +repository at
    11 
    +https://salsa.debian.org/xorg-team/xserver/xorg-server.git
    12 
    +
    13 
    +This modification of configure.ac makes it possible to build static
    14 
    +nettle when needed, while preserving the build to use nettle with a
    15 
    +dynamic library when passing a different configuration option.
    16 
    +
    17 
    +Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1756>
    18 
    +(cherry picked from commit a651eefc9e525072d99413c1aeabd01858c50819)
    19 
    +---
    20 
    + configure.ac | 10 +++++++++-
    21 
    + 1 file changed, 9 insertions(+), 1 deletion(-)
    22 
    +
    23 
    +diff --git a/configure.ac b/configure.ac
    24 
    +index 7c24a74..fcdef39 100644
    25 
    +--- a/configure.ac
    26 
    ++++ b/configure.ac
    27 
    +@@ -1509,7 +1509,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
    28 
    +
    29 
    + # SHA1 hashing
    30 
    + AC_ARG_WITH([sha1],
    31 
    +-            [AS_HELP_STRING([--with-sha1=libc|libmd|libnettle|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI],
    32 
    ++            [AS_HELP_STRING([--with-sha1=libc|libmd|libnettle|nettlestatic|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI],
    33 
    +                             [choose SHA1 implementation])])
    34 
    + AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
    35 
    + if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
    36 
    +@@ -1584,6 +1584,14 @@ if test "x$with_sha1" = xlibnettle; then
    37 
    + 	          [Use libnettle SHA1 functions])
    38 
    + 	SHA1_LIBS=-lnettle
    39 
    + fi
    40 
    ++if test "x$with_sha1" = xnettlestatic && test "x$HAVE_LIBNETTLE" != xyes; then
    41 
    ++	AC_MSG_ERROR([nettlestatic requested but libnettle not found])
    42 
    ++fi
    43 
    ++if test "x$with_sha1" = xnettlestatic; then
    44 
    ++	AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
    45 
    ++	          [Use static libnettle SHA1 functions])
    46 
    ++	SHA1_LIBS=-l:libnettle.a
    47 
    ++fi
    48 
    + AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
    49 
    + if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
    50 
    + 	with_sha1=libgcrypt

  • debian/patches/03_static-nettle.diff deleted
    1 
    -Link against static libnettle
    2 
    -
    3 
    -There's no libnettle udeb.
    4 
    -
    5 
    ----
    6 
    - configure.ac |    2 +-
    7 
    - 1 file changed, 1 insertion(+), 1 deletion(-)
    8 
    -
    9 
    ---- a/configure.ac
    10 
    -+++ b/configure.ac
    11 
    -@@ -1582,7 +1582,7 @@ fi
    12 
    - if test "x$with_sha1" = xlibnettle; then
    13 
    - 	AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
    14 
    - 	          [Use libnettle SHA1 functions])
    15 
    --	SHA1_LIBS=-lnettle
    16 
    -+	SHA1_LIBS=-l:libnettle.a
    17 
    - fi
    18 
    - AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
    19 
    - if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then

  • debian/patches/08_apple_silicon_config.diff
    ... ... @@ -15,9 +15,9 @@ diff --git a/config/10-quirks.conf b/config/10-quirks.conf
    15 15 
     index 47907d8..54dd908 100644
    16 16 
     --- a/config/10-quirks.conf
    17 17 
     +++ b/config/10-quirks.conf
    18 
    -@@ -36,3 +36,13 @@ Section "InputClass"
    19 
    -         MatchDriver "evdev"
    20 
    -         Option "TypeName" "MOUSE"
    18 
    +@@ -46,3 +46,13 @@
    19 
    +         Driver "modesetting"
    20 
    +         Option "PrimaryGPU" "true"
    21 21 
      EndSection
    22 22 
     +
    23 23 
     +# https://bugzilla.redhat.com/show_bug.cgi?id=2152414

  • debian/patches/series
    1 
    -## Patches with a number < 100 are applied in debian.
    2 
    -## Ubuntu patches start with 100.
    3 1 
     02_kbsd-input-devd.diff
    4 
    -03_static-nettle.diff
    2 
    +03_autotools-enable-static-use-of-Nettle-for-SHA1.diff
    5 3 
     05_Revert-Unload-submodules.diff
    6 4 
     06_use-intel-only-on-pre-gen4.diff
    7 5 
     07_use-modesetting-driver-by-default-on-GeForce.diff

  • debian/rules.flags
    ... ... @@ -59,7 +59,7 @@ confflags_main = \
    59 59 
     	--enable-xnest \
    60 60 
     	--enable-kdrive \
    61 61 
     	--enable-xephyr \
    62 
    -	--with-sha1=libgcrypt \
    62 
    +	--with-sha1=libnettle \
    63 63 
     	--enable-xcsecurity \
    64 64 
     	$(void)
    65 65
    ... ... @@ -89,7 +89,7 @@ confflags_udeb = \
    89 89 
     	--disable-xnest \
    90 90 
     	--disable-kdrive \
    91 91 
     	--disable-xephyr \
    92 
    -	--with-sha1=libnettle \
    92 
    +	--with-sha1=nettlestatic \
    93 93 
     	$(void)
    94 94
    95 95 
     ifeq ($(DEB_HOST_ARCH_OS), linux)

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: