Page MenuHomeFreeBSD
Differential D17569

sysutils/s6-rc: Update to 0.4.1.0
ClosedPublic
Actions

Authored by 0mp on Oct 15 2018, 4:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 7:31 AM
Unknown Object (File)
Sat, Feb 22, 7:33 AM
Unknown Object (File)
Feb 21 2025, 4:39 AM
Unknown Object (File)
Feb 6 2025, 2:07 PM
Unknown Object (File)
Dec 16 2024, 5:53 PM
Unknown Object (File)
Dec 3 2024, 3:28 AM
Unknown Object (File)
Dec 1 2024, 12:17 PM
Unknown Object (File)
Dec 1 2024, 5:48 AM
View All Files
Subscribers
crest_bultmann.eu

Details

Reviewers
mat
krion
Commits
rP482961: sysutils/s6-rc: Update to 0.4.1.0
Summary

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232053

While here, set LICENSE_FILE.

Approved by the maintainer.

Changelog: http://git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/plain/NEWS

Test Plan
  • portlint
  • poudriere

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

0mp created this revision.Oct 15 2018, 4:26 PM
Harbormaster completed remote builds in B20216: Diff 49173.Oct 15 2018, 4:26 PM
0mp edited the summary of this revision. (Show Details)Oct 15 2018, 4:30 PM
crest_bultmann.eu added a comment.Oct 15 2018, 4:35 PM

I would just like to state that I'm neither the maintainer of s6-rc nor did the maintainer for s6-rc (moo@arthepsy.eu) set a maintainer approved flag for my patch in PR #232053.

mat added inline comments.Oct 16 2018, 8:43 AM
sysutils/s6-rc/Makefile
10 ↗(On Diff #49173)

As long as you are changing the comment, might as well make it so people actually understand what this is about.

mat accepted this revision.Oct 16 2018, 8:43 AM
This revision is now accepted and ready to land.Oct 16 2018, 8:43 AM
0mp marked 2 inline comments as done.Oct 25 2018, 9:23 AM
0mp added inline comments.
sysutils/s6-rc/Makefile
10 ↗(On Diff #49173)

That's a good suggestion. I am also not 100% happy with the current comments in the s6-* family of ports.

I am not sure what would be a better comment, though.

What do you think, @crest_bultmann.eu?

We might improve it in another revision.

Closed by commit rP482961: sysutils/s6-rc: Update to 0.4.1.0 (authored by 0mp). · Explain WhyOct 25 2018, 9:30 AM
This revision was automatically updated to reflect the committed changes.
0mp marked an inline comment as done.

Revision Contents
Changeset List

PathSize
head/
sysutils/
s6-rc/
5 lines
6 lines
4 lines

Diff 49603

View Options

head/sysutils/s6-rc/Makefile

Show All 23 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _LEGACY_SYS_FCNTL_H_ #ifndef _LEGACY_SYS_FCNTL_H_
#define _LEGACY_SYS_FCNTL_H_ #define _LEGACY_SYS_FCNTL_H_
#include_next <fcntl.h> #include_next <fcntl.h>
/*
* On FreeBSD fcntl.h indirectly brings in cdefs.h. On Linux with musl, it does
* not. Unconditionally inlude it here since there's no harm in including it
* multiple times since we use __BEGIN_DECLS and __END_DECLS from it below.
*/
#include <sys/cdefs.h>
jrtc27Unsubmitted
Not Done
Inline Actions

I was slow to get to reviewing these over the weekend, but this feels like it should be in tools/build/cross-build/include/linux/fcntl.h (which does already exist)

jrtc27: I was slow to get to reviewing these over the weekend, but this feels like it should be in…
impAuthorUnsubmitted
Done
Inline Actions

I thought that at first but landed here due to proximity.

What's your thinking on the way you suggest? What makes that a better place?

imp: I thought that at first but landed here due to proximity. What's your thinking on the way you…
jrtc27Unsubmitted
Not Done
Inline Actions

Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter FreeBSD sources / avoid the ugliness spreading too far, and more clearly signposts why they're there (this looks redundant on FreeBSD, so you'd have to consult git to find out). Not such a big deal in this case compared to a lot of the cross-build hacks as it's just a lone include, but I'd like to keep it principled.

jrtc27: Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter…
jrtc27Unsubmitted
Not Done
Inline Actions

(I mean, the comment addresses the signposting of course, but having it in a directory that says linux in it makes it somewhat self-documenting :))

jrtc27: (I mean, the comment addresses the signposting of course, but having it in a directory that…
impAuthorUnsubmitted
Done
Inline Actions

OK. Moved in https://reviews.freebsd.org/D45373

imp: OK. Moved in https://reviews.freebsd.org/D45373
struct spacectl_range { struct spacectl_range {
off_t r_offset; off_t r_offset;
off_t r_len; off_t r_len;
}; };
#define SPACECTL_DEALLOC 1 #define SPACECTL_DEALLOC 1
#define SPACECTL_F_SUPPORTED 0 #define SPACECTL_F_SUPPORTED 0
__BEGIN_DECLS __BEGIN_DECLS
int fspacectl(int, int, const struct spacectl_range *, int, int fspacectl(int, int, const struct spacectl_range *, int,
struct spacectl_range *); struct spacectl_range *);
__END_DECLS __END_DECLS
#endif /* !_LEGACY_SYS_STAT_H_ */ #endif /* !_LEGACY_SYS_STAT_H_ */
View Options

head/sysutils/s6-rc/distinfo

Show All 23 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _LEGACY_SYS_FCNTL_H_ #ifndef _LEGACY_SYS_FCNTL_H_
#define _LEGACY_SYS_FCNTL_H_ #define _LEGACY_SYS_FCNTL_H_
#include_next <fcntl.h> #include_next <fcntl.h>
/*
* On FreeBSD fcntl.h indirectly brings in cdefs.h. On Linux with musl, it does
* not. Unconditionally inlude it here since there's no harm in including it
* multiple times since we use __BEGIN_DECLS and __END_DECLS from it below.
*/
#include <sys/cdefs.h>
jrtc27Unsubmitted
Not Done
Inline Actions

I was slow to get to reviewing these over the weekend, but this feels like it should be in tools/build/cross-build/include/linux/fcntl.h (which does already exist)

jrtc27: I was slow to get to reviewing these over the weekend, but this feels like it should be in…
impAuthorUnsubmitted
Done
Inline Actions

I thought that at first but landed here due to proximity.

What's your thinking on the way you suggest? What makes that a better place?

imp: I thought that at first but landed here due to proximity. What's your thinking on the way you…
jrtc27Unsubmitted
Not Done
Inline Actions

Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter FreeBSD sources / avoid the ugliness spreading too far, and more clearly signposts why they're there (this looks redundant on FreeBSD, so you'd have to consult git to find out). Not such a big deal in this case compared to a lot of the cross-build hacks as it's just a lone include, but I'd like to keep it principled.

jrtc27: Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter…
jrtc27Unsubmitted
Not Done
Inline Actions

(I mean, the comment addresses the signposting of course, but having it in a directory that says linux in it makes it somewhat self-documenting :))

jrtc27: (I mean, the comment addresses the signposting of course, but having it in a directory that…
impAuthorUnsubmitted
Done
Inline Actions

OK. Moved in https://reviews.freebsd.org/D45373

imp: OK. Moved in https://reviews.freebsd.org/D45373
struct spacectl_range { struct spacectl_range {
off_t r_offset; off_t r_offset;
off_t r_len; off_t r_len;
}; };
#define SPACECTL_DEALLOC 1 #define SPACECTL_DEALLOC 1
#define SPACECTL_F_SUPPORTED 0 #define SPACECTL_F_SUPPORTED 0
__BEGIN_DECLS __BEGIN_DECLS
int fspacectl(int, int, const struct spacectl_range *, int, int fspacectl(int, int, const struct spacectl_range *, int,
struct spacectl_range *); struct spacectl_range *);
__END_DECLS __END_DECLS
#endif /* !_LEGACY_SYS_STAT_H_ */ #endif /* !_LEGACY_SYS_STAT_H_ */
View Options

head/sysutils/s6-rc/pkg-plist

Show All 23 Lines
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _LEGACY_SYS_FCNTL_H_ #ifndef _LEGACY_SYS_FCNTL_H_
#define _LEGACY_SYS_FCNTL_H_ #define _LEGACY_SYS_FCNTL_H_
#include_next <fcntl.h> #include_next <fcntl.h>
/*
* On FreeBSD fcntl.h indirectly brings in cdefs.h. On Linux with musl, it does
* not. Unconditionally inlude it here since there's no harm in including it
* multiple times since we use __BEGIN_DECLS and __END_DECLS from it below.
*/
#include <sys/cdefs.h>
jrtc27Unsubmitted
Not Done
Inline Actions

I was slow to get to reviewing these over the weekend, but this feels like it should be in tools/build/cross-build/include/linux/fcntl.h (which does already exist)

jrtc27: I was slow to get to reviewing these over the weekend, but this feels like it should be in…
impAuthorUnsubmitted
Done
Inline Actions

I thought that at first but landed here due to proximity.

What's your thinking on the way you suggest? What makes that a better place?

imp: I thought that at first but landed here due to proximity. What's your thinking on the way you…
jrtc27Unsubmitted
Not Done
Inline Actions

Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter FreeBSD sources / avoid the ugliness spreading too far, and more clearly signposts why they're there (this looks redundant on FreeBSD, so you'd have to consult git to find out). Not such a big deal in this case compared to a lot of the cross-build hacks as it's just a lone include, but I'd like to keep it principled.

jrtc27: Confines the bits that aren't needed on FreeBSD to somewhere out the way. Helps to declutter…
jrtc27Unsubmitted
Not Done
Inline Actions

(I mean, the comment addresses the signposting of course, but having it in a directory that says linux in it makes it somewhat self-documenting :))

jrtc27: (I mean, the comment addresses the signposting of course, but having it in a directory that…
impAuthorUnsubmitted
Done
Inline Actions

OK. Moved in https://reviews.freebsd.org/D45373

imp: OK. Moved in https://reviews.freebsd.org/D45373
struct spacectl_range { struct spacectl_range {
off_t r_offset; off_t r_offset;
off_t r_len; off_t r_len;
}; };
#define SPACECTL_DEALLOC 1 #define SPACECTL_DEALLOC 1
#define SPACECTL_F_SUPPORTED 0 #define SPACECTL_F_SUPPORTED 0
__BEGIN_DECLS __BEGIN_DECLS
int fspacectl(int, int, const struct spacectl_range *, int, int fspacectl(int, int, const struct spacectl_range *, int,
struct spacectl_range *); struct spacectl_range *);
__END_DECLS __END_DECLS
#endif /* !_LEGACY_SYS_STAT_H_ */ #endif /* !_LEGACY_SYS_STAT_H_ */