Bug 201297 - [REVIVE PORT] security/chkrootkit: Update to 0.50, now builds with wtmpx on FreeBSD 10.1, code included
Summary: [REVIVE PORT] security/chkrootkit: Update to 0.50, now builds with wtmpx on F...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Thomas Zander
URL:
Keywords: feature, patch, patch-ready
Depends on:
Blocks:
 
Reported: 2015-07-03 01:08 UTC by Lacey Powers
Modified: 2015-07-11 14:43 UTC (History)
3 users (show)

See Also:
koobs: maintainer-feedback? (lacey.leanne)


Attachments
Makefile, pkg-descr, dist-info tarball for chkrootkit (1.42 KB, application/x-gzip)
2015-07-03 01:08 UTC, Lacey Powers
no flags Details
chkrootkit 0.50 unified diff (2.36 KB, patch)
2015-07-04 00:40 UTC, Lacey Powers
no flags Details | Diff
Poudriere Build output (16.18 KB, text/plain)
2015-07-04 00:41 UTC, Lacey Powers
no flags Details
Portlint output (130 bytes, text/plain)
2015-07-04 00:41 UTC, Lacey Powers
no flags Details
chkrootkit patch with updated maintainer (2.47 KB, patch)
2015-07-05 22:39 UTC, Lacey Powers
no flags Details | Diff
patch for chkwtmp.c for FreeBSD-9 (222 bytes, text/x-csrc)
2015-07-05 22:39 UTC, Lacey Powers
no flags Details
Patch for chklastlog.c for FreeBSD-9 (216 bytes, patch)
2015-07-05 22:40 UTC, Lacey Powers
no flags Details | Diff
chkrootkit diff all in one with file patches included (4.13 KB, patch)
2015-07-06 16:37 UTC, Lacey Powers
lacey.leanne: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Lacey Powers 2015-07-03 01:08:24 UTC
Created attachment 158275 [details]
Makefile, pkg-descr, dist-info tarball for chkrootkit

Checked old ports in the FreeBSD svn ports. 

Found and updated chkrootkit to 0.50. 

Ran it through portlint, and all the steps outlined in the FreeBSD Porters Handbook. Everything seems to work. 

Makefile, pkg-descr, dist-info in attached tarball.
Comment 1 Kubilay Kocak freebsd_committer freebsd_triage 2015-07-03 06:35:54 UTC
Thanks for your submission Lacey

Could you please:

 1) Attach your change as a unified diff against ports using the 'resurrection' procedure outlined here: 

https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/ports.html#ports-qa-resurrect

 2) Include (as a comment) the exact svn copy command you ran in (1), so that a committer can duplicate it

 3) Include QA results (as attachments):

  * portlint -AC
  * poudriere testport (or bulk -t) output
Comment 2 Lacey Powers 2015-07-04 00:40:29 UTC
Created attachment 158313 [details]
chkrootkit 0.50 unified diff
Comment 3 Lacey Powers 2015-07-04 00:41:05 UTC
Created attachment 158314 [details]
Poudriere Build output
Comment 4 Lacey Powers 2015-07-04 00:41:27 UTC
Created attachment 158315 [details]
Portlint output
Comment 5 Lacey Powers 2015-07-04 00:46:13 UTC
I read through the link you put in the previous comment. I missed that, thank you for sharing it. My apologies.

Per your request, and the directions in the link, I have attached the unified diff, including the changes to the subdir and MOVED, along with the output of portlint and poudriere (which was surprisingly easy to set up and use)

Here is the svn cp command as well:

svn cp 'https://svn0.us-west.freebsd.org/ports/head/security/chkrootkit/@362835' security/chkrootkit

One commit back from r362836, in which chkrootkit was removed.

Please let me know if you need anything else from me for this.
Comment 6 Kubilay Kocak freebsd_committer freebsd_triage 2015-07-04 02:48:15 UTC
Perfect Lacey!

The only other thing I would suggest is setting MAINTAINER to yourself, or asking the previous maintainer if they are OK with being put back in the driver seat :)

The only thing maintainers need to do regarding issues they create here for changes, is to:

 * set the maintainer-feedack flag from "?" to "+" when they respond, and 
 * set maintainer-approval to "+" on attachments they that approve in cases where they are the approving party, ie:

 - When person creating the attachment is MAINTAINER
 - When the port currently has no maintainer (MAINTAINER=ports@)
Comment 7 Lacey Powers 2015-07-05 22:39:09 UTC
Created attachment 158402 [details]
chkrootkit patch with updated maintainer
Comment 8 Lacey Powers 2015-07-05 22:39:45 UTC
Created attachment 158403 [details]
patch for chkwtmp.c for FreeBSD-9
Comment 9 Lacey Powers 2015-07-05 22:40:17 UTC
Created attachment 158404 [details]
Patch for chklastlog.c for FreeBSD-9
Comment 10 Lacey Powers 2015-07-05 22:45:34 UTC
Per your suggestions, I changed the maintainer to my email address, since I haven't heard back from the previous maintainer.

I also used Poudriere to test under 8.4 and 9.3, and I have attached two small patches to make things build under FreeBSD 9. Everything seems to work just fine in my testing.

Please let me know if further changes are needed, and thank you very much for your help and patience Kubilay. =)
Comment 11 Kubilay Kocak freebsd_committer freebsd_triage 2015-07-06 05:25:59 UTC
Thanks Lacey, and its my pleasure.

If the patches for FreeBSD 9.x *cant* be used for any other version, then you'll want to conditionally patch them using an OSVERSION check or similar.

If those patches can be used unconditionally, then you can ignore the above comment.

Either way, it would be great if you could bundle all attachments here into a single patch that would be great so that its clear to a committer what needs to be done in one step

PROTIP: You can create files/patch-* files very easily with the 'makepatch' helper. See the following porters handbook section for instructions:

http://www2.au.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#slow-patch

If the patches only apply to FreeBSD 9, then you want to use EXTRA_PATCHES construct. See Porters Handbook Section: 5.4.7. PATCHFILES

Don't forget to run poudriere/portlint again just to make sure, and obsolete the first 3 patches after you attach the latest version :)

Keep up the great work
Comment 12 Lacey Powers 2015-07-06 16:37:25 UTC
Created attachment 158424 [details]
chkrootkit diff all in one with file patches included
Comment 13 Lacey Powers 2015-07-06 16:47:15 UTC
Added the diff with all patches included. The patches in question just change a version check to be ">= 9" from ">9", so they are not version specific, they just include FreeBSD 9 in the wtmpx check already in the code.

(make makepatch is pretty slick, btw, thank you for the suggestion! =D)

The patch applies cleanly with patch -p0 on security/chkrootkit checked out with the following cp command: 

svn cp 'https://svn0.us-west.freebsd.org/ports/head/security/chkrootkit/@362835' security/chkrootkit

Poudriere and portlint outputs are the same as previously attached. If needed, I can add them as well.

Please let me know if anything else is needed to revive the port. =)
Comment 14 commit-hook freebsd_committer freebsd_triage 2015-07-11 14:40:30 UTC
A commit references this bug:

Author: riggs
Date: Sat Jul 11 14:40:23 UTC 2015
New revision: 391741
URL: https://svnweb.freebsd.org/changeset/ports/391741

Log:
  - Revive security/chkrootkit
  - Update to upstream version 0.50
  - Port has a new maintainer: Lacey Powers <lacey.leanne@gmail.com>

  PR:		201297
  Submitted by:	lacey.leanne@gmail.com (maintainer)
  Reviewed by:	koobs

Changes:
  head/MOVED
  head/security/Makefile
  head/security/chkrootkit/
  head/security/chkrootkit/Makefile
  head/security/chkrootkit/distinfo
  head/security/chkrootkit/files/
  head/security/chkrootkit/files/patch-chklastlog.c
  head/security/chkrootkit/files/patch-chkwtmp.c