[arch-commits] Commit in (9 files)

Sun Sep 1 22:03:23 UTC 2013

Date: Monday, September 2, 2013 @ 00:03:23
  Author: bgyorgy
Revision: 96582

Move rxtx from unsupported with 63 votes

Added:
  java-rxtx/
  java-rxtx/repos/
  java-rxtx/trunk/
  java-rxtx/trunk/PKGBUILD
  java-rxtx/trunk/rxtx-2.2-fhs_lock.patch
  java-rxtx/trunk/rxtx-2.2-lock.patch
  java-rxtx/trunk/rxtx.install
  java-rxtx/trunk/ttyACM_port.patch
  java-rxtx/trunk/utsrelease.patch

-------------------------+
 PKGBUILD                |   57 ++++++++++++++++++++++++++++++++++++++++++++++
 rxtx-2.2-fhs_lock.patch |   13 ++++++++++
 rxtx-2.2-lock.patch     |   12 +++++++++
 rxtx.install            |    3 ++
 ttyACM_port.patch       |   28 ++++++++++++++++++++++
 utsrelease.patch        |   36 +++++++++++++++++++++++++++++
 6 files changed, 149 insertions(+)

Added: java-rxtx/trunk/PKGBUILD
===================================================================

--- java-rxtx/trunk/PKGBUILD	                        (rev 0)
+++ java-rxtx/trunk/PKGBUILD	2013-09-01 22:03:23 UTC (rev 96582)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
+
+pkgname=java-rxtx
+_pkgname=rxtx
+pkgver=2.2pre2
+pkgrel=1
+pkgdesc="Java library for serial IO"
+arch=('i686' 'x86_64')
+url="http://rxtx.qbang.org/"
+license=('LGPL')
+depends=('glibc' 'java-runtime')
+makedepends=('java-environment')
+options=('!libtool')
+provides=("$_pkgname-$pkgver")
+replaces=("$_pkgname")
+install=$_pkgname.install
+source=(http://rxtx.qbang.org/pub/$_pkgname/$_pkgname-$pkgver.zip
+        utsrelease.patch
+        rxtx-2.2-lock.patch
+        rxtx-2.2-fhs_lock.patch
+        ttyACM_port.patch)
+md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c'
+         '2f21ec5eb108f871815242698b6150f1'
+         '1f7c43d582bfe9daea22d7f7057436da'
+         'f4d22d263f45cd1d4db6242dd0ac78ae'
+         '903a3fe0067d0682dd5f64483c741df6')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/utsrelease.patch"
+
+  # Fix lockdir patch
+  patch -Np1 -i "$srcdir/rxtx-2.2-lock.patch"
+
+  # Fix buffer overflow
+  patch -Np1 -i "$srcdir/rxtx-2.2-fhs_lock.patch"
+
+  # Enable more ports
+  patch -Np1 -i "$srcdir/ttyACM_port.patch"
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static
+  make -j1
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  mkdir -p "$pkgdir"/usr/{lib,share/java/rxtx}
+  make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install
+}


Property changes on: java-rxtx/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: java-rxtx/trunk/rxtx-2.2-fhs_lock.patch
===================================================================
--- java-rxtx/trunk/rxtx-2.2-fhs_lock.patch	                        (rev 0)
+++ java-rxtx/trunk/rxtx-2.2-fhs_lock.patch	2013-09-01 22:03:23 UTC (rev 96582)
@@ -0,0 +1,13 @@
+--- ./src/SerialImp.c.orig	2011-03-17 14:42:48.946047373 -0500
++++ ./src/SerialImp.c		2011-03-17 14:46:01.244904859 -0500
+@@ -5291,8 +5291,8 @@ 
+ 	 *
+ 	 */
+ 	int fd,j;
+-	char lockinfo[12], message[80];
+-	char file[80], *p;
++	char lockinfo[12], message[200];
++	char file[200], *p;
+ 
+ 	j = strlen( filename );
+ 	p = ( char * ) filename + j;

Added: java-rxtx/trunk/rxtx-2.2-lock.patch
===================================================================
--- java-rxtx/trunk/rxtx-2.2-lock.patch	                        (rev 0)
+++ java-rxtx/trunk/rxtx-2.2-lock.patch	2013-09-01 22:03:23 UTC (rev 96582)
@@ -0,0 +1,12 @@
+diff -up ./src/SerialImp.h.lock ./src/SerialImp.h
+--- ./src/SerialImp.h.lock	2010-11-09 15:59:54.891179571 +0100
++++ ./src/SerialImp.h	2010-11-09 16:01:12.257819409 +0100
+@@ -158,7 +158,7 @@ struct event_info_struct
+ #	endif /* CMSPAR */
+ #	
+ #	define DEVICEDIR "/dev/"
+-#	define LOCKDIR "/var/lock"
++#	define LOCKDIR "/var/lock/lockdev"
+ #	define LOCKFILEPREFIX "LCK.."
+ #	define FHS
+ #endif /* __linux__ */

Added: java-rxtx/trunk/rxtx.install
===================================================================
--- java-rxtx/trunk/rxtx.install	                        (rev 0)
+++ java-rxtx/trunk/rxtx.install	2013-09-01 22:03:23 UTC (rev 96582)
@@ -0,0 +1,3 @@
+post_install() {
+echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+}

Added: java-rxtx/trunk/ttyACM_port.patch
===================================================================
--- java-rxtx/trunk/ttyACM_port.patch	                        (rev 0)
+++ java-rxtx/trunk/ttyACM_port.patch	2013-09-01 22:03:23 UTC (rev 96582)
@@ -0,0 +1,28 @@
+Description: Allows for the enumeration of many additional ports, including ttyACM for Arduino Unos
+Author: Scott Howard <showard314 at gmail.com>
+
+Index: rxtx/src/gnu/io/RXTXCommDriver.java
+===================================================================
+--- rxtx.orig/src/gnu/io/RXTXCommDriver.java	2010-10-04 23:14:47.236148507 -0400
++++ rxtx/src/gnu/io/RXTXCommDriver.java	2010-10-04 23:18:56.976108303 -0400
+@@ -574,20 +574,7 @@
+ 					if(osName.equals("Linux"))
+ 					{
+ 						String[] Temp = {
+-						"ttyS", // linux Serial Ports
+ 						"ttySA", // for the IPAQs
+-						"ttyUSB", // for USB frobs
+-						"rfcomm",       // bluetooth serial device
+-						"ttyircomm", // linux IrCommdevices (IrDA serial emu)
+-						};
+-						CandidatePortPrefixes=Temp;
+-					}
+-					else if(osName.equals("Linux-all-ports"))
+-					{
+-					/* if you want to enumerate all ports ~5000
+-					   possible, then replace the above with this
+-					*/
+-						String[] Temp = {
+ 						"comx",      // linux COMMX synchronous serial card
+ 						"holter",    // custom card for heart monitoring
+ 						"modem",     // linux symbolic link to modem.

Added: java-rxtx/trunk/utsrelease.patch
===================================================================
--- java-rxtx/trunk/utsrelease.patch	                        (rev 0)
+++ java-rxtx/trunk/utsrelease.patch	2013-09-01 22:03:23 UTC (rev 96582)
@@ -0,0 +1,36 @@
+diff -Naur rxtx-2.2pre2.orig/src/I2CImp.c rxtx-2.2pre2/src/I2CImp.c
+--- rxtx-2.2pre2.orig/src/I2CImp.c	2007-04-26 07:26:05.000000000 +0200
++++ rxtx-2.2pre2/src/I2CImp.c	2013-08-10 13:28:54.690313710 +0200
+@@ -125,7 +125,7 @@
+ 	sigaction( SIGIO, NULL, &handler );
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+-#if defined(__linux__) 
++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) 
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+diff -Naur rxtx-2.2pre2.orig/src/RawImp.c rxtx-2.2pre2/src/RawImp.c
+--- rxtx-2.2pre2.orig/src/RawImp.c	2007-11-18 23:32:42.000000000 +0100
++++ rxtx-2.2pre2/src/RawImp.c	2013-08-10 13:28:54.703647364 +0200
+@@ -270,7 +270,7 @@
+ 	sigaction( SIGIO, NULL, &handler );
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+-#if defined(__linux__) 
++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) 
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+diff -Naur rxtx-2.2pre2.orig/src/RS485Imp.c rxtx-2.2pre2/src/RS485Imp.c
+--- rxtx-2.2pre2.orig/src/RS485Imp.c	2007-04-26 07:26:05.000000000 +0200
++++ rxtx-2.2pre2/src/RS485Imp.c	2013-08-10 13:28:54.706980778 +0200
+@@ -125,7 +125,7 @@
+ 	sigaction( SIGIO, NULL, &handler );
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+-#if defined(__linux__) 
++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) 
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{


