1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-10-31 20:08:43 +01:00
Commit Graph

54 Commits

Author SHA1 Message Date
Werner Koch
aec972732e
speedo: Fix authenticode signing
--
2022-04-21 14:18:27 +02:00
Werner Koch
4237a2b0a5
speedo: Automatically select Authenticode signing cert.
--

This is required because GlobalSign re-issued the certificate (which
actually required to install InternetExploder in addition to Edge) and
now we have two certs to select from.  The /a option seems to use the
latest generated certificate.
2021-04-22 11:33:55 +02:00
Werner Koch
8d6123faa8
build: new option to disable building of tpm2daemon
* configure.ac (build_tpmd): New configure option --disable-tpm2d
(BUILD_WITH_TPM2D): New.
* Makefile.am (tests): Use conditionally BUILD_TPM2D instead of
HAVE_LIBTSS.
* build-aux/speedo.mk (speedo_pkg_gnupg_configure) [W32]: Do not build
tpm2d.
* autogen.rc: Ditto.
2021-03-15 09:50:30 +01:00
Werner Koch
919a969354
speedo: Update w32 stuff from 2.2
* build-aux/speedo.mk: Update from 2.2.  Add target w32-msi-release.
* build-aux/speedo/w32/inst.nsi: Fix location of doc files.
* build-aux/speedo/w32/wixlib.wxs: Add gpg-card and fix a wrong name.
* Makefile.am (release): Support a WITH_MSI variable.
(wixlibfile): Improve copying to archive.
(release): Use AMTAR instead of TAR.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
2021-02-18 13:25:33 +01:00
Werner Koch
4699911f04
speedo: Allow customizing the release process
--
2020-08-26 13:57:14 +02:00
Andre Heinecke
0b7088dc80 speedo, w32: Add w32-wixlib target for MSI package
* Makefile.am (EXTRA_DIST): Add wixlib.wxs
* build-aux/speedo.mk (w32-wixlib): New target.
(w32-release): Build wixlib if WIXPREFIX is set.
(help): Add documentation.
* build-aux/speedo/w32/wixlib.wxs

--
This build a wixlib of the Windows binaries of GnuPG.
A wixlib is a module that can be linked into another
wix project to create an installer including this
module. Gpg4win uses the wixlib from GnuPG for
it's MSI Package.

To build the wixlib you need wine with wine-mono installed
and the wixtoolset.

When calling speedo set the variable WIXPREFIX to
the location containing the extracted toolset.

e.g.:

    make -f build-aux/speedo.mk w32-wixlib WIXPREFIX=~/wix
2019-08-08 13:08:22 +02:00
Werner Koch
4964691861 build: Sign all Windows binaries.
* build-aux/speedo.mk (AUTHENTICODE_SIGNHOST): New.
(AUTHENTICODE_TOOL): New.
(AUTHENTICODE_FILES): New.
(installer): Sign listed files.
(AUTHENTICODE_SIGNHOST): New macro.
(sign-installer): Use that macro instead of direct use of osslsigncode.
--

This also adds code to support signing via a Token.  Because there is
no specification of that token, I was not able to write a free driver
for it.  Thus we resort to use a running Windows-10 instance with an
enabled ssh server to do the code signing.

Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e6901c2bc8)
2019-08-08 13:05:23 +02:00
Andre Heinecke
b98799ce96
speedo: Fix installer build with NSIS-3
* build-aux/speedo.mk: Add charset for nsis 3.

--
NSIS-3 defaults to UTF-8 but for NSIS-2 compatibility
we still stay on CP1252 for now.
2019-03-18 16:08:23 +01:00
Werner Koch
d7323bb2d9
speedo: Remove obsolete configure option of gpgme.
* build-aux/speedo.mk (speedo_pkg_gpgme_configure): Remove
--disable-w32-qt option.
--

This option is obsolete since GPGME 1.7 (in 2016)

Signed-off-by: Werner Koch <wk@gnupg.org>
2018-11-05 12:47:44 +01:00
Daniel Kahn Gillmor
a7c5d65eb5 all: fix more spelling errors 2018-10-25 16:53:05 -04:00
Werner Koch
11e9b704b5
speedo: Sign the windows installer with a timestamp.
--
2018-10-25 18:26:34 +02:00
Werner Koch
7853190cfe
build: Update swdb tags and include release info from 2.2.5 2018-02-22 16:34:36 +01:00
Werner Koch
fffefd3c98
speedo: Use --enable-wks-tools for non-W32 builds.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
2018-02-20 08:57:28 +01:00
Werner Koch
7b928c2564
speedo: Add new option STATIC=1
--

This can be used to build GnuPG with static versions of the core
gnupg libraries.  For example:

 make -f build-aux/speedo.mk STATIC=1 SELFCHECK=0 \
     INSTALL_PREFIX=/somewhere/gnupg22  native

The SELFCHECK=0 is only needed to build from a non-released version.
You don't need it with a released tarball.

Signed-off-by: Werner Koch <wk@gnupg.org>
2018-02-19 10:51:27 +01:00
Werner Koch
5b8d12a8bd
speedo,w32: Disable FLTK pinentry.
--
2017-12-07 16:29:29 +01:00
Werner Koch
23bfac6d1a
speedo: Include software versions in the W32 README
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit f9f72ffbfa)
2017-11-07 09:29:04 +01:00
Werner Koch
008ae0bd86
build: Change SWDB tag "gnupg21" to "gnupg22".
* configure.ac (GNUPG_SWDB_TAG): New ac_define.  Set it to "gnupg22".
* tools/gpgconf.c (query_swdb): Use it.
* build-aux/speedo.mk: Change tag "gnupg21" to "gnupg22".
* Makefile.am (distcheck-hook): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
2017-08-23 14:52:29 +02:00
Werner Koch
a69464b0b6
gpg: Install gpg by default under the name gpg.
* configure.ac: Remove option --enable-gpg2-is-gpg.  Add option
--enable-gpg-is-gpg2.
* build-aux/speedo.mk (speedo_pkg_gnupg_configure): Remove
--enable-gpg2-is-gpg.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
2017-08-05 14:39:32 +02:00
Andre Heinecke
96acbdd726
speedo: Fix source tar call ambiguity
* build-aux/speedo.mk (dist-source): Expand exclude-vc to
exclude-vcs.

--
Tar 1.29 also has exclude-vcs-ignores so this became
ambiguous.

Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
2017-06-06 16:40:40 +02:00
Werner Koch
7742455089
speedo: Now build for W32 with ntbtls support.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
2017-02-21 20:53:45 +01:00
Werner Koch
c0234462dc
speedo: Remove the unused ADNS package.
--
2017-01-23 23:03:36 +01:00
Werner Koch
284ec54495
build: Add target to sign the windows installer.
* build-aux/speedo.mk (w32-sign-installer): New.
(AUTHENTICODE_KEY): New.
(installer-from-source): Use cp instead of mv.  Factor code out to ...
(MKSWDB_commands): new macro.
(sign-installer): New.
--

Obviously this is more convenient then doing this all by hand.

Signed-off-by: Werner Koch <wk@gnupg.org>
2016-12-19 18:35:10 +01:00
Werner Koch
e1a929849c
speedo: New target w32-release-offline
--

As long as a current swdb.lst is available and all directories below
~/b carry the appropriate tarballs this target can be used to build a
w32-installer w/0 any network access.
2016-06-16 19:12:00 +02:00
Werner Koch
79b7a8a9e0
w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
* configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
* build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
  --enable-build-timestamp.
--

Debian-bug-id: 826309
Signed-off-by: Werner Koch <wk@gnupg.org>
2016-06-04 18:45:37 +02:00
Werner Koch
9ea258fa5b
speedo: Also try patch files w/o version number.
* build-aux/speedo.mk (SPKG_template): Try such a patch file.

Signed-off-by: Werner Koch <wk@gnupg.org>
2016-05-04 14:31:46 +02:00
Werner Koch
bd4d65615b
w32: Replace libiconv DLL by iconv feature of libgpg-error.
* configure.ac: Do nor require libiconv for W32.
* common/utf8conv.c [W32]: Do not incluce iconv.h.  Request
libgpg-error iconv macros.
(jnlib_iconv): Use ICONV_CONST macro.
* build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
* build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.

Signed-off-by: Werner Koch <wk@gnupg.org>
2016-04-21 09:17:11 +02:00
Werner Koch
2385b9f1dd
speedo: Use swdb.lst to define the SQLite version.
* 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>
2016-04-20 12:21:52 +02:00
Justus Winter
e7171f5595 speedo,w32: Build libsqlite3.
* build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
(libsqlite3_ver): New variable.
(speedo_pkg_libsqlite3_tar): Likewise.

Signed-off-by: Justus Winter <justus@g10code.com>
2016-03-31 17:51:39 +02:00
Werner Koch
039a55716b
speedo: Allow use of SHA-256 checksums
* build-aux/getswdb.sh: Add option --find-sha256sum.
* build-aux/speedo.mk (libgpg_error_sha2): New var.  Also for all
other packages.
(SHA2SUM): New.
(SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
(installer-from-source): Create swdb fragment.

Signed-off-by: Werner Koch <wk@gnupg.org>
2016-01-25 10:09:02 +01:00
Werner Koch
2eee29253d
speedo: Add a w32-release target.
--

This simplifies building a release to:

  git tag -s gnupg-2.n.m
  ./autogen.sh --force
  cd ~/b/gnupg
  ~/s/gnupg/configure --enable-maintainer-mode
  make distcheck
  tar xJf gnupg-2.n.m.tar.bz2
  make -f gnupg-2.n.m/build-aux/speedo.mk w32-release
  gpg -sbvu KEYID gnupg-2.n.m.tar.bz2
  gpg -sbvu KEYID gnupg-w32-2.n.m-20151008.tar.xz
  gpg -sbvu KEYID gnupg-w32-2.n.m-20151008.exe
  scp gnupg-2.n.m.tar.bz2              $TARGET
  scp gnupg-w32-2.n.m-20151008.tar.xz  $TARGET
  scp gnupg-w32-2.n.m-20151008.exe     $TARGET
2015-10-08 18:25:37 +02:00
Werner Koch
43211f553d
build: Distribute swdb.lst with the w32-source target.
--
2015-06-16 18:11:31 +02:00
Werner Koch
21b0701e2e
speedo: Add make option SELFCHECK=0 to build a new release.
* build-aux/getswdb.sh: Add option --skip-selfcheck.
* build-aux/speedo.mk: Add option SELFCHECK.
2015-05-12 14:27:14 +02:00
Werner Koch
154abaf3c9
speedo,w32: Install a native pinentry.
* build-aux/speedo.mk: Always build pinentry for w32.
(speedo_pkg_pinentry_configure): Adjust to modern pinentry.
* build-aux/speedo/w32/inst.nsi: Install native pinentry under the
name pinentry-basic.exe.

Signed-off-by: Werner Koch <wk@gnupg.org>
2015-05-06 11:06:26 +02:00
Werner Koch
3f2bdac2f2
speedo: Fix libgpg-error build in w64 builds
--

This typo was recently introduced.
2015-04-09 19:08:57 +02:00
Werner Koch
8872657b2a w32: Change default Windows install dir and add bin to PATH.
* build-aux/speedo.mk (WITH_GUI): New macro.  The Windows installer is
now build by default without any GUI stuff.
* build-aux/speedo/w32/inst.nsi: Change standard installation
directory.
(AddToPath, un.RemoveFromPath): New.
(gnupginst): Add bin directory to the PATH.

Signed-off-by: Werner Koch <wk@gnupg.org>
2015-02-02 10:34:18 +01:00
Werner Koch
9a85b91e92 speedo: Add simple logos to the installer.
* build-aux/speedo/w32/README.txt: Include GnuPG Readme.
* build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
* build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
* build-aux/speedo/w32/inst.nsi: Add logos.
* build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
--

The welcome page logo is basically a placeholder until someone has
created a pretty one.
2014-11-21 12:58:50 +01:00
Werner Koch
c7c79e3193 build: Add method to use a custom swdb.lst and use adns with Windows.
* build-aux/getswdb.sh: Add option --skip-verify.
* build-aux/speedo.mk: Add config var CUSTOM_SWDB.  Tage adns version
from swdb and build for Windows with adns.
2014-11-07 18:20:06 +01:00
Werner Koch
8ec0b384a8 speedo: Append the date to the Windows installer.
* build-aux/speedo.mk (BUILD_DATESTR): New.
(dist-source, installer): Use it.
2014-11-05 21:40:52 +01:00
Werner Koch
2402887584 speedo: Do not not assume GNU tar.
--
Signed-off-by: Werner Koch <wk@gnupg.org>
2014-11-05 15:29:41 +01:00
Werner Koch
794a687be0 speedo: Use --disable-ntbtls for gnupg for now.
--
2014-10-31 21:33:18 +01:00
Werner Koch
158fe90018 speedo: Fixes for native build.
* build-aux/speedo.mk (TARGETOS): Init with empty string.
(speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
(INST_VERSION, INST_PROD_VERSION): Create only for w32.
2014-10-27 18:02:46 +01:00
Werner Koch
841a797f6d speedo: Add INSTALL_PREFIX feature.
--

With this it is now possible build and install gnupg 2.1 properly
below /usr/local:

  make -f TOPSRC/build-aux/speed.ml native INSTALL_PREFIX=/usr/local

Of course you need installation priviliges for the /usr/local tree.
2014-10-03 15:30:38 +02:00
Werner Koch
2427bc5bc7 speedo: Autodetect sha1sum tools.
* build-aux/getswdb.sh: Add option --find-sha1sum.
* build-aux/speedo.mk (check-tools): New phony target.  Not yet used.
(SHA1SUM): New var.  Use it instead of sha1sum.
2014-09-22 13:51:35 +02:00
Werner Koch
2f065d7ab6 speedo: Various fixes
* build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org.  Minor
other fixes.
2014-09-18 11:39:34 +02:00
Werner Koch
36125f9c30 speedo: Improve speedo Makefile.
--

Building for the native platform is now a mere

  make -f build-aux/speedo.mk native

You may also use "help" as target.
2014-09-17 22:16:53 +02:00
Werner Koch
b6386367ac speedo: Fix for non-Windows build of glib.
--
2014-09-01 10:10:30 +02:00
Werner Koch
31649e72fd speedo: Get version numbers from online database.
* build-aux/getswdb.sh: New.
* build-aux/speedo.mk: Get release version numbers from swdb.lst.
--

This should make maintaining GnuPG installations easier.  Running

 make -f /foo/gnupg/build-aux/speedo.mk TARGETOS=native WHAT=release

downloads all GnuPG related packages and builds them.  The gnupg
directory may be a GIT checkout but in that case please run
./autogen.sh on it first.  Note that currently swdb.lst is always
downloaded from gnupg.org and thus monitoring the network or the gnupg
machine reveal information on who is currently building GnuPG.  If
there is an easy way to detect that TOR is enabled this can be changed
to directly download from the GnuPG hidden service.
2014-08-19 12:49:45 +02:00
Werner Koch
c029a184d6 speedo: "make clean-gnupg" may not remove the source.
* build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
--

I learned it the hard way and lost a bunch of stashed changes.
2014-06-26 17:06:34 +02:00
Werner Koch
47e63dc001 speedo: Support building from dist-source generated tarball. 2014-06-17 10:37:55 +02:00
Werner Koch
6eeb31abee speedo: Improve building of the w32 installer.
* build-aux/speedo.mk: Change name of build directory to PLAY.
Improve the dist-source target.
* build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
line (plus comment).
* build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
Install more tools.
--

gdk-pixbuf-loaders.cache needs to end with an extra LF or the
gdk-pixbuf is not able to read the last entry.  The final comment is
to make our git sanity checks happy.

Running

 make -f build-aux/speedo.mk \
      TARGETOS=w32 TARBALLS=~/tarballs installer

does now create a working installer.  After removing dirmngr from the
installation GPA kind of works.  There are remaining problems with
dirmngr and scdaemon which will be fixed soon.

Running

 make -f build-aux/speedo.mk \
      TARGETOS=w32 TARBALLS=~/tarballs dist-source

creates an xz compressed tarball with all the sources used to build
the installer.  Distributing this tarball along with the installer is
sufficient to comply with the GPL.  Well, some more instructions
should be given in the readme files.
2014-06-11 15:45:29 +02:00