Received: by mail.netbsd.org (Postfix, from userid 605) id 70EAC85060; Mon, 11 Jun 2018 10:04:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F02668505F for ; Mon, 11 Jun 2018 10:04:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id cD63gy7j2jiS for ; Mon, 11 Jun 2018 10:04:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 508D784E9C for ; Mon, 11 Jun 2018 10:04:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 45911FBEC; Mon, 11 Jun 2018 10:04:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1528711465132210" MIME-Version: 1.0 Date: Mon, 11 Jun 2018 10:04:25 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/print To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180611100425.45911FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1528711465132210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Jun 11 10:04:25 UTC 2018 Modified Files: pkgsrc/print/cups: Makefile Makefile.common pkgsrc/print/cups-base: Makefile distinfo pkgsrc/print/cups-base/patches: patch-man-cups-files.conf.man.in patch-scheduler_auth.c Log Message: cups: updated to 2.2.8 CUPS 2.2.8 is a bug fix release that addresses issues in the scheduler, ipptool utility, CUPS library, and USB printer support. A detailed list of changes can be found in the change log included in the download. To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 pkgsrc/print/cups/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/cups/Makefile.common cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/cups-base/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/cups-base/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/print/cups-base/patches/patch-scheduler_auth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1528711465132210 Content-Disposition: inline Content-Length: 12609 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=utf-8 Modified files: Index: pkgsrc/print/cups/Makefile diff -u pkgsrc/print/cups/Makefile:1.259 pkgsrc/print/cups/Makefile:1.260 --- pkgsrc/print/cups/Makefile:1.259 Tue Apr 17 22:29:47 2018 +++ pkgsrc/print/cups/Makefile Mon Jun 11 10:04:24 2018 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.259 2018/04/17 22:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.260 2018/06/11 10:04:24 adam Exp $ -PKGREVISION= 2 .include "../../print/cups/Makefile.common" PKGNAME= cups-${CUPS_VERS} Index: pkgsrc/print/cups/Makefile.common diff -u pkgsrc/print/cups/Makefile.common:1.3 pkgsrc/print/cups/Makefile.common:1.4 --- pkgsrc/print/cups/Makefile.common:1.3 Thu Apr 5 16:31:45 2018 +++ pkgsrc/print/cups/Makefile.common Mon Jun 11 10:04:24 2018 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.3 2018/04/05 16:31:45 leot Exp $ +# $NetBSD: Makefile.common,v 1.4 2018/06/11 10:04:24 adam Exp $ # # used by print/cups/Makefile # used by print/cups-base/Makefile -CUPS_VERS= 2.2.7 +CUPS_VERS= 2.2.8 DISTNAME= cups-${CUPS_VERS}-source CATEGORIES= print Index: pkgsrc/print/cups-base/Makefile diff -u pkgsrc/print/cups-base/Makefile:1.9 pkgsrc/print/cups-base/Makefile:1.10 --- pkgsrc/print/cups-base/Makefile:1.9 Tue Apr 17 22:29:33 2018 +++ pkgsrc/print/cups-base/Makefile Mon Jun 11 10:04:24 2018 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.9 2018/04/17 22:29:33 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2018/06/11 10:04:24 adam Exp $ -PKGREVISION= 2 .include "../../print/cups/Makefile.common" DISTNAME= cups-${CUPS_VERS}-source @@ -24,7 +23,6 @@ USE_LANGUAGES= c c++ # pdftops is a C++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= aclocal autoconf automake gmake pkg-config - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} Index: pkgsrc/print/cups-base/distinfo diff -u pkgsrc/print/cups-base/distinfo:1.5 pkgsrc/print/cups-base/distinfo:1.6 --- pkgsrc/print/cups-base/distinfo:1.5 Thu Apr 5 16:31:45 2018 +++ pkgsrc/print/cups-base/distinfo Mon Jun 11 10:04:24 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2018/04/05 16:31:45 leot Exp $ +$NetBSD: distinfo,v 1.6 2018/06/11 10:04:24 adam Exp $ -SHA1 (cups-2.2.7-source.tar.gz) = aa2ae7c486d5957c9fc5f00aec63e453b19311b4 -RMD160 (cups-2.2.7-source.tar.gz) = ae82e358d8e24e14b2a633ec12e4db1fc8eacd48 -SHA512 (cups-2.2.7-source.tar.gz) = 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e -Size (cups-2.2.7-source.tar.gz) = 10330296 bytes +SHA1 (cups-2.2.8-source.tar.gz) = f8c572d5b2405091e3be6836523a6abdda645f60 +RMD160 (cups-2.2.8-source.tar.gz) = 79bc052e3f70408a698bfbe2556b53d2f0140b2c +SHA512 (cups-2.2.8-source.tar.gz) = 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261 +Size (cups-2.2.8-source.tar.gz) = 10374921 bytes SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 @@ -18,11 +18,11 @@ SHA1 (patch-config-scripts_cups-manpages SHA1 (patch-config-scripts_cups-opsys.m4) = 2bbacc401d4d8dbc157889b6a6cf66684c52357b SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511 SHA1 (patch-doc-help-man-cups-files.conf.html) = fcd3d06c00b0a85b6c0790235ccb68685252ea68 -SHA1 (patch-man-cups-files.conf.man.in) = 1563a7be3327a975ce8753a3287947f1594975a3 +SHA1 (patch-man-cups-files.conf.man.in) = 820da58aa3f854018a48b68256d0cf0dc75b986e SHA1 (patch-ppdc_Makefile) = cdeb0ef9a68f9dd85453ef3076a0120ad9983698 SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab -SHA1 (patch-scheduler_auth.c) = 9f329eab415dea7d53e45f39e7ce9ff66ba0a128 +SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0 SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf SHA1 (patch-test_ippfind.c) = 6db56b9b1b9a26d5c40336af4dc6cde98abd9c19 Index: pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in diff -u pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in:1.1 pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in:1.2 --- pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in:1.1 Sun Nov 12 14:10:15 2017 +++ pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in Mon Jun 11 10:04:25 2018 @@ -1,10 +1,10 @@ -$NetBSD: patch-man-cups-files.conf.man.in,v 1.1 2017/11/12 14:10:15 khorben Exp $ +$NetBSD: patch-man-cups-files.conf.man.in,v 1.2 2018/06/11 10:04:25 adam Exp $ Add a PidFile configuration directive to write a PID file. ---- man/cups-files.conf.man.in.orig 2017-03-28 20:26:53.000000000 +0200 -+++ man/cups-files.conf.man.in 2017-07-17 17:25:02.000000000 +0200 -@@ -159,6 +159,12 @@ +--- man/cups-files.conf.man.in.orig 2018-06-05 16:06:54.000000000 +0000 ++++ man/cups-files.conf.man.in +@@ -157,6 +157,12 @@ The server name may be included in filen .fi The default is "/var/log/cups/page_log". @@ -14,6 +14,6 @@ Add a PidFile configuration directive to +Specifies the file the CUPS scheduler writes its PID to +(set to an empty value to disable the PID file). +The default is usually "/var/run/cups/cupsd.pid". - .\"#RemoteRoot + .\"#PassEnv .TP 5 - \fBRemoteRoot \fIusername\fR + \fBPassEnv \fIvariable \fR[ ... \fIvariable \fR] Index: pkgsrc/print/cups-base/patches/patch-scheduler_auth.c diff -u pkgsrc/print/cups-base/patches/patch-scheduler_auth.c:1.2 pkgsrc/print/cups-base/patches/patch-scheduler_auth.c:1.3 --- pkgsrc/print/cups-base/patches/patch-scheduler_auth.c:1.2 Thu Apr 5 16:31:45 2018 +++ pkgsrc/print/cups-base/patches/patch-scheduler_auth.c Mon Jun 11 10:04:25 2018 @@ -1,24 +1,11 @@ -$NetBSD: patch-scheduler_auth.c,v 1.2 2018/04/05 16:31:45 leot Exp $ +$NetBSD: patch-scheduler_auth.c,v 1.3 2018/06/11 10:04:25 adam Exp $ - Don't pull in sys/ucred.h on Solaris as it results in procfs.h being included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs. - OpenBSD defines SO_PEERCRED, but it is different from Linux's one. -- Backport commit `570933a6a3597371bae1beeb754ee8711d6305ab' to fix builds - without PAM (issue #5283). It will not be needed in cups-2.2.8. ---- scheduler/auth.c.orig 2018-04-05 16:07:04.209662684 +0000 +--- scheduler/auth.c.orig 2018-06-05 16:06:54.000000000 +0000 +++ scheduler/auth.c -@@ -1,8 +1,8 @@ - /* - * Authorization routines for the CUPS scheduler. - * -- * Copyright 2007-2016 by Apple Inc. -- * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * Copyright © 2007-2018 by Apple Inc. -+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved. - * - * This file contains Kerberos support code, copyright 2006 by - * Jelmer Vernooij. @@ -47,7 +47,7 @@ extern const char *cssmErrorString(int e #ifdef HAVE_SYS_PARAM_H # include @@ -28,17 +15,7 @@ $NetBSD: patch-scheduler_auth.c,v 1.2 20 # include typedef struct xucred cupsd_ucred_t; # define CUPSD_UCRED_UID(c) (c).cr_uid -@@ -71,9 +71,6 @@ static int check_authref(cupsd_client_t - static int compare_locations(cupsd_location_t *a, - cupsd_location_t *b); - static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); --#if !HAVE_LIBPAM --static char *cups_crypt(const char *pw, const char *salt); --#endif /* !HAVE_LIBPAM */ - static void free_authmask(cupsd_authmask_t *am, void *data); - #if HAVE_LIBPAM - static int pam_func(int, const struct pam_message **, -@@ -402,7 +399,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I +@@ -399,7 +399,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I con->type = CUPSD_AUTH_BASIC; } #endif /* HAVE_AUTHORIZATION_H */ @@ -47,24 +24,7 @@ $NetBSD: patch-scheduler_auth.c,v 1.2 20 else if (!strncmp(authorization, "PeerCred ", 9) && con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best) { -@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - * client... - */ - -- pass = cups_crypt(password, pw->pw_passwd); -+ pass = crypt(password, pw->pw_passwd); - - if (!pass || strcmp(pw->pw_passwd, pass)) - { - # ifdef HAVE_SHADOW_H - if (spw) - { -- pass = cups_crypt(password, spw->sp_pwdp); -+ pass = crypt(password, spw->sp_pwdp); - - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { -@@ -839,7 +836,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I +@@ -836,7 +836,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER); @@ -73,133 +33,3 @@ $NetBSD: patch-scheduler_auth.c,v 1.2 20 /* * Get the client's UID if we are printing locally - that allows a backend * to run as the correct user to get Kerberos credentials of its own. -@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask, /* - } - - --#if !HAVE_LIBPAM --/* -- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, -- * as needed. -- */ -- --static char * /* O - Encrypted password */ --cups_crypt(const char *pw, /* I - Password string */ -- const char *salt) /* I - Salt (key) string */ --{ -- if (!strncmp(salt, "$1$", 3)) -- { -- /* -- * Use MD5 passwords without the benefit of PAM; this is for -- * Slackware Linux, and the algorithm was taken from the -- * old shadow-19990827/lib/md5crypt.c source code... :( -- */ -- -- int i; /* Looping var */ -- unsigned long n; /* Output number */ -- int pwlen; /* Length of password string */ -- const char *salt_end; /* End of "salt" data for MD5 */ -- char *ptr; /* Pointer into result string */ -- _cups_md5_state_t state; /* Primary MD5 state info */ -- _cups_md5_state_t state2; /* Secondary MD5 state info */ -- unsigned char digest[16]; /* MD5 digest result */ -- static char result[120]; /* Final password string */ -- -- -- /* -- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. -- * Get a maximum of 8 characters of salt data after $1$... -- */ -- -- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) -- if (*salt_end == '$') -- break; -- -- /* -- * Compute the MD5 sum we need... -- */ -- -- pwlen = strlen(pw); -- -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); -- -- _cupsMD5Init(&state2); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Finish(&state2, digest); -- -- for (i = pwlen; i > 0; i -= 16) -- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); -- -- for (i = pwlen; i > 0; i >>= 1) -- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); -- -- _cupsMD5Finish(&state, digest); -- -- for (i = 0; i < 1000; i ++) -- { -- _cupsMD5Init(&state); -- -- if (i & 1) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- else -- _cupsMD5Append(&state, digest, 16); -- -- if (i % 3) -- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); -- -- if (i % 7) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- if (i & 1) -- _cupsMD5Append(&state, digest, 16); -- else -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- _cupsMD5Finish(&state, digest); -- } -- -- /* -- * Copy the final sum to the result string and return... -- */ -- -- memcpy(result, salt, (size_t)(salt_end - salt)); -- ptr = result + (salt_end - salt); -- *ptr++ = '$'; -- -- for (i = 0; i < 5; i ++, ptr += 4) -- { -- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); -- -- if (i < 4) -- n |= (unsigned)digest[i + 12]; -- else -- n |= (unsigned)digest[5]; -- -- to64(ptr, n, 4); -- } -- -- to64(ptr, (unsigned)digest[11], 2); -- ptr += 2; -- *ptr = '\0'; -- -- return (result); -- } -- else -- { -- /* -- * Use the standard crypt() function... -- */ -- -- return (crypt(pw, salt)); -- } --} --#endif /* !HAVE_LIBPAM */ -- -- - /* - * 'free_authmask()' - Free function for auth masks. - */ --_----------=_1528711465132210--