net-mgmt/librenms: Add a second DISTFILES entry, for the vendor directory, not included byupstream code.

[dvl]

Summary

The latest librenms releases expect PHP composer to be run. That is difficult to do at package build time, but we might be able to do it. In the meantime, I have resorted to manually creating the expected tarball.

Test Plan

The maintainer needs to run the commands on each release and then
upload the resulting vendor directory tarball:

git clone [e-mail]:librenms/librenms.git

avoid php warnings/errors

in /usr/local/etc/php.ini set:
date.timezone = "UTC"

install required packages

pkg install php56-mysqli php56-session php56-gd php56-tokenizer php56-xmlwriter php56-curl php56-xml php56-pdo

get the upstream code

git clone [e-mail]:librenms/librenms.git

select the release we are buliding

cd librenms
git checkout tags/1.42.01

use composer to build the vendor directory

./scripts/composer_wrapper.php install --no-dev

create the tarball

mv vendor librenms-vendor-1.42.01
tar -czf librenms-vendor-1.42.01.tar.gz librenms-vendor-1.42.01

copy it to where it can be fetched:

scp librenms-vendor-1.42.01.tar.gz freefall:~/public_distfiles/

[dvl]

net-mgmt/librenms/Makefile

14

I have no idea if this is the correct way to specify additional MASTER_SITES and DISTFILES

It is working, but I suspect there is a better way.

193

The upstream vendor code expects to write to this location, hence the +w

I don't like it. I would prefer the code did not do this, but there is no known configuration change which will affect this.

net-mgmt/librenms/files/pkg-message.in

33

This is something I wish we could do for the user, but it is site-specific and generates a key for the app.

[mat]

net-mgmt/librenms/Makefile

14

It is not, as make fetch-urlall-list will show you. Read 5.4.9. Multiple Distribution or Patches Files from Multiple Locations

[dvl]

Do multiple MASTER_SITES

[dvl]

net-mgmt/librenms/Makefile

14

Ahh, I did not see that when searching. merci.

$ make fetch-urlall-list
http://distcache.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
http://distcache.us-east.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
http://distcache.eu.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
http://distcache.us-west.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
http://distcache.FreeBSD.org/ports-distfiles/librenms-vendor-1.42.01.tar.gz
https://codeload.github.com/librenms/librenms/tar.gz/1.42.01?dummy=/librenms-librenms-1.42.01_GH0.tar.gz
http://distcache.FreeBSD.org/ports-distfiles/librenms-librenms-1.42.01_GH0.tar.gz
https://codeload.github.com/librenms/librenms/tar.gz/1.42.01?dummy=/librenms-librenms-1.42.01_GH0.tar.gz
http://distcache.FreeBSD.org/ports-distfiles/librenms-librenms-1.42.01_GH0.tar.gz

15

I am going to change this to use PORTVERSION etc.

16

Is this an appropriate way to name the vendor distfile?

[dvl]

Use variables for DISTFILES

[mat]

net-mgmt/librenms/Makefile

13–16

Remove all the :librenms stuff, it's already added, correctly, by USE_GITHUB.

[dvl]

Add .env.example & patch it for simple use
Patch includes/common.php so the about has a valid version and date
Remove :librenms from DISTFILES and MASTER_SITES because GH fixes that.

[dvl]

Patch for installing from packages vs git

[dvl]

Not sure what changed this time.

[dvl]

Add UPDATING entry

[dvl]

Not sure

[mat]

net-mgmt/librenms/Makefile

14

You should probably use ports-mgmt/distilator to check things instead of relying on eyes and fetch-urlall-list :-)

21–24

Wrong place in the Makefile. See Chapter 15. Order of Variables in Port Makefiles.

[dvl]

Fix up USES
rearange Makefile according to proper order

[dvl]

Ready to commit now, after removing PORTREVISION

net-mgmt/librenms/Makefile

9

This is for net-mgmt/librenms/files/patch-includes_common.php

The code expects a timestamp value.

10

This must be removed before the commit.

13–16

Yes, I noticed this:

===>  Extracting for librenms-1.42.01_5,1
=> SHA256 Checksum OK for librenms-vendor-1.42.01.tar.gz.
=> SHA256 Checksum OK for librenms-librenms-1.42.01_GH0.tar.gz.
=> SHA256 Checksum OK for librenms-librenms-1.42.01_GH0.tar.gz.

14

This is a nice tool. Thank you.

$ distilator . 
301 [WWW]	http://www.librenms.org -> https://www.librenms.org/
200 [DISTFILE]	http://distcache.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
200 [DISTFILE]	http://distcache.eu.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
200 [DISTFILE]	https://codeload.github.com/librenms/librenms/tar.gz/1.42.01?dummy=/librenms-librenms-1.42.01_GH0.tar.gz
200 [DISTFILE]	http://distcache.us-west.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz
200 [DISTFILE]	http://distcache.us-east.FreeBSD.org/local-distfiles/dvl/librenms-vendor-1.42.01.tar.gz

21–24

I moved a whole bunch of stuff around.

net-mgmt/librenms/files/patch-config.php.default

7

This patch tells the code that we were installed from a package, not from git.

net-mgmt/librenms/files/patch-includes_common.php

12

The code assumes we have installed via git clone. This new code will ensure the /about/ page will populate.

25

It is valid to have git installed but be installed from a package.

net-mgmt/librenms/files/pkg-message.in

58

Ahh yes, this needs to be added to your configuration file. I think I will also create an UPDATING entry.

[mat]

net-mgmt/librenms/Makefile

23

Wrong place in the Makefile. See Chapter 15. Order of Variables in Port Makefiles.

25

Why +=?

net-mgmt/librenms/files/pkg-message.in

2

%%LOCALBASE%%/etc/mysql/my.cnf.

[dvl]

net-mgmt/librenms/Makefile

23

Oh, it goes after USES and USE

25

I don't know.