rpms/netpbm/F-12 .cvsignore, 1.60, 1.61 netpbm-security-scripts.patch, 1.1, 1.2 netpbm.spec, 1.149, 1.150 sources, 1.64, 1.65 netpbm-pamtosvg.patch, 1.1, NONE netpbm-pnmdepth.patch, 1.1, NONE netpbm-pnmsmooth-segfault.patch, 1.1, NONE
Jindrich Novy
jnovy at fedoraproject.org
Mon Jan 4 13:01:28 UTC 2010
Author: jnovy
Update of /cvs/pkgs/rpms/netpbm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5086
Modified Files:
.cvsignore netpbm-security-scripts.patch netpbm.spec sources
Removed Files:
netpbm-pamtosvg.patch netpbm-pnmdepth.patch
netpbm-pnmsmooth-segfault.patch
Log Message:
* Wed Dec 30 2009 Jindrich Novy <jnovy at redhat.com> 10.47.07-1
- update to 10.47.07
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore 10 Dec 2009 10:34:09 -0000 1.60
+++ .cvsignore 4 Jan 2010 13:01:27 -0000 1.61
@@ -1 +1 @@
-netpbm-10.47.05.tar.xz
+netpbm-10.47.07.tar.xz
netpbm-security-scripts.patch:
converter/other/anytopnm | 13 +++-
editor/pamstretch-gen | 4 -
editor/pnmmargin | 20 ++----
editor/ppmfade | 137 ++++++++++++++++++++++++-----------------------
editor/ppmquantall | 8 --
editor/ppmshadow | 7 +-
6 files changed, 95 insertions(+), 94 deletions(-)
Index: netpbm-security-scripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/netpbm-security-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-security-scripts.patch 21 Oct 2009 16:06:19 -0000 1.1
+++ netpbm-security-scripts.patch 4 Jan 2010 13:01:28 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up netpbm-10.47.04/converter/other/anytopnm.security2 netpbm-10.47.04/converter/other/anytopnm
---- netpbm-10.47.04/converter/other/anytopnm.security2 2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/anytopnm 2009-10-21 14:51:49.000000000 +0200
+diff -up netpbm-10.47.06/converter/other/anytopnm.security-scripts netpbm-10.47.06/converter/other/anytopnm
+--- netpbm-10.47.06/converter/other/anytopnm.security-scripts 2009-12-13 20:27:05.000000000 +0100
++++ netpbm-10.47.06/converter/other/anytopnm 2009-12-16 18:59:17.000000000 +0100
@@ -510,10 +510,7 @@ else
inputFile="-"
fi
@@ -31,9 +31,9 @@ diff -up netpbm-10.47.04/converter/other
+fi
+
exit 0
-diff -up netpbm-10.47.04/editor/pamstretch-gen.security2 netpbm-10.47.04/editor/pamstretch-gen
---- netpbm-10.47.04/editor/pamstretch-gen.security2 2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pamstretch-gen 2009-10-21 14:53:28.000000000 +0200
+diff -up netpbm-10.47.06/editor/pamstretch-gen.security-scripts netpbm-10.47.06/editor/pamstretch-gen
+--- netpbm-10.47.06/editor/pamstretch-gen.security-scripts 2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/pamstretch-gen 2009-12-16 18:59:17.000000000 +0100
@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
exit 1
fi
@@ -45,9 +45,9 @@ diff -up netpbm-10.47.04/editor/pamstret
trap 'rm -rf $tempdir' 0 1 3 15
tempfile=$tempdir/pnmig
-diff -up netpbm-10.47.04/editor/pnmmargin.security2 netpbm-10.47.04/editor/pnmmargin
---- netpbm-10.47.04/editor/pnmmargin.security2 2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmmargin 2009-10-21 14:55:40.000000000 +0200
+diff -up netpbm-10.47.06/editor/pnmmargin.security-scripts netpbm-10.47.06/editor/pnmmargin
+--- netpbm-10.47.06/editor/pnmmargin.security-scripts 2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/pnmmargin 2009-12-16 19:04:05.000000000 +0100
@@ -11,15 +11,11 @@
# documentation. This software is provided "as is" without express or
# implied warranty.
@@ -69,59 +69,26 @@ diff -up netpbm-10.47.04/editor/pnmmargi
color="-gofigure"
plainopt=""
-@@ -43,6 +39,9 @@ while true ; do
- 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"
-@@ -50,6 +49,9 @@ while true ; do
- ;;
- -* )
- echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
-+ if [ -d "$tmpdir" ]; then
-+ rm -rf "$tmpdir"
-+ fi
- exit 1
- ;;
- * )
-@@ -60,6 +62,9 @@ done
-
- 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"
-@@ -67,6 +72,9 @@ shift
-
- 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
-
-@@ -103,6 +111,6 @@ else
+@@ -90,6 +86,7 @@ else
+ -white | -black )
+ pnmpad $plainopt $color \
+ -left=$size -right=$size -top=$size -bottom=$size $tmp1
++ rm -rf "$tmpdir"
+ exit
+ ;;
+ * )
+@@ -102,7 +99,4 @@ else
+ pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
fi
-
-
-
-
-+if [ -d "$tmpdir" ]; then
-+ rm -rf "$tmpdir"
-+fi
-diff -up netpbm-10.47.04/editor/ppmfade.security2 netpbm-10.47.04/editor/ppmfade
---- netpbm-10.47.04/editor/ppmfade.security2 2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmfade 2009-10-21 15:03:01.000000000 +0200
+-
++rm -rf "$tmpdir"
+diff -up netpbm-10.47.06/editor/ppmfade.security-scripts netpbm-10.47.06/editor/ppmfade
+--- netpbm-10.47.06/editor/ppmfade.security-scripts 2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/ppmfade 2009-12-16 18:59:17.000000000 +0100
@@ -14,6 +14,7 @@
#
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -385,9 +352,9 @@ diff -up netpbm-10.47.04/editor/ppmfade.
+system("rm $tmpdir/junk*$$.ppm");
exit(0);
-diff -up netpbm-10.47.04/editor/ppmquantall.security2 netpbm-10.47.04/editor/ppmquantall
---- netpbm-10.47.04/editor/ppmquantall.security2 2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmquantall 2009-10-21 14:52:38.000000000 +0200
+diff -up netpbm-10.47.06/editor/ppmquantall.security-scripts netpbm-10.47.06/editor/ppmquantall
+--- netpbm-10.47.06/editor/ppmquantall.security-scripts 2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/ppmquantall 2009-12-16 18:59:17.000000000 +0100
@@ -70,12 +70,8 @@ for i in ${files[@]}; do
heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
done
@@ -403,9 +370,9 @@ diff -up netpbm-10.47.04/editor/ppmquant
pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
if [ $? != 0 ]; then
-diff -up netpbm-10.47.04/editor/ppmshadow.security2 netpbm-10.47.04/editor/ppmshadow
---- netpbm-10.47.04/editor/ppmshadow.security2 2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/ppmshadow 2009-10-21 14:51:02.000000000 +0200
+diff -up netpbm-10.47.06/editor/ppmshadow.security-scripts netpbm-10.47.06/editor/ppmshadow
+--- netpbm-10.47.06/editor/ppmshadow.security-scripts 2009-12-13 20:26:58.000000000 +0100
++++ netpbm-10.47.06/editor/ppmshadow 2009-12-16 18:59:17.000000000 +0100
@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/netpbm.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- netpbm.spec 10 Dec 2009 10:34:09 -0000 1.149
+++ netpbm.spec 4 Jan 2010 13:01:28 -0000 1.150
@@ -1,6 +1,6 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.47.05
+Version: 10.47.07
Release: 1%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -27,8 +27,6 @@ Patch13: netpbm-glibc.patch
Patch14: netpbm-pnmtofiasco-stdin.patch
Patch15: netpbm-svgtopam.patch
Patch16: netpbm-ppmpat-segfault.patch
-Patch17: netpbm-pnmsmooth-segfault.patch
-Patch18: netpbm-pamtosvg.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel
@@ -86,8 +84,6 @@ netpbm-progs. You'll also need to insta
%patch14 -p1 -b .pnmtofiasco-stdin
%patch15 -p1 -b .svgtopam
%patch16 -p1 -b .ppmpat-segfault
-%patch17 -p1 -b .pnmsmooth-segfault
-%patch18 -p1 -b .pamtosvg
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
@@ -216,6 +212,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpbm/
%changelog
+* Wed Dec 30 2009 Jindrich Novy <jnovy at redhat.com> 10.47.07-1
+- update to 10.47.07
+
+* Fri Dec 14 2009 Jindrich Novy <jnovy at redhat.com> 10.47.06-1
+- update to 10.47.06 - fixes the dumb pamtosvg mistake in 10.47.05
+- pnmmargin won't create leftovers in /tmp (#547888)
+
* Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 10.47.05-1
- update to 10.47.05
- fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow
@@ -230,7 +233,9 @@ rm -rf $RPM_BUILD_ROOT
* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
- update to 10.47.04 (it is now stable) (#529525)
-- fixes #502917, #482850, #482847
+
+* Fri Oct 9 2009 Jindrich Novy <jnovy at redhat.com> 10.35.68-1
+- update to 10.35.68
* Fri Sep 4 2009 Jindrich Novy <jnovy at redhat.com> 10.35.67-1
- update to 10.35.67
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources 10 Dec 2009 10:34:09 -0000 1.64
+++ sources 4 Jan 2010 13:01:28 -0000 1.65
@@ -1 +1 @@
-b3076d696dff3673d66412d111356141 netpbm-10.47.05.tar.xz
+46d9573f83715692f9b0dfb84fcd0e7c netpbm-10.47.07.tar.xz
--- netpbm-pamtosvg.patch DELETED ---
--- netpbm-pnmdepth.patch DELETED ---
--- netpbm-pnmsmooth-segfault.patch DELETED ---
More information about the fedora-extras-commits
mailing list