From owner-freebsd-ports-bugs@freebsd.org Thu Oct 1 09:43:41 2020
Return-Path: <owner-freebsd-ports-bugs@freebsd.org>
Delivered-To: freebsd-ports-bugs@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 891AB422BD0
for <freebsd-ports-bugs@mailman.nyi.freebsd.org>;
Thu, 1 Oct 2020 09:43:41 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::50:13])
by mx1.freebsd.org (Postfix) with ESMTP id 4C27VP3Bt8z3d5W
for <freebsd-ports-bugs@freebsd.org>; Thu, 1 Oct 2020 09:43:41 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
Received: by mailman.nyi.freebsd.org (Postfix)
id 6D9D6422EC0; Thu, 1 Oct 2020 09:43:41 +0000 (UTC)
Delivered-To: ports-bugs@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6C442423095
for <ports-bugs@mailman.nyi.freebsd.org>; Thu, 1 Oct 2020 09:43:41 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4C27VP2C71z3dXx
for <ports-bugs@FreeBSD.org>; Thu, 1 Oct 2020 09:43:41 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
Received: from kenobi.freebsd.org (kenobi.freebsd.org
[IPv6:2610:1c1:1:606c::50:1d])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3028AEC30
for <ports-bugs@FreeBSD.org>; Thu, 1 Oct 2020 09:43:41 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
Received: from kenobi.freebsd.org ([127.0.1.5])
by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 0919hfSA085960
for <ports-bugs@FreeBSD.org>; Thu, 1 Oct 2020 09:43:41 GMT
(envelope-from bugzilla-noreply@freebsd.org)
Received: (from www@localhost)
by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 0919hfXD085959
for ports-bugs@FreeBSD.org; Thu, 1 Oct 2020 09:43:41 GMT
(envelope-from bugzilla-noreply@freebsd.org)
X-Authentication-Warning: kenobi.freebsd.org: www set sender to
bugzilla-noreply@freebsd.org using -f
From: bugzilla-noreply@freebsd.org
To: ports-bugs@FreeBSD.org
Subject: [Bug 250008] net-mgmt/ocsinventory-server: update to 2.8
Date: Thu, 01 Oct 2020 09:43:41 +0000
X-Bugzilla-Reason: AssignedTo
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: Ports & Packages
X-Bugzilla-Component: Individual Port(s)
X-Bugzilla-Version: Latest
X-Bugzilla-Keywords:
X-Bugzilla-Severity: Affects Only Me
X-Bugzilla-Who: fernape@FreeBSD.org
X-Bugzilla-Status: Open
X-Bugzilla-Resolution:
X-Bugzilla-Priority: ---
X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org
X-Bugzilla-Flags: maintainer-feedback?
X-Bugzilla-Changed-Fields:
Message-ID: <bug-250008-7788-aHClQOz67N@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-250008-7788@https.bugs.freebsd.org/bugzilla/>
References: <bug-250008-7788@https.bugs.freebsd.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Oct 2020 09:43:41 -0000
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D250008
--- Comment #3 from Fernando Apestegu=C3=ADa <fernape@FreeBSD.org> ---
patch -p3 -E < ../../250008.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net-mgmt/ocsinventory-server/Makefile
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-server/Makefile (revision 550687)
|+++ net-mgmt/ocsinventory-server/Makefile (working copy)
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 1 with fuzz 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net-mgmt/ocsinventory-server/distinfo
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-server/distinfo (revision 550687)
|+++ net-mgmt/ocsinventory-server/distinfo (working copy)
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net-mgmt/ocsinventory-server/pkg-plist
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-server/pkg-plist (revision 550687)
|+++ net-mgmt/ocsinventory-server/pkg-plist (working copy)
--------------------------
Patching file pkg-plist using Plan A...
Hunk #1 succeeded at 21.
Hunk #2 succeeded at 46.
Hunk #3 succeeded at 63.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net-mgmt/ocsinventory-ocsreports/Makefile
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-ocsreports/Makefile (revision 550687)
|+++ net-mgmt/ocsinventory-ocsreports/Makefile (working copy)
--------------------------
Patching file Makefile using Plan A...
Hunk #1 failed at 1.
Hunk #2 failed at 32.
2 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net-mgmt/ocsinventory-ocsreports/distinfo
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-ocsreports/distinfo (revision 550687)
|+++ net-mgmt/ocsinventory-ocsreports/distinfo (working copy)
--------------------------
Patching file distinfo using Plan A...
Hunk #1 failed at 1.
1 out of 1 hunks failed--saving rejects to distinfo.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample=20=20=
=20=20
(nonexistent)
|+++ net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample=20=20=
=20=20
(working copy)
--------------------------
(Creating file dbconfig.inc.php.sample...)
Patching file dbconfig.inc.php.sample using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|Property changes on:
net-mgmt/ocsinventory-ocsreports/files/dbconfig.inc.php.sample
|___________________________________________________________________
|Added: svn:eol-style
|## -0,0 +1 ##
|+native
|\ No newline at end of property
|Added: svn:mime-type
|## -0,0 +1 ##
|+text/plain
|\ No newline at end of property
|Index: net-mgmt/ocsinventory-ocsreports/pkg-plist
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|--- net-mgmt/ocsinventory-ocsreports/pkg-plist (revision 550687)
|+++ net-mgmt/ocsinventory-ocsreports/pkg-plist (working copy)
--------------------------
Patching file pkg-plist using Plan A...
Hunk #1 failed at 15.
Hunk #2 failed at 30.
Hunk #3 failed at 46.
Hunk #4 failed at 72.
No such line 276 in input file, ignoring
Hunk #5 failed at 288.
Hunk #6 failed at 357.
Hunk #7 failed at 399.
Hunk #8 failed at 416.
Hunk #9 failed at 462.
Hunk #10 failed at 507.
Hunk #11 failed at 529.
Hunk #12 failed at 632.
Hunk #13 failed at 655.
13 out of 13 hunks failed--saving rejects to pkg-plist.rej
done
See this. I just updated my tree. In the Makefile, only this two lines use
INSTALL_DATA:
fernape@beastie:~/FreeBSD-repos/ports/head/net-mgmt/ocsinventory-server$ gr=
ep
INSTALL_DATA Makefile
${INSTALL_DATA} ${WRKSRC}/etc/ocsinventory/ocsinventory-${F}.conf
${STAGEDIR}${ETCDIR}/ocsinventory-${F}.conf.sample
${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/INSTALL
${STAGEDIR}${DOCSDIR}/
fernape@beastie:~/FreeBSD-repos/ports/head/net-mgmt/ocsinventory-server$ gr=
ep
INSTALL_DATA /tmp/250008/250008.patch
- ${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php
${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
+ ${INSTALL_DATA} ${FILESDIR}/dbconfig.inc.php.sample
${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
${INSTALL_DATA} ${WRKSRC}/backend/require/cas.config.php
${STAGEDIR}${WWWDIR}/backend/require/cas.config.php.sample
${INSTALL_DATA} ${WRKDIR}/apache.conf
${STAGEDIR}${ETCDIR}/ocsreports.inc.sample
yet the patch is trying to delete a line like this one:
- ${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php
${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
that I don't see anywhere...
I can only see references to that here:
fernape@beastie:~/FreeBSD-repos/ports/head/net-mgmt$ grep -R dbconfig.inc.p=
hp *
ocsinventory-ocsreports/files/pkg-message.in:* edit %%WWWDIR%%/dbconfig.inc=
.php
ocsinventory-ocsreports/Makefile: (cd ${WRKSRC} && ${COPYTREE_SHARE} .
${STAGEDIR}${WWWDIR} "! -name dbconfig.inc.php ! -name cas.config.php")
ocsinventory-ocsreports/Makefile: ${INSTALL_DATA}
${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
ocsinventory-ocsreports/pkg-plist:@sample %%WWWDIR%%/dbconfig.inc.php.sample
not in ocsinventory-server.
What am I missing?
--=20
You are receiving this mail because:
You are the assignee for the bug.=