From 43739e72f2f0f4af391280dc29a4b43ac0a8ab09 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 1/10] schema upgrade script


---

diff --git a/docs/schema-upgrade-1.11-1.12.sql b/docs/schema-upgrade-1.11-1.12.sql
new file mode 100644
index 0000000..10bcaf5
--- /dev/null
+++ b/docs/schema-upgrade-1.11-1.12.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+-- from schema-update-dist-repos.sql
+
+INSERT INTO permissions (name) VALUES ('image');
+
+ALTER TABLE repo ADD COLUMN dist BOOLEAN DEFAULT 'false';
+
+COMMIT;

From 5a608101ff5cdf29c7892c87ef3a0da7145698f7 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 2/10] initial 1.12 migration doc


---

diff --git a/docs/source/migrating_to_1.12.rst b/docs/source/migrating_to_1.12.rst
new file mode 100644
index 0000000..f01e0a8
--- /dev/null
+++ b/docs/source/migrating_to_1.12.rst
@@ -0,0 +1,76 @@
+Migrating to Koji 1.12
+======================
+
+..
+  reStructured Text formatted
+
+The 1.11 release of Koji includes a several changes that you should consider when
+migrating.
+
+DB Updates
+----------
+
+There is a minor update to support the dist-repos feature:
+    * The ``repo`` table now has a ``dist`` column
+
+Additionally, the schema explicitly adds the ``image`` permission to the
+permissions table, correcting an old oversight.
+
+As in previous releases, we provide a migration script that updates the
+database.
+
+::
+
+    # psql koji koji  </usr/share/doc/koji-1.12.0/docs/schema-upgrade-1.11-1.12.sql
+
+
+Command line changes
+--------------------
+
+The ``import-sig`` command now now supports a ``--write`` option to immediately
+write out a signed copy.
+
+The ``write-signed-rpm`` command previously (and confusingly) only accepted
+nvrs as arguments (i.e. builds not rpms). Now it accepts either nvras or nvrs
+(rpms or builds).
+
+The ``clone-tag`` command has been refactored. It supports many more options
+and should execute much faster than before.
+
+The new ``dist-repo`` command creates rpm repos suitable for distribution.
+
+The new ``save-failed-tree`` command allows the a task owner (or admin)
+to download information from the buildroot of a failed build. This feature
+requires the ``save_failed_tree`` plugin to be enabled on the hub and buidlers.
+
+
+Configuration
+-------------
+
+The only configuration changes are for the ``save-failed-tree`` plugins (hub
+and builder). Each has its own configuration file. See :doc:`plugins`
+
+The hub accepts a new ``CheckClientIP`` option (default True) to indicate
+whether authentication credentials should be tied to the client's IP address.
+(For some proxy setups, this may need to be set to False).
+
+RPC API Changes
+---------------
+
+New rpc calls:
+    * ``listPackagesSimple`` : handles a limited subset of the
+    functionality provided by the ``listPackages`` call
+    * ``distRepo`` : triggers generation of a distribution repo
+
+Changes to calls
+    * repo related calls (e.g. ``repoInfo`` now include a boolean ``dist``
+    field
+    * the ``editTag2`` call can now remove tag_extra data if the
+    ``remove_extra`` keywarg argument is used
+    * the listTaskOutput call supports a new ``all_volumes`` keyword argument.
+    If true, the results are extended to deal with files in same relative paths
+    on different volumes.
+    * the ``getTaskResult`` call takes an optional boolean ``raise_fault``
+    argument
+    * the ``taskWaitResults`` call takes an optional ``canfail`` argument
+    to indicate subtasks which can fail without raising an exception

From cf6701390195413496ea8e319cd2d6d5862a0f23 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 3/10] bump version; add changelog entry


---

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 655c823..3ae5402 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,9 +54,9 @@ copyright = u'2015, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McL
 # built documents.
 #
 # The short X.Y version.
-version = '1.11.0'
+version = '1.12.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.11.0'
+release = '1.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/koji.spec b/koji.spec
index 250c1a2..9012787 100644
--- a/koji.spec
+++ b/koji.spec
@@ -15,7 +15,7 @@
 %define release %{baserelease}
 %endif
 Name: koji
-Version: 1.11.0
+Version: 1.12.0
 Release: %{release}%{?dist}
 License: LGPLv2 and GPLv2+
 # koji.ssl libs (from plague) are GPLv2+
@@ -352,6 +352,79 @@ fi
 %endif
 
 %changelog
+* Thu Mar 30 2017 Mike McLean <mikem at redhat.com> - 1.12.0-1
+- PR#359 Add koji-tools link to docs
+- PR#318 Signed repos, take two [dist repos]
+- PR#200 Saving failed build trees
+- PR#354 more runroot tests
+- PR#232 Allow uploading files to non-default volumes
+- PR#350 cli: clarify some "mismatch" warnings
+- PR#351 cli: check # of args in handle_set_build_volume()
+- PR#358 jenkins configuration update
+- PR#260 Add debug and debug_xmlrpc to default koji config
+- PR#304 unify KeyboardInterrupt behaviour for watch commands
+- PR#341 Some more 2to3 python2.4 safe results
+- PR#345 support removing extra values from tags
+- PR#295 Set compatrequests defaults same as requests
+- PR#348 remove unused function parse_timestamp
+- PR#347 Return datetime objects in iso string format
+- PR#343 Handle empty file upload
+- PR#337 cli: move list-permissions to info category
+- PR#332 remove has_key (not working in python3)
+- PR#336 use alabaster theme for docs
+- PR#333 Fix README link to mash project
+- PR#331 use new exception syntax
+- PR#330 formatting typo
+- PR#226 print statement -> print function
+- PR#319 Added support for CG provided owner
+- PR#324 jenkins' docs
+- PR#326 use multicall for clone tag
+- PR#283 wrap sending email in try except
+- PR#323 Honor excludearch and exclusivearch for noarch builds
+- PR#322 fix encoding when parsing json data on the hub
+- PR#278 mock_output.log not included with logs when importing rpm builds
+- PR#321 hub: enforce strict in get_user()
+- PR#309 Make --can-fail option working for make-image
+- PR#243 add TrustForwardedIP and CheckClientIP for hubs behind proxies
+- PR#307 Fix options.force in import_comps
+- PR#308 fix a syntax error introduced by commit 6f4c576
+- PR#303 check http request status before attempting to decode response
+- PR#317 docs update - krbV configuration
+- PR#310 Fix koji-devel mailing list address
+- PR#311 Add indirectionimage to pull-down menu in webui
+- PR#313 docs typo
+- PR#316 update test requirements docs
+- PR#281 web.conf options for specifying which methods will appear in filter
+- PR#291 Missing --can-fail option for spin-appliance
+- PR#209 add disttag handling to get_next_release
+- PR#262 koji-shadow: allow use without certs
+- PR#297 Fixed minor typo in writing koji code doc
+- PR#289 Don't fail on unimported krbV
+- PR#287 Update content generator metadata documentation
+- PR#223 convert the packages page to use paginateMethod()
+- PR#240 Convert from pygresql to psycopg2
+- PR#239 Allow principal and keytab in cli config
+- PR#263 Error message for missing certificates
+- PR#274 Fix kojiweb error using getfile to download non-text files
+- PR#177 allow tasks to fail on some arches for images/lives/appliances
+- PR#264 unify CLI parsing of multiple architectures
+- PR#265 fix poll_interval ref in list-history cmd
+- PR#272 fix default values for buildroot.container_type
+- PR#242 Make tests compatible with rhel7/centos7
+- PR#267 more direct tag functions for the hub
+- PR#256 update url and source in spec
+- PR#257 Clarify purpose of cfgmap
+- PR#245 Rewrite koji.util.rmtree to avoid forming long paths
+- PR#244 Add krb_rdns to koji-shadow
+- PR#246 Revert "default krb_rdns to True"
+- PR#248 Make koji-gc also work with principal and keytab
+- PR#253 Updated links in docs/code
+- PR#254 Extended clone-tag
+- PR#83 add support for putting scripts just before the closing </body> tag
+- PR#141 Don't hide results in kojiweb
+- PR#225 Also set WSGIApplicationGroup to %{GLOBAL} for the web
+- PR#238 make the tlstimeout class compatible with newer versions of qpid
+
 * Thu Dec  8 2016 Mike McLean <mikem at redhat.com> - 1.11.0-1
 - content generator support
 - generic build type support (btypes)

From d5251eb1aa356fc03186e66f94f10efefe0144a4 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 4/10] migration doc tweaks


---

diff --git a/docs/source/migrating_to_1.12.rst b/docs/source/migrating_to_1.12.rst
index f01e0a8..77d68de 100644
--- a/docs/source/migrating_to_1.12.rst
+++ b/docs/source/migrating_to_1.12.rst
@@ -4,7 +4,7 @@ Migrating to Koji 1.12
 ..
   reStructured Text formatted
 
-The 1.11 release of Koji includes a several changes that you should consider when
+The 1.12 release of Koji includes a several changes that you should consider when
 migrating.
 
 DB Updates
@@ -54,6 +54,7 @@ The hub accepts a new ``CheckClientIP`` option (default True) to indicate
 whether authentication credentials should be tied to the client's IP address.
 (For some proxy setups, this may need to be set to False).
 
+
 RPC API Changes
 ---------------
 

From a04ce42002b6e0db9ed5bcb1baba252d63cc6915 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 5/10] link for 1.12 migration doc


---

diff --git a/docs/source/migrations.rst b/docs/source/migrations.rst
index 7b58c01..31ef53a 100644
--- a/docs/source/migrations.rst
+++ b/docs/source/migrations.rst
@@ -5,6 +5,7 @@ Migrations
 .. toctree::
     :maxdepth: 1
 
+    migrating_to_1.12
     migrating_to_1.11
     migrating_to_1.10
     migrating_to_1.9

From 685cabaca595a0dcac28ac45da81e9552e654c26 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 6/10] more tweaks


---

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3ae5402..e83d380 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -47,7 +47,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Koji'
-copyright = u'2015, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McLeod, Ralph Bean, Adam Miller'
+copyright = u'2017, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McLeod, Ralph Bean, Adam Miller'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/docs/source/migrating_to_1.12.rst b/docs/source/migrating_to_1.12.rst
index 77d68de..a4fc79d 100644
--- a/docs/source/migrating_to_1.12.rst
+++ b/docs/source/migrating_to_1.12.rst
@@ -59,19 +59,23 @@ RPC API Changes
 ---------------
 
 New rpc calls:
-    * ``listPackagesSimple`` : handles a limited subset of the
+
+``listPackagesSimple``
+    handles a limited subset of the
     functionality provided by the ``listPackages`` call
-    * ``distRepo`` : triggers generation of a distribution repo
 
-Changes to calls
+``distRepo``
+    triggers generation of a distribution repo
+
+Changes to calls:
     * repo related calls (e.g. ``repoInfo`` now include a boolean ``dist``
-    field
+      field
     * the ``editTag2`` call can now remove tag_extra data if the
-    ``remove_extra`` keywarg argument is used
+      ``remove_extra`` keywarg argument is used
     * the listTaskOutput call supports a new ``all_volumes`` keyword argument.
-    If true, the results are extended to deal with files in same relative paths
-    on different volumes.
+      If true, the results are extended to deal with files in same relative paths
+      on different volumes.
     * the ``getTaskResult`` call takes an optional boolean ``raise_fault``
-    argument
+      argument
     * the ``taskWaitResults`` call takes an optional ``canfail`` argument
-    to indicate subtasks which can fail without raising an exception
+      to indicate subtasks which can fail without raising an exception

From 14df2fc282d2ef11cca3672f9d0cad254b6a1ce2 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 7/10] use short version for Sphinx version field


---

diff --git a/docs/source/conf.py b/docs/source/conf.py
index e83d380..201a8fb 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -54,7 +54,7 @@ copyright = u'2017, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McL
 # built documents.
 #
 # The short X.Y version.
-version = '1.12.0'
+version = '1.12'
 # The full version, including alpha/beta/rc tags.
 release = '1.12.0'
 

From 73d910c7d69e684bff2cb89f79a0d768e6acf03b Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 8/10] fix path to sql script in migration doc


---

diff --git a/docs/source/migrating_to_1.12.rst b/docs/source/migrating_to_1.12.rst
index a4fc79d..166e54c 100644
--- a/docs/source/migrating_to_1.12.rst
+++ b/docs/source/migrating_to_1.12.rst
@@ -21,7 +21,7 @@ database.
 
 ::
 
-    # psql koji koji  </usr/share/doc/koji-1.12.0/docs/schema-upgrade-1.11-1.12.sql
+    # psql koji koji  </usr/share/doc/koji/docs/schema-upgrade-1.11-1.12.sql
 
 
 Command line changes

From eae45c603067c0798b0736d55b9357a27da1e365 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:56:26 +0000
Subject: [PATCH 9/10] update changelog


---

diff --git a/koji.spec b/koji.spec
index 9012787..c17700e 100644
--- a/koji.spec
+++ b/koji.spec
@@ -352,7 +352,9 @@ fi
 %endif
 
 %changelog
-* Thu Mar 30 2017 Mike McLean <mikem at redhat.com> - 1.12.0-1
+* Thu Apr  6 2017 Mike McLean <mikem at redhat.com> - 1.12.0-1
+- PR#365 handle buildroots with state=None
+- PR#367 play nice with older hubs and new volume options
 - PR#359 Add koji-tools link to docs
 - PR#318 Signed repos, take two [dist repos]
 - PR#200 Saving failed build trees

From 96ca34fd75c7b88165ae41a396132337847752c8 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 18 2017 16:58:55 +0000
Subject: [PATCH 10/10] update changelog


---

diff --git a/koji.spec b/koji.spec
index c17700e..b940619 100644
--- a/koji.spec
+++ b/koji.spec
@@ -352,7 +352,8 @@ fi
 %endif
 
 %changelog
-* Thu Apr  6 2017 Mike McLean <mikem at redhat.com> - 1.12.0-1
+* Tue Apr 18 2017 Mike McLean <mikem at redhat.com> - 1.12.0-1
+- PR#373 backward-compatible try/except
 - PR#365 handle buildroots with state=None
 - PR#367 play nice with older hubs and new volume options
 - PR#359 Add koji-tools link to docs

