* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. bcbff8f1e0d69d953b5427b0858c6a3d8c466326
@ 2015-07-09 10:36 git
0 siblings, 0 replies; only message in thread
From: git @ 2015-07-09 10:36 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7818 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via bcbff8f1e0d69d953b5427b0858c6a3d8c466326 (commit)
via df954e2faa4bd423225b0c9f5401bc8a79029c16 (commit)
from b7234e013e0316148d5250543c1b44ef2fc8969f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bcbff8f1e0d69d953b5427b0858c6a3d8c466326
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 9 12:35:42 2015 +0200
gummiboot: Remove package
gummiboot is not developed as a standalone project any
more and has been merged into systemd.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit df954e2faa4bd423225b0c9f5401bc8a79029c16
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jul 9 12:35:12 2015 +0200
kernel: Remove iptables support
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
gummiboot/gummiboot.nm | 69 --------------------------------------------------
kernel/config-generic | 54 +++------------------------------------
kernel/kernel.nm | 2 +-
3 files changed, 4 insertions(+), 121 deletions(-)
delete mode 100644 gummiboot/gummiboot.nm
Difference in files:
diff --git a/gummiboot/gummiboot.nm b/gummiboot/gummiboot.nm
deleted file mode 100644
index 956affc..0000000
--- a/gummiboot/gummiboot.nm
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = gummiboot
-version = 26
-release = 1
-sup_arches = x86_64 i686
-
-groups = System/Boot
-url = http://freedesktop.org/wiki/Software/gummiboot
-license = LGPLv2+
-summary = Simple EFI Boot Manager
-
-description
- gummiboot is a simple UEFI boot manager which executes configured EFI
- images. The default entry is selected by a configured pattern (glob)
- or an on-screen menu.
-
- gummiboot operates on the EFI System Partition (ESP) only. gummiboot
- reads simple and entirely generic boot loader configuration files;
- one file per boot loader entry to select from.
-
- Configuration file fragments, kernels, initrds, other EFI images need
- to reside on the ESP.
-end
-
-source_dl = http://cgit.freedesktop.org/gummiboot/snapshot/
-
-build
- requires
- autoconf
- automake
- gnu-efi
- libblkid-devel
- libxslt
- docbook-xsl
- end
-
- prepare_cmds
- ./autogen.sh
- end
-
- configure_options += \
- --libexecdir=%{prefix}/lib
-
- make_build_targets += V=1
-end
-
-packages
- package %{name}
- provides
- bundled(gnu-efi)
- end
-
- script postin
- %{bindir}/gummiboot update >/dev/null 2>&1 || :
- end
-
- script postup
- %{bindir}/gummiboot update >/dev/null 2>&1 || :
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/kernel/config-generic b/kernel/config-generic
index 0cda631..c0f7553 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -463,7 +463,6 @@ CONFIG_NF_CONNTRACK=y
CONFIG_NF_LOG_COMMON=m
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -499,7 +498,6 @@ CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_INET=m
CONFIG_NFT_EXTHDR=m
@@ -530,13 +528,9 @@ CONFIG_NETFILTER_XT_SET=m
# Xtables targets
#
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
@@ -546,15 +540,11 @@ CONFIG_NETFILTER_XT_NAT=m
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_SECMARK=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
#
# Xtables matches
@@ -623,7 +613,7 @@ CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_IPV6 is not set
# CONFIG_IP_VS_DEBUG is not set
CONFIG_IP_VS_TAB_BITS=12
@@ -686,24 +676,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_PPTP=m
CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
+# CONFIG_IP_NF_IPTABLES is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
@@ -723,26 +696,7 @@ CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
+# CONFIG_IP6_NF_IPTABLES is not set
CONFIG_NF_TABLES_BRIDGE=m
CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
@@ -874,7 +828,6 @@ CONFIG_NET_ACT_POLICE=m
CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
@@ -882,7 +835,6 @@ CONFIG_NET_ACT_SKBEDIT=m
CONFIG_NET_ACT_CSUM=m
CONFIG_NET_ACT_VLAN=m
CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index c30b6b6..0978786 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 4.0.4
-release = 1
+release = 2
thisapp = linux-%{version}
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-07-09 10:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-09 10:36 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. bcbff8f1e0d69d953b5427b0858c6a3d8c466326 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox