summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2014-10-02 14:18:36 +0200
committerTreeve Jelbert2014-10-03 11:06:57 +0200
commitff79f3676747832e25c5f1ffa609f9b6faa441aa (patch)
tree0d0f80864c1969f970ae3a9303bb543aeea51bea
parentbcd7a2c9d9807f035755ffdd5ff9824164d4ae63 (diff)
cups: => 2.0.0
-rwxr-xr-xprinter/cups/CONFIGURE2
-rwxr-xr-xprinter/cups/DEPENDS6
-rwxr-xr-xprinter/cups/DETAILS4
-rw-r--r--printer/cups/HISTORY4
4 files changed, 7 insertions, 9 deletions
diff --git a/printer/cups/CONFIGURE b/printer/cups/CONFIGURE
index 4a0a367da0..8d83457302 100755
--- a/printer/cups/CONFIGURE
+++ b/printer/cups/CONFIGURE
@@ -7,8 +7,6 @@ if [[ $EXTRA_LANG == y ]]; then
all de es fr ja pl sv
fi &&
-config_query_list CUPS_SSL "Which SSL backend do you want for https and ftps?" none gnutls SSL &&
-
config_query_option CUPS_OPTS \
"Do you want to enable raw printing" \
n \
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 67dee1b1f2..5288e1be25 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -41,11 +41,7 @@ optional_depends "linux-pam" \
"--disable-pam" \
"for pluggable authentication" &&
-case $CUPS_SSL in
- gnutls) depends gnutls "--enable-gnutls --disable-openssl" ;;
- SSL) depends SSL "--enable-openssl --disable-gnutls" ;;
- none) OPTS+=" --disable-ssl " ;;
-esac &&
+optional_depends gnutls "--enable-gnutls --disable-openssl" 'security' &&
optional_depends "acl" \
"" \
diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index 9b92f660f4..0a1429e62d 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -3,8 +3,8 @@
# VERSION=1.4.3
# SOURCE_HASH=sha512:
#else
- VERSION=1.7.5
- SOURCE_HASH=sha512:fe446b3d904539d744d3fa24f3ced2549ef9dfea8c805f1602eb71d03e19c2f06edaacf51f148e8216207af0c901f7d956c855f49b13b01112b01c9c45b75b9d
+ VERSION=2.0.0
+ SOURCE_HASH=sha512:d6b3f3ef786c477914678825cff68c96d8e3457fdf8742e65f444312e8b9da44b44a5a91b09b855011a2abb4b16b3351d5dfd649ddb9e98d17bec849c9908d33
SECURITY_PATCH=7
#fi
SOURCE=$SPELL-$VERSION-source.tar.bz2
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index f95133c5d3..579b740ec8 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,7 @@
+2014-10-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.0.0
+ * DEPENDS, CONFIGURE: openssl is no longer supported
+
2014-09-02 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: add krb5
* FINAL: specify default_final