Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 11 Apr 2019 05:30:26 +0000 (07:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 11 Apr 2019 05:30:26 +0000 (07:30 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
1  2 
config/rootfiles/oldcore/130/exclude
config/rootfiles/oldcore/130/filelists/Net_SSLeay
config/rootfiles/oldcore/130/filelists/apache2
config/rootfiles/oldcore/130/filelists/files
config/rootfiles/oldcore/130/filelists/strongswan
config/rootfiles/oldcore/130/filelists/wget
config/rootfiles/oldcore/130/update.sh
make.sh

index 0000000,0000000..b221598
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -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
index 0000000,0000000..13fe056
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/Net_SSLeay
index 0000000,0000000..eef95ef
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apache2
index 0000000,0000000..fcb57df
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/wget
diff --cc make.sh
+++ b/make.sh
  
  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