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

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

src/paks/iptraf/ROOTFILES

@@ -0,0 +1,2 @@
+usr/bin/iptraf
+usr/bin/rvnamed

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

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

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

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

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

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.
+

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)

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