* [gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/, media-libs/hamlib/files/
@ 2020-03-25 14:15 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2020-03-25 14:15 UTC (permalink / raw
To: gentoo-commits
commit: c206ece2b4cc4b081a32850bb50af6c5ec3d73bd
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 14:14:44 2020 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 14:15:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c206ece2
media-libs/hamlib: Fix build error with -Werror=format-security
Closes: https://bugs.gentoo.org/714682
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-libs/hamlib/files/hamlib-3.3-format-security.patch | 14 ++++++++++++++
media-libs/hamlib/hamlib-3.3.ebuild | 4 ++++
2 files changed, 18 insertions(+)
diff --git a/media-libs/hamlib/files/hamlib-3.3-format-security.patch b/media-libs/hamlib/files/hamlib-3.3-format-security.patch
new file mode 100644
index 00000000000..bbf2de1d17d
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-3.3-format-security.patch
@@ -0,0 +1,14 @@
+# Fixes build error with format-securety (bug #714682)
+diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
+index 44308cc..aab1300 100644
+--- a/tests/rotctl_parse.c
++++ b/tests/rotctl_parse.c
+@@ -1009,7 +1009,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc)
+ /* The starting position of the source string is the first
+ * character past the initial '\'.
+ */
+- snprintf(cmd_name, sizeof(cmd_name), parsed_input[0] + 1);
++ snprintf(cmd_name, sizeof(cmd_name), "%s", parsed_input[0] + 1);
+
+ /* Sanity check as valid multiple character commands consist of
+ * alpha-numeric characters and the underscore ('_') character.
diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index 7a23ca37f1b..2cde4b103be 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -34,6 +34,8 @@ DEPEND=" ${RDEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/hamlib-3.3-format-security.patch )
+
DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO)
pkg_setup() {
@@ -57,6 +59,8 @@ src_prepare() {
eautoreconf
+ eapply "${PATCHES}"
+
eapply_user
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/, media-libs/hamlib/files/
@ 2022-05-08 10:04 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2022-05-08 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 9c8d77147db9d81b4125433ea3c66b7380f20c74
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat May 7 03:59:18 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun May 8 09:55:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c8d7714
media-libs/hamlib: Fix USE=tcl with slibtool
Bug: https://bugs.gentoo.org/798273
Upstream-PR: https://github.com/Hamlib/Hamlib/pull/1023
Upstream-commit: 4fa9a211adbc ("bindings: Fix tcl build with slibtool")
Signed-off-by: orbea <orbea <AT> riseup.net>
Bug: https://bugs.gentoo.org/798273
Closes: https://github.com/gentoo/gentoo/pull/25363
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-libs/hamlib/files/hamlib-4.4-slibtool.patch | 73 +++++++++++++++++++++++
media-libs/hamlib/hamlib-4.4.ebuild | 8 ++-
2 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
new file mode 100644
index 000000000000..140534e744b0
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
@@ -0,0 +1,73 @@
+From 4fa9a211adbcb1ae9329db41c27854af70f39d64 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 6 May 2022 17:13:36 -0700
+Subject: [PATCH] bindings: Fix tcl build with slibtool
+
+---
+ bindings/Makefile.am | 3 ++-
+ configure.ac | 16 ++++++++++++----
+ macros/tcl.m4 | 1 +
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index f9f17d567..7e2647945 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -149,8 +149,9 @@ PKG_VER = $(ABI_VERSION).$(ABI_REVISION)
+ DLL = hamlibtcl-$(PKG_VER)$(TCL_SHLIB_SUFFIX)
+
+ nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
++hamlibtcl_la_CFLAGS = $(TCL_CFLAGS)
+ hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version
+-hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC)
++hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) $(TCL_LIBS)
+
+ hamlibtcl_ladir = $(tcldir)
+ hamlibtcl_la_DATA = pkgIndex.tcl
+diff --git a/configure.ac b/configure.ac
+index f58eb0925..ab6e120f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -589,11 +589,16 @@ AC_ARG_WITH([tcl-binding],
+ [build_tcl=no])
+ AC_MSG_RESULT([$build_tcl])
+
+-dnl SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
++dnl tcl.pc or SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
+ AS_IF([test x"${build_tcl}" = "xyes"],[
+- dnl Search for and load tclConfig.sh.
+- SC_PATH_TCLCONFIG
+- SC_LOAD_TCLCONFIG
++ dnl Search for and load tcl.pc or tclConfig.sh.
++ PKG_CHECK_MODULES([TCL], [tcl],
++ [],
++ [
++ AC_MSG_WARN([Unable to find Tcl pkgconfig])
++ SC_PATH_TCLCONFIG
++ SC_LOAD_TCLCONFIG
++ ])
+
+ tcl_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
+@@ -617,6 +622,9 @@ AC_SUBST([TCL_VERSION])
+ AC_SUBST([TCL_LIB_SPEC])
+ AC_SUBST([TCL_INCLUDE_SPEC])
+ AC_SUBST([TCL_SHLIB_SUFFIX])
++dnl These variables are set once tcl.pc is found.
++AC_SUBST([TCL_LIBS])
++AC_SUBST([TCL_CFLAGS])
+
+
+ dnl Check for lua availability, so we can enable HamlibLua
+diff --git a/macros/tcl.m4 b/macros/tcl.m4
+index feed05ce3..c1d308cf4 100644
+--- a/macros/tcl.m4
++++ b/macros/tcl.m4
+@@ -130,6 +130,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
+ . $TCL_BIN_DIR/tclConfig.sh
+ else
+ AC_MSG_RESULT([file not found])
++ AC_MSG_ERROR([failed to load tclConfig.sh])
+ fi
+
+ #
diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
index 72c4dabac98b..64e2839ee422 100644
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ b/media-libs/hamlib/hamlib-4.4.ebuild
@@ -38,6 +38,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+PATCHES=(
+ "${FILESDIR}/${P}-slibtool.patch" # 798273
+)
+
S="${WORKDIR}/${MY_P}"
pkg_setup() {
@@ -45,6 +49,8 @@ pkg_setup() {
}
src_prepare() {
+ default
+
# fix hardcoded libdir paths
sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-e "s#fix}/include#fix}/include/hamlib#" \
@@ -60,8 +66,6 @@ src_prepare() {
sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
eautoreconf
-
- eapply_user
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/, media-libs/hamlib/files/
@ 2025-03-23 8:44 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2025-03-23 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 93d92a254724630b37c88b374a808a987adefd35
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 23 08:43:58 2025 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Mar 23 08:44:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d92a25
media-libs/hamlib: drop 4.5.5-r4, 4.6.1
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-libs/hamlib/Manifest | 2 -
.../hamlib/files/hamlib-4.5.5-gcc14-fix.patch | 12 ---
media-libs/hamlib/hamlib-4.5.5-r4.ebuild | 102 ---------------------
media-libs/hamlib/hamlib-4.6.1.ebuild | 99 --------------------
4 files changed, 215 deletions(-)
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 9af00835dea4..47edefe7c4d2 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,3 +1 @@
-DIST hamlib-4.5.5.tar.gz 2603846 BLAKE2B ad4a286a7aa1e972707cb9ed15a4268909a7d252a64b98b01d35c9d9e42c605cd600e819e195e49d501c1e135191fda585581e27801fa217c9141236a81ad770 SHA512 2cdff2630e89fa95c7ac40e998492e8a04e000fcca18b9491ddcb967927ffaa771ed2e6ac3232a060947883533a6ae7405042a2f8fdb1de157d71f74381f5899
-DIST hamlib-4.6.1.tar.gz 2909273 BLAKE2B d8ab443bd19068ec76fbe021f9dcdbaf3cead9a6eac1eab47c148c35fe7c98d294d50386cc3c386e8113ac26a9aa594f7a9d121e81601c84660350115566b1b6 SHA512 3363665e2fc5541e2bd68767e9c0d8c856a7d2ea9a7e4a2d7e79d6e7349150642cba4e96d27ab6dc029fd838e05c3f0f9f7acadcc7c8bc51bedaf61ef67e95ce
DIST hamlib-4.6.2.tar.gz 2909790 BLAKE2B 8bba73b446be13f4be592333b51b863f7299d189c640e2d1bfb6dd82f8f5e19ed6a1f39be09811d2061bb416696dd24907a9248b7bc96360e7a0fec8783701b1 SHA512 8b8b7e4c95e4331f1ace1d724924e30c66a88d04d5354fd28d28090b751184300196e4512504136ece98cef374e69dd58cc597819f8802ddadb978c7a0bf731d
diff --git a/media-libs/hamlib/files/hamlib-4.5.5-gcc14-fix.patch b/media-libs/hamlib/files/hamlib-4.5.5-gcc14-fix.patch
deleted file mode 100644
index 35eade8f68e2..000000000000
--- a/media-libs/hamlib/files/hamlib-4.5.5-gcc14-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/memload.c b/tests/memload.c
-index 6157a08..4f189d0 100644
---- a/tests/memload.c
-+++ b/tests/memload.c
-@@ -19,6 +19,7 @@
- */
-
-
-+#include <stdlib.h>
- #include <hamlib/config.h>
-
- #include <hamlib/rig.h>
diff --git a/media-libs/hamlib/hamlib-4.5.5-r4.ebuild b/media-libs/hamlib/hamlib-4.5.5-r4.ebuild
deleted file mode 100644
index 5e99e3fec86c..000000000000
--- a/media-libs/hamlib/hamlib-4.5.5-r4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.github.io"
-SRC_URI="https://downloads.sourceforge.net/hamlib/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0/4.2"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
- =virtual/libusb-0*
- dev-libs/libxml2
- sys-libs/readline:0=
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- tcl? ( dev-lang/tcl:0= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- dev-lang/swig
- >=dev-build/libtool-2.2
- doc? ( app-text/doxygen
- dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.5.5-gcc14-fix.patch"
- "${FILESDIR}/hamlib-drop-lua.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Correct install target to whatever INSTALLDIRS says and use vendor
- # installdirs everywhere (bug #611550)
- sed -i -e "s#install_site#install#" \
- -e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
- bindings/Makefile.am || die "sed failed patching for perl"
-
- # make building of documentation compatible with autotools-utils
- sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/926839
- # https://github.com/Hamlib/Hamlib/issues/1524
- filter-lto
-
- econf \
- --libdir=/usr/$(get_libdir)/hamlib \
- --disable-static \
- --with-xml-support \
- $(use_with perl perl-binding) \
- $(use_with python python-binding) \
- $(use_with tcl tcl-binding)
-}
-
-src_compile() {
- emake
- use doc && emake html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- use python && python_optimize
-
- use doc && HTML_DOCS=( doc/html/ )
- einstalldocs
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins hamlib.pc
-
- echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
- doenvd "${T}"/73hamlib
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/hamlib/hamlib-4.6.1.ebuild b/media-libs/hamlib/hamlib-4.6.1.ebuild
deleted file mode 100644
index 45ff29e3306f..000000000000
--- a/media-libs/hamlib/hamlib-4.6.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.github.io"
-SRC_URI="https://downloads.sourceforge.net/hamlib/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
- =virtual/libusb-0*
- dev-libs/libxml2
- sys-libs/readline:0=
- perl? ( dev-lang/perl )
- python? ( ${PYTHON_DEPS} )
- tcl? ( dev-lang/tcl:0= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- dev-lang/swig
- >=dev-build/libtool-2.2
- doc? ( app-text/doxygen
- dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-PATCHES=( "${FILESDIR}/hamlib-drop-lua.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Correct install target to whatever INSTALLDIRS says and use vendor
- # installdirs everywhere (bug #611550)
- sed -i -e "s#install_site#install#" \
- -e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
- bindings/Makefile.am || die "sed failed patching for perl"
-
- # make building of documentation compatible with autotools-utils
- sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/926839
- # https://github.com/Hamlib/Hamlib/issues/1524
- filter-lto
-
- econf \
- --libdir=/usr/$(get_libdir)/hamlib \
- --disable-static \
- --with-xml-support \
- $(use_with perl perl-binding) \
- $(use_with python python-binding) \
- $(use_with tcl tcl-binding)
-}
-
-src_compile() {
- emake
- use doc && emake html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- use python && python_optimize
-
- use doc && HTML_DOCS=( doc/html/ )
- einstalldocs
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins hamlib.pc
-
- echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
- doenvd "${T}"/73hamlib
-
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-23 8:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-25 14:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/, media-libs/hamlib/files/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2022-05-08 10:04 Thomas Beierlein
2025-03-23 8:44 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox