* [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. a0e8bf8f365b7d24f622a8250da4a67948b946bb
@ 2013-09-01 18:53 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-09-01 18:53 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8425 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 2.x development tree".
The branch, fifteen has been updated
via a0e8bf8f365b7d24f622a8250da4a67948b946bb (commit)
via daa3a950046faa04f88f988a42165b1f9b59ffe2 (commit)
from 4234cbe2ef4d9a1313e08c34a46d61242486fdad (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 a0e8bf8f365b7d24f622a8250da4a67948b946bb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 1 20:52:33 2013 +0200
kernel: enable /dev/port.
commit daa3a950046faa04f88f988a42165b1f9b59ffe2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 1 20:52:06 2013 +0200
configroot: fix merge problem.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 7 +++++--
config/kernel/kernel.config.i586-ipfire-pae | 5 ++++-
config/rootfiles/common/configroot | 31 ++++++++++-------------------
lfs/configroot | 9 ++++-----
4 files changed, 24 insertions(+), 28 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 745ae88..24c0b32 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.10-ipfire Kernel Configuration
+# Linux/x86 3.10.10 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -417,6 +417,7 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_MICROCODE_INTEL_LIB=y
CONFIG_MICROCODE_INTEL_EARLY=y
CONFIG_MICROCODE_EARLY=y
+# CONFIG_X86_MSR is not set
CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
@@ -2558,6 +2559,7 @@ CONFIG_NOZOMI=m
CONFIG_N_HDLC=m
CONFIG_N_GSM=m
# CONFIG_TRACE_SINK is not set
+# CONFIG_DEVKMEM is not set
# CONFIG_STALDRV is not set
#
@@ -2646,6 +2648,7 @@ CONFIG_HPET=y
CONFIG_HANGCHECK_TIMER=m
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -5401,7 +5404,7 @@ CONFIG_PAX_USERCOPY=y
#
# Memory Protections
#
-CONFIG_GRKERNSEC_KMEM=y
+# CONFIG_GRKERNSEC_KMEM is not set
CONFIG_GRKERNSEC_VM86=y
# CONFIG_GRKERNSEC_IO is not set
# CONFIG_GRKERNSEC_PERF_HARDEN is not set
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 123b862..807a9a2 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -427,6 +427,7 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_MICROCODE_INTEL_LIB=y
CONFIG_MICROCODE_INTEL_EARLY=y
CONFIG_MICROCODE_EARLY=y
+# CONFIG_X86_MSR is not set
CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
@@ -2575,6 +2576,7 @@ CONFIG_NOZOMI=m
CONFIG_N_HDLC=m
CONFIG_N_GSM=m
# CONFIG_TRACE_SINK is not set
+# CONFIG_DEVKMEM is not set
# CONFIG_STALDRV is not set
#
@@ -2665,6 +2667,7 @@ CONFIG_HPET=y
CONFIG_HANGCHECK_TIMER=m
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -5440,7 +5443,7 @@ CONFIG_PAX_USERCOPY=y
#
# Memory Protections
#
-CONFIG_GRKERNSEC_KMEM=y
+# CONFIG_GRKERNSEC_KMEM is not set
CONFIG_GRKERNSEC_VM86=y
# CONFIG_GRKERNSEC_IO is not set
# CONFIG_GRKERNSEC_PERF_HARDEN is not set
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 6849250..8cd4a8a 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -49,24 +49,25 @@ var/ipfire/extrahd/devices
var/ipfire/extrahd/partitions
var/ipfire/extrahd/scan
var/ipfire/extrahd/settings
-var/ipfire/fwlogs
-var/ipfire/forward
-var/ipfire/forward/bin/rules.pl
+#var/ipfire/forward
+#var/ipfire/forward/bin
var/ipfire/forward/bin/firewall-lib.pl
-var/ipfire/forward/settings
+var/ipfire/forward/bin/rules.pl
var/ipfire/forward/config
-var/ipfire/forward/input
-var/ipfire/forward/outgoing
var/ipfire/forward/dmz
+var/ipfire/forward/input
var/ipfire/forward/nat
+var/ipfire/forward/outgoing
var/ipfire/forward/p2protocols
-var/ipfire/fwhosts
-var/ipfire/fwhosts/icmp-types
+var/ipfire/forward/settings
+#var/ipfire/fwhosts
+var/ipfire/fwhosts/customgroups
var/ipfire/fwhosts/customhosts
var/ipfire/fwhosts/customnetworks
-var/ipfire/fwhosts/customgroups
-var/ipfire/fwhosts/customservices
var/ipfire/fwhosts/customservicegrp
+var/ipfire/fwhosts/customservices
+var/ipfire/fwhosts/icmp-types
+var/ipfire/fwlogs
#var/ipfire/fwlogs/ipsettings
#var/ipfire/fwlogs/portsettings
var/ipfire/general-functions.pl
@@ -126,16 +127,6 @@ var/ipfire/net-traffic
#var/ipfire/nfs/nfs-server
var/ipfire/optionsfw
var/ipfire/optionsfw/settings
-#var/ipfire/outgoing
-#var/ipfire/outgoing/bin
-#var/ipfire/outgoing/bin/outgoingfw.pl
-#var/ipfire/outgoing/defaultservices
-#var/ipfire/outgoing/groups
-#var/ipfire/outgoing/groups/ipgroups
-#var/ipfire/outgoing/groups/macgroups
-#var/ipfire/outgoing/p2protocols
-#var/ipfire/outgoing/rules
-#var/ipfire/outgoing/settings
var/ipfire/ovpn
var/ipfire/ovpn/ccd.conf
var/ipfire/ovpn/ccdroute
diff --git a/lfs/configroot b/lfs/configroot
index 341b146..690b9c9 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,9 +51,8 @@ $(TARGET) :
# Create all directories
for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
- ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \
- ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main menu.d modem net-traffic \
- net-traffic/templates nfs optionsfw \
+ ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main \
+ menu.d modem net-traffic net-traffic/templates nfs optionsfw \
ovpn patches pakfire portfw ppp private proxy/advanced/cre \
proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
@@ -65,11 +64,11 @@ $(TARGET) :
for i in auth/users backup/include.user backup/exclude.user \
certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
- extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
+ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
- ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
touch $(CONFIG_ROOT)/$$i; \
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-09-01 18:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-01 18:53 [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. a0e8bf8f365b7d24f622a8250da4a67948b946bb git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox