X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Felinks;h=7dd0333dc33ee8960c0ff6a2269cc308e5a06d7e;hb=2b51f53cfd32d6f24aba49c8fde822be8bee6d56;hp=2727423f0269a565d5ed7a2f0e993695740bcdd9;hpb=e97d4c98963477b5247005d33acd9d4b5fe1ca8e;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/elinks b/lfs/elinks
index 2727423f02..7dd0333dc3 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -32,9 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 5
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
@@ -78,6 +77,9 @@ dist:
 $(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/elinks-0.12pre6-openssl11.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/elinks-0.11.0-ssl-noegd.patch
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
@@ -85,5 +87,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -p /usr/local/etc/elinks
 	cp -vf $(DIR_SRC)/config/elinks/elinks.conf /usr/local/etc/elinks/elinks.conf
 
+	# Suppress first welcome dialog by creating bookmark
+	# and history files for root
+	mkdir -p /root/.elinks
+	touch /root/.elinks/bookmarks
+	touch /root/.elinks/globhist
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)