svn commit: r389019 - branches/2015Q2/print/cups-base
Jung-uk Kim
jkim at FreeBSD.org
Wed Jun 10 05:27:54 UTC 2015
Author: jkim
Date: Wed Jun 10 05:27:52 2015
New Revision: 389019
URL: https://svnweb.freebsd.org/changeset/ports/389019
Log:
MFH: r389015
CUPS 2.x does not support OpenSSL any more. Switch to GNU TLS by default.
Approved by: ports-secteam (delphij)
Modified:
branches/2015Q2/print/cups-base/Makefile
branches/2015Q2/print/cups-base/pkg-descr
branches/2015Q2/print/cups-base/pkg-descr.client
branches/2015Q2/print/cups-base/pkg-descr.image
branches/2015Q2/print/cups-base/pkg-plist
Directory Properties:
branches/2015Q2/ (props changed)
Modified: branches/2015Q2/print/cups-base/Makefile
==============================================================================
--- branches/2015Q2/print/cups-base/Makefile Wed Jun 10 03:50:29 2015 (r389018)
+++ branches/2015Q2/print/cups-base/Makefile Wed Jun 10 05:27:52 2015 (r389019)
@@ -15,6 +15,9 @@ COMMENT= Common UNIX Printing System: ${
LICENSE= GPLv2
+LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
+ libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
CONFLICTS= LPRng-[0-9]*
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
@@ -36,7 +39,7 @@ CONFIGURE_ARGS+= --localstatedir=/var
--with-domainsocket=${CUPS_SOCKET} \
--with-cachedir=${CUPS_CACHEDIR} \
--with-pam-module="unix" \
- --enable-ssl
+ --enable-gnutls
CUPS_CACHEDIR?= /var/db/cups
CUPS_SPOOLDIR= /var/spool/cups
@@ -50,23 +53,20 @@ GROUPS= cups
USERS= cups
# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
-OPTIONS_SINGLE= SSL
-OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
-OPTIONS_DEFAULT= OPENSSL
OPTIONS_SUB= yes
.if defined(CUPS_CLIENT)
-PORTREVISION= 0
+PORTREVISION= 1
LICENSE= LGPL21
CUPS_SUFFIX= -client
OPTIONS_RADIO= ZEROCONF
OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER
OPTIONS_DEFAULT+= MDNSRESPONDER
.elif defined(CUPS_IMAGE)
-PORTREVISION= 0
+PORTREVISION= 1
CUPS_SUFFIX= -image
LICENSE= LGPL21
.else
-PORTREVISION= 0
+PORTREVISION= 1
CUPS_SUFFIX= -base
# No DOCS option. Files are needed by web interface.
OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
@@ -127,17 +127,6 @@ PLIST_SUB+= OVERWRITE="@comment "
CONFIGURE_ARGS+= --with-printcap=${PREFIX}/etc/printcap
.endif
-.if ${PORT_OPTIONS:MGNUTLS}
-CONFIGURE_ARGS+= --disable-openssl --enable-gnutls
-LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
- libgnutls.so:${PORTSDIR}/security/gnutls
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --disable-gnutls --enable-openssl
-.endif
-
# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it
# will set the path of the interpreter to "no" and set it's existence to TRUE.
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
Modified: branches/2015Q2/print/cups-base/pkg-descr
==============================================================================
--- branches/2015Q2/print/cups-base/pkg-descr Wed Jun 10 03:50:29 2015 (r389018)
+++ branches/2015Q2/print/cups-base/pkg-descr Wed Jun 10 05:27:52 2015 (r389019)
@@ -17,7 +17,5 @@ non-PostScript printers. Sample drivers
that use these filters. This software is available in the cups-pstoraster
port.
-LICENSE: GPL2 or later with exception to link with OpenSSL
-
WWW: http://www.cups.org/
[original text by greid at ukug.uk.freebsd.org]
Modified: branches/2015Q2/print/cups-base/pkg-descr.client
==============================================================================
--- branches/2015Q2/print/cups-base/pkg-descr.client Wed Jun 10 03:50:29 2015 (r389018)
+++ branches/2015Q2/print/cups-base/pkg-descr.client Wed Jun 10 05:27:52 2015 (r389019)
@@ -1,5 +1,3 @@
This provides libcups for applications to access CUPS.
-LICENSE: LGPL2 or later with exception to link with OpenSSL
-
WWW: http://www.cups.org/
Modified: branches/2015Q2/print/cups-base/pkg-descr.image
==============================================================================
--- branches/2015Q2/print/cups-base/pkg-descr.image Wed Jun 10 03:50:29 2015 (r389018)
+++ branches/2015Q2/print/cups-base/pkg-descr.image Wed Jun 10 05:27:52 2015 (r389019)
@@ -1,5 +1,3 @@
This provides libcupsimage for applications to process CUPS raster files.
-LICENSE: LGPL2 or later with exception to link with OpenSSL
-
WWW: http://www.cups.org/
Modified: branches/2015Q2/print/cups-base/pkg-plist
==============================================================================
--- branches/2015Q2/print/cups-base/pkg-plist Wed Jun 10 03:50:29 2015 (r389018)
+++ branches/2015Q2/print/cups-base/pkg-plist Wed Jun 10 05:27:52 2015 (r389019)
@@ -42,7 +42,9 @@ lib/libcupsmime.so.1
lib/libcupsppdc.so
lib/libcupsppdc.so.1
libexec/cups/backend/http
+libexec/cups/backend/https
libexec/cups/backend/ipp
+libexec/cups/backend/ipps
libexec/cups/backend/lpd
libexec/cups/backend/snmp
libexec/cups/backend/socket
More information about the svn-ports-branches
mailing list