Dr. Werner Fink 2015-03-03 11:58:57 +00:00 committed by Git OBS Bridge
parent c5fca8cf15
commit fb82ba88b8
2 changed files with 20 additions and 3 deletions

14
a2ps-4.14-iswprint.patch Normal file
View File

@ -0,0 +1,14 @@
---
lib/quotearg.c | 1 +
1 file changed, 1 insertion(+)
--- lib/quotearg.c
+++ lib/quotearg.c 2015-03-03 11:23:16.174018578 +0000
@@ -60,6 +60,7 @@
#if HAVE_MBRTOWC && HAVE_WCHAR_H
# include <wchar.h>
+# include <wctype.h>
#else
# define iswprint(wc) 1
# define mbrtowc(pwc, s, n, ps) 1

View File

@ -60,6 +60,7 @@ Patch8: a2ps-4.13-base.patch
Patch9: a2ps-4.13-utf8.patch Patch9: a2ps-4.13-utf8.patch
Patch10: a2ps-4.13-types.patch Patch10: a2ps-4.13-types.patch
Patch11: a2ps-4.13-psgen.patch Patch11: a2ps-4.13-psgen.patch
Patch12: a2ps-4.14-iswprint.patch
Patch13: a2ps-4.14-linker.patch Patch13: a2ps-4.14-linker.patch
# PATCH-FIX-USTREAM Bug 871097 - CVE-2014-0466: a2ps: fixps does not use -dSAFER # PATCH-FIX-USTREAM Bug 871097 - CVE-2014-0466: a2ps: fixps does not use -dSAFER
Patch14: CVE-2014-0466.diff Patch14: CVE-2014-0466.diff
@ -102,21 +103,23 @@ touch -r configure.in .ref
%patch9 -p0 -b .utf8 %patch9 -p0 -b .utf8
%patch10 -p0 -b .types %patch10 -p0 -b .types
%patch11 -p0 -b .psgen %patch11 -p0 -b .psgen
%patch12 -p0 -b .iswprint
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch -p0 -b .p0 %patch -p0 -b .p0
cp -f %SOURCE1 po/ko.po cp -f %SOURCE1 po/ko.po
find -type f | grep -vE '(parseppd|parsessh).y' | xargs \ find -type f | grep -vE '(parseppd|parsessh).y' | xargs \
sed -ri 's/59 Temple Place(,| -) Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/' sed -ri 's/59 Temple Place(,| -) Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/'
touch -r .ref configure.in
find -name Makefile.in | xargs sed -ri '/^am--refresh:/d'
find -name Makefile.in | xargs touch find -name Makefile.in | xargs touch
%build %build
#XXX: ugly hack; necessary?? #XXX: ugly hack; necessary??
cp /usr/share/automake-*/config.{guess,sub} auxdir/ cp -p /usr/share/automake-*/config.{guess,sub} auxdir/
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector -fPIE" export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector -fPIE"
export LPR=lpr export LPR=lpr
export CC=gcc export CC=gcc
touch -r .ref configure.in
%configure --enable-shared --disable-static --with-pic --with-medium=LC_PAPER \ %configure --enable-shared --disable-static --with-pic --with-medium=LC_PAPER \
--with-encoding=LC_CTYPE --with-encoding=LC_CTYPE
con="" con=""
@ -145,7 +148,7 @@ find -name Makefile.in | xargs touch
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz
%postun %preun
/sbin/ldconfig /sbin/ldconfig
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz