media-video/motion: version bump to 4.3.1 #15513

hfernh · 2020-04-25T11:44:30Z

New version of motion, which fixes
Bug: https://bugs.gentoo.org/665930
Bug: https://bugs.gentoo.org/673410
Bug: https://bugs.gentoo.org/717312

Signed-off-by: Johannes Willem Fernhout hfern@fernhout.info

hfernh · 2020-04-25T11:53:47Z

references to bugs:
https://bugs.gentoo.org/665930
https://bugs.gentoo.org/673410
https://bugs.gentoo.org/717312

vilhelmgray

Squash this patch into your previous one so that it's a single commit that can be merged when it's approved.

vilhelmgray · 2020-04-25T20:03:14Z

references to bugs:
https://bugs.gentoo.org/665930
https://bugs.gentoo.org/673410
https://bugs.gentoo.org/717312

Change the Github pull request title at the top of this page and append [please reassign] to the end. This will cause the bot to automatically recheck the commit messages for these bug links.

vilhelmgray · 2020-04-25T20:06:38Z

I reviewed the bot's QA issue list:

1. DeprecatedEclass / uses deprecated eclass: [ user (migrate to acct-user/acct-group packages) ]
   => removed reference to user

You need to create a motion user package and a motion group package. Add them as dependencies to your motion ebuild. Here's some more information about the format: https://wiki.gentoo.org/wiki/Categories_acct-group_and_acct-user

2. UnknownUseFlags | unknown USE flag: 'mariadb'
   => not exactly sure what caused this, maybe an extra space behind mariadb in the IUSE string..?

Add a "mariadb" entry in the metadata.xml file: 91f6eee#diff-f19779b8008ab61e7ff7cf996b971d96

hfernh · 2020-04-26T09:56:42Z

Have reserved a motion uid/gid in a pull request gentoo/api-gentoo-org#272 . Previously I had removed the motion user from the ebuild, but once this pull request 272 is approved I will reinstate the motion user, and process the other comments.

vilhelmgray · 2020-05-03T18:09:49Z

This is looking better, but squash all those commits down to just one.

The [please reassign] needs to be appended to the title of this Github pull request, not the body. There's an Edit button to the right of the title that you can click to change it (try Ctrl+F to search "Edit" for it if you're having trouble finding it).

I also recommend applying to become a Proxy Maintainer for this package. That will probably help expedite the process to merge your pull request.

gentoo-repo-qa-bot · 2020-05-03T18:17:28Z

Pull request CI report

Report generated at: 2020-05-03 18:17 UTC
Newest commit scanned: 8bcb255
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/a7cfb89/output.html

hfernh · 2020-05-05T14:27:41Z

I think I finally managed to squash the commits together, get the right labels and bug references added.

hfernh · 2020-05-05T18:22:46Z

@juippis based on the earlier suggestion from @vilhelmgray to volunteer as proxy-maintainer I contacted @mgorny, who suggested that you should have a look at this PR.

gentoo-repo-qa-bot · 2020-05-06T09:04:17Z

Pull request CI report

Report generated at: 2020-05-06 09:04 UTC
Newest commit scanned: 70947f7
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/50fd808/output.html

juippis

You need to split this into 3 commits. One for acct-user, one for acct-group and one for media-video/motion.
Your commit summary needs to be updated, it's media**-**video, not media_video. And you can update your Bug: tag to be Closes: tag so it closes the bugs automatically when this is merged. Overall it looks good, just few small things here and there.

juippis · 2020-05-07T11:22:15Z

acct-group/motion/metadata.xml

+<pkgmetadata>
+    <maintainer type="project">
+        <email>media-video@gentoo.org</email>
+    </maintainer>


You can't add them here without their consent. Did you ask? If not, put yourself and proxy-maint project here.
https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers/User_Guide#Proxied_maintainer_in_metadata.xml

No, have not asked them; I assumed because they are the maintainer of media-video/motion that they'd also maintain the uid/gid. I will change the maintainer to me and the proxy maint group.

juippis · 2020-05-07T11:22:45Z

acct-user/motion/motion-0.ebuild

+
+DESCRIPTION="added by portage for motion, a software motion detector"
+ACCT_USER_ID=395
+ACCT_USER_HOME=/var/lib/motion


Is this actually needed? Please refer to
http://michael.orlitzky.com/articles/gentoo_glep81_user_package_guidelines.xhtml#the-home-directory

The reason for a home dir is that motion writes it's output files in the current working directory (or the directory defined in it's config file). Looking at Michael Orlizky's article I should create the home dir from the motion-video/motion ebuild though, not assume it'll be created by acct-user/motion ebuild.

juippis · 2020-05-07T11:23:14Z

media-video/motion/files/motion.confd-r4

+#MOTION_USER="motion"
+#MOTION_GROUP="motion"


Why is everything commented in this file? Looks ok to me.

All the comments are just documentation, showing default values.

juippis · 2020-05-07T11:23:48Z

media-video/motion/files/motion.initd-r4

@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation


2020 and switch Foundation to Authors.

Ok, will do

juippis · 2020-05-07T11:24:45Z

media-video/motion/files/motion.service

 Group=video

 #RuntimeDirectory=motion
 #RuntimeDirectoryMode=0750

-WorkingDirectory=/var/lib/motion
+#WorkingDirectory=/var/lib/motion


Why comment? Just remove if it's not needed.

I should actually make a separate r4 version and leave the original as is for motion-4.1.1. That way existing 4.1.1 won't be bothered with any changes and 4.1.1 can be deprecated over time. The new version can set the uid/gid and the working dir properly.

juippis · 2020-05-07T11:25:05Z

media-video/motion/motion-4.3.1.ebuild

+EAPI=7
+inherit autotools readme.gentoo-r1 systemd


One empty line below EAPI please.

juippis · 2020-05-07T11:25:21Z

media-video/motion/motion-4.3.1.ebuild

+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"


Not sure what you want me to do with this...

juippis · 2020-05-07T11:26:34Z

media-video/motion/motion-4.3.1.ebuild

+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)


libav has been removed from ::gentoo tree.

Ok, I'll change it to ffmpeg? ( media-video/ffmpeg:0= )

juippis · 2020-05-07T11:33:22Z

media-video/motion/motion-4.3.1.ebuild

+	( use mysql || use mariadb ) || sed -i -e "/use mysql/d"  "${D}/etc/init.d/motion"
+	use postgres || sed -i -e "/use postgresql/d"  "${D}/etc/init.d/motion"
+	( use mysql || use mariadb || use postgres ) || sed -i -e "/depend/{N;N;d;}" "${D}/etc/init.d/motion"


What if you did this / constructed the init.d file before calling newinitd?

That might work too: I would change "${D}/etc/init.d/motion" to "${FILESDIR}"/${PN}.confd-r4" in these three lines.

Why would that be better?

Because this is hard to make sense at. And all external commands need to die (sed). So you'll have to open this into if ... then;

You can use something like https://github.com/gentoo/gentoo/blob/master/mail-client/thunderbird-bin/thunderbird-bin-68.8.0.ebuild#L151 with newinitd.

juippis · 2020-05-07T11:34:05Z

media-video/motion/motion-4.3.1.ebuild

+	use supervise-daemon && echo "supervisor=\"supervise-daemon\"" >> "${D}/etc/init.d/motion"
+	use supervise-daemon || echo "pidfile=\"/run/\${RC_SVCNAME}.pid\"" >> "${D}/etc/init.d/motion"
+	use supervise-daemon || echo "command_background=true" >> "${D}/etc/init.d/motion"


This is doable with a single echo. Although I'd say to construct this file with newinitd.

I tried doing with a single echo, using echo -e, and adding a \n for the newline but that added unwanted spaces. An alternative would be using a heredoc, but that won't be shorter nor easier to read, I think.

Not sure how to construct a file using newinitd, other then have a separate initd file for this, which would make us maintain more files.

gentoo-repo-qa-bot · 2020-05-11T17:50:52Z

Pull request CI report

Report generated at: 2020-05-11 17:50 UTC
Newest commit scanned: fb2d6ba
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/4e78e22419/output.html

hfernh · 2020-05-11T18:52:19Z

I think I resolved all issues. However the bot checked only the last commit. When @juippis wrote:

You need to split this into 3 commits. One for acct-user, one for acct-group and one for media-video/motion.

Di you mean three pull separate pull requests?

juippis · 2020-05-12T14:46:59Z

Di you mean three pull separate pull requests?

No, it looks good now. 3 commits 1 PR.

Summary of changes: - support new version 4.3.1 - EAPI6 to EAPI7 - GLEP81 support: user and group management via dedicated packages - untangled support for mariadb and mysql - remove libav - confd support for commandline options, umask and work dir - initd checkpre function to check existence of work dir and log dir - support for OpenRC's supervise-daemon via a local use flag - added myself as proxy-maintainer Closes: https://bugs.gentoo.org/665930 Closes: https://bugs.gentoo.org/673410 Closes: https://bugs.gentoo.org/717312 Signed-off-by: Johannes Willem Fernhout <hfern@fernhout.info>

New group for media-video/motion, gid 395. See also gentoo/api-gentoo-org#272. Signed-off-by: Johannes Willem Fernhout <hfern@fernhout.info>

New user for media-video/motion, uid 395. See also gentoo/api-gentoo-org#272. Signed-off-by: Johannes Willem Fernhout <hfern@fernhout.info>

hfernh · 2020-05-15T16:21:21Z

I have changed the editing of the initd file by creating just one multi line string with additions (depend function, supervise-daemon/ssd stuff) that should be added. Since I get permission errors when I try to update the source file (file/motion-initd-r4) I now copy it first to a temp file, then add the string, then install the initd file.

gentoo-repo-qa-bot · 2020-05-15T16:51:00Z

Pull request CI report

Report generated at: 2020-05-15 16:51 UTC
Newest commit scanned: a1c6847
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/c61020b4e8/output.html

hfernh · 2020-05-23T21:18:51Z

Please let me know if there is anything else that needs to be done to get this merged. Thanks.

hfernh · 2020-06-01T09:07:28Z

@juippis Please let me know if there is anything else that needs to be done to get this merged. Thanks.

juippis

Hey,

sorry for ignoring this so long. I'm preparing for a law case which takes all my energy.

So the init.d construction is not what I had in mind but I guess it works. However this needs to be fixed before merging:

 * The ebuild is installing to one or more unexpected paths:
 * 
 *   /usr/local
 * 
 * Please fix the ebuild to use correct FHS/Gentoo policy paths.

 >: equery f motion | grep /local/
/usr/local/bin
/usr/local/bin/motion
/usr/local/etc
/usr/local/etc/motion
/usr/local/etc/motion/camera1-dist.conf
/usr/local/etc/motion/camera2-dist.conf
/usr/local/etc/motion/camera3-dist.conf
/usr/local/etc/motion/camera4-dist.conf
/usr/local/etc/motion/motion-dist.conf
/usr/local/share
/usr/local/share/locale
/usr/local/share/locale/fi
/usr/local/share/locale/fi/LC_MESSAGES
/usr/local/share/locale/fi/LC_MESSAGES/motion.mo
/usr/local/share/locale/sv
/usr/local/share/locale/sv/LC_MESSAGES
/usr/local/share/locale/sv/LC_MESSAGES/motion.mo
/usr/local/share/man
/usr/local/share/man/man1
/usr/local/share/man/man1/motion.1

We don't install anything to /usr/local through portage.

juippis · 2020-06-02T11:42:12Z

media-video/motion/motion-4.3.1.ebuild

+	# }
+	#
+	# supervisor=supervise-daemon"
+	local INITDADJ=""


Also while at it, please make a local variable smallcase. We distinct them from global variables this way. Global variables cannot be changed inside a phase while local can.

It is weird that is shows installing in /usr/local on your machine. I see this:

$ equery f motion

Searching for motion ...

Contents of media-video/motion-4.3.1:
/etc
/etc/conf.d
/etc/conf.d/motion
/etc/init.d
/etc/init.d/motion
/etc/motion
/etc/motion/camera1-dist.conf
/etc/motion/camera2-dist.conf
/etc/motion/camera3-dist.conf
/etc/motion/camera4-dist.conf
/etc/motion/motion-dist.conf
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/motion.service
/usr
/usr/bin
/usr/bin/motion
/usr/share
/usr/share/doc
/usr/share/doc/motion-4.3.1
/usr/share/doc/motion-4.3.1/COPYING.bz2
/usr/share/doc/motion-4.3.1/CREDITS.bz2
/usr/share/doc/motion-4.3.1/README.gentoo.bz2
/usr/share/doc/motion-4.3.1/mask1.png
/usr/share/doc/motion-4.3.1/motion_build.html
/usr/share/doc/motion-4.3.1/motion_config.html
/usr/share/doc/motion-4.3.1/motion_guide.html
/usr/share/doc/motion-4.3.1/motion_stylesheet.css
/usr/share/doc/motion-4.3.1/normal.jpg
/usr/share/doc/motion-4.3.1/outputmotion1.jpg
/usr/share/doc/motion-4.3.1/outputnormal1.jpg
/usr/share/locale
/usr/share/locale/de
/usr/share/locale/de/LC_MESSAGES
/usr/share/locale/de/LC_MESSAGES/motion.mo
/usr/share/locale/nl
/usr/share/locale/nl/LC_MESSAGES
/usr/share/locale/nl/LC_MESSAGES/motion.mo
/usr/share/man
/usr/share/man/man1
/usr/share/man/man1/motion.1.bz2

Happens with FEATURES="test".

juippis

I'll file a bug about that test failure, and restrict them for now. Thanks and sorry it took this long!

juippis · 2020-06-04T06:54:46Z

media-video/motion/motion-4.3.1.ebuild

+	# }
+	#
+	# supervisor=supervise-daemon"
+	local INITDADJ=""


Happens with FEATURES="test".

hfernh · 2020-06-04T07:02:03Z

Thanks for taking the effort to check. I'll lowercase local INITDADJ and send that PR later today. Please also look at gentoo/api-gentoo-org#272 , which has the UID/GID for motion. Thanks.

juippis · 2020-06-04T07:17:23Z

58c1002

gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Apr 25, 2020

vilhelmgray mentioned this pull request Apr 25, 2020

media-video/motion: Remove virtual/mysql dependency #10020

Closed

vilhelmgray suggested changes Apr 25, 2020

View reviewed changes

hfernh mentioned this pull request Apr 26, 2020

uid-git.txt: reserve 395 UID+GID for media-video/motion user gentoo/api-gentoo-org#272

Closed

hfernh changed the title ~~media_video/motion: version bump to 4.3.1~~ media_video/motion: version bump to 4.3.1 [please reassign] May 4, 2020

gentoo-bot changed the title ~~media_video/motion: version bump to 4.3.1 [please reassign]~~ media_video/motion: version bump to 4.3.1 May 4, 2020

hfernh force-pushed the media_video/motion-4.3.1-version-bump branch 2 times, most recently from d93c61f to 89aa84f Compare May 4, 2020 12:27

hfernh changed the title ~~media_video/motion: version bump to 4.3.1~~ media_video/motion: version bump to 4.3.1 [please reassign] May 4, 2020

gentoo-bot changed the title ~~media_video/motion: version bump to 4.3.1 [please reassign]~~ media_video/motion: version bump to 4.3.1 May 4, 2020

juippis reviewed May 7, 2020

View reviewed changes

hfernh force-pushed the media_video/motion-4.3.1-version-bump branch from 70947f7 to fb2d6ba Compare May 11, 2020 17:03

hfernh added 3 commits May 15, 2020 18:09

acct-group/motion: new GLEP-81 package

5884231

New group for media-video/motion, gid 395. See also gentoo/api-gentoo-org#272. Signed-off-by: Johannes Willem Fernhout <hfern@fernhout.info>

acct-user/motion: new GLEP-81 package

a1c6847

New user for media-video/motion, uid 395. See also gentoo/api-gentoo-org#272. Signed-off-by: Johannes Willem Fernhout <hfern@fernhout.info>

hfernh force-pushed the media_video/motion-4.3.1-version-bump branch from fb2d6ba to a1c6847 Compare May 15, 2020 16:15

hfernh changed the title ~~media_video/motion: version bump to 4.3.1~~ media-video/motion: version bump to 4.3.1 May 15, 2020

juippis reviewed Jun 2, 2020

View reviewed changes

juippis approved these changes Jun 4, 2020

View reviewed changes

media-video/motion/motion-4.3.1.ebuild

# }

#

# supervisor=supervise-daemon"

local INITDADJ=""

Copy link

Member

juippis Jun 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happens with FEATURES="test".

juippis closed this Jun 4, 2020

hfernh deleted the media_video/motion-4.3.1-version-bump branch November 2, 2020 18:01

		@@ -0,0 +1,16 @@
		#!/sbin/openrc-run
		# Copyright 1999-2017 Gentoo Foundation

		#MOTION_USER="motion"
		#MOTION_GROUP="motion"

media-video/motion: version bump to 4.3.1 #15513

media-video/motion: version bump to 4.3.1 #15513

Conversation

hfernh commented Apr 25, 2020 • edited

hfernh commented Apr 25, 2020

vilhelmgray left a comment

Choose a reason for hiding this comment

vilhelmgray commented Apr 25, 2020 • edited

vilhelmgray commented Apr 25, 2020 • edited

hfernh commented Apr 26, 2020 • edited

vilhelmgray commented May 3, 2020 • edited

gentoo-repo-qa-bot commented May 3, 2020

Pull request CI report

hfernh commented May 5, 2020

hfernh commented May 5, 2020

gentoo-repo-qa-bot commented May 6, 2020

Pull request CI report

juippis left a 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

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

hfernh May 7, 2020 • 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

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented May 11, 2020

Pull request CI report

hfernh commented May 11, 2020 • edited

juippis commented May 12, 2020

hfernh commented May 15, 2020

gentoo-repo-qa-bot commented May 15, 2020

Pull request CI report

hfernh commented May 23, 2020

hfernh commented Jun 1, 2020

juippis 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

juippis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hfernh commented Jun 4, 2020

juippis commented Jun 4, 2020

hfernh commented Apr 25, 2020 •

edited

vilhelmgray commented Apr 25, 2020 •

edited

vilhelmgray commented Apr 25, 2020 •

edited

hfernh commented Apr 26, 2020 •

edited

vilhelmgray commented May 3, 2020 •

edited

hfernh May 7, 2020 •

edited

hfernh commented May 11, 2020 •

edited

juippis left a comment •

edited