summaryrefslogtreecommitdiffstats
path: root/network/dsniff/patches/34_fix-parallel-FTBFS.patch
diff options
context:
space:
mode:
Diffstat (limited to 'network/dsniff/patches/34_fix-parallel-FTBFS.patch')
-rw-r--r--network/dsniff/patches/34_fix-parallel-FTBFS.patch109
1 files changed, 109 insertions, 0 deletions
diff --git a/network/dsniff/patches/34_fix-parallel-FTBFS.patch b/network/dsniff/patches/34_fix-parallel-FTBFS.patch
new file mode 100644
index 0000000000..00fbb96c13
--- /dev/null
+++ b/network/dsniff/patches/34_fix-parallel-FTBFS.patch
@@ -0,0 +1,109 @@
+Description: Fix parallel FTBFS problems
+ * Add libmissing.a as a dependency to each of the PROGS to ensure it is
+ built before them.
+ * Ensure mount.h is created before decode_mountd.o gets built.
+ * Ensure nfs_prot.h is created before filesnarf.o gets built.
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/860611
+Bug-Debian: https://bugs.debian.org/869086
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,16 +75,28 @@
+ .c.o:
+ $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
+
+-all: libmissing.a $(PROGS)
++all: $(PROGS)
+
+-mount.c: mount.x
++mount.h: mount.x
+ rpcgen -h mount.x -o mount.h
++
++mount.c: mount.x
+ rpcgen -c mount.x -o mount.c
+
+-nfs_prot.c: nfs_prot.x
++mount.o: mount.h
++
++decode_mountd.o: mount.h
++
++nfs_prot.h: nfs_prot.x
+ rpcgen -h nfs_prot.x -o nfs_prot.h
++
++nfs_prot.c: nfs_prot.x
+ rpcgen -c nfs_prot.x -o nfs_prot.c
+
++nfs_prot.o: nfs_prot.h
++
++filesnarf.o: nfs_prot.h
++
+ $(LIBOBJS):
+ $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+
+@@ -92,49 +104,49 @@
+ ar -cr $@ $(LIBOBJS)
+ $(RANLIB) $@
+
+-dsniff: $(HDRS) $(SRCS) $(OBJS)
++dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
+
+-arpspoof: arpspoof.o arp.o
++arpspoof: arpspoof.o arp.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-dnsspoof: dnsspoof.o pcaputil.o
++dnsspoof: dnsspoof.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o
++filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-macof: macof.o
++macof: macof.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-mailsnarf: mailsnarf.o buf.o pcaputil.o
++mailsnarf: mailsnarf.o buf.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ mailsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-msgsnarf: msgsnarf.o buf.o pcaputil.o
++msgsnarf: msgsnarf.o buf.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
++sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+
+-sshow: sshow.o pcaputil.o
++sshow: sshow.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-tcpkill: tcpkill.o pcaputil.o
++tcpkill: tcpkill.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-tcpnice: tcpnice.o pcaputil.o
++tcpnice: tcpnice.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ tcpnice.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-tcphijack: tcphijack.o pcaputil.o
++tcphijack: tcphijack.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ tcphijack.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+
+-urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o
++urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+
+-webmitm: webmitm.o base64.o buf.o decode_http.o record.o
++webmitm: webmitm.o base64.o buf.o decode_http.o record.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
+
+-webspy: webspy.o base64.o buf.o remote.o
++webspy: webspy.o base64.o buf.o remote.o libmissing.a
+ $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
+
+ install: