[gentoo-commits] repo/gentoo:master commit in: dev-java/rxtx/files/, dev-java/rxtx/
commit: 38e3e568bc36fcdf89277d6b68301472f34a04ee
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Sep 9 11:11:42 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Sep 9 11:11:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e3e568
dev-java/rxtx: added missing include + scrubbed patches
Closes: https://bugs.gentoo.org/927898
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch| 4
dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch | 6 --
dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch | 5 -
dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch | 4 ++--
dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch | 10 ++
dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild | 3 ++-
6 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
index 366bb78c2cba..9ed045fef250 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
@@ -16,10 +16,6 @@
https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9
Bug: https://bugs.gentoo.org/831394
-Description: Fixes the build failure with Java 10
-Author: Emmanuel Bourg
-Forwarded: no
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,11 +111,6 @@
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
index a00ed96f7e5a..b734ac7ffd25 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
@@ -5,12 +5,6 @@ Subject: [PATCH] Fix invalid Javadoc syntax that leads to
errors
Bug: https://bugs.gentoo.org/642030
Signed-off-by: Yuan Liao
- src/gnu/io/RXTXPort.java | 50 ++--
- 1 file changed, 27 insertions(+), 23 deletions(-)
-
-diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java
-index 622a6a8..77a23ea 100644
--- a/src/gnu/io/RXTXPort.java
+++ b/src/gnu/io/RXTXPort.java
@@ -1732,7 +1732,7 @@ Documentation is at
http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
index 1337cce3c546..2d060c338429 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
@@ -4,11 +4,6 @@
https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9
Bug: https://bugs.gentoo.org/550534
-From: tony mancill
-Forwarded: no
-Description: use format specifiers in fprintf statements for hardening flags
-
--- a/src/SerialImp.c
+++ b/src/SerialImp.c
@@ -5108,7 +5108,7 @@
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
index 1e4ff4af57b7..9a69c64029db 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
@@ -1,5 +1,5 @@
src/lfd/lockdaemon.c.orig 2007-04-26 06:26:07.0 +0100
-+++ src/lfd/lockdaemon.c 2016-02-17 20:41:09.137509089 +
+--- src/lfd/lockdaemon.c.orig
src/lfd/lockdaemon.c
@@ -69,6 +69,7 @@
#include
#include
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
new file mode 100644
index ..b56fe43092d0
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/SerialImp.c
b/src/SerialImp.c
+@@ -146,6 +146,7 @@
+ #ifdef LIBLOCKDEV
+ #include
+ #endif /* LIBLOCKDEV */
++#include
+
+ extern int errno;
+
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 2d39447cb63b..460474c3ba23 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -46,6 +46,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-format-security.patch"
eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch"
eapply "${FILESDIR}/${P}-fix-for-java-10+.patch"
+ eapply "${FILESDIR}/${P}-missing-include.patch"
eapply_user
rm acinclude.m4 || die
[gentoo-commits] repo/gentoo:master commit in: dev-java/rxtx/files/
commit: 8f278bcd4fa99f047e60643f06f28d38ace9bea9
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Sep 18 12:20:40 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Sep 18 12:21:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f278bcd
dev-java/rxtx: restored *.diff files/patches
Closes: https://bugs.gentoo.org/743325
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff | 14 +
dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff | 90 +
2 files changed, 104 insertions(+)
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
new file mode 100644
index 000..496d732ae2f
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
@@ -0,0 +1,14 @@
+--- src/lfd/lockdaemon.c.orig 2004-10-12 10:59:28.0 +0200
src/lfd/lockdaemon.c 2006-10-29 22:46:58.0 +0100
+@@ -248,9 +248,8 @@
+
+ if ( check_group_uucp() )
+ {
+- syslog( LOG_INFO, "check_lock_status: No permission to create
lock file.
+-
+- please see: How can I use Lock Files with rxtx? in INSTALL\n" );
++ syslog( LOG_INFO, "check_lock_status: No permission to create
lock file.\n\n"
++ "please see: How can I use Lock Files with rxtx? in
INSTALL\n" );
+ return 1;
+ }
+
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
new file mode 100644
index 000..fb05955c65f
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
@@ -0,0 +1,90 @@
+--- src/I2CImp.c.orig 2004-10-17 16:23:02.0 +0200
src/I2CImp.c 2006-10-26 21:25:32.0 +0200
+@@ -87,6 +87,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -98,6 +99,7 @@
+ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled
to run with OS release %s and you are currently running OS release %s. In some
cases this can be a problem. Try recompiling RXTX if you notice strange
behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic
link to the include files that came with the kernel source and not an older
copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ getchar();
+ }
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/RawImp.c.orig 2004-10-16 18:20:35.0 +0200
src/RawImp.c 2006-10-26 21:25:59.0 +0200
+@@ -231,6 +231,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -242,6 +243,7 @@
+ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled
to run with OS release %s and you are currently running OS release %s. In some
cases this can be a problem. Try recompiling RXTX if you notice strange
behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic
link to the include files that came with the kernel source and not an older
copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ getchar();
+ }
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/RS485Imp.c.orig2004-10-16 18:20:35.0 +0200
src/RS485Imp.c 2006-10-26 21:26:23.0 +0200
+@@ -87,6 +87,7 @@
+ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -98,6 +99,7 @@
+ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled
to run with OS release %s and you are currently running OS release %s. In some
cases this can be a problem. Try recompiling RXTX if you notice strange
behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic
link to the include files that came with the kernel source and not an older
copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ getchar();
+ }
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/SerialImp.c.orig 2006-01-29 23:19:04.0 +0100
src/SerialImp.c2006-10-26 21:26:59.0 +0200
+@@ -280,6 +280,7 @@
+ gettimeofday(&seloop, NULL);
+ #endif /* DEBUG_TIMING */
+ #if defined(DEBUG) && defined(__linux__)
++#if 0
+ /* Lets let people who upgraded kernels know they may have problems */
+ if (uname (&name) == -1)
+ {
+@@ -295,6 +296,
[gentoo-commits] repo/gentoo:master commit in: dev-java/rxtx/files/, dev-java/rxtx/
commit: a09db871abd782835c0b689fbdb9577f96a38a49
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Sep 18 08:29:50 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Sep 18 08:29:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09db871
dev-java/rxtx: removed obsolete 2.2_pre2
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff | 14
dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff | 90 -
dev-java/rxtx/rxtx-2.2_pre2.ebuild | 101
3 files changed, 205 deletions(-)
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
deleted file mode 100644
index 496d732ae2f..000
--- a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
+++ /dev/null
@@ -1,14 +0,0 @@
src/lfd/lockdaemon.c.orig 2004-10-12 10:59:28.0 +0200
-+++ src/lfd/lockdaemon.c 2006-10-29 22:46:58.0 +0100
-@@ -248,9 +248,8 @@
-
- if ( check_group_uucp() )
- {
-- syslog( LOG_INFO, "check_lock_status: No permission to create
lock file.
--
-- please see: How can I use Lock Files with rxtx? in INSTALL\n" );
-+ syslog( LOG_INFO, "check_lock_status: No permission to create
lock file.\n\n"
-+ "please see: How can I use Lock Files with rxtx? in
INSTALL\n" );
- return 1;
- }
-
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
deleted file mode 100644
index fb05955c65f..000
--- a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
+++ /dev/null
@@ -1,90 +0,0 @@
src/I2CImp.c.orig 2004-10-17 16:23:02.0 +0200
-+++ src/I2CImp.c 2006-10-26 21:25:32.0 +0200
-@@ -87,6 +87,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #if defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -98,6 +99,7 @@
- fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled
to run with OS release %s and you are currently running OS release %s. In some
cases this can be a problem. Try recompiling RXTX if you notice strange
behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic
link to the include files that came with the kernel source and not an older
copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
- getchar();
- }
-+#endif
- #endif /* __linux__ */
- #endif /* WIN32 */
- }
src/RawImp.c.orig 2004-10-16 18:20:35.0 +0200
-+++ src/RawImp.c 2006-10-26 21:25:59.0 +0200
-@@ -231,6 +231,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #if defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -242,6 +243,7 @@
- fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled
to run with OS release %s and you are currently running OS release %s. In some
cases this can be a problem. Try recompiling RXTX if you notice strange
behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic
link to the include files that came with the kernel source and not an older
copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
- getchar();
- }
-+#endif
- #endif /* __linux__ */
- #endif /* WIN32 */
- }
src/RS485Imp.c.orig2004-10-16 18:20:35.0 +0200
-+++ src/RS485Imp.c 2006-10-26 21:26:23.0 +0200
-@@ -87,6 +87,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #if defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -98,6 +99,7 @@
- fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled
to run with OS release %s and you are currently running OS release %s. In some
cases this can be a problem. Try recompiling RXTX if you notice strange
behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic
link to the include files that came with the kernel source and not an older
copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
- getchar();
- }
-+#endif
- #endif /* __linux__ */
- #endif /* WIN32 */
- }
src/SerialImp.c.orig 2006-01-29 23:19:04.0 +0100
-+++ src/SerialImp.c2006-10-26 21:26:59.0 +0200
-@@ -280,6 +280,7 @@
- gettimeofday(&seloop, NULL);
- #endif /* DEBUG_TIMING */
- #if defined(DEBUG) && defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname
[gentoo-commits] repo/gentoo:master commit in: dev-java/rxtx/files/, dev-java/rxtx/
commit: 2be6be83cae43e372d0ca7a555035ac3ec73e917
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Feb 17 21:20:57 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Feb 17 21:21:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be6be83
dev-java/rxtx: Fix USE=lfd issue (#550908), EAPI bump, cleanups
* lockdaemon.c should include limits.h
* app-arch/zip can be implied using JAVA_PKG_IUSE
* dev-java/ant-core isn't actually needed
* sys-apps/xinetd is an RDEPEND, not DEPEND
* Use the correct -source and -target flags
* Remove useless elibtoolize
* Remove useless sed
* Add missing dies
* dohtml is bad
Package-Manager: portage-2.2.27
dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch | 10 +++
dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild | 102 +
2 files changed, 112 insertions(+)
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
new file mode 100644
index 000..1e4ff4a
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
@@ -0,0 +1,10 @@
+--- src/lfd/lockdaemon.c.orig 2007-04-26 06:26:07.0 +0100
src/lfd/lockdaemon.c 2016-02-17 20:41:09.137509089 +
+@@ -69,6 +69,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #define FHS
+ #define LOCKFILEPREFIX "LCK.."
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
new file mode 100644
index 000..8cd2fc0
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit toolchain-funcs versionator autotools java-pkg-2
+
+MY_PV="$(delete_version_separator 2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Native lib providing serial and parallel communication for Java"
+HOMEPAGE="http://rxtx.qbang.org/";
+SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip";
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="lfd"
+
+RDEPEND=">=virtual/jre-1.6
+ lfd? ( sys-apps/xinetd )"
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
+ sed -i \
+ -e "s:UTS_RELEASE::g" \
+ -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
+ -e "s:-source ... -target ...:$(java-pkg_javac-args):g" \
+ configure.in || die
+
+ epatch \
+ "${FILESDIR}/${PN}-2.1-7r2-lfd.diff" \
+ "${FILESDIR}/${PN}-2.1-7r2-nouts.diff" \
+ "${FILESDIR}/${P}-add-ttyACM.patch" \
+ "${FILESDIR}/${P}-limits.patch"
+
+ rm acinclude.m4 || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable lfd lockfile_server)
+}
+
+src_compile() {
+ emake
+
+ if use lfd ; then
+ # see INSTALL in src/ldf
+ $(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o
src/lfd/in.lfd || die
+ fi
+
+ if use doc ; then
+ emake docs
+ fi
+
+ # Fix for src zip creation
+ if use source ; then
+ mkdir -p src_with_pkg/gnu || die
+ ln -s ../../src src_with_pkg/gnu/io || die
+ fi
+}
+
+src_install() {
+ java-pkg_dojar RXTXcomm.jar
+ java-pkg_doso ${CHOST}/.libs/*.so
+
+ dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
+ docinto html
+ dodoc RMISecurityManager.html
+
+ if use lfd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/lockfiled.xinetd" lfd
+ dosbin src/lfd/in.lfd
+ dodoc src/lfd/LockFileServer.rfc
+ fi
+
+ use doc && java-pkg_dojavadoc api
+ use source && java-pkg_dosrc src_with_pkg/gnu
+}
+
+pkg_postinst() {
+ if use lfd ; then
+ elog "Don't forget to enable the LockFileServer"
+ elog "daemon (lfd) in /etc/xinetd.d/lfd"
+ else
+ elog "RXTX uses UUCP style device-locks. You should"
+ elog "add every user who needs to access serial ports"
+ elog "to the 'uucp' group:"
+ elog
+ elog "usermod -aG uucp "
+ fi
+}
