diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-13 21:44:46 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-13 21:46:27 +0100 |
| commit | ae7f22768e13f01eb337330332bf18780b8104c0 (patch) | |
| tree | 65fed96a9b3ab9a3a750b338e01d214d1dbaa420 /debian/patches/soname.patch | |
| parent | fef6a04f189f791b9bee9f17797890b12fee495f (diff) | |
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
Diffstat (limited to 'debian/patches/soname.patch')
| -rw-r--r-- | debian/patches/soname.patch | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch index cbdae2a..fb9a11d 100644 --- a/debian/patches/soname.patch +++ b/debian/patches/soname.patch @@ -1,21 +1,28 @@ From: Mark Baker <mark@mnb.org.uk> -Description: Change soname to what debian use -Index: pcre3/configure.ac +Date: Wed, 13 Jul 2016 21:20:13 +0100 +Subject: soname + =================================================================== ---- pcre3.orig/configure.ac 2015-12-22 13:27:15.000000000 +0000 -+++ pcre3/configure.ac 2015-12-22 13:28:37.000000000 +0000 -@@ -17,10 +17,10 @@ +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3cefaf1..6077ad5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,10 +17,10 @@ m4_define(pcre_date, [2016-06-14]) # 50 lines of this file. Please update that if the variables above are moved. # Libtool shared library interface versions (current:revision:age) --m4_define(libpcre_version, [3:6:2]) --m4_define(libpcre16_version, [2:6:2]) --m4_define(libpcre32_version, [0:6:0]) --m4_define(libpcreposix_version, [0:3:0]) -+m4_define(libpcre_version, [16:2:13]) -+m4_define(libpcre16_version, [16:2:13]) -+m4_define(libpcre32_version, [16:2:13]) -+m4_define(libpcreposix_version, [16:2:13]) +-m4_define(libpcre_version, [3:7:2]) +-m4_define(libpcre16_version, [2:7:2]) +-m4_define(libpcre32_version, [0:7:0]) +-m4_define(libpcreposix_version, [0:4:0]) ++m4_define(libpcre_version, [16:3:13]) ++m4_define(libpcre16_version, [16:3:13]) ++m4_define(libpcre32_version, [16:3:13]) ++m4_define(libpcreposix_version, [16:3:13]) m4_define(libpcrecpp_version, [0:1:0]) AC_PREREQ(2.57) |