openvpn-auth-ldap: 2.0.3+deb6.1 -> 2.0.4

authored by Robert Schütz and committed by Jonathan Ringer 966188ff f188138a

+23 -38
+23 -38
pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix
··· 1 - { stdenv, lib, fetchFromGitHub, fetchpatch, 2 - autoreconfHook, re2c, openldap, openvpn, gnustep, check 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , gnustep 6 + , re2c 7 + , openldap 8 + , openssl 9 + , openvpn 3 10 }: 4 11 5 - let 6 - srcName = "openvpn-auth-ldap"; 7 - srcVersion = "2.0.3"; 8 - debianRev = "6.1"; 9 - 10 - fetchPatchFromDebian = 11 - {patch, sha256}: 12 - fetchpatch { 13 - inherit sha256; 14 - url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}"; 15 - }; 16 - in 17 - 18 12 stdenv.mkDerivation rec { 19 - name = "${srcName}-${version}"; 20 - version = "${srcVersion}+deb${debianRev}"; 13 + pname = "openvpn-auth-ldap"; 14 + version = "2.0.4"; 21 15 22 16 src = fetchFromGitHub { 23 17 owner = "threerings"; 24 - repo = srcName; 25 - rev = "auth-ldap-${srcVersion}"; 26 - sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq"; 18 + repo = "openvpn-auth-ldap"; 19 + rev = "auth-ldap-${version}"; 20 + sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb"; 27 21 }; 28 22 29 - patches = map fetchPatchFromDebian [ 30 - {patch = "STARTTLS_before_auth.patch"; 31 - sha256 = "02kky73mgx9jf16lpabppl271zyjn4a1160k8b6a0fax5ic8gbwk";} 32 - {patch = "gobjc_4.7_runtime.patch"; 33 - sha256 = "0ljmdn70g5xp4kjcv59wg2wnqaifjdfdv1wlj356d10a7fzvxc76";} 34 - {patch = "openvpn_ldap_simpler_add_handler_4"; 35 - sha256 = "0nha9mazp3dywbs1ywj8xi4ahzsjsasyrcic87v8c0x2nwl9kaa0";} 36 - {patch = "auth-ldap-gnustep.patch"; 37 - sha256 = "053jni1s3pacpi2s43dkmk95j79ifh8rybjly13yy2dqffbasr31";} 38 - ]; 39 - 40 23 nativeBuildInputs = [ 41 24 autoreconfHook 42 - ]; 43 - 44 - buildInputs = [ 45 - check 46 25 gnustep.base 47 26 gnustep.libobjc 48 27 gnustep.make 28 + re2c 29 + ]; 30 + 31 + buildInputs = [ 49 32 openldap 33 + openssl 50 34 openvpn 51 - re2c 52 35 ]; 53 36 54 37 configureFlags = [ 55 - "--with-objc-runtime=modern" 38 + "--with-objc-runtime=GNU" 56 39 "--with-openvpn=${openvpn}/include" 57 40 "--libdir=$(out)/lib/openvpn" 58 41 ]; 59 42 43 + doCheck = true; 44 + 60 45 preInstall = '' 61 46 mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples 62 - cp README $out/share/doc/openvpn/ 47 + cp README.md $out/share/doc/openvpn/ 63 48 cp auth-ldap.conf $out/share/doc/openvpn/examples/ 64 49 ''; 65 50