Browse Source

Relocate iptables to stx-integ/networking/iptables

Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: Ica6395bcb6126e41da9fcd9b46d52080e0795228
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
Scott Little 8 months ago
parent
commit
9e1e7011c6

+ 0
- 1
centos_pkg_dirs View File

@@ -1 +0,0 @@
1
-iptables

+ 0
- 16
iptables/PKG-INFO View File

@@ -1,16 +0,0 @@
1
-Metadata-Version: 1.1
2
-Name: iptables
3
-Version: 1.4.21
4
-Summary: Tools for managing Linux kernel packet filtering capabilities
5
-Home-page: 
6
-Author:
7
-Author-email:
8
-License: GPLv2
9
-
10
-Description:
11
-The iptables utility controls the network packet filtering code in the
12
-Linux kernel. If you need to set up firewalls and/or IP masquerading,
13
-you should install this package.
14
-
15
-        
16
-Platform: UNKNOWN

+ 0
- 2
iptables/centos/build_srpm.data View File

@@ -1,2 +0,0 @@
1
-COPY_LIST="iptables/*"
2
-TIS_PATCH_VER=3

+ 0
- 26
iptables/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch View File

@@ -1,27 +0,0 @@
1
-From d34bb2d38b4a62db5be32ddd901b1ebd6966165c Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 16:15:33 -0400
4
-Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch
5
-
6
-Conflicts:
7
-	SPECS/iptables.spec
8
----
9
- SPECS/iptables.spec | 2 +-
10
- 1 file changed, 1 insertion(+), 1 deletion(-)
11
-
12
-diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
13
-index ddf75a0..9d65fc7 100644
14
---- a/SPECS/iptables.spec
15
-+++ b/SPECS/iptables.spec
16
-@@ -7,7 +7,7 @@
17
- Name: iptables
18
- Summary: Tools for managing Linux kernel packet filtering capabilities
19
- Version: 1.4.21
20
--Release: 18.0.1%{?dist}
21
-+Release: 18.0.1.el7%{?_tis_dist}.%{tis_patch_ver}
22
- Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
23
- Source1: iptables.init
24
- Source2: iptables-config
25
-1.9.1
26
-

+ 0
- 23
iptables/centos/meta_patches/0002-default-service-enabled.patch View File

@@ -1,24 +0,0 @@
1
-From 48e4805ac9d088837bd639b06388dd34f0a6e0f1 Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 16:15:33 -0400
4
-Subject: [PATCH 3/3] WRS: 0002-default-service-enabled.patch
5
-
6
----
7
- SPECS/iptables.spec | 1 +
8
- 1 file changed, 1 insertion(+)
9
-
10
-diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
11
-index 9d65fc7..9f59ede 100644
12
---- a/SPECS/iptables.spec
13
-+++ b/SPECS/iptables.spec
14
-@@ -223,6 +223,7 @@ done
15
- 
16
- %post services
17
- %systemd_post iptables.service ip6tables.service
18
-+/usr/bin/systemctl enable iptables.service ip6tables.service >/dev/null 2>&1
19
- 
20
- %preun services
21
- %systemd_preun iptables.service ip6tables.service
22
-1.9.1
23
-

+ 0
- 3
iptables/centos/meta_patches/PATCH_ORDER View File

@@ -1,3 +0,0 @@
1
-spec-include-custom-rules.patch
2
-0001-Update-package-versioning-for-TIS-format.patch
3
-0002-default-service-enabled.patch

+ 0
- 49
iptables/centos/meta_patches/spec-include-custom-rules.patch View File

@@ -1,50 +0,0 @@
1
-From 2c6bfc5f39203c8293f1db33804816c9d881ddde Mon Sep 17 00:00:00 2001
2
-From: Scott Little <scott.little@windriver.com>
3
-Date: Mon, 2 Oct 2017 16:15:33 -0400
4
-Subject: [PATCH 1/3] WRS: spec-include-custom-rules.patch
5
-
6
----
7
- SPECS/iptables.spec | 13 +++++++++++--
8
- 1 file changed, 11 insertions(+), 2 deletions(-)
9
-
10
-diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
11
-index fc07a38..ddf75a0 100644
12
---- a/SPECS/iptables.spec
13
-+++ b/SPECS/iptables.spec
14
-@@ -16,6 +16,11 @@ Source4: iptables.save-legacy
15
- Source5: sysconfig_iptables
16
- Source6: sysconfig_ip6tables
17
- Source7: iptables.panic-legacy
18
-+
19
-+# WRS
20
-+Source8: iptables.rules
21
-+Source9: ip6tables.rules
22
-+
23
- Patch1: iptables-1.4.21-rhbz_1054871.patch
24
- Patch2: iptables-1.4.21-libxt_cgroup.patch
25
- Patch3: iptables-1.4.21-wait_seconds.patch
26
-@@ -76,8 +81,8 @@ Requires(post): systemd
27
- Requires(preun): systemd
28
- Requires(postun): systemd
29
- # provide and obsolete old main package
30
--Provides: %{name} = 1.4.16.1
31
--Obsoletes: %{name} < 1.4.16.1
32
-+#Provides: %{name} = 1.4.16.1
33
-+#Obsoletes: %{name} < 1.4.16.1
34
- # provide and obsolete ipv6 sub package
35
- Provides: %{name}-ipv6 = 1.4.11.1
36
- Obsoletes: %{name}-ipv6 < 1.4.11.1
37
-@@ -179,6 +184,10 @@ sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildr
38
- install -c -m 755 ip6tabes.save-legacy %{buildroot}/%{legacy_actions}/ip6tables/save
39
- install -c -m 755 ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6tables/panic
40
- 
41
-+# WRS
42
-+install -m 600 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/iptables
43
-+install -m 600 %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/ip6tables
44
-+
45
- %if 0%{?rhel}
46
- %pre
47
- for p in %{_sysconfdir}/alternatives/iptables.*; do
48
-1.9.1
49
-

+ 0
- 1
iptables/centos/srpm_path View File

@@ -1 +0,0 @@
1
-mirror:Source/iptables-1.4.21-18.0.1.el7.centos.src.rpm

+ 0
- 8
iptables/iptables/ip6tables.rules View File

@@ -1,8 +0,0 @@
1
-# system default rules
2
-*filter
3
-:INPUT ACCEPT [0:0]
4
-:FORWARD ACCEPT [0:0]
5
-:OUTPUT ACCEPT [0:0]
6
-:INPUT-custom-pre - [0:0]
7
-:INPUT-custom-post - [0:0]
8
-COMMIT

+ 0
- 8
iptables/iptables/iptables.rules View File

@@ -1,8 +0,0 @@
1
-# system default rules
2
-*filter
3
-:INPUT ACCEPT [0:0]
4
-:FORWARD ACCEPT [0:0]
5
-:OUTPUT ACCEPT [0:0]
6
-:INPUT-custom-pre - [0:0]
7
-:INPUT-custom-post - [0:0]
8
-COMMIT

Loading…
Cancel
Save