From dan@bast.unixathome.org  Sat Nov 28 22:02:41 2009
Return-Path: <dan@bast.unixathome.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A92291065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Nov 2009 22:02:41 +0000 (UTC)
	(envelope-from dan@bast.unixathome.org)
Received: from nyi.unixathome.org (nyi.unixathome.org [64.147.113.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 7FFD48FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Nov 2009 22:02:41 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by nyi.unixathome.org (Postfix) with ESMTP id D914850858;
	Sat, 28 Nov 2009 22:02:40 +0000 (GMT)
Received: from nyi.unixathome.org ([127.0.0.1])
	by localhost (nyi.unixathome.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 333oLk5VatsR; Sat, 28 Nov 2009 22:02:40 +0000 (GMT)
Received: from bast.unixathome.org (bast.unixathome.org [10.8.1.1])
	by nyi.unixathome.org (Postfix) with ESMTP id 1D8FE5084D;
	Sat, 28 Nov 2009 22:02:40 +0000 (GMT)
Received: by bast.unixathome.org (Postfix, from userid 1001)
	id F338CB88F; Sat, 28 Nov 2009 22:02:38 +0000 (GMT)
Message-Id: <20091128220238.F338CB88F@bast.unixathome.org>
Date: Sat, 28 Nov 2009 22:02:38 +0000 (GMT)
From: Dan Langille <dan@langille.org>
Reply-To: Dan Langille <dan@langille.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Dan Langille <dan@langille.org>
Subject: [PATCH] security/logcheck - use correct .conf file location in message
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         140981
>Category:       ports
>Synopsis:       [PATCH] security/logcheck - use correct .conf file location in message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glarkin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 28 22:10:00 UTC 2009
>Closed-Date:    Thu Dec 17 20:32:24 EST 2009
>Last-Modified:  Fri Dec 18 01:40:00 UTC 2009
>Originator:     Dan Langille
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
The FreeBSD Diary
>Environment:
System: FreeBSD bast.example.org 6.2-STABLE FreeBSD 6.2-STABLE #3: Wed Feb 28 22:21:12 EST 2007     dan@bast.example.org:/usr/obj/usr/src/sys/BAST  i386


	
>Description:
	
The installed logcheck script contains a hardcoded reference to the 
.conf file.  This patch fixes that to use the variable.

Umm, after creating this patch, I noticed that /etc/logcheck/footer.txt
and /etc/logcheck/header.txt should also be variables and patched
to /usr/local/etc/logcheck/ but I no longer have time.

FYI, this patch has not been tested, but I can do that later this week 
if this doesn't move forward.  Same with the above recommendation.

>How-To-Repeat:
	
>Fix:

	



begin 644 logcheck.diff
diff -ruN /usr/ports/security/logcheck/files/patch-src__logcheck logcheck/files/patch-src__logcheck
--- /usr/ports/security/logcheck/files/patch-src__logcheck	2008-09-11 00:30:09.000000000 +0000
+++ logcheck/files/patch-src__logcheck	2009-11-28 21:55:32.000000000 +0000
@@ -95,6 +95,15 @@
         fi
  	
      fi
+@@ -168,7 +168,7 @@
+ ${TMPDIR:+Check temporary directory: $TMPDIR
+ }
+ Also verify that the logcheck user can read all files referenced in
+-/etc/logcheck/logcheck.logfiles!
++${LOGFILES_LIST}!
+ 
+ $(export)
+ EOF
 @@ -212,8 +195,7 @@
  	    mkdir $cleaned \
  	        || error "Could not make dir $cleaned for cleaned rulefiles."
end

>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Sat Nov 28 22:10:10 UTC 2009 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140981 
Responsible-Changed-From-To: freebsd-ports-bugs->glarkin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Nov 28 22:10:15 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Dan Langille <dan@langille.org>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/140981: [PATCH] security/logcheck - use correct .conf file
 location in message
Date: Sat, 28 Nov 2009 17:22:46 -0500

 This is a multi-part message in MIME format.
 --------------090301030208050101060006
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 The patch file seems to be crappy.
 
 See attached:
 
 
 --------------090301030208050101060006
 Content-Type: text/plain;
  name="logcheck.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="logcheck.diff"
 
 diff -ruN /usr/ports/security/logcheck/files/patch-src__logcheck logcheck/files/patch-src__logcheck
 --- /usr/ports/security/logcheck/files/patch-src__logcheck	2008-09-11 00:30:09.000000000 +0000
 +++ logcheck/files/patch-src__logcheck	2009-11-28 21:55:32.000000000 +0000
 @@ -95,6 +95,15 @@
          fi
   	
       fi
 +@@ -168,7 +168,7 @@
 + ${TMPDIR:+Check temporary directory: $TMPDIR
 + }
 + Also verify that the logcheck user can read all files referenced in
 +-/etc/logcheck/logcheck.logfiles!
 ++${LOGFILES_LIST}!
 + 
 + $(export)
 + EOF
  @@ -212,8 +195,7 @@
   	    mkdir $cleaned \
   	        || error "Could not make dir $cleaned for cleaned rulefiles."
 
 --------------090301030208050101060006--

From: Greg Larkin <glarkin@FreeBSD.org>
To: Dan Langille <dan@langille.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/140981: [PATCH] security/logcheck - use correct .conf file
 location in message
Date: Fri, 04 Dec 2009 21:24:59 -0500

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Dan Langille wrote:
 > The installed logcheck script contains a hardcoded reference to the
 > .conf file. This patch fixes that to use the variable.
 > 
 > Umm, after creating this patch, I noticed that /etc/logcheck/footer.txt
 > and /etc/logcheck/header.txt should also be variables and patched
 > to /usr/local/etc/logcheck/ but I no longer have time.
 > 
 > FYI, this patch has not been tested, but I can do that later this week
 > if this doesn't move forward. Same with the above recommendation.
 
 Hi Dan,
 
 I think we have to go one step further and place %%PREFIX%% in the patch
 files, otherwise they will cause problems with non-standard installation
 prefixes.  This will take a little more work and testing, so let me know
 if you have time, or I'll try to carve some out next week.
 
 Thank you,
 Greg
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (MingW32)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
 iD8DBQFLGcR70sRouByUApARAifdAKCsigbJtLzgurZYYzy+fENWxnB6MACfUD8g
 +aNfU98YMqzAcf53fFq06fg=
 =QD4k
 -----END PGP SIGNATURE-----
 

From: Dan Langille <dan@langille.org>
To: glarkin@FreeBSD.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/140981: [PATCH] security/logcheck - use correct .conf file
 location in message
Date: Fri, 04 Dec 2009 22:21:25 -0500

 Greg Larkin wrote:
 > -----BEGIN PGP SIGNED MESSAGE-----
 > Hash: SHA1
 > 
 > Dan Langille wrote:
 >> The installed logcheck script contains a hardcoded reference to the
 >> .conf file. This patch fixes that to use the variable.
 >>
 >> Umm, after creating this patch, I noticed that /etc/logcheck/footer.txt
 >> and /etc/logcheck/header.txt should also be variables and patched
 >> to /usr/local/etc/logcheck/ but I no longer have time.
 >>
 >> FYI, this patch has not been tested, but I can do that later this week
 >> if this doesn't move forward. Same with the above recommendation.
 > 
 > Hi Dan,
 > 
 > I think we have to go one step further and place %%PREFIX%% in the patch
 > files, otherwise they will cause problems with non-standard installation
 > prefixes.  This will take a little more work and testing, so let me know
 > if you have time, or I'll try to carve some out next week.
 > 
 > Thank you,
 > Greg
 
 I agree.  That is a good idea.  :)  Time?  Who has that?
State-Changed-From-To: open->analyzed 
State-Changed-By: glarkin 
State-Changed-When: Tue Dec 8 20:19:40 EST 2009 
State-Changed-Why:  
Additional work needed for true installation directory parameterization. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140981 
State-Changed-From-To: analyzed->closed 
State-Changed-By: glarkin 
State-Changed-When: Thu Dec 17 20:32:04 EST 2009 
State-Changed-Why:  
Committed with additional modifications, thank you! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/140981: commit references a PR
Date: Fri, 18 Dec 2009 01:31:30 +0000 (UTC)

 glarkin     2009-12-18 01:31:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/logcheck    Makefile 
     security/logcheck/files pkg-message.in 
   Added files:
     security/logcheck/files extra-patch-debian__logcheck.cron.d.in 
                             extra-patch-docs__logcheck.8.in 
                             extra-patch-etc__logcheck.conf.in 
                             extra-patch-src__logcheck.in 
   Removed files:
     security/logcheck/files patch-debian__logcheck.cron.d 
                             patch-docs__logcheck.8 
                             patch-etc__logcheck.conf 
                             patch-src__logcheck 
   Log:
   - Parameterized all non-hier(7)-compliant paths in the logcheck script,
     man page and config files, adding support for a custom PREFIX setting.
   - Parameterized the shebang line in the logtail script
   - Bumped PORTREVISION
   
   PR:             ports/140981
   Submitted by:   Dan Langille <dan@langille.org>
   
   Revision  Changes    Path
   1.28      +14 -4     ports/security/logcheck/Makefile
   1.1       +16 -0     ports/security/logcheck/files/extra-patch-debian__logcheck.cron.d.in (new)
   1.1       +118 -0    ports/security/logcheck/files/extra-patch-docs__logcheck.8.in (new)
   1.1       +16 -0     ports/security/logcheck/files/extra-patch-etc__logcheck.conf.in (new)
   1.1       +181 -0    ports/security/logcheck/files/extra-patch-src__logcheck.in (new)
   1.2       +0 -16     ports/security/logcheck/files/patch-debian__logcheck.cron.d (dead)
   1.2       +0 -118    ports/security/logcheck/files/patch-docs__logcheck.8 (dead)
   1.2       +0 -16     ports/security/logcheck/files/patch-etc__logcheck.conf (dead)
   1.3       +0 -150    ports/security/logcheck/files/patch-src__logcheck (dead)
   1.3       +2 -2      ports/security/logcheck/files/pkg-message.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
