Attachment 229870 Details for Bug 260190 – updated to 1.0.7

[patch] updated to 1.0.7

chia1.0.7.patch (text/plain), 8.56 KB, created by risner on 2021-12-04 03:32:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: risner

Created: 2021-12-04 03:32:52 UTC

Size: 8.56 KB

patch

obsolete

>diff -ruN chiapos.1.0.3/Makefile chiapos/Makefile
>--- chiapos.1.0.3/Makefile	2021-12-03 22:27:24.794487000 -0500
>+++ chiapos/Makefile	2021-12-03 21:20:42.152875000 -0500
>@@ -1,5 +1,5 @@
> PORTNAME=	chiapos
>-DISTVERSION=	1.0.3
>+DISTVERSION=	1.0.7
> CATEGORIES=	finance
> MASTER_SITES=	CHEESESHOP
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -19,6 +19,8 @@
> 
> NOT_FOR_ARCHS=	i386 powerpc
> 
>+BUILD_DEPENDS=	catch>0:devel/catch
>+
> USES=		cmake:noninja
> USE_GITHUB=	nodefault
> GH_TUPLE=	jarro2783:cxxopts:302302b30839505703d37fb82f536c53cf9172fa:c/src-ext/cxxopts \
>@@ -30,8 +32,6 @@
> 
> post-extract:
> # This example is experimental, currently broken (upstream) and unnecessary.
>-# The placeholder Makefile is for when/if they release a future fixed version.
>-	@${CP} ${FILESDIR}/Hellman-Makefile ${WRKSRC}/hellman_example/Makefile
> # Remove extraneous unused files to prevent confusion
> 	@${RM} ${WRKSRC}/lib/FiniteStateEntropy/fetch-content-CMakeLists.txt
> 	@${RM} ${WRKSRC}/pyproject.toml
>diff -ruN chiapos.1.0.3/distinfo chiapos/distinfo
>--- chiapos.1.0.3/distinfo	2021-12-03 22:27:18.454882000 -0500
>+++ chiapos/distinfo	2021-12-03 21:21:15.606726000 -0500
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1623067298
>-SHA256 (chiapos-1.0.3.tar.gz) = d987b481a3acbff1e0d77eb713af8d99ecec2bd11c2c465528a5078a433686bd
>-SIZE (chiapos-1.0.3.tar.gz) = 1291513
>+TIMESTAMP = 1638584475
>+SHA256 (chiapos-1.0.7.tar.gz) = 1e10ce00730d293ed83ed3a3c630d525c9256fe4e31e64abbda7aa054b8a753f
>+SIZE (chiapos-1.0.7.tar.gz) = 1168757
> SHA256 (jarro2783-cxxopts-302302b30839505703d37fb82f536c53cf9172fa_GH0.tar.gz) = 74e21646f3278243c9466665794d45410e63453ab7f3652acdae1d62efc4b21d
> SIZE (jarro2783-cxxopts-302302b30839505703d37fb82f536c53cf9172fa_GH0.tar.gz) = 89640
> SHA256 (gulrak-filesystem-4e21ab305794f5309a1454b4ae82ab9a0f5e0d25_GH0.tar.gz) = fef3e809d584b77fd3ec677bd0d40cbe6737bbb3dbb1570fe1b2025262ea82c2
>diff -ruN chiapos.1.0.3/files/Hellman-Makefile chiapos/files/Hellman-Makefile
>--- chiapos.1.0.3/files/Hellman-Makefile	2021-12-03 22:28:07.035781000 -0500
>+++ chiapos/files/Hellman-Makefile	1969-12-31 19:00:00.000000000 -0500
>@@ -1,14 +0,0 @@
>-all: HellmanAttacks
>-
>-OBJ = aes.o bits.o calculate_bucket.o cxxopts.o encoding.o hellman.o picosha2.o plotter_disk.o pos_constants.o prover_disk.o sort_on_disk.o util.o verifier.o
>-
>-.SUFFIXES:.hpp .o
>-
>-.hpp.o:
>-	$(CC) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
>-
>-HellmanAttacks: ${OBJ}
>-	${CC} -o HellmanAttacks ${OBJ}
>-
>-clean:
>-	rm -f HellmanAttacks ${OBJ}
>diff -ruN chiapos.1.0.3/files/patch-CMakeLists.txt chiapos/files/patch-CMakeLists.txt
>--- chiapos.1.0.3/files/patch-CMakeLists.txt	2021-12-03 22:28:16.245456000 -0500
>+++ chiapos/files/patch-CMakeLists.txt	2021-12-03 22:16:53.009991000 -0500
>@@ -1,17 +1,21 @@
>---- CMakeLists.txt.orig	2021-05-28 02:40:44 UTC
>+--- CMakeLists.txt.orig	2021-12-03 19:59:40 UTC
> +++ CMakeLists.txt
>-@@ -14,29 +14,7 @@ endif()
>+@@ -14,33 +14,7 @@ endif()
>  project(chiapos C CXX ASM)
>  
>  # CMake 3.14+
> -include(FetchContent)
>  
>+-if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
>+-include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
>+-else()
> -FetchContent_Declare(
> -  pybind11-src
> -  GIT_REPOSITORY https://github.com/pybind/pybind11.git
>--  GIT_TAG        v2.6.2
>+-  GIT_TAG        v2.7.1
> -)
> -FetchContent_MakeAvailable(pybind11-src)
>+-endif()
> -
> -FetchContent_Declare(
> -  cxxopts
>@@ -30,9 +34,11 @@
>  set(FSE_LIB ${CMAKE_CURRENT_SOURCE_DIR}/lib/FiniteStateEntropy/lib)
>  set(FSE_FILES
>      ${FSE_LIB}/fse_compress.c
>-@@ -48,8 +26,8 @@ set(FSE_FILES
>+@@ -51,9 +25,10 @@ set(FSE_FILES
>+ 
>  include_directories(
>    ${INCLUDE_DIRECTORIES}
>++  ${CMAKE_INSTALL_PREFIX}/include
>    ${CMAKE_CURRENT_SOURCE_DIR}/../lib/include
> -  ${cxxopts_SOURCE_DIR}/include
> -  ${gulrak_SOURCE_DIR}/include/ghc
>@@ -41,7 +47,7 @@
>    ${CMAKE_CURRENT_SOURCE_DIR}/../lib/FiniteStateEntropy/lib
>    ${CMAKE_CURRENT_SOURCE_DIR}/src
>    ${CMAKE_CURRENT_SOURCE_DIR}/test
>-@@ -130,8 +108,6 @@ set(BLAKE3_SRC
>+@@ -134,8 +109,6 @@ set(BLAKE3_SRC
>  )
>  ENDIF()
>  
>@@ -50,8 +56,25 @@
>  add_executable(ProofOfSpace
>      src/cli.cpp
>      src/chacha8.c
>-@@ -145,33 +121,30 @@ add_executable(RunTests
>-     ${BLAKE3_SRC}
>+@@ -148,13 +121,6 @@ IF (BUILD_PROOF_OF_SPACE_STATICALLY)
>+   target_link_libraries(ProofOfSpace -static -Wl,--whole-archive -lrt -lpthread -Wl,--no-whole-archive)
>+ ENDIF()
>+ 
>+-FetchContent_Declare(
>+-  Catch2
>+-  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
>+-  GIT_TAG        v2.13.7
>+-)
>+-FetchContent_MakeAvailable(Catch2)
>+-
>+ add_executable(RunTests
>+     tests/test-main.cpp
>+     tests/test.cpp
>+@@ -166,18 +132,20 @@ target_link_libraries(RunTests
>+   PRIVATE
>+     fse
>+     Threads::Threads
>+-    Catch2::Catch2
>  )
>  
> +install(TARGETS ProofOfSpace DESTINATION bin)
>@@ -66,24 +89,17 @@
> -target_compile_features(chiapos PUBLIC cxx_std_17)
>  target_compile_features(RunTests PUBLIC cxx_std_17)
>  
>++
>  if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
>--  target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>+   target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>    target_link_libraries(ProofOfSpace fse Threads::Threads)
>-   target_link_libraries(RunTests fse Threads::Threads)
>- elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
>--  target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>+@@ -185,8 +153,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
>+   target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>    target_link_libraries(ProofOfSpace fse Threads::Threads)
>-   target_link_libraries(RunTests fse Threads::Threads)
>  elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
> -  target_link_libraries(chiapos PRIVATE fse Threads::Threads)
>    target_link_libraries(ProofOfSpace fse Threads::Threads)
>-   target_link_libraries(RunTests fse Threads::Threads)
>++  include(${CMAKE_INSTALL_PREFIX}/lib/cmake/Catch2/Catch.cmake)
>  elseif (MSVC)
>--  target_link_libraries(chiapos PRIVATE fse Threads::Threads uint128)
>+   target_link_libraries(chiapos PRIVATE fse Threads::Threads uint128)
>    target_link_libraries(ProofOfSpace fse Threads::Threads uint128)
>-   target_link_libraries(RunTests fse Threads::Threads uint128)
>- else()
>--  target_link_libraries(chiapos PRIVATE fse stdc++fs Threads::Threads)
>-   target_link_libraries(ProofOfSpace fse stdc++fs Threads::Threads)
>-   target_link_libraries(RunTests fse stdc++fs Threads::Threads)
>- endif()
>diff -ruN chiapos.1.0.3/files/patch-setup.py chiapos/files/patch-setup.py
>--- chiapos.1.0.3/files/patch-setup.py	2021-12-03 22:28:24.587150000 -0500
>+++ chiapos/files/patch-setup.py	2021-12-03 22:19:56.272391000 -0500
>@@ -1,5 +1,19 @@
>---- setup.py.orig	2021-05-28 02:40:44 UTC
>+--- setup.py.orig	2021-12-03 19:59:40 UTC
> +++ setup.py
>+@@ -9,13 +9,6 @@ from setuptools import setup, setuptools, Extension
>+ from setuptools.command.build_ext import build_ext
>+ from distutils.version import LooseVersion
>+ 
>+-
>+-class CMakeExtension(Extension):
>+-    def __init__(self, name, sourcedir=""):
>+-        Extension.__init__(self, name, sources=["./"])
>+-        self.sourcedir = os.path.abspath(sourcedir)
>+-
>+-
>+ class CMakeBuild(build_ext):
>+     def run(self):
>+         try:
> @@ -107,9 +100,6 @@ ext_modules = [
>              "src/chacha8.c",
>          ],
>@@ -10,21 +24,20 @@
>              "src",
>              "uint128_t",
>              ".",
>-@@ -202,6 +192,7 @@ if platform.system() == "Windows":
>+@@ -203,6 +193,7 @@ if platform.system() == "Windows":
>  else:
>      setup(
>          name="chiapos",
>-+        version="1.0.3",
>++        version="1.0.6",
>          author="Mariano Sorgente",
>          author_email="mariano@chia.net",
>          description="Chia proof of space plotting, proving, and verifying (wraps C++)",
>-@@ -209,8 +200,7 @@ else:
>-         python_requires=">=3.7",
>+@@ -211,8 +202,6 @@ else:
>          long_description=open("README.md").read(),
>          long_description_content_type="text/markdown",
>--        url="https://github.com/Chia-Network/chiavdf",
>+         url="https://github.com/Chia-Network/chiapos",
>+-        tests_require=["pytest"],
> -        ext_modules=[CMakeExtension("chiapos", ".")],
>-+        url="https://github.com/Chia-Network/chiapos",
>          cmdclass=dict(build_ext=CMakeBuild),
>          zip_safe=False,
>      )
>diff -ruN chiapos.1.0.3/pkg-descr chiapos/pkg-descr
>--- chiapos.1.0.3/pkg-descr	2021-12-03 22:27:09.415975000 -0500
>+++ chiapos/pkg-descr	2021-12-03 22:30:56.808450000 -0500
>@@ -2,9 +2,6 @@
> verifier. It exclusively runs on 64 bit architectures. Read the Proof of
> Space document to learn about what proof of space is and how it works.
> 
>-Notes:
>-i386 is not supported, and would be too slow for practical use if supported.
>-
> This port is for the cmake build (binaries).
> 
> WWW: https://github.com/Chia-Network/chiapos

Flags:

risner: maintainer-approval+

Actions: View | Diff

Attachments on bug 260190: 229862 | 229870 | 229871 | 229930