Bug 179194 - [patch] print/cups-base: fix typo in options description
Summary: [patch] print/cups-base: fix typo in options description
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Eitan Adler
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-02 09:10 UTC by vsjcfm
Modified: 2013-06-02 13:20 UTC (History)
0 users

See Also:


Attachments
file.txt (429 bytes, text/plain)
2013-06-02 09:10 UTC, vsjcfm
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description vsjcfm 2013-06-02 09:10:00 UTC
There is a typo in XDG_OPEN description.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2013-06-02 09:10:08 UTC
Maintainer of print/cups-base,

Please note that PR ports/179194 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179194

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2013-06-02 09:10:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Chris Petrik 2013-06-02 11:25:48 UTC
These stupid changes should not require maintainer approval.
Comment 4 Eitan Adler freebsd_committer freebsd_triage 2013-06-02 13:09:42 UTC
Responsible Changed
From-To: freebsd-ports-bugs->eadler

I'll take it.
Comment 5 dfilter service freebsd_committer 2013-06-02 13:14:32 UTC
Author: eadler
Date: Sun Jun  2 12:14:24 2013
New Revision: 319651
URL: http://svnweb.freebsd.org/changeset/ports/319651

Log:
  - 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)

Added:
  head/print/cups-base/files/patch-cups-request.c   (contents, props changed)
Modified:
  head/print/cups-base/Makefile

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Sun Jun  2 11:54:07 2013	(r319650)
+++ head/print/cups-base/Makefile	Sun Jun  2 12:14:24 2013	(r319651)
@@ -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>
 

Added: head/print/cups-base/files/patch-cups-request.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/cups-base/files/patch-cups-request.c	Sun Jun  2 12:14:24 2013	(r319651)
@@ -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;
++      }
++    }
+   }
+ 
+  /*
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Eitan Adler freebsd_committer freebsd_triage 2013-06-02 13:15:19 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!