about summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-28 15:42:42 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-28 15:42:42 +0000
commitdefd86049c17a1a34db52f9cbf238f926e270dca (patch)
treebfb3eab227bc0ad487db09a2a34780fb71f61808 /pkgs/tools/security
parent49b7f13128731188bfebdc2cf2a712a7fc5118ce (diff)
parentdb8f709430e20ad07e040af1813529e133ec823b (diff)
downloadnixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.gz
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.bz2
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.lz
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.xz
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.zst
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.zip
Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/ksshaskpass/default.nix23
-rw-r--r--pkgs/tools/security/p0f/default.nix13
-rw-r--r--pkgs/tools/security/p0f/p0f.patch46
3 files changed, 23 insertions, 59 deletions
diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix
new file mode 100644
index 000000000000..1c777294c9bb
--- /dev/null
+++ b/pkgs/tools/security/ksshaskpass/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, kdelibs}:
+
+stdenv.mkDerivation {
+  name = "ksshaskpass-0.5.3";
+
+  src = fetchurl {
+    url = http://kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz;
+    sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
+  };
+
+  buildInputs = [ kdelibs ];
+
+  patchPhase = ''
+    sed -i 's@/usr/bin/@@' src/ksshaskpass.desktop
+  '';
+
+  meta = {
+    homepage = http://kde-apps.org/content/show.php?content=50971;
+    description = "A KDE 4 version of ssh-askpass with KWallet support";
+    license = stdenv.lib.licenses.gpl2Plus;
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
deleted file mode 100644
index 22c58cdfecf8..000000000000
--- a/pkgs/tools/security/p0f/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, libpcap}:
-  
-stdenv.mkDerivation {
-  name = "p0f-2.0.8";
-  
-  src = fetchurl {
-    url = http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz;
-    md5 = "1ccbcd8d4c95ef6dae841120d23c56a5";
-  };
-  
-  buildInputs = [libpcap];
-  patches = [./p0f.patch];
-}
diff --git a/pkgs/tools/security/p0f/p0f.patch b/pkgs/tools/security/p0f/p0f.patch
deleted file mode 100644
index e1b73fa37a07..000000000000
--- a/pkgs/tools/security/p0f/p0f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ruN p0f/Build p0f.new/Build
---- p0f/Build	2006-03-16 08:44:34.000000000 +0100
-+++ p0f.new/Build	2007-01-13 03:26:40.000000000 +0100
-@@ -36,9 +36,9 @@
- 
- USE_BPF="pcap-bpf.h"
- 
--if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
--  USE_BPF="net/bpf.h"
--fi
-+#if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
-+#  USE_BPF="net/bpf.h"
-+#fi
- 
- export USE_BPF
- 
-diff -ruN p0f/mk/Linux p0f.new/mk/Linux
---- p0f/mk/Linux	2006-08-21 14:37:00.000000000 +0200
-+++ p0f.new/mk/Linux	2007-01-13 03:34:18.000000000 +0100
-@@ -11,8 +11,7 @@
- LIBS	= -lpcap
- STRIP   = strip
- CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
--          -DUSE_BPF=\"${USE_BPF}\" \
--	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
-+          -DUSE_BPF=\"${USE_BPF}\"
- FILE	= p0f
- TOOLS   = test/sendack test/sendack2 test/sendsyn
- 
-@@ -47,9 +46,11 @@
- 	rm -f /tmp/p0f.tgz
- 	
- install: $(FILE)
--	cp -f $(FILE) /usr/sbin/
--	cp -f p0frep /usr/sbin/
--	mkdir /etc/p0f || true
--	cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp /etc/p0f/
--	cp -f p0f.1 /usr/man/man1/ || cp -f p0f.1 /usr/local/man/man1/
-+	mkdir -p ${out}/sbin
-+	cp -f $(FILE) ${out}/sbin/
-+	cp -f p0frep ${out}/sbin/
-+	mkdir -p ${out}/etc/p0f || true
-+	cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp ${out}/etc/p0f/
-+	mkdir -p ${out}/man/man1
-+	cp -f p0f.1 ${out}/man/man1/
- 	@echo "You might want to manually install test/ tools now."