From: Arne Fitzenreiter Date: Thu, 11 Apr 2019 05:30:26 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Tag: v2.23-core131~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2907cdd9fba3a6ce6af8cc75c656daf1fa43dc0;p=ipfire-2.x.git Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter --- a2907cdd9fba3a6ce6af8cc75c656daf1fa43dc0 diff --cc config/rootfiles/oldcore/130/exclude index 0000000000,0000000000..b221598781 new file mode 100644 --- /dev/null +++ b/config/rootfiles/oldcore/130/exclude @@@ -1,0 -1,0 +1,28 @@@ ++boot/config.txt ++boot/grub/grub.cfg ++boot/grub/grubenv ++etc/alternatives ++etc/collectd.custom ++etc/default/grub ++etc/ipsec.conf ++etc/ipsec.secrets ++etc/ipsec.user.conf ++etc/ipsec.user.secrets ++etc/localtime ++etc/shadow ++etc/snort/snort.conf ++etc/ssl/openssl.cnf ++etc/sudoers ++etc/sysconfig/firewall.local ++etc/sysconfig/rc.local ++etc/udev/rules.d/30-persistent-network.rules ++srv/web/ipfire/html/proxy.pac ++var/ipfire/dma ++var/ipfire/time ++var/ipfire/ovpn ++var/lib/alternatives ++var/log/cache ++var/log/dhcpcd.log ++var/log/messages ++var/state/dhcp/dhcpd.leases ++var/updatecache diff --cc config/rootfiles/oldcore/130/filelists/Net_SSLeay index 0000000000,0000000000..13fe0560cf new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/Net_SSLeay @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/Net_SSLeay diff --cc config/rootfiles/oldcore/130/filelists/apache2 index 0000000000,0000000000..eef95efa72 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/apache2 @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/apache2 diff --cc config/rootfiles/oldcore/130/filelists/files index 0000000000,98b8fec396..98b8fec396 mode 000000,100644..100644 --- a/config/rootfiles/oldcore/130/filelists/files +++ b/config/rootfiles/oldcore/130/filelists/files diff --cc config/rootfiles/oldcore/130/filelists/strongswan index 0000000000,90c727e265..90c727e265 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/130/filelists/strongswan +++ b/config/rootfiles/oldcore/130/filelists/strongswan diff --cc config/rootfiles/oldcore/130/filelists/wget index 0000000000,0000000000..fcb57dfec8 new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/wget @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/wget diff --cc config/rootfiles/oldcore/130/update.sh index 0000000000,86e42a1d4e..86e42a1d4e mode 000000,100644..100644 --- a/config/rootfiles/oldcore/130/update.sh +++ b/config/rootfiles/oldcore/130/update.sh diff --cc make.sh index de973c69c6,08cf319014..b4d5ea7a39 --- a/make.sh +++ b/make.sh @@@ -24,9 -24,9 +24,10 @@@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.21" # Version number -CORE="130" # Core Level (Filename) ++<<<<<<< HEAD +VERSION="2.23" # Version number - CORE="130" # Core Level (Filename) - PAKFIRE_CORE="129" # Core Level (PAKFIRE) ++CORE="131" # Core Level (Filename) + PAKFIRE_CORE="130" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir