[arch-commits] Commit in inputattach/repos (24 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue May 28 14:09:11 EDT 2013


    Date: Tuesday, May 28, 2013 @ 20:09:11
  Author: spupykin
Revision: 91882

archrelease: copy trunk to community-i686, community-x86_64

Added:
  inputattach/repos/community-i686/0001-Add-w8001-flag.patch
    (from rev 91881, inputattach/trunk/0001-Add-w8001-flag.patch)
  inputattach/repos/community-i686/0002-Allow-for-custom-baud-rates.patch
    (from rev 91881, inputattach/trunk/0002-Allow-for-custom-baud-rates.patch)
  inputattach/repos/community-i686/PKGBUILD
    (from rev 91881, inputattach/trunk/PKGBUILD)
  inputattach/repos/community-i686/inputattach.conf.d
    (from rev 91881, inputattach/trunk/inputattach.conf.d)
  inputattach/repos/community-i686/inputattach.service
    (from rev 91881, inputattach/trunk/inputattach.service)
  inputattach/repos/community-i686/inputattachctl
    (from rev 91881, inputattach/trunk/inputattachctl)
  inputattach/repos/community-x86_64/0001-Add-w8001-flag.patch
    (from rev 91881, inputattach/trunk/0001-Add-w8001-flag.patch)
  inputattach/repos/community-x86_64/0002-Allow-for-custom-baud-rates.patch
    (from rev 91881, inputattach/trunk/0002-Allow-for-custom-baud-rates.patch)
  inputattach/repos/community-x86_64/PKGBUILD
    (from rev 91881, inputattach/trunk/PKGBUILD)
  inputattach/repos/community-x86_64/inputattach.conf.d
    (from rev 91881, inputattach/trunk/inputattach.conf.d)
  inputattach/repos/community-x86_64/inputattach.service
    (from rev 91881, inputattach/trunk/inputattach.service)
  inputattach/repos/community-x86_64/inputattachctl
    (from rev 91881, inputattach/trunk/inputattachctl)
Deleted:
  inputattach/repos/community-i686/0001-Add-w8001-flag.patch
  inputattach/repos/community-i686/0002-Allow-for-custom-baud-rates.patch
  inputattach/repos/community-i686/PKGBUILD
  inputattach/repos/community-i686/inputattach.conf.d
  inputattach/repos/community-i686/inputattach.service
  inputattach/repos/community-i686/inputattachctl
  inputattach/repos/community-x86_64/0001-Add-w8001-flag.patch
  inputattach/repos/community-x86_64/0002-Allow-for-custom-baud-rates.patch
  inputattach/repos/community-x86_64/PKGBUILD
  inputattach/repos/community-x86_64/inputattach.conf.d
  inputattach/repos/community-x86_64/inputattach.service
  inputattach/repos/community-x86_64/inputattachctl

---------------------------------------------------------+
 /0001-Add-w8001-flag.patch                              |   54 +++++
 /0002-Allow-for-custom-baud-rates.patch                 |  140 ++++++++++++++
 /PKGBUILD                                               |  100 ++++++++++
 /inputattach.conf.d                                     |   20 ++
 /inputattach.service                                    |   22 ++
 /inputattachctl                                         |   28 ++
 community-i686/0001-Add-w8001-flag.patch                |   27 --
 community-i686/0002-Allow-for-custom-baud-rates.patch   |   70 -------
 community-i686/PKGBUILD                                 |   50 -----
 community-i686/inputattach.conf.d                       |   10 -
 community-i686/inputattach.service                      |   11 -
 community-i686/inputattachctl                           |   14 -
 community-x86_64/0001-Add-w8001-flag.patch              |   27 --
 community-x86_64/0002-Allow-for-custom-baud-rates.patch |   70 -------
 community-x86_64/PKGBUILD                               |   50 -----
 community-x86_64/inputattach.conf.d                     |   10 -
 community-x86_64/inputattach.service                    |   11 -
 community-x86_64/inputattachctl                         |   14 -
 18 files changed, 364 insertions(+), 364 deletions(-)

Deleted: community-i686/0001-Add-w8001-flag.patch
===================================================================
--- community-i686/0001-Add-w8001-flag.patch	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-i686/0001-Add-w8001-flag.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,27 +0,0 @@
-From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Tue, 13 Jul 2010 11:49:47 +1000
-Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- inputattach.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index a7de302..0382954 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -495,6 +495,9 @@ static struct input_types input_types[] = {
- { "--dump",		"-dump",	"Just enable device",
- 	B2400, CS8,
- 	0,			0x00,	0x00,	0,	dump_init },
-+{ "--w8001",		"-w8001",	"Wacom W8001",
-+	B38400, CS8,
-+	SERIO_W8001,		0x00,	0x00,	0,	NULL },
- { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
- };
- 
--- 
-1.7.2.3
-

Copied: inputattach/repos/community-i686/0001-Add-w8001-flag.patch (from rev 91881, inputattach/trunk/0001-Add-w8001-flag.patch)
===================================================================
--- community-i686/0001-Add-w8001-flag.patch	                        (rev 0)
+++ community-i686/0001-Add-w8001-flag.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,27 @@
+From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Tue, 13 Jul 2010 11:49:47 +1000
+Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ inputattach.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/inputattach.c b/inputattach.c
+index a7de302..0382954 100644
+--- a/inputattach.c
++++ b/inputattach.c
+@@ -495,6 +495,9 @@ static struct input_types input_types[] = {
+ { "--dump",		"-dump",	"Just enable device",
+ 	B2400, CS8,
+ 	0,			0x00,	0x00,	0,	dump_init },
++{ "--w8001",		"-w8001",	"Wacom W8001",
++	B38400, CS8,
++	SERIO_W8001,		0x00,	0x00,	0,	NULL },
+ { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
+ };
+ 
+-- 
+1.7.2.3
+

Deleted: community-i686/0002-Allow-for-custom-baud-rates.patch
===================================================================
--- community-i686/0002-Allow-for-custom-baud-rates.patch	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-i686/0002-Allow-for-custom-baud-rates.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,70 +0,0 @@
-From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 21 Jul 2010 14:41:04 +1000
-Subject: [PATCH 3/3] Allow for custom baud rates.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- inputattach.c |   25 ++++++++++++++++++++++++-
- 1 files changed, 24 insertions(+), 1 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index 0382954..6806fc8 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -506,7 +506,7 @@ static void show_help(void)
- 	struct input_types *type;
- 
- 	puts("");
--	puts("Usage: inputattach [--daemon] <mode> <device>");
-+	puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
- 	puts("");
- 	puts("Modes:");
- 
-@@ -530,6 +530,7 @@ int main(int argc, char **argv)
- 	int i;
- 	char c;
- 	int retval;
-+	int baud = -1;
- 
- 	for (i = 1; i < argc; i++) {
- 		if (!strcasecmp(argv[i], "--help")) {
-@@ -540,6 +541,15 @@ int main(int argc, char **argv)
- 		} else if (need_device) {
- 			device = argv[i];
- 			need_device = 0;
-+		} else if (!strcasecmp(argv[i], "--baud")) {
-+			if (argc <= i + 1) {
-+				show_help();
-+				fprintf(stderr,
-+					"inputattach: require baud rate\n");
-+				return EXIT_FAILURE;
-+			}
-+
-+			baud = atoi(argv[++i]);
- 		} else {
- 			if (type && type->name) {
- 				fprintf(stderr,
-@@ -580,6 +590,19 @@ int main(int argc, char **argv)
- 		return 1;
- 	}
- 
-+	switch(baud) {
-+	case -1: break;
-+	case 2400: type->speed = B2400; break;
-+	case 4800: type->speed = B4800; break;
-+	case 9600: type->speed = B9600; break;
-+	case 19200: type->speed = B19200; break;
-+	case 38400: type->speed = B38400; break;
-+	default:
-+		fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
-+				baud);
-+		return EXIT_FAILURE;
-+	}
-+
- 	setline(fd, type->flags, type->speed);
- 
- 	if (type->flush)
--- 
-1.7.2.3
-

Copied: inputattach/repos/community-i686/0002-Allow-for-custom-baud-rates.patch (from rev 91881, inputattach/trunk/0002-Allow-for-custom-baud-rates.patch)
===================================================================
--- community-i686/0002-Allow-for-custom-baud-rates.patch	                        (rev 0)
+++ community-i686/0002-Allow-for-custom-baud-rates.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,70 @@
+From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 21 Jul 2010 14:41:04 +1000
+Subject: [PATCH 3/3] Allow for custom baud rates.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ inputattach.c |   25 ++++++++++++++++++++++++-
+ 1 files changed, 24 insertions(+), 1 deletions(-)
+
+diff --git a/inputattach.c b/inputattach.c
+index 0382954..6806fc8 100644
+--- a/inputattach.c
++++ b/inputattach.c
+@@ -506,7 +506,7 @@ static void show_help(void)
+ 	struct input_types *type;
+ 
+ 	puts("");
+-	puts("Usage: inputattach [--daemon] <mode> <device>");
++	puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
+ 	puts("");
+ 	puts("Modes:");
+ 
+@@ -530,6 +530,7 @@ int main(int argc, char **argv)
+ 	int i;
+ 	char c;
+ 	int retval;
++	int baud = -1;
+ 
+ 	for (i = 1; i < argc; i++) {
+ 		if (!strcasecmp(argv[i], "--help")) {
+@@ -540,6 +541,15 @@ int main(int argc, char **argv)
+ 		} else if (need_device) {
+ 			device = argv[i];
+ 			need_device = 0;
++		} else if (!strcasecmp(argv[i], "--baud")) {
++			if (argc <= i + 1) {
++				show_help();
++				fprintf(stderr,
++					"inputattach: require baud rate\n");
++				return EXIT_FAILURE;
++			}
++
++			baud = atoi(argv[++i]);
+ 		} else {
+ 			if (type && type->name) {
+ 				fprintf(stderr,
+@@ -580,6 +590,19 @@ int main(int argc, char **argv)
+ 		return 1;
+ 	}
+ 
++	switch(baud) {
++	case -1: break;
++	case 2400: type->speed = B2400; break;
++	case 4800: type->speed = B4800; break;
++	case 9600: type->speed = B9600; break;
++	case 19200: type->speed = B19200; break;
++	case 38400: type->speed = B38400; break;
++	default:
++		fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
++				baud);
++		return EXIT_FAILURE;
++	}
++
+ 	setline(fd, type->flags, type->speed);
+ 
+ 	if (type->flush)
+-- 
+1.7.2.3
+

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-i686/PKGBUILD	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
-
-pkgname=inputattach
-pkgver=1.24
-pkgrel=9
-pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
-arch=('i686' 'x86_64')
-url="http://linuxconsole.sourceforge.net/"
-license=('GPL')
-depends=('bash')
-makedepends=('gcc')
-backup=(etc/conf.d/inputattach)
-source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
-	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
-	'inputattach.conf.d'
-	'inputattach.service'
-	'inputattachctl'
-	'0001-Add-w8001-flag.patch'
-	'0002-Allow-for-custom-baud-rates.patch')
-md5sums=('eb595a766ca363edb3b14c25404596ce'
-         '93d34d96cd3ad19ea1aeca7f68a66b4a'
-         '7ca903e54829764c8241233af5069216'
-         'c19b9ed38b243191cf5378b87a42a4cc'
-         '84c6463660c10bd34c0390102da087d5'
-         'f1b3ddae308351357f557cbd5c6cda81'
-         '8f76908449cae24a95adbf0bc0a17721')
-
-build() {
-  cd "$srcdir"
-
-  mkdir src
-  cp inputattach.c serio-ids.h src/
-  cd src
-
-  # Add support for serial wacom tablets
-  patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
-  patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
-
-  cc $CFLAGS inputattach.c -o inputattach
-}
-
-package() {
-  cd "$srcdir/src"
-  install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach"
-  install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
-  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
-  install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
-}

Copied: inputattach/repos/community-i686/PKGBUILD (from rev 91881, inputattach/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
+
+pkgname=inputattach
+pkgver=1.24
+pkgrel=10
+pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
+arch=('i686' 'x86_64')
+url="http://linuxconsole.sourceforge.net/"
+license=('GPL')
+depends=('bash')
+makedepends=('gcc')
+backup=(etc/conf.d/inputattach)
+source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
+	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
+	'inputattach.conf.d'
+	'inputattach.service'
+	'inputattachctl'
+	'0001-Add-w8001-flag.patch'
+	'0002-Allow-for-custom-baud-rates.patch')
+md5sums=('eb595a766ca363edb3b14c25404596ce'
+         '93d34d96cd3ad19ea1aeca7f68a66b4a'
+         '7ca903e54829764c8241233af5069216'
+         'c19b9ed38b243191cf5378b87a42a4cc'
+         '7dd0690a9d2fe5e1052900650906e273'
+         'f1b3ddae308351357f557cbd5c6cda81'
+         '8f76908449cae24a95adbf0bc0a17721')
+
+build() {
+  cd "$srcdir"
+
+  mkdir src
+  cp inputattach.c serio-ids.h src/
+  cd src
+
+  # Add support for serial wacom tablets
+  patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
+  patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
+
+  cc $CFLAGS inputattach.c -o inputattach
+}
+
+package() {
+  cd "$srcdir/src"
+  install -Dm755 inputattach "$pkgdir/usr/bin/inputattach"
+  install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
+  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
+  install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
+}

Deleted: community-i686/inputattach.conf.d
===================================================================
--- community-i686/inputattach.conf.d	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-i686/inputattach.conf.d	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,10 +0,0 @@
-#
-# Configuration for inputattach
-#
-# IAPARAMS is an array of inputattach arguments, see 'inputattach --help'.
-# An inputattach instance will be started for each element.
-
-IAPARAMS=(
-  "--microsoft /dev/ttyS0"
-  #"--baud 9600 --w8001 /dev/ttyS1"
-)

Copied: inputattach/repos/community-i686/inputattach.conf.d (from rev 91881, inputattach/trunk/inputattach.conf.d)
===================================================================
--- community-i686/inputattach.conf.d	                        (rev 0)
+++ community-i686/inputattach.conf.d	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,10 @@
+#
+# Configuration for inputattach
+#
+# IAPARAMS is an array of inputattach arguments, see 'inputattach --help'.
+# An inputattach instance will be started for each element.
+
+IAPARAMS=(
+  "--microsoft /dev/ttyS0"
+  #"--baud 9600 --w8001 /dev/ttyS1"
+)

Deleted: community-i686/inputattach.service
===================================================================
--- community-i686/inputattach.service	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-i686/inputattach.service	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Attach serial input devices to kernel input subsystem
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/inputattachctl start
-ExecStop=/usr/bin/inputattachctl stop
-
-[Install]
-WantedBy=multi-user.target

Copied: inputattach/repos/community-i686/inputattach.service (from rev 91881, inputattach/trunk/inputattach.service)
===================================================================
--- community-i686/inputattach.service	                        (rev 0)
+++ community-i686/inputattach.service	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Attach serial input devices to kernel input subsystem
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/inputattachctl start
+ExecStop=/usr/bin/inputattachctl stop
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/inputattachctl
===================================================================
--- community-i686/inputattachctl	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-i686/inputattachctl	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/inputattach
-
-case "$1" in
-	start)
-		for i in "${IAPARAMS[@]}"; do
-			/usr/sbin/inputattach --daemon $i || exit 1
-		done
-		;;
-	stop)
-		killall inputattach || exit 1
-		;;
-esac

Copied: inputattach/repos/community-i686/inputattachctl (from rev 91881, inputattach/trunk/inputattachctl)
===================================================================
--- community-i686/inputattachctl	                        (rev 0)
+++ community-i686/inputattachctl	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. /etc/conf.d/inputattach
+
+case "$1" in
+	start)
+		for i in "${IAPARAMS[@]}"; do
+			/usr/bin/inputattach --daemon $i || exit 1
+		done
+		;;
+	stop)
+		killall inputattach || exit 1
+		;;
+esac

Deleted: community-x86_64/0001-Add-w8001-flag.patch
===================================================================
--- community-x86_64/0001-Add-w8001-flag.patch	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-x86_64/0001-Add-w8001-flag.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,27 +0,0 @@
-From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Tue, 13 Jul 2010 11:49:47 +1000
-Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- inputattach.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index a7de302..0382954 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -495,6 +495,9 @@ static struct input_types input_types[] = {
- { "--dump",		"-dump",	"Just enable device",
- 	B2400, CS8,
- 	0,			0x00,	0x00,	0,	dump_init },
-+{ "--w8001",		"-w8001",	"Wacom W8001",
-+	B38400, CS8,
-+	SERIO_W8001,		0x00,	0x00,	0,	NULL },
- { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
- };
- 
--- 
-1.7.2.3
-

Copied: inputattach/repos/community-x86_64/0001-Add-w8001-flag.patch (from rev 91881, inputattach/trunk/0001-Add-w8001-flag.patch)
===================================================================
--- community-x86_64/0001-Add-w8001-flag.patch	                        (rev 0)
+++ community-x86_64/0001-Add-w8001-flag.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,27 @@
+From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Tue, 13 Jul 2010 11:49:47 +1000
+Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ inputattach.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/inputattach.c b/inputattach.c
+index a7de302..0382954 100644
+--- a/inputattach.c
++++ b/inputattach.c
+@@ -495,6 +495,9 @@ static struct input_types input_types[] = {
+ { "--dump",		"-dump",	"Just enable device",
+ 	B2400, CS8,
+ 	0,			0x00,	0x00,	0,	dump_init },
++{ "--w8001",		"-w8001",	"Wacom W8001",
++	B38400, CS8,
++	SERIO_W8001,		0x00,	0x00,	0,	NULL },
+ { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
+ };
+ 
+-- 
+1.7.2.3
+

Deleted: community-x86_64/0002-Allow-for-custom-baud-rates.patch
===================================================================
--- community-x86_64/0002-Allow-for-custom-baud-rates.patch	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-x86_64/0002-Allow-for-custom-baud-rates.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,70 +0,0 @@
-From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 21 Jul 2010 14:41:04 +1000
-Subject: [PATCH 3/3] Allow for custom baud rates.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- inputattach.c |   25 ++++++++++++++++++++++++-
- 1 files changed, 24 insertions(+), 1 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index 0382954..6806fc8 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -506,7 +506,7 @@ static void show_help(void)
- 	struct input_types *type;
- 
- 	puts("");
--	puts("Usage: inputattach [--daemon] <mode> <device>");
-+	puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
- 	puts("");
- 	puts("Modes:");
- 
-@@ -530,6 +530,7 @@ int main(int argc, char **argv)
- 	int i;
- 	char c;
- 	int retval;
-+	int baud = -1;
- 
- 	for (i = 1; i < argc; i++) {
- 		if (!strcasecmp(argv[i], "--help")) {
-@@ -540,6 +541,15 @@ int main(int argc, char **argv)
- 		} else if (need_device) {
- 			device = argv[i];
- 			need_device = 0;
-+		} else if (!strcasecmp(argv[i], "--baud")) {
-+			if (argc <= i + 1) {
-+				show_help();
-+				fprintf(stderr,
-+					"inputattach: require baud rate\n");
-+				return EXIT_FAILURE;
-+			}
-+
-+			baud = atoi(argv[++i]);
- 		} else {
- 			if (type && type->name) {
- 				fprintf(stderr,
-@@ -580,6 +590,19 @@ int main(int argc, char **argv)
- 		return 1;
- 	}
- 
-+	switch(baud) {
-+	case -1: break;
-+	case 2400: type->speed = B2400; break;
-+	case 4800: type->speed = B4800; break;
-+	case 9600: type->speed = B9600; break;
-+	case 19200: type->speed = B19200; break;
-+	case 38400: type->speed = B38400; break;
-+	default:
-+		fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
-+				baud);
-+		return EXIT_FAILURE;
-+	}
-+
- 	setline(fd, type->flags, type->speed);
- 
- 	if (type->flush)
--- 
-1.7.2.3
-

Copied: inputattach/repos/community-x86_64/0002-Allow-for-custom-baud-rates.patch (from rev 91881, inputattach/trunk/0002-Allow-for-custom-baud-rates.patch)
===================================================================
--- community-x86_64/0002-Allow-for-custom-baud-rates.patch	                        (rev 0)
+++ community-x86_64/0002-Allow-for-custom-baud-rates.patch	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,70 @@
+From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 21 Jul 2010 14:41:04 +1000
+Subject: [PATCH 3/3] Allow for custom baud rates.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ inputattach.c |   25 ++++++++++++++++++++++++-
+ 1 files changed, 24 insertions(+), 1 deletions(-)
+
+diff --git a/inputattach.c b/inputattach.c
+index 0382954..6806fc8 100644
+--- a/inputattach.c
++++ b/inputattach.c
+@@ -506,7 +506,7 @@ static void show_help(void)
+ 	struct input_types *type;
+ 
+ 	puts("");
+-	puts("Usage: inputattach [--daemon] <mode> <device>");
++	puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
+ 	puts("");
+ 	puts("Modes:");
+ 
+@@ -530,6 +530,7 @@ int main(int argc, char **argv)
+ 	int i;
+ 	char c;
+ 	int retval;
++	int baud = -1;
+ 
+ 	for (i = 1; i < argc; i++) {
+ 		if (!strcasecmp(argv[i], "--help")) {
+@@ -540,6 +541,15 @@ int main(int argc, char **argv)
+ 		} else if (need_device) {
+ 			device = argv[i];
+ 			need_device = 0;
++		} else if (!strcasecmp(argv[i], "--baud")) {
++			if (argc <= i + 1) {
++				show_help();
++				fprintf(stderr,
++					"inputattach: require baud rate\n");
++				return EXIT_FAILURE;
++			}
++
++			baud = atoi(argv[++i]);
+ 		} else {
+ 			if (type && type->name) {
+ 				fprintf(stderr,
+@@ -580,6 +590,19 @@ int main(int argc, char **argv)
+ 		return 1;
+ 	}
+ 
++	switch(baud) {
++	case -1: break;
++	case 2400: type->speed = B2400; break;
++	case 4800: type->speed = B4800; break;
++	case 9600: type->speed = B9600; break;
++	case 19200: type->speed = B19200; break;
++	case 38400: type->speed = B38400; break;
++	default:
++		fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
++				baud);
++		return EXIT_FAILURE;
++	}
++
+ 	setline(fd, type->flags, type->speed);
+ 
+ 	if (type->flush)
+-- 
+1.7.2.3
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-x86_64/PKGBUILD	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
-
-pkgname=inputattach
-pkgver=1.24
-pkgrel=9
-pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
-arch=('i686' 'x86_64')
-url="http://linuxconsole.sourceforge.net/"
-license=('GPL')
-depends=('bash')
-makedepends=('gcc')
-backup=(etc/conf.d/inputattach)
-source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
-	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
-	'inputattach.conf.d'
-	'inputattach.service'
-	'inputattachctl'
-	'0001-Add-w8001-flag.patch'
-	'0002-Allow-for-custom-baud-rates.patch')
-md5sums=('eb595a766ca363edb3b14c25404596ce'
-         '93d34d96cd3ad19ea1aeca7f68a66b4a'
-         '7ca903e54829764c8241233af5069216'
-         'c19b9ed38b243191cf5378b87a42a4cc'
-         '84c6463660c10bd34c0390102da087d5'
-         'f1b3ddae308351357f557cbd5c6cda81'
-         '8f76908449cae24a95adbf0bc0a17721')
-
-build() {
-  cd "$srcdir"
-
-  mkdir src
-  cp inputattach.c serio-ids.h src/
-  cd src
-
-  # Add support for serial wacom tablets
-  patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
-  patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
-
-  cc $CFLAGS inputattach.c -o inputattach
-}
-
-package() {
-  cd "$srcdir/src"
-  install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach"
-  install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
-  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
-  install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
-}

Copied: inputattach/repos/community-x86_64/PKGBUILD (from rev 91881, inputattach/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
+
+pkgname=inputattach
+pkgver=1.24
+pkgrel=10
+pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
+arch=('i686' 'x86_64')
+url="http://linuxconsole.sourceforge.net/"
+license=('GPL')
+depends=('bash')
+makedepends=('gcc')
+backup=(etc/conf.d/inputattach)
+source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
+	'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
+	'inputattach.conf.d'
+	'inputattach.service'
+	'inputattachctl'
+	'0001-Add-w8001-flag.patch'
+	'0002-Allow-for-custom-baud-rates.patch')
+md5sums=('eb595a766ca363edb3b14c25404596ce'
+         '93d34d96cd3ad19ea1aeca7f68a66b4a'
+         '7ca903e54829764c8241233af5069216'
+         'c19b9ed38b243191cf5378b87a42a4cc'
+         '7dd0690a9d2fe5e1052900650906e273'
+         'f1b3ddae308351357f557cbd5c6cda81'
+         '8f76908449cae24a95adbf0bc0a17721')
+
+build() {
+  cd "$srcdir"
+
+  mkdir src
+  cp inputattach.c serio-ids.h src/
+  cd src
+
+  # Add support for serial wacom tablets
+  patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
+  patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
+
+  cc $CFLAGS inputattach.c -o inputattach
+}
+
+package() {
+  cd "$srcdir/src"
+  install -Dm755 inputattach "$pkgdir/usr/bin/inputattach"
+  install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
+  install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
+  install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
+}

Deleted: community-x86_64/inputattach.conf.d
===================================================================
--- community-x86_64/inputattach.conf.d	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-x86_64/inputattach.conf.d	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,10 +0,0 @@
-#
-# Configuration for inputattach
-#
-# IAPARAMS is an array of inputattach arguments, see 'inputattach --help'.
-# An inputattach instance will be started for each element.
-
-IAPARAMS=(
-  "--microsoft /dev/ttyS0"
-  #"--baud 9600 --w8001 /dev/ttyS1"
-)

Copied: inputattach/repos/community-x86_64/inputattach.conf.d (from rev 91881, inputattach/trunk/inputattach.conf.d)
===================================================================
--- community-x86_64/inputattach.conf.d	                        (rev 0)
+++ community-x86_64/inputattach.conf.d	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,10 @@
+#
+# Configuration for inputattach
+#
+# IAPARAMS is an array of inputattach arguments, see 'inputattach --help'.
+# An inputattach instance will be started for each element.
+
+IAPARAMS=(
+  "--microsoft /dev/ttyS0"
+  #"--baud 9600 --w8001 /dev/ttyS1"
+)

Deleted: community-x86_64/inputattach.service
===================================================================
--- community-x86_64/inputattach.service	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-x86_64/inputattach.service	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Attach serial input devices to kernel input subsystem
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/inputattachctl start
-ExecStop=/usr/bin/inputattachctl stop
-
-[Install]
-WantedBy=multi-user.target

Copied: inputattach/repos/community-x86_64/inputattach.service (from rev 91881, inputattach/trunk/inputattach.service)
===================================================================
--- community-x86_64/inputattach.service	                        (rev 0)
+++ community-x86_64/inputattach.service	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Attach serial input devices to kernel input subsystem
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/inputattachctl start
+ExecStop=/usr/bin/inputattachctl stop
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/inputattachctl
===================================================================
--- community-x86_64/inputattachctl	2013-05-28 18:08:38 UTC (rev 91881)
+++ community-x86_64/inputattachctl	2013-05-28 18:09:11 UTC (rev 91882)
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/inputattach
-
-case "$1" in
-	start)
-		for i in "${IAPARAMS[@]}"; do
-			/usr/sbin/inputattach --daemon $i || exit 1
-		done
-		;;
-	stop)
-		killall inputattach || exit 1
-		;;
-esac

Copied: inputattach/repos/community-x86_64/inputattachctl (from rev 91881, inputattach/trunk/inputattachctl)
===================================================================
--- community-x86_64/inputattachctl	                        (rev 0)
+++ community-x86_64/inputattachctl	2013-05-28 18:09:11 UTC (rev 91882)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. /etc/conf.d/inputattach
+
+case "$1" in
+	start)
+		for i in "${IAPARAMS[@]}"; do
+			/usr/bin/inputattach --daemon $i || exit 1
+		done
+		;;
+	stop)
+		killall inputattach || exit 1
+		;;
+esac



More information about the arch-commits mailing list