diff options
| author | eadler <eadler@FreeBSD.org> | 2013-06-02 20:14:24 +0800 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2013-06-02 20:14:24 +0800 |
| commit | da754a6da53db4c38f30710fee7d3e25036ce87c (patch) | |
| tree | 30bcbddba0f435cbdcc20d202bc519cbadc76b8d /print | |
| parent | 525d2b7d0bf60331561cde1234adeae72ae1730d (diff) | |
| download | freebsd-ports-gnome-da754a6da53db4c38f30710fee7d3e25036ce87c.tar.gz freebsd-ports-gnome-da754a6da53db4c38f30710fee7d3e25036ce87c.tar.zst freebsd-ports-gnome-da754a6da53db4c38f30710fee7d3e25036ce87c.zip | |
- Fix typo w.r.t. XDG_OPEN option
- Add a a backported patch from cups 1.6 which fixes an issue with regard to a timed out TCP connection. it should be
deleted once the port is updated to 1.6.
- Pet portlint a bit
- remove unused CONFLICTS line
PR: 178987
Submitted by: "r4721@tormail.org" <r4721@tormail.org>
PR: 179194
Submitted by: Sayetsky Anton <vsjcfm@gmail.com>
Approved by: c.petrik.sosa@gmail.com (maintainer)
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups-base/Makefile | 3 | ||||
| -rw-r--r-- | print/cups-base/files/patch-cups-request.c | 28 |
2 files changed, 29 insertions, 2 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 855c8f508566..65505ba501ea 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -69,7 +69,6 @@ OPTIONS_DEFINE= GNUTLS .else PORTREVISION= 1 CUPS_SUFFIX= -base -CONFLICTS+= cupsddk-* OPTIONS_DEFINE= GNUTLS LIBPAPER PHP PYTHON PAM LDAP DBUS LIBUSB XDG_OPEN GHOSTSCRIPT XPDF AVAHI MDNSRESPONDER OPTIONS_DEFAULT= LIBPAPER GHOSTSCRIPT NO_OPTIONS_SORT= yes @@ -78,7 +77,7 @@ NO_OPTIONS_SORT= yes LIBUSB_DESC= USB support GHOSTSCRIPT_DESC= Build pdftops with GHOSTSCRIPT XPDF_DESC= Build pdftops with XPDF -XDG_OPEN= Build with XDG_OPEN as browser +XDG_OPEN_DESC= Build with XDG_OPEN as browser .include <bsd.port.options.mk> diff --git a/print/cups-base/files/patch-cups-request.c b/print/cups-base/files/patch-cups-request.c new file mode 100644 index 000000000000..9c7b0be2edef --- /dev/null +++ b/print/cups-base/files/patch-cups-request.c @@ -0,0 +1,28 @@ +--- cups/request.c ++++ cups/request.c +@@ -1004,6 +1004,25 @@ + httpClose(cg->http); + cg->http = NULL; + } ++ else ++ { ++ /* ++ * Same server, see if the connection is still established... ++ */ ++ ++ char ch; /* Connection check byte */ ++ ++ if (recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT) < 0 && ++ errno != EWOULDBLOCK) ++ { ++ /* ++ * Nope, close the connection... ++ */ ++ ++ httpClose(cg->http); ++ cg->http = NULL; ++ } ++ } + } + + /* |