public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ^/nixpkgs/trunk.

Browse Source 
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
This commit is contained in:
Yury G. Kudryashov
2012-03-28 15:42:42 +00:00
parent 49b7f13128 db8f709430
commit defd86049c
773 changed files with 4797 additions and 4596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/ksshaskpass/default.nix
+23
View File
@@ -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;
};
}
pkgs/tools/security/p0f/default.nix
-13
View File
@@ -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];
}
pkgs/tools/security/p0f/p0f.patch
-46
View File
@@ -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."