net-misc/kea: various improvements #22116

expeditioneer · 2021-08-26T17:23:41Z

fixed-gtest detection
added Systemd services

Closes: https://bugs.gentoo.org/693332
Closes: https://bugs.gentoo.org/626280
Bug: https://bugs.gentoo.org/751883

Signed-off-by: Dennis Lamm expeditioneer@gentoo.org
Package-Manager: Portage-3.0.20, Repoman-3.0.3

gentoo-bot · 2021-08-26T17:24:09Z

Pull Request assignment

Submitter: @expeditioneer
Areas affected: ebuilds
Packages affected: net-misc/kea

net-misc/kea: ~~polynomial-c~~, ~~chainsaw~~

At least one of the listed packages is maintained entirely by non-GitHub developers!

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

gentoo-repo-qa-bot · 2021-08-26T17:34:55Z

Pull request CI report

Report generated at: 2021-08-26 17:34 UTC
Newest commit scanned: 0da2bc4
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/e223d34843/output.html

SoapGentoo · 2021-08-26T18:21:56Z

net-misc/kea/files/kea-1.8.2-gtest.patch

+		        AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS])
+		   fi
+	        fi
+	    done


...just use pkg-config?

thesamesam · 2021-08-26T18:28:15Z

net-misc/kea/kea-1.8.2-r1.ebuild

+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+
+	if use samples; then
+	    diropts -m 0750 -o root -g dhcp


Indentation is inconsistent

thesamesam · 2021-08-26T18:28:45Z

net-misc/kea/kea-1.8.2-r1.ebuild

+	systemd_dounit "${FILESDIR}"/kea-dhcp4-server.service
+	systemd_dounit "${FILESDIR}"/kea-dhcp6-server.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf


Need a pkg_postinst call to tmpfiles_process (should be a QA warning now, see here)

Added missing pkg_postinst

thesamesam · 2021-08-26T18:29:12Z

net-misc/kea/kea-1.9.10-r1.ebuild

+		-e 's#test -f "$dir/lib/libgtest.a"#test -f "$dir/lib64/libgtest.a"#g' \
+		-e 's#test -f "$dir/lib/libgtest.so"#test -f "$dir/lib64/libgtest.so"#g' \
+		-e 's GTEST_LDFLAGS="-L$dir/lib GTEST_LDFLAGS="-L$dir/lib64 g' \
+		m4macros/ax_gtest.m4 || die "fixing gtest detection macro failed"


pkg_config? hardcoding lib64 isn't right here anyway for all platforms.

thesamesam · 2021-08-26T18:29:54Z

net-misc/kea/metadata.xml

@@ -9,8 +9,18 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer type="person">


Make sure you wait until one of the existing maintainers reviews.

gentoo-repo-qa-bot · 2021-08-26T19:54:56Z

Pull request CI report

Report generated at: 2021-08-26 19:54 UTC
Newest commit scanned: 81f29a9
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/e97b3e27ea/output.html

Polynomial-C · 2021-08-27T10:41:26Z

Can you please squash your commits into one?

expeditioneer · 2021-08-29T16:29:25Z

@Polynomial-C: I've added the gtest detection via pkg-config and squashed the commits

gentoo-repo-qa-bot · 2021-08-29T16:39:57Z

Pull request CI report

Report generated at: 2021-08-29 16:39 UTC
Newest commit scanned: 6346f0a
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/f4d6d3e29b/output.html

Polynomial-C · 2021-08-30T14:32:38Z

net-misc/kea/kea-1.8.2-r1.ebuild

+		dodir /etc/kea
+		cp "${FILESDIR}"/kea-ctrl-agent.conf "${ED}"/etc/kea/kea-ctrl-agent.conf || die "Could not create kea-ctrl-agent.conf"
+		cp "${FILESDIR}"/kea-ddns-server.conf "${ED}"/etc/kea/kea-ddns-server.conf || die "Could not create kea-ddns-server.conf"
+		cp "${FILESDIR}"/kea-dhcp4.conf "${ED}"/etc/kea/kea-dhcp4.conf || die "Could not create kea kea-dhcp4.conf"
+		cp "${FILESDIR}"/kea-dhcp6.conf "${ED}"/etc/kea/kea-dhcp6.conf || die "Could not create kea-dhcp6.conf"


Please replace these with insinto and doins calls. That way you may even remove the dodir line.

Polynomial-C · 2021-08-30T14:58:58Z

Oh and please fix these issues as well:

Traceback (most recent call last):
  File "/usr/lib/portage/python3.9/doins.py", line 594, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/usr/lib/portage/python3.9/doins.py", line 582, in main
    if _doins(
  File "/usr/lib/portage/python3.9/doins.py", line 434, in _doins
    return install_runner.install_file(source, os.path.dirname(dest))
  File "/usr/lib/portage/python3.9/doins.py", line 370, in install_file
    return self._ins_runner.run(source, dest_dir)
  File "/usr/lib/portage/python3.9/doins.py", line 179, in run
    sstat = os.stat(source)
FileNotFoundError: [Errno 2] No such file or directory: b'/var/tmp/portage/net-misc/kea-1.9.10-r1/files/kea-dhcp-ddns-server.service'
 * ERROR: net-misc/kea-1.9.10-r1::gentoo failed (install phase):
 *   doins failed
 *
 * If you need support, post the output of `emerge --info '=net-misc/kea-1.9.10-r1::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=net-misc/kea-1.9.10-r1::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/net-misc/kea-1.9.10-r1/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/net-misc/kea-1.9.10-r1/temp/environment'.
 * Working directory: '/var/tmp/portage/net-misc/kea-1.9.10-r1/work/kea-1.9.10'
 * S: '/var/tmp/portage/net-misc/kea-1.9.10-r1/work/kea-1.9.10'
 * QA Notice: Unrecognized configure options:
 *
 *      --with-gtest
 *      --with-gtest

expeditioneer · 2021-08-31T19:15:33Z

@Polynomial-C this should be fixed now

gentoo-repo-qa-bot · 2021-08-31T19:25:01Z

Pull request CI report

Report generated at: 2021-08-31 19:25 UTC
Newest commit scanned: 4eda473
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/cb6ef0beda/output.html

expeditioneer · 2021-09-01T14:19:59Z

Added bugs to commit message

gentoo-repo-qa-bot · 2021-09-01T14:45:27Z

Pull request CI report

Report generated at: 2021-09-01 14:45 UTC
Newest commit scanned: 6e68252
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/3315edbbfc/output.html

Polynomial-C · 2021-09-01T21:22:47Z

net-misc/kea/kea-1.8.2-r1.ebuild

+		doins "${FILESDIR}"/${PN}-ctrl-agent.conf || die "Could not create kea-ctrl-agent.conf"
+		doins "${FILESDIR}"/${PN}-ddns-server.conf || die "Could not create kea-ddns-server.conf"
+		doins "${FILESDIR}"/${PN}-dhcp4.conf || die "Could not create kea kea-dhcp4.conf"
+		doins "${FILESDIR}"/${PN}-dhcp6.conf || die "Could not create kea-dhcp6.conf"


doins does not require || die calls. See https://devmanual.gentoo.org/ebuild-writing/error-handling/index.html

Polynomial-C · 2021-09-01T21:23:58Z

net-misc/kea/kea-1.8.2-r1.ebuild

+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+
+	if use samples; then
+		diropts -m 0750 -o root -g dhcp


Alright, removing the dodir call also made this line useless. But I suppose you want the etc/kea dir to have these permissions so I suggest to re-introduce the dodir /etc/kea call.

I've fixed it

gentoo-repo-qa-bot · 2021-09-02T20:31:39Z

Pull request CI report

Report generated at: 2021-09-02 20:31 UTC
Newest commit scanned: 64dc842
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/02bdacfdff/output.html

expeditioneer · 2021-09-06T18:01:03Z

@Polynomial-C could we merge this?

thesamesam · 2021-09-06T18:02:55Z

net-misc/kea/files/kea-1.8.2-gtest.patch

+-    fi
+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
+    PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
+    GTEST_INCLUDES=`pkg-config --keep-system-cflags --cflags-only-I gtest`


You shouldn't need to then call pkg-config directly (PKG_CHECK_MODULES should populate everything you need), but if you absolutely must, respect ${PKG_CONFIG} instead (not calling just pkg-config bare).

@thesamesam thank you for the hint with ${PKG_CONFIG} i replaced the plain pkg-configcalls. Sadly PKG_CHECK_MODULES does not provide everything which is required by kea. I also wanted to keep the changes minimal on their codebase.

np, I understand -- thanks! I defer to @Polynomial-C now.

gentoo-repo-qa-bot · 2021-09-06T19:31:58Z

Pull request CI report

Report generated at: 2021-09-06 19:31 UTC
Newest commit scanned: d5e43fc
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/c642c51107/output.html

expeditioneer · 2021-09-07T05:25:01Z

I've found an issue with the conditional activation of gtest. Please wait with further reviews until i have fixed that.

expeditioneer · 2021-09-07T05:54:06Z

The conditional activation of gtest should now work as expected and intended.

gentoo-repo-qa-bot · 2021-09-07T06:11:58Z

Pull request CI report

Report generated at: 2021-09-07 06:11 UTC
Newest commit scanned: 2771192
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/e598e4517a/output.html

Polynomial-C

Please fix the two remaining minor issues.
Optionally you may also bump kea to version 1.9.11 (but in a separate commit please).

Once you've done this, you can commit your PR. Thanks for your patience.

Polynomial-C · 2021-09-07T14:42:33Z

net-misc/kea/kea-1.9.10-r1.ebuild

+	if use samples; then
+		diropts -m 0750 -o root -g dhcp
+		dodir /etc/kea
+        insopts -m 0640 -o root -g dhcp


Please fix the indentation

Polynomial-C · 2021-09-07T14:42:42Z

net-misc/kea/kea-9999.ebuild

+	if use samples; then
+		diropts -m 0750 -o root -g dhcp
+		dodir /etc/kea
+        insopts -m 0640 -o root -g dhcp


gentoo-repo-qa-bot · 2021-09-07T18:26:55Z

Pull request CI report

Report generated at: 2021-09-07 18:26 UTC
Newest commit scanned: e66147d
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/c1a4eb8fe4/output.html

fixed-gtest detection added Systemd services Closes: https://bugs.gentoo.org/693332 Closes: https://bugs.gentoo.org/626280 Bug: https://bugs.gentoo.org/751883 Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org> Package-Manager: Portage-3.0.20, Repoman-3.0.3

Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org> Package-Manager: Portage-3.0.20, Repoman-3.0.3

gentoo-repo-qa-bot · 2021-09-07T19:41:55Z

Pull request CI report

Report generated at: 2021-09-07 19:41 UTC
Newest commit scanned: 0f81099
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/e42826e264/output.html

gentoo-bot added need assignment It was impossible to assign the PR correctly. Please assign it manually. no bug found No Bug/Closes found in the commits. labels Aug 26, 2021

expeditioneer self-assigned this Aug 26, 2021

SoapGentoo suggested changes Aug 26, 2021

View reviewed changes

thesamesam suggested changes Aug 26, 2021

View reviewed changes

expeditioneer force-pushed the kea branch from cb3ed63 to 6346f0a Compare August 29, 2021 16:28

expeditioneer assigned Polynomial-C Aug 29, 2021

Polynomial-C suggested changes Aug 30, 2021

View reviewed changes

expeditioneer force-pushed the kea branch from 6346f0a to 4eda473 Compare August 31, 2021 19:14

expeditioneer force-pushed the kea branch from 4eda473 to 6e68252 Compare September 1, 2021 14:18

Polynomial-C suggested changes Sep 1, 2021

View reviewed changes

expeditioneer force-pushed the kea branch 2 times, most recently from 3f1278a to 64dc842 Compare September 2, 2021 20:16

thesamesam reviewed Sep 6, 2021

View reviewed changes

expeditioneer force-pushed the kea branch from 64dc842 to d5e43fc Compare September 6, 2021 19:18

expeditioneer force-pushed the kea branch from d5e43fc to 2771192 Compare September 7, 2021 05:53

Polynomial-C suggested changes Sep 7, 2021

View reviewed changes

expeditioneer force-pushed the kea branch from 2771192 to e66147d Compare September 7, 2021 18:12

expeditioneer force-pushed the kea branch from e66147d to 1d0f61c Compare September 7, 2021 19:12

net-misc/kea: version bump 1.9.11

0f81099

Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org> Package-Manager: Portage-3.0.20, Repoman-3.0.3

gentoo-bot closed this in e2b1dcc Sep 8, 2021

expeditioneer deleted the kea branch September 8, 2021 04:58

net-misc/kea: various improvements #22116

net-misc/kea: various improvements #22116

Conversation

expeditioneer commented Aug 26, 2021 • edited

gentoo-bot commented Aug 26, 2021

Pull Request assignment

Linked bugs

gentoo-repo-qa-bot commented Aug 26, 2021

Pull request CI report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Aug 26, 2021

Pull request CI report

Polynomial-C commented Aug 27, 2021

expeditioneer commented Aug 29, 2021

gentoo-repo-qa-bot commented Aug 29, 2021

Pull request CI report

Choose a reason for hiding this comment

Polynomial-C commented Aug 30, 2021

expeditioneer commented Aug 31, 2021

gentoo-repo-qa-bot commented Aug 31, 2021

Pull request CI report

expeditioneer commented Sep 1, 2021

gentoo-repo-qa-bot commented Sep 1, 2021

Pull request CI report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Sep 2, 2021

Pull request CI report

expeditioneer commented Sep 6, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Sep 6, 2021

Pull request CI report

expeditioneer commented Sep 7, 2021

expeditioneer commented Sep 7, 2021

gentoo-repo-qa-bot commented Sep 7, 2021

Pull request CI report

Polynomial-C left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Sep 7, 2021

Pull request CI report

gentoo-repo-qa-bot commented Sep 7, 2021

Pull request CI report

expeditioneer commented Aug 26, 2021 •

edited

Polynomial-C left a comment •

edited