pkg/50013: Update print/cups-filters to 1.0.70

[Leonardo Taccari <iamleot%gmail.com@localhost>]

>Number:         50013
>Category:       pkg
>Synopsis:       Update print/cups-filters to 1.0.70
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 29 20:10:00 +0000 2015
>Originator:     Leonardo Taccari
>Release:        NetBSD 7.99.19
>Organization:
Università Politecnica delle Marche
>Environment:
	
	
System: NetBSD boh 7.99.19 NetBSD 7.99.19 (GENERIC) #35: Sun Jun 28 13:29:09 CEST 2015 leot@boh:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
Architecture: x86_64
Machine: amd64
>Description:
	print/cups-filters in pkgsrc (1.0.69) is not the latest stable version
	(1.0.70).
>How-To-Repeat:
	$ cd pkgsrc/print/cups-filters
	$ make show-var VARNAME=PKGNAME
>Fix:
	Please apply the attached trivial patches. Our patches/ are no longer
	needed (all imported upstream). While here I will also attach a
	possible commit message that includes all the NEWS.


------------------8<------------------8<------------------8<------------------
Update print/cups-filters to 1.0.70.

Changes:
- texttopdf: Fixed buffer overflow on size allocation of texttopdf
  when working with extremely small line sizes, which causes the size
  calculation to result in 0 (CVE-2015-3258, thanks to Stefan
  Cornelius fro Red Hat for the patch).
- cups-browsed: leak fixes
- cups-browsed: Further BrowseAllow fixing
- cups-browsed: BrowsePoll is an array of pointers, not structures,
  so allocate room for the pointers
  - cups-browsed: Prevent NULL dereference when handling BrowseAllow
  without value
  - cups-browsed: Use memory deallocation function corresponding to
  allocation function used
- cups-browsed: Fixes for glib source handling (Red Hat bug #1228555)
- foomatic-rip: Allow using another shell than /bin/bash using the
  "--with-shell=..." option for "./configure". Thanks to Leonardo
  Taccari for the patch (Bug #1288).
------------------8<------------------8<------------------8<------------------


------------------8<------------------8<------------------8<------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups-filters/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	14 Jun 2015 16:08:04 -0000	1.22
+++ Makefile	29 Jun 2015 19:57:25 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.22 2015/06/14 16:08:04 wiz Exp $
 
-DISTNAME=	cups-filters-1.0.69
+DISTNAME=	cups-filters-1.0.70
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups-filters/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	14 Jun 2015 16:08:04 -0000	1.17
+++ distinfo	29 Jun 2015 19:57:25 -0000
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.17 2015/06/14 16:08:04 wiz Exp $
 
-SHA1 (cups-filters-1.0.69.tar.xz) = c3d5cdbc0c7805c6a415ea05cdd7fd8b50f808b6
-RMD160 (cups-filters-1.0.69.tar.xz) = dea1d54539957a060456a6cfe98e52a23a80b575
-Size (cups-filters-1.0.69.tar.xz) = 1338548 bytes
-SHA1 (patch-configure.ac) = 4b5243c4c31541e7d44ff2d049cd5a42bc7a2267
-SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = cd916bf6c211b14305c311b6ad63bd0881030b09
+SHA1 (cups-filters-1.0.70.tar.xz) = ec0969c66627f3770554ed73453c0fbbeb377ad8
+RMD160 (cups-filters-1.0.70.tar.xz) = 69d7461dd62917b2c7155f11a6d3df46d0b72c6a
+Size (cups-filters-1.0.70.tar.xz) = 1338076 bytes
Index: patches/patch-configure.ac
===================================================================
RCS file: patches/patch-configure.ac
diff -N patches/patch-configure.ac
--- patches/patch-configure.ac	14 Jun 2015 16:08:04 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2015/06/14 16:08:04 wiz Exp $
-
-Add a --with-shell option in order to avoid hardcoding "/bin/bash" inside
-filter/foomaticrip.c.
-
-Fixed upstream as [Bug 1288]:
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1288
-
---- configure.ac.orig	2015-04-13 14:47:41.000000000 +0000
-+++ configure.ac
-@@ -622,6 +622,16 @@ fi
- AC_SUBST(SED_EXTENDED_REGEX_OPT)
- AC_SUBST(CUPS_GHOSTSCRIPT)
- 
-+# =========================================================
-+# Select a different shell instead of the default /bin/bash
-+# =========================================================
-+AC_ARG_WITH([shell],
-+	[AS_HELP_STRING([--with-shell=path], [Specify path for a modern shell.])],
-+	[with_shell="$withval"],
-+	[with_shell="/bin/bash"]
-+)
-+AC_DEFINE_UNQUOTED([SHELL], "$with_shell", [Path for a modern shell])]
-+
- # =====================
- # Prepare all .in files
- # =====================
-@@ -659,6 +669,7 @@ Build configuration:
- 	png:             ${with_png}
- 	php:             ${with_php}
- 	php-config:      ${with_php_config}
-+	shell:           ${with_shell}
- 	test-font:       ${with_test_font_path}
- 	tiff:            ${with_tiff}
- 	avahi:           ${enable_avahi}
Index: patches/patch-filter_foomatic-rip_foomaticrip.c
===================================================================
RCS file: patches/patch-filter_foomatic-rip_foomaticrip.c
diff -N patches/patch-filter_foomatic-rip_foomaticrip.c
--- patches/patch-filter_foomatic-rip_foomaticrip.c	14 Jun 2015 16:08:04 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-filter_foomatic-rip_foomaticrip.c,v 1.5 2015/06/14 16:08:04 wiz Exp $
-
-Adjust according the --with-shell option.
-
-Fixed upstream as [Bug 1288]:
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1288
-
---- filter/foomatic-rip/foomaticrip.c.orig	2015-02-13 22:36:44.000000000 +0000
-+++ filter/foomatic-rip/foomaticrip.c
-@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo
-                                 "/opt/cups/filter:"
-                                 "/usr/lib/cups/filter";
- 
--char modern_shell[64] = "/bin/bash";
-+char modern_shell[64] = SHELL;
- 
- void config_set_option(const char *key, const char *value)
- {

>Unformatted: