Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / lfs / freeradius

diff --git a/lfs/freeradius b/lfs/freeradius
index 604116f6c8d69e940f5134b5626a128f379c66ff..1417f422d644e78147071ec0d4ce75d7e8245c27 100644 (file)
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 3.0.18
+VER        = 3.0.19
 
 THISAPP    = freeradius-server-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freeradius
-PAK_VER    = 5
+PAK_VER    = 10
 
 DEPS       = "samba"
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 05f0c8c7ac79659f808ff31751daa857
+$(DL_FILE)_MD5 = 3e4048353931eda01f03ef89039f0651
 
 install : $(TARGET)
 
@@ -80,7 +80,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/freeradius-no-buildtime-cert-gen.patch
        $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && \
                ./configure \
@@ -92,6 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --with-threads \
                        --with-thread-pool \
                        --disable-ltdl-install \
+                       --disable-openssl-version-check \
                        --without-rlm_eap_ikev2 \
                        --without-rlm_sql_iodbc \
                        --without-rlm_sql_firebird \
@@ -139,6 +141,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/backup/includes/freeradius \
                /var/ipfire/backup/addons/includes/freeradius
 
+       # Logrotate
+       -mkdir -pv /etc/logrotate.d
+       install -v -m 644 $(DIR_SRC)/config/freeradius/logrotate \
+               /etc/logrotate.d/freeradius
+
        #install initscripts
        $(call INSTALL_INITSCRIPT,freeradius)