mdk4: upstream fixed

This commit is contained in:
Rick Farina (Zero_Chaos) 2022-01-18 22:26:07 -05:00
parent 76922bf4a3
commit 9122d953a7
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC
3 changed files with 3 additions and 100 deletions

View file

@ -1 +1 @@
DIST mdk4-4.2_p20211014.tar.gz 176033 BLAKE2B 15d029480c02425806dba4d3a846b9c843ab68aa9c97167e5be9f18b731321c231a20c30b872b0c1826cd33a7f61a31c7cef938d89ce96490d715e797977000f SHA512 7e906c11a30504ba5ad33b286d675fc2ca01b6854189f073d90880c6a60062c796ecd2c98482a3cfb1aa832a34a3a243cadd3a0d394f1192a1e90e12709abb2d
DIST mdk4-4.2_p20220118.tar.gz 176096 BLAKE2B ccae03d931714c89b2a8ba0c243df566c3c692a41d9c90deb0ee22bb56696dc817441a2037ccda213791d00314d7daf1c471c5d5560d5b1b802e75de9e9da15c SHA512 3371d8c45fb41aaf3a5796a03856fe14e40244a43a25a5c19b1ed2322a7ed59931221a92769afbbcabe8808c4263699636604233aa2551988168ce511b588cc1

View file

@ -1,94 +0,0 @@
diff --git a/Makefile b/Makefile
index 4bad0d4..5e20162 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-DESTDIR =
-PREFIX = /usr/local
-SBINDIR = $(PREFIX)/sbin
-MANDIR = $(PREFIX)/share/man
+DESTDIR ?=
+PREFIX ?= /usr/local
+SBINDIR ?= $(PREFIX)/sbin
+MANDIR ?= $(PREFIX)/share/man
SRC = src
@@ -13,7 +13,6 @@ install: all
PREFIX=$(DESTDIR)$(PREFIX)
$(MAKE) -C $(SRC) install
install -D -m 0644 man/mdk4.2 $(DESTDIR)$(MANDIR)/man8/mdk4.2
- gzip -f $(DESTDIR)$(MANDIR)/man8/mdk4.2
.PHONY : clean
clean:
diff --git a/common.mak b/common.mak
index 86b92c1..ae229af 100644
--- a/common.mak
+++ b/common.mak
@@ -121,7 +121,7 @@ OPTFLAGS = -D_FILE_OFFSET_BITS=64
CFLAGS ?= -g -W -Wall -O3
CFLAGS += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS)
-prefix = /usr/local
+prefix ?= /usr/local
bindir = $(prefix)/bin
sbindir = $(prefix)/sbin
mandir = $(prefix)/share/man/man1
diff --git a/src/Makefile b/src/Makefile
index 1540755..ce4051d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,10 +3,10 @@ include $(MDK_ROOT)/common.mak
# TODO: Remove '-fcommon' from CFLAGS and address issues, reference:
# https://gcc.gnu.org/gcc-10/porting_to.html#common
-CFLAGS += -g -O3 -Wall -Wextra -fcommon
+CFLAGS ?= -g -O3 -Wall -Wextra -fcommon
LINKFLAGS = -lpthread -lpcap $(LDFLAGS)
-SBINDIR = $(PREFIX)/sbin
+SBINDIR ?= $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man
OSD = osdep
@@ -41,11 +41,11 @@ test: test.c $(OBJS)
mv $(@) ..
install: mdk4
- install -D -m 0755 $^ $(SBINDIR)/$^
+ install -D -m 0755 $^ $(DESTDIR)/$(SBINDIR)/$^
$(MAKE) -C $(ATTACKS) install
$(MAKE) -C $(OSD) install
- mkdir -p /usr/local/src/mdk4
- cp -r pocs /usr/local/src/mdk4
+ mkdir -p $(DESTDIR)$(PREFIX)/share/mdk4
+ cp -r pocs $(DESTDIR)$(PREFIX)/share/mdk4
.PHONY : clean
clean:
diff --git a/src/attacks/poc.c b/src/attacks/poc.c
index 7547b1c..cd72721 100644
--- a/src/attacks/poc.c
+++ b/src/attacks/poc.c
@@ -101,12 +101,16 @@ void* poc_parse(int argc, char *argv[]) {
strcpy(poc_path, "./pocs");
dir=opendir(poc_path);
if (dir == NULL){
- strcpy(poc_path, "/usr/local/src/mdk4/pocs");
+ strcpy(poc_path, "/usr/share/mdk4/pocs");
dir=opendir(poc_path);
if(dir == NULL){
- printf("Open pocs dir error!\n");
- exit(1);
- }
+ strcpy(poc_path, "/usr/local/share/mdk4/pocs");
+ dir=opendir(poc_path);
+ if(dir == NULL){
+ printf("Open pocs dir error!\n");
+ exit(1);
+ }
+ }
}
file_cnt = 0;

View file

@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
inherit git-r3
else
COMMIT="9e595b2f72b9c6cf12cc688e46e3eba3bac1b4d3"
COMMIT="8ddd3969f6457a3d275d6f9e078ec95b6b2b47ea"
SRC_URI="https://github.com/aircrack-ng/mdk4/archive/"${COMMIT}".tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
S="${WORKDIR}/${PN}-${COMMIT}"
@ -26,15 +26,12 @@ DEPEND="dev-libs/libnl:=
net-libs/libpcap:="
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}"/4.2ish-makefile.patch )
src_compile() {
emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
}
src_install() {
emake PREFIX="/usr" DESTDIR="${ED}" install
mv "${ED}/usr/share/man/man8/mdk4.2" "${ED}/usr/share/man/man8/mdk4.8" || die
emake DESTDIR="${ED}" install
insinto /usr/share/${PN}
doins -r useful_files