From 2557e39a38de8307fb00c9f4301b98714cd9a663 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Mon, 13 Nov 2017 07:59:30 +0100 Subject: [PATCH] Shorewall-core: Bump to version 5.1.8.1 Several changes in Makefile. Signed-off-by: W. van den Akker --- net/shorewall-core/Makefile | 16 ++++++++-------- net/shorewall-core/patches/110-lib.common.patch | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile index e3f0c6ed5..21552a6ca 100644 --- a/net/shorewall-core/Makefile +++ b/net/shorewall-core/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall-core -PKG_VERSION:=5.1.4.1 +PKG_VERSION:=5.1.8.1 PKG_DIRECTORY:=5.1 PKG_RELEASE:=1 -PKG_MAINVERSION:=5.1.4 +PKG_MAINVERSION:=5.1.8 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_DIRECTORY)/shorewall-$(PKG_MAINVERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=3d1446f7e437104c8f8c7257ccdbddfc0dc7df3ea68b80274c11dd94cc1c8629 +PKG_HASH:=0caca8dbd969e88f3f875789b3ac31985a19d39916efe15f69766a6ddd8d97ac PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0+ @@ -51,11 +51,11 @@ define Build/Compile endef define Package/shorewall-core/install - $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/share/shorewall/ + $(INSTALL_DIR) $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall $(1)/usr/sbin/ endef $(eval $(call BuildPackage,shorewall-core)) diff --git a/net/shorewall-core/patches/110-lib.common.patch b/net/shorewall-core/patches/110-lib.common.patch index 6008d2744..aeb757971 100644 --- a/net/shorewall-core/patches/110-lib.common.patch +++ b/net/shorewall-core/patches/110-lib.common.patch @@ -1,8 +1,8 @@ -Index: shorewall-core-5.0.15.2/lib.common +Index: shorewall-core-5.1.7.2/lib.common =================================================================== ---- shorewall-core-5.0.15.2.orig/lib.common 2016-12-20 23:42:20.000000000 +0100 -+++ shorewall-core-5.0.15.2/lib.common 2017-01-02 11:33:03.026495427 +0100 -@@ -352,7 +352,7 @@ +--- shorewall-core-5.1.7.2.orig/lib.common 2017-10-11 08:01:06.191862789 +0200 ++++ shorewall-core-5.1.7.2/lib.common 2017-10-11 08:01:06.187863006 +0200 +@@ -345,7 +345,7 @@ if [ -z "$MODULESDIR" ]; then uname=$(uname -r) @@ -11,7 +11,7 @@ Index: shorewall-core-5.0.15.2/lib.common if [ -n "$extras" ]; then for directory in $(split "$extras"); do MODULESDIR="$MODULESDIR:/lib/modules/$uname/$directory" -@@ -408,7 +408,7 @@ +@@ -399,7 +399,7 @@ if [ -z "$MODULESDIR" ]; then uname=$(uname -r)