Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnupg ver. bump

Browse Source
This commit is contained in:
Rmys
2022-12-06 13:32:54 +03:00
parent c88ea1c12c
commit 1ef96cc545
12 changed files with 579 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/crypt/gnupg/actions.py
+41
View File
@@ -0,0 +1,41 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
#shelltools.export("CFLAGS","%s -fPIE" % get.CFLAGS())
#shelltools.export("LDFLAGS", "%s -pie -Wl,-z,relro,-z,now" % get.LDFLAGS())
shelltools.system("sed -e '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in")
autotools.configure("--enable-symcryptrun \
--disable-rpath \
--enable-gpgtar \
--enable-maintainer-mode")
def build():
autotools.make("-j1")
autotools.make("-C doc html")
# IMPORTANT: for packagers check disabled for build in farm. please test local if passed, commit
#def check():
# autotools.make("check")
def install():
autotools.rawInstall('DESTDIR=%s libexecdir="/usr/libexec"' % get.installDIR())
# Compat symlinks
pisitools.dosym("gpg", "/usr/bin/gpg2")
pisitools.dosym("gpgv", "/usr/bin/gpgv2")
pisitools.dosym("gpg.1", "/usr/share/man/man1/gpg2.1")
pisitools.dosym("gpgv.1", "/usr/share/man/man1/gpgv2.1")
# Lets make doc
pisitools.dohtml("doc/*")
pisitools.dohtml("doc/gnupg.html/*")
pisitools.dodoc("ChangeLog", "NEWS", "README", "THANKS", "TODO")
util/crypt/gnupg/comar/package.py
+7
View File
@@ -0,0 +1,7 @@
#!/usr/bin/python
import os
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("/bin/chmod u+s,go-r /usr/bin/gpg2")
os.system("/bin/chmod u+s,go-r /usr/bin/gpg-agent")
util/crypt/gnupg/files/gnupg-1.9.3-use-ImageMagick-for-photo.patch
+11
View File
@@ -0,0 +1,11 @@
--- gnupg-1.9.3/g10/photoid.c.display 2004-01-24 15:03:56.745060064 +0800
+++ gnupg-1.9.3/g10/photoid.c 2004-01-24 15:04:21.560287576 +0800
@@ -240,7 +240,7 @@
#elif defined(__riscos__)
return "Filer_Run %I";
#else
- return "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin";
+ return "display -title 'KeyID 0x%k'";
#endif
}
#endif
util/crypt/gnupg/files/gnupg-2.0.14-tests-s2kcount.patch
+67
View File
@@ -0,0 +1,67 @@
We have to use fixed s2k-count number otherwise the gpg2 would
want to consult gpg-agent which is not yet installed in the mock
chroot.
Index: gnupg-2.0.17/tests/openpgp/conventional-mdc.test
===================================================================
--- gnupg-2.0.17.orig/tests/openpgp/conventional-mdc.test
+++ gnupg-2.0.17/tests/openpgp/conventional-mdc.test
@@ -21,9 +21,9 @@ for ciph in `all_cipher_algos`; do
dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
fi
echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
- --force-mdc --cipher $ciph -c -o x --yes z
+ --force-mdc --cipher $ciph -c -o x --yes --s2k-count 65536 z
echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
- -o y --yes x
+ -o y --yes --s2k-count 96 x
cmp z y || error "$ciph/$i: mismatch"
done
done
Index: gnupg-2.0.17/tests/openpgp/conventional.test
===================================================================
--- gnupg-2.0.17.orig/tests/openpgp/conventional.test
+++ gnupg-2.0.17/tests/openpgp/conventional.test
@@ -12,8 +12,8 @@
#info Checking conventional encryption
for i in plain-2 data-32000 ; do
- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes $i
- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x
+ echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes --s2k-count 65536 $i
+ echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes --s2k-count 65536 x
cmp $i y || error "$i: mismatch"
done
@@ -21,8 +21,8 @@ for a in `all_cipher_algos`; do
echo_n "$a "
for i in plain-1 data-80000 ; do
echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
- --cipher-algo $a -c -o x --yes $i
- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x
+ --cipher-algo $a -c -o x --yes --s2k-count 65536 $i
+ echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes --s2k-count 65536 x
cmp $i y || error "$i: ($a) mismatch"
done
done
Index: gnupg-2.0.17/tests/openpgp/genkey1024.test
===================================================================
--- gnupg-2.0.17.orig/tests/openpgp/genkey1024.test
+++ gnupg-2.0.17/tests/openpgp/genkey1024.test
@@ -10,7 +10,7 @@
. $srcdir/defs.inc || exit 3
-$GPG --quiet --batch --debug-quick-random --gen-key <<EOF
+$GPG --quiet --batch --debug-quick-random --s2k-count 65536 --gen-key <<EOF
Key-Type: DSA
Key-Length: 1024
Subkey-Type: ELG
@@ -24,7 +24,7 @@ Passphrase: abc
EOF
if have_pubkey_algo "RSA"; then
-$GPG --quiet --batch --debug-quick-random --gen-key <<EOF
+$GPG --quiet --batch --debug-quick-random --s2k-count 65536 --gen-key <<EOF
Key-Type: RSA
Key-Length: 1024
Key-Usage: sign,encrypt
util/crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+33
View File
@@ -0,0 +1,33 @@
From e3bdb7d17264b8d5bd9abab97c96d9c4a50e4f61 Mon Sep 17 00:00:00 2001
From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
Date: Mon, 3 Apr 2017 23:44:56 +0300
Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test
reliability
--
As socket lengths are normally restricted to 108 characters
(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters
by default easily results in errors.
---
tests/gpgscm/tests.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 592b36f..f54a387 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -273,9 +273,9 @@
(canonical-path (_mkdtemp (if (null? components)
(path-join
(get-temp-path)
- (string-append "gpgscm-" (get-isotime) "-"
+ (string-append "gscm"
(basename-suffix *scriptname* ".scm")
- "-XXXXXX"))
+ "XXXXXX"))
(apply path-join components)))))
;; Make a temporary directory and remove it at interpreter shutdown.
--
2.10.2
util/crypt/gnupg/files/protect-tool-env.patch
+28
View File
@@ -0,0 +1,28 @@
diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
--- old/agent/protect-tool.c 2012-12-08 13:53:17.067611957 +1100
+++ new/agent/protect-tool.c 2012-12-08 13:53:28.247633012 +1100
@@ -102,6 +102,7 @@
static int opt_status_msg;
static const char *opt_p12_charset;
static const char *opt_agent_program;
+static session_env_t opt_session_env;
static char *get_passphrase (int promptno);
static void release_passphrase (char *pw);
@@ -1040,6 +1041,7 @@
opt_homedir = default_homedir ();
+ opt_session_env = session_env_new ();
pargs.argc = &argc;
pargs.argv = &argv;
@@ -1091,7 +1093,7 @@
opt.verbose,
opt_homedir,
opt_agent_program,
- NULL, NULL, NULL);
+ NULL, NULL, opt_session_env);
if (opt_prompt)
opt_prompt = percent_plus_unescape (opt_prompt, 0);
util/crypt/gnupg/pspec.xml
+165
View File
@@ -0,0 +1,165 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gnupg</Name>
<Homepage>http://www.gnupg.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv3+</License>
<IsA>app:console</IsA>
<Summary>The GNU Privacy Guard, a PGP replacement</Summary>
<Description>GnuPG allows to encrypt and sign your data and communication, features a versatile key managment system as well as access modules for all kinds of public key directories.</Description>
<Archive sha1sum="1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc" type="tarbz2">https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2</Archive>
<BuildDependencies>
<Dependency>openldap-client</Dependency>
<Dependency>pinentry</Dependency>
<Dependency>npth-devel</Dependency>
<Dependency>libassuan-devel</Dependency>
<Dependency>libksba-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>bzip2</Dependency>
<Dependency>texinfo</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>gnutls-devel</Dependency>
<Dependency>readline-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>libgpg-error-devel</Dependency>
<Dependency>libusb-compat-devel</Dependency>
<Dependency>tpm2-tss-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch</Patch>
</Patches>
</Source>
<Package>
<Name>gnupg</Name>
<Replaces>
<Package>dirmngr</Package>
</Replaces>
<Conflicts>
<Package>dirmngr</Package>
</Conflicts>
<RuntimeDependencies>
<Dependency>openldap-client</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>npth</Dependency>
<Dependency>libassuan</Dependency>
<Dependency>pinentry</Dependency>
<Dependency>libksba</Dependency>
<Dependency>zlib</Dependency>
<Dependency>bzip2</Dependency>
<Dependency>gnutls</Dependency>
<Dependency>readline</Dependency>
<Dependency>libgcrypt</Dependency>
<Dependency>libgpg-error</Dependency>
<Dependency>libusb</Dependency>
<Dependency>tpm2-tss</Dependency>
<!-- For scdaemon -->
<Dependency>libusb-compat</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="library">/usr/libexec</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="doc">/usr/share/doc/html</Path>
<Path fileType="data">/usr/share/gnupg</Path>
<Path fileType="info">/usr/share/info</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<Provides>
<COMAR script="package.py">System.Package</COMAR>
</Provides>
</Package>
<Package>
<Name>gnupg-docs</Name>
<Summary>Documentation files for GnuPG</Summary>
<RuntimeDependencies>
<Dependency release="current">gnupg</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc/gnupg/html</Path>
<Path fileType="doc">/usr/share/gnupg/help.*</Path>
<Path fileType="doc">/usr/share/doc/gnupg/faq.html</Path>
</Files>
</Package>
<History>
<Update release="10">
<Date>2022-12-06</Date>
<Version>2.3.8</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2021-05-29</Date>
<Version>2.2.17</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2019-09-15</Date>
<Version>2.2.17</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2019-09-15</Date>
<Version>2.2.17</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2019-09-15</Date>
<Version>2.2.17</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-08-05</Date>
<Version>2.2.4</Version>
<Comment>Version bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2017-01-25</Date>
<Version>2.1.18</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-12-24</Date>
<Version>2.1.17</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-08</Date>
<Version>2.1.7</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-08-21</Date>
<Version>2.1.7</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
util/crypt/gnupg/translations.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>gnupg</Name>
<Summary xml:lang="tr">GNU Gizlilik Koruması</Summary>
<Description xml:lang="tr">GnuPG verilerinizin ve iletişimlerinizin şifrelenmesi ve imzalanmmasını sağlar, her tür genel anahtar dizinleri için modullere erişiminde olduğu gibi çok yönlü anahtar yönetim sistemi avantajı vardır.</Description>
</Source>
<Package>
<Name>gnupg-docs</Name>
<Summary xml:lang="tr">GnuPG paketine ait API dokümantasyonu</Summary>
</Package>
</PISI>