Hello community,
here is the log from the commit of package netpbm for openSUSE:Factory
checked in at Wed Jul 8 21:02:31 CEST 2009.
--------
--- netpbm/netpbm.changes 2009-06-01 14:24:55.000000000 +0200
+++ netpbm/netpbm.changes 2009-06-30 15:13:41.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Jun 17 16:28:54 CEST 2009 - nadvornik@suse.cz
+
+- improved generating of man pages [bnc#431226]
+- fixed various warnings
+
+-------------------------------------------------------------------
+Tue Jun 16 14:06:12 CEST 2009 - nadvornik@suse.cz
+
+- generate man pages from html
+
+-------------------------------------------------------------------
+Mon Jun 15 16:56:54 CEST 2009 - nadvornik@suse.cz
+
+- updated to 10.35.64
+ * for detailed changelog see
+ /usr/share/doc/packages/netpbm/HISTORY
+- use security patches from Fedora
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
netpbm-10.26.44-aliasing.patch
netpbm-10.26.44-colornames-init.diff
netpbm-10.26.44-documentation.tar.bz2
netpbm-10.26.44-endian.patch
netpbm-10.26.44-fix1overflow.patch
netpbm-10.26.44-fixes.patch
netpbm-10.26.44-manpages.patch
netpbm-10.26.44-manpages.tar.bz2
netpbm-10.26.44-nohpcdtoppm-nojbig.tar.bz2
netpbm-10.26.44-overflow.patch
netpbm-10.26.44-pamperspective.patch
netpbm-10.26.44-pamscale.patch
netpbm-10.26.44-pamtouil.patch
netpbm-10.26.44-pnmtopng-CAN-2005-2978.patch
netpbm-10.26.44-pnmtopng-overflow.patch
netpbm-10.26.44-pnmtopng-transparent.patch
netpbm-10.26.44-pstopnm-gs-options.patch
netpbm-10.26.44-rgb.patch
netpbm-10.26.44-tmpfile.patch
netpbm-10.26.44-ximtoppm-fixes.patch
netpbm-10.26.44.dif
New:
----
netpbm-10.22-security2.patch
netpbm-10.23-security.patch
netpbm-10.35.64-colornames-init.diff
netpbm-10.35.64-documentation.tar.bz2
netpbm-10.35.64-endian.patch
netpbm-10.35.64-fixes.patch
netpbm-10.35.64-manpages.patch
netpbm-10.35.64-nohpcdtoppm-nojbig.tar.bz2
netpbm-10.35.64-pamscale.patch
netpbm-10.35.64-pamtouil.patch
netpbm-10.35.64-pnmtopng-CAN-2005-2978.patch
netpbm-10.35.64-pnmtopng-transparent.patch
netpbm-10.35.64-rgb.patch
netpbm-10.35.64-tmpfile.patch
netpbm-10.35.64-ximtoppm-fixes.patch
netpbm-10.35.64.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netpbm.spec ++++++
--- /var/tmp/diff_new_pack.T5meuU/_old 2009-07-08 20:57:29.000000000 +0200
+++ /var/tmp/diff_new_pack.T5meuU/_new 2009-07-08 20:57:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package netpbm (Version 10.26.44)
+# spec file for package netpbm (Version 10.35.64)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,8 +19,8 @@
Name: netpbm
-BuildRequires: flex libjasper-devel libpng-devel libtiff-devel
-License: Any permissive; Artistic License; BSD 3-Clause; GPL v2 or later; Public Domain, Freeware; X11/MIT
+BuildRequires: flex libjasper-devel libpng-devel libtiff-devel python
+License: PERMISSIVE-OSI-COMPLIANT ; Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; Public Domain, Freeware ; MIT License (or similar)
Group: Productivity/Graphics/Convertors
Provides: pbmplus
AutoReqProv: on
@@ -29,31 +29,26 @@
Obsoletes: netpbm-64bit
%endif
#
-Version: 10.26.44
-Release: 104
+Version: 10.35.64
+Release: 1
Summary: A Powerful Graphics Conversion Package
Source: netpbm-%{version}-nohpcdtoppm-nojbig.tar.bz2
Source1: netpbm-%{version}-documentation.tar.bz2
-Source2: netpbm-%{version}-manpages.tar.bz2
Source3: prepare-src-tarball
Patch: netpbm-%{version}.dif
Patch2: netpbm-%{version}-manpages.patch
-Patch4: netpbm-%{version}-overflow.patch
-Patch5: netpbm-%{version}-aliasing.patch
+Patch3: netpbm-10.23-security.patch
+Patch4: netpbm-10.22-security2.patch
Patch6: netpbm-%{version}-tmpfile.patch
Patch7: netpbm-%{version}-colornames-init.diff
Patch8: netpbm-%{version}-fixes.patch
-Patch9: netpbm-%{version}-pstopnm-gs-options.patch
Patch10: netpbm-%{version}-endian.patch
Patch11: netpbm-%{version}-pnmtopng-CAN-2005-2978.patch
-Patch12: netpbm-%{version}-pnmtopng-overflow.patch
Patch13: netpbm-%{version}-ximtoppm-fixes.patch
Patch15: netpbm-%{version}-rgb.patch
Patch16: netpbm-%{version}-pamtouil.patch
Patch17: netpbm-%{version}-pnmtopng-transparent.patch
-Patch18: netpbm-%{version}-fix1overflow.patch
Patch19: netpbm-%{version}-pamscale.patch
-Patch20: netpbm-%{version}-pamperspective.patch
Url: http://netpbm.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -157,26 +152,21 @@
%prep
%setup
%setup -D -q -a 1
-%setup -D -q -a 2
rm -rf libtiff
%patch
%patch2
-%patch4
-%patch5
+%patch3 -p1
+%patch4 -p1
%patch6
%patch7 -p1
%patch8
-%patch9
%patch10
%patch11
-%patch12
%patch13
%patch15
%patch16
%patch17
-%patch18
%patch19
-%patch20
rm -rf converter/other/jpeg2000/libjasper/include #make sure the internal libjasper is not used
mkdir -p pnmtopalm
cd pnmtopalm
@@ -195,6 +185,14 @@
make CFLAGS="$CFLAGS" \
JASPERLIB=-ljasper \
JASPERHDR_DIR=/usr/include/jasper
+#
+# convert html to man pages
+cd netpbm.sourceforge.net/doc
+ ../../buildtools/makeman *.html
+for i in 1 3 5 ; do
+ mkdir -p ../../man/man${i}
+ mv *.${i} ../../man/man${i}
+done
%install
mkdir -p $RPM_BUILD_ROOT/usr/{bin,include,%_lib,share/man}
@@ -211,16 +209,15 @@
rm $RPM_BUILD_ROOT/usr/%_lib/*.a
mkdir -p $RPM_BUILD_ROOT/usr/share/netpbm
install -m 644 converter/other/pnmtopalm/*.map $RPM_BUILD_ROOT/usr/share/netpbm
+rm $RPM_BUILD_ROOT/usr/bin/doc.url
rm $RPM_BUILD_ROOT/usr/bin/g3topbm #conflict with g3utils
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n libnetpbm10
-%run_ldconfig
+%post -n libnetpbm10 -p /sbin/ldconfig
-%postun -n libnetpbm10
-%run_ldconfig
+%postun -n libnetpbm10 -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -242,207 +239,3 @@
%{_libdir}/lib*.so
%changelog
-* Mon Jun 01 2009 nadvornik@suse.cz
-- build fix: use non-conflicting name instead of "getline"
-* Wed Jan 14 2009 olh@suse.de
-- obsolete libnetpbm-XXbit instead of netpbm-XXbit
-* Wed Jan 07 2009 olh@suse.de
-- obsolete old -XXbit packages (bnc#437293)
-* Fri Nov 28 2008 nadvornik@suse.cz
-- fixed a crash in pamperspective by an update to newer
- version [bnc#440954]
-* Wed Oct 22 2008 nadvornik@suse.cz
-- fixed "pamscale -reduce" [bnc#391972]
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
- for multilib support
-* Fri Feb 01 2008 meissner@suse.de
-- fixed potential 1 byte array overread
-* Wed Nov 21 2007 nadvornik@suse.cz
-- compile with -flax-vector-conversions
-* Fri Nov 09 2007 nadvornik@suse.cz
-- use system libjasper [#339731]
-* Thu Jul 19 2007 nadvornik@suse.cz
-- updated to 10.26.44 (many bugfixes)
-- applied Shared Library Packaging Policy:
- * created libnetpbm-devel subpackage
- * renamed libnetpbm to libnetpbm10
-* Wed Apr 11 2007 nadvornik@suse.cz
-- removed ppmtompeg sources [#261140]
-* Thu Mar 29 2007 rguenther@suse.de
-- add flex BuildRequires
-* Wed Dec 06 2006 prusnak@suse.cz
-- fixed pamtouil crash when -name was specified (pamtouil.patch)
-- changed transparency handling (pnmtopng-transparent.patch) [#225258]
-* Thu Nov 30 2006 prusnak@suse.cz
-- fixed missing manpages [#224478]
-- fixed segfault in pbmtext [#224420]
-* Tue Nov 14 2006 prusnak@suse.cz
-- fixed [#216670]
- - removed man pages that pointed to online documentation (manpages.patch)
- - added man pages generated from HTML documentation (manpages.tar.bz2)
-* Thu Mar 23 2006 nadvornik@suse.cz
-- fixed uninitialized variables [#155948]
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Thu Jan 12 2006 nadvornik@suse.cz
-- compile with -fstack-protector
-* Thu Jan 05 2006 nadvornik@suse.cz
-- updated to 10.26.22
-* Tue Nov 15 2005 nadvornik@suse.cz
-- fixed possible buffer overflow [#133649]
-* Thu Oct 13 2005 nadvornik@suse.cz
-- fixed possible buffer overflow (CAN-2005-2978) [#119601]
-* Mon Sep 26 2005 nadvornik@suse.cz
-- fixed fiasco on bigendian [#105431]
-* Tue Aug 09 2005 nadvornik@suse.cz
-- call ghostscript with the -dSAFER option [#102527]
-* Mon Aug 01 2005 nadvornik@suse.cz
-- fixed libnetpb.so symlink
-* Fri Jul 29 2005 nadvornik@suse.cz
-- installed palm colormaps required by plucker
-* Thu Jul 28 2005 nadvornik@suse.cz
-- updated to 10.26.12
-* Wed Jun 22 2005 schwab@suse.de
-- Fix aliasing bug.
-- Don't strip binaries.
-* Thu Jan 06 2005 nadvornik@suse.cz
-- updated to 10.18.18
-- fixed tempdir handling in anytopbm [#49446]
-* Fri Nov 19 2004 ro@suse.de
-- fixed file list
-* Tue Aug 31 2004 jw@suse.de
-- fix uninitialized colornames in libppmcolor.c,
- that caused ppmtoxpm to segv on x86-64.
-* Fri Aug 27 2004 kukuk@suse.de
-- Fix .so symlink
-* Thu Aug 26 2004 nadvornik@suse.cz
-- updated to 10.18.15: many bugfixes, incuding pnmtopng fix [#42868]
-* Thu Mar 18 2004 nadvornik@suse.cz
-- do not pack /usr/bin/doc.url [#36329]
-* Fri Mar 05 2004 nadvornik@suse.cz
-- fixed pbmtextps [#32104]
-- fixed dangerous compiler warnings
-* Mon Jan 26 2004 nadvornik@suse.cz
-- fixed temp files handling [#34036]
-* Sat Jan 10 2004 adrian@suse.de
-- add %%run_ldconfig
-* Thu Sep 18 2003 nadvornik@suse.cz
-- fixed tail/head syntax [#31231]
-* Wed May 28 2003 nadvornik@suse.cz
-- remove unpackaged files from buildroot
-* Thu Feb 13 2003 ro@suse.de
-- fix symlink for libnetpbm.so
-* Tue Feb 11 2003 nadvornik@suse.cz
-- updated to 10.11.4
-* Mon Aug 05 2002 nadvornik@suse.cz
-- removed g3topbm again
-* Mon Jul 29 2002 schwab@suse.de
-- Fix reference to perl in scripts.
-* Sat Jul 27 2002 kukuk@suse.de
-- Create compatibility links for the old libraries to compile
- old sources
-* Sat Jul 27 2002 meissner@suse.de
-- %%_lib fixes, use RPM_OPT_FLAGS and -fPIC
-* Fri Jul 26 2002 adrian@suse.de
-- fix neededforbuild
-* Fri Jul 26 2002 nadvornik@suse.cz
-- updated to 10.5:
- - libraries libpbm, libpgm, libpnm, libppm merged to libnetpbm
- - documentation is in html only
-* Tue May 14 2002 nadvornik@suse.cz
-- fixed usage of the %%{_libdir} macro
-* Tue Feb 26 2002 nadvornik@suse.cz
-- fixed "#!/bin/sh" line in ppmtomap
-* Thu Feb 07 2002 nadvornik@suse.cz
-- updated to 9.24
-* Fri Feb 01 2002 ro@suse.de
-- changed neededforbuild <libpng> to <libpng-devel-packages>
-* Thu Jan 10 2002 nadvornik@suse.cz
-- update to 9.23:
- - bugfix release
-- patched pnmtops to accept -dpi <number>x<number> [bug #12591]
-- used macros %%{_lib} and %%{_libdir}
-* Wed Dec 05 2001 nadvornik@suse.cz
-- update to 9.21:
- - new: pamdeinterlace, pnmquant, ppmtoneo, neotoppm
-* Tue Sep 04 2001 nadvornik@suse.cz
-- removed jbigtopnm and pnmtojbig because of potential patent
- problems [bug #9903]
-- fixed segfault in icontopnm
-* Thu Aug 23 2001 ro@suse.de
-- added pm.h and pm_config.h to INTERFACE_HEADERS
- (pm.h is included by pbm.h and includes pm_config.h)
-* Thu Aug 23 2001 nadvornik@suse.cz
-- update to 9.16
- new: pbmtopsg3 (Postscript G3 fax), pbmtonokia, ppmrainbow
- pamoil (a replacement for pgmoil)
- fixes and updates:
- ppmtogif, ppmtojpeg, xpmtoppm, pnmtopng/pngtopnm,
- giftopnm, ppm3d, tifftopnm, pgmcrater, pnmgamma,
- ppmcie, pnmscale, pnmscalefixed, ppmtoeyuv, eyuvtoppm
- pstopnm
-- removed hpcdtoppm from source, because selling and commercial
- using is prohibited
-* Tue Jun 05 2001 pblaha@suse.cz
-- upgrade on 9.14
-- add documentation and examples for ppmtompeg fix bug #8647
-* Thu Apr 05 2001 pblaha@suse.cz
-- make ln -s pnmtoplainpnm pnmnoraw and ln -s gemtopnm gemtopbm
-* Tue Apr 03 2001 kukuk@suse.de
-- Remove g2topbm again due conficts with g3utils
-* Mon Mar 26 2001 pblaha@suse.cz
-- update on 9.12
-* Wed Mar 14 2001 pblaha@suse.cz
-- remove g3topbm due to conflict with g3utils
-* Wed Mar 07 2001 pblaha@suse.cz
-- update on 9.11
-* Wed Jan 24 2001 pblaha@suse.cz
-- update on 9.10
-* Fri Dec 22 2000 garloff@suse.de
-- Add Provides + Obsoletes: libnetpb.
-- Use some more macros in spec file.
-- bzip2 source.
-* Tue Dec 05 2000 schwab@suse.de
-- Be sure to compile with -fpic.
-* Mon Dec 04 2000 kukuk@suse.de
-- Fix again path to perl
-* Thu Nov 30 2000 pblaha@suse.cz
-- remove g3topbm and pbmtog3 for conflict with g3utils
-* Tue Nov 28 2000 kukuk@suse.de
-- Use /usr/bin/perl
-* Tue Nov 28 2000 pblaha@suse.cz
-- remove hpcdtoppm because conflict with photocd
-* Mon Oct 02 2000 pblaha@suse.cz
-- update to 9.8 and rename libnetpb to libnetpbm
-* Fri Sep 29 2000 ro@suse.de
-- fixed Makefile deps
-* Mon Jul 10 2000 bubnikv@suse.cz
-- fixed pbmtog3 to use fixed width of fax image (standard), added
- switch to allow usage of source image width
-- updated man page of pbmtog3
-- changed URLs of home page and source file
-* Tue Jun 20 2000 nadvornik@suse.cz
-- added shhopt.h, libshhopt.*
-* Fri May 26 2000 bubnikv@suse.cz
-- sorted
-* Fri May 19 2000 nadvornik@suse.cz
-- fixed Imakefile
-* Tue May 16 2000 nadvornik@suse.cz
-- update to 8.4
-- added BuildRoot
-* Fri May 12 2000 schwab@suse.de
-- pbmplus.h: fix linux configuration.
-* Tue Feb 29 2000 kukuk@suse.de
-- Let ldconfig create correct links for shared libraries and add
- them to file list
-* Mon Sep 13 1999 bs@suse.de
-- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Thu Jan 14 1999 ro@suse.de
-- pbmplus.h: don't redeclare write on alpha
-* Wed Jun 17 1998 ro@suse.de
-- patched to build for libc5 and glibc
-* Thu May 14 1998 ro@suse.de
-- added patch to build pbmtosff from Christian Lademann
-* Tue May 12 1998 ro@suse.de
-- extracted package from libgr / build from own sources
++++++ netpbm-10.22-security2.patch ++++++
--- netpbm-10.35.64/converter/other/anytopnm
+++ netpbm-10.35.64/converter/other/anytopnm
@@ -506,11 +506,7 @@
inputFile="-"
fi
-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
-chmod 700 $tempdir
-
-trap 'rm -rf $tempdir' 0
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
# Take out all spaces
# Find the filename extension for last-ditch efforts later
@@ -536,9 +532,17 @@
echo "$progname: unknown file type. " \
"'file' says mime type is '$mimeType', " 1>&2
echo "type description is '$typeDescription'" 1>&2
+ if [ -d "$tempdir" ] ; then
+ rm -rf "$tempdir"
+ fi
+
exit 1
fi
convertIt $file $filetype
+if [ -d "$tempdir" ] ; then
+ rm -rf "$tempdir"
+fi
+
exit 0
--- netpbm-10.35.64/editor/pamstretch-gen
+++ netpbm-10.35.64/editor/pamstretch-gen
@@ -31,10 +31,7 @@
exit 1
fi
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
-chmod 700 $tempdir
-tempfile=$tempdir/pnmig
+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
trap 'rm -rf $tempdir' 0 1 3 15
--- netpbm-10.35.64/editor/pnmmargin
+++ netpbm-10.35.64/editor/pnmmargin
@@ -11,16 +11,11 @@
# documentation. This software is provided "as is" without express or
# implied warranty.
-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
-chmod 700 $tempdir
-
-trap 'rm -rf $tempdir' 0 1 3 15
-
-tmp1=$tempdir/pnmm1
-tmp2=$tempdir/pnmm2
-tmp3=$tempdir/pnmm3
-tmp4=$tempdir/pnmm4
+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
+tmp1="$tmpdir/tmp1"
+tmp2="$tmpdir/tmp2"
+tmp3="$tmpdir/tmp3"
+tmp4="$tmpdir/tmp4"
color="-gofigure"
@@ -39,6 +34,9 @@
shift
if [ ! ${1-""} ] ; then
echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
fi
color="$1"
@@ -46,6 +44,9 @@
;;
-* )
echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
;;
* )
@@ -56,6 +57,9 @@
if [ ! ${1-""} ] ; then
echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
fi
size="$1"
@@ -63,6 +67,9 @@
if [ ${2-""} ] ; then
echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
+ if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+ fi
exit 1
fi
@@ -86,3 +93,7 @@
# Cat things together.
pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
pnmcat -tb $tmp3 $tmp4 $tmp3
+
+if [ -d "$tmpdir" ]; then
+ rm -rf "$tmpdir"
+fi
--- netpbm-10.35.64/editor/ppmfade
+++ netpbm-10.35.64/editor/ppmfade
@@ -14,6 +14,7 @@
#
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
use strict;
+use File::Temp "tempdir";
my $SPREAD = 1;
my $SHIFT = 2;
@@ -118,20 +119,26 @@
print("Frames are " . $width . "W x " . $height . "H\n");
+#
+# We create a tmp-directory right here
+#
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
+
+
if ($first_file eq "undefined") {
print "Fading from black to ";
- system("ppmmake \\#000 $width $height >junk1$$.ppm");
+ system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
} else {
print "Fading from $first_file to ";
- system("cp", $first_file, "junk1$$.ppm");
+ system("cp", $first_file, "$tmpdir/junk1$$.ppm");
}
if ($last_file eq "undefined") {
print "black.\n";
- system("ppmmake \\#000 $width $height >junk2$$.ppm");
+ system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
} else {
print "$last_file\n";
- system("cp", $last_file, "junk2$$.ppm");
+ system("cp", $last_file, "$tmpdir/junk2$$.ppm");
}
#
@@ -139,14 +146,14 @@
#
# Here's what our temporary files are:
-# junk1$$.ppm: The original (fade-from) image
-# junk2$$.ppm: The target (fade-from) image
-# junk3$$.ppm: The frame of the fade for the current iteration of the
-# the for loop.
-# junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-# image to another, this is the first frame of that
-# sequence.
-# junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+# $tmpdir/junk1$$.ppm: The original (fade-from) image
+# $tmpdir/junk2$$.ppm: The target (fade-from) image
+# $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the
+# the for loop.
+# $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+# image to another, this is the first frame of that
+# sequence.
+# $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
my $i; # Frame number
for ($i = 1; $i <= $nframes; $i++) {
@@ -154,148 +161,148 @@
if ($mode eq $SPREAD) {
if ($i <= 10) {
my $n = $spline20[$i] * 100;
- system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n;
$n = $spline20[$i] * 100;
- system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
$n = (1-$spline20[$i-10]) * 100;
- system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
$n = $spline10[$i-10];
- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = (1-$spline20[$i-10])*100;
- system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
}
} elsif ($mode eq $SHIFT) {
if ($i <= 10) {
my $n = $spline20[$i] * 100;
- system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n;
$n = $spline20[$i] * 100;
- system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
$n = (1-$spline20[$i-10])*100;
- system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
$n = $spline10[$i-10];
- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = (1-$spline20[$i-10]) * 100;
- system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
}
} elsif ($mode eq $RELIEF) {
if ($i == 1) {
- system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
+ system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
}
if ($i <= 10) {
my $n = $spline10[$i];
- system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n = $spline10[$i-10];
- system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = $spline10[$i-20];
- system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
}
if ($i == 10) {
- system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
+ system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
}
} elsif ($mode eq $OIL) {
if ($i == 1) {
- system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
- ">junk1o$$.ppm");
+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+ ">$tmpdir/junk1o$$.ppm");
}
if ($i <= 10) {
my $n = $spline10[$i];
- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n = $spline10[$i-10];
- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = $spline10[$i-20];
- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
}
if ($i == 10) {
- system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
- ">junk2o$$.ppm");
+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+ ">$tmpdir/junk2o$$.ppm");
}
} elsif ($mode eq $EDGE) {
if ($i == 1) {
- system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
- ">junk1o$$.ppm");
+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+ ">$tmpdir/junk1o$$.ppm");
}
if ($i <= 10) {
my $n = $spline10[$i];
- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n = $spline10[$i-10];
- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = $spline10[$i-20];
- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
}
if ($i == 10) {
- system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
- ">junk2o$$.ppm");
+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+ ">$tmpdir/junk2o$$.ppm");
}
} elsif ($mode eq $BENTLEY) {
if ($i == 1) {
- system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
- ">junk1o$$.ppm");
+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+ ">$tmpdir/junk1o$$.ppm");
}
if ($i <= 10) {
my $n = $spline10[$i];
- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n = $spline10[$i-10];
- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = $spline10[$i-20];
- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
}
if ($i == 10) {
- system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
- ">junk2o$$.ppm");
+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+ ">$tmpdir/junk2o$$.ppm");
}
} elsif ($mode eq $BLOCK) {
if ($i <= 10) {
my $n = 1 - 1.9*$spline20[$i];
- system("pamscale $n junk1$$.ppm | " .
- "pamscale -width $width -height $height >junk3$$.ppm");
+ system("pamscale $n $tmpdir/junk1$$.ppm | " .
+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
} elsif ($i <= 20) {
my $n = $spline10[$i-10];
- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
} else {
my $n = 1 - 1.9*$spline20[31-$i];
- system("pamscale $n junk2$$.ppm | " .
- "pamscale -width $width -height $height >junk3$$.ppm");
+ system("pamscale $n $tmpdir/junk2$$.ppm | " .
+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
}
if ($i == 10) {
- system("cp", "junk3$$.ppm", "junk1a$$.ppm");
- system("pamscale $n junk2$$.ppm | " .
- "pamscale -width $width -height $height >junk2a$$.ppm");
+ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
+ system("pamscale $n $tmpdir/junk2$$.ppm | " .
+ "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
}
} elsif ($mode eq $MIX) {
my $fade_factor = sqrt(1/($nframes-$i+1));
- system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
+ system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
} else {
print("Internal error: impossible mode value '$mode'\n");
}
my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
- system("cp", "junk3$$.ppm", $outfile);
+ system("cp", "$tmpdir/junk3$$.ppm", $outfile);
}
#
# Clean up shop.
#
-system("rm junk*$$.ppm");
+system("rm $tmpdir/junk*$$.ppm");
exit(0);
--- netpbm-10.35.64/editor/ppmquantall
+++ netpbm-10.35.64/editor/ppmquantall
@@ -70,13 +70,8 @@
heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
done
-tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
-mkdir $tempdir || { echo "Could not create temporary file. Exiting."; exit 1;}
-chmod 700 $tempdir
-
-trap 'rm -rf $tempdir' 0 1 3 15
-
-all=$tempdir/pqa.all.$$
+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
+rm -f $all
pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
if [ $? != 0 ]; then
--- netpbm-10.35.64/editor/ppmshadow
+++ netpbm-10.35.64/editor/ppmshadow
@@ -72,9 +72,10 @@
my $tmpdir = $ENV{TMPDIR} || "/tmp";
-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp, 0777) or
- die("Unable to create directory for temporary files '$ourtmp");
+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {
+ die "Can't create directory for temporary files";
+}
# Process command line options
++++++ netpbm-10.23-security.patch ++++++
++++ 1847 lines (skipped)
++++++ netpbm-10.26.44-colornames-init.diff -> netpbm-10.35.64-colornames-init.diff ++++++
--- netpbm/netpbm-10.26.44-colornames-init.diff 2007-08-10 01:26:02.000000000 +0200
+++ netpbm/netpbm-10.35.64-colornames-init.diff 2009-06-17 16:36:02.000000000 +0200
@@ -1,6 +1,6 @@
---- netpbm-10.26.12/lib/libppmcolor.c
-+++ netpbm-10.26.12/lib/libppmcolor.c
-@@ -450,6 +450,16 @@
+--- netpbm-10.35.64/lib/libppmcolor.c
++++ netpbm-10.35.64/lib/libppmcolor.c
+@@ -536,6 +536,16 @@
fclose(colorFile);
}
++++++ netpbm-10.26.44-documentation.tar.bz2 -> netpbm-10.35.64-documentation.tar.bz2 ++++++
++++ 13462 lines of diff (skipped)
++++++ netpbm-10.26.44-endian.patch -> netpbm-10.35.64-endian.patch ++++++
++++++ netpbm-10.26.44-fixes.patch -> netpbm-10.35.64-fixes.patch ++++++
--- netpbm/netpbm-10.26.44-fixes.patch 2007-08-10 01:26:02.000000000 +0200
+++ netpbm/netpbm-10.35.64-fixes.patch 2009-06-17 16:36:05.000000000 +0200
@@ -1,33 +1,23 @@
--- buildtools/Makefile
+++ buildtools/Makefile
-@@ -33,10 +33,10 @@
- -o $@ $<
+@@ -34,10 +34,10 @@
+ -o $@ $<
typegen.o endiangen.o:%.o:%.c
-- $(CC_FOR_BUILD) -c -o $@ $<
-+ $(CC_FOR_BUILD) $(CFLAGS) -c -o $@ $<
+- $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $<
++ $(CC_FOR_BUILD) $(CFLAGS) -c $(CFLAGS_FOR_BUILD) -o $@ $<
$(PROGS):%:%.o
- $(LD_FOR_BUILD) -o $@ $<
+ $(LD_FOR_BUILD) $(LDFLAGS) -o $@ $<
- clean: cleanlocal
+ distclean clean: cleanlocal
.PHONY: cleanlocal
---- converter/other/fiasco/codec/coeff.c
-+++ converter/other/fiasco/codec/coeff.c
-@@ -14,6 +14,7 @@
- * $State: Exp $
- */
-
-+#include
", r"\n.PP\n", indoc)
+ indoc = re.sub("(?i)</P>", "", indoc)
++ indoc = re.sub("(?i)<!--[^>]*-->", "", indoc)
++ indoc = re.sub("(?i)]*>", "", indoc)
+ lines = indoc.split("\n")
+ listdepth = 0
+ for i in range(len(lines)):
+@@ -131,13 +136,14 @@
+ indoc = re.sub('(?i)]+">([^<]+)</A>', r'\\fI\1\\fP', indoc)
+ # Format manual crossreferences
+ def xrefmatch(match):
+- xrefto = match.group(1)
+- xrefsection = sectmap.get(xrefto, 1)
++ xrefto = match.group(2)
++ xrefurl = match.group(1)
++ xrefsection = sectmap.get(xrefurl, 1)
+ if xrefsection == 0:
+ return "\n.I " + xrefto
+ else:
+- return "\n.BR %s (%d)" % (xrefto, xrefsection)
+- indoc = re.sub(r'(?i)\n* *(?:\\fB)?]+.html">([^<]+)</A>(?:\\fP)?',
++ return "\n.BR %s (%d)\n" % (xrefto, xrefsection)
++ indoc = re.sub(r'(?i)\n* *(?:\\fB)?]+.html)"?>([^<]+)</A>(?:\\fP)?',
+ xrefmatch, indoc)
+ # Format URLs
+ def urlmatch(match):
+@@ -151,7 +157,7 @@
+ indoc = indoc.replace("×", r"\(mu")
+ indoc = indoc.replace("®", r"\*R")
+ # Turn anchors into .UN tags
+- indoc = re.sub('(?i)(?: )*</A>\s*', ".UN \\1\n", indoc)
++ indoc = re.sub('(?i)(?: )*</A>\s*', ".UN \\1\n", indoc)
+ # Strip off the index trailer
+ trailer = re.compile('
.*', re.DOTALL | re.IGNORECASE)
+ indoc = re.sub(trailer, "", indoc)
+@@ -159,17 +165,17 @@
+ indoc = indoc.replace("</BODY>", "").replace("</HTML>", "")
+ indoc = indoc.replace("</body>", "").replace("</html>", "")
+ # Recognize sections with IDs
+- indoc = re.sub('(?i)<H2>([^><]*)</A></H2>',
++ indoc = re.sub('(?i)<H2>([^><]*)</A></H2>',
+ ".UN \\1\n.SH \\2", indoc)
+- indoc = re.sub('(?i)<H3>([^><]*)</A></H3>',
++ indoc = re.sub('(?i)<H3>([^><]*)</A></H3>',
+ ".UN \\1\n.SS \\2", indoc)
+- indoc = re.sub('(?i)<H4>([^><]*)</A></H4>',
++ indoc = re.sub('(?i)<H4>([^><]*)</A></H4>',
+ ".UN \\1\n.B \\2", indoc)
+- indoc = re.sub('(?i)([^><]*)</H2>',
++ indoc = re.sub('(?i)
([^><]*)</H2>',
+ ".UN \\1\n.SH \\2", indoc)
+- indoc = re.sub('(?i)
([^><]*)</H3>',
++ indoc = re.sub('(?i)
([^><]*)</H3>',
+ ".UN \\1\n.SS \\2", indoc)
+- indoc = re.sub('(?i)
([^><]*)</H4>',
++ indoc = re.sub('(?i)
([^><]*)</H4>',
+ ".UN \\1\n.B \\2", indoc)
+ # Sections without IDs
+ indoc = re.sub('(?i)<H2>([^><]*)</H2>', ".SH \\1", indoc)
++++++ netpbm-10.26.44-nohpcdtoppm-nojbig.tar.bz2 -> netpbm-10.35.64-nohpcdtoppm-nojbig.tar.bz2 ++++++
++++ 111639 lines of diff (skipped)
++++++ netpbm-10.26.44-pamscale.patch -> netpbm-10.35.64-pamscale.patch ++++++
--- netpbm/netpbm-10.26.44-pamscale.patch 2008-10-22 18:26:13.000000000 +0200
+++ netpbm/netpbm-10.35.64-pamscale.patch 2009-06-17 16:36:16.000000000 +0200
@@ -1,6 +1,6 @@
--- editor/pamscale.c
+++ editor/pamscale.c
-@@ -599,6 +599,8 @@
+@@ -595,6 +595,8 @@
const char *filterOpt, *window;
unsigned int filterSpec, windowSpec;
++++++ netpbm-10.26.44-pamtouil.patch -> netpbm-10.35.64-pamtouil.patch ++++++
--- netpbm/netpbm-10.26.44-pamtouil.patch 2007-08-10 01:26:02.000000000 +0200
+++ netpbm/netpbm-10.35.64-pamtouil.patch 2009-06-15 17:18:02.000000000 +0200
@@ -1,11 +1,11 @@
--- converter/other/pamtouil.c
+++ converter/other/pamtouil.c
-@@ -94,7 +94,7 @@
+@@ -95,7 +95,7 @@
/* Remove trailing "_icon" */
barPos = strrchr(cmdlineP->outname, '_');
-- if (strcmp(barPos, "_icon") == 0)
-+ if (barPos && strcmp(barPos, "_icon") == 0)
+- if (STREQ(barPos, "_icon"))
++ if (barPos && STREQ(barPos, "_icon"))
*barPos = '\0';
} else {
- if (strcmp(cmdlineP->inputFilespec, "-") == 0)
+ if (STREQ(cmdlineP->inputFilespec, "-"))
++++++ netpbm-10.26.44-pnmtopng-CAN-2005-2978.patch -> netpbm-10.35.64-pnmtopng-CAN-2005-2978.patch ++++++
--- netpbm/netpbm-10.26.44-pnmtopng-CAN-2005-2978.patch 2007-08-10 01:26:03.000000000 +0200
+++ netpbm/netpbm-10.35.64-pnmtopng-CAN-2005-2978.patch 2009-06-17 16:36:17.000000000 +0200
@@ -1,6 +1,6 @@
--- converter/other/pnmtopng.c
+++ converter/other/pnmtopng.c
-@@ -160,7 +160,7 @@
+@@ -521,7 +521,7 @@
unsigned int * const bestMatchP) {
unsigned int paletteIndex;
@@ -8,8 +8,8 @@
+ unsigned int bestIndex = 0;
unsigned int bestMatch;
- bestMatch = UINT_MAX;
-@@ -1578,7 +1578,7 @@
+ assert(paletteSize > 0);
+@@ -2342,7 +2342,7 @@
/* The color part of the color/alpha palette passed to the PNG
compressor
*/
++++++ netpbm-10.26.44-pnmtopng-transparent.patch -> netpbm-10.35.64-pnmtopng-transparent.patch ++++++
--- netpbm/netpbm-10.26.44-pnmtopng-transparent.patch 2007-08-10 01:26:03.000000000 +0200
+++ netpbm/netpbm-10.35.64-pnmtopng-transparent.patch 2009-06-17 16:36:18.000000000 +0200
@@ -1,6 +1,6 @@
--- converter/other/pnmtopng.c
+++ converter/other/pnmtopng.c
-@@ -1328,7 +1328,7 @@
+@@ -1842,7 +1842,7 @@
computePixelWidth(PNM_FORMAT_TYPE(format), pnm_meaningful_bits, alpha,
NULL, &bitsPerPixel);
@@ -9,7 +9,7 @@
/* No palette can beat 1 bit per pixel -- no need to waste time
counting the colors.
*/
-@@ -1351,7 +1351,7 @@
+@@ -1865,7 +1865,7 @@
"colormapped PNG", MAXCOLORS);
} else {
/* There are few enough colors that a palette is possible */
++++++ netpbm-10.26.44-rgb.patch -> netpbm-10.35.64-rgb.patch ++++++
--- netpbm/netpbm-10.26.44-rgb.patch 2007-08-10 01:26:03.000000000 +0200
+++ netpbm/netpbm-10.35.64-rgb.patch 2009-06-15 17:18:10.000000000 +0200
@@ -1,11 +1,11 @@
--- pm_config.in.h
+++ pm_config.in.h
-@@ -99,7 +99,7 @@
+@@ -67,7 +67,7 @@
#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_DB1 "/usr/share/X11/rgb.txt"
- #define RGB_DB2 "/usr/openwin/lib/rgb.txt"
+ #define RGB_DB2 "/usr/share/X11/rgb.txt"
#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
#endif
++++++ netpbm-10.26.44-tmpfile.patch -> netpbm-10.35.64-tmpfile.patch ++++++
--- netpbm/netpbm-10.26.44-tmpfile.patch 2007-08-10 01:26:03.000000000 +0200
+++ netpbm/netpbm-10.35.64-tmpfile.patch 2009-06-17 16:36:20.000000000 +0200
@@ -24,7 +24,7 @@
--- generator/ppmrainbow
+++ generator/ppmrainbow
-@@ -39,7 +39,13 @@
+@@ -47,7 +47,13 @@
push @colorlist, $ARGV[0];
}
@@ -39,7 +39,7 @@
my $widthRemaining;
my $n;
-@@ -71,4 +77,5 @@
+@@ -79,4 +85,5 @@
END {
unlink @outlist if @outlist;
++++++ netpbm-10.26.44-ximtoppm-fixes.patch -> netpbm-10.35.64-ximtoppm-fixes.patch ++++++
--- netpbm/netpbm-10.26.44-ximtoppm-fixes.patch 2007-08-10 01:26:03.000000000 +0200
+++ netpbm/netpbm-10.35.64-ximtoppm-fixes.patch 2009-06-17 16:36:21.000000000 +0200
@@ -1,8 +1,8 @@
--- converter/ppm/ximtoppm.c
+++ converter/ppm/ximtoppm.c
-@@ -56,6 +56,10 @@
- OPTENT3(0, "alphaout", OPT_STRING,
- &cmdlineP->alpha_filename, &alphaoutSpec, 0);
+@@ -54,6 +54,10 @@
+ opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
+ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */
+ opt.opt_table = option_def;
+ opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
++++++ netpbm-10.26.44.dif -> netpbm-10.35.64.dif ++++++
--- netpbm/netpbm-10.26.44.dif 2007-08-10 01:26:03.000000000 +0200
+++ netpbm/netpbm-10.35.64.dif 2009-06-15 17:18:19.000000000 +0200
@@ -1,6 +1,6 @@
--- Makefile.config.in
+++ Makefile.config.in
-@@ -78,7 +78,7 @@
+@@ -108,7 +108,7 @@
#OSF1:
#INSTALL = $(SRCDIR)/buildtools/installosf
#Red Hat Linux:
@@ -9,19 +9,16 @@
# STRIPFLAG is the option you pass to the above install program to make it
# strip unnecessary information out of binaries.
-@@ -218,9 +218,9 @@
- # copy of Pbmtext used 16K less real memory when built with -fpic than
- # when built without. 2001.06.02.
-
--CFLAGS_SHLIB =
-+# CFLAGS_SHLIB =
- # Solaris or SunOS with gcc, and NetBSD:
--#CFLAGS_SHLIB = -fpic
+@@ -283,7 +283,7 @@
+ CFLAGS_SHLIB =
+ # Gcc:
+ #CFLAGS_SHLIB = -fpic
+-#CFLAGS_SHLIB = -fPIC
+CFLAGS_SHLIB = -fPIC
- #CFLAGS_SHLIB = -fPIC
# Sun compiler:
#CFLAGS_SHLIB = -Kpic
-@@ -288,7 +288,7 @@
+ #CFLAGS_SHLIB = -KPIC
+@@ -350,7 +350,7 @@
# The TIFF library. See above. If you want to build the tiff
# converters, you must have the tiff library already installed.
@@ -30,7 +27,7 @@
TIFFHDR_DIR =
#TIFFLIB = libtiff.so
-@@ -318,7 +318,7 @@
+@@ -382,7 +382,7 @@
# JPEG stuff statically linked in, in which case you won't need
# JPEGLIB in order to build the Tiff converters.
@@ -39,18 +36,9 @@
JPEGHDR_DIR =
#JPEGLIB = libjpeg.so
#JPEGHDR_DIR = /usr/include/jpeg
-@@ -342,7 +342,7 @@
- # with names that include a version number, such as libpng10.a and header
- # files in /usr/include/libpng10.
- # option.
--PNGLIB = NONE
-+PNGLIB = libpng.so
- PNGHDR_DIR =
- PNGVER =
- #PNGLIB = libpng$(PNGVER).so
-@@ -359,7 +359,7 @@
- # NONE for the PNG library, it doesn't matter what you specify here --
- # it won't get used.
+@@ -432,7 +432,7 @@
+ #
+ # If you have 'libpng-config' (see above), these are irrelevant.
-ZLIB = NONE
+ZLIB = libz.so
++++++ prepare-src-tarball ++++++
--- /var/tmp/diff_new_pack.T5meuU/_old 2009-07-08 20:57:33.000000000 +0200
+++ /var/tmp/diff_new_pack.T5meuU/_new 2009-07-08 20:57:33.000000000 +0200
@@ -1,15 +1,17 @@
#!/bin/sh -x
#This script is used to create netpbm-$VER-nohpcdtoppm-nojbig.tar.bz2
-#from netpbm-$VER.tgz
-#netpbm-$VER.tgz can be found at http://sourceforge.net/projects/netpbm/
+#from upstream svn, http://sourceforge.net/projects/netpbm/
-VER=10.26.44
rm -rf REMOVE
mkdir REMOVE
cd REMOVE
-tar xzf ../netpbm-$VER.tgz
+svn checkout http://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm
+VER=`echo \`cut -f2 -d= netpbm*/Makefile.version \`|sed -e "s| |.|g"`
+mv netpbm* netpbm-$VER
+
+find . -name ".svn" -exec rm -rf {} \;
cd netpbm*/converter/ppm/hpcdtoppm || exit 1
rm -rf *
@@ -38,8 +40,9 @@
echo clean: >> Makefile
cd ../../../..
-
-
tar cjf ../netpbm-$VER-nohpcdtoppm-nojbig.tar.bz2 *
+wget -m netpbm.sourceforge.net
+rm netpbm.sourceforge.net/bdffont.tgz
+tar cjf ../netpbm-$VER-documentation.tar.bz2 netpbm.sourceforge.net
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org