Commit 29e0f2c984063d420e1026f1b4d902e01a9ae6cf - openssl

Changes from unstable. Kurt Roeckx 7 years ago

4 changed file(s) with 43 addition(s) and 37 deletion(s). Raw diff Collapse all Expand all

+20

-0

debian/changelog less more

	0	openssl (1.0.2i-1~bpo8+1) jessie-backports; urgency=medium
	1
	2	* New upstream version
	3	- Fix CVE-2016-2177
	4	- Fix CVE-2016-2178
	5	- Fix CVE-2016-2179
	6	- Fix CVE-2016-2180
	7	- Fix CVE-2016-2181
	8	- Fix CVE-2016-2182
	9	- Fix CVE-2016-2183
	10	- Fix CVE-2016-6302
	11	- Fix CVE-2016-6303
	12	- Fix CVE-2016-6304
	13	- Fix CVE-2016-6306
	14	* Drop ca.patch, option is now documented upstream
	15	* Update engines-path.patch to also update the libcrypto.pc, now that that
	16	has an enginesdir in it.
	17
	18	-- Kurt Roeckx <kurt@roeckx.be> Thu, 22 Sep 2016 21:21:00 +0200
	19
0	20	openssl (1.0.2h-1~bpo8+2) jessie-backports; urgency=medium
1	21
2	22	* move the symbols SRP_VBASE_get1_by_user, SRP_user_pwd_free from

-22

~~debian/patches/ca.patch~~ less more

0		---
1		apps/CA.pl.in \| 2 ++
2		1 file changed, 2 insertions(+)
3
4		--- a/apps/CA.pl.in
5		+++ b/apps/CA.pl.in
6		@@ -65,6 +65,7 @@ if(defined $ENV{OPENSSL}) {
7		foreach (@ARGV) {
8		if ( /^(-\?\|-h\|-help)$/ ) {
9		print STDERR "usage: CA -newcert\|-newreq\|-newreq-nodes\|-newca\|-sign\|-verify\n";
10		+ print STDERR "usage: CA -signcert certfile keyfile\|-newcert\|-newreq\|-newca\|-sign\|-verify\n";
11		exit 0;
12		} elsif (/^-newcert$/) {
13		# create a certificate
14		@@ -165,6 +166,7 @@ foreach (@ARGV) {
15		} else {
16		print STDERR "Unknown arg $_\n";
17		print STDERR "usage: CA -newcert\|-newreq\|-newreq-nodes\|-newca\|-sign\|-verify\n";
18		+ print STDERR "usage: CA -signcert certfile keyfile\|-newcert\|-newreq\|-newca\|-sign\|-verify\n";
19		exit 1;
20		}
21		}

+23

-14

debian/patches/engines-path.patch less more

0		Index: openssl-1.0.2~beta3/Makefile.org
	0	Index: openssl-1.0.2i/Makefile.org
1	1	===================================================================
2		--- openssl-1.0.2~beta3.orig/Makefile.org
3		+++ openssl-1.0.2~beta3/Makefile.org
4		@@ -541,7 +541,7 @@ install: all install_docs install_sw
	2	--- openssl-1.0.2i.orig/Makefile.org
	3	+++ openssl-1.0.2i/Makefile.org
	4	@@ -368,7 +368,7 @@ libcrypto.pc: Makefile
	5	echo 'exec_prefix=$${prefix}'; \
	6	echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
	7	echo 'includedir=$${prefix}/include'; \
	8	- echo 'enginesdir=$${libdir}/engines'; \
	9	+ echo 'enginesdir=$${libdir}/openssl-1.0.0/engines'; \
	10	echo ''; \
	11	echo 'Name: OpenSSL-libcrypto'; \
	12	echo 'Description: OpenSSL cryptography library'; \
	13	@@ -536,7 +536,7 @@ install: all install_docs install_sw
5	14	install_sw:
6	15	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
7	16	$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \

10	19	$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
11	20	$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
12	21	$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
13		Index: openssl-1.0.2~beta3/engines/Makefile
	22	Index: openssl-1.0.2i/engines/Makefile
14	23	===================================================================
15		--- openssl-1.0.2~beta3.orig/engines/Makefile
16		+++ openssl-1.0.2~beta3/engines/Makefile
	24	--- openssl-1.0.2i.orig/engines/Makefile
	25	+++ openssl-1.0.2i/engines/Makefile
17	26	@@ -107,13 +107,13 @@ install:
18	27	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
19	28	@if [ -n "$(SHARED_LIBS)" ]; then \

44	53	done; \
45	54	fi
46	55	@target=install; $(RECURSIVE_MAKE)
47		Index: openssl-1.0.2~beta3/Configure
	56	Index: openssl-1.0.2i/Configure
48	57	===================================================================
49		--- openssl-1.0.2~beta3.orig/Configure
50		+++ openssl-1.0.2~beta3/Configure
51		@@ -1893,7 +1893,7 @@ while (<IN>)
	58	--- openssl-1.0.2i.orig/Configure
	59	+++ openssl-1.0.2i/Configure
	60	@@ -1969,7 +1969,7 @@ while (<IN>)
52	61	}
53	62	elsif (/^#define\s+ENGINESDIR/)
54	63	{

57	66	$foo =~ s/\\/\\\\/g;
58	67	print OUT "#define ENGINESDIR \"$foo\"\n";
59	68	}
60		Index: openssl-1.0.2~beta3/engines/ccgost/Makefile
	69	Index: openssl-1.0.2i/engines/ccgost/Makefile
61	70	===================================================================
62		--- openssl-1.0.2~beta3.orig/engines/ccgost/Makefile
63		+++ openssl-1.0.2~beta3/engines/ccgost/Makefile
	71	--- openssl-1.0.2i.orig/engines/ccgost/Makefile
	72	+++ openssl-1.0.2i/engines/ccgost/Makefile
64	73	@@ -47,7 +47,7 @@ install:
65	74	pfx=lib; \
66	75	if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

-1

debian/patches/series less more

0		ca.patch
1	0	config-hurd.patch
2	1	debian-targets.patch
3	2	engines-path.patch