- fixed and enabled security patch

- -devel and -static group changed to Development/Libraries
- release 20

Changed files:
    a2ps-security.patch -> 1.2
    a2ps.spec -> 1.58

diff --git a/a2ps-security.patch b/a2ps-security.patch
index ce4b6cfa54e40f019d791b1aaf224b152c87a7b8..3808bcd74b753a71e46e083803668c211dfea871 100644 (file)
--- a/a2ps-security.patch
+++ b/a2ps-security.patch
@@ -10,8 +10,8 @@ diff -ur a2ps-4.13.orig/lib/routines.c a2ps-4.13/lib/routines.c
 + * Securely generate a temp file, and make sure it gets\r
 + * deleted upon exit.\r
 + */\r
-+static char **        tempfiles;\r
-+static unsigned       ntempfiles;\r
++static char **        tempfiles = NULL;\r
++static unsigned       ntempfiles = 0;\r
 +\r
 +static void\r
 +cleanup_tempfiles()\r
@@ -38,7 +38,7 @@ diff -ur a2ps-4.13.orig/lib/routines.c a2ps-4.13/lib/routines.c
 +      if (!filename)\r
 +              return NULL;\r
 +\r
-+      sprintf(filename, "%s/%sXXXXXX", dirname, filename);\r
++      sprintf(filename, "%s/%sXXXXXX", dirname, pfx);\r
 +\r
 +      if ((fd = mkstemp(filename)) < 0) {\r
 +              free(filename);\r

diff --git a/a2ps.spec b/a2ps.spec
index f864967eb574e29027ea0bced80d0b0784fee5c6..8aa2c91fad2b8c5fcdc023d1ca1e03cb031dcda1 100644 (file)
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -2,7 +2,7 @@ Summary:        Text to Postscript filter
 Summary(pl):   Filtr text/plain do Postscriptu
 Name:          a2ps
 Version:       4.13b
-Release:       19
+Release:       20
 License:       GPL
 Group:         Applications/Text
 Group(de):     Applikationen/Text
@@ -12,7 +12,7 @@ Source0:      ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz
 Source1:       ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz
 Source2:       ogonkify.1.pl
 Patch0:                %{name}-info.patch
-#Patch1:               %{name}-security.patch
+Patch1:                %{name}-security.patch
 Patch2:                %{name}-etc.patch
 Patch3:                %{name}-flex.patch
 Patch4:                %{name}-conf.patch
@@ -48,14 +48,14 @@ PostScript zawieraj
 %package devel
 Summary:       Header files and development documentation for a2ps
 Summary(pl):   Pliki nag³ówkowe i dokunentacja do a2ps
-Group:         Libraries
-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
-Group(pt_BR):  Bibliotecas
-Group(ru):     âÉÂÌÉÏÔÅËÉ
-Group(uk):     â¦Â̦ÏÔÅËÉ
+Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description devel
@@ -67,14 +67,14 @@ Pliki nag
 %package static
 Summary:       a2ps static libraries
 Summary(pl):   Biblioteki statyczne do a2ps
-Group:         Libraries
-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
-Group(pt_BR):  Bibliotecas
-Group(ru):     âÉÂÌÉÏÔÅËÉ
-Group(uk):     â¦Â̦ÏÔÅËÉ
+Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
@@ -86,7 +86,7 @@ Biblioteki statyczne do a2ps.
 %prep
 %setup  -q -n %{name}-4.13 -a 1
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1