summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Helmert III <jchelmert3@posteo.net>2020-10-15 20:12:57 -0500
committerSam James <sam@gentoo.org>2020-11-11 00:25:33 +0000
commit6eb198608ec3087deffd074ab6a8be044165051a (patch)
tree15d1bec9729c7e9bb7867791fdd514d3489e8680 /media-gfx/sam2p
parentdev-libs/libmaxminddb: security cleanup <1.4.3 (diff)
downloadgentoo-6eb198608ec3087deffd074ab6a8be044165051a.tar.gz
gentoo-6eb198608ec3087deffd074ab6a8be044165051a.tar.bz2
gentoo-6eb198608ec3087deffd074ab6a8be044165051a.zip
media-gfx/sam2p: drop 0.49.3 (security)
Bug: https://bugs.gentoo.org/636876 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: John Helmert III <jchelmert3@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/17945 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/sam2p')
-rw-r--r--media-gfx/sam2p/Manifest1
-rw-r--r--media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch160
-rw-r--r--media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch23
-rw-r--r--media-gfx/sam2p/sam2p-0.49.3.ebuild47
4 files changed, 0 insertions, 231 deletions
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index d8df300a1fd2..53c2024bccf6 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,2 +1 @@
-DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
deleted file mode 100644
index dfad65cc05d9..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Fix literal suffix errors in C++14, caused by missing spaces between
-C-strings and macros.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
-
---- a/configure.in
-+++ b/configure.in
-@@ -81,8 +81,6 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
--dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
- AC_PROG_CXX
-@@ -216,7 +214,7 @@
-
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
-
---- a/gensio.cpp
-+++ b/gensio.cpp
-@@ -494,7 +494,7 @@
-
- #if HAVE_PTS_POPEN
- if (!tmpsname) {
-- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-+ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
- signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */
- } else {
- #else
-@@ -622,7 +622,7 @@
- if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */
- #if HAVE_PTS_POPEN
- if (!tmpsname) {
-- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-+ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
- signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */
- vi_precopy();
- in.vi_read(0,0);
-@@ -730,12 +730,7 @@
-
- /* --- */
-
--
--#if HAVE_lstat_in_sys_stat
--# define PTS_lstat lstat
--#else
- # define PTS_lstat stat
--#endif
-
- /** @param fname must start with '/' (dir separator)
- * @return true if file successfully created
---- a/in_ps.cpp
-+++ b/in_ps.cpp
-@@ -137,7 +137,7 @@
- // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury);
- /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */
- sprintf(bboxline,
-- "<</PageSize[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]>>setpagedevice\n"
-+ "<</PageSize[%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g]>>setpagedevice\n"
- /* removing /PageSize also cancels /a4, /a5 etc. */
- /* we need `currentmatrix ... setpagedevice setmatrix' because
- * setpagedevice cancels the current transformation matrix so our
-@@ -147,7 +147,7 @@
- "/setpagedevice{matrix currentmatrix exch "
- "dup length dict copy dup /PageSize undef setpagedevice "
- "setmatrix}bind def\n"
-- "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n"
-+ "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n"
- , urx-llx, ury-lly, -llx, -lly);
- } else {
- Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0;
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@
- export PERL_BADLANG
-
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -51,8 +51,8 @@
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
-
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no =$(CXX) -DNDEBUG
- # CXD_yes =$(CXX) $(GFLAG) -lefence
- CXD_yes =$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)
---- a/minips.cpp
-+++ b/minips.cpp
-@@ -292,9 +292,9 @@
- void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) {
- char buf[64]; /* Imp: should be enough?? */
- if (metric!=0 && (dumpPS_force || dumpPS)) {
-- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]);
-+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]);
- } else {
-- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]);
-+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]);
- }
- out_ << buf;
- }
-@@ -1044,7 +1044,7 @@
- } else {
- d = d < 0 ? 72.0 / -d : d / 72.0;
- char buf[64]; /* Dat: enough */
-- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d);
-+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d);
- out << buf;
- }
- }
-@@ -1093,7 +1093,7 @@
- out << (rounding>=2 && ll<0 ? 0 : ll);
- } else {
- char buf[64]; /* Dat: enough */
-- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d);
-+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d);
- out << buf;
- }
- }
---- a/ps_tiny.c
-+++ b/ps_tiny.c
-@@ -151,7 +151,7 @@
- }
-
- static void erri(char const*msg1, char const*msg2) {
-- fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n",
-+ fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n",
- PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:"");
- exit(3);
- }
-@@ -230,7 +230,7 @@
- /** @param b: assume null-terminated @return true on error */
- static /*inline*/ sbool toInteger(char *s, psint_t *ret) {
- int n=0; /* BUGFIX?? found by __CHECKER__ */
-- return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0';
-+ return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0';
- }
-
- /** @param b: assume null-terminated @return true on error */
-@@ -700,7 +700,7 @@
- getotag("Abbr");
- getkey("acount"); acount=getuintval();
- getkey("xcount"); xcount=getuintval();
-- sprintf(tmp,"%"SLEN_P"u dict%%</I>", acount+xcount);
-+ sprintf(tmp,"%" SLEN_P "u dict%%</I>", acount+xcount);
- setifmt(tmp,0); copy("I"); noifmt();
- gettagbeg();
-
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
deleted file mode 100644
index cb24dbda1bda..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 79a7de171f461a1c79089fa770f0da186e87c723
-Author: Peter Szabo <pts@fazekas.hu>
-Date: Sun Apr 30 04:00:23 2017 +0200
-
- fixed Perl 5.26 compatibility for perl -x (https://github.com/pts/sam2p/issues/2)
-
-diff --git a/Makefile b/Makefile
-index 849b09d..1791a9c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -71,10 +71,10 @@ sam2p_version.h: debian/changelog
- sam2p_main.o: sam2p_version.h
-
- xpmc.h: cols2.pl
-- perl -x cols2.pl >xpmc.h
-+ perl -x ./cols2.pl >xpmc.h
-
- #HQ=perl -e'$$_=join"",<STDIN>; s@([^\w\.\/\-])@sprintf"\\%03o",ord$$1@ge; print "\"$$_\"\n"'
--HQ=perl -x hq.pl
-+HQ=perl -x ./hq.pl
- #%.tth: %.tte
- # <$< >$@ $(HQ)
- #%.tth: %.ttm
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
deleted file mode 100644
index aab339fb4890..000000000000
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
-HOMEPAGE="https://github.com/pts/sam2p"
-SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="examples gif"
-
-DEPEND="dev-lang/perl"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch "${FILESDIR}/${P}-perl526.patch" )
-
-src_prepare() {
- default
-
- # configure.in files are deprecated
- mv configure.{in,ac} || die
-
- # eautoreconf is still needed or you get bad warnings
- eautoreconf
-}
-
-src_configure() {
- tc-export CXX
-
- econf --enable-lzw $(use_enable gif)
-}
-
-src_install() {
- dobin sam2p
- einstalldocs
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}