From: Arne Fitzenreiter Date: Fri, 6 Jun 2014 08:17:54 +0000 (+0200) Subject: core78 -> core79: to insert openssl security update. X-Git-Tag: v2.15-core79~27 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a65b9c3268ffacc27e703025ffd246e95f906a79 core78 -> core79: to insert openssl security update. --- diff --git a/config/rootfiles/core/78/exclude b/config/rootfiles/core/79/exclude similarity index 100% rename from config/rootfiles/core/78/exclude rename to config/rootfiles/core/79/exclude diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-multi b/config/rootfiles/core/79/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/78/filelists/armv5tel/linux-multi rename to config/rootfiles/core/79/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/78/filelists/armv5tel/linux-rpi b/config/rootfiles/core/79/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/78/filelists/armv5tel/linux-rpi rename to config/rootfiles/core/79/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/78/filelists/daq b/config/rootfiles/core/79/filelists/daq similarity index 100% rename from config/rootfiles/core/78/filelists/daq rename to config/rootfiles/core/79/filelists/daq diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/79/filelists/files similarity index 100% rename from config/rootfiles/core/78/filelists/files rename to config/rootfiles/core/79/filelists/files diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/79/filelists/hostname similarity index 100% rename from config/rootfiles/core/78/filelists/hostname rename to config/rootfiles/core/79/filelists/hostname diff --git a/config/rootfiles/core/78/filelists/i586/grub b/config/rootfiles/core/79/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/78/filelists/i586/grub rename to config/rootfiles/core/79/filelists/i586/grub diff --git a/config/rootfiles/core/78/filelists/i586/linux b/config/rootfiles/core/79/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/78/filelists/i586/linux rename to config/rootfiles/core/79/filelists/i586/linux diff --git a/config/rootfiles/core/78/filelists/i586/syslinux b/config/rootfiles/core/79/filelists/i586/syslinux similarity index 100% rename from config/rootfiles/core/78/filelists/i586/syslinux rename to config/rootfiles/core/79/filelists/i586/syslinux diff --git a/config/rootfiles/core/79/filelists/openssh b/config/rootfiles/core/79/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /dev/null +++ b/config/rootfiles/core/79/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/79/filelists/openssl b/config/rootfiles/core/79/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/79/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/openvpn b/config/rootfiles/core/79/filelists/openvpn similarity index 100% rename from config/rootfiles/core/78/filelists/openvpn rename to config/rootfiles/core/79/filelists/openvpn diff --git a/config/rootfiles/core/78/filelists/perl-Device-Modem b/config/rootfiles/core/79/filelists/perl-Device-Modem similarity index 100% rename from config/rootfiles/core/78/filelists/perl-Device-Modem rename to config/rootfiles/core/79/filelists/perl-Device-Modem diff --git a/config/rootfiles/core/78/filelists/perl-Device-SerialPort b/config/rootfiles/core/79/filelists/perl-Device-SerialPort similarity index 100% rename from config/rootfiles/core/78/filelists/perl-Device-SerialPort rename to config/rootfiles/core/79/filelists/perl-Device-SerialPort diff --git a/config/rootfiles/core/78/filelists/ppp b/config/rootfiles/core/79/filelists/ppp similarity index 100% rename from config/rootfiles/core/78/filelists/ppp rename to config/rootfiles/core/79/filelists/ppp diff --git a/config/rootfiles/core/78/filelists/snort b/config/rootfiles/core/79/filelists/snort similarity index 100% rename from config/rootfiles/core/78/filelists/snort rename to config/rootfiles/core/79/filelists/snort diff --git a/config/rootfiles/core/78/filelists/squid b/config/rootfiles/core/79/filelists/squid similarity index 100% rename from config/rootfiles/core/78/filelists/squid rename to config/rootfiles/core/79/filelists/squid diff --git a/config/rootfiles/core/78/filelists/sudo b/config/rootfiles/core/79/filelists/sudo similarity index 100% rename from config/rootfiles/core/78/filelists/sudo rename to config/rootfiles/core/79/filelists/sudo diff --git a/config/rootfiles/core/78/filelists/vnstat b/config/rootfiles/core/79/filelists/vnstat similarity index 100% rename from config/rootfiles/core/78/filelists/vnstat rename to config/rootfiles/core/79/filelists/vnstat diff --git a/config/rootfiles/core/78/meta b/config/rootfiles/core/79/meta similarity index 100% rename from config/rootfiles/core/78/meta rename to config/rootfiles/core/79/meta diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/79/update.sh similarity index 99% rename from config/rootfiles/core/78/update.sh rename to config/rootfiles/core/79/update.sh index f3e0593526..2085d4332f 100644 --- a/config/rootfiles/core/78/update.sh +++ b/config/rootfiles/core/79/update.sh @@ -35,7 +35,7 @@ function add_to_backup () # # Remove old core updates from pakfire cache to save space... -core=78 +core=79 for (( i=1; i<=${core}; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire diff --git a/make.sh b/make.sh index c170076532..1c10f32348 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="78" # Core Level (Filename) -PAKFIRE_CORE="78" # Core Level (PAKFIRE) +CORE="79" # Core Level (Filename) +PAKFIRE_CORE="79" # 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