1 |
commit: 5ce7b15739d29a94773324e1295020c059f978ab |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 22 09:57:02 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 22 09:57:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce7b157 |
7 |
|
8 |
dev-libs/cyrus-sasl: switch to patchset for -r6 |
9 |
|
10 |
files/ was getting too large for the repository. |
11 |
|
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
dev-libs/cyrus-sasl/Manifest | 1 + |
15 |
dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild | 16 ++------ |
16 |
.../files/cyrus-sasl-2.1.27-autoconf-2.71.patch | 45 ---------------------- |
17 |
3 files changed, 4 insertions(+), 58 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest |
20 |
index 843afea7db80..da2a2265fd42 100644 |
21 |
--- a/dev-libs/cyrus-sasl/Manifest |
22 |
+++ b/dev-libs/cyrus-sasl/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
+DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797 |
25 |
DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b |
26 |
|
27 |
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild |
28 |
index 3f20ae795401..99c0c56d8889 100644 |
29 |
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild |
30 |
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild |
31 |
@@ -6,11 +6,12 @@ EAPI=7 |
32 |
inherit edos2unix flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles |
33 |
|
34 |
SASLAUTHD_CONF_VER="2.1.26" |
35 |
- |
36 |
+MY_PATCH_VER="${PN}-2.1.27-r6-patches" |
37 |
DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" |
38 |
HOMEPAGE="https://www.cyrusimap.org/sasl/" |
39 |
#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" |
40 |
SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" |
41 |
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.bz2" |
42 |
|
43 |
LICENSE="BSD-with-attribution" |
44 |
SLOT="2" |
45 |
@@ -47,18 +48,7 @@ MULTILIB_WRAPPED_HEADERS=( |
46 |
) |
47 |
|
48 |
PATCHES=( |
49 |
- "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch" |
50 |
- "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch" |
51 |
- "${FILESDIR}/${PN}-2.1.27-as_needed.patch" |
52 |
- "${FILESDIR}/${PN}-2.1.25-auxprop.patch" |
53 |
- "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch" |
54 |
- "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch" |
55 |
- "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch" |
56 |
- "${FILESDIR}/${PN}-2.1.27-memmem.patch" |
57 |
- "${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch" |
58 |
- "${FILESDIR}/${PN}-2.1.27-slibtool.patch" |
59 |
- "${FILESDIR}/${PN}-2.1.27-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch" |
60 |
- "${FILESDIR}/${PN}-2.1.27-autoconf-2.71.patch" |
61 |
+ "${WORKDIR}"/${MY_PATCH_VER}/ |
62 |
) |
63 |
|
64 |
pkg_setup() { |
65 |
|
66 |
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch |
67 |
deleted file mode 100644 |
68 |
index b346cd7e5002..000000000000 |
69 |
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch |
70 |
+++ /dev/null |
71 |
@@ -1,45 +0,0 @@ |
72 |
-https://bugs.gentoo.org/825342 |
73 |
- |
74 |
-commit 5664c3f535289ce9efb513a2897991b5c436bb44 |
75 |
-Author: Pavel Raiskup <praiskup@××××××.com> |
76 |
-Date: Thu Apr 1 17:26:28 2021 +0200 |
77 |
- |
78 |
- configure.ac: properly quote macro arguments |
79 |
- |
80 |
- Autoconf 2.70+ is more picky about the quotation (even though with |
81 |
- previous versions the arguments should have been quoted, too). When we |
82 |
- don't quote macros inside the AC_CACHE_VAL macro - some of the Autoconf |
83 |
- initialization is wrongly ordered in ./configure script and we keep |
84 |
- seeing bugs like: |
85 |
- |
86 |
- ./configure: line 2165: ac_fn_c_try_run: command not found |
87 |
- |
88 |
- Original report: https://bugzilla.redhat.com/1943013 |
89 |
- |
90 |
- Signed-off-by: Pavel Raiskup <praiskup@××××××.com> |
91 |
- |
92 |
---- a/configure.ac |
93 |
-+++ b/configure.ac |
94 |
-@@ -213,7 +213,8 @@ if test $sasl_cv_uscore = yes; then |
95 |
- AC_MSG_CHECKING(whether dlsym adds the underscore for us) |
96 |
- cmu_save_LIBS="$LIBS" |
97 |
- LIBS="$LIBS $SASL_DL_LIB" |
98 |
-- AC_CACHE_VAL(sasl_cv_dlsym_adds_uscore,AC_TRY_RUN( [ |
99 |
-+ AC_CACHE_VAL([sasl_cv_dlsym_adds_uscore], |
100 |
-+ [AC_TRY_RUN([ |
101 |
- #include <dlfcn.h> |
102 |
- #include <stdio.h> |
103 |
- #include <stdlib.h> |
104 |
-@@ -221,9 +222,9 @@ void foo() { int i=0;} |
105 |
- int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY); |
106 |
- if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo"); |
107 |
- if(ptr1 && !ptr2) exit(0); } exit(1); } |
108 |
--], [sasl_cv_dlsym_adds_uscore=yes], sasl_cv_dlsym_adds_uscore=no |
109 |
-- AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?]), |
110 |
-- AC_MSG_WARN(cross-compiler, we'll do our best))) |
111 |
-+], [sasl_cv_dlsym_adds_uscore=yes], [sasl_cv_dlsym_adds_uscore=no |
112 |
-+ AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?])], |
113 |
-+ [AC_MSG_WARN(cross-compiler, we'll do our best)])]) |
114 |
- LIBS="$cmu_save_LIBS" |
115 |
- AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore) |
116 |
- |