[packages/gpm] - rediffed
hawk
hawk at pld-linux.org
Sat Dec 2 17:21:37 CET 2023
commit 80f4ae18635de18624d5134024e4814b606c47c2
Author: Marcin Krol <hawk at tld-linux.org>
Date: Sat Dec 2 17:21:25 2023 +0100
- rediffed
glibc.patch | 99 ++++++++++++++-----------------------------------------
gpm-gawk.patch | 7 ++--
gpm-nodebug.patch | 16 +++++----
3 files changed, 37 insertions(+), 85 deletions(-)
---
diff --git a/glibc.patch b/glibc.patch
index ad31e0b..d87fe3f 100644
--- a/glibc.patch
+++ b/glibc.patch
@@ -10,12 +10,14 @@ found.
src/daemon/open_console.c | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
-index 4d6c0af..6dd43e6 100644
---- a/src/daemon/open_console.c
-+++ b/src/daemon/open_console.c
-@@ -24,6 +24,10 @@
- #include <sys/types.h> /* major() */
+diff -urNp -x '*.orig' gpm-1.20.7.org/src/daemon/open_console.c gpm-1.20.7/src/daemon/open_console.c
+--- gpm-1.20.7.org/src/daemon/open_console.c 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/daemon/open_console.c 2023-12-02 17:21:16.152842561 +0100
+@@ -21,8 +21,13 @@
+
+ #include <fcntl.h> /* open and co. */
+ #include <sys/stat.h> /* stat() */
++#include <sys/types.h> /* major() */
#include <sys/ioctl.h> /* ioctl */
+#ifdef HAVE_SYS_SYSMACROS_H
@@ -25,34 +27,9 @@ index 4d6c0af..6dd43e6 100644
/* Linux specific (to be outsourced in gpm2 */
#include <linux/serial.h> /* for serial console check */
#include <asm/ioctls.h> /* for serial console check */
-From d88fb1de5803c366ab62f7de9ee5d83207fb2afe Mon Sep 17 00:00:00 2001
-From: Dima Krasner <dima at dimakrasner.com>
-Date: Wed, 12 Nov 2014 23:06:46 +0200
-Subject: [PATCH] Added musl support to libgpm and the daemon.
-
----
- src/daemon/open_console.c | 1 +
- src/prog/display-buttons.c | 1 +
- src/prog/display-coords.c | 1 +
- src/prog/gpm-root.y | 4 ++--
- 4 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
-index 98297c9..4d6c0af 100644
---- a/src/daemon/open_console.c
-+++ b/src/daemon/open_console.c
-@@ -21,6 +21,7 @@
-
- #include <fcntl.h> /* open and co. */
- #include <sys/stat.h> /* stat() */
-+#include <sys/types.h> /* major() */
- #include <sys/ioctl.h> /* ioctl */
-
- /* Linux specific (to be outsourced in gpm2 */
-diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c
-index de8e5b2..38d2f11 100644
---- a/src/prog/display-buttons.c
-+++ b/src/prog/display-buttons.c
+diff -urNp -x '*.orig' gpm-1.20.7.org/src/prog/display-buttons.c gpm-1.20.7/src/prog/display-buttons.c
+--- gpm-1.20.7.org/src/prog/display-buttons.c 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/prog/display-buttons.c 2023-12-02 17:21:16.152842561 +0100
@@ -36,6 +36,7 @@
#include <stdio.h> /* printf() */
#include <time.h> /* time() */
@@ -61,11 +38,10 @@ index de8e5b2..38d2f11 100644
#include <gpm.h> /* gpm information */
/* display resulting data */
-diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c
-index 1fb810f..82afd12 100644
---- a/src/prog/display-coords.c
-+++ b/src/prog/display-coords.c
-@@ -38,6 +38,7 @@
+diff -urNp -x '*.orig' gpm-1.20.7.org/src/prog/display-coords.c gpm-1.20.7/src/prog/display-coords.c
+--- gpm-1.20.7.org/src/prog/display-coords.c 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/prog/display-coords.c 2023-12-02 17:21:16.152842561 +0100
+@@ -37,6 +37,7 @@
#include <stdio.h> /* printf() */
#include <time.h> /* time() */
#include <errno.h> /* errno */
@@ -73,48 +49,21 @@ index 1fb810f..82afd12 100644
#include <gpm.h> /* gpm information */
/* display resulting data */
-diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
-index 069d801..188ae35 100644
---- a/src/prog/gpm-root.y
-+++ b/src/prog/gpm-root.y
-@@ -1199,9 +1199,9 @@ int main(int argc, char **argv)
- #if defined(__GLIBC__)
- __sigemptyset(&childaction.sa_mask);
- #else /* __GLIBC__ */
-- childaction.sa_mask=0;
-+ sigemptyset(&childaction.sa_mask);
- #endif /* __GLIBC__ */
-- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
-+ childaction.sa_flags=0;
- sigaction(SIGCHLD,&childaction,NULL);
-
- /*....................................... Connect and get your buffer */
-From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sun, 25 Jun 2017 07:25:33 -0700
-Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
-
-__sigemptyset has been removed from glibc public
-API headers in upcoming (2.26) release onwards
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- src/prog/gpm-root.y | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
-index 5126c65..76c896c 100644
---- a/src/prog/gpm-root.y
-+++ b/src/prog/gpm-root.y
-@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
+diff -urNp -x '*.orig' gpm-1.20.7.org/src/prog/gpm-root.y gpm-1.20.7/src/prog/gpm-root.y
+--- gpm-1.20.7.org/src/prog/gpm-root.y 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/prog/gpm-root.y 2023-12-02 17:21:16.153842574 +0100
+@@ -1196,12 +1196,8 @@ int main(int argc, char **argv)
LOG_DAEMON : LOG_USER);
/* reap your zombies */
childaction.sa_handler=reap_children;
-#if defined(__GLIBC__)
- __sigemptyset(&childaction.sa_mask);
-#else /* __GLIBC__ */
- sigemptyset(&childaction.sa_mask);
+- childaction.sa_mask=0;
-#endif /* __GLIBC__ */
- childaction.sa_flags=0;
+- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
++ sigemptyset(&childaction.sa_mask);
++ childaction.sa_flags=0;
sigaction(SIGCHLD,&childaction,NULL);
+ /*....................................... Connect and get your buffer */
diff --git a/gpm-gawk.patch b/gpm-gawk.patch
index 964a733..321142a 100644
--- a/gpm-gawk.patch
+++ b/gpm-gawk.patch
@@ -1,6 +1,7 @@
---- ./doc/Makefile.in.orgnl Mon Mar 11 23:57:59 2002
-+++ ./doc/Makefile.in Tue Mar 12 00:23:14 2002
-@@ -52,11 +52,11 @@
+diff -urNp -x '*.orig' gpm-1.20.7.org/doc/Makefile.in gpm-1.20.7/doc/Makefile.in
+--- gpm-1.20.7.org/doc/Makefile.in 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/doc/Makefile.in 2023-12-02 17:20:44.433452706 +0100
+@@ -54,12 +54,12 @@ all: $(srcdir)/gpm.info gpm.man
# TXT (-)
%.txt: %.info
diff --git a/gpm-nodebug.patch b/gpm-nodebug.patch
index 5637bc1..bba6d59 100644
--- a/gpm-nodebug.patch
+++ b/gpm-nodebug.patch
@@ -1,6 +1,7 @@
---- gpm-1.20.1/src/lib/report-lib.c.orig Sat Feb 23 16:42:23 2002
-+++ gpm-1.20.1/src/lib/report-lib.c Fri May 3 20:16:02 2002
-@@ -36,13 +36,13 @@
+diff -urNp -x '*.orig' gpm-1.20.7.org/src/lib/report-lib.c gpm-1.20.7/src/lib/report-lib.c
+--- gpm-1.20.7.org/src/lib/report-lib.c 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/lib/report-lib.c 2023-12-02 17:21:05.021705751 +0100
+@@ -36,13 +36,13 @@ void gpm_report(int line, char *file, in
switch(stat) {
case GPM_STAT_INFO : string = GPM_TEXT_INFO ;
@@ -16,13 +17,14 @@
case GPM_STAT_OOPS : string = GPM_TEXT_OOPS;
log_level = LOG_CRIT; break;
}
---- gpm-1.20.0/src/report.c.orig Sat Feb 23 16:42:23 2002
-+++ gpm-1.20.0/src/report.c Fri May 3 20:12:51 2002
-@@ -130,6 +130,7 @@
+diff -urNp -x '*.orig' gpm-1.20.7.org/src/report.c gpm-1.20.7/src/report.c
+--- gpm-1.20.7.org/src/report.c 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7/src/report.c 2023-12-02 17:21:05.021705751 +0100
+@@ -138,6 +138,7 @@ void gpm_report(int line, char *file, in
case GPM_RUN_DAEMON:
switch(stat) {
case GPM_STAT_INFO:
+ break;
#ifdef HAVE_VSYSLOG
syslog(LOG_INFO | LOG_USER, GPM_STRING_INFO);
- vsyslog(LOG_INFO | LOG_USER, text, ap);
+ vsyslog(LOG_INFO | LOG_USER, text, ap2);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gpm.git/commitdiff/80f4ae18635de18624d5134024e4814b606c47c2
More information about the pld-cvs-commit
mailing list