IPFire-SCM

ipfire-scm@lists.ipfire.org

7876 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core94, updated. b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c
by git＠ipfire.org 23 Oct '15

23 Oct '15

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, core94 has been updated via b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit) from 374e636feeade7827e8bea834ee911d15530650f (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 b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 23 19:49:17 2015 +0200 core94: add system menu to update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index e63a611..9ef227b 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/wireless.cgi var/ipfire/langs +var/ipfire/menu.d/10-system.menu var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c
by git＠ipfire.org 23 Oct '15

23 Oct '15

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 b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit) from 374e636feeade7827e8bea834ee911d15530650f (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 b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 23 19:49:17 2015 +0200 core94: add system menu to update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index e63a611..9ef227b 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/wireless.cgi var/ipfire/langs +var/ipfire/menu.d/10-system.menu var/ipfire/menu.d/40-services.menu var/ipfire/network-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. de1c22041dbacbe5fda9b6e5b493fd1db99b0002
by git＠ipfire.org 23 Oct '15

23 Oct '15

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ca468b64bb442c1556bd5ebbfe60f1ae606ca81d
by git＠ipfire.org 23 Oct '15

23 Oct '15

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 ca468b64bb442c1556bd5ebbfe60f1ae606ca81d (commit) from bef6465a923f71647b2b0b9a06725035e05a03af (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 ca468b64bb442c1556bd5ebbfe60f1ae606ca81d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 23 16:31:15 2015 +0100 network: Fix build on 32 architectures Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: network/network.nm | 21 ++-- ...tcalc-Allow-build-on-64-bit-architectures.patch | 127 +++++++++++++++++++++ network/systemd/network.service | 13 --- 3 files changed, 141 insertions(+), 20 deletions(-) create mode 100644 network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch delete mode 100644 network/systemd/network.service Difference in files: diff --git a/network/network.nm b/network/network.nm index be3c641..7228a65 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 007 -release = 1 +release = 1.1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Base Networking/Tools @@ -25,8 +25,15 @@ source_dl = http://source.ipfire.org/releases/network/ build requires + autoconf + automake docbook-xsl libxslt + systemd-devel + end + + prepare_cmds + [ -e "configure" ] || ./autogen.sh end install_cmds @@ -63,23 +70,23 @@ packages end configfiles - /etc/firewall /etc/network end - # Enable network service, so it starts at the first boot. script postin systemctl daemon-reload >/dev/null 2>&1 || : - systemctl --no-reload enable network.service >/dev/null 2>&1 || : end - script preun - systemctl --no-reload disable network.service >/dev/null 2>&1 || : - systemctl stop network.service >/dev/null 2>&1 || : + script postun + systemctl daemon-reload >/dev/null 2>&1 || : end script postup systemctl daemon-reload >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch b/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch new file mode 100644 index 0000000..fec5b2c --- /dev/null +++ b/network/patches/0001-inetcalc-Allow-build-on-64-bit-architectures.patch @@ -0,0 +1,127 @@ +From cf3fb03ccc299b1233fa1a3cc4ce66520c324e70 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 21 Oct 2015 18:42:06 +0200 +Subject: [PATCH] inetcalc: Allow build on 64 bit architectures + +inetcalc previously used a GCC extension that was only +available on 64 bit platforms. This patch changes the +code to use struct in6_addr instead of __uint128_t for +storing IP addresses. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + src/inetcalc.c | 47 +++++++++++++++++++++++++++++++++-------------- + 1 file changed, 33 insertions(+), 14 deletions(-) + +diff --git a/src/inetcalc.c b/src/inetcalc.c +index f821d6ed41a6..ba692542aba7 100644 +--- a/src/inetcalc.c ++++ b/src/inetcalc.c +@@ -30,17 +30,26 @@ + + typedef struct ip_address { + int family; +- __uint128_t addr; ++ struct in6_addr addr; + int prefix; + } ip_address_t; + +-static __uint128_t prefix_to_bitmask(int prefix) { +- __uint128_t bitmask = ~0; ++static struct in6_addr prefix_to_bitmask(int prefix) { ++ assert(prefix <= 128); + +- for (int i = 0; i < 128 - prefix; i++) +- bitmask >>= 1; ++ struct in6_addr bitmask; + +- return bitmask; ++ for (int i = 0; i < 16; i++) ++ bitmask.s6_addr[i] = 0; ++ ++ for (int i = prefix, j = 0; i > 0; i -= 8, j++) { ++ if (i >= 8) ++ bitmask.s6_addr[j] = 0xff; ++ else ++ bitmask.s6_addr[j] = 0xff << (8 - i); ++ } ++ ++ return bitmask; + } + + static int bitmask_to_prefix(uint32_t bits) { +@@ -171,7 +180,7 @@ static int ip_address_eq(const ip_address_t* a1, const ip_address_t* a2) { + if (a1->family != a2->family) + return 1; + +- if (a1->addr != a2->addr) ++ if (a1->addr.s6_addr != a2->addr.s6_addr) + return 1; + + if (a1->prefix != a2->prefix) +@@ -184,7 +193,7 @@ static int ip_address_gt(const ip_address_t* a1, const ip_address_t* a2) { + if (a1->family != a2->family || a1->prefix != a2->prefix) + return -1; + +- if (a1->addr > a2->addr) ++ if (a1->addr.s6_addr > a2->addr.s6_addr) + return 0; + + return 1; +@@ -193,7 +202,7 @@ static int ip_address_gt(const ip_address_t* a1, const ip_address_t* a2) { + static int ip_address_format_string(char* buffer, size_t size, const ip_address_t* ip) { + assert(ip->family == AF_INET || ip->family == AF_INET6); + +- const char* p = inet_ntop(ip->family, &ip->addr, buffer, size); ++ const char* p = inet_ntop(ip->family, &ip->addr.s6_addr, buffer, size); + if (!p) + return errno; + +@@ -218,21 +227,25 @@ static void ip_address_print(const ip_address_t* ip) { + static void ip_address_make_network(ip_address_t* net, const ip_address_t* ip) { + assert(ip->prefix >= 0); + +- __uint128_t mask = prefix_to_bitmask(ip->prefix); ++ struct in6_addr mask = prefix_to_bitmask(ip->prefix); + + net->family = ip->family; + net->prefix = ip->prefix; +- net->addr = ip->addr & mask; ++ ++ for (int i = 0; i < 16; i++) ++ net->addr.s6_addr[i] = ip->addr.s6_addr[i] & mask.s6_addr[i]; + } + + static void ip_address_make_broadcast(ip_address_t* broadcast, const ip_address_t* ip) { + assert(ip->family == AF_INET && ip->prefix >= 0); + +- __uint128_t mask = prefix_to_bitmask(ip->prefix); ++ struct in6_addr mask = prefix_to_bitmask(ip->prefix); + + broadcast->family = ip->family; + broadcast->prefix = ip->prefix; +- broadcast->addr = ip->addr | ~mask; ++ ++ for (int i = 0; i < 16; i++) ++ broadcast->addr.s6_addr[i] = ip->addr.s6_addr[i] | ~mask.s6_addr[i]; + } + + static int action_check(const int family, const char* address) { +@@ -342,7 +355,13 @@ static int action_prefix(const int family, const char* addr1, const char* addr2) + if (r) + return r; + +- uint32_t mask = ntohl(network.addr ^ broadcast.addr); ++ struct in6_addr netmask; ++ for (int i = 0; i < 16; i++) ++ netmask.s6_addr[i] = network.addr.s6_addr[i] ^ broadcast.addr.s6_addr[i]; ++ ++ uint32_t mask = netmask.s6_addr[0] << 24 | netmask.s6_addr[1] << 16 | ++ netmask.s6_addr[2] << 8 | netmask.s6_addr[3]; ++ + int prefix = bitmask_to_prefix(~mask); + if (prefix < 0) + return 1; +-- +2.4.3 + diff --git a/network/systemd/network.service b/network/systemd/network.service deleted file mode 100644 index 4509a35..0000000 --- a/network/systemd/network.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Network Connectivity -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStartPre=/sbin/network init -ExecStart=/sbin/network start -ExecStop=/sbin/network stop - -[Install] -WantedBy=multi-user.target hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 038169b894f1914b3cbd6513fea5f307bcc4ab12
by git＠ipfire.org 23 Oct '15

23 Oct '15

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 038169b894f1914b3cbd6513fea5f307bcc4ab12 (commit) from 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6 (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 038169b894f1914b3cbd6513fea5f307bcc4ab12 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 23 11:00:03 2015 +0200 kernel: uppdate to 3.14.55 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 19 ++++++++----------- src/patches/linux-3.14.54_fix_ip_route_list.patch | 12 ------------ 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 src/patches/linux-3.14.54_fix_ip_route_list.patch Difference in files: diff --git a/lfs/linux b/lfs/linux index 85b4060..8d59865 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.14.54 -RPI_PATCHES = 3.14.54-grsec-ipfire1 -A7M_PATCHES = 3.14.54-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.54-v1.patch.xz +VER = 3.14.55 +RPI_PATCHES = 3.14.55-grsec-ipfire1 +A7M_PATCHES = 3.14.55-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.55-v1.patch.xz THISAPP = linux-$(VER) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 61a0568abd96bef9b682d0d46977fbdd -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = db92bc85979895efdc6d9da2877ce0ae -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 9092711bcac325c5d0dac5eed98f1c5d -$(GRS_PATCHES)_MD5 = 0c1e505cf87177bfb7d62c95e67f10ef +$(DL_FILE)_MD5 = 5358dcd2655874496ede6f3a8ada5054 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 4ab53e184441c895adf318a1c2874d43 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = f29bd5c156384b0a4bb7c6e2c973ea06 +$(GRS_PATCHES)_MD5 = dc0e0195a362087c71227173eab062d4 install : $(TARGET) @@ -134,9 +134,6 @@ ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch endif - # Fix ip route list hang introduced with linux 3.14.54 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.54_fix_ip_route_list.patch - # DVB Patches cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch diff --git a/src/patches/linux-3.14.54_fix_ip_route_list.patch b/src/patches/linux-3.14.54_fix_ip_route_list.patch deleted file mode 100644 index 6613d15..0000000 --- a/src/patches/linux-3.14.54_fix_ip_route_list.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/net/core/fib_rules.c b/net/core/fib_rules.c ---- a/net/core/fib_rules.c 2015-10-19 16:40:32.000000000 +0200 -+++ b/net/core/fib_rules.c 2015-10-19 16:54:37.836777983 +0200 -@@ -631,7 +631,7 @@ - err = fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, RTM_NEWRULE, - NLM_F_MULTI, ops); -- if (err) -+ if (err < 0) - break; - skip: - idx++; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6
by git＠ipfire.org 22 Oct '15

22 Oct '15

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 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6 (commit) via 374e636feeade7827e8bea834ee911d15530650f (commit) from 159c9eb9b1ac6144db50e4677132c51ddf2d8ceb (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 39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6 Merge: 159c9eb 374e636 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 22 23:38:27 2015 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/menu/10-system.menu | 5 +++++ config/menu/40-services.menu | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu index 5755366..3b84e31 100644 --- a/config/menu/10-system.menu +++ b/config/menu/10-system.menu @@ -16,6 +16,11 @@ 'title' => "$Lang::tr{'wlan client'}", 'enabled' => 0, }; + $subsystem->{'22.dma'} = {'caption' => $Lang::tr{'email settings'}, + 'uri' => '/cgi-bin/mail.cgi', + 'title' => "$Lang::tr{'email settings'}", + 'enabled' => 1, + }; $subsystem->{'30.ssh'} = { 'caption' => $Lang::tr{'ssh access'}, 'uri' => '/cgi-bin/remote.cgi', diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu index aaf1ad7..2f4d96e 100644 --- a/config/menu/40-services.menu +++ b/config/menu/40-services.menu @@ -20,11 +20,6 @@ 'title' => "$Lang::tr{'time server'}", 'enabled' => 1, }; - $subservices->{'41.dma'} = {'caption' => $Lang::tr{'email settings'}, - 'uri' => '/cgi-bin/mail.cgi', - 'title' => "$Lang::tr{'email settings'}", - 'enabled' => 1, - }; $subservices->{'50.qos'} = {'caption' => 'Quality of Service', 'uri' => '/cgi-bin/qos.cgi', 'title' => "Quality of Service", hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core94, updated. 374e636feeade7827e8bea834ee911d15530650f
by git＠ipfire.org 22 Oct '15

22 Oct '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 374e636feeade7827e8bea834ee911d15530650f
by git＠ipfire.org 22 Oct '15

22 Oct '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core94, updated. d7b82e7ccee811b6a451522734d10bd2b6c6628d
by git＠ipfire.org 22 Oct '15

22 Oct '15

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, core94 has been updated via d7b82e7ccee811b6a451522734d10bd2b6c6628d (commit) from 38b7997ffdb0b0257a6502e9e531874acd711539 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/update.sh | 5 ++++- lfs/openssh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index e6f9cf1..a9c24a5 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -47,7 +47,10 @@ telinit u # Update SSH configuration sed -i /etc/ssh/sshd_config \ - -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' + -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ # Move away old and unsupported keys mv -f /etc/ssh/ssh_host_dsa_key{,.old} diff --git a/lfs/openssh b/lfs/openssh index 22d1de5..1178d6f 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 # @@ -91,6 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 159c9eb9b1ac6144db50e4677132c51ddf2d8ceb
by git＠ipfire.org 22 Oct '15

22 Oct '15

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 159c9eb9b1ac6144db50e4677132c51ddf2d8ceb (commit) via d7b82e7ccee811b6a451522734d10bd2b6c6628d (commit) via 38b7997ffdb0b0257a6502e9e531874acd711539 (commit) via ee97ade8e40ece29913a2bd5af59cf94fe4941b1 (commit) via 13adb7aea82dca7002419517fea038d70f3defc0 (commit) from 4c5c4f3afcfe65c3bfc2d278304a35fd69965eae (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 159c9eb9b1ac6144db50e4677132c51ddf2d8ceb Merge: 4c5c4f3 d7b82e7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 22 13:11:17 2015 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/94/update.sh | 16 +++++++++++++++- lfs/openssh | 5 ++++- 2 files changed, 19 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/94/update.sh b/config/rootfiles/oldcore/94/update.sh index 6560662..a9c24a5 100644 --- a/config/rootfiles/oldcore/94/update.sh +++ b/config/rootfiles/oldcore/94/update.sh @@ -47,7 +47,10 @@ telinit u # Update SSH configuration sed -i /etc/ssh/sshd_config \ - -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' + -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ # Move away old and unsupported keys mv -f /etc/ssh/ssh_host_dsa_key{,.old} @@ -70,6 +73,17 @@ EOF fcrontab -z &>/dev/null +# DMA - reconfigure Postfix if exists +if [ -e /etc/postfix/main.cf ] && [ ! -e "/usr/sbin/sendmail.postfix" ]; then + mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix + /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 15 + sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' /opt/pakfire/db/rootfiles/postfix +fi +# DMA - configure dma as default mta +mkdir -p /etc/alternatives +mkdir -p /var/lib/alternatives +/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20 + # Start services /etc/init.d/dnsmasq start /etc/init.d/sshd start diff --git a/lfs/openssh b/lfs/openssh index 22d1de5..1178d6f 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 # @@ -91,6 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \ + -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \ /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM