gvpe: 3.0 -> 3.1

pkgs/tools/networking/gvpe/default.nix

@@ -1,25 +1,24 @@
-{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools }:
+{ lib, stdenv, fetchurl, openssl, gmp, zlib, iproute2, nettools, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "gvpe";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchurl {
     url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
-    sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf";
+    sha256 = "sha256-8evVctclu5QOCAdxocEIZ8NQnc2DFvYRSBRQPcux6LM=";
   };
 
-  patches = [ ./gvpe-3.0-glibc-2.26.patch ];
-
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl gmp zlib ];
 
   configureFlags = [
     "--enable-tcp"
     "--enable-http-proxy"
     "--enable-dns"
-    ];
+  ];
 
-  preBuild = ''
+  postPatch = ''
     sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
     sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C
   '';

pkgs/tools/networking/gvpe/gvpe-3.0-glibc-2.26.patch

@@ -1,18 +0,0 @@
-diff --git a/lib/getopt.h b/lib/getopt.h
-index 2d02142..5e7d8d4 100644
---- a/lib/getopt.h
-+++ b/lib/getopt.h
-@@ -101,13 +101,6 @@ struct option
- #define optional_argument	2
- 
- #if defined (__STDC__) && __STDC__
--#ifdef __GNU_LIBRARY__
--/* Many other libraries have conflicting prototypes for getopt, with
--   differences in the consts, in stdlib.h.  To avoid compilation
--   errors, only prototype getopt for the GNU C library.  */
--extern int getopt (int argc, char *const *argv, const char *shortopts);
--#else /* not __GNU_LIBRARY__ */
--#endif /* __GNU_LIBRARY__ */
- extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- 		        const struct option *longopts, int *longind);
- extern int getopt_long_only (int argc, char *const *argv,

pkgs/top-level/all-packages.nix

@@ -6213,9 +6213,7 @@ with pkgs;
 
   gvm-tools = with python3.pkgs; toPythonApplication gvm-tools;
 
-  gvpe = callPackage ../tools/networking/gvpe {
-    openssl = openssl_1_0_2;
-  };
+  gvpe = callPackage ../tools/networking/gvpe {};
 
   gvolicon = callPackage ../tools/audio/gvolicon {};