[Glibc-bsd-commits] r3379 - in trunk/freebsd-moused/debian: . patches

[Guillem Jover]

Author: guillem
Date: 2011-05-31 02:52:11 +0000 (Tue, 31 May 2011)
New Revision: 3379

Modified:
   trunk/freebsd-moused/debian/changelog
   trunk/freebsd-moused/debian/patches/000_libbsd.patch
   trunk/freebsd-moused/debian/patches/001_glibc.diff
   trunk/freebsd-moused/debian/patches/002_retry.diff
Log:
New upstream freebsd-moused release (based on FreeBSD 8.2)


Modified: trunk/freebsd-moused/debian/changelog
===================================================================
--- trunk/freebsd-moused/debian/changelog	2011-05-31 02:45:02 UTC (rev 3378)
+++ trunk/freebsd-moused/debian/changelog	2011-05-31 02:52:11 UTC (rev 3379)
@@ -1,5 +1,6 @@
-freebsd-moused (5.3-2) UNRELEASED; urgency=low
+freebsd-moused (8.2-1) UNRELEASED; urgency=low
 
+  * New upstream release (based on FreeBSD 8.2).
   * Rename debian/init.d to debian/init.
   * Do not auto-generate the debian/control file.
   * Switch from CDBS to debhelper 7 and source format “3.0 (quilt)”.

Modified: trunk/freebsd-moused/debian/patches/000_libbsd.patch
===================================================================
--- trunk/freebsd-moused/debian/patches/000_libbsd.patch	2011-05-31 02:45:02 UTC (rev 3378)
+++ trunk/freebsd-moused/debian/patches/000_libbsd.patch	2011-05-31 02:52:11 UTC (rev 3379)
@@ -11,8 +11,8 @@
  MAN=	moused.8
 +LDADD=	-lbsd
  
- #BINMODE=4555
- #INSTALLFLAGS=-fschg
+ WARNS?=6
+ 
 --- a/usr.sbin/moused/moused.c
 +++ b/usr.sbin/moused/moused.c
 @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");

Modified: trunk/freebsd-moused/debian/patches/001_glibc.diff
===================================================================
--- trunk/freebsd-moused/debian/patches/001_glibc.diff	2011-05-31 02:45:02 UTC (rev 3378)
+++ trunk/freebsd-moused/debian/patches/001_glibc.diff	2011-05-31 02:52:11 UTC (rev 3379)
@@ -4,7 +4,7 @@
 
 --- a/usr.sbin/moused/moused.c
 +++ b/usr.sbin/moused/moused.c
-@@ -45,7 +45,6 @@
+@@ -45,10 +45,10 @@
   **/
  
  #include <sys/cdefs.h>
@@ -12,21 +12,17 @@
  
  #include <sys/param.h>
  #include <sys/consio.h>
-@@ -72,6 +71,7 @@ __FBSDID("$FreeBSD$");
- #include <syslog.h>
- #include <termios.h>
- #include <unistd.h>
 +#include <sys/ttycom.h>
- 
- #define MAX_CLICKTHRESHOLD	2000	/* 2 seconds */
- #define MAX_BUTTON2TIMEOUT	2000	/* 2 seconds */
-@@ -466,8 +466,7 @@ static void	moused(void);
- static void	hup(int sig);
+ #include <sys/mouse.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+@@ -533,8 +533,7 @@ static void	hup(int sig);
  static void	cleanup(int sig);
+ static void	pause_mouse(int sig);
  static void	usage(void);
 -static void	log_or_warn(int log_pri, int errnum, const char *fmt, ...)
 -		    __printflike(3, 4);
 +static void	log_or_warn(int log_pri, int errnum, const char *fmt, ...);
  
  static int	r_identify(void);
- static char	*r_if(int type);
+ static const char *r_if(int type);

Modified: trunk/freebsd-moused/debian/patches/002_retry.diff
===================================================================
--- trunk/freebsd-moused/debian/patches/002_retry.diff	2011-05-31 02:45:02 UTC (rev 3378)
+++ trunk/freebsd-moused/debian/patches/002_retry.diff	2011-05-31 02:52:11 UTC (rev 3379)
@@ -9,7 +9,7 @@
 
 --- a/usr.sbin/moused/moused.c
 +++ b/usr.sbin/moused/moused.c
-@@ -755,9 +755,9 @@ main(int argc, char *argv[])
+@@ -878,9 +878,9 @@ main(int argc, char *argv[])
  	usage();
      }
  
@@ -21,10 +21,10 @@
  	    retry = 5;
      }
  
-@@ -767,7 +767,7 @@ main(int argc, char *argv[])
- 	    signal(SIGINT , cleanup);
+@@ -891,7 +891,7 @@ main(int argc, char *argv[])
  	    signal(SIGQUIT, cleanup);
  	    signal(SIGTERM, cleanup);
+ 	    signal(SIGUSR1, pause_mouse);
 -	    for (i = 0; i < retry; ++i) {
 +	    for (i = 0; i < retry || retry == 0; ++i) {
  		if (i > 0)