commit: 6d9dda3defdbfa4c15b0b3b59f9e8548766d92d9 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Dec 26 13:15:31 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Dec 26 13:15:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6d9dda3d
app-text/enscript: drop ~m68k-mint, cleanup Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-text/enscript/Manifest | 4 - app-text/enscript/enscript-1.6.4-r4.ebuild | 56 ------ app-text/enscript/enscript-1.6.5.1.ebuild | 52 ----- app-text/enscript/enscript-1.6.5.2-r1.ebuild | 53 ------ app-text/enscript/enscript-1.6.5.2.ebuild | 52 ----- app-text/enscript/enscript-1.6.5.ebuild | 52 ----- app-text/enscript/enscript-1.6.6.ebuild | 4 +- .../enscript/files/enscript-1.6.3-language.patch | 11 -- .../enscript/files/enscript-1.6.3-security.patch | 177 ----------------- ...nscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch | 91 --------- .../enscript/files/enscript-1.6.4-config.patch | 95 --------- app-text/enscript/files/enscript-catmur.patch | 26 --- app-text/enscript/files/ruby.st | 212 --------------------- 13 files changed, 2 insertions(+), 883 deletions(-) diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest index ec6163f87e..b5dc1665c3 100644 --- a/app-text/enscript/Manifest +++ b/app-text/enscript/Manifest @@ -1,5 +1 @@ -DIST enscript-1.6.4.tar.gz 1036734 BLAKE2B 1eeef021d3feef958c913b1092bdc4ef4d3b8cfc5234593663031ddc1b6e4090a66b41eb4d5c53df0abd0c01b29dad845a72d68c6411d702ceb4ec9cb0e7e6bb SHA512 bd1a2e74e7434ef19c24cab35ab6fb460c593317d4f78161e17632c19bfb800229742def3c9785017b6343621208fca308c1a24a26c03c306ef1698ed7c02d94 -DIST enscript-1.6.5.1.tar.gz 1314983 BLAKE2B 9b42eee6de54c1bf890d7354d44b35bb51875ad74ff80131c98e2db6d709bf96335a749bf42b6db83056ce051d35093add2b891e0171408c11435f9f26082f97 SHA512 86163472abbd6ac9e84b4b6ca4048855ff2a91f41bfb1b59b9d962927d10799d2bf73db1f8f5e5ec53876191b56cb21ff18c076f4a9873f552cb507332c85db4 -DIST enscript-1.6.5.2.tar.gz 1318283 BLAKE2B 32f6e3150fee0ea6cf04fee8245663e8d8ddb2ab8308269bf334426af340ef5539b44050402a0dd4d4948c3bbaaf59fd9556e4221212480509664c5e7cc02f09 SHA512 8e0ecb95fb4fed79bc82094c86dfc449d429581511840cc68b8e3dd1c04a532adf9ccbd1fe6f325b3b5df8192311c69a294a6367c8891c60a70698cd037038e1 -DIST enscript-1.6.5.tar.gz 1308918 BLAKE2B 8d421f564e220bd771d2ae80b140a7237b0e21ee71ad44ddf0df14623ecc2b8824b45058883e96f426aed4689af2b321cf521c4eadc38f3937f862c8feb5a251 SHA512 310c4d9a3e9791a290dde875798d6f0dd6ddadc87f95e249aa90ab8e0263a8396128e13b6a854925dd3369153817967bfedfe12df4407527f2d8c6c21ba138d5 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc diff --git a/app-text/enscript/enscript-1.6.4-r4.ebuild b/app-text/enscript/enscript-1.6.4-r4.ebuild deleted file mode 100644 index 29cea57491..0000000000 --- a/app-text/enscript/enscript-1.6.4-r4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.4-r4.ebuild,v 1.7 2008/11/15 18:44:05 dertobi123 Exp $ - -inherit eutils - -DESCRIPTION="powerful text-to-postscript converter" -SRC_URI="http://www.iki.fi/mtr/genscript/${P}.tar.gz"; -HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"; - -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -SLOT="0" -LICENSE="GPL-2" -IUSE="nls ruby" - -DEPEND="sys-devel/flex - sys-devel/bison - nls? ( sys-devel/gettext )" -RDEPEND="nls? ( virtual/libintl )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/enscript-1.6.3-security.patch - epatch "${FILESDIR}"/enscript-1.6.3-language.patch - epatch "${FILESDIR}"/enscript-catmur.patch - epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch - epatch "${FILESDIR}"/enscript-1.6.4-config.patch - epatch "${FILESDIR}"/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch - use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch - epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch -} - -src_compile() { - unset CC - econf $(use_enable nls) - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" - - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" - - if use ruby ; then - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" - fi -} - -pkg_postinst() { - elog "Now, customize /etc/enscript.cfg." -} diff --git a/app-text/enscript/enscript-1.6.5.1.ebuild b/app-text/enscript/enscript-1.6.5.1.ebuild deleted file mode 100644 index 8eabb3905f..0000000000 --- a/app-text/enscript/enscript-1.6.5.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.1.ebuild,v 1.1 2010/03/09 18:09:11 jer Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="powerful text-to-postscript converter" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"; - -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -SLOT="0" -LICENSE="GPL-3" -IUSE="nls ruby" - -DEPEND=" - sys-devel/flex - sys-devel/bison - nls? ( sys-devel/gettext ) -" -RDEPEND="nls? ( virtual/libintl )" - -src_prepare() { - epatch "${FILESDIR}"/enscript-1.6.3-language.patch - epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch - use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch - epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" - - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" - - if use ruby ; then - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" - fi -} - -pkg_postinst() { - elog "Now, customize /etc/enscript.cfg." -} diff --git a/app-text/enscript/enscript-1.6.5.2-r1.ebuild b/app-text/enscript/enscript-1.6.5.2-r1.ebuild deleted file mode 100644 index 58fdf54f3a..0000000000 --- a/app-text/enscript/enscript-1.6.5.2-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.7 2012/09/30 17:35:03 armin76 Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="powerful text-to-postscript converter" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"; - -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -SLOT="0" -LICENSE="GPL-3" -IUSE="nls ruby" - -DEPEND=" - sys-devel/flex - sys-devel/bison - nls? ( sys-devel/gettext ) -" -RDEPEND="nls? ( virtual/libintl )" - -src_prepare() { - epatch "${FILESDIR}"/enscript-1.6.3-language.patch - epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch - epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch - use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch - epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" - - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" - - if use ruby ; then - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" - fi -} - -pkg_postinst() { - elog "Now, customize /etc/enscript.cfg." -} diff --git a/app-text/enscript/enscript-1.6.5.2.ebuild b/app-text/enscript/enscript-1.6.5.2.ebuild deleted file mode 100644 index 465f808257..0000000000 --- a/app-text/enscript/enscript-1.6.5.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2.ebuild,v 1.1 2010/06/10 16:01:47 jer Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="powerful text-to-postscript converter" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"; - -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -SLOT="0" -LICENSE="GPL-3" -IUSE="nls ruby" - -DEPEND=" - sys-devel/flex - sys-devel/bison - nls? ( sys-devel/gettext ) -" -RDEPEND="nls? ( virtual/libintl )" - -src_prepare() { - epatch "${FILESDIR}"/enscript-1.6.3-language.patch - epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch - use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch - epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" - - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" - - if use ruby ; then - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" - fi -} - -pkg_postinst() { - elog "Now, customize /etc/enscript.cfg." -} diff --git a/app-text/enscript/enscript-1.6.5.ebuild b/app-text/enscript/enscript-1.6.5.ebuild deleted file mode 100644 index 981e46529d..0000000000 --- a/app-text/enscript/enscript-1.6.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.ebuild,v 1.1 2010/01/26 05:08:23 jer Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="powerful text-to-postscript converter" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"; - -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" -SLOT="0" -LICENSE="GPL-3" -IUSE="nls ruby" - -DEPEND=" - sys-devel/flex - sys-devel/bison - nls? ( sys-devel/gettext ) -" -RDEPEND="nls? ( virtual/libintl )" - -src_prepare() { - epatch "${FILESDIR}"/enscript-1.6.3-language.patch - epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch - use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch - epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed" - - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed" - - if use ruby ; then - insinto /usr/share/enscript/hl - doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed" - fi -} - -pkg_postinst() { - elog "Now, customize /etc/enscript.cfg." -} diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild index d848e733d9..7386c36588 100644 --- a/app-text/enscript/enscript-1.6.6.ebuild +++ b/app-text/enscript/enscript-1.6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.6.ebuild,v 1.1 2012/09/26 14:27:26 jer Exp $ @@ -10,7 +10,7 @@ DESCRIPTION="powerful text-to-postscript converter" SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"; -KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris" +KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" SLOT="0" LICENSE="GPL-3" IUSE="nls ruby" diff --git a/app-text/enscript/files/enscript-1.6.3-language.patch b/app-text/enscript/files/enscript-1.6.3-language.patch deleted file mode 100644 index 66ac8cbc3c..0000000000 --- a/app-text/enscript/files/enscript-1.6.3-language.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.c.org 2005-06-01 01:23:29.000000000 +0200 -+++ src/main.c 2005-06-01 01:26:38.000000000 +0200 -@@ -2001,7 +2001,7 @@ - int i; - - c = getopt_long (argc, argv, -- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVW:X:zZ", -+ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ", - long_options, &option_index); - - if (c == -1) diff --git a/app-text/enscript/files/enscript-1.6.3-security.patch b/app-text/enscript/files/enscript-1.6.3-security.patch deleted file mode 100644 index de67593f5e..0000000000 --- a/app-text/enscript/files/enscript-1.6.3-security.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/gsint.h enscript-1.6.3.CAN-2004-1184/src/gsint.h ---- orig/enscript-1.6.3/src/gsint.h 2000-07-11 17:28:06.000000000 +0200 -+++ enscript-1.6.3.CAN-2004-1184/src/gsint.h 2005-01-04 20:45:24.000000000 +0100 -@@ -701,4 +701,9 @@ FILE *printer_open ___P ((char *cmd, cha - */ - void printer_close ___P ((void *context)); - -+/* -+ * Escape filenames for shell usage -+ */ -+char *shell_escape ___P ((const char *fn)); -+ - #endif /* not GSINT_H */ -diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/main.c enscript-1.6.3.CAN-2004-1184/src/main.c ---- orig/enscript-1.6.3/src/main.c 2005-01-04 20:52:31.000000000 +0100 -+++ enscript-1.6.3.CAN-2004-1184/src/main.c 2005-01-05 10:57:44.000000000 +0100 -@@ -1555,9 +1555,13 @@ name width\theight\tllx\tlly - buffer_append (&cmd, intbuf); - buffer_append (&cmd, " "); - -- buffer_append (&cmd, "-Ddocument_title=\""); -- buffer_append (&cmd, title); -- buffer_append (&cmd, "\" "); -+ buffer_append (&cmd, "-Ddocument_title=\'"); -+ if ((cp = shell_escape (title)) != NULL) -+ { -+ buffer_append (&cmd, cp); -+ free (cp); -+ } -+ buffer_append (&cmd, "\' "); - - buffer_append (&cmd, "-Dtoc="); - buffer_append (&cmd, toc ? "1" : "0"); -@@ -1574,8 +1578,14 @@ name width\theight\tllx\tlly - /* Append input files. */ - for (i = optind; i < argc; i++) - { -- buffer_append (&cmd, " "); -- buffer_append (&cmd, argv[i]); -+ char *cp; -+ if ((cp = shell_escape (argv[i])) != NULL) -+ { -+ buffer_append (&cmd, " \'"); -+ buffer_append (&cmd, cp); -+ buffer_append (&cmd, "\'"); -+ free (cp); -+ } - } - - /* And do the job. */ -@@ -1636,7 +1645,7 @@ name width\theight\tllx\tlly - buffer_ptr (opts), buffer_len (opts)); - } - -- buffer_append (&buffer, " \"%s\""); -+ buffer_append (&buffer, " \'%s\'"); - - input_filter = buffer_copy (&buffer); - input_filter_stdin = "-"; -diff -u -p -Nr --exclude CVS orig/enscript-1.6.3/src/util.c enscript-1.6.3.CAN-2004-1184/src/util.c ---- orig/enscript-1.6.3/src/util.c 1999-09-17 17:26:51.000000000 +0200 -+++ enscript-1.6.3.CAN-2004-1184/src/util.c 2005-01-05 10:43:23.000000000 +0100 -@@ -1239,6 +1239,8 @@ escape_string (char *string) - - /* Create result. */ - cp = xmalloc (len + 1); -+ if (cp == NULL) -+ return NULL; - for (i = 0, j = 0; string[i]; i++) - switch (string[i]) - { -@@ -1879,6 +1881,7 @@ is_open (InputStream *is, FILE *fp, char - char *cmd = NULL; - int cmdlen; - int i, pos; -+ char *cp; - - is->is_pipe = 1; - -@@ -1902,12 +1905,16 @@ is_open (InputStream *is, FILE *fp, char - { - case 's': - /* Expand cmd-buffer. */ -- cmdlen += strlen (fname); -- cmd = xrealloc (cmd, cmdlen); -+ if ((cp = shell_escape (fname)) != NULL) -+ { -+ cmdlen += strlen (cp); -+ cmd = xrealloc (cmd, cmdlen); - -- /* Paste filename. */ -- strcpy (cmd + pos, fname); -- pos += strlen (fname); -+ /* Paste filename. */ -+ strcpy (cmd + pos, cp); -+ pos += strlen (cp); -+ free (cp); -+ } - - i++; - break; -@@ -2116,3 +2123,36 @@ buffer_len (Buffer *buffer) - { - return buffer->len; - } -+ -+/* -+ * Escapes the name of a file so that the shell groks it in 'single' -+ * quotation marks. The resulting pointer has to be free()ed when not -+ * longer used. -+*/ -+char * -+shell_escape(const char *fn) -+{ -+ size_t len = 0; -+ const char *inp; -+ char *retval, *outp; -+ -+ for(inp = fn; *inp; ++inp) -+ switch(*inp) -+ { -+ case '\'': len += 4; break; -+ default: len += 1; break; -+ } -+ -+ outp = retval = malloc(len + 1); -+ if(!outp) -+ return NULL; /* perhaps one should do better error handling here */ -+ for(inp = fn; *inp; ++inp) -+ switch(*inp) -+ { -+ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break; -+ default: *outp++ = *inp; break; -+ } -+ *outp = 0; -+ -+ return retval; -+} -diff -u -p -Nr --exclude CVS enscript-1.6.3.CAN-2004-1184/src/psgen.c enscript-1.6.3.CAN-2004-1185/src/psgen.c ---- enscript-1.6.3.CAN-2004-1184/src/psgen.c 2005-01-04 20:59:56.000000000 +0100 -+++ enscript-1.6.3.CAN-2004-1185/src/psgen.c 2005-01-05 15:22:40.000000000 +0100 -@@ -2385,9 +2385,10 @@ recognize_eps_file (Token *token) - MESSAGE (2, (stderr, "^@epsf=\"%s\"\n", token->u.epsf.filename)); - - i = strlen (token->u.epsf.filename); -+ /* - if (i > 0 && token->u.epsf.filename[i - 1] == '|') - { -- /* Read EPS data from pipe. */ -+ / * Read EPS data from pipe. * / - token->u.epsf.pipe = 1; - token->u.epsf.filename[i - 1] = '\0'; - token->u.epsf.fp = popen (token->u.epsf.filename, "r"); -@@ -2400,6 +2401,7 @@ recognize_eps_file (Token *token) - } - } - else -+ */ - { - char *filename; - -diff -u -p -Nr --exclude CVS enscript-1.6.3.CAN-2004-1185/src/psgen.c enscript-1.6.3.CAN-2004-1186/src/psgen.c ---- enscript-1.6.3.CAN-2004-1185/src/psgen.c 2005-01-05 15:22:40.000000000 +0100 -+++ enscript-1.6.3.CAN-2004-1186/src/psgen.c 2005-01-05 15:22:44.000000000 +0100 -@@ -2034,8 +2034,9 @@ dump_ps_page_header (char *fname, int em - else - { - ftail++; -- strncpy (buf, fname, ftail - fname); -- buf[ftail - fname] = '\0'; -+ i = ftail - fname >= sizeof (buf)-1 ? sizeof (buf)-1 : ftail - fname; -+ strncpy (buf, fname, i); -+ buf[i] = '\0'; - } - - if (nup > 1) - diff --git a/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch b/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch deleted file mode 100644 index 2ee926b107..0000000000 --- a/app-text/enscript/files/enscript-1.6.4-CVE-2008-3863-CVE-2008-4306.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- src/psgen.c -+++ src/psgen.c 2008-10-29 10:43:08.512598143 +0100 -@@ -24,6 +24,7 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include <limits.h> - #include "gsint.h" - - /* -@@ -124,7 +125,7 @@ struct gs_token_st - double xscale; - double yscale; - int llx, lly, urx, ury; /* Bounding box. */ -- char filename[512]; -+ char filename[PATH_MAX]; - char *skipbuf; - unsigned int skipbuf_len; - unsigned int skipbuf_pos; -@@ -135,11 +136,11 @@ struct gs_token_st - Color bgcolor; - struct - { -- char name[512]; -+ char name[PATH_MAX]; - FontPoint size; - InputEncoding encoding; - } font; -- char filename[512]; -+ char filename[PATH_MAX]; - } u; - }; - -@@ -248,7 +249,7 @@ static int do_print = 1; - static int user_fontp = 0; - - /* The user ^@font{}-defined font. */ --static char user_font_name[256]; -+static char user_font_name[PATH_MAX]; - static FontPoint user_font_pt; - static InputEncoding user_font_encoding; - -@@ -978,7 +979,8 @@ large for page\n"), - FATAL ((stderr, - _("user font encoding can be only the system's default or `ps'"))); - -- strcpy (user_font_name, token.u.font.name); -+ memset (user_font_name, 0, sizeof(user_font_name)); -+ strncpy (user_font_name, token.u.font.name, sizeof(user_font_name) - 1); - user_font_pt.w = token.u.font.size.w; - user_font_pt.h = token.u.font.size.h; - user_font_encoding = token.u.font.encoding; -@@ -1444,7 +1446,7 @@ read_special_escape (InputStream *is, To - buf[i] = ch; - if (i + 1 >= sizeof (buf)) - FATAL ((stderr, _("too long argument for %s escape:\n%.*s"), -- escapes[i].name, i, buf)); -+ escapes[e].name, i, buf)); - } - buf[i] = '\0'; - -@@ -1452,7 +1454,8 @@ read_special_escape (InputStream *is, To - switch (escapes[e].escape) - { - case ESC_FONT: -- strcpy (token->u.font.name, buf); -+ memset (token->u.font.name, 0, sizeof(token->u.font.name)); -+ strncpy (token->u.font.name, buf, sizeof(token->u.font.name) - 1); - - /* Check for the default font. */ - if (strcmp (token->u.font.name, "default") == 0) -@@ -1465,7 +1468,8 @@ read_special_escape (InputStream *is, To - FATAL ((stderr, _("malformed font spec for ^@font escape: %s"), - token->u.font.name)); - -- strcpy (token->u.font.name, cp); -+ memset (token->u.font.name, 0, sizeof(token->u.font.name)); -+ strncpy (token->u.font.name, cp, sizeof(token->u.font.name) - 1); - xfree (cp); - } - token->type = tFONT; -@@ -1544,7 +1548,8 @@ read_special_escape (InputStream *is, To - break; - - case ESC_SETFILENAME: -- strcpy (token->u.filename, buf); -+ memset (token->u.filename, 0, sizeof(token->u.font.name)); -+ strncpy (token->u.filename, buf, sizeof(token->u.filename) - 1); - token->type = tSETFILENAME; - break; - diff --git a/app-text/enscript/files/enscript-1.6.4-config.patch b/app-text/enscript/files/enscript-1.6.4-config.patch deleted file mode 100644 index 5823a9db5e..0000000000 --- a/app-text/enscript/files/enscript-1.6.4-config.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- enscript-1.6.4/afm/Makefile.am.config 2003-03-05 07:26:16.000000000 +0000 -+++ enscript-1.6.4/afm/Makefile.am 2005-12-23 09:56:52.000000000 +0000 -@@ -36,11 +36,11 @@ - EXTRA_DIST = font.map $(default_afm) $(public_fonts) - - install-data-local: -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm - for f in $(EXTRA_DIST); do \ -- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \ -+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \ - done - - uninstall-local: -- rm -rf $(datadir)/enscript/afm -+ rm -rf $(DESTDIR)/$(datadir)/enscript/afm ---- enscript-1.6.4/afm/Makefile.in.config 2003-03-05 07:40:06.000000000 +0000 -+++ enscript-1.6.4/afm/Makefile.in 2005-12-23 09:56:52.000000000 +0000 -@@ -319,14 +319,14 @@ - - - install-data-local: -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm - for f in $(EXTRA_DIST); do \ -- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \ -+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \ - done - - uninstall-local: -- rm -rf $(datadir)/enscript/afm -+ rm -rf $(DESTDIR)/$(datadir)/enscript/afm - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ---- enscript-1.6.4/lib/Makefile.in.config 2003-03-05 07:40:07.000000000 +0000 -+++ enscript-1.6.4/lib/Makefile.in 2005-12-23 09:56:52.000000000 +0000 -@@ -345,15 +345,16 @@ - all-local: enscript.cfg - - install-data-local: enscript.cfg -- $(top_srcdir)/mkinstalldirs $(sysconfdir) -- if test -r $(sysconfdir)/enscript.cfg; then \ -- cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \ -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) -+ if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \ -+ cp $(DESTDIR)$(sysconfdir)/enscript.cfg \ -+ $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \ - else :; \ - fi -- $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg -+ $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg - - uninstall-local: -- rm -f $(sysconfdir)/enscript.cfg -+ rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg - - enscript.cfg: $(srcdir)/enscript.cfg.in Makefile - sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \ ---- enscript-1.6.4/states/hl/Makefile.am.config 2005-12-23 09:59:55.000000000 +0000 -+++ enscript-1.6.4/states/hl/Makefile.am 2005-12-23 10:00:09.000000000 +0000 -@@ -45,10 +45,10 @@ - EXTRA_DIST = $(states) - - install-data-local: -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl - for f in $(states); do \ -- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \ -+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \ - done - - uninstall-local: ---- enscript-1.6.4/states/hl/Makefile.in.config 2005-12-23 10:00:13.000000000 +0000 -+++ enscript-1.6.4/states/hl/Makefile.in 2005-12-23 10:00:34.000000000 +0000 -@@ -330,10 +330,10 @@ - - - install-data-local: -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript -- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl - for f in $(states); do \ -- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \ -+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \ - done - - uninstall-local: diff --git a/app-text/enscript/files/enscript-catmur.patch b/app-text/enscript/files/enscript-catmur.patch deleted file mode 100644 index bd4b222f7f..0000000000 --- a/app-text/enscript/files/enscript-catmur.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/main.c 2005/11/04 11:02:27 1.1 -+++ src/main.c 2005/11/04 11:16:28 -@@ -1695,7 +1695,7 @@ name width\theight\tllx\tlly - } - - /* Table of Contents. */ -- if (toc) -+ if (ofp != NULL && toc) - { - /* This is really cool... */ - -@@ -1714,9 +1714,11 @@ name width\theight\tllx\tlly - process_file (_("Table of Contents"), &is, 1); - is_close (&is); - } -- -- /* Clean up toc file. */ -- fclose (toc_fp); -+ else -+ { -+ /* Clean up toc file. */ -+ fclose (toc_fp); -+ } - } - - /* Give trailer a chance to dump itself. */ diff --git a/app-text/enscript/files/ruby.st b/app-text/enscript/files/ruby.st deleted file mode 100644 index 392c9c1390..0000000000 --- a/app-text/enscript/files/ruby.st +++ /dev/null @@ -1,212 +0,0 @@ -/** - * Name: ruby - * Description: Ruby programming language. - * Author: Mike Wilson <[email protected]> - */ - -state ruby_comment -{ - /\*\\\// { - language_print ($0); - return; - } - LANGUAGE_SPECIALS { - language_print ($0); - } -} - -state ruby_dquot_string -{ - /\\\\./ { - language_print ($0); - } - /\"/ { - language_print ($0); - return; - } - LANGUAGE_SPECIALS { - language_print ($0); - } -} - -state ruby_quot_string -{ - /\\\\./ { - language_print ($0); - } - /[\']/ { - language_print ($0); - return; - } - LANGUAGE_SPECIALS { - language_print ($0); - } -} - -state ruby_bquot_string -{ - /\\\\./ { - language_print ($0); - } - /`/ { - language_print ($0); - return; - } - LANGUAGE_SPECIALS { - language_print ($0); - } -} - -state ruby -{ - BEGIN { - header (); - } - END { - trailer (); - } - - /* Comments. */ - /#[^{].*$/ { - comment_face (true); - language_print ($0); - comment_face (false); - } - - /* Ignore escaped quote marks */ - /\\\"/ { - language_print ($0); - } - /\\\'/ { - language_print ($0); - } - /\\\`/ { - language_print ($0); - } - - /* In cgi files, JavaScript might be imbedded, so we need to look out - * for the JavaScript comments, because they might contain something - * we don't like, like a contraction (don't, won't, etc.) - * We won't put them in comment face, because they are not ruby - * comments. - */ - /\/\// { - language_print ($0); - call (eat_one_line); - } - - /* String constants. */ - /\"/ { - string_face (true); - language_print ($0); - call (ruby_dquot_string); - string_face (false); - } - /[\']/ { - string_face (true); - language_print ($0); - call (ruby_quot_string); - string_face (false); - } - - /* Backquoted command string */ - /`/ { - string_face (true); - language_print ($0); - call (ruby_bquot_string); - string_face (false); - } - - /* Variables globals and instance */ - /[$@]\w+/ { - variable_name_face (true); - language_print ($0); - variable_name_face (false); - } - - /* Variables class variable */ - /@@\w+/ { - variable_name_face (true); - language_print ($0); - variable_name_face (false); - } - - /([ \t]*)(def)([ \t]+)([^(]*)/ { - /* indentation */ - language_print ($1); - - /* def */ - keyword_face (true); - language_print ($2); - keyword_face (false); - - /* middle */ - language_print ($3); - - /* Function name. */ - function_name_face (true); - language_print ($4); - function_name_face (false); - } - - /\$[!@&`'+~=\/\\,;.<>_*$?:"]/ { - variable_name_face (true); - language_print ($0); - variable_name_face (false); - } - - /* Highlighting - --Type face - private protected public - - --Builtin face (I consider these to be somewhat special) - alias alias_method attr attr_accessor attr_reader attr_writer - module_alias module_function self super - - --Reference face - require include - - --Keyword face - and begin break case class def defined? do else elsif end - ensure eval extend false for if in method module next nil not - or redo rescue retry return then true undef unless until when - while yield - */ -/\\b(private|protected|public)\\b/ { - type_face (true); - language_print ($0); - type_face (false); - } - -/\\b(alias|alias_method|attr|attr_accessor|attr_reader|attr_writer\\ -|module_alias|module_function|self|super)\\b/ { - builtin_face (true); - language_print ($0); - builtin_face (false); - } - -/\\b(include|require)\\b/ { - reference_face (true); - language_print ($0); - reference_face (false); - } - -/\\b(and|begin|break|case|class|def|defined?|do|else|elsif|end|ensure|eval\\ -|extend|false|for|if|in|method|module|next|nil|not|or|raise|redo|rescue|retry\\ -|return|then|true|undef|unless|until|when|while|yield)\\b/ { - keyword_face (true); - language_print ($0); - keyword_face (false); - } - - LANGUAGE_SPECIALS { - language_print ($0); - } -} - - -/* -Local variables: -mode: c -End: -*/
