security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

speedo: Use swdb.lst to define the SQLite version.

Browse Source 
* build-aux/speedo.mk: Change sqlite to use our mirror and the
swdb.lst file.
* build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
gpg.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-04-20 11:02:39 +02:00
parent d02de6c0a4
commit 2385b9f1dd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build-aux/speedo.mk
View File

@ -172,7 +172,7 @@ speedo_spkgs = \
ifeq ($(TARGETOS),w32)
speedo_spkgs += \
zlib bzip2 adns libiconv libsqlite3
zlib bzip2 adns sqlite libiconv
ifeq ($(WITH_GUI),1)
speedo_spkgs += gettext
endif
@ -306,6 +306,11 @@ adns_ver := $(shell awk '$$1=="adns_ver" {print $$2}' swdb.lst)
adns_sha1 := $(shell awk '$$1=="adns_sha1" {print $$2}' swdb.lst)
adns_sha2 := $(shell awk '$$1=="adns_sha2" {print $$2}' swdb.lst)
sqlite_ver := $(shell awk '$$1=="sqlite_ver" {print $$2}' swdb.lst)
sqlite_sha1 := $(shell awk '$$1=="sqlite_sha1_gz" {print $$2}' swdb.lst)
sqlite_sha2 := $(shell awk '$$1=="sqlite_sha2_gz" {print $$2}' swdb.lst)
$(info Information from the version database)
$(info GnuPG ..........: $(gnupg_ver) (building $(gnupg_ver_this)))
$(info Libgpg-error ...: $(libgpg_error_ver))
@ -315,6 +320,7 @@ $(info Libassuan ......: $(libassuan_ver))
$(info Zlib ...........: $(zlib_ver))
$(info Bzip2 ..........: $(bzip2_ver))
$(info ADNS ...........: $(adns_ver))
$(info SQLite .........: $(sqlite_ver))
$(info GPGME ..........: $(gpgme_ver))
$(info Pinentry .......: $(pinentry_ver))
$(info GPA ............: $(gpa_ver))
@ -324,7 +330,6 @@ endif
# Version number for external packages
pkg_config_ver = 0.23
libiconv_ver = 1.14
libsqlite3_ver = 3120000
gettext_ver = 0.18.2.1
libffi_ver = 3.0.13
glib_ver = 2.34.3
@ -413,9 +418,9 @@ endif
speedo_pkg_pkg_config_tar = $(pkg2rep)/pkg-config-$(pkg_config_ver).tar.gz
speedo_pkg_zlib_tar = $(pkgrep)/zlib/zlib-$(zlib_ver).tar.gz
speedo_pkg_bzip2_tar = $(pkgrep)/bzip2/bzip2-$(bzip2_ver).tar.gz
speedo_pkg_sqlite_tar = $(pkgrep)/sqlite/sqlite-autoconf-$(sqlite_ver).tar.gz
speedo_pkg_adns_tar = $(pkg10rep)/adns/adns-$(adns_ver).tar.bz2
speedo_pkg_libiconv_tar = $(pkg2rep)/libiconv-$(libiconv_ver).tar.gz
speedo_pkg_libsqlite3_tar = $(pkg2rep)/sqlite-autoconf-$(libsqlite3_ver).tar.gz
speedo_pkg_gettext_tar = $(pkg2rep)/gettext-$(gettext_ver).tar.gz
speedo_pkg_libffi_tar = $(pkg2rep)/libffi-$(libffi_ver).tar.gz
speedo_pkg_glib_tar = $(pkg2rep)/glib-$(glib_ver).tar.xz

4
build-aux/speedo/w32/inst.nsi
View File

@ -573,8 +573,8 @@ Section "GnuPG" SEC_gnupg
SectionIn RO
SetOutPath "$INSTDIR\bin"
File /oname=gpg.exe "bin/gpg2.exe"
File /oname=gpgv.exe "bin/gpgv2.exe"
File "bin/gpg.exe"
File "bin/gpgv.exe"
File "bin/gpgsm.exe"
File "bin/gpgconf.exe"
File "bin/gpg-connect-agent.exe"

26
build-aux/speedo/w32/pkg-copyright.txt
View File

@ -1,11 +1,11 @@
Here is a list with collected copyright notices. For details see the
description of each individual package. [Compiled by wk FIXME]
description of each individual package. [Compiled by wk 2016-04-20]
GnuPG is
Copyright (C) 1997-2015 Werner Koch
Copyright (C) 1994-2015 Free Software Foundation, Inc.
Copyright (C) 2003-2015 g10 Code GmbH
Copyright (C) 1997-2016 Werner Koch
Copyright (C) 1994-2016 Free Software Foundation, Inc.
Copyright (C) 2003-2016 g10 Code GmbH
Copyright (C) 2002 Klarälvdalens Datakonsult AB
Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper@gnu.ai.mit.edu>
Copyright (C) 1994 X Consortium
@ -102,3 +102,21 @@ NSIS is
[It is distributed along with NSIS and the same conditions as stated
above apply]
ADNS is
Copyright (C) 1997-2000,2003,2006 Ian Jackson
Copyright (C) 1999-2000,2003,2006 Tony Finch
Copyright (C) 1991 Massachusetts Institute of Technology
SQLite has
been put into the public-domain by its author D. Richard Hipp:
The author disclaims copyright to this source code. In place of
a legal notice, here is a blessing:
May you do good and not evil.
May you find forgiveness for yourself and forgive others.
May you share freely, never taking more than you give.