cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to cups-2.0.2.

Browse Source
This commit is contained in:
ajacoutot 2015-02-10 08:29:33 +00:00
parent 985137f09c
commit a96027f0c9
8 changed files with 87 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
print/cups/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.191 2014/12/15 12:55:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.192 2015/02/10 08:29:33 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
VERSION= 2.0.1
VERSION= 2.0.2
DISTNAME= cups-${VERSION}-source
EXTRACT_SUFX= .tar.bz2
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-main= 2
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4
@ -28,6 +26,8 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2 - LGPLv2
PERMIT_PACKAGE_CDROM= Yes
MODULES= converters/libiconv
WANTLIB += avahi-client avahi-common gnutls m pthread stdc++ z
WANTLIB-main += ${WANTLIB}

4
print/cups/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cups-2.0.1-source.tar.bz2) = YPfyzKafO3YaAp+zFO5CmePqD8AjUPBtGSzzHVghVSU=
SIZE (cups-2.0.1-source.tar.bz2) = 8738217
SHA256 (cups-2.0.2-source.tar.bz2) = hYcg92tm/QRBrioW98q9lVTIxkYH4o/6zxbDbFOjsYs=
SIZE (cups-2.0.2-source.tar.bz2) = 8766982

41
print/cups/patches/patch-backend_usb-libusb_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-backend_usb-libusb_c,v 1.13 2014/12/10 10:22:13 ajacoutot Exp $
commit ce7d367df7e8b554116e297d6e38a9b989dea725
Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue Dec 9 21:33:23 2014 +0000
Fix a libusb issue on OpenBSD.
commit 5e1504aa1e8854f222154d627148ad5675dc7de3
Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue Dec 9 22:10:45 2014 +0000
Fix USB printing on OpenBSD (STR #4525)
--- backend/usb-libusb.c.orig Wed Dec 10 10:48:01 2014
+++ backend/usb-libusb.c Wed Dec 10 10:48:18 2014
@@ -915,7 +915,7 @@ find_device(usb_cb_t cb, /* I - Callback function *
write_endp = endp;
}
- if (write_endp >= 0)
+ if (write_endp != 0xff)
{
/*
* Save the best match so far...
@@ -1451,9 +1451,14 @@ open_device(usb_printer_t *printer, /* I - Printer */
else
{
printer->usblp_attached = 0;
- fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n",
- devdesc.idVendor, devdesc.idProduct);
- goto error;
+
+ if (errcode != LIBUSB_ERROR_NOT_SUPPORTED)
+ {
+ fprintf(stderr,
+ "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" "
+ "kernel module attached\n", devdesc.idVendor, devdesc.idProduct);
+ goto error;
+ }
}
/*

18
print/cups/patches/patch-config-scripts_cups-common_m4
View File

@ -1,12 +1,9 @@
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.13 2014/11/15 10:22:23 ajacoutot Exp $
$OpenBSD: patch-config-scripts_cups-common_m4,v 1.14 2015/02/10 08:29:33 ajacoutot Exp $
Our <sys/ucred.h> does not provide xucred.
XXX push upstream
Use arc4random_stir only if present.
--- config-scripts/cups-common.m4.orig Wed Oct 1 14:52:30 2014
+++ config-scripts/cups-common.m4 Fri Oct 3 15:38:02 2014
--- config-scripts/cups-common.m4.orig Mon Feb 9 20:38:35 2015
+++ config-scripts/cups-common.m4 Tue Feb 10 09:04:12 2015
@@ -136,7 +136,6 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
@ -15,12 +12,3 @@ Use arc4random_stir only if present.
dnl Checks for iconv.h and iconv_open
AC_CHECK_HEADER(iconv.h,
@@ -173,7 +172,7 @@ else
fi
dnl Check for random number functions...
-AC_CHECK_FUNCS(random lrand48 arc4random)
+AC_CHECK_FUNCS(random lrand48 arc4random arc4random_stir)
dnl Check for geteuid function.
AC_CHECK_FUNCS(geteuid)

20
print/cups/patches/patch-config_h_in
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.8 2014/11/15 10:22:23 ajacoutot Exp $
XXX push upstream
Use arc4random_stir only if present.
--- config.h.in.orig Sat Aug 30 03:51:22 2014
+++ config.h.in Fri Oct 3 15:35:39 2014
@@ -624,7 +624,11 @@
#ifdef HAVE_ARC4RANDOM
# define CUPS_RAND() arc4random()
-# define CUPS_SRAND(v) arc4random_stir()
+# ifdef HAVE_ARC4RANDOM_STIR
+# define CUPS_SRAND(v) arc4random_stir()
+# else
+# define CUPS_SRAND(v)
+# endif
#elif defined(HAVE_RANDOM)
# define CUPS_RAND() random()
# define CUPS_SRAND(v) srandom(v)

66
print/cups/patches/patch-scheduler_process_c
View File

@ -1,66 +0,0 @@
$OpenBSD: patch-scheduler_process_c,v 1.5 2014/11/16 10:32:56 ajacoutot Exp $
https://www.cups.org/str.php?L4526
--- scheduler/process.c.orig Fri Nov 14 18:14:45 2014
+++ scheduler/process.c Sat Nov 15 10:10:58 2014
@@ -465,13 +465,12 @@ cupsdStartProcess(
nice_str[16]; /* FilterNice string */
uid_t user; /* Command UID */
cupsd_proc_t *proc; /* New process record */
-#if defined(HAVE_POSIX_SPAWN) && !defined(__OpenBSD__)
+#ifdef HAVE_POSIX_SPAWN
posix_spawn_file_actions_t actions; /* Spawn file actions */
posix_spawnattr_t attrs; /* Spawn attributes */
- sigset_t defsignals; /* Default signals */
#elif defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* POSIX signal handler */
-#endif /* HAVE_POSIX_SPAWN && !__OpenBSD__ */
+#endif /* HAVE_POSIX_SPAWN */
#if defined(__APPLE__)
char processPath[1024], /* CFProcessPath environment variable */
linkpath[1024]; /* Link path for symlinks... */
@@ -535,9 +534,9 @@ cupsdStartProcess(
* Use helper program when we have a sandbox profile...
*/
-#if !defined(HAVE_POSIX_SPAWN) || defined(__OpenBSD__)
+#ifndef HAVE_POSIX_SPAWN
if (profile)
-#endif /* !HAVE_POSIX_SPAWN || __OpenBSD__ */
+#endif /* !HAVE_POSIX_SPAWN */
{
snprintf(cups_exec, sizeof(cups_exec), "%s/daemon/cups-exec", ServerBin);
snprintf(user_str, sizeof(user_str), "%d", user);
@@ -573,21 +572,14 @@ cupsdStartProcess(
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStartProcess: argv[%d] = \"%s\"", i, argv[i]);
}
-#if defined(HAVE_POSIX_SPAWN) && !defined(__OpenBSD__) /* OpenBSD posix_spawn is busted with SETSIGDEF */
+#ifdef HAVE_POSIX_SPAWN
/*
* Setup attributes and file actions for the spawn...
*/
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStartProcess: Setting spawn attributes.");
- sigemptyset(&defsignals);
- sigaddset(&defsignals, SIGTERM);
- sigaddset(&defsignals, SIGCHLD);
- sigaddset(&defsignals, SIGPIPE);
-
posix_spawnattr_init(&attrs);
posix_spawnattr_setflags(&attrs, POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSIGDEF);
- posix_spawnattr_setpgroup(&attrs, 0);
- posix_spawnattr_setsigdefault(&attrs, &defsignals);
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStartProcess: Setting file actions.");
posix_spawn_file_actions_init(&actions);
@@ -796,7 +788,7 @@ cupsdStartProcess(
}
cupsdReleaseSignals();
-#endif /* HAVE_POSIX_SPAWN && !__OpenBSD__ */
+#endif /* HAVE_POSIX_SPAWN */
if (*pid)
{

8
print/cups/patches/patch-test_run-stp-tests_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-test_run-stp-tests_sh,v 1.13 2014/11/15 10:22:23 ajacoutot Exp $
--- test/run-stp-tests.sh.orig Thu Sep 4 02:57:41 2014
+++ test/run-stp-tests.sh Fri Oct 3 15:35:39 2014
$OpenBSD: patch-test_run-stp-tests_sh,v 1.14 2015/02/10 08:29:33 ajacoutot Exp $
--- test/run-stp-tests.sh.orig Fri Dec 19 17:56:15 2014
+++ test/run-stp-tests.sh Tue Feb 10 09:04:12 2015
@@ -36,7 +36,7 @@ umask 022
# Make the IPP test program...
#
@ -10,7 +10,7 @@ $OpenBSD: patch-test_run-stp-tests_sh,v 1.13 2014/11/15 10:22:23 ajacoutot Exp $
#
# Solaris has a non-POSIX grep in /bin...
@@ -568,7 +568,7 @@ fi
@@ -593,7 +593,7 @@ fi
export LD_LIBRARY_PATH

75
print/cups/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.16 2014/12/15 12:55:18 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.17 2015/02/10 08:29:33 ajacoutot Exp $
@conflict LPRng-*
@pkgpath print/cups
@pkgpath print/cups,ldap
@ -280,6 +280,77 @@ share/cups/templates/header.tmpl
share/cups/templates/help-header.tmpl
share/cups/templates/help-printable.tmpl
share/cups/templates/help-trailer.tmpl
share/cups/templates/ja/
share/cups/templates/ja/add-class.tmpl
share/cups/templates/ja/add-printer.tmpl
share/cups/templates/ja/add-rss-subscription.tmpl
share/cups/templates/ja/admin.tmpl
share/cups/templates/ja/choose-device.tmpl
share/cups/templates/ja/choose-make.tmpl
share/cups/templates/ja/choose-model.tmpl
share/cups/templates/ja/choose-serial.tmpl
share/cups/templates/ja/choose-uri.tmpl
share/cups/templates/ja/class-added.tmpl
share/cups/templates/ja/class-confirm.tmpl
share/cups/templates/ja/class-deleted.tmpl
share/cups/templates/ja/class-jobs-header.tmpl
share/cups/templates/ja/class-modified.tmpl
share/cups/templates/ja/class.tmpl
share/cups/templates/ja/classes-header.tmpl
share/cups/templates/ja/classes.tmpl
share/cups/templates/ja/command.tmpl
share/cups/templates/ja/edit-config.tmpl
share/cups/templates/ja/error-op.tmpl
share/cups/templates/ja/error.tmpl
share/cups/templates/ja/header.tmpl
share/cups/templates/ja/help-header.tmpl
share/cups/templates/ja/help-printable.tmpl
share/cups/templates/ja/help-trailer.tmpl
share/cups/templates/ja/job-cancel.tmpl
share/cups/templates/ja/job-hold.tmpl
share/cups/templates/ja/job-move.tmpl
share/cups/templates/ja/job-moved.tmpl
share/cups/templates/ja/job-release.tmpl
share/cups/templates/ja/job-restart.tmpl
share/cups/templates/ja/jobs-header.tmpl
share/cups/templates/ja/jobs.tmpl
share/cups/templates/ja/list-available-printers.tmpl
share/cups/templates/ja/modify-class.tmpl
share/cups/templates/ja/modify-printer.tmpl
share/cups/templates/ja/norestart.tmpl
share/cups/templates/ja/option-boolean.tmpl
share/cups/templates/ja/option-conflict.tmpl
share/cups/templates/ja/option-header.tmpl
share/cups/templates/ja/option-pickmany.tmpl
share/cups/templates/ja/option-pickone.tmpl
share/cups/templates/ja/option-trailer.tmpl
share/cups/templates/ja/pager.tmpl
share/cups/templates/ja/printer-accept.tmpl
share/cups/templates/ja/printer-added.tmpl
share/cups/templates/ja/printer-cancel-jobs.tmpl
share/cups/templates/ja/printer-configured.tmpl
share/cups/templates/ja/printer-confirm.tmpl
share/cups/templates/ja/printer-default.tmpl
share/cups/templates/ja/printer-deleted.tmpl
share/cups/templates/ja/printer-jobs-header.tmpl
share/cups/templates/ja/printer-modified.tmpl
share/cups/templates/ja/printer-reject.tmpl
share/cups/templates/ja/printer-start.tmpl
share/cups/templates/ja/printer-stop.tmpl
share/cups/templates/ja/printer.tmpl
share/cups/templates/ja/printers-header.tmpl
share/cups/templates/ja/printers.tmpl
share/cups/templates/ja/restart.tmpl
share/cups/templates/ja/samba-export.tmpl
share/cups/templates/ja/samba-exported.tmpl
share/cups/templates/ja/search.tmpl
share/cups/templates/ja/set-printer-options-header.tmpl
share/cups/templates/ja/set-printer-options-trailer.tmpl
share/cups/templates/ja/subscription-added.tmpl
share/cups/templates/ja/subscription-canceled.tmpl
share/cups/templates/ja/test-page.tmpl
share/cups/templates/ja/trailer.tmpl
share/cups/templates/ja/users.tmpl
share/cups/templates/job-cancel.tmpl
share/cups/templates/job-hold.tmpl
share/cups/templates/job-move.tmpl
@ -431,6 +502,8 @@ share/doc/cups/images/smiley.jpg
share/doc/cups/images/unsel.gif
share/doc/cups/images/wait.gif
share/doc/cups/index.html
share/doc/cups/ja/
share/doc/cups/ja/index.html
share/doc/cups/robots.txt
share/doc/pkg-readmes/${FULLPKGNAME}
@group _cups