* [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/
@ 2017-08-18 17:34 Alon Bar-Lev
0 siblings, 0 replies; 4+ messages in thread
From: Alon Bar-Lev @ 2017-08-18 17:34 UTC (permalink / raw
To: gentoo-commits
commit: b513ba6e336e37c2784b5118e1f633794e6c87db
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 10 08:25:15 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 10:29:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b513ba6e
app-crypt/xca: remove unused patch
app-crypt/xca/files/xca-1.1.0-ec.patch | 124 ---------------------------------
1 file changed, 124 deletions(-)
diff --git a/app-crypt/xca/files/xca-1.1.0-ec.patch b/app-crypt/xca/files/xca-1.1.0-ec.patch
deleted file mode 100644
index 617f7a14c31..00000000000
--- a/app-crypt/xca/files/xca-1.1.0-ec.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From ca758f29c89d87581b244c652f7a14c8306cc994 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 7 Jan 2015 14:43:37 +0200
-Subject: [PATCH] Add more EC conditionals
-
-Upstream bug:
-https://sourceforge.net/p/xca/patches/16/
-
----
- lib/pki_scard.cpp | 12 ++++++++++++
- widgets/MW_help.cpp | 2 +-
- widgets/NewKey.cpp | 2 +-
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/lib/pki_scard.cpp b/lib/pki_scard.cpp
-index 444c81d..547c932 100644
---- a/lib/pki_scard.cpp
-+++ b/lib/pki_scard.cpp
-@@ -237,7 +237,9 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
- QByteArray ba;
- RSA *rsa = pk->pkey.rsa;
- DSA *dsa = pk->pkey.dsa;
-+#ifndef OPENSSL_NO_EC
- EC_KEY *ec = pk->pkey.ec;
-+#endif
-
- pk11_attlist attrs(pk11_attr_ulong(CKA_CLASS,
- priv ? CKO_PRIVATE_KEY : CKO_PUBLIC_KEY));
-@@ -254,6 +256,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
- pk11_attr_data(CKA_SUBPRIME, dsa->q, false) <<
- pk11_attr_data(CKA_BASE, dsa->g, false);
- break;
-+#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC:
- ba = i2d_bytearray(I2D_VOID(i2d_ECPKParameters),
- EC_KEY_get0_group(ec));
-@@ -261,6 +264,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
- attrs << pk11_attr_ulong(CKA_KEY_TYPE, CKK_EC) <<
- pk11_attr_data(CKA_EC_PARAMS, ba);
- break;
-+#endif
- default:
- throw errorEx(QString("Unkown Keytype %d").arg(pk->type));
-
-@@ -330,7 +334,9 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
- QByteArray ba;
- RSA *rsa = pkey->pkey.rsa;
- DSA *dsa = pkey->pkey.dsa;
-+#ifndef OPENSSL_NO_EC
- EC_KEY *ec = pkey->pkey.ec;
-+#endif
- pk11_attlist pub_atts;
- pk11_attlist priv_atts;
- QList<CK_OBJECT_HANDLE> objects;
-@@ -381,6 +387,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
- priv_atts << pk11_attr_data(CKA_VALUE, dsa->priv_key, false);
- pub_atts << pk11_attr_data(CKA_VALUE, dsa->pub_key, false);
- break;
-+#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC: {
- /* Public Key */
- BIGNUM *point;
-@@ -410,6 +417,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
- EC_KEY_get0_private_key(ec));
- break;
- }
-+#endif
- default:
- throw errorEx(QString("Unkown Keytype %d").arg(pkey->type));
-
-@@ -459,11 +467,13 @@ QList<int> pki_scard::possibleHashNids()
- case CKM_DSA_SHA1: nids << NID_sha1; break;
- }
- break;
-+#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC:
- switch (mechanism) {
- case CKM_ECDSA_SHA1: nids << NID_sha1; break;
- }
- break;
-+#endif
- }
- }
- if (nids.count() == 0) {
-@@ -473,7 +483,9 @@ QList<int> pki_scard::possibleHashNids()
- NID_sha384 << NID_sha512 << NID_ripemd160;
- break;
- case EVP_PKEY_DSA:
-+#ifndef OPENSSL_NO_EC
- case EVP_PKEY_EC:
-+#endif
- nids << NID_sha1;
- break;
- }
-diff --git a/widgets/MW_help.cpp b/widgets/MW_help.cpp
-index 67faa2a..c13c309 100644
---- a/widgets/MW_help.cpp
-+++ b/widgets/MW_help.cpp
-@@ -65,7 +65,7 @@ void MainWindow::about()
- }
- #endif
- #else
-- brainpool = "(Elliptic Curve Cryptography support disabled)"
-+ brainpool = "(Elliptic Curve Cryptography support disabled)";
- #endif
- openssl = SSLeay_version(SSLEAY_VERSION);
- qt = qVersion();
-diff --git a/widgets/NewKey.cpp b/widgets/NewKey.cpp
-index 824456d..0dba2c2 100644
---- a/widgets/NewKey.cpp
-+++ b/widgets/NewKey.cpp
-@@ -79,8 +79,8 @@ class keyListItem
- */
- ec_flags = CKF_EC_F_P | CKF_EC_F_2M;
- }
-- }
- #endif
-+ }
- printname = QString("%1 #%2 (%3 Key of %4 - %5 bits)").
- arg(ti.label()).arg(ti.serial()).
- arg(tl->name).
---
-2.0.5
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/
@ 2021-08-27 23:40 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2021-08-27 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 620deaf5e9e56f84ffb7aadad5b75555b44de059
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Aug 20 18:24:14 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 23:36:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=620deaf5
app-crypt/xca: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22056
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-crypt/xca/files/xca-2.1.2-bug-733000.patch | 31 --------------------------
1 file changed, 31 deletions(-)
diff --git a/app-crypt/xca/files/xca-2.1.2-bug-733000.patch b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
deleted file mode 100644
index 3e17a8aa9a9..00000000000
--- a/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/doc/Makefile b/doc/Makefile
-index 7c9a643..f88c209 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -3,15 +3,11 @@ TOPDIR=..
- BUILD=..
- endif
-
--DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
-+DELFILES=xca*.html changelog.html database_schema.html
-
--doc: xca.1.gz xca.html changelog.html database_schema.html
-+doc: xca.1 xca.html changelog.html database_schema.html
- include $(TOPDIR)/Rules.mak
-
--%.1.gz: %.1
-- @$(PRINT) " MAN [$(BASENAME)] $@"
-- gzip -9 <$^ >$@
--
- xca.html: xca.sgml
- rm -f xca*.html
- echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
-@@ -23,7 +19,7 @@ install: $(doc)
- $(ENABLE_DOC)install -m 755 -d $(destdir)$(htmldir)
- $(ENABLE_DOC)install -m 644 xca*.html $(destdir)$(htmldir)
- install -m 755 -d $(destdir)$(mandir)/man1
-- install -m 644 *.1.gz $(destdir)/$(mandir)/man1
-+ install -m 644 *.1 $(destdir)/$(mandir)/man1
-
- app: xca.html
- mkdir -p $(APPDIR)/Resources
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/
@ 2022-04-18 7:15 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-04-18 7:15 UTC (permalink / raw
To: gentoo-commits
commit: e812d3ca8a6547a8ab21038c643cdb79dcb86e87
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 18 06:58:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:15:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e812d3ca
app-crypt/xca: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25078
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/xca/files/xca-2.3.0-bug-733000.patch | 28 --------------------------
1 file changed, 28 deletions(-)
diff --git a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
deleted file mode 100644
index 044575475c89..000000000000
--- a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/doc/Makefile b/doc/Makefile
-index d481c5a..dc5b49a 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -5,13 +5,9 @@ endif
-
- DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
-
--doc: xca.1.gz xca.html changelog.html database_schema.html
-+doc: xca.1 xca.html changelog.html database_schema.html
- include $(TOPDIR)/Rules.mak
-
--%.1.gz: %.1
-- @$(PRINT) " MAN [$(BASENAME)] $@"
-- gzip -9 <$^ >$@
--
- xca.html: xca.sgml
- rm -f xca*.html
- echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
-@@ -23,7 +19,7 @@ install: $(doc)
- $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
- $(ENABLE_DOC)install -m 644 xca*.html $(DESTDIR)$(htmldir)
- install -m 755 -d $(DESTDIR)$(mandir)/man1
-- install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1
-+ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1
-
- app: xca.html
- mkdir -p $(APPDIR)/Resources
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/
@ 2023-12-28 1:03 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2023-12-28 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 3f65a7c76a9eab140f9763d405b74b0d3acbf7e6
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 26 09:30:45 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 01:03:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f65a7c7
app-crypt/xca: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34486
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-crypt/xca/files/xca-2.4.0-bug-733000.patch | 29 --------------------------
1 file changed, 29 deletions(-)
diff --git a/app-crypt/xca/files/xca-2.4.0-bug-733000.patch b/app-crypt/xca/files/xca-2.4.0-bug-733000.patch
deleted file mode 100644
index 0863c906957e..000000000000
--- a/app-crypt/xca/files/xca-2.4.0-bug-733000.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/doc/Makefile 2021-05-07 22:40:29.000000000 +0200
-+++ b/doc/Makefile 2021-08-11 07:29:33.794844656 +0200
-@@ -12,16 +12,12 @@
-
- SPHINX_FILES=$(patsubst %,sphinx/%.rst,$(RST_FILES))
-
--.build-stamp doc: xca.1.gz html/index.html qthelp/xca.qhc
-+.build-stamp doc: xca.1 html/index.html qthelp/xca.qhc
- qthelpfiles=qthelp/*.html qthelp/xca.qhc qthelp/xca.qch
- .install-stamp: doc
-
- include $(TOPDIR)/Rules.mak
-
--%.1.gz: %.1
-- @$(PRINT) " MAN [$(BASENAME)] $@"
-- gzip -9 <$^ >$@
--
- xca.1: xca.1.head xca.1.options xca.1.tail
- cat $^ > $@
-
-@@ -43,7 +39,7 @@
- $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
- $(ENABLE_DOC)install -m 644 $(qthelpfiles) $(DESTDIR)$(htmldir)
- install -m 755 -d $(DESTDIR)$(mandir)/man1
-- install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1
-+ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1
-
- app: $(doc)
- mkdir -p $(APPDIR)/Resources
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-28 1:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-28 1:03 [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-04-18 7:15 Sam James
2021-08-27 23:40 Conrad Kostecki
2017-08-18 17:34 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox