diff options
| author | Florian Franzmann | 2022-05-21 23:56:08 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2022-05-23 18:01:25 +0200 |
| commit | 531439626e32170d271ae42db05983937d565259 (patch) | |
| tree | f937802b429b54b44a83fff26d57aebcbbe06be7 | |
| parent | 67835473458763540bbfc14a5d760a1cd129ea95 (diff) | |
xorg-app/xdm: replace patch with config option
| -rw-r--r-- | xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch | 22 | ||||
| -rwxr-xr-x | xorg-app/xdm/BUILD | 2 | ||||
| -rw-r--r-- | xorg-app/xdm/HISTORY | 5 | ||||
| -rwxr-xr-x | xorg-app/xdm/PRE_BUILD | 2 |
4 files changed, 7 insertions, 24 deletions
diff --git a/xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch b/xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch deleted file mode 100644 index 17d2d24dd2..0000000000 --- a/xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f8e1ba94509391955b0bffffb11f2ec3bed55bf1 Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> -Date: Fri, 15 Mar 2013 20:34:51 +0100 -Subject: [PATCH] use X's default authentication mechanism instead of xdm's - specific one - ---- - config/xdm-config.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp -index a685129..5203cce 100644 ---- a/config/xdm-config.in -+++ b/config/xdm-config.in -@@ -37,3 +37,4 @@ DisplayManager*loginmoveInterval: 10 - ! SECURITY: do not listen for XDMCP or Chooser requests - ! Comment out this line if you want to manage X terminals with xdm - DisplayManager.requestPort: 0 -+DisplayManager*authName: MIT-MAGIC-COOKIE-1 --- -1.8.1.3 - diff --git a/xorg-app/xdm/BUILD b/xorg-app/xdm/BUILD index 1bda793005..4d9e137e37 100755 --- a/xorg-app/xdm/BUILD +++ b/xorg-app/xdm/BUILD @@ -1,3 +1,5 @@ OPTS="$XDM_OPTS $OPTS --with-xdmconfigdir=\"$INSTALL_ROOT/etc/X11/xdm\"" && +OPTS+=" --disable-xdm-auth" && +OPTS+=" --disable-static" && default_build diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY index acbfeaf29e..8169b4f7f4 100644 --- a/xorg-app/xdm/HISTORY +++ b/xorg-app/xdm/HISTORY @@ -1,3 +1,8 @@ +2022-05-21 Florian Franzmann <bwlf@bandrate.org> + * 0001-use-X-s-default-authentication-mechanism-instead-of-.patch, + BUILD: disable xdm's authentication with config option instead of + patch + 2022-04-04 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1.13 diff --git a/xorg-app/xdm/PRE_BUILD b/xorg-app/xdm/PRE_BUILD index 2680a1442c..ebb921b6e1 100755 --- a/xorg-app/xdm/PRE_BUILD +++ b/xorg-app/xdm/PRE_BUILD @@ -1,8 +1,6 @@ default_pre_build && cd "${SOURCE_DIRECTORY}" && -patch -p1 < "${SPELL_DIRECTORY}/0001-use-X-s-default-authentication-mechanism-instead-of-.patch" && - if [[ $XDM_XCONSOLE == "n" ]]; then patch -p1 < "$SPELL_DIRECTORY/0001-do-not-start-xconsole.patch" fi |