X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fslang;h=542d32ff100aa07f34ae22b0ad724b675e7ee1e0;hp=7aad756417c0504e1b556ff4b6c22d7c6f0e82d4;hb=6af867f6bbef7670eb7014a1c1643dbcb63c2f48;hpb=d50b88e8bbf85993091707571aa243eac16525e4

diff --git a/lfs/slang b/lfs/slang
index 7aad756417..542d32ff10 100644
--- a/lfs/slang
+++ b/lfs/slang
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.6
+VER        = 1.4.9
 
 THISAPP    = slang-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = efb055000636f312d5c3de56f3c70d12
+$(DL_FILE)_MD5 = 4fbb1a7f1257e065ca830deefe13d350
 
 install : $(TARGET)
 
@@ -76,17 +74,24 @@ $(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/slang-debian-utf8.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-utf8-acs.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.5-utf8-segv.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-utf8-fix.patch
 ifeq "$(LFS_PASS)" "install"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.9-uclibc.patch
 	cd $(DIR_APP) && ./configure --prefix=""
-	cd $(DIR_APP) && make $(MAKETUNING) elf
-	cd $(DIR_APP)/src && make install-elf DESTDIR="/opt/$(MACHINE)-uClibc"
-	rm -vf /opt/$(MACHINE)-uClibc/lib/libslang.so*
+	cd $(DIR_APP)/src && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
+	ln -sf libslang-utf8.a /opt/$(MACHINE)-uClibc/lib/libslang.a
 else
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make elf $(MAKETUNING)
+	perl -p -i -e 's/(ELF_CFLAGS=\"[^\"]*)-O2([^\"]*\".*)/$1'"$(CFLAGS)"' $2/gs' configure
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make elf all
 	cd $(DIR_APP) && make install-elf
-	cd $(DIR_APP) && chmod -v 755 /usr/lib/libslang.so.2.0.6
+	ln -sf libslang-utf8.so.1.4.9 /usr/lib/libslang-utf8.so.1
+	ln -sf libslang-utf8.so /usr/lib/libslang.so
+	ln -sf libslang-utf8.a /usr/lib/libslang.a
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)