Quellenupdate:

* tcpdump/glibc/wget/libpng/vlan/expect/vim Programmupdate: * libpng 1.2.8 --> 1.2.12 * dnsmasq 2.22 --> 2.33 Geandert: * Packager fuer Pakfire angepasst. (Namen mit Unterstrich) * Squid mit 2 Patches versehen. * Konsolentyp: xterm-color Hinzugefuegt: * Subversion 1.3.1 * IPTraf 3.0.0 git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@250 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-08-19 11:04:41 +00:00
parent 97520ed5c2
commit 7a98bae5d3
24 changed files with 693 additions and 148 deletions
--- a/config/etc/profile
+++ b/config/etc/profile
@@ -45,5 +45,4 @@ PS1='\[\033[1;33m\]\u\[\033[1;37m\]@\[\033[1;32m\]\h\[\033[1;37m\]:\[\033[1;31m\
 echo -n -e '\033%G'

 export LANG PS1
-# Enable colors for applications like mc....
-export TERM=linux
+export TERM=xterm-color
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -63,7 +63,7 @@
  * dhcp-3.0.2
  * dhcpcd-1.3.22-pl4
  * diffutils-2.8.1
-  * dnsmasq-2.22
+  * dnsmasq-2.33
  * dosfstools-2.11
  * e2fsprogs-1.35
  * eagle-usb-2.3.2
@@ -112,13 +112,12 @@
  * inetutils-1.4.2
  * ipac-ng-1.31
  * ipaddr-1.2
-  * ipfire-logs-2006-08-14-15:42.tgz
-  * ipfire-logs-2006-08-14-19:12.tgz
-  * ipfire-logs-2006-08-14-19:15.tgz
-  * ipfire-logs-2006-08-14-19:21.tgz
-  * ipfire-logs-2006-08-14-20:21.tgz
+  * ipfire-logs-2006-08-18-15:38.tgz
+  * ipfire-logs-2006-08-18-15:42.tgz
+  * ipfire-logs-2006-08-18-23:26.tgz
  * iproute2-2.4.7-now-ss010824
  * iptables-1.3.5
+  * iptraf-3.0.0
  * iptstate-1.4
  * iputils-ss020927
  * isapnptools-1.26
@@ -135,6 +134,7 @@
  * libnet-1.1.2.1
  * libogg-1.1.3
  * libpcap-0.8.3
+  * libpng-1.2.12
  * libpng-1.2.8
  * libpri-1.2.3
  * libsafe_2.0-16
@@ -216,10 +216,12 @@
  * spandsp-0.0.2pre25
  * speedtouch-1.2
  * squid-2.5.STABLE14
+  * squid-2.5.STABLE14_fix
  * squid-graph-3.1
  * squidGuard-1.2.0
  * startscripts
  * stund_0.96_Aug13
+  * subversion-1.3.1
  * sudo-1.6.8p12
  * sysklogd-1.4.1
  * syslinux-2.11
@@ -242,5 +244,4 @@
  * xinetd-2.3.14
  * xmbmon205
  * zaptel-1.2.7
-  * zaptel-1.2.7_fix
  * zlib-1.2.3
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -26,7 +26,7 @@

 include Config

-VER        = 2.22
+VER        = 2.33

 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = b38f33cd0703fa664a37a4595d918189
+$(DL_FILE)_MD5 = 45696461b6e6bc929273b1191ca50447

 install : $(TARGET)

@@ -72,13 +72,10 @@ $(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) && sed -i \
-	    -e 's%^BINDIR.*$$%BINDIR = /usr/sbin%' \
-	    -e 's%^MANDIR.*$$%MANDIR = /usr/share/man%' Makefile
-	cd $(DIR_APP) && sed -i \
-	    -e 's/linux\/netlink.h/linux\/types.h/' src/netlink.c
-	cd $(DIR_APP)/src && sed -i 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
+	cd $(DIR_APP)/src && sed -i \
+		-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
+		-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
 	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && PREFIX=/usr make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/expect
+++ b/lfs/expect
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: expect,v 1.3.2.5 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 5.41.0

 THISAPP    = expect-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://expect.nist.gov/old
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/expect-5.41
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools

--- a/lfs/glibc
+++ b/lfs/glibc
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: glibc,v 1.17.2.12 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 2.3.3

 THISAPP    = glibc-$(VER)-lfs-5.1
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_LFS_FTP)
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
--- a/lfs/iptraf
+++ b/lfs/iptraf
@@ -0,0 +1,82 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.0.0
+
+THISAPP    = iptraf-$(VER)
+DL_FILE    = $(THISAPP).bin.i386.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = iptraf
+PAK_VER    = ipfire-beta1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 0b022f233731ca09a7c16d659c769dad
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP).bin.i386/src && yes 'n' | make install TARGET=/usr/bin
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/libpng
+++ b/lfs/libpng
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: libpng,v 1.3.2.4 2005/02/27 15:23:03 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,11 +26,11 @@

 include Config

-VER        = 1.2.8
+VER        = 1.2.12

 THISAPP    = libpng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/libpng
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -48,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = cac1512878fb98f2456df6dc50bc9bc7
+$(DL_FILE)_MD5 = e82f39e46aac34a1ca559c79322979be

 install : $(TARGET)

@@ -78,12 +72,8 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/libpng-1.2.8-link_to_proper_libs-1.patch
-	cd $(DIR_APP) && sed \
-	    -e 's%^prefix.*$$%prefix=/usr%' \
-	    -e 's%^ZLIBLIB.*$$%ZLIBLIB=/usr/lib%' \
-	    -e 's%^ZLIBINC.*$$%ZLIBINC=/usr/include%' \
-	    -e 's%-O3%$(CFLAGS)%' scripts/makefile.linux > makefile
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpng-1.2.12-no-asm.patch
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static --without-libpng-compat
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
--- a/lfs/squid
+++ b/lfs/squid
@@ -38,11 +38,17 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+	$(THISAPP)-httpReplyDestroy.patch \
+	$(THISAPP)-hierarchy_tag.patch

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(THISAPP)-httpReplyDestroy.patch = $(URL_IPFIRE)/$(THISAPP)-httpReplyDestroy.patch
+$(THISAPP)-hierarchy_tag.patch = $(URL_IPFIRE)/$(THISAPP)-hierarchy_tag.patch

 $(DL_FILE)_MD5 = f413e0b887a5f9b2a75350243ed5564c
+$(THISAPP)-httpReplyDestroy.patch_MD5 = 1529f8b0170e24b26353578778435bd4
+$(THISAPP)-hierarchy_tag.patch_MD5 = 9abe563ca3d01dc58502737edc6f3c60

 install : $(TARGET)

@@ -73,6 +79,8 @@ $(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_DL)/$(THISAPP)-httpReplyDestroy.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-hierarchy_tag.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	   --datadir=/usr/lib/squid \
 	   --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
--- a/lfs/subversion
+++ b/lfs/subversion
@@ -0,0 +1,86 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.3.1
+
+THISAPP    = subversion-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = subversion
+PAK_VER    = ipfire-beta1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 07b95963968ae345541ca99d0e7bf082
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+				--without-berkeley-db \
+				--with-installbuilddir=/usr/lib/apr-0
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: tcpdump,v 1.5.2.7 2005/10/22 10:19:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 3.8.3

 THISAPP    = tcpdump-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.tcpdump.org/release
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

--- a/lfs/vim
+++ b/lfs/vim
@@ -36,7 +36,7 @@ VER        = 6.3

 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.vim.org/pub/vim/unix
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/vim63
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -48,7 +48,7 @@ objects = $(DL_FILE) \
 	vim-6.3-security_fix-1.patch

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-vim-6.3-security_fix-1.patch = $(URL_LFS)/vim/vim-6.3-security_fix-1.patch
+vim-6.3-security_fix-1.patch = $(URL_IPFIRE)/vim-6.3-security_fix-1.patch

 $(DL_FILE)_MD5 = 821fda8f14d674346b87e3ef9cb96389
 vim-6.3-security_fix-1.patch_MD5 = ef9a421f1d29993ce5bbd709cece4624
--- a/lfs/vlan
+++ b/lfs/vlan
@@ -18,11 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-#     2005-jul  Gilles Espinasse                                              #
-#                                                                             #
-# $Id: vlan,v 1.1.2.3 2006/01/15 08:55:50 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -35,8 +30,7 @@ VER        = 1.9

 THISAPP    = vlan.$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-#DL_FROM    = http://www.candelatech.com/~greear/vlan
-DL_FROM    = http://fresh.t-systems-sfr.com/linux/src
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/vlan
 TARGET     = $(DIR_INFO)/$(THISAPP)

--- a/lfs/wget
+++ b/lfs/wget
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.10.2

 THISAPP    = wget-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://ftp.gnu.org/pub/gnu/wget
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

@@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

 md5 : $(subst %,%_MD5,$(objects))

-dist: 
-	make-packages.sh postfix $(THISAPP)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -85,4 +76,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
+	@$(POSTBUILD)
--- a/make.sh
+++ b/make.sh
@@ -758,6 +758,8 @@ buildipcop() {
  ipcopmake etherwake
  ipcopmake ethereal
  ipcopmake tftp-hpa
+  ipcopmake subversion
+  ipcopmake iptraf
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }

@@ -877,6 +879,7 @@ ipfirepackages() {
  ipfiredist cyrusimap
  ipfiredist fetchmail
  ipfiredist gnump3d
+  ipfiredist iptraf
  ipfiredist java
  ipfiredist lame
  ipfiredist libogg
@@ -894,6 +897,7 @@ ipfirepackages() {
  ipfiredist samba
  ipfiredist sox
  ipfiredist spamassassin
+  ipfiredist subversion
  ipfiredist web-cyradm
  ipfiredist xampp
 #  ipfiredist xinetd
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -19599,7 +19599,7 @@ usr/lib/libpcap.so.0
 usr/lib/libpcap.so.0.8
 #usr/share/man/man3/pcap.3
 ##
-## libpng-1.2.8
+## libpng-1.2.12
 ##
 #usr/bin/libpng-config
 #usr/bin/libpng12-config
@@ -19610,12 +19610,15 @@ usr/lib/libpcap.so.0.8
 #usr/include/png.h
 #usr/include/pngconf.h
 #usr/lib/libpng.a
+#usr/lib/libpng.la
+#usr/lib/libpng12.la
 usr/lib/libpng.so
 usr/lib/libpng.so.3
 usr/lib/libpng.so.3.1.2.8
 #usr/lib/libpng12.a
 #usr/lib/libpng12.so
 #usr/lib/libpng12.so.0
+#usr/lib/libpng12.so.0.12.0
 #usr/lib/libpng12.so.0.1.2.8
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/libpng.pc
@@ -24714,19 +24717,6 @@ usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Net/SSLeay/want_write.al
 ##
 sbin/vconfig
 ##
-## PARPORT & PRINTER modules
-##
-lib/modules/2.4.33/kernel/drivers/char/lp.o.gz
-lib/modules/2.4.33/kernel/drivers/char/parport_serial.o.gz
-lib/modules/2.4.33/kernel/drivers/char/ppdev.o.gz
-lib/modules/2.4.33/kernel/drivers/char/tipar.o.gz
-lib/modules/2.4.33/kernel/drivers/parport
-lib/modules/2.4.33/kernel/drivers/parport/parport.o.gz
-lib/modules/2.4.33/kernel/drivers/parport/parport_pc.o.gz
-lib/modules/2.4.33/kernel/drivers/scsi/imm.o.gz
-lib/modules/2.4.33/kernel/drivers/scsi/ppa.o.gz
-lib/modules/2.4.33/kernel/drivers/usb/printer.o.gz
-##
 ## LINUX-PAM ++ pam_mysql
 ##
 #etc/security
--- a/src/paks/iptraf/ROOTFILES
+++ b/src/paks/iptraf/ROOTFILES
@@ -0,0 +1,2 @@
+usr/bin/iptraf
+usr/bin/rvnamed
--- a/src/paks/iptraf/install.sh
+++ b/src/paks/iptraf/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Extract the files
+tar xfz files.tgz -C /
+cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2
--- a/src/paks/iptraf/uninstall.sh
+++ b/src/paks/iptraf/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Delete the files
+## Befehl fehlt noch
+rm -f /opt/pakfire/installed/ROOTFILES.$2
--- a/src/paks/subversion/ROOTFILES
+++ b/src/paks/subversion/ROOTFILES
@@ -0,0 +1,373 @@
+usr/bin/apr-config
+usr/bin/apu-config
+usr/bin/neon-config
+usr/bin/svn
+usr/bin/svnadmin
+usr/bin/svndumpfilter
+usr/bin/svnlook
+#usr/bin/svnserve
+usr/bin/svnversion
+#usr/include/apr-0
+#usr/include/apr-0/apr.h
+#usr/include/apr-0/apr_allocator.h
+#usr/include/apr-0/apr_anylock.h
+#usr/include/apr-0/apr_atomic.h
+#usr/include/apr-0/apr_base64.h
+#usr/include/apr-0/apr_buckets.h
+#usr/include/apr-0/apr_compat.h
+#usr/include/apr-0/apr_date.h
+#usr/include/apr-0/apr_dbm.h
+#usr/include/apr-0/apr_dso.h
+#usr/include/apr-0/apr_env.h
+#usr/include/apr-0/apr_errno.h
+#usr/include/apr-0/apr_file_info.h
+#usr/include/apr-0/apr_file_io.h
+#usr/include/apr-0/apr_fnmatch.h
+#usr/include/apr-0/apr_general.h
+#usr/include/apr-0/apr_getopt.h
+#usr/include/apr-0/apr_global_mutex.h
+#usr/include/apr-0/apr_hash.h
+#usr/include/apr-0/apr_hooks.h
+#usr/include/apr-0/apr_inherit.h
+#usr/include/apr-0/apr_ldap.h
+#usr/include/apr-0/apr_ldap_url.h
+#usr/include/apr-0/apr_lib.h
+#usr/include/apr-0/apr_md4.h
+#usr/include/apr-0/apr_md5.h
+#usr/include/apr-0/apr_mmap.h
+#usr/include/apr-0/apr_network_io.h
+#usr/include/apr-0/apr_optional.h
+#usr/include/apr-0/apr_optional_hooks.h
+#usr/include/apr-0/apr_poll.h
+#usr/include/apr-0/apr_pools.h
+#usr/include/apr-0/apr_portable.h
+#usr/include/apr-0/apr_proc_mutex.h
+#usr/include/apr-0/apr_queue.h
+#usr/include/apr-0/apr_reslist.h
+#usr/include/apr-0/apr_ring.h
+#usr/include/apr-0/apr_rmm.h
+#usr/include/apr-0/apr_sdbm.h
+#usr/include/apr-0/apr_sha1.h
+#usr/include/apr-0/apr_shm.h
+#usr/include/apr-0/apr_signal.h
+#usr/include/apr-0/apr_strings.h
+#usr/include/apr-0/apr_strmatch.h
+#usr/include/apr-0/apr_support.h
+#usr/include/apr-0/apr_tables.h
+#usr/include/apr-0/apr_thread_cond.h
+#usr/include/apr-0/apr_thread_mutex.h
+#usr/include/apr-0/apr_thread_proc.h
+#usr/include/apr-0/apr_thread_rwlock.h
+#usr/include/apr-0/apr_time.h
+#usr/include/apr-0/apr_uri.h
+#usr/include/apr-0/apr_user.h
+#usr/include/apr-0/apr_uuid.h
+#usr/include/apr-0/apr_version.h
+#usr/include/apr-0/apr_want.h
+#usr/include/apr-0/apr_xlate.h
+#usr/include/apr-0/apr_xml.h
+#usr/include/apr-0/apu.h
+#usr/include/apr-0/apu_compat.h
+#usr/include/apr-0/apu_version.h
+#usr/include/apr-0/apu_want.h
+#usr/include/neon
+#usr/include/neon/ne_207.h
+#usr/include/neon/ne_acl.h
+#usr/include/neon/ne_alloc.h
+#usr/include/neon/ne_auth.h
+#usr/include/neon/ne_basic.h
+#usr/include/neon/ne_compress.h
+#usr/include/neon/ne_dates.h
+#usr/include/neon/ne_defs.h
+#usr/include/neon/ne_i18n.h
+#usr/include/neon/ne_locks.h
+#usr/include/neon/ne_md5.h
+#usr/include/neon/ne_props.h
+#usr/include/neon/ne_redirect.h
+#usr/include/neon/ne_request.h
+#usr/include/neon/ne_session.h
+#usr/include/neon/ne_socket.h
+#usr/include/neon/ne_ssl.h
+#usr/include/neon/ne_string.h
+#usr/include/neon/ne_uri.h
+#usr/include/neon/ne_utils.h
+#usr/include/neon/ne_xml.h
+#usr/include/neon/ne_xmlreq.h
+#usr/include/subversion-1
+#usr/include/subversion-1/mod_dav_svn.h
+#usr/include/subversion-1/svn-revision.txt
+#usr/include/subversion-1/svn_auth.h
+#usr/include/subversion-1/svn_base64.h
+#usr/include/subversion-1/svn_client.h
+#usr/include/subversion-1/svn_cmdline.h
+#usr/include/subversion-1/svn_config.h
+#usr/include/subversion-1/svn_ctype.h
+#usr/include/subversion-1/svn_dav.h
+#usr/include/subversion-1/svn_delta.h
+#usr/include/subversion-1/svn_diff.h
+#usr/include/subversion-1/svn_error.h
+#usr/include/subversion-1/svn_error_codes.h
+#usr/include/subversion-1/svn_fs.h
+#usr/include/subversion-1/svn_hash.h
+#usr/include/subversion-1/svn_io.h
+#usr/include/subversion-1/svn_md5.h
+#usr/include/subversion-1/svn_nls.h
+#usr/include/subversion-1/svn_opt.h
+#usr/include/subversion-1/svn_path.h
+#usr/include/subversion-1/svn_pools.h
+#usr/include/subversion-1/svn_props.h
+#usr/include/subversion-1/svn_quoprint.h
+#usr/include/subversion-1/svn_ra.h
+#usr/include/subversion-1/svn_ra_svn.h
+#usr/include/subversion-1/svn_repos.h
+#usr/include/subversion-1/svn_sorts.h
+#usr/include/subversion-1/svn_string.h
+#usr/include/subversion-1/svn_subst.h
+#usr/include/subversion-1/svn_time.h
+#usr/include/subversion-1/svn_types.h
+#usr/include/subversion-1/svn_utf.h
+#usr/include/subversion-1/svn_version.h
+#usr/include/subversion-1/svn_wc.h
+#usr/include/subversion-1/svn_xml.h
+#usr/lib/apr-0
+#usr/lib/apr-0/apr_rules.mk
+#usr/lib/apr-0/libtool
+#usr/lib/apr.exp
+#usr/lib/aprutil.exp
+#usr/lib/libapr-0.a
+#usr/lib/libapr-0.la
+usr/lib/libapr-0.so
+usr/lib/libapr-0.so.0
+usr/lib/libapr-0.so.0.9.7
+#usr/lib/libaprutil-0.a
+#usr/lib/libaprutil-0.la
+usr/lib/libaprutil-0.so
+usr/lib/libaprutil-0.so.0
+usr/lib/libaprutil-0.so.0.9.7
+#usr/lib/libneon.a
+#usr/lib/libneon.la
+usr/lib/libneon.so
+usr/lib/libneon.so.25
+usr/lib/libneon.so.25.0.5
+#usr/lib/libsvn_client-1.a
+#usr/lib/libsvn_client-1.la
+usr/lib/libsvn_client-1.so
+usr/lib/libsvn_client-1.so.0
+usr/lib/libsvn_client-1.so.0.0.0
+#usr/lib/libsvn_delta-1.a
+#usr/lib/libsvn_delta-1.la
+usr/lib/libsvn_delta-1.so
+usr/lib/libsvn_delta-1.so.0
+usr/lib/libsvn_delta-1.so.0.0.0
+#usr/lib/libsvn_diff-1.a
+#usr/lib/libsvn_diff-1.la
+usr/lib/libsvn_diff-1.so
+usr/lib/libsvn_diff-1.so.0
+usr/lib/libsvn_diff-1.so.0.0.0
+#usr/lib/libsvn_fs-1.a
+#usr/lib/libsvn_fs-1.la
+usr/lib/libsvn_fs-1.so
+usr/lib/libsvn_fs-1.so.0
+usr/lib/libsvn_fs-1.so.0.0.0
+#usr/lib/libsvn_fs_fs-1.a
+#usr/lib/libsvn_fs_fs-1.la
+usr/lib/libsvn_fs_fs-1.so
+usr/lib/libsvn_fs_fs-1.so.0
+usr/lib/libsvn_fs_fs-1.so.0.0.0
+#usr/lib/libsvn_ra-1.a
+#usr/lib/libsvn_ra-1.la
+usr/lib/libsvn_ra-1.so
+usr/lib/libsvn_ra-1.so.0
+usr/lib/libsvn_ra-1.so.0.0.0
+#usr/lib/libsvn_ra_dav-1.a
+#usr/lib/libsvn_ra_dav-1.la
+usr/lib/libsvn_ra_dav-1.so
+usr/lib/libsvn_ra_dav-1.so.0
+usr/lib/libsvn_ra_dav-1.so.0.0.0
+#usr/lib/libsvn_ra_local-1.a
+#usr/lib/libsvn_ra_local-1.la
+usr/lib/libsvn_ra_local-1.so
+usr/lib/libsvn_ra_local-1.so.0
+usr/lib/libsvn_ra_local-1.so.0.0.0
+#usr/lib/libsvn_ra_svn-1.a
+#usr/lib/libsvn_ra_svn-1.la
+usr/lib/libsvn_ra_svn-1.so
+usr/lib/libsvn_ra_svn-1.so.0
+usr/lib/libsvn_ra_svn-1.so.0.0.0
+#usr/lib/libsvn_repos-1.a
+#usr/lib/libsvn_repos-1.la
+usr/lib/libsvn_repos-1.so
+usr/lib/libsvn_repos-1.so.0
+usr/lib/libsvn_repos-1.so.0.0.0
+#usr/lib/libsvn_subr-1.a
+#usr/lib/libsvn_subr-1.la
+usr/lib/libsvn_subr-1.so
+usr/lib/libsvn_subr-1.so.0
+usr/lib/libsvn_subr-1.so.0.0.0
+#usr/lib/libsvn_wc-1.a
+#usr/lib/libsvn_wc-1.la
+usr/lib/libsvn_wc-1.so
+usr/lib/libsvn_wc-1.so.0
+usr/lib/libsvn_wc-1.so.0.0.0
+#usr/lib/pkgconfig/neon.pc
+#usr/share/doc/neon-0.25.5
+#usr/share/doc/neon-0.25.5/html
+#usr/share/doc/neon-0.25.5/html/apas01.html
+#usr/share/doc/neon-0.25.5/html/apas02.html
+#usr/share/doc/neon-0.25.5/html/apas03.html
+#usr/share/doc/neon-0.25.5/html/apas04.html
+#usr/share/doc/neon-0.25.5/html/apas05.html
+#usr/share/doc/neon-0.25.5/html/apas06.html
+#usr/share/doc/neon-0.25.5/html/apas07.html
+#usr/share/doc/neon-0.25.5/html/apas08.html
+#usr/share/doc/neon-0.25.5/html/apas09.html
+#usr/share/doc/neon-0.25.5/html/apas10.html
+#usr/share/doc/neon-0.25.5/html/apas11.html
+#usr/share/doc/neon-0.25.5/html/apas12.html
+#usr/share/doc/neon-0.25.5/html/api.html
+#usr/share/doc/neon-0.25.5/html/biblio.html
+#usr/share/doc/neon-0.25.5/html/compliance.html
+#usr/share/doc/neon-0.25.5/html/features.html
+#usr/share/doc/neon-0.25.5/html/gfdl.html
+#usr/share/doc/neon-0.25.5/html/index.html
+#usr/share/doc/neon-0.25.5/html/intro.html
+#usr/share/doc/neon-0.25.5/html/ref.html
+#usr/share/doc/neon-0.25.5/html/refalloc.html
+#usr/share/doc/neon-0.25.5/html/refauth.html
+#usr/share/doc/neon-0.25.5/html/refbuf.html
+#usr/share/doc/neon-0.25.5/html/refbufapp.html
+#usr/share/doc/neon-0.25.5/html/refbufcr.html
+#usr/share/doc/neon-0.25.5/html/refbufdest.html
+#usr/share/doc/neon-0.25.5/html/refbufutil.html
+#usr/share/doc/neon-0.25.5/html/refcert.html
+#usr/share/doc/neon-0.25.5/html/refclicert.html
+#usr/share/doc/neon-0.25.5/html/refconfig.html
+#usr/share/doc/neon-0.25.5/html/referr.html
+#usr/share/doc/neon-0.25.5/html/refgetst.html
+#usr/share/doc/neon-0.25.5/html/refiaddr.html
+#usr/share/doc/neon-0.25.5/html/refneon.html
+#usr/share/doc/neon-0.25.5/html/refopts.html
+#usr/share/doc/neon-0.25.5/html/refreq.html
+#usr/share/doc/neon-0.25.5/html/refreqbody.html
+#usr/share/doc/neon-0.25.5/html/refreqhdr.html
+#usr/share/doc/neon-0.25.5/html/refreqopts.html
+#usr/share/doc/neon-0.25.5/html/refresolve.html
+#usr/share/doc/neon-0.25.5/html/refresphdr.html
+#usr/share/doc/neon-0.25.5/html/refsess.html
+#usr/share/doc/neon-0.25.5/html/refshave.html
+#usr/share/doc/neon-0.25.5/html/refsockinit.html
+#usr/share/doc/neon-0.25.5/html/refsslca.html
+#usr/share/doc/neon-0.25.5/html/refsslcert2.html
+#usr/share/doc/neon-0.25.5/html/refsslcertio.html
+#usr/share/doc/neon-0.25.5/html/refssldname.html
+#usr/share/doc/neon-0.25.5/html/refsslvfy.html
+#usr/share/doc/neon-0.25.5/html/refstatus.html
+#usr/share/doc/neon-0.25.5/html/reftok.html
+#usr/share/doc/neon-0.25.5/html/refvers.html
+#usr/share/doc/neon-0.25.5/html/refxml.html
+#usr/share/doc/neon-0.25.5/html/using.html
+#usr/share/doc/neon-0.25.5/html/xml.html
+#usr/share/locale/de/LC_MESSAGES/subversion.mo
+#usr/share/locale/es/LC_MESSAGES/subversion.mo
+#usr/share/locale/fr/LC_MESSAGES/subversion.mo
+#usr/share/locale/it/LC_MESSAGES/subversion.mo
+#usr/share/locale/ja/LC_MESSAGES/subversion.mo
+#usr/share/locale/ko/LC_MESSAGES/subversion.mo
+#usr/share/locale/nb/LC_MESSAGES/subversion.mo
+#usr/share/locale/pl/LC_MESSAGES/subversion.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/subversion.mo
+#usr/share/locale/sv/LC_MESSAGES/subversion.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/subversion.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/subversion.mo
+#usr/share/man/man1/neon-config.1
+#usr/share/man/man1/svn.1
+#usr/share/man/man1/svnadmin.1
+#usr/share/man/man1/svndumpfilter.1
+#usr/share/man/man1/svnlook.1
+#usr/share/man/man1/svnversion.1
+#usr/share/man/man3/ne_add_request_header.3
+#usr/share/man/man3/ne_addr_destroy.3
+#usr/share/man/man3/ne_addr_error.3
+#usr/share/man/man3/ne_addr_first.3
+#usr/share/man/man3/ne_addr_next.3
+#usr/share/man/man3/ne_addr_resolve.3
+#usr/share/man/man3/ne_addr_result.3
+#usr/share/man/man3/ne_buffer.3
+#usr/share/man/man3/ne_buffer_altered.3
+#usr/share/man/man3/ne_buffer_append.3
+#usr/share/man/man3/ne_buffer_clear.3
+#usr/share/man/man3/ne_buffer_concat.3
+#usr/share/man/man3/ne_buffer_create.3
+#usr/share/man/man3/ne_buffer_destroy.3
+#usr/share/man/man3/ne_buffer_finish.3
+#usr/share/man/man3/ne_buffer_grow.3
+#usr/share/man/man3/ne_buffer_ncreate.3
+#usr/share/man/man3/ne_buffer_zappend.3
+#usr/share/man/man3/ne_calloc.3
+#usr/share/man/man3/ne_close_connection.3
+#usr/share/man/man3/ne_forget_auth.3
+#usr/share/man/man3/ne_get_error.3
+#usr/share/man/man3/ne_get_response_header.3
+#usr/share/man/man3/ne_get_scheme.3
+#usr/share/man/man3/ne_get_server_hostport.3
+#usr/share/man/man3/ne_get_status.3
+#usr/share/man/man3/ne_iaddr_cmp.3
+#usr/share/man/man3/ne_iaddr_free.3
+#usr/share/man/man3/ne_iaddr_make.3
+#usr/share/man/man3/ne_iaddr_print.3
+#usr/share/man/man3/ne_iaddr_typeof.3
+#usr/share/man/man3/ne_malloc.3
+#usr/share/man/man3/ne_oom_callback.3
+#usr/share/man/man3/ne_print_request_header.3
+#usr/share/man/man3/ne_qtoken.3
+#usr/share/man/man3/ne_realloc.3
+#usr/share/man/man3/ne_request_create.3
+#usr/share/man/man3/ne_request_destroy.3
+#usr/share/man/man3/ne_request_dispatch.3
+#usr/share/man/man3/ne_response_header_iterate.3
+#usr/share/man/man3/ne_session_create.3
+#usr/share/man/man3/ne_session_destroy.3
+#usr/share/man/man3/ne_session_proxy.3
+#usr/share/man/man3/ne_set_error.3
+#usr/share/man/man3/ne_set_persist.3
+#usr/share/man/man3/ne_set_proxy_auth.3
+#usr/share/man/man3/ne_set_read_timeout.3
+#usr/share/man/man3/ne_set_request_body_buffer.3
+#usr/share/man/man3/ne_set_request_body_fd.3
+#usr/share/man/man3/ne_set_request_expect100.3
+#usr/share/man/man3/ne_set_server_auth.3
+#usr/share/man/man3/ne_set_useragent.3
+#usr/share/man/man3/ne_shave.3
+#usr/share/man/man3/ne_sock_init.3
+#usr/share/man/man3/ne_ssl_cert_cmp.3
+#usr/share/man/man3/ne_ssl_cert_export.3
+#usr/share/man/man3/ne_ssl_cert_free.3
+#usr/share/man/man3/ne_ssl_cert_identity.3
+#usr/share/man/man3/ne_ssl_cert_import.3
+#usr/share/man/man3/ne_ssl_cert_issuer.3
+#usr/share/man/man3/ne_ssl_cert_read.3
+#usr/share/man/man3/ne_ssl_cert_signedby.3
+#usr/share/man/man3/ne_ssl_cert_subject.3
+#usr/share/man/man3/ne_ssl_cert_write.3
+#usr/share/man/man3/ne_ssl_clicert_decrypt.3
+#usr/share/man/man3/ne_ssl_clicert_encrypted.3
+#usr/share/man/man3/ne_ssl_clicert_free.3
+#usr/share/man/man3/ne_ssl_clicert_name.3
+#usr/share/man/man3/ne_ssl_clicert_owner.3
+#usr/share/man/man3/ne_ssl_clicert_read.3
+#usr/share/man/man3/ne_ssl_dname_cmp.3
+#usr/share/man/man3/ne_ssl_readable_dname.3
+#usr/share/man/man3/ne_ssl_set_verify.3
+#usr/share/man/man3/ne_ssl_trust_cert.3
+#usr/share/man/man3/ne_ssl_trust_default_ca.3
+#usr/share/man/man3/ne_status.3
+#usr/share/man/man3/ne_strdup.3
+#usr/share/man/man3/ne_strndup.3
+#usr/share/man/man3/ne_token.3
+#usr/share/man/man3/ne_version_match.3
+#usr/share/man/man3/ne_version_string.3
+#usr/share/man/man3/ne_xml_create.3
+#usr/share/man/man3/ne_xml_destroy.3
+#usr/share/man/man3/neon.3
+#usr/share/man/man5/svnserve.conf.5
+#usr/share/man/man8/svnserve.8
--- a/src/paks/subversion/install.sh
+++ b/src/paks/subversion/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Extract the files
+tar xfz files.tgz -C /
+cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2
--- a/src/paks/subversion/uninstall.sh
+++ b/src/paks/subversion/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Delete the files
+## Befehl fehlt noch
+rm -f /opt/pakfire/installed/ROOTFILES.$2
--- a/src/patches/libpng-1.2.12-no-asm.patch
+++ b/src/patches/libpng-1.2.12-no-asm.patch
@@ -0,0 +1,62 @@
+backport from current 1.4 beta's to handle the bug where the
+PNG_NO_ASSEMBLER_CODE define is not exported properly
+
+http://bugs.gentoo.org/136346
+
+--- libpng-1.2.12/configure.ac
+++ libpng-1.2.12/configure.ac
+@@ -62,15 +62,12 @@
+ AC_TRY_COMPILE(
+   [#include "pnggccrd.c"],
+   [return 0;],
+-  LIBPNG_DEFINES=,
+-  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
+-if test "$LIBPNG_DEFINES"; then
+-    AC_MSG_RESULT(no)
+-else
+-    AC_MSG_RESULT(yes)
+-    LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+-fi
+  [LIBPNG_NO_ASSEMBLER=yes; LIBPNG_DEFINES=""],
+  [LIBPNG_NO_ASSEMBLER=no ; LIBPNG_DEFINES="-DPNG_NO_ASSEMBLER_CODE=1"])
+LIBPNG_DEFINES="$LIBPNG_DEFINES -DPNG_CONFIGURE_LIBPNG"
+AC_MSG_RESULT($LIBPNG_NO_ASSEMBLER)
+ AC_SUBST(LIBPNG_DEFINES)
+AM_CONDITIONAL(LIBPNG_NO_ASSEMBLER, test "x$LIBPNG_NO_ASSEMBLER" = "xno")
+ 
+ AC_MSG_CHECKING([if libraries can be versioned])
+ GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
+--- libpng-1.2.12/Makefile.am
+++ libpng-1.2.12/Makefile.am
+@@ -87,6 +87,14 @@
+ 
+ CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
+
+pngconf.h: pngconf.h.in
+	sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h.tmp
+if LIBPNG_NO_ASSEMBLER
+	echo "#define PNG_NO_ASSEMBLER_CODE 1" >> pngconf.h.tmp
+endif
+	sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h.tmp
+	mv pngconf.h.tmp pngconf.h
+
+ $(PNGLIB_BASENAME).pc: libpng.pc
+ 	cp libpng.pc $@
+ 
+--- libpng-1.2.12/pngconf.h
+++ libpng-1.2.12/pngconf.h
+@@ -19,6 +19,13 @@
+ 
+ #define PNG_1_2_X
+ 
+/* Backported no-assembler fix from libpng-1.4.0beta8 */
+
+/* Makefile-supplied defines go here: */
+/* End of Makefile-supplied defines. */
+
+/* End of backported no-assembler fix */
+
+ /* 
+  * PNG_USER_CONFIG has to be defined on the compiler command line. This
+  * includes the resource compiler for Windows DLL configurations.
+
--- a/src/patches/libpng-1.2.8-link_to_proper_libs-1.patch
+++ b/src/patches/libpng-1.2.8-link_to_proper_libs-1.patch
@@ -1,58 +0,0 @@
-Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
-Date: 2004-08-05
-Initial Package Version: 1.2.6
-Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
-Description: libpng is not linked against libz and libm. This causes
-             problems for packages that try to link against libpng
-             without including "-lz -lm" in the linker flags.
-
-$LastChangedBy: igor $
-$Date: 2005/02/27 15:23:07 $
-
--- libpng-1.2.8/scripts/libpng.pc.in.orig	2005-01-04 14:06:54.182100728 +0000
-+++ libpng-1.2.8/scripts/libpng.pc.in	2005-01-04 14:07:19.108311368 +0000
-@@ -7,5 +7,5 @@
- Name: libpng12
- Description: Loads and saves PNG files
- Version: 1.2.8
-Libs: -L${libdir} -lpng12 -lz -lm
-+Libs: -L${libdir} -lpng12
- Cflags: -I${includedir}/libpng12
--- libpng-1.2.8/scripts/makefile.linux.orig	2005-01-04 14:07:37.875458328 +0000
-+++ libpng-1.2.8/scripts/makefile.linux	2005-01-04 14:11:03.918135080 +0000
-@@ -34,8 +34,9 @@
- CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
- 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LIBS=-lz -lm
-+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
-+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
- 
- RANLIB=ranlib
- #RANLIB=echo
-@@ -86,7 +87,7 @@
- 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- 	echo L_opts=\"-L$(LIBPATH)\"; \
- 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
-	echo libs=\"-lpng12 -lz -lm\"; \
-+	echo libs=\"-lpng12\"; \
- 	cat scripts/libpng-config-body.in ) > libpng-config
- 	chmod +x libpng-config
- 
-@@ -99,12 +100,12 @@
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
- 	-o $(LIBNAME).so.$(PNGVER) \
-	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- libpng.so.3.$(PNGMIN): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,libpng.so.3 \
- 	-o libpng.so.3.$(PNGMIN) \
-	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- pngtest: pngtest.o $(LIBNAME).so
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
--- a/src/scripts/packager
+++ b/src/scripts/packager
@@ -24,7 +24,7 @@ else

 	cd /    && rm -rf /tmp/*
 	cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-	tar cfz ../$PROG-$VER-$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES
+	tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES

 	cd /install/packages && md5sum $PROG*.tar.gz > $PROG-$VER-$PAK_VER.tar.gz.md5
 	cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5