Compare commits

...

2 Commits

Author SHA1 Message Date
Juhani Krekelä adcf11944f Update to libressl-3.7.2. 2023-04-21 23:00:33 +03:00
Juhani Krekelä 4657132716 Fix tix-port(8) diffs on non-English locales.
tix-port(8) parses the diff(1) output, to remove the "Only in …"
informational messages. As they are meant to be human-readable, not
machine-readable, they are translated to different languages, which
causes tix-port(8) to miss them. This patch sets LC_ALL=C for the diff
invocation, so that the messages are always in English.
2023-04-12 14:01:11 +03:00
4 changed files with 5 additions and 4 deletions

View File

@ -217,7 +217,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/openssl/s_socket.c libssl/ap
diff -Paur --no-dereference -- libssl.upstream/configure libssl/configure
--- libssl.upstream/configure
+++ libssl/configure
@@ -11775,6 +11775,10 @@
@@ -11779,6 +11779,10 @@
HOST_OS=midipix
CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
;;

View File

@ -1,10 +1,10 @@
NAME=libssl
BUILD_LIBRARIES=
VERSION=3.7.1
VERSION=3.7.2
DISTNAME=libressl-$VERSION
COMPRESSION=tar.gz
ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=98086961a2b8b657ed0fea3056fb2db14294b6bfa193c15a5236a0a35c843ded
SHA256SUM=b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7
UPSTREAM_SITE=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
UPSTREAM_ARCHIVE=$ARCHIVE
LICENSE=OpenSSL

View File

@ -0,0 +1 @@
rm -rf -- 'include/openssl/opensslconf.h'

View File

@ -317,7 +317,7 @@ diff_package() {(
base=$(basename -- "$port")
if [ -e "$base.upstream" ]; then
announce "diff $base.upstream $base"
diff -Paur --no-dereference -- "$base.upstream" "$base" |
LC_ALL=C diff -Paur --no-dereference -- "$base.upstream" "$base" |
sed -E -e '/^Only in.*$/d' -e 's/^((---|\+\+\+)[^\t]+)\t.*/\1/' \
> "$base.patch"
if [ ! -s "$base.patch" ]; then rm "$base.patch"; fi