From nobody Tue Apr 26 16:24:17 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6E8281997DE0; Tue, 26 Apr 2022 16:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KnnJd2cMyz4g1G; Tue, 26 Apr 2022 16:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650990257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=atCt8Ymszt7ZboydzjZAoGHFWe9ijUiePD1Kfzs3gAM=; b=c/oTOwOvntxEUCH1CGMQeOWiD+Ddpvd1Tqs+TGD3fOiZBALDNr99c8qBM3NitPx9MG/tXv IUBnIvxjWN483Wg8ZsvlBvze+AhMvL55NvAmMX7uA/sQKO4p+sIP9x6ou/PrI9RJEcmxtS XDreqQn8xNJFymk2elLgG7uVgxyQR25Exq7Qw/WwCRbEwrY+3s3VsXHdVpzUdM0FeOKmXV H0FfeXxrjl0upf1r7X3eJGCJDTuW91Vf9CFWLfSseLhbETfAw+gprCY1vi8t99hh7sREvz YTJtJGc76Vftdl5Qubmd9lMiaSvZiNL54Vs/Fa7XbJD7P02RGgoa/st4Hkr0Nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3962712DFE; Tue, 26 Apr 2022 16:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23QGOHP8050473; Tue, 26 Apr 2022 16:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QGOHTb050472; Tue, 26 Apr 2022 16:24:17 GMT (envelope-from git) Date: Tue, 26 Apr 2022 16:24:17 GMT Message-Id: <202204261624.23QGOHTb050472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 2ddc3e4c5078 - 2022Q2 - japanese/eb: Add patch to fix buffer overrun in eb/multiplex.c List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 2ddc3e4c5078fed3eb1713c14513120887173d2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650990257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=atCt8Ymszt7ZboydzjZAoGHFWe9ijUiePD1Kfzs3gAM=; b=Z000UvX+xIWlw+oZt9zA9lsIxJXZ0RpMZHeddhMAkVKIBD753v5DELZ6Gadx3rvj3Nyytq I0aunsXtsLOlUQFW3LzNv31o+nhW1ZDetOOsYDmrL07sDgjNQfIFN10xCh0YVdb2R7yaBw aCH4yTSJp9EvX5Spe7FxDIDdlGTZZoSHbmKb559ub9hx50lwzV33/hRQN2MF1OZYnqw1hF FFZHEHO3/a21IOTtwS90NPMBrhjeX/Mh/qJ39HH/794u1bVQJ84/wYhtFuxldnwhTHfZyR 4enTrc/AjUMLIeSzTB6DxryjdzPjCVliiXZqDREFg501FSzU6SBcPrCAADP+VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650990257; a=rsa-sha256; cv=none; b=QeiXCyfvqt0KjbYwT1lRkX4coaCJo2OuG0eNPybixLp1lsOhDoi4rZgDNfd+VEHMe8gBA5 ssIsEccgAsiqurLjPzzbVqnHFvOdl8xRQbBUCUqh2TbjE54gNsOJGT05Fcuocz+FK9dUsO 7AOtFC8ip+NBOICxWKDaprxfX+wxzRuxLm0uxKGeWQ8Ig8Sw9RuQDwR0xvJXwuvkckYzdB jDgaotORKyu5T3FjKG3YZOGxHK44b+Wvauc1EU6h1VfdiHabGT8PSyHa+SxCGp2aDGXH7y O1X/dCaswU3p1HdD2PhtK3Q8jF9k7uwL0zP6iJrw0U7TVcQmy3irsZiSmx+QTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ddc3e4c5078fed3eb1713c14513120887173d2b commit 2ddc3e4c5078fed3eb1713c14513120887173d2b Author: Yasuhiro Kimura AuthorDate: 2022-04-26 15:48:01 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-26 16:23:59 +0000 japanese/eb: Add patch to fix buffer overrun in eb/multiplex.c While I'm here, * Pet portlint and portclippy * Tidy up Makefile with portfmt Reported by: Kazuhiro Ito Obtained from: edict ML MFH: 2022Q2 Security: 17a30a24-c579-11ec-bbbd-0800270512f4 (cherry picked from commit 2140f32d458610dd076b00670a68def3b7f39d37) --- japanese/eb/Makefile | 87 +++++++++++++++------------------- japanese/eb/files/patch-eb_multiplex.c | 11 +++++ 2 files changed, 48 insertions(+), 50 deletions(-) diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile index 979dc5285377..12764cb34947 100644 --- a/japanese/eb/Makefile +++ b/japanese/eb/Makefile @@ -2,7 +2,7 @@ PORTNAME= eb PORTVERSION= 4.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/ \ ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/ @@ -17,58 +17,27 @@ COMMENT= C library for accessing EB, EBG, EBXA, and EPWING CD-ROM dictionaries LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -EBFILES= ${DISTNAME}${EXTRACT_SUFX} -APPENDIXFILES= appendix/cencro-1.0.tar.gz \ - appendix/chujiten-2.3.tar.gz \ - appendix/chujiten2-2.0.tar.gz \ - appendix/chujiten6-2.3.tar.gz \ - appendix/colloc-2.0.tar.gz \ - appendix/crownfj-2.0.tar.gz \ - appendix/crownfj2-1.0.tar.gz \ - appendix/crowngj-1.0.tar.gz \ - appendix/daihyakka-1.0.tar.gz \ - appendix/daijirin-2.0.tar.gz \ - appendix/dd75-2.0.tar.gz \ - appendix/gendai2000-1.0.tar.gz \ - appendix/genius-1.0.tar.gz \ - appendix/genius2-1.1.tar.gz \ - appendix/global-2.0.tar.gz \ - appendix/heritage-2.2.tar.gz \ - appendix/hyogen-1.0.tar.gz \ - appendix/izumi-2.0.tar.gz \ - appendix/jitenban-2.4.tar.gz \ - appendix/jitenban97-2.1.tar.gz \ - appendix/kanjigen-2.0.tar.gz \ - appendix/kanjigen2-2.0.tar.gz \ - appendix/kojien-2.3.tar.gz \ - appendix/kojien2-2.0.tar.gz \ - appendix/kojien4-2.2.tar.gz \ - appendix/oxford-2.0.tar.gz \ - appendix/plus-2.0.tar.gz \ - appendix/readers-2.2.tar.gz \ - appendix/readers2-2.0.tar.gz \ - appendix/ruigigo-1.0.tar.gz \ - appendix/superdic98-1.0.tar.gz +USES= autoreconf iconv libtool perl5 tar:bzip2 +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-iconv-includes=${ICONV_PREFIX}/include \ + --with-iconv-libraries=${ICONV_PREFIX}/lib \ + --with-pkgdocdir=${DOCSDIR} +CONFIGURE_ENV= ac_cv_path_PERL=${PERL} -PORTDOCS= eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html eb-06.html \ - eb-07.html eb-08.html eb-09.html eb-10.html eb-11.html eb-12.html \ - eb-13.html eb-14.html eb.html ebappendix-01.html ebappendix-02.html \ - ebappendix-03.html ebappendix-04.html ebappendix.html ebfont-01.html \ +PORTDOCS= eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html \ + eb-06.html eb-07.html eb-08.html eb-09.html eb-10.html \ + eb-11.html eb-12.html eb-13.html eb-14.html eb.html \ + ebappendix-01.html ebappendix-02.html ebappendix-03.html \ + ebappendix-04.html ebappendix.html ebfont-01.html \ ebfont-02.html ebfont-03.html ebfont-04.html ebfont.html \ ebinfo-01.html ebinfo-02.html ebinfo-03.html ebinfo-04.html \ ebinfo-05.html ebinfo.html ebrefile-01.html ebrefile-02.html \ - ebrefile-03.html ebrefile.html ebstopcode-01.html ebstopcode-02.html \ - ebstopcode-03.html ebstopcode.html ebzip-01.html ebzip-02.html \ - ebzip-03.html ebzip-04.html ebzip-05.html ebzip-06.html ebzip-07.html \ - ebzip-08.html ebzip-09.html ebzip-10.html ebzip.html - -USES= autoreconf iconv libtool perl5 tar:bzip2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \ - --with-iconv-includes=${ICONV_PREFIX}/include \ - --with-iconv-libraries=${ICONV_PREFIX}/lib -CONFIGURE_ENV= ac_cv_path_PERL=${PERL} + ebrefile-03.html ebrefile.html ebstopcode-01.html \ + ebstopcode-02.html ebstopcode-03.html ebstopcode.html \ + ebzip-01.html ebzip-02.html ebzip-03.html ebzip-04.html \ + ebzip-05.html ebzip-06.html ebzip-07.html ebzip-08.html \ + ebzip-09.html ebzip-10.html ebzip.html OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes @@ -76,10 +45,28 @@ OPTIONS_SUB= yes APPENDIXDIR= ${DATADIR}/appendix NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ON= --with-gettext-includes=${LOCALBASE}/include \ --with-gettext-libraries=${LOCALBASE}/lib NLS_CONFIGURE_OFF= --disable-nls +NLS_CONFIGURE_ENABLE= nls + +EBFILES= ${DISTNAME}${EXTRACT_SUFX} +APPENDIXFILES= appendix/cencro-1.0.tar.gz appendix/chujiten-2.3.tar.gz \ + appendix/chujiten2-2.0.tar.gz appendix/chujiten6-2.3.tar.gz \ + appendix/colloc-2.0.tar.gz appendix/crownfj-2.0.tar.gz \ + appendix/crownfj2-1.0.tar.gz appendix/crowngj-1.0.tar.gz \ + appendix/daihyakka-1.0.tar.gz appendix/daijirin-2.0.tar.gz \ + appendix/dd75-2.0.tar.gz appendix/gendai2000-1.0.tar.gz \ + appendix/genius-1.0.tar.gz appendix/genius2-1.1.tar.gz \ + appendix/global-2.0.tar.gz appendix/heritage-2.2.tar.gz \ + appendix/hyogen-1.0.tar.gz appendix/izumi-2.0.tar.gz \ + appendix/jitenban-2.4.tar.gz appendix/jitenban97-2.1.tar.gz \ + appendix/kanjigen-2.0.tar.gz appendix/kanjigen2-2.0.tar.gz \ + appendix/kojien-2.3.tar.gz appendix/kojien2-2.0.tar.gz \ + appendix/kojien4-2.2.tar.gz appendix/oxford-2.0.tar.gz \ + appendix/plus-2.0.tar.gz appendix/readers-2.2.tar.gz \ + appendix/readers2-2.0.tar.gz appendix/ruigigo-1.0.tar.gz \ + appendix/superdic98-1.0.tar.gz post-extract: ${RM} -r ${WRKSRC}/zlib diff --git a/japanese/eb/files/patch-eb_multiplex.c b/japanese/eb/files/patch-eb_multiplex.c new file mode 100644 index 000000000000..8f21849dab2b --- /dev/null +++ b/japanese/eb/files/patch-eb_multiplex.c @@ -0,0 +1,11 @@ +--- eb/multiplex.c.orig 2010-01-03 12:26:06 UTC ++++ eb/multiplex.c +@@ -876,7 +876,7 @@ ebnet_set_file_path(int file, const char *file_path) + return -1; + + strncpy(entry->file_path, file_path, EB_MAX_RELATIVE_PATH_LENGTH + 1); +- *(entry->file_path + EB_MAX_RELATIVE_PATH_LENGTH + 1) = '\0'; ++ *(entry->file_path + EB_MAX_RELATIVE_PATH_LENGTH) = '\0'; + + return 0; + }