rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 10.61.01

Browse Source
This commit is contained in:
Jindrich Novy 2013-01-03 06:22:57 +01:00
parent c40fe3e016
commit 333bd7241e
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/netpbm-10.60.05.tar.xz /netpbm-10.61.01.tar.xz

12
netpbm-cmuwtopbm.patch
View File

@ -1,6 +1,6 @@
diff -up netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.47.12/converter/pbm/cmuwmtopbm.c diff -up netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.61.01/converter/pbm/cmuwmtopbm.c
--- netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix 2010-04-27 15:47:14.000000000 +0200 --- netpbm-10.61.01/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix 2013-01-02 18:39:57.000000000 +0100
+++ netpbm-10.47.12/converter/pbm/cmuwmtopbm.c 2010-05-03 15:17:06.081277896 +0200 +++ netpbm-10.61.01/converter/pbm/cmuwmtopbm.c 2013-01-03 05:41:36.024984241 +0100
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
This program does not check the pad bits at the end of each row. This program does not check the pad bits at the end of each row.
*/ */
@ -8,11 +8,11 @@ diff -up netpbm-10.47.12/converter/pbm/cmuwmtopbm.c.cmuwtopbmfix netpbm-10.47.12
- -
+#include <stdint.h> +#include <stdint.h>
#include "pbm.h" #include "pbm.h"
#include "cmuwm.h"
@@ -33,7 +33,7 @@ readCmuwmHeader(FILE * const ifP /*--------------------------
const char * const initReadError = @@ -42,7 +42,7 @@ readCmuwmHeader(FILE * const ifP
"CMU window manager header EOF / read error"; "CMU window manager header EOF / read error";
uint32_t const cmuwmMagic = 0xf10040bb;
- long l; - long l;
+ uint32_t l; + uint32_t l;

9
netpbm-manfix.patch
View File

@ -109,17 +109,18 @@ diff -up netpbm-10.59.03/userguide/pamstereogram.html.manfix netpbm-10.59.03/use
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html> +<html>
<head> <head>
<meta http-equiv="Content-type" content="text/html"> <meta charset="UTF-8">
<title>Pamstereogram User Manual</title> <title>Pamstereogram User Manual</title>
@@ -11,7 +11,7 @@ @@ -11,8 +11,7 @@
<p>Updated: 20 June 2012</p> <p>Updated:30 December 2012</p>
-<p><a href="#contents">Table Of Contents</a></p> -<p><a href="#contents">Table Of Contents</a></p>
-
+<p><a href="#index">Table Of Contents</a></p> +<p><a href="#index">Table Of Contents</a></p>
<h2 id="name">NAME</h2> <h2 id="name">NAME</h2>
diff -up netpbm-10.59.03/userguide/pamtoavs.html.manfix netpbm-10.59.03/userguide/pamtoavs.html diff -up netpbm-10.59.03/userguide/pamtoavs.html.manfix netpbm-10.59.03/userguide/pamtoavs.html
--- netpbm-10.59.03/userguide/pamtoavs.html.manfix 2012-09-22 03:46:15.000000000 +0200 --- netpbm-10.59.03/userguide/pamtoavs.html.manfix 2012-09-22 03:46:15.000000000 +0200
+++ netpbm-10.59.03/userguide/pamtoavs.html 2012-09-25 10:47:22.759174777 +0200 +++ netpbm-10.59.03/userguide/pamtoavs.html 2012-09-25 10:47:22.759174777 +0200

2
netpbm-security-code.patch
View File

@ -1668,7 +1668,7 @@ diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanar
+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com> + * 2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
*/ */
#include "rle.h" #include <stdio.h>
@@ -63,8 +65,8 @@ typedef int *ptr; @@ -63,8 +65,8 @@ typedef int *ptr;
/* /*
* Storage allocation macros * Storage allocation macros

6
netpbm.spec
View File

@ -1,6 +1,6 @@
Summary: A library for handling different graphics file formats Summary: A library for handling different graphics file formats
Name: netpbm Name: netpbm
Version: 10.60.05 Version: 10.61.01
Release: 1%{?dist} Release: 1%{?dist}
# See copyright_summary for details # See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain License: BSD and GPLv2 and IJG and MIT and Public Domain
@ -256,6 +256,10 @@ rm -rf $RPM_BUILD_ROOT
%doc userguide/* %doc userguide/*
%changelog %changelog
* Thu Jan 03 2013 Jindrich Novy <jnovy@redhat.com> 10.61.01-1
- update to 10.61.01
- sync patches
* Fri Dec 14 2012 Jindrich Novy <jnovy@redhat.com> 10.60.05-1 * Fri Dec 14 2012 Jindrich Novy <jnovy@redhat.com> 10.60.05-1
- update to 10.60.05 - update to 10.60.05
- fixes pngtopam and ppmpat - fixes pngtopam and ppmpat

2
sources
View File

@ -1 +1 @@
9da2866e8591f21ecb35041656bd5c6b netpbm-10.60.05.tar.xz aeb9375f0c8a17451804ca0f47149107 netpbm-10.61.01.tar.xz