Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openssl: update to 1.1.1l.
@ 2021-08-24 15:10 ericonr
  2021-08-25 17:16 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2021-08-24 15:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages openssl
https://github.com/void-linux/void-packages/pull/32653

openssl: update to 1.1.1l.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@leahneukirchen 

A patch file from https://github.com/void-linux/void-packages/pull/32653.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-32653.patch --]
[-- Type: text/x-diff, Size: 2231 bytes --]

From b1ea39b83cbc8e4ce9f97500f2c46da4f7f3bf69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 24 Aug 2021 12:09:47 -0300
Subject: [PATCH] openssl: update to 1.1.1l.

---
 srcpkgs/openssl/patches/ppc-auxv.patch | 16 ++++++++++++----
 srcpkgs/openssl/template               |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
index 308cb2218bc9..274ac2d55998 100644
--- a/srcpkgs/openssl/patches/ppc-auxv.patch
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -1,6 +1,8 @@
---- a/crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
-+++ b/crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
-@@ -207,11 +207,9 @@
+diff --git a/crypto/ppccap.c b/crypto/ppccap.c
+index eeaa47c..e6eeb14 100644
+--- a/crypto/ppccap.c
++++ b/crypto/ppccap.c
+@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
          return 0;
  }
  
@@ -8,10 +10,16 @@
 -# if __GLIBC_PREREQ(2, 16)
 -#  include <sys/auxv.h>
 -#  define OSSL_IMPLEMENT_GETAUXVAL
+-# elif defined(__ANDROID_API__)
+-/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+-#  if __ANDROID_API__ >= 18
+-#   include <sys/auxv.h>
+-#   define OSSL_IMPLEMENT_GETAUXVAL
+-#  endif
 -# endif
 +#if defined(__linux__)
 +# include <sys/auxv.h>
 +# define OSSL_IMPLEMENT_GETAUXVAL
  #endif
  
- /* I wish <sys/auxv.h> was universally available */
+ #if defined(__FreeBSD__)
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 01dfd74de14d..06d83aa0d81d 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1k
+version=1.1.1l
 revision=1
 bootstrap=yes
 build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
 license="OpenSSL"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
+checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: openssl: update to 1.1.1l.
  2021-08-24 15:10 [PR PATCH] openssl: update to 1.1.1l ericonr
@ 2021-08-25 17:16 ` ericonr
  0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-08-25 17:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]

There's a merged pull request on the void-packages repository

openssl: update to 1.1.1l.
https://github.com/void-linux/void-packages/pull/32653

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@leahneukirchen 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-25 17:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24 15:10 [PR PATCH] openssl: update to 1.1.1l ericonr
2021-08-25 17:16 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).