Merge pull request #392 from cotequeiroz/pimbd-constant_cpu_to_be32

pimbd: Fix gcc 7.3 compilation error

diff --git a/babel-pinger/Makefile b/babel-pinger/Makefile
index 40e7b1a3eb1c04052b8624f0acf844dd268639b4..052f467a719c7380f53c2a5b38159648f2366484 100644 (file)
--- a/babel-pinger/Makefile
+++ b/babel-pinger/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
-PKG_MD5SUM:=40d4931986913f5f8d9b5b70abf6fda5
+PKG_HASH:=c411430bb102f08d3d68d2fb5010b5da0149908b671ac0fb12abd8c8ee6380c5
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/babeld/Makefile b/babeld/Makefile
index 5cf136d2b856a19d9e7e149ad551e65eeb0c969c..f4c65c9bc2a59452a57d3f589bb726a5ea9a78de 100644 (file)
--- a/babeld/Makefile
+++ b/babeld/Makefile
@@ -13,7 +13,6 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/
-PKG_MD5SUM:=eec395ade02524b3f351507a21742939
 PKG_HASH:=07edecb132386d5561a767482bc5200e04239b18e48c2f0f47ae1c78d60fe5dc
 PKG_LICENSE:=MIT
 

diff --git a/batmand/Makefile b/batmand/Makefile
index b4ed3017104136c9cd18a04a498afe2921b61118..425d355943039b25f02ec3789e9bc3461c009fdb 100644 (file)
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=batmand
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.open-mesh.org/batmand.git
+PKG_SOURCE_URL:=https://git.open-mesh.org/batmand.git
 PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e
 PKG_VERSION:=1440
 PKG_RELEASE:=0

diff --git a/bird2/Makefile b/bird2/Makefile
index 47ca5803c4a3644d45d1061fa0a679d3d2fc1d5c..f4aa4cd01c962a00efced5f3805f3e1222011340 100644 (file)
--- a/bird2/Makefile
+++ b/bird2/Makefile
@@ -12,7 +12,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f
+PKG_HASH:=035f91d6f568f8ed438a0814235ac4c5c79147cd2acf201322c307732883480f
 PKG_BUILD_DEPENDS:=ncurses readline
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index fd9608183276fb32c7142bd883721505d10791af..92610e1bdc292928c50dff551f9dc1e4f56ab8c5 100644 (file)
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -28,8 +28,7 @@ PKG_NAME:=bmx6
 
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx6.git
-#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx6.git
+PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx6.git
 
 PKG_REV:=0312168aaa384379ccbefd4b2d936fc698664d5b
 PKG_MIRROR_HASH:=98acdbda8a8cadadf8141c7b8a17b6417112f70f3211b86abad23a8c7a28be10
@@ -44,7 +43,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 include $(INCLUDE_DIR)/package.mk
 
-
 TARGET_CFLAGS += $(FPIC)
 
 MAKE_ARGS += \

diff --git a/bmx7/Makefile b/bmx7/Makefile
index 41205df739f79437f8757e17a7b5c6881dd65705..fe90af9c1ad4674f401ceea665c8ac81b69b95ee 100644 (file)
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -27,13 +27,12 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
-PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx7.git
-#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx7.git
+PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx7.git
 
 PKG_REV:=9883383dc26df16da67b9ef7ba99efe62f79c4e7
 PKG_MIRROR_HASH:=012178aba42016d3e0961715f99bf1e322c2c6c22b1cc6635375468360cb4d68
 PKG_VERSION:=r2018042501
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0
 
 PKG_SOURCE_VERSION:=$(PKG_REV)

diff --git a/bmx7/files/etc/init.d/bmx7 b/bmx7/files/etc/init.d/bmx7
index 515dc8876df77b7aca966c7f30dc117381c7f1cd..74f896603cc30c9b8c6feeaff96e4b360e0e673f 100755 (executable)
--- a/bmx7/files/etc/init.d/bmx7
+++ b/bmx7/files/etc/init.d/bmx7
@@ -20,5 +20,9 @@ start_service() {
 }
 
 reload_service() {
-    $BIN -c configReload
+    "$BIN" -c configReload
+}
+
+service_triggers() {
+    procd_add_reload_trigger "bmx7"
 }

diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index 4b6cf4eaf4b6275c2d63d50d35ce2e8aa7500f31..ca709c812702954d28eed6f5a0b311037f0dd16f 100644 (file)
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=2017-08-24-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/mcproxy/mcproxy.git
+PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0+
 

diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile
index 36faa8d802e40f1ddc0a64722fcc66c4104b0805..8b8cf24c7bd4935b99955818f082140d83553f5f 100644 (file)
--- a/minimalist-pcproxy/Makefile
+++ b/minimalist-pcproxy/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/fingon/minimalist-pcproxy.git
+PKG_SOURCE_URL:=https://github.com/fingon/minimalist-pcproxy.git
 PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
 PKG_LICENSE:=GPL-2.0
 

diff --git a/mrd6/Makefile b/mrd6/Makefile
index c4863ed4644c4f3d52eb38e5b58211ec257f3326..8cdd8d15be3b2db25edcf53c6a9f6e81439ba019 100644 (file)
--- a/mrd6/Makefile
+++ b/mrd6/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=2013-11-30-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/hugosantos/mrd6.git
+PKG_SOURCE_URL:=https://github.com/hugosantos/mrd6.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0+
 

diff --git a/ndppd/Makefile b/ndppd/Makefile
index 9a3d55ea4a6c4b01a2bd2baac634e232e49d738a..d889f5238768ad3ce7cab946aadfd1b0239ca4ed 100644 (file)
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -8,14 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ndppd
-PKG_VERSION:=0.2.3
+PKG_VERSION:=0.2.5
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
-
 # Latest release
-PKG_SOURCE_URL:=https://github.com/DanielAdolfsson/ndppd/archive
-PKG_MD5SUM:=1391c063db64b47541e58da12e5ae60d
+PKG_SOURCE_URL:=https://codeload.github.com/DanielAdolfsson/ndppd/tar.gz/$(PKG_VERSION)?
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=ee934167f8357f0bd0015e201a77fbe4d028c59e89dc98113805c6855e1c3992
 PKG_LICENSE:=GPL-3.0+
 
 # Development snapshot

diff --git a/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch b/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
deleted file mode 100644 (file)
index dad23f5..0000000
--- a/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 00da8bf7bab88a3827af4110fb27df9cde542e32 Mon Sep 17 00:00:00 2001
-From: Daniel Adolfsson <daniel@priv.nu>
-Date: Tue, 12 Feb 2013 13:25:22 +0100
-Subject: [PATCH] =?UTF-8?q?Fix=20issue=20#2=20-=20ndppd=20d=C3=A6monizes=20t?=
- =?UTF-8?q?oo=20early?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- src/ndppd.cc |   18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/src/ndppd.cc b/src/ndppd.cc
-index 6ac19e8..20ced6f 100644
---- a/src/ndppd.cc
-+++ b/src/ndppd.cc
-@@ -201,15 +201,6 @@ int main(int argc, char* argv[], char* env[])
-         }
-     }
- 
--    if (daemon) {
--        logger::syslog(true);
--
--        if (daemonize() < 0) {
--            logger::error() << "Failed to daemonize process";
--            return 1;
--        }
--    }
--
-     if (!pidfile.empty()) {
-         std::ofstream pf;
-         pf.open(pidfile.c_str(), std::ios::out | std::ios::trunc);
-@@ -225,8 +216,15 @@ int main(int argc, char* argv[], char* env[])
- 
-     if (!configure(config_path))
-         return -1;
-+    
-+    if (daemon) {
-+        logger::syslog(true);
- 
--    //route::load("/proc/net/ipv6_route");
-+        if (daemonize() < 0) {
-+            logger::error() << "Failed to daemonize process";
-+            return 1;
-+        }
-+    }
- 
-     // Time stuff.
- 
--- 
-1.7.10.4
-

diff --git a/ndppd/patches/0002-upstream-cast-fix.patch b/ndppd/patches/0002-upstream-cast-fix.patch
deleted file mode 100644 (file)
index 555a198..0000000
--- a/ndppd/patches/0002-upstream-cast-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f19fa4be6ac87032c01f2db57ccb484f83c62604 Mon Sep 17 00:00:00 2001
-From: Daniel Adolfsson <daniel@priv.nu>
-Date: Fri, 8 Apr 2016 13:32:22 +0200
-Subject: [PATCH] Fix a cast so it can be compiled with gcc-6
-
----
- src/iface.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/iface.cc b/src/iface.cc
-index 3ce893f..5f165eb 100644
---- a/src/iface.cc
-+++ b/src/iface.cc
-@@ -147,7 +147,7 @@ ptr<iface> iface::open_pfd(const std::string& name)
-         // Bail if it's* not* ND_NEIGHBOR_SOLICIT.
-         BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, ND_NEIGHBOR_SOLICIT, 0, 1),
-         // Keep packet.
--        BPF_STMT(BPF_RET | BPF_K, -1),
-+        BPF_STMT(BPF_RET | BPF_K, (u_int32_t)-1),
-         // Drop packet.
-         BPF_STMT(BPF_RET | BPF_K, 0)
-     };

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index b0f9da8112e348ba643497a4b6864b9e301c91a5..7b05e630663d7ff962b4059727e8988b6c3bf7b2 100644 (file)
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -12,7 +12,7 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
+PKG_SOURCE_URL:=https://github.com/nodogsplash/nodogsplash.git
 PKG_SOURCE_VERSION:=9ef7d5fc16351585baf65877776d19cf85bf3031
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1

diff --git a/ohybridproxy/Makefile b/ohybridproxy/Makefile
index 7d88f5d862ec619a8f9fccc01d361c496310a3bb..ea23137f311122cc6525aa2870010bbb11cff8b5 100644 (file)
--- a/ohybridproxy/Makefile
+++ b/ohybridproxy/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=2016-06-28-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/sbyx/ohybridproxy.git
+PKG_SOURCE_URL:=https://github.com/sbyx/ohybridproxy.git
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 4aaccb2ca51a3eae116883ec052cf17162bf1b3c..75f377e689da2deac12c2f460cc45f2243384275 100644 (file)
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=v0.9.6.2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_MD5SUM:=
 
 PKG_BUILD_PARALLEL:=0
 PKG_LICENSE:=BSD-3-Clause

diff --git a/quagga/Makefile b/quagga/Makefile
index f8963e01ac3a9710097ad892c11e91e35504504f..e2751f4ed91ed18c534952f0096d2f9bfde51a01 100644 (file)
--- a/quagga/Makefile
+++ b/quagga/Makefile
@@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=quagga
 PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=daa303871e07ea5856aae6fd79e89722
+PKG_HASH:=f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/quagga/
+PKG_SOURCE_URL:=@SAVANNAH/quagga/
 PKG_CONFIG_DEPENDS:= \
        CONFIG_IPV6 \
        CONFIG_PACKAGE_quagga-watchquagga \

diff --git a/vis/Makefile b/vis/Makefile
index 316224a39f2726c64dfbfbca4ce2ec2bec92d8a0..af58f5e00390360d53d5dc08446bae7478d9d1cc 100644 (file)
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=vis
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.open-mesh.org/vis.git
+PKG_SOURCE_URL:=https://git.open-mesh.org/vis.git
 PKG_REV:=e141311c6a4fc824efbad536c137ed279905d825
 PKG_VERSION:=1440
 PKG_RELEASE:=0