Browse Source

Merge pull request #6032 from wvdakker/master

Shorewall: Bump to version 5.2.0.2
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
e18166c9d3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 14 deletions
  1. +2
    -2
      net/shorewall-core/Makefile
  2. +2
    -2
      net/shorewall-lite/Makefile
  3. +2
    -2
      net/shorewall/Makefile
  4. +1
    -1
      net/shorewall/patches/120-logfile.patch
  5. +1
    -1
      net/shorewall/patches/130-set-path.patch
  6. +2
    -2
      net/shorewall6-lite/Makefile
  7. +2
    -2
      net/shorewall6/Makefile
  8. +1
    -1
      net/shorewall6/patches/120-logfile.patch
  9. +1
    -1
      net/shorewall6/patches/130-set-path.patch

+ 2
- 2
net/shorewall-core/Makefile View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-core PKG_NAME:=shorewall-core
PKG_MAJOR_MINOR_VERSION:=5.2 PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=0 PKG_BUGFIX_MAJOR_VERSION:=0
PKG_BUGFIX_MINOR_VERSION:=.1
PKG_BUGFIX_MINOR_VERSION:=.2
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=5913e3f8e2b2d38cef1669d0add21720cc72bcf8bc275c765eb1f50896a97b87
PKG_HASH:=3a4e3aaedfd3cdfea4cfceb1e1d4c3b54873bdb717f52d35e0dff1bb7eaca180
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl> PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+


+ 2
- 2
net/shorewall-lite/Makefile View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite PKG_NAME:=shorewall-lite
PKG_MAJOR_MINOR_VERSION:=5.2 PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=0 PKG_BUGFIX_MAJOR_VERSION:=0
PKG_BUGFIX_MINOR_VERSION:=.1
PKG_BUGFIX_MINOR_VERSION:=.2
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=4a7f931868456b32fa69b6c851e4401a0bda60e4e0091773ac711da953116f6b
PKG_HASH:=5cfe2318508b3073f60c6dfd0119c52b181de17ed4ada3a8661e698b1a6b4a53
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl> PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+


+ 2
- 2
net/shorewall/Makefile View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall PKG_NAME:=shorewall
PKG_MAJOR_MINOR_VERSION:=5.2 PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=0 PKG_BUGFIX_MAJOR_VERSION:=0
PKG_BUGFIX_MINOR_VERSION:=.1
PKG_BUGFIX_MINOR_VERSION:=.2
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=a2e962e0eb898cc50fc711763f72639bfa8589abdc95a81e20e4bee8a228cd1d
PKG_HASH:=e9efe5f0caf145abfb5edc9ae7b6ceafedc27cd31d6f918028bbd5dc94ca2aa3
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl> PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+


+ 1
- 1
net/shorewall/patches/120-logfile.patch View File

@ -9,7 +9,7 @@
BLACKLIST_LOG_LEVEL= BLACKLIST_LOG_LEVEL=
@@ -101,7 +101,7 @@ RESTOREFILE=restore
@@ -103,7 +103,7 @@ RESTOREFILE=restore
SHOREWALL_SHELL=/bin/sh SHOREWALL_SHELL=/bin/sh


+ 1
- 1
net/shorewall/patches/130-set-path.patch View File

@ -2,7 +2,7 @@ Index: shorewall-5.1.9/configfiles/shorewall.conf
=================================================================== ===================================================================
--- shorewall-5.1.9.orig/configfiles/shorewall.conf 2017-12-18 08:09:12.043625770 +0100 --- shorewall-5.1.9.orig/configfiles/shorewall.conf 2017-12-18 08:09:12.043625770 +0100
+++ shorewall-5.1.9/configfiles/shorewall.conf 2017-12-18 08:09:54.353402257 +0100 +++ shorewall-5.1.9/configfiles/shorewall.conf 2017-12-18 08:09:54.353402257 +0100
@@ -93,7 +93,7 @@
@@ -95,7 +95,7 @@
NFACCT= NFACCT=


+ 2
- 2
net/shorewall6-lite/Makefile View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6-lite PKG_NAME:=shorewall6-lite
PKG_MAJOR_MINOR_VERSION:=5.2 PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=0 PKG_BUGFIX_MAJOR_VERSION:=0
PKG_BUGFIX_MINOR_VERSION:=.1
PKG_BUGFIX_MINOR_VERSION:=.2
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=1ff0f4e264afa75034e5fb94878339367a442f7da55b5fc61ed70dd1fd4f6027
PKG_HASH:=4d32eea9396359077886676873bc796d1ea5593981f800c8708aea4cb4986d4c
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl> PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+


+ 2
- 2
net/shorewall6/Makefile View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6 PKG_NAME:=shorewall6
PKG_MAJOR_MINOR_VERSION:=5.2 PKG_MAJOR_MINOR_VERSION:=5.2
PKG_BUGFIX_MAJOR_VERSION:=0 PKG_BUGFIX_MAJOR_VERSION:=0
PKG_BUGFIX_MINOR_VERSION:=.1
PKG_BUGFIX_MINOR_VERSION:=.2
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION) PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION) PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -22,7 +22,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=29cab053cbb2e800d117805135be4158b75fbe08be964da2a14bf34ed3aada17
PKG_HASH:=74792d7e452bb9e50041106878cfa9f44c000809c98718ea2ffd7617e0809e25
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl> PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+


+ 1
- 1
net/shorewall6/patches/120-logfile.patch View File

@ -11,7 +11,7 @@ Index: shorewall6-5.1.4.1/configfiles/shorewall6.conf
BLACKLIST_LOG_LEVEL= BLACKLIST_LOG_LEVEL=
@@ -98,7 +98,7 @@
@@ -100,7 +100,7 @@
SHOREWALL_SHELL=/bin/sh SHOREWALL_SHELL=/bin/sh


+ 1
- 1
net/shorewall6/patches/130-set-path.patch View File

@ -2,7 +2,7 @@ Index: shorewall6-5.1.9/configfiles/shorewall6.conf
=================================================================== ===================================================================
--- shorewall6-5.1.9.orig/configfiles/shorewall6.conf 2017-12-18 08:13:01.999494346 +0100 --- shorewall6-5.1.9.orig/configfiles/shorewall6.conf 2017-12-18 08:13:01.999494346 +0100
+++ shorewall6-5.1.9/configfiles/shorewall6.conf 2017-12-18 08:13:37.253618974 +0100 +++ shorewall6-5.1.9/configfiles/shorewall6.conf 2017-12-18 08:13:37.253618974 +0100
@@ -92,7 +92,7 @@
@@ -94,7 +94,7 @@
PERL=/usr/bin/perl PERL=/usr/bin/perl


Loading…
Cancel
Save