From ba4f7cb05fd473d233206e360fe8b2e62b27796d Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sat, 21 May 2016 13:34:41 +0000 Subject: submit merge request --- doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn (limited to 'doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn') diff --git a/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn b/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn new file mode 100644 index 00000000..3156fdb4 --- /dev/null +++ b/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn @@ -0,0 +1,18 @@ +Please consider merging branch `sbuild` of repository `https://git.spwhitton.name/propellor`. + +This branch adds the following features: + +- A new module `Propellor.Property.Sbuild` with properties for configuring sbuild schroots +- A new module `Propellor.Property.Schroot` with a property supporting those in `Propellor.Property.Sbuild` +- A new module `Propellor.Property.Ccache` with a property supporting those in `Propellor.Property.Sbuild` +- An export of `extractSuite` from `Propellor.Property.Debootstrap`, used in `Propellor.Property.Sbuild` +- Two new types of iptables matching rules in `Propellor.Property.Firewall`. + +The additions to `Propellor.Property.Firewall` were made to support `Sbuild.blockNetwork`, which is a hack from the Debian Wiki which doesn't seem to work with the latest version of sbuild. I left the additions to `Propellor.Property.Firewall` in my branch since they are probably independently useful. I left the `blockNetwork` property commented-out in `Sbuild.hs` in case I or someone else can make it work at a later date. + +I get the following strange warning from GHC thanks to my new export from `Propellor.Property.Debootstrap`. I can't figure out the problem and would be grateful for help. + + src/Propellor/Property/Debootstrap.hs:8:9: Warning: + `extractSuite' is exported by `extractSuite' and `extractSuite' + +--spwhitton -- cgit v1.2.3 From 864d47361ba34d851a9bbb34a6242854c042e556 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 May 2016 11:23:25 -0400 Subject: Modules added for Sbuild and Ccache. Thanks, Sean Whitton --- debian/changelog | 7 +++++++ doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn | 2 ++ 2 files changed, 9 insertions(+) (limited to 'doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn') diff --git a/debian/changelog b/debian/changelog index 261989c2..02bf0d1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (3.0.5) UNRELEASED; urgency=medium + + * Modules added for Sbuild and Ccache. + Thanks, Sean Whitton + + -- Joey Hess Mon, 23 May 2016 11:19:28 -0400 + propellor (3.0.4) unstable; urgency=medium * Run letsencrypt with --noninteractive. diff --git a/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn b/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn index 3156fdb4..96c08d53 100644 --- a/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn +++ b/doc/todo/merge_request:_Propellor.Property.Sbuild.mdwn @@ -16,3 +16,5 @@ I get the following strange warning from GHC thanks to my new export from `Prope `extractSuite' is exported by `extractSuite' and `extractSuite' --spwhitton + +> [[merged|done]]; thank you! --[[Joey]] -- cgit v1.2.3