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 09da68fa7600118fc7f46a30689faa69afe1f177 (commit) via 7070545f8331fd3789bc3969ceb640e5c2030bed (commit) via d99fd620447c674b0eb791b4b359020841e69639 (commit) from e067b858d6948b9cd698804975842ef65e3b3218 (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 09da68fa7600118fc7f46a30689faa69afe1f177 Merge: 7070545 e067b85 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 7 13:43:46 2011 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 7070545f8331fd3789bc3969ceb640e5c2030bed Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 7 11:21:18 2011 +0200

radvd: Use network scripts to generate configuration file.

commit d99fd620447c674b0eb791b4b359020841e69639 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 18:00:25 2011 +0200

openssl: Remove some dead code.

-----------------------------------------------------------------------

Summary of changes: pkgs/openssl/openssl.nm | 11 +---------- pkgs/radvd/radvd.nm | 3 ++- pkgs/radvd/systemd/radvd.service | 2 ++ 3 files changed, 5 insertions(+), 11 deletions(-)

Difference in files: diff --git a/pkgs/openssl/openssl.nm b/pkgs/openssl/openssl.nm index 7690d0f..95c388e 100644 --- a/pkgs/openssl/openssl.nm +++ b/pkgs/openssl/openssl.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = openssl PKG_VER = 1.0.0d -PKG_REL = 2 +PKG_REL = 3

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = System/Libraries @@ -50,15 +50,6 @@ ifneq "$(MACHINE)" "i686" SSL_ARCH = no-asm 386 # 386 implies no-sse2 endif

-# These arches do support sse2. -#ifneq "$(TARGET)" "via-c7" -#ifneq "$(TARGET)" "atom" -#ifneq "$(TARGET)" "core2duo" -# SSL_ARCH += no-sse2 -#endif -#endif -#endif - define STAGE_PREPARE_CMDS cd $(DIR_APP) && find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} ; diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index d82c7e9..bb9dfa1 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = radvd PKG_VER = 1.8 -PKG_REL = 3 +PKG_REL = 4

PKG_MAINTAINER = PKG_GROUPS = System/Daemons @@ -35,6 +35,7 @@ PKG_LICENSE = BSD with advertising PKG_SUMMARY = A Router Advertisement daemon.

PKG_BUILD_DEPS+= flex flex-devel bison +PKG_DEPS += /lib/network/network-radvd-config

define PKG_DESCRIPTION radvd is the router advertisement daemon for IPv6. It listens to \ diff --git a/pkgs/radvd/systemd/radvd.service b/pkgs/radvd/systemd/radvd.service index 08cbc1e..25cff99 100644 --- a/pkgs/radvd/systemd/radvd.service +++ b/pkgs/radvd/systemd/radvd.service @@ -4,7 +4,9 @@ Requires=network.target After=network.target

[Service] +ExecStartPre=/lib/network/network-radvd-config start ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -u radvd +ExecStopPre=/lib/network/network-radvd-config stop ExecReload=/bin/kill -HUP $MAINPID Type=forking PIDFile=/run/radvd/radvd.pid

hooks/post-receive -- IPFire 3.x development tree