reinit the tree, so we can have metadata

5 files changed, 130 insertions, 0 deletions

diff --git a/net-wireless/reaver/files/reaver-1.4_cflags.patch b/net-wireless/reaver/files/reaver-1.4_cflags.patch
new file mode 100644
index 000000000000..e4e1da718d64
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_cflags.patch
@@ -0,0 +1,47 @@
+--- a/src/wps/Makefile
++++ b/src/wps/Makefile
+@@ -1,34 +1,34 @@
+-CC=gcc
++CC?=gcc
+ INC=-I../utils -I ../
+ 
+ all: wps_attr_build.o wps_attr_parse.o wps_attr_process.o wps.o wps_common.o wps_dev_attr.o wps_enrollee.o wps_registrar.o wps_ufd.o
+ 
+ wps_attr_build.o:
+-	$(CC) $(INC) wps_attr_build.c -c
++	$(CC) $(CFLAGS) $(INC) wps_attr_build.c -c
+ 
+ wps_attr_parse.o:
+-	$(CC) $(INC) wps_attr_parse.c -c
++	$(CC) $(CFLAGS) $(INC) wps_attr_parse.c -c
+ 
+ wps_attr_process.o:
+-	$(CC) $(INC) wps_attr_process.c -c
++	$(CC) $(CFLAGS) $(INC) wps_attr_process.c -c
+ 
+ wps.o:
+-	$(CC) $(INC) wps.c -c
++	$(CC) $(CFLAGS) $(INC) wps.c -c
+ 
+ wps_common.o:
+-	$(CC) $(INC) wps_common.c -c
++	$(CC) $(CFLAGS) $(INC) wps_common.c -c
+ 
+ wps_dev_attr.o:
+-	$(CC) $(INC) wps_dev_attr.c -c
++	$(CC) $(CFLAGS) $(INC) wps_dev_attr.c -c
+ 
+ wps_enrollee.o:
+-	$(CC) $(INC) wps_enrollee.c -c
++	$(CC) $(CFLAGS) $(INC) wps_enrollee.c -c
+ 
+ wps_registrar.o:
+-	$(CC) $(INC) wps_registrar.c -c
++	$(CC) $(CFLAGS) $(INC) wps_registrar.c -c
+ 
+ wps_ufd.o:
+-	$(CC) $(INC) wps_ufd.c -c
++	$(CC) $(CFLAGS) $(INC) wps_ufd.c -c
+ 
+ clean:
+ 	rm -f *.o
diff --git a/net-wireless/reaver/files/reaver-1.4_memset.patch b/net-wireless/reaver/files/reaver-1.4_memset.patch
new file mode 100644
index 000000000000..782910a3f0f5
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_memset.patch
@@ -0,0 +1,11 @@
+--- a/src/crypto/md5-internal.c
++++ b/src/crypto/md5-internal.c
+@@ -188,7 +188,7 @@
+     MD5Transform(ctx->buf, (u32 *) ctx->in);
+     byteReverse((unsigned char *) ctx->buf, 4);
+     os_memcpy(digest, ctx->buf, 16);
+-    os_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
++    os_memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
+ }
+ 
+ /* The four core functions - F1 is optimized somewhat */
diff --git a/net-wireless/reaver/files/reaver-1.4_parallel-make.patch b/net-wireless/reaver/files/reaver-1.4_parallel-make.patch
new file mode 100644
index 000000000000..f880cd7562b4
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_parallel-make.patch
@@ -0,0 +1,50 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -16,22 +16,22 @@
+ 	$(CC) $(CFLAGS) $(INC) wpscrack.c *.o $(LDFLAGS) -o reaver
+ 
+ libwps.o:
+-	(cd $(LIBWPS_DIR) && make)
++	(cd $(LIBWPS_DIR) && $(MAKE))
+ 
+ wps: libutils libcrypto
+-	(cd wps && make)
++	(cd wps && $(MAKE))
+ 
+ libutils:
+-	(cd utils && make)
++	(cd utils && $(MAKE))
+ 
+ libcrypto: libtls
+-	(cd crypto && make)
++	(cd crypto && $(MAKE))
+ 
+ libtls:
+-	(cd tls && make)
++	(cd tls && $(MAKE))
+ 
+ libiw:
+-	(cd lwe && make BUILD_STATIC=y libiw.a)
++	(cd lwe && $(MAKE) BUILD_STATIC=y libiw.a)
+ 
+ init.o:
+ 	$(CC) $(CFLAGS) init.c -c
+@@ -93,12 +93,12 @@
+ clean:
+ 	rm -f *~ *.o reaver wash
+ 	rm -rf *.cache config.status config.log
+-	(cd utils && make clean)
+-	(cd tls && make clean)
+-	(cd crypto && make clean)
+-	(cd wps && make clean)
+-	(cd lwe && make realclean)
+-	(cd $(LIBWPS_DIR) && make clean)
++	(cd utils && $(MAKE) clean)
++	(cd tls && $(MAKE) clean)
++	(cd crypto && $(MAKE) clean)
++	(cd wps && $(MAKE) clean)
++	(cd lwe && $(MAKE) realclean)
++	(cd $(LIBWPS_DIR) && $(MAKE) clean)
+ 	rm -f Makefile config.h
+ 
+ cleanbin: 
diff --git a/net-wireless/reaver/files/reaver-1.4_var_db.patch b/net-wireless/reaver/files/reaver-1.4_var_db.patch
new file mode 100644
index 000000000000..de4317b59ffc
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_var_db.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -3,7 +3,7 @@ LIBWPS_DIR=libwps
+ INC=-I$(LIBWPS_DIR)
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-CONFDIR=@sysconfdir@/@target@
++CONFDIR=/var/db/reaver
+ CFLAGS=-DCONF_DIR='"$(CONFDIR)"' -DREAVER_DATABASE='"$(CONFDIR)/reaver.db"' @CFLAGS@
+ LDFLAGS=$(LIBWPS_DIR)/*.o wps/*.o tls/bignum.o tls/libtls.a utils/libutils.a crypto/libcrypto.a lwe/libiw.a @LDFLAGS@
+ 
diff --git a/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch b/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
new file mode 100644
index 000000000000..cc9fe6b774e8
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
@@ -0,0 +1,11 @@
+--- a/wps/wps_registrar.c
++++ b/wps/wps_registrar.c
+@@ -1469,7 +1469,7 @@
+ 
+ 	wpa_printf(MSG_DEBUG, "WPS: Building Message M4");
+ 
+-	wpa_printf(MSG_DEBUG, "WPS: Dev Password Len: %d", wps->dev_password_len);
++	wpa_printf(MSG_DEBUG, "WPS: Dev Password Len: %zd", wps->dev_password_len);
+ 	wpa_printf(MSG_DEBUG, "WPS: Dev Password: %s", wps->dev_password);
+ 
+ 	wps_derive_psk(wps, wps->dev_password, wps->dev_password_len);