[Pkg-cups-devel] r490 - cupsys/trunk/debian/patches
Kenshi Muto
kmuto at alioth.debian.org
Sat Jul 14 06:55:20 UTC 2007
Author: kmuto
Date: Sat Jul 14 06:55:20 2007
New Revision: 490
Log:
modified 09_runasuser_autoconf to follow upstream's changes. removed 57_cupsaddsmb because it's merged now.
Removed:
cupsys/trunk/debian/patches/57_cupsaddsmb.dpatch
Modified:
cupsys/trunk/debian/patches/00list
cupsys/trunk/debian/patches/09_runasuser_autoconf.dpatch
Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list (original)
+++ cupsys/trunk/debian/patches/00list Sat Jul 14 06:55:20 2007
@@ -17,7 +17,6 @@
54_cups-config_modeldir.dpatch
55_ppd_okidata_name.dpatch
#56_dirsvc.dpatch
-57_cupsaddsmb.dpatch
58_cupsd.conf-AllowLocal.dpatch
60_device_uri.dpatch
62_classes_crash.dpatch
Modified: cupsys/trunk/debian/patches/09_runasuser_autoconf.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/09_runasuser_autoconf.dpatch (original)
+++ cupsys/trunk/debian/patches/09_runasuser_autoconf.dpatch Sat Jul 14 06:55:20 2007
@@ -5,19 +5,21 @@
## DP: No description.
@DPATCH@
-diff -urNad cups-1.2-ubuntu~/configure cups-1.2-ubuntu/configure
---- cups-1.2-ubuntu~/configure 2007-04-30 10:40:19.000000000 +0200
-+++ cups-1.2-ubuntu/configure 2007-04-30 10:40:55.000000000 +0200
-@@ -309,7 +309,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 INITDIR INITDDIR RCLEVELS RCSTART RCSTOP 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 INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG 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 PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES 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 INITDIR INITDDIR RCLEVELS RCSTART RCSTOP 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 INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG 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 PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
+diff -urNad cupsys-1.2.12~/configure cupsys-1.2.12/configure
+--- cupsys-1.2.12~/configure 2007-07-14 15:39:04.616155164 +0900
++++ cupsys-1.2.12/configure 2007-07-14 15:42:12.968290213 +0900
+@@ -792,7 +792,9 @@
+ INSTALL_LANGUAGES
+ UNINSTALL_LANGUAGES
+ LIBOBJS
+-LTLIBOBJS'
++LTLIBOBJS
++CUPS_DROP_PRIVILEGES
++'
ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -881,6 +881,7 @@
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1407,6 +1409,7 @@
enable ImplicitClasses by default, default=yes
--enable-use-network-default
enable UseNetworkDefault by default, default=auto
@@ -25,10 +27,10 @@
--enable-pdftops build pdftops filter, default=auto
Optional Packages:
-@@ -14055,6 +14056,26 @@
+@@ -14582,6 +14585,26 @@
+ #define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS "$CUPS_BROWSE_REMOTE_PROTOCOLS"
_ACEOF
-
+# Check whether --enable-privilege-dropping or --disable-privilege-dropping was given.
+if test "${enable_privilege_dropping+set}" = set; then
+ enableval="$enable_privilege_dropping"
@@ -50,13 +52,42 @@
+
+
- # Check whether --with-printcap or --without-printcap was given.
- if test "${with_printcap+set}" = set; then
-@@ -15355,6 +15376,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
-+s, at CUPS_DROP_PRIVILEGES@,$CUPS_DROP_PRIVILEGES,;t t
- s, at PAP@,$PAP,;t t
- s, at PDFTOPS@,$PDFTOPS,;t t
- s, at JAVA@,$JAVA,;t t
+ # Check whether --enable-browse_short was given.
+ if test "${enable_browse_short+set}" = set; then
+diff -urNad cupsys-1.2.12~/configure.rej cupsys-1.2.12/configure.rej
+--- cupsys-1.2.12~/configure.rej 1970-01-01 09:00:00.000000000 +0900
++++ cupsys-1.2.12/configure.rej 2007-07-14 15:39:04.776155278 +0900
+@@ -0,0 +1,33 @@
++***************
++*** 309,315 ****
++ #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 INITDIR INITDDIR RCLEVELS RCSTART RCSTOP 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 INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG 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 PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
++ ac_subst_files=''
++
++ # Initialize some variables set by options.
++--- 309,315 ----
++ #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 INITDIR INITDDIR RCLEVELS RCSTART RCSTOP 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 INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG 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 PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
++ ac_subst_files=''
++
++ # Initialize some variables set by options.
++***************
++*** 15882,15887 ****
++ 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
++ s, at PAP@,$PAP,;t t
++ s, at PDFTOPS@,$PDFTOPS,;t t
++ s, at JAVA@,$JAVA,;t t
++--- 15903,15909 ----
++ 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
+++ s, at CUPS_DROP_PRIVILEGES@,$CUPS_DROP_PRIVILEGES,;t t
++ s, at PAP@,$PAP,;t t
++ s, at PDFTOPS@,$PDFTOPS,;t t
++ s, at JAVA@,$JAVA,;t t
More information about the Pkg-cups-devel
mailing list