Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print print: Remove cups15, legacy cups version now BR...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/621318d25e71
branches:  trunk
changeset: 429763:621318d25e71
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Apr 24 12:00:52 2020 +0000

description:
print: Remove cups15, legacy cups version now BROKEN due to OpenSSL 1.1

diffstat:

 print/Makefile                                           |     3 +-
 print/cups15/DESCR                                       |    15 -
 print/cups15/MESSAGE                                     |    13 -
 print/cups15/MESSAGE.libusb                              |    14 -
 print/cups15/MESSAGE.pam                                 |     9 -
 print/cups15/Makefile                                    |   200 --
 print/cups15/PLIST                                       |  1123 --------------
 print/cups15/buildlink3.mk                               |    30 -
 print/cups15/distinfo                                    |    30 -
 print/cups15/files/cups.pam                              |     6 -
 print/cups15/files/cupsd.sh                              |    73 -
 print/cups15/options.mk                                  |    96 -
 print/cups15/patches/patch-ac                            |    14 -
 print/cups15/patches/patch-ad                            |    89 -
 print/cups15/patches/patch-ae                            |    72 -
 print/cups15/patches/patch-af                            |    24 -
 print/cups15/patches/patch-ag                            |    24 -
 print/cups15/patches/patch-ah                            |    18 -
 print/cups15/patches/patch-ai                            |    15 -
 print/cups15/patches/patch-an                            |   158 -
 print/cups15/patches/patch-ao                            |    78 -
 print/cups15/patches/patch-at                            |    15 -
 print/cups15/patches/patch-au                            |    14 -
 print/cups15/patches/patch-conf_Makefile                 |    29 -
 print/cups15/patches/patch-config-scripts_cups-common.m4 |    15 -
 print/cups15/patches/patch-config-scripts_cups-gssapi.m4 |    45 -
 print/cups15/patches/patch-config.h.in                   |    19 -
 print/cups15/patches/patch-filter_raster.c               |    14 -
 print/cups15/patches/patch-ppdc_Makefile                 |    13 -
 print/cups15/patches/patch-scheduler_auth.c              |    36 -
 print/cups15/patches/patch-scheduler_client.c            |    22 -
 print/cups15/patches/patch-scheduler_dirsvc.c            |    13 -
 32 files changed, 1 insertions(+), 2338 deletions(-)

diffs (truncated from 2477 to 300 lines):

diff -r 0b7197981c28 -r 621318d25e71 print/Makefile
--- a/print/Makefile    Fri Apr 24 11:56:55 2020 +0000
+++ b/print/Makefile    Fri Apr 24 12:00:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.757 2020/03/01 17:15:49 nia Exp $
+# $NetBSD: Makefile,v 1.758 2020/04/24 12:00:52 nia Exp $
 #
 
 COMMENT=       Desktop publishing
@@ -29,7 +29,6 @@
 SUBDIR+=       cups-drivers-Magicolor5440DL
 SUBDIR+=       cups-filters
 SUBDIR+=       cups-pdf
-SUBDIR+=       cups15
 SUBDIR+=       deforaos-pdfviewer
 SUBDIR+=       dspdfviewer
 SUBDIR+=       dvidvi
diff -r 0b7197981c28 -r 621318d25e71 print/cups15/DESCR
--- a/print/cups15/DESCR        Fri Apr 24 11:56:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-The Common UNIX Printing System provides a portable printing layer for
-UNIX operating systems. It has been developed by Easy Software Products
-to promote a standard printing solution for all UNIX vendors and users.
-CUPS provides the System V and Berkeley command-line interfaces.
-
-CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for
-managing print jobs and queues.  The Line Printer Daemon (LPD, RFC1179)
-and AppSocket protocols are also supported with reduced functionality.
-
-CUPS adds network printer browsing and PostScript Printer Description
-("PPD")-based printing options to support real world applications under
-UNIX.
-
-This package contains the older 1.5 series, before Apple stopped
-maintaining the filters.
diff -r 0b7197981c28 -r 621318d25e71 print/cups15/MESSAGE
--- a/print/cups15/MESSAGE      Fri Apr 24 11:56:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2014/06/17 13:17:12 wiz Exp $
-
-You will need to also install print/ghostscript if you wish to
-print to non-Postscript printers.
-
-You may install additional PPD files for other printer models into
-${PREFIX}/share/cups/model.
-
-You may want to backup /etc/printcap before starting CUPS for the first
-time, as the CUPS scheduler may overwrite this file with automatically
-generated content.
-===========================================================================
diff -r 0b7197981c28 -r 621318d25e71 print/cups15/MESSAGE.libusb
--- a/print/cups15/MESSAGE.libusb       Fri Apr 24 11:56:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.libusb,v 1.1 2014/06/17 13:17:12 wiz Exp $
-
-With cups 1.4 from pkgsrc, USB printing can use libusb in addition to
-traditional USB printer devices.
-
-To see the DeviceURI of all attached printers run:
-
-${PREFIX}/libexec/cups/backend/usb
-
-libusb DeviceURIs start with "usb://".
-
-ulpt(4)/usblp DeviceURIs start with "usb:/dev/" (e.g., "usb:/dev/ulpt0".)
-===========================================================================
diff -r 0b7197981c28 -r 621318d25e71 print/cups15/MESSAGE.pam
--- a/print/cups15/MESSAGE.pam  Fri Apr 24 11:56:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.pam,v 1.1 2014/06/17 13:17:12 wiz Exp $
-
-To authenticate for CUPS using PAM, add the contents of the file:
-
-        ${PREFIX}/share/examples/cups/cups.pam
-
-to your PAM configuration file.
-===========================================================================
diff -r 0b7197981c28 -r 621318d25e71 print/cups15/Makefile
--- a/print/cups15/Makefile     Fri Apr 24 11:56:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2020/01/18 21:48:21 jperkin Exp $
-#
-# The CUPS author is very good about taking back changes into the main
-# CUPS distribution.  The correct place to send patches or bug-fixes is:
-# cups-bugs%cups.org@localhost.
-
-DISTNAME=      cups-${DIST_VERS}-source
-PKGNAME=       cups-${DIST_VERS:S/-/./g}
-BASE_VERS=     1.5.4
-DIST_VERS=     ${BASE_VERS}
-PKGREVISION=   19
-
-# Fix for https://www.cups.org/str.php?L4609
-PATCH_SITES=   https://www.cups.org/strfiles.php/3482/
-PATCHFILES=    str4609-1.5.patch
-
-CATEGORIES=    print
-MASTER_SITES=  http://ftp.easysw.com/pub/cups/${BASE_VERS}/
-MASTER_SITES+= ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/
-MASTER_SITES+= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    sbd%NetBSD.org@localhost
-HOMEPAGE=      https://www.cups.org/
-COMMENT=       Common UNIX Printing System (1.5 branch)
-LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2
-
-CONFLICTS+=    LPRng-[0-9]* LPRng-core-[0-9]*
-
-WRKSRC=                        ${WRKDIR}/cups-${BASE_VERS}
-UNLIMIT_RESOURCES=     datasize memorysize
-USE_LANGUAGES=         c c++   # pdftops is a C++ application
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            aclocal autoconf automake gmake
-USE_LIBTOOL=           yes
-# patch-a[jkl] were added for 2.60
-AUTOCONF_REQD=         2.60
-
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
-CONFIGURE_ARGS+=       --with-cachedir=${CUPS_CACHE:Q}
-CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/cups
-CONFIGURE_ARGS+=       --with-serverbindir=${PREFIX}/libexec/cups
-CONFIGURE_ARGS+=       --with-cups-user=${CUPS_USER}
-CONFIGURE_ARGS+=       --with-cups-group=${CUPS_GROUP}
-CONFIGURE_ARGS+=       --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
-CONFIGURE_ARGS+=       --enable-libpaper
-CONFIGURE_ARGS+=       --enable-libtool
-CONFIGURE_ARGS+=       --enable-jpeg
-CONFIGURE_ARGS+=       --enable-png
-CONFIGURE_ARGS+=       --enable-tiff
-CONFIGURE_ARGS+=       --enable-ssl
-CONFIGURE_ARGS+=       --enable-openssl
-CONFIGURE_ARGS+=       --enable-bannertops
-CONFIGURE_ARGS+=       --enable-texttops
-CONFIGURE_ARGS+=       --with-manext=bsd
-CONFIGURE_ARGS+=       --without-bundledir
-CONFIGURE_ARGS+=       --without-icondir
-CONFIGURE_ARGS+=       --without-menudir
-CONFIGURE_ARGS+=       --without-perl
-CONFIGURE_ARGS+=       --without-php
-CONFIGURE_ARGS+=       --without-python
-CONFIGURE_ARGS+=       --without-java
-CONFIGURE_ARGS+=       --disable-gssapi
-CONFIGURE_ARGS+=       --disable-gnutls
-CONFIGURE_ARGS+=       --disable-ldap
-
-CONFIGURE_ENV+=                DSOFLAGS=${LDFLAGS:M*:Q}
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-.if ${OPSYS} == "SunOS"
-LIBS_SSP=              -lssp_nonshared -lssp
-CONFIGURE_ENV+=                LIBS_SSP=${LIBS_SSP:M*:Q}
-# Explicitly disable epoll on illumos, it is provided for Linux compat only.
-CONFIGURE_ENV+=                ac_cv_func_epoll_create=no
-.endif
-LIBS+=                 ${BUILDLINK_LDADD.iconv}
-
-PLIST_VARS+=           mac notmac
-.if ${OPSYS} == "Darwin"
-PLIST.mac=             yes
-.else
-PLIST.notmac=          yes
-.endif
-
-# Avoid the following error when compiling with clang.
-# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
-# can not be used when making a shared object; recompile with -fPIC
-BUILDLINK_TRANSFORM.FreeBSD+=  rm:-Wl,-pie
-
-# CUPS_USER            user to run filter and CGI programs as
-# CUPS_GROUP           group to run filter and CGI programs as
-# CUPS_SYSTEM_GROUPS   group for system administration
-#
-CUPS_USER?=            lp
-CUPS_GROUP?=           lp
-CUPS_SYSTEM_GROUPS?=   ${REAL_ROOT_GROUP}
-FILES_SUBST+=          CUPS_USER=${CUPS_USER}
-FILES_SUBST+=          CUPS_GROUP=${CUPS_GROUP}
-FILES_SUBST+=          CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
-
-PKG_GROUPS_VARS+=      CUPS_GROUP CUPS_SYSTEM_GROUPS
-PKG_USERS_VARS+=       CUPS_USER
-
-BUILD_DEFS+=           CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
-
-DOCDIR=                        ${PREFIX}/share/doc/cups
-EGDIR=                 ${PREFIX}/share/examples/cups
-MIMEDIR=               ${PREFIX}/share/cups/mime
-PKG_SYSCONFSUBDIR=     cups
-CUPS_CONFDIR=          ${PKG_SYSCONFDIR}
-CUPS_LOGDIR=           ${VARBASE}/log/cups
-CUPS_REQUESTS=         ${VARBASE}/spool/cups
-CUPS_CACHE=            ${VARBASE}/cache/cups
-CUPS_STATEDIR=         ${VARBASE}/run/cups
-
-PKG_GROUPS=            ${CUPS_GROUP}
-PKG_USERS=             ${CUPS_USER}:${CUPS_GROUP}
-PKG_GECOS.${CUPS_USER}=        Common UNIX Printing System user
-PKG_SHELL.${CUPS_USER}=        ${SH}
-
-CONF_FILES=            ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
-CONF_FILES+=           ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf
-RCD_SCRIPTS=           cupsd
-
-OWN_DIRS=              ${CUPS_CONFDIR}
-OWN_DIRS+=             ${CUPS_CONFDIR}/interfaces
-OWN_DIRS+=             ${CUPS_CONFDIR}/ppd
-OWN_DIRS+=             ${PREFIX}/libexec/cups/driver
-OWN_DIRS+=             ${CUPS_LOGDIR}
-OWN_DIRS+=             ${CUPS_STATEDIR}
-OWN_DIRS_PERMS=                ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
-OWN_DIRS_PERMS+=       ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700
-OWN_DIRS_PERMS+=       ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710
-OWN_DIRS_PERMS+=       ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770
-OWN_DIRS_PERMS+=       ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
-OWN_DIRS_PERMS+=       ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
-
-SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     ${WRKDIR}/cups.pam
-SUBST_VARS.paths=      LOCALBASE
-SUBST_STAGE.paths=     pre-configure
-
-SUBST_CLASSES+=                rpathfix
-SUBST_FILES.rpathfix=  cups-config.in
-SUBST_MESSAGE.rpathfix=        Adding rpath to cups-config.
-SUBST_SED.rpathfix=    -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
-SUBST_STAGE.rpathfix=  pre-configure
-
-.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
-SUBST_CLASSES+=                piefix
-SUBST_FILES.piefix=    Makedefs.in
-SUBST_MESSAGE.piefix=  Removing PIE flags
-SUBST_SED.piefix=      -e 's|@PIEFLAGS@||g'
-SUBST_STAGE.piefix=    pre-configure
-.endif
-
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR}
-INSTALL_ENV+=          DSTROOT=${DESTDIR}
-
-pre-configure:
-.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
-       ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
-       exit 1
-.endif
-       cd ${WRKSRC} && aclocal && autoconf
-
-post-extract:
-       ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
-
-post-install:
-       set -e; for file in LICENSE.txt README.txt; do                  \
-               ${INSTALL_DATA} ${WRKSRC}/$${file}                      \
-                    ${DESTDIR}${DOCDIR}/$${file}; \
-       done
-       ${RUN} for file in cupsd.conf snmp.conf ; do                    \
-               ${INSTALL_DATA} ${WRKSRC}/conf/$${file}                 \
-                       ${DESTDIR}${EGDIR}/$${file};                    \
-       done
-.if !empty(PKG_OPTIONS:Mpam)
-       ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
-.endif
-.if !empty(PKG_OPTIONS:Mdnssd)
-       ${LN} -fs ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../print/libpaper/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 0b7197981c28 -r 621318d25e71 print/cups15/PLIST
--- a/print/cups15/PLIST        Fri Apr 24 11:56:55 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1123 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2015/09/05 13:03:22 jperkin Exp $
-bin/cancel
-bin/cups-config
-bin/cupstestdsc
-bin/cupstestppd
-bin/ipptool
-bin/lp
-bin/lpoptions



Home | Main Index | Thread Index | Old Index