From 20cc6f7378ace91306fb21283b48d186b6c9f9af Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Mar 2016 13:36:49 -0400 Subject: tyought --- .../comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment diff --git a/doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment b/doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment new file mode 100644 index 00000000..f4c6a8a7 --- /dev/null +++ b/doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 10""" + date="2016-03-20T17:29:48Z" + content=""" +The list of child properties is a problem, because it would need to be +`[Property proptypes]` and the proptypes will vary, so heterogenious list. + +The proptypes of the child properties needs to influence the proptypes of +the parent anyway. Take intersection of the parent's targets and its +children's targets, plus both's non-target types. + +So, could calculate that proptypes, and use it as the type of both the +parent property, and each child property in the list. +"""]] -- cgit v1.2.3 From 4d7b7d8bde122a9f75422d2ea3e14608d6b41d17 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 14:54:50 -0400 Subject: prep release --- debian/changelog | 4 ++-- ...ment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp | Bin 12288 -> 0 bytes 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp diff --git a/debian/changelog b/debian/changelog index b3f19cbb..2c2b2ea7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (2.17.0) UNRELEASED; urgency=medium +propellor (2.17.0) unstable; urgency=medium * Added initial support for FreeBSD. Thanks, Evan Cofsky. @@ -29,7 +29,7 @@ propellor (2.17.0) UNRELEASED; urgency=medium * Tor.named: Fix bug that sometimes caused the property to fail the first time, though retrying succeeded. - -- Joey Hess Mon, 29 Feb 2016 17:58:08 -0400 + -- Joey Hess Thu, 24 Mar 2016 14:53:31 -0400 propellor (2.16.0) unstable; urgency=medium diff --git a/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp b/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp deleted file mode 100644 index 79380a08..00000000 Binary files a/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp and /dev/null differ -- cgit v1.2.3 From 59a3bcfad908c9f785132a3c4942f79b4cc6ca70 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 14:55:55 -0400 Subject: no longer falsing rules --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c88cc004..a71212db 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ -#!/bin/false +#!/usr/bin/make -f # Avoid using cabal, as it writes to $HOME export CABAL=./Setup -- cgit v1.2.3 From a21bb7787b876999b043314a584d17d058a17142 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 14:56:11 -0400 Subject: setting up joeyconfig after merge --- config.hs | 2 +- privdata/relocate | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index ec313725..97d90636 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -config-simple.hs \ No newline at end of file +joeyconfig.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig -- cgit v1.2.3 From a3a771f0ca82ba709ccfd1e15b10df6070b176ac Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 14:56:20 -0400 Subject: clean up after merge --- config.hs | 2 +- privdata/relocate | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index 97d90636..ec313725 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -joeyconfig.hs \ No newline at end of file +config-simple.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate deleted file mode 100644 index 271692d8..00000000 --- a/privdata/relocate +++ /dev/null @@ -1 +0,0 @@ -.joeyconfig -- cgit v1.2.3 From 57589cd7eb21ec6d46ae9c451b45e51f4fce181f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 14:58:37 -0400 Subject: fix hook name --- propellor.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/propellor.cabal b/propellor.cabal index 7b9b8885..dc322e88 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -19,7 +19,7 @@ Extra-Source-Files: config-freebsd.hs joeyconfig.hs config.hs - contrib/post-checkout-hook + contrib/post-merge-hook debian/changelog debian/README.Debian debian/compat -- cgit v1.2.3 From 57431d90b5fb1c16973676bc6b0d32b12c26669b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Mar 2016 15:01:25 -0400 Subject: add news item for propellor 2.17.0 --- doc/news/version_2.15.1.mdwn | 11 ----------- doc/news/version_2.17.0.mdwn | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 11 deletions(-) delete mode 100644 doc/news/version_2.15.1.mdwn create mode 100644 doc/news/version_2.17.0.mdwn diff --git a/doc/news/version_2.15.1.mdwn b/doc/news/version_2.15.1.mdwn deleted file mode 100644 index ea750b6a..00000000 --- a/doc/news/version_2.15.1.mdwn +++ /dev/null @@ -1,11 +0,0 @@ -propellor 2.15.1 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Added git configs propellor.spin-branch and propellor.forbid-dirty-spin. - Thanks, Sean Whitton. - * Added User.systemAccountFor and User.systemAccountFor' properties. - Thanks, Félix Sipma. - * Gpg.keyImported converted to not use a flag file and instead check - if gpg has the provided key already. - Thanks, Félix Sipma. - * Merged Utility changes from git-annex. - * Clean build with ghc 7.10."""]] \ No newline at end of file diff --git a/doc/news/version_2.17.0.mdwn b/doc/news/version_2.17.0.mdwn new file mode 100644 index 00000000..4149dbab --- /dev/null +++ b/doc/news/version_2.17.0.mdwn @@ -0,0 +1,30 @@ +propellor 2.17.0 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Added initial support for FreeBSD. + Thanks, Evan Cofsky. + * Added Propellor.Property.ZFS. + Thanks, Evan Cofsky. + * Firewall: Reorganized Chain data type. (API change) + Thanks, Félix Sipma. + * Firewall: Separated Table and Target (API change) + Thanks, Félix Sipma. + * Ssh: change type of listenPort from Int to Port (API change) + Thanks, Félix Sipma. + * Firewall: add TCPFlag, Frequency, TCPSyn, ICMPTypeMatch, NatDestination + Thanks, Félix Sipma. + * Network: Filter out characters not allowed in interfaces.d files. + Thanks, Félix Sipma. + * Apt.upgrade: Run dpkg --configure -a first, to recover from + interrupted upgrades. + * Apt: Add safeupgrade. + * Force ssh, scp, and git commands to be run in the foreground. + Should fix intermittent hangs of propellor --spin. + * Avoid repeated re-building on systems such as FreeBSD where building + re-links the binary even when there are no changes. + * Locale.available: Run locale-gen, instead of dpkg-reconfigure locales, + which modified the locale.gen file and sometimes caused the property to + need to make changes every time. + * Speed up propellor's build of itself, by asking cabal to only build + the propellor-config binary and not all the libraries. + * Tor.named: Fix bug that sometimes caused the property to fail the first + time, though retrying succeeded."""]] \ No newline at end of file -- cgit v1.2.3