diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2021-08-09 18:18:33 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2021-08-09 20:15:04 +0000 |
| commit | 49a90dc82f1fb8f49c98f505d3b6ac811ea47884 (patch) | |
| tree | 5322aaec3b2362792c733864520440d510cdd0b7 /x11/cde/files | |
| parent | ea46c60b62e15e7370387bcb7b472905a269a566 (diff) | |
| download | ports-49a90dc82f1fb8f49c98f505d3b6ac811ea47884.tar.gz ports-49a90dc82f1fb8f49c98f505d3b6ac811ea47884.zip | |
x11/cde: Update to 2.4.0
This commit updates x11/cde from 2.3.2 to 2.4.0. 2.4.0 fixes a local
privilege escalation in dteseesion, DtSvc.
Other changes include:
- 2.4.0 builds under FreeBSD 14-CURRENT using both poudriere (as before)
and now directly on the command line using make.
- i386 is now broken because it cannot bind to a temporary of type va_list.
- This commit also changes maintainership to myself (cy) as requested
by crees (maintainer) in PR/257148.
PR: 257148
Submitted by: cy
Reported by: cy
Approved by: crees
MFH: 2021-Q3
Security: CVE-2020-2696/VU#308289
Security: VuXML: 848bdd06-f93a-11eb-9f7d-206a8a720317
Diffstat (limited to 'x11/cde/files')
| -rw-r--r-- | x11/cde/files/patch-lib_DtSearch_raima_dbtype.h | 13 | ||||
| -rw-r--r-- | x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c | 13 |
2 files changed, 5 insertions, 21 deletions
diff --git a/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h b/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h deleted file mode 100644 index 62e45563ea85..000000000000 --- a/x11/cde/files/patch-lib_DtSearch_raima_dbtype.h +++ /dev/null @@ -1,13 +0,0 @@ -Remove unnecessary and conflicting global variable - ---- lib/DtSearch/raima/dbtype.h.orig 2021-02-11 09:26:30.733694000 +0000 -+++ lib/DtSearch/raima/dbtype.h 2021-02-11 09:25:05.275302000 +0000 -@@ -405,7 +405,7 @@ - struct sk { - INT sk_fld; - CHAR_P sk_val; --} __SK__; -+}; - typedef struct { struct sk *ptr; LOCK_DESC } SK_P; - - /* node key search path stack entry: one per level per key field */ diff --git a/x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c b/x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c index 2bfa483e6ffa..ab3f91b3887e 100644 --- a/x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c +++ b/x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c @@ -1,14 +1,11 @@ -We don't use inetd-- that involves messing with inetd.conf. May as well -just launch as a daemon, which also deals with rpcbind dependency. - ---- programs/dtcm/dtcm/calendarA.c.orig 2016-09-14 10:18:38 UTC -+++ programs/dtcm/dtcm/calendarA.c -@@ -2051,7 +2051,7 @@ error_open(Calendar *c) { +--- programs/dtcm/dtcm/calendarA.c.orig 2021-07-03 12:35:15.000000000 -0700 ++++ programs/dtcm/dtcm/calendarA.c 2021-07-12 13:58:22.306477000 -0700 +@@ -2047,7 +2047,7 @@ set_message(c->message_text, buf); - sprintf(buf, "%s\n%s: %s, %s: %s", catgets(c->DT_catd, 1, 91, + sprintf(buf, "%s\n%s: %s, %s: %s", CATGETS(c->DT_catd, 1, 91, - "rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin inetd.conf for rpc.cmsd is correct for your host."), -+ "rpc.cmsd is not responding for your user name.\nMake sure that rpc.cmsd is running and enabled\nin /etc/rc.conf (dtcms_enable=yes)."), ++ "rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin /etc/rc.conf for rpc.cmsd is correct for your host."), nl_user, name, nl_host, host); |