Bug 215832 - [patch] net-mgmt/rancid3 partiality fix vars used in post-install and improve comware support
Summary: [patch] net-mgmt/rancid3 partiality fix vars used in post-install and improve...
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: Mark Felder
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2017-01-06 15:33 UTC by Olli Hauer
Modified: 2017-01-11 15:07 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (feld)


Attachments
rancid3 patch v1 (2.97 KB, patch)
2017-01-06 15:33 UTC, Olli Hauer
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olli Hauer freebsd_committer freebsd_triage 2017-01-06 15:33:32 UTC
Created attachment 178576 [details]
rancid3 patch v1

After upgrading to 3.6.1 I've seen i haven't submitted some additional changes for comware support, and after looking into the changes I've also seen some vars in post-install are misspelled.

The patch contains the following changes:

rancid modules should use the current rancis version number, else rancid will complain about it
 - replace hard coded version number in cmw.pm and cmwlogin.pm with @VERSION@

Not in the patch, this should be done before committing!
 - svn mv files/cmw.pm files/cmw.pm.in
 - svn mv files/cmwlogin.pm files/cmwlogin.pm.in

Fix variables used in post-install
 - s/NEWERCONFIG_FILES1/NEWERCONFIG_FILE1/
 - s/NEWERCONFIG_FILES2/NEWERCONFIG_FILE2/

By the way, I think the tests about existing config files should be done in a pkg-install script, else the are not done iff installed by 'pkg install ...'
Comment 1 Mark Felder freebsd_committer freebsd_triage 2017-01-06 18:23:50 UTC
committed, thanks!
Comment 2 commit-hook freebsd_committer freebsd_triage 2017-01-06 18:24:18 UTC
A commit references this bug:

Author: feld
Date: Fri Jan  6 18:23:38 UTC 2017
New revision: 430723
URL: https://svnweb.freebsd.org/changeset/ports/430723

Log:
  net-mgmt/rancid3: Port cleanup

  Fix some variables in post-install, make Comware support include a
  version number that matches PORTVERSION

  PR:		215832

Changes:
  head/net-mgmt/rancid3/Makefile
  head/net-mgmt/rancid3/files/cmw.pm
  head/net-mgmt/rancid3/files/cmw.pm.in
  head/net-mgmt/rancid3/files/cmwlogin
  head/net-mgmt/rancid3/files/cmwlogin.in
Comment 3 commit-hook freebsd_committer freebsd_triage 2017-01-06 18:49:48 UTC
A commit references this bug:

Author: ohauer
Date: Fri Jan  6 18:48:49 UTC 2017
New revision: 430728
URL: https://svnweb.freebsd.org/changeset/ports/430728

Log:
  - add missing fix for rancid version
    s/3.1.99/@VERSION@/

  PR:		215832

Changes:
  head/net-mgmt/rancid3/files/cmw.pm.in
  head/net-mgmt/rancid3/files/cmwlogin.in
Comment 4 Olli Hauer freebsd_committer freebsd_triage 2017-01-06 18:50:44 UTC
Hi Mark,

Thanks for the quick commit!
It seems the @VERSION@ part was lost from the cmw.pm, cmwlogin.pm and I've taken the liberty to commit the missing part ;)
Comment 5 Mark Felder freebsd_committer freebsd_triage 2017-01-06 19:22:31 UTC
Good catch, thank you.
Comment 6 commit-hook freebsd_committer freebsd_triage 2017-01-11 15:07:13 UTC
A commit references this bug:

Author: feld
Date: Wed Jan 11 15:06:22 UTC 2017
New revision: 431186
URL: https://svnweb.freebsd.org/changeset/ports/431186

Log:
  MFH: r430723 r430728 r431184

  net-mgmt/rancid3: Port cleanup

  Fix some variables in post-install, make Comware support include a
  version number that matches PORTVERSION

  PR:		215832

  - add missing fix for rancid version
    s/3.1.99/@VERSION@/

  PR:		215832

  net-mgmt/rancid3: Update to 3.6.2

  Approved by:	ports-secteam (with hat)

Changes:
_U  branches/2017Q1/
  branches/2017Q1/net-mgmt/rancid3/Makefile
  branches/2017Q1/net-mgmt/rancid3/distinfo
  branches/2017Q1/net-mgmt/rancid3/files/cmw.pm
  branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in
  branches/2017Q1/net-mgmt/rancid3/files/cmwlogin
  branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in
  branches/2017Q1/net-mgmt/rancid3/pkg-plist
Comment 7 commit-hook freebsd_committer freebsd_triage 2017-01-11 15:07:15 UTC
A commit references this bug:

Author: feld
Date: Wed Jan 11 15:06:23 UTC 2017
New revision: 431186
URL: https://svnweb.freebsd.org/changeset/ports/431186

Log:
  MFH: r430723 r430728 r431184

  net-mgmt/rancid3: Port cleanup

  Fix some variables in post-install, make Comware support include a
  version number that matches PORTVERSION

  PR:		215832

  - add missing fix for rancid version
    s/3.1.99/@VERSION@/

  PR:		215832

  net-mgmt/rancid3: Update to 3.6.2

  Approved by:	ports-secteam (with hat)

Changes:
_U  branches/2017Q1/
  branches/2017Q1/net-mgmt/rancid3/Makefile
  branches/2017Q1/net-mgmt/rancid3/distinfo
  branches/2017Q1/net-mgmt/rancid3/files/cmw.pm
  branches/2017Q1/net-mgmt/rancid3/files/cmw.pm.in
  branches/2017Q1/net-mgmt/rancid3/files/cmwlogin
  branches/2017Q1/net-mgmt/rancid3/files/cmwlogin.in
  branches/2017Q1/net-mgmt/rancid3/pkg-plist