!1 package init
From: @fly_fzc Reviewed-by: @zhujianwei001 Signed-off-by: @zhujianwei001
This commit is contained in:
openeuler-ci-bot
Gitee
commit
0180f0a8ac
BIN
342e805bc1f5dfdd650e3f031686d6c939b095d9.tar.gz
Normal file
BIN
342e805bc1f5dfdd650e3f031686d6c939b095d9.tar.gz
Normal file
Binary file not shown.
132
Fix-print-Syntax-error.patch
Normal file
132
Fix-print-Syntax-error.patch
Normal file
@ -0,0 +1,132 @@
|
||||
From b2b7b49ffbf5d5ef135635d28eb6488f415f9879 Mon Sep 17 00:00:00 2001
|
||||
From: fly_fzc <2385803914@qq.com>
|
||||
Date: Tue, 11 Mar 2025 15:23:29 +0800
|
||||
Subject: [PATCH] Fix print Syntax error
|
||||
|
||||
---
|
||||
src/pki/testdata/ocsp_unittest/annotate_test_data.py | 6 +-
|
||||
.../parse_certificate_unittest/regenerate_pem_from_ascii.py | 10 +-
|
||||
.../testdata/verify_signed_data_unittest/annotate_test_data.py | 4 +-
|
||||
src/util/generate-asm-lcov.py | 4 +-
|
||||
4 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/pki/testdata/ocsp_unittest/annotate_test_data.py b/src/pki/testdata/ocsp_unittest/annotate_test_data.py
|
||||
index 8e9262b..dbcaf27 100755
|
||||
--- a/src/pki/testdata/ocsp_unittest/annotate_test_data.py
|
||||
+++ b/src/pki/testdata/ocsp_unittest/annotate_test_data.py
|
||||
@@ -85,7 +85,7 @@ def GenerateCommentForBlock(block_name, block_data):
|
||||
stdout_data = stdout_data.replace("-----", "~~~~~")
|
||||
return '$ openssl ocsp -resp_text -respin <([%s])\n%s' % (block_name,
|
||||
stdout_data)
|
||||
- print 'Error pretty printing OCSP response:\n',stderr_data
|
||||
+ print ('Error pretty printing OCSP response:\n',stderr_data)
|
||||
|
||||
# Otherwise try pretty printing using asn1parse.
|
||||
|
||||
@@ -205,12 +205,12 @@ def WriteStringToFile(data, path):
|
||||
|
||||
def main():
|
||||
for path in GetPemFilePaths():
|
||||
- print "Processing %s ..." % (path)
|
||||
+ print ("Processing %s ..." % (path))
|
||||
original_data = ReadFileToString(path)
|
||||
transformed_data = Transform(original_data)
|
||||
if original_data != transformed_data:
|
||||
WriteStringToFile(transformed_data, path)
|
||||
- print "Rewrote %s" % (path)
|
||||
+ print ("Rewrote %s" % (path))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
diff --git a/src/pki/testdata/parse_certificate_unittest/regenerate_pem_from_ascii.py b/src/pki/testdata/parse_certificate_unittest/regenerate_pem_from_ascii.py
|
||||
index 38316fb..798535a 100755
|
||||
--- a/src/pki/testdata/parse_certificate_unittest/regenerate_pem_from_ascii.py
|
||||
+++ b/src/pki/testdata/parse_certificate_unittest/regenerate_pem_from_ascii.py
|
||||
@@ -31,7 +31,7 @@ def read_file_to_string(path):
|
||||
|
||||
def write_string_to_file(data, path):
|
||||
"""Writes a string to a file"""
|
||||
- print "Writing file %s ..." % (path)
|
||||
+ print ("Writing file %s ..." % (path))
|
||||
with open(path, "w") as f:
|
||||
f.write(data)
|
||||
|
||||
@@ -48,7 +48,7 @@ def apply_substitution(template, name, value):
|
||||
(re.escape(name), re.escape(name)), re.DOTALL)
|
||||
m = regex.search(template)
|
||||
if not m:
|
||||
- print "Couldn't find a section named %s in the template" % (name)
|
||||
+ print ("Couldn't find a section named %s in the template" % (name))
|
||||
sys.exit(1)
|
||||
|
||||
return replace_string(template, m.start(1), m.end(1), value)
|
||||
@@ -56,7 +56,7 @@ def apply_substitution(template, name, value):
|
||||
|
||||
def main():
|
||||
if len(sys.argv) != 2:
|
||||
- print 'Usage: %s <PATH_TO_PEM>' % (sys.argv[0])
|
||||
+ print ('Usage: %s <PATH_TO_PEM>' % (sys.argv[0]))
|
||||
sys.exit(1)
|
||||
|
||||
pem_path = sys.argv[1]
|
||||
@@ -73,7 +73,7 @@ def main():
|
||||
cert_ascii = apply_substitution(cert_ascii, m.group(1), m.group(2))
|
||||
|
||||
if num_matches == 0:
|
||||
- print "Input did not contain any substitutions"
|
||||
+ print ("Input did not contain any substitutions")
|
||||
sys.exit(1)
|
||||
|
||||
# Convert the ascii-der to actual DER binary.
|
||||
@@ -93,7 +93,7 @@ def main():
|
||||
'-----END CERTIFICATE-----', re.DOTALL)
|
||||
m = regex.search(orig)
|
||||
if not m:
|
||||
- print "ERROR: Cannot find CERTIFICATE block in input"
|
||||
+ print ("ERROR: Cannot find CERTIFICATE block in input")
|
||||
sys.exit(1)
|
||||
modified = replace_string(orig, m.start(1), m.end(1),
|
||||
base64.b64encode(cert_der))
|
||||
diff --git a/src/pki/testdata/verify_signed_data_unittest/annotate_test_data.py b/src/pki/testdata/verify_signed_data_unittest/annotate_test_data.py
|
||||
index 9e6b478..5462d25 100755
|
||||
--- a/src/pki/testdata/verify_signed_data_unittest/annotate_test_data.py
|
||||
+++ b/src/pki/testdata/verify_signed_data_unittest/annotate_test_data.py
|
||||
@@ -152,7 +152,7 @@ def WriteStringToFile(data, path):
|
||||
|
||||
def main():
|
||||
for path in GetPemFilePaths():
|
||||
- print "Processing %s ..." % (path)
|
||||
+ print ("Processing %s ..." % (path))
|
||||
original_data = ReadFileToString(path)
|
||||
transformed_data = Transform(original_data)
|
||||
if original_data != transformed_data:
|
||||
@@ -157,7 +157,7 @@ def main():
|
||||
transformed_data = Transform(original_data)
|
||||
if original_data != transformed_data:
|
||||
WriteStringToFile(transformed_data, path)
|
||||
- print "Rewrote %s" % (path)
|
||||
+ print ("Rewrote %s" % (path))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
diff --git a/src/util/generate-asm-lcov.py b/src/util/generate-asm-lcov.py
|
||||
index 257ae84..06df336 100755
|
||||
--- a/src/util/generate-asm-lcov.py
|
||||
+++ b/src/util/generate-asm-lcov.py
|
||||
@@ -128,7 +128,7 @@ def output(data):
|
||||
|
||||
if __name__ == '__main__':
|
||||
if len(sys.argv) != 3:
|
||||
- print '%s <Callgrind Folder> <Build Folder>' % (__file__)
|
||||
+ print ('%s <Callgrind Folder> <Build Folder>' % (__file__))
|
||||
sys.exit()
|
||||
|
||||
cg_folder = sys.argv[1]
|
||||
@@ -149,4 +149,4 @@ if __name__ == '__main__':
|
||||
|
||||
annotated = merge(cg_files, srcs)
|
||||
lcov = generate(annotated)
|
||||
- print output(lcov)
|
||||
+ print (output(lcov))
|
||||
--
|
||||
2.33.0
|
||||
83
boringssl.spec
Normal file
83
boringssl.spec
Normal file
@ -0,0 +1,83 @@
|
||||
%define debug_package %{nil}
|
||||
%define src_install_dir /usr/src/%{name}
|
||||
|
||||
Name: boringssl
|
||||
Version: 342e805bc1f5dfdd650e3f031686d6c939b095d9
|
||||
Release: 1
|
||||
Summary: An SSL/TLS protocol implementation
|
||||
License: OpenSSL
|
||||
Group: Development/Sources
|
||||
URL: https://boringssl.googlesource.com/%{name}
|
||||
Source: https://github.com/google/%{name}/archive/%{version}.tar.gz
|
||||
|
||||
Patch0: Fix-print-Syntax-error.patch
|
||||
|
||||
BuildRequires: cmake >= 3.0
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
%description
|
||||
BoringSSL is an implementation of the Secure Sockets Layer (SSL) and
|
||||
Transport Layer Security (TLS) protocols, derived from OpenSSL.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for BoringSSL
|
||||
Group: Development/Libraries/C and C++
|
||||
|
||||
%description devel
|
||||
Development files for BoringSSL - an implementation of the Secure
|
||||
Sockets Layer (SSL) and Transport Layer Security (TLS) protocols,
|
||||
derived from OpenSSL.
|
||||
|
||||
%package source
|
||||
Summary: Source code of BoringSSL
|
||||
Group: Development/Sources
|
||||
BuildArch: noarch
|
||||
|
||||
%description source
|
||||
Source files for BoringSSL implementation
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
# Install sources
|
||||
mkdir -p %{buildroot}%{src_install_dir}
|
||||
cp -r * %{buildroot}%{src_install_dir}
|
||||
%fdupes %{buildroot}%{src_install_dir}
|
||||
# Fix arch-independent-package-contains-binary-or-object
|
||||
find %{buildroot}%{src_install_dir} -type f \( -name "*.a" -o -name "*.lib" -o -name "*.o" \) -exec rm -f "{}" +
|
||||
# Fix non-executable-script warning.
|
||||
find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec chmod +x "{}" +
|
||||
# Fix env-script-interpreter error.
|
||||
find %{buildroot}%{src_install_dir} -type f -name "*.pl" -exec sed -i 's|#!.*/usr/bin/env perl|#!/usr/bin/perl|' "{}" +
|
||||
find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*/usr/bin/python$|#!/usr/bin/python3|' "{}" +
|
||||
find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*/usr/bin/env python.*|#!/usr/bin/python3|' "{}" +
|
||||
find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*/usr/bin/env bash|#!/bin/bash|' "{}" +
|
||||
|
||||
# To avoid conflicts with openssl development files, change all includes from
|
||||
# openssl to boringssl.
|
||||
# BoringSSL headers provided by this pachage are installed in
|
||||
# /usr/include/boringssl for the same reason.
|
||||
find src/include/openssl -type f -exec sed -i 's/openssl/boringssl/' "{}" +
|
||||
|
||||
find src/include/openssl -type f -execdir install -D -m0644 "{}" "%{buildroot}%{_includedir}/boringssl/{}" \;
|
||||
|
||||
rm -rf %{buildroot}%{src_install_dir}/src/util/ar/testdata/mac/libsample.a
|
||||
rm -rf %{buildroot}%{src_install_dir}/src/util/ar/testdata/windows/*
|
||||
|
||||
%files
|
||||
%doc src/README.md
|
||||
%license LICENSE
|
||||
|
||||
%files devel
|
||||
%{_includedir}/boringssl
|
||||
|
||||
%files source
|
||||
%{src_install_dir}
|
||||
|
||||
%changelog
|
||||
* Mon Apr 7 2025 fuanan <fuanan3@h-partners.com> - 342e805bc1f5dfdd650e3f031686d6c939b095d9-1
|
||||
- package init
|
||||
4
boringssl.yaml
Normal file
4
boringssl.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: google/boringssl
|
||||
tag_prefix: ^v
|
||||
separator: .
|
||||
Loading…
x
Reference in New Issue
Block a user