Date: Monday, April 25, 2022 @ 18:54:35
Author: arojas
Revision: 1190047
archrelease: copy trunk to community-x86_64
Added:
java-rxtx/repos/community-x86_64/PKGBUILD
(from rev 1190046, java-rxtx/trunk/PKGBUILD)
java-rxtx/repos/community-x86_64/java-rxtx.install
(from rev 1190046, java-rxtx/trunk/java-rxtx.install)
java-rxtx/repos/community-x86_64/java10.patch
(from rev 1190046, java-rxtx/trunk/java10.patch)
java-rxtx/repos/community-x86_64/java11.patch
(from rev 1190046, java-rxtx/trunk/java11.patch)
java-rxtx/repos/community-x86_64/rxtx-2.2-fhs_lock.patch
(from rev 1190046, java-rxtx/trunk/rxtx-2.2-fhs_lock.patch)
java-rxtx/repos/community-x86_64/rxtx-2.2-format-security.patch
(from rev 1190046, java-rxtx/trunk/rxtx-2.2-format-security.patch)
java-rxtx/repos/community-x86_64/rxtx-2.2-lock.patch
(from rev 1190046, java-rxtx/trunk/rxtx-2.2-lock.patch)
java-rxtx/repos/community-x86_64/rxtx-2.2-undefined_symbol.patch
(from rev 1190046, java-rxtx/trunk/rxtx-2.2-undefined_symbol.patch)
java-rxtx/repos/community-x86_64/ttyACM_port.patch
(from rev 1190046, java-rxtx/trunk/ttyACM_port.patch)
java-rxtx/repos/community-x86_64/utsrelease.patch
(from rev 1190046, java-rxtx/trunk/utsrelease.patch)
Deleted:
java-rxtx/repos/community-x86_64/PKGBUILD
java-rxtx/repos/community-x86_64/java-rxtx.install
java-rxtx/repos/community-x86_64/java10.patch
java-rxtx/repos/community-x86_64/java11.patch
java-rxtx/repos/community-x86_64/rxtx-2.2-fhs_lock.patch
java-rxtx/repos/community-x86_64/rxtx-2.2-lock.patch
java-rxtx/repos/community-x86_64/rxtx-2.2-undefined_symbol.patch
java-rxtx/repos/community-x86_64/ttyACM_port.patch
java-rxtx/repos/community-x86_64/utsrelease.patch
---------------------------------+
PKGBUILD | 157 +++++++++++++++++++-------------------
java-rxtx.install | 6 -
java10.patch | 56 ++++++-------
java11.patch | 24 ++---
rxtx-2.2-fhs_lock.patch | 26 +++---
rxtx-2.2-format-security.patch | 118 ++++++++++++++++++++++++++++
rxtx-2.2-lock.patch | 24 ++---
rxtx-2.2-undefined_symbol.patch | 24 ++---
ttyACM_port.patch | 56 ++++++-------
utsrelease.patch | 72 ++++++++---------
10 files changed, 343 insertions(+), 220 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-25 18:54:08 UTC (rev 1190046)
+++ PKGBUILD 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,76 +0,0 @@
-# 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=7
-pkgdesc="Java library for serial IO"
-arch=('x86_64')
-url="http://rxtx.qbang.org/";
-license=('LGPL')
-depends=('glibc' 'java-runtime' 'systemd')
-makedepends=('java-environment')
-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
- java10.patch
- java11.patch
- rxtx-2.2-undefined_symbol.patch)
-md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c'
- '2f21ec5eb108f871815242698b6150f1'
- '1f7c43d582bfe9daea22d7f7057436da'
- 'f4d22d263f45cd1d4db6242dd0ac78ae'
- '903a3fe0067d0682dd5f64483c741df6'
- '683dd95e6e419b2b63851c08ede7ca86'
- '1db5c64e239c80294d00c932237889dd'
- '4695fe9bb28a7c9b21447f998fb46b02')
-
-prepare() {
- cd $_pkgname-$pkgver
-
- # Fix build
- patch -Np1 -i ../utsrelease.patch
-
- # Fix lockdir patch
- patch -Np1 -i ../rxtx-2.2-lock.patch
-
- # Fix buffer overflow
- patch -Np1 -i ../rxtx-2.2-fhs_lock.patch
-
- # Enable more ports
- patch -Np1 -i ../ttyACM_port.patch
-
- # Fix build with openjdk10
- patch -Np1 -i ../java10.patch
-
- # Fix build with openjdk11
- patch -Np1 -i ../java11.patch
-
- # Fix undefined symbol
- patch -Np1 -i ../rxtx-2.2-undefined_symbol.patch
-
- rm *.m4
- autoreconf -fi
-}
-
-build() {
- cd $_pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make -j1
-}
-
-package() {
- cd $_pkgname-$pkgver
- mkdir -p "$pkgdir"/usr/{lib,share/java/rxtx}
- make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install
-
- # Setup lock directory
- install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
- echo 'd /run/lock/lockdev 0775 root lock -' >
"$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-}
Copied: java-rxtx/repos/community-x86_64/PKGBUILD (from rev 1190046,
java-rxtx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,81 @@
+# 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=8
+pkgdesc="Java library for serial IO"
+arch=('x86_64')
+url="http://rxtx.qbang.org/";
+license=('LGPL')
+depends=('glibc' 'java-runtime' 'systemd')
+makedepends=('java-environment')
+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
+ rxtx-2.2-format-security.patch
+ ttyACM_port.patch
+ java10.patch
+ java11.patch
+ rxtx-2.2-undefined_symbol.patch)
+md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c'
+ '2f21ec5eb108f871815242698b6150f1'
+ '1f7c43d582bfe9daea22d7f7057436da'
+ 'f4d22d263f45cd1d4db6242dd0ac78ae'
+ '32094214422b717a31841146ca78400d'
+ '903a3fe0067d0682dd5f64483c741df6'
+ '683dd95e6e419b2b63851c08ede7ca86'
+ '1db5c64e239c80294d00c932237889dd'
+ '4695fe9bb28a7c9b21447f998fb46b02')
+
+prepare() {
+ cd $_pkgname-$pkgver
+
+ # Fix build
+ patch -Np1 -i ../utsrelease.patch
+
+ # Fix lockdir patch
+ patch -Np1 -i ../rxtx-2.2-lock.patch
+
+ # Fix buffer overflow
+ patch -Np1 -i ../rxtx-2.2-fhs_lock.patch
+
+ # Enable more ports
+ patch -Np1 -i ../ttyACM_port.patch
+
+ # Fix build with openjdk10
+ patch -Np1 -i ../java10.patch
+
+ # Fix build with openjdk11
+ patch -Np1 -i ../java11.patch
+
+ # Fix undefined symbol
+ patch -Np1 -i ../rxtx-2.2-undefined_symbol.patch
+
+ # Fix format-security errors
+ patch -p1 -i ../rxtx-2.2-format-security.patch
+
+ rm *.m4
+ autoreconf -fi
+}
+
+build() {
+ cd $_pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make -j1
+}
+
+package() {
+ cd $_pkgname-$pkgver
+ mkdir -p "$pkgdir"/usr/{lib,share/java/rxtx}
+ make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install
+
+ # Setup lock directory
+ install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
+ echo 'd /run/lock/lockdev 0775 root lock -' >
"$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
Deleted: java-rxtx.install
===================================================================
--- java-rxtx.install 2022-04-25 18:54:08 UTC (rev 1190046)
+++ java-rxtx.install 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,3 +0,0 @@
-post_install() {
- echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
-}
Copied: java-rxtx/repos/community-x86_64/java-rxtx.install (from rev 1190046,
java-rxtx/trunk/java-rxtx.install)
===================================================================
--- java-rxtx.install (rev 0)
+++ java-rxtx.install 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,3 @@
+post_install() {
+ echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+}
Deleted: java10.patch
===================================================================
--- java10.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ java10.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,28 +0,0 @@
-diff -Naur rxtx-2.2pre2.orig/configure.in rxtx-2.2pre2/configure.in
---- rxtx-2.2pre2.orig/configure.in 2008-12-31 03:28:37.000000000 +0100
-+++ rxtx-2.2pre2/configure.in 2018-04-25 07:50:42.382848449 +0200
-@@ -483,8 +483,7 @@
- ;;
- *)
- find_java_native_include jni_md.h
-- JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST)
-jni"
-- JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/
-O -source 1.3 -target 1.3"
-+ JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/
-h \$(DEST) -O"
- JAR="\$(JPATH)/bin/jar"
- JAVADOC="\$(JPATH)/bin/javadoc"
- CFLAGS=$CFLAGS" -D_BSD_SOURCE"
-diff -Naur rxtx-2.2pre2.orig/Makefile.am rxtx-2.2pre2/Makefile.am
---- rxtx-2.2pre2.orig/Makefile.am 2008-09-14 23:36:27.000000000 +0200
-+++ rxtx-2.2pre2/Makefile.am 2018-04-25 07:50:01.198326446 +0200
-@@ -111,11 +111,6 @@
- $(CLASSES): $(javafiles) $(TOP)/Makefile
- $(JAVAH_FIX)
- $(JAVAC) $(javafiles)
-- $(JAVAH) `(for i in $(javahfiles);do \
-- if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
-- echo $(CLASSDIR).$$i; \
-- fi; \
-- done)`
- $(JAR) cf $(JARTARGET) $(CLASSTOP)/*
-
- # install librxtxSerial.so into the proper directory and copy $(JARTARGET)
to its
Copied: java-rxtx/repos/community-x86_64/java10.patch (from rev 1190046,
java-rxtx/trunk/java10.patch)
===================================================================
--- java10.patch (rev 0)
+++ java10.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,28 @@
+diff -Naur rxtx-2.2pre2.orig/configure.in rxtx-2.2pre2/configure.in
+--- rxtx-2.2pre2.orig/configure.in 2008-12-31 03:28:37.000000000 +0100
++++ rxtx-2.2pre2/configure.in 2018-04-25 07:50:42.382848449 +0200
+@@ -483,8 +483,7 @@
+ ;;
+ *)
+ find_java_native_include jni_md.h
+- JAVAH="\$(JPATH)/bin/javah -classpath \$(CLASSPATH) -d \$(DEST)
-jni"
+- JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/
-O -source 1.3 -target 1.3"
++ JAVAC="\$(JPATH)/bin/javac -classpath \$(CLASSPATH) -d \$(TOP)/
-h \$(DEST) -O"
+ JAR="\$(JPATH)/bin/jar"
+ JAVADOC="\$(JPATH)/bin/javadoc"
+ CFLAGS=$CFLAGS" -D_BSD_SOURCE"
+diff -Naur rxtx-2.2pre2.orig/Makefile.am rxtx-2.2pre2/Makefile.am
+--- rxtx-2.2pre2.orig/Makefile.am 2008-09-14 23:36:27.000000000 +0200
++++ rxtx-2.2pre2/Makefile.am 2018-04-25 07:50:01.198326446 +0200
+@@ -111,11 +111,6 @@
+ $(CLASSES): $(javafiles) $(TOP)/Makefile
+ $(JAVAH_FIX)
+ $(JAVAC) $(javafiles)
+- $(JAVAH) `(for i in $(javahfiles);do \
+- if grep > /dev/null native.*\( $(SPATH)/gnu/io/$$i.java; then \
+- echo $(CLASSDIR).$$i; \
+- fi; \
+- done)`
+ $(JAR) cf $(JARTARGET) $(CLASSTOP)/*
+
+ # install librxtxSerial.so into the proper directory and copy $(JARTARGET)
to its
Deleted: java11.patch
===================================================================
--- java11.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ java11.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,12 +0,0 @@
-diff -Naur rxtx-2.2pre2.orig/src/gnu/io/LPRPort.java
rxtx-2.2pre2/src/gnu/io/LPRPort.java
---- rxtx-2.2pre2.orig/src/gnu/io/LPRPort.java 2007-04-26 07:26:05.000000000
+0200
-+++ rxtx-2.2pre2/src/gnu/io/LPRPort.java 2020-05-28 10:20:22.755141415
+0200
-@@ -370,7 +370,7 @@
- public void run()
- {
- eventLoop();
-- yield();
-+ Thread.yield();
- }
- }
- }
Copied: java-rxtx/repos/community-x86_64/java11.patch (from rev 1190046,
java-rxtx/trunk/java11.patch)
===================================================================
--- java11.patch (rev 0)
+++ java11.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,12 @@
+diff -Naur rxtx-2.2pre2.orig/src/gnu/io/LPRPort.java
rxtx-2.2pre2/src/gnu/io/LPRPort.java
+--- rxtx-2.2pre2.orig/src/gnu/io/LPRPort.java 2007-04-26 07:26:05.000000000
+0200
++++ rxtx-2.2pre2/src/gnu/io/LPRPort.java 2020-05-28 10:20:22.755141415
+0200
+@@ -370,7 +370,7 @@
+ public void run()
+ {
+ eventLoop();
+- yield();
++ Thread.yield();
+ }
+ }
+ }
Deleted: rxtx-2.2-fhs_lock.patch
===================================================================
--- rxtx-2.2-fhs_lock.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ rxtx-2.2-fhs_lock.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,13 +0,0 @@
---- ./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;
Copied: java-rxtx/repos/community-x86_64/rxtx-2.2-fhs_lock.patch (from rev
1190046, java-rxtx/trunk/rxtx-2.2-fhs_lock.patch)
===================================================================
--- rxtx-2.2-fhs_lock.patch (rev 0)
+++ rxtx-2.2-fhs_lock.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -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;
Copied: java-rxtx/repos/community-x86_64/rxtx-2.2-format-security.patch (from
rev 1190046, java-rxtx/trunk/rxtx-2.2-format-security.patch)
===================================================================
--- rxtx-2.2-format-security.patch (rev 0)
+++ rxtx-2.2-format-security.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,118 @@
+Debian patch for fixing errors emitted due to -Werror=format-security.
+The patch can be found at:
+https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b990f66c3/debian/patches/format_security.patch
+
+Bug: https://bugs.gentoo.org/550534
+
+---
+From: tony mancill <tmanc...@debian.org>
+Forwarded: no
+Description: use format specifiers in fprintf statements for hardening flags
+
+--- a/src/SerialImp.c
++++ b/src/SerialImp.c
+@@ -5108,7 +5108,7 @@
+ void report_warning(const char *msg)
+ {
+ #ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #else
+ mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -5129,7 +5129,7 @@
+ #ifdef DEBUG_MW
+ mexErrMsgTxt( msg );
+ #else
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #endif /* DEBUG_MW */
+ #endif /* DEBUG_VERBOSE */
+ }
+@@ -5145,7 +5145,7 @@
+ void report_error(const char *msg)
+ {
+ #ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #else
+ mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -5164,7 +5164,7 @@
+ {
+ #ifdef DEBUG
+ # ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ # else
+ mexPrintf( msg );
+ # endif /* DEBUG_MW */
+--- a/src/ParallelImp.c
++++ b/src/ParallelImp.c
+@@ -920,7 +920,7 @@
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #else
+ mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -938,7 +938,7 @@
+ void report(char *msg)
+ {
+ #ifdef DEBUG
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #endif /* DEBUG */
+ }
+
+--- a/src/SerialImp.cpp
++++ b/src/SerialImp.cpp
+@@ -1844,7 +1844,7 @@
+
+
+ #ifdef DEBUG
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #endif
+ }
+
+--- a/CNI/SerialImp.c
++++ b/CNI/SerialImp.c
+@@ -4549,7 +4549,7 @@
+ void report_warning(char *msg)
+ {
+ #ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #else
+ mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -4570,7 +4570,7 @@
+ #ifdef DEBUG_MW
+ mexErrMsgTxt( msg );
+ #else
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #endif /* DEBUG_MW */
+ #endif /* DEBUG_VERBOSE */
+ }
+@@ -4586,7 +4586,7 @@
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ #else
+ mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */
+@@ -4605,7 +4605,7 @@
+ {
+ #ifdef DEBUG
+ # ifndef DEBUG_MW
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ # else
+ mexPrintf( msg );
+ # endif /* DEBUG_MW */
Deleted: rxtx-2.2-lock.patch
===================================================================
--- rxtx-2.2-lock.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ rxtx-2.2-lock.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,12 +0,0 @@
-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__ */
Copied: java-rxtx/repos/community-x86_64/rxtx-2.2-lock.patch (from rev 1190046,
java-rxtx/trunk/rxtx-2.2-lock.patch)
===================================================================
--- rxtx-2.2-lock.patch (rev 0)
+++ rxtx-2.2-lock.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -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__ */
Deleted: rxtx-2.2-undefined_symbol.patch
===================================================================
--- rxtx-2.2-undefined_symbol.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ rxtx-2.2-undefined_symbol.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,12 +0,0 @@
---- rxtx-20100211.orig/src/SerialImp.c 2018-11-04 13:02:53.306800091 +0100
-+++ rxtx-20100211.new/src/SerialImp.c 2018-11-04 13:01:39.495497644 +0100
---- ./src/SerialImp.c.orig 2018-11-04 13:02:53.306800091 +0100
-+++ ./src/SerialImp.c 2018-11-04 13:01:39.495497644 +0100
-@@ -148,6 +148,7 @@
- #endif /* LIBLOCKDEV */
-
- extern int errno;
-+#include <sys/sysmacros.h>
-
- #include "SerialImp.h"
-
Copied: java-rxtx/repos/community-x86_64/rxtx-2.2-undefined_symbol.patch (from
rev 1190046, java-rxtx/trunk/rxtx-2.2-undefined_symbol.patch)
===================================================================
--- rxtx-2.2-undefined_symbol.patch (rev 0)
+++ rxtx-2.2-undefined_symbol.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,12 @@
+--- rxtx-20100211.orig/src/SerialImp.c 2018-11-04 13:02:53.306800091 +0100
++++ rxtx-20100211.new/src/SerialImp.c 2018-11-04 13:01:39.495497644 +0100
+--- ./src/SerialImp.c.orig 2018-11-04 13:02:53.306800091 +0100
++++ ./src/SerialImp.c 2018-11-04 13:01:39.495497644 +0100
+@@ -148,6 +148,7 @@
+ #endif /* LIBLOCKDEV */
+
+ extern int errno;
++#include <sys/sysmacros.h>
+
+ #include "SerialImp.h"
+
Deleted: ttyACM_port.patch
===================================================================
--- ttyACM_port.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ ttyACM_port.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,28 +0,0 @@
-Description: Allows for the enumeration of many additional ports, including
ttyACM for Arduino Unos
-Author: Scott Howard <showard...@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.
Copied: java-rxtx/repos/community-x86_64/ttyACM_port.patch (from rev 1190046,
java-rxtx/trunk/ttyACM_port.patch)
===================================================================
--- ttyACM_port.patch (rev 0)
+++ ttyACM_port.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -0,0 +1,28 @@
+Description: Allows for the enumeration of many additional ports, including
ttyACM for Arduino Unos
+Author: Scott Howard <showard...@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.
Deleted: utsrelease.patch
===================================================================
--- utsrelease.patch 2022-04-25 18:54:08 UTC (rev 1190046)
+++ utsrelease.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -1,36 +0,0 @@
-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)
- {
Copied: java-rxtx/repos/community-x86_64/utsrelease.patch (from rev 1190046,
java-rxtx/trunk/utsrelease.patch)
===================================================================
--- utsrelease.patch (rev 0)
+++ utsrelease.patch 2022-04-25 18:54:35 UTC (rev 1190047)
@@ -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)
+ {
