diff options
| author | Juergen Daubert <jue@jue.li> | 2013-03-20 18:18:45 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2013-03-20 18:18:45 +0100 |
| commit | d50c1c7da5241ae7650a9a8a7981c7f13d9025b4 (patch) | |
| tree | ebd7b72129ed6d2576bcaccc78ae17c356e627eb /cups | |
| parent | f003afb656f5139b0ed2738a866746903291519f (diff) | |
| download | opt-d50c1c7da5241ae7650a9a8a7981c7f13d9025b4.tar.gz opt-d50c1c7da5241ae7650a9a8a7981c7f13d9025b4.tar.xz | |
cups: update to 1.6.2
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/.footprint | 3 | ||||
| -rw-r--r-- | cups/.md5sum | 4 | ||||
| -rw-r--r-- | cups/Pkgfile | 4 | ||||
| -rw-r--r-- | cups/cups-config.patch | 22 |
4 files changed, 19 insertions, 14 deletions
diff --git a/cups/.footprint b/cups/.footprint index 1b44dbbaa..c699b15fa 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -1,5 +1,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/lp etc/cups/ +-rw-r----- root/lp etc/cups/cups-files.conf -rw-r----- root/lp etc/cups/cupsd.conf -rw-r----- root/lp etc/cups/cupsd.conf.default drwxr-xr-x root/lp etc/cups/interfaces/ @@ -124,6 +125,7 @@ drwxr-xr-x root/root usr/man/man1/ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/classes.conf.5.gz -rw-r--r-- root/root usr/man/man5/client.conf.5.gz +-rw-r--r-- root/root usr/man/man5/cups-files.conf.5.gz -rw-r--r-- root/root usr/man/man5/cups-snmp.conf.5.gz -rw-r--r-- root/root usr/man/man5/cupsd.conf.5.gz -rw-r--r-- root/root usr/man/man5/ipptoolfile.5.gz @@ -237,6 +239,7 @@ drwxr-xr-x root/root usr/share/cups/doc/help/ -rw-r--r-- root/root usr/share/cups/doc/help/ref-access_log.html -rw-r--r-- root/root usr/share/cups/doc/help/ref-classes-conf.html -rw-r--r-- root/root usr/share/cups/doc/help/ref-client-conf.html +-rw-r--r-- root/root usr/share/cups/doc/help/ref-cups-files-conf.html -rw-r--r-- root/root usr/share/cups/doc/help/ref-cupsd-conf.html -rw-r--r-- root/root usr/share/cups/doc/help/ref-error_log.html -rw-r--r-- root/root usr/share/cups/doc/help/ref-mailto-conf.html diff --git a/cups/.md5sum b/cups/.md5sum index 27636c5e0..3cb34a588 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,3 +1,3 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -87ade07e3d1efd03c9c3add949cf9c00 cups-1.6.1-source.tar.bz2 -2220f411940c4f7504ed4457c6304d4a cups-config.patch +13c8b2b2336d42001abe4899766b62dc cups-1.6.2-source.tar.bz2 +fd78a2c51a2e206ea85d21d2dc9dde69 cups-config.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index 900e5c235..480566f7d 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,8 +4,8 @@ # Depends on: acl tcp_wrappers libusb openssl zlib name=cups -version=1.6.1 -release=2 +version=1.6.2 +release=1 source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 cups-config.patch cups) diff --git a/cups/cups-config.patch b/cups/cups-config.patch index 249f375b1..275cdb7cf 100644 --- a/cups/cups-config.patch +++ b/cups/cups-config.patch @@ -1,14 +1,16 @@ -diff -Nru cups-1.2.0.orig/conf/cupsd.conf.in cups-1.2.0/conf/cupsd.conf.in ---- cups-1.2.0.orig/conf/cupsd.conf.in 2006-05-14 10:35:54.000000000 +0200 -+++ cups-1.2.0/conf/cupsd.conf.in 2006-05-14 10:36:54.000000000 +0200 -@@ -10,6 +10,10 @@ - # troubleshooting... - LogLevel info +diff -Nru cups-1.6.2.orig/conf/cups-files.conf.in cups-1.6.2/conf/cups-files.conf.in +--- cups-1.6.2.orig/conf/cups-files.conf.in 2013-03-18 18:52:05.834379900 +0100 ++++ cups-1.6.2/conf/cups-files.conf.in 2013-03-18 19:13:54.540806821 +0100 +@@ -74,10 +74,10 @@ + #ServerBin @CUPS_SERVERBIN@ -+# Location of ssl certificates + # SSL/TLS certificate for the scheduler... +-#ServerCertificate @CUPS_SERVERCERT@ +ServerCertificate /etc/ssl/certs/cups.crt + + # SSL/TLS private key for the scheduler... +-#ServerKey @CUPS_SERVERKEY@ +ServerKey /etc/ssl/keys/cups.key -+ - # Administrator user group... - SystemGroup @CUPS_SYSTEM_GROUPS@ + # Location of other configuration files... + #ServerRoot @CUPS_SERVERROOT@ |