From 6940042683fbbab1ab13012317d0c1575aa0f059fd5bb122b56bd0c7d6639be0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 5 Feb 2021 06:54:29 +0000 Subject: [PATCH] Accepting request 869577 from home:etamPL:branches:network:cryptocurrencies - update to 1.0.0 * no upstream changelog - refreshed patches OBS-URL: https://build.opensuse.org/request/show/869577 OBS-URL: https://build.opensuse.org/package/show/network:cryptocurrencies/libff?expand=0&rev=2 --- 00_no_bn128.patch | 48 +++++++++++-------- 01_shared_lib.patch | 6 +-- 02_config_hpp.patch | 112 +++++++++++++++++++++---------------------- libff-0~git63.tar.xz | 3 -- libff-1.0.0.tar.xz | 3 ++ libff.changes | 7 +++ libff.spec | 2 +- prepare_source.sh | 4 +- 8 files changed, 99 insertions(+), 86 deletions(-) delete mode 100644 libff-0~git63.tar.xz create mode 100644 libff-1.0.0.tar.xz diff --git a/00_no_bn128.patch b/00_no_bn128.patch index 0bd1d3c..b319ae6 100644 --- a/00_no_bn128.patch +++ b/00_no_bn128.patch @@ -7,10 +7,10 @@ Subject: disable BN128 BN128 uses internally bundled dependencies, which would require more work to package properly. -Index: libff-0~git63/CMakeLists.txt +Index: libff-1.0.0/CMakeLists.txt =================================================================== ---- libff-0~git63.orig/CMakeLists.txt -+++ libff-0~git63/CMakeLists.txt +--- libff-1.0.0.orig/CMakeLists.txt ++++ libff-1.0.0/CMakeLists.txt @@ -9,10 +9,10 @@ endif() set( @@ -45,10 +45,10 @@ Index: libff-0~git63/CMakeLists.txt - add_subdirectory(depends) endif() add_subdirectory(libff) -Index: libff-0~git63/libff/CMakeLists.txt +Index: libff-1.0.0/libff/CMakeLists.txt =================================================================== ---- libff-0~git63.orig/libff/CMakeLists.txt -+++ libff-0~git63/libff/CMakeLists.txt +--- libff-1.0.0.orig/libff/CMakeLists.txt ++++ libff-1.0.0/libff/CMakeLists.txt @@ -1,25 +1,3 @@ -set(FF_EXTRASRCS) -set(FF_EXTRALIBS) @@ -111,10 +111,10 @@ Index: libff-0~git63/libff/CMakeLists.txt - - add_dependencies(profile multiexp_profile) endif() -Index: libff-0~git63/libff/algebra/curves/tests/test_bilinearity.cpp +Index: libff-1.0.0/libff/algebra/curves/tests/test_bilinearity.cpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/tests/test_bilinearity.cpp -+++ libff-0~git63/libff/algebra/curves/tests/test_bilinearity.cpp +--- libff-1.0.0.orig/libff/algebra/curves/tests/test_bilinearity.cpp ++++ libff-1.0.0/libff/algebra/curves/tests/test_bilinearity.cpp @@ -6,9 +6,6 @@ *****************************************************************************/ #include @@ -125,7 +125,7 @@ Index: libff-0~git63/libff/algebra/curves/tests/test_bilinearity.cpp #include #include #include -@@ -127,10 +124,4 @@ int main(void) +@@ -128,12 +125,6 @@ int main(void) alt_bn128_pp::init_public_params(); pairing_test(); double_miller_loop_test(); @@ -136,10 +136,12 @@ Index: libff-0~git63/libff/algebra/curves/tests/test_bilinearity.cpp - double_miller_loop_test(); -#endif } -Index: libff-0~git63/libff/algebra/curves/tests/test_groups.cpp + + #else // NDEBUG +Index: libff-1.0.0/libff/algebra/curves/tests/test_groups.cpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/tests/test_groups.cpp -+++ libff-0~git63/libff/algebra/curves/tests/test_groups.cpp +--- libff-1.0.0.orig/libff/algebra/curves/tests/test_groups.cpp ++++ libff-1.0.0/libff/algebra/curves/tests/test_groups.cpp @@ -8,9 +8,6 @@ #include #include @@ -150,7 +152,7 @@ Index: libff-0~git63/libff/algebra/curves/tests/test_groups.cpp #include #include -@@ -165,12 +162,4 @@ int main(void) +@@ -166,14 +163,6 @@ int main(void) test_group >(); test_output >(); test_mul_by_q >(); @@ -163,10 +165,12 @@ Index: libff-0~git63/libff/algebra/curves/tests/test_groups.cpp - test_output >(); -#endif } -Index: libff-0~git63/libff/algebra/fields/tests/test_fields.cpp + + #else // NDEBUG +Index: libff-1.0.0/libff/algebra/fields/tests/test_fields.cpp =================================================================== ---- libff-0~git63.orig/libff/algebra/fields/tests/test_fields.cpp -+++ libff-0~git63/libff/algebra/fields/tests/test_fields.cpp +--- libff-1.0.0.orig/libff/algebra/fields/tests/test_fields.cpp ++++ libff-1.0.0/libff/algebra/fields/tests/test_fields.cpp @@ -8,9 +8,6 @@ #include #include @@ -177,7 +181,7 @@ Index: libff-0~git63/libff/algebra/fields/tests/test_fields.cpp #include #include #include -@@ -236,10 +233,4 @@ int main(void) +@@ -237,12 +234,6 @@ int main() test_field(); test_Frobenius(); test_all_fields(); @@ -188,10 +192,12 @@ Index: libff-0~git63/libff/algebra/fields/tests/test_fields.cpp - test_field >(); -#endif } -Index: libff-0~git63/libff/common/default_types/ec_pp.hpp + + #else // NDEBUG +Index: libff-1.0.0/libff/common/default_types/ec_pp.hpp =================================================================== ---- libff-0~git63.orig/libff/common/default_types/ec_pp.hpp -+++ libff-0~git63/libff/common/default_types/ec_pp.hpp +--- libff-1.0.0.orig/libff/common/default_types/ec_pp.hpp ++++ libff-1.0.0/libff/common/default_types/ec_pp.hpp @@ -23,14 +23,6 @@ typedef alt_bn128_pp default_ec_pp; } // libff #endif diff --git a/01_shared_lib.patch b/01_shared_lib.patch index 9c1f4cc..b36ca43 100644 --- a/01_shared_lib.patch +++ b/01_shared_lib.patch @@ -3,10 +3,10 @@ Date: 2019-02-12 20:48:31 Upstream: no Subject: build as shared library -Index: libff-0~git63/libff/CMakeLists.txt +Index: libff-1.0.0/libff/CMakeLists.txt =================================================================== ---- libff-0~git63.orig/libff/CMakeLists.txt -+++ libff-0~git63/libff/CMakeLists.txt +--- libff-1.0.0.orig/libff/CMakeLists.txt ++++ libff-1.0.0/libff/CMakeLists.txt @@ -1,6 +1,6 @@ add_library( ff diff --git a/02_config_hpp.patch b/02_config_hpp.patch index 1d20121..f3361c6 100644 --- a/02_config_hpp.patch +++ b/02_config_hpp.patch @@ -4,10 +4,10 @@ Upstream: yes References: https://github.com/scipr-lab/libff/issues/21 Subject: add a configuration header -Index: libff-0~git63/CMakeLists.txt +Index: libff-1.0.0/CMakeLists.txt =================================================================== ---- libff-0~git63.orig/CMakeLists.txt -+++ libff-0~git63/CMakeLists.txt +--- libff-1.0.0.orig/CMakeLists.txt ++++ libff-1.0.0/CMakeLists.txt @@ -124,13 +124,14 @@ if("${WITH_PROCPS}") libprocps ) @@ -32,10 +32,10 @@ Index: libff-0~git63/CMakeLists.txt add_definitions(-DNO_PT_COMPRESSION=1) endif() -Index: libff-0~git63/libff/CMakeLists.txt +Index: libff-1.0.0/libff/CMakeLists.txt =================================================================== ---- libff-0~git63.orig/libff/CMakeLists.txt -+++ libff-0~git63/libff/CMakeLists.txt +--- libff-1.0.0.orig/libff/CMakeLists.txt ++++ libff-1.0.0/libff/CMakeLists.txt @@ -1,3 +1,5 @@ +configure_file(config.hpp.in config.hpp) + @@ -61,10 +61,10 @@ Index: libff-0~git63/libff/CMakeLists.txt TARGETS ff DESTINATION lib${LIB_SUFFIX} ) -Index: libff-0~git63/libff/config.hpp.in +Index: libff-1.0.0/libff/config.hpp.in =================================================================== --- /dev/null -+++ libff-0~git63/libff/config.hpp.in ++++ libff-1.0.0/libff/config.hpp.in @@ -0,0 +1,22 @@ +#ifndef LIBFF_CONFIG_HPP_ +#define LIBFF_CONFIG_HPP_ @@ -88,10 +88,10 @@ Index: libff-0~git63/libff/config.hpp.in +#cmakedefine USE_ASM + +#endif // LIBFF_CONFIG_HPP_ -Index: libff-0~git63/libff/common/default_types/ec_pp.hpp +Index: libff-1.0.0/libff/common/default_types/ec_pp.hpp =================================================================== ---- libff-0~git63.orig/libff/common/default_types/ec_pp.hpp -+++ libff-0~git63/libff/common/default_types/ec_pp.hpp +--- libff-1.0.0.orig/libff/common/default_types/ec_pp.hpp ++++ libff-1.0.0/libff/common/default_types/ec_pp.hpp @@ -13,9 +13,11 @@ #ifndef EC_PP_HPP_ #define EC_PP_HPP_ @@ -141,10 +141,10 @@ Index: libff-0~git63/libff/common/default_types/ec_pp.hpp #endif #endif // EC_PP_HPP_ -Index: libff-0~git63/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp +Index: libff-1.0.0/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp -+++ libff-0~git63/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp +--- libff-1.0.0.orig/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp ++++ libff-1.0.0/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp @@ -9,6 +9,7 @@ #define ALT_BN128_G1_HPP_ #include @@ -153,10 +153,10 @@ Index: libff-0~git63/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp +Index: libff-1.0.0/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp -+++ libff-0~git63/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp +--- libff-1.0.0.orig/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp ++++ libff-1.0.0/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp @@ -9,6 +9,7 @@ #define ALT_BN128_G2_HPP_ #include @@ -165,10 +165,10 @@ Index: libff-0~git63/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/edwards/edwards_g1.hpp +Index: libff-1.0.0/libff/algebra/curves/edwards/edwards_g1.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/edwards/edwards_g1.hpp -+++ libff-0~git63/libff/algebra/curves/edwards/edwards_g1.hpp +--- libff-1.0.0.orig/libff/algebra/curves/edwards/edwards_g1.hpp ++++ libff-1.0.0/libff/algebra/curves/edwards/edwards_g1.hpp @@ -9,6 +9,7 @@ #define EDWARDS_G1_HPP_ #include @@ -177,10 +177,10 @@ Index: libff-0~git63/libff/algebra/curves/edwards/edwards_g1.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/edwards/edwards_g2.hpp +Index: libff-1.0.0/libff/algebra/curves/edwards/edwards_g2.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/edwards/edwards_g2.hpp -+++ libff-0~git63/libff/algebra/curves/edwards/edwards_g2.hpp +--- libff-1.0.0.orig/libff/algebra/curves/edwards/edwards_g2.hpp ++++ libff-1.0.0/libff/algebra/curves/edwards/edwards_g2.hpp @@ -10,6 +10,7 @@ #include #include @@ -189,10 +189,10 @@ Index: libff-0~git63/libff/algebra/curves/edwards/edwards_g2.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp +Index: libff-1.0.0/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp -+++ libff-0~git63/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp +--- libff-1.0.0.orig/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp ++++ libff-1.0.0/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp @@ -14,6 +14,7 @@ #include @@ -201,10 +201,10 @@ Index: libff-0~git63/libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp +Index: libff-1.0.0/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp -+++ libff-0~git63/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp +--- libff-1.0.0.orig/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp ++++ libff-1.0.0/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp @@ -14,6 +14,7 @@ #include @@ -213,10 +213,10 @@ Index: libff-0~git63/libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp +Index: libff-1.0.0/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp -+++ libff-0~git63/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp +--- libff-1.0.0.orig/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp ++++ libff-1.0.0/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp @@ -14,6 +14,7 @@ #include @@ -225,10 +225,10 @@ Index: libff-0~git63/libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp #include #include -Index: libff-0~git63/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp +Index: libff-1.0.0/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp -+++ libff-0~git63/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp +--- libff-1.0.0.orig/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp ++++ libff-1.0.0/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp @@ -14,6 +14,7 @@ #include @@ -237,10 +237,10 @@ Index: libff-0~git63/libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp #include #include -Index: libff-0~git63/libff/algebra/fields/fp2.tcc +Index: libff-1.0.0/libff/algebra/fields/fp2.tcc =================================================================== ---- libff-0~git63.orig/libff/algebra/fields/fp2.tcc -+++ libff-0~git63/libff/algebra/fields/fp2.tcc +--- libff-1.0.0.orig/libff/algebra/fields/fp2.tcc ++++ libff-1.0.0/libff/algebra/fields/fp2.tcc @@ -10,6 +10,7 @@ #ifndef FP2_TCC_ #define FP2_TCC_ @@ -249,10 +249,10 @@ Index: libff-0~git63/libff/algebra/fields/fp2.tcc #include namespace libff { -Index: libff-0~git63/libff/algebra/fields/fp3.tcc +Index: libff-1.0.0/libff/algebra/fields/fp3.tcc =================================================================== ---- libff-0~git63.orig/libff/algebra/fields/fp3.tcc -+++ libff-0~git63/libff/algebra/fields/fp3.tcc +--- libff-1.0.0.orig/libff/algebra/fields/fp3.tcc ++++ libff-1.0.0/libff/algebra/fields/fp3.tcc @@ -10,6 +10,7 @@ #ifndef FP3_TCC_ #define FP3_TCC_ @@ -261,10 +261,10 @@ Index: libff-0~git63/libff/algebra/fields/fp3.tcc #include namespace libff { -Index: libff-0~git63/libff/algebra/scalar_multiplication/multiexp.tcc +Index: libff-1.0.0/libff/algebra/scalar_multiplication/multiexp.tcc =================================================================== ---- libff-0~git63.orig/libff/algebra/scalar_multiplication/multiexp.tcc -+++ libff-0~git63/libff/algebra/scalar_multiplication/multiexp.tcc +--- libff-1.0.0.orig/libff/algebra/scalar_multiplication/multiexp.tcc ++++ libff-1.0.0/libff/algebra/scalar_multiplication/multiexp.tcc @@ -18,6 +18,7 @@ #include #include @@ -273,10 +273,10 @@ Index: libff-0~git63/libff/algebra/scalar_multiplication/multiexp.tcc #include #include #include -Index: libff-0~git63/libff/common/utils.hpp +Index: libff-1.0.0/libff/common/utils.hpp =================================================================== ---- libff-0~git63.orig/libff/common/utils.hpp -+++ libff-0~git63/libff/common/utils.hpp +--- libff-1.0.0.orig/libff/common/utils.hpp ++++ libff-1.0.0/libff/common/utils.hpp @@ -16,6 +16,8 @@ #include #include @@ -286,10 +286,10 @@ Index: libff-0~git63/libff/common/utils.hpp namespace libff { typedef std::vector bit_vector; -Index: libff-0~git63/libff/algebra/fields/bigint.tcc +Index: libff-1.0.0/libff/algebra/fields/bigint.tcc =================================================================== ---- libff-0~git63.orig/libff/algebra/fields/bigint.tcc -+++ libff-0~git63/libff/algebra/fields/bigint.tcc +--- libff-1.0.0.orig/libff/algebra/fields/bigint.tcc ++++ libff-1.0.0/libff/algebra/fields/bigint.tcc @@ -13,6 +13,8 @@ #include #include @@ -299,10 +299,10 @@ Index: libff-0~git63/libff/algebra/fields/bigint.tcc namespace libff { template -Index: libff-0~git63/libff/algebra/fields/fp.hpp +Index: libff-1.0.0/libff/algebra/fields/fp.hpp =================================================================== ---- libff-0~git63.orig/libff/algebra/fields/fp.hpp -+++ libff-0~git63/libff/algebra/fields/fp.hpp +--- libff-1.0.0.orig/libff/algebra/fields/fp.hpp ++++ libff-1.0.0/libff/algebra/fields/fp.hpp @@ -10,6 +10,7 @@ #ifndef FP_HPP_ #define FP_HPP_ @@ -311,10 +311,10 @@ Index: libff-0~git63/libff/algebra/fields/fp.hpp #include #include -Index: libff-0~git63/libff/common/serialization.hpp +Index: libff-1.0.0/libff/common/serialization.hpp =================================================================== ---- libff-0~git63.orig/libff/common/serialization.hpp -+++ libff-0~git63/libff/common/serialization.hpp +--- libff-1.0.0.orig/libff/common/serialization.hpp ++++ libff-1.0.0/libff/common/serialization.hpp @@ -18,6 +18,8 @@ #include #include diff --git a/libff-0~git63.tar.xz b/libff-0~git63.tar.xz deleted file mode 100644 index 7b8dbf5..0000000 --- a/libff-0~git63.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:323114b1e62ea3729c0916c149f606ceb86e517802577090a016e5e888dfa0e8 -size 68264 diff --git a/libff-1.0.0.tar.xz b/libff-1.0.0.tar.xz new file mode 100644 index 0000000..2cdc4f0 --- /dev/null +++ b/libff-1.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df555119aca4668417c9d7936db39cd22f078e6ee43585de87dc73d75391d57e +size 68488 diff --git a/libff.changes b/libff.changes index cb1c19b..0bec21a 100644 --- a/libff.changes +++ b/libff.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 30 07:43:39 UTC 2020 - Adam Mizerski + +- update to 1.0.0 + * no upstream changelog +- refreshed patches + ------------------------------------------------------------------- Mon Jan 21 21:26:14 UTC 2019 - Adam Mizerski diff --git a/libff.spec b/libff.spec index 8573ffa..dee76d6 100644 --- a/libff.spec +++ b/libff.spec @@ -17,7 +17,7 @@ Name: libff -Version: 0~git63 +Version: 1.0.0 Release: 0 Summary: C++ library for Finite Fields and Elliptic Curves License: MIT diff --git a/prepare_source.sh b/prepare_source.sh index 724172f..e24a53e 100644 --- a/prepare_source.sh +++ b/prepare_source.sh @@ -4,8 +4,8 @@ git clone https://github.com/scipr-lab/libff.git cd libff -# https://en.opensuse.org/openSUSE:Package_naming_guidelines#SCM_snapshots -version="0~git$(git rev-list master | wc -l)" +version="1.0.0" +git checkout "v${version}" rm -rf .git*