diff --git a/.cvsignore b/.cvsignore index 168a39e..91ce906 100644 --- a/.cvsignore +++ b/.cvsignore @@ -39,3 +39,5 @@ cups-1.4b2-source.tar.bz2 cups-1.4b2-svn8404-source.tar.bz2 cups-1.4rc1-source.tar.bz2 cups-1.4.0-source.tar.bz2 +cups-1.4b2-source.tar.bz2 +cups-1.4b2-svn8404-source.tar.bz2 diff --git a/cups-1.1.16-system-auth.patch b/cups-1.1.16-system-auth.patch index 299871d..7ce17e5 100644 --- a/cups-1.1.16-system-auth.patch +++ b/cups-1.1.16-system-auth.patch @@ -1,18 +1,35 @@ ---- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000 -+++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000 -@@ -79,10 +79,16 @@ +diff -up /dev/null cups-1.4.2/conf/cups.password-auth +--- /dev/null 2009-11-10 09:17:06.284031490 +0000 ++++ cups-1.4.2/conf/cups.password-auth 2009-11-10 11:15:42.750666738 +0000 +@@ -0,0 +1,4 @@ ++#%PAM-1.0 ++# Use password-auth common PAM configuration for the daemon ++auth include password-auth ++account include password-auth +diff -up cups-1.4.2/conf/cups.system-auth cups-1.4.2/conf/cups +diff -up /dev/null cups-1.4.2/conf/cups.system-auth +--- /dev/null 2009-11-10 09:17:06.284031490 +0000 ++++ cups-1.4.2/conf/cups.system-auth 2009-11-10 11:15:42.750666738 +0000 +@@ -0,0 +1,3 @@ ++#%PAM-1.0 ++auth include system-auth ++account include system-auth +diff -up cups-1.4.2/conf/Makefile.system-auth cups-1.4.2/conf/Makefile +--- cups-1.4.2/conf/Makefile.system-auth 2009-09-22 22:53:31.000000000 +0100 ++++ cups-1.4.2/conf/Makefile 2009-11-10 11:18:44.188791989 +0000 +@@ -90,10 +90,16 @@ install-data: done -if test x$(PAMDIR) != x; then \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ -- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ +- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ - $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ + if test -f /etc/pam.d/password-auth; then \ -+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups ; \ ++ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ + elif test -f /etc/pam.d/system-auth; then \ -+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \ ++ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ else \ - $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ + $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ + else \ + $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ @@ -20,16 +37,3 @@ fi ; \ fi ---- /dev/null 2006-03-07 09:12:30.964372750 +0000 -+++ cups-1.2svn-r5238/conf/cups.system-auth 2006-03-07 09:43:12.000000000 +0000 -@@ -0,0 +1,3 @@ -+#%PAM-1.0 -+auth include system-auth -+account include system-auth ---- /dev/null 2006-03-07 09:12:30.964372750 +0000 -+++ cups-1.2svn-r5238/conf/cups.password-auth 2006-03-07 09:43:12.000000000 +0000 -@@ -0,0 +1,4 @@ -+#%PAM-1.0 -+# Use password-auth common PAM configuration for the daemon -+auth include password-auth -+account include password-auth diff --git a/cups-str3332.patch b/cups-str3332.patch deleted file mode 100644 index 27b30e8..0000000 --- a/cups-str3332.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4.1/backend/usb-unix.c.function-decl cups-1.4.1/backend/usb-unix.c ---- cups-1.4.1/backend/usb-unix.c.function-decl 2009-09-14 17:36:06.087996470 +0100 -+++ cups-1.4.1/backend/usb-unix.c 2009-09-14 17:36:13.656996607 +0100 -@@ -605,7 +605,7 @@ open_device(const char *uri, /* I - Dev - * 'side_cb()' - Handle side-channel requests... - */ - --static void -+static int - side_cb(int print_fd, /* I - Print file */ - int device_fd, /* I - Device file */ - int snmp_fd, /* I - SNMP socket (unused) */ diff --git a/cups-str3356.patch b/cups-str3356.patch deleted file mode 100644 index e055c1c..0000000 --- a/cups-str3356.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -up cups-1.4.1/scheduler/ipp.c.str3356 cups-1.4.1/scheduler/ipp.c ---- cups-1.4.1/scheduler/ipp.c.str3356 2009-10-07 17:26:27.504800579 +0100 -+++ cups-1.4.1/scheduler/ipp.c 2009-10-07 17:26:31.311800539 +0100 -@@ -2324,8 +2324,9 @@ add_printer(cupsd_client_t *con, /* I - - dstfile[1024]; /* Destination Script/PPD file */ - int modify; /* Non-zero if we are modifying */ - char newname[IPP_MAX_NAME]; /* New printer name */ -- int need_restart_job; /* Need to restart job? */ -- int set_device_uri, /* Did we set the device URI? */ -+ int changed_driver, /* Changed the PPD/interface script? */ -+ need_restart_job, /* Need to restart job? */ -+ set_device_uri, /* Did we set the device URI? */ - set_port_monitor; /* Did we set the port monitor? */ - - -@@ -2469,6 +2470,7 @@ add_printer(cupsd_client_t *con, /* I - - * Look for attributes and copy them over as needed... - */ - -+ changed_driver = 0; - need_restart_job = 0; - - if ((attr = ippFindAttribute(con->request, "printer-location", -@@ -2731,6 +2733,7 @@ add_printer(cupsd_client_t *con, /* I - - if (con->filename) - { - need_restart_job = 1; -+ changed_driver = 1; - - strlcpy(srcfile, con->filename, sizeof(srcfile)); - -@@ -2801,18 +2804,6 @@ add_printer(cupsd_client_t *con, /* I - - cupsdLogMessage(CUPSD_LOG_DEBUG, - "Copied PPD file successfully!"); - chmod(dstfile, 0644); -- --#ifdef __APPLE__ -- /* -- * (Re)register color profiles... -- */ -- -- if (!RunUser) -- { -- apple_unregister_profiles(printer); -- apple_register_profiles(printer); -- } --#endif /* __APPLE__ */ - } - else - { -@@ -2829,6 +2820,7 @@ add_printer(cupsd_client_t *con, /* I - - IPP_TAG_NAME)) != NULL) - { - need_restart_job = 1; -+ changed_driver = 1; - - if (!strcmp(attr->values[0].string.text, "raw")) - { -@@ -2866,19 +2858,33 @@ add_printer(cupsd_client_t *con, /* I - - cupsdLogMessage(CUPSD_LOG_DEBUG, - "Copied PPD file successfully!"); - chmod(dstfile, 0644); -+ } -+ } -+ -+ if (changed_driver) -+ { -+ /* -+ * If we changed the PPD/interface script, then remove the printer's cache -+ * file... -+ */ -+ -+ char cache_name[1024]; /* Cache filename for printer attrs */ -+ -+ snprintf(cache_name, sizeof(cache_name), "%s/%s.ipp", CacheDir, -+ printer->name); -+ unlink(cache_name); - - #ifdef __APPLE__ -- /* -- * (Re)register color profiles... -- */ -+ /* -+ * (Re)register color profiles... -+ */ - -- if (!RunUser) -- { -- apple_unregister_profiles(printer); -- apple_register_profiles(printer); -- } --#endif /* __APPLE__ */ -+ if (!RunUser) -+ { -+ apple_unregister_profiles(printer); -+ apple_register_profiles(printer); - } -+#endif /* __APPLE__ */ - } - - /* diff --git a/cups-str3380.patch b/cups-str3380.patch deleted file mode 100644 index 24df54e..0000000 --- a/cups-str3380.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4.1/doc/de/index.html.in.str3380 cups-1.4.1/doc/de/index.html.in ---- cups-1.4.1/doc/de/index.html.in.str3380 2009-04-09 22:22:42.000000000 +0100 -+++ cups-1.4.1/doc/de/index.html.in 2009-10-19 12:04:30.352768816 +0100 -@@ -17,7 +17,7 @@ SRC="/images/left.gif" WIDTH="64" HEIGHT -