From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. bcbff8f1e0d69d953b5427b0858c6a3d8c466326 Date: Thu, 09 Jul 2015 12:36:16 +0200 Message-ID: <20150709103616.A26D82239D@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8152336993561323609==" List-Id: --===============8152336993561323609== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Thu Jul 9 12:35:42 2015 +0200 gummiboot: Remove package =20 gummiboot is not developed as a standalone project any more and has been merged into systemd. =20 Signed-off-by: Michael Tremer commit df954e2faa4bd423225b0c9f5401bc8a79029c16 Author: Michael Tremer Date: Thu Jul 9 12:35:12 2015 +0200 kernel: Remove iptables support =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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 = # -############################################################################= ### - -name =3D gummiboot -version =3D 26 -release =3D 1 -sup_arches =3D x86_64 i686 - -groups =3D System/Boot -url =3D http://freedesktop.org/wiki/Software/gummiboot -license =3D LGPLv2+ -summary =3D 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 =3D 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 +=3D \ - --libexecdir=3D%{prefix}/lib - - make_build_targets +=3D V=3D1 -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=3Dy CONFIG_NF_LOG_COMMON=3Dm CONFIG_NF_CONNTRACK_MARK=3Dy CONFIG_NF_CONNTRACK_SECMARK=3Dy -CONFIG_NF_CONNTRACK_ZONES=3Dy CONFIG_NF_CONNTRACK_PROCFS=3Dy CONFIG_NF_CONNTRACK_EVENTS=3Dy CONFIG_NF_CONNTRACK_TIMEOUT=3Dy @@ -499,7 +498,6 @@ CONFIG_NF_NAT_IRC=3Dm CONFIG_NF_NAT_SIP=3Dm CONFIG_NF_NAT_TFTP=3Dm CONFIG_NF_NAT_REDIRECT=3Dm -CONFIG_NETFILTER_SYNPROXY=3Dm CONFIG_NF_TABLES=3Dm CONFIG_NF_TABLES_INET=3Dm CONFIG_NFT_EXTHDR=3Dm @@ -530,13 +528,9 @@ CONFIG_NETFILTER_XT_SET=3Dm # Xtables targets # CONFIG_NETFILTER_XT_TARGET_AUDIT=3Dm -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=3Dm CONFIG_NETFILTER_XT_TARGET_CLASSIFY=3Dm CONFIG_NETFILTER_XT_TARGET_CONNMARK=3Dm CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=3Dm -CONFIG_NETFILTER_XT_TARGET_CT=3Dm -CONFIG_NETFILTER_XT_TARGET_DSCP=3Dm -CONFIG_NETFILTER_XT_TARGET_HL=3Dm CONFIG_NETFILTER_XT_TARGET_HMARK=3Dm CONFIG_NETFILTER_XT_TARGET_IDLETIMER=3Dm CONFIG_NETFILTER_XT_TARGET_LED=3Dm @@ -546,15 +540,11 @@ CONFIG_NETFILTER_XT_NAT=3Dm CONFIG_NETFILTER_XT_TARGET_NETMAP=3Dm CONFIG_NETFILTER_XT_TARGET_NFLOG=3Dm CONFIG_NETFILTER_XT_TARGET_NFQUEUE=3Dm -CONFIG_NETFILTER_XT_TARGET_NOTRACK=3Dm CONFIG_NETFILTER_XT_TARGET_RATEEST=3Dm CONFIG_NETFILTER_XT_TARGET_REDIRECT=3Dm CONFIG_NETFILTER_XT_TARGET_TEE=3Dm -CONFIG_NETFILTER_XT_TARGET_TPROXY=3Dm -CONFIG_NETFILTER_XT_TARGET_TRACE=3Dm CONFIG_NETFILTER_XT_TARGET_SECMARK=3Dm CONFIG_NETFILTER_XT_TARGET_TCPMSS=3Dm -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=3Dm =20 # # Xtables matches @@ -623,7 +613,7 @@ CONFIG_IP_SET_HASH_NETPORT=3Dm CONFIG_IP_SET_HASH_NETIFACE=3Dm CONFIG_IP_SET_LIST_SET=3Dm CONFIG_IP_VS=3Dm -CONFIG_IP_VS_IPV6=3Dy +# CONFIG_IP_VS_IPV6 is not set # CONFIG_IP_VS_DEBUG is not set CONFIG_IP_VS_TAB_BITS=3D12 =20 @@ -686,24 +676,7 @@ CONFIG_NF_NAT_SNMP_BASIC=3Dm CONFIG_NF_NAT_PROTO_GRE=3Dm CONFIG_NF_NAT_PPTP=3Dm CONFIG_NF_NAT_H323=3Dm -CONFIG_IP_NF_IPTABLES=3Dy -CONFIG_IP_NF_MATCH_AH=3Dm -CONFIG_IP_NF_MATCH_ECN=3Dm -CONFIG_IP_NF_MATCH_RPFILTER=3Dm -CONFIG_IP_NF_MATCH_TTL=3Dm -CONFIG_IP_NF_FILTER=3Dm -CONFIG_IP_NF_TARGET_REJECT=3Dm -CONFIG_IP_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP_NF_NAT=3Dm -CONFIG_IP_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP_NF_TARGET_NETMAP=3Dm -CONFIG_IP_NF_TARGET_REDIRECT=3Dm -CONFIG_IP_NF_MANGLE=3Dm -CONFIG_IP_NF_TARGET_CLUSTERIP=3Dm -CONFIG_IP_NF_TARGET_ECN=3Dm -CONFIG_IP_NF_TARGET_TTL=3Dm -CONFIG_IP_NF_RAW=3Dm -CONFIG_IP_NF_SECURITY=3Dm +# CONFIG_IP_NF_IPTABLES is not set CONFIG_IP_NF_ARPTABLES=3Dm CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm @@ -723,26 +696,7 @@ CONFIG_NFT_CHAIN_NAT_IPV6=3Dm CONFIG_NF_NAT_MASQUERADE_IPV6=3Dm CONFIG_NFT_MASQ_IPV6=3Dm CONFIG_NFT_REDIR_IPV6=3Dm -CONFIG_IP6_NF_IPTABLES=3Dy -CONFIG_IP6_NF_MATCH_AH=3Dm -CONFIG_IP6_NF_MATCH_EUI64=3Dm -CONFIG_IP6_NF_MATCH_FRAG=3Dm -CONFIG_IP6_NF_MATCH_OPTS=3Dm -CONFIG_IP6_NF_MATCH_HL=3Dm -CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm -CONFIG_IP6_NF_MATCH_MH=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RT=3Dm -CONFIG_IP6_NF_TARGET_HL=3Dm -CONFIG_IP6_NF_FILTER=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_SYNPROXY=3Dm -CONFIG_IP6_NF_MANGLE=3Dm -CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP6_NF_SECURITY=3Dm -CONFIG_IP6_NF_NAT=3Dm -CONFIG_IP6_NF_TARGET_MASQUERADE=3Dm -CONFIG_IP6_NF_TARGET_NPT=3Dm +# CONFIG_IP6_NF_IPTABLES is not set CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NFT_BRIDGE_META=3Dm CONFIG_NFT_BRIDGE_REJECT=3Dm @@ -874,7 +828,6 @@ CONFIG_NET_ACT_POLICE=3Dm CONFIG_NET_ACT_GACT=3Dm CONFIG_GACT_PROB=3Dy CONFIG_NET_ACT_MIRRED=3Dm -CONFIG_NET_ACT_IPT=3Dm CONFIG_NET_ACT_NAT=3Dm CONFIG_NET_ACT_PEDIT=3Dm CONFIG_NET_ACT_SIMP=3Dm @@ -882,7 +835,6 @@ CONFIG_NET_ACT_SKBEDIT=3Dm CONFIG_NET_ACT_CSUM=3Dm CONFIG_NET_ACT_VLAN=3Dm CONFIG_NET_ACT_BPF=3Dm -CONFIG_NET_ACT_CONNMARK=3Dm CONFIG_NET_CLS_IND=3Dy CONFIG_NET_SCH_FIFO=3Dy # 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 @@ =20 name =3D kernel version =3D 4.0.4 -release =3D 1 +release =3D 2 thisapp =3D linux-%{version} =20 maintainer =3D Arne Fitzenreiter hooks/post-receive -- IPFire 3.x development tree --===============8152336993561323609==--