mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-20 04:02:40 +03:00
Merge pull request #157060 from helsinki-systems/drop/gogoclient
gogoclient: drop
This commit is contained in:
commit
17ba3f719f
@ -1,39 +0,0 @@
|
||||
diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in
|
||||
--- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in 2009-11-20 17:53:12.000000000 +0100
|
||||
+++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in 2012-02-25 15:16:12.758849219 +0100
|
||||
@@ -224,7 +224,7 @@
|
||||
#
|
||||
# broker_list=<file_name>
|
||||
#
|
||||
-broker_list=tsp-broker-list.txt
|
||||
+broker_list=/var/lib/gogoc/tsp-broker-list.txt
|
||||
|
||||
#
|
||||
# Last Server Used File Name:
|
||||
@@ -234,7 +234,7 @@
|
||||
#
|
||||
# last_server=<file_name>
|
||||
#
|
||||
-last_server=tsp-last-server.txt
|
||||
+last_server=/var/lib/gogoc/tsp-last-server.txt
|
||||
|
||||
#
|
||||
# Always Use Last Known Working Server:
|
||||
@@ -294,7 +294,7 @@
|
||||
#
|
||||
# log_filename=<file_name>
|
||||
#
|
||||
-log_filename=gogoc.log
|
||||
+log_filename=/var/log/gogoc.log
|
||||
|
||||
#
|
||||
# Log File Rotation:
|
||||
@@ -313,7 +313,7 @@
|
||||
#
|
||||
# log_rotation=<yes|no>
|
||||
#
|
||||
-log_rotation=yes
|
||||
+log_rotation=no
|
||||
|
||||
#
|
||||
# Log File Rotation Size:
|
@ -1,41 +0,0 @@
|
||||
{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gogoclient";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
#url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz";
|
||||
url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz";
|
||||
sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
|
||||
};
|
||||
patches = [./gcc46-include-fix.patch ./config-paths.patch ];
|
||||
makeFlags = ["target=linux"];
|
||||
installFlags = ["installdir=$(out)"];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [openssl];
|
||||
|
||||
preFixup = ''
|
||||
mkdir -p $out/share/gogoclient-${version}
|
||||
chmod 444 $out/bin/gogoc.conf
|
||||
mv $out/bin/gogoc.conf $out/share/gogoclient-${version}/gogoc.conf.sample
|
||||
rm $out/bin/gogoc.conf.sample
|
||||
|
||||
substituteInPlace "$out/template/linux.sh" \
|
||||
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
|
||||
--replace "/sbin/route" "${nettools}/bin/route" \
|
||||
--replace "/sbin/ip" "${iproute2}/sbin/ip" \
|
||||
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
|
||||
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ipv6.ernet.in/Tunnel_broker";
|
||||
description = "Client to connect to the Freenet6 IPv6 tunnel broker service";
|
||||
maintainers = [ maintainers.bluescreen303 ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -1,22 +0,0 @@
|
||||
diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc
|
||||
--- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc 2009-11-20 17:34:55.000000000 +0100
|
||||
+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc 2012-02-25 15:06:20.764698284 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
// **************************************************************************
|
||||
#include <gogocmessaging/clientmsgsender.h>
|
||||
#include <assert.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
|
||||
namespace gogocmessaging
|
||||
diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc
|
||||
--- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc 2009-11-20 17:34:56.000000000 +0100
|
||||
+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc 2012-02-25 15:06:36.722740288 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
// **************************************************************************
|
||||
#include <gogocmessaging/servermsgsender.h>
|
||||
#include <assert.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
|
||||
namespace gogocmessaging
|
@ -367,9 +367,11 @@ mapAliases ({
|
||||
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
|
||||
gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14
|
||||
gmock = gtest; # moved from top-level 2021-03-14
|
||||
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
|
||||
go-pup = pup; # added 2017-12-19
|
||||
gobby5 = gobby; # added 2021-02-01
|
||||
gobjectIntrospection = gobject-introspection; # added 2018-12-02
|
||||
gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # added 2021-12-15
|
||||
goimports = gotools; # added 2018-09-16
|
||||
gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23
|
||||
google-gflags = gflags; # added 2019-07-25
|
||||
|
@ -22799,10 +22799,6 @@ with pkgs;
|
||||
|
||||
quicktemplate = callPackage ../development/tools/quicktemplate { };
|
||||
|
||||
gogoclient = callPackage ../os-specific/linux/gogoclient {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
|
||||
linux-pam = callPackage ../os-specific/linux/pam { };
|
||||
|
||||
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
|
||||
|
Loading…
Reference in New Issue
Block a user