From e5effe71d7062f8489aa9449d982b41216dac0a4 Mon Sep 17 00:00:00 2001
From: bernd <bernd@openbsd.org>
Date: Mon, 27 Apr 2009 08:25:39 +0000
Subject: [PATCH] Update to cups-1.3.10. With lots of help from ajacoutot@.

There's an issue with the admin.cgi which will be fixed
in-tree.

ok ajacoutot@, jasper@
---
 print/cups/Makefile                           |  38 +-
 print/cups/distinfo                           |  10 +-
 print/cups/files/cups-disable                 |   4 +-
 print/cups/files/cups-enable                  |   4 +-
 print/cups/patches/patch-Makedefs_in          |  38 +-
 print/cups/patches/patch-Makefile             |  74 ---
 print/cups/patches/patch-backend_betest_c     |   8 +-
 print/cups/patches/patch-cgi-bin_admin_c      |  10 +-
 .../patch-config-scripts_cups-sharedlibs_m4   |   8 +-
 print/cups/patches/patch-configure            |  36 +-
 print/cups/patches/patch-cups_Makefile        |  46 +-
 print/cups/patches/patch-desktop_cups_desktop |  29 +-
 print/cups/patches/patch-filter_Makefile      |  20 +-
 print/cups/patches/patch-filter_imagetops_c   |   8 +-
 .../cups/patches/patch-filter_imagetoraster_c |  10 +-
 print/cups/patches/patch-init_cups_sh_in      |   8 +-
 print/cups/patches/patch-notifier_Makefile    |  22 +
 print/cups/patches/patch-pdftops_Stream_cxx   |  27 -
 print/cups/patches/patch-scheduler_Makefile   |  35 +-
 .../patches/patch-scheduler_cups-driverd_c    |  20 +-
 print/cups/patches/patch-scheduler_ipp_c      |  60 --
 .../patches/patch-scheduler_subscriptions_c   |  63 --
 print/cups/patches/patch-systemv_Makefile     |  14 +-
 print/cups/patches/patch-systemv_lpadmin_c    |  10 +-
 .../patch-test_4_4-subscription-ops_test      |  77 ++-
 .../cups/patches/patch-test_run-stp-tests_sh  |  18 +-
 print/cups/pkg/MESSAGE                        |   8 +-
 print/cups/pkg/PLIST                          | 582 +++++++++++++++++-
 28 files changed, 805 insertions(+), 482 deletions(-)
 delete mode 100644 print/cups/patches/patch-Makefile
 create mode 100644 print/cups/patches/patch-notifier_Makefile
 delete mode 100644 print/cups/patches/patch-pdftops_Stream_cxx
 delete mode 100644 print/cups/patches/patch-scheduler_ipp_c
 delete mode 100644 print/cups/patches/patch-scheduler_subscriptions_c

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 2b9358350e0..10f4ae0d53e 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.44 2009/04/21 13:03:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2009/04/27 08:25:39 bernd Exp $
 
 COMMENT=		Common Unix Printing System
 
-VERSION=		1.2.7
+VERSION=		1.3.10
 DISTNAME=		cups-${VERSION}-source
-PKGNAME=		cups-${VERSION}p21
+PKGNAME=		cups-${VERSION}
 CATEGORIES=		print sysutils
 
-SHARED_LIBS+=		cups		3.0
-# XXX ghostscript needs to dlopen() libcupsimage.so.2
-SHARED_LIBS+=		cupsimage	2.3
+SHARED_LIBS+=		cups		4.0
+# XXX ghostscript needs to dlopen() libcupsimage.so.3
+SHARED_LIBS+=		cupsimage	3.0
 
 HOMEPAGE=		http://www.cups.org/
 
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c gcrypt gpg-error jpeg m pthread stdc++ tasn1 z
+WANTLIB += c gcrypt gpg-error jpeg m pthread tasn1 z
 
 MASTER_SITES=		http://ftp.easysw.com/pub/cups/${VERSION}/ \
 			http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \
@@ -43,7 +43,10 @@ LIB_DEPENDS=		png.>=3::graphics/png \
 
 FAKE_FLAGS=		BINMODE=${BINMODE} \
 			SHAREMODE=${SHAREMODE} \
-			DBUSDIR=${WRKINST}/${TRUEPREFIX}/share/examples/cups/dbus-1/system.d
+			ICONDIR=${DESTDIR}${PREFIX}/share/icons \
+			MENUDIR=${DESTDIR}${PREFIX}/share/applications \
+			DBUSDIR=${WRKINST}/${TRUEPREFIX}/share/examples/cups/dbus-1/system.d \
+			PDFTOPS="pdftops"
 
 MAKE_ENV+=		LIBcups_VERSION=${LIBcups_VERSION} \
 			LIBcupsimage_VERSION=${LIBcupsimage_VERSION}
@@ -61,7 +64,8 @@ CONFIGURE_ARGS+=	--with-cups-user=_cups \
 			--without-perl \
 			--without-php \
 			--without-python \
-			--enable-dbus
+			--enable-dbus \
+			--disable-pdftops
 
 # XXX we need to use GnuTLS instead of OpenSSL because of conflicting
 # symbols with Mozilla NSS which can lead to crashes
@@ -73,7 +77,8 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 			LIBcups_VERSION=${LIBcups_VERSION} \
 			LIBcupsimage_VERSION=${LIBcupsimage_VERSION} \
-			LIBGNUTLSCONFIG="pkg-config gnutls"
+			LIBGNUTLSCONFIG="pkg-config gnutls" \
+			ac_cv_path_CUPS_GHOSTSCRIPT="${LOCALBASE}/bin/gs"
 
 CFLAGS+=		"-I${LOCALBASE}/include" \
 			"-I${LOCALBASE}/include/libpng"
@@ -102,15 +107,16 @@ post-configure:
 	${SUBST_CMD} ${WRKSRC}/Makefile
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups/init
-	@cd ${WRKINST}${SYSCONFDIR}/cups && cp -R * \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups/init
+	cd ${WRKINST}${SYSCONFDIR}/cups && cp -R * \
 		${PREFIX}/share/examples/cups
-	@rm -r ${WRKINST}${SYSCONFDIR}/cups ${WRKINST}/var/run \
+	rm -r ${WRKINST}${SYSCONFDIR}/cups ${WRKINST}/var/run \
 	    ${WRKINST}/var/cache
-	@${INSTALL_DATA} ${WRKBUILD}/init/cups.sh ${PREFIX}/share/cups/init
+	${INSTALL_DATA} ${WRKBUILD}/init/cups.sh ${PREFIX}/share/cups/init
 .for file in cups-enable cups-disable
-	@sed s,y0y0y0,${LOCALBASE}, < ${FILESDIR}/${file} > \
-		${PREFIX}/sbin/${file}
+	cp ${FILESDIR}/${file} ${WRKBUILD}
+	${SUBST_CMD} ${WRKBUILD}/${file}
+	${INSTALL_SCRIPT} ${WRKBUILD}/${file} ${PREFIX}/sbin
 .endfor
 
 .include <bsd.port.mk>
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 1fc7005a48d..d1898e37950 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,5 +1,5 @@
-MD5 (cups-1.2.7-source.tar.bz2) = v0R4PZtGEwvunymV5gVUcA==
-RMD160 (cups-1.2.7-source.tar.bz2) = MjutgPmvPFPuwgqJxEr+JmdUJPo=
-SHA1 (cups-1.2.7-source.tar.bz2) = ECTx1Jldj3Zdx5zlB+rCvo4MzUU=
-SHA256 (cups-1.2.7-source.tar.bz2) = 50hdaz3L0ziiNhr/ZsUW+N+vwcgepbATlvbuXzZcTrM=
-SIZE (cups-1.2.7-source.tar.bz2) = 3585758
+MD5 (cups-1.3.10-source.tar.bz2) = hP/+lrhTfIGkY/rM6tgAJg==
+RMD160 (cups-1.3.10-source.tar.bz2) = nI9TZvhLX5CH96KbrOZ32zCakz8=
+SHA1 (cups-1.3.10-source.tar.bz2) = SGifBxBBBiFtNRmMyQ7VbfM/rzg=
+SHA256 (cups-1.3.10-source.tar.bz2) = lwGlRaagWpkb7rSbQfu01FDDvbtOt0sTKw0piGQLtWY=
+SIZE (cups-1.3.10-source.tar.bz2) = 3778970
diff --git a/print/cups/files/cups-disable b/print/cups/files/cups-disable
index 1c45b75c76d..ec2a53ddb64 100644
--- a/print/cups/files/cups-disable
+++ b/print/cups/files/cups-disable
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#	$OpenBSD: cups-disable,v 1.1.1.1 2005/01/16 12:36:42 mbalmer Exp $
+#	$OpenBSD: cups-disable,v 1.2 2009/04/27 08:25:39 bernd Exp $
 #
 #	this script disables CUPS by removing links created by
 #	cups-enable.
 
-PREFIX=y0y0y0
+PREFIX=${TRUEPREFIX}
 BINDIR=/usr/bin
 SBINDIR=/usr/sbin
 QUIET=No
diff --git a/print/cups/files/cups-enable b/print/cups/files/cups-enable
index 67c6f611221..8b3b25befbc 100644
--- a/print/cups/files/cups-enable
+++ b/print/cups/files/cups-enable
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#	$OpenBSD: cups-enable,v 1.1.1.1 2005/01/16 12:36:42 mbalmer Exp $
+#	$OpenBSD: cups-enable,v 1.2 2009/04/27 08:25:39 bernd Exp $
 #
 #	this script replaces OpenBSD lpd files with the corresponding
 #	files from CUPS.
 
-PREFIX=y0y0y0
+PREFIX=${TRUEPREFIX}
 BINDIR=/usr/bin
 SBINDIR=/usr/sbin
 
diff --git a/print/cups/patches/patch-Makedefs_in b/print/cups/patches/patch-Makedefs_in
index 51815ce374b..707a44b4e50 100644
--- a/print/cups/patches/patch-Makedefs_in
+++ b/print/cups/patches/patch-Makedefs_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makedefs_in,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
---- Makedefs.in.orig	Wed Sep 20 10:46:49 2006
-+++ Makedefs.in	Wed Sep 20 10:50:10 2006
-@@ -49,13 +49,13 @@ STRIP		=	@STRIP@
+$OpenBSD: patch-Makedefs_in,v 1.3 2009/04/27 08:25:39 bernd Exp $
+--- Makedefs.in.orig	Tue Jan 22 23:37:21 2008
++++ Makedefs.in	Tue Mar 17 16:56:19 2009
+@@ -40,13 +40,13 @@ STRIP		=	@STRIP@
  # Installation programs...
  #
  
@@ -20,7 +20,35 @@ $OpenBSD: patch-Makedefs_in,v 1.2 2006/10/01 10:43:38 mbalmer Exp $
  
  #
  # Default user, group, and system groups for the scheduler...
-@@ -238,7 +238,7 @@ DBUSDIR		=	@DBUSDIR@
+@@ -206,8 +206,8 @@ DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
+ DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
+ ICONDIR		=	@ICONDIR@
+ INCLUDEDIR	=	$(BUILDROOT)$(includedir)
+-INITDIR		=	@INITDIR@
+-INITDDIR	=	@INITDDIR@
++INITDIR		=
++INITDDIR	=
+ LIBDIR		=	$(BUILDROOT)$(libdir)
+ LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
+ LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
+@@ -222,7 +222,7 @@ SBINDIR		=	$(BUILDROOT)@sbindir@
+ SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
+ SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
+ STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
+-XINETD		=	@XINETD@
++XINETD		=
+ 
+ MAN1EXT		=	@MAN1EXT@
+ MAN5EXT		=	@MAN5EXT@
+@@ -234,14 +234,14 @@ PAMDIR		=	@PAMDIR@
+ PAMFILE		=	@PAMFILE@
+ 
+ DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
+-DBUSDIR		=	@DBUSDIR@
++DBUSDIR		=
+ 
+ 
+ #
  # Rules...
  #
  
diff --git a/print/cups/patches/patch-Makefile b/print/cups/patches/patch-Makefile
deleted file mode 100644
index 0b24d547653..00000000000
--- a/print/cups/patches/patch-Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2008/10/30 13:26:41 ajacoutot Exp $
---- Makefile.orig	Tue Aug 29 17:51:19 2006
-+++ Makefile	Thu Oct 30 13:45:59 2008
-@@ -99,59 +99,22 @@ install:	installhdrs
- 	echo Installing cups-config script...
- 	$(INSTALL_DIR) -m 755 $(BINDIR)
- 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
--	if test "x$(INITDIR)" != x; then \
--		echo Installing init scripts...; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
--		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
--	fi
--	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
--		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
--		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
--			echo Installing StartupItems files...; \
--			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
--			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
--			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
--			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
--		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
--			echo Installing LaunchDaemons configuration files...; \
--			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
--			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
--		else \
--			echo Installing RC script...; \
--			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
--		fi \
--	fi
- 	if test "x$(DBUSDIR)" != x; then \
- 		echo Installing cups.conf in $(DBUSDIR)...;\
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
- 		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
- 	fi
--	if test "x$(XINETD)" != x; then \
--		echo Installing xinetd configuration file for cups-lpd...; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
--		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
--	fi
--	if test -d /usr/share/applications; then \
--		echo Installing desktop icons...; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
--		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
--		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
--		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
--		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
--		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
--	fi
-+	echo Installing desktop icons...; \
-+	$(INSTALL_DIR) -m 755 $(DESTDIR)/${PREFIX}/share/applications; \
-+	$(INSTALL_DATA) desktop/cups.desktop $(DESTDIR)/${PREFIX}/share/applications; \
-+	$(INSTALL_DIR) -m 755 $(DESTDIR)/${PREFIX}/share/icons/hicolor/16x16/apps; \
-+	$(INSTALL_DATA) desktop/cups-16.png $(DESTDIR)/${PREFIX}/share/icons/hicolor/16x16/apps/cups.png; \
-+	$(INSTALL_DIR) -m 755 $(DESTDIR)/${PREFIX}/share/icons/hicolor/32x32/apps; \
-+	$(INSTALL_DATA) desktop/cups-32.png $(DESTDIR)/${PREFIX}/share/icons/hicolor/32x32/apps/cups.png; \
-+	$(INSTALL_DIR) -m 755 $(DESTDIR)/${PREFIX}/share/icons/hicolor/64x64/apps; \
-+	$(INSTALL_DATA) desktop/cups-64.png $(DESTDIR)/${PREFIX}/share/icons/hicolor/64x64/apps/cups.png; \
-+	$(INSTALL_DIR) -m 755 $(DESTDIR)/${PREFIX}/share/icons/hicolor/128x128/apps; \
-+	$(INSTALL_DATA) desktop/cups-128.png $(DESTDIR)/${PREFIX}/share/icons/hicolor/128x128/apps/cups.png
- 
- 
- #
diff --git a/print/cups/patches/patch-backend_betest_c b/print/cups/patches/patch-backend_betest_c
index 6bf03c1f33c..7ee9b6415e3 100644
--- a/print/cups/patches/patch-backend_betest_c
+++ b/print/cups/patches/patch-backend_betest_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-backend_betest_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
---- backend/betest.c.orig	Fri Feb 18 03:18:11 2005
-+++ backend/betest.c	Mon May  7 15:47:41 2007
-@@ -76,7 +76,7 @@ main(int  argc,		/* I - Number of command-line argumen
+$OpenBSD: patch-backend_betest_c,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- backend/betest.c.orig	Sat Jul 12 00:48:49 2008
++++ backend/betest.c	Tue Mar 17 16:21:49 2009
+@@ -67,7 +67,7 @@ main(int  argc,		/* I - Number of command-line argumen
    */
  
    execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],
diff --git a/print/cups/patches/patch-cgi-bin_admin_c b/print/cups/patches/patch-cgi-bin_admin_c
index 26a9224c306..175dd630929 100644
--- a/print/cups/patches/patch-cgi-bin_admin_c
+++ b/print/cups/patches/patch-cgi-bin_admin_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-cgi-bin_admin_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
---- cgi-bin/admin.c.orig	Thu Aug 24 17:55:42 2006
-+++ cgi-bin/admin.c	Mon May  7 15:47:41 2007
-@@ -237,7 +237,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
+$OpenBSD: patch-cgi-bin_admin_c,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- cgi-bin/admin.c.orig	Fri Sep 26 17:30:29 2008
++++ cgi-bin/admin.c	Tue Mar 17 16:21:50 2009
+@@ -414,7 +414,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
  		*response;		/* IPP response */
    ipp_attribute_t *attr;		/* member-uris attribute */
    char		uri[HTTP_MAX_URI];	/* Device or printer URI */
@@ -10,7 +10,7 @@ $OpenBSD: patch-cgi-bin_admin_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
  		*ptr;			/* Pointer to CGI variable */
    const char	*title;			/* Title of page */
    static const char * const pattrs[] =	/* Requested printer attributes */
-@@ -517,7 +517,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
+@@ -695,7 +695,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
  		*uriptr;		/* Pointer into URI */
    int		maxrate;		/* Maximum baud rate */
    char		baudrate[255];		/* Baud rate string */
diff --git a/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4 b/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
index 8e895bff729..43e2b508843 100644
--- a/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
+++ b/print/cups/patches/patch-config-scripts_cups-sharedlibs_m4
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config-scripts_cups-sharedlibs_m4,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
---- config-scripts/cups-sharedlibs.m4.orig	Wed Sep 20 10:53:05 2006
-+++ config-scripts/cups-sharedlibs.m4	Wed Sep 20 10:54:16 2006
-@@ -48,8 +48,8 @@ if test x$enable_shared != xno; then
+$OpenBSD: patch-config-scripts_cups-sharedlibs_m4,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- config-scripts/cups-sharedlibs.m4.orig	Wed Jul 11 23:46:42 2007
++++ config-scripts/cups-sharedlibs.m4	Tue Mar 17 16:21:50 2009
+@@ -49,8 +49,8 @@ if test x$enable_shared != xno; then
  			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
  		OSF1* | Linux | GNU | *BSD*)
diff --git a/print/cups/patches/patch-configure b/print/cups/patches/patch-configure
index 4890bf8dd09..60bfdb49b7a 100644
--- a/print/cups/patches/patch-configure
+++ b/print/cups/patches/patch-configure
@@ -1,16 +1,7 @@
-$OpenBSD: patch-configure,v 1.6 2009/03/23 15:04:41 ajacoutot Exp $
---- configure.orig	Thu Nov 16 15:51:56 2006
-+++ configure	Mon Mar 23 15:38:33 2009
-@@ -7179,7 +7179,7 @@ done
- 
-                 ;;
- 
--	Linux*)
-+	*)
- 				if test "x$enable_dbus" != xno; then
- 			# Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
-@@ -7910,8 +7910,8 @@ if test x$enable_shared != xno; then
+$OpenBSD: patch-configure,v 1.7 2009/04/27 08:25:39 bernd Exp $
+--- configure.orig	Thu Apr 16 22:02:06 2009
++++ configure	Thu Apr 23 12:57:20 2009
+@@ -9874,8 +9874,8 @@ if test x$enable_shared != xno; then
  			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
  		OSF1* | Linux | GNU | *BSD*)
@@ -21,7 +12,7 @@ $OpenBSD: patch-configure,v 1.6 2009/03/23 15:04:41 ajacoutot Exp $
  			DSO="\$(CC)"
  			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
  			;;
-@@ -8162,7 +8162,7 @@ if test -n "$GCC"; then
+@@ -10141,7 +10141,7 @@ if test -n "$GCC"; then
  	if test -z "$OPTIM"; then
  		if test "x$with_optim" = x; then
  			# Default to optimize-for-size and debug
@@ -30,12 +21,21 @@ $OpenBSD: patch-configure,v 1.6 2009/03/23 15:04:41 ajacoutot Exp $
  		else
  			OPTIM="$with_optim $OPTIM"
  		fi
-@@ -12405,7 +12405,7 @@ fi
+@@ -16791,7 +16791,7 @@ fi
  
  
  	if test x$ac_cv_header_pthread_h = xyes; then
 -				for flag in -lpthreads -lpthread -pthread; do
-+				for flag in -pthread -lpthreads -lpthread ; do
-         		echo "$as_me:$LINENO: checking for pthread_create using $flag" >&5
- echo $ECHO_N "checking for pthread_create using $flag... $ECHO_C" >&6
++				for flag in -pthread -lpthreads -lpthread; do
+         		{ echo "$as_me:$LINENO: checking for pthread_create using $flag" >&5
+ echo $ECHO_N "checking for pthread_create using $flag... $ECHO_C" >&6; }
  			SAVELIBS="$LIBS"
+@@ -18877,7 +18877,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define CUPS_GHOSTSCRIPT "$CUPS_GHOSTSCRIPT"
++#define CUPS_GHOSTSCRIPT "$ac_cv_path_CUPS_GHOSTSCRIPT"
+ _ACEOF
+ 
+ 
diff --git a/print/cups/patches/patch-cups_Makefile b/print/cups/patches/patch-cups_Makefile
index 8018b8bc5d6..3e7b06dea11 100644
--- a/print/cups/patches/patch-cups_Makefile
+++ b/print/cups/patches/patch-cups_Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-cups_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
---- cups/Makefile.orig	Thu Aug  3 04:20:57 2006
-+++ cups/Makefile	Wed Sep 20 11:03:14 2006
-@@ -138,7 +138,7 @@ all:	$(TARGETS)
+$OpenBSD: patch-cups_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- cups/Makefile.orig	Sat Sep  6 02:30:39 2008
++++ cups/Makefile	Tue Mar 17 16:29:45 2009
+@@ -131,7 +131,7 @@ all:	$(TARGETS)
  
  clean:
  	$(RM) $(OBJS) $(TARGETS)
@@ -10,7 +10,7 @@ $OpenBSD: patch-cups_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
  	$(RM) -r 32bit 64bit
  
  
-@@ -163,9 +163,9 @@ depend:
+@@ -156,9 +156,9 @@ depend:
  install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
  	$(INSTALL_DIR) -m 755 $(LIBDIR)
  	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
@@ -23,7 +23,7 @@ $OpenBSD: patch-cups_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
  	fi
  	if test $(LIBCUPS) = "libcups.2.dylib"; then \
  		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
-@@ -186,13 +186,13 @@ installhdrs:
+@@ -185,13 +185,13 @@ installhdrs:
  
  install32bit:
  	$(INSTALL_DIR) -m 755 $(LIB32DIR)
@@ -41,7 +41,7 @@ $OpenBSD: patch-cups_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
  
  
  #
-@@ -207,7 +207,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
+@@ -206,7 +206,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
  	$(RM) $(LIBDIR)/libcups.sl
  	$(RM) $(LIBDIR)/libcups.sl.2
  	$(RM) $(LIBDIR)/libcups.so
@@ -50,30 +50,14 @@ $OpenBSD: patch-cups_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
  	-$(RMDIR) $(LIBDIR)
  	for file in $(HEADERS); do \
  		$(RM) $(INCLUDEDIR)/cups/$$file; \
-@@ -216,48 +216,48 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
- 
- uninstall32bit:
- 	$(RM) $(LIB32DIR)/libcups.so
--	$(RM) $(LIB32DIR)/libcups.so.2
-+	$(RM) $(LIB32DIR)/libcups.so.${LIBcups_VERSION}
- 	-$(RMDIR) $(LIB32DIR)
- 
- uninstall64bit:
- 	$(RM) $(LIB64DIR)/libcups.so
--	$(RM) $(LIB64DIR)/libcups.so.2
-+	$(RM) $(LIB64DIR)/libcups.so.${LIBcups_VERSION}
- 	-$(RMDIR) $(LIB64DIR)
- 
- 
- #
--# libcups.so.2, libcups.sl.2
-+# libcups.so.${LIBcups_VERSION}, libcups.sl.2
+@@ -228,35 +228,35 @@ uninstall64bit:
+ # libcups.so.2, libcups.sl.2
  #
  
 -libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 +libcups.so.${LIBcups_VERSION} libcups.sl.2:	$(LIBOBJS)
  	echo Linking $@...
- 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+ 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 -	$(RM) `basename $@ .2`
 -	$(LN) $@ `basename $@ .2`
 +	$(RM) `basename $@ .${LIBcups_VERSION}`
@@ -81,30 +65,28 @@ $OpenBSD: patch-cups_Makefile,v 1.3 2006/10/01 10:43:38 mbalmer Exp $
  
  
  #
--# 32bit/libcups.so.2
-+# 32bit/libcups.so.${LIBcups_VERSION}
+ # 32bit/libcups.so.2
  #
  
 -32bit/libcups.so.2:	$(LIB32OBJS)
 +32bit/libcups.so.${LIBcups_VERSION}:	$(LIB32OBJS)
  	echo Linking 32-bit $@...
  	-mkdir 32bit
- 	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+ 	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
  	$(RM) 32bit/libcups.so
 -	$(LN) libcups.so.2 32bit/libcups.so
 +	$(LN) libcups.so.${LIBcups_VERSION} 32bit/libcups.so
  
  
  #
--# 64bit/libcups.so.2
-+# 64bit/libcups.so.${LIBcups_VERSION}
+ # 64bit/libcups.so.2
  #
  
 -64bit/libcups.so.2:	$(LIB64OBJS)
 +64bit/libcups.so.${LIBcups_VERSION}:	$(LIB64OBJS)
  	echo Linking 64-bit $@...
  	-mkdir 64bit
- 	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+ 	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
  	$(RM) 64bit/libcups.so
 -	$(LN) libcups.so.2 64bit/libcups.so
 +	$(LN) libcups.so.${LIBcups_VERSION} 64bit/libcups.so
diff --git a/print/cups/patches/patch-desktop_cups_desktop b/print/cups/patches/patch-desktop_cups_desktop
index 70d9c706315..2a615a1dcaf 100644
--- a/print/cups/patches/patch-desktop_cups_desktop
+++ b/print/cups/patches/patch-desktop_cups_desktop
@@ -1,19 +1,20 @@
-$OpenBSD: patch-desktop_cups_desktop,v 1.3 2009/03/04 19:50:00 jasper Exp $
---- desktop/cups.desktop.orig	Thu Nov 16 14:34:44 2006
-+++ desktop/cups.desktop	Fri Feb 27 11:23:26 2009
-@@ -1,7 +1,7 @@
+$OpenBSD: patch-desktop_cups_desktop,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- desktop/cups.desktop.orig	Sat Sep  6 02:30:39 2008
++++ desktop/cups.desktop	Tue Mar 17 16:41:22 2009
+@@ -1,6 +1,6 @@
  [Desktop Entry]
- Categories=Application;System;X-Red-Hat-Base;
- Encoding=UTF-8
+ Categories=System;Printing;HardwareSettings;X-Red-Hat-Base;
 -Exec=htmlview http://localhost:631/
 +Exec=xdg-open http://localhost:631/
- GenericName=
  Icon=cups
- MimeType=
-@@ -24,4 +24,4 @@ Comment[et]=CUPS-i veebiliides
- Name[pl]=Zarządzanie drukowaniem
- Comment[pl]=Interfejs WWW CUPS
- Name[it]=Gestione stampa
--Comment[it]=Interfaccia web di CUPS
-\ No newline at end of file
+ StartupNotify=false
+ Terminal=false
+@@ -24,7 +24,7 @@ Comment[id.UTF-8]=Antarmuka Web CUPS
+ Name[it.UTF-8]=Gestione stampa
+ Comment[it.UTF-8]=Interfaccia web di CUPS
+ Name[ja.UTF-8]=印刷の管理
+-Comment[ja.UTF-8]=CUPS Web インタフェース
 +Comment[it]=Interfaccia web di CUPS
+ Name[pl.UTF-8]=Zarządzanie drukowaniem
+ Comment[pl.UTF-8]=Interfejs WWW CUPS
+ Name[zh.UTF-8]=打印机管理
diff --git a/print/cups/patches/patch-filter_Makefile b/print/cups/patches/patch-filter_Makefile
index f058042ce9c..b2ef51045cd 100644
--- a/print/cups/patches/patch-filter_Makefile
+++ b/print/cups/patches/patch-filter_Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
---- filter/Makefile.orig	Wed Jun 14 23:03:17 2006
-+++ filter/Makefile	Mon May  7 15:47:41 2007
-@@ -65,7 +65,7 @@ all:	$(TARGETS)
+$OpenBSD: patch-filter_Makefile,v 1.5 2009/04/27 08:25:39 bernd Exp $
+--- filter/Makefile.orig	Sat Sep  6 02:30:39 2008
++++ filter/Makefile	Tue Mar 17 16:21:50 2009
+@@ -57,7 +57,7 @@ all:	$(TARGETS)
  
  clean:
  	$(RM) $(OBJS) $(TARGETS)
@@ -10,7 +10,7 @@ $OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
  	$(RM) -r 32bit 64bit
  
  
-@@ -96,9 +96,9 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32)
+@@ -88,9 +88,9 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32)
  	$(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
  	$(INSTALL_DIR) -m 755 $(LIBDIR)
  	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
@@ -23,7 +23,7 @@ $OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
  	fi
  	-if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
  		$(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
-@@ -118,13 +118,13 @@ installhdrs:
+@@ -116,13 +116,13 @@ installhdrs:
  
  install32bit:
  	$(INSTALL_DIR) -m 755 $(LIB32DIR)
@@ -41,7 +41,7 @@ $OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
  
  
  #
-@@ -145,7 +145,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
+@@ -143,7 +143,7 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
  	$(RM) $(LIBDIR)/libcupsimage.sl
  	$(RM) $(LIBDIR)/libcupsimage.sl.2
  	$(RM) $(LIBDIR)/libcupsimage.so
@@ -50,7 +50,7 @@ $OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
  	-$(RMDIR) $(LIBDIR)
  	$(RM) $(INCLUDEDIR)/cups/image.h
  	$(RM) $(INCLUDEDIR)/cups/raster.h
-@@ -153,12 +153,12 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
+@@ -151,12 +151,12 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
  
  uninstall32bit:
  	$(RM) $(LIB32DIR)/libcupsimage.so
@@ -65,7 +65,7 @@ $OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
  	-$(RMDIR) $(LIB64DIR)
  
  
-@@ -201,22 +201,22 @@ hpgltops:	$(HPGLOBJS) common.o ../cups/$(LIBCUPS)
+@@ -199,22 +199,22 @@ hpgltops:	$(HPGLOBJS) common.o ../cups/$(LIBCUPS)
  
  
  #
@@ -94,7 +94,7 @@ $OpenBSD: patch-filter_Makefile,v 1.4 2007/05/07 13:58:07 ajacoutot Exp $
  	echo Linking 32-bit $@...
  	-mkdir 32bit
  	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
-@@ -224,10 +224,10 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
+@@ -222,10 +222,10 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
  
  
  #
diff --git a/print/cups/patches/patch-filter_imagetops_c b/print/cups/patches/patch-filter_imagetops_c
index 0a1e9137b13..276bdfe94a7 100644
--- a/print/cups/patches/patch-filter_imagetops_c
+++ b/print/cups/patches/patch-filter_imagetops_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-filter_imagetops_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
---- filter/imagetops.c.orig	Mon Oct  2 18:26:04 2006
-+++ filter/imagetops.c	Mon May  7 15:47:41 2007
-@@ -166,6 +166,8 @@ main(int  argc,				/* I - Number of command-line argum
+$OpenBSD: patch-filter_imagetops_c,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- filter/imagetops.c.orig	Sat Jul 12 00:48:49 2008
++++ filter/imagetops.c	Tue Mar 17 16:21:50 2009
+@@ -156,6 +156,8 @@ main(int  argc,				/* I - Number of command-line argum
    sat  = 100;
    g    = 1.0;
    b    = 1.0;
diff --git a/print/cups/patches/patch-filter_imagetoraster_c b/print/cups/patches/patch-filter_imagetoraster_c
index 59644d0d1c5..96855420dac 100644
--- a/print/cups/patches/patch-filter_imagetoraster_c
+++ b/print/cups/patches/patch-filter_imagetoraster_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-filter_imagetoraster_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
---- filter/imagetoraster.c.orig	Mon May 15 07:02:15 2006
-+++ filter/imagetoraster.c	Mon May  7 15:47:41 2007
-@@ -258,7 +258,7 @@ main(int  argc,				/* I - Number of command-line argum
+$OpenBSD: patch-filter_imagetoraster_c,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- filter/imagetoraster.c.orig	Sat Jul 12 00:48:49 2008
++++ filter/imagetoraster.c	Tue Mar 17 16:21:50 2009
+@@ -248,7 +248,7 @@ main(int  argc,				/* I - Number of command-line argum
        close(mypipes[1]);
  
        execlp("pstoraster", argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
@@ -10,7 +10,7 @@ $OpenBSD: patch-filter_imagetoraster_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
        perror("ERROR: Unable to exec pstoraster");
        return (errno);
      }
-@@ -287,7 +287,7 @@ main(int  argc,				/* I - Number of command-line argum
+@@ -277,7 +277,7 @@ main(int  argc,				/* I - Number of command-line argum
      */
  
      execlp("imagetops", argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
diff --git a/print/cups/patches/patch-init_cups_sh_in b/print/cups/patches/patch-init_cups_sh_in
index 056f3e5e00c..ab5ad7bbd84 100644
--- a/print/cups/patches/patch-init_cups_sh_in
+++ b/print/cups/patches/patch-init_cups_sh_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-init_cups_sh_in,v 1.1 2006/10/01 10:43:38 mbalmer Exp $
---- init/cups.sh.in.orig	Wed Sep 20 11:48:50 2006
-+++ init/cups.sh.in	Wed Sep 20 11:50:07 2006
-@@ -91,6 +91,16 @@ case "`uname`" in
+$OpenBSD: patch-init_cups_sh_in,v 1.2 2009/04/27 08:25:39 bernd Exp $
+--- init/cups.sh.in.orig	Wed Jul 11 23:46:42 2007
++++ init/cups.sh.in	Tue Mar 17 16:21:50 2009
+@@ -82,6 +82,16 @@ case "`uname`" in
  		fi
  		;;
  
diff --git a/print/cups/patches/patch-notifier_Makefile b/print/cups/patches/patch-notifier_Makefile
new file mode 100644
index 00000000000..b3b9ea3ce7c
--- /dev/null
+++ b/print/cups/patches/patch-notifier_Makefile
@@ -0,0 +1,22 @@
+$OpenBSD: patch-notifier_Makefile,v 1.1 2009/04/27 08:25:39 bernd Exp $
+--- notifier/Makefile.orig	Mon Jul 28 23:14:43 2008
++++ notifier/Makefile	Tue Mar 17 17:34:02 2009
+@@ -43,12 +43,12 @@ install:	all
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/notifier
+ 	$(INSTALL_BIN) mailto $(SERVERBIN)/notifier
+ 	$(INSTALL_BIN) rss $(SERVERBIN)/notifier
+-	$(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
+-	-chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
+-	if test "x$(SYMROOT)" != "x"; then \
+-		$(INSTALL_DIR) $(SYMROOT); \
+-		cp mailto rss $(SYMROOT); \
+-	fi
++#	$(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
++#	-chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
++#	if test "x$(SYMROOT)" != "x"; then \
++#		$(INSTALL_DIR) $(SYMROOT); \
++#		cp mailto rss $(SYMROOT); \
++#	fi
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-pdftops_Stream_cxx b/print/cups/patches/patch-pdftops_Stream_cxx
deleted file mode 100644
index 74a701b5590..00000000000
--- a/print/cups/patches/patch-pdftops_Stream_cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-pdftops_Stream_cxx,v 1.3 2007/08/03 20:51:42 kili Exp $
-
-Fix for CVE-2007-3387.
-
---- pdftops/Stream.cxx.orig	Mon Feb 13 04:08:11 2006
-+++ pdftops/Stream.cxx	Fri Aug  3 21:53:53 2007
-@@ -411,15 +411,13 @@ StreamPredictor::StreamPredictor(Stream *strA, int pre
-   ok = gFalse;
- 
-   nVals = width * nComps;
--  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
--      nComps >= INT_MAX / nBits ||
--      width >= INT_MAX / nComps / nBits ||
--      nVals * nBits + 7 < 0) {
--    return;
--  }
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
--  if (rowBytes <= 0) {
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps > gfxColorMaxComps ||
-+      nBits > 16 ||
-+      width >= INT_MAX / nComps ||      // check for overflow in nVals
-+      nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes
-     return;
-   }
-   predLine = (Guchar *)gmalloc(rowBytes);
diff --git a/print/cups/patches/patch-scheduler_Makefile b/print/cups/patches/patch-scheduler_Makefile
index 9d58f4f2bb0..cc402f38aa8 100644
--- a/print/cups/patches/patch-scheduler_Makefile
+++ b/print/cups/patches/patch-scheduler_Makefile
@@ -1,15 +1,21 @@
-$OpenBSD: patch-scheduler_Makefile,v 1.3 2006/10/01 16:02:24 mbalmer Exp $
---- scheduler/Makefile.orig	Mon Sep 11 20:30:09 2006
-+++ scheduler/Makefile	Sun Oct  1 17:53:39 2006
-@@ -134,22 +134,22 @@ install:	all
- 	echo Creating $(SERVERROOT)/ssl...
- 	$(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl
- 	-chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl
--	echo Creating $(STATEDIR)...
--	$(INSTALL_DIR) -m 755 $(STATEDIR)
--	echo Creating $(STATEDIR)/certs...
--	$(INSTALL_DIR) -m 511 $(STATEDIR)/certs
--	-chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs
+$OpenBSD: patch-scheduler_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- scheduler/Makefile.orig	Thu Aug 16 20:44:46 2007
++++ scheduler/Makefile	Tue Mar 17 16:35:21 2009
+@@ -135,23 +135,23 @@ install:	all
+ 		echo Creating $(SERVERROOT)/ssl...; \
+ 		$(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl; \
+ 		chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl || true; \
+-		echo Creating $(STATEDIR)...; \
+-		$(INSTALL_DIR) -m 755 $(STATEDIR); \
+-		echo Creating $(STATEDIR)/certs...; \
+-		$(INSTALL_DIR) -m 511 $(STATEDIR)/certs; \
+-		chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs || true; \
++		echo Creating $(DESTDIR)$(STATEDIR)...; \
++		$(INSTALL_DIR) -m 755 $(DESTDIR)$(STATEDIR); \
++		echo Creating $(DESTDIR)$(STATEDIR)/certs...; \
++		$(INSTALL_DIR) -m 511 $(DESTDIR)$(STATEDIR)/certs; \
++		chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(DESTDIR)$(STATEDIR)/certs || true; \
+ 	fi
 -	echo Creating $(LOGDIR)...
 -	$(INSTALL_DIR) -m 755 $(LOGDIR)
 -	echo Creating $(REQUESTS)...
@@ -21,11 +27,6 @@ $OpenBSD: patch-scheduler_Makefile,v 1.3 2006/10/01 16:02:24 mbalmer Exp $
 -	echo Creating $(CACHEDIR)...
 -	$(INSTALL_DIR) -m 775 $(CACHEDIR)
 -	-chgrp $(CUPS_GROUP) $(CACHEDIR)
-+	echo Creating $(DESTDIR)$(STATEDIR)...
-+	$(INSTALL_DIR) -m 755 $(DESTDIR)$(STATEDIR)
-+	echo Creating $(DESTDIR)$(STATEDIR)/certs...
-+	$(INSTALL_DIR) -m 511 $(DESTDIR)$(STATEDIR)/certs
-+	-chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(DESTDIR)$(STATEDIR)/certs
 +#	echo Creating $(LOGDIR)...
 +#	$(INSTALL_DIR) -m 755 $(LOGDIR)
 +#	echo Creating $(REQUESTS)...
diff --git a/print/cups/patches/patch-scheduler_cups-driverd_c b/print/cups/patches/patch-scheduler_cups-driverd_c
index ac52fd56a07..2c57ea76ae5 100644
--- a/print/cups/patches/patch-scheduler_cups-driverd_c
+++ b/print/cups/patches/patch-scheduler_cups-driverd_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-scheduler_cups-driverd_c,v 1.2 2007/05/07 13:58:07 ajacoutot Exp $
---- scheduler/cups-driverd.c.orig	Tue Apr 18 17:16:00 2006
-+++ scheduler/cups-driverd.c	Mon May  7 15:47:41 2007
-@@ -267,7 +267,7 @@ cat_ppd(const char *name)		/* I - PPD name */
-     * Yes, let it cat the PPD file...
-     */
+$OpenBSD: patch-scheduler_cups-driverd_c,v 1.3 2009/04/27 08:25:39 bernd Exp $
+--- scheduler/cups-driverd.c.orig	Mon Jun 16 19:57:44 2008
++++ scheduler/cups-driverd.c	Tue Mar 17 16:36:22 2009
+@@ -350,7 +350,7 @@ cat_ppd(const char *name,		/* I - PPD name */
+     argv[0] = scheme;
+     argv[1] = (char *)"cat";
+     argv[2] = (char *)name;
+-    argv[3] = NULL;
++    argv[3] = (char *)0;
  
--    if (execl(line, scheme, "cat", name, (char *)NULL))
-+    if (execl(line, scheme, "cat", name, (char *)0))
+     if (cupsdExec(line, argv))
      {
-      /*
-       * Unable to execute driver...
diff --git a/print/cups/patches/patch-scheduler_ipp_c b/print/cups/patches/patch-scheduler_ipp_c
deleted file mode 100644
index 772b517ba4c..00000000000
--- a/print/cups/patches/patch-scheduler_ipp_c
+++ /dev/null
@@ -1,60 +0,0 @@
-$OpenBSD: patch-scheduler_ipp_c,v 1.1 2009/03/04 19:50:00 jasper Exp $
-
-Security fix for CVE-2008-5183.
-Patch adapted from Red Hat's solution.
-
---- scheduler/ipp.c.orig	Fri Oct 20 22:35:41 2006
-+++ scheduler/ipp.c	Fri Feb 27 11:32:27 2009
-@@ -1888,24 +1888,25 @@ add_job_subscriptions(
-     if (mask == CUPSD_EVENT_NONE)
-       mask = CUPSD_EVENT_JOB_COMPLETED;
- 
--    sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job, recipient,
--                               0);
-+    if ((sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job,
-+                                    recipient, 0)) != NULL)
-+    {
-+      sub->interval = interval;
- 
--    sub->interval = interval;
-+      cupsdSetString(&sub->owner, job->username);
- 
--    cupsdSetString(&sub->owner, job->username);
-+      if (user_data)
-+      {
-+	sub->user_data_len = user_data->values[0].unknown.length;
-+	memcpy(sub->user_data, user_data->values[0].unknown.data,
-+	       sub->user_data_len);
-+      }
- 
--    if (user_data)
--    {
--      sub->user_data_len = user_data->values[0].unknown.length;
--      memcpy(sub->user_data, user_data->values[0].unknown.data,
--             sub->user_data_len);
-+      ippAddSeparator(con->response);
-+      ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
-+		    "notify-subscription-id", sub->id);
-     }
- 
--    ippAddSeparator(con->response);
--    ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
--                  "notify-subscription-id", sub->id);
--
-     if (attr)
-       attr = attr->next;
-   }
-@@ -4939,7 +4940,12 @@ create_subscription(
-     else
-       job = NULL;
- 
--    sub = cupsdAddSubscription(mask, printer, job, recipient, 0);
-+    if ((sub = cupsdAddSubscription(mask, printer, job, recipient, 0)) == NULL)
-+    {
-+      send_ipp_status(con, IPP_TOO_MANY_SUBSCRIPTIONS,
-+		      _("There are too many subscriptions."));
-+      return;
-+    }
- 
-     if (job)
-       cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for job %d",
diff --git a/print/cups/patches/patch-scheduler_subscriptions_c b/print/cups/patches/patch-scheduler_subscriptions_c
deleted file mode 100644
index 6f0fdc52c47..00000000000
--- a/print/cups/patches/patch-scheduler_subscriptions_c
+++ /dev/null
@@ -1,63 +0,0 @@
-$OpenBSD: patch-scheduler_subscriptions_c,v 1.1 2009/03/04 19:50:00 jasper Exp $
-
-Security fix for CVE-2008-5183.
-Patch adapted from Red Hat's solution.
-
---- scheduler/subscriptions.c.orig	Fri Sep 29 04:26:29 2006
-+++ scheduler/subscriptions.c	Fri Feb 27 11:31:46 2009
-@@ -349,8 +349,54 @@ cupsdAddSubscription(
-   * Limit the number of subscriptions...
-   */
- 
--  if (cupsArrayCount(Subscriptions) >= MaxSubscriptions)
-+  if (MaxSubscriptions > 0 && cupsArrayCount(Subscriptions) >= MaxSubscriptions)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                    "cupsdAddSubscription: Reached MaxSubscriptions %d",
-+		    MaxSubscriptions);
-     return (NULL);
-+  }
-+
-+  if (MaxSubscriptionsPerJob > 0 && job)
-+  {
-+    int        count;			       /* Number of job subscriptions */
-+
-+    for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
-+	     count = 0;
-+	 temp;
-+	temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
-+      if (temp->job == job)
-+	count ++;
-+
-+    if (count >= MaxSubscriptionsPerJob)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		     "cupsdAddSubscription: Reached MaxSubscriptionsPerJob %d "
-+		     "for job #%d", MaxSubscriptionsPerJob, job->id);
-+      return (NULL);
-+    }
-+  }
-+
-+  if (MaxSubscriptionsPerPrinter > 0 && dest)
-+  {
-+    int        count;			       /* Number of printer subscriptions */
-+
-+    for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
-+	     count = 0;
-+	 temp;
-+	temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
-+      if (temp->dest == dest)
-+	count ++;
-+
-+    if (count >= MaxSubscriptionsPerPrinter)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		     "cupsdAddSubscription: Reached "
-+		     "MaxSubscriptionsPerPrinter %d for %s",
-+		     MaxSubscriptionsPerPrinter, dest->name);
-+      return (NULL);
-+    }
-+  }
- 
-  /*
-   * Allocate memory for this subscription...
diff --git a/print/cups/patches/patch-systemv_Makefile b/print/cups/patches/patch-systemv_Makefile
index db1ec7abcbf..4b8cdbc2949 100644
--- a/print/cups/patches/patch-systemv_Makefile
+++ b/print/cups/patches/patch-systemv_Makefile
@@ -1,12 +1,12 @@
-$OpenBSD: patch-systemv_Makefile,v 1.3 2006/11/07 11:20:49 mbalmer Exp $
---- systemv/Makefile.orig	Tue Nov  7 12:17:19 2006
-+++ systemv/Makefile	Tue Nov  7 12:17:44 2006
-@@ -78,7 +78,7 @@ install:	all
+$OpenBSD: patch-systemv_Makefile,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- systemv/Makefile.orig	Wed Jul 11 23:46:42 2007
++++ systemv/Makefile	Tue Mar 17 16:37:06 2009
+@@ -70,7 +70,7 @@ install:	all
  	$(INSTALL_BIN) lp $(BINDIR)
  	$(INSTALL_BIN) lpoptions $(BINDIR)
  	$(INSTALL_BIN) lpstat $(BINDIR)
 -	$(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
 +	$(INSTALL_BIN) lppasswd $(BINDIR)
- 
- 
- #
+ 	if test "x$(SYMROOT)" != "x"; then \
+ 		$(INSTALL_DIR) $(SYMROOT); \
+ 		for file in $(TARGETS); do \
diff --git a/print/cups/patches/patch-systemv_lpadmin_c b/print/cups/patches/patch-systemv_lpadmin_c
index c94d90ad533..035779a006a 100644
--- a/print/cups/patches/patch-systemv_lpadmin_c
+++ b/print/cups/patches/patch-systemv_lpadmin_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-systemv_lpadmin_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
---- systemv/lpadmin.c.orig	Tue Sep  5 22:45:47 2006
-+++ systemv/lpadmin.c	Mon May  7 15:47:41 2007
-@@ -1963,14 +1963,14 @@ set_printer_options(
+$OpenBSD: patch-systemv_lpadmin_c,v 1.4 2009/04/27 08:25:39 bernd Exp $
+--- systemv/lpadmin.c.orig	Sat Jul 12 00:48:49 2008
++++ systemv/lpadmin.c	Tue Mar 17 16:21:50 2009
+@@ -1956,14 +1956,14 @@ set_printer_options(
  static int				/* O - 0 if name is no good, 1 if name is good */
  validate_name(const char *name)		/* I - Name to check */
  {
@@ -18,7 +18,7 @@ $OpenBSD: patch-systemv_lpadmin_c,v 1.3 2007/05/07 13:58:07 ajacoutot Exp $
      if (*ptr == '@')
        break;
      else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' ||
-@@ -1981,7 +1981,7 @@ validate_name(const char *name)		/* I - Name to check 
+@@ -1974,7 +1974,7 @@ validate_name(const char *name)		/* I - Name to check 
    * All the characters are good; validate the length, too...
    */
  
diff --git a/print/cups/patches/patch-test_4_4-subscription-ops_test b/print/cups/patches/patch-test_4_4-subscription-ops_test
index 682332f4a51..8d78ef18f49 100644
--- a/print/cups/patches/patch-test_4_4-subscription-ops_test
+++ b/print/cups/patches/patch-test_4_4-subscription-ops_test
@@ -1,41 +1,36 @@
-$OpenBSD: patch-test_4_4-subscription-ops_test,v 1.1 2009/03/04 19:50:00 jasper Exp $
-
-Security fix for CVE-2008-5183.
-Patch adapted from Red Hat's solution.
-
-*** test/4.4-subscription-ops.test.orig	Wed Aug 16 22:05:58 2006
---- test/4.4-subscription-ops.test	Fri Feb 27 11:26:51 2009
-***************
-*** 117,120 ****
---- 117,147 ----
-  	DISPLAY notify-events
-  }
-+ {
-+        # The name of the test...
-+        NAME "Check MaxSubscriptions limits"
-+ 
-+        # The operation to use
-+        OPERATION Create-Printer-Subscription
-+        RESOURCE /
-+ 
-+        # The attributes to send
-+        GROUP operation
-+        ATTR charset attributes-charset utf-8
-+        ATTR language attributes-natural-language en
-+        ATTR uri printer-uri $method://$hostname:$port/printers/Test1
-+ 
-+ 	GROUP subscription
-+        ATTR uri notify-recipient-uri testnotify://
-+        ATTR keyword notify-events printer-state-changed
-+        ATTR integer notify-lease-duration 5
-+ 
-+        # What statuses are OK?
-+        STATUS client-error-too-many-subscriptions
-+ 
-+        # What attributes do we expect?
-+        EXPECT attributes-charset
-+        EXPECT attributes-natural-language
-+ }
-+ 
-  
-  #
+$OpenBSD: patch-test_4_4-subscription-ops_test,v 1.2 2009/04/27 08:25:39 bernd Exp $
+--- test/4.4-subscription-ops.test.orig	Wed Nov 19 20:50:56 2008
++++ test/4.4-subscription-ops.test	Mon Apr 27 10:16:38 2009
+@@ -142,6 +142,33 @@
+ 	EXPECT attributes-charset
+ 	EXPECT attributes-natural-language
+ }
++{
++       # The name of the test...
++       NAME "Check MaxSubscriptions limits"
++
++       # The operation to use
++       OPERATION Create-Printer-Subscription
++       RESOURCE /
++
++       # The attributes to send
++       GROUP operation
++       ATTR charset attributes-charset utf-8
++       ATTR language attributes-natural-language en
++       ATTR uri printer-uri $method://$hostname:$port/printers/Test1
++
++	GROUP subscription
++       ATTR uri notify-recipient-uri testnotify://
++       ATTR keyword notify-events printer-state-changed
++       ATTR integer notify-lease-duration 5
++
++       # What statuses are OK?
++       STATUS client-error-too-many-subscriptions
++
++       # What attributes do we expect?
++       EXPECT attributes-charset
++       EXPECT attributes-natural-language
++}
++
+ 
+ #
diff --git a/print/cups/patches/patch-test_run-stp-tests_sh b/print/cups/patches/patch-test_run-stp-tests_sh
index 0bc9a9bd85d..ea5a91c6c62 100644
--- a/print/cups/patches/patch-test_run-stp-tests_sh
+++ b/print/cups/patches/patch-test_run-stp-tests_sh
@@ -1,12 +1,12 @@
-$OpenBSD: patch-test_run-stp-tests_sh,v 1.4 2009/03/04 19:50:00 jasper Exp $
+$OpenBSD: patch-test_run-stp-tests_sh,v 1.5 2009/04/27 08:25:39 bernd Exp $
 
 Second chunk of this patch:
 Security fix for CVE-2008-5183.
 Patch adapted from Red Hat's solution.
 
---- test/run-stp-tests.sh.orig	Wed Nov 15 21:37:45 2006
-+++ test/run-stp-tests.sh	Fri Feb 27 11:25:28 2009
-@@ -30,7 +30,7 @@ argcount=$#
+--- test/run-stp-tests.sh.orig	Wed Nov 19 20:50:56 2008
++++ test/run-stp-tests.sh	Sat Apr 18 00:50:57 2009
+@@ -21,7 +21,7 @@ argcount=$#
  # Make the IPP test program...
  #
  
@@ -15,15 +15,7 @@ Patch adapted from Red Hat's solution.
  
  #
  # Figure out the proper echo options...
-@@ -294,6 +294,7 @@ FontPath /tmp/cups-$user/share/fonts
- DocumentRoot $root/doc
- RequestRoot /tmp/cups-$user/spool
- TempDir /tmp/cups-$user/spool/temp
-+MaxSubscriptions 3
- MaxLogSize 0
- AccessLog /tmp/cups-$user/log/access_log
- ErrorLog /tmp/cups-$user/log/error_log
-@@ -373,7 +374,7 @@ fi
+@@ -387,7 +387,7 @@ fi
  
  export LD_LIBRARY_PATH
  
diff --git a/print/cups/pkg/MESSAGE b/print/cups/pkg/MESSAGE
index 367e64e4e6c..baab24190e0 100644
--- a/print/cups/pkg/MESSAGE
+++ b/print/cups/pkg/MESSAGE
@@ -15,7 +15,7 @@ Starting cupsd will overwrite /etc/printcap. A backup copy of this file
 is saved as /etc/printcap.pre-cups by '${PREFIX}/sbin/cups-enable'
 and will be restored when you run '${PREFIX}/sbin/cups-disable'.
 
-If you want to use CUPS bundled PPD files (i.e. drivers), you'll need to
-install ghostscript.  Also if you want to print on non-PostScript
-printers, you will most probably want to install the foomatic-filters
-package which provides a universal filter script.
+If you want to print to non-Postscript printers or use CUPS bundled PPD
+files (i.e. drivers), you'll need to install ghostscript.  You will also
+most probably want to install the foomatic-filters package which
+provides a universal filter script.
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index 8760301838a..4c1a119feb4 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2009/03/23 15:04:41 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.18 2009/04/27 08:25:39 bernd Exp $
 @conflict LPRng-*
 @newgroup _cups:541
 @newuser _cups:541:541:daemon:CUPS:/nonexistent:/sbin/nologin
@@ -22,13 +22,12 @@ include/cups/cups.h
 include/cups/dir.h
 include/cups/file.h
 include/cups/http.h
-include/cups/i18n.h
 include/cups/image.h
 include/cups/ipp.h
 include/cups/language.h
-include/cups/md5.h
 include/cups/ppd.h
 include/cups/raster.h
+include/cups/sidechannel.h
 include/cups/transcode.h
 libexec/cups/
 libexec/cups/backend/
@@ -70,7 +69,7 @@ libexec/cups/monitor/
 @bin libexec/cups/monitor/tbcp
 libexec/cups/notifier/
 @bin libexec/cups/notifier/mailto
-@bin libexec/cups/notifier/testnotify
+@bin libexec/cups/notifier/rss
 @man man/man1/cancel.1
 @man man/man1/cups-config.1
 @man man/man1/cupstestdsc.1
@@ -99,9 +98,11 @@ libexec/cups/notifier/
 @man man/man8/cups-lpd.8
 @man man/man8/cups-polld.8
 @man man/man8/cupsaddsmb.8
+@man man/man8/cupsctl.8
 @man man/man8/cupsd.8
 @man man/man8/cupsdisable.8
 @man man/man8/cupsenable.8
+@man man/man8/cupsfilter.8
 @man man/man8/lpadmin.8
 @man man/man8/lpc.8
 @man man/man8/lpinfo.8
@@ -113,9 +114,11 @@ sbin/cups-disable
 sbin/cups-enable
 @mode
 @bin sbin/cupsaddsmb
+@bin sbin/cupsctl
 @bin sbin/cupsd
 sbin/cupsdisable
 sbin/cupsenable
+@bin sbin/cupsfilter
 @bin sbin/lpadmin
 @bin sbin/lpc
 @bin sbin/lpinfo
@@ -150,6 +153,7 @@ share/cups/charmaps/iso-8859-6.txt
 share/cups/charmaps/iso-8859-7.txt
 share/cups/charmaps/iso-8859-8.txt
 share/cups/charmaps/iso-8859-9.txt
+share/cups/charmaps/jis-x0213.txt
 share/cups/charmaps/koi8-r.txt
 share/cups/charmaps/koi8-u.txt
 share/cups/charmaps/mac-roman.txt
@@ -169,32 +173,7 @@ share/cups/charmaps/windows-936.txt
 share/cups/charmaps/windows-949.txt
 share/cups/charmaps/windows-950.txt
 share/cups/charsets/
-share/cups/charsets/iso-8859-1
-share/cups/charsets/iso-8859-10
-share/cups/charsets/iso-8859-13
-share/cups/charsets/iso-8859-14
-share/cups/charsets/iso-8859-15
-share/cups/charsets/iso-8859-2
-share/cups/charsets/iso-8859-3
-share/cups/charsets/iso-8859-4
-share/cups/charsets/iso-8859-5
-share/cups/charsets/iso-8859-6
-share/cups/charsets/iso-8859-7
-share/cups/charsets/iso-8859-8
-share/cups/charsets/iso-8859-9
-share/cups/charsets/koi8-r
-share/cups/charsets/koi8-u
 share/cups/charsets/utf-8
-share/cups/charsets/windows-1250
-share/cups/charsets/windows-1251
-share/cups/charsets/windows-1252
-share/cups/charsets/windows-1253
-share/cups/charsets/windows-1254
-share/cups/charsets/windows-1255
-share/cups/charsets/windows-1256
-share/cups/charsets/windows-1257
-share/cups/charsets/windows-1258
-share/cups/charsets/windows-874
 share/cups/data/
 share/cups/data/HPGLprolog
 share/cups/data/psglyphs
@@ -208,10 +187,10 @@ share/cups/fonts/Symbol
 share/cups/init
 share/cups/model/
 share/cups/model/deskjet.ppd
-share/cups/model/deskjet2.ppd
 share/cups/model/dymo.ppd
 share/cups/model/epson24.ppd
 share/cups/model/epson9.ppd
+share/cups/model/intelbar.ppd
 share/cups/model/laserjet.ppd
 share/cups/model/okidat24.ppd
 share/cups/model/okidata9.ppd
@@ -220,12 +199,14 @@ share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
 share/cups/model/stphoto2.ppd
 share/cups/model/zebra.ppd
+share/cups/model/zebracpl.ppd
 share/cups/model/zebraep1.ppd
 share/cups/model/zebraep2.ppd
 share/cups/profiles/
 share/cups/templates/
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
+share/cups/templates/add-rss-subscription.tmpl
 share/cups/templates/admin.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
@@ -242,6 +223,7 @@ share/cups/templates/classes.tmpl
 share/cups/templates/de/
 share/cups/templates/de/add-class.tmpl
 share/cups/templates/de/add-printer.tmpl
+share/cups/templates/de/add-rss-subscription.tmpl
 share/cups/templates/de/admin.tmpl
 share/cups/templates/de/choose-device.tmpl
 share/cups/templates/de/choose-make.tmpl
@@ -269,6 +251,7 @@ share/cups/templates/de/job-release.tmpl
 share/cups/templates/de/job-restart.tmpl
 share/cups/templates/de/jobs-header.tmpl
 share/cups/templates/de/jobs.tmpl
+share/cups/templates/de/list-available-printers.tmpl
 share/cups/templates/de/maintenance.tmpl
 share/cups/templates/de/modify-class.tmpl
 share/cups/templates/de/modify-printer.tmpl
@@ -299,6 +282,8 @@ share/cups/templates/de/samba-exported.tmpl
 share/cups/templates/de/search.tmpl
 share/cups/templates/de/set-printer-options-header.tmpl
 share/cups/templates/de/set-printer-options-trailer.tmpl
+share/cups/templates/de/subscription-added.tmpl
+share/cups/templates/de/subscription-canceled.tmpl
 share/cups/templates/de/test-page.tmpl
 share/cups/templates/de/trailer.tmpl
 share/cups/templates/de/users.tmpl
@@ -308,6 +293,7 @@ share/cups/templates/error.tmpl
 share/cups/templates/es/
 share/cups/templates/es/add-class.tmpl
 share/cups/templates/es/add-printer.tmpl
+share/cups/templates/es/add-rss-subscription.tmpl
 share/cups/templates/es/admin.tmpl
 share/cups/templates/es/choose-device.tmpl
 share/cups/templates/es/choose-make.tmpl
@@ -335,6 +321,7 @@ share/cups/templates/es/job-release.tmpl
 share/cups/templates/es/job-restart.tmpl
 share/cups/templates/es/jobs-header.tmpl
 share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/list-available-printers.tmpl
 share/cups/templates/es/maintenance.tmpl
 share/cups/templates/es/modify-class.tmpl
 share/cups/templates/es/modify-printer.tmpl
@@ -366,6 +353,8 @@ share/cups/templates/es/samba-exported.tmpl
 share/cups/templates/es/search.tmpl
 share/cups/templates/es/set-printer-options-header.tmpl
 share/cups/templates/es/set-printer-options-trailer.tmpl
+share/cups/templates/es/subscription-added.tmpl
+share/cups/templates/es/subscription-canceled.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
 share/cups/templates/es/users.tmpl
@@ -432,9 +421,205 @@ share/cups/templates/et/set-printer-options-trailer.tmpl
 share/cups/templates/et/test-page.tmpl
 share/cups/templates/et/trailer.tmpl
 share/cups/templates/et/users.tmpl
+share/cups/templates/fr/
+share/cups/templates/fr/add-class.tmpl
+share/cups/templates/fr/add-printer.tmpl
+share/cups/templates/fr/admin.tmpl
+share/cups/templates/fr/choose-device.tmpl
+share/cups/templates/fr/choose-make.tmpl
+share/cups/templates/fr/choose-model.tmpl
+share/cups/templates/fr/choose-serial.tmpl
+share/cups/templates/fr/choose-uri.tmpl
+share/cups/templates/fr/class-added.tmpl
+share/cups/templates/fr/class-confirm.tmpl
+share/cups/templates/fr/class-deleted.tmpl
+share/cups/templates/fr/class-jobs-header.tmpl
+share/cups/templates/fr/class-modified.tmpl
+share/cups/templates/fr/classes-header.tmpl
+share/cups/templates/fr/classes.tmpl
+share/cups/templates/fr/edit-config.tmpl
+share/cups/templates/fr/error-op.tmpl
+share/cups/templates/fr/error.tmpl
+share/cups/templates/fr/header.tmpl
+share/cups/templates/fr/help-header.tmpl
+share/cups/templates/fr/help-printable.tmpl
+share/cups/templates/fr/job-cancel.tmpl
+share/cups/templates/fr/job-hold.tmpl
+share/cups/templates/fr/job-move.tmpl
+share/cups/templates/fr/job-moved.tmpl
+share/cups/templates/fr/job-release.tmpl
+share/cups/templates/fr/job-restart.tmpl
+share/cups/templates/fr/jobs-header.tmpl
+share/cups/templates/fr/jobs.tmpl
+share/cups/templates/fr/maintenance.tmpl
+share/cups/templates/fr/modify-class.tmpl
+share/cups/templates/fr/modify-printer.tmpl
+share/cups/templates/fr/norestart.tmpl
+share/cups/templates/fr/option-boolean.tmpl
+share/cups/templates/fr/option-conflict.tmpl
+share/cups/templates/fr/option-header.tmpl
+share/cups/templates/fr/option-pickmany.tmpl
+share/cups/templates/fr/option-pickone.tmpl
+share/cups/templates/fr/option-trailer.tmpl
+share/cups/templates/fr/pager.tmpl
+share/cups/templates/fr/printer-accept.tmpl
+share/cups/templates/fr/printer-added.tmpl
+share/cups/templates/fr/printer-configured.tmpl
+share/cups/templates/fr/printer-confirm.tmpl
+share/cups/templates/fr/printer-default.tmpl
+share/cups/templates/fr/printer-deleted.tmpl
+share/cups/templates/fr/printer-jobs-header.tmpl
+share/cups/templates/fr/printer-modified.tmpl
+share/cups/templates/fr/printer-purge.tmpl
+share/cups/templates/fr/printer-reject.tmpl
+share/cups/templates/fr/printer-start.tmpl
+share/cups/templates/fr/printer-stop.tmpl
+share/cups/templates/fr/printers-header.tmpl
+share/cups/templates/fr/printers.tmpl
+share/cups/templates/fr/restart.tmpl
+share/cups/templates/fr/samba-export.tmpl
+share/cups/templates/fr/samba-exported.tmpl
+share/cups/templates/fr/search.tmpl
+share/cups/templates/fr/set-printer-options-header.tmpl
+share/cups/templates/fr/set-printer-options-trailer.tmpl
+share/cups/templates/fr/test-page.tmpl
+share/cups/templates/fr/trailer.tmpl
+share/cups/templates/fr/users.tmpl
+share/cups/templates/he/
+share/cups/templates/he/add-class.tmpl
+share/cups/templates/he/add-printer.tmpl
+share/cups/templates/he/admin.tmpl
+share/cups/templates/he/choose-device.tmpl
+share/cups/templates/he/choose-make.tmpl
+share/cups/templates/he/choose-model.tmpl
+share/cups/templates/he/choose-serial.tmpl
+share/cups/templates/he/choose-uri.tmpl
+share/cups/templates/he/class-added.tmpl
+share/cups/templates/he/class-confirm.tmpl
+share/cups/templates/he/class-deleted.tmpl
+share/cups/templates/he/class-jobs-header.tmpl
+share/cups/templates/he/class-modified.tmpl
+share/cups/templates/he/classes-header.tmpl
+share/cups/templates/he/classes.tmpl
+share/cups/templates/he/edit-config.tmpl
+share/cups/templates/he/error-op.tmpl
+share/cups/templates/he/error.tmpl
+share/cups/templates/he/header.tmpl
+share/cups/templates/he/help-header.tmpl
+share/cups/templates/he/help-printable.tmpl
+share/cups/templates/he/job-cancel.tmpl
+share/cups/templates/he/job-hold.tmpl
+share/cups/templates/he/job-move.tmpl
+share/cups/templates/he/job-moved.tmpl
+share/cups/templates/he/job-release.tmpl
+share/cups/templates/he/job-restart.tmpl
+share/cups/templates/he/jobs-header.tmpl
+share/cups/templates/he/jobs.tmpl
+share/cups/templates/he/maintenance.tmpl
+share/cups/templates/he/modify-class.tmpl
+share/cups/templates/he/modify-printer.tmpl
+share/cups/templates/he/norestart.tmpl
+share/cups/templates/he/option-boolean.tmpl
+share/cups/templates/he/option-conflict.tmpl
+share/cups/templates/he/option-header.tmpl
+share/cups/templates/he/option-pickmany.tmpl
+share/cups/templates/he/option-pickone.tmpl
+share/cups/templates/he/option-trailer.tmpl
+share/cups/templates/he/pager.tmpl
+share/cups/templates/he/printer-accept.tmpl
+share/cups/templates/he/printer-added.tmpl
+share/cups/templates/he/printer-configured.tmpl
+share/cups/templates/he/printer-confirm.tmpl
+share/cups/templates/he/printer-default.tmpl
+share/cups/templates/he/printer-deleted.tmpl
+share/cups/templates/he/printer-jobs-header.tmpl
+share/cups/templates/he/printer-modified.tmpl
+share/cups/templates/he/printer-purge.tmpl
+share/cups/templates/he/printer-reject.tmpl
+share/cups/templates/he/printer-start.tmpl
+share/cups/templates/he/printer-stop.tmpl
+share/cups/templates/he/printers-header.tmpl
+share/cups/templates/he/printers.tmpl
+share/cups/templates/he/restart.tmpl
+share/cups/templates/he/samba-export.tmpl
+share/cups/templates/he/samba-exported.tmpl
+share/cups/templates/he/search.tmpl
+share/cups/templates/he/set-printer-options-header.tmpl
+share/cups/templates/he/set-printer-options-trailer.tmpl
+share/cups/templates/he/test-page.tmpl
+share/cups/templates/he/trailer.tmpl
+share/cups/templates/he/users.tmpl
 share/cups/templates/header.tmpl
 share/cups/templates/help-header.tmpl
 share/cups/templates/help-printable.tmpl
+share/cups/templates/id/
+share/cups/templates/id/add-class.tmpl
+share/cups/templates/id/add-printer.tmpl
+share/cups/templates/id/add-rss-subscription.tmpl
+share/cups/templates/id/admin.tmpl
+share/cups/templates/id/choose-device.tmpl
+share/cups/templates/id/choose-make.tmpl
+share/cups/templates/id/choose-model.tmpl
+share/cups/templates/id/choose-serial.tmpl
+share/cups/templates/id/choose-uri.tmpl
+share/cups/templates/id/class-added.tmpl
+share/cups/templates/id/class-confirm.tmpl
+share/cups/templates/id/class-deleted.tmpl
+share/cups/templates/id/class-jobs-header.tmpl
+share/cups/templates/id/class-modified.tmpl
+share/cups/templates/id/classes-header.tmpl
+share/cups/templates/id/classes.tmpl
+share/cups/templates/id/edit-config.tmpl
+share/cups/templates/id/error-op.tmpl
+share/cups/templates/id/error.tmpl
+share/cups/templates/id/header.tmpl
+share/cups/templates/id/help-header.tmpl
+share/cups/templates/id/help-printable.tmpl
+share/cups/templates/id/job-cancel.tmpl
+share/cups/templates/id/job-hold.tmpl
+share/cups/templates/id/job-move.tmpl
+share/cups/templates/id/job-moved.tmpl
+share/cups/templates/id/job-release.tmpl
+share/cups/templates/id/job-restart.tmpl
+share/cups/templates/id/jobs-header.tmpl
+share/cups/templates/id/jobs.tmpl
+share/cups/templates/id/list-available-printers.tmpl
+share/cups/templates/id/maintenance.tmpl
+share/cups/templates/id/modify-class.tmpl
+share/cups/templates/id/modify-printer.tmpl
+share/cups/templates/id/norestart.tmpl
+share/cups/templates/id/option-boolean.tmpl
+share/cups/templates/id/option-conflict.tmpl
+share/cups/templates/id/option-header.tmpl
+share/cups/templates/id/option-pickmany.tmpl
+share/cups/templates/id/option-pickone.tmpl
+share/cups/templates/id/option-trailer.tmpl
+share/cups/templates/id/pager.tmpl
+share/cups/templates/id/printer-accept.tmpl
+share/cups/templates/id/printer-added.tmpl
+share/cups/templates/id/printer-configured.tmpl
+share/cups/templates/id/printer-confirm.tmpl
+share/cups/templates/id/printer-default.tmpl
+share/cups/templates/id/printer-deleted.tmpl
+share/cups/templates/id/printer-jobs-header.tmpl
+share/cups/templates/id/printer-modified.tmpl
+share/cups/templates/id/printer-purge.tmpl
+share/cups/templates/id/printer-reject.tmpl
+share/cups/templates/id/printer-start.tmpl
+share/cups/templates/id/printer-stop.tmpl
+share/cups/templates/id/printers-header.tmpl
+share/cups/templates/id/printers.tmpl
+share/cups/templates/id/restart.tmpl
+share/cups/templates/id/samba-export.tmpl
+share/cups/templates/id/samba-exported.tmpl
+share/cups/templates/id/search.tmpl
+share/cups/templates/id/set-printer-options-header.tmpl
+share/cups/templates/id/set-printer-options-trailer.tmpl
+share/cups/templates/id/subscription-added.tmpl
+share/cups/templates/id/subscription-canceled.tmpl
+share/cups/templates/id/test-page.tmpl
+share/cups/templates/id/trailer.tmpl
+share/cups/templates/id/users.tmpl
 share/cups/templates/it/
 share/cups/templates/it/add-class.tmpl
 share/cups/templates/it/add-printer.tmpl
@@ -502,6 +687,7 @@ share/cups/templates/it/users.tmpl
 share/cups/templates/ja/
 share/cups/templates/ja/add-class.tmpl
 share/cups/templates/ja/add-printer.tmpl
+share/cups/templates/ja/add-rss-subscription.tmpl
 share/cups/templates/ja/admin.tmpl
 share/cups/templates/ja/choose-device.tmpl
 share/cups/templates/ja/choose-make.tmpl
@@ -528,9 +714,11 @@ share/cups/templates/ja/job-release.tmpl
 share/cups/templates/ja/job-restart.tmpl
 share/cups/templates/ja/jobs-header.tmpl
 share/cups/templates/ja/jobs.tmpl
+share/cups/templates/ja/list-available-printers.tmpl
 share/cups/templates/ja/maintenance.tmpl
 share/cups/templates/ja/modify-class.tmpl
 share/cups/templates/ja/modify-printer.tmpl
+share/cups/templates/ja/norestart.tmpl
 share/cups/templates/ja/option-conflict.tmpl
 share/cups/templates/ja/option-trailer.tmpl
 share/cups/templates/ja/pager.tmpl
@@ -552,6 +740,8 @@ share/cups/templates/ja/restart.tmpl
 share/cups/templates/ja/samba-export.tmpl
 share/cups/templates/ja/samba-exported.tmpl
 share/cups/templates/ja/search.tmpl
+share/cups/templates/ja/subscription-added.tmpl
+share/cups/templates/ja/subscription-canceled.tmpl
 share/cups/templates/ja/test-page.tmpl
 share/cups/templates/ja/users.tmpl
 share/cups/templates/job-cancel.tmpl
@@ -562,6 +752,7 @@ share/cups/templates/job-release.tmpl
 share/cups/templates/job-restart.tmpl
 share/cups/templates/jobs-header.tmpl
 share/cups/templates/jobs.tmpl
+share/cups/templates/list-available-printers.tmpl
 share/cups/templates/maintenance.tmpl
 share/cups/templates/modify-class.tmpl
 share/cups/templates/modify-printer.tmpl
@@ -656,6 +847,8 @@ share/cups/templates/samba-exported.tmpl
 share/cups/templates/search.tmpl
 share/cups/templates/set-printer-options-header.tmpl
 share/cups/templates/set-printer-options-trailer.tmpl
+share/cups/templates/subscription-added.tmpl
+share/cups/templates/subscription-canceled.tmpl
 share/cups/templates/sv/
 share/cups/templates/sv/add-class.tmpl
 share/cups/templates/sv/add-printer.tmpl
@@ -722,6 +915,69 @@ share/cups/templates/sv/users.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
 share/cups/templates/users.tmpl
+share/cups/templates/zh_TW/
+share/cups/templates/zh_TW/add-class.tmpl
+share/cups/templates/zh_TW/add-printer.tmpl
+share/cups/templates/zh_TW/admin.tmpl
+share/cups/templates/zh_TW/choose-device.tmpl
+share/cups/templates/zh_TW/choose-make.tmpl
+share/cups/templates/zh_TW/choose-model.tmpl
+share/cups/templates/zh_TW/choose-serial.tmpl
+share/cups/templates/zh_TW/choose-uri.tmpl
+share/cups/templates/zh_TW/class-added.tmpl
+share/cups/templates/zh_TW/class-confirm.tmpl
+share/cups/templates/zh_TW/class-deleted.tmpl
+share/cups/templates/zh_TW/class-jobs-header.tmpl
+share/cups/templates/zh_TW/class-modified.tmpl
+share/cups/templates/zh_TW/classes-header.tmpl
+share/cups/templates/zh_TW/classes.tmpl
+share/cups/templates/zh_TW/edit-config.tmpl
+share/cups/templates/zh_TW/error-op.tmpl
+share/cups/templates/zh_TW/error.tmpl
+share/cups/templates/zh_TW/header.tmpl
+share/cups/templates/zh_TW/help-header.tmpl
+share/cups/templates/zh_TW/help-printable.tmpl
+share/cups/templates/zh_TW/job-cancel.tmpl
+share/cups/templates/zh_TW/job-hold.tmpl
+share/cups/templates/zh_TW/job-move.tmpl
+share/cups/templates/zh_TW/job-moved.tmpl
+share/cups/templates/zh_TW/job-release.tmpl
+share/cups/templates/zh_TW/job-restart.tmpl
+share/cups/templates/zh_TW/jobs-header.tmpl
+share/cups/templates/zh_TW/jobs.tmpl
+share/cups/templates/zh_TW/maintenance.tmpl
+share/cups/templates/zh_TW/modify-class.tmpl
+share/cups/templates/zh_TW/modify-printer.tmpl
+share/cups/templates/zh_TW/option-boolean.tmpl
+share/cups/templates/zh_TW/option-conflict.tmpl
+share/cups/templates/zh_TW/option-header.tmpl
+share/cups/templates/zh_TW/option-pickmany.tmpl
+share/cups/templates/zh_TW/option-pickone.tmpl
+share/cups/templates/zh_TW/option-trailer.tmpl
+share/cups/templates/zh_TW/pager.tmpl
+share/cups/templates/zh_TW/printer-accept.tmpl
+share/cups/templates/zh_TW/printer-added.tmpl
+share/cups/templates/zh_TW/printer-configured.tmpl
+share/cups/templates/zh_TW/printer-confirm.tmpl
+share/cups/templates/zh_TW/printer-default.tmpl
+share/cups/templates/zh_TW/printer-deleted.tmpl
+share/cups/templates/zh_TW/printer-jobs-header.tmpl
+share/cups/templates/zh_TW/printer-modified.tmpl
+share/cups/templates/zh_TW/printer-purge.tmpl
+share/cups/templates/zh_TW/printer-reject.tmpl
+share/cups/templates/zh_TW/printer-start.tmpl
+share/cups/templates/zh_TW/printer-stop.tmpl
+share/cups/templates/zh_TW/printers-header.tmpl
+share/cups/templates/zh_TW/printers.tmpl
+share/cups/templates/zh_TW/restart.tmpl
+share/cups/templates/zh_TW/samba-export.tmpl
+share/cups/templates/zh_TW/samba-exported.tmpl
+share/cups/templates/zh_TW/search.tmpl
+share/cups/templates/zh_TW/set-printer-options-header.tmpl
+share/cups/templates/zh_TW/set-printer-options-trailer.tmpl
+share/cups/templates/zh_TW/test-page.tmpl
+share/cups/templates/zh_TW/trailer.tmpl
+share/cups/templates/zh_TW/users.tmpl
 share/doc/cups/
 share/doc/cups/cups-printable.css
 share/doc/cups/cups.css
@@ -730,9 +986,11 @@ share/doc/cups/de/images/
 share/doc/cups/de/images/button-accept-jobs.gif
 share/doc/cups/de/images/button-add-class.gif
 share/doc/cups/de/images/button-add-printer.gif
+share/doc/cups/de/images/button-add-rss-subscription.gif
 share/doc/cups/de/images/button-add-this-printer.gif
 share/doc/cups/de/images/button-cancel-all-jobs.gif
 share/doc/cups/de/images/button-cancel-job.gif
+share/doc/cups/de/images/button-cancel-subscription.gif
 share/doc/cups/de/images/button-change-settings.gif
 share/doc/cups/de/images/button-clean-print-heads.gif
 share/doc/cups/de/images/button-clear.gif
@@ -741,6 +999,7 @@ share/doc/cups/de/images/button-delete-class.gif
 share/doc/cups/de/images/button-delete-printer.gif
 share/doc/cups/de/images/button-edit-configuration-file.gif
 share/doc/cups/de/images/button-export-samba.gif
+share/doc/cups/de/images/button-find-new-printers.gif
 share/doc/cups/de/images/button-help.gif
 share/doc/cups/de/images/button-hold-job.gif
 share/doc/cups/de/images/button-manage-classes.gif
@@ -774,6 +1033,7 @@ share/doc/cups/de/images/button-start-printer.gif
 share/doc/cups/de/images/button-stop-class.gif
 share/doc/cups/de/images/button-stop-printer.gif
 share/doc/cups/de/images/button-unpublish-printer.gif
+share/doc/cups/de/images/button-use-default-config.gif
 share/doc/cups/de/images/button-view-access-log.gif
 share/doc/cups/de/images/button-view-error-log.gif
 share/doc/cups/de/images/button-view-page-log.gif
@@ -784,9 +1044,11 @@ share/doc/cups/es/images/
 share/doc/cups/es/images/button-accept-jobs.gif
 share/doc/cups/es/images/button-add-class.gif
 share/doc/cups/es/images/button-add-printer.gif
+share/doc/cups/es/images/button-add-rss-subscription.gif
 share/doc/cups/es/images/button-add-this-printer.gif
 share/doc/cups/es/images/button-cancel-all-jobs.gif
 share/doc/cups/es/images/button-cancel-job.gif
+share/doc/cups/es/images/button-cancel-subscription.gif
 share/doc/cups/es/images/button-change-settings.gif
 share/doc/cups/es/images/button-clean-print-heads.gif
 share/doc/cups/es/images/button-clear.gif
@@ -795,6 +1057,7 @@ share/doc/cups/es/images/button-delete-class.gif
 share/doc/cups/es/images/button-delete-printer.gif
 share/doc/cups/es/images/button-edit-configuration-file.gif
 share/doc/cups/es/images/button-export-samba.gif
+share/doc/cups/es/images/button-find-new-printers.gif
 share/doc/cups/es/images/button-help.gif
 share/doc/cups/es/images/button-hold-job.gif
 share/doc/cups/es/images/button-manage-classes.gif
@@ -890,7 +1153,120 @@ share/doc/cups/et/images/button-view-page-log.gif
 share/doc/cups/et/images/button-view-printable-version.gif
 share/doc/cups/et/index.html
 share/doc/cups/favicon.ico
+share/doc/cups/fr/
+share/doc/cups/fr/images/
+share/doc/cups/fr/images/button-accept-jobs.gif
+share/doc/cups/fr/images/button-add-class.gif
+share/doc/cups/fr/images/button-add-printer.gif
+share/doc/cups/fr/images/button-add-this-printer.gif
+share/doc/cups/fr/images/button-cancel-all-jobs.gif
+share/doc/cups/fr/images/button-cancel-job.gif
+share/doc/cups/fr/images/button-change-settings.gif
+share/doc/cups/fr/images/button-clean-print-heads.gif
+share/doc/cups/fr/images/button-clear.gif
+share/doc/cups/fr/images/button-continue.gif
+share/doc/cups/fr/images/button-delete-class.gif
+share/doc/cups/fr/images/button-delete-printer.gif
+share/doc/cups/fr/images/button-edit-configuration-file.gif
+share/doc/cups/fr/images/button-export-samba.gif
+share/doc/cups/fr/images/button-find-new-printers.gif
+share/doc/cups/fr/images/button-help.gif
+share/doc/cups/fr/images/button-hold-job.gif
+share/doc/cups/fr/images/button-manage-classes.gif
+share/doc/cups/fr/images/button-manage-jobs.gif
+share/doc/cups/fr/images/button-manage-printers.gif
+share/doc/cups/fr/images/button-manage-server.gif
+share/doc/cups/fr/images/button-modify-class.gif
+share/doc/cups/fr/images/button-modify-printer.gif
+share/doc/cups/fr/images/button-move-job.gif
+share/doc/cups/fr/images/button-move-jobs.gif
+share/doc/cups/fr/images/button-print-self-test-page.gif
+share/doc/cups/fr/images/button-print-test-page.gif
+share/doc/cups/fr/images/button-publish-printer.gif
+share/doc/cups/fr/images/button-reject-jobs.gif
+share/doc/cups/fr/images/button-release-job.gif
+share/doc/cups/fr/images/button-restart-job.gif
+share/doc/cups/fr/images/button-save-changes.gif
+share/doc/cups/fr/images/button-search.gif
+share/doc/cups/fr/images/button-set-allowed-users.gif
+share/doc/cups/fr/images/button-set-as-default.gif
+share/doc/cups/fr/images/button-set-printer-options.gif
+share/doc/cups/fr/images/button-show-active.gif
+share/doc/cups/fr/images/button-show-all.gif
+share/doc/cups/fr/images/button-show-completed.gif
+share/doc/cups/fr/images/button-show-next.gif
+share/doc/cups/fr/images/button-show-previous.gif
+share/doc/cups/fr/images/button-sort-ascending.gif
+share/doc/cups/fr/images/button-sort-descending.gif
+share/doc/cups/fr/images/button-start-class.gif
+share/doc/cups/fr/images/button-start-printer.gif
+share/doc/cups/fr/images/button-stop-class.gif
+share/doc/cups/fr/images/button-stop-printer.gif
+share/doc/cups/fr/images/button-unpublish-printer.gif
+share/doc/cups/fr/images/button-use-default-config.gif
+share/doc/cups/fr/images/button-view-access-log.gif
+share/doc/cups/fr/images/button-view-error-log.gif
+share/doc/cups/fr/images/button-view-page-log.gif
+share/doc/cups/fr/images/button-view-printable-version.gif
+share/doc/cups/fr/index.html
+share/doc/cups/he/
+share/doc/cups/he/cups.css
+share/doc/cups/he/images/
+share/doc/cups/he/images/button-accept-jobs.gif
+share/doc/cups/he/images/button-add-class.gif
+share/doc/cups/he/images/button-add-printer.gif
+share/doc/cups/he/images/button-add-this-printer.gif
+share/doc/cups/he/images/button-cancel-all-jobs.gif
+share/doc/cups/he/images/button-cancel-job.gif
+share/doc/cups/he/images/button-change-settings.gif
+share/doc/cups/he/images/button-clean-print-heads.gif
+share/doc/cups/he/images/button-clear.gif
+share/doc/cups/he/images/button-continue.gif
+share/doc/cups/he/images/button-delete-class.gif
+share/doc/cups/he/images/button-delete-printer.gif
+share/doc/cups/he/images/button-edit-configuration-file.gif
+share/doc/cups/he/images/button-export-samba.gif
+share/doc/cups/he/images/button-help.gif
+share/doc/cups/he/images/button-hold-job.gif
+share/doc/cups/he/images/button-manage-classes.gif
+share/doc/cups/he/images/button-manage-jobs.gif
+share/doc/cups/he/images/button-manage-printers.gif
+share/doc/cups/he/images/button-manage-server.gif
+share/doc/cups/he/images/button-modify-class.gif
+share/doc/cups/he/images/button-modify-printer.gif
+share/doc/cups/he/images/button-move-job.gif
+share/doc/cups/he/images/button-move-jobs.gif
+share/doc/cups/he/images/button-print-self-test-page.gif
+share/doc/cups/he/images/button-print-test-page.gif
+share/doc/cups/he/images/button-publish-printer.gif
+share/doc/cups/he/images/button-reject-jobs.gif
+share/doc/cups/he/images/button-release-job.gif
+share/doc/cups/he/images/button-restart-job.gif
+share/doc/cups/he/images/button-save-changes.gif
+share/doc/cups/he/images/button-search.gif
+share/doc/cups/he/images/button-set-allowed-users.gif
+share/doc/cups/he/images/button-set-as-default.gif
+share/doc/cups/he/images/button-set-printer-options.gif
+share/doc/cups/he/images/button-show-active.gif
+share/doc/cups/he/images/button-show-all.gif
+share/doc/cups/he/images/button-show-completed.gif
+share/doc/cups/he/images/button-show-next.gif
+share/doc/cups/he/images/button-show-previous.gif
+share/doc/cups/he/images/button-sort-ascending.gif
+share/doc/cups/he/images/button-sort-descending.gif
+share/doc/cups/he/images/button-start-class.gif
+share/doc/cups/he/images/button-start-printer.gif
+share/doc/cups/he/images/button-stop-class.gif
+share/doc/cups/he/images/button-stop-printer.gif
+share/doc/cups/he/images/button-unpublish-printer.gif
+share/doc/cups/he/images/button-use-default-config.gif
+share/doc/cups/he/images/button-view-access-log.gif
+share/doc/cups/he/images/button-view-error-log.gif
+share/doc/cups/he/images/button-view-page-log.gif
+share/doc/cups/he/images/button-view-printable-version.gif
+share/doc/cups/he/index.html
 share/doc/cups/help/
+share/doc/cups/help/accounting.html
 share/doc/cups/help/api-array.html
 share/doc/cups/help/api-cups.html
 share/doc/cups/help/api-filedir.html
@@ -900,6 +1276,7 @@ share/doc/cups/help/api-ppd.html
 share/doc/cups/help/api-raster.html
 share/doc/cups/help/cgi.html
 share/doc/cups/help/glossary.html
+share/doc/cups/help/kerberos.html
 share/doc/cups/help/license.html
 share/doc/cups/help/man-accept.html
 share/doc/cups/help/man-backend.html
@@ -949,21 +1326,82 @@ share/doc/cups/help/spec-cmp.html
 share/doc/cups/help/spec-command.html
 share/doc/cups/help/spec-design.html
 share/doc/cups/help/spec-ipp.html
+share/doc/cups/help/spec-postscript.html
 share/doc/cups/help/spec-ppd.html
 share/doc/cups/help/spec-raster.html
 share/doc/cups/help/spec-stp.html
 share/doc/cups/help/standard.html
 share/doc/cups/help/translation.html
 share/doc/cups/help/whatsnew.html
+share/doc/cups/id/
+share/doc/cups/id/images/
+share/doc/cups/id/images/button-accept-jobs.gif
+share/doc/cups/id/images/button-add-class.gif
+share/doc/cups/id/images/button-add-printer.gif
+share/doc/cups/id/images/button-add-rss-subscription.gif
+share/doc/cups/id/images/button-add-this-printer.gif
+share/doc/cups/id/images/button-cancel-all-jobs.gif
+share/doc/cups/id/images/button-cancel-job.gif
+share/doc/cups/id/images/button-cancel-subscription.gif
+share/doc/cups/id/images/button-change-settings.gif
+share/doc/cups/id/images/button-clean-print-heads.gif
+share/doc/cups/id/images/button-clear.gif
+share/doc/cups/id/images/button-continue.gif
+share/doc/cups/id/images/button-delete-class.gif
+share/doc/cups/id/images/button-delete-printer.gif
+share/doc/cups/id/images/button-edit-configuration-file.gif
+share/doc/cups/id/images/button-export-samba.gif
+share/doc/cups/id/images/button-find-new-printers.gif
+share/doc/cups/id/images/button-help.gif
+share/doc/cups/id/images/button-hold-job.gif
+share/doc/cups/id/images/button-manage-classes.gif
+share/doc/cups/id/images/button-manage-jobs.gif
+share/doc/cups/id/images/button-manage-printers.gif
+share/doc/cups/id/images/button-manage-server.gif
+share/doc/cups/id/images/button-modify-class.gif
+share/doc/cups/id/images/button-modify-printer.gif
+share/doc/cups/id/images/button-move-job.gif
+share/doc/cups/id/images/button-move-jobs.gif
+share/doc/cups/id/images/button-print-self-test-page.gif
+share/doc/cups/id/images/button-print-test-page.gif
+share/doc/cups/id/images/button-publish-printer.gif
+share/doc/cups/id/images/button-reject-jobs.gif
+share/doc/cups/id/images/button-release-job.gif
+share/doc/cups/id/images/button-restart-job.gif
+share/doc/cups/id/images/button-save-changes.gif
+share/doc/cups/id/images/button-search.gif
+share/doc/cups/id/images/button-set-allowed-users.gif
+share/doc/cups/id/images/button-set-as-default.gif
+share/doc/cups/id/images/button-set-printer-options.gif
+share/doc/cups/id/images/button-show-active.gif
+share/doc/cups/id/images/button-show-all.gif
+share/doc/cups/id/images/button-show-completed.gif
+share/doc/cups/id/images/button-show-next.gif
+share/doc/cups/id/images/button-show-previous.gif
+share/doc/cups/id/images/button-sort-ascending.gif
+share/doc/cups/id/images/button-sort-descending.gif
+share/doc/cups/id/images/button-start-class.gif
+share/doc/cups/id/images/button-start-printer.gif
+share/doc/cups/id/images/button-stop-class.gif
+share/doc/cups/id/images/button-stop-printer.gif
+share/doc/cups/id/images/button-unpublish-printer.gif
+share/doc/cups/id/images/button-use-default-config.gif
+share/doc/cups/id/images/button-view-access-log.gif
+share/doc/cups/id/images/button-view-error-log.gif
+share/doc/cups/id/images/button-view-page-log.gif
+share/doc/cups/id/images/button-view-printable-version.gif
+share/doc/cups/id/index.html
 share/doc/cups/images/
 share/doc/cups/images/bottom-left.gif
 share/doc/cups/images/bottom-right.gif
 share/doc/cups/images/button-accept-jobs.gif
 share/doc/cups/images/button-add-class.gif
 share/doc/cups/images/button-add-printer.gif
+share/doc/cups/images/button-add-rss-subscription.gif
 share/doc/cups/images/button-add-this-printer.gif
 share/doc/cups/images/button-cancel-all-jobs.gif
 share/doc/cups/images/button-cancel-job.gif
+share/doc/cups/images/button-cancel-subscription.gif
 share/doc/cups/images/button-change-settings.gif
 share/doc/cups/images/button-clean-print-heads.gif
 share/doc/cups/images/button-clear.gif
@@ -972,6 +1410,7 @@ share/doc/cups/images/button-delete-class.gif
 share/doc/cups/images/button-delete-printer.gif
 share/doc/cups/images/button-edit-configuration-file.gif
 share/doc/cups/images/button-export-samba.gif
+share/doc/cups/images/button-find-new-printers.gif
 share/doc/cups/images/button-help.gif
 share/doc/cups/images/button-hold-job.gif
 share/doc/cups/images/button-manage-classes.gif
@@ -1018,6 +1457,8 @@ share/doc/cups/images/logo.gif
 share/doc/cups/images/printer-idle.gif
 share/doc/cups/images/printer-processing.gif
 share/doc/cups/images/printer-stopped.gif
+share/doc/cups/images/raster.png
+share/doc/cups/images/raster.svg
 share/doc/cups/images/smiley.jpg
 share/doc/cups/images/tab-left.gif
 share/doc/cups/images/tab-right.gif
@@ -1091,15 +1532,20 @@ share/doc/cups/ja/images/
 share/doc/cups/ja/images/button-accept-jobs.gif
 share/doc/cups/ja/images/button-add-class.gif
 share/doc/cups/ja/images/button-add-printer.gif
+share/doc/cups/ja/images/button-add-rss-subscription.gif
 share/doc/cups/ja/images/button-add-this-printer.gif
 share/doc/cups/ja/images/button-cancel-all-jobs.gif
 share/doc/cups/ja/images/button-cancel-job.gif
+share/doc/cups/ja/images/button-cancel-subscription.gif
 share/doc/cups/ja/images/button-change-settings.gif
+share/doc/cups/ja/images/button-clean-print-heads.gif
+share/doc/cups/ja/images/button-clear.gif
 share/doc/cups/ja/images/button-continue.gif
 share/doc/cups/ja/images/button-delete-class.gif
 share/doc/cups/ja/images/button-delete-printer.gif
 share/doc/cups/ja/images/button-edit-configuration-file.gif
 share/doc/cups/ja/images/button-export-samba.gif
+share/doc/cups/ja/images/button-find-new-printers.gif
 share/doc/cups/ja/images/button-help.gif
 share/doc/cups/ja/images/button-hold-job.gif
 share/doc/cups/ja/images/button-manage-classes.gif
@@ -1110,6 +1556,7 @@ share/doc/cups/ja/images/button-modify-class.gif
 share/doc/cups/ja/images/button-modify-printer.gif
 share/doc/cups/ja/images/button-move-job.gif
 share/doc/cups/ja/images/button-move-jobs.gif
+share/doc/cups/ja/images/button-print-self-test-page.gif
 share/doc/cups/ja/images/button-print-test-page.gif
 share/doc/cups/ja/images/button-publish-printer.gif
 share/doc/cups/ja/images/button-reject-jobs.gif
@@ -1136,6 +1583,7 @@ share/doc/cups/ja/images/button-use-default-config.gif
 share/doc/cups/ja/images/button-view-access-log.gif
 share/doc/cups/ja/images/button-view-error-log.gif
 share/doc/cups/ja/images/button-view-page-log.gif
+share/doc/cups/ja/images/button-view-printable-version.gif
 share/doc/cups/ja/index.html
 share/doc/cups/pl/
 share/doc/cups/pl/images/
@@ -1248,6 +1696,61 @@ share/doc/cups/sv/images/button-view-error-log.gif
 share/doc/cups/sv/images/button-view-page-log.gif
 share/doc/cups/sv/images/button-view-printable-version.gif
 share/doc/cups/sv/index.html
+share/doc/cups/zh_TW/
+share/doc/cups/zh_TW/images/
+share/doc/cups/zh_TW/images/button-accept-jobs.gif
+share/doc/cups/zh_TW/images/button-add-class.gif
+share/doc/cups/zh_TW/images/button-add-printer.gif
+share/doc/cups/zh_TW/images/button-add-this-printer.gif
+share/doc/cups/zh_TW/images/button-cancel-all-jobs.gif
+share/doc/cups/zh_TW/images/button-cancel-job.gif
+share/doc/cups/zh_TW/images/button-change-settings.gif
+share/doc/cups/zh_TW/images/button-clean-print-heads.gif
+share/doc/cups/zh_TW/images/button-clear.gif
+share/doc/cups/zh_TW/images/button-continue.gif
+share/doc/cups/zh_TW/images/button-delete-class.gif
+share/doc/cups/zh_TW/images/button-delete-printer.gif
+share/doc/cups/zh_TW/images/button-edit-configuration-file.gif
+share/doc/cups/zh_TW/images/button-export-samba.gif
+share/doc/cups/zh_TW/images/button-help.gif
+share/doc/cups/zh_TW/images/button-hold-job.gif
+share/doc/cups/zh_TW/images/button-manage-classes.gif
+share/doc/cups/zh_TW/images/button-manage-jobs.gif
+share/doc/cups/zh_TW/images/button-manage-printers.gif
+share/doc/cups/zh_TW/images/button-manage-server.gif
+share/doc/cups/zh_TW/images/button-modify-class.gif
+share/doc/cups/zh_TW/images/button-modify-printer.gif
+share/doc/cups/zh_TW/images/button-move-job.gif
+share/doc/cups/zh_TW/images/button-move-jobs.gif
+share/doc/cups/zh_TW/images/button-print-self-test-page.gif
+share/doc/cups/zh_TW/images/button-print-test-page.gif
+share/doc/cups/zh_TW/images/button-publish-printer.gif
+share/doc/cups/zh_TW/images/button-reject-jobs.gif
+share/doc/cups/zh_TW/images/button-release-job.gif
+share/doc/cups/zh_TW/images/button-restart-job.gif
+share/doc/cups/zh_TW/images/button-save-changes.gif
+share/doc/cups/zh_TW/images/button-search.gif
+share/doc/cups/zh_TW/images/button-set-allowed-users.gif
+share/doc/cups/zh_TW/images/button-set-as-default.gif
+share/doc/cups/zh_TW/images/button-set-printer-options.gif
+share/doc/cups/zh_TW/images/button-show-active.gif
+share/doc/cups/zh_TW/images/button-show-all.gif
+share/doc/cups/zh_TW/images/button-show-completed.gif
+share/doc/cups/zh_TW/images/button-show-next.gif
+share/doc/cups/zh_TW/images/button-show-previous.gif
+share/doc/cups/zh_TW/images/button-sort-ascending.gif
+share/doc/cups/zh_TW/images/button-sort-descending.gif
+share/doc/cups/zh_TW/images/button-start-class.gif
+share/doc/cups/zh_TW/images/button-start-printer.gif
+share/doc/cups/zh_TW/images/button-stop-class.gif
+share/doc/cups/zh_TW/images/button-stop-printer.gif
+share/doc/cups/zh_TW/images/button-unpublish-printer.gif
+share/doc/cups/zh_TW/images/button-use-default-config.gif
+share/doc/cups/zh_TW/images/button-view-access-log.gif
+share/doc/cups/zh_TW/images/button-view-error-log.gif
+share/doc/cups/zh_TW/images/button-view-page-log.gif
+share/doc/cups/zh_TW/images/button-view-printable-version.gif
+share/doc/cups/zh_TW/index.html
 share/examples/cups/
 @sample ${SYSCONFDIR}/cups/
 share/examples/cups/cupsd.conf
@@ -1255,7 +1758,8 @@ share/examples/cups/cupsd.conf
 share/examples/cups/cupsd.conf.default
 share/examples/cups/dbus-1/
 share/examples/cups/dbus-1/system.d/
-share/examples/cups/dbus-1/system.d/cups.conf
+share/examples/cups/dbus-1/system.d/system.d/
+share/examples/cups/dbus-1/system.d/system.d/cups.conf
 @sample ${SYSCONFDIR}/dbus-1/system.d/cups.conf
 share/examples/cups/init/
 @sample ${SYSCONFDIR}/cups/init/
@@ -1267,6 +1771,7 @@ share/examples/cups/mime.types
 @sample ${SYSCONFDIR}/cups/mime.types
 share/examples/cups/ppd/
 @sample ${SYSCONFDIR}/cups/ppd/
+share/examples/cups/snmp.conf
 share/examples/cups/ssl/
 @sample ${SYSCONFDIR}/cups/ssl/
 share/icons/
@@ -1283,19 +1788,34 @@ share/icons/hicolor/32x32/apps/cups.png
 share/icons/hicolor/64x64/
 share/icons/hicolor/64x64/apps/
 share/icons/hicolor/64x64/apps/cups.png
+share/locale/da/cups_da.po
 share/locale/de/cups_de.po
 share/locale/es/cups_es.po
 share/locale/et/cups_et.po
+share/locale/fi/cups_fi.po
+share/locale/fr/cups_fr.po
+share/locale/he/cups_he.po
+share/locale/id/cups_id.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
+share/locale/ko/cups_ko.po
+share/locale/nl/cups_nl.po
+share/locale/no/cups_no.po
 share/locale/pl/cups_pl.po
+share/locale/pt/cups_pt.po
+share/locale/pt_BR/cups_pt_BR.po
+share/locale/ru/cups_ru.po
 share/locale/sv/cups_sv.po
+share/locale/zh/
+share/locale/zh/cups_zh.po
+share/locale/zh_TW/cups_zh_TW.po
 @owner _cups
 @group _cups
 @sample /var/log/cups/
 @sample /var/spool/cups/
 @sample /var/spool/cups/tmp/
 @sample /var/cache/cups/
+@sample /var/cache/cups/rss/
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @exec %D/bin/update-desktop-database