From 649eecd6319b53b213edf92c1f2785f1db89c3cf Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 29 Mar 2020 07:22:38 +0000 Subject: httplz: fix strict deps build --- pkgs/tools/networking/httplz/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 5d59010ac1ef..c4f003f884fc 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -12,10 +12,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - openssl pkgconfig - ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; -- cgit 1.4.1 From 2346014aae514debb0b7d252a55d85b1331254fd Mon Sep 17 00:00:00 2001 From: Fabian Möller Date: Wed, 4 Mar 2020 19:33:35 +0100 Subject: bgpq3: init at 0.1.35 --- pkgs/tools/networking/bgpq3/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/bgpq3/default.nix (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/tools/networking/bgpq3/default.nix new file mode 100644 index 000000000000..e3d2218b0c97 --- /dev/null +++ b/pkgs/tools/networking/bgpq3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "bgpq3"; + version = "0.1.35"; + + src = fetchFromGitHub { + owner = "snar"; + repo = pname; + rev = "v${version}"; + sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj"; + }; + + # Fix binary install location. Remove with next upstream release. + preInstall = "mkdir -p $out/bin"; + + meta = with stdenv.lib; { + description = "bgp filtering automation tool"; + homepage = "https://github.com/snar/bgpq3"; + license = licenses.bsd2; + maintainers = with maintainers; [ b4dm4n ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5691c4a7a9f..5b40f018f6cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18582,6 +18582,8 @@ in bgpdump = callPackage ../tools/networking/bgpdump { }; + bgpq3 = callPackage ../tools/networking/bgpq3 { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; -- cgit 1.4.1 From 49be064fa56fc35b44570200c4e68aa560de690a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 22 Mar 2020 22:07:12 +0100 Subject: skawarePackages: release 2020-03 Hello, New versions of all the skarnet.org packages are available. This is mostly a bugfix release (there was an installation bug in some circumstances with shared libraries) but some packages, notably execline and s6, have new, useful features. The new versions are the following: skalibs-2.9.2.0 nsss-0.0.2.2 utmps-0.0.3.2 execline-2.6.0.0 s6-2.9.1.0 s6-rc-0.5.1.2 s6-linux-init-1.0.4.0 s6-dns-2.3.2.0 s6-networking-2.3.1.2 s6-portable-utils-2.2.2.2 s6-linux-utils-2.5.1.2 mdevd-0.1.1.2 bcnm-0.0.1.0 Here are details for the packages that have more than bugfixes: * skalibs-2.9.2.0 --------------- - New header: skalibs/bigkv.h. It's a set of functions allowing efficient lookups in a large set of strings (typically read from the command line or the environment). https://skarnet.org/software/skalibs/ git://git.skarnet.org/skalibs * execline-2.6.0.0 ---------------- - It's a major release because an API has been modified: dollarat. Beforehand, dollarat's -0 option would always prevail over any -d option. Now, dollarat has its conflicting -0 and -d options handled in the conventional way, with rightmost priority. - The runblock program now accepts a command line prefix, which is given as runblock's own command line. This allows blocks to serve as arguments to a new command, instead of having to be full command lines by themselves. - New binary: posix-umask. - The former "cd" program is now named "execline-cd" and the former "umask" program is named "execline-umask". When the=20 --enable-pedantic-posix option is not given at configure time, "cd" and "umask" are symbolic links created at installation time and pointing to execline-cd and execline-umask respectively. When the --enable-pedantic-posix option is given, the symbolic links point to posix-cd and posix-umask instead. - With posix-cd and posix-umask (and the changes to wait done in the previous version), execline is now fully POSIX-compliant when built with the --enable-pedantic-posix option. This will certainly, without the slightest hint of a doubt, change distributions' attitudes about it. https://skarnet.org/software/execline/ git://git.skarnet.org/execline * s6-2.9.1.0 ---------- - A new '?' directive has been added to s6-log. It behaves exactly like '!', except that it spawns the given processor with /bin/sh as an interpreter instead of execlineb. - execline support is now optional: it can be disabled by specifying --disable-execline at configure time. Some functionality is unavailable when execline support is disabled: * s6-log's '!' directive * s6-notifyoncheck's -c option * s6-ipcserver-access's support for 'exec' directives in a ruleset - A new -X option has been added to s6-svscan, to specify a descriptor that will be passed as stderr to a service spawned by this s6-svscan and named s6-svscan-log. This is used in the new s6-linux-init, to avoid needing to hardcode the /dev/console name for the catch-all logger's standard error. - On systems that define SIGPWR and SIGWINCH, s6-svscan -s now diverts those signals. This allows powerfail and kbrequest events to be handled when s6-svscan runs as process 1. https://skarnet.org/software/s6/ git://git.skarnet.org/s6 * s6-linux-init-1.0.4.0 --------------------- - New options have been added to s6-linux-init-maker: to support running s6-linux-init without a catch-all logger, and to support running it in a container. - s6-linux-init-maker now adds a SIGPWR handler to the default image: on receipt of a SIGPWR, the system's shutdown procedure is triggered. - s6-linux-init now handles kbrequest, which triggers a SIGWINCH in init when a special, configurable set of keys is pressed. By default, no SIGWINCH handler is declared in the image, and no set of keys is bound to kbrequest. https://skarnet.org/software/s6-linux-init/ git://git.skarnet.org/s6-linux-init * s6-dns-2.3.2.0 -------------- - New library: libdcache, implementing a clean cache structure to contain DNS data. It's still not used at the moment. https://skarnet.org/software/s6-dns/ git://git.skarnet.org/s6-dns * bcnm-0.0.1.0 ------------ - First numbered release, because the Ad=C3=A9lie Linux distribution, which uses libwpactrl, needs an official release instead of pulling from git. - libwpactrl is a set of C functions helping control a wpa_supplicant process. - bcnm-waitif is a binary that waits for network interface state events such as appearance/disappearance, up/down, running/not-running. It is useful to avoid race conditions during a boot sequence, for instance. https://skarnet.org/software/bcnm/ git://git.skarnet.org/bcnm Enjoy, Bug-reports welcome. -- Laurent --- pkgs/development/libraries/nsss/default.nix | 4 ++-- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/development/libraries/utmps/default.nix | 5 ++--- pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++-- pkgs/tools/misc/execline/default.nix | 4 ++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-dns/default.nix | 5 +++-- pkgs/tools/networking/s6-networking/default.nix | 4 ++-- pkgs/tools/system/s6-rc/default.nix | 4 ++-- pkgs/tools/system/s6/default.nix | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 5c8bf8dedc1e..3e3530215bf8 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.0.2.1"; - sha256 = "1arzl4492wv42rvv6xs8h5d3qpy9nwxv5l84inzabs6s9f9nlxax"; + version = "0.0.2.2"; + sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e5443c5d53a0..d7e0f8313850 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.9.1.0"; - sha256 = "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk"; + version = "2.9.2.0"; + sha256 = "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 073674f8571f..16b4cd563b2b 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.0.3.1"; - sha256 = "1h4hgjdrai51qkalgcx2ff60drpnw0ich66z90p8wk74am0vgc0h"; + version = "0.0.3.2"; + sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh"; description = "A secure utmpx and wtmp implementation"; @@ -29,4 +29,3 @@ buildPackage { mv examples $doc/share/doc/utmps/examples ''; } - diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 200e66cb4d89..74bf913df982 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.5.1.1"; - sha256 = "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5"; + version = "2.5.1.2"; + sha256 = "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86"; description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index fb685e65a4f5..d09537f56490 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -7,8 +7,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.5.3.0"; - sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805"; + version = "2.6.0.0"; + sha256 = "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 18813531033f..bc32489c588e 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,8 +7,8 @@ let in buildPackage { pname = pname; - version = "2.2.2.1"; - sha256 = "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy"; + version = "2.2.2.2"; + sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 66bdcbbba54a..739fdc2e2fce 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.1.1"; - sha256 = "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1"; + version = "2.3.2.0"; + sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7"; description = "A suite of DNS client programs and libraries for Unix systems"; @@ -28,6 +28,7 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6dns.* rm libskadns.* + rm libdcache.* mv doc $doc/share/doc/s6-dns/html ''; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 1551d6da97be..f8c479d5ce27 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.3.1.1"; - sha256 = "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx"; + version = "2.3.1.2"; + sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 95d4b376d0aa..4ddc7fbecc01 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.1.1"; - sha256 = "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5"; + version = "0.5.1.2"; + sha256 = "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp"; description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index efdf173a22c6..3ce97a9d97bd 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.9.0.1"; - sha256 = "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0"; + version = "2.9.1.0"; + sha256 = "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5"; description = "skarnet.org's small & secure supervision software suite"; -- cgit 1.4.1 From 98f5d0574f941f1fd7b08f0f895b76b4d2656373 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Mar 2020 13:16:05 +0200 Subject: gtk-gnutella: 1.1.14 -> 1.1.15 Remove patches applied between 1.1.14 and 1.1.15 and switch to GitHub source. gtk-gnutella: several changes. Disable internal malloc implementation. Add @doronbehar as maintainer. Comment about hardeningDisable regarding next release. Format arguments and inputs. Enable to disable GUI. --- pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 70 ++++++++++++++-------- 1 file changed, 46 insertions(+), 24 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 70e36cb7ec58..08163bd8a9e2 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,37 +1,58 @@ -{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils -, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls +{ stdenv +, fetchFromGitHub +, fetchpatch +, bison +, pkgconfig +, gettext +, desktop-file-utils +, glib +, gtk2 +, libxml2 +, libbfd +, zlib +, binutils +, gnutls +, enableGui ? true }: stdenv.mkDerivation rec { pname = "gtk-gnutella"; - version = "1.1.14"; + # NOTE: Please remove hardeningDisable on the next release, see: + # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 + version = "1.1.15"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii"; + src = fetchFromGitHub { + owner = "gtk-gnutella"; + repo = "gtk-gnutella"; + rev = "v${version}"; + sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r"; }; - patches = [ - (fetchpatch { - # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14 - url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch"; - sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch"; - sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn"; - }) + nativeBuildInputs = [ + bison + desktop-file-utils + gettext + pkgconfig ]; - - postPatch = '' - substituteInPlace Makefile.SH --replace "@exit 0" "@echo done" - ''; - - nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ]; - buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ]; + buildInputs = [ + glib + gnutls + libbfd + libxml2 + zlib + ] + ++ + stdenv.lib.optionals (enableGui) [ gtk2 ] + ; configureScript = "./build.sh"; - configureFlags = [ "--configure-only" ]; + configureFlags = [ + "--configure-only" + # See https://sourceforge.net/p/gtk-gnutella/bugs/555/ + "--disable-malloc" + ] + ++ stdenv.lib.optionals (!enableGui) [ "--topless" ] + ; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; @@ -45,6 +66,7 @@ stdenv.mkDerivation rec { description = "A GTK Gnutella client, optimized for speed and scalability"; homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; + maintainers = [ maintainers.doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; -- cgit 1.4.1 From 296d1f813da3db9ae72eed5a4624a0a14826d347 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Mar 2020 02:28:35 +0000 Subject: circus: 0.15.0 -> 0.16.1 --- pkgs/tools/networking/circus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 10edc92a9951..82c9db90432e 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -6,11 +6,11 @@ in buildPythonApplication rec { pname = "circus"; - version = "0.15.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b"; + sha256 = "0paccmqwgard2l0z7swcc3nwc418l9b4mfaddb4s31bpnqg02z6x"; }; postPatch = '' -- cgit 1.4.1 From 365eb878a976abdf516402d7c6b4a7c8b605504d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Mar 2020 02:53:28 +0000 Subject: pirate-get: 0.3.4 -> 0.3.5 --- pkgs/tools/networking/pirate-get/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index b92d255b719c..bacea663493f 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -4,20 +4,20 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.3.4"; + version = "0.3.5"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0f82yf3bl9jaywagv4vvwypm57z1x8a8qqn0xhz9np3949df4ysm"; + sha256 = "01jr9c04ic4bfalfdijavzvqzmpkw3hq1glqyc86z3v6zwl8dlp2"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; - homepage = https://github.com/vikstrous/pirate-get; + homepage = "https://github.com/vikstrous/pirate-get"; license = licenses.gpl1; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; -- cgit 1.4.1