From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] openssl: version bump 1.0.1h -> 1.0.1i
Date: Fri, 8 Aug 2014 10:32:25 +0200 [thread overview]
Message-ID: <20140808083225.GN28454@pengutronix.de> (raw)
In-Reply-To: <1407415261-16377-1-git-send-email-bernhard@bwalle.de>
[-- Attachment #1: Type: text/plain, Size: 4897 bytes --]
On Thu, Aug 07, 2014 at 02:41:01PM +0200, Bernhard Walle wrote:
> Fixes CVE-2014-3508.
>
Thanks, applied. I've regenerated the patches (no real changes). I've
attached the script I use for this in case anyone is interested.
Btw, if you run git send-email with '-M' then the patch is smaller and much
better to read.
Michael
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
> patches/openssl-1.0.1h/0001-ca.patch | 31 ----
> patches/openssl-1.0.1h/0002-debian-targets.patch | 80 ---------
> patches/openssl-1.0.1h/0003-engines-path.patch | 92 ----------
> patches/openssl-1.0.1h/0004-no-rpath.patch | 24 ---
> patches/openssl-1.0.1h/0005-no-symbolic.patch | 24 ---
> patches/openssl-1.0.1h/0006-pic.patch | 189 ---------------------
> patches/openssl-1.0.1h/0007-valgrind.patch | 31 ----
> patches/openssl-1.0.1h/0008-rehash-crt.patch | 44 -----
> patches/openssl-1.0.1h/0009-shared-lib-ext.patch | 25 ---
> patches/openssl-1.0.1h/0010-stddef.patch | 23 ---
> patches/openssl-1.0.1h/0011-block_diginotar.patch | 66 -------
> .../0012-block_digicert_malaysia.patch | 30 ----
> .../0013-Change-default-bit-size-and-digest.patch | 131 --------------
> .../openssl-1.0.1h/0014-openssl_fix_for_x32.patch | 50 ------
> patches/openssl-1.0.1h/series | 17 --
> patches/openssl-1.0.1i/0001-ca.patch | 31 ++++
> patches/openssl-1.0.1i/0002-debian-targets.patch | 80 +++++++++
> patches/openssl-1.0.1i/0003-engines-path.patch | 92 ++++++++++
> patches/openssl-1.0.1i/0004-no-rpath.patch | 24 +++
> patches/openssl-1.0.1i/0005-no-symbolic.patch | 24 +++
> patches/openssl-1.0.1i/0006-pic.patch | 189 +++++++++++++++++++++
> patches/openssl-1.0.1i/0007-valgrind.patch | 31 ++++
> patches/openssl-1.0.1i/0008-rehash-crt.patch | 44 +++++
> patches/openssl-1.0.1i/0009-shared-lib-ext.patch | 25 +++
> patches/openssl-1.0.1i/0010-stddef.patch | 23 +++
> patches/openssl-1.0.1i/0011-block_diginotar.patch | 66 +++++++
> .../0012-block_digicert_malaysia.patch | 30 ++++
> .../0013-Change-default-bit-size-and-digest.patch | 131 ++++++++++++++
> .../openssl-1.0.1i/0014-openssl_fix_for_x32.patch | 50 ++++++
> patches/openssl-1.0.1i/series | 17 ++
> rules/openssl.make | 4 +-
> 31 files changed, 859 insertions(+), 859 deletions(-)
> delete mode 100644 patches/openssl-1.0.1h/0001-ca.patch
> delete mode 100644 patches/openssl-1.0.1h/0002-debian-targets.patch
> delete mode 100644 patches/openssl-1.0.1h/0003-engines-path.patch
> delete mode 100644 patches/openssl-1.0.1h/0004-no-rpath.patch
> delete mode 100644 patches/openssl-1.0.1h/0005-no-symbolic.patch
> delete mode 100644 patches/openssl-1.0.1h/0006-pic.patch
> delete mode 100644 patches/openssl-1.0.1h/0007-valgrind.patch
> delete mode 100644 patches/openssl-1.0.1h/0008-rehash-crt.patch
> delete mode 100644 patches/openssl-1.0.1h/0009-shared-lib-ext.patch
> delete mode 100644 patches/openssl-1.0.1h/0010-stddef.patch
> delete mode 100644 patches/openssl-1.0.1h/0011-block_diginotar.patch
> delete mode 100644 patches/openssl-1.0.1h/0012-block_digicert_malaysia.patch
> delete mode 100644 patches/openssl-1.0.1h/0013-Change-default-bit-size-and-digest.patch
> delete mode 100644 patches/openssl-1.0.1h/0014-openssl_fix_for_x32.patch
> delete mode 100644 patches/openssl-1.0.1h/series
> create mode 100644 patches/openssl-1.0.1i/0001-ca.patch
> create mode 100644 patches/openssl-1.0.1i/0002-debian-targets.patch
> create mode 100644 patches/openssl-1.0.1i/0003-engines-path.patch
> create mode 100644 patches/openssl-1.0.1i/0004-no-rpath.patch
> create mode 100644 patches/openssl-1.0.1i/0005-no-symbolic.patch
> create mode 100644 patches/openssl-1.0.1i/0006-pic.patch
> create mode 100644 patches/openssl-1.0.1i/0007-valgrind.patch
> create mode 100644 patches/openssl-1.0.1i/0008-rehash-crt.patch
> create mode 100644 patches/openssl-1.0.1i/0009-shared-lib-ext.patch
> create mode 100644 patches/openssl-1.0.1i/0010-stddef.patch
> create mode 100644 patches/openssl-1.0.1i/0011-block_diginotar.patch
> create mode 100644 patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch
> create mode 100644 patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch
> create mode 100644 patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch
> create mode 100644 patches/openssl-1.0.1i/series
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: openssl-apply-debian --]
[-- Type: text/plain, Size: 1230 bytes --]
#!/bin/bash
set -e
set -x
blacklist="
config-hurd.patch
man-dir.patch
man-section.patch
rehash_pod.patch
version-script.patch
gnu_source.patch
c_rehash-compat.patch
dgst_hmac.patch
fix-pod-errors.patch
"
start="$(pwd)"
src="$(pwd)/$1"
deb="$(pwd)/$2"
tmp="$(mktemp -d)"
cd "$tmp"
tar xf "$src"
openssl="$(ls -d openssl-*)"
tar xf "$deb"
patches=debian/patches
for patch in $blacklist; do
sed -i "s/\(${patch}\)/#\1/" ${patches}/series
done
cd "$openssl"
git init
git add *
git commit -m "base"
git tag base
git quiltimport --patches=../$patches/ --author "Michael Olbrich <m.olbrich@pengutronix.de>"
git filter-branch --msg-filter "cat | grep -v '^==*$' && echo '\nImported from $(basename $deb)\n\nSigned-off-by: Michael Olbrich <m.olbrich@pengutronix.de>'" base...master
#for patch in $(cat ../$patches/series | grep -v '^#'); do
# patch=../$patches/$patch
# name=$(basename $patch)
# name=${name%.patch}
# git apply $patch
# git add *
# git commit -m "debian $name
#
#Applied $(basename $patch) from $(basename $deb)" -a -s
#done
git format-patch --no-signature -N base
mkdir "$start/$openssl"
mv 0*.patch "$start/$openssl/"
cd "$start"
rm -rf "$tmp"
cd "$start/$openssl/"
sed -i 1d 0*.patch
ls 0*.patch > series
[-- Attachment #3: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2014-08-08 8:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-07 12:41 Bernhard Walle
2014-08-08 8:32 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140808083225.GN28454@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox