diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:35 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:35 +0900 |
| commit | e761a9d6e4f22fb519b7fd34e1978caf44c0872e (patch) | |
| tree | a2a30c3097bb53eee4835a45b74d780940c636f8 /build-aux | |
| parent | 7a22f5e8cd3e5a40c2a3a8e87a95bd98a64e7cb2 (diff) | |
| download | gpg2-e761a9d6e4f22fb519b7fd34e1978caf44c0872e.tar.gz gpg2-e761a9d6e4f22fb519b7fd34e1978caf44c0872e.tar.bz2 gpg2-e761a9d6e4f22fb519b7fd34e1978caf44c0872e.zip | |
Imported Upstream version 2.2.7upstream/2.2.7
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/getswdb.sh | 4 | ||||
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build-aux/getswdb.sh b/build-aux/getswdb.sh index 83ecdb2..cd419f2 100755 --- a/build-aux/getswdb.sh +++ b/build-aux/getswdb.sh @@ -175,9 +175,9 @@ fi # to help detect rollback attacks. # if [ $skip_selfcheck = no ]; then - gnupg_ver=$(awk '$1=="gnupg21_ver" {print $2;exit}' swdb.lst) + gnupg_ver=$(awk '$1=="gnupg22_ver" {print $2;exit}' swdb.lst) if [ -z "$gnupg_ver" ]; then - echo "GnuPG 2.1 version missing in swdb.lst!" >&2 + echo "GnuPG 2.2 version missing in swdb.lst!" >&2 exit 1 fi gnupg_ver_num=$(echo "$gnupg_ver" | cvtver) diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index b89876e..fb452d5 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -625,6 +625,7 @@ Section "GnuPG" SEC_gnupg File "bin/gpgconf.exe" File "bin/gpg-connect-agent.exe" File "bin/gpgtar.exe" + File "libexec/dirmngr_ldap.exe" File "libexec/gpg-preset-passphrase.exe" File "libexec/gpg-wks-client.exe" @@ -743,6 +744,8 @@ Section "-libgpg-error" SEC_libgpg_error File share/locale/de/LC_MESSAGES/libgpg-error.mo SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES" File share/locale/eo/LC_MESSAGES/libgpg-error.mo + SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES" + File share/locale/es/LC_MESSAGES/libgpg-error.mo SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES" File share/locale/fr/LC_MESSAGES/libgpg-error.mo SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES" @@ -1249,6 +1252,9 @@ Section "-un.libgpg-error" Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\libgpg-error.mo" RMDir "$INSTDIR\share\locale\eo\LC_MESSAGES" RMDir "$INSTDIR\share\locale\eo" + Delete "$INSTDIR\share\locale\es\LC_MESSAGES\libgpg-error.mo" + RMDir "$INSTDIR\share\locale\es\LC_MESSAGES" + RMDir "$INSTDIR\share\locale\es" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\libgpg-error.mo" RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES" RMDir "$INSTDIR\share\locale\fr" @@ -1307,6 +1313,7 @@ Section "-un.gnupg" Delete "$INSTDIR\bin\gpgconf.exe" Delete "$INSTDIR\bin\gpg-connect-agent.exe" Delete "$INSTDIR\bin\gpgtar.exe" + Delete "$INSTDIR\bin\dirmngr_ldap.exe" Delete "$INSTDIR\bin\gpg-preset-passphrase.exe" Delete "$INSTDIR\bin\gpg-wks-client.exe" |