- updated to 1.6.5.1 (fixes at least: CAN-2004-1184 CAN-2004-1185 CAN-2004-1186 CVE...

- removed obsolete ac_fixes,am_fixes patches

Changed files:
    enscript-ac_fixes.patch -> 1.4
    enscript-am_fixes.patch -> 1.4
    enscript.spec -> 1.47

diff --git a/enscript-ac_fixes.patch b/enscript-ac_fixes.patch
deleted file mode 100644 (file)
index 978a299..0000000
--- a/enscript-ac_fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- enscript-1.6.4/configure.in.orig   2003-03-05 08:26:16.000000000 +0100
-+++ enscript-1.6.4/configure.in        2003-05-09 07:49:01.000000000 +0200
-@@ -11,23 +11,7 @@
- 
- AC_PROG_INSTALL
- 
--AC_ARG_WITH(cc,
--[  --with-cc(=CC)       use system's native compiler (or compiler CC)],
--  if test "X$withval" != "Xno"; then
--    if test "X$withval" = "Xyes"; then
--      CC='cc'
--    else
--      CC=$withval
--    fi
--    CFLAGS="$CFLAGS -I/usr/local/include"
--    LDFLAGS="$LDFLAGS -L/usr/local/lib"
--    echo "using compiler CC=$CC"
--  fi
--)
--
--if test "X$CC" = "X"; then
--  AC_PROG_CC
--fi
-+AC_PROG_CC
- 
- AC_ISC_POSIX
- AM_C_PROTOTYPES
-@@ -59,14 +43,6 @@
- AC_PROG_YACC
- AM_PROG_LEX
- 
--AC_ARG_ENABLE(debug,
--[  --enable-debug       enable debugging], [
--  echo enabling debugging
--  if test -n "$GCC"; then
--    CFLAGS="$CFLAGS -Wall"
--  fi
--])
--
- dnl Define the default output media.
- 
- AC_ARG_WITH(media,
-@@ -132,9 +108,6 @@
- 
- dnl substitutions
- 
--AC_SUBST(CFLAGS)
--AC_SUBST(LDFLAGS)
--
- AC_CONFIG_FILES([Makefile  po/Makefile.in m4/Makefile  intl/Makefile po/Makefile \
-       compat/Makefile \
-       afm/Makefile \

diff --git a/enscript-am_fixes.patch b/enscript-am_fixes.patch
deleted file mode 100644 (file)
index 1d63d61..0000000
--- a/enscript-am_fixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- enscript-1.6.4/lib/Makefile.am.orig        2003-03-05 08:26:29.000000000 +0100
-+++ enscript-1.6.4/lib/Makefile.am     2003-05-09 07:52:40.000000000 +0200
-@@ -38,12 +38,8 @@
- 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; \
--      else :; \
--      fi
--      $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
-+      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-+      $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
- 
- uninstall-local:
-       rm -f $(sysconfdir)/enscript.cfg
---- enscript-1.6.4/afm/Makefile.am.orig        2003-03-05 08:26:16.000000000 +0100
-+++ enscript-1.6.4/afm/Makefile.am     2003-05-09 07:53:56.000000000 +0200
-@@ -36,10 +36,10 @@
- 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:
---- enscript-1.6.4/states/hl/Makefile.am.orig  2003-03-05 08:26:33.000000000 +0100
-+++ enscript-1.6.4/states/hl/Makefile.am       2003-05-09 07:54:20.000000000 +0200
-@@ -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:

diff --git a/enscript.spec b/enscript.spec
index 4820ff8e9a36e0c77c2cc511e4f981c658d9d608..e5c103ad985c5f89e453bdddf57bee99021e3e49 100644 (file)
--- a/enscript.spec
+++ b/enscript.spec
@@ -1,31 +1,25 @@
 # TODO
 # - ruby hiliting from http://neugierig.org/software/ruby/
 # TODO
 # - ruby hiliting from http://neugierig.org/software/ruby/

+# - reexamine CVE-2008-5078 (no longer applicable?)

 Summary:       Converts plain ASCII to PostScript
 Summary(es.UTF-8):     Convierte texto ASCII a postscript
 Summary(pl.UTF-8):     Konwertuje czyste ASCII do PostScriptu
 Summary(pt_BR.UTF-8):  Converte texto ASCII para postscript
 Name:          enscript
 Summary:       Converts plain ASCII to PostScript
 Summary(es.UTF-8):     Convierte texto ASCII a postscript
 Summary(pl.UTF-8):     Konwertuje czyste ASCII do PostScriptu
 Summary(pt_BR.UTF-8):  Converte texto ASCII para postscript
 Name:          enscript

-Version:       1.6.4
-Release:       3
-License:       GPL
+Version:       1.6.5.1
+Release:       1
+License:       GPL v3+

 Group:         Applications/Publishing
 Group:         Applications/Publishing

-Source0:       http://www.iki.fi/mtr/genscript/%{name}-%{version}.tar.gz
-# Source0-md5: b5174b59e4a050fb462af5dbf28ebba3
-Patch0:                %{name}-ac_fixes.patch
-Patch1:                %{name}-am_fixes.patch
-Patch2:                %{name}-mail.patch
-Patch3:                %{name}-debian.patch
-Patch4:                %{name}-info.patch
-Patch5:                %{name}-php.patch
-URL:           http://www.iki.fi/mtr/genscript/
-# patches from RH packages:
-# http://securitytracker.com/alerts/2008/Dec/1021405.html
-BuildRequires: security(CVE-2008-3863)
-BuildRequires: security(CVE-2008-4306)
-BuildRequires: security(CVE-2008-5078)
-BuildRequires: autoconf >= 2.57
+Source0:       http://ftp.gnu.org/gnu/enscript/%{name}-%{version}.tar.gz
+# Source0-md5: 2d9568800bfa2831c82b6e216adaad78
+Patch0:                %{name}-mail.patch
+Patch1:                %{name}-debian.patch
+Patch2:                %{name}-info.patch
+Patch3:                %{name}-php.patch
+URL:           http://www.gnu.org/software/enscript/
+BuildRequires: autoconf >= 2.61

 BuildRequires: automake
 BuildRequires: automake

-BuildRequires: gettext-devel
+BuildRequires: gettext-devel >= 0.17

 BuildRequires: texinfo
 Obsoletes:     nenscript
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: texinfo
 Obsoletes:     nenscript
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -58,8 +52,6 @@ página física (lado a lado) ou modificar as fontes do texto.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

-%patch4 -p1
-%patch5 -p1

 
 %build
 %{__gettextize}
 
 %build
 %{__gettextize}


@@ -86,10 +78,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post  -p      /sbin/postshell
+%post  -p /sbin/postshell

 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 -/usr/sbin/fix-info-dir -c %{_infodir}
 

-%postun        -p      /sbin/postshell
+%postun        -p /sbin/postshell

 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang


@@ -97,12 +89,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README README.ESCAPES THANKS TODO docs/FAQ.html
 %config(noreplace) %{_sysconfdir}/enscript.cfg
 %attr(755,root,root) %{_bindir}/diffpp
 %doc AUTHORS ChangeLog NEWS README README.ESCAPES THANKS TODO docs/FAQ.html
 %config(noreplace) %{_sysconfdir}/enscript.cfg
 %attr(755,root,root) %{_bindir}/diffpp

-%attr(755,root,root) %{_bindir}/sliceprint

 %attr(755,root,root) %{_bindir}/enscript
 %attr(755,root,root) %{_bindir}/enscript

-%attr(755,root,root) %{_bindir}/nenscript

 %attr(755,root,root) %{_bindir}/mkafmmap
 %attr(755,root,root) %{_bindir}/mkafmmap

-%attr(755,root,root) %{_bindir}/states
+%attr(755,root,root) %{_bindir}/nenscript

 %attr(755,root,root) %{_bindir}/over
 %attr(755,root,root) %{_bindir}/over

+%attr(755,root,root) %{_bindir}/sliceprint
+%attr(755,root,root) %{_bindir}/states

 %{_datadir}/enscript
 %{_datadir}/enscript

-%{_mandir}/man1/*
-%{_infodir}/*.info*
+%{_mandir}/man1/diffpp.1*
+%{_mandir}/man1/enscript.1*
+%{_mandir}/man1/sliceprint.1*
+%{_mandir}/man1/states.1*
+%{_infodir}/enscript.info*