From 479de47f11df14ff001a3d337d7579e1247de3cf Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 14 Jul 2018 03:16:33 +0200 Subject: [PATCH] Ensure libmissing.a exists before dsniff for parallelized builds --- dsniff-2.4-libtirpc.patch | 2 +- dsniff-2.4-smp_mflags.patch | 15 +++++++++++++++ dsniff.spec | 6 ++++-- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 dsniff-2.4-smp_mflags.patch diff --git a/dsniff-2.4-libtirpc.patch b/dsniff-2.4-libtirpc.patch index c4aa191..738aa3a 100644 --- a/dsniff-2.4-libtirpc.patch +++ b/dsniff-2.4-libtirpc.patch @@ -16,7 +16,7 @@ support in glibc has been deprecated for a long time. @@ -93,7 +93,7 @@ $(RANLIB) $@ - dsniff: $(HDRS) $(SRCS) $(OBJS) + dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) -ltirpc diff --git a/dsniff-2.4-smp_mflags.patch b/dsniff-2.4-smp_mflags.patch new file mode 100644 index 0000000..791faa9 --- /dev/null +++ b/dsniff-2.4-smp_mflags.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck for dsniff >= 2.4b1 which +ensures when building using %{?_smp_mflags} that libmissing.a is built when +its being used for linking. + +--- dsniff-2.4/Makefile.in 2018-07-14 02:54:20.405095355 +0200 ++++ dsniff-2.4/Makefile.in.smp_mflags 2018-07-14 02:54:44.973245128 +0200 +@@ -92,7 +92,7 @@ + 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 diff --git a/dsniff.spec b/dsniff.spec index d224391..9e16a64 100644 --- a/dsniff.spec +++ b/dsniff.spec @@ -38,7 +38,8 @@ Patch28: dsniff-2.4-pntohl_shift.patch Patch29: dsniff-2.4-rpc_segfault.patch Patch30: dsniff-2.4-openssl_110.patch Patch31: dsniff-2.4-remote_typo.patch -Patch32: dsniff-2.4-libtirpc.patch +Patch32: dsniff-2.4-smp_mflags.patch +Patch33: dsniff-2.4-libtirpc.patch BuildRequires: gcc BuildRequires: libnet-devel BuildRequires: openssl-devel @@ -100,8 +101,9 @@ by exploiting weak bindings in ad-hoc PKI. %patch29 -p1 -b .rpc_segfault %patch30 -p1 -b .openssl_110 %patch31 -p1 -b .remote_typo +%patch32 -p1 -b .smp_mflags %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -%patch32 -p1 -b .libtirpc +%patch33 -p1 -b .libtirpc %endif %build