[Git][NTPsec/ntpsec][master] The --enable-crypto option turned out not to be used. Retire it.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
eb6933fc by Eric S. Raymond at 2017-01-23T17:18:43-05:00
The --enable-crypto option turned out not to be used.  Retire it.

- - - - -


4 changed files:

- INSTALL
- devel/make-tarball
- devel/release.nix
- wafhelpers/options.py


Changes:

=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -58,6 +58,11 @@ bison::
    Required to build.
    Gentoo package: sys-devel/bison
 
+OpenSSL::
+   Required to build.
+   Enables encryption and authentication.
+   Gentoo: dev-libs/openssl
+
 libsodium::
    Required to run and build.
    Used for cryptographic-quality random-number generation.
@@ -117,11 +122,6 @@ seccomp::
    Optional on Linux to support restricting syscalls
    Gentoo: sys-libs/libseccomp
 
-OpenSSL::
-   Optional, required for --enable-crypto.
-   Enables encryption and authentication.
-   Gentoo: dev-libs/openssl
-
 sys/timepps.h::
    If you are building to supply Stratum 1 time service (that is, with
    refclocks linked in) you may find that you need the sys/timepps.h


=====================================
devel/make-tarball
=====================================
--- a/devel/make-tarball
+++ b/devel/make-tarball
@@ -47,7 +47,7 @@ mkdir .tmp
 cd .tmp
 tar -xzf ../ntpsec-${V}.tar.gz
 cd ntpsec-${V}
-./waf configure --refclock=all --enable-crypto --enable-doc
+./waf configure --refclock=all --enable-doc
 ./waf build
 cd ../..
 rm -fr .tmp


=====================================
devel/release.nix
=====================================
--- a/devel/release.nix
+++ b/devel/release.nix
@@ -15,7 +15,7 @@ let
     ;
     enableParallelBuilding = true;
     doCheck = false; #XXX: set this to 'true' once we have a test suite
-    configureFlags = "--enable-ipv6 --enable-crypto";
+    configureFlags = "--enable-ipv6";
   };
 in with derivationOptions; rec {
   tarball = pkgs.releaseTools.sourceTarball (derivationOptions // rec {


=====================================
wafhelpers/options.py
=====================================
--- a/wafhelpers/options.py
+++ b/wafhelpers/options.py
@@ -13,8 +13,6 @@ def options_cmd(ctx, config):
                    default=False, help="Disable debugging code")
     grp.add_option('--enable-debug-gdb', action='store_true',
                    default=False, help="Enable GDB debugging symbols")
-    grp.add_option('--enable-crypto', action='store_true',
-                   default=False, help="Enable OpenSSL.")
     grp.add_option('--disable-droproot', action='store_true',
                    default=False, help="Disable dropping root.")
     grp.add_option('--enable-early-droproot', action='store_true',



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/eb6933fc79998d4e009dee72a7eafadd770ad1b3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170123/77faf47f/attachment.html>