From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] crypto++: update to 820
Date: Sun, 29 Sep 2019 22:21:34 +0200 [thread overview]
Message-ID: <20190929202134.UhHYf5b0d469qAKzT4ktZ7XYiAADGuvcZ4Ij5bZ2yxw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14746@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages crypto++_820
https://github.com/void-linux/void-packages/pull/14746
crypto++: update to 820
A patch file from https://github.com/void-linux/void-packages/pull/14746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-crypto++_820-14746.patch --]
[-- Type: text/x-diff, Size: 6563 bytes --]
From 718ef59925be6f01e80cf6989717ce6aca5be10a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 26 Sep 2019 13:11:40 -0500
Subject: [PATCH 1/4] crypto++: update to 820.
---
common/shlibs | 2 +-
srcpkgs/crypto++/patches/arm-native.patch | 26 -------------------
.../crypto++/patches/musl-soname-links.patch | 10 -------
srcpkgs/crypto++/template | 16 +++++++-----
4 files changed, 11 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/crypto++/patches/arm-native.patch
delete mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch
diff --git a/common/shlibs b/common/shlibs
index b362b34f155..b2ee025bc00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1312,7 +1312,7 @@ libkworkspace5.so.5 kworkspace-5.14.5_2
libdb-5.3.so libdb-5.3.21_1
libdb_cxx-5.3.so libdb-cxx-5.3.21_1
libcares.so.2 c-ares-1.10.0_1
-libcryptopp.so.5.6 crypto++-565_1
+libcryptopp.so.8 crypto++-820_1
libphonon.so.4 phonon-4.6.0_1
libphononexperimental.so.4 phonon-4.6.0_1
libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch
deleted file mode 100644
index ff7678735d3..00000000000
--- a/srcpkgs/crypto++/patches/arm-native.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- GNUmakefile.orig
-+++ GNUmakefile
-@@ -125,23 +125,6 @@
- endif
- endif
-
--# Guard use of -march=native
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
-- CXXFLAGS += -march=native
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
-- CXXFLAGS += -march=native
--else
-- # GCC 3.3 and "unknown option -march="
-- # Ubuntu GCC 4.1 compiler crash with -march=native
-- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
-- # Sun compiler is handled below
-- ifeq ($(SUN_COMPILER)$(IS_X64),01)
-- CXXFLAGS += -m64
-- else ifeq ($(SUN_COMPILER)$(IS_X86),01)
-- CXXFLAGS += -m32
-- endif # X86/X32/X64
--endif
--
- # Aligned access required for -O3 and above due to vectorization
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
- ifneq ($(UNALIGNED_ACCESS),0)
diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch
deleted file mode 100644
index 34f3b4fbfe6..00000000000
--- a/srcpkgs/crypto++/patches/musl-soname-links.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GNUmakefile.orig 2017-09-22 10:27:03.000000000 +0000
-+++ GNUmakefile 2017-09-22 10:34:42.897537258 +0000
-@@ -581,6 +581,7 @@
- -$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
- ifeq ($(HAS_SOLIB_VERSION),1)
- -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-+ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
- $(LDCONF) $(DESTDIR)$(LIBDIR)
- endif
- endif
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index bce3e38a963..7ee121dcdef 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,20 +1,24 @@
-# Template build file for 'crypto++'.
+# Template file for 'crypto++'
pkgname=crypto++
-version=565
-revision=3
+version=820
+revision=1
create_wrksrc=yes
build_style=gnu-makefile
make_build_target="libcryptopp.so libcryptopp.a"
hostmakedepends="unzip"
-short_desc="A free C++ class library of cryptographic schemes"
+short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSL-1.0, Public Domain"
homepage="http://www.cryptopp.com/"
-license="Boost Software License 1.0, Public domain"
distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34
+checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC"
+if [ "$XBPS_CROSS" ]; then
+ make_build_args="-f GNUmakefile-cross"
+fi
+
post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
}
From a080b071c83e66d351da7802e75c5f6a349075d6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 26 Sep 2019 13:11:40 -0500
Subject: [PATCH 2/4] MEGAsdk: rebuild for crypto++
---
srcpkgs/MEGAsdk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 864b70a7adc..52aa7573279 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,7 +1,7 @@
# Template file for 'MEGAsdk'
pkgname=MEGAsdk
version=3.6.2a
-revision=1
+revision=2
wrksrc="sdk-${version}"
build_style=gnu-configure
configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
From 2f6699ff55e453bf99befb6e3f78ac3719e0bb16 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 26 Sep 2019 13:11:40 -0500
Subject: [PATCH 3/4] clementine: rebuild for crypto++
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 1a58a07c556..74c67b8a687 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=19
+revision=20
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
wrksrc="Clementine-${_commit}"
build_style=cmake
From 6257e5e5218526050a6890cd423f0b2bd49cc5cd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 26 Sep 2019 13:11:41 -0500
Subject: [PATCH 4/4] codecrypt: rebuild for crypto++
---
srcpkgs/codecrypt/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template
index 697c9672d6a..13c8b79abd7 100644
--- a/srcpkgs/codecrypt/template
+++ b/srcpkgs/codecrypt/template
@@ -1,14 +1,14 @@
# Template file for 'codecrypt'
pkgname=codecrypt
version=1.8
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="crypto++-devel fftw-devel gmp-devel"
-maintainer="Orphaned <orphan@voidlinux.org>"
short_desc="Post-quantum cryptography tool"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
homepage="https://e-x-a.org/codecrypt"
-license="LGPL-3"
distfiles="https://github.com/exaexa/codecrypt/archive/v${version}.tar.gz"
checksum=25f11bc361b4f8aca7245698334b5715b7d594d708a75e8cdb2aa732dc46eb96
next prev parent reply other threads:[~2019-09-29 20:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 18:30 [PR PATCH] " voidlinux-github
2019-09-29 20:21 ` voidlinux-github [this message]
2019-09-29 20:21 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-30 14:42 ` voidlinux-github
2019-09-30 14:42 ` voidlinux-github
2019-09-30 18:18 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190929202134.UhHYf5b0d469qAKzT4ktZ7XYiAADGuvcZ4Ij5bZ2yxw@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).