~jgrimm/ubuntu/+source/moin:merge-zesty-1.9.9-1ubuntu1

Last commit made on 2017-02-03
Get this branch:
git clone -b merge-zesty-1.9.9-1ubuntu1 https://git.launchpad.net/~jgrimm/ubuntu/+source/moin
Only Jon Grimm can upload to this branch. If you are Jon Grimm please log in for upload directions.

Branch merges

Branch information

Name:
merge-zesty-1.9.9-1ubuntu1
Repository:
lp:~jgrimm/ubuntu/+source/moin

Recent commits

694bb86... by Jon Grimm

reconstruct-changelog

0edc9d8... by Jon Grimm

merge-changelogs

df8bcb3... by Jon Grimm

Revert "Lumping 3 together, all will be dropped as fixed in new debian."

Drop patches as already picked up by Debian:
- debian/patches/CVE-2016-7146.patch
- debian/patches/CVE-2016-7148.patch
- debian/patches/CVE-2016-9119.patch

This reverts commit 9989cf15e43eaf245da9bedbd8bcaa7aaefbb62f.

9989cf1... by Jon Grimm

Lumping 3 together, all will be dropped as fixed in new debian.

  * SECURITY UPDATE: XSS in attachment dialogue
    - debian/patches/CVE-2016-7146.patch: properly escape page_name in
      MoinMoin/action/fckdialog.py.
    - CVE-2016-7146
  * SECURITY UPDATE: XSS in AttachFile view
    - debian/patches/CVE-2016-7148.patch: properly escape pagename in
      MoinMoin/action/AttachFile.py.
    - CVE-2016-7148
  * SECURITY UPDATE: XSS in link dialogue
    - debian/patches/CVE-2016-9119.patch: properly escape strings in
      MoinMoin/action/fckdialog.py.
    - CVE-2016-9119

bf2c544... by Jon Grimm

Two logical changes, but both still needed at end, so meh.
- remove python-xml from Suggests field, the package isn't in
  sys.path any more.
- demote fckeditor from Recommends to Suggests; the code was previously
  embedded in moin, but it was also disabled, so there's no reason for us
  to pull this in by default currently. Note: fckeditor has a number of
  security problems and so this change probably needs to be carried
  indefinitely.

8a6a4fa... by Jon Grimm

     - Drop python-mysqldb in favor of python-pymysql.

ada9973... by Steve McIntyre

Import patches-unapplied version 1.9.9-1 to debian/sid

Imported using usd-importer.

Publish parent: 315918e366e1de19a2213925c3c6eb958f475eb3

New changelog entries:
  * New upstream release, lots of bug fixes
  * Includes a few security updates:
    + CVE-2016-9119: XSS in GUI editor's link dialogue
      (Closes: #844338)
    + CVE-2016-7146: XSS in GUI editor's attachment dialogue
      (Closes:#844340)
    + CVE-2016-7148: XSS in AttachFile view (multifile related)
      (Closes: #844341)
  * Apply recommended patch from upstream: fix wrong digestmod of hmac.new
    calls
  * Update patches to fit upstream changes:
    + use_systemwide_libs.patch
    + mail-verification.patch
  * Add patch from Paul Wise to implement an incremental dump process in
    moin dump
  * Fix timestamps to make package build reproducibly. Thanks to Eduard
    Sanou for the patch. Closes: #794014

315918e... by Steve McIntyre

Import patches-unapplied version 1.9.8-1 to debian/sid

Imported using usd-importer.

Publish parent: 7f4a50b27e1f21c7ede5226cdcf9b14d7dc3c31c

New changelog entries:
  * New upstream release, lots of bug fixes
  * Remove patches that are now upstream:
    + avoid_empty_dir_creation.patch
    + subscribercache.patch
  * Update patches to fit upstream changes:
    + disable_gui_editor_if_fckeditor_missing.patch
    + use_systemwide_libs.patch
    + mail-verification.patch
    + external_account_creation_check.patch
  * Update README.Debian; add more info about "moin maint" etc.

7f4a50b... by Steve McIntyre

Import patches-unapplied version 1.9.7-2 to debian/sid

Imported using usd-importer.

Publish parent: b476825382b5398fb0cdeeac79be88cac8b19f4f

New changelog entries:
  * Add source for the minified copy of jquery.js included in the upstream
    source tarball, even though it's never used in the Debian build at all.
    Close: #754783. Mention it in README.source too
  * Minor updates prompted by lintian:
    + Update Standards-Version
    + Switch from "dh_clean -k" to "dh_prep"
    + Minor tweaks to debian/copyright to fix parse errors

b476825... by Steve McIntyre

Import patches-unapplied version 1.9.7-1 to debian/sid

Imported using usd-importer.

Publish parent: 7a901de0d0ad890746f42eb84bc54df357f4aa4e

New changelog entries:
  * New upstream release (x2)
  * Make sure that strings output to the external account creation checker
    are marked as UTF-8.
  * Re-add missing dependencies, fallout from the CDBS switch.
    Closes: #704433
  * Add dependency on python-passlib rather than use the bundled version.
  * Update patches to fit upstream changes:
    + recaptcha.patch
    + subscribercache.patch
    + use_systemwide_libs.patch
    + mail-verification.patch
  * Remove patches that were already from upstream:
    + constant_time_strcmp.patch
    + escape_css_url.patch
    + secure_taintfile_name.patch
    + escape_pagename_in_rss.patch
    + draw-taintfile.patch
    + attachfile-path-traversal.patch
  * Split out the call to external account creation check into a separate
    patch (external_account_creation_check.patch) instead of lumping it in
    with mail-verification.patch
  * Do not create empty pagedir (with empty edit-log). Patch from
    upstream. Closes: #721557