summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-24 15:02:29 -0400
committerJoey Hess2016-03-24 15:02:29 -0400
commit51fa88feb1fd3621360c1db5b6b771a798a25a88 (patch)
treebff3f4d8ff052c1b95c7241bed4f4b8c7ef9368d
parent416ae178ec7ed54d5740006a8dc6e1d2e30f00f4 (diff)
parent57431d90b5fb1c16973676bc6b0d32b12c26669b (diff)
Merge branch 'master' into typed-os-requirements
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules2
-rw-r--r--doc/news/version_2.15.1.mdwn11
-rw-r--r--doc/news/version_2.17.0.mdwn30
-rw-r--r--doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swpbin12288 -> 0 bytes
-rw-r--r--doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment15
-rw-r--r--propellor.cabal2
7 files changed, 49 insertions, 15 deletions
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 <id@joeyh.name> Mon, 29 Feb 2016 17:58:08 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 24 Mar 2016 14:53:31 -0400
propellor (2.16.0) unstable; urgency=medium
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
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
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
--- a/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp
+++ /dev/null
Binary files differ
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.
+"""]]
diff --git a/propellor.cabal b/propellor.cabal
index fcad09e5..a631f262 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