X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fnetpbm;h=e22e0fbc8743c3ba9023efe2c8e8417237c0c743;hp=5af5e47c718b8f672477d792b614bb7f99871dee;hb=82b405615f47bb1dc34f4a3b488cb282058e9be3;hpb=fc992179a15a53c920d8f18e276624c0ace6a6ec

diff --git a/lfs/netpbm b/lfs/netpbm
index 5af5e47c71..e22e0fbc87 100644
--- a/lfs/netpbm
+++ b/lfs/netpbm
@@ -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,7 +24,7 @@
 
 include Config
 
-VER        = 10.26.46
+VER        = 10.47.61
 
 THISAPP    = netpbm-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -32,10 +32,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netpbm
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
+CFLAGS    += -flax-vector-conversions
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 37a071debfce1dd9596267448f4b56c8
+$(DL_FILE)_MD5 = a5d2ec8acc99f60e5b92a720ed292c3e
 
 install : $(TARGET)
 
@@ -77,10 +79,17 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/converter && patch -Np1 < $(DIR_SRC)/src/patches/netpbm-10.26.46-getline.patch
-	cp $(DIR_SRC)/config/netpbm/Makefile.config $(DIR_APP)
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make package PKGDIR=/usr/local/netpbm
-	cp /usr/local/netpbm/lib/lib* /usr/lib
+	rm -rf /usr/netpbm
+	cp $(DIR_SRC)/config/netpbm/config.mk $(DIR_APP)
+	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)"
+	cd $(DIR_APP) && make package PKGDIR=/usr/netpbm
+	mkdir -pv /usr/include/netpbm 
+	mkdir -pv /usr/share/netpbm
+	mv -fv /usr/netpbm/include/netpbm/* /usr/include/netpbm
+	mv -fv /usr/netpbm/lib/* /usr/lib
+	mv -fv /usr/netpbm/bin/* /usr/bin
+	mv -fv /usr/netpbm/misc/* /usr/share/netpbm
+	rm -Rfv /usr/netpbm/
+	cd /usr/lib && ln -sfv libnetpbm.so.10.47 libnetpbm.so
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)