[Pkg-cups-devel] r204 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches

Martin Pitt mpitt at costa.debian.org
Tue Apr 25 10:49:57 UTC 2006 

Author: mpitt
Date: Tue Apr 25 10:49:56 2006
New Revision: 204

Removed:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/20_httpGetHostname_crash.dpatch
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
   cupsys/branches/cups-1.2-ubuntu/debian/patches/04_freebsd.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/07_removecvstag.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser.dpatch
   cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
Log:
Merge new upstream release from Debian:
* New upstream bug fix release 1.2RC3:
  - Fixes handling of products/manufacturers with spaces in the name.
    Closes: LP#33545
* Update patches for new upstream release.
* Remove debian/patches/20_httpGetHostname_crash.dpatch, fixed upstream.



Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Tue Apr 25 10:49:56 2006
@@ -1,8 +1,14 @@
-cupsys (1.1.99.rc2-0ubuntu3) dapper; urgency=low
+cupsys (1.1.99.rc3-0ubuntu1) dapper; urgency=low
 
+  * New upstream bug fix release 1.2RC3:
+    - Fixes handling of products/manufacturers with spaces in the name.
+      Closes: LP#33545
+  * Update patches for new upstream release.
+  * Remove debian/patches/20_httpGetHostname_crash.dpatch, fixed upstream.
   * debian/patches/08_cupsd.conf.conf.d.dpatch:
     - Set "BrowseAddress @LOCAL"; without this, sending browsing information
-      does not work (Browsing still has to be enabled).
+      does not work (Browsing still has to be enabled). Since enable_browsing
+      now works for exporting printers, too, this Closes: LP#17981
     - Add some comments to point out that the Port and Browsing settings are
       moved to /etc/cups/cups.d/.
   * debian/cupsys.postrm: Clean up passwd.md5 on purge.

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Tue Apr 25 10:49:56 2006
@@ -13,7 +13,6 @@
 12_quiesce_ipp_logging.dpatch
 13_default_log_warn.dpatch
 19_cupsaccept.dpatch
-20_httpGetHostname_crash.dpatch
 26_modprobe.dpatch
 44_fixconfdirperms.dpatch
 47_pid.dpatch

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/04_freebsd.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/04_freebsd.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/04_freebsd.dpatch	Tue Apr 25 10:49:56 2006
@@ -5,10 +5,10 @@
 ## DP: man extension is handled by dh_installman
 
 @DPATCH@
-diff -urNad cupsys-1.1.99.r5357~/backend/parallel.c cupsys-1.1.99.r5357/backend/parallel.c
---- cupsys-1.1.99.r5357~/backend/parallel.c	2006-03-07 22:07:44.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/parallel.c	2006-03-30 15:21:44.000000000 +0000
-@@ -695,7 +695,7 @@
+diff -urNad cups-1.2~/backend/parallel.c cups-1.2/backend/parallel.c
+--- cups-1.2~/backend/parallel.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/parallel.c	2006-04-25 12:14:51.000000000 +0200
+@@ -693,7 +693,7 @@
        printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
      }
    }
@@ -17,23 +17,24 @@
    int	i;			/* Looping var */
    int	fd;			/* File descriptor */
    char	device[255];		/* Device filename */
-diff -urNad cupsys-1.1.99.r5357~/backend/serial.c cupsys-1.1.99.r5357/backend/serial.c
---- cupsys-1.1.99.r5357~/backend/serial.c	2006-03-07 22:07:44.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/serial.c	2006-03-30 15:21:44.000000000 +0000
-@@ -661,10 +661,10 @@
+diff -urNad cups-1.2~/backend/serial.c cups-1.2/backend/serial.c
+--- cups-1.2~/backend/serial.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/serial.c	2006-04-25 12:15:44.000000000 +0200
+@@ -666,11 +666,11 @@
  void
  list_devices(void)
  {
 -#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 +#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
    static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
- 				/* Funky hex numbering used for some devices */
+ 					/* Funky hex numbering used for some *
+ 					 * devices                           */
 -#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
 +#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
  
- #if defined(__linux) || defined(linux) || defined(__linux__)
-   int	i, j;		/* Looping vars */
-@@ -926,7 +926,7 @@
+ #ifdef __linux
+   int			i, j;		/* Looping vars */
+@@ -958,7 +958,7 @@
        printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
               device, i + 1);
    }
@@ -42,10 +43,10 @@
    int	i, j;		/* Looping vars */
    int	fd;		/* File descriptor */
    char	device[255];	/* Device filename */
-diff -urNad cupsys-1.1.99.r5357~/backend/usb-unix.c cupsys-1.1.99.r5357/backend/usb-unix.c
---- cupsys-1.1.99.r5357~/backend/usb-unix.c	2006-03-09 19:22:36.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/usb-unix.c	2006-03-30 15:21:44.000000000 +0000
-@@ -397,7 +397,7 @@
+diff -urNad cups-1.2~/backend/usb-unix.c cups-1.2/backend/usb-unix.c
+--- cups-1.2~/backend/usb-unix.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/usb-unix.c	2006-04-25 12:14:51.000000000 +0200
+@@ -401,7 +401,7 @@
    }
  #elif defined(__hpux)
  #elif defined(__osf)
@@ -54,9 +55,9 @@
    int   i;                      /* Looping var */
    char  device[255];            /* Device filename */
  
-diff -urNad cupsys-1.1.99.r5357~/backend/usb.c cupsys-1.1.99.r5357/backend/usb.c
---- cupsys-1.1.99.r5357~/backend/usb.c	2006-02-24 03:15:13.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/usb.c	2006-03-30 15:21:44.000000000 +0000
+diff -urNad cups-1.2~/backend/usb.c cups-1.2/backend/usb.c
+--- cups-1.2~/backend/usb.c	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/backend/usb.c	2006-04-25 12:14:51.000000000 +0200
 @@ -72,7 +72,7 @@
  
  #ifdef __APPLE__
@@ -66,9 +67,9 @@
  #  include "usb-unix.c"
  #else
  /*
-diff -urNad cupsys-1.1.99.r5357~/config-scripts/cups-directories.m4 cupsys-1.1.99.r5357/config-scripts/cups-directories.m4
---- cupsys-1.1.99.r5357~/config-scripts/cups-directories.m4	2006-03-20 19:06:50.000000000 +0000
-+++ cupsys-1.1.99.r5357/config-scripts/cups-directories.m4	2006-03-30 15:21:44.000000000 +0000
+diff -urNad cups-1.2~/config-scripts/cups-directories.m4 cups-1.2/config-scripts/cups-directories.m4
+--- cups-1.2~/config-scripts/cups-directories.m4	2006-04-25 12:14:36.000000000 +0200
++++ cups-1.2/config-scripts/cups-directories.m4	2006-04-25 12:14:51.000000000 +0200
 @@ -135,7 +135,7 @@
  				"/System/Library/StartupItems/PrintingServices")
  			;;
@@ -78,10 +79,10 @@
  			# Linux/HURD seems to choose an init.d directory at random...
  			if test -d /sbin/init.d; then
  				# SuSE
-diff -urNad cupsys-1.1.99.r5357~/configure cupsys-1.1.99.r5357/configure
---- cupsys-1.1.99.r5357~/configure	2006-03-30 15:20:38.000000000 +0000
-+++ cupsys-1.1.99.r5357/configure	2006-03-30 15:21:44.000000000 +0000
-@@ -8264,7 +8264,7 @@
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure	2006-04-25 12:14:50.000000000 +0200
++++ cups-1.2/configure	2006-04-25 12:14:51.000000000 +0200
+@@ -7445,7 +7445,7 @@
  
  			;;
  

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/07_removecvstag.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/07_removecvstag.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/07_removecvstag.dpatch	Tue Apr 25 10:49:56 2006
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.1.99.r5357~/conf/Makefile cupsys-1.1.99.r5357/conf/Makefile
---- cupsys-1.1.99.r5357~/conf/Makefile	2006-03-05 16:48:12.000000000 +0000
-+++ cupsys-1.1.99.r5357/conf/Makefile	2006-03-30 15:22:37.000000000 +0000
+diff -urNad cups-1.2~/conf/Makefile cups-1.2/conf/Makefile
+--- cups-1.2~/conf/Makefile	2006-04-25 12:16:07.000000000 +0200
++++ cups-1.2/conf/Makefile	2006-04-25 12:17:11.000000000 +0200
 @@ -65,6 +65,8 @@
  			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
  		else \
@@ -20,9 +20,9 @@
 @@ -75,6 +77,8 @@
  			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
  		fi ; \
- 		$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
+ 		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 +		grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
 +		mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
- 		chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
  	done
  	-if test x$(PAMDIR) != x; then \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser.dpatch	Tue Apr 25 10:49:56 2006
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cups-1.2-ubuntu~/config-scripts/cups-defaults.m4 cups-1.2-ubuntu/config-scripts/cups-defaults.m4
---- cups-1.2-ubuntu~/config-scripts/cups-defaults.m4	2006-04-24 19:15:03.000000000 +0200
-+++ cups-1.2-ubuntu/config-scripts/cups-defaults.m4	2006-04-24 19:15:53.000000000 +0200
+diff -urNad cups-1.2~/config-scripts/cups-defaults.m4 cups-1.2/config-scripts/cups-defaults.m4
+--- cups-1.2~/config-scripts/cups-defaults.m4	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/config-scripts/cups-defaults.m4	2006-04-25 12:18:56.000000000 +0200
 @@ -218,6 +218,17 @@
  AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
  AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_GROUPS, "$CUPS_SYSTEM_GROUPS")
@@ -26,9 +26,9 @@
  dnl Default printcap file...
  AC_ARG_WITH(printcap, [  --with-printcap     set default printcap file],
  	default_printcap="$withval",
-diff -urNad cups-1.2-ubuntu~/config.h.in cups-1.2-ubuntu/config.h.in
---- cups-1.2-ubuntu~/config.h.in	2006-04-24 19:15:03.000000000 +0200
-+++ cups-1.2-ubuntu/config.h.in	2006-04-24 19:15:53.000000000 +0200
+diff -urNad cups-1.2~/config.h.in cups-1.2/config.h.in
+--- cups-1.2~/config.h.in	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/config.h.in	2006-04-25 12:18:56.000000000 +0200
 @@ -41,6 +41,11 @@
  #define CUPS_DEFAULT_GROUP	"sys"
  #define CUPS_DEFAULT_SYSTEM_GROUPS	"sys root system"
@@ -41,9 +41,9 @@
  
  /*
   * Default file permissions...
-diff -urNad cups-1.2-ubuntu~/scheduler/cert.c cups-1.2-ubuntu/scheduler/cert.c
---- cups-1.2-ubuntu~/scheduler/cert.c	2006-04-24 19:15:03.000000000 +0200
-+++ cups-1.2-ubuntu/scheduler/cert.c	2006-04-24 19:15:53.000000000 +0200
+diff -urNad cups-1.2~/scheduler/cert.c cups-1.2/scheduler/cert.c
+--- cups-1.2~/scheduler/cert.c	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/scheduler/cert.c	2006-04-25 12:18:56.000000000 +0200
 @@ -116,7 +116,7 @@
      * Root certificate...
      */
@@ -53,9 +53,9 @@
      fchown(fd, RunUser, SystemGroupIDs[0]);
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdAddCert: NumSystemGroups=%d",
-diff -urNad cups-1.2-ubuntu~/scheduler/conf.c cups-1.2-ubuntu/scheduler/conf.c
---- cups-1.2-ubuntu~/scheduler/conf.c	2006-04-24 19:15:03.000000000 +0200
-+++ cups-1.2-ubuntu/scheduler/conf.c	2006-04-24 19:15:53.000000000 +0200
+diff -urNad cups-1.2~/scheduler/conf.c cups-1.2/scheduler/conf.c
+--- cups-1.2~/scheduler/conf.c	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/scheduler/conf.c	2006-04-25 12:18:56.000000000 +0200
 @@ -460,7 +460,11 @@
    if (!status)
      return (0);
@@ -68,9 +68,9 @@
  
   /*
    * Use the default system group if none was supplied in cupsd.conf...
-diff -urNad cups-1.2-ubuntu~/scheduler/main.c cups-1.2-ubuntu/scheduler/main.c
---- cups-1.2-ubuntu~/scheduler/main.c	2006-04-24 19:15:03.000000000 +0200
-+++ cups-1.2-ubuntu/scheduler/main.c	2006-04-24 19:15:53.000000000 +0200
+diff -urNad cups-1.2~/scheduler/main.c cups-1.2/scheduler/main.c
+--- cups-1.2~/scheduler/main.c	2006-04-25 12:17:52.000000000 +0200
++++ cups-1.2/scheduler/main.c	2006-04-25 12:19:17.000000000 +0200
 @@ -56,6 +56,9 @@
  #include <sys/resource.h>
  #include <syslog.h>
@@ -102,13 +102,12 @@
   /*
    * Start any pending print jobs...
    */
-@@ -996,8 +1013,7 @@
-     * Update the root certificate once every 5 minutes...
+@@ -998,7 +1015,7 @@
      */
  
--    if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
--        !RunUser)
-+    if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration)
+     if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
+-        !RunUser && cupsArrayCount(Clients))
++        cupsArrayCount(Clients))
      {
       /*
        * Update the root certificate...

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch	Tue Apr 25 10:49:56 2006
@@ -5,19 +5,27 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys~/configure cupsys/configure
---- cupsys~/configure	2006-04-12 15:15:03.000000000 +0200
-+++ cupsys/configure	2006-04-12 15:15:11.000000000 +0200
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure	2006-04-25 12:20:01.000000000 +0200
++++ cups-1.2/configure	2006-04-25 12:20:14.000000000 +0200
 @@ -309,7 +310,7 @@
  #endif"
  
  ac_default_prefix=/
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDDIR INITDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP SSLFLAGS SSLLIBS EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDDIR INITDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP SSLFLAGS SSLLIBS EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDDIR INITDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDDIR INITDIR XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR DSO DSOFLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 CXXLIBS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -13273,6 +14238,26 @@
+@@ -881,6 +882,7 @@
+                           enable ImplicitClasses by default, default=yes
+   --enable-use-network-default
+                           enable UseNetworkDefault by default, default=auto
++  --enable-privilege-dropping       drop root privileges to normal user, default=no
+   --enable-pdftops        build pdftops filter, default=auto
+ 
+ Optional Packages:
+@@ -13281,6 +14246,26 @@
  _ACEOF
  
  
@@ -44,7 +52,7 @@
  
  # Check whether --with-printcap or --without-printcap was given.
  if test "${with_printcap+set}" = set; then
-@@ -14388,6 +15374,7 @@
+@@ -14403,6 +15389,7 @@
  s, at CUPS_GROUP@,$CUPS_GROUP,;t t
  s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
  s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t

More information about the Pkg-cups-devel mailing list