From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- media-libs/hamlib/Manifest | 7 +- .../hamlib/files/hamlib-3.3-format-security.patch | 14 ++++ media-libs/hamlib/hamlib-3.1.ebuild | 87 ---------------------- media-libs/hamlib/hamlib-3.2.ebuild | 87 ---------------------- media-libs/hamlib/hamlib-3.3.ebuild | 6 +- 5 files changed, 21 insertions(+), 180 deletions(-) create mode 100644 media-libs/hamlib/files/hamlib-3.3-format-security.patch delete mode 100644 media-libs/hamlib/hamlib-3.1.ebuild delete mode 100644 media-libs/hamlib/hamlib-3.2.ebuild (limited to 'media-libs/hamlib') diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest index ce91b99d6bf5..85a7168ad784 100644 --- a/media-libs/hamlib/Manifest +++ b/media-libs/hamlib/Manifest @@ -1,7 +1,4 @@ -DIST hamlib-3.1.tar.gz 2130615 BLAKE2B dbc348d5df04015e1706b6f165496f0b0d9a4f7ce5e5ba6c8589349c1c9c1119ef31e8c3d4ba14666d19f3638bf27ad9b4a566af2fd4054faafc0604b8aeafd0 SHA512 befc5c407379e30711bde2affb9c191add6dbb04a36c1309f8771170cf04156c48609a094775638036282e085de6c78d09ef8d2760d69c595471e16e985e0885 -DIST hamlib-3.2.tar.gz 2223125 BLAKE2B c9bffa2b4d2aa4b3f9c590276058c159aa1236f22d3f37a063124af09002dc3034a88fd6f1273b5f4562ae22618222ea50c254fb59384bfae778448fe029ef49 SHA512 9aec2d361980abafdedf7b80f5b8bcf5b71f4f0c32bbfecebc0a50e6f74eb263ddc5188cf77283ed7361baabedb8364a2ce94a12fdda1bbdfaa0a030f510f224 +AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80 -EBUILD hamlib-3.1.ebuild 2118 BLAKE2B cf465e4a550819e167799bd078934b27b70cd2fb7fb3ebad4a57f3319fc8e9ba2a911fdfe4a687578602123d779468e09017c8861c137b0c33209a7dbef93992 SHA512 edb41fc07c24a558d9445394dec0fad71b826fee9c9d68c09adaaa30b036b47d40713bf385f7ac27c3dfa114a1533f7abe81551384366d2e168ba7472af47c3f -EBUILD hamlib-3.2.ebuild 2138 BLAKE2B fe56143078dea009d776ee2bbb569301443ad063faf74e0b36a5496d94ac9f3cd18725bfdede0bfd8a17fea312ec55b87f6a461403da18f6a34ef2df96d46725 SHA512 7aad2a1a6d43bcb83a6dfd1207e57a6c4c68ccc5218f8c37ebe7dc369b144c6ac7f9937814b4d03bf073b9cf3c8501e616e66ff400c019a327e82fba29960430 -EBUILD hamlib-3.3.ebuild 2018 BLAKE2B cb9d883705cb8aca8b94a43da7ba097977ffc0aa28e9629da4c9585f9c70a6273f09fb02c5897feb1b66f5ad922853ef0a9ef8034b8127830fc73b66500538d9 SHA512 3553647a517a792ea5f58ffd719fe03f124dbbdd925b913e6368b9f02bfaf1436f9458daacf825afa64f899f73890f144d6d4deeb552e418e3a339f650a59155 +EBUILD hamlib-3.3.ebuild 2104 BLAKE2B dc9066dfdd47afc271da4d82854e6f62cb109fec0b630b4f360363eeb24f448ee4c125e4ceafbd8315b0b81b4ec31e1acdeceb3d66fbe38b12bd0bebc76884b7 SHA512 a565f82e8c2d85f3396746ce1c2dadfd9c60ded21732f694fd53f911f8754868998941518769854137f94244138de9f3dd14442534e0ea062d4c80f2d3af6e11 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5 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 000000000000..bbf2de1d17d5 --- /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.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild deleted file mode 100644 index 890f0209c90d..000000000000 --- a/media-libs/hamlib/hamlib-3.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools-utils eutils multilib python-single-r1 - -DESCRIPTION="Ham radio backend rig control libraries" -HOMEPAGE="https://sourceforge.net/apps/mediawiki/hamlib" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2 GPL-2" -SLOT="0" -KEYWORDS="amd64 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} - virtual/pkgconfig - dev-lang/swig - >=sys-devel/libtool-2.2 - doc? ( app-doc/doxygen )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # fix hardcoded libdir paths - sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \ - -e "s#fix}/include#fix}/include/hamlib#" \ - hamlib.pc.in || die "sed failed" - - # 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() { - local myeconfargs=( - --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) - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && autotools-utils_src_compile html -} - -src_install() { - use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/html/") - autotools-utils_src_install - - insinto /usr/$(get_libdir)/pkgconfig - doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc - - echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib - doenvd "${T}"/73hamlib -} diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild deleted file mode 100644 index bdbd7a2b584c..000000000000 --- a/media-libs/hamlib/hamlib-3.2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit autotools-utils eutils multilib python-single-r1 - -DESCRIPTION="Ham radio backend rig control libraries" -HOMEPAGE="https://www.hamlib.org" -SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz" - -LICENSE="LGPL-2 GPL-2" -SLOT="0" -KEYWORDS="amd64 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} - virtual/pkgconfig - dev-lang/swig - >=sys-devel/libtool-2.2 - doc? ( app-doc/doxygen )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # fix hardcoded libdir paths - sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \ - -e "s#fix}/include#fix}/include/hamlib#" \ - hamlib.pc.in || die "sed failed" - - # 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() { - local myeconfargs=( - --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) - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - use doc && autotools-utils_src_compile html -} - -src_install() { - use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/html/") - autotools-utils_src_install - - insinto /usr/$(get_libdir)/pkgconfig - doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc - - echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib - doenvd "${T}"/73hamlib -} diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild index f4a753957eb1..2cde4b103be4 100644 --- a/media-libs/hamlib/hamlib-3.3.ebuild +++ b/media-libs/hamlib/hamlib-3.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) inherit autotools python-single-r1 @@ -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 } -- cgit v1.2.3