kpcyrd pushed to branch main at Arch Linux / Packaging / Packages / monero
Commits:
2c364e18 by kpcyrd at 2024-03-10T16:44:47+01:00
upgpkg: 0.18.3.2-1
- - - - -
4 changed files:
- .SRCINFO
- + .nvchecker.toml
- PKGBUILD
- + fortify-source.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,14 +1,16 @@
pkgbase = monero
pkgdesc = Monero: the secure, private, untraceable peer-to-peer currency
- pkgver = 0.18.3.1
- pkgrel = 4
+ pkgver = 0.18.3.2
+ pkgrel = 1
url = https://getmonero.org/
arch = x86_64
- license = BSD
+ license = BSD-3-Clause
makedepends = boost
makedepends = cmake
makedepends = git
makedepends = python
+ depends = gcc-libs
+ depends = glibc
depends = libboost_program_options.so
depends = libhidapi-libusb.so
depends = libreadline.so
@@ -20,12 +22,13 @@ pkgbase = monero
depends = libzmq.so
depends = pcsclite
depends = protobuf
- source =
monero::git+https://github.com/monero-project/monero?signed#commit=2656cdf5056c07684741c4425a051760b97025b0
+ source =
monero::git+https://github.com/monero-project/monero?signed#commit=ef3e18b51beb937c7f786ecef0d0a0e3f6295082
source = git+https://github.com/miniupnp/miniupnp.git
source = git+https://github.com/Tencent/rapidjson.git
source = git+https://github.com/trezor/trezor-common.git
source = git+https://github.com/tevador/RandomX.git
source = git+https://github.com/monero-project/supercop.git
+ source = fortify-source.patch
source = monero.sysusers
source = monero.tmpfiles
validpgpkeys = 8777AB8F778EE89487A2F8E7F4ACA0183641E010
@@ -37,6 +40,7 @@ pkgbase = monero
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
+ sha512sums =
cbb67fee67d053bbc929ad0eeaad6421fae43acf5f1ae4df346333362da7f50adc985a63c27bc4ac2a7c1f226d27162a6cad9908b53866180153a5422038e3db
sha512sums =
2e4ecf3f305dab46e166f50c0451dd969927b485df544aebcf8115a65444573e6d57a8ac6bea64ce5ab4b5cce2c70f913d9ac3bce561c59acf89851edc76a22c
sha512sums =
ae3c300548e6ba5fdf6a203146e5dcaf1955c3e19820c0bb3a73bb70ec5629a3af00d43dac95b6f3832ded5c480e872d829981a63206016d4a64f3940b713357
=====================================
.nvchecker.toml
=====================================
@@ -0,0 +1,5 @@
+[monero]
+source = "github"
+github = "monero-project/monero"
+prefix = "v"
+use_max_tag = true
=====================================
PKGBUILD
=====================================
@@ -1,14 +1,16 @@
# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
pkgname=monero
-pkgver=0.18.3.1
-_commit=2656cdf5056c07684741c4425a051760b97025b0
-pkgrel=4
+pkgver=0.18.3.2
+_commit=ef3e18b51beb937c7f786ecef0d0a0e3f6295082
+pkgrel=1
pkgdesc="Monero: the secure, private, untraceable peer-to-peer currency"
-license=('BSD')
+license=('BSD-3-Clause')
arch=('x86_64')
url="https://getmonero.org/";
depends=(
+ 'gcc-libs'
+ 'glibc'
'libboost_program_options.so'
'libhidapi-libusb.so'
'libreadline.so'
@@ -34,6 +36,7 @@ source=(
"git+https://github.com/trezor/trezor-common.git";
"git+https://github.com/tevador/RandomX.git";
"git+https://github.com/monero-project/supercop.git";
+ "fortify-source.patch"
"monero.sysusers"
"monero.tmpfiles"
)
@@ -43,6 +46,7 @@ sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+
'cbb67fee67d053bbc929ad0eeaad6421fae43acf5f1ae4df346333362da7f50adc985a63c27bc4ac2a7c1f226d27162a6cad9908b53866180153a5422038e3db'
'2e4ecf3f305dab46e166f50c0451dd969927b485df544aebcf8115a65444573e6d57a8ac6bea64ce5ab4b5cce2c70f913d9ac3bce561c59acf89851edc76a22c'
'ae3c300548e6ba5fdf6a203146e5dcaf1955c3e19820c0bb3a73bb70ec5629a3af00d43dac95b6f3832ded5c480e872d829981a63206016d4a64f3940b713357')
validpgpkeys=(
@@ -65,6 +69,8 @@ prepare() {
git cherry-pick -n c32befe4f8385f5f893c0db611060bc7c7b425f3
# Fix build with protobuf 23
sed -e 's|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|' -i CMakeLists.txt
+
+ patch -Np1 -i ../fortify-source.patch
}
build() {
=====================================
fortify-source.patch
=====================================
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8fb03ba1f..9f9cb753e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -819,12 +819,6 @@ else()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
+
+- # if those don't work for your compiler, single it out where appropriate
+- if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT OPENBSD)
+- set(C_SECURITY_FLAGS "${C_SECURITY_FLAGS} -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1")
+- set(CXX_SECURITY_FLAGS "${CXX_SECURITY_FLAGS} -U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=1")
+- endif()
+-
+ # warnings
+ add_c_flag_if_supported(-Wformat C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-Wformat CXX_SECURITY_FLAGS)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/monero/-/commit/2c364e18f999510ea96b137f9ad1ffb8b94cd6d7
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/monero/-/commit/2c364e18f999510ea96b137f9ad1ffb8b94cd6d7
You're receiving this email because of your account on gitlab.archlinux.org.
