From raj@csub.edu  Wed Aug 12 23:13:17 2009
Return-Path: <raj@csub.edu>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E789A106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Aug 2009 23:13:17 +0000 (UTC)
	(envelope-from raj@csub.edu)
Received: from mh1.csub.edu (mh1.csub.edu [136.168.1.95])
	by mx1.freebsd.org (Postfix) with ESMTP id C52338FC51
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Aug 2009 23:13:17 +0000 (UTC)
Received: from pps4.csub.edu (pps4.csub.edu [136.168.0.209])
	by mh1.csub.edu (8.13.8/8.13.8) with ESMTP id n7CMwvLe022196
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 12 Aug 2009 15:58:57 -0700 (PDT)
	(envelope-from raj@csub.edu)
Received: from strider.csub.edu (strider.csub.edu [136.168.65.65])
	by pps4.csub.edu (8.13.1/8.13.1) with ESMTP id n7CMwsF0008569;
	Wed, 12 Aug 2009 15:58:57 -0700
Received: from strider.csub.edu (localhost [127.0.0.1])
	by strider.csub.edu (8.14.3/8.14.3) with ESMTP id n7CMws8k017969;
	Wed, 12 Aug 2009 15:58:54 -0700 (PDT)
	(envelope-from raj@strider.csub.edu)
Received: (from raj@localhost)
	by strider.csub.edu (8.14.3/8.14.3/Submit) id n7CMwsLK017968;
	Wed, 12 Aug 2009 15:58:54 -0700 (PDT)
	(envelope-from raj)
Message-Id: <200908122258.n7CMwsLK017968@strider.csub.edu>
Date: Wed, 12 Aug 2009 15:58:54 -0700 (PDT)
From: Russell Jackson <raj@csub.edu>
Reply-To: Russell Jackson <raj@csub.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Michael Fleming <mfleming@csub.edu>
Subject: offensive fortune in non-offensive category
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         137702
>Category:       bin
>Synopsis:       fortune(6): offensive fortune in non-offensive category
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brucec
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 12 23:20:05 UTC 2009
>Closed-Date:    Wed Feb 16 21:31:00 UTC 2011
>Last-Modified:  Wed Feb 16 21:31:00 UTC 2011
>Originator:     Russell Jackson
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
California State University, Bakersfield
>Environment:
System: FreeBSD strider.csub.edu 7.2-STABLE FreeBSD 7.2-STABLE #1: Tue Jun 16 16:03:07 PDT 2009 raj@strider.csub.edu:/usr/obj/usr/src/sys/STRIDER i386


	
>Description:
	

	A coworker pointed out a borderline offensive fortune that appeared in my
	email signature which is partially generated from `fortune -s` output.

		$ grep -rC2 'PLATONIC FRIENDSHIP' /usr/share/games/fortune
		/usr/share/games/fortune/fortunes-                 Shell"
		/usr/share/games/fortune/fortunes-%
		/usr/share/games/fortune/fortunes:PLATONIC FRIENDSHIP:
		/usr/share/games/fortune/fortunes-      What develops when two people get
		/usr/share/games/fortune/fortunes-      tired of making love to each other.
	
	I agree that it's probably not appropriate in a professional setting.

>How-To-Repeat:
	

	N/A
>Fix:
	

	Move to offensive category.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->brucec  
Responsible-Changed-By: brucec 
Responsible-Changed-When: Thu Mar 25 21:39:12 UTC 2010 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137702 
State-Changed-From-To: open->patched 
State-Changed-By: brucec 
State-Changed-When: Sun Feb 13 18:20:03 UTC 2011 
State-Changed-Why:  
Fix committed in r218650. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137702 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/137702: commit references a PR
Date: Sun, 13 Feb 2011 18:19:04 +0000 (UTC)

 Author: brucec
 Date: Sun Feb 13 18:18:56 2011
 New Revision: 218650
 URL: http://svn.freebsd.org/changeset/base/218650
 
 Log:
   Move potentially offensive fortune to fortunes-o.
   
   PR:	bin/137702
   MFC after:	3 days
 
 Modified:
   head/games/fortune/datfiles/fortunes
   head/games/fortune/datfiles/fortunes-o.real
 
 Modified: head/games/fortune/datfiles/fortunes
 ==============================================================================
 --- head/games/fortune/datfiles/fortunes	Sun Feb 13 18:08:53 2011	(r218649)
 +++ head/games/fortune/datfiles/fortunes	Sun Feb 13 18:18:56 2011	(r218650)
 @@ -38136,10 +38136,6 @@ couldn't compete successfully with poets
  		-- Kilgore Trout (Philip J. Farmer) "Venus on the Half
  		   Shell"
  %
 -PLATONIC FRIENDSHIP:
 -	What develops when two people get
 -	tired of making love to each other.
 -%
  Play Rogue, visit exotic locations, meet strange creatures and kill
  them.
  %
 
 Modified: head/games/fortune/datfiles/fortunes-o.real
 ==============================================================================
 --- head/games/fortune/datfiles/fortunes-o.real	Sun Feb 13 18:08:53 2011	(r218649)
 +++ head/games/fortune/datfiles/fortunes-o.real	Sun Feb 13 18:18:56 2011	(r218650)
 @@ -10487,6 +10487,10 @@ Pile driver, n.:
  Planned Parenthood:
  	The emission Control Center.
  %
 +PLATONIC FRIENDSHIP:
 +        What develops when two people get
 +        tired of making love to each other.
 +%
  Playing poker with busty Ms. Ware,
  He announced as he folded with flair,
  	"I had four of a kind,
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/137702: commit references a PR
Date: Wed, 16 Feb 2011 21:10:57 +0000 (UTC)

 Author: brucec
 Date: Wed Feb 16 21:10:50 2011
 New Revision: 218750
 URL: http://svn.freebsd.org/changeset/base/218750
 
 Log:
   MFC r218650:
   
   Move potentially offensive fortune to fortunes-o.
   
   PR:	bin/137702
 
 Modified:
   stable/8/games/fortune/datfiles/fortunes
   stable/8/games/fortune/datfiles/fortunes-o.real
 Directory Properties:
   stable/8/games/fortune/   (props changed)
 
 Modified: stable/8/games/fortune/datfiles/fortunes
 ==============================================================================
 --- stable/8/games/fortune/datfiles/fortunes	Wed Feb 16 21:04:47 2011	(r218749)
 +++ stable/8/games/fortune/datfiles/fortunes	Wed Feb 16 21:10:50 2011	(r218750)
 @@ -38136,10 +38136,6 @@ couldn't compete successfully with poets
  		-- Kilgore Trout (Philip J. Farmer) "Venus on the Half
  		   Shell"
  %
 -PLATONIC FRIENDSHIP:
 -	What develops when two people get
 -	tired of making love to each other.
 -%
  Play Rogue, visit exotic locations, meet strange creatures and kill
  them.
  %
 
 Modified: stable/8/games/fortune/datfiles/fortunes-o.real
 ==============================================================================
 --- stable/8/games/fortune/datfiles/fortunes-o.real	Wed Feb 16 21:04:47 2011	(r218749)
 +++ stable/8/games/fortune/datfiles/fortunes-o.real	Wed Feb 16 21:10:50 2011	(r218750)
 @@ -10487,6 +10487,10 @@ Pile driver, n.:
  Planned Parenthood:
  	The emission Control Center.
  %
 +PLATONIC FRIENDSHIP:
 +        What develops when two people get
 +        tired of making love to each other.
 +%
  Playing poker with busty Ms. Ware,
  He announced as he folded with flair,
  	"I had four of a kind,
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/137702: commit references a PR
Date: Wed, 16 Feb 2011 21:13:11 +0000 (UTC)

 Author: brucec
 Date: Wed Feb 16 21:13:02 2011
 New Revision: 218751
 URL: http://svn.freebsd.org/changeset/base/218751
 
 Log:
   MFC r218650:
   
   Move potentially offensive fortune to fortunes-o.
   
   PR:	bin/137702
 
 Modified:
   stable/7/games/fortune/datfiles/fortunes
   stable/7/games/fortune/datfiles/fortunes-o.real
 Directory Properties:
   stable/7/games/fortune/   (props changed)
 
 Modified: stable/7/games/fortune/datfiles/fortunes
 ==============================================================================
 --- stable/7/games/fortune/datfiles/fortunes	Wed Feb 16 21:10:50 2011	(r218750)
 +++ stable/7/games/fortune/datfiles/fortunes	Wed Feb 16 21:13:02 2011	(r218751)
 @@ -38136,10 +38136,6 @@ couldn't compete successfully with poets
  		-- Kilgore Trout (Philip J. Farmer) "Venus on the Half
  		   Shell"
  %
 -PLATONIC FRIENDSHIP:
 -	What develops when two people get
 -	tired of making love to each other.
 -%
  Play Rogue, visit exotic locations, meet strange creatures and kill
  them.
  %
 
 Modified: stable/7/games/fortune/datfiles/fortunes-o.real
 ==============================================================================
 --- stable/7/games/fortune/datfiles/fortunes-o.real	Wed Feb 16 21:10:50 2011	(r218750)
 +++ stable/7/games/fortune/datfiles/fortunes-o.real	Wed Feb 16 21:13:02 2011	(r218751)
 @@ -10487,6 +10487,10 @@ Pile driver, n.:
  Planned Parenthood:
  	The emission Control Center.
  %
 +PLATONIC FRIENDSHIP:
 +        What develops when two people get
 +        tired of making love to each other.
 +%
  Playing poker with busty Ms. Ware,
  He announced as he folded with flair,
  	"I had four of a kind,
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brucec 
State-Changed-When: Wed Feb 16 21:30:38 UTC 2011 
State-Changed-Why:  
Merged to stable/7 and stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137702 
>Unformatted:
