Hi list,
I prepared an update for cups.
cups - Update to 2.0.3: http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=a51f6ccd2...
This solves https://bugzilla.ipfire.org/show_bug.cgi?id=10899 - hopefully. ;-)
Regards Matthias
Hi,
this looks good.
I am just wondering why the two backend files for https and ipps are gone. Have these been merged with http or something else? Dropping support for those two protocols won't be a good idea.
On your note about testers: It seems that we do not have anyone on the team who is actually using CUPS in a productive environment.
I also would appreciate if you could send in your changes as patches to this list eventually. Take your time to figure out how this works: http://wiki.ipfire.org/devel/submit-patches
Best, -Michael
On Fri, 2015-07-17 at 17:38 +0200, Matthias Fischer wrote:
Hi list,
I prepared an update for cups.
cups - Update to 2.0.3: http://git.ipfire.org/?p=people/mfischer/ipfire -2.x.git;a=commit;h=a51f6ccd2637c30e3d31f30028583635cba38c4f
This solves https://bugzilla.ipfire.org/show_bug.cgi?id=10899 - hopefully. ;-)
Regards Matthias
Hi,
On 17.07.2015 17:47, Michael Tremer wrote:
I am just wondering why the two backend files for https and ipps are gone. Have these been merged with http or something else? Dropping support for those two protocols won't be a good idea.
I noticed this too, while editing the rootfile.
Do we need additional configure-options for https and ipps?
What about --enable-ssl, --enable-gnutls and --enable-cdsassl?
Regards Matthias
Hi,
On 17.07.2015 17:47, Michael Tremer wrote:
I also would appreciate if you could send in your changes as patches...
I hope, this is better now. I changed the subject accordingly.
Regarding the missing (https / ipps) backend-files, I tested with '--enable-ssl', '--enable-gnutls' (missing!) and 'enable-cdsassl', but no luck.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index e3cd084..513cf4c 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -1,4 +1,5 @@ etc/pam.d/cups +etc/rc.d/init.d/cups #etc/rc0.d #etc/rc0.d/K36cups #etc/rc2.d @@ -17,7 +18,6 @@ usr/bin/cupstestppd usr/bin/ipptool usr/bin/lp usr/bin/lpoptions -usr/bin/lppasswd usr/bin/lpq usr/bin/lpr usr/bin/lprm @@ -50,9 +50,7 @@ usr/bin/ppdpo usr/lib/cups usr/lib/cups/backend usr/lib/cups/backend/http -usr/lib/cups/backend/https usr/lib/cups/backend/ipp -usr/lib/cups/backend/ipps usr/lib/cups/backend/lpd usr/lib/cups/backend/smb usr/lib/cups/backend/snmp @@ -181,77 +179,6 @@ usr/share/cups/templates/add-class.tmpl usr/share/cups/templates/add-printer.tmpl usr/share/cups/templates/add-rss-subscription.tmpl usr/share/cups/templates/admin.tmpl -usr/share/cups/templates/ca -usr/share/cups/templates/ca/add-class.tmpl -usr/share/cups/templates/ca/add-printer.tmpl -usr/share/cups/templates/ca/add-rss-subscription.tmpl -usr/share/cups/templates/ca/admin.tmpl -usr/share/cups/templates/ca/choose-device.tmpl -usr/share/cups/templates/ca/choose-make.tmpl -usr/share/cups/templates/ca/choose-model.tmpl -usr/share/cups/templates/ca/choose-serial.tmpl -usr/share/cups/templates/ca/choose-uri.tmpl -usr/share/cups/templates/ca/class-added.tmpl -usr/share/cups/templates/ca/class-confirm.tmpl -usr/share/cups/templates/ca/class-deleted.tmpl -usr/share/cups/templates/ca/class-jobs-header.tmpl -usr/share/cups/templates/ca/class-modified.tmpl -usr/share/cups/templates/ca/class.tmpl -usr/share/cups/templates/ca/classes-header.tmpl -usr/share/cups/templates/ca/classes.tmpl -usr/share/cups/templates/ca/command.tmpl -usr/share/cups/templates/ca/edit-config.tmpl -usr/share/cups/templates/ca/error-op.tmpl -usr/share/cups/templates/ca/error.tmpl -usr/share/cups/templates/ca/header.tmpl -usr/share/cups/templates/ca/help-header.tmpl -usr/share/cups/templates/ca/help-printable.tmpl -usr/share/cups/templates/ca/help-trailer.tmpl -usr/share/cups/templates/ca/job-cancel.tmpl -usr/share/cups/templates/ca/job-hold.tmpl -usr/share/cups/templates/ca/job-move.tmpl -usr/share/cups/templates/ca/job-moved.tmpl -usr/share/cups/templates/ca/job-release.tmpl -usr/share/cups/templates/ca/job-restart.tmpl -usr/share/cups/templates/ca/jobs-header.tmpl -usr/share/cups/templates/ca/jobs.tmpl -usr/share/cups/templates/ca/list-available-printers.tmpl -usr/share/cups/templates/ca/modify-class.tmpl -usr/share/cups/templates/ca/modify-printer.tmpl -usr/share/cups/templates/ca/norestart.tmpl -usr/share/cups/templates/ca/option-boolean.tmpl -usr/share/cups/templates/ca/option-conflict.tmpl -usr/share/cups/templates/ca/option-header.tmpl -usr/share/cups/templates/ca/option-pickmany.tmpl -usr/share/cups/templates/ca/option-pickone.tmpl -usr/share/cups/templates/ca/option-trailer.tmpl -usr/share/cups/templates/ca/pager.tmpl -usr/share/cups/templates/ca/printer-accept.tmpl -usr/share/cups/templates/ca/printer-added.tmpl -usr/share/cups/templates/ca/printer-configured.tmpl -usr/share/cups/templates/ca/printer-confirm.tmpl -usr/share/cups/templates/ca/printer-default.tmpl -usr/share/cups/templates/ca/printer-deleted.tmpl -usr/share/cups/templates/ca/printer-jobs-header.tmpl -usr/share/cups/templates/ca/printer-modified.tmpl -usr/share/cups/templates/ca/printer-purge.tmpl -usr/share/cups/templates/ca/printer-reject.tmpl -usr/share/cups/templates/ca/printer-start.tmpl -usr/share/cups/templates/ca/printer-stop.tmpl -usr/share/cups/templates/ca/printer.tmpl -usr/share/cups/templates/ca/printers-header.tmpl -usr/share/cups/templates/ca/printers.tmpl -usr/share/cups/templates/ca/restart.tmpl -usr/share/cups/templates/ca/samba-export.tmpl -usr/share/cups/templates/ca/samba-exported.tmpl -usr/share/cups/templates/ca/search.tmpl -usr/share/cups/templates/ca/set-printer-options-header.tmpl -usr/share/cups/templates/ca/set-printer-options-trailer.tmpl -usr/share/cups/templates/ca/subscription-added.tmpl -usr/share/cups/templates/ca/subscription-canceled.tmpl -usr/share/cups/templates/ca/test-page.tmpl -usr/share/cups/templates/ca/trailer.tmpl -usr/share/cups/templates/ca/users.tmpl usr/share/cups/templates/choose-device.tmpl usr/share/cups/templates/choose-make.tmpl usr/share/cups/templates/choose-model.tmpl @@ -266,77 +193,6 @@ usr/share/cups/templates/class.tmpl usr/share/cups/templates/classes-header.tmpl usr/share/cups/templates/classes.tmpl usr/share/cups/templates/command.tmpl -usr/share/cups/templates/cs -usr/share/cups/templates/cs/add-class.tmpl -usr/share/cups/templates/cs/add-printer.tmpl -usr/share/cups/templates/cs/add-rss-subscription.tmpl -usr/share/cups/templates/cs/admin.tmpl -usr/share/cups/templates/cs/choose-device.tmpl -usr/share/cups/templates/cs/choose-make.tmpl -usr/share/cups/templates/cs/choose-model.tmpl -usr/share/cups/templates/cs/choose-serial.tmpl -usr/share/cups/templates/cs/choose-uri.tmpl -usr/share/cups/templates/cs/class-added.tmpl -usr/share/cups/templates/cs/class-confirm.tmpl -usr/share/cups/templates/cs/class-deleted.tmpl -usr/share/cups/templates/cs/class-jobs-header.tmpl -usr/share/cups/templates/cs/class-modified.tmpl -usr/share/cups/templates/cs/class.tmpl -usr/share/cups/templates/cs/classes-header.tmpl -usr/share/cups/templates/cs/classes.tmpl -usr/share/cups/templates/cs/command.tmpl -usr/share/cups/templates/cs/edit-config.tmpl -usr/share/cups/templates/cs/error-op.tmpl -usr/share/cups/templates/cs/error.tmpl -usr/share/cups/templates/cs/header.tmpl -usr/share/cups/templates/cs/help-header.tmpl -usr/share/cups/templates/cs/help-printable.tmpl -usr/share/cups/templates/cs/help-trailer.tmpl -usr/share/cups/templates/cs/job-cancel.tmpl -usr/share/cups/templates/cs/job-hold.tmpl -usr/share/cups/templates/cs/job-move.tmpl -usr/share/cups/templates/cs/job-moved.tmpl -usr/share/cups/templates/cs/job-release.tmpl -usr/share/cups/templates/cs/job-restart.tmpl -usr/share/cups/templates/cs/jobs-header.tmpl -usr/share/cups/templates/cs/jobs.tmpl -usr/share/cups/templates/cs/list-available-printers.tmpl -usr/share/cups/templates/cs/modify-class.tmpl -usr/share/cups/templates/cs/modify-printer.tmpl -usr/share/cups/templates/cs/norestart.tmpl -usr/share/cups/templates/cs/option-boolean.tmpl -usr/share/cups/templates/cs/option-conflict.tmpl -usr/share/cups/templates/cs/option-header.tmpl -usr/share/cups/templates/cs/option-pickmany.tmpl -usr/share/cups/templates/cs/option-pickone.tmpl -usr/share/cups/templates/cs/option-trailer.tmpl -usr/share/cups/templates/cs/pager.tmpl -usr/share/cups/templates/cs/printer-accept.tmpl -usr/share/cups/templates/cs/printer-added.tmpl -usr/share/cups/templates/cs/printer-configured.tmpl -usr/share/cups/templates/cs/printer-confirm.tmpl -usr/share/cups/templates/cs/printer-default.tmpl -usr/share/cups/templates/cs/printer-deleted.tmpl -usr/share/cups/templates/cs/printer-jobs-header.tmpl -usr/share/cups/templates/cs/printer-modified.tmpl -usr/share/cups/templates/cs/printer-purge.tmpl -usr/share/cups/templates/cs/printer-reject.tmpl -usr/share/cups/templates/cs/printer-start.tmpl -usr/share/cups/templates/cs/printer-stop.tmpl -usr/share/cups/templates/cs/printer.tmpl -usr/share/cups/templates/cs/printers-header.tmpl -usr/share/cups/templates/cs/printers.tmpl -usr/share/cups/templates/cs/restart.tmpl -usr/share/cups/templates/cs/samba-export.tmpl -usr/share/cups/templates/cs/samba-exported.tmpl -usr/share/cups/templates/cs/search.tmpl -usr/share/cups/templates/cs/set-printer-options-header.tmpl -usr/share/cups/templates/cs/set-printer-options-trailer.tmpl -usr/share/cups/templates/cs/subscription-added.tmpl -usr/share/cups/templates/cs/subscription-canceled.tmpl -usr/share/cups/templates/cs/test-page.tmpl -usr/share/cups/templates/cs/trailer.tmpl -usr/share/cups/templates/cs/users.tmpl usr/share/cups/templates/de usr/share/cups/templates/de/add-class.tmpl usr/share/cups/templates/de/add-printer.tmpl @@ -362,7 +218,6 @@ usr/share/cups/templates/de/error.tmpl usr/share/cups/templates/de/header.tmpl usr/share/cups/templates/de/help-header.tmpl usr/share/cups/templates/de/help-printable.tmpl -usr/share/cups/templates/de/help-trailer.tmpl usr/share/cups/templates/de/job-cancel.tmpl usr/share/cups/templates/de/job-hold.tmpl usr/share/cups/templates/de/job-move.tmpl @@ -384,13 +239,13 @@ usr/share/cups/templates/de/option-trailer.tmpl usr/share/cups/templates/de/pager.tmpl usr/share/cups/templates/de/printer-accept.tmpl usr/share/cups/templates/de/printer-added.tmpl +usr/share/cups/templates/de/printer-cancel-jobs.tmpl usr/share/cups/templates/de/printer-configured.tmpl usr/share/cups/templates/de/printer-confirm.tmpl usr/share/cups/templates/de/printer-default.tmpl usr/share/cups/templates/de/printer-deleted.tmpl usr/share/cups/templates/de/printer-jobs-header.tmpl usr/share/cups/templates/de/printer-modified.tmpl -usr/share/cups/templates/de/printer-purge.tmpl usr/share/cups/templates/de/printer-reject.tmpl usr/share/cups/templates/de/printer-start.tmpl usr/share/cups/templates/de/printer-stop.tmpl @@ -458,13 +313,13 @@ usr/share/cups/templates/es/option-trailer.tmpl usr/share/cups/templates/es/pager.tmpl usr/share/cups/templates/es/printer-accept.tmpl usr/share/cups/templates/es/printer-added.tmpl +usr/share/cups/templates/es/printer-cancel-jobs.tmpl usr/share/cups/templates/es/printer-configured.tmpl usr/share/cups/templates/es/printer-confirm.tmpl usr/share/cups/templates/es/printer-default.tmpl usr/share/cups/templates/es/printer-deleted.tmpl usr/share/cups/templates/es/printer-jobs-header.tmpl usr/share/cups/templates/es/printer-modified.tmpl -usr/share/cups/templates/es/printer-purge.tmpl usr/share/cups/templates/es/printer-reject.tmpl usr/share/cups/templates/es/printer-start.tmpl usr/share/cups/templates/es/printer-stop.tmpl @@ -482,152 +337,10 @@ usr/share/cups/templates/es/subscription-canceled.tmpl usr/share/cups/templates/es/test-page.tmpl usr/share/cups/templates/es/trailer.tmpl usr/share/cups/templates/es/users.tmpl -usr/share/cups/templates/fr -usr/share/cups/templates/fr/add-class.tmpl -usr/share/cups/templates/fr/add-printer.tmpl -usr/share/cups/templates/fr/add-rss-subscription.tmpl -usr/share/cups/templates/fr/admin.tmpl -usr/share/cups/templates/fr/choose-device.tmpl -usr/share/cups/templates/fr/choose-make.tmpl -usr/share/cups/templates/fr/choose-model.tmpl -usr/share/cups/templates/fr/choose-serial.tmpl -usr/share/cups/templates/fr/choose-uri.tmpl -usr/share/cups/templates/fr/class-added.tmpl -usr/share/cups/templates/fr/class-confirm.tmpl -usr/share/cups/templates/fr/class-deleted.tmpl -usr/share/cups/templates/fr/class-jobs-header.tmpl -usr/share/cups/templates/fr/class-modified.tmpl -usr/share/cups/templates/fr/class.tmpl -usr/share/cups/templates/fr/classes-header.tmpl -usr/share/cups/templates/fr/classes.tmpl -usr/share/cups/templates/fr/command.tmpl -usr/share/cups/templates/fr/edit-config.tmpl -usr/share/cups/templates/fr/error-op.tmpl -usr/share/cups/templates/fr/error.tmpl -usr/share/cups/templates/fr/header.tmpl -usr/share/cups/templates/fr/help-header.tmpl -usr/share/cups/templates/fr/help-printable.tmpl -usr/share/cups/templates/fr/help-trailer.tmpl -usr/share/cups/templates/fr/job-cancel.tmpl -usr/share/cups/templates/fr/job-hold.tmpl -usr/share/cups/templates/fr/job-move.tmpl -usr/share/cups/templates/fr/job-moved.tmpl -usr/share/cups/templates/fr/job-release.tmpl -usr/share/cups/templates/fr/job-restart.tmpl -usr/share/cups/templates/fr/jobs-header.tmpl -usr/share/cups/templates/fr/jobs.tmpl -usr/share/cups/templates/fr/list-available-printers.tmpl -usr/share/cups/templates/fr/modify-class.tmpl -usr/share/cups/templates/fr/modify-printer.tmpl -usr/share/cups/templates/fr/norestart.tmpl -usr/share/cups/templates/fr/option-boolean.tmpl -usr/share/cups/templates/fr/option-conflict.tmpl -usr/share/cups/templates/fr/option-header.tmpl -usr/share/cups/templates/fr/option-pickmany.tmpl -usr/share/cups/templates/fr/option-pickone.tmpl -usr/share/cups/templates/fr/option-trailer.tmpl -usr/share/cups/templates/fr/pager.tmpl -usr/share/cups/templates/fr/printer-accept.tmpl -usr/share/cups/templates/fr/printer-added.tmpl -usr/share/cups/templates/fr/printer-configured.tmpl -usr/share/cups/templates/fr/printer-confirm.tmpl -usr/share/cups/templates/fr/printer-default.tmpl -usr/share/cups/templates/fr/printer-deleted.tmpl -usr/share/cups/templates/fr/printer-jobs-header.tmpl -usr/share/cups/templates/fr/printer-modified.tmpl -usr/share/cups/templates/fr/printer-purge.tmpl -usr/share/cups/templates/fr/printer-reject.tmpl -usr/share/cups/templates/fr/printer-start.tmpl -usr/share/cups/templates/fr/printer-stop.tmpl -usr/share/cups/templates/fr/printer.tmpl -usr/share/cups/templates/fr/printers-header.tmpl -usr/share/cups/templates/fr/printers.tmpl -usr/share/cups/templates/fr/restart.tmpl -usr/share/cups/templates/fr/samba-export.tmpl -usr/share/cups/templates/fr/samba-exported.tmpl -usr/share/cups/templates/fr/search.tmpl -usr/share/cups/templates/fr/set-printer-options-header.tmpl -usr/share/cups/templates/fr/set-printer-options-trailer.tmpl -usr/share/cups/templates/fr/subscription-added.tmpl -usr/share/cups/templates/fr/subscription-canceled.tmpl -usr/share/cups/templates/fr/test-page.tmpl -usr/share/cups/templates/fr/trailer.tmpl -usr/share/cups/templates/fr/users.tmpl usr/share/cups/templates/header.tmpl usr/share/cups/templates/help-header.tmpl usr/share/cups/templates/help-printable.tmpl usr/share/cups/templates/help-trailer.tmpl -usr/share/cups/templates/it -usr/share/cups/templates/it/add-class.tmpl -usr/share/cups/templates/it/add-printer.tmpl -usr/share/cups/templates/it/add-rss-subscription.tmpl -usr/share/cups/templates/it/admin.tmpl -usr/share/cups/templates/it/choose-device.tmpl -usr/share/cups/templates/it/choose-make.tmpl -usr/share/cups/templates/it/choose-model.tmpl -usr/share/cups/templates/it/choose-serial.tmpl -usr/share/cups/templates/it/choose-uri.tmpl -usr/share/cups/templates/it/class-added.tmpl -usr/share/cups/templates/it/class-confirm.tmpl -usr/share/cups/templates/it/class-deleted.tmpl -usr/share/cups/templates/it/class-jobs-header.tmpl -usr/share/cups/templates/it/class-modified.tmpl -usr/share/cups/templates/it/class.tmpl -usr/share/cups/templates/it/classes-header.tmpl -usr/share/cups/templates/it/classes.tmpl -usr/share/cups/templates/it/command.tmpl -usr/share/cups/templates/it/edit-config.tmpl -usr/share/cups/templates/it/error-op.tmpl -usr/share/cups/templates/it/error.tmpl -usr/share/cups/templates/it/header.tmpl -usr/share/cups/templates/it/help-header.tmpl -usr/share/cups/templates/it/help-printable.tmpl -usr/share/cups/templates/it/help-trailer.tmpl -usr/share/cups/templates/it/job-cancel.tmpl -usr/share/cups/templates/it/job-hold.tmpl -usr/share/cups/templates/it/job-move.tmpl -usr/share/cups/templates/it/job-moved.tmpl -usr/share/cups/templates/it/job-release.tmpl -usr/share/cups/templates/it/job-restart.tmpl -usr/share/cups/templates/it/jobs-header.tmpl -usr/share/cups/templates/it/jobs.tmpl -usr/share/cups/templates/it/list-available-printers.tmpl -usr/share/cups/templates/it/modify-class.tmpl -usr/share/cups/templates/it/modify-printer.tmpl -usr/share/cups/templates/it/norestart.tmpl -usr/share/cups/templates/it/option-boolean.tmpl -usr/share/cups/templates/it/option-conflict.tmpl -usr/share/cups/templates/it/option-header.tmpl -usr/share/cups/templates/it/option-pickmany.tmpl -usr/share/cups/templates/it/option-pickone.tmpl -usr/share/cups/templates/it/option-trailer.tmpl -usr/share/cups/templates/it/pager.tmpl -usr/share/cups/templates/it/printer-accept.tmpl -usr/share/cups/templates/it/printer-added.tmpl -usr/share/cups/templates/it/printer-configured.tmpl -usr/share/cups/templates/it/printer-confirm.tmpl -usr/share/cups/templates/it/printer-default.tmpl -usr/share/cups/templates/it/printer-deleted.tmpl -usr/share/cups/templates/it/printer-jobs-header.tmpl -usr/share/cups/templates/it/printer-modified.tmpl -usr/share/cups/templates/it/printer-purge.tmpl -usr/share/cups/templates/it/printer-reject.tmpl -usr/share/cups/templates/it/printer-start.tmpl -usr/share/cups/templates/it/printer-stop.tmpl -usr/share/cups/templates/it/printer.tmpl -usr/share/cups/templates/it/printers-header.tmpl -usr/share/cups/templates/it/printers.tmpl -usr/share/cups/templates/it/restart.tmpl -usr/share/cups/templates/it/samba-export.tmpl -usr/share/cups/templates/it/samba-exported.tmpl -usr/share/cups/templates/it/search.tmpl -usr/share/cups/templates/it/set-printer-options-header.tmpl -usr/share/cups/templates/it/set-printer-options-trailer.tmpl -usr/share/cups/templates/it/subscription-added.tmpl -usr/share/cups/templates/it/subscription-canceled.tmpl -usr/share/cups/templates/it/test-page.tmpl -usr/share/cups/templates/it/trailer.tmpl -usr/share/cups/templates/it/users.tmpl usr/share/cups/templates/ja usr/share/cups/templates/ja/add-class.tmpl usr/share/cups/templates/ja/add-printer.tmpl @@ -675,13 +388,13 @@ usr/share/cups/templates/ja/option-trailer.tmpl usr/share/cups/templates/ja/pager.tmpl usr/share/cups/templates/ja/printer-accept.tmpl usr/share/cups/templates/ja/printer-added.tmpl +usr/share/cups/templates/ja/printer-cancel-jobs.tmpl usr/share/cups/templates/ja/printer-configured.tmpl usr/share/cups/templates/ja/printer-confirm.tmpl usr/share/cups/templates/ja/printer-default.tmpl usr/share/cups/templates/ja/printer-deleted.tmpl usr/share/cups/templates/ja/printer-jobs-header.tmpl usr/share/cups/templates/ja/printer-modified.tmpl -usr/share/cups/templates/ja/printer-purge.tmpl usr/share/cups/templates/ja/printer-reject.tmpl usr/share/cups/templates/ja/printer-start.tmpl usr/share/cups/templates/ja/printer-stop.tmpl @@ -720,88 +433,19 @@ usr/share/cups/templates/option-trailer.tmpl usr/share/cups/templates/pager.tmpl usr/share/cups/templates/printer-accept.tmpl usr/share/cups/templates/printer-added.tmpl +usr/share/cups/templates/printer-cancel-jobs.tmpl usr/share/cups/templates/printer-configured.tmpl usr/share/cups/templates/printer-confirm.tmpl usr/share/cups/templates/printer-default.tmpl usr/share/cups/templates/printer-deleted.tmpl usr/share/cups/templates/printer-jobs-header.tmpl usr/share/cups/templates/printer-modified.tmpl -usr/share/cups/templates/printer-purge.tmpl usr/share/cups/templates/printer-reject.tmpl usr/share/cups/templates/printer-start.tmpl usr/share/cups/templates/printer-stop.tmpl usr/share/cups/templates/printer.tmpl usr/share/cups/templates/printers-header.tmpl usr/share/cups/templates/printers.tmpl -usr/share/cups/templates/pt_BR -usr/share/cups/templates/pt_BR/add-class.tmpl -usr/share/cups/templates/pt_BR/add-printer.tmpl -usr/share/cups/templates/pt_BR/add-rss-subscription.tmpl -usr/share/cups/templates/pt_BR/admin.tmpl -usr/share/cups/templates/pt_BR/choose-device.tmpl -usr/share/cups/templates/pt_BR/choose-make.tmpl -usr/share/cups/templates/pt_BR/choose-model.tmpl -usr/share/cups/templates/pt_BR/choose-serial.tmpl -usr/share/cups/templates/pt_BR/choose-uri.tmpl -usr/share/cups/templates/pt_BR/class-added.tmpl -usr/share/cups/templates/pt_BR/class-confirm.tmpl -usr/share/cups/templates/pt_BR/class-deleted.tmpl -usr/share/cups/templates/pt_BR/class-jobs-header.tmpl -usr/share/cups/templates/pt_BR/class-modified.tmpl -usr/share/cups/templates/pt_BR/class.tmpl -usr/share/cups/templates/pt_BR/classes-header.tmpl -usr/share/cups/templates/pt_BR/classes.tmpl -usr/share/cups/templates/pt_BR/command.tmpl -usr/share/cups/templates/pt_BR/edit-config.tmpl -usr/share/cups/templates/pt_BR/error-op.tmpl -usr/share/cups/templates/pt_BR/error.tmpl -usr/share/cups/templates/pt_BR/header.tmpl -usr/share/cups/templates/pt_BR/help-header.tmpl -usr/share/cups/templates/pt_BR/job-cancel.tmpl -usr/share/cups/templates/pt_BR/job-hold.tmpl -usr/share/cups/templates/pt_BR/job-move.tmpl -usr/share/cups/templates/pt_BR/job-moved.tmpl -usr/share/cups/templates/pt_BR/job-release.tmpl -usr/share/cups/templates/pt_BR/job-restart.tmpl -usr/share/cups/templates/pt_BR/jobs-header.tmpl -usr/share/cups/templates/pt_BR/jobs.tmpl -usr/share/cups/templates/pt_BR/list-available-printers.tmpl -usr/share/cups/templates/pt_BR/modify-class.tmpl -usr/share/cups/templates/pt_BR/modify-printer.tmpl -usr/share/cups/templates/pt_BR/norestart.tmpl -usr/share/cups/templates/pt_BR/option-boolean.tmpl -usr/share/cups/templates/pt_BR/option-conflict.tmpl -usr/share/cups/templates/pt_BR/option-header.tmpl -usr/share/cups/templates/pt_BR/option-pickmany.tmpl -usr/share/cups/templates/pt_BR/option-pickone.tmpl -usr/share/cups/templates/pt_BR/option-trailer.tmpl -usr/share/cups/templates/pt_BR/pager.tmpl -usr/share/cups/templates/pt_BR/printer-accept.tmpl -usr/share/cups/templates/pt_BR/printer-added.tmpl -usr/share/cups/templates/pt_BR/printer-configured.tmpl -usr/share/cups/templates/pt_BR/printer-confirm.tmpl -usr/share/cups/templates/pt_BR/printer-default.tmpl -usr/share/cups/templates/pt_BR/printer-deleted.tmpl -usr/share/cups/templates/pt_BR/printer-jobs-header.tmpl -usr/share/cups/templates/pt_BR/printer-modified.tmpl -usr/share/cups/templates/pt_BR/printer-purge.tmpl -usr/share/cups/templates/pt_BR/printer-reject.tmpl -usr/share/cups/templates/pt_BR/printer-start.tmpl -usr/share/cups/templates/pt_BR/printer-stop.tmpl -usr/share/cups/templates/pt_BR/printer.tmpl -usr/share/cups/templates/pt_BR/printers-header.tmpl -usr/share/cups/templates/pt_BR/printers.tmpl -usr/share/cups/templates/pt_BR/restart.tmpl -usr/share/cups/templates/pt_BR/samba-export.tmpl -usr/share/cups/templates/pt_BR/samba-exported.tmpl -usr/share/cups/templates/pt_BR/search.tmpl -usr/share/cups/templates/pt_BR/set-printer-options-header.tmpl -usr/share/cups/templates/pt_BR/set-printer-options-trailer.tmpl -usr/share/cups/templates/pt_BR/subscription-added.tmpl -usr/share/cups/templates/pt_BR/subscription-canceled.tmpl -usr/share/cups/templates/pt_BR/test-page.tmpl -usr/share/cups/templates/pt_BR/trailer.tmpl -usr/share/cups/templates/pt_BR/users.tmpl usr/share/cups/templates/restart.tmpl usr/share/cups/templates/ru usr/share/cups/templates/ru/add-class.tmpl @@ -828,7 +472,6 @@ usr/share/cups/templates/ru/error.tmpl usr/share/cups/templates/ru/header.tmpl usr/share/cups/templates/ru/help-header.tmpl usr/share/cups/templates/ru/help-printable.tmpl -usr/share/cups/templates/ru/help-trailer.tmpl usr/share/cups/templates/ru/job-cancel.tmpl usr/share/cups/templates/ru/job-hold.tmpl usr/share/cups/templates/ru/job-move.tmpl @@ -850,13 +493,13 @@ usr/share/cups/templates/ru/option-trailer.tmpl usr/share/cups/templates/ru/pager.tmpl usr/share/cups/templates/ru/printer-accept.tmpl usr/share/cups/templates/ru/printer-added.tmpl +usr/share/cups/templates/ru/printer-cancel-jobs.tmpl usr/share/cups/templates/ru/printer-configured.tmpl usr/share/cups/templates/ru/printer-confirm.tmpl usr/share/cups/templates/ru/printer-default.tmpl usr/share/cups/templates/ru/printer-deleted.tmpl usr/share/cups/templates/ru/printer-jobs-header.tmpl usr/share/cups/templates/ru/printer-modified.tmpl -usr/share/cups/templates/ru/printer-purge.tmpl usr/share/cups/templates/ru/printer-reject.tmpl usr/share/cups/templates/ru/printer-start.tmpl usr/share/cups/templates/ru/printer-stop.tmpl @@ -887,18 +530,13 @@ usr/share/cups/templates/users.tmpl usr/share/cups/usb usr/share/cups/usb/org.cups.usb-quirks usr/share/doc/cups -usr/share/doc/cups/ca -usr/share/doc/cups/ca/index.html -usr/share/doc/cups/cs -usr/share/doc/cups/cs/index.html +usr/share/doc/cups/apple-touch-icon.png usr/share/doc/cups/cups-printable.css usr/share/doc/cups/cups.css usr/share/doc/cups/de usr/share/doc/cups/de/index.html usr/share/doc/cups/es usr/share/doc/cups/es/index.html -usr/share/doc/cups/fr -usr/share/doc/cups/fr/index.html usr/share/doc/cups/help usr/share/doc/cups/help/accounting.html usr/share/doc/cups/help/api-array.html @@ -919,11 +557,18 @@ usr/share/doc/cups/help/kerberos.html usr/share/doc/cups/help/license.html usr/share/doc/cups/help/man-backend.html usr/share/doc/cups/help/man-cancel.html +usr/share/doc/cups/help/man-classes.conf.html +usr/share/doc/cups/help/man-client.conf.html usr/share/doc/cups/help/man-cups-config.html +usr/share/doc/cups/help/man-cups-files.conf.html usr/share/doc/cups/help/man-cups-lpd.html usr/share/doc/cups/help/man-cups-snmp.html +usr/share/doc/cups/help/man-cups.html usr/share/doc/cups/help/man-cupsaccept.html usr/share/doc/cups/help/man-cupsaddsmb.html +usr/share/doc/cups/help/man-cupsd-helper.html +usr/share/doc/cups/help/man-cupsd-logs.html +usr/share/doc/cups/help/man-cupsd.conf.html usr/share/doc/cups/help/man-cupsd.html usr/share/doc/cups/help/man-cupsenable.html usr/share/doc/cups/help/man-cupstestdsc.html @@ -937,7 +582,6 @@ usr/share/doc/cups/help/man-lpc.html usr/share/doc/cups/help/man-lpinfo.html usr/share/doc/cups/help/man-lpmove.html usr/share/doc/cups/help/man-lpoptions.html -usr/share/doc/cups/help/man-lppasswd.html usr/share/doc/cups/help/man-lpq.html usr/share/doc/cups/help/man-lpr.html usr/share/doc/cups/help/man-lprm.html @@ -950,6 +594,8 @@ usr/share/doc/cups/help/man-ppdhtml.html usr/share/doc/cups/help/man-ppdi.html usr/share/doc/cups/help/man-ppdmerge.html usr/share/doc/cups/help/man-ppdpo.html +usr/share/doc/cups/help/man-printers.conf.html +usr/share/doc/cups/help/man-subscriptions.conf.html usr/share/doc/cups/help/network.html usr/share/doc/cups/help/options.html usr/share/doc/cups/help/overview.html @@ -957,18 +603,7 @@ usr/share/doc/cups/help/policies.html usr/share/doc/cups/help/postscript-driver.html usr/share/doc/cups/help/ppd-compiler.html usr/share/doc/cups/help/raster-driver.html -usr/share/doc/cups/help/ref-access_log.html -usr/share/doc/cups/help/ref-classes-conf.html -usr/share/doc/cups/help/ref-client-conf.html -usr/share/doc/cups/help/ref-cups-files-conf.html -usr/share/doc/cups/help/ref-cupsd-conf.html -usr/share/doc/cups/help/ref-error_log.html -usr/share/doc/cups/help/ref-mailto-conf.html -usr/share/doc/cups/help/ref-page_log.html usr/share/doc/cups/help/ref-ppdcfile.html -usr/share/doc/cups/help/ref-printers-conf.html -usr/share/doc/cups/help/ref-snmp-conf.html -usr/share/doc/cups/help/ref-subscriptions-conf.html usr/share/doc/cups/help/security.html usr/share/doc/cups/help/sharing.html usr/share/doc/cups/help/spec-banner.html @@ -982,7 +617,6 @@ usr/share/doc/cups/help/spec-ppd.html usr/share/doc/cups/help/spec-raster.html usr/share/doc/cups/help/spec-stp.html usr/share/doc/cups/help/translation.html -usr/share/doc/cups/help/whatsnew.html usr/share/doc/cups/images usr/share/doc/cups/images/color-wheel.png usr/share/doc/cups/images/cups-block-diagram.png @@ -991,6 +625,7 @@ usr/share/doc/cups/images/cups-icon.png usr/share/doc/cups/images/cups-postscript-chain.png usr/share/doc/cups/images/cups-raster-chain.png usr/share/doc/cups/images/cups.png +usr/share/doc/cups/images/generic.png usr/share/doc/cups/images/left.gif usr/share/doc/cups/images/raster-organization.png usr/share/doc/cups/images/raster.png @@ -1001,12 +636,8 @@ usr/share/doc/cups/images/smiley.jpg usr/share/doc/cups/images/unsel.gif usr/share/doc/cups/images/wait.gif usr/share/doc/cups/index.html -usr/share/doc/cups/it -usr/share/doc/cups/it/index.html usr/share/doc/cups/ja usr/share/doc/cups/ja/index.html -usr/share/doc/cups/pt_BR -usr/share/doc/cups/pt_BR/index.html usr/share/doc/cups/robots.txt usr/share/doc/cups/ru usr/share/doc/cups/ru/index.html @@ -1017,16 +648,15 @@ usr/share/locale/es/cups_es.po usr/share/locale/fr/cups_fr.po usr/share/locale/it/cups_it.po usr/share/locale/ja/cups_ja.po -usr/share/locale/pt_BR/cups_pt_BR.po usr/share/locale/ru/cups_ru.po #usr/share/man/man1/cancel.1.gz #usr/share/man/man1/cups-config.1.gz +#usr/share/man/man1/cups.1.gz #usr/share/man/man1/cupstestdsc.1.gz #usr/share/man/man1/cupstestppd.1.gz #usr/share/man/man1/ipptool.1.gz #usr/share/man/man1/lp.1.gz #usr/share/man/man1/lpoptions.1.gz -#usr/share/man/man1/lppasswd.1.gz #usr/share/man/man1/lpq.1.gz #usr/share/man/man1/lpr.1.gz #usr/share/man/man1/lprm.1.gz @@ -1054,11 +684,14 @@ usr/share/locale/ru/cups_ru.po #usr/share/man/man8/accept.8.gz #usr/share/man/man8/cups-deviced.8.gz #usr/share/man/man8/cups-driverd.8.gz +#usr/share/man/man8/cups-exec.8.gz #usr/share/man/man8/cups-lpd.8.gz #usr/share/man/man8/cups-snmp.8.gz #usr/share/man/man8/cupsaccept.8.gz #usr/share/man/man8/cupsaddsmb.8.gz #usr/share/man/man8/cupsctl.8.gz +#usr/share/man/man8/cupsd-helper.8.gz +#usr/share/man/man8/cupsd-logs.8.gz #usr/share/man/man8/cupsd.8.gz #usr/share/man/man8/cupsdisable.8.gz #usr/share/man/man8/cupsenable.8.gz @@ -1082,4 +715,3 @@ var/ipfire/cups/ssl var/log/cups var/spool/cups var/spool/cups/tmp -etc/rc.d/init.d/cups diff --git a/lfs/cups b/lfs/cups index 0c51687..e0ef962 100644 --- a/lfs/cups +++ b/lfs/cups @@ -1,7 +1,7 @@
############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2015 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.7.5 +VER = 2.0.3
THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 11 +PAK_VER = 12
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5d893edc2957005f78e2b2423fdace2e +$(DL_FILE)_MD5 = 8d98b85edbdab7ab03739c9622f570e8
install : $(TARGET)
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cups-str4609.patch cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ -- 2.4.6
-
Matthias Fischer -
Michael Tremer