[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Sunday, September 27, 2020 @ 17:54:58
Author: arojas
Revision: 396808
Update to 10.73.33
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-27 17:42:14 UTC (rev 396807)
+++ PKGBUILD2020-09-27 17:54:58 UTC (rev 396808)
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73.32
+pkgver=10.73.33
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
@@ -15,7 +15,7 @@
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch
reproducible-man-gzip.patch use-source-date-epoch.patch)
-sha256sums=('a79b86a9ff28bac4fa46688a6cb6e537be0129d23fc74ec71a941b0791679942'
+sha256sums=('e370c3593c3a2a38edd7181c1ebfc40f03dba6ade915ad46ca5d4eb46c3e381a'
'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
'SKIP'
'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
[arch-commits] Commit in netpbm/trunk (PKGBUILD netpbm-security-code.patch)
Date: Sunday, July 5, 2020 @ 10:15:52
Author: arojas
Revision: 390854
Update to 10.73.32
Modified:
netpbm/trunk/PKGBUILD
netpbm/trunk/netpbm-security-code.patch
+
PKGBUILD |8
netpbm-security-code.patch | 24
2 files changed, 4 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-05 09:41:39 UTC (rev 390853)
+++ PKGBUILD2020-07-05 10:15:52 UTC (rev 390854)
@@ -1,8 +1,8 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73.31
-pkgrel=3
+pkgver=10.73.32
+pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -15,11 +15,11 @@
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch
reproducible-man-gzip.patch use-source-date-epoch.patch)
-sha256sums=('584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b'
+sha256sums=('a79b86a9ff28bac4fa46688a6cb6e537be0129d23fc74ec71a941b0791679942'
'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
'SKIP'
'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
-'d39951cf96db6b3f430edef6fddcab5ef082db49968f09eb1c3e891205bcdb5f'
+'83d75a80ce999d8b69572e54f04c4d220c60b0d09f9e52d3236264535c3bf216'
'2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33'
'8e3efdb4fcbfdc8e9a5c8e9663c7d6b9ecef3a2379ce38d2acc5669c339f6814'
'68055341833f482c6910a56c2fdfe046978a1a92fd8442a2a9209c82ce3e4d13')
Modified: netpbm-security-code.patch
===
--- netpbm-security-code.patch 2020-07-05 09:41:39 UTC (rev 390853)
+++ netpbm-security-code.patch 2020-07-05 10:15:52 UTC (rev 390854)
@@ -843,30 +843,6 @@
index ce5e639..a39b689 100644
--- a/converter/ppm/ximtoppm.c
+++ b/converter/ppm/ximtoppm.c
-@@ -117,6 +117,7 @@ ReadXimHeader(FILE * const in_fp,
- header->bits_channel = atoi(a_head.bits_per_channel);
- header->alpha_flag = atoi(a_head.alpha_channel);
- if (strlen(a_head.author)) {
-+overflow_add(strlen(a_head.author),1);
- if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
- 1))) {
- pm_message("ReadXimHeader: can't calloc author string" );
-@@ -126,6 +127,7 @@ ReadXimHeader(FILE * const in_fp,
- strncpy(header->author, a_head.author, strlen(a_head.author));
- }
- if (strlen(a_head.date)) {
-+overflow_add(strlen(a_head.date),1);
- if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
- pm_message("ReadXimHeader: can't calloc date string" );
- return(0);
-@@ -134,6 +136,7 @@ ReadXimHeader(FILE * const in_fp,
- strncpy(header->date, a_head.date, strlen(a_head.date));
- }
- if (strlen(a_head.program)) {
-+overflow_add(strlen(a_head.program),1);
- if (!(header->program = calloc(
- (unsigned int)strlen(a_head.program) + 1, 1))) {
- pm_message("ReadXimHeader: can't calloc program string" );
@@ -160,6 +163,7 @@ ReadXimHeader(FILE * const in_fp,
if (header->nchannels == 3 && header->bits_channel == 8)
header->ncolors = 0;
[arch-commits] Commit in netpbm/trunk (PKGBUILD use-source-date-epoch.patch)
Date: Saturday, May 30, 2020 @ 16:11:30
Author: jelle
Revision: 387916
Make netpbm really reproducible by fixing timestamps
Added:
netpbm/trunk/use-source-date-epoch.patch
Modified:
netpbm/trunk/PKGBUILD
-+
PKGBUILD|8 +---
use-source-date-epoch.patch | 13 +
2 files changed, 18 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-30 15:06:22 UTC (rev 387915)
+++ PKGBUILD2020-05-30 16:11:30 UTC (rev 387916)
@@ -2,7 +2,7 @@
pkgname=netpbm
pkgver=10.73.31
-pkgrel=2
+pkgrel=3
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -14,7 +14,7 @@
source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch
-reproducible-man-gzip.patch)
+reproducible-man-gzip.patch use-source-date-epoch.patch)
sha256sums=('584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b'
'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
'SKIP'
@@ -21,7 +21,8 @@
'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
'd39951cf96db6b3f430edef6fddcab5ef082db49968f09eb1c3e891205bcdb5f'
'2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33'
-'8e3efdb4fcbfdc8e9a5c8e9663c7d6b9ecef3a2379ce38d2acc5669c339f6814')
+'8e3efdb4fcbfdc8e9a5c8e9663c7d6b9ecef3a2379ce38d2acc5669c339f6814'
+'68055341833f482c6910a56c2fdfe046978a1a92fd8442a2a9209c82ce3e4d13')
validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
prepare() {
@@ -31,6 +32,7 @@
patch -p1 < ../netpbm-security-code.patch
patch -p1 < ../netpbm-security-scripts.patch
patch -p1 < ../reproducible-man-gzip.patch
+ patch -p1 < ../use-source-date-epoch.patch
sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman
sed -i 's|@python|@python2|' buildtools/manpage.mk
Added: use-source-date-epoch.patch
===
--- use-source-date-epoch.patch (rev 0)
+++ use-source-date-epoch.patch 2020-05-30 16:11:30 UTC (rev 387916)
@@ -0,0 +1,13 @@
+Only in netpbm-10.73.31/buildtools/: depend.mk
+diff -aur netpbm-10.73.31.old/buildtools/stamp-date
netpbm-10.73.31/buildtools/stamp-date
+--- netpbm-10.73.31.old/buildtools/stamp-date 2020-05-30 17:34:29.833395465
+0200
netpbm-10.73.31/buildtools/stamp-date 2020-05-30 17:48:52.910091897
+0200
+@@ -9,7 +9,7 @@
+ # documentation. This software is provided "as is" without express or
+ # implied warranty.
+ #
+-DATE=$(date)
++DATE="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}")"
+ LOGNAME_OR_UNKNOWN=${LOGNAME:-UNKNOWN}
+ USER=${USER:-$LOGNAME_OR_UNKNOWN}
+ if [ "$USER" = "UNKNOWN" ]; then
[arch-commits] Commit in netpbm/trunk (PKGBUILD reproducible-man-gzip.patch)
Date: Thursday, May 28, 2020 @ 16:54:28
Author: jelle
Revision: 387775
Make netpbm reproducible by hiding gzip timestamps
Added:
netpbm/trunk/reproducible-man-gzip.patch
Modified:
netpbm/trunk/PKGBUILD
-+
PKGBUILD|9 ++---
reproducible-man-gzip.patch | 16
2 files changed, 22 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-28 16:36:57 UTC (rev 387774)
+++ PKGBUILD2020-05-28 16:54:28 UTC (rev 387775)
@@ -2,7 +2,7 @@
pkgname=netpbm
pkgver=10.73.31
-pkgrel=1
+pkgrel=2
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -13,13 +13,15 @@
# Get docs with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
-netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch)
+netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch
+reproducible-man-gzip.patch)
sha256sums=('584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b'
'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
'SKIP'
'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
'd39951cf96db6b3f430edef6fddcab5ef082db49968f09eb1c3e891205bcdb5f'
-'2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33')
+'2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33'
+'8e3efdb4fcbfdc8e9a5c8e9663c7d6b9ecef3a2379ce38d2acc5669c339f6814')
validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
prepare() {
@@ -28,6 +30,7 @@
patch -p1 < ../netpbm-CAN-2005-2471.patch
patch -p1 < ../netpbm-security-code.patch
patch -p1 < ../netpbm-security-scripts.patch
+ patch -p1 < ../reproducible-man-gzip.patch
sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman
sed -i 's|@python|@python2|' buildtools/manpage.mk
Added: reproducible-man-gzip.patch
===
--- reproducible-man-gzip.patch (rev 0)
+++ reproducible-man-gzip.patch 2020-05-28 16:54:28 UTC (rev 387775)
@@ -0,0 +1,16 @@
+diff -aur netpbm-10.73.31.old/buildtools/manpage.mk
netpbm-10.73.31/buildtools/manpage.mk
+--- netpbm-10.73.31.old/buildtools/manpage.mk 2020-05-28 18:41:20.400790506
+0200
netpbm-10.73.31/buildtools/manpage.mk 2020-05-28 18:50:50.444143414
+0200
+@@ -388,9 +388,9 @@
+ # This will install the generated man pages
+ installman:
+ set -x
+- for f in netpbm.1 $(MAN1); do if [ -f $$f ]; then gzip <$$f
>$(MANDIR)/man1/$$f.gz; fi; done
+- for f in $(MAN3); do if [ -f $$f ]; then gzip <$$f
>$(MANDIR)/man3/$$f.gz; fi; done
+- for f in $(MAN5); do if [ -f $$f ]; then gzip <$$f
>$(MANDIR)/man5/$$f.gz; fi; done
++ for f in netpbm.1 $(MAN1); do if [ -f $$f ]; then gzip -n <$$f
>$(MANDIR)/man1/$$f.gz; fi; done
++ for f in $(MAN3); do if [ -f $$f ]; then gzip -n <$$f
>$(MANDIR)/man3/$$f.gz; fi; done
++ for f in $(MAN5); do if [ -f $$f ]; then gzip -n <$$f
>$(MANDIR)/man5/$$f.gz; fi; done
+
+ # This will uninstall them
+ uninstallman:
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Thursday, March 26, 2020 @ 09:19:43
Author: arojas
Revision: 378504
Update to 10.73.31
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-03-26 08:50:57 UTC (rev 378503)
+++ PKGBUILD2020-03-26 09:19:43 UTC (rev 378504)
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73.30
+pkgver=10.73.31
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
@@ -14,7 +14,7 @@
source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch)
-sha256sums=('623b6829464eb6037ec65a14d952bcb8d6c835b7bc7f22de617ab4e3b8c4'
+sha256sums=('584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b'
'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
'SKIP'
'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Sunday, January 26, 2020 @ 10:36:45
Author: arojas
Revision: 373947
Update to 10.73.30
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-26 10:26:04 UTC (rev 373946)
+++ PKGBUILD2020-01-26 10:36:45 UTC (rev 373947)
@@ -1,8 +1,7 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73.28
-_rev=r3413
+pkgver=10.73.30
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
@@ -15,7 +14,7 @@
source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch)
-sha256sums=('c0d32d4b9a53fde47dd9a36f45653e0ef51f6c390517f10b0c5056d1a8a844bd'
+sha256sums=('623b6829464eb6037ec65a14d952bcb8d6c835b7bc7f22de617ab4e3b8c4'
'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
'SKIP'
'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
[arch-commits] Commit in netpbm/trunk (PKGBUILD netpbm-CAN-2005-2471.patch)
Date: Wednesday, July 24, 2019 @ 18:08:03
Author: arojas
Revision: 358549
Update to 10.73.28
Modified:
netpbm/trunk/PKGBUILD
netpbm/trunk/netpbm-CAN-2005-2471.patch
+
PKGBUILD | 32
netpbm-CAN-2005-2471.patch |8
2 files changed, 20 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-24 17:13:22 UTC (rev 358548)
+++ PKGBUILD2019-07-24 18:08:03 UTC (rev 358549)
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73.22
+pkgver=10.73.28
_rev=r3413
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
@@ -12,19 +12,19 @@
makedepends=('python2' 'jbigkit' 'subversion')
options=('!makeflags')
# Get docs with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
-source=(svn://svn.code.sf.net/p/netpbm/code/stable#revision=$_rev
+source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch)
-sha1sums=('SKIP'
- '25a58975bd8cd383238b4ae31f4405c60914faac'
- 'SKIP'
- 'b79cf9d42488fea065ba16262ed97694c47af08d'
- '60088182b44ed2f10914413f7c95841a71a594fe'
- 'ca61aabdeb24a6421781ca975719ce7314be2bb9')
+sha256sums=('c0d32d4b9a53fde47dd9a36f45653e0ef51f6c390517f10b0c5056d1a8a844bd'
+'74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
+'SKIP'
+'991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
+'d39951cf96db6b3f430edef6fddcab5ef082db49968f09eb1c3e891205bcdb5f'
+'2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33')
validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
prepare() {
- cd stable
+ cd $pkgname-$pkgver
patch -p1 < ../netpbm-CAN-2005-2471.patch
patch -p1 < ../netpbm-security-code.patch
@@ -47,27 +47,27 @@
}
build() {
- cd stable
+ cd $pkgname-$pkgver
make
# Generating useful man pages with html doc
- make MAKEMAN="${srcdir}/stable/buildtools/makeman" USERGUIDE=. \
--C ../doc -f "${srcdir}/stable/buildtools/manpage.mk" manpages
+ make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" USERGUIDE=. \
+-C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" manpages
}
package() {
- cd stable
+ cd $pkgname-$pkgver
make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
# Removing dummy man pages
rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
- make MAKEMAN="${srcdir}/stable/buildtools/makeman"
MANDIR="${pkgdir}/usr/share/man" \
--C ../doc -f "${srcdir}/stable/buildtools/manpage.mk" installman
+ make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman"
MANDIR="${pkgdir}/usr/share/man" \
+-C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" installman
# Replace obsolete utility
echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' >
"${pkgdir}/usr/bin/pgmtopbm"
# Licensing. Note that each program in the package has a separate license.
- install -D -m644 "${srcdir}/stable/doc/copyright_summary" \
+ install -D -m644 "${srcdir}/$pkgname-$pkgver/doc/copyright_summary" \
"${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
}
Modified: netpbm-CAN-2005-2471.patch
===
--- netpbm-CAN-2005-2471.patch 2019-07-24 17:13:22 UTC (rev 358548)
+++ netpbm-CAN-2005-2471.patch 2019-07-24 18:08:03 UTC (rev 358549)
@@ -1,6 +1,6 @@
--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15
02:39:46.0 +0200
+++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.0
+0200
-@@ -711,11 +711,11 @@
+@@ -818,11 +818,11 @@
ghostscriptProg, arg0,
deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
"-q", "-dNOPAUSE",
@@ -8,9 +8,9 @@
+ "-dPARANOIDSAFER", "-");
}
- execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
-- "-dNOPAUSE", "-dSAFER", "-", NULL);
-+ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
+ execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt,
+-textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL);
++ textalphabitsopt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
ghostscriptProg, errno, strerror(errno));
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Saturday, November 17, 2018 @ 12:48:31
Author: jelle
Revision: 340028
upgpkg: netpbm 10.73.22-1
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-11-17 12:34:55 UTC (rev 340027)
+++ PKGBUILD2018-11-17 12:48:31 UTC (rev 340028)
@@ -1,8 +1,8 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73.18
-_rev=r3154
+pkgver=10.73.22
+_rev=r3413
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Friday, March 23, 2018 @ 17:26:40
Author: jelle
Revision: 319864
upgpkg: netpbm 10.73.18-1
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-23 15:34:37 UTC (rev 319863)
+++ PKGBUILD2018-03-23 17:26:40 UTC (rev 319864)
@@ -2,8 +2,8 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.73
-_rev=r2692
+pkgver=10.73.18
+_rev=r3154
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('x86_64')
[arch-commits] Commit in netpbm/trunk (PKGBUILD netpbm-security-code.patch)
Date: Thursday, January 8, 2015 @ 19:26:57
Author: eric
Revision: 228758
upgpkg: netpbm 10.69.02-1
Upstream update
Modified:
netpbm/trunk/PKGBUILD
netpbm/trunk/netpbm-security-code.patch
+
PKGBUILD |7 ---
netpbm-security-code.patch | 16 ++--
2 files changed, 6 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-08 17:28:13 UTC (rev 228757)
+++ PKGBUILD2015-01-08 18:26:57 UTC (rev 228758)
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.67.00
+pkgver=10.69.02
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
@@ -9,7 +9,7 @@
license=('custom' 'BSD' 'GPL' 'LGPL')
url="http://netpbm.sourceforge.net/";
depends=('perl' 'libpng' 'libtiff' 'libxml2')
-makedepends=('python2' 'jbigkit')
+makedepends=('python2' 'jbigkit' 'subversion')
options=('!makeflags')
# Get docs with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
source=(svn://svn.code.sf.net/p/netpbm/code/advanced
@@ -19,8 +19,9 @@
'25a58975bd8cd383238b4ae31f4405c60914faac'
'SKIP'
'b79cf9d42488fea065ba16262ed97694c47af08d'
- '4e9d91516d79d2099ba4bd47434e6bb12c52bcc4'
+ '313e040ea74eb73675aa420b6f54e1f4452c4769'
'c67a63c010353de3ecac3ad72ba76bbb85e4ed4c')
+validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
pkgver() {
cd advanced
Modified: netpbm-security-code.patch
===
--- netpbm-security-code.patch 2015-01-08 17:28:13 UTC (rev 228757)
+++ netpbm-security-code.patch 2015-01-08 18:26:57 UTC (rev 228758)
@@ -768,9 +768,9 @@
/* Finally, write out the data. */
+overflow_add(cols/MAX_COUNT, 1);
+overflow_add(cols, cols/MAX_COUNT+1);
- packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
+ outBuf = malloc((unsigned)(cols+cols/MAX_COUNT+1));
for (row = 0, oc = 0; row < rows; row++)
- oc += putRow(stdout, row, cols, pixels[row], packed);
+ unsigned int rowSize;
diff -up netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code
netpbm-10.58.01/converter/ppm/ppmtopj.c
--- netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code 2012-04-09
15:31:44.0 +0200
+++ netpbm-10.58.01/converter/ppm/ppmtopj.c2012-04-09 15:40:03.212619677
+0200
@@ -1145,18 +1145,6 @@
hmargin = 2 * fontP->maxwidth;
}
}
-diff -up netpbm-10.58.01/generator/pgmcrater.c.security-code
netpbm-10.58.01/generator/pgmcrater.c
netpbm-10.58.01/generator/pgmcrater.c.security-code2012-04-09
15:31:34.0 +0200
-+++ netpbm-10.58.01/generator/pgmcrater.c 2012-04-09 15:40:03.226619502
+0200
-@@ -130,7 +130,7 @@ static void gencraters()
- /* Acquire the elevation array and initialize it to mean
-surface elevation. */
-
--MALLOCARRAY(aux, SCRX * SCRY);
-+aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
- if (aux == NULL)
- pm_error("out of memory allocating elevation array");
-
diff -up netpbm-10.58.01/lib/libpam.c.security-code
netpbm-10.58.01/lib/libpam.c
--- netpbm-10.58.01/lib/libpam.c.security-code 2012-04-09 15:31:38.0
+0200
+++ netpbm-10.58.01/lib/libpam.c 2012-04-09 15:40:03.227619490 +0200
[arch-commits] Commit in netpbm/trunk (PKGBUILD netpbm-security-code.patch)
Date: Wednesday, July 9, 2014 @ 04:03:52
Author: eric
Revision: 216733
upgpkg: netpbm 10.67.00-1
Upstream update, Update patch, Simplify PKGBUILD maintenance, Add jbigkit
makedepends
Modified:
netpbm/trunk/PKGBUILD
netpbm/trunk/netpbm-security-code.patch
+
PKGBUILD | 26 ++
netpbm-security-code.patch | 76 ---
2 files changed, 48 insertions(+), 54 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-08 19:24:37 UTC (rev 216732)
+++ PKGBUILD2014-07-09 02:03:52 UTC (rev 216733)
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=netpbm
-pkgver=10.66.03
+pkgver=10.67.00
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
@@ -9,27 +9,22 @@
license=('custom' 'BSD' 'GPL' 'LGPL')
url="http://netpbm.sourceforge.net/";
depends=('perl' 'libpng' 'libtiff' 'libxml2')
-makedepends=('python2')
+makedepends=('python2' 'jbigkit')
options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.xz{,.sig}
\
-
ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
\
+# Get docs with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
+source=(svn://svn.code.sf.net/p/netpbm/code/advanced
+
ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
netpbm-CAN-2005-2471.patch netpbm-security-code.patch
netpbm-security-scripts.patch)
-sha1sums=('b396dfde402b6979a8b551cf60ba1030278a233d'
- 'SKIP'
+sha1sums=('SKIP'
'25a58975bd8cd383238b4ae31f4405c60914faac'
'SKIP'
'b79cf9d42488fea065ba16262ed97694c47af08d'
- '4213468c44a63c0575896f6781987a09cfcc2d30'
+ '4e9d91516d79d2099ba4bd47434e6bb12c52bcc4'
'c67a63c010353de3ecac3ad72ba76bbb85e4ed4c')
-# source PKGBUILD && mksource
-mksource() {
-# Get docs with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
- svn checkout svn://svn.code.sf.net/p/netpbm/code/advanced advanced
- _pkgver=$(grep MAJOR advanced/version.mk |cut -d ' ' -f 3).$(grep MINOR
advanced/version.mk |cut -d ' ' -f 3).0$(grep POINT advanced/version.mk |cut -d
' ' -f 3)
- tar -cf ${pkgname}-${_pkgver}.tar.xz advanced
- gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.xz
- rm -r advanced
+pkgver() {
+ cd advanced
+ echo $(grep MAJOR version.mk |cut -d ' ' -f 3).$(grep MINOR version.mk |cut
-d ' ' -f 3).0$(grep POINT version.mk |cut -d ' ' -f 3)
}
prepare() {
@@ -48,6 +43,7 @@
echo 'JPEGLIB = libjpeg.so' >> config.mk
echo 'PNGLIB = libpng.so' >> config.mk
echo 'ZLIB = libz.so' >> config.mk
+ echo 'JBIGLIB = /usr/lib/libjbig.a' >> config.mk
sed -i 's|misc|share/netpbm|' common.mk
sed -i 's|/link|/lib|' lib/Makefile
Modified: netpbm-security-code.patch
===
--- netpbm-security-code.patch 2014-07-08 19:24:37 UTC (rev 216732)
+++ netpbm-security-code.patch 2014-07-09 02:03:52 UTC (rev 216733)
@@ -151,26 +151,6 @@
*/
/*
* pnmtorle - A program which will convert pbmplus (ppm or pgm) images
-diff -up netpbm-10.58.01/converter/other/pnmtosgi.c.security-code
netpbm-10.58.01/converter/other/pnmtosgi.c
netpbm-10.58.01/converter/other/pnmtosgi.c.security-code 2012-04-09
15:31:42.0 +0200
-+++ netpbm-10.58.01/converter/other/pnmtosgi.c 2012-04-09 15:40:03.188619976
+0200
-@@ -254,6 +254,7 @@ build_channels(FILE * const ifp, int con
- #endif
-
- if( storage != STORAGE_VERBATIM ) {
-+overflow2(channels, rows);
- MALLOCARRAY_NOFAIL(table, channels * rows);
- MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
- }
-@@ -306,6 +307,8 @@ compress(ScanElem * temp,
- break;
- case STORAGE_RLE:
- tabrow = chan_no * rows + row;
-+overflow2(chan_no, rows);
-+overflow_add(chan_no* rows, row);
- len = rle_compress(temp, cols);/* writes result into rletemp
*/
- channel[chan_no][row].length = len;
- MALLOCARRAY(p, len);
diff -up netpbm-10.58.01/converter/other/rletopnm.c.security-code
netpbm-10.58.01/converter/other/rletopnm.c
--- netpbm-10.58.01/converter/other/rletopnm.c.security-code 2012-04-09
15:31:42.0 +0200
+++ netpbm-10.58.01/converter/other/rletopnm.c 2012-04-09 15:40:03.189619963
+0200
@@ -183,25 +163,6 @@
*/
/*
* rletopnm - A conversion program to convert from Utah's "rle" image format
-diff -up netpbm-10.58.01/converter/other/sgitopnm.c.security-code
netpbm-10.58.01/converter/other/sgitopnm.c
netpbm-10.58.01/converter/other/sgitopnm.c.security-code 2012-04-09
15:31:42.0 +0200
-+++ netpbm-10.58.01/converter/other/sgitopnm.c 2012-04-09 15:40:03.189619963
+0200
-@@ -359,10 +359,14 @@ readChannels(FILE
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Saturday, October 26, 2013 @ 23:22:10
Author: eric
Revision: 197556
upgpkg: netpbm 10.61.02-3
Rebuild without static libraries
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 19:51:23 UTC (rev 197555)
+++ PKGBUILD2013-10-26 21:22:10 UTC (rev 197556)
@@ -3,7 +3,7 @@
pkgname=netpbm
pkgver=10.61.02
-pkgrel=2
+pkgrel=3
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -34,7 +34,7 @@
}
prepare() {
- cd "${srcdir}/advanced"
+ cd advanced
patch -p1 < ../netpbm-CAN-2005-2471.patch
patch -p1 < ../netpbm-security-code.patch
@@ -56,26 +56,22 @@
}
build() {
- cd "${srcdir}/advanced"
-
+ cd advanced
make
-
# Generating useful man pages with html doc
- cd "${srcdir}/doc"
make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \
--f "${srcdir}/advanced/buildtools/manpage.mk" manpages
+-C ../doc -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
}
package() {
- cd "${srcdir}/advanced"
+ cd advanced
make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
# Removing dummy man pages
rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
- cd "${srcdir}/doc"
make MAKEMAN="${srcdir}/advanced/buildtools/makeman"
MANDIR="${pkgdir}/usr/share/man" \
--f "${srcdir}/advanced/buildtools/manpage.mk" installman
+-C ../doc -f "${srcdir}/advanced/buildtools/manpage.mk" installman
# Replace obsolete utility
echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' >
"${pkgdir}/usr/bin/pgmtopbm"
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Sunday, April 28, 2013 @ 01:32:48
Author: foutrelis
Revision: 183786
upgpkg: netpbm 10.61.02-2
libpng 1.6 rebuild.
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-27 23:24:13 UTC (rev 183785)
+++ PKGBUILD2013-04-27 23:32:48 UTC (rev 183786)
@@ -3,7 +3,7 @@
pkgname=netpbm
pkgver=10.61.02
-pkgrel=1
+pkgrel=2
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -33,8 +33,9 @@
rm -r advanced
}
-build() {
+prepare() {
cd "${srcdir}/advanced"
+
patch -p1 < ../netpbm-CAN-2005-2471.patch
patch -p1 < ../netpbm-security-code.patch
patch -p1 < ../netpbm-security-scripts.patch
@@ -48,11 +49,15 @@
echo 'JPEGLIB = libjpeg.so' >> config.mk
echo 'PNGLIB = libpng.so' >> config.mk
echo 'ZLIB = libz.so' >> config.mk
-
+
sed -i 's|misc|share/netpbm|' common.mk
sed -i 's|/link|/lib|' lib/Makefile
sed -i 's|install.manweb install.man|install.man|' GNUmakefile
+}
+build() {
+ cd "${srcdir}/advanced"
+
make
# Generating useful man pages with html doc
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Tuesday, January 4, 2011 @ 15:54:47
Author: eric
Revision: 104760
upgpkg: netpbm 10.47.24-1
Upstream update, Fixed for python2 (close FS#22307)
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-04 20:54:04 UTC (rev 104759)
+++ PKGBUILD2011-01-04 20:54:47 UTC (rev 104760)
@@ -1,28 +1,28 @@
# $Id$
# Maintainer: Kevin Piche
-# Contributor: Jochem Kossen
pkgname=netpbm
-pkgver=10.47.18
+pkgver=10.47.24
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
license=('custom' 'BSD' 'GPL' 'LGPL')
url="http://netpbm.sourceforge.net/";
depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
-makedepends=('python')
+makedepends=('python2')
options=('!makeflags')
# Releases after 10.34 are available via SVN only.
-# Get stable tarball here: http://netpbm.sourceforge.net/release.html#tarball
-# get doc with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
+# Get Stable tarball here: http://netpbm.sourceforge.net/release.html#tarball
+# Get version number in version.mk
+# Get docs with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \
ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
libpng-1.4.patch netpbm-CAN-2005-2471.patch \
netpbm-security-code.patch netpbm-security-scripts.patch)
-md5sums=('c3b66d329f818b6b4f02f7367ce1a6f8' '48efce0093c5f242bce3072958fe88c3'\
+md5sums=('debf962e9a5531fd3e57143d38165eac' '48efce0093c5f242bce3072958fe88c3'\
'6a8319e77f2d41881ee11c86b78c51d0' '07ee863e6f951250e8d0a08243c828c7'\
'fac4c9bedff9d90ac5a66e93d8c2eb33' 'cbb689129c82d16360d7f840b86789c7')
-sha1sums=('d670574754f161e37534c16f86ebda08a4266774'
'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\
+sha1sums=('02a85bffb8d5771011c17067e07fded26a455ee9'
'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\
'ab2e67374871b8b6c0c8b69a24e3502e68487759'
'456b76004622479f6ee81107c54b5211a1663a6a'\
'5af979e8fb7d3bbb7e731eed62326bb594bc91b3'
'2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
@@ -32,6 +32,8 @@
patch -p1 < ../netpbm-CAN-2005-2471.patch
patch -p1 < ../netpbm-security-code.patch
patch -p1 < ../netpbm-security-scripts.patch
+ sed -i 's|#!/bin/env python|#!/bin/env python2|' buildtools/makeman
+ sed -i 's|@python|@python2|' buildtools/manpage.mk
cp config.mk.in config.mk
[ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
[arch-commits] Commit in netpbm/trunk (PKGBUILD)
Date: Wednesday, August 18, 2010 @ 22:32:47
Author: eric
Revision: 88007
upgpkg: netpbm 10.47.18-1
Upstream update, Fixed headers location (close FS#20496)
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-08-18 22:09:14 UTC (rev 88006)
+++ PKGBUILD2010-08-19 02:32:47 UTC (rev 88007)
@@ -3,7 +3,7 @@
# Contributor: Jochem Kossen
pkgname=netpbm
-pkgver=10.47.16
+pkgver=10.47.18
pkgrel=1
pkgdesc="A toolkit for manipulation of graphic images"
arch=('i686' 'x86_64')
@@ -19,10 +19,10 @@
ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
libpng-1.4.patch netpbm-CAN-2005-2471.patch \
netpbm-security-code.patch netpbm-security-scripts.patch)
-md5sums=('88efeeea3a678532556e826e23703ce9' '48efce0093c5f242bce3072958fe88c3'\
+md5sums=('c3b66d329f818b6b4f02f7367ce1a6f8' '48efce0093c5f242bce3072958fe88c3'\
'6a8319e77f2d41881ee11c86b78c51d0' '07ee863e6f951250e8d0a08243c828c7'\
'fac4c9bedff9d90ac5a66e93d8c2eb33' 'cbb689129c82d16360d7f840b86789c7')
-sha1sums=('b72bfe4ba2a387cdc1bcbcd2d58b04c2353b6dfe'
'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\
+sha1sums=('d670574754f161e37534c16f86ebda08a4266774'
'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'\
'ab2e67374871b8b6c0c8b69a24e3502e68487759'
'456b76004622479f6ee81107c54b5211a1663a6a'\
'5af979e8fb7d3bbb7e731eed62326bb594bc91b3'
'2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
@@ -44,7 +44,6 @@
sed -i 's|PKGMANDIR = man|PKGMANDIR = share/man|' common.mk
sed -i 's|misc|share/netpbm|' common.mk
sed -i 's|/link|/lib|' lib/Makefile
- sed -i 's|include/netpbm|include|' GNUmakefile lib/Makefile
sed -i 's|install.manweb install.man|install.man|' GNUmakefile
sed -i '/MANUALS1 = $(BINARIES) $(SCRIPTS)/a\
MANUALS1 += bmptoppm faxformat gemtopbm jpegtopnm mrf netpbm pamtotiff
pamx pgmedge \\\
[arch-commits] Commit in netpbm/trunk (PKGBUILD libpng-1.4.patch)
Date: Friday, January 22, 2010 @ 00:55:10
Author: eric
Revision: 64766
upgpkg: netpbm 10.35.841-2
Rebuilt for libpng 1.4 and libjpeg 8
Added:
netpbm/trunk/libpng-1.4.patch
Modified:
netpbm/trunk/PKGBUILD
--+
PKGBUILD | 12 +--
libpng-1.4.patch | 86 +
2 files changed, 95 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-22 04:44:26 UTC (rev 64765)
+++ PKGBUILD2010-01-22 05:55:10 UTC (rev 64766)
@@ -4,7 +4,7 @@
pkgname=netpbm
pkgver=10.35.841
-pkgrel=1
+pkgrel=2
pkgdesc="A toolkit for manipulation of graphic images"
arch=(i686 x86_64)
license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -17,16 +17,22 @@
# get doc with: wget --recursive --relative -nH
http://netpbm.sourceforge.net/doc/
source=(ftp://ftp.archlinux.org/other/netpbm/$pkgname-$pkgver.tar.bz2 \
ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-20090222.tar.bz2 \
-Makefile.config arch.patch netpbm-10.35-glibc.patch
netpbm-10.35-jpeg7.patch)
+Makefile.config arch.patch netpbm-10.35-glibc.patch
netpbm-10.35-jpeg7.patch libpng-1.4.patch)
md5sums=('04d94bf5eefd56e6443b4008196d5969' '20f5392fd1deacfa267bf64ab9d420c5'\
'cfdb69f77f8ef06f8863fe02ce27db71' '88992e053dbfa9fdde2cccea32e6632b'\
- '8e278fba37c8f70f6a8658b98686dfad' '6a3da4565f6623f4875bd62871a8dda5')
+ '8e278fba37c8f70f6a8658b98686dfad' '6a3da4565f6623f4875bd62871a8dda5'\
+ 'a644dd64e197cd5f29df2962742f01d5')
+sha1sums=('e934e4b5a3ecaa448163b249bdb9546f51e28f87'
'c60e393e9eaf0cc9c5caf6a9294632ec012ea31b'\
+ 'de15f60bc472c4ae920f4465889d4d57e9524ef6'
'125c737470695efc23895844d14e886caae5ae67'\
+ '5c79325ea6d97f939c09179d9f1983cb2f160c95'
'682d0245d4ce3bb3b8d689656e40960231541a7f'\
+ '20c46bd7e7303a5aa48a001bd7e4e5ec9c8d2b1e')
build() {
cd ${srcdir}/${pkgname}
patch -p1 < ../arch.patch || return 1
patch -p0 < ../netpbm-10.35-glibc.patch || return 1
patch -p0 < ../netpbm-10.35-jpeg7.patch || return 1
+ patch -p1 < ../libpng-1.4.patch || return 1
cp ../Makefile.config .
if [ "${CARCH}" == "x86_64" ]; then
Added: libpng-1.4.patch
===
--- libpng-1.4.patch(rev 0)
+++ libpng-1.4.patch2010-01-22 05:55:10 UTC (rev 64766)
@@ -0,0 +1,86 @@
+diff -Naur netpbm-orig/converter/other/pnmtopng.c
netpbm/converter/other/pnmtopng.c
+--- netpbm-orig/converter/other/pnmtopng.c 2010-01-22 00:13:48.0
-0500
netpbm/converter/other/pnmtopng.c 2010-01-22 00:21:33.0 -0500
+@@ -2604,7 +2604,7 @@
+ info_ptr->num_palette = palette_size;
+ if (trans_size > 0) {
+ info_ptr->valid |= PNG_INFO_tRNS;
+-info_ptr->trans = trans;
++info_ptr->trans_alpha = trans;
+ info_ptr->num_trans = trans_size; /* omit opaque values */
+ }
+ /* creating hIST chunk */
+@@ -2641,7 +2641,7 @@
+ info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
+ if (transparent > 0) {
+ info_ptr->valid |= PNG_INFO_tRNS;
+-info_ptr->trans_values =
++info_ptr->trans_color =
+ xelToPngColor_16(transcolor, maxval, png_maxval);
+ }
+ } else {
+@@ -2653,10 +2653,10 @@
+ if (info_ptr->valid && PNG_INFO_tRNS)
+ pm_message("Transparent color {gray, red, green, blue} = "
+"{%d, %d, %d, %d}",
+- info_ptr->trans_values.gray,
+- info_ptr->trans_values.red,
+- info_ptr->trans_values.green,
+- info_ptr->trans_values.blue);
++ info_ptr->trans_color.gray,
++ info_ptr->trans_color.red,
++ info_ptr->trans_color.green,
++ info_ptr->trans_color.blue);
+ else
+ pm_message("No transparent color");
+ }
+diff -Naur netpbm-orig/converter/other/pngtopnm.c
netpbm/converter/other/pngtopnm.c
+--- netpbm-orig/converter/other/pngtopnm.c 2010-01-22 00:33:25.0
-0500
netpbm/converter/other/pngtopnm.c 2010-01-22 00:39:21.0 -0500
+@@ -476,7 +476,7 @@
+ bool retval;
+
+ if (info_ptr->valid & PNG_INFO_tRNS) {
+-const png_color_16 * const transColorP = &info_ptr->trans_values;
++const png_color_16 * const transColorP = &info_ptr->trans_color;
+
+
+ /* There seems to be a problem here: you can't compare real
+@@ -569,8 +569,8 @@
+ for (i = 0, foundGray = FALSE;
+ i < info_ptr->num_trans && !foundGray;
+ ++i) {
+-if (info_ptr->trans[i] != 0 &&
+-info_ptr->trans[i] != maxval) {
++if (info_ptr->trans_alpha[i] != 0 &&
++info_ptr->trans_alph
