* [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/, app-text/a2ps/files/
@ 2016-05-17 18:31 Andrew Savchenko
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Savchenko @ 2016-05-17 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 0ac6de8a5a1fbd7d085b38c2d802c9c62f8d8897
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 18:30:20 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Tue May 17 18:30:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac6de8a
app-text/a2ps: fix bug 482748
Fix build with >=texinfo-5.2 and LINGUAS="ja"
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
app-text/a2ps/a2ps-4.14-r4.ebuild | 137 ++++++++++++++++++++++
app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch | 147 ++++++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/app-text/a2ps/a2ps-4.14-r4.ebuild b/app-text/a2ps/a2ps-4.14-r4.ebuild
new file mode 100644
index 0000000..9be05f9
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools elisp-common flag-o-matic
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"
+
+RESTRICT=test
+
+RDEPEND="app-text/ghostscript-gpl
+ app-text/libpaper
+ >=app-text/psutils-1.17
+ app-text/wdiff
+ emacs? ( virtual/emacs )
+ latex? ( virtual/latex-base )
+ nls? ( virtual/libintl )
+ userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
+ userland_BSD? ( sys-freebsd/freebsd-ubin )"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-2.7.2
+ virtual/yacc
+ nls? ( sys-devel/gettext )"
+
+SITEFILE=50${PN}-gentoo.el
+
+S=${WORKDIR}/${PN}-${PV:0:4}
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
+ use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+ if use linguas_ja; then
+ eapply "${WORKDIR}"/${P}-ja_nls.patch
+ # bug #335803
+ eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
+ else
+ eapply "${FILESDIR}"/${P}-cleanup.patch
+ fi
+
+ # fix fnmatch replacement, bug #134546
+ eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+
+ # bug #122026
+ eapply "${FILESDIR}"/${P}-psset.patch
+
+ # fix emacs printing, bug #114627
+ eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
+
+ # fix chmod error, #167670
+ eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
+
+ # add configure check for mempcpy, bug 216588
+ eapply "${FILESDIR}"/${P}-check-mempcpy.patch
+
+ # fix compilation error due to invalid stpcpy() prototype, bug 216588
+ eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+
+ # fix compilation error due to obstack.h issue, bug 269638
+ eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
+
+ # fix compilation error due to texinfo 5.x, bug 482748
+ eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
+
+ # fix building with sys-devel/automake >= 1.12, bug 420503
+ rm -f {.,ogonkify}/aclocal.m4 || die
+ sed -i \
+ -e '/^AM_C_PROTOTYPES/d' \
+ -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+ -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+ configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -DPROTOTYPES #420503
+
+ local myconf="COM_netscape=no COM_acroread=no"
+
+ use emacs || myconf="${myconf} EMACS=no"
+ use latex || myconf="${myconf} COM_latex=no"
+
+ export LANG=C LC_ALL=C
+
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --sysconfdir="${EPREFIX}"/etc/a2ps \
+ $(use_enable nls) \
+ ${myconf}
+}
+
+src_compile() {
+ # parallel make b0rked
+ emake -j1
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ lispdir="${EPREFIX}${SITELISP}"/${PN} \
+ install
+
+ newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+ newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+ newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+ rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+ prune_libtool_files
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+
+ dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
new file mode 100644
index 0000000..44cd4bf
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
@@ -0,0 +1,147 @@
+--- a2ps-4.14/doc/a2ps.texi.bero 2013-03-26 10:31:31.230137555 +0100
++++ a2ps-4.14/doc/a2ps.texi 2013-03-26 11:01:01.504006086 +0100
+@@ -44,10 +44,6 @@
+ @end ifnottex
+
+ @c TeX variants
+-@macro LaTeX
+-La@TeX{}
+-@end macro
+-
+ @macro PreTeX
+ Pre@TeX{}
+ @end macro
+@@ -417,9 +413,9 @@ Genesis
+ @c Now, that's what I call humor :)
+ @cindex First Page
+ This document describes GNU @pack{} version @value{VERSION}. The latest
+-versions may be found on the @href{@value{WWWHOME},@pack{} home page}.
+-We plan to update the @href{http://www.gnu.org/software/a2ps/, GNU
+-@pack{} home page} in the near future, in which case the latter will be
++versions may be found on the @uref{@value{WWWHOME}, home page}.
++We plan to update the @uref{@value{WWWHOME}, GNU home page}
++in the near future, in which case the latter will be
+ a better source of information.
+
+ We tried to make this document informative and pleasant. It tries to be
+@@ -431,8 +427,8 @@ difficult to use. @xref{Glossary}, for
+ information.
+
+ Please, send us emailcards @code{:)}. Whatever the comment is, or if you
+-just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel
+-Santana} and @email{akim@@freefriends.org, Akim Demaille}. But
++just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel Santana}
++and @email{akim@@freefriends.org, Akim Demaille}. But
+ @emph{never} write to either of us for asking questions, or to report
+ bugs. Chances are very high never to receive an answer, as we receive
+ too many messages. @xref{a2ps Mailing Lists}, for information on the
+@@ -517,8 +513,8 @@ everybody so that mistakes get fixed as
+
+ So, if you have a problem (configuration error, compilation error,
+ runtime error, documentation error or unclear), first check in the FAQ
+-(@pxref{FAQ}), then on the page @href{@value{WWWHOME}/bugs.html,Known
+-@pack{} Bugs} if the issue has not been addressed yet. If it is not the
++(@pxref{FAQ}), then on the page @uref{@value{WWWHOME}/bugs.html,Known Bugs}
++if the issue has not been addressed yet. If it is not the
+ case, but it appears that the version of @pack{} you have is old,
+ consider upgrading.
+
+@@ -2802,8 +2798,7 @@ Thou shalt start your PostScript DSC con
+
+ The bad news is that some printers will reject this header. Then you
+ may change this header without any worry since the PostScript produced
+-by @pack{} is also 100% PostScript level 1@footnote{That is to say, there
+-are no PostScript printers that don't understand these files.}.
++by @pack{} is also 100% PostScript level 1@footnote{That is to say, there are no PostScript printers that don't understand these files.}.
+
+ @defvr {Configuration Setting} OutputFirstLine: @var{magic-number}
+ @cindex @samp{OutputFirstLine:}
+@@ -3971,13 +3966,13 @@ Quote @var{text} so that no special sequ
+ @itemx \end@{enumerate@}
+ @itemx \begin@{description@}
+ @itemx \end@{description@}
+-These commands are legal in @LaTeX but have no sense in @PreTeX{}.
++These commands are legal in @LaTeX{} but have no sense in @PreTeX{}.
+ Hence there are simply ignored and not printed (if immediately followed
+ by an end-of-line).
+ @end table
+
+ @node Differences with LaTeX
+-@subsubsection Differences with @LaTeX
++@subsubsection Differences with @LaTeX{}
+ The following symbols, inherited from the style sheet @code{Symbol}, are
+ not supported by @LaTeX{}:
+
+@@ -4124,9 +4119,9 @@ beautiful, with any character you might
+ prefix part of the file name, and is alpha-numerical, lower case, and
+ less than 8 characters long.
+
+-Anywhere @pack{} needs to recognize a style sheet by a name, @strong{it
+-uses the key} (in the @file{sheets.map} file, with the option @samp{-E},
+-etc.).
++Anywhere @pack{} needs to recognize a style sheet by a name,
++@strong{it uses the key} (in the @file{sheets.map} file, with the
++option @samp{-E}, etc.).
+
+ As an example, C++ is implemented in a file called @file{cxx.ssh}, in
+ which the name is declared to be @samp{C++}.
+@@ -5672,7 +5667,7 @@ supporting a @samp{--help}-like option.
+ @subsection Invoking @code{card}
+
+ @example
+-card [@var{options}] @var{applications} [-- @var{@pack{}-options}]
++card [@var{options}] @var{applications} [-- @var{-options}]
+ @end example
+
+ @noindent
+@@ -5680,7 +5675,7 @@ card [@var{options}] @var{applications}
+ @var{applications}' help message (typically by the options @samp{--help}
+ or @samp{-h}), and pretty prints it thanks to @pack{} (or the content of
+ the environment variable @samp{A2PS} if it is set).
+-@var{@pack{}-options} are passed to @pack{}.
++@var{-options} are passed to @pack{}.
+
+ Supported options are:
+
+@@ -5874,12 +5869,12 @@ difference finder,wdiff,GNU wdiff}) to e
+ @subsection Invoking @code{pdiff}
+
+ @example
+-pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{@pack{}-options}]
++pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{-options}]
+ @end example
+
+ @noindent
+ make a pretty comparison between @var{file-1} and @var{file-2}.
+-@var{@pack{}-options} are passed to @pack{}.
++@var{-options} are passed to @pack{}.
+
+ Supported options are:
+
+@@ -6222,7 +6217,7 @@ Error related questions.
+ @subsection Why Does it Print Nothing?
+
+ @quotation
+-@i{@pack{} works OK, but the printer prints nothing.}
++@i{works OK, but the printer prints nothing.}
+ @end quotation
+
+ There are two ways that printing can fail: silently, or with a
+@@ -6351,7 +6346,7 @@ If it is incorrect, ask for help around
+ @subsection Why Does it Say my File is Binary?
+
+ @quotation
+-@i{@pack{} complains that my file is binary though it is not.}
++@i{complains that my file is binary though it is not.}
+ @end quotation
+
+ There are several reasons that can cause @pack{} to consider a file is
+@@ -6591,7 +6586,7 @@ format you want for the date: @xref{Esca
+ @subsection Why Have the Options Changed?
+
+ @quotation
+-@i{The options of this @pack{} are not the same as in the previous versions.}
++@i{The options of this are not the same as in the previous versions.}
+ @end quotation
+
+ True. But the old scheme (up to version 4.6.1) prevented us from
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/, app-text/a2ps/files/
@ 2016-11-27 7:20 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2016-11-27 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 4a1d1e520fccdcff5c0ab5e69dfaf6df5abd0ff9
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 18:11:51 2016 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 07:14:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1d1e52
app-text/a2ps: Security revbump to fix CVE-2014-0466 (bug #506352)
Patch for CVE-2014-0466 taken from Debian [Link 1].
Link 1: https://sources.debian.net/src/a2ps/1:4.14-1.1%2Bdeb7u1/debian/patches/10_CVE-2014-0466.dpatch/
Gentoo-Bug: https://bugs.gentoo.org/506352
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2898
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
app-text/a2ps/a2ps-4.14-r5.ebuild | 140 ++++++++++++++++++++++
app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch | 32 +++++
2 files changed, 172 insertions(+)
diff --git a/app-text/a2ps/a2ps-4.14-r5.ebuild b/app-text/a2ps/a2ps-4.14-r5.ebuild
new file mode 100644
index 00000000..bba3f52
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r5.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools elisp-common flag-o-matic
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="http://www.inf.enst.fr/~demaille/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"
+
+RESTRICT=test
+
+RDEPEND="app-text/ghostscript-gpl
+ app-text/libpaper
+ >=app-text/psutils-1.17
+ app-text/wdiff
+ emacs? ( virtual/emacs )
+ latex? ( virtual/latex-base )
+ nls? ( virtual/libintl )
+ userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
+ userland_BSD? ( sys-freebsd/freebsd-ubin )"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-2.7.2
+ virtual/yacc
+ nls? ( sys-devel/gettext )"
+
+SITEFILE=50${PN}-gentoo.el
+
+S=${WORKDIR}/${PN}-${PV:0:4}
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
+ use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+ if use linguas_ja; then
+ eapply "${WORKDIR}"/${P}-ja_nls.patch
+ # bug #335803
+ eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
+ else
+ eapply "${FILESDIR}"/${P}-cleanup.patch
+ fi
+
+ # fix fnmatch replacement, bug #134546
+ eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+
+ # bug #122026
+ eapply "${FILESDIR}"/${P}-psset.patch
+
+ # fix emacs printing, bug #114627
+ eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
+
+ # fix chmod error, #167670
+ eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
+
+ # add configure check for mempcpy, bug 216588
+ eapply "${FILESDIR}"/${P}-check-mempcpy.patch
+
+ # fix compilation error due to invalid stpcpy() prototype, bug 216588
+ eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+
+ # fix compilation error due to obstack.h issue, bug 269638
+ eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
+
+ # fix compilation error due to texinfo 5.x, bug 482748
+ eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
+
+ # fix CVE-2014-0466, bug 506352
+ eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch
+
+ # fix building with sys-devel/automake >= 1.12, bug 420503
+ rm -f {.,ogonkify}/aclocal.m4 || die
+ sed -i \
+ -e '/^AM_C_PROTOTYPES/d' \
+ -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+ -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+ configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -DPROTOTYPES #420503
+
+ local myconf="COM_netscape=no COM_acroread=no"
+
+ use emacs || myconf="${myconf} EMACS=no"
+ use latex || myconf="${myconf} COM_latex=no"
+
+ export LANG=C LC_ALL=C
+
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --sysconfdir="${EPREFIX}"/etc/a2ps \
+ $(use_enable nls) \
+ ${myconf}
+}
+
+src_compile() {
+ # parallel make b0rked
+ emake -j1
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ lispdir="${EPREFIX}${SITELISP}"/${PN} \
+ install
+
+ newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+ newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+ newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+ rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+ prune_libtool_files
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+
+ dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
new file mode 100644
index 00000000..56f0b2f
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
@@ -0,0 +1,32 @@
+CVE-2014-0466: fixps does not invoke gs with -dSAFER
+
+A malicious PostScript file could delete files with the privileges of
+the invoking user.
+
+Author: Salvatore Bonaccorso <carnil@debian.org>
+Origin: https://bugs.debian.org/742902
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.in a2ps/contrib/fixps.in
+--- a2ps~/contrib/fixps.in 2014-03-30 12:24:50.000000000 +0200
++++ a2ps/contrib/fixps.in 2014-03-30 12:40:36.763249218 +0200
+@@ -389,7 +389,7 @@
+ eval "$command" ;;
+ gs)
+ $verbose "$program: making a full rewrite of the file ($gs)." >&2
+- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
++ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
+ esac
+ )
+ fi
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.m4 a2ps/contrib/fixps.m4
+--- a2ps~/contrib/fixps.m4 2014-03-30 12:24:50.000000000 +0200
++++ a2ps/contrib/fixps.m4 2014-03-30 12:40:36.767249254 +0200
+@@ -307,7 +307,7 @@
+ eval "$command" ;;
+ gs)
+ $verbose "$program: making a full rewrite of the file ($gs)." >&2
+- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
++ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
+ esac
+ )
+ fi
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/, app-text/a2ps/files/
@ 2022-10-20 9:02 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2022-10-20 9:02 UTC (permalink / raw
To: gentoo-commits
commit: a9b0b249a1ed19e6f3570d39353e9f783b5e861c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 08:56:38 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 09:01:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b0b249
app-text/a2ps: Fix function declaration
Update to EAPI 8. Specify LICENSE more precisely.
Closes: https://bugs.gentoo.org/870763
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-text/a2ps/a2ps-4.14-r8.ebuild | 146 ++++++++++++++++++++++
app-text/a2ps/files/a2ps-4.14-configure.ac.patch | 11 ++
app-text/a2ps/files/a2ps-4.14-function-decl.patch | 12 ++
3 files changed, 169 insertions(+)
diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild
new file mode 100644
index 000000000000..3424f0792726
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r8.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="https://www.gnu.org/software/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+ cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
+S="${WORKDIR}/${PN}-${PV:0:4}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cjk emacs latex nls static-libs vanilla"
+
+RESTRICT="test"
+
+RDEPEND="app-text/ghostscript-gpl
+ app-text/libpaper:=
+ >=app-text/psutils-1.17
+ app-text/wdiff
+ >=sys-apps/coreutils-6.10-r1
+ emacs? ( >=app-editors/emacs-23.1:* )
+ latex? ( virtual/latex-base )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/gperf-2.7.2
+ virtual/yacc
+ nls? ( sys-devel/gettext )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
+ use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+ if use cjk; then
+ eapply "${WORKDIR}"/${P}-ja_nls.patch
+ # bug #335803
+ eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
+ else
+ eapply "${FILESDIR}"/${P}-cleanup.patch
+ fi
+
+ # fix fnmatch replacement, bug #134546
+ eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+
+ # bug #122026
+ eapply "${FILESDIR}"/${P}-psset.patch
+
+ # fix emacs printing, bug #114627
+ eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
+
+ # fix chmod error, #167670
+ eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
+
+ # add configure check for mempcpy, bug 216588
+ eapply "${FILESDIR}"/${P}-check-mempcpy.patch
+
+ # fix compilation error due to invalid stpcpy() prototype, bug 216588
+ eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+
+ # fix compilation error due to obstack.h issue, bug 269638
+ eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
+
+ # fix compilation error due to texinfo 5.x, bug 482748
+ eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
+
+ # fix CVE-2014-0466, bug 506352
+ eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch
+
+ # fix CVE-2001-1593, bug 507024
+ eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
+
+ # specify encoding explicitly, bug #695918
+ eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
+
+ # fix function declaration, bug 870763
+ eapply "${FILESDIR}"/${P}-function-decl.patch
+
+ # update reference in man/Makefile.maint
+ eapply "${FILESDIR}"/${P}-configure.ac.patch
+
+ # fix building with sys-devel/automake >= 1.12, bug 420503
+ rm -f {.,ogonkify}/aclocal.m4 || die
+ sed -i \
+ -e '/^AM_C_PROTOTYPES/d' \
+ -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+ -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+ configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -DPROTOTYPES #420503
+
+ export LANG=C LC_ALL=C
+
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --sysconfdir="${EPREFIX}"/etc/a2ps \
+ $(use_enable nls) \
+ COM_netscape=no \
+ COM_acroread=no \
+ $(usev !latex COM_latex=no) \
+ $(usev !emacs EMACS=no)
+}
+
+src_compile() {
+ # parallel make b0rked
+ emake -j1
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ lispdir="${EPREFIX}${SITELISP}"/${PN} \
+ install
+
+ newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+ newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+ newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+ rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+ find "${ED}" -name '*.la' -delete || die
+
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/files/a2ps-4.14-configure.ac.patch b/app-text/a2ps/files/a2ps-4.14-configure.ac.patch
new file mode 100644
index 000000000000..58cbe4bca478
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-configure.ac.patch
@@ -0,0 +1,11 @@
+--- a2ps-4.14/man/Makefile.maint
++++ a2ps-4.14/man/Makefile.maint
+@@ -4,7 +4,7 @@
+ HELP2MAN-run = $(PERL) -w -- $(srcdir)/$(HELP2MAN)
+
+ # Depend on configure.in to get version number changes.
+-$(man_MANS): $(top_srcdir)/configure.in common.x
++$(man_MANS): $(top_srcdir)/configure.ac common.x
+
+ # Depend on the source file containing the --help text.
+ # Filter out irregular cases.
diff --git a/app-text/a2ps/files/a2ps-4.14-function-decl.patch b/app-text/a2ps/files/a2ps-4.14-function-decl.patch
new file mode 100644
index 000000000000..1b330723e95b
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-function-decl.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/870763
+
+--- a2ps-4.14/lib/path-concat.c
++++ a2ps-4.14/lib/path-concat.c
+@@ -26,6 +26,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #if HAVE_STRING_H
+ # include <string.h>
+ #endif
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/, app-text/a2ps/files/
@ 2022-10-20 15:04 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2022-10-20 15:04 UTC (permalink / raw
To: gentoo-commits
commit: f347d04d56baa226e8798a9a094a68d42c8b6149
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 14:54:19 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 15:04:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f347d04d
app-text/a2ps: Some housekeeping of patches
In the long term, these should be moved to a tarball and out of the
Gentoo repository.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-text/a2ps/a2ps-4.14-r7.ebuild | 4 +-
app-text/a2ps/a2ps-4.14-r8.ebuild | 59 +++++++---------------
app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch | 4 +-
app-text/a2ps/files/a2ps-4.13c-emacs.patch | 3 ++
.../files/a2ps-4.13c-fnmatch-replacement.patch | 4 +-
app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch | 3 ++
.../a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch | 15 +++---
app-text/a2ps/files/a2ps-4.14-psset.patch | 3 +-
app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch | 4 +-
...2ps-4.13-stdout.diff => a2ps-4.14-stdout.patch} | 8 +--
app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch | 3 ++
11 files changed, 50 insertions(+), 60 deletions(-)
diff --git a/app-text/a2ps/a2ps-4.14-r7.ebuild b/app-text/a2ps/a2ps-4.14-r7.ebuild
index 5beff0baee31..786c6a6aa41d 100644
--- a/app-text/a2ps/a2ps-4.14-r7.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r7.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
default
eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
- use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+ use vanilla || eapply "${FILESDIR}"/${P}-stdout.patch
if use cjk; then
eapply "${WORKDIR}"/${P}-ja_nls.patch
# bug #335803
@@ -62,7 +62,7 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-check-mempcpy.patch
# fix compilation error due to invalid stpcpy() prototype, bug 216588
- eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+ eapply "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
# fix compilation error due to obstack.h issue, bug 269638
eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild
index 3424f0792726..ede532a155af 100644
--- a/app-text/a2ps/a2ps-4.14-r8.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r8.ebuild
@@ -33,11 +33,27 @@ BDEPEND=">=dev-util/gperf-2.7.2
SITEFILE="50${PN}-gentoo.el"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
+ "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+ "${FILESDIR}"/${P}-psset.patch
+ "${FILESDIR}"/${PN}-4.13c-emacs.patch
+ "${FILESDIR}"/${PN}-4.13-manpage-chmod.patch
+ "${FILESDIR}"/${P}-check-mempcpy.patch
+ "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+ "${FILESDIR}"/${P}-ptrdiff_t.patch
+ "${FILESDIR}"/${P}-texinfo-5.x.patch
+ "${FILESDIR}"/${P}-CVE-2014-0466.patch
+ "${FILESDIR}"/${P}-CVE-2001-1593.patch
+ "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
+ "${FILESDIR}"/${P}-function-decl.patch
+ "${FILESDIR}"/${P}-configure.ac.patch
+)
+
src_prepare() {
default
- eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
- use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+ use vanilla || eapply "${FILESDIR}"/${P}-stdout.patch
if use cjk; then
eapply "${WORKDIR}"/${P}-ja_nls.patch
# bug #335803
@@ -46,45 +62,6 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-cleanup.patch
fi
- # fix fnmatch replacement, bug #134546
- eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
-
- # bug #122026
- eapply "${FILESDIR}"/${P}-psset.patch
-
- # fix emacs printing, bug #114627
- eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
-
- # fix chmod error, #167670
- eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
-
- # add configure check for mempcpy, bug 216588
- eapply "${FILESDIR}"/${P}-check-mempcpy.patch
-
- # fix compilation error due to invalid stpcpy() prototype, bug 216588
- eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
-
- # fix compilation error due to obstack.h issue, bug 269638
- eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
-
- # fix compilation error due to texinfo 5.x, bug 482748
- eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
-
- # fix CVE-2014-0466, bug 506352
- eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch
-
- # fix CVE-2001-1593, bug 507024
- eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
-
- # specify encoding explicitly, bug #695918
- eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
-
- # fix function declaration, bug 870763
- eapply "${FILESDIR}"/${P}-function-decl.patch
-
- # update reference in man/Makefile.maint
- eapply "${FILESDIR}"/${P}-configure.ac.patch
-
# fix building with sys-devel/automake >= 1.12, bug 420503
rm -f {.,ogonkify}/aclocal.m4 || die
sed -i \
diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
index e0c61124e9df..8e8454a3ea48 100644
--- a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
+++ b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
@@ -1,4 +1,6 @@
-diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
+fix chmod error
+https://bugs.gentoo.org/167670
+
--- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200
+++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200
@@ -20,7 +20,7 @@
diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
index f1cd5d9ebdfc..97099a7393d9 100644
--- a/app-text/a2ps/files/a2ps-4.13c-emacs.patch
+++ b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
@@ -1,3 +1,6 @@
+fix emacs printing
+https://bugs.gentoo.org/114627
+
--- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100
+++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100
@@ -93,6 +93,7 @@
diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
index c49ab78c93c0..92098541b694 100644
--- a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
+++ b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
@@ -1,4 +1,6 @@
-diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+fix fnmatch replacement
+https://bugs.gentoo.org/134546
+
--- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600
+++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500
@@ -27,18 +27,6 @@
diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
index 7b820cead05f..62a8ab21961f 100644
--- a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
+++ b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
@@ -1,3 +1,6 @@
+add configure check for mempcpy
+https://bugs.gentoo.org/216588
+
--- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200
+++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200
@@ -137,7 +137,8 @@
diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
index 7c3c69076ae9..ed72bbad0715 100644
--- a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
+++ b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
@@ -1,9 +1,9 @@
-=== modified file 'lib/xstrrpl.c'
---- lib/xstrrpl.c 2008-04-14 18:04:50 +0000
-+++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000
-@@ -20,12 +20,10 @@
-
- #include "system.h"
+fix compilation error due to invalid stpcpy() prototype
+https://bugs.gentoo.org/216588
+
+--- a2ps-4.14/lib/xstrrpl.c
++++ a2ps-4.14/lib/xstrrpl.c
+@@ -22,8 +22,6 @@
#include <assert.h>
#include "xstrrpl.h"
@@ -12,6 +12,3 @@
/* Perform subsitutions in string. Result is malloc'd
E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
- */
- char *
-
diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch
index 291c3aac4fa4..e0793bc9eb1f 100644
--- a/app-text/a2ps/files/a2ps-4.14-psset.patch
+++ b/app-text/a2ps/files/a2ps-4.14-psset.patch
@@ -1,4 +1,5 @@
-diff -Naur a2ps-4.14.orig/contrib/psset.in a2ps-4.14/contrib/psset.in
+https://bugs.gentoo.org/122026
+
--- a2ps-4.14.orig/contrib/psset.in 2007-12-29 12:29:01.000000000 +0900
+++ a2ps-4.14/contrib/psset.in 2009-04-12 12:17:43.000000000 +0900
@@ -219,7 +219,7 @@
diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
index 00d955a819a9..7ff45cf3bc4a 100644
--- a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
+++ b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
@@ -1,4 +1,6 @@
-diff -uNr a2ps-4.14/lib/obstack.h a2ps-4.14.test/lib/obstack.h
+fix compilation error due to obstack.h issue
+https://bugs.gentoo.org/269638
+
--- a2ps-4.14/lib/obstack.h 2007-12-29 09:37:59.000000000 +0800
+++ a2ps-4.14.test/lib/obstack.h 2009-06-10 18:49:45.000000000 +0900
@@ -138,9 +138,9 @@
diff --git a/app-text/a2ps/files/a2ps-4.13-stdout.diff b/app-text/a2ps/files/a2ps-4.14-stdout.patch
similarity index 63%
rename from app-text/a2ps/files/a2ps-4.13-stdout.diff
rename to app-text/a2ps/files/a2ps-4.14-stdout.patch
index 1e40e618fcbd..6661b0e26f03 100644
--- a/app-text/a2ps/files/a2ps-4.13-stdout.diff
+++ b/app-text/a2ps/files/a2ps-4.14-stdout.patch
@@ -1,8 +1,8 @@
---- lib/printers.c.orig Tue Oct 12 00:01:59 1999
-+++ lib/printers.c Wed May 2 11:23:25 2001
+--- a2ps-4.14/lib/printers.c
++++ a2ps-4.14/lib/printers.c
@@ -315,8 +315,8 @@
- res->ppd = NULL; /* Printer's ppd are not read yet */
-
+ res->ppd = NULL; /* Printer's ppd are not read yet */
+
/* Output */
- /* Default is to send to default printer */
- res->flag_output_is_printer = true;
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
index 44cd4bfd099d..baf53cfcc122 100644
--- a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
@@ -1,3 +1,6 @@
+fix compilation error due to texinfo 5.x
+https://bugs.gentoo.org/482748
+
--- a2ps-4.14/doc/a2ps.texi.bero 2013-03-26 10:31:31.230137555 +0100
+++ a2ps-4.14/doc/a2ps.texi 2013-03-26 11:01:01.504006086 +0100
@@ -44,10 +44,6 @@
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/, app-text/a2ps/files/
@ 2023-03-10 8:08 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-03-10 8:08 UTC (permalink / raw
To: gentoo-commits
commit: ef4cab9962c42b9572017becdb7bbc73cee1c2c4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 08:05:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 08:07:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4cab99
app-text/a2ps: add 4.15
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/a2ps/Manifest | 1 +
app-text/a2ps/a2ps-4.15.ebuild | 86 ++++++++++++++++++++++
app-text/a2ps/files/a2ps-4.14-stdout.patch | 3 +
...ps-4.14-stdout.patch => a2ps-4.15-stdout.patch} | 9 ++-
4 files changed, 96 insertions(+), 3 deletions(-)
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index a77cfa5fe179..6c5b905a04ee 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,2 +1,3 @@
DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
+DIST a2ps-4.15.tar.gz 3723299 BLAKE2B b68c3939ad7af5eeb48c85fe6e36e350ce9d0081181bec4374441a1ed9dea6cf716fd3c30a29c06e987d7c26304f2e21ba9b258bb6ca591a6c68180faca8edd8 SHA512 4d88ed4c65c636aa7640e01cf19c259775a810eb91495dc39726554c8ab3b89a105d947c3b357a5b16e5d120b5530587b1838a99829862c9c081b5ae1b354798
diff --git a/app-text/a2ps/a2ps-4.15.ebuild b/app-text/a2ps/a2ps-4.15.ebuild
new file mode 100644
index 000000000000..a8e2110dcdd5
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.15.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="https://www.gnu.org/software/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV:0:4}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cjk emacs latex nls static-libs vanilla"
+
+# a2ps-lpr-wrapper needs bash
+RDEPEND="
+ app-text/ghostscript-gpl
+ app-text/libpaper:=
+ >=app-text/psutils-1.17
+ app-text/wdiff
+ app-shells/bash:*
+ >=sys-apps/coreutils-6.10-r1
+ emacs? ( >=app-editors/emacs-23.1:* )
+ latex? ( virtual/latex-base )
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ >=dev-util/gperf-2.7.2
+ nls? ( sys-devel/gettext )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ default
+
+ use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ export LANG=C LC_ALL=C
+
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --sysconfdir="${EPREFIX}"/etc/a2ps \
+ $(use_enable nls) \
+ COM_netscape=no \
+ COM_acroread=no \
+ $(usev !latex COM_latex=no) \
+ $(usev !emacs EMACS=no)
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ lispdir="${EPREFIX}${SITELISP}"/${PN} \
+ install
+
+ newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+ newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+ newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+ rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+ find "${ED}" -name '*.la' -delete || die
+
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/files/a2ps-4.14-stdout.patch b/app-text/a2ps/files/a2ps-4.14-stdout.patch
index 6661b0e26f03..5ca7649ad3e7 100644
--- a/app-text/a2ps/files/a2ps-4.14-stdout.patch
+++ b/app-text/a2ps/files/a2ps-4.14-stdout.patch
@@ -1,3 +1,6 @@
+https://bugs.gentoo.org/47691
+https://bugs.gentoo.org/47764
+https://lists.gnu.org/archive/html/bug-a2ps/2001-05/msg00000.html
--- a2ps-4.14/lib/printers.c
+++ a2ps-4.14/lib/printers.c
@@ -315,8 +315,8 @@
diff --git a/app-text/a2ps/files/a2ps-4.14-stdout.patch b/app-text/a2ps/files/a2ps-4.15-stdout.patch
similarity index 57%
copy from app-text/a2ps/files/a2ps-4.14-stdout.patch
copy to app-text/a2ps/files/a2ps-4.15-stdout.patch
index 6661b0e26f03..00002ffb9524 100644
--- a/app-text/a2ps/files/a2ps-4.14-stdout.patch
+++ b/app-text/a2ps/files/a2ps-4.15-stdout.patch
@@ -1,6 +1,9 @@
---- a2ps-4.14/lib/printers.c
-+++ a2ps-4.14/lib/printers.c
-@@ -315,8 +315,8 @@
+https://bugs.gentoo.org/47691
+https://bugs.gentoo.org/47764
+https://lists.gnu.org/archive/html/bug-a2ps/2001-05/msg00000.html
+--- a/liba2ps/printers.c
++++ b/liba2ps/printers.c
+@@ -287,8 +287,8 @@ a2ps_printers_new (struct a2ps_common_s * common)
res->ppd = NULL; /* Printer's ppd are not read yet */
/* Output */
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-10 8:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-27 7:20 [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/, app-text/a2ps/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2023-03-10 8:08 Sam James
2022-10-20 15:04 Ulrich Müller
2022-10-20 9:02 Ulrich Müller
2016-05-17 18:31 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox