This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, fifteen has been updated via 96711574bec47c5ffec3bd26c0b4056e07d2ef0e (commit) via 6233483ba7d92b83a80e5a4759f83248198eb2f2 (commit) via 318685daf4a9d404a98b24f2175e505525547b31 (commit) via 99093fa51667deb09c2ca4dd9cbad1d3469d738a (commit) via b0c1baa588d38afe11314c931ae62ee02047125f (commit) via 5a9e26d83150750f8a7d1420007752df2639fb65 (commit) via 76479e2746eacd39fa6548a21aacada19d112476 (commit) via 5a038beb35666e5e5a030481130766b5e832ef23 (commit) via e24a59271eb7b1a9ce5b2169acf408ddc5c22270 (commit) via f0fbffeb3af455f52fedc58050aff714127c05ea (commit) via 309783b9d569e30c9ecc7c76e2e1c2aef57b981b (commit) via 65e77163342164e18d115f8dfa550f07dd216869 (commit) via c2741b14ef385f334d2afdb67e5ec70f19cc2418 (commit) via ec9f81be0cee42529ac57c4f106144dfc1a934ec (commit) via 90e4ec2a88ac967600b8c692f7001314ca6d14c3 (commit) via 035ace2cbb99efe4873f77a34bd151f8d78ce21d (commit) from c4979a81c8d27fed69b4f360cc67845bac85549a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 96711574bec47c5ffec3bd26c0b4056e07d2ef0e Author: Alexander Marx amarx@ipfire.org Date: Thu Sep 26 16:18:54 2013 +0200

Forward Firewall: BUGFIX: when using ICMP services in firewallrules and then changing the service, the rule was broken

commit 6233483ba7d92b83a80e5a4759f83248198eb2f2 Author: Alexander Marx amarx@ipfire.org Date: Thu Sep 26 14:09:24 2013 +0200

Forward Firewall: Bugfix: When creating a rule which results in an error, the counters in the firewallgroups where increased. Bugfix: When using icmp-type "all" there was no rule created

Conflicts: html/cgi-bin/forwardfw.cgi

commit 318685daf4a9d404a98b24f2175e505525547b31 Merge: 99093fa c4979a8 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 27 10:40:24 2013 +0200

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

commit 99093fa51667deb09c2ca4dd9cbad1d3469d738a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 27 01:46:44 2013 +0200

Use hardened compiler flags.

commit b0c1baa588d38afe11314c931ae62ee02047125f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 27 01:46:21 2013 +0200

libxml2: Add package to fifteen update.

commit 5a9e26d83150750f8a7d1420007752df2639fb65 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 27 01:45:13 2013 +0200

mbr: Remove package, which is not needed any more.

This package was needed to add the MBR to flash images, which are not available in IPFire 2.15 any more.

commit 76479e2746eacd39fa6548a21aacada19d112476 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 27 00:55:07 2013 +0200

transmission: Don't use C++ exception handling.

commit 5a038beb35666e5e5a030481130766b5e832ef23 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 27 00:48:55 2013 +0200

iotop: New package.

commit e24a59271eb7b1a9ce5b2169acf408ddc5c22270 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 26 22:34:35 2013 +0200

openvmtools: Build without -fPIC.

commit f0fbffeb3af455f52fedc58050aff714127c05ea Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 26 22:34:01 2013 +0200

cpufrequtils: Build without -fPIC.

commit 309783b9d569e30c9ecc7c76e2e1c2aef57b981b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 26 22:13:13 2013 +0200

ffmpeg: Don't use -fPIC and don't use strict aliasing.

commit 65e77163342164e18d115f8dfa550f07dd216869 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 26 19:54:08 2013 +0200

cyrus-sasl: Run autoconf before build.

commit c2741b14ef385f334d2afdb67e5ec70f19cc2418 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 26 19:52:34 2013 +0200

libxml2: Update to 2.6.32.

commit ec9f81be0cee42529ac57c4f106144dfc1a934ec Merge: 90e4ec2 0a379f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 26 16:12:15 2013 +0200

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

commit 90e4ec2a88ac967600b8c692f7001314ca6d14c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Sep 17 19:57:28 2013 +0200

lzo: Update to 2.06.

Eliminates the requirement of a executable stack.

commit 035ace2cbb99efe4873f77a34bd151f8d78ce21d Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Sep 17 17:29:19 2013 +0200

coreutils: Use PIE version of LFS uname patch.

-----------------------------------------------------------------------

Summary of changes: config/forwardfw/rules.pl | 24 +- config/rootfiles/common/cyrus-sasl | 91 ++--- config/rootfiles/common/libxml2 | 428 +++++++++++---------- config/rootfiles/common/mbr | 2 - .../66 => core/fifteen}/filelists/coreutils | 0 config/rootfiles/core/fifteen/filelists/libxml2 | 1 + config/rootfiles/core/fifteen/filelists/lzo | 1 + config/rootfiles/packages/iotop | 20 + html/cgi-bin/forwardfw.cgi | 90 +++-- html/cgi-bin/fwhosts.cgi | 33 +- lfs/cpufrequtils | 2 + lfs/cyrus-sasl | 3 +- lfs/ffmpeg | 3 + lfs/{python-xattr => iotop} | 14 +- lfs/libxml2 | 6 +- lfs/lzo | 4 +- lfs/mbr | 78 ---- lfs/openvmtools | 2 + lfs/transmission | 2 + make.sh | 2 +- src/patches/coreutils-5.96-uname-1.patch | 58 ++- tools/make-functions | 16 +- 22 files changed, 448 insertions(+), 432 deletions(-) delete mode 100644 config/rootfiles/common/mbr copy config/rootfiles/{oldcore/66 => core/fifteen}/filelists/coreutils (100%) create mode 120000 config/rootfiles/core/fifteen/filelists/libxml2 create mode 120000 config/rootfiles/core/fifteen/filelists/lzo create mode 100644 config/rootfiles/packages/iotop copy lfs/{python-xattr => iotop} (93%) delete mode 100644 lfs/mbr

Difference in files: diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl index 370b7ec..3f491f7 100755 --- a/config/forwardfw/rules.pl +++ b/config/forwardfw/rules.pl @@ -146,8 +146,10 @@ sub buildrules my $nat; my $fwaccessdport; my $natchain; + my $icmptype; foreach my $key (sort {$a <=> $b} keys %$hash){ next if (($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1') && $conexists eq 'off' ); + $command="iptables -A"; if ($$hash{$key}[28] eq 'ON'){ $command='iptables -t nat -A'; $natip=&get_nat_ip($$hash{$key}[29],$$hash{$key}[31]); @@ -260,10 +262,15 @@ sub buildrules if(substr($DPORT, 2, 4) eq 'icmp'){ my @icmprule= split(",",substr($DPORT, 12,)); foreach (@icmprule){ + $icmptype="--icmp-type "; + if ($_ eq "BLANK") { + $icmptype=""; + $_=""; + } if ($$hash{$key}[17] eq 'ON'){ - print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] --icmp-type $_ $TIME -j LOG\n"; + print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG\n"; } - print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] --icmp-type $_ $TIME -j $$hash{$key}[0]\n"; + print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]\n"; } }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){ $natchain='NAT_DESTINATION'; @@ -289,7 +296,7 @@ sub buildrules $natchain='NAT_SOURCE'; print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to $natip\n"; } - if ($$hash{$key}[17] eq 'ON'){ + if ($$hash{$key}[17] eq 'ON' ){ print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n"; } if ($PROT ne '-p ICMP'){ @@ -315,10 +322,15 @@ sub buildrules if(substr($DPORT, 2, 4) eq 'icmp'){ my @icmprule= split(",",substr($DPORT, 12,)); foreach (@icmprule){ + $icmptype="--icmp-type "; + if ($_ eq "BLANK") { + $icmptype=""; + $_=""; + } if ($$hash{$key}[17] eq 'ON'){ - system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] -- icmp-type $_ $TIME -j LOG"); + system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG"); } - system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] --icmp-type $_ $TIME -j $$hash{$key}[0]"); + system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]"); } #PROCESS DNAT RULE (Portforward) }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){ @@ -346,7 +358,7 @@ sub buildrules $natchain='NAT_SOURCE'; system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to $natip\n"; } - if ($$hash{$key}[17] eq 'ON'){ + if ($$hash{$key}[17] eq 'ON' && substr($DPORT, 2, 4) ne 'icmp'){ system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n"; } #PROCESS EVERY OTHER RULE (If NOT ICMP, else the rule would be applied double) diff --git a/config/rootfiles/common/cyrus-sasl b/config/rootfiles/common/cyrus-sasl index 4fe13bc..287ef37 100644 --- a/config/rootfiles/common/cyrus-sasl +++ b/config/rootfiles/common/cyrus-sasl @@ -37,53 +37,54 @@ usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.21 usr/lib/sasl2/smtpd.conf -#usr/man/man3/sasl.3 -#usr/man/man3/sasl_authorize_t.3 -#usr/man/man3/sasl_auxprop.3 -#usr/man/man3/sasl_auxprop_getctx.3 -#usr/man/man3/sasl_auxprop_request.3 -#usr/man/man3/sasl_callbacks.3 -#usr/man/man3/sasl_canon_user_t.3 -#usr/man/man3/sasl_chalprompt_t.3 -#usr/man/man3/sasl_checkapop.3 -#usr/man/man3/sasl_checkpass.3 -#usr/man/man3/sasl_client_init.3 -#usr/man/man3/sasl_client_new.3 -#usr/man/man3/sasl_client_start.3 -#usr/man/man3/sasl_client_step.3 -#usr/man/man3/sasl_decode.3 -#usr/man/man3/sasl_dispose.3 -#usr/man/man3/sasl_done.3 -#usr/man/man3/sasl_encode.3 -#usr/man/man3/sasl_encodev.3 -#usr/man/man3/sasl_errdetail.3 -#usr/man/man3/sasl_errors.3 -#usr/man/man3/sasl_errstring.3 -#usr/man/man3/sasl_getopt_t.3 -#usr/man/man3/sasl_getpath_t.3 -#usr/man/man3/sasl_getprop.3 -#usr/man/man3/sasl_getrealm_t.3 -#usr/man/man3/sasl_getsecret_t.3 -#usr/man/man3/sasl_getsimple_t.3 -#usr/man/man3/sasl_global_listmech.3 -#usr/man/man3/sasl_idle.3 -#usr/man/man3/sasl_listmech.3 -#usr/man/man3/sasl_log_t.3 -#usr/man/man3/sasl_server_init.3 -#usr/man/man3/sasl_server_new.3 -#usr/man/man3/sasl_server_start.3 -#usr/man/man3/sasl_server_step.3 -#usr/man/man3/sasl_server_userdb_checkpass_t.3 -#usr/man/man3/sasl_server_userdb_setpass_t.3 -#usr/man/man3/sasl_setpass.3 -#usr/man/man3/sasl_setprop.3 -#usr/man/man3/sasl_user_exists.3 -#usr/man/man3/sasl_verifyfile_t.3 -#usr/man/man8/saslauthd.8 -#usr/man/man8/sasldblistusers2.8 -#usr/man/man8/saslpasswd2.8 +#usr/man/cat8 +#usr/man/cat8/saslauthd.8 usr/sbin/saslauthd usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2 +#usr/share/man/man3/sasl.3 +#usr/share/man/man3/sasl_authorize_t.3 +#usr/share/man/man3/sasl_auxprop.3 +#usr/share/man/man3/sasl_auxprop_getctx.3 +#usr/share/man/man3/sasl_auxprop_request.3 +#usr/share/man/man3/sasl_callbacks.3 +#usr/share/man/man3/sasl_canon_user_t.3 +#usr/share/man/man3/sasl_chalprompt_t.3 +#usr/share/man/man3/sasl_checkapop.3 +#usr/share/man/man3/sasl_checkpass.3 +#usr/share/man/man3/sasl_client_init.3 +#usr/share/man/man3/sasl_client_new.3 +#usr/share/man/man3/sasl_client_start.3 +#usr/share/man/man3/sasl_client_step.3 +#usr/share/man/man3/sasl_decode.3 +#usr/share/man/man3/sasl_dispose.3 +#usr/share/man/man3/sasl_done.3 +#usr/share/man/man3/sasl_encode.3 +#usr/share/man/man3/sasl_encodev.3 +#usr/share/man/man3/sasl_errdetail.3 +#usr/share/man/man3/sasl_errors.3 +#usr/share/man/man3/sasl_errstring.3 +#usr/share/man/man3/sasl_getopt_t.3 +#usr/share/man/man3/sasl_getpath_t.3 +#usr/share/man/man3/sasl_getprop.3 +#usr/share/man/man3/sasl_getrealm_t.3 +#usr/share/man/man3/sasl_getsecret_t.3 +#usr/share/man/man3/sasl_getsimple_t.3 +#usr/share/man/man3/sasl_global_listmech.3 +#usr/share/man/man3/sasl_idle.3 +#usr/share/man/man3/sasl_listmech.3 +#usr/share/man/man3/sasl_log_t.3 +#usr/share/man/man3/sasl_server_init.3 +#usr/share/man/man3/sasl_server_new.3 +#usr/share/man/man3/sasl_server_start.3 +#usr/share/man/man3/sasl_server_step.3 +#usr/share/man/man3/sasl_server_userdb_checkpass_t.3 +#usr/share/man/man3/sasl_server_userdb_setpass_t.3 +#usr/share/man/man3/sasl_setpass.3 +#usr/share/man/man3/sasl_setprop.3 +#usr/share/man/man3/sasl_user_exists.3 +#usr/share/man/man3/sasl_verifyfile_t.3 +#usr/share/man/man8/sasldblistusers2.8 +#usr/share/man/man8/saslpasswd2.8 var/lib/sasl var/run/saslauthd diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2 index ea2eb77..07c1edd 100644 --- a/config/rootfiles/common/libxml2 +++ b/config/rootfiles/common/libxml2 @@ -54,7 +54,7 @@ #usr/lib/libxml2.la usr/lib/libxml2.so usr/lib/libxml2.so.2 -usr/lib/libxml2.so.2.6.26 +usr/lib/libxml2.so.2.6.32 #usr/lib/pkgconfig/libxml-2.0.pc usr/lib/python2.7/site-packages/drv_libxml2.py usr/lib/python2.7/site-packages/libxml2.py @@ -62,219 +62,217 @@ usr/lib/python2.7/site-packages/libxml2.py #usr/lib/python2.7/site-packages/libxml2mod.la usr/lib/python2.7/site-packages/libxml2mod.so #usr/lib/xml2Conf.sh -#usr/man/man1/xml2-config.1 -#usr/man/man1/xmlcatalog.1 -#usr/man/man1/xmllint.1 -#usr/man/man3/libxml.3 #usr/share/aclocal/libxml.m4 -#usr/share/doc/libxml2-2.6.26 -#usr/share/doc/libxml2-2.6.26/Copyright -#usr/share/doc/libxml2-2.6.26/examples -#usr/share/doc/libxml2-2.6.26/examples/testHTML.c -#usr/share/doc/libxml2-2.6.26/examples/testSAX.c -#usr/share/doc/libxml2-2.6.26/examples/testXPath.c -#usr/share/doc/libxml2-2.6.26/examples/xmllint.c -#usr/share/doc/libxml2-2.6.26/html -#usr/share/doc/libxml2-2.6.26/html/DOM.gif -#usr/share/doc/libxml2-2.6.26/html/FAQ.html -#usr/share/doc/libxml2-2.6.26/html/Libxml2-Logo-180x168.gif -#usr/share/doc/libxml2-2.6.26/html/Libxml2-Logo-90x34.gif -#usr/share/doc/libxml2-2.6.26/html/encoding.html -#usr/share/doc/libxml2-2.6.26/html/examples.xml -#usr/share/doc/libxml2-2.6.26/html/examples.xsl -#usr/share/doc/libxml2-2.6.26/html/html -#usr/share/doc/libxml2-2.6.26/html/html/book1.html -#usr/share/doc/libxml2-2.6.26/html/html/home.png -#usr/share/doc/libxml2-2.6.26/html/html/index.html -#usr/share/doc/libxml2-2.6.26/html/html/left.png -#usr/share/doc/libxml2-2.6.26/html/html/libxml-DOCBparser.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-HTMLparser.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-HTMLtree.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-SAX.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-SAX2.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-c14n.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-catalog.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-chvalid.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-debugXML.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-dict.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-encoding.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-entities.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-globals.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-hash.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-lib.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-list.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-nanoftp.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-nanohttp.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-parser.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-parserInternals.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-pattern.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-relaxng.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-schemasInternals.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-schematron.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-threads.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-tree.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-uri.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-valid.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xinclude.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xlink.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlIO.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlautomata.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlerror.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlexports.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlmemory.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlmodule.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlreader.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlregexp.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlsave.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlschemas.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlschemastypes.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlstring.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlunicode.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlversion.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlwriter.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xpath.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xpathInternals.html -#usr/share/doc/libxml2-2.6.26/html/html/libxml-xpointer.html -#usr/share/doc/libxml2-2.6.26/html/html/right.png -#usr/share/doc/libxml2-2.6.26/html/html/up.png -#usr/share/doc/libxml2-2.6.26/html/io1.c -#usr/share/doc/libxml2-2.6.26/html/io1.res -#usr/share/doc/libxml2-2.6.26/html/io2.c -#usr/share/doc/libxml2-2.6.26/html/io2.res -#usr/share/doc/libxml2-2.6.26/html/libxml.gif -#usr/share/doc/libxml2-2.6.26/html/parse1.c -#usr/share/doc/libxml2-2.6.26/html/parse2.c -#usr/share/doc/libxml2-2.6.26/html/parse3.c -#usr/share/doc/libxml2-2.6.26/html/parse4.c -#usr/share/doc/libxml2-2.6.26/html/reader1.c -#usr/share/doc/libxml2-2.6.26/html/reader1.res -#usr/share/doc/libxml2-2.6.26/html/reader2.c -#usr/share/doc/libxml2-2.6.26/html/reader3.c -#usr/share/doc/libxml2-2.6.26/html/reader3.res -#usr/share/doc/libxml2-2.6.26/html/reader4.c -#usr/share/doc/libxml2-2.6.26/html/reader4.res -#usr/share/doc/libxml2-2.6.26/html/redhat.gif -#usr/share/doc/libxml2-2.6.26/html/smallfootonly.gif -#usr/share/doc/libxml2-2.6.26/html/structure.gif -#usr/share/doc/libxml2-2.6.26/html/test1.xml -#usr/share/doc/libxml2-2.6.26/html/test2.xml -#usr/share/doc/libxml2-2.6.26/html/test3.xml -#usr/share/doc/libxml2-2.6.26/html/testWriter.c -#usr/share/doc/libxml2-2.6.26/html/tree1.c -#usr/share/doc/libxml2-2.6.26/html/tree1.res -#usr/share/doc/libxml2-2.6.26/html/tree2.c -#usr/share/doc/libxml2-2.6.26/html/tree2.res -#usr/share/doc/libxml2-2.6.26/html/tst.xml -#usr/share/doc/libxml2-2.6.26/html/tutorial -#usr/share/doc/libxml2-2.6.26/html/tutorial/apa.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/apb.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/apc.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/apd.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ape.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/apf.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/apg.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/aph.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/api.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s02.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s03.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s04.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s05.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s06.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s07.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s08.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s09.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/images -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/blank.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/1.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/10.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/2.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/3.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/4.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/5.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/6.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/7.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/8.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/9.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/caution.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/draft.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/home.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/important.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/next.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/note.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/prev.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/tip.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/toc-blank.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/toc-minus.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/toc-plus.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/up.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/images/warning.png -#usr/share/doc/libxml2-2.6.26/html/tutorial/includeaddattribute.c -#usr/share/doc/libxml2-2.6.26/html/tutorial/includeaddkeyword.c -#usr/share/doc/libxml2-2.6.26/html/tutorial/includeconvert.c -#usr/share/doc/libxml2-2.6.26/html/tutorial/includegetattribute.c -#usr/share/doc/libxml2-2.6.26/html/tutorial/includekeyword.c -#usr/share/doc/libxml2-2.6.26/html/tutorial/includexpath.c -#usr/share/doc/libxml2-2.6.26/html/tutorial/index.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/ix01.html -#usr/share/doc/libxml2-2.6.26/html/tutorial/xmltutorial.pdf -#usr/share/doc/libxml2-2.6.26/html/w3c.png -#usr/share/doc/libxml2-2.6.26/html/writer.xml -#usr/share/doc/libxml2-2.6.26/html/xml.html -#usr/share/doc/libxml2-2.6.26/html/xpath1.c -#usr/share/doc/libxml2-2.6.26/html/xpath1.res -#usr/share/doc/libxml2-2.6.26/html/xpath2.c -#usr/share/doc/libxml2-2.6.26/html/xpath2.res -#usr/share/doc/libxml2-python-2.6.26 -#usr/share/doc/libxml2-python-2.6.26/TODO -#usr/share/doc/libxml2-python-2.6.26/examples -#usr/share/doc/libxml2-python-2.6.26/examples/attribs.py -#usr/share/doc/libxml2-python-2.6.26/examples/build.py -#usr/share/doc/libxml2-python-2.6.26/examples/ctxterror.py -#usr/share/doc/libxml2-python-2.6.26/examples/cutnpaste.py -#usr/share/doc/libxml2-python-2.6.26/examples/dtdvalid.py -#usr/share/doc/libxml2-python-2.6.26/examples/error.py -#usr/share/doc/libxml2-python-2.6.26/examples/inbuf.py -#usr/share/doc/libxml2-python-2.6.26/examples/indexes.py -#usr/share/doc/libxml2-python-2.6.26/examples/invalid.xml -#usr/share/doc/libxml2-python-2.6.26/examples/nsdel.py -#usr/share/doc/libxml2-python-2.6.26/examples/outbuf.py -#usr/share/doc/libxml2-python-2.6.26/examples/push.py -#usr/share/doc/libxml2-python-2.6.26/examples/pushSAX.py -#usr/share/doc/libxml2-python-2.6.26/examples/pushSAXhtml.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader2.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader3.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader4.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader5.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader6.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader7.py -#usr/share/doc/libxml2-python-2.6.26/examples/reader8.py -#usr/share/doc/libxml2-python-2.6.26/examples/readererr.py -#usr/share/doc/libxml2-python-2.6.26/examples/readernext.py -#usr/share/doc/libxml2-python-2.6.26/examples/regexp.py -#usr/share/doc/libxml2-python-2.6.26/examples/relaxng.py -#usr/share/doc/libxml2-python-2.6.26/examples/resolver.py -#usr/share/doc/libxml2-python-2.6.26/examples/schema.py -#usr/share/doc/libxml2-python-2.6.26/examples/serialize.py -#usr/share/doc/libxml2-python-2.6.26/examples/sync.py -#usr/share/doc/libxml2-python-2.6.26/examples/test.dtd -#usr/share/doc/libxml2-python-2.6.26/examples/thread2.py -#usr/share/doc/libxml2-python-2.6.26/examples/tst.py -#usr/share/doc/libxml2-python-2.6.26/examples/tst.xml -#usr/share/doc/libxml2-python-2.6.26/examples/tstLastError.py -#usr/share/doc/libxml2-python-2.6.26/examples/tstURI.py -#usr/share/doc/libxml2-python-2.6.26/examples/tstmem.py -#usr/share/doc/libxml2-python-2.6.26/examples/tstxpath.py -#usr/share/doc/libxml2-python-2.6.26/examples/valid.xml -#usr/share/doc/libxml2-python-2.6.26/examples/validDTD.py -#usr/share/doc/libxml2-python-2.6.26/examples/validRNG.py -#usr/share/doc/libxml2-python-2.6.26/examples/validSchemas.py -#usr/share/doc/libxml2-python-2.6.26/examples/validate.py -#usr/share/doc/libxml2-python-2.6.26/examples/walker.py -#usr/share/doc/libxml2-python-2.6.26/examples/xpath.py -#usr/share/doc/libxml2-python-2.6.26/examples/xpathext.py -#usr/share/doc/libxml2-python-2.6.26/examples/xpathret.py +#usr/share/doc/libxml2-2.6.32 +#usr/share/doc/libxml2-2.6.32/Copyright +#usr/share/doc/libxml2-2.6.32/examples +#usr/share/doc/libxml2-2.6.32/examples/testHTML.c +#usr/share/doc/libxml2-2.6.32/examples/testSAX.c +#usr/share/doc/libxml2-2.6.32/examples/testXPath.c +#usr/share/doc/libxml2-2.6.32/examples/xmllint.c +#usr/share/doc/libxml2-2.6.32/html +#usr/share/doc/libxml2-2.6.32/html/DOM.gif +#usr/share/doc/libxml2-2.6.32/html/FAQ.html +#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-180x168.gif +#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-90x34.gif +#usr/share/doc/libxml2-2.6.32/html/encoding.html +#usr/share/doc/libxml2-2.6.32/html/examples.xml +#usr/share/doc/libxml2-2.6.32/html/examples.xsl +#usr/share/doc/libxml2-2.6.32/html/html +#usr/share/doc/libxml2-2.6.32/html/html/book1.html +#usr/share/doc/libxml2-2.6.32/html/html/home.png +#usr/share/doc/libxml2-2.6.32/html/html/index.html +#usr/share/doc/libxml2-2.6.32/html/html/left.png +#usr/share/doc/libxml2-2.6.32/html/html/libxml-DOCBparser.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLparser.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLtree.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX2.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-c14n.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-catalog.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-chvalid.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-debugXML.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-dict.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-encoding.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-entities.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-globals.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-hash.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-lib.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-list.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanoftp.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanohttp.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-parser.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-parserInternals.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-pattern.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-relaxng.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-schemasInternals.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-schematron.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-threads.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-tree.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-uri.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-valid.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xinclude.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xlink.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlIO.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlautomata.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlerror.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlexports.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmemory.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmodule.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlreader.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlregexp.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlsave.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemas.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemastypes.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlstring.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlunicode.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlversion.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlwriter.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpath.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpathInternals.html +#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpointer.html +#usr/share/doc/libxml2-2.6.32/html/html/right.png +#usr/share/doc/libxml2-2.6.32/html/html/up.png +#usr/share/doc/libxml2-2.6.32/html/io1.c +#usr/share/doc/libxml2-2.6.32/html/io1.res +#usr/share/doc/libxml2-2.6.32/html/io2.c +#usr/share/doc/libxml2-2.6.32/html/io2.res +#usr/share/doc/libxml2-2.6.32/html/libxml.gif +#usr/share/doc/libxml2-2.6.32/html/parse1.c +#usr/share/doc/libxml2-2.6.32/html/parse2.c +#usr/share/doc/libxml2-2.6.32/html/parse3.c +#usr/share/doc/libxml2-2.6.32/html/parse4.c +#usr/share/doc/libxml2-2.6.32/html/reader1.c +#usr/share/doc/libxml2-2.6.32/html/reader1.res +#usr/share/doc/libxml2-2.6.32/html/reader2.c +#usr/share/doc/libxml2-2.6.32/html/reader3.c +#usr/share/doc/libxml2-2.6.32/html/reader3.res +#usr/share/doc/libxml2-2.6.32/html/reader4.c +#usr/share/doc/libxml2-2.6.32/html/reader4.res +#usr/share/doc/libxml2-2.6.32/html/redhat.gif +#usr/share/doc/libxml2-2.6.32/html/smallfootonly.gif +#usr/share/doc/libxml2-2.6.32/html/structure.gif +#usr/share/doc/libxml2-2.6.32/html/test1.xml +#usr/share/doc/libxml2-2.6.32/html/test2.xml +#usr/share/doc/libxml2-2.6.32/html/test3.xml +#usr/share/doc/libxml2-2.6.32/html/testWriter.c +#usr/share/doc/libxml2-2.6.32/html/tree1.c +#usr/share/doc/libxml2-2.6.32/html/tree1.res +#usr/share/doc/libxml2-2.6.32/html/tree2.c +#usr/share/doc/libxml2-2.6.32/html/tree2.res +#usr/share/doc/libxml2-2.6.32/html/tst.xml +#usr/share/doc/libxml2-2.6.32/html/tutorial +#usr/share/doc/libxml2-2.6.32/html/tutorial/apa.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/apb.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/apc.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/apd.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ape.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/apf.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/apg.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/aph.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/api.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s02.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s03.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s04.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s05.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s06.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s07.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s08.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s09.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/images +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/blank.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/1.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/10.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/2.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/3.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/4.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/5.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/6.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/7.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/8.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/9.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/caution.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/draft.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/home.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/important.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/next.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/note.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/prev.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/tip.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-blank.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-minus.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-plus.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/up.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/images/warning.png +#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddattribute.c +#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddkeyword.c +#usr/share/doc/libxml2-2.6.32/html/tutorial/includeconvert.c +#usr/share/doc/libxml2-2.6.32/html/tutorial/includegetattribute.c +#usr/share/doc/libxml2-2.6.32/html/tutorial/includekeyword.c +#usr/share/doc/libxml2-2.6.32/html/tutorial/includexpath.c +#usr/share/doc/libxml2-2.6.32/html/tutorial/index.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/ix01.html +#usr/share/doc/libxml2-2.6.32/html/tutorial/xmltutorial.pdf +#usr/share/doc/libxml2-2.6.32/html/w3c.png +#usr/share/doc/libxml2-2.6.32/html/writer.xml +#usr/share/doc/libxml2-2.6.32/html/xml.html +#usr/share/doc/libxml2-2.6.32/html/xpath1.c +#usr/share/doc/libxml2-2.6.32/html/xpath1.res +#usr/share/doc/libxml2-2.6.32/html/xpath2.c +#usr/share/doc/libxml2-2.6.32/html/xpath2.res +#usr/share/doc/libxml2-python-2.6.32 +#usr/share/doc/libxml2-python-2.6.32/TODO +#usr/share/doc/libxml2-python-2.6.32/examples +#usr/share/doc/libxml2-python-2.6.32/examples/attribs.py +#usr/share/doc/libxml2-python-2.6.32/examples/build.py +#usr/share/doc/libxml2-python-2.6.32/examples/compareNodes.py +#usr/share/doc/libxml2-python-2.6.32/examples/ctxterror.py +#usr/share/doc/libxml2-python-2.6.32/examples/cutnpaste.py +#usr/share/doc/libxml2-python-2.6.32/examples/dtdvalid.py +#usr/share/doc/libxml2-python-2.6.32/examples/error.py +#usr/share/doc/libxml2-python-2.6.32/examples/inbuf.py +#usr/share/doc/libxml2-python-2.6.32/examples/indexes.py +#usr/share/doc/libxml2-python-2.6.32/examples/invalid.xml +#usr/share/doc/libxml2-python-2.6.32/examples/nsdel.py +#usr/share/doc/libxml2-python-2.6.32/examples/outbuf.py +#usr/share/doc/libxml2-python-2.6.32/examples/push.py +#usr/share/doc/libxml2-python-2.6.32/examples/pushSAX.py +#usr/share/doc/libxml2-python-2.6.32/examples/pushSAXhtml.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader2.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader3.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader4.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader5.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader6.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader7.py +#usr/share/doc/libxml2-python-2.6.32/examples/reader8.py +#usr/share/doc/libxml2-python-2.6.32/examples/readererr.py +#usr/share/doc/libxml2-python-2.6.32/examples/readernext.py +#usr/share/doc/libxml2-python-2.6.32/examples/regexp.py +#usr/share/doc/libxml2-python-2.6.32/examples/relaxng.py +#usr/share/doc/libxml2-python-2.6.32/examples/resolver.py +#usr/share/doc/libxml2-python-2.6.32/examples/schema.py +#usr/share/doc/libxml2-python-2.6.32/examples/serialize.py +#usr/share/doc/libxml2-python-2.6.32/examples/sync.py +#usr/share/doc/libxml2-python-2.6.32/examples/test.dtd +#usr/share/doc/libxml2-python-2.6.32/examples/thread2.py +#usr/share/doc/libxml2-python-2.6.32/examples/tst.py +#usr/share/doc/libxml2-python-2.6.32/examples/tst.xml +#usr/share/doc/libxml2-python-2.6.32/examples/tstLastError.py +#usr/share/doc/libxml2-python-2.6.32/examples/tstURI.py +#usr/share/doc/libxml2-python-2.6.32/examples/tstmem.py +#usr/share/doc/libxml2-python-2.6.32/examples/tstxpath.py +#usr/share/doc/libxml2-python-2.6.32/examples/valid.xml +#usr/share/doc/libxml2-python-2.6.32/examples/validDTD.py +#usr/share/doc/libxml2-python-2.6.32/examples/validRNG.py +#usr/share/doc/libxml2-python-2.6.32/examples/validSchemas.py +#usr/share/doc/libxml2-python-2.6.32/examples/validate.py +#usr/share/doc/libxml2-python-2.6.32/examples/walker.py +#usr/share/doc/libxml2-python-2.6.32/examples/xpath.py +#usr/share/doc/libxml2-python-2.6.32/examples/xpathext.py +#usr/share/doc/libxml2-python-2.6.32/examples/xpathns.py +#usr/share/doc/libxml2-python-2.6.32/examples/xpathret.py #usr/share/gtk-doc #usr/share/gtk-doc/html #usr/share/gtk-doc/html/libxml2 @@ -333,3 +331,7 @@ usr/lib/python2.7/site-packages/libxml2mod.so #usr/share/gtk-doc/html/libxml2/right.png #usr/share/gtk-doc/html/libxml2/style.css #usr/share/gtk-doc/html/libxml2/up.png +#usr/share/man/man1/xml2-config.1 +#usr/share/man/man1/xmlcatalog.1 +#usr/share/man/man1/xmllint.1 +#usr/share/man/man3/libxml.3 diff --git a/config/rootfiles/common/mbr b/config/rootfiles/common/mbr deleted file mode 100644 index 231e27d..0000000 --- a/config/rootfiles/common/mbr +++ /dev/null @@ -1,2 +0,0 @@ -#usr/sbin/install-mbr -#usr/share/man/man8/install-mbr.8 diff --git a/config/rootfiles/core/fifteen/filelists/coreutils b/config/rootfiles/core/fifteen/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/filelists/libxml2 b/config/rootfiles/core/fifteen/filelists/libxml2 new file mode 120000 index 0000000..242e69f --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/fifteen/filelists/lzo b/config/rootfiles/core/fifteen/filelists/lzo new file mode 120000 index 0000000..8e11e78 --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/lzo @@ -0,0 +1 @@ +../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/packages/iotop b/config/rootfiles/packages/iotop new file mode 100644 index 0000000..5ebe221 --- /dev/null +++ b/config/rootfiles/packages/iotop @@ -0,0 +1,20 @@ +usr/lib/python2.7/site-packages/iotop +#usr/lib/python2.7/site-packages/iotop-0.6-py2.7.egg-info +#usr/lib/python2.7/site-packages/iotop/__init__.py +#usr/lib/python2.7/site-packages/iotop/__init__.pyc +#usr/lib/python2.7/site-packages/iotop/data.py +#usr/lib/python2.7/site-packages/iotop/data.pyc +#usr/lib/python2.7/site-packages/iotop/genetlink.py +#usr/lib/python2.7/site-packages/iotop/genetlink.pyc +#usr/lib/python2.7/site-packages/iotop/ioprio.py +#usr/lib/python2.7/site-packages/iotop/ioprio.pyc +#usr/lib/python2.7/site-packages/iotop/netlink.py +#usr/lib/python2.7/site-packages/iotop/netlink.pyc +#usr/lib/python2.7/site-packages/iotop/ui.py +#usr/lib/python2.7/site-packages/iotop/ui.pyc +#usr/lib/python2.7/site-packages/iotop/version.py +#usr/lib/python2.7/site-packages/iotop/version.pyc +#usr/lib/python2.7/site-packages/iotop/vmstat.py +#usr/lib/python2.7/site-packages/iotop/vmstat.pyc +usr/sbin/iotop +#usr/share/man/man8/iotop.8 diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi index e3bbe59..405a97d 100755 --- a/html/cgi-bin/forwardfw.cgi +++ b/html/cgi-bin/forwardfw.cgi @@ -183,19 +183,21 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') $fwdfwsettings{'nosave2'} = 'on'; } } - &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}}); - if ($fwdfwsettings{'nobase'} ne 'on'){ - &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}}); - } - if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){ - &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') { - &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0); - }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){ - &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - } - if($fwdfwsettings{'nosave2'} ne 'on'){ - &saverule(%configinputfw,$configinput); + if (!$errormessage){ + &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}}); + if ($fwdfwsettings{'nobase'} ne 'on'){ + &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}}); + } + if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){ + &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') { + &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0); + }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){ + &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + } + if($fwdfwsettings{'nosave2'} ne 'on'){ + &saverule(%configinputfw,$configinput); + } } }elsif($fwdfwsettings{'grp1'} eq 'ipfire_src' ){ # OUTGOING PART @@ -237,20 +239,22 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') } } #increase counters - &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}}); - &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}}); - if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){ - &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') { - &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0); - }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){ - &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - } - if ($fwdfwsettings{'nobase'} eq 'on'){ - &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - } - if ($fwdfwsettings{'nosave2'} ne 'on'){ - &saverule(%configoutgoingfw,$configoutgoing); + if (!$errormessage){ + &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}}); + &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}}); + if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){ + &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') { + &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0); + }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){ + &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + } + if ($fwdfwsettings{'nobase'} eq 'on'){ + &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + } + if ($fwdfwsettings{'nosave2'} ne 'on'){ + &saverule(%configoutgoingfw,$configoutgoing); + } } }else{ #FORWARD PART @@ -292,21 +296,23 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') } } #increase counters - &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}}); - &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}}); - if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){ - &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') { - &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0); - }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){ - &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - } - if ($fwdfwsettings{'nobase'} eq 'on'){ - &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); - } - if ($fwdfwsettings{'nosave2'} ne 'on'){ - &saverule(%configfwdfw,$configfwdfw); - } + if (!$errormessage){ + &checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}}); + &checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}}); + if($fwdfwsettings{'oldusesrv'} eq '' && $fwdfwsettings{'USESRV'} eq 'ON'){ + &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + }elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') { + &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0); + }elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){ + &checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + } + if ($fwdfwsettings{'nobase'} eq 'on'){ + &checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}); + } + if ($fwdfwsettings{'nosave2'} ne 'on'){ + &saverule(%configfwdfw,$configfwdfw); + } + } } if ($errormessage){ &newrule; diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 7ed27c4..2d4c69f 100755 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -47,8 +47,7 @@ my %ipsecsettings=(); my %fwfwd=(); my %fwinp=(); my %ovpnsettings=(); -my %ipsecconf=(); -my %ipsecsettings=(); +

my $errormessage; my $hint; @@ -65,7 +64,6 @@ my $fwconfigfwd = "${General::swroot}/forward/config"; my $fwconfiginp = "${General::swroot}/forward/input"; my $configovpn = "${General::swroot}/ovpn/settings"; my $tdcolor=''; -my $configipsec = "${General::swroot}/vpn/config"; my $configipsecrw = "${General::swroot}/vpn/settings";

unless (-e $confignet) { system("touch $confignet"); } @@ -179,6 +177,13 @@ if ($fwhostsettings{'ACTION'} eq 'updateservice') $fwhostsettings{'ICMP_TYPES'}='BLANK'; } my $key1 = &General::findhasharraykey(%customservice); + #find out short ICMP-TYPE + &General::readhasharray("${General::swroot}/fwhosts/icmp-types", %icmptypes); + foreach my $key (keys %icmptypes){ + if ("$icmptypes{$key}[0] ($icmptypes{$key}[1])" eq $fwhostsettings{'ICMP_TYPES'}){ + $fwhostsettings{'ICMP_TYPES'}=$icmptypes{$key}[0]; + } + } foreach my $i (0 .. 4) { $customservice{$key1}[$i] = "";} $customservice{$key1}[0] = $fwhostsettings{'SRV_NAME'}; $customservice{$key1}[1] = $fwhostsettings{'SRV_PORT'}; @@ -222,15 +227,22 @@ if ($fwhostsettings{'ACTION'} eq 'updateservice') if($count gt 0 && $fwhostsettings{'oldsrvprot'} ne $fwhostsettings{'PROT'} ){ $needrules='on'; } + if($count gt 0 && $fwhostsettings{'oldsrvicmp'} ne $fwhostsettings{'ICMP'} ){ + $needrules='on'; + } $fwhostsettings{'SRV_NAME'} = ''; $fwhostsettings{'SRV_PORT'} = ''; $fwhostsettings{'PROT'} = ''; + $fwhostsettings{'ICMP'} = ''; + $fwhostsettings{'oldsrvicmp'} = ''; }else{ $fwhostsettings{'SRV_NAME'} = $fwhostsettings{'oldsrvname'}; $fwhostsettings{'SRV_PORT'} = $fwhostsettings{'oldsrvport'}; $fwhostsettings{'PROT'} = $fwhostsettings{'oldsrvprot'}; + $fwhostsettings{'ICMP'} = $fwhostsettings{'oldsrvicmp'}; $fwhostsettings{'updatesrv'}= 'on'; } + $fwhostsettings{'updatesrv'} = ''; if($needrules eq 'on'){ &rules; } @@ -1289,6 +1301,7 @@ sub addservice $fwhostsettings{'oldsrvname'} = $fwhostsettings{'SRV_NAME'}; $fwhostsettings{'oldsrvport'} = $fwhostsettings{'SRV_PORT'}; $fwhostsettings{'oldsrvprot'} = $fwhostsettings{'PROT'}; + $fwhostsettings{'oldsrvicmp'} = $fwhostsettings{'ICMP'}; } print<<END; <table width='100%' border='0'><form method='post'> @@ -1311,9 +1324,12 @@ END &General::readhasharray("${General::swroot}/fwhosts/icmp-types", %icmptypes); print"<option>All ICMP-Types</option>"; foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){ - print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>"; + if ($icmptypes{$key}[0] eq $fwhostsettings{'oldsrvicmp'}){ + print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>"; + }else{ + print"<option>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>"; + } } - print<<END; </select></td></tr> <tr><td width='10%'>$Lang::tr{'fwhost port'}:</td><td><input type='text' name='SRV_PORT' value='$fwhostsettings{'SRV_PORT'}' maxlength='11' size='24'></td></tr> @@ -1327,7 +1343,9 @@ END <input type='hidden' name='ACTION' value='updateservice'> <input type='hidden' name='oldsrvname' value='$fwhostsettings{'oldsrvname'}'> <input type='hidden' name='oldsrvport' value='$fwhostsettings{'oldsrvport'}'> - <input type='hidden' name='oldsrvprot' value='$fwhostsettings{'oldsrvprot'}'></form> + <input type='hidden' name='oldsrvprot' value='$fwhostsettings{'oldsrvprot'}'> + <input type='hidden' name='oldsrvicmp' value='$fwhostsettings{'oldsrvicmp'}'> + </form> END }else{ @@ -1647,7 +1665,8 @@ END <td width='1%'><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /><input type='hidden' name='ACTION' value='editservice' /> <input type='hidden' name='SRV_NAME' value='$customservice{$key}[0]' /> <input type='hidden' name='SRV_PORT' value='$customservice{$key}[1]' /> - <input type='hidden' name='PROT' value='$customservice{$key}[2]' /></form></td> + <input type='hidden' name='PROT' value='$customservice{$key}[2]' /> + <input type='hidden' name='ICMP' value='$customservice{$key}[3]' /></form></td> END if ($customservice{$key}[4] eq '0') { diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 6e38b0a..f07e49d 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -37,6 +37,8 @@ PAK_VER = 6

DEPS = ""

+CFLAGS += -fno-PIC + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index 749011f..af2b148 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -84,7 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c - cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in + cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am + cd $(DIR_APP) && autoconf

ifeq "$(PASS)" "" cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 0ee9c3e..e2df5cc 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -35,6 +35,9 @@ PAK_VER = 4

DEPS = "ffmpeg-libs sdl lame libvorbis xvid"

+# Don't use PIC for libavcodec +CFLAGS += -fno-PIC -fno-strict-aliasing + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/iotop b/lfs/iotop new file mode 100644 index 0000000..fd0002b --- /dev/null +++ b/lfs/iotop @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 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 3 of the License, or # +# (at your option) any later version. # +# # +# 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 this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.6 + +THISAPP = iotop-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +PROG = iotop +PAK_VER = 1 +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 080fbb494566b5291a2a27cf6c203562 + +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) && python setup.py install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libxml2 b/lfs/libxml2 index 08ea864..4a25c4c 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -24,7 +24,7 @@

include Config

-VER = 2.6.26 +VER = 2.6.32

THISAPP = libxml2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)

+CFLAGS += -fno-strict-aliasing + ############################################################################### # Top-level Rules ############################################################################### @@ -40,7 +42,7 @@ objects = $(DL_FILE)

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

-$(DL_FILE)_MD5 = 2d8d3805041edab967368b497642f981 +$(DL_FILE)_MD5 = 2621d322c16f0257e30f0ff2b13384de

install : $(TARGET)

diff --git a/lfs/lzo b/lfs/lzo index e7f29e8..69bc5cd 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -24,7 +24,7 @@

include Config

-VER = 2.02 +VER = 2.06

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

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

-$(DL_FILE)_MD5 = 6760e5819f4238328709bf93bf10071c +$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8

install : $(TARGET)

diff --git a/lfs/mbr b/lfs/mbr deleted file mode 100644 index c43f2fd..0000000 --- a/lfs/mbr +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# 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 this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.1.11 - -THISAPP = mbr-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 4e406ded185f94c2d2bf5fc793ac1842 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/openvmtools b/lfs/openvmtools index 229ed8f..baae595 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -37,6 +37,8 @@ PAK_VER = 1

DEPS = ""

+CFLAGS += -fno-PIC + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/transmission b/lfs/transmission index 3c1368d..51c2fbd 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -36,6 +36,8 @@ PAK_VER = 9

DEPS = "libevent2"

+CXXFLAGS += -fno-exceptions + ############################################################################### # Top-level Rules ############################################################################### diff --git a/make.sh b/make.sh index 4d37960..2ada028 100755 --- a/make.sh +++ b/make.sh @@ -771,6 +771,7 @@ buildipfire() { ipfiremake arm ipfiremake wavemon ipfiremake iptraf-ng + ipfiremake iotop echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -800,7 +801,6 @@ buildinstaller() { LOGFILE="$BASEDIR/log/_build.installer.log" export LOGFILE ipfiremake as86 - ipfiremake mbr ipfiremake memtest ipfiremake installer installmake strip diff --git a/src/patches/coreutils-5.96-uname-1.patch b/src/patches/coreutils-5.96-uname-1.patch index a05ae04..0ae413f 100644 --- a/src/patches/coreutils-5.96-uname-1.patch +++ b/src/patches/coreutils-5.96-uname-1.patch @@ -1,34 +1,53 @@ -Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org> -Date: 2005-10-23 -Initial Package Version: 5.92 +Submitted By: Robert Connolly robert@linuxfromscratch.org (ashes) +Date: 2005-11-13 +Initial Package Version: 5.93 Upstream Status: pending -Origin: Scot McPherson -Description: Fix the output of uname once and for all. +Origin: Scot McPherson and Zack Winkles +Description: Fix the output of uname once and for all. This is the position independent +version.

- $ uname -m # This always worked. + $ uname -m # This always worked. i686 - $ uname -i # Used to report 'unknown'. + $ uname -i # Used to report 'unknown'. i386 - $ uname -p # Likewise. + $ uname -p # Likewise. athlon-4

-diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c ---- coreutils-5.92.orig/src/uname.c 2005-09-15 20:34:42.000000000 +0000 -+++ coreutils-5.92/src/uname.c 2005-10-23 10:14:06.000000000 +0000 -@@ -29,6 +29,12 @@ +Now 'uname -p' can be used by GCC's mtune/mcpu and march options. For example: + + CFLAGS="-march=$(uname -m) -mtune=$(uname -p)" + +diff -Naur coreutils-5.93.orig/src/uname.c coreutils-5.93/src/uname.c +--- coreutils-5.93.orig/src/uname.c 2005-09-15 19:57:04.000000000 +0000 ++++ coreutils-5.93/src/uname.c 2005-11-13 19:18:35.000000000 +0000 +@@ -29,6 +29,26 @@ # include <sys/systeminfo.h> #endif

+#ifdef linux -+#define cpuid(in,a,b,c,d)\ -+ asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in)); ++/* Thanks to the ffmpeg team for this PIC version of cpuid() */ ++#ifdef ARCH_X86_64 ++# define REG_b "rbx" ++# define REG_S "rsi" ++#else ++# define REG_b "ebx" ++# define REG_S "esi" ++#endif ++#define cpuid(index,eax,ebx,ecx,edx)\ ++ __asm __volatile\ ++ ("mov %%"REG_b", %%"REG_S"\n\t"\ ++ "cpuid\n\t"\ ++ "xchg %%"REG_b", %%"REG_S\ ++ : "=a" (eax), "=S" (ebx),\ ++ "=c" (ecx), "=d" (edx)\ ++ : "0" (index)); +int has_sse( void ); +#endif + #if HAVE_SYS_SYSCTL_H # if HAVE_SYS_PARAM_H # include <sys/param.h> /* needed for OpenBSD 3.0 */ -@@ -256,6 +262,96 @@ +@@ -256,6 +276,99 @@ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) element = processor; } @@ -75,6 +94,9 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c + element="pentium3"; + break; + case 15: // Pentium4 ++ if( model == 3 ) // Prescott ++ element="prescott"; ++ else + element="pentium4"; + break; + default: @@ -125,7 +147,7 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c #endif #ifdef UNAME_PROCESSOR if (element == unknown) -@@ -293,7 +389,7 @@ +@@ -293,7 +406,7 @@

if (toprint & PRINT_HARDWARE_PLATFORM) { @@ -134,7 +156,7 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c #if HAVE_SYSINFO && defined SI_PLATFORM { static char hardware_platform[257]; -@@ -301,6 +397,15 @@ +@@ -301,6 +414,15 @@ hardware_platform, sizeof hardware_platform)) element = hardware_platform; } @@ -150,7 +172,7 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c #endif #ifdef UNAME_HARDWARE_PLATFORM if (element == unknown) -@@ -323,3 +428,29 @@ +@@ -323,3 +445,29 @@

exit (EXIT_SUCCESS); } diff --git a/tools/make-functions b/tools/make-functions index 7bacec1..6d77db4 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -222,25 +222,25 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then MACHINE=i586 CROSSTARGET=${MACHINE}-cross-linux-gnu BUILDTARGET=i586-pc-linux-gnu - CFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" - CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" - C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" - CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" + CFLAGS_ARCH="${GLOBAL_CFLAGS} -march=i586 -fomit-frame-pointer" elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv6l' = $MACHINE -o 'armv7l' = $MACHINE ]; then echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE MACHINE=armv5tel MACHINE_TYPE=arm CROSSTARGET=${MACHINE}-cross-linux-gnueabi BUILDTARGET=${MACHINE}-unknown-linux-gnueabi - CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe" - CXXFLAGS="$CFLAGS" - C2FLAGS="$CFLAGS" - CXX2FLAGS="$CXXFLAGS" + CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer" else echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" exit 1 fi

+CFLAGS="-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC" +CFLAGS="${CFLAGS} -fstack-protector-all --param=ssp-buffer-size=4 ${CFLAGS_ARCH}" +CXXFLAGS="${CFLAGS}" +C2FLAGS="${CFLAGS}" +CXX2FLAGS="${CXXFLAGS}" + # Define immediately stdumount() { umount $BASEDIR/build/sys 2>/dev/null;

hooks/post-receive -- IPFire 2.x development tree