- up to 10.35.65. CVE-2007-2721 and CVE-2008-3520 fixed by linking to system jasper...

Changed files:
    netpbm-build.patch -> 1.1
    netpbm-rgb-path.patch -> 1.2
    netpbm.spec -> 1.94

diff --git a/netpbm-build.patch b/netpbm-build.patch
new file mode 100644 (file)
index 0000000..a0f4b3a
--- /dev/null
+++ b/netpbm-build.patch
@@ -0,0 +1,25 @@
+--- netpbm-10.35.65/buildtools/configure.pl~   2009-06-26 03:35:42.000000000 +0200
++++ netpbm-10.35.65/buildtools/configure.pl    2009-07-15 08:47:35.271968502 +0200
+@@ -1889,11 +1889,6 @@
+         push(@Makefile_config, "CFLAGS += -fPIC\n");
+         push(@Makefile_config, "LDSHLIB = -shared -fPIC\n");
+         push(@Makefile_config, 'LDFLAGS += -Wl,+b,/usr/pubsw/lib', "\n");
+-    } else {
+-        # We don't know what to do here.  We used to (before 10.20) just
+-        # just assume the compiler was gcc.  We know that the gcc stuff
+-        # above does NOT work for HP native compiler.
+-        push(@config_mk, "LDSHLIB =\n");
+     }
+ } elsif ($platform eq "AIX") {
+     push(@Makefile_config, 'LDFLAGS = -L /usr/pubsw/lib', "\n");
+--- netpbm-10.35.65/converter/ppm/ppmtompeg/jpeg.c~    2006-08-19 05:12:28.000000000 +0200
++++ netpbm-10.35.65/converter/ppm/ppmtompeg/jpeg.c     2009-07-15 08:52:06.372101451 +0200
+@@ -469,7 +469,7 @@
+ #ifdef JPEG4
+     buffer_height = 8;  /* could be 2, 4,8 rows high */
+ #else
+-    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+ #endif
+   
+     for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;

diff --git a/netpbm-rgb-path.patch b/netpbm-rgb-path.patch
deleted file mode 100644 (file)
index 1fb49b8..0000000
--- a/netpbm-rgb-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- netpbm-10.34/pm_config.in.h~       2006-06-17 21:58:23.000000000 +0200
-+++ netpbm-10.34/pm_config.in.h        2007-08-17 13:40:40.000000000 +0200
-@@ -67,8 +67,8 @@
- #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
- #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
- #else
--#define RGB_DB1 "/usr/lib/X11/rgb.txt"
--#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
-+#define RGB_DB1 "/usr/share/X11/rgb.txt"
-+#define RGB_DB2 "/usr/lib/X11/rgb.txt"
- #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
- #endif
- 
---- netpbm-10.34/netpbm.sourceforge.net/doc/libppm.html~       2003-03-21 17:22:54.000000000 +0100
-+++ netpbm-10.34/netpbm.sourceforge.net/doc/libppm.html        2007-08-17 13:42:28.000000000 +0200
-@@ -453,8 +453,8 @@
- is not set, Netpbm defaults to the first existing file from this list:
- 
- <ol>
-+<li><b>/usr/share/X11/rgb.txt</b>
- <li><b>/usr/lib/X11/rgb.txt</b>
--<li><b>/usr/openwinlib/rgb.txt</b>
- <li><b>/usr/X11R6/lib/X11/rgb.txt</b>
- </ol>
- 

diff --git a/netpbm.spec b/netpbm.spec
index 9c1608ff597b3fc2a0080df89cac7dbc96a2b335..02032c6107779b16f861dfb297ab001b83cc35a4 100644 (file)
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -10,25 +10,24 @@ Summary(pt_BR.UTF-8):       Ferramentas para manipular arquivos graficos nos formatos
 Summary(ru.UTF-8):     Набор библиотек для работы с различными графическими файлами
 Summary(uk.UTF-8):     Набір бібліотек для роботи з різними графічними файлами
 Name:          netpbm
-Version:       10.34
-Release:       6
+Version:       10.35.65
+Release:       1
 License:       Freeware
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/netpbm/%{name}-%{version}.tgz
-# Source0-md5: 851137b746e9a08c46e6580743c036c4
+#  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version} (where version from doc/HISTORY)
+#  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
+Source0:       %{name}-%{version}.tar.bz2
+# Source0-md5: 8f8317643d6f729ebc30913d066be804
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 8fb174f8da02ea01bf72a9dc61be10f1
 Source2:       %{name}-docs-20030520.tar.bz2
 # Source2-md5: 2d6a3965d493def21edfbc3e1aa262e9
 Patch0:                %{name}-make.patch
-Patch1:                %{name}-rgb-path.patch
+Patch1:                %{name}-build.patch
 URL:           http://netpbm.sourceforge.net/
-# Patches in redhat:
-# https://rhn.redhat.com/errata/RHSA-2009-0012.html
-BuildRequires: security(CVE-2007-2721)
-BuildRequires: security(CVE-2008-3520)
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: flex
+BuildRequires: jasper-devel
 BuildRequires: jbigkit-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -214,6 +213,28 @@ użyciu svgalib.
 %patch1 -p1
 
 %build
+./configure << EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+EOF
+
 # it appends defines to pm_config.h twice if -j > 1
 %{__make} -j1 \
        CC="%{__cc}" \
@@ -224,7 +245,9 @@ użyciu svgalib.
        PNGHDR_DIR=%{_includedir} \
        TIFFHDR_DIR=%{_includedir} \
        X11LIB=%{_libdir}/libX11.so \
-       JBIGLIB=/usr/%{_lib}/libjbig.so << EOF
+       JBIGLIB=/usr/%{_lib}/libjbig.so \
+       JASPERLIB="" \
+       JASPERDEPLIBS="-ljasper" << EOF
 
 gnu
 regular
@@ -258,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir}/man{1,3,5}}
 
 rm -rf PKG
-%{__make} package \
+%{__make} -j1 package \
        pkgdir=$(pwd)/PKG
 
 rm -f PKG/bin/doc.url