commit: 95af7c77e3687fb248aeec1c40682ae78d8e64b2 Author: John Helmert III <ajak <AT> gentoo <DOT> org> AuthorDate: Sat Jun 12 17:29:35 2021 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Sat Jun 12 17:29:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95af7c77
dev-cpp/libmcpp: drop 2.7.2-r3 Bug: https://bugs.gentoo.org/718808 Signed-off-by: John Helmert III <ajak <AT> gentoo.org> dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch | 33 ----------- dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch | 75 ------------------------ dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 47 --------------- 3 files changed, 155 deletions(-) diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch deleted file mode 100644 index cb5aa6c345c..00000000000 --- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-gniibe.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Simple fixes - * Fix freeing unmalloced memory - The memory of 'in_file' is not malloced, but points to argv[]. - It is wrong to free it. - * When there is no input file specified by argv, it causes error - and fp_in == NULL. Check is needed to call fclose for fp_in. -Author: NIIBE Yutaka - -## Fixes the issue reported at: -## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/ - -Index: mcpp-2.7.2/src/main.c -=================================================================== ---- mcpp-2.7.2.orig/src/main.c 2013-07-09 03:03:05.610947658 +0000 -+++ mcpp-2.7.2/src/main.c 2013-07-09 03:03:05.534947624 +0000 -@@ -428,16 +428,11 @@ - - fatal_error_exit: - #if MCPP_LIB -- /* Free malloced memory */ -- if (mcpp_debug & MACRO_CALL) { -- if (in_file != stdin_name) -- free( in_file); -- } - clear_filelist(); - clear_symtable(); - #endif - -- if (fp_in != stdin) -+ if (fp_in && fp_in != stdin) - fclose( fp_in); - if (fp_out != stdout) - fclose( fp_out); diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch deleted file mode 100644 index fff5d321fe9..00000000000 --- a/dev-cpp/libmcpp/files/libmcpp-2.7.2-zeroc.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: Fixes by ZeroC, Inc. -Author: ZeroC, Inc. -Bug-Debian: http://bugs.debian.org/611749 - ---- mcpp-2.7.2.orig/src/main.c -+++ mcpp-2.7.2/src/main.c -@@ -326,6 +326,8 @@ static void init_main( void) - = FALSE; - option_flags.trig = TRIGRAPHS_INIT; - option_flags.dig = DIGRAPHS_INIT; -+ sh_file = NULL; -+ sh_line = 0; - } - - int mcpp_lib_main ---- mcpp-2.7.2.orig/src/support.c -+++ mcpp-2.7.2/src/support.c -@@ -188,7 +188,7 @@ static char * append_to_buffer( - size_t length - ) - { -- if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */ -+ if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */ - size_t size = MAX( BUF_INCR_SIZE, length); - - if (mem_buf_p->buffer == NULL) { /* 1st append */ -@@ -1722,6 +1722,8 @@ com_start: - sp -= 2; - while (*sp != '\n') /* Until end of line */ - mcpp_fputc( *sp++, OUT); -+ mcpp_fputc( '\n', OUT); -+ wrong_line = TRUE; - } - goto end_line; - default: /* Not a comment */ ---- mcpp-2.7.2.orig/src/internal.H -+++ mcpp-2.7.2/src/internal.H -@@ -390,6 +390,8 @@ extern char * const work_end; /* E - extern char identifier[]; /* Lastly scanned name */ - extern IFINFO ifstack[]; /* Information of #if nesting */ - extern char work_buf[]; -+extern FILEINFO * sh_file; -+extern int sh_line; - /* Temporary buffer for directive line and macro expansion */ - - /* main.c */ -@@ -557,6 +559,6 @@ extern void init_system( void); - #endif - #endif - --#if HOST_HAVE_STPCPY -+#if HOST_HAVE_STPCPY && !defined(stpcpy) - extern char * stpcpy( char * dest, const char * src); - #endif ---- mcpp-2.7.2.orig/src/system.c -+++ mcpp-2.7.2/src/system.c -@@ -3858,6 +3858,9 @@ static int chk_dirp( - } - #endif - -+FILEINFO* sh_file; -+int sh_line; -+ - void sharp( - FILEINFO * sharp_file, - int flag /* Flag to append to the line for GCC */ -@@ -3868,8 +3871,6 @@ void sharp( - * else (i.e. 'sharp_file' is NULL) 'infile'. - */ - { -- static FILEINFO * sh_file; -- static int sh_line; - FILEINFO * file; - int line; - diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild deleted file mode 100644 index b2aa110f188..00000000000 --- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_P=${P/lib/} - -DESCRIPTION="A portable C++ preprocessor" -HOMEPAGE="http://mcpp.sourceforge.net"; -SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos" -IUSE="static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch - "${FILESDIR}"/${PN}-2.7.2-zeroc.patch - "${FILESDIR}"/${PN}-2.7.2-gniibe.patch -) - -src_prepare() { - default - - # bug #778461 - sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die - - eautoreconf -} - -src_configure() { - econf \ - --enable-mcpplib \ - $(use_enable static-libs static) -} - -src_install() { - default - - if ! use static-libs; then - find "${D}" -name '*.la' -delete || die - fi -}
