diff options
| author | dinoex <dinoex@FreeBSD.org> | 2009-11-29 06:06:25 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2009-11-29 06:06:25 +0800 |
| commit | d910af9993a8058fd9f8ae391c824bb5296bd0a0 (patch) | |
| tree | 2fa91ac3491d15c323157ca587048de349d15b7c | |
| parent | 012a13990bbe4cd4b63501fde546589e1bc8934d (diff) | |
| download | freebsd-ports-gnome-d910af9993a8058fd9f8ae391c824bb5296bd0a0.tar.gz freebsd-ports-gnome-d910af9993a8058fd9f8ae391c824bb5296bd0a0.tar.zst freebsd-ports-gnome-d910af9993a8058fd9f8ae391c824bb5296bd0a0.zip | |
- Security update to 1.4.2
Security: STR #3367
Security: STR #3401
| -rw-r--r-- | print/cups-base/Makefile | 2 | ||||
| -rw-r--r-- | print/cups-base/distinfo | 6 | ||||
| -rw-r--r-- | print/cups-base/files/patch-usb-unix.c | 30 |
3 files changed, 4 insertions, 34 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index ee6bbb70b9e8..26e8542a8837 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cups -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 DISTVERSIONSUFFIX= -source PORTREVISION= 0 CATEGORIES= print diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index 5b1d04dc4067..cc4f0f47731c 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -1,3 +1,3 @@ -MD5 (cups-1.4.1-source.tar.bz2) = 587a58039c112ecb3c932e048c8a7b01 -SHA256 (cups-1.4.1-source.tar.bz2) = cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba -SIZE (cups-1.4.1-source.tar.bz2) = 4449577 +MD5 (cups-1.4.2-source.tar.bz2) = d95e2d588e3d36e563027a963b117b1b +SHA256 (cups-1.4.2-source.tar.bz2) = 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314 +SIZE (cups-1.4.2-source.tar.bz2) = 4450466 diff --git a/print/cups-base/files/patch-usb-unix.c b/print/cups-base/files/patch-usb-unix.c deleted file mode 100644 index acf182383bcc..000000000000 --- a/print/cups-base/files/patch-usb-unix.c +++ /dev/null @@ -1,30 +0,0 @@ ---- backend/usb-unix.c.orig 2009-08-31 20:45:43.000000000 +0200 -+++ backend/usb-unix.c 2009-10-21 09:21:14.000000000 +0200 -@@ -36,7 +36,7 @@ - */ - - static int open_device(const char *uri, int *use_bc); --static int side_cb(int print_fd, int device_fd, int snmp_fd, -+static void side_cb(int print_fd, int device_fd, int snmp_fd, - http_addr_t *addr, int use_bc); - - -@@ -579,7 +579,7 @@ - datalen = sizeof(data); - - if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) -- return (-1); -+ return; - - switch (command) - { -@@ -622,7 +622,8 @@ - break; - } - -- return (cupsSideChannelWrite(command, status, data, datalen, 1.0)); -+ cupsSideChannelWrite(command, status, data, datalen, 1.0); -+ return; - } - - |