diff --git a/.gitignore b/.gitignore index e69de29..ca8c949 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,74 @@ +iceauth-1.0.2.tar.bz2 +rgb-1.0.1.tar.bz2 +sessreg-1.0.4.tar.bz2 +xcmsdb-1.0.1.tar.bz2 +xhost-1.0.2.tar.bz2 +xmodmap-1.0.3.tar.bz2 +xsetpointer-1.0.1.tar.bz2 +xsetroot-1.0.2.tar.bz2 +xstdcmap-1.0.1.tar.bz2 +xvidtune-1.0.1.tar.bz2 +iceauth-1.0.3.tar.bz2 +sessreg-1.0.5.tar.bz2 +xmodmap-1.0.4.tar.bz2 +rgb-1.0.3.tar.bz2 +xhost-1.0.3.tar.bz2 +xsetroot-1.0.3.tar.bz2 +xrandr-1.3.3.tar.bz2 +/iceauth-1.0.4.tar.bz2 +/rgb-1.0.4.tar.bz2 +/sessreg-1.0.5.tar.bz2 +/xhost-1.0.4.tar.bz2 +/xmodmap-1.0.5.tar.bz2 +/xrandr-1.3.4.tar.bz2 +/xsetpointer-1.0.1.tar.bz2 +/xsetroot-1.1.0.tar.bz2 +/xstdcmap-1.0.2.tar.bz2 +xrdb-1.0.7.tar.bz2 +xrefresh-1.0.4.tar.bz2 +xset-1.2.1.tar.bz2 +xgamma-1.0.4.tar.bz2 +/xrdb-1.0.9.tar.bz2 +/xset-1.2.2.tar.bz2 +/iceauth-1.0.5.tar.bz2 +/sessreg-1.0.6.tar.bz2 +/xrandr-1.3.5.tar.bz2 +/xinput-1.5.3.tar.bz2 +/xkill-1.0.3.tar.bz2 +/xinput-1.5.4.tar.bz2 +/xinput-1.5.99.901.tar.bz2 +/xinput-1.6.0.tar.bz2 +/xrandr-1.4.0.tar.bz2 +/rgb-1.0.5.tar.bz2 +/sessreg-1.0.8.tar.bz2 +/xgamma-1.0.5.tar.bz2 +/xhost-1.0.5.tar.bz2 +/xmodmap-1.0.7.tar.bz2 +/xsetroot-1.1.1.tar.bz2 +/xstdcmap-1.0.3.tar.bz2 +/xrdb-1.1.0.tar.bz2 +/xmodmap-1.0.8.tar.bz2 +/xkill-1.0.4.tar.bz2 +/xinput-1.6.1.tar.bz2 +/iceauth-1.0.6.tar.bz2 +/xhost-1.0.6.tar.bz2 +/xrandr-1.4.2.tar.bz2 +/xrefresh-1.0.5.tar.bz2 +/xset-1.2.3.tar.bz2 +/xrandr-1.4.3.tar.bz2 +/rgb-1.0.6.tar.bz2 +/iceauth-1.0.7.tar.bz2 +/sessreg-1.1.0.tar.bz2 +/xmodmap-1.0.9.tar.bz2 +/xgamma-1.0.6.tar.bz2 +/xhost-1.0.7.tar.bz2 +/xinput-1.6.2.tar.bz2 +/xrandr-1.5.0.tar.bz2 +/iceauth-1.0.8.tar.bz2 +/xkill-1.0.5.tar.bz2 +/xrdb-1.1.1.tar.bz2 +/xrefresh-1.0.6.tar.bz2 +/xset-1.2.4.tar.bz2 +/xsetroot-1.1.2.tar.bz2 +/xinput-1.6.3.tar.bz2 +/xisxwayland-1.tar.xz diff --git a/0001-Replace-strncpy-calls-with-a-sane-version-that-alway.patch b/0001-Replace-strncpy-calls-with-a-sane-version-that-alway.patch new file mode 100644 index 0000000..812321e --- /dev/null +++ b/0001-Replace-strncpy-calls-with-a-sane-version-that-alway.patch @@ -0,0 +1,107 @@ +From c52a3a649fa5366f6933cdbaff331361dfd638c7 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 12 Sep 2018 14:46:05 +1000 +Subject: [PATCH app/sessreg] Replace strncpy calls with a sane version that + always terminates + +Fixes coverity complaints about potentially unterminated strings +--- + sessreg.c | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/sessreg.c b/sessreg.c +index 0a8fdb2..7725bcc 100644 +--- a/sessreg.c ++++ b/sessreg.c +@@ -192,6 +192,14 @@ sysnerr (int x, const char *s) + return x; + } + ++static void ++safe_strncpy(char *dest, const char *src, size_t n) ++{ ++ (void)strncpy(dest, src, n); ++ if (n > 0) ++ dest[n - 1] = '\0'; ++} ++ + int + main (int argc, char **argv) + { +@@ -406,9 +414,9 @@ main (int argc, char **argv) + memset(&ll, 0, sizeof(ll)); + ll.ll_time = current_time; + if (line) +- (void) strncpy (ll.ll_line, line, sizeof (ll.ll_line)); ++ safe_strncpy (ll.ll_line, line, sizeof (ll.ll_line)); + if (host_name) +- (void) strncpy (ll.ll_host, host_name, sizeof (ll.ll_host)); ++ safe_strncpy (ll.ll_host, host_name, sizeof (ll.ll_host)); + + sysnerr (write (llog, (char *) &ll, sizeof (ll)) + == sizeof (ll), "write lastlog entry"); +@@ -429,11 +437,11 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a + { + memset (u, 0, sizeof (*u)); + if (line) +- (void) strncpy (u->ut_line, line, sizeof (u->ut_line)); ++ safe_strncpy (u->ut_line, line, sizeof (u->ut_line)); + else + memset (u->ut_line, 0, sizeof (u->ut_line)); + if (addp && user) +- (void) strncpy (u->ut_name, user, sizeof (u->ut_name)); ++ safe_strncpy (u->ut_name, user, sizeof (u->ut_name)); + else + memset (u->ut_name, 0, sizeof (u->ut_name)); + #ifdef HAVE_STRUCT_UTMP_UT_ID +@@ -451,7 +459,7 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a + i -= sizeof (u->ut_id); + else + i = 0; +- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id)); ++ safe_strncpy (u->ut_id, line + i, sizeof (u->ut_id)); + } else + memset (u->ut_id, 0, sizeof (u->ut_id)); + #endif +@@ -469,7 +477,7 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a + #endif + #ifdef HAVE_STRUCT_UTMP_UT_HOST + if (addp && host) +- (void) strncpy (u->ut_host, host, sizeof (u->ut_host)); ++ safe_strncpy (u->ut_host, host, sizeof (u->ut_host)); + else + memset (u->ut_host, 0, sizeof (u->ut_host)); + #endif +@@ -513,9 +521,9 @@ set_utmpx (struct utmpx *u, const char *line, const char *user, + if(strcmp(line, ":0") == 0) + (void) strcpy(u->ut_line, "console"); + else +- (void) strncpy (u->ut_line, line, sizeof (u->ut_line)); ++ safe_strncpy (u->ut_line, line, sizeof (u->ut_line)); + +- strncpy(u->ut_host, line, sizeof(u->ut_host)); ++ safe_strncpy(u->ut_host, line, sizeof(u->ut_host)); + #ifdef HAVE_STRUCT_UTMPX_UT_SYSLEN + u->ut_syslen = strlen(line); + #endif +@@ -523,7 +531,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user, + else + memset (u->ut_line, 0, sizeof (u->ut_line)); + if (addp && user) +- (void) strncpy (u->ut_user, user, sizeof (u->ut_user)); ++ safe_strncpy (u->ut_user, user, sizeof (u->ut_user)); + else + memset (u->ut_user, 0, sizeof (u->ut_user)); + +@@ -541,7 +549,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user, + i -= sizeof (u->ut_id); + else + i = 0; +- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id)); ++ safe_strncpy (u->ut_id, line + i, sizeof (u->ut_id)); + + /* make sure there is no entry using identical ut_id */ + if (!UtmpxIdOpen(u->ut_id) && addp) { +-- +2.17.1 + diff --git a/0001-sessreg-Replace-strncpy-calls-with-a-sane-version-that-alway.patch b/0001-sessreg-Replace-strncpy-calls-with-a-sane-version-that-alway.patch new file mode 100644 index 0000000..cb5215d --- /dev/null +++ b/0001-sessreg-Replace-strncpy-calls-with-a-sane-version-that-alway.patch @@ -0,0 +1,104 @@ +From eb22398e59ae2d17bfc444400cb688c82448cb92 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 12 Sep 2018 14:46:05 +1000 +Subject: [PATCH app/sessreg] Replace strncpy calls with a sane version that + always terminates + +Fixes coverity complaints about potentially unterminated strings +--- + sessreg.c | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + +diff --git a/sessreg.c b/sessreg.c +index 0a8fdb2..53b30b0 100644 +--- a/sessreg.c ++++ b/sessreg.c +@@ -192,6 +192,14 @@ sysnerr (int x, const char *s) + return x; + } + ++static void ++safe_strncpy(char *dest, const char *src, size_t n) ++{ ++ (void)strncpy(dest, src, n); ++ if (n > 0) ++ dest[n - 1] = '\0'; ++} ++ + int + main (int argc, char **argv) + { +@@ -406,9 +414,9 @@ main (int argc, char **argv) + memset(&ll, 0, sizeof(ll)); + ll.ll_time = current_time; + if (line) +- (void) strncpy (ll.ll_line, line, sizeof (ll.ll_line)); ++ safe_strncpy (ll.ll_line, line, sizeof (ll.ll_line)); + if (host_name) +- (void) strncpy (ll.ll_host, host_name, sizeof (ll.ll_host)); ++ safe_strncpy (ll.ll_host, host_name, sizeof (ll.ll_host)); + + sysnerr (write (llog, (char *) &ll, sizeof (ll)) + == sizeof (ll), "write lastlog entry"); +@@ -429,11 +437,11 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a + { + memset (u, 0, sizeof (*u)); + if (line) +- (void) strncpy (u->ut_line, line, sizeof (u->ut_line)); ++ safe_strncpy (u->ut_line, line, sizeof (u->ut_line)); + else + memset (u->ut_line, 0, sizeof (u->ut_line)); + if (addp && user) +- (void) strncpy (u->ut_name, user, sizeof (u->ut_name)); ++ safe_strncpy (u->ut_name, user, sizeof (u->ut_name)); + else + memset (u->ut_name, 0, sizeof (u->ut_name)); + #ifdef HAVE_STRUCT_UTMP_UT_ID +@@ -451,7 +459,7 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a + i -= sizeof (u->ut_id); + else + i = 0; +- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id)); ++ safe_strncpy (u->ut_id, line + i, sizeof (u->ut_id)); + } else + memset (u->ut_id, 0, sizeof (u->ut_id)); + #endif +@@ -469,7 +477,7 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a + #endif + #ifdef HAVE_STRUCT_UTMP_UT_HOST + if (addp && host) +- (void) strncpy (u->ut_host, host, sizeof (u->ut_host)); ++ safe_strncpy (u->ut_host, host, sizeof (u->ut_host)); + else + memset (u->ut_host, 0, sizeof (u->ut_host)); + #endif +@@ -513,7 +521,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user, + if(strcmp(line, ":0") == 0) + (void) strcpy(u->ut_line, "console"); + else +- (void) strncpy (u->ut_line, line, sizeof (u->ut_line)); ++ safe_strncpy (u->ut_line, line, sizeof (u->ut_line)); + + strncpy(u->ut_host, line, sizeof(u->ut_host)); + #ifdef HAVE_STRUCT_UTMPX_UT_SYSLEN +@@ -523,7 +531,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user, + else + memset (u->ut_line, 0, sizeof (u->ut_line)); + if (addp && user) +- (void) strncpy (u->ut_user, user, sizeof (u->ut_user)); ++ safe_strncpy (u->ut_user, user, sizeof (u->ut_user)); + else + memset (u->ut_user, 0, sizeof (u->ut_user)); + +@@ -541,7 +549,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user, + i -= sizeof (u->ut_id); + else + i = 0; +- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id)); ++ safe_strncpy (u->ut_id, line + i, sizeof (u->ut_id)); + + /* make sure there is no entry using identical ut_id */ + if (!UtmpxIdOpen(u->ut_id) && addp) { +-- +2.17.1 + diff --git a/0001-xrandr-init-the-name-to-0.patch b/0001-xrandr-init-the-name-to-0.patch new file mode 100644 index 0000000..55aad1c --- /dev/null +++ b/0001-xrandr-init-the-name-to-0.patch @@ -0,0 +1,41 @@ +From a2134406ab0aef44e7b710e1e2a2a40965e96692 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 13 Sep 2018 09:44:16 +1000 +Subject: [PATCH app/xrandr] init the name to 0 + +There are a few conditions where coverity finds a use of an uninitialized +field of the name_t struct. These are rather messy combinations of conditions, +so let's go with the simple solution here and just init everything to 0. +This may still have side-effects but at least they'll be more obvious than the +previous "use whatever memory is leftover from breakfast". + +This patch also adds a missing init_name(), much for the same reason. + +Signed-off-by: Peter Hutterer +--- + xrandr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xrandr.c b/xrandr.c +index 7f1e867..ce3cd91 100644 +--- a/xrandr.c ++++ b/xrandr.c +@@ -637,6 +637,7 @@ print_verbose_mode (const XRRModeInfo *mode, Bool current, Bool preferred) + static void + init_name (name_t *name) + { ++ memset(name, 0, sizeof(*name)); + name->kind = name_none; + } + +@@ -1822,6 +1823,7 @@ get_outputs (void) + output_t *output; + name_t output_name; + if (!output_info) fatal ("could not get output 0x%lx information\n", res->outputs[o]); ++ init_name(&output_name); + set_name_xid (&output_name, res->outputs[o]); + set_name_index (&output_name, o); + set_name_string (&output_name, output_info->name); +-- +2.17.1 + diff --git a/0001-xrandr-suppress-misleading-indentation-warning.patch b/0001-xrandr-suppress-misleading-indentation-warning.patch new file mode 100644 index 0000000..114baad --- /dev/null +++ b/0001-xrandr-suppress-misleading-indentation-warning.patch @@ -0,0 +1,47 @@ +From 215a01f1513f918e7295a8a477d4674f7b8085f0 Mon Sep 17 00:00:00 2001 +From: Giuseppe Bilotta +Date: Wed, 18 Jan 2017 08:52:23 +0100 +Subject: [PATCH app/xrandr] xrandr: suppress misleading indentation warning + +When printing out rotations, we print a space before any item other than +the first, and set `first = False` in each block where we print. +However, this is done in the same line as the conditional that checks if +first is set, which may give the impression that the assignment is also +under the conditional. This is not the case, and recent GCC warns about +this. + +Move the assignment to after we print the value we want to print, which +(1) doesn't mislead about the indentation, and +(2) makes logical sense as the _next_ entry is what won't be the first. + +Signed-off-by: Giuseppe Bilotta +--- + xrandr.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xrandr.c b/xrandr.c +index dcfdde0..2aad946 100644 +--- a/xrandr.c ++++ b/xrandr.c +@@ -3703,14 +3703,16 @@ main (int argc, char **argv) + printf (" ("); + for (i = 0; i < 4; i ++) { + if ((rotations >> i) & 1) { +- if (!first) printf (" "); first = False; ++ if (!first) printf (" "); + printf("%s", direction[i]); ++ first = False; + } + } + if (rotations & RR_Reflect_X) + { +- if (!first) printf (" "); first = False; ++ if (!first) printf (" "); + printf ("x axis"); ++ first = False; + } + if (rotations & RR_Reflect_Y) + { +-- +2.17.1 + diff --git a/sessreg-1.1.0-get-rid-of-sed.patch b/sessreg-1.1.0-get-rid-of-sed.patch new file mode 100644 index 0000000..a9f299f --- /dev/null +++ b/sessreg-1.1.0-get-rid-of-sed.patch @@ -0,0 +1,168 @@ +diff -Naur sessreg-1.1.0.old/man/filenames.sed.c sessreg-1.1.0/man/filenames.sed.c +--- sessreg-1.1.0.old/man/filenames.sed.c 2015-04-30 13:58:47.780569645 +0200 ++++ sessreg-1.1.0/man/filenames.sed.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,36 +0,0 @@ +-#include "sessreg.h" +- +-#ifdef UTMPX_FILE +-# define UTF UTMPX_FILE +-# define UTM utmpx +-/* delete utmp-only content */ +-/__BEGIN_UTMP_ONLY__/,/__END_UTMP_ONLY__/ d +-#else +-# define UTF UTMP_FILE +-# define UTM utmp +-/* delete utmpx-only content */ +-/__BEGIN_UTMPX_ONLY__/,/__END_UTMPX_ONLY__/ d +-#endif +- +-#ifdef WTMPX_FILE +-# define WTF WTMPX_FILE +-# define WTM wtmpx +-#else +-# define WTF WTMP_FILE +-# define WTM wtmp +-#endif +- +-#ifndef TTYS_FILE +-# define TTYS_FILE "/etc/ttys" +-#endif +- +-#ifndef LLOG_FILE +-# define LLOG_FILE "/var/log/lastlog" +-#endif +- +-s|__utmp_manpage__|UTM|g +-s|__utmp_file__|UTF|g +-s|__wtmp_manpage__|WTM|g +-s|__wtmp_file__|WTF|g +-s|__ttys_file__|TTYS_FILE|g +-s|__lastlog_file__|LLOG_FILE|g +diff -Naur sessreg-1.1.0.old/man/Makefile.am sessreg-1.1.0/man/Makefile.am +--- sessreg-1.1.0.old/man/Makefile.am 2015-04-30 13:58:47.780569645 +0200 ++++ sessreg-1.1.0/man/Makefile.am 2015-04-30 14:10:41.420249238 +0200 +@@ -3,20 +3,11 @@ + appman_PRE = sessreg.man + appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +-EXTRA_DIST = $(appman_PRE) filenames.sed.c +-CLEANFILES = $(appman_DATA) filenames.sed ++EXTRA_DIST = $(appman_PRE) ++CLEANFILES = $(appman_DATA) + SUFFIXES = .$(APP_MAN_SUFFIX) .man + + AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +-filenames.sed: filenames.sed.c +- $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \ +- $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@ +- +-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +-MAN_SUBSTS += -f filenames.sed +- +-sessreg.$(APP_MAN_SUFFIX): filenames.sed + + .man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +diff -Naur sessreg-1.1.0.old/man/sessreg.man sessreg-1.1.0/man/sessreg.man +--- sessreg-1.1.0.old/man/sessreg.man 2015-04-30 13:58:47.780569645 +0200 ++++ sessreg-1.1.0/man/sessreg.man 2015-04-30 14:11:47.134127555 +0200 +@@ -24,11 +24,11 @@ + .\" + .TH SESSREG __appmansuffix__ __xorgversion__ + .SH NAME +-sessreg \- manage __utmp_manpage__/__wtmp_manpage__ entries for non-init clients ++sessreg \- manage utmp (__filemansuffix__)/wtmp (__filemansuffix__) entries for non-init clients + .SH SYNOPSIS + .B sessreg +-[-w \fI__wtmp_manpage__-file\fP] +-[-u \fI__utmp_manpage__-file\fP] ++[-w \fIwtmp (__filemansuffix__)-file\fP] ++[-u \fIutmp (__filemansuffix__)-file\fP] + [-L \fIlastlog-file\fP] + [-l \fIline-name\fP] + [-h \fIhost-name\fP] +@@ -41,25 +41,25 @@ + \fIuser-name\fP + .SH DESCRIPTION + .PP +-\fISessreg\fP is a simple program for managing __utmp_manpage__/__wtmp_manpage__ and lastlog ++\fISessreg\fP is a simple program for managing utmp (__filemansuffix__)/wtmp (__filemansuffix__) and lastlog + entries for xdm sessions. + .\" __BEGIN_UTMP_ONLY__ + .PP + System V has a better interface to utmp than BSD; it + dynamically allocates entries in the file, instead of writing them at fixed + positions indexed by position in +-.BR __ttys_file__ . ++.BR /etc/ttys . + .PP + To manage BSD-style utmp files, \fIsessreg\fP has two strategies. In + conjunction with xdm, the -x option counts the number of lines in +-.B __ttys_file__ ++.B /etc/ttys + and then adds to that the number of the line in the Xservers file which + specifies the display. The display name must be specified as the + "line-name" using the -l option. This sum is used as the "slot-number" in + the utmp file that this entry will be written at. In the more general case, + the -s option specifies the slot-number directly. If for some strange reason + your system uses a file other than +-.B __ttys_file__ ++.B /etc/ttys + to manage init, the -t option can direct + \fIsessreg\fP to look elsewhere for a count of terminal sessions. + .PP +@@ -95,17 +95,17 @@ + sessreg -d -l $DISPLAY -x /etc/X11/xdm/Xservers $USER + .fi + .SH OPTIONS +-.IP "\fB-w\fP \fI__wtmp_manpage__-file\fP" +-This specifies an alternate __wtmp_manpage__ file, instead of +-.BR __wtmp_file__ . +-The special name "none" disables writing records to the __wtmp_manpage__ file. +-.IP "\fB-u\fP \fI__utmp_manpage__-file\fP" +-This specifies an alternate __utmp_manpage__ file, instead of +-.BR __utmp_file__ . +-The special name "none" disables writing records to the __utmp_manpage__ file. ++.IP "\fB-w\fP \fIwtmp (__filemansuffix__)-file\fP" ++This specifies an alternate wtmp (__filemansuffix__) file, instead of ++.BR /var/log/wtmp . ++The special name "none" disables writing records to the wtmp (__filemansuffix__) file. ++.IP "\fB-u\fP \fIutmp (__filemansuffix__)-file\fP" ++This specifies an alternate utmp (__filemansuffix__) file, instead of ++.BR /var/run/utmp . ++The special name "none" disables writing records to the utmp (__filemansuffix__) file. + .IP "\fB-L\fP \fIlastlog-file\fP" + This specifies an alternate lastlog file, instead of +-.BR __lastlog_file__ , ++.BR /var/log/lastlog , + if the platform supports lastlog files. + The special name "none" disables writing records to the lastlog file. + .IP "\fB-l\fP \fIline-name\fP" +@@ -122,7 +122,7 @@ + .\" __BEGIN_UTMP_ONLY__ + Each potential session has a unique slot number in BSD systems, most are + identified by the position of the \fIline-name\fP in the +-.BR __ttys_file__ file. ++.BR /etc/ttys file. + This option overrides the default position determined with ttyslot(__libmansuffix__). + This option is inappropriate for use with xdm, the -x option is more useful. + .\" __END_UTMP_ONLY__ +@@ -153,13 +153,13 @@ + .IP "\fB-V\fP" + This option causes the command to print its version and exit. + .IP "\fB-a\fP" +-This session should be added to __utmp_manpage__/__wtmp_manpage__. ++This session should be added to utmp/wtmp. + .IP "\fB-d\fP" +-This session should be deleted from __utmp_manpage__/__wtmp_manpage__. One of -a/-d must ++This session should be deleted from utmp/wtmp. One of -a/-d must + be specified. + .SH "SEE ALSO" + .BR xdm (__appmansuffix__), +-.BR __utmp_manpage__ (__filemansuffix__), +-.BR __wtmp_manpage__ (__filemansuffix__) ++.BR utmp (__filemansuffix__), ++.BR wtmp (__filemansuffix__) + .SH AUTHOR + Keith Packard, MIT X Consortium diff --git a/sources b/sources new file mode 100644 index 0000000..54f2c90 --- /dev/null +++ b/sources @@ -0,0 +1,16 @@ +SHA512 (iceauth-1.0.8.tar.bz2) = 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1 +SHA512 (rgb-1.0.6.tar.bz2) = 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e +SHA512 (sessreg-1.1.0.tar.bz2) = 5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116 +SHA512 (xgamma-1.0.6.tar.bz2) = 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a +SHA512 (xhost-1.0.7.tar.bz2) = 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7 +SHA512 (xinput-1.6.3.tar.bz2) = cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 +SHA512 (xkill-1.0.5.tar.bz2) = 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 +SHA512 (xmodmap-1.0.9.tar.bz2) = 6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac +SHA512 (xrandr-1.5.0.tar.bz2) = 11d8fb1b98fbe215555d5bb875d82f80a7fd6a61c93ebf175c226f4f747570e8d18980add54a4b88d20dc637155074b2a558b34f035d66a465f324281d65f9e4 +SHA512 (xrdb-1.1.1.tar.bz2) = 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f +SHA512 (xrefresh-1.0.6.tar.bz2) = 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674 +SHA512 (xset-1.2.4.tar.bz2) = f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d +SHA512 (xsetpointer-1.0.1.tar.bz2) = 1a462f70dde10c6ce92432440a9e718ba231c49ecbf68f0c2fd2276862edc4e9cd0dd5b6d71ad169b30e4cac7110278e4c8ed48eedd1d6cc0d1bd5e322bbcf58 +SHA512 (xsetroot-1.1.2.tar.bz2) = 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b +SHA512 (xstdcmap-1.0.3.tar.bz2) = 8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 +SHA512 (xisxwayland-1.tar.xz) = 9514442313cff4df0c71fed445ba0e3fe52f3c84ebbec81725a590f68cc42ea01ac96b23736a0108fe206da3aee48434c5c30d1c58905bfc75db35205c288bca diff --git a/xorg-x11-server-utils.rpmlintrc b/xorg-x11-server-utils.rpmlintrc new file mode 100644 index 0000000..8d0188a --- /dev/null +++ b/xorg-x11-server-utils.rpmlintrc @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* txt"); diff --git a/xorg-x11-server-utils.spec b/xorg-x11-server-utils.spec new file mode 100644 index 0000000..74ec83b --- /dev/null +++ b/xorg-x11-server-utils.spec @@ -0,0 +1,379 @@ +# doesn't work yet, needs more nickle bindings +%global with_xkeystone 0 + +# Component versions +%global iceauth 1.0.8 +%global rgb 1.0.6 +%global sessreg 1.1.0 +%global xgamma 1.0.6 +%global xhost 1.0.7 +%global xinput 1.6.3 +%global xkill 1.0.5 +%global xmodmap 1.0.9 +%global xrandr 1.5.0 +%global xrdb 1.1.1 +%global xrefresh 1.0.6 +%global xset 1.2.4 +%global xsetpointer 1.0.1 +%global xsetroot 1.1.2 +%global xstdcmap 1.0.3 +%global xisxwayland 1 + +Summary: X.Org X11 X server utilities +Name: xorg-x11-server-utils +Version: 7.7 +Release: 36%{?dist} +License: MIT +URL: http://www.x.org + +Source0: https://www.x.org/pub/individual/app/iceauth-%{iceauth}.tar.bz2 +Source1: https://www.x.org/pub/individual/app/rgb-%{rgb}.tar.bz2 +Source2: https://www.x.org/pub/individual/app/sessreg-%{sessreg}.tar.bz2 +Source3: https://www.x.org/pub/individual/app/xgamma-%{xgamma}.tar.bz2 +Source4: https://www.x.org/pub/individual/app/xhost-%{xhost}.tar.bz2 +Source5: https://www.x.org/pub/individual/app/xinput-%{xinput}.tar.bz2 +Source6: https://www.x.org/pub/individual/app/xkill-%{xkill}.tar.bz2 +Source7: https://www.x.org/pub/individual/app/xmodmap-%{xmodmap}.tar.bz2 +Source8: https://www.x.org/pub/individual/app/xrandr-%{xrandr}.tar.bz2 +Source9: https://www.x.org/pub/individual/app/xrdb-%{xrdb}.tar.bz2 +Source10: https://www.x.org/pub/individual/app/xrefresh-%{xrefresh}.tar.bz2 +Source11: https://www.x.org/pub/individual/app/xset-%{xset}.tar.bz2 +Source13: https://www.x.org/pub/individual/app/xsetpointer-%{xsetpointer}.tar.bz2 +Source14: https://www.x.org/pub/individual/app/xsetroot-%{xsetroot}.tar.bz2 +Source15: https://www.x.org/pub/individual/app/xstdcmap-%{xstdcmap}.tar.bz2 +Source16: https://www.x.org/pub/individual/app/xisxwayland-%{xisxwayland}.tar.xz + +Patch0: sessreg-1.1.0-get-rid-of-sed.patch +Patch2: 0001-sessreg-Replace-strncpy-calls-with-a-sane-version-that-alway.patch +Patch3: 0001-xrandr-suppress-misleading-indentation-warning.patch +Patch4: 0001-xrandr-init-the-name-to-0.patch + +BuildRequires: xorg-x11-util-macros + +BuildRequires: pkgconfig(xbitmaps) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xtrans) +BuildRequires: pkgconfig(xxf86vm) + +BuildRequires: libtool +BuildRequires: meson + +# xrdb, sigh +Requires: mcpp + +Provides: iceauth = %{iceauth} +Provides: sessreg = %{sessreg} +Provides: xgamma = %{xgamma} +Provides: xhost = %{xhost} +Provides: xinput = %{xinput} +Provides: xkill = %{xkill} +Provides: xmodmap = %{xmodmap} +Provides: xrandr = %{xrandr} +Provides: xrdb = %{xrdb} +Provides: xrefresh = %{xrefresh} +Provides: xset = %{xset} +Provides: xsetpointer = %{xsetpointer} +Provides: xsetroot = %{xsetroot} +Provides: xstdcmap = %{xstdcmap} + +%description +A collection of utilities used to tweak and query the runtime configuration of +the X server. + +%package -n rgb +Summary: X color name database +Version: %{rgb} +# rgb subpackaged from xorg-x11-server-utils-7.7-33.fc32, bug #1268295 +Conflicts: xorg-x11-server-utils < 7.7-33 + +%description -n rgb +This package includes both a list mapping X color names to RGB values +(rgb.txt) and an showrgb program to convert the text file into the source +format. + +%if %{with_xkeystone} +%package -n xkeystone +Summary: X display keystone correction +Requires: nickle + +%description -n xkeystone +Utility to perform keystone adjustments on X screens. +%endif + +%prep +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a13 -a14 -a15 -a16 +%patch0 +pushd sessreg-%{sessreg} +%patch2 -p1 +popd +pushd xrandr-%{xrandr} +%patch3 -p1 +%patch4 -p1 +popd + +%build + +# Build all apps +{ + for app in * ; do + pushd $app + case $app in + xrdb-*) + autoreconf -vif + %configure --disable-silent-rules --with-cpp=%{_bindir}/mcpp + make %{?_smp_mflags} + ;; + xisxwayland-*) + %meson + %meson_build + ;; + *) + autoreconf -vif + %configure --disable-silent-rules + make %{?_smp_mflags} + ;; + esac + + popd + done +} + +%install +# Install all apps +{ + for app in * ; do + pushd $app + case $app in + xisxwayland-*) + %meson_install + ;; + *) + %make_install + ;; + esac + popd + done +} +%if !%{with_xkeystone} +rm -f $RPM_BUILD_ROOT%{_bindir}/xkeystone +%endif + +%files +%doc +%{_bindir}/iceauth +%{_bindir}/sessreg +%{_bindir}/xgamma +%{_bindir}/xhost +%{_bindir}/xinput +%{_bindir}/xisxwayland +%{_bindir}/xkill +%{_bindir}/xmodmap +%{_bindir}/xrandr +%{_bindir}/xrdb +%{_bindir}/xrefresh +%{_bindir}/xset +%{_bindir}/xsetpointer +%{_bindir}/xsetroot +%{_bindir}/xstdcmap +%{_mandir}/man1/iceauth.1* +%{_mandir}/man1/sessreg.1* +%{_mandir}/man1/xgamma.1* +%{_mandir}/man1/xhost.1* +%{_mandir}/man1/xinput.1* +%{_mandir}/man1/xisxwayland.1* +%{_mandir}/man1/xkill.1* +%{_mandir}/man1/xmodmap.1* +%{_mandir}/man1/xrandr.1* +%{_mandir}/man1/xrdb.1* +%{_mandir}/man1/xrefresh.1* +%{_mandir}/man1/xset.1* +%{_mandir}/man1/xsetpointer.1* +%{_mandir}/man1/xsetroot.1* +%{_mandir}/man1/xstdcmap.1* + +%files -n rgb +%{_bindir}/showrgb +%{_datadir}/X11/rgb.txt +%{_mandir}/man1/showrgb.1* + +%if %{with_xkeystone} +%files -n xkeystone +%{_bindir}/xkeystone +%endif + +%changelog +* Wed Jul 29 2020 Fedora Release Engineering - 7.7-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 19 2020 Peter Hutterer 7.7-35 +- xisxwayland 1 + +* Fri Jan 31 2020 Fedora Release Engineering - 7.7-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Sep 11 2019 Petr Pisar - 7.7-33 +- Subpackage rgb (bug #1268295) + +* Sat Jul 27 2019 Fedora Release Engineering - 7.7-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Peter Hutterer 7.7-31 +- xinput 1.6.3 + +* Thu Jun 20 2019 Adam Jackson - 7.7-30 +- Drop BuildRequires: pkgconfig(xxf86misc), X servers haven't implemented that + extension in 10+ years. + +* Thu Mar 21 2019 Adam Jackson - 7.7-29 +- Rebuild for xtrans 1.4.0 + +* Sun Feb 03 2019 Fedora Release Engineering - 7.7-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Sep 12 2018 Peter Hutterer 7.7-27 +- Fix a bunch of coverity warnings +- disable silent rules + +* Sat Jul 14 2018 Fedora Release Engineering - 7.7-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 12 2018 Adam Jackson - 7.7-25 +- iceauth 1.0.8 +- xkill 1.0.5 +- xrdb 1.1.1 +- xrefresh 1.0.6 +- xset 1.2.4 +- xsetroot 1.1.2 +- HTTPS URLs + +* Fri Feb 09 2018 Fedora Release Engineering - 7.7-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 7.7-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 7.7-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 7.7-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Oct 26 2016 Peter Hutterer 7.7-20 +- Drop xsetmode. It's been broken for years + +* Tue Feb 23 2016 Simone Caronni - 7.7-19 +- xrandr 1.5.0 + +* Fri Feb 05 2016 Fedora Release Engineering - 7.7-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 20 2016 Peter Hutterer +- s/define/global/ + +* Tue Oct 20 2015 Peter Hutterer 7.7-17 +- xinput 1.6.2 + +* Fri Jun 19 2015 Fedora Release Engineering - 7.7-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 01 2015 Simone Caronni - 7.7-15 +- xgamma 1.0.6 +- xhost 1.0.7 + +* Thu Apr 30 2015 Simone Caronni - 7.7-14 +- xmodmap 1.0.9 +- Fix FTBFS Fedora 22 on sessreg. + +* Sat Feb 21 2015 Till Maas - 7.7-13 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Tue Jan 20 2015 Simone Caronni - 7.7-12 +- Update sessreg to 1.1.0. + +* Sat Jan 17 2015 Simone Caronni - 7.7-11 +- Update iceauth to 1.0.7. + +* Mon Nov 10 2014 Simone Caronni - 7.7-10 +- rgb 1.0.6 + +* Thu Oct 23 2014 Simone Caronni - 7.7-9 +- Clean up SPEC file, fix rpmlint warnings. + +* Wed Oct 01 2014 Adam Jackson 7.7-8 +- xrandr 1.4.3 + +* Mon Aug 18 2014 Fedora Release Engineering - 7.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jun 12 2014 Simone Caronni 7.7-6 +- iceauth 1.0.6 +- xhost 1.0.6 +- xrandr 1.4.2 +- xrefresh 1.0.5 +- xset 1.2.3 + +* Sun Jun 08 2014 Fedora Release Engineering - 7.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Sep 16 2013 Peter Hutterer 7.7-4 +- xinput 1.6.1 + +* Mon Sep 09 2013 Peter Hutterer 7.7-3 +- xmodmap 1.0.8 +- xkill 1.0.4 +- xrdb 1.1.0 + +* Sun Aug 04 2013 Fedora Release Engineering - 7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 27 2013 Adam Jackson 7.7-1 +- rgb 1.0.5 +- xsessreg 1.0.8 +- xgamma 1.0.5 +- xhost 1.0.5 +- xmodmap 1.0.7 +- xsetroot 1.1.1 +- xstdcmap 1.0.3 + +* Thu Mar 07 2013 Dave Airlie 7.5-17 +- autoconf for aarch64 + +* Wed Feb 13 2013 Benjamin Tissoires 7.5-16 +- xrandr 1.4.0 + +* Wed Jan 30 2013 Adam Jackson 7.5-15 +- Print primary output in xrandr + +* Wed Nov 14 2012 Adam Jackson 7.5-14 +- xinput 1.6.0 + +* Sun Jul 22 2012 Fedora Release Engineering - 7.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Apr 17 2012 Peter Hutterer 7.5-12 +- Add libXinerama-devel requires for new xinput + +* Tue Apr 17 2012 Peter Hutterer 7.5-11 +- xinput 1.5.99.901 + +* Sat Jan 14 2012 Fedora Release Engineering - 7.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 22 2011 Peter Hutterer 7.5-9 +- xinput 1.5.4 + +* Thu Nov 10 2011 Adam Jackson 7.5-8 +- Move xinput and xkill here from xorg-x11-apps + +* Mon Oct 10 2011 Matěj Cepl - 7.5-7 +- Fix BuildRequires ... xbitmaps-devel does not exist anymore (RHBZ #744751) +- Upgrade to the latest upstream iceauth, rgb, sessreg, and xrandr