Bug 242153 - devel/nexus2-oss: MFH to 2019Q4 is incomplete
Summary: devel/nexus2-oss: MFH to 2019Q4 is incomplete
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Dmitri Goutnik
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-11-22 09:16 UTC by Michael Osipov
Modified: 2019-11-22 16:17 UTC (History)
3 users (show)

See Also:
joneum: merge-quarterly+

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Osipov 2019-11-22 09:16:36 UTC 
Port maintainer here. I do receive pkg fallouts like: http://beefy2.nyi.freebsd.org/build.html?mastername=120amd64-quarterly&build=518071

The cause is that the merge into Q4 is incomplete:

> $ svn diff http://svn0.us-east.freebsd.org/ports/head/devel/nexus2-oss http://svn0.us-east.freebsd.org/ports/branches/2019Q4/devel/nexus2-oss/
> Index: pkg-plist
> ===================================================================
> --- pkg-plist   (.../head/devel/nexus2-oss)     (Revision 518131)
> +++ pkg-plist   (.../branches/2019Q4/devel/nexus2-oss)  (Revision 518131)
> @@ -315,8 +315,8 @@
>  %%DATADIR%%/nexus/WEB-INF/web.xml
>  %%DATADIR%%/nexus/favicon.ico
>  %%DATADIR%%/nexus/favicon.png
> -%%DATADIR%%/nexus/images/NexusRepoMngr_horiz_white+color@2x.png
> -%%DATADIR%%/nexus/images/NexusRepoMngr_withSonatype@3x.png
> +%%DATADIR%%/nexus/images/header_branding.png
> +%%DATADIR%%/nexus/images/nexus650x55.png
>  %%DATADIR%%/nexus/robots.txt
>  @dir(%%USER%%,%%GROUP%%,750) %%RUNDIR%%
>  @dir(%%USER%%,%%GROUP%%,750) %%LOGDIR%%
> Index: files/nexus2.in
> ===================================================================
> --- files/nexus2.in     (.../head/devel/nexus2-oss)     (Revision 518131)
> +++ files/nexus2.in     (.../branches/2019Q4/devel/nexus2-oss)  (Revision 518131)
> @@ -3,7 +3,7 @@
>  # $FreeBSD$
>  #
>  # PROVIDE: %%NEXUS_RC%%
> -# REQUIRE: LOGIN FILESYSTEMS NETWORKING
> +# REQUIRE: LOGIN FILESYSTEMS
>  # KEYWORD: shutdown
>  #
>  # Add the following line to /etc/rc.conf[.local] to enable Nexus:
> @@ -28,7 +28,7 @@
>  command_args="%%ETCDIR%%/wrapper.conf wrapper.syslog.ident=%%NEXUS_RC%% \
>    wrapper.pidfile=${pidfile} wrapper.lockfile=%%RUNDIR%%/%%NEXUS_RC%%.lock \
>    wrapper.java.pidfile=%%RUNDIR%%/%%NEXUS_RC%%.java.pid wrapper.daemonize=TRUE \
> -  wrapper.name=%%NEXUS_RC%% wrapper.displayname=Nexus_Repository_Manager_OSS"
> +  wrapper.name=%%NEXUS_RC%% wrapper.displayname=Nexus\ Repository\ Manager\ OSS"
> 
>  run_rc_command "$1"
Comment 1 Jochen Neumeister freebsd_committer freebsd_triage 2019-11-22 09:50:40 UTC 
Hello,

obviously everything from r514553 is missing
@dmgk took everything from his commit to 2019Q4 on 09.11.2019, but didn't consider the previous commits.
@dmgk could you still take over the old changes?

Approved for 2019Q4 by me (Approved by: ports-secteam (joneum))
Comment 2 commit-hook freebsd_committer freebsd_triage 2019-11-22 16:16:10 UTC 
A commit references this bug:

Author: dmgk
Date: Fri Nov 22 16:16:05 UTC 2019
New revision: 518151
URL: https://svnweb.freebsd.org/changeset/ports/518151

Log:
  Unbreak after incomplete merge in r517133

  PR:		242153
  Reported by:	Michael Osipov <michael.osipov@siemens.com> (maintainer)
  Approved by:	ports-secteam (joneum)

Changes:
  branches/2019Q4/devel/nexus2-oss/files/nexus2.in
  branches/2019Q4/devel/nexus2-oss/pkg-plist
Comment 3 Dmitri Goutnik freebsd_committer freebsd_triage 2019-11-22 16:17:51 UTC 
Fixed, sorry for the breakage.