Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next

This commit is contained in:
Michael Tremer
2013-07-16 22:00:14 +02:00
5 changed files with 37 additions and 9 deletions

View File

@@ -80,7 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make install
install -v -m 755 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
chown -v root:nobody /etc/squidclamav.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav
chmod 755 /srv/web/ipfire/html/clwarn.cgi
@rm -rf $(DIR_APP)

View File

@@ -85,7 +85,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--sysconfdir="/etc" \
--enable-curl \
--enable-openssl \
--enable-xauth-eap \
--enable-eap-radius \
--enable-eap-tls \
--enable-eap-ttls \
--enable-eap-peap \
--enable-eap-mschapv2 \
--enable-eap-identity \
$(PADLOCK)
cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"