commit 840ccefab6ec79765d53680d72b930380e11c48f
Author: Elan Ruusamäe <[email protected]>
Date: Tue Nov 26 22:34:59 2013 +0200
add vendor pld
shorewall.spec | 11 ++++++--
system-pld.patch | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 2 deletions(-)
---
diff --git a/shorewall.spec b/shorewall.spec
index 0ea4324..5e843ea 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -7,7 +7,7 @@ Summary: Shoreline Firewall - an iptables-based firewall
for Linux systems
Summary(pl.UTF-8): Shoreline Firewall - zapora sieciowa oparta na iptables
Name: shorewall
Version: 4.5.21.4
-Release: 0.1
+Release: 0.2
License: GPL
Group: Networking/Utilities
Source0:
ftp://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.21/%{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@ Patch1: system-pld.patch
URL: http://www.shorewall.net/
BuildRequires: perl
BuildRequires: perl(Digest::SHA)
+BuildRequires: bash >= 4.0
BuildRequires: systemd-units
Requires: %{name}-core = %{version}-%{release}
Requires: iproute2
@@ -142,6 +143,12 @@ and shutdown.
%prep
%setup -qcT -a0 -a1 -a2 -a3 -a4 -a5
+cp -p %{name}-%{version}/shorewallrc.{redhat,pld}
+cp -p %{name}-core-%{version}/shorewallrc.{redhat,pld}
+cp -p %{name}-lite-%{version}/shorewallrc.{redhat,pld}
+cp -p %{name}6-%{version}/shorewallrc.{redhat,pld}
+cp -p %{name}6-lite-%{version}/shorewallrc.{redhat,pld}
+cp -p %{name}-init-%{version}/shorewallrc.{redhat,pld}
%patch0 -p1
%patch1 -p1
@@ -158,7 +165,7 @@ targets="shorewall-core shorewall shorewall-lite shorewall6
shorewall6-lite shor
for i in $targets; do
cd $i-%{version}
./configure \
- vendor=redhat \
+ VENDOR=pld \
LIBEXECDIR=%{_libexecdir} \
SYSTEMD=%{systemdunitdir} \
SBINDIR=%{_sbindir}
diff --git a/system-pld.patch b/system-pld.patch
new file mode 100644
index 0000000..d7981a4
--- /dev/null
+++ b/system-pld.patch
@@ -0,0 +1,80 @@
+--- shorewall-4.5.21.4/shorewall-init-4.5.21.4/install.sh~ 2013-11-26
21:44:23.000000000 +0200
++++ shorewall-4.5.21.4/shorewall-init-4.5.21.4/install.sh 2013-11-26
21:44:27.995923734 +0200
+@@ -228,7 +228,7 @@
+ apple)
+ T=
+ ;;
+- debian|gentoo|redhat|suse|slackware|archlinux)
++ debian|gentoo|redhat|suse|slackware|archlinux|pld)
+ ;;
+ *)
+ [ -n "$BUILD" ] && echo "ERROR: Unknown BUILD environment ($BUILD)" >&2
|| echo "ERROR: Unknown BUILD environment"
+@@ -261,6 +261,9 @@
+ suse)
+ echo "Installing SuSE-specific configuration..."
+ ;;
++ pld)
++ echo "Installing PLD Linux-specific configuration..."
++ ;;
+ linux)
+ echo "ERROR: Shorewall-init is not supported on this system" >&2
+ exit 1
+--- shorewall-4.5.21.4/shorewall-core-4.5.21.4/install.sh~ 2013-11-23
17:20:38.000000000 +0200
++++ shorewall-4.5.21.4/shorewall-core-4.5.21.4/install.sh 2013-11-26
22:21:01.647513003 +0200
+@@ -276,7 +276,7 @@
+ apple)
+ echo "Installing Mac-specific configuration...";
+ ;;
+- debian|gentoo|redhat|slackware|archlinux|linux|suse)
++ debian|gentoo|redhat|slackware|archlinux|linux|suse|pld)
+ ;;
+ *)
+ echo "ERROR: Unknown HOST \"$HOST\"" >&2
+--- shorewall-4.5.21.4/shorewall-4.5.21.4/install.sh~ 2013-11-23
17:20:38.000000000 +0200
++++ shorewall-4.5.21.4/shorewall-4.5.21.4/install.sh 2013-11-26
22:22:08.727285691 +0200
+@@ -295,6 +295,9 @@
+ archlinux)
+ echo "Installing ArchLinux-specific configuration..."
+ ;;
++ pld)
++ echo "Installing PLD Linux-specific configuration..."
++ ;;
+ linux)
+ ;;
+ *)
+--- shorewall-4.5.21.4/shorewall-lite-4.5.21.4/install.sh~ 2013-11-23
17:20:39.000000000 +0200
++++ shorewall-4.5.21.4/shorewall-lite-4.5.21.4/install.sh 2013-11-26
22:24:36.217448281 +0200
+@@ -289,6 +289,9 @@
+ suse)
+ echo "Installing Suse-specific configuration..."
+ ;;
++ pld)
++ echo "Installing PLD Linux-specific configuration..."
++ ;;
+ linux)
+ ;;
+ *)
+--- shorewall-4.5.21.4/shorewall6-4.5.21.4/install.sh~ 2013-11-23
17:20:39.000000000 +0200
++++ shorewall-4.5.21.4/shorewall6-4.5.21.4/install.sh 2013-11-26
22:26:06.484959575 +0200
+@@ -295,6 +295,9 @@
+ archlinux)
+ echo "Installing ArchLinux-specific configuration..."
+ ;;
++ pld)
++ echo "Installing PLD Linux-specific configuration..."
++ ;;
+ linux)
+ ;;
+ *)
+--- shorewall-4.5.21.4/shorewall6-lite-4.5.21.4/install.sh~ 2013-11-23
17:20:39.000000000 +0200
++++ shorewall-4.5.21.4/shorewall6-lite-4.5.21.4/install.sh 2013-11-26
22:26:58.184018766 +0200
+@@ -289,6 +289,9 @@
+ suse)
+ echo "Installing Suse-specific configuration..."
+ ;;
++ pld)
++ echo "Installing PLD Linux-specific configuration..."
++ ;;
+ linux)
+ ;;
+ *)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shorewall.git/commitdiff/9a37af4519fb09980dda5b975379aab77ce8b43d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
