IPFire-SCM April 2019

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d51d3c5b93886a66b75388d029e35eb07d9b06eb
by Michael Tremer 12 Apr '19

12 Apr '19

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, next has been updated via d51d3c5b93886a66b75388d029e35eb07d9b06eb (commit) via 2eb0c326da2196c56f6f955bf5371e5d8c7ca9db (commit) via 19c066b602a12fcce601cfa2350b0d83b231717c (commit) from a32c219fa4642127a97050bf5af60a03e4e5c2f8 (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 d51d3c5b93886a66b75388d029e35eb07d9b06eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 12 17:36:54 2019 +0100 IPS logging: Fix date comparison for last entry Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2eb0c326da2196c56f6f955bf5371e5d8c7ca9db Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 12 17:33:39 2019 +0100 IPS logging: There is no distinguation between suricata & snort required Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 19c066b602a12fcce601cfa2350b0d83b231717c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 12 17:32:02 2019 +0100 IPS logging: Fix reading date The CGI script only compares mm/dd and does not care about the year. Suricata, however, logs the year as well which has to be ignored here. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/logs.cgi/ids.dat | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) Difference in files: diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 1447a06f0..8918bc6da 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -383,7 +383,6 @@ sub processevent our ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport, $sid, @refs); my $filestr=''; - my $readmode=''; if ($datediff==0) { # If there is no datediff, directly assign the suricata fast.log. $filestr="/var/log/suricata/fast.log"; @@ -399,9 +398,6 @@ sub processevent # Assign snort alert file, the datediff and extension for compressed file. $filestr = "/var/log/snort/alert.$datediff"; $filestr = "$filestr.gz"; - - # Assign "snort" as readmode. - $readmode="snort"; } } if (!(open (LOG,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) { @@ -411,7 +407,7 @@ sub processevent while(<LOG>) { $line++; - if (($_ =~ m/\[\*\*\]/) && ($readmode eq "snort")) { + if ($_ =~ m/\[\*\*\]/) { unless ($line == 1 || $date ne "$monthstr/$daystr") { &append; $line = 1; @@ -420,17 +416,6 @@ sub processevent @refs = (); $_ =~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/; $title = &Header::cleanhtml($2,"y"); - } else { - &append; - $line = 1; - - # Assign default values. - ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport,$sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a"); - @refs = (); - - # Gather title details from line. - $_ =~ m/:([0-9]{1,5})\] (.*) \[\*\*\]/; - $title = &Header::cleanhtml($2,"y"); } if ($_ =~ m/Classification: (.*)\] \[Priority: (\d)\]/) { $classification = &Header::cleanhtml($1,"y"); @@ -447,8 +432,8 @@ sub processevent $destport = $10; } - if ($_ =~ m/^([0-9\/]{3,10})\-([0-9\:]{5,8})\.([0-9]{1,14})/) { - ($date,$time) = ($1,$2); + if ($_ =~ m/^([0-9\/]{3,5})(\/\d+)?\-([0-9\:]{5,8})\.([0-9]{1,14})/) { + ($date,$time) = ($1,$3); } if ($_ =~ m/\[Xref \=\>.*\]/) { $_ =~ s/\]\[Xref \=\> /, /g; @@ -461,12 +446,9 @@ sub processevent } $line++; - # Split the date into single chunks. - my ($month, $day, $year) = split('/', $date); - # Check if all data is collected and the date of the event fits the desired date to # get displayed. - if ($line gt 1 || "$month/$day" eq "$monthstr/$daystr") { &append; } + if ($line gt 1 && $date eq "$monthstr/$daystr") { &append; } close(LOG); } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a32c219fa4642127a97050bf5af60a03e4e5c2f8
by Michael Tremer 12 Apr '19

12 Apr '19

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, next has been updated via a32c219fa4642127a97050bf5af60a03e4e5c2f8 (commit) via 41b7369f8078d5dc4998483fa005b2f8e3b89624 (commit) via 854b63c42af8f82106b587dc43945ad848f8994e (commit) from a45bfbf1c5a8a7c10ad4bdcb5ed559ed38a796c5 (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 a32c219fa4642127a97050bf5af60a03e4e5c2f8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 07:55:36 2019 +0100 zabbix_agentd: Bump package version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 41b7369f8078d5dc4998483fa005b2f8e3b89624 Author: Alexander Koch <ipfire(a)starkstromkonsument.de> Date: Wed Apr 10 20:33:31 2019 +0200 zabbix_agentd: Bugfix for /etc/sudoers.d/zabbix.user Files containing an '~' or '.' are ignored by sudo when placed in the includedir /etc/sudoers.d This makes the file useless. The file is renamed to "zabbix" instead of "zabbix.user" to fix this. See: https://www.sudo.ws/man/1.8.13/sudoers.man.html#Including_other_files_from_… Signed-off-by: Alexander Koch <ipfire(a)starkstromkonsument.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 854b63c42af8f82106b587dc43945ad848f8994e Author: Alexander Koch <ipfire(a)starkstromkonsument.de> Date: Wed Apr 10 20:33:30 2019 +0200 zabbix_agentd: update to 4.2.0 Relase Notes: https://www.zabbix.com/rn/rn4.2.0 Signed-off-by: Alexander Koch <ipfire(a)starkstromkonsument.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/zabbix_agentd | 2 +- config/rootfiles/packages/zabbix_agentd | 2 +- lfs/zabbix_agentd | 8 ++++---- src/paks/zabbix_agentd/update.sh | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/zabbix_agentd index b410dbe16..cba18d772 100644 --- a/config/backup/includes/zabbix_agentd +++ b/config/backup/includes/zabbix_agentd @@ -1,2 +1,2 @@ -/etc/sudoers.d/zabbix.user +/etc/sudoers.d/zabbix /etc/zabbix_agentd/* diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd index db852381e..eaecf2644 100644 --- a/config/rootfiles/packages/zabbix_agentd +++ b/config/rootfiles/packages/zabbix_agentd @@ -1,6 +1,6 @@ etc/logrotate.d/zabbix_agentd etc/rc.d/init.d/zabbix_agentd -etc/sudoers.d/zabbix.user +etc/sudoers.d/zabbix etc/zabbix_agentd etc/zabbix_agentd/scripts etc/zabbix_agentd/zabbix_agentd.conf diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index b086d9f1a..23b77b930 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -24,7 +24,7 @@ include Config -VER = 4.0.4 +VER = 4.2.0 THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 1 +PAK_VER = 2 DEPS = "" ############################################################################### @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 46fdb83d4b24e13127a20a3e874b1d8f +$(DL_FILE)_MD5 = 20f261708f95787f3dbea3eab89f804d install : $(TARGET) @@ -108,7 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Install sudoers include file install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \ - /etc/sudoers.d/zabbix.user + /etc/sudoers.d/zabbix # Install include file for backup install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \ diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update.sh index 89c40d0d7..7fc1c96fb 100644 --- a/src/paks/zabbix_agentd/update.sh +++ b/src/paks/zabbix_agentd/update.sh @@ -24,3 +24,8 @@ . /opt/pakfire/lib/functions.sh ./uninstall.sh ./install.sh + +# Ensure /etc/sudoers.d/zabbix.user is renamed to /etc/sudoers.d/zabbix +if [ -e /etc/sudoers.d/zabbix.user ]; then + mv -v /etc/sudoers.d/zabbix.user /etc/sudoers.d/zabbix +fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a45bfbf1c5a8a7c10ad4bdcb5ed559ed38a796c5
by Michael Tremer 12 Apr '19

12 Apr '19

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, next has been updated via a45bfbf1c5a8a7c10ad4bdcb5ed559ed38a796c5 (commit) from 3e11f8257dfe003aaad20d7ca73e3bc831131a96 (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 a45bfbf1c5a8a7c10ad4bdcb5ed559ed38a796c5 Author: Stéphane Pautrel <stephane.pautrel(a)gmail.com> Date: Thu Apr 11 03:47:44 2019 +0100 installer+setup: Update French translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/installer/po/fr.po | 95 +++++++++++++++++++--------- src/setup/po/fr.po | 164 ++++++++++++++++++++++++------------------------- 2 files changed, 147 insertions(+), 112 deletions(-) Difference in files: diff --git a/src/installer/po/fr.po b/src/installer/po/fr.po index 818bdb46e..9c6bcd60d 100644 --- a/src/installer/po/fr.po +++ b/src/installer/po/fr.po @@ -1,23 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR The IPFire Project (www.ipfire.org) # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # nonux <nonux(a)free.fr>, 2015 # Philippe B <philippe(a)123-newbeetle.com>, 2016 +# Stephane PAUTREL <contact(a)acb78.com>, 2019 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2017-09-20 08:56+0000\n" -"Last-Translator: Philippe B <philippe(a)123-newbeetle.com>\n" +"PO-Revision-Date: 2019-04-11 23:25+0200\n" +"Last-Translator: Stephane PAUTREL <contact(a)acb78.com>\n" "Language-Team: French (http://www.transifex.com/mstremer/ipfire/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 2.2.1\n" #: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 msgid "OK" @@ -34,7 +36,7 @@ msgstr "J'accepte la licence" #: main.c:384 msgid "Warning: Unattended installation will start in 10 seconds..." -msgstr "Attention: Une installation sans surveillance va débuter dans 10 secondes..." +msgstr "Attention : Une installation sans surveillance va débuter dans 10 secondes..." #: main.c:403 msgid "Language selection" @@ -42,7 +44,7 @@ msgstr "Sélection de la langue" #: main.c:403 msgid "Select the language you wish to use for the installation." -msgstr "Sélectionnez la langue que vous souhaitez utiliser pour l'installation." +msgstr "Choisir la langue que vous souhaitez utiliser pour l'installation." #: main.c:418 msgid "Unattended mode" @@ -58,7 +60,10 @@ msgid "" "Welcome to the %s installation program.\n" "\n" "Selecting Cancel on any of the following screens will reboot the computer." -msgstr "Bienvenue dans le programme d'installation de %s.\n\nSélectionner Echap sur une écran redémarrera l'ordinateur." +msgstr "" +"Bienvenue dans le programme d'installation de %s.\n" +"\n" +"Sélectionner Echap sur un écran redémarrera l'ordinateur." #: main.c:428 msgid "Start installation" @@ -75,12 +80,13 @@ msgid "" "No source drive could be found.\n" "\n" "You can try downloading the required installation image." -msgstr "Aucune disque source trouvé.\n\nVous pouvez essayer de télécharger l'image d'installation nécessaire." +msgstr "" +"Aucune disque source trouvé.\n" +"\n" +"Vous pouvez essayer de télécharger l'image d'installation nécessaire." #: main.c:456 -msgid "" -"Please make sure to connect your machine to a network and the installer will" -" try connect to acquire an IP address." +msgid "Please make sure to connect your machine to a network and the installer will try connect to acquire an IP address." msgstr "Soyez certain que votre machine est connectée à un réseau et l'installateur va tenter de récupérer une adresse IP." #: main.c:460 @@ -96,15 +102,18 @@ msgid "" "Networking could not be started but is required to go on with the installation.\n" "\n" "Please connect your machine to a network with a DHCP server and retry." -msgstr "Une connexion réseau ne peut être initiée et est nécessaire pour pour poursuivre l'installation.\n\nMerci de connecter votre machine à une serveur DHCP et réessayer." +msgstr "" +"Une connexion réseau ne peut être initiée et est nécessaire afin de poursuivre l'installation.\n" +"\n" +"Merci de connecter votre machine à un serveur DHCP et réessayer." #: main.c:487 main.c:516 msgid "Retry" -msgstr "Ré-essayer" +msgstr "Réessayer" #: main.c:501 msgid "Downloading installation image..." -msgstr "Téléchargement de l'image d'installation ..." +msgstr "Téléchargement de l'image d'installation..." #: main.c:510 #, c-format @@ -118,14 +127,20 @@ msgid "" " Reason: %s\n" "\n" "%s" -msgstr "L'image d'installation ne peut être téléchargée.\nRaison:%s\n\n%s" +msgstr "" +"L'image d'installation ne peut être téléchargée.\n" +"Motif :%s\n" +"\n" +"%s" #: main.c:528 #, c-format msgid "" "Could not mount %s to %s:\n" " %s\n" -msgstr "Impossible de monter %s vers %s:\n%s\n" +msgstr "" +"Impossible de monter %s vers %s:\n" +"%s\n" #: main.c:543 msgid "License Agreement" @@ -133,7 +148,7 @@ msgstr "Contrat de licence" #: main.c:544 msgid "License not accepted!" -msgstr "Contrat de licence non accepté!" +msgstr "Contrat de licence non accepté !" #: main.c:566 msgid "No hard disk found." @@ -148,14 +163,20 @@ msgid "" "Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" "\n" "ALL DATA ON THE DISK WILL BE DESTROYED." -msgstr "Selectionner le disque sur lequel vous voulez installer IPFire. Il sera d'abord partitioné et un système de fichier y sera créé.\n\nTOUTES LES DONNÉES DUS DISQUE SERONT PERDUES." +msgstr "" +"Choisir le disque sur lequel vous souhaitez installer IPFire. Il sera d'abord partitionné et un système de fichier y sera créé.\n" +"\n" +"TOUTES LES DONNEES DU DISQUE SERONT PERDUES." #: main.c:599 msgid "" "No disk has been selected.\n" "\n" "Please select one or more disks you want to install IPFire on." -msgstr "Aucun disque selectionné.\n\nSelectionnez un dsique au moins sur le(s)quel(s) sera installé IPFire." +msgstr "" +"Aucun disque sélectionné.\n" +"\n" +"Choisissez au moins un disque sur le(s)quel(s) sera installé IPFire." #: main.c:617 #, c-format @@ -165,7 +186,12 @@ msgid "" " %s\n" "\n" "Do you agree to continue?" -msgstr "Le programme d'installation va maintenant préparer le disque choisi.\n\n%s\n\nEtes vous d'accord pour continuer?" +msgstr "" +"Le programme d'installation va maintenant préparer le disque choisi.\n" +"\n" +"%s\n" +"\n" +"Etes vous d'accord pour continuer ?" #: main.c:619 msgid "Disk Setup" @@ -184,7 +210,13 @@ msgid "" " %s\n" "\n" "Do you agree to continue?" -msgstr "Le programme d'installation va maintenant paramétrer la configuration RAID sur les disques sélectionnés.\n\n%s\n%s\n\nEtes vous d'accord pour continuer?" +msgstr "" +"Le programme d'installation va maintenant paramétrer la configuration RAID sur les disques choisis.\n" +"\n" +"%s\n" +"%s\n" +"\n" +"Etes-vous d'accord pour continuer ?" #: main.c:629 msgid "RAID Setup" @@ -199,8 +231,7 @@ msgid "Your harddisk is too small." msgstr "Votre disque dur est trop petit." #: main.c:671 -msgid "" -"Your harddisk is very small, but you can continue without a swap partition." +msgid "Your harddisk is very small, but you can continue without a swap partition." msgstr "Votre disque dur est très petit, mais vous pouvez continuer sans la partition d'échange." #: main.c:684 @@ -217,7 +248,7 @@ msgstr "Système de fichier XFS" #: main.c:687 msgid "ReiserFS Filesystem" -msgstr "Système de fichier ReiserFS" +msgstr "SystÃ¨me de fichier ReiserFS" #: main.c:701 msgid "Filesystem Selection" @@ -225,7 +256,7 @@ msgstr "Choix du système de fichier" #: main.c:701 msgid "Please choose your filesystem:" -msgstr "Merci de choisir votre système de fichier : " +msgstr "Merci de choisir votre système de fichier :" #: main.c:712 msgid "Building RAID..." @@ -288,7 +319,10 @@ msgid "" "A backup file has been found on the installation image.\n" "\n" "Do you want to restore the backup?" -msgstr "Un fichier de sauvegarde a été trouvé sur l'image d'installation.\n\nVoulez vous restaurer cette sauvegarde?" +msgstr "" +"Un fichier de sauvegarde a été trouvé sur l'image d'installation.\n" +"\n" +"Voulez vous restaurer cette sauvegarde ?" #: main.c:827 msgid "Yes" @@ -316,16 +350,19 @@ msgid "" "%s was successfully installed!\n" "\n" "Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." -msgstr "%s a été installé correctement.\n\nRetirer tous les médias d'installation du système et appuyer sur redémarrer. Une fois que le système redémarré, vous devrez paramètrer les réseaux et les mots de passe système. Ensuite, vous devrez faire pointer votre navigateur vers https://%s:444 (ou le nom que vous avez donné à votre %s) pour la console de configuration web." +msgstr "" +"%s a été installé correctement.\n" +"\n" +"Retirer tous les médias d'installation du système et appuyer sur redémarrer. Une fois le système redémarré, vous devrez paramétrer les réseaux et les mots de passe système. Ensuite, vous devrez faire pointer votre navigateur vers https://%s:444 (ou le nom que vous avez donné à votre %s) pour la console de configuration web." #: main.c:882 msgid "Congratulations!" -msgstr "Félécitations!" +msgstr "Félicitations !" #: main.c:882 msgid "Reboot" -msgstr "Re-démarrer" +msgstr "Redémarrer" #: main.c:893 msgid "Setup has failed. Press Ok to reboot." -msgstr "La configuration a échoué. Appuyez sur OK pour re-démarrer." +msgstr "La configuration a échoué. Appuyez sur OK pour redémarrer." diff --git a/src/setup/po/fr.po b/src/setup/po/fr.po index 46a74b55b..a7c1df1dc 100644 --- a/src/setup/po/fr.po +++ b/src/setup/po/fr.po @@ -1,27 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR The IPFire Project (www.ipfire.org) # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# Cedric RIVERA, 2016 # irenee Munyaneza <muirenee(a)yahoo.fr>, 2014 -# Nicolas Cuffia <cuffia.cuceglio(a)vivaldi.net>, 2016 # nonux <nonux(a)free.fr>, 2015 -# Philippe B <philippe(a)123-newbeetle.com>, 2016 # Sebastien Labrie <fonkyy(a)gmail.com>, 2015 +# Nicolas Cuffia <cuffia.cuceglio(a)vivaldi.net>, 2016 +# Philippe B <philippe(a)123-newbeetle.com>, 2016 +# Cedric RIVERA, 2016 +# Stephane PAUTREL <contact(a)acb78.com>, 2019 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2017-09-20 09:45+0000\n" -"Last-Translator: Cedric RIVERA\n" +"PO-Revision-Date: 2019-04-12 00:50+0200\n" +"Last-Translator: Stephane PAUTREL <contact(a)acb78.com>\n" "Language-Team: French (http://www.transifex.com/mstremer/ipfire/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 2.2.1\n" #: dhcp.c:50 msgid "Start address:" @@ -41,15 +43,15 @@ msgstr "DNS secondaire :" #: dhcp.c:54 msgid "Default lease (mins):" -msgstr "Bail par défaut (mins) :" +msgstr "Bail par défaut (mns) :" #: dhcp.c:55 msgid "Max lease (mins):" -msgstr "Bail maximum (mins) :" +msgstr "Bail maximum (mns) :" #: dhcp.c:56 msgid "Domain name suffix:" -msgstr "Suffixe du nom de domaine : " +msgstr "Suffixe du nom de domaine :" #: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 #: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 @@ -65,7 +67,7 @@ msgstr "Configuration du serveur DHCP" #: dhcp.c:116 msgid "Configure the DHCP server by entering the settings information." -msgstr "Configurer le serveur DHCP en entrant les informations de paramètrage." +msgstr "Configurer le serveur DHCP en saisissant les informations de paramétrage." #: dhcp.c:125 msgid "Enabled" @@ -90,7 +92,9 @@ msgstr "Annuler" msgid "" "The following fields are invalid:\n" "\n" -msgstr "Les champs suivants sont invalides:\n\n" +msgstr "" +"Les champs suivants sont invalides :\n" +"\n" #: dhcp.c:159 msgid "Start address" @@ -122,7 +126,7 @@ msgstr "Nom de domaine" #: domainname.c:42 msgid "Enter Domain name" -msgstr "Entrez le nom de domaine" +msgstr "Saisir le nom de domaine." #: domainname.c:48 msgid "Domain name cannot be empty." @@ -142,7 +146,7 @@ msgstr "Nom d'hôte" #: hostname.c:46 msgid "Enter the machine's hostname." -msgstr "Entrez le nom d'hôte de la machine." +msgstr "Saisir le nom d'hôte de la machine." #: hostname.c:53 msgid "Hostname cannot be empty." @@ -154,15 +158,15 @@ msgstr "Le nom de domaine ne doit pas contenir d'espaces." #: hostname.c:58 msgid "Hostname may only contain letters, numbers and hyphens." -msgstr "Le hostname doit seulement contenir des lettres, chiffres et trais d'union." +msgstr "Le nom d'hôte doit seulement contenir des lettres, chiffres et trais d'union." #: keymap.c:84 main.c:67 msgid "Keyboard mapping" -msgstr "Mappage du clavier" +msgstr "Mappage clavier" #: keymap.c:85 msgid "Choose the type of keyboard you are using from the list below." -msgstr "Choisir le type de clavier utilisé depuis la liste ci-dessous." +msgstr "Choisir le type de clavier utilisé dans la liste suivante." #: main.c:68 timezone.c:77 msgid "Timezone" @@ -174,7 +178,7 @@ msgstr "Réseau" #: main.c:72 misc.c:147 msgid "ISDN" -msgstr "ISDN" +msgstr "RNIS" #: main.c:73 msgid "'root' password" @@ -182,11 +186,11 @@ msgstr "Mot de passe \"root\"" #: main.c:74 msgid "'admin' password" -msgstr "Most de passe \"admin\"" +msgstr "Mot de passe \"admin\"" #: main.c:90 msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" -msgstr "<Tab>/<Alt-Tab> entre les éléments | <Espace> selection" +msgstr "<Tab>/<Alt-Tab> entre les éléments | <Espace> sélection" #: main.c:97 msgid "Section menu" @@ -194,7 +198,7 @@ msgstr "Menu de sélection" #: main.c:98 msgid "Select the item you wish to configure." -msgstr "Sélectionner l'artivle à confurer." +msgstr "Choisir l'élément à configurer." #: main.c:99 msgid "Quit" @@ -209,15 +213,13 @@ msgid "Warning" msgstr "Avertissement" #: main.c:175 -msgid "" -"Initial setup was not entirely complete. You must ensure that Setup is " -"properly finished by running setup again at the shell." -msgstr "Le paramétrage initial n'est pas terminé. Assurez vous que le paramétrage s'est correctement terminé en exécutant de nouveau setup depuis le shell." +msgid "Initial setup was not entirely complete. You must ensure that Setup is properly finished by running setup again at the shell." +msgstr "Le paramétrage initial n'est pas terminé. Assurez-vous que le paramétrage s'est correctement terminé en exécutant de nouveau setup depuis le shell." #: misc.c:62 #, c-format msgid "Unable to write %s/main/hostname.conf" -msgstr "Impossible d'écriere %s/main/hostname.conf" +msgstr "Impossible d'écrire %s/main/hostname.conf" #: misc.c:71 msgid "Unable to open main hosts file." @@ -241,11 +243,11 @@ msgstr "Impossible de définir le nom d'hôte" #: misc.c:147 msgid "Scanning and configuring ISDN devices." -msgstr "Détection et configuration des interfaces ISDN." +msgstr "Détection et configuration des interfaces RNIS." #: misc.c:148 msgid "Unable to scan for ISDN devices." -msgstr "Détection des périphériques ISDN impossible." +msgstr "Détection des périphériques RNIS impossible." #: netstuff.c:86 #, c-format @@ -271,23 +273,23 @@ msgstr "Connexion PPP (PPPoE, modem, ATM ...)" #: netstuff.c:113 msgid "DHCP Hostname:" -msgstr "Nom d'hôte DHCP:" +msgstr "Nom d'hôte DHCP :" #: netstuff.c:115 msgid "Force DHCP MTU:" -msgstr "Forcer taille MTU pour DHCP:" +msgstr "Forcer taille MTU pour DHCP :" #: netstuff.c:134 msgid "IP address:" -msgstr "Adresse IP" +msgstr "Adresse IP :" #: netstuff.c:146 msgid "Network mask:" -msgstr "Masque de sous-réseau : " +msgstr "Masque sous-réseau :" #: netstuff.c:173 networking.c:749 msgid "The following fields are invalid:" -msgstr "Les champs suivants sont invalides : " +msgstr "Les champs suivants sont invalides :" #: netstuff.c:183 msgid "IP address" @@ -303,12 +305,12 @@ msgstr "Nom d'hôte DHCP" #: netstuff.c:396 netstuff.c:709 msgid "Unset" -msgstr "Non-défini" +msgstr "Non défini" #: netstuff.c:669 #, c-format msgid "Please choose a networkcard for the following interface - %s." -msgstr "Choisissez un adaptateur réseau pour l'interface - %s." +msgstr "Veuillez choisir un adaptateur réseau pour l'interface - %s." #: netstuff.c:672 msgid "Extended Network Menu" @@ -328,15 +330,15 @@ msgstr "Identification du périphérique" #: netstuff.c:678 msgid "The lights on the selected port should flash now for 10 seconds..." -msgstr "Le témoin lumineux du port sélectionné doit clignoter maintenant pendant 10 secondes ..." +msgstr "Le témoin lumineux du port sélectionné doit clignoter maintenant pendant 10 secondes..." #: netstuff.c:679 msgid "Identification is not supported by this interface." -msgstr "L'identification n'est pas supporté par cet interface." +msgstr "L'identification n'est pas supportée par cette interface." #: netstuff.c:691 msgid "There are no unassigned interfaces on your system." -msgstr "Aucune interface assignée sur votre système." +msgstr "Aucune interface assignée à votre système." #: netstuff.c:732 #, c-format @@ -345,11 +347,11 @@ msgstr "Confirmez-vous la suppression de l'interface assignée %s ?" #: netstuff.c:755 msgid "Select network driver" -msgstr "Selectionnez le pilote réseau" +msgstr "Choisir le pilote réseau" #: netstuff.c:755 msgid "Set additional module parameters" -msgstr "Régler des paramètres supplémentaires du moduie" +msgstr "Régler des paramètres supplémentaires du module" #: netstuff.c:762 msgid "Loading module..." @@ -357,7 +359,7 @@ msgstr "Chargement du module..." #: netstuff.c:777 msgid "Unable to load driver module." -msgstr "Incapable de charger le module du pilote" +msgstr "Ne peut pas charger le module du pilote" #: netstuff.c:780 msgid "Module name cannot be blank." @@ -369,7 +371,7 @@ msgstr "Arrêt du réseau..." #: networking.c:115 msgid "Restarting network..." -msgstr "Re-démarrage du réseau..." +msgstr "Redémarrage du réseau..." #: networking.c:146 msgid "No GREEN interface assigned." @@ -437,7 +439,7 @@ msgstr "Réglages DNS et Passerelle" #: networking.c:260 msgid "When configuration is complete, a network restart will be required." -msgstr "A l'issue de la configuration un redémarrage de la couche réseau est nécessaire." +msgstr "A l'issue de la configuration, un redémarrage de la couche réseau est nécessaire." #: networking.c:267 #, c-format @@ -445,11 +447,14 @@ msgid "" "Current config: %s\n" "\n" "%s" -msgstr "Configuration actuelle: %s\n\n%s" +msgstr "" +"Configuration actuelle : %s\n" +"\n" +"%s" #: networking.c:268 msgid "Network configuration menu" -msgstr "Menu de configuration Reseau" +msgstr "Menu de configuration Réseau" #: networking.c:269 networking.c:520 networking.c:642 msgid "Done" @@ -457,12 +462,8 @@ msgstr "Terminé" #: networking.c:300 #, c-format -msgid "" -"Select the network configuration for %s. The following configuration types " -"list those interfaces which have ethernet attached. If you change this " -"setting, a network restart will be required, and you will have to " -"reconfigure the network driver assignments." -msgstr "Choisir la configuration réseau pour %s. Les types de configuration suivants énumèrent les interfaces ethernet connectées. Tous changements dans le paramétrage nécessitent une reconfiguration de la couche réseau et des pilotes associés." +msgid "Select the network configuration for %s. The following configuration types list those interfaces which have ethernet attached. If you change this setting, a network restart will be required, and you will have to reconfigure the network driver assignments." +msgstr "Choisir la configuration réseau pour %s. Les types suivants correspondent aux interfaces Ethernet connectées. Tout changement dans le paramétrage nécessite une reconfiguration de la couche réseau et des pilotes associés." #: networking.c:307 #, c-format @@ -470,27 +471,33 @@ msgid "" "Not enough netcards for your choice.\n" "\n" "Needed: %d - Available: %d\n" -msgstr "Pas assez d'adaptateurs réseaux pour votre choix.\n\nAttendu: %d - Disponible: %d\n\n" +msgstr "" +"Pas assez d'adaptateurs réseaux pour votre choix.\n" +"\n" +"Attendu: %d - Disponible: %d\n" +"\n" #: networking.c:359 msgid "" "Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n" "\n" -msgstr "Configuration des pilotes réseaux et des interfaces associées aux adaptateurs réseaux. La configuration est la suivante:\n" +msgstr "La configuration des pilotes réseaux et des interfaces associées aux adaptateurs réseaux est la suivante :\n" #: networking.c:408 msgid "Do you wish to change these settings?" -msgstr "Voulez-vous changer ces paramètres?" +msgstr "Voulez-vous changer ces paramètres ?" #: networking.c:447 msgid "Restarting non-local network..." -msgstr "Redémarrage du réseau distant ..." +msgstr "Redémarrage du réseau distant..." #: networking.c:464 msgid "" "Please choose the interface you wish to change.\n" "\n" -msgstr "S'il vous plaît, choisissez l'interface que vous voulez changer.\n\n" +msgstr "" +"Veuillez choisir l'interface que vous souhaitez changer.\n" +"\n" #: networking.c:519 msgid "Assigned Cards" @@ -502,26 +509,20 @@ msgstr "Enlever" #: networking.c:556 networking.c:649 #, c-format -msgid "" -"If you change this IP address, and you are logged in remotely, your " -"connection to the %s machine will be broken, and you will have to reconnect " -"on the new IP. This is a risky operation, and should only be attempted if " -"you have physical access to the machine, should something go wrong." -msgstr "Si vous changez cette adresse IP et si vous êtes connecté à distance alors votre accès à la machine %s sera rompu et il vous sera nécessaire de vous reconnecter à la nouvelle adresse IP. C'est une situation dangereuse qui ne doit être tentée que si vous avez accès physiquement à l'ordinateur afin d'éviter une complication inattendue." +msgid "If you change this IP address, and you are logged in remotely, your connection to the %s machine will be broken, and you will have to reconnect on the new IP. This is a risky operation, and should only be attempted if you have physical access to the machine, should something go wrong." +msgstr "Si vous changez cette adresse IP et si vous êtes connecté à distance alors votre accès à la machine %s sera rompu et il sera nécessaire de vous reconnecter à la nouvelle adresse IP. C'est une situation dangereuse qui ne doit être tentée que si vous avez accès physiquement à l'ordinateur afin d'éviter une complication inattendue." #: networking.c:641 msgid "Select the interface you wish to reconfigure." -msgstr "Selectionnez l'interface que vous souhaitez reconfigurer." +msgstr "Choisir l'interface que vous souhaitez reconfigurer." #: networking.c:729 msgid "Default gateway:" -msgstr "Passerelle par defaut" +msgstr "Passerelle par défaut :" #: networking.c:744 -msgid "" -"Enter the DNS and gateway information. These settings are used only with " -"Static IP (and DHCP if DNS set) on the RED interface." -msgstr "Saisir les informations relatives au DNS et à la passerelle. Ces paramètres sont utilisés dans la cas d'une configuration statique de la couche IP (et DHCP pour le DNS) sur l'interface ROUGE." +msgid "Enter the DNS and gateway information. These settings are used only with Static IP (and DHCP if DNS set) on the RED interface." +msgstr "Saisir les informations relatives aux DNS et à la passerelle. Ces paramètres sont utilisés dans le cas d'une configuration statique de la couche IP (et DHCP pour le DNS) sur l'interface ROUGE." #: networking.c:773 msgid "Default gateway" @@ -532,9 +533,8 @@ msgid "Secondary DNS specified without a Primary DNS" msgstr "DNS secondaire spécifié sans DNS primaire" #: passwords.c:33 -msgid "" -"Enter the 'root' user password. Login as this user for commandline access." -msgstr "Entrez le mot de passe pour le super-utilisateur 'root'. Se connecter avec celui-ci pour les accès en ligne de commande." +msgid "Enter the 'root' user password. Login as this user for commandline access." +msgstr "Saisir le mot de passe du super-utilisateur 'root' permettant de se connecter en ligne de commande." #: passwords.c:38 passwords.c:61 msgid "Setting password" @@ -542,18 +542,16 @@ msgstr "Configuration du mot de passe" #: passwords.c:38 msgid "Setting 'root' password...." -msgstr "Paramétrage du mot de passe pour le super-utilisateur 'root' ..." +msgstr "Paramétrage du mot de passe pour le super-utilisateur 'root'..." #: passwords.c:39 msgid "Problem setting 'root' password." -msgstr "Problème lors du paramétrage du mot de passe pour le super-utilisateur 'root' ..." +msgstr "Problème lors du paramétrage du mot de passe pour le super-utilisateur 'root'..." #: passwords.c:53 #, c-format -msgid "" -"Enter %s 'admin' user password. This is the user to use for logging into the" -" %s web administration pages." -msgstr "Saisir le mot de passe %s pour l'utilisateur 'admin'. Cet utilisateur est nécessaire pour se connecter aux pages web %s d'administration." +msgid "Enter %s 'admin' user password. This is the user to use for logging into the %s web administration pages." +msgstr "Saisir le mot de passe %s de l'utilisateur 'admin' nécessaire à la connexion aux pages web d'administration %s." #: passwords.c:60 #, c-format @@ -563,28 +561,28 @@ msgstr "Paramétrage du mot de passe %s pour le compte utilisateur 'admin'..." #: passwords.c:62 #, c-format msgid "Problem setting %s 'admin' user password." -msgstr "Problème rencontré lors de mise en place du mot de passe %s pour l'utilisateur 'admin'." +msgstr "Problème rencontré lors de la saisie du mot de passe %s pour l'utilisateur 'admin'." #: passwords.c:76 msgid "Password:" -msgstr "Mot de passe" +msgstr "Mot de passe :" #: passwords.c:77 msgid "Again:" -msgstr "Encore" +msgstr "Confirmer :" #: passwords.c:95 msgid "Password cannot be blank." -msgstr "Le mot de passe ne doit pas être vide" +msgstr "Le mot de passe ne doit pas être vide." #: passwords.c:102 msgid "Passwords do not match." -msgstr "Les mots de passe de correspondent pas." +msgstr "Les mots de passe ne correspondent pas." #: passwords.c:109 msgid "Password cannot contain spaces." -msgstr "Le mot de passe ne doit pas contenir des espaces" +msgstr "Le mot de passe ne doit pas contenir d'espaces" #: timezone.c:77 msgid "Choose the timezone you are in from the list below." -msgstr "Choisir le fuseau horaire adéquate dans la liste suivante. " +msgstr "Choisir le fuseau horaire approprié dans la liste suivante." hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3e11f8257dfe003aaad20d7ca73e3bc831131a96
by Arne Fitzenreiter 11 Apr '19

11 Apr '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d27675b08175ed7969d842fdc64f157797911faa
by Arne Fitzenreiter 11 Apr '19

11 Apr '19

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, next has been updated via d27675b08175ed7969d842fdc64f157797911faa (commit) via a2907cdd9fba3a6ce6af8cc75c656daf1fa43dc0 (commit) via d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c (commit) via af9aa1556e6329e7af3d8939c51316fe1599295a (commit) via 0971726e1372d743f92b7f0e6969ebbaa8718756 (commit) via 6fc3f2e685d42d9c6261ca281740ce067ab6e00d (commit) via e7dafc3e3eb7be7e685fe0e7b3999fd6f264c80b (commit) via f0ce8b2c8853041cd708a0cef88b1bd22cbf88df (commit) via d66433fca6323940ac217d7a0834a0b178d509eb (commit) via 49ce16f9bea9f1812be5cb41ef7b390556fc2364 (commit) via 8d76eb20852a695b15e6fd32076128a25fad01d1 (commit) via bfd5cfa9c6949eca6319a774b871007c9da8fd0e (commit) via a485606c27781a5439d38fcde662a786cb5671d9 (commit) from ee82349a0ea00866d731936e769fab9441690932 (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 d27675b08175ed7969d842fdc64f157797911faa Merge: a2907cdd9 ee82349a0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 11 07:31:11 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit a2907cdd9fba3a6ce6af8cc75c656daf1fa43dc0 Merge: 4f30ce49b d01d68913 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 11 07:30:26 2019 +0200 Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{core/131 => oldcore/130}/exclude | 0 .../{core/131 => oldcore/130}/filelists/Net_SSLeay | 0 .../{core/131 => oldcore/130}/filelists/apache2 | 0 config/rootfiles/oldcore/130/filelists/files | 3 +++ .../rootfiles/oldcore/{106 => 130}/filelists/strongswan | 0 .../rootfiles/{core/131 => oldcore/130}/filelists/wget | 0 config/rootfiles/oldcore/{112 => 130}/update.sh | 16 +++++++--------- make.sh | 5 +++-- 8 files changed, 13 insertions(+), 11 deletions(-) copy config/rootfiles/{core/131 => oldcore/130}/exclude (100%) copy config/rootfiles/{core/131 => oldcore/130}/filelists/Net_SSLeay (100%) copy config/rootfiles/{core/131 => oldcore/130}/filelists/apache2 (100%) create mode 100644 config/rootfiles/oldcore/130/filelists/files copy config/rootfiles/oldcore/{106 => 130}/filelists/strongswan (100%) copy config/rootfiles/{core/131 => oldcore/130}/filelists/wget (100%) copy config/rootfiles/oldcore/{112 => 130}/update.sh (91%) Difference in files: diff --git a/config/rootfiles/oldcore/130/exclude b/config/rootfiles/oldcore/130/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/130/exclude @@ -0,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 --git a/config/rootfiles/oldcore/130/filelists/Net_SSLeay b/config/rootfiles/oldcore/130/filelists/Net_SSLeay new file mode 120000 index 000000000..13fe0560c --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/Net_SSLeay @@ -0,0 +1 @@ +../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/filelists/apache2 b/config/rootfiles/oldcore/130/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/filelists/files b/config/rootfiles/oldcore/130/filelists/files new file mode 100644 index 000000000..98b8fec39 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +usr/local/bin/ipsec-interfaces diff --git a/config/rootfiles/oldcore/130/filelists/strongswan b/config/rootfiles/oldcore/130/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/filelists/wget b/config/rootfiles/oldcore/130/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/oldcore/130/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/130/update.sh b/config/rootfiles/oldcore/130/update.sh new file mode 100644 index 000000000..86e42a1d4 --- /dev/null +++ b/config/rootfiles/oldcore/130/update.sh @@ -0,0 +1,65 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2019 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=130 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/usr/local/bin/ipsecctrl D + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/apache restart +/usr/local/bin/ipsecctrl S + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index de973c69c..b4d5ea7a3 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,10 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name +<<<<<<< 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 414ca3fe85d1fbaed8e775926166f19c158ea836
by Michael Tremer 10 Apr '19

10 Apr '19

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 414ca3fe85d1fbaed8e775926166f19c158ea836 (commit) from f48d90546c8840e021ae45532378b97b55fd27a8 (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 414ca3fe85d1fbaed8e775926166f19c158ea836 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 20:59:21 2019 +0100 binutils: Update to 2.32 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: binutils/binutils.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/binutils/binutils.nm b/binutils/binutils.nm index 81e7884a2..b971bb375 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = binutils -version = 2.30 +version = 2.32 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f48d90546c8840e021ae45532378b97b55fd27a8
by Michael Tremer 09 Apr '19

09 Apr '19

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 f48d90546c8840e021ae45532378b97b55fd27a8 (commit) via 0a1bbed10a8768d4a655dfe0327d1ebff41290fb (commit) via c3d2e812ce0e9d24877f29fa88112f4e625bfef1 (commit) via 3c07a5b13561a850139d92be9805d19e2f3a7cf3 (commit) via 4fef5f19cb032d02d26127517014889cc9f37ffd (commit) from aa3c0f63690fa984ffd4e3e2be8786e0a494aec1 (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 f48d90546c8840e021ae45532378b97b55fd27a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 02:42:04 2019 +0100 screen: Update to 4.6.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0a1bbed10a8768d4a655dfe0327d1ebff41290fb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 02:38:53 2019 +0100 tmux: Update to 2.8 The project has also moved to GitHub. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c3d2e812ce0e9d24877f29fa88112f4e625bfef1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 02:33:10 2019 +0100 ncurses: Install in base system This package has tools like reset in it that I use often and therefore I think it should be installed in the base system. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3c07a5b13561a850139d92be9805d19e2f3a7cf3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 02:32:45 2019 +0100 hyperscan: Drop cmake parameters that are passed anyways Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4fef5f19cb032d02d26127517014889cc9f37ffd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 02:32:13 2019 +0100 cmake: Update to 3.14.1 The testsuite does not run through any more and has therefore been disabled. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: cmake/cmake.nm | 30 ++++++++++++++---------------- hyperscan/hyperscan.nm | 5 +---- ncurses/ncurses.nm | 4 +++- screen/screen.nm | 4 ++-- tmux/tmux.nm | 4 ++-- 5 files changed, 22 insertions(+), 25 deletions(-) Difference in files: diff --git a/cmake/cmake.nm b/cmake/cmake.nm index 161b9ffac..8bb3a3c63 100644 --- a/cmake/cmake.nm +++ b/cmake/cmake.nm @@ -5,8 +5,8 @@ name = cmake version = %{ver_maj}.%{ver_min} -ver_maj = 3.3 -ver_min = 2 +ver_maj = 3.14 +ver_min = 1 release = 1 groups = Development/Tools @@ -14,10 +14,6 @@ url = http://www.cmake.org license = BSD summary = Cross-platform make system. -# Add some fixes to work with lto. -CFLAGS += -Wl,-lpthread -CXXFLAGS += -Wl,-lpthread - description CMake is used to control the software compilation process using simple \ platform and compiler independent configuration files. CMake generates \ @@ -34,24 +30,23 @@ build bzip2-devel expat-devel gcc-c++ - jsoncpp-devel - libarchive-devel + jsoncpp-devel >= 1.4.1 + libarchive-devel >= 3.1.0 libcurl-devel + libuv-devel >= 1.10.0 ncurses-devel openssl-devel + rhash-devel xz-devel zlib-devel end - prepare_cmds - # Fixup permissions - find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x - end + PARALLELISMFLAGS = -j4 build mkdir -pv build cd build && ../bootstrap \ - --prefix=/usr \ + --prefix=%{prefix} \ --datadir=/share/cmake \ --docdir=/share/doc/cmake-%{version} \ --mandir=/share/man \ @@ -61,9 +56,12 @@ build make VERBOSE=1 %{PARALLELISMFLAGS} end - test - cd build && bin/ctest -V -E ModuleNotices - end + # The following tests FAILED: + # 5 - kwsys.testSystemTools (Failed) + # 327 - RunCMake.FileAPI (Failed) + #test + # cd build && bin/ctest -V -E ModuleNotices + #end install cd build && make install DESTDIR=%{BUILDROOT} diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm index e1688a5c3..a973672ef 100644 --- a/hyperscan/hyperscan.nm +++ b/hyperscan/hyperscan.nm @@ -5,7 +5,7 @@ name = hyperscan version = 5.1.0 -release = 2 +release = 3 # This won't build on any architectures but those sup_arches = x86_64 i686 @@ -40,9 +40,6 @@ build build %{cmake} . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=%{lib} \ - -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_STATIC_AND_SHARED:BOOL=OFF make %{PARALLELISMFLAGS} diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 86da88ccd..a54057458 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -6,7 +6,7 @@ name = ncurses version = 5.9 revision = 20150117 -release = 11.%{revision} +release = 12.%{revision} thisapp = %{name}-%{version}-%{revision} groups = System/Base @@ -97,6 +97,8 @@ end packages package %{name} + groups += Base + end package %{name}-libs template LIBS diff --git a/screen/screen.nm b/screen/screen.nm index f944d18f5..ac8872807 100644 --- a/screen/screen.nm +++ b/screen/screen.nm @@ -4,7 +4,7 @@ ############################################################################### name = screen -version = 4.3.1 +version = 4.6.2 release = 1 groups = Application/System @@ -19,7 +19,7 @@ description one login. end -source_dl = http://ftp.gnu.org/gnu/screen/ +source_dl = https://ftp.gnu.org/gnu/screen/ build requires diff --git a/tmux/tmux.nm b/tmux/tmux.nm index 2a58b69ed..276e5207b 100644 --- a/tmux/tmux.nm +++ b/tmux/tmux.nm @@ -4,11 +4,11 @@ ############################################################################### name = tmux -version = 2.2 +version = 2.8 release = 1 groups = Application/System -url = http://sourceforge.net/projects/tmux +url = https://github.com/tmux/tmux license = ISC and BSD summary = A terminal multiplexer hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core130, updated. d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c
by Arne Fitzenreiter 09 Apr '19

09 Apr '19

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, core130 has been updated via d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c (commit) via af9aa1556e6329e7af3d8939c51316fe1599295a (commit) via 0971726e1372d743f92b7f0e6969ebbaa8718756 (commit) from 6fc3f2e685d42d9c6261ca281740ce067ab6e00d (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 d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 5 21:55:12 2019 +0200 wget: Update to 1.20.3 For details see: https://fossies.org/linux/wget/ChangeLog Excerpt from "NEWS": "2019-04-05 Tim Ruehsen <tim.ruehsen(a)gmx.de> Fix a buffer overflow vulnerability * src/iri.c(do_conversion): Reallocate the output buffer to a larger size if it is already full" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit af9aa1556e6329e7af3d8939c51316fe1599295a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 4 02:04:28 2019 +0100 core130: Ship updated apache Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0971726e1372d743f92b7f0e6969ebbaa8718756 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Apr 4 09:15:00 2019 +0200 apache: Update to 2.4.39 For details see: http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 1 + .../rootfiles/{oldcore/114 => core/130}/filelists/apache2 | 0 config/rootfiles/core/130/update.sh | 14 +------------- lfs/apache2 | 6 +++--- lfs/wget | 4 ++-- 5 files changed, 7 insertions(+), 18 deletions(-) copy config/rootfiles/{oldcore/114 => core/130}/filelists/apache2 (100%) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index ee09c6cbe..4866fb6bd 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1646,6 +1646,7 @@ usr/lib/apache/mod_slotmem_plain.so usr/lib/apache/mod_slotmem_shm.so usr/lib/apache/mod_socache_dbm.so usr/lib/apache/mod_socache_memcache.so +usr/lib/apache/mod_socache_redis.so usr/lib/apache/mod_socache_shmcb.so usr/lib/apache/mod_speling.so usr/lib/apache/mod_ssl.so diff --git a/config/rootfiles/core/130/filelists/apache2 b/config/rootfiles/core/130/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/130/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh index f072e8052..86e42a1d4 100644 --- a/config/rootfiles/core/130/update.sh +++ b/config/rootfiles/core/130/update.sh @@ -32,15 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services -/etc/init.d/squid stop -/usr/local/bin/openvpnctrl -k -/usr/local/bin/openvpnctrl -kn2n /usr/local/bin/ipsecctrl D -/etc/init.d/unbound stop - -# Remove files -rm -vf \ - /usr/lib/firewall/ipsec-block # Extract files extract_files @@ -52,12 +44,8 @@ ldconfig /usr/local/bin/update-lang-cache # Start services -/etc/init.d/firewall restart -/etc/init.d/unbound start +/etc/init.d/apache restart /usr/local/bin/ipsecctrl S -/usr/local/bin/openvpnctrl -s -/usr/local/bin/openvpnctrl -sn2n -/etc/init.d/squid start # This update needs a reboot... #touch /var/run/need_reboot diff --git a/lfs/apache2 b/lfs/apache2 index be5ffd9ec..87f639efe 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.4.38 +VER = 2.4.39 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084 +$(DL_FILE)_MD5 = 930e217ba2d71e708a3f1521ecae7ec0 install : $(TARGET) diff --git a/lfs/wget b/lfs/wget index ac2fa826c..00ca75033 100644 --- a/lfs/wget +++ b/lfs/wget @@ -24,7 +24,7 @@ include Config -VER = 1.20.2 +VER = 1.20.3 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2692f6678e93601441306b5c1fc6a77a +$(DL_FILE)_MD5 = db4e6dc7977cbddcd543b240079a4899 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c
by Arne Fitzenreiter 09 Apr '19

09 Apr '19

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, master has been updated via d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c (commit) via af9aa1556e6329e7af3d8939c51316fe1599295a (commit) via 0971726e1372d743f92b7f0e6969ebbaa8718756 (commit) from 6fc3f2e685d42d9c6261ca281740ce067ab6e00d (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 d01d68913f643c5d4b9b58a7ecab6d1c4dde5c0c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 5 21:55:12 2019 +0200 wget: Update to 1.20.3 For details see: https://fossies.org/linux/wget/ChangeLog Excerpt from "NEWS": "2019-04-05 Tim Ruehsen <tim.ruehsen(a)gmx.de> Fix a buffer overflow vulnerability * src/iri.c(do_conversion): Reallocate the output buffer to a larger size if it is already full" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit af9aa1556e6329e7af3d8939c51316fe1599295a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 4 02:04:28 2019 +0100 core130: Ship updated apache Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0971726e1372d743f92b7f0e6969ebbaa8718756 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Apr 4 09:15:00 2019 +0200 apache: Update to 2.4.39 For details see: http://mirror.checkdomain.de/apache//httpd/CHANGES_2.4.39 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 1 + .../rootfiles/{oldcore/114 => core/130}/filelists/apache2 | 0 config/rootfiles/core/130/update.sh | 14 +------------- lfs/apache2 | 6 +++--- lfs/wget | 4 ++-- 5 files changed, 7 insertions(+), 18 deletions(-) copy config/rootfiles/{oldcore/114 => core/130}/filelists/apache2 (100%) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index ee09c6cbe..4866fb6bd 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1646,6 +1646,7 @@ usr/lib/apache/mod_slotmem_plain.so usr/lib/apache/mod_slotmem_shm.so usr/lib/apache/mod_socache_dbm.so usr/lib/apache/mod_socache_memcache.so +usr/lib/apache/mod_socache_redis.so usr/lib/apache/mod_socache_shmcb.so usr/lib/apache/mod_speling.so usr/lib/apache/mod_ssl.so diff --git a/config/rootfiles/core/130/filelists/apache2 b/config/rootfiles/core/130/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/130/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh index f072e8052..86e42a1d4 100644 --- a/config/rootfiles/core/130/update.sh +++ b/config/rootfiles/core/130/update.sh @@ -32,15 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services -/etc/init.d/squid stop -/usr/local/bin/openvpnctrl -k -/usr/local/bin/openvpnctrl -kn2n /usr/local/bin/ipsecctrl D -/etc/init.d/unbound stop - -# Remove files -rm -vf \ - /usr/lib/firewall/ipsec-block # Extract files extract_files @@ -52,12 +44,8 @@ ldconfig /usr/local/bin/update-lang-cache # Start services -/etc/init.d/firewall restart -/etc/init.d/unbound start +/etc/init.d/apache restart /usr/local/bin/ipsecctrl S -/usr/local/bin/openvpnctrl -s -/usr/local/bin/openvpnctrl -sn2n -/etc/init.d/squid start # This update needs a reboot... #touch /var/run/need_reboot diff --git a/lfs/apache2 b/lfs/apache2 index be5ffd9ec..87f639efe 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.4.38 +VER = 2.4.39 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084 +$(DL_FILE)_MD5 = 930e217ba2d71e708a3f1521ecae7ec0 install : $(TARGET) diff --git a/lfs/wget b/lfs/wget index ac2fa826c..00ca75033 100644 --- a/lfs/wget +++ b/lfs/wget @@ -24,7 +24,7 @@ include Config -VER = 1.20.2 +VER = 1.20.3 THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2692f6678e93601441306b5c1fc6a77a +$(DL_FILE)_MD5 = db4e6dc7977cbddcd543b240079a4899 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core130, created. 6fc3f2e685d42d9c6261ca281740ce067ab6e00d
by Arne Fitzenreiter 09 Apr '19

09 Apr '19

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, core130 has been created at 6fc3f2e685d42d9c6261ca281740ce067ab6e00d (commit) - Log ----------------------------------------------------------------- commit 6fc3f2e685d42d9c6261ca281740ce067ab6e00d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 9 07:31:23 2019 +0200 core130: insert a core update for urgent fixes. the bigger changes for suricata and kernel need longer time for test so we insert a core with smaller but important fixes. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e7dafc3e3eb7be7e685fe0e7b3999fd6f264c80b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 9 07:30:26 2019 +0200 core130: ship strongswan Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f0ce8b2c8853041cd708a0cef88b1bd22cbf88df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 8 11:56:58 2019 +0100 core130: Ship perl-Net-SSLeay This was still using the old version of OpenSSL. Instead of linking the module (which we should have found earlier) the module uses dlopen :( Fixes: #12044 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d66433fca6323940ac217d7a0834a0b178d509eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 8 16:41:24 2019 +0100 strongswan: Manually install all routes for non-routed VPNs This is a regression from disabling charon.install_routes. VPNs are routing fine as long as traffic is passing through the firewall. Traps are not propertly used as long as these routes are not present and therefore we won't trigger any tunnels when traffic originates from the firewall. Fixes: #12045 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 49ce16f9bea9f1812be5cb41ef7b390556fc2364 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 4 02:07:16 2019 +0100 core130: Ship updated wget Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8d76eb20852a695b15e6fd32076128a25fad01d1 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Apr 4 09:43:50 2019 +0200 wget: Update to 1.20.2 For details see: https://fossies.org/linux/wget/ChangeLog Excerpt from "NEWS": * Changes in Wget 1.20.2 ** NTLM authentication will retry under certain cases ** Fixed a buffer overflow vulnerability" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bfd5cfa9c6949eca6319a774b871007c9da8fd0e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Mar 27 20:54:10 2019 +0100 clamav: Update to 0.101.2 For details see: https://blog.clamav.net/2019/03/clamav-01012-and-01003-patches-have.html "ClamAV 0.101.2 is a patch release to address a handful of security related bugs." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a485606c27781a5439d38fcde662a786cb5671d9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 18 15:24:56 2019 +0000 ipsec-interfaces: Apply static routes (again) after creating IPsec interfaces Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2019