* fix up missing files

This commit is contained in:
Alexander Baldeck 2021-01-26 13:58:41 +01:00
parent d41c6becf3
commit 5381e24e8b
4 changed files with 153 additions and 4 deletions

View File

@ -10,8 +10,8 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=asciidoc
pkgver=9.0.4
pkgrel=2
pkgver=9.0.5
pkgrel=1
pkgdesc='Text document format for short documents, articles, books and UNIX man pages'
arch=('any')
url='https://asciidoc.org/'
@ -27,8 +27,8 @@ optdepends=('graphviz: graphviz-filter'
'w3m: text generation'
'lynx: alternative text generation')
source=("https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('9e269f336a71e8685d03a00c71b55ca029eed9f7baf1afe67c447be32206b176')
b2sums=('3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f')
sha256sums=('b73248717403fe49ef239b2bdb95f2b603e0af15ddd8f5e420f27707010bf95f')
b2sums=('3e5a454f4d47bb3c71e4c180ab05a0d23985473ca83d987435614ddafc9ee0d340a6e6cdafcb7371f719487954233f6d4bae69b4fc7d3818fc1d8e91c94ef36e')
prepare() {
cd ${pkgname}-py3-${pkgver}

View File

@ -0,0 +1,46 @@
diff -ruN a/Autostart/Systemd/brltty@.service.in b/Autostart/Systemd/brltty@.service.in
--- a/Autostart/Systemd/brltty@.service.in 2020-12-11 23:51:58.000000000 +0100
+++ b/Autostart/Systemd/brltty@.service.in 2021-01-20 23:57:46.159394660 +0100
@@ -83,8 +83,8 @@
# for serial I/O (/dev/ttyS<n>)
# probably only one of these should be uncommented
-SupplementaryGroups=dialout
-#SupplementaryGroups=uucp
+# SupplementaryGroups=dialout
+SupplementaryGroups=uucp
# for USB I/o via USBFS (/dev/bus/usb/*/*)
SupplementaryGroups=root
@@ -93,7 +93,7 @@
SupplementaryGroups=audio
# for playing sound via the Pulse Audio daemon
-SupplementaryGroups=pulse-access
+# SupplementaryGroups=pulse-access
# for monitoring keyboard input (/dev/input/*)
SupplementaryGroups=input
diff -ruN a/Autostart/Systemd/sysusers b/Autostart/Systemd/sysusers
--- a/Autostart/Systemd/sysusers 2020-11-29 13:35:32.000000000 +0100
+++ b/Autostart/Systemd/sysusers 2021-01-20 23:58:58.186157113 +0100
@@ -30,8 +30,8 @@
# for serial I/O (/dev/ttyS<n>)
# probably only one of these should be uncommented
-m brltty dialout
-#m brltty uucp
+# m brltty dialout
+m brltty uucp
# for USB I/o (/dev/bus/usb/*/*)
m brltty root
@@ -40,7 +40,7 @@
m brltty audio
# for playing sound via the Pulse Audio daemon
-m brltty pulse-access
+# m brltty pulse-access
# for monitoring keyboard input (/dev/input/*)
m brltty input

View File

@ -0,0 +1,95 @@
diff --git a/cipher/ecc-curves.c b/cipher/ecc-curves.c
index 26006d6c..900b668a 100644
--- a/cipher/ecc-curves.c
+++ b/cipher/ecc-curves.c
@@ -1200,13 +1200,18 @@ mpi_ec_setup_elliptic_curve (mpi_ec_t ec, int flags,
if ((n+7)/8 != len)
{
- if ((n+7)/8 < len && ec->dialect == ECC_DIALECT_ED25519)
+ if (ec->dialect == ECC_DIALECT_ED25519)
{
/*
* GnuPG (<= 2.2) or OpenPGP implementations with no
* SOS support may remove zeros at the beginning.
* Recover those zeros.
*/
+ /*
+ * Also, GnuPG (<= 2.2) may add additional zero at
+ * the beginning, when private key is moved from
+ * OpenPGP to gpg-agent. Remove such a zero-prefix.
+ */
const unsigned char *buf;
unsigned char *value;
@@ -1214,13 +1219,26 @@ mpi_ec_setup_elliptic_curve (mpi_ec_t ec, int flags,
if (!buf)
return GPG_ERR_INV_OBJ;
- value = xtrycalloc_secure (1, len);
+ value = xtrymalloc_secure (len);
if (!value)
return gpg_err_code_from_syserror ();
- memset (value, 0, len - (n+7)/8);
- memcpy (value + len - (n+7)/8, buf, (n+7)/8);
- mpi_set_opaque (ec->d, value, len);
+ if ((n+7)/8 < len)
+ /* Recover zeros. */
+ {
+ memset (value, 0, len - (n+7)/8);
+ memcpy (value + len - (n+7)/8, buf, (n+7)/8);
+ }
+ else if ((n+7)/8 == len + 1)
+ /* Remove a zero. */
+ memcpy (value, buf+1, len);
+ else
+ {
+ xfree (value);
+ return GPG_ERR_INV_OBJ;
+ }
+
+ mpi_set_opaque (ec->d, value, len*8);
}
else
{
diff --git a/cipher/ecc.c b/cipher/ecc.c
index b4672d3d..5d8c7607 100644
--- a/cipher/ecc.c
+++ b/cipher/ecc.c
@@ -688,6 +688,8 @@ ecc_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_data, gcry_sexp_t keyparms)
mpi_ec_t ec = NULL;
int flags = 0;
+ _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_SIGN, 0);
+
/*
* Extract the key.
*/
@@ -700,7 +702,6 @@ ecc_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_data, gcry_sexp_t keyparms)
goto leave;
}
- _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_SIGN, 0);
ctx.flags |= flags;
if (ec->model == MPI_EC_EDWARDS && ec->dialect == ECC_DIALECT_SAFECURVE)
ctx.flags |= PUBKEY_FLAG_EDDSA;
@@ -783,6 +784,9 @@ ecc_verify (gcry_sexp_t s_sig, gcry_sexp_t s_data, gcry_sexp_t s_keyparms)
mpi_ec_t ec = NULL;
int flags = 0;
+ _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_VERIFY,
+ ecc_get_nbits (s_keyparms));
+
/*
* Extract the key.
*/
@@ -804,8 +808,6 @@ ecc_verify (gcry_sexp_t s_sig, gcry_sexp_t s_data, gcry_sexp_t s_keyparms)
goto leave;
}
- _gcry_pk_util_init_encoding_ctx (&ctx, PUBKEY_OP_VERIFY,
- ecc_get_nbits (s_keyparms));
ctx.flags |= flags;
if (ec->model == MPI_EC_EDWARDS && ec->dialect == ECC_DIALECT_SAFECURVE)
ctx.flags |= PUBKEY_FLAG_EDDSA;

8
postfix/postfix.install Normal file
View File

@ -0,0 +1,8 @@
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
# introduction of split packages
if [ "$(vercmp "$2" "3.5.9")" -le 0 ]; then
echo "WARNING: The following features are now only available via optdepends: cdb, ldap, lmdb, mysql, pcre, pgsql, sqlite."
fi
}