jool: Update to 4.0.6 10480/head
authorTiago Gaspar <tiagogaspar8@gmail.com>
Wed, 6 Nov 2019 17:00:22 +0000 (17:00 +0000)
committerTiago Gaspar <tiagogaspar8@gmail.com>
Wed, 6 Nov 2019 17:00:22 +0000 (17:00 +0000)
Update jool to te latest stable version (4.0.6).

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
net/jool/Makefile
net/jool/patches/010-musl.patch [deleted file]

index 17cd56bc359b56925bc0953a26dacba43bb5f059..f0f34ca09490ce2985d75e4c6ba45f0cd66044fa 100644 (file)
@@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=jool
-PKG_VERSION:=4.0.5
+PKG_VERSION:=4.0.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/NICMx/Jool/releases/download/v$(PKG_VERSION)
-PKG_HASH:=b61ae37d7a71e28530765bdfd9a62f89e7878e3ea9c15dabbcefcd144891100d
+PKG_HASH:=d9314c9de421c1fa854be83ab8ad6b4ad5062a01a9865a97bb87c5850d1c2b2a
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-only
diff --git a/net/jool/patches/010-musl.patch b/net/jool/patches/010-musl.patch
deleted file mode 100644 (file)
index 0bac615..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/usr/argp/main.c
-+++ b/src/usr/argp/main.c
-@@ -8,6 +8,7 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <getopt.h>
- #include "command.h"
- #include "log.h"
---- a/src/usr/iptables/Makefile
-+++ b/src/usr/iptables/Makefile
-@@ -34,9 +34,9 @@ uninstall:
-       rm -f ${DESTDIR}${XTABLES_SO_DIR}/libxt_JOOL_SIIT.so
-       rm -f ${DESTDIR}${XTABLES_SO_DIR}/libxt_JOOL.so
- lib%.so: lib%.o
--      gcc -shared -fPIC ${LDFLAGS} -o $@ $^;
-+      ${CC} -shared -fPIC ${LDFLAGS} -o $@ $^;
- lib%.o: lib%.c
--      gcc ${DEFAULT_CFLAGS} ${CFLAGS} -D_INIT=lib$*_init -fPIC -c -o $@ $<;
-+      ${CC} ${DEFAULT_CFLAGS} ${CFLAGS} -D_INIT=lib$*_init -fPIC -c -o $@ $<;
- clean distclean:
-       rm -f *.so
- distdir: