[gentoo-commits] gentoo commit in src/patchsets/gpm/1.20.1: 01_all_info.patch 03_all_DESTDIR.patch 04_all_root.patch 05_all_serialconsole.patch 08_all_nodebug.patch 09_all_logfillup.patch 10_all_link.patch 11_all_lib_segv.patch 12_all_linux26-dependcache.patch 20_all_gpm-1.20.1-subscript.patch 21_all_synps2-four-way-button.patch 25_all_gpm-mousewheel-support.patch 28_all_gpm-OPEN_MAX.patch 30_all_gpm-1.20.1-weak-wgetch.patch 40_all_gpm-daemon.patch 60_all_parallel-build.patch

[Mike Frysinger (vapier)]

vapier      08/04/20 03:00:09

  Added:                01_all_info.patch 03_all_DESTDIR.patch
                        04_all_root.patch 05_all_serialconsole.patch
                        08_all_nodebug.patch 09_all_logfillup.patch
                        10_all_link.patch 11_all_lib_segv.patch
                        12_all_linux26-dependcache.patch
                        20_all_gpm-1.20.1-subscript.patch
                        21_all_synps2-four-way-button.patch
                        25_all_gpm-mousewheel-support.patch
                        28_all_gpm-OPEN_MAX.patch
                        30_all_gpm-1.20.1-weak-wgetch.patch
                        40_all_gpm-daemon.patch 60_all_parallel-build.patch
  Log:
  relocate into versioned subdir

Revision  Changes    Path
1.1                  src/patchsets/gpm/1.20.1/01_all_info.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/01_all_info.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/01_all_info.patch?rev=1.1&content-type=text/plain

Index: 01_all_info.patch
===================================================================
Touch up the info headers.

diff -Nru gpm-1.19.6/doc/doc.gpm gpm-1.17.9.new/doc/doc.gpm
--- gpm-1.19.6/doc/doc.gpm.in	Fri Aug  6 07:35:33 1999
+++ gpm-1.19.6.new/doc/doc.gpm.in	Wed Sep  1 04:36:32 1999
@@ -34,9 +34,9 @@
 
 @ifinfo
 @format
-@dircategory Miscellaneous
+@dircategory Miscellaneous
 @direntry
-* Gpm: (gpm).   A server wich hands mouse events to non-X programs.
+* Gpm: (gpm).   Text-mode mouse library and srv daemon.
 @end direntry
 @end format
 @end ifinfo



1.1                  src/patchsets/gpm/1.20.1/03_all_DESTDIR.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/03_all_DESTDIR.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/03_all_DESTDIR.patch?rev=1.1&content-type=text/plain

Index: 03_all_DESTDIR.patch
===================================================================
We want to be able to install with `make install DESTDIR=$D`.

Supporting DESTDIR with `make install` is just good form anyways :)

diff -Nur gpm-1.20.1.orig/Makefile.in gpm-1.20.1/Makefile.in
--- gpm-1.20.1.orig/Makefile.in	Tue Dec 24 23:57:16 2002
+++ gpm-1.20.1/Makefile.in	Fri Jan 31 14:33:45 2003
@@ -50,9 +50,9 @@
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) $(STRIP)' install
 
 installdirs:
-	$(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \
+	$(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(includedir) $(DESTDIR)$(sysconfdir); \
 	if test "x@ELISP@" != "x" ; then \
-		$(MKDIR) $(lispdir) ; \
+		$(MKDIR) $(DESTDIR)$(lispdir) ; \
 	fi
 
 ### GENERIC
diff -Nur gpm-1.20.1.orig/Makefile.include.in gpm-1.20.1/Makefile.include.in
--- gpm-1.20.1.orig/Makefile.include.in	Tue Dec 24 23:57:16 2002
+++ gpm-1.20.1/Makefile.include.in	Fri Jan 31 14:34:04 2003
@@ -46,7 +46,7 @@
 TEX               = @TEX@
 TEXINDEX          = @TEXINDEX@
 DVIPS             = @DVIPS@
-MAKEINFO          = @MAKEINFO@ --no-split
+MAKEINFO          = @MAKEINFO@
 TEXI2HTML         = texi2html -monolithic
 STRIP             = -s
 
diff -Nur gpm-1.20.1.orig/contrib/Makefile.in gpm-1.20.1/contrib/Makefile.in
--- gpm-1.20.1.orig/contrib/Makefile.in	Tue Dec 24 23:57:16 2002
+++ gpm-1.20.1/contrib/Makefile.in	Fri Jan 31 14:30:12 2003
@@ -13,7 +13,7 @@
 
 install: all
 	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
-		$(INSTALL_DATA) $(srcdir)/$$i $(lispdir)/`basename $$i` ;\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(lispdir)/`basename $$i` ;\
 	done; fi
 
 %.elc: %.el
diff -Nur gpm-1.20.1.orig/doc/Makefile.in gpm-1.20.1/doc/Makefile.in
--- gpm-1.20.1.orig/doc/Makefile.in	Tue Dec 24 23:57:16 2002
+++ gpm-1.20.1/doc/Makefile.in	Fri Jan 31 14:29:48 2003
@@ -112,29 +112,15 @@
 # install & uninstall
 
 installdirs:	
-	$(MKDIR) $(man1dir) $(man7dir) $(man8dir) $(infodir)	
+	$(MKDIR) $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(infodir)	
 
 install:	all installdirs
-	$(INSTALL_DATA) -m 644 mev.1          $(man1dir)
-	$(INSTALL_DATA) -m 644 mouse-test.1   $(man1dir)
-	$(INSTALL_DATA) -m 644 gpm-root.1     $(man1dir)
-	$(INSTALL_DATA) -m 644 gpm-types.7    $(man7dir)
-	$(INSTALL_DATA) -m 644 gpm.8          $(man8dir)
-	$(INSTALL_DATA) -m 644 $(srcdir)/gpm.info       $(infodir)
-	# Use install-info if available
-	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  if [ -f $(infodir)/dir ] ; then \
-		install-info --dir-file=$(infodir)/dir $(infodir)/gpm.info; \
-	  fi; \
-	fi
-	#itz Sat Dec 26 23:21:05 PST 1998
-	#i keep all my infopages compressed and i'm tired to do it by
-	#hand, so check if there are any compressed pages and do this
-	#one too
-	-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
-		&& gzip -f $(infodir)/gpm.info
-	# Hmm.... shouldn't man pages be compressed too?
-   # maybe they should, but at least at my system they are not.
+	$(INSTALL_DATA) -m 644 mev.1          $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) -m 644 mouse-test.1   $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) -m 644 gpm-root.1     $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) -m 644 gpm-types.7    $(DESTDIR)$(man7dir)
+	$(INSTALL_DATA) -m 644 gpm.8          $(DESTDIR)$(man8dir)
+	$(INSTALL_DATA) -m 644 $(srcdir)/gpm.info       $(DESTDIR)$(infodir)
 
 # This potentially leaves around cached manpages,
 # e.g. /var/cache/man/cat1/mev.1.gz.  Deleting these is not our job,
diff -Nur gpm-1.20.1.orig/src/Makefile.in gpm-1.20.1/src/Makefile.in
--- gpm-1.20.1.orig/src/Makefile.in	Tue Dec 24 23:57:16 2002
+++ gpm-1.20.1/src/Makefile.in	Fri Jan 31 14:33:02 2003
@@ -91,15 +91,15 @@
 installdirs:
 
 install:	check 
-	$(INSTALL_PROGRAM) gpm $(sbindir)/gpm
-	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
-	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
+	$(INSTALL_PROGRAM) gpm $(DESTDIR)$(sbindir)/gpm
+	$(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a
+	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(DESTDIR)$(includedir)/gpm.h
 	# POSIX requires the range of a for loop be nonempty and Bash
 	# 2.x goes along; unfortunately that means an additional
 	# headache in cases like this
 	if test "x@SHLIB@" != "x" ; then \
-		$(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ;\
-		cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ;\
+		$(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(DESTDIR)$(libdir)/libgpm.so.@abi_full@ ;\
+		cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ;\
       echo "WARNING: We installed a lib, you should now call ldconfig" ; \
       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ;\
       echo "Or to update everything just type ldconfig"; \
@@ -107,7 +107,7 @@
 
    # prog/
 	for i in $(PROG); do \
-		$(INSTALL_PROGRAM) $$i $(bindir)/`echo $$i | sed 's,prog/,,'` ;\
+		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/`echo $$i | sed 's,prog/,,'` ;\
 	done
 
 install-strip:



1.1                  src/patchsets/gpm/1.20.1/04_all_root.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/04_all_root.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/04_all_root.patch?rev=1.1&content-type=text/plain

Index: 04_all_root.patch
===================================================================
Fixes root permissions for gpm.

--- ./src/prog/gpm-root.y.orgin	Sat Feb 23 16:42:23 2002
+++ ./src/prog/gpm-root.y	Mon Mar 11 17:32:37 2002
@@ -433,9 +433,10 @@
 /*====================================================================*/
 void f__fix(struct passwd *pass)
 {
-   setgid(pass->pw_gid);
-   initgroups(pass->pw_name, pass->pw_gid);
-   setuid(pass->pw_uid);
+   if (setgid(pass->pw_gid) < 0 ||
+   	initgroups(pass->pw_name, pass->pw_gid) < 0 ||
+   	setuid(pass->pw_uid) < 0)
+   exit(1);
    setenv("HOME",    pass->pw_dir, 1);
    setenv("LOGNAME", pass->pw_name,1);
    setenv("USER",    pass->pw_name,1);



1.1                  src/patchsets/gpm/1.20.1/05_all_serialconsole.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/05_all_serialconsole.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/05_all_serialconsole.patch?rev=1.1&content-type=text/plain

Index: 05_all_serialconsole.patch
===================================================================
Trying to run on a serial console doesn't make much sense :).

--- ./src/headers/message.h.org	Sat Feb 23 16:42:23 2002
+++ ./src/headers/message.h	Tue Mar 12 00:16:35 2002
@@ -125,6 +125,7 @@
 #define GPM_MESS_NOTWRITE           "Can you write to %s?"
 #define GPM_MESS_WRITE_ERR          "write(): %s"
 #define GPM_MESS_OPEN_CON           "Opening console failed."
+#define GPM_MESS_OPEN_SERIALCON     "We seem to be on a serial console."
 #define GPM_MESS_READ_FIRST         "Error in read()ing first: %s"
 #define GPM_MESS_READ_REST          "Error in read()ing rest: %s"
 #define GPM_MESS_REMOVE_FILES       "Removing files %s and %s"
--- ./src/gpm.c.org	Sat Feb 23 16:42:23 2002
+++ ./src/gpm.c	Tue Mar 12 00:20:19 2002
@@ -38,6 +38,7 @@
 #include <sys/un.h>        /* struct sockaddr_un */
 
 #include <linux/vt.h>      /* VT_GETSTATE */
+#include <linux/serial.h>  /* for serial console check */
 #include <sys/kd.h>        /* KDGETMODE */
 #include <termios.h>       /* winsize */
 
@@ -153,10 +154,23 @@
 static inline int open_console(const int mode)
 {
    int fd;
-
-   if ((fd=open(option.consolename, mode)) < 0)
-      gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN_CON);
+   struct stat sb;
+   int maj, twelve=12;
+   struct serial_struct si;
+
+   fd = open(option.consolename, mode);
+   if (fd != -1) {
+	   fstat(fd, &sb);
+	   maj = major(sb.st_rdev);
+	   if (maj != 4 && (maj < 136 || maj > 143)) {
+		   if (ioctl (fd, TIOCLINUX, &twelve) < 0) {
+			   if (si.line > 0)
+				   gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN_SERIALCON);
+		   }
+	   }
    return fd;
+   } else
+	gpm_report(GPM_PR_OOPS,GPM_MESS_OPEN_CON);
 }
 
 /*-------------------------------------------------------------------*/



1.1                  src/patchsets/gpm/1.20.1/08_all_nodebug.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/08_all_nodebug.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/08_all_nodebug.patch?rev=1.1&content-type=text/plain

Index: 08_all_nodebug.patch
===================================================================
Avoid useless debug info under certain circumstances.

--- 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
@@ -30,10 +30,10 @@
    va_start(ap,text);
 
    switch(stat) {
-      case GPM_STAT_INFO : string = GPM_TEXT_INFO ; break;
+      case GPM_STAT_INFO : string = GPM_TEXT_INFO ; return;
       case GPM_STAT_WARN : string = GPM_TEXT_WARN ; break;
       case GPM_STAT_ERR  : string = GPM_TEXT_ERR  ; break;
-      case GPM_STAT_DEBUG: string = GPM_TEXT_DEBUG; break;
+      case GPM_STAT_DEBUG: string = GPM_TEXT_DEBUG; return;
       case GPM_STAT_OOPS : string = GPM_TEXT_OOPS; break;
    }
    fprintf(stderr,"%s[%s(%d)]:\n",string,file,line);
--- 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 @@
       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);



1.1                  src/patchsets/gpm/1.20.1/09_all_logfillup.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/09_all_logfillup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/09_all_logfillup.patch?rev=1.1&content-type=text/plain

Index: 09_all_logfillup.patch
===================================================================
This is a fix for gpm bad tendency to fill multiple logs with the same info.

--- gpm-1.20.1/src/lib/liblow.c~	Sun Oct  6 10:36:25 2002
+++ gpm-1.20.1/src/lib/liblow.c	Sun Oct  6 10:36:25 2002
@@ -258,7 +258,7 @@
          /* do we really need this check ? */
          if(strncmp(tty,option.consolename,strlen(option.consolename)-1)
             || !isdigit(tty[strlen(option.consolename)-1])) {
-            gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed");
+           /* gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed"); */
             goto err;
          }
           
@@ -367,7 +367,7 @@
 
   /*....................................... Error: free all memory */
    err:
-   gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
+  /* gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! "); */
    do {
       new=gpm_stack->next;
       free(gpm_stack);



1.1                  src/patchsets/gpm/1.20.1/10_all_link.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/10_all_link.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/10_all_link.patch?rev=1.1&content-type=text/plain

Index: 10_all_link.patch
===================================================================
This is a patch that only uses -lm when necessary.  Also does some
linking cleanups, and links only with shared -lgpm.

--- gpm-1.20.1/src/Makefile.in.orig	Sat Feb  1 17:15:55 2003
+++ gpm-1.20.1/src/Makefile.in	Sat Feb  1 17:23:43 2003
@@ -70,6 +70,7 @@
 all:	gpm lib/@SHLIB@ lib/libgpm.a $(PROG)
 
 gpm:	$(GOBJ)
+	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
 
 # construct dependings of sourcefiles and link sourcefiles
 $(DEPFILE) dep: prog/gpm-root.c
@@ -139,13 +140,14 @@
 	$(YACC) $(YFLAGS) $< && mv y.tab.c prog/gpm-root.c
 
 # gpm-root needs an own rule, because gpm-root.c is not in $(srcdir)
-prog/gpm-root: prog/gpm-root.c
+prog/gpm-root: prog/gpm-root.c lib/libgpm.so
 	$(CC) -I. @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o $@.o $<
-	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $@.o @LIBS@ $(LIBS) lib/libgpm.a
+	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $@.o @LIBS@ $(LIBS) lib/libgpm.so
 
-prog/mouse-test:	mice.o twiddler.o synaptics.o
+prog/mouse-test:	prog/mouse-test.o mice.o twiddler.o synaptics.o
+	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $^ @LIBS@ $(LIBS) -lm
 
-$(PROG):	lib/libgpm.so lib/@SHLIB@ lib/libgpm.a
+$(PROG):	lib/libgpm.so
 
 # Subdirectory lib/
 lib/libgpm.a:	$(LOBJ)



1.1                  src/patchsets/gpm/1.20.1/11_all_lib_segv.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/11_all_lib_segv.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/11_all_lib_segv.patch?rev=1.1&content-type=text/plain

Index: 11_all_lib_segv.patch
===================================================================
This fixes mc, which was crashing without this simple little fix. :-)

--- gpm-1.20.1/src/lib/liblow.c.orig	Sat Feb  1 16:21:23 2003
+++ gpm-1.20.1/src/lib/liblow.c	Sat Feb  1 16:43:07 2003
@@ -199,6 +199,7 @@
    Gpm_Stst *new = NULL;
    char* sock_name = 0;
 
+   if(!checked_con)
    option.consolename = NULL;
 
    gpm_report(GPM_PR_DEBUG,"VC: %d",flag);



1.1                  src/patchsets/gpm/1.20.1/12_all_linux26-dependcache.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/12_all_linux26-dependcache.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/12_all_linux26-dependcache.patch?rev=1.1&content-type=text/plain

Index: 12_all_linux26-dependcache.patch
===================================================================
Prevent matching against invalid linux-2.6 headers.
See http://bugs.gentoo.org/show_bug.cgi?id=66222 for more info.

--- src/Makefile.in.orig	2004-10-31 17:23:16.412105664 +0000
+++ src/Makefile.in	2004-10-31 17:23:45.636055416 +0000
@@ -85,7 +85,7 @@
 	# create dependencies
 	for DEPS in `echo *.c */*.c`; do \
 	$(CC) -I. -I $(srcdir) -M @CPPFLAGS@ $(CPPFLAGS) $$DEPS | \
-	$(SED) 's/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'  >> $(DEPFILE) ; done
+	$(SED) 's/\($*\)\.o\([ :]+\)/\1.o \1.lo\2/g'  >> $(DEPFILE) ; done
 
 ### INSTALL
 check:	all



1.1                  src/patchsets/gpm/1.20.1/20_all_gpm-1.20.1-subscript.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/20_all_gpm-1.20.1-subscript.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/20_all_gpm-1.20.1-subscript.patch?rev=1.1&content-type=text/plain

Index: 20_all_gpm-1.20.1-subscript.patch
===================================================================
Taken from Fedora cvs.

gunze_calib is declared as int[4], so referring to idx #4 is 
obviously a bad idea :).

--- gpm-1.20.1/src/mice.c.lr	2004-02-15 09:19:48.000000000 +0100
+++ gpm-1.20.1/src/mice.c	2004-02-15 09:22:18.000000000 +0100
@@ -2112,7 +2112,7 @@
       for (i=0; i<4; i++)
          if (gunze_calib[i] & ~1023) calibok = 0;
       if (gunze_calib[0] == gunze_calib[2]) calibok = 0;
-      if (gunze_calib[1] == gunze_calib[4]) calibok = 0;
+      if (gunze_calib[1] == gunze_calib[3]) calibok = 0;
       fclose(f);
    }
    if (!calibok) {



1.1                  src/patchsets/gpm/1.20.1/21_all_synps2-four-way-button.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/21_all_synps2-four-way-button.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/21_all_synps2-four-way-button.patch?rev=1.1&content-type=text/plain

Index: 21_all_synps2-four-way-button.patch
===================================================================
Patch by Pavel Semerad.
http://bugs.gentoo.org/show_bug.cgi?id=36790

I found there are errors in synaptics.c source file. One is overwriting memory
(other variables) and second is assign of synaptics internal numbers to
state->buttons (struct Gpm_Event).

This patch solves it. Array boundaries must be set to 8, because of for
cycle in tp_process_repeating_actions(). And assign of last_4_way_buttons
cannot be done to state->buttons. I have commented it out (and it seems to
work), but may be this is not the correct solution.

--- ./src/synaptics.c.ps
+++ ./src/synaptics.c
@@ -830,9 +830,9 @@ static int           last_corner_action 
 static int           last_finger_action = GPM_B_NOT_SET;
 static int           last_normal_button_actions[6] = 
   {GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET};
-static int           last_stick_button_actions[3]  = 
+static int           last_stick_button_actions[8]  = 
   {GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET};
-static int           last_4_way_button_actions[4] =
+static int           last_4_way_button_actions[8] =
   {GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET,GPM_B_NOT_SET};
 
 /* toss status information */
@@ -1483,7 +1483,22 @@ static int syn_ps2_process_extended_pack
   }
 
   /* Multiplexing with the stick (guest) device. */
-  state->buttons |= last_4_way_buttons | last_stick_buttons;
+  if (stick_pressure_enabled) {
+    tmp_buttons = report->pressure == 0 ? GPM_B_NONE : last_stick_buttons;
+    if (tmp_buttons || last_stick_buttons) {
+      tp_process_repeating_actions(state,tmp_buttons,last_stick_buttons,
+				   &last_stick_button_actions[0],stick_actions);
+      last_stick_buttons = tmp_buttons;
+    }
+  }
+  if (four_way_button_enabled) {
+    tmp_buttons = report->pressure == 0 ? GPM_B_NONE : last_4_way_buttons;
+    if (tmp_buttons || last_4_way_buttons) {
+      tp_process_repeating_actions(state,tmp_buttons,last_4_way_buttons,
+				   &last_4_way_button_actions[0],four_button_actions);	  
+      last_4_way_buttons = tmp_buttons;
+    }
+  }
 
   return 0;
 }



1.1                  src/patchsets/gpm/1.20.1/25_all_gpm-mousewheel-support.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/25_all_gpm-mousewheel-support.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/25_all_gpm-mousewheel-support.patch?rev=1.1&content-type=text/plain

Index: 25_all_gpm-mousewheel-support.patch
===================================================================
Makes moving the mouse wheel in console equivalent to pressing the
arrow keys on your keyboard. It is done by writing the arrow key
codes to the terminal (Linux or VT compatible) whenever gpm detects
the wheels have spinned, similarly to how it pastes text on
pressing button 2.

Patch by Andrzej Zaborowski <balrog@×××××.org>

http://bugs.gentoo.org/101605

--- src/gpm.c
+++ src/gpm.c
@@ -184,6 +184,35 @@
 }
 
 /*-------------------------------------------------------------------*/
+/* Emits arrow keys to the console, according to mouse wheel movements */
+static inline void emit_keystrokes(int wdx, int wdy)
+{
+   /* TODO: use terminfo */
+   char c[6] = "\x1b[ABCD";
+   int fd;
+
+#define EMIT(n) {						\
+      if (ioctl(fd, TIOCSTI, c + 0) < 0)			\
+         gpm_report(GPM_PR_OOPS, GPM_MESS_IOCTL_TIOCLINUX);	\
+      if (ioctl(fd, TIOCSTI, c + 1) < 0)			\
+         gpm_report(GPM_PR_OOPS, GPM_MESS_IOCTL_TIOCLINUX);	\
+      if (ioctl(fd, TIOCSTI, c + n) < 0)			\
+         gpm_report(GPM_PR_OOPS, GPM_MESS_IOCTL_TIOCLINUX);	\
+   }
+
+   fd = open_console(O_WRONLY);
+   if (wdx > 0)
+      EMIT(4)
+   if (wdx < 0)
+      EMIT(5)
+   if (wdy > 0)
+      EMIT(2)
+   if (wdy < 0)
+      EMIT(3)
+   close(fd);
+}
+
+/*-------------------------------------------------------------------*/
 static inline void selection_copy(int x1, int y1, int x2, int y2, int mode)
 {
 /*
@@ -253,6 +282,8 @@
          if (x2<1) x2++; else if (x2>maxx) x2--;
          if (y2<1) y2++; else if (y2>maxy) y2--;
          selection_copy(x2,y2,x2,y2,3); /* just highlight pointer */
+         if (event->wdx || event->wdy) /* mouse wheel */
+            emit_keystrokes(event->wdx, event->wdy);
          return 0;
 
       case GPM_DRAG:
@@ -516,7 +547,8 @@
    /* up and down, up and down, ... who does a do..while(0) loop ???
       and then makes a break into it... argh ! */
 
-   if (!event->dx && !event->dy && (event->buttons==oldB))
+   if (!event->dx && !event->dy && !event->wdx && !event->wdy &&
+               (event->buttons==oldB))
       do { /* so to break */
          static long awaketime;
          /*



1.1                  src/patchsets/gpm/1.20.1/28_all_gpm-OPEN_MAX.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/28_all_gpm-OPEN_MAX.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/28_all_gpm-OPEN_MAX.patch?rev=1.1&content-type=text/plain

Index: 28_all_gpm-OPEN_MAX.patch
===================================================================
Get the value of max file descriptors dynamically.

http://bugs.gentoo.org/195977

--- a/src/prog/gpm-root.y
+++ b/src/prog/gpm-root.y
@@ -526,7 +526,9 @@ int f_bgcmd(int mode, DrawItem *self, int uid)
 	            open("/dev/null",O_RDONLY); /* stdin  */
 	            open(consolename,O_WRONLY); /* stdout */
 	            dup(1);                     /* stderr */  
-	            for (i=3;i<OPEN_MAX; i++) close(i);
+	            int open_max = sysconf(_SC_OPEN_MAX);
+	            if (open_max == -1) open_max = 1024;
+	            for (i=3;i<open_max; i++) close(i);
 	            execl("/bin/sh","sh","-c",self->arg,(char *)NULL);
 	            exit(1); /* shouldn't happen */
 	         default: return 0;
--- a/src/special.c
+++ b/src/special.c
@@ -156,7 +156,9 @@ int processSpecial(Gpm_Event *event)
       open(GPM_NULL_DEV,O_RDONLY); /* stdin  */
       open(console.device, O_WRONLY); /* stdout */
       dup(1);                     /* stderr */
-      for (i=3;i<OPEN_MAX; i++) close(i);
+      int open_max = sysconf(_SC_OPEN_MAX);
+      if (open_max == -1) open_max = 1024;
+      for (i=3;i<open_max; i++) close(i);
       execl("/bin/sh","sh","-c",command,(char *)NULL);
       exit(1); /* shouldn't happen */



1.1                  src/patchsets/gpm/1.20.1/30_all_gpm-1.20.1-weak-wgetch.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/30_all_gpm-1.20.1-weak-wgetch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/30_all_gpm-1.20.1-weak-wgetch.patch?rev=1.1&content-type=text/plain

Index: 30_all_gpm-1.20.1-weak-wgetch.patch
===================================================================
gpm has optional ncurses support while ncurses has optional gpm
support.  if both have the optional features enabled, we get a
sweet circular dependency (makes prelink angry).  so we disable
gpm's linking against ncurses and make the ncurses code work with
runtime checks.

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=117150
http://bugs.gentoo.org/show_bug.cgi?id=80942

--- gpm-1.20.1/src/lib/libcurses.c.weak-wgetch	2002-12-24 17:57:16.000000000 -0500
+++ gpm-1.20.1/src/lib/libcurses.c	2004-03-22 15:51:24.000000000 -0500
@@ -41,7 +41,12 @@
 #endif /* HAVE_NCURSES_CURSES_H */
 #endif /* HAVE_NCURSES_H */
 
-#define GET(win) ((win) ? wgetch(win) : getch())
+/* If win != NULL, it must have been created by ncurses anyway.
+   Avoid circular library dependencies.  */
+#pragma weak wgetch
+#pragma weak stdscr
+
+#define GET(win) ((win && wgetch) ? wgetch(win) : getch())
 
 int Gpm_Wgetch(WINDOW *win)
 {
--- gpm-1.20.1/configure.in.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
+++ gpm-1.20.1/configure.in	2004-03-22 15:51:24.000000000 -0500
@@ -115,7 +115,7 @@
             AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
         else :; fi
     done
-    SHARED_LIBS="$LIBS $TERMLIBS -lc"
+    SHARED_LIBS="-lc"
     LIBS=$SAVELIBS ;;
 esac    
 
--- gpm-1.20.1/configure.weak-wgetch	2004-03-22 15:49:55.000000000 -0500
+++ gpm-1.20.1/configure	2004-03-22 15:51:24.000000000 -0500
@@ -4295,7 +4295,7 @@
 
         else :; fi
     done
-    SHARED_LIBS="$LIBS $TERMLIBS -lc"
+    SHARED_LIBS="-lc"
     LIBS=$SAVELIBS ;;
 esac
 



1.1                  src/patchsets/gpm/1.20.1/40_all_gpm-daemon.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/40_all_gpm-daemon.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/40_all_gpm-daemon.patch?rev=1.1&content-type=text/plain

Index: 40_all_gpm-daemon.patch
===================================================================
Daemons should always close stdin, stdout and stderr after forking otherwise
the controlling terminal will have issues closing.
Examples include starting over ssh or baselayout-2
http://bugs.gentoo.org/182721

--- a/src/startup.c
+++ b/src/startup.c
@@ -29,7 +29,7 @@
 #include <sys/types.h>  /* geteuid, mknod */
 #include <sys/stat.h>   /* mknod */
 #include <fcntl.h>      /* mknod */
-#include <unistd.h>     /* mknod */
+#include <unistd.h>     /* mknod, daemon */
 
 
 #include "headers/gpmInt.h"
@@ -134,26 +134,17 @@
       }
    }
 
-   if(option.run_status == GPM_RUN_STARTUP ) { /* else is debugging */
-      /* goto background and become a session leader (Stefan Giessler) */  
-      switch(fork()) {
-         case -1: gpm_report(GPM_PR_OOPS,GPM_MESS_FORK_FAILED);   /* error  */
-         case  0: option.run_status = GPM_RUN_DAEMON; break;      /* child  */
-         default: _exit(0);                                       /* parent */
-      }
+   if (option.run_status == GPM_RUN_STARTUP ) { /* else is debugging */
+      if (daemon(0,0))
+         gpm_report(GPM_PR_OOPS,GPM_MESS_FORK_FAILED);   /* error  */
 
-      if (setsid() < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_SETSID_FAILED);
+      option.run_status = GPM_RUN_DAEMON; /* child  */
    }
 
    /* damon init: check whether we run or not, display message */
    check_uniqueness();
    gpm_report(GPM_PR_INFO,GPM_MESS_STARTED);
 
-   /* is changing to root needed, because of relative paths ? or can we just
-    * remove and ignore it ?? FIXME */
-   if (chdir("/") < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_CHDIR_FAILED);
-
-   
    //return mouse_table[1].fd; /* the second is handled in the main() */
 
    /****************** OLD CODE from gpn.c  END ***********************/



1.1                  src/patchsets/gpm/1.20.1/60_all_parallel-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/60_all_parallel-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpm/1.20.1/60_all_parallel-build.patch?rev=1.1&content-type=text/plain

Index: 60_all_parallel-build.patch
===================================================================
Fix the targets so that `make -j` works properly ...

The gpm.man thing in doc/ is kind of a hack, but it's not *my* fault that the 
man targets are so ugly :).

 -- vapier@g.o

--- Makefile.in.orig	2005-01-30 06:20:49.419135576 -0500
+++ Makefile.in	2005-01-30 06:21:43.715881216 -0500
@@ -23,7 +23,7 @@
 
 ### simple, but effective rules
 
-all: dep do-all
+all: do-all
 
 dep:
 	touch src/$(DEPFILE) # to prevent unecessary warnings
@@ -58,7 +58,7 @@
 ### GENERIC
 
 # do-all goes to all subdirectories and does all
-do-%:
+do-%: dep
 	@target=`echo $@ | $(SED) -e 's/^do-//'`; \
 	for i in $(SUBDIRS) ; do \
 		if test -f ./$$i/Makefile ; then \
--- doc/Makefile.in.orig	2005-01-30 06:09:37.450290368 -0500
+++ doc/Makefile.in	2005-01-30 06:16:55.710664664 -0500
@@ -32,6 +32,8 @@
 
 MANPAGES = gpm.8 mev.1 gpm-root.1 gpm-types.7 mouse-test.1
 
+all: $(srcdir)/gpm.info gpm.man
+
 # HTML (texi2html)
 %.html: %.texinfo
 	if [ $(TEXI2HTML) != "no" ]; then $(TEXI2HTML) $< ;fi
@@ -55,13 +57,13 @@
 	$(AWK) -f $(srcdir)/mktxt $< > $@
 
 # MAN (-)
-$(MANPAGES): doc.gpm $(srcdir)/manpager
+gpm.man: doc.gpm $(srcdir)/manpager
 	$(AWK) -f $(srcdir)/manpager doc.gpm
 	for i in gpm-root.1 gpm-types.7 gpm.8 mev.1 mouse-test.1; do \
 		expand $$i | sed s/^'[ ]*'//g > $$i.new; \
 		mv $$i.new $$i; \
 	done;
-
+	touch gpm.man
 
 # DVI 
 # This rule is somewhat a rewrite of texi2dvi. I like make more than sh :-)
@@ -97,8 +99,6 @@
 
 # Main portion
 
-all: $(srcdir)/gpm.info $(MANPAGES)
-
 # why gpmdoc.ps and gpm.ps??
 # there is no gpm.ps in my tree and no rule to generate gpm.ps.
 gpmdoc.ps:	gpm.ps



-- 
gentoo-commits@l.g.o mailing list