Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra/libnids
diff options
context:
space:
mode:
Diffstat (limited to 'extra/libnids')
-rw-r--r--extra/libnids/PKGBUILD17
-rw-r--r--extra/libnids/libnids-1.24-inline.patch46
2 files changed, 63 insertions, 0 deletions
diff --git a/extra/libnids/PKGBUILD b/extra/libnids/PKGBUILD
new file mode 100644
index 00000000..7a510454
--- /dev/null
+++ b/extra/libnids/PKGBUILD
@@ -0,0 +1,17 @@
+# libndis defines some functions inline, so they are not in the shared library,
+# needed for instance for dsniff
+# see https://src.fedoraproject.org/cgit/rpms/libnids.git/commit/?id=ecafb692f20e0acad555f66c3cc1646997a82dae
+
+source+=('libnids-1.24-inline.patch')
+sha256sums+=('3aea2351877c2a789d753ac66f1323a3d575dead9fb04c559e221dbebdfc7e3e')
+
+eval "$(
+ {
+ declare -f prepare || \
+ printf 'prepare() {\n}\n'
+ } \
+ | sed '
+ $i cd "$srcdir/$pkgname-$pkgver" \
+ patch -Np1 -i "$srcdir/libnids-1.24-inline.patch"
+ '
+)"
diff --git a/extra/libnids/libnids-1.24-inline.patch b/extra/libnids/libnids-1.24-inline.patch
new file mode 100644
index 00000000..b17b73e9
--- /dev/null
+++ b/extra/libnids/libnids-1.24-inline.patch
@@ -0,0 +1,46 @@
+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.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+ 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
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+ return (csum_fold(csum_partial(buff, len, 0)));
+ }
+
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+ if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+ return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ csum_partial((u_char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+ if (dontchksum(saddr))