From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- app-editors/hteditor/Manifest | 5 +- .../files/hteditor-2.1.0-format-security.patch | 57 ++++++++++++++++++++ .../files/hteditor-2.1.0-gcc-6-uchar.patch | 45 ++++++++++++++++ app-editors/hteditor/hteditor-2.1.0-r1.ebuild | 60 ++++++++++++++++++++++ app-editors/hteditor/hteditor-2.1.0.ebuild | 1 + 5 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 app-editors/hteditor/files/hteditor-2.1.0-format-security.patch create mode 100644 app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch create mode 100644 app-editors/hteditor/hteditor-2.1.0-r1.ebuild (limited to 'app-editors/hteditor') diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest index d35ebe1b54da..b7a08ac5d589 100644 --- a/app-editors/hteditor/Manifest +++ b/app-editors/hteditor/Manifest @@ -1,5 +1,8 @@ +AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f +AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410 -EBUILD hteditor-2.1.0.ebuild 1147 BLAKE2B 9811ce42c624b4c0fb5ac6415b3c437013fad812befb981868ef7646cdd56f66c4f5e9a279dbf4079a8b8708b19f9a29c42a15cb31e9a573de75945707f5447f SHA512 bc89e1589e935e8dd11b67cb16b21542b5bd712dbd3fd85990f82e8630e32189ff3c66d1c83508632b71a022303d5da25d7c75b841b4af05d49f5b77333aaaf7 +EBUILD hteditor-2.1.0-r1.ebuild 1231 BLAKE2B c25a462ec8e00c6c689d03dfc8c74676743cf4f345ef34827e59cd875111c4c9e4d6f92d494bc2f33384e76036f7d7f8c0c6bf91d791b665f02f9d35847d51fa SHA512 b496fd7d0a1df96b80d387d49ff94bc11e59a324fefd2e66a5d26bae285c57be9f7a3f792ae265b3145d6437134772b393e2466d1062c2b1d8f224212351a908 +EBUILD hteditor-2.1.0.ebuild 1185 BLAKE2B 03f7e29f51fe3cc3e1aae710a962b07b0245ff81b60a5a946a1bac41e1539e7ea345b5069ab48d946c13382d58f6db7fd58430c8561a81e74e6ce57ad6fc1150 SHA512 1de23a98bf82d020b34543e0eb572eb44dcba82a6d294455a3c68c02a3da3aa22e6348e2c8d25ecab7878b5fcd7e4ab4b42d48c07f90e42b6befa54730ba0b9c MISC metadata.xml 460 BLAKE2B 517972433773ade8012213525db8c3395d6f6545d1e1499b18cb511df70a5c0f42bae14471d19f8a8e268f2149d4ed00b3a220a037cf7e57bb508d1239333295 SHA512 ff08b42c35979dbf9c165ae5895374779c53ab4d80e25edb9bf0d854ac44c89dd01bd817fc555d75036e687f007abbd717593af0554e6315dced60372bec4707 diff --git a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch new file mode 100644 index 000000000000..408d1b9b1be3 --- /dev/null +++ b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch @@ -0,0 +1,57 @@ +https://bugs.gentoo.org/521018 + +From 5839355d67ff822593190473a41512ca19e4280a Mon Sep 17 00:00:00 2001 +From: Anton Gladky +Date: Wed, 18 Feb 2015 21:20:39 +0100 +Subject: [PATCH] Fix "format not a string" compilation failure + +Compilation with the flag -Werror=format-security fails with +the message: + +error: format not a string literal and no format arguments + +This patch solves the issue. +--- + asm/x86dis.cc | 6 +++--- + htpal.cc | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/asm/x86dis.cc b/asm/x86dis.cc +index 0830d9c..bb9028f 100644 +--- a/asm/x86dis.cc ++++ b/asm/x86dis.cc +@@ -1218,15 +1218,15 @@ void x86dis::str_op(char *opstr, int *opstrlen, x86dis_insn *insn, x86_insn_op * + default: {assert(0);} + } + if (!insn->rexprefix) { +- sprintf(opstr, x86_regs[j][op->reg]); ++ sprintf(opstr, "%s", x86_regs[j][op->reg]); + } else { +- sprintf(opstr, x86_64regs[j][op->reg]); ++ sprintf(opstr, "%s", x86_64regs[j][op->reg]); + } + break; + } + case X86_OPTYPE_SEG: + if (x86_segs[op->seg]) { +- sprintf(opstr, x86_segs[op->seg]); ++ sprintf(opstr, "%s", x86_segs[op->seg]); + } + break; + case X86_OPTYPE_CRX: +diff --git a/htpal.cc b/htpal.cc +index 03dea18..3d5f51e 100644 +--- a/htpal.cc ++++ b/htpal.cc +@@ -307,7 +307,7 @@ void palette_entry::strvalue(char *buf32bytes) + text = "normal"; + } + p = tag_make_color(p, 32, VCP(fg, bg)); +- p += sprintf(p, text); ++ p += sprintf(p, "%s", text); + p = tag_make_default_color(p, 32); + *p = 0; + } +-- +2.16.2 + diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch new file mode 100644 index 000000000000..67eaa6e01491 --- /dev/null +++ b/app-editors/hteditor/files/hteditor-2.1.0-gcc-6-uchar.patch @@ -0,0 +1,45 @@ +https://github.com/sebastianbiallas/ht/pull/21 + +From 7ce68c4bca7fd64c0073f1770c6b5761c03174f0 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Wed, 21 Mar 2018 21:30:31 +0000 +Subject: [PATCH] ht: fix build failure on -funsigned-char platforms + +powerpc (and arm) have 'char' == 'unsigned char' by default. +This causes build failures on c++11: + +``` +$ ./configure CFLAGS=-funsigned-char CXXFLAGS=-funsigned-char +$ make + +g++ -DHAVE_CONFIG_H -I. -I./analyser -I./asm -I./info -I./io/posix -I./io -I./output -I./eval -I. -DNOMACROS -pipe -O3 -fomit-frame-pointer -Wall -fsigned-char -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c++14 -Woverloaded-virtual -Wnon-virtual-dtor -funsigned-char -MT htcoffhd.o -MD -MP -MF .deps/htcoffhd.Tpo -c -o htcoffhd.o htcoffhd.cc +htcoffhd.cc:93:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] + }; + ^ +htcoffhd.cc:131:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] + }; +``` + +Use 'signed char' explicitly to maintain existing behavior. + +Signed-off-by: Sergei Trofimovich +--- + httag.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/httag.h b/httag.h +index 7f5da1c..83e5c22 100644 +--- a/httag.h ++++ b/httag.h +@@ -69,7 +69,7 @@ struct ht_tag_flags { + } PACKED; + + struct ht_tag_flags_s { +- char bitidx; ++ signed char bitidx; + const char *desc; + } PACKED; + +-- +2.16.2 + diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild new file mode 100644 index 000000000000..a1d577aacafa --- /dev/null +++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools toolchain-funcs + +MY_P=${P/editor} + +DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files" +HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/" +SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="X" + +RDEPEND="sys-libs/ncurses:0= + X? ( x11-libs/libX11 ) + >=dev-libs/lzo-2" +DEPEND="${RDEPEND} + virtual/yacc + sys-devel/flex" + +DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO ) + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}"/${P}-gcc-7.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-gcc-6-uchar.patch + "${FILESDIR}"/${P}-format-security.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable X x11-textmode) \ + --enable-maintainermode +} + +src_compile() { + emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + #For prefix + chmod u+x "${S}/install-sh" + + local HTML_DOCS="doc/*.html" + doinfo doc/*.info + + default +} diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild index 5e5d0e083085..1f5fc5b5ee5c 100644 --- a/app-editors/hteditor/hteditor-2.1.0.ebuild +++ b/app-editors/hteditor/hteditor-2.1.0.ebuild @@ -30,6 +30,7 @@ S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${P}-gcc-7.patch "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-gcc-6-uchar.patch ) src_prepare() { -- cgit v1.2.3