commit 5607b9dbef73a7df2e95f7f0b64c9a1d5079ace6
Author: Jakub Bogusz <[email protected]>
Date: Sat Apr 8 09:51:29 2023 +0200
- updated to 1.0.2 (using Debian checkout as there are no release tarballs)
with Debian patch to fix deprecated decls
- dropped cmake patch, use upstream include dirs layout
libdecaf-cmake.patch | 28 ----------------------------
libdecaf-fix-attribute-deprecated-decl.patch | 20 ++++++++++++++++++++
libdecaf.spec | 14 +++++++-------
3 files changed, 27 insertions(+), 35 deletions(-)
---
diff --git a/libdecaf.spec b/libdecaf.spec
index e77d9e7..6169bd1 100644
--- a/libdecaf.spec
+++ b/libdecaf.spec
@@ -5,18 +5,20 @@
Summary: Elliptic curve library
Summary(pl.UTF-8): Biblioteka krzywych eliptycznych
Name: libdecaf
-Version: 1.0.0
+Version: 1.0.2
Release: 1
License: MIT
Group: Libraries
-Source0:
http://downloads.sourceforge.net/ed448goldilocks/%{name}-%{version}.tgz
-# Source0-md5: 48b57dc6ff6be56930f0be2a5722a70e
-Patch0: %{name}-cmake.patch
+#Source0:
http://downloads.sourceforge.net/ed448goldilocks/%{name}-%{version}.tgz
+# > 1.0.0 releases are tagged in git, but not published - use debian checkout
+Source0:
http://deb.debian.org/debian/pool/main/libd/libdecaf/%{name}_%{version}.orig.tar.gz
+# Source0-md5: 50d59a0d1428e91734b2aa7c1e586980
+Patch0: %{name}-fix-attribute-deprecated-decl.patch
URL: http://ed448goldilocks.sourceforge.net/
BuildRequires: cmake >= 3.0
BuildRequires: doxygen
BuildRequires: libstdc++-devel
-BuildRequires: python >= 1:2.7
+BuildRequires: python3 >= 1:3.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -84,8 +86,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libdecaf.so
%{_includedir}/decaf
-%{_includedir}/decaf.h
-%{_includedir}/decaf.hxx
%dir %{_datadir}/decaf
%{_datadir}/decaf/cmake
diff --git a/libdecaf-cmake.patch b/libdecaf-cmake.patch
deleted file mode 100644
index ae9409c..0000000
--- a/libdecaf-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Recent cmake seems not to populate INTERFACE_INCLUDE_DIRECTORIES when using
target_include_directories with empty path list.
-
-Drop duplicate "decaf" from includes path.
-
---- libdecaf-1.0.0/cmake/DecafConfig.cmake.in.orig 2018-06-06
00:25:08.000000000 +0200
-+++ libdecaf-1.0.0/cmake/DecafConfig.cmake.in 2020-09-26 09:22:59.720744590
+0200
-@@ -42,9 +42,7 @@
- endif()
- endif()
- endif()
--get_target_property(DECAF_INCLUDE_DIRS ${DECAF_TARGETNAME}
INTERFACE_INCLUDE_DIRECTORIES)
--list(INSERT DECAF_INCLUDE_DIRS 0 "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
--list(REMOVE_DUPLICATES DECAF_INCLUDE_DIRS)
-+set(DECAF_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
-
- set(DECAF_CPPFLAGS @DECAF_CPPFLAGS@)
- set(DECAF_FOUND 1)
---- libdecaf-1.0.0/src/CMakeLists.txt.orig 2018-06-06 00:25:08.000000000
+0200
-+++ libdecaf-1.0.0/src/CMakeLists.txt 2020-09-26 09:39:00.252207612 +0200
-@@ -119,7 +119,7 @@
- endif()
-
- install(DIRECTORY ${GSOURCE_PATH}/include/
-- DESTINATION include/decaf
-+ DESTINATION include
- FILES_MATCHING PATTERN "*.h*"
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
- )
diff --git a/libdecaf-fix-attribute-deprecated-decl.patch
b/libdecaf-fix-attribute-deprecated-decl.patch
new file mode 100644
index 0000000..1d9e070
--- /dev/null
+++ b/libdecaf-fix-attribute-deprecated-decl.patch
@@ -0,0 +1,20 @@
+--- a/src/per_curve/eddsa.tmpl.h
++++ b/src/per_curve/eddsa.tmpl.h
+@@ -143,7 +143,7 @@
+ uint8_t context_len
+ ) __attribute__((nonnull(1,2,3))) DECAF_NOINLINE
+ #if DECAF_EDDSA_NON_KEYPAIR_API_IS_DEPRECATED
+- __attribute__((deprecated("Passing the pubkey and privkey separately is
unsafe",
++ __attribute__((deprecated("Passing the pubkey and privkey separately is
unsafe, use "
+ "decaf_ed$(gf_shortname)_keypair_sign")))
+ #endif
+ ;
+@@ -171,7 +171,7 @@
+ uint8_t context_len
+ ) __attribute__((nonnull(1,2,3,4))) DECAF_NOINLINE
+ #if DECAF_EDDSA_NON_KEYPAIR_API_IS_DEPRECATED
+- __attribute__((deprecated("Passing the pubkey and privkey separately is
unsafe",
++ __attribute__((deprecated("Passing the pubkey and privkey separately is
unsafe, use "
+ "decaf_ed$(gf_shortname)_keypair_sign_prehash")))
+ #endif
+ ;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdecaf.git/commitdiff/5607b9dbef73a7df2e95f7f0b64c9a1d5079ace6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
