Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/community/libnids
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-05-03 07:59:05 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-05-03 07:59:05 +0200
commitb5629b3bf409f7e9efcc3efcf72e4b4a469c5d7e (patch)
tree0922e76f46fc1852bd7fc456435a058bc0ce5a7c /community/libnids
parent57c6cc24bf27b44adbcde021574deae60ec17b2d (diff)
community/libnids: redone patch and tested dsniff (which works now)
Diffstat (limited to 'community/libnids')
-rw-r--r--community/libnids/PKGBUILD2
-rw-r--r--community/libnids/libnids-1.24-inline.patch24
2 files changed, 13 insertions, 13 deletions
diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD
index b21e57a2..13578e05 100644
--- a/community/libnids/PKGBUILD
+++ b/community/libnids/PKGBUILD
@@ -3,7 +3,7 @@
# see https://src.fedoraproject.org/cgit/rpms/libnids.git/commit/?id=ecafb692f20e0acad555f66c3cc1646997a82dae
source+=('libnids-1.24-inline.patch')
-sha256sums+=('be5a0e9987f7c1bdae5480f8463ba8b0011c4c000750e8e22136fe81b6287b98')
+sha256sums+=('3aea2351877c2a789d753ac66f1323a3d575dead9fb04c559e221dbebdfc7e3e')
prepare() {
cd $pkgname-$pkgver
diff --git a/community/libnids/libnids-1.24-inline.patch b/community/libnids/libnids-1.24-inline.patch
index c1123c2f..b17b73e9 100644
--- a/community/libnids/libnids-1.24-inline.patch
+++ b/community/libnids/libnids-1.24-inline.patch
@@ -1,15 +1,6 @@
-diff --git a/libnids-1.24-inline.patch b/libnids-1.24-inline.patch
-new file mode 100644
-index 0000000..e3a6cce
---- /dev/null
-+++ b/libnids-1.24-inline.patch
-@@ -0,0 +1,40 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for libnids <= 1.24 which
-avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and
-my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well.
-
---- libnids-1.24/src/checksum.c 2010-02-26 11:58:41.000000000 +0100
-+++ libnids-1.24/src/checksum.c.inline 2016-02-09 14:08:38.000000000 +0100
+diff -rauN libnids-1.24/src/checksum.c libnids-1.24-inline-patch/src/checksum.c
+--- libnids-1.24/src/checksum.c 2010-02-26 11:58:41.000000000 +0100
++++ libnids-1.24-inline-patch/src/checksum.c 2018-05-03 07:53:10.552320792 +0200
@@ -120,7 +120,7 @@
By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt
Gulbrandsen.
@@ -19,6 +10,15 @@ my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well.
{
u_int sum;
if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -172,7 +172,7 @@
+ computes the checksum of the TCP/UDP pseudo-header
+ returns a 16-bit checksum, already complemented
+ */
+-static inline u_short
++static u_short
+ csum_tcpudp_magic(u_int saddr, u_int daddr, u_short len,
+ u_short proto, u_int sum)
+ {
@@ -191,13 +191,13 @@
this routine is used for miscellaneous IP-like checksums, mainly in
icmp.c