From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. b7d9509c3aebab95d559a3a7ad64f9d9655a3c07
Date: Sat, 04 Jan 2014 17:40:41 +0100 [thread overview]
Message-ID: <20140104164041.D548021E2F@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3185 bytes --]
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, fifteen has been updated
via b7d9509c3aebab95d559a3a7ad64f9d9655a3c07 (commit)
via 1dbe439b83315f413c94f7c1726cdd44d7f2f838 (commit)
from 33a1b286084cf0745aced5f17c86e39b41859c40 (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 b7d9509c3aebab95d559a3a7ad64f9d9655a3c07
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 4 17:20:15 2014 +0100
openvpn: Use AES-256-CBC as default cipher.
Applies to new installations, only.
commit 1dbe439b83315f413c94f7c1726cdd44d7f2f838
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 4 16:21:56 2014 +0100
toolchain: Fix compiling due to Stack Protector changes.
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/ovpnmain.cgi | 2 +-
lfs/gcc | 3 +++
lfs/glibc | 13 +++++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 81a7450..dac3e2e 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -4534,7 +4534,7 @@ END
#default setzen
if ($cgiparams{'DCIPHER'} eq '') {
- $cgiparams{'DCIPHER'} = 'BF-CBC';
+ $cgiparams{'DCIPHER'} = 'AES-256-CBC';
}
if ($cgiparams{'DDEST_PORT'} eq '') {
$cgiparams{'DDEST_PORT'} = '1194';
diff --git a/lfs/gcc b/lfs/gcc
index a9f124b..0264d37 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -97,6 +97,9 @@ else
EXTRA_MAKE =
EXTRA_INSTALL =
endif
+
+ # Disable stack protection in toolchain.
+ CFLAGS += -fno-stack-protector
endif
ifeq "$(MACHINE_TYPE)" "arm"
diff --git a/lfs/glibc b/lfs/glibc
index 9acbb11..b09fcd6 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -281,8 +281,21 @@ endif
cd $(DIR_SRC)/glibc-build && \
CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
$(DIR_APP)/configure $(EXTRA_CONFIG)
+
+ sed -i $(DIR_SRC)/glibc-build/config.make \
+ -e "s/^build-pic-default=.*/build-pic-default=yes/"
+
+ # Build the glibc libraries without stack protection (as this is not supported)
+ echo "build-programs=no" >> $(DIR_SRC)/glibc-build/configparms
+ cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
+ CFLAGS="$(CFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE" \
+ CXXFLAGS="$(CXXFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE"
+
+ # Build the programs with hardening
+ : > $(DIR_SRC)/glibc-build/configparms
cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+
cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
ifeq "$(ROOT)" ""
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-01-04 16:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140104164041.D548021E2F@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox