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

diff --git a/pkgs/openssl/openssl.nm b/pkgs/openssl/openssl.nm
index 7690d0fca7a98dc2314e3f0ba0ee6ee01455cf94..95c388ecc659fa509cfbe972a329c309c87ceafa 100644 (file)
--- 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 d82c7e98c8cb0d54922f92dcb3a94ca7a82f30a3..bb9dfa1e2eb3ff8fe850fe2f509e1b14ea6e0ecf 100644 (file)
--- 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 08cbc1eefd90c8c86aab61b46e788c15ab90cfb8..25cff9994957b4567b11ad9f428274174f6ac743 100644 (file)
--- 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