X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsysklogd;h=eaf647059332d9f42608dc80fa723c2212318eb5;hb=3b521c724f09a45e09ac9228d8b65df0d8bd13a7;hp=9a4fda9daff8b93ec8dc380d1f78435fa1854d3e;hpb=4dbe43173110f92aea314fb49689ebf0850a5292;p=ipfire-2.x.git

diff --git a/lfs/sysklogd b/lfs/sysklogd
index 9a4fda9daf..eaf6470593 100644
--- a/lfs/sysklogd
+++ b/lfs/sysklogd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.4.1
+VER        = 1.5.1
 
 THISAPP    = sysklogd-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f587720988bc1670071f31d3694ca0fb
+$(DL_FILE)_MD5 = c70599ab0d037fde724f7210c2c8d7f8
 
 install : $(TARGET)
 
@@ -69,14 +69,15 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+	# Compile fix
+	cd $(DIR_APP) && sed -i "s/union wait/int/" syslogd.c
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	touch /var/log/{dhcpcd.log,messages,ovpnserver.log}
-	chmod 664 /var/log/{dhcpcd.log,messages,ovpnserver.log}
-	chown 0:105 /var/log/{dhcpcd.log,messages,ovpnserver.log}
+	touch /var/log/{dhcpcd.log,messages}
+	chmod 664 /var/log/{dhcpcd.log,messages}
+	chown 0:105 /var/log/{dhcpcd.log,messages}
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)