Merge "refactor iptables"
This commit is contained in:
Zuul
Gerrit Code Review
commit
4046c2ca47
|
|
@ -296,9 +296,7 @@ iscsi-initiator-utils
|
|||
iscsi-initiator-utils-iscsiuio
|
||||
|
||||
# iptables
|
||||
iptables
|
||||
iptables-services
|
||||
iptables-utils
|
||||
iptables-config
|
||||
|
||||
# python-psycopg2
|
||||
python-psycopg2
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ logging/logmgmt
|
|||
filesystem/filesystem-scripts
|
||||
utilities/branding
|
||||
config-files/io-scheduler
|
||||
config-files/iptables-config
|
||||
config-files/sudo-config
|
||||
config-files/memcached-custom
|
||||
config-files/audit-config
|
||||
|
|
@ -135,7 +136,6 @@ ldap/ldapscripts
|
|||
networking/net-tools
|
||||
filesystem/drbd/drbd-tools
|
||||
database/mariadb
|
||||
networking/iptables
|
||||
database/python-psycopg2
|
||||
base/crontabs
|
||||
base/dnsmasq
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
SRC_DIR="files"
|
||||
TIS_PATCH_VER=0
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
Summary: StarlingX iptables Configuration File
|
||||
Name: iptables-config
|
||||
Version: 1.0
|
||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||
License: Apache-2.0
|
||||
Group: config-files
|
||||
Packager: StarlingX
|
||||
URL: unknown
|
||||
Source: %name-%version.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
Requires: iptables
|
||||
Requires: iptables-services
|
||||
Requires: iptables-utils
|
||||
|
||||
%define debug_package %{nil}
|
||||
|
||||
%description
|
||||
StarlingX iptables configuration file
|
||||
|
||||
%prep
|
||||
|
||||
%setup
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
|
||||
install -d %{buildroot}%{_datadir}/starlingx
|
||||
install -m 600 iptables.rules %{buildroot}%{_datadir}/starlingx/iptables.rules
|
||||
install -m 600 ip6tables.rules %{buildroot}%{_datadir}/starlingx/ip6tables.rules
|
||||
|
||||
%post
|
||||
if [ $1 -eq 1 ] ; then
|
||||
cp -f %{_datadir}/starlingx/iptables.rules %{_sysconfdir}/sysconfig/iptables
|
||||
chmod 600 %{_sysconfdir}/sysconfig/iptables
|
||||
cp -f %{_datadir}/starlingx/ip6tables.rules %{_sysconfdir}/sysconfig/ip6tables
|
||||
chmod 600 %{_sysconfdir}/sysconfig/ip6tables
|
||||
fi
|
||||
|
||||
%{_bindir}/systemctl enable iptables.service ip6tables.service >/dev/null 2>&1
|
||||
exit 0
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%{_datadir}/starlingx/iptables.rules
|
||||
%{_datadir}/starlingx/ip6tables.rules
|
||||
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Metadata-Version: 1.1
|
||||
Name: iptables
|
||||
Version: 1.4.21
|
||||
Summary: Tools for managing Linux kernel packet filtering capabilities
|
||||
Home-page:
|
||||
Author:
|
||||
Author-email:
|
||||
License: GPLv2
|
||||
|
||||
Description:
|
||||
The iptables utility controls the network packet filtering code in the
|
||||
Linux kernel. If you need to set up firewalls and/or IP masquerading,
|
||||
you should install this package.
|
||||
|
||||
|
||||
Platform: UNKNOWN
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
COPY_LIST="iptables/*"
|
||||
TIS_PATCH_VER=3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From a198eb6f0fe109511ebfd69bc5e21fe346cc9e31 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 16:15:33 -0400
|
||||
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/iptables.spec
|
||||
---
|
||||
SPECS/iptables.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
|
||||
index 1bcfb4d..0de8812 100644
|
||||
--- a/SPECS/iptables.spec
|
||||
+++ b/SPECS/iptables.spec
|
||||
@@ -7,7 +7,7 @@
|
||||
Name: iptables
|
||||
Summary: Tools for managing Linux kernel packet filtering capabilities
|
||||
Version: 1.4.21
|
||||
-Release: 24.1%{?dist}
|
||||
+Release: 24.1.el7_5%{?_tis_dist}.%{tis_patch_ver}
|
||||
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
|
||||
Source1: iptables.init
|
||||
Source2: iptables-config
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From ef71415934f45a6f8ce0c5b67b03e61ded784b63 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 16:15:33 -0400
|
||||
Subject: WRS: 0002-default-service-enabled.patch
|
||||
|
||||
---
|
||||
SPECS/iptables.spec | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
|
||||
index 0de8812..d83cf8c 100644
|
||||
--- a/SPECS/iptables.spec
|
||||
+++ b/SPECS/iptables.spec
|
||||
@@ -222,6 +222,7 @@ done
|
||||
|
||||
%post services
|
||||
%systemd_post iptables.service ip6tables.service
|
||||
+/usr/bin/systemctl enable iptables.service ip6tables.service >/dev/null 2>&1
|
||||
|
||||
%preun services
|
||||
%systemd_preun iptables.service ip6tables.service
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
spec-include-custom-rules.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
0002-default-service-enabled.patch
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
From 5b16910e95db49953a82fa583d99a0ac255dca1b Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 16:15:33 -0400
|
||||
Subject: WRS: spec-include-custom-rules.patch
|
||||
|
||||
---
|
||||
SPECS/iptables.spec | 13 +++++++++++--
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
|
||||
index b3c208d..1bcfb4d 100644
|
||||
--- a/SPECS/iptables.spec
|
||||
+++ b/SPECS/iptables.spec
|
||||
@@ -16,6 +16,11 @@ Source4: iptables.save-legacy
|
||||
Source5: sysconfig_iptables
|
||||
Source6: sysconfig_ip6tables
|
||||
Source7: iptables.panic-legacy
|
||||
+
|
||||
+# WRS
|
||||
+Source8: iptables.rules
|
||||
+Source9: ip6tables.rules
|
||||
+
|
||||
Patch1: iptables-1.4.21-rhbz_1054871.patch
|
||||
Patch2: iptables-1.4.21-libxt_cgroup.patch
|
||||
Patch3: iptables-1.4.21-wait_seconds.patch
|
||||
@@ -74,8 +79,8 @@ Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
# provide and obsolete old main package
|
||||
-Provides: %{name} = 1.4.16.1
|
||||
-Obsoletes: %{name} < 1.4.16.1
|
||||
+#Provides: %{name} = 1.4.16.1
|
||||
+#Obsoletes: %{name} < 1.4.16.1
|
||||
# provide and obsolete ipv6 sub package
|
||||
Provides: %{name}-ipv6 = 1.4.11.1
|
||||
Obsoletes: %{name}-ipv6 < 1.4.11.1
|
||||
@@ -178,6 +183,10 @@ sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildr
|
||||
install -c -m 755 ip6tabes.save-legacy %{buildroot}/%{legacy_actions}/ip6tables/save
|
||||
install -c -m 755 ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6tables/panic
|
||||
|
||||
+# WRS
|
||||
+install -m 600 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/iptables
|
||||
+install -m 600 %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/ip6tables
|
||||
+
|
||||
%if 0%{?rhel}
|
||||
%pre
|
||||
for p in %{_sysconfdir}/alternatives/iptables.*; do
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
mirror:Source/iptables-1.4.21-24.1.el7_5.src.rpm
|
||||
Loading…
Reference in New Issue