chiark / gitweb /
Rebase patch queue onto upstream 8.39:
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 13 Jul 2016 20:44:46 +0000 (21:44 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 13 Jul 2016 20:46:27 +0000 (21:46 +0100)
commitae7f22768e13f01eb337330332bf18780b8104c0
tree65fed96a9b3ab9a3a750b338e01d214d1dbaa420
parentfef6a04f189f791b9bee9f17797890b12fee495f
Rebase patch queue onto upstream 8.39:

Adjusted the soname patch
Dropped CVE-2016-1283.patch as it is in upstream

Process:

* Manually unapplied patches with
   for f in `cat debian/patches/series`; do patch -p1 -R <debian/patches/"$f"; done
* gbp pq export
   This generates a patches-unapplied branch

* On a fresh branch (git checkout --orphan, although next time
  use the "Commit upstream" sub-branch)
  tar to extract new orig and git add -Af to import it

* git rebase to rebase the patch queue onto the new upstream

* gbp pq import to get the patch queue into debian/

* dpkg-source --before-build .
  to get a patches-applied branch

* rm -rf .pc; git add -Af and commit
19 files changed:
debian/patches/794589-information-disclosure.patch [deleted file]
debian/patches/CVE-2016-1283.patch [deleted file]
debian/patches/Disable_JIT_on_sparc64.patch
debian/patches/Fix-bad-compilation-for-patterns-like-1-1-with-forwa.patch [deleted file]
debian/patches/Fix-bad-compile-for-groups-like-2-0-1999.patch [deleted file]
debian/patches/Fix-buffer-overflow-for-named-recursive-back-referen.patch [deleted file]
debian/patches/Fix-compile-time-loop-for-recursive-reference-within.patch [deleted file]
debian/patches/Fix-compiler-crash-misbehaviour-for-zero-repeated-gr.patch [deleted file]
debian/patches/Fix-silly-quantifier-size-check.patch [deleted file]
debian/patches/PCRE6_compatible_API.patch
debian/patches/apply-upstream-revision-1631-closes-8159 [deleted file]
debian/patches/cve-2014-8964.patch [deleted file]
debian/patches/fix_find_fixedlength.patch [deleted file]
debian/patches/no_jit_x32_powerpcspe.patch
debian/patches/pcre_info.patch
debian/patches/pcregrep.1-patch
debian/patches/pcreposix.patch
debian/patches/series
debian/patches/soname.patch