]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq
authorMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 19:40:16 +0000 (21:40 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 19:40:16 +0000 (21:40 +0200)
188 files changed:
config/backup/includes/cyrus-imapd [new file with mode: 0644]
config/backup/includes/netsnmpd [new file with mode: 0644]
config/cfgroot/network-functions.pl
config/firewall/p2protocols
config/rootfiles/common/libnet
config/rootfiles/common/libtool
config/rootfiles/common/libxml2
config/rootfiles/common/libxslt
config/rootfiles/common/newt
config/rootfiles/common/pcre
config/rootfiles/common/slang
config/rootfiles/common/web-user-interface
config/rootfiles/core/89/update.sh
config/rootfiles/core/90/exclude
config/rootfiles/core/90/filelists/files
config/rootfiles/core/90/filelists/openldap [new symlink]
config/rootfiles/core/90/update.sh
config/rootfiles/core/91/exclude [new file with mode: 0644]
config/rootfiles/core/91/filelists/files [new file with mode: 0644]
config/rootfiles/core/91/filelists/i586/openssl-sse2 [new symlink]
config/rootfiles/core/91/filelists/i586/strongswan-padlock [new symlink]
config/rootfiles/core/91/filelists/libnet [new symlink]
config/rootfiles/core/91/filelists/libtool [new symlink]
config/rootfiles/core/91/filelists/libxml2 [new symlink]
config/rootfiles/core/91/filelists/libxslt [new symlink]
config/rootfiles/core/91/filelists/newt [new symlink]
config/rootfiles/core/91/filelists/openssh [new symlink]
config/rootfiles/core/91/filelists/openssl [new symlink]
config/rootfiles/core/91/filelists/pcre [new symlink]
config/rootfiles/core/91/filelists/slang [new symlink]
config/rootfiles/core/91/filelists/strongswan [new symlink]
config/rootfiles/core/91/meta [new file with mode: 0644]
config/rootfiles/core/91/update.sh [new file with mode: 0644]
config/rootfiles/packages/cyrus-imapd
config/rootfiles/packages/netsnmpd
config/urlfilter/autoupdate.pl
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.it
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
html/cgi-bin/connections.cgi
html/cgi-bin/country.cgi
html/cgi-bin/dhcp.cgi
html/cgi-bin/geoip-block.cgi
html/cgi-bin/pppsetup.cgi
html/cgi-bin/vpnmain.cgi
html/cgi-bin/webaccess.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/cyrus-imapd
lfs/dnsmasq
lfs/elinks
lfs/libnet
lfs/libtool
lfs/libxml2
lfs/libxslt
lfs/linux
lfs/netsnmpd
lfs/newt
lfs/openssh
lfs/openssl
lfs/pcre
lfs/postfix
lfs/python-optional-src
lfs/sarg
lfs/slang
lfs/strongswan
lfs/tor
lfs/vsftpd
make.sh
src/initscripts/init.d/firstsetup
src/misc-progs/rebuildhosts.c
src/pakfire/lib/functions.pl
src/pakfire/pakfire
src/paks/cyrus-imapd/uninstall.sh
src/paks/linux-pae/install.sh
src/paks/netsnmpd/install.sh [moved from src/paks/net-snmp/install.sh with 100% similarity]
src/paks/netsnmpd/uninstall.sh [moved from src/paks/net-snmp/uninstall.sh with 98% similarity]
src/paks/netsnmpd/update.sh [moved from src/paks/net-snmp/update.sh with 100% similarity]
src/paks/postfix/install.sh
src/paks/postfix/uninstall.sh
src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch
src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch
src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch
src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch
src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch
src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch
src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch
src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch
src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch
src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch
src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch
src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch
src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch
src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch
src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch
src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch
src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch
src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch
src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch
src/patches/dnsmasq/0020-Initialise-return-value.patch
src/patches/dnsmasq/0021-Add-ignore-address-option.patch
src/patches/dnsmasq/0022-Bad-packet-protection.patch
src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch
src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch
src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch
src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch
src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch
src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch
src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch
src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch
src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch
src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch
src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch
src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch
src/patches/dnsmasq/0035-Update-German-translation.patch
src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch
src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch
src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch
src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch
src/patches/dnsmasq/0040-inotify-documentation-updates.patch
src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch
src/patches/dnsmasq/0042-BSD-make-support.patch
src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch
src/patches/dnsmasq/0044-Manpage-typo-fix.patch
src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch
src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch
src/patches/dnsmasq/0047-man-page-typo.patch
src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch
src/patches/dnsmasq/0049-Typos.patch
src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch
src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch
src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch
src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch
src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch
src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch
src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch
src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch
src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch
src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch
src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch
src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch
src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch
src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch
src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch
src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch
src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch
src/patches/dnsmasq/0067-Merge-message-translations.patch
src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch
src/patches/dnsmasq/0069-Whitespace-fixes.patch
src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch
src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch
src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch
src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch
src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch
src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch
src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch
src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch
src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch
src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch
src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch
src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch
src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch
src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch
src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch
src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch
src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch
src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch
src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch [new file with mode: 0644]
src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch [new file with mode: 0644]
src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch [new file with mode: 0644]
src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch
src/patches/dnsmasq/0093-Tweak-last-commit.patch [new file with mode: 0644]
src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch [new file with mode: 0644]
src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch [new file with mode: 0644]
src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch [new file with mode: 0644]
src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch [new file with mode: 0644]
src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch [new file with mode: 0644]
src/patches/openssl-1.0.2-fix_parallel_build-1.patch [new file with mode: 0644]
src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch [deleted file]
src/patches/strongswan-5.3.1-build-timeattack.patch [new file with mode: 0644]

diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd
new file mode 100644 (file)
index 0000000..bb1bb3b
--- /dev/null
@@ -0,0 +1,4 @@
+/usr/sieve
+/var/imap
+/var/ipfire/cyrusimap
+/var/log/imap
diff --git a/config/backup/includes/netsnmpd b/config/backup/includes/netsnmpd
new file mode 100644 (file)
index 0000000..78ac6ac
--- /dev/null
@@ -0,0 +1 @@
+/etc/snmpd.conf
index 029ffc09eee5308dddc5d777e7eb11417e347e3b..1cd2814ec1b0c32f3592b36a377ca15060dab6b2 100644 (file)
@@ -23,6 +23,8 @@
 
 package Network;
 
+require "/var/ipfire/general-functions.pl";
+
 use Socket;
 
 my %PREFIX2NETMASK = (
@@ -244,6 +246,31 @@ sub ip_address_in_network($$) {
        return (($address_bin ge $network_bin) && ($address_bin le $broadcast_bin));
 }
 
+sub setup_upstream_proxy() {
+       my %proxysettings = ();
+       &General::readhash("${General::swroot}/proxy/settings", \%proxysettings);
+
+       if ($proxysettings{'UPSTREAM_PROXY'}) {
+               my $credentials = "";
+
+               if ($proxysettings{'UPSTREAM_USER'}) {
+                       $credentials = $proxysettings{'UPSTREAM_USER'};
+
+                       if ($proxysettings{'UPSTREAM_PASSWORD'}) {
+                               $credentials .= ":" . $proxysettings{'UPSTREAM_PASSWORD'};
+                       }
+
+                       $credentials .= "@";
+               }
+
+               my $proxy = "http://" . $credentials . $proxysettings{'UPSTREAM_PROXY'};
+
+               $ENV{'http_proxy'} = $proxy;
+               $ENV{'https_proxy'} = $proxy;
+               $ENV{'ftp_proxy'} = $proxy;
+       }
+}
+
 1;
 
 # Remove the next line to enable the testsuite
index 70005812684e5b4a3e9795107c7e4d89dcc0f3a0..d8998095c1177c376c358171b2fadf269e0cde61 100644 (file)
@@ -1,9 +1,9 @@
-Applejuice;apple;off;
-Ares;ares;off;
-Bittorrent;bit;off;
-DirectConnect;dc;off;
-Edonkey;edk;off;
-Gnutella;gnu;off;
-KaZaA;kazaa;off;
-SoulSeek;soul;off;
-WinMX;winmx;off;
+Applejuice;apple;on;
+Ares;ares;on;
+Bittorrent;bit;on;
+DirectConnect;dc;on;
+Edonkey;edk;on;
+Gnutella;gnu;on;
+KaZaA;kazaa;on;
+SoulSeek;soul;on;
+WinMX;winmx;on;
index 8fe7c1791ee09676a05024ae0c8e4e55ce3e2022..e36695e93dafbe722c8bf70f632df4147141437f 100644 (file)
@@ -1,3 +1,4 @@
+#usr/bin/libnet-config
 #usr/include/libnet
 #usr/include/libnet.h
 #usr/include/libnet/libnet-asn1.h
@@ -7,3 +8,10 @@
 #usr/include/libnet/libnet-structures.h
 #usr/include/libnet/libnet-types.h
 #usr/lib/libnet.a
+#usr/lib/libnet.la
+#usr/lib/libnet.so
+#usr/lib/libnet.so.1
+#usr/lib/libnet.so.1.7.0
+#usr/share/man/man3/libnet-functions.h.3
+#usr/share/man/man3/libnet-macros.h.3
+#usr/share/man/man3/libnet.h.3
index 5646be25ab600f9badfdb85843ca019911613339..23753c79ee92fb1b59a3c31334be642bf082b7dc 100644 (file)
@@ -9,9 +9,10 @@
 #usr/lib/libltdl.la
 usr/lib/libltdl.so
 usr/lib/libltdl.so.7
-usr/lib/libltdl.so.7.3.0
+usr/lib/libltdl.so.7.3.1
 #usr/share/aclocal/argz.m4
 #usr/share/aclocal/libtool.m4
+#usr/share/aclocal/ltargz.m4
 #usr/share/aclocal/ltdl.m4
 #usr/share/aclocal/ltoptions.m4
 #usr/share/aclocal/ltsugar.m4
@@ -21,6 +22,32 @@ usr/lib/libltdl.so.7.3.0
 #usr/share/info/libtool.info-1
 #usr/share/info/libtool.info-2
 #usr/share/libtool
+#usr/share/libtool/config-h.in
+#usr/share/libtool/configure
+#usr/share/libtool/configure.ac
+#usr/share/libtool/COPYING.LIB
+#usr/share/libtool/Makefile.am
+#usr/share/libtool/Makefile.in
+#usr/share/libtool/README
+#usr/share/libtool/aclocal.m4
+#usr/share/libtool/lt__alloc.c
+#usr/share/libtool/lt__argz.c
+#usr/share/libtool/lt__dirent.c
+#usr/share/libtool/lt__strl.c
+#usr/share/libtool/lt_dlloader.c
+#usr/share/libtool/lt_error.c
+#usr/share/libtool/ltdl.c
+#usr/share/libtool/ltdl.h
+#usr/share/libtool/ltdl.mk
+#usr/share/libtool/slist.c
+#usr/share/libtool/build-aux
+#usr/share/libtool/build-aux/compile
+#usr/share/libtool/build-aux/config.guess
+#usr/share/libtool/build-aux/config.sub
+#usr/share/libtool/build-aux/depcomp
+#usr/share/libtool/build-aux/install-sh
+#usr/share/libtool/build-aux/ltmain.sh
+#usr/share/libtool/build-aux/missing
 #usr/share/libtool/config
 #usr/share/libtool/config/compile
 #usr/share/libtool/config/config.guess
@@ -41,6 +68,24 @@ usr/lib/libltdl.so.7.3.0
 #usr/share/libtool/libltdl/config-h.in
 #usr/share/libtool/libltdl/configure
 #usr/share/libtool/libltdl/configure.ac
+#usr/share/libtool/libltdl/lt__alloc.c
+#usr/share/libtool/libltdl/lt__dirent.c
+#usr/share/libtool/libltdl/lt__strl.c
+#usr/share/libtool/libltdl/lt_dlloader.c
+#usr/share/libtool/libltdl/lt_error.c
+#usr/share/libtool/libltdl/ltdl.c
+#usr/share/libtool/libltdl/ltdl.h
+#usr/share/libtool/libltdl/slist.c
+#usr/share/libtool/libltdl/lt__alloc.h
+#usr/share/libtool/libltdl/lt__argz_.h
+#usr/share/libtool/libltdl/lt__dirent.h
+#usr/share/libtool/libltdl/lt__glibc.h
+#usr/share/libtool/libltdl/lt__private.h
+#usr/share/libtool/libltdl/lt__strl.h
+#usr/share/libtool/libltdl/lt_dlloader.h
+#usr/share/libtool/libltdl/lt_error.h
+#usr/share/libtool/libltdl/lt_system.h
+#usr/share/libtool/libltdl/slist.h
 #usr/share/libtool/libltdl/libltdl
 #usr/share/libtool/libltdl/libltdl/lt__alloc.h
 #usr/share/libtool/libltdl/libltdl/lt__dirent.h
@@ -59,13 +104,13 @@ usr/lib/libltdl.so.7.3.0
 #usr/share/libtool/libltdl/loaders/loadlibrary.c
 #usr/share/libtool/libltdl/loaders/preopen.c
 #usr/share/libtool/libltdl/loaders/shl_load.c
-#usr/share/libtool/libltdl/lt__alloc.c
-#usr/share/libtool/libltdl/lt__dirent.c
-#usr/share/libtool/libltdl/lt__strl.c
-#usr/share/libtool/libltdl/lt_dlloader.c
-#usr/share/libtool/libltdl/lt_error.c
-#usr/share/libtool/libltdl/ltdl.c
-#usr/share/libtool/libltdl/ltdl.h
-#usr/share/libtool/libltdl/slist.c
+#usr/share/libtool/loaders
+#usr/share/libtool/loaders/dld_link.c
+#usr/share/libtool/loaders/dlopen.c
+#usr/share/libtool/loaders/dyld.c
+#usr/share/libtool/loaders/load_add_on.c
+#usr/share/libtool/loaders/loadlibrary.c
+#usr/share/libtool/loaders/preopen.c
+#usr/share/libtool/loaders/shl_load.c
 #usr/share/man/man1/libtool.1
 #usr/share/man/man1/libtoolize.1
index 07c1edda52a9062292fc3d1752d0559be475f746..1298651712ca5c791ba93149102f5757d20cbaae 100644 (file)
 #usr/include/libxml2/libxml/xpath.h
 #usr/include/libxml2/libxml/xpathInternals.h
 #usr/include/libxml2/libxml/xpointer.h
+#usr/lib/cmake
+#usr/lib/cmake/libxml2
+#usr/lib/cmake/libxml2/libxml2-config.cmake
 #usr/lib/libxml2.a
 #usr/lib/libxml2.la
 usr/lib/libxml2.so
 usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.6.32
+usr/lib/libxml2.so.2.9.2
 #usr/lib/pkgconfig/libxml-2.0.pc
 usr/lib/python2.7/site-packages/drv_libxml2.py
 usr/lib/python2.7/site-packages/libxml2.py
@@ -63,218 +66,220 @@ usr/lib/python2.7/site-packages/libxml2.py
 usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/lib/xml2Conf.sh
 #usr/share/aclocal/libxml.m4
-#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/doc/libxml2-2.9.2
+#usr/share/doc/libxml2-2.9.2/Copyright
+#usr/share/doc/libxml2-2.9.2/examples
+#usr/share/doc/libxml2-2.9.2/examples/testHTML.c
+#usr/share/doc/libxml2-2.9.2/examples/testSAX.c
+#usr/share/doc/libxml2-2.9.2/examples/testXPath.c
+#usr/share/doc/libxml2-2.9.2/examples/xmllint.c
+#usr/share/doc/libxml2-2.9.2/html
+#usr/share/doc/libxml2-2.9.2/html/DOM.gif
+#usr/share/doc/libxml2-2.9.2/html/FAQ.html
+#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-180x168.gif
+#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-90x34.gif
+#usr/share/doc/libxml2-2.9.2/html/encoding.html
+#usr/share/doc/libxml2-2.9.2/html/examples.xml
+#usr/share/doc/libxml2-2.9.2/html/examples.xsl
+#usr/share/doc/libxml2-2.9.2/html/html
+#usr/share/doc/libxml2-2.9.2/html/html/book1.html
+#usr/share/doc/libxml2-2.9.2/html/html/home.png
+#usr/share/doc/libxml2-2.9.2/html/html/index.html
+#usr/share/doc/libxml2-2.9.2/html/html/left.png
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-DOCBparser.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLparser.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLtree.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX2.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-c14n.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-catalog.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-chvalid.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-debugXML.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-dict.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-encoding.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-entities.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-globals.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-hash.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-lib.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-list.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanoftp.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanohttp.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-parser.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-parserInternals.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-pattern.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-relaxng.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-schemasInternals.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-schematron.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-threads.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-tree.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-uri.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-valid.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xinclude.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xlink.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlIO.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlautomata.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlerror.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlexports.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmemory.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmodule.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlreader.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlregexp.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlsave.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemas.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemastypes.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlstring.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlunicode.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlversion.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlwriter.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpath.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpathInternals.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpointer.html
+#usr/share/doc/libxml2-2.9.2/html/html/libxml-xzlib.html
+#usr/share/doc/libxml2-2.9.2/html/html/right.png
+#usr/share/doc/libxml2-2.9.2/html/html/up.png
+#usr/share/doc/libxml2-2.9.2/html/index.html
+#usr/share/doc/libxml2-2.9.2/html/io1.c
+#usr/share/doc/libxml2-2.9.2/html/io1.res
+#usr/share/doc/libxml2-2.9.2/html/io2.c
+#usr/share/doc/libxml2-2.9.2/html/io2.res
+#usr/share/doc/libxml2-2.9.2/html/libxml.gif
+#usr/share/doc/libxml2-2.9.2/html/parse1.c
+#usr/share/doc/libxml2-2.9.2/html/parse2.c
+#usr/share/doc/libxml2-2.9.2/html/parse3.c
+#usr/share/doc/libxml2-2.9.2/html/parse4.c
+#usr/share/doc/libxml2-2.9.2/html/reader1.c
+#usr/share/doc/libxml2-2.9.2/html/reader1.res
+#usr/share/doc/libxml2-2.9.2/html/reader2.c
+#usr/share/doc/libxml2-2.9.2/html/reader3.c
+#usr/share/doc/libxml2-2.9.2/html/reader3.res
+#usr/share/doc/libxml2-2.9.2/html/reader4.c
+#usr/share/doc/libxml2-2.9.2/html/reader4.res
+#usr/share/doc/libxml2-2.9.2/html/redhat.gif
+#usr/share/doc/libxml2-2.9.2/html/smallfootonly.gif
+#usr/share/doc/libxml2-2.9.2/html/structure.gif
+#usr/share/doc/libxml2-2.9.2/html/test1.xml
+#usr/share/doc/libxml2-2.9.2/html/test2.xml
+#usr/share/doc/libxml2-2.9.2/html/test3.xml
+#usr/share/doc/libxml2-2.9.2/html/testWriter.c
+#usr/share/doc/libxml2-2.9.2/html/tree1.c
+#usr/share/doc/libxml2-2.9.2/html/tree1.res
+#usr/share/doc/libxml2-2.9.2/html/tree2.c
+#usr/share/doc/libxml2-2.9.2/html/tree2.res
+#usr/share/doc/libxml2-2.9.2/html/tst.xml
+#usr/share/doc/libxml2-2.9.2/html/tutorial
+#usr/share/doc/libxml2-2.9.2/html/tutorial/apa.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/apb.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/apc.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/apd.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ape.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/apf.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/apg.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/aph.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/api.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s02.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s03.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s04.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s05.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s06.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s07.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s08.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s09.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/blank.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/1.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/10.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/2.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/3.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/4.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/5.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/6.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/7.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/8.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/9.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/caution.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/draft.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/home.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/important.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/next.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/note.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/prev.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/tip.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-blank.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-minus.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-plus.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/up.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/images/warning.png
+#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddattribute.c
+#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddkeyword.c
+#usr/share/doc/libxml2-2.9.2/html/tutorial/includeconvert.c
+#usr/share/doc/libxml2-2.9.2/html/tutorial/includegetattribute.c
+#usr/share/doc/libxml2-2.9.2/html/tutorial/includekeyword.c
+#usr/share/doc/libxml2-2.9.2/html/tutorial/includexpath.c
+#usr/share/doc/libxml2-2.9.2/html/tutorial/index.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/ix01.html
+#usr/share/doc/libxml2-2.9.2/html/tutorial/xmltutorial.pdf
+#usr/share/doc/libxml2-2.9.2/html/w3c.png
+#usr/share/doc/libxml2-2.9.2/html/writer.xml
+#usr/share/doc/libxml2-2.9.2/html/xml.html
+#usr/share/doc/libxml2-2.9.2/html/xpath1.c
+#usr/share/doc/libxml2-2.9.2/html/xpath1.res
+#usr/share/doc/libxml2-2.9.2/html/xpath2.c
+#usr/share/doc/libxml2-2.9.2/html/xpath2.res
+#usr/share/doc/libxml2-python-2.9.2
+#usr/share/doc/libxml2-python-2.9.2/TODO
+#usr/share/doc/libxml2-python-2.9.2/examples
+#usr/share/doc/libxml2-python-2.9.2/examples/attribs.py
+#usr/share/doc/libxml2-python-2.9.2/examples/build.py
+#usr/share/doc/libxml2-python-2.9.2/examples/compareNodes.py
+#usr/share/doc/libxml2-python-2.9.2/examples/ctxterror.py
+#usr/share/doc/libxml2-python-2.9.2/examples/cutnpaste.py
+#usr/share/doc/libxml2-python-2.9.2/examples/dtdvalid.py
+#usr/share/doc/libxml2-python-2.9.2/examples/error.py
+#usr/share/doc/libxml2-python-2.9.2/examples/inbuf.py
+#usr/share/doc/libxml2-python-2.9.2/examples/indexes.py
+#usr/share/doc/libxml2-python-2.9.2/examples/input_callback.py
+#usr/share/doc/libxml2-python-2.9.2/examples/invalid.xml
+#usr/share/doc/libxml2-python-2.9.2/examples/nsdel.py
+#usr/share/doc/libxml2-python-2.9.2/examples/outbuf.py
+#usr/share/doc/libxml2-python-2.9.2/examples/push.py
+#usr/share/doc/libxml2-python-2.9.2/examples/pushSAX.py
+#usr/share/doc/libxml2-python-2.9.2/examples/pushSAXhtml.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader2.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader3.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader4.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader5.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader6.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader7.py
+#usr/share/doc/libxml2-python-2.9.2/examples/reader8.py
+#usr/share/doc/libxml2-python-2.9.2/examples/readererr.py
+#usr/share/doc/libxml2-python-2.9.2/examples/readernext.py
+#usr/share/doc/libxml2-python-2.9.2/examples/regexp.py
+#usr/share/doc/libxml2-python-2.9.2/examples/relaxng.py
+#usr/share/doc/libxml2-python-2.9.2/examples/resolver.py
+#usr/share/doc/libxml2-python-2.9.2/examples/schema.py
+#usr/share/doc/libxml2-python-2.9.2/examples/serialize.py
+#usr/share/doc/libxml2-python-2.9.2/examples/sync.py
+#usr/share/doc/libxml2-python-2.9.2/examples/test.dtd
+#usr/share/doc/libxml2-python-2.9.2/examples/thread2.py
+#usr/share/doc/libxml2-python-2.9.2/examples/tst.py
+#usr/share/doc/libxml2-python-2.9.2/examples/tst.xml
+#usr/share/doc/libxml2-python-2.9.2/examples/tstLastError.py
+#usr/share/doc/libxml2-python-2.9.2/examples/tstURI.py
+#usr/share/doc/libxml2-python-2.9.2/examples/tstmem.py
+#usr/share/doc/libxml2-python-2.9.2/examples/tstxpath.py
+#usr/share/doc/libxml2-python-2.9.2/examples/valid.xml
+#usr/share/doc/libxml2-python-2.9.2/examples/validDTD.py
+#usr/share/doc/libxml2-python-2.9.2/examples/validRNG.py
+#usr/share/doc/libxml2-python-2.9.2/examples/validSchemas.py
+#usr/share/doc/libxml2-python-2.9.2/examples/validate.py
+#usr/share/doc/libxml2-python-2.9.2/examples/walker.py
+#usr/share/doc/libxml2-python-2.9.2/examples/xpath.py
+#usr/share/doc/libxml2-python-2.9.2/examples/xpathext.py
+#usr/share/doc/libxml2-python-2.9.2/examples/xpathleak.py
+#usr/share/doc/libxml2-python-2.9.2/examples/xpathns.py
+#usr/share/doc/libxml2-python-2.9.2/examples/xpathret.py
 #usr/share/gtk-doc/html/libxml2
 #usr/share/gtk-doc/html/libxml2/general.html
 #usr/share/gtk-doc/html/libxml2/home.png
index a6e2ab39a3b03991378330634339d029f7a71207..be00b2426c2bb91047b57a039e024c8481d7dfa6 100644 (file)
@@ -24,18 +24,19 @@ usr/bin/xsltproc
 #usr/include/libxslt/xsltInternals.h
 #usr/include/libxslt/xsltconfig.h
 #usr/include/libxslt/xsltexports.h
+#usr/include/libxslt/xsltlocale.h
 #usr/include/libxslt/xsltutils.h
 #usr/lib/libexslt.a
 #usr/lib/libexslt.la
 usr/lib/libexslt.so
 usr/lib/libexslt.so.0
-usr/lib/libexslt.so.0.8.13
+usr/lib/libexslt.so.0.8.17
 #usr/lib/libxslt-plugins
 #usr/lib/libxslt.a
 #usr/lib/libxslt.la
 usr/lib/libxslt.so
 usr/lib/libxslt.so.1
-usr/lib/libxslt.so.1.1.17
+usr/lib/libxslt.so.1.1.28
 #usr/lib/pkgconfig/libexslt.pc
 #usr/lib/pkgconfig/libxslt.pc
 usr/lib/python2.7/site-packages/libxml2.pyc
@@ -44,108 +45,113 @@ usr/lib/python2.7/site-packages/libxml2.pyc
 #usr/lib/python2.7/site-packages/libxsltmod.la
 usr/lib/python2.7/site-packages/libxsltmod.so
 #usr/lib/xsltConf.sh
-#usr/man/man1/xsltproc.1
-#usr/man/man3/libexslt.3
-#usr/man/man3/libxslt.3
 #usr/share/aclocal/libxslt.m4
-#usr/share/doc/libxslt-1.1.17
-#usr/share/doc/libxslt-1.1.17/html
-#usr/share/doc/libxslt-1.1.17/html/API.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk0.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk1.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk2.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk3.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk4.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk5.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk6.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk7.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk8.html
-#usr/share/doc/libxslt-1.1.17/html/APIchunk9.html
-#usr/share/doc/libxslt-1.1.17/html/APIconstructors.html
-#usr/share/doc/libxslt-1.1.17/html/APIfiles.html
-#usr/share/doc/libxslt-1.1.17/html/APIfunctions.html
-#usr/share/doc/libxslt-1.1.17/html/APIsymbols.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIchunk0.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIconstructors.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfiles.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfunctions.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIsymbols.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/bugs.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/docs.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/downloads.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/exslt.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/help.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/index.html
-#usr/share/doc/libxslt-1.1.17/html/EXSLT/intro.html
-#usr/share/doc/libxslt-1.1.17/html/FAQ.html
-#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-180x168.gif
-#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-90x34.gif
-#usr/share/doc/libxslt-1.1.17/html/bugs.html
-#usr/share/doc/libxslt-1.1.17/html/contexts.gif
-#usr/share/doc/libxslt-1.1.17/html/contribs.html
-#usr/share/doc/libxslt-1.1.17/html/docbook.html
-#usr/share/doc/libxslt-1.1.17/html/docs.html
-#usr/share/doc/libxslt-1.1.17/html/downloads.html
-#usr/share/doc/libxslt-1.1.17/html/extensions.html
-#usr/share/doc/libxslt-1.1.17/html/help.html
-#usr/share/doc/libxslt-1.1.17/html/html
-#usr/share/doc/libxslt-1.1.17/html/html/book1.html
-#usr/share/doc/libxslt-1.1.17/html/html/home.png
-#usr/share/doc/libxslt-1.1.17/html/html/index.html
-#usr/share/doc/libxslt-1.1.17/html/html/left.png
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-attributes.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-documents.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extensions.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extra.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-functions.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-imports.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-keys.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-lib.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-namespaces.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-numbersInternals.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-pattern.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-preproc.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-security.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-templates.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-transform.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-variables.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xslt.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltInternals.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltexports.html
-#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltutils.html
-#usr/share/doc/libxslt-1.1.17/html/html/right.png
-#usr/share/doc/libxslt-1.1.17/html/html/up.png
-#usr/share/doc/libxslt-1.1.17/html/index.html
-#usr/share/doc/libxslt-1.1.17/html/internals.html
-#usr/share/doc/libxslt-1.1.17/html/intro.html
-#usr/share/doc/libxslt-1.1.17/html/news.html
-#usr/share/doc/libxslt-1.1.17/html/node.gif
-#usr/share/doc/libxslt-1.1.17/html/object.gif
-#usr/share/doc/libxslt-1.1.17/html/processing.gif
-#usr/share/doc/libxslt-1.1.17/html/python.html
-#usr/share/doc/libxslt-1.1.17/html/redhat.gif
-#usr/share/doc/libxslt-1.1.17/html/smallfootonly.gif
-#usr/share/doc/libxslt-1.1.17/html/stylesheet.gif
-#usr/share/doc/libxslt-1.1.17/html/templates.gif
-#usr/share/doc/libxslt-1.1.17/html/tutorial
-#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslt_tutorial.c
-#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.html
-#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.xml
-#usr/share/doc/libxslt-1.1.17/html/tutorial2
-#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.c
-#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.html
-#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.xml
-#usr/share/doc/libxslt-1.1.17/html/xslt.html
-#usr/share/doc/libxslt-1.1.17/html/xsltproc.html
-#usr/share/doc/libxslt-1.1.17/html/xsltproc2.html
-#usr/share/doc/libxslt-python-1.1.17
-#usr/share/doc/libxslt-python-1.1.17/TODO
-#usr/share/doc/libxslt-python-1.1.17/examples
-#usr/share/doc/libxslt-python-1.1.17/examples/basic.py
-#usr/share/doc/libxslt-python-1.1.17/examples/exslt.py
-#usr/share/doc/libxslt-python-1.1.17/examples/extelem.py
-#usr/share/doc/libxslt-python-1.1.17/examples/extfunc.py
-#usr/share/doc/libxslt-python-1.1.17/examples/pyxsltproc.py
-#usr/share/doc/libxslt-python-1.1.17/examples/test.xml
-#usr/share/doc/libxslt-python-1.1.17/examples/test.xsl
+#usr/share/doc/libxslt-1.1.28
+#usr/share/doc/libxslt-1.1.28/html
+#usr/share/doc/libxslt-1.1.28/html/API.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk0.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk1.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk10.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk11.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk12.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk13.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk2.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk3.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk4.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk5.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk6.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk7.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk8.html
+#usr/share/doc/libxslt-1.1.28/html/APIchunk9.html
+#usr/share/doc/libxslt-1.1.28/html/APIconstructors.html
+#usr/share/doc/libxslt-1.1.28/html/APIfiles.html
+#usr/share/doc/libxslt-1.1.28/html/APIfunctions.html
+#usr/share/doc/libxslt-1.1.28/html/APIsymbols.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIchunk0.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIconstructors.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfiles.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfunctions.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIsymbols.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/bugs.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/docs.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/downloads.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/exslt.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/help.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/index.html
+#usr/share/doc/libxslt-1.1.28/html/EXSLT/intro.html
+#usr/share/doc/libxslt-1.1.28/html/FAQ.html
+#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-180x168.gif
+#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-90x34.gif
+#usr/share/doc/libxslt-1.1.28/html/bugs.html
+#usr/share/doc/libxslt-1.1.28/html/contexts.gif
+#usr/share/doc/libxslt-1.1.28/html/contribs.html
+#usr/share/doc/libxslt-1.1.28/html/docbook.html
+#usr/share/doc/libxslt-1.1.28/html/docs.html
+#usr/share/doc/libxslt-1.1.28/html/downloads.html
+#usr/share/doc/libxslt-1.1.28/html/extensions.html
+#usr/share/doc/libxslt-1.1.28/html/help.html
+#usr/share/doc/libxslt-1.1.28/html/html
+#usr/share/doc/libxslt-1.1.28/html/html/book1.html
+#usr/share/doc/libxslt-1.1.28/html/html/home.png
+#usr/share/doc/libxslt-1.1.28/html/html/index.html
+#usr/share/doc/libxslt-1.1.28/html/html/left.png
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-attributes.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-documents.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extensions.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extra.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-functions.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-imports.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-keys.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-lib.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-namespaces.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-numbersInternals.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-pattern.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-preproc.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-security.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-templates.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-transform.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-variables.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xslt.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltInternals.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltexports.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltlocale.html
+#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltutils.html
+#usr/share/doc/libxslt-1.1.28/html/html/right.png
+#usr/share/doc/libxslt-1.1.28/html/html/up.png
+#usr/share/doc/libxslt-1.1.28/html/index.html
+#usr/share/doc/libxslt-1.1.28/html/internals.html
+#usr/share/doc/libxslt-1.1.28/html/intro.html
+#usr/share/doc/libxslt-1.1.28/html/news.html
+#usr/share/doc/libxslt-1.1.28/html/node.gif
+#usr/share/doc/libxslt-1.1.28/html/object.gif
+#usr/share/doc/libxslt-1.1.28/html/processing.gif
+#usr/share/doc/libxslt-1.1.28/html/python.html
+#usr/share/doc/libxslt-1.1.28/html/redhat.gif
+#usr/share/doc/libxslt-1.1.28/html/smallfootonly.gif
+#usr/share/doc/libxslt-1.1.28/html/stylesheet.gif
+#usr/share/doc/libxslt-1.1.28/html/templates.gif
+#usr/share/doc/libxslt-1.1.28/html/tutorial
+#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslt_tutorial.c
+#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.html
+#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.xml
+#usr/share/doc/libxslt-1.1.28/html/tutorial2
+#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.c
+#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.html
+#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.xml
+#usr/share/doc/libxslt-1.1.28/html/xslt.html
+#usr/share/doc/libxslt-1.1.28/html/xsltproc.html
+#usr/share/doc/libxslt-1.1.28/html/xsltproc2.html
+#usr/share/doc/libxslt-python-1.1.28
+#usr/share/doc/libxslt-python-1.1.28/TODO
+#usr/share/doc/libxslt-python-1.1.28/examples
+#usr/share/doc/libxslt-python-1.1.28/examples/basic.py
+#usr/share/doc/libxslt-python-1.1.28/examples/exslt.py
+#usr/share/doc/libxslt-python-1.1.28/examples/extelem.py
+#usr/share/doc/libxslt-python-1.1.28/examples/extfunc.py
+#usr/share/doc/libxslt-python-1.1.28/examples/pyxsltproc.py
+#usr/share/doc/libxslt-python-1.1.28/examples/test.xml
+#usr/share/doc/libxslt-python-1.1.28/examples/test.xsl
+#usr/share/man/man1/xsltproc.1
+#usr/share/man/man3/libexslt.3
+#usr/share/man/man3/libxslt.3
index 2fbd2b34c87623ab9b6aceaea7c9af854743f5b1..adc9b7581371c92e6174500b8b30d9efe0d9c3ec 100644 (file)
@@ -3,7 +3,7 @@ usr/bin/whiptail
 #usr/lib/libnewt.a
 #usr/lib/libnewt.so
 usr/lib/libnewt.so.0.52
-usr/lib/libnewt.so.0.52.17
+usr/lib/libnewt.so.0.52.18
 #usr/lib/pkgconfig/libnewt.pc
 #usr/lib/python2.7/site-packages/_snack.so
 #usr/lib/python2.7/site-packages/snack.py
@@ -13,8 +13,6 @@ usr/lib/libnewt.so.0.52.17
 #usr/share/locale/as
 #usr/share/locale/as/LC_MESSAGES
 #usr/share/locale/as/LC_MESSAGES/newt.mo
-#usr/share/locale/ast
-#usr/share/locale/ast/LC_MESSAGES
 #usr/share/locale/ast/LC_MESSAGES/newt.mo
 #usr/share/locale/bal
 #usr/share/locale/bal/LC_MESSAGES
@@ -102,8 +100,6 @@ usr/lib/libnewt.so.0.52.17
 #usr/share/locale/nn
 #usr/share/locale/nn/LC_MESSAGES
 #usr/share/locale/nn/LC_MESSAGES/newt.mo
-#usr/share/locale/pa
-#usr/share/locale/pa/LC_MESSAGES
 #usr/share/locale/pa/LC_MESSAGES/newt.mo
 #usr/share/locale/pl/LC_MESSAGES/newt.mo
 #usr/share/locale/pt/LC_MESSAGES/newt.mo
index 78ac2a24fba7e91a6ceb7a5b673a4f59d72988d4..8c4cc2ac2559da5ed84289c9286d11d33300586f 100644 (file)
@@ -10,7 +10,7 @@
 #usr/lib/libpcre.la
 usr/lib/libpcre.so
 usr/lib/libpcre.so.1
-usr/lib/libpcre.so.1.2.4
+usr/lib/libpcre.so.1.2.5
 #usr/lib/libpcrecpp.la
 usr/lib/libpcrecpp.so
 usr/lib/libpcrecpp.so.0
index 0ebef78c70cfcd4c3d9b5af57d1176bda54e290f..71802d44362cbf6e6b0c1c119f8b3487c0b38335 100644 (file)
@@ -4,21 +4,26 @@
 #usr/include/slcurses.h
 #usr/lib/libslang.so
 usr/lib/libslang.so.2
-usr/lib/libslang.so.2.2.4
+usr/lib/libslang.so.2.3.0
 #usr/lib/pkgconfig/slang.pc
 #usr/lib/slang
 #usr/lib/slang/v2
 #usr/lib/slang/v2/modules
+usr/lib/slang/v2/modules/base64-module.so
+usr/lib/slang/v2/modules/chksum-module.so
 usr/lib/slang/v2/modules/csv-module.so
 usr/lib/slang/v2/modules/fcntl-module.so
 usr/lib/slang/v2/modules/fork-module.so
+usr/lib/slang/v2/modules/histogram-module.so
 usr/lib/slang/v2/modules/iconv-module.so
+usr/lib/slang/v2/modules/json-module.so
 usr/lib/slang/v2/modules/pcre-module.so
 usr/lib/slang/v2/modules/png-module.so
 usr/lib/slang/v2/modules/rand-module.so
 usr/lib/slang/v2/modules/select-module.so
 usr/lib/slang/v2/modules/slsmg-module.so
 usr/lib/slang/v2/modules/socket-module.so
+usr/lib/slang/v2/modules/stats-module.so
 usr/lib/slang/v2/modules/sysconf-module.so
 usr/lib/slang/v2/modules/termios-module.so
 usr/lib/slang/v2/modules/varray-module.so
@@ -35,6 +40,10 @@ usr/lib/slang/v2/modules/zlib-module.so
 #usr/share/doc/slsh
 #usr/share/doc/slsh/html
 #usr/share/doc/slsh/html/slshfun-1.html
+#usr/share/doc/slsh/html/slshfun-10.html
+#usr/share/doc/slsh/html/slshfun-11.html
+#usr/share/doc/slsh/html/slshfun-12.html
+#usr/share/doc/slsh/html/slshfun-13.html
 #usr/share/doc/slsh/html/slshfun-2.html
 #usr/share/doc/slsh/html/slshfun-3.html
 #usr/share/doc/slsh/html/slshfun-4.html
@@ -48,13 +57,18 @@ usr/lib/slang/v2/modules/zlib-module.so
 #usr/share/slsh
 #usr/share/slsh/arrayfuns.sl
 #usr/share/slsh/autoload.sl
+#usr/share/slsh/base64.sl
+#usr/share/slsh/chksum.sl
 #usr/share/slsh/cmaps
 #usr/share/slsh/cmaps/cool.map
 #usr/share/slsh/cmaps/coolwarm.map
 #usr/share/slsh/cmaps/copper.map
+#usr/share/slsh/cmaps/cubicl.map
+#usr/share/slsh/cmaps/cubicyf.map
 #usr/share/slsh/cmaps/drywet.map
 #usr/share/slsh/cmaps/ds9b.map
 #usr/share/slsh/cmaps/ds9sls.map
+#usr/share/slsh/cmaps/edge.map
 #usr/share/slsh/cmaps/gebco.map
 #usr/share/slsh/cmaps/globe.map
 #usr/share/slsh/cmaps/gray.map
@@ -76,13 +90,20 @@ usr/lib/slang/v2/modules/zlib-module.so
 #usr/share/slsh/csv.sl
 #usr/share/slsh/fcntl.sl
 #usr/share/slsh/fork.sl
+#usr/share/slsh/fswalk.sl
 #usr/share/slsh/glob.sl
 #usr/share/slsh/help
 #usr/share/slsh/help/arrayfuns.hlp
+#usr/share/slsh/help/base64funs.hlp
+#usr/share/slsh/help/chksumfuns.hlp
 #usr/share/slsh/help/cmdopt.hlp
 #usr/share/slsh/help/csvfuns.hlp
 #usr/share/slsh/help/forkfuns.hlp
+#usr/share/slsh/help/fswalk.hlp
 #usr/share/slsh/help/glob.hlp
+#usr/share/slsh/help/histfuns.hlp
+#usr/share/slsh/help/jsonfuns.hlp
+#usr/share/slsh/help/listfuns.hlp
 #usr/share/slsh/help/onigfuns.hlp
 #usr/share/slsh/help/pcrefuns.hlp
 #usr/share/slsh/help/pngfuns.hlp
@@ -95,8 +116,12 @@ usr/lib/slang/v2/modules/zlib-module.so
 #usr/share/slsh/help/setfuns.hlp
 #usr/share/slsh/help/slsmg.hlp
 #usr/share/slsh/help/sockfuns.hlp
+#usr/share/slsh/help/statsfuns.hlp
 #usr/share/slsh/help/structfuns.hlp
+#usr/share/slsh/histogram.sl
 #usr/share/slsh/iconv.sl
+#usr/share/slsh/json.sl
+#usr/share/slsh/listfuns.sl
 #usr/share/slsh/local-packages
 #usr/share/slsh/onig.sl
 #usr/share/slsh/pcre.sl
@@ -132,6 +157,7 @@ usr/lib/slang/v2/modules/zlib-module.so
 #usr/share/slsh/slshrl.sl
 #usr/share/slsh/slsmg.sl
 #usr/share/slsh/socket.sl
+#usr/share/slsh/stats.sl
 #usr/share/slsh/stkcheck.sl
 #usr/share/slsh/structfuns.sl
 #usr/share/slsh/sysconf.sl
index 5da892bbdf81ba0e403eb9b936eca1c36aff8c75..3f22b725c42462b3bff65a1bd77bc2441b5d18b2 100644 (file)
@@ -356,3 +356,5 @@ srv/web/ipfire/html/themes/maniac/include/style.css
 var/updatecache
 var/updatecache/download
 var/updatecache/metadata
+srv/web/ipfire/html/accounting
+srv/web/ipfire/html/graphs
index 90a6d776b09e0434967660d186635a4836265500..13c645a1a2ffacdac7a34bc62ade0b2816bb2a27 100644 (file)
@@ -75,15 +75,17 @@ chown nobody.nobody \
        /var/run/ovpnserver.log
 
 # Update OpenVPN/collectd configuration
-files=`find /var/ipfire/ovpn/n2nconf/ -type d`
-for i in $files;
-do
-       if ! grep -q "status-version" $i/${i##*/}.conf; then
-               echo "# Logfile" >> $i/${i##*/}.conf
-               echo "status-version 1" >> $i/${i##*/}.conf
+for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do
+       name="${i##*/}"
+       name="${name%*.conf}"
+
+       if ! grep -qE "^status-version" ${i}; then
+               echo "# Logfile" >> ${i}
+               echo "status-version 1" >> ${i}
        fi
-       if ! grep -q "status " $i/${i##*/}.conf; then
-               echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf
+
+       if ! grep -qE "^status " ${i}; then
+               echo "status /var/run/openvpn/${name}-n2n 10" >> ${i}
        fi
 done
 
index 56e840d8cc430f92a45b03e2c122fadc2061050e..73b7b73e630fb896f20e3af5331ebde0476121f5 100644 (file)
@@ -15,7 +15,6 @@ etc/sudoers
 etc/sysconfig/firewall.local
 etc/sysconfig/modules
 etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
 var/ipfire/firewall/geoipblock
 var/ipfire/fwhosts/custmgeoipgrp
index 431dcd61c061c451fbb78908b609d1a7593d8bbd..ee596a070133cc46cb21cde91802c64dd1738777 100644 (file)
@@ -5,6 +5,8 @@ etc/rc.d/init.d/network-trigger
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/rcsysinit.d/S90network-trigger
+opt/pakfire/pakfire
+opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/core/90/filelists/openldap
new file mode 120000 (symlink)
index 0000000..80c324f
--- /dev/null
@@ -0,0 +1 @@
+../../../common/openldap
\ No newline at end of file
index 4835c5a29cbec3cfbc4e71eaabd9cf5acfa35da7..34dacf1134654caab5f8ef8a23e6c0bc26175717 100644 (file)
@@ -208,6 +208,13 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove old udev configuration
+rm -vf /etc/udev/rules.d/30-persistent-network.rules
+
+# Remove pids from dhcp client because it hang at normal shutdown
+# so let the sysvinit kill it
+rm -f /run/dhcpcd-*.pid
+
 #
 # Start services
 #
@@ -218,22 +225,9 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
        /etc/init.d/ipsec start
 fi
 
-case "$(uname -m)" in
-       i?86)
-       case "$(find_device "/")" in
-               xvd* )
-                       echo Skip remove grub2 files, because pygrub fail.
-                       rm -f /boot/grub/*
-                       echo config will recreated by linux-pae install.
-                       ;;
-               * )
-                       #
-                       # Update to GRUB2 config
-                       #
-                       grub-mkconfig > /boot/grub/grub.cfg
-                       ;;
-       esac
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+               grub-mkconfig > /boot/grub/grub.cfg
+fi
 
 # Upadate Kernel version uEnv.txt
 if [ -e /boot/uEnv.txt ]; then
@@ -247,7 +241,7 @@ fi
 
 
 # Force (re)install pae kernel if pae is supported
-rm -rf /opt/pakfire/db/*/meta-linux-pae
+rm -rf /opt/pakfire/db/installed/meta-linux-pae
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
        ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
        BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
@@ -258,9 +252,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
+#              rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null
        fi
 fi
 
diff --git a/config/rootfiles/core/91/exclude b/config/rootfiles/core/91/exclude
new file mode 100644 (file)
index 0000000..18e9b4d
--- /dev/null
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files
new file mode 100644 (file)
index 0000000..7cc5aa2
--- /dev/null
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2
new file mode 120000 (symlink)
index 0000000..f424713
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock
new file mode 120000 (symlink)
index 0000000..2412824
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/libnet b/config/rootfiles/core/91/filelists/libnet
new file mode 120000 (symlink)
index 0000000..26e5f79
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libnet
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/core/91/filelists/libtool
new file mode 120000 (symlink)
index 0000000..54f5666
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libtool
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/core/91/filelists/libxml2
new file mode 120000 (symlink)
index 0000000..242e69f
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libxml2
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/core/91/filelists/libxslt
new file mode 120000 (symlink)
index 0000000..bf9d766
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libxslt
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/newt b/config/rootfiles/core/91/filelists/newt
new file mode 120000 (symlink)
index 0000000..fb3eb20
--- /dev/null
@@ -0,0 +1 @@
+../../../common/newt
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre
new file mode 120000 (symlink)
index 0000000..b390d9a
--- /dev/null
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/core/91/filelists/slang
new file mode 120000 (symlink)
index 0000000..228e45e
--- /dev/null
@@ -0,0 +1 @@
+../../../common/slang
\ No newline at end of file
diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/core/91/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh
new file mode 100644 (file)
index 0000000..1e55e8b
--- /dev/null
@@ -0,0 +1,65 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2015 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=91
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/ipsec stop
+
+# Extract files
+extract_files
+
+# Create some missing graphs folders (core90)
+mkdir -p /srv/web/ipfire/html/{accounting,graphs}
+chmod 777 /srv/web/ipfire/html/{accounting,graphs}
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+
+sync
+
+# Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0
index 0c0485e4ef685cb8eea4c2ba9f27cc76b6dfe196..bbaec3ffb05ca2690c2a0d48863a0403f1f8d5ed 100644 (file)
@@ -146,6 +146,7 @@ var/imap/msg
 var/imap/proc
 var/imap/ptclient
 var/imap/socket
+var/ipfire/backup/addons/includes/cyrus-imapd
 var/ipfire/cyrusimap
 var/ipfire/cyrusimap/cyrus.conf
 var/ipfire/cyrusimap/imapd.conf
index 30dbf93bce894309f53d25b9cda0182f5cbb56a6..63289492223b9c7ee176c023f81dbb766eb2ed60 100644 (file)
@@ -2,12 +2,16 @@ etc/rc.d/rc0.d/K02netsnmpd
 etc/rc.d/rc3.d/S65netsnmpd
 etc/rc.d/rc6.d/K02netsnmpd
 etc/snmpd.conf
+usr/bin/agentxtrap
 usr/bin/encode_keychange
 usr/bin/fixproc
 usr/bin/ipf-mod.pl
 usr/bin/mib2c
 usr/bin/mib2c-update
+usr/bin/net-snmp-cert
 usr/bin/net-snmp-config
+usr/bin/net-snmp-create-v3-user
+usr/bin/snmp-bridge-mib
 usr/bin/snmpbulkget
 usr/bin/snmpbulkwalk
 usr/bin/snmpcheck
@@ -37,6 +41,7 @@ usr/bin/traptoemail
 #usr/include/net-snmp/agent/agent_module_config.h
 #usr/include/net-snmp/agent/agent_read_config.h
 #usr/include/net-snmp/agent/agent_registry.h
+#usr/include/net-snmp/agent/agent_sysORTable.h
 #usr/include/net-snmp/agent/agent_trap.h
 #usr/include/net-snmp/agent/all_helpers.h
 #usr/include/net-snmp/agent/auto_nlist.h
@@ -62,9 +67,12 @@ usr/bin/traptoemail
 #usr/include/net-snmp/agent/serialize.h
 #usr/include/net-snmp/agent/set_helper.h
 #usr/include/net-snmp/agent/snmp_agent.h
+#usr/include/net-snmp/agent/snmp_get_statistic.h
 #usr/include/net-snmp/agent/snmp_vars.h
 #usr/include/net-snmp/agent/stash_cache.h
 #usr/include/net-snmp/agent/stash_to_next.h
+#usr/include/net-snmp/agent/struct.h
+#usr/include/net-snmp/agent/sysORTable.h
 #usr/include/net-snmp/agent/table.h
 #usr/include/net-snmp/agent/table_array.h
 #usr/include/net-snmp/agent/table_container.h
@@ -72,7 +80,11 @@ usr/bin/traptoemail
 #usr/include/net-snmp/agent/table_dataset.h
 #usr/include/net-snmp/agent/table_iterator.h
 #usr/include/net-snmp/agent/table_tdata.h
+#usr/include/net-snmp/agent/util_funcs
 #usr/include/net-snmp/agent/util_funcs.h
+#usr/include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h
+#usr/include/net-snmp/agent/util_funcs/header_generic.h
+#usr/include/net-snmp/agent/util_funcs/header_simple_table.h
 #usr/include/net-snmp/agent/var_struct.h
 #usr/include/net-snmp/agent/watcher.h
 #usr/include/net-snmp/config_api.h
@@ -81,8 +93,8 @@ usr/bin/traptoemail
 #usr/include/net-snmp/library/README
 #usr/include/net-snmp/library/asn1.h
 #usr/include/net-snmp/library/callback.h
+#usr/include/net-snmp/library/cert_util.h
 #usr/include/net-snmp/library/check_varbind.h
-#usr/include/net-snmp/library/cmu_compat.h
 #usr/include/net-snmp/library/container.h
 #usr/include/net-snmp/library/container_binary_array.h
 #usr/include/net-snmp/library/container_iterator.h
@@ -90,25 +102,34 @@ usr/bin/traptoemail
 #usr/include/net-snmp/library/container_null.h
 #usr/include/net-snmp/library/data_list.h
 #usr/include/net-snmp/library/default_store.h
+#usr/include/net-snmp/library/dir_utils.h
 #usr/include/net-snmp/library/factory.h
 #usr/include/net-snmp/library/fd_event_manager.h
 #usr/include/net-snmp/library/file_utils.h
 #usr/include/net-snmp/library/getopt.h
 #usr/include/net-snmp/library/int64.h
 #usr/include/net-snmp/library/keytools.h
+#usr/include/net-snmp/library/large_fd_set.h
 #usr/include/net-snmp/library/lcd_time.h
 #usr/include/net-snmp/library/md5.h
 #usr/include/net-snmp/library/mib.h
 #usr/include/net-snmp/library/mt_support.h
+#usr/include/net-snmp/library/oid.h
 #usr/include/net-snmp/library/oid_stash.h
 #usr/include/net-snmp/library/parse.h
 #usr/include/net-snmp/library/read_config.h
 #usr/include/net-snmp/library/scapi.h
 #usr/include/net-snmp/library/snmp-tc.h
 #usr/include/net-snmp/library/snmp.h
+#usr/include/net-snmp/library/snmpAliasDomain.h
 #usr/include/net-snmp/library/snmpCallbackDomain.h
+#usr/include/net-snmp/library/snmpIPv4BaseDomain.h
+#usr/include/net-snmp/library/snmpSocketBaseDomain.h
+#usr/include/net-snmp/library/snmpTCPBaseDomain.h
 #usr/include/net-snmp/library/snmpTCPDomain.h
+#usr/include/net-snmp/library/snmpUDPBaseDomain.h
 #usr/include/net-snmp/library/snmpUDPDomain.h
+#usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h
 #usr/include/net-snmp/library/snmpUnixDomain.h
 #usr/include/net-snmp/library/snmp_alarm.h
 #usr/include/net-snmp/library/snmp_api.h
@@ -129,6 +150,7 @@ usr/bin/traptoemail
 #usr/include/net-snmp/library/text_utils.h
 #usr/include/net-snmp/library/tools.h
 #usr/include/net-snmp/library/transform_oids.h
+#usr/include/net-snmp/library/types.h
 #usr/include/net-snmp/library/ucd_compat.h
 #usr/include/net-snmp/library/vacm.h
 #usr/include/net-snmp/library/winpipe.h
@@ -137,6 +159,7 @@ usr/bin/traptoemail
 #usr/include/net-snmp/machine/generic.h
 #usr/include/net-snmp/mib_api.h
 #usr/include/net-snmp/net-snmp-config.h
+#usr/include/net-snmp/net-snmp-features.h
 #usr/include/net-snmp/net-snmp-includes.h
 #usr/include/net-snmp/output_api.h
 #usr/include/net-snmp/pdu_api.h
@@ -150,17 +173,24 @@ usr/bin/traptoemail
 #usr/include/net-snmp/system/bsdi4.h
 #usr/include/net-snmp/system/cygwin.h
 #usr/include/net-snmp/system/darwin.h
+#usr/include/net-snmp/system/darwin10.h
 #usr/include/net-snmp/system/darwin7.h
 #usr/include/net-snmp/system/darwin8.h
 #usr/include/net-snmp/system/darwin9.h
 #usr/include/net-snmp/system/dragonfly.h
 #usr/include/net-snmp/system/dynix.h
 #usr/include/net-snmp/system/freebsd.h
+#usr/include/net-snmp/system/freebsd10.h
+#usr/include/net-snmp/system/freebsd11.h
+#usr/include/net-snmp/system/freebsd12.h
 #usr/include/net-snmp/system/freebsd2.h
 #usr/include/net-snmp/system/freebsd3.h
 #usr/include/net-snmp/system/freebsd4.h
 #usr/include/net-snmp/system/freebsd5.h
 #usr/include/net-snmp/system/freebsd6.h
+#usr/include/net-snmp/system/freebsd7.h
+#usr/include/net-snmp/system/freebsd8.h
+#usr/include/net-snmp/system/freebsd9.h
 #usr/include/net-snmp/system/generic.h
 #usr/include/net-snmp/system/hpux.h
 #usr/include/net-snmp/system/irix.h
@@ -169,6 +199,8 @@ usr/bin/traptoemail
 #usr/include/net-snmp/system/mips.h
 #usr/include/net-snmp/system/netbsd.h
 #usr/include/net-snmp/system/openbsd.h
+#usr/include/net-snmp/system/openbsd4.h
+#usr/include/net-snmp/system/openbsd5.h
 #usr/include/net-snmp/system/osf5.h
 #usr/include/net-snmp/system/solaris.h
 #usr/include/net-snmp/system/solaris2.3.h
@@ -186,28 +218,28 @@ usr/bin/traptoemail
 #usr/lib/libnetsnmp.a
 #usr/lib/libnetsnmp.la
 usr/lib/libnetsnmp.so
-usr/lib/libnetsnmp.so.15
-usr/lib/libnetsnmp.so.15.1.2
+usr/lib/libnetsnmp.so.30
+usr/lib/libnetsnmp.so.30.0.3
 #usr/lib/libnetsnmpagent.a
 #usr/lib/libnetsnmpagent.la
 usr/lib/libnetsnmpagent.so
-usr/lib/libnetsnmpagent.so.15
-usr/lib/libnetsnmpagent.so.15.1.2
+usr/lib/libnetsnmpagent.so.30
+usr/lib/libnetsnmpagent.so.30.0.3
 #usr/lib/libnetsnmphelpers.a
 #usr/lib/libnetsnmphelpers.la
 usr/lib/libnetsnmphelpers.so
-usr/lib/libnetsnmphelpers.so.15
-usr/lib/libnetsnmphelpers.so.15.1.2
+usr/lib/libnetsnmphelpers.so.30
+usr/lib/libnetsnmphelpers.so.30.0.3
 #usr/lib/libnetsnmpmibs.a
 #usr/lib/libnetsnmpmibs.la
 usr/lib/libnetsnmpmibs.so
-usr/lib/libnetsnmpmibs.so.15
-usr/lib/libnetsnmpmibs.so.15.1.2
+usr/lib/libnetsnmpmibs.so.30
+usr/lib/libnetsnmpmibs.so.30.0.3
 #usr/lib/libnetsnmptrapd.a
 #usr/lib/libnetsnmptrapd.la
 usr/lib/libnetsnmptrapd.so
-usr/lib/libnetsnmptrapd.so.15
-usr/lib/libnetsnmptrapd.so.15.1.2
+usr/lib/libnetsnmptrapd.so.30
+usr/lib/libnetsnmptrapd.so.30.0.3
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP
@@ -253,159 +285,37 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_s
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix
-#usr/man/man1/encode_keychange.1
-#usr/man/man1/fixproc.1
-#usr/man/man1/mib2c-update.1
-#usr/man/man1/mib2c.1
-#usr/man/man1/net-snmp-config.1
-#usr/man/man1/snmpbulkget.1
-#usr/man/man1/snmpbulkwalk.1
-#usr/man/man1/snmpcmd.1
-#usr/man/man1/snmpconf.1
-#usr/man/man1/snmpdelta.1
-#usr/man/man1/snmpdf.1
-#usr/man/man1/snmpget.1
-#usr/man/man1/snmpgetnext.1
-#usr/man/man1/snmpinform.1
-#usr/man/man1/snmpnetstat.1
-#usr/man/man1/snmpset.1
-#usr/man/man1/snmpstatus.1
-#usr/man/man1/snmptable.1
-#usr/man/man1/snmptest.1
-#usr/man/man1/snmptranslate.1
-#usr/man/man1/snmptrap.1
-#usr/man/man1/snmpusm.1
-#usr/man/man1/snmpvacm.1
-#usr/man/man1/snmpwalk.1
-#usr/man/man1/tkmib.1
-#usr/man/man1/traptoemail.1
-#usr/man/man3/add_mibdir.3
-#usr/man/man3/add_module_replacement.3
-#usr/man/man3/config_perror.3
-#usr/man/man3/config_pwarn.3
-#usr/man/man3/default_store.3
-#usr/man/man3/fprint_description.3
-#usr/man/man3/fprint_objid.3
-#usr/man/man3/fprint_value.3
-#usr/man/man3/fprint_variable.3
-#usr/man/man3/get_module_node.3
-#usr/man/man3/init_mib.3
-#usr/man/man3/init_mib_internals.3
-#usr/man/man3/mib_api.3
-#usr/man/man3/netsnmp_Container_iterator.3
-#usr/man/man3/netsnmp_agent.3
-#usr/man/man3/netsnmp_baby_steps.3
-#usr/man/man3/netsnmp_bulk_to_next.3
-#usr/man/man3/netsnmp_cache_handler.3
-#usr/man/man3/netsnmp_container.3
-#usr/man/man3/netsnmp_debug.3
-#usr/man/man3/netsnmp_ds_get_boolean.3
-#usr/man/man3/netsnmp_ds_get_int.3
-#usr/man/man3/netsnmp_ds_get_string.3
-#usr/man/man3/netsnmp_ds_register_config.3
-#usr/man/man3/netsnmp_ds_register_premib.3
-#usr/man/man3/netsnmp_ds_set_boolean.3
-#usr/man/man3/netsnmp_ds_set_int.3
-#usr/man/man3/netsnmp_ds_set_string.3
-#usr/man/man3/netsnmp_ds_shutdown.3
-#usr/man/man3/netsnmp_example_scalar_int.3
-#usr/man/man3/netsnmp_handler.3
-#usr/man/man3/netsnmp_instance.3
-#usr/man/man3/netsnmp_iterator_info_s.3
-#usr/man/man3/netsnmp_leaf.3
-#usr/man/man3/netsnmp_library.3
-#usr/man/man3/netsnmp_mib_handler_methods.3
-#usr/man/man3/netsnmp_mib_utilities.3
-#usr/man/man3/netsnmp_mode_end_call.3
-#usr/man/man3/netsnmp_multiplexer.3
-#usr/man/man3/netsnmp_old_api.3
-#usr/man/man3/netsnmp_read_only.3
-#usr/man/man3/netsnmp_row_merge.3
-#usr/man/man3/netsnmp_scalar.3
-#usr/man/man3/netsnmp_scalar_group_group.3
-#usr/man/man3/netsnmp_serialize.3
-#usr/man/man3/netsnmp_stash_cache.3
-#usr/man/man3/netsnmp_table.3
-#usr/man/man3/netsnmp_table_array.3
-#usr/man/man3/netsnmp_table_data.3
-#usr/man/man3/netsnmp_table_dataset.3
-#usr/man/man3/netsnmp_table_iterator.3
-#usr/man/man3/netsnmp_utilities.3
-#usr/man/man3/netsnmp_watcher.3
-#usr/man/man3/print_description.3
-#usr/man/man3/print_mib.3
-#usr/man/man3/print_objid.3
-#usr/man/man3/print_value.3
-#usr/man/man3/print_variable.3
-#usr/man/man3/read_all_mibs.3
-#usr/man/man3/read_config.3
-#usr/man/man3/read_config_print_usage.3
-#usr/man/man3/read_configs.3
-#usr/man/man3/read_mib.3
-#usr/man/man3/read_module.3
-#usr/man/man3/read_module_node.3
-#usr/man/man3/read_objid.3
-#usr/man/man3/read_premib_configs.3
-#usr/man/man3/register_app_config_handler.3
-#usr/man/man3/register_app_premib_handler.3
-#usr/man/man3/register_config_handler.3
-#usr/man/man3/register_mib_handlers.3
-#usr/man/man3/register_premib_handler.3
-#usr/man/man3/send_easy_trap.3
-#usr/man/man3/send_trap_vars.3
-#usr/man/man3/send_v2trap.3
-#usr/man/man3/shutdown_mib.3
-#usr/man/man3/snmp_agent_api.3
-#usr/man/man3/snmp_alarm.3
-#usr/man/man3/snmp_alarm_register.3
-#usr/man/man3/snmp_alarm_register_hr.3
-#usr/man/man3/snmp_alarm_unregister.3
-#usr/man/man3/snmp_api.3
-#usr/man/man3/snmp_api_errstring.3
-#usr/man/man3/snmp_close.3
-#usr/man/man3/snmp_error.3
-#usr/man/man3/snmp_free_pdu.3
-#usr/man/man3/snmp_open.3
-#usr/man/man3/snmp_perror.3
-#usr/man/man3/snmp_read.3
-#usr/man/man3/snmp_select_info.3
-#usr/man/man3/snmp_send.3
-#usr/man/man3/snmp_sess_api.3
-#usr/man/man3/snmp_sess_async_send.3
-#usr/man/man3/snmp_sess_close.3
-#usr/man/man3/snmp_sess_error.3
-#usr/man/man3/snmp_sess_init.3
-#usr/man/man3/snmp_sess_open.3
-#usr/man/man3/snmp_sess_perror.3
-#usr/man/man3/snmp_sess_read.3
-#usr/man/man3/snmp_sess_select_info.3
-#usr/man/man3/snmp_sess_send.3
-#usr/man/man3/snmp_sess_session.3
-#usr/man/man3/snmp_sess_timeout.3
-#usr/man/man3/snmp_set_mib_warnings.3
-#usr/man/man3/snmp_set_save_descriptions.3
-#usr/man/man3/snmp_timeout.3
-#usr/man/man3/snmp_trap_api.3
-#usr/man/man3/snprint_objid.3
-#usr/man/man3/snprint_value.3
-#usr/man/man3/snprint_variable.3
-#usr/man/man3/sprint_realloc_objid.3
-#usr/man/man3/sprint_realloc_value.3
-#usr/man/man3/sprint_realloc_variable.3
-#usr/man/man3/unregister_app_config_handler.3
-#usr/man/man3/unregister_config_handler.3
-#usr/man/man5/mib2c.conf.5
-#usr/man/man5/snmp.conf.5
-#usr/man/man5/snmp_config.5
-#usr/man/man5/snmpd.conf.5
-#usr/man/man5/snmpd.examples.5
-#usr/man/man5/snmpd.internal.5
-#usr/man/man5/snmptrapd.conf.5
-#usr/man/man5/variables.5
-#usr/man/man8/snmpd.8
-#usr/man/man8/snmptrapd.8
 usr/sbin/snmpd
 usr/sbin/snmptrapd
+#usr/share/man/man1/agentxtrap.1
+#usr/share/man/man1/encode_keychange.1
+#usr/share/man/man1/fixproc.1
+#usr/share/man/man1/mib2c-update.1
+#usr/share/man/man1/mib2c.1
+#usr/share/man/man1/net-snmp-config.1
+#usr/share/man/man1/net-snmp-create-v3-user.1
+#usr/share/man/man1/snmp-bridge-mib.1
+#usr/share/man/man1/snmpbulkget.1
+#usr/share/man/man1/snmpbulkwalk.1
+#usr/share/man/man1/snmpcmd.1
+#usr/share/man/man1/snmpconf.1
+#usr/share/man/man1/snmpdelta.1
+#usr/share/man/man1/snmpdf.1
+#usr/share/man/man1/snmpget.1
+#usr/share/man/man1/snmpgetnext.1
+#usr/share/man/man1/snmpinform.1
+#usr/share/man/man1/snmpnetstat.1
+#usr/share/man/man1/snmpset.1
+#usr/share/man/man1/snmpstatus.1
+#usr/share/man/man1/snmptable.1
+#usr/share/man/man1/snmptest.1
+#usr/share/man/man1/snmptranslate.1
+#usr/share/man/man1/snmptrap.1
+#usr/share/man/man1/snmpusm.1
+#usr/share/man/man1/snmpvacm.1
+#usr/share/man/man1/snmpwalk.1
+#usr/share/man/man1/tkmib.1
+#usr/share/man/man1/traptoemail.1
 #usr/share/man/man3/NetSNMP::ASN.3
 #usr/share/man/man3/NetSNMP::OID.3
 #usr/share/man/man3/NetSNMP::TrapReceiver.3
@@ -414,6 +324,109 @@ usr/sbin/snmptrapd
 #usr/share/man/man3/NetSNMP::default_store.3
 #usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3
 #usr/share/man/man3/SNMP.3
+#usr/share/man/man3/add_mibdir.3
+#usr/share/man/man3/add_module_replacement.3
+#usr/share/man/man3/config_perror.3
+#usr/share/man/man3/config_pwarn.3
+#usr/share/man/man3/default_store.3
+#usr/share/man/man3/fprint_description.3
+#usr/share/man/man3/fprint_objid.3
+#usr/share/man/man3/fprint_value.3
+#usr/share/man/man3/fprint_variable.3
+#usr/share/man/man3/get_module_node.3
+#usr/share/man/man3/netsnmp_agent_api.3
+#usr/share/man/man3/netsnmp_config_api.3
+#usr/share/man/man3/netsnmp_init_mib.3
+#usr/share/man/man3/netsnmp_mib_api.3
+#usr/share/man/man3/netsnmp_pdu_api.3
+#usr/share/man/man3/netsnmp_read_module.3
+#usr/share/man/man3/netsnmp_sess_api.3
+#usr/share/man/man3/netsnmp_session_api.3
+#usr/share/man/man3/netsnmp_trap_api.3
+#usr/share/man/man3/netsnmp_varbind_api.3
+#usr/share/man/man3/print_description.3
+#usr/share/man/man3/print_mib.3
+#usr/share/man/man3/print_objid.3
+#usr/share/man/man3/print_value.3
+#usr/share/man/man3/print_variable.3
+#usr/share/man/man3/read_all_mibs.3
+#usr/share/man/man3/read_config_print_usage.3
+#usr/share/man/man3/read_configs.3
+#usr/share/man/man3/read_mib.3
+#usr/share/man/man3/read_objid.3
+#usr/share/man/man3/read_premib_configs.3
+#usr/share/man/man3/register_app_config_handler.3
+#usr/share/man/man3/register_app_prenetsnmp_mib_handler.3
+#usr/share/man/man3/register_config_handler.3
+#usr/share/man/man3/register_const_config_handler.3
+#usr/share/man/man3/register_mib_handlers.3
+#usr/share/man/man3/register_prenetsnmp_mib_handler.3
+#usr/share/man/man3/send_easy_trap.3
+#usr/share/man/man3/send_trap_vars.3
+#usr/share/man/man3/send_v2trap.3
+#usr/share/man/man3/shutdown_mib.3
+#usr/share/man/man3/snmp_add_null_var.3
+#usr/share/man/man3/snmp_alarm.3
+#usr/share/man/man3/snmp_alarm_register.3
+#usr/share/man/man3/snmp_alarm_register_hr.3
+#usr/share/man/man3/snmp_alarm_unregister.3
+#usr/share/man/man3/snmp_api_errstring.3
+#usr/share/man/man3/snmp_async_send.3
+#usr/share/man/man3/snmp_clone_pdu.3
+#usr/share/man/man3/snmp_clone_varbind.3
+#usr/share/man/man3/snmp_close.3
+#usr/share/man/man3/snmp_error.3
+#usr/share/man/man3/snmp_fix_pdu.3
+#usr/share/man/man3/snmp_free_pdu.3
+#usr/share/man/man3/snmp_free_var.3
+#usr/share/man/man3/snmp_free_varbind.3
+#usr/share/man/man3/snmp_open.3
+#usr/share/man/man3/snmp_parse_oid.3
+#usr/share/man/man3/snmp_pdu_add_variable.3
+#usr/share/man/man3/snmp_pdu_create.3
+#usr/share/man/man3/snmp_perror.3
+#usr/share/man/man3/snmp_read.3
+#usr/share/man/man3/snmp_select_info.3
+#usr/share/man/man3/snmp_send.3
+#usr/share/man/man3/snmp_sess_async_send.3
+#usr/share/man/man3/snmp_sess_close.3
+#usr/share/man/man3/snmp_sess_error.3
+#usr/share/man/man3/snmp_sess_init.3
+#usr/share/man/man3/snmp_sess_open.3
+#usr/share/man/man3/snmp_sess_perror.3
+#usr/share/man/man3/snmp_sess_read.3
+#usr/share/man/man3/snmp_sess_select_info.3
+#usr/share/man/man3/snmp_sess_send.3
+#usr/share/man/man3/snmp_sess_session.3
+#usr/share/man/man3/snmp_sess_synch_response.3
+#usr/share/man/man3/snmp_sess_timeout.3
+#usr/share/man/man3/snmp_set_mib_errors.3
+#usr/share/man/man3/snmp_set_mib_warnings.3
+#usr/share/man/man3/snmp_set_save_descriptions.3
+#usr/share/man/man3/snmp_set_var_objid.3
+#usr/share/man/man3/snmp_set_var_typed_integer.3
+#usr/share/man/man3/snmp_set_var_typed_value.3
+#usr/share/man/man3/snmp_set_var_value.3
+#usr/share/man/man3/snmp_synch_response.3
+#usr/share/man/man3/snmp_timeout.3
+#usr/share/man/man3/snmp_varlist_add_variable.3
+#usr/share/man/man3/snprint_description.3
+#usr/share/man/man3/snprint_objid.3
+#usr/share/man/man3/snprint_value.3
+#usr/share/man/man3/snprint_variable.3
+#usr/share/man/man3/unregister_all_config_handlers.3
+#usr/share/man/man3/unregister_app_config_handler.3
+#usr/share/man/man3/unregister_config_handler.3
+#usr/share/man/man5/mib2c.conf.5
+#usr/share/man/man5/snmp.conf.5
+#usr/share/man/man5/snmp_config.5
+#usr/share/man/man5/snmpd.conf.5
+#usr/share/man/man5/snmpd.examples.5
+#usr/share/man/man5/snmpd.internal.5
+#usr/share/man/man5/snmptrapd.conf.5
+#usr/share/man/man5/variables.5
+#usr/share/man/man8/snmpd.8
+#usr/share/man/man8/snmptrapd.8
 usr/share/snmp
 usr/share/snmp/mib2c-data
 usr/share/snmp/mib2c-data/default-mfd-top.m2c
@@ -425,6 +438,7 @@ usr/share/snmp/mib2c-data/generic-ctx-get.m2i
 usr/share/snmp/mib2c-data/generic-ctx-set.m2i
 usr/share/snmp/mib2c-data/generic-data-allocate.m2i
 usr/share/snmp/mib2c-data/generic-data-context.m2i
+usr/share/snmp/mib2c-data/generic-get-U64.m2i
 usr/share/snmp/mib2c-data/generic-get-char.m2i
 usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i
 usr/share/snmp/mib2c-data/generic-get-decl.m2i
@@ -500,10 +514,12 @@ usr/share/snmp/mib2c.mfd.conf
 usr/share/snmp/mib2c.notify.conf
 usr/share/snmp/mib2c.old-api.conf
 usr/share/snmp/mib2c.perl.conf
+usr/share/snmp/mib2c.raw-table.conf
 usr/share/snmp/mib2c.scalar.conf
 usr/share/snmp/mib2c.table_data.conf
 usr/share/snmp/mibs
 usr/share/snmp/mibs/AGENTX-MIB.txt
+usr/share/snmp/mibs/BRIDGE-MIB.txt
 usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt
 usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
 usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
@@ -520,6 +536,7 @@ usr/share/snmp/mibs/IF-MIB.txt
 usr/share/snmp/mibs/INET-ADDRESS-MIB.txt
 usr/share/snmp/mibs/IP-FORWARD-MIB.txt
 usr/share/snmp/mibs/IP-MIB.txt
+usr/share/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt
 usr/share/snmp/mibs/IPV6-ICMP-MIB.txt
 usr/share/snmp/mibs/IPV6-MIB.txt
 usr/share/snmp/mibs/IPV6-TC.txt
@@ -529,6 +546,7 @@ usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt
 usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
 usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt
 usr/share/snmp/mibs/NET-SNMP-MIB.txt
+usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt
 usr/share/snmp/mibs/NET-SNMP-TC.txt
 usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt
 usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
@@ -544,6 +562,8 @@ usr/share/snmp/mibs/SNMP-MPD-MIB.txt
 usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 usr/share/snmp/mibs/SNMP-PROXY-MIB.txt
 usr/share/snmp/mibs/SNMP-TARGET-MIB.txt
+usr/share/snmp/mibs/SNMP-TLS-TM-MIB.txt
+usr/share/snmp/mibs/SNMP-TSM-MIB.txt
 usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt
 usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
@@ -555,6 +575,7 @@ usr/share/snmp/mibs/SNMPv2-TC.txt
 usr/share/snmp/mibs/SNMPv2-TM.txt
 usr/share/snmp/mibs/TCP-MIB.txt
 usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt
+usr/share/snmp/mibs/TUNNEL-MIB.txt
 usr/share/snmp/mibs/UCD-DEMO-MIB.txt
 usr/share/snmp/mibs/UCD-DISKIO-MIB.txt
 usr/share/snmp/mibs/UCD-DLMOD-MIB.txt
@@ -586,4 +607,5 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging
 usr/share/snmp/snmpconf-data/snmptrapd-data/runtime
 usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
 usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle
+var/ipfire/backup/addons/includes/netsnmpd
 etc/rc.d/init.d/netsnmpd
index fa6ec91dd0473d696a6134e8e80ce7968a5470c8..39b9b4f0b572f9fb0c6e1a68f851e86101d9cc69 100644 (file)
@@ -8,6 +8,8 @@
 #
 use strict;
 
+require "/var/ipfire/general-functions.pl";
+
 my $make_clean = 1;
 
 my $swroot = "/var/ipfire";
@@ -72,6 +74,7 @@ unless ($blacklist_url eq '')
        if (-d $target) { system("rm -rf $target"); }
        system("mkdir $target");
 
+       &Network::setup_upstream_proxy();
        system("/usr/bin/wget -o $target/wget.log -O $blacklist $blacklist_url");
 
        if (-e $blacklist)
index 1ccc6541280b834e40d531a5b3476082c13b6e51..0d86987569b50cb9ec384043929960d4a2335f83 100644 (file)
@@ -423,6 +423,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
@@ -643,6 +644,7 @@ WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 WARNING: untranslated string: no data
+WARNING: untranslated string: none
 WARNING: untranslated string: qos add subclass
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
index b7be8627b3ed122a431d77f1587cb6f1ed0d73b7..1f1c78d611d429299eeece9aaa2f4a1975cf77f5 100644 (file)
@@ -450,6 +450,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
index 086dfbdc946fc242fa3349e7fc314bf9b9284d3f..2a502006b96ba0a113b8837dfb9d10db0988e172 100644 (file)
@@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -916,6 +917,7 @@ WARNING: untranslated string: most preferred
 WARNING: untranslated string: nameserver
 WARNING: untranslated string: no data
 WARNING: untranslated string: no hardware random number generator
+WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
 WARNING: untranslated string: openvpn default
@@ -959,6 +961,9 @@ WARNING: untranslated string: ovpn routes push options
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
@@ -973,6 +978,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
index 47ee3fb3f06d429b7703ccd0e81cc1362db65ac1..aa4951d80e9f2c73f9269ab97efa0b38ffdba38c 100644 (file)
@@ -390,6 +390,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -931,6 +932,7 @@ WARNING: untranslated string: most preferred
 WARNING: untranslated string: nameserver
 WARNING: untranslated string: no data
 WARNING: untranslated string: no hardware random number generator
+WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
 WARNING: untranslated string: ntp common settings
@@ -970,6 +972,9 @@ WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
@@ -984,6 +989,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
index 098f4401e40c8518c0efef1df19a8f7cf922e047..1669e79f6d5a59ab92e78b4f18c84b68b2e6f671 100644 (file)
@@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
@@ -704,15 +705,20 @@ WARNING: untranslated string: masquerading disabled
 WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: messages
 WARNING: untranslated string: no data
+WARNING: untranslated string: none
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: uncheck all
 WARNING: untranslated string: vpn statistic n2n
 WARNING: untranslated string: vpn statistic rw
index 602441d0b7675f532fabffaf8b420dca0bb67896..11d76577bb56f6b17e8d5f9a4f7d808a229425f8 100644 (file)
@@ -443,6 +443,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -736,6 +737,7 @@ WARNING: untranslated string: modem status
 WARNING: untranslated string: monitor interface
 WARNING: untranslated string: nameserver
 WARNING: untranslated string: no data
+WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
@@ -748,6 +750,9 @@ WARNING: untranslated string: ovpn dh upload
 WARNING: untranslated string: ovpn generating the root and host certificates
 WARNING: untranslated string: ovpn ha
 WARNING: untranslated string: ovpn hmac
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
@@ -755,6 +760,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
 WARNING: untranslated string: software version
index 086dfbdc946fc242fa3349e7fc314bf9b9284d3f..2a502006b96ba0a113b8837dfb9d10db0988e172 100644 (file)
@@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -916,6 +917,7 @@ WARNING: untranslated string: most preferred
 WARNING: untranslated string: nameserver
 WARNING: untranslated string: no data
 WARNING: untranslated string: no hardware random number generator
+WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
 WARNING: untranslated string: openvpn default
@@ -959,6 +961,9 @@ WARNING: untranslated string: ovpn routes push options
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: pakfire ago
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
@@ -973,6 +978,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
index 94724d4c296992ef8663d624ff8b4f6de608fe9c..d2215b6df4476d39a7ae65b5b3da57d1163cc6e5 100644 (file)
@@ -384,6 +384,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -916,6 +917,7 @@ WARNING: untranslated string: most preferred
 WARNING: untranslated string: nameserver
 WARNING: untranslated string: no data
 WARNING: untranslated string: no hardware random number generator
+WARNING: untranslated string: none
 WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: notice
 WARNING: untranslated string: openvpn default
@@ -953,6 +955,9 @@ WARNING: untranslated string: ovpn no connections
 WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: proxy reports
 WARNING: untranslated string: proxy reports daily
 WARNING: untranslated string: proxy reports monthly
@@ -967,6 +972,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
index 6f846c738c1a86e370ca749fd2fa1a8db7e59d98..a9d633273bdc5642b09cd9a679e68f318c05f346 100644 (file)
@@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
@@ -683,13 +684,18 @@ WARNING: untranslated string: incoming compression in bytes per second
 WARNING: untranslated string: incoming overhead in bytes per second
 WARNING: untranslated string: invalid input for valid till days
 WARNING: untranslated string: no data
+WARNING: untranslated string: none
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
+WARNING: untranslated string: pptp netconfig
+WARNING: untranslated string: pptp peer
+WARNING: untranslated string: pptp route
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: search
 WARNING: untranslated string: uncheck all
 WARNING: untranslated string: vpn statistic n2n
 WARNING: untranslated string: vpn statistic rw
index 9fdc0d27618ea2ef7b3efc4028b5fc0ba6846e5b..b88db57542753842130c1be4a7a8f9655c92dc76 100644 (file)
 < ovpn reneg sec
 < p2p block
 < p2p block save notice
+< pptp netconfig
+< pptp peer
+< pptp route
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < show dh
 < snat new source ip address
 < ovpn routes push options
 < p2p block
 < p2p block save notice
+< pptp netconfig
+< pptp peer
+< pptp route
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < Set time on boot
 < show dh
 < ovpn routes push options
 < p2p block
 < p2p block save notice
+< pptp netconfig
+< pptp peer
+< pptp route
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < show dh
 < snat new source ip address
 < ovpn reneg sec
 < p2p block
 < p2p block save notice
+< pptp netconfig
+< pptp peer
+< pptp route
 < proxy reports
 < proxy reports daily
 < proxy reports monthly
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < show dh
 < snat new source ip address
index 5c17d33e276a51c4a90bda383e2c616af012c818..4eb9cd7bfe8a8cfadc953facfce9eee53e3acc5a 100644 (file)
@@ -540,7 +540,7 @@ foreach my $line (@conntrack) {
        $ttl = format_time($ttl);
 
        my $sip_extra;
-       if ($sip ne $sip_ret) {
+       if ($sip_ret && $sip ne $sip_ret) {
                $sip_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
                $sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>";
                $sip_extra .= " <span style='color:#FFFFFF;'>$sip_ret</span>";
@@ -548,7 +548,7 @@ foreach my $line (@conntrack) {
        }
 
        my $dip_extra;
-       if ($dip ne $dip_ret) {
+       if ($dip_ret && $dip ne $dip_ret) {
                $dip_extra = "<span style='color:#FFFFFF;'>&gt;</span> ";
                $dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>";
                $dip_extra .= " <span style='color:#FFFFFF;'>$dip_ret</span>";
@@ -661,15 +661,17 @@ sub ipcolour($) {
        my ($ip) = $_[0];
        my $found = 0;
 
-       foreach my $line (@network) {
-               if ($network[$id] eq '') {
-                       $id++;
-               } else {
-                       if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
-                               $found = 1;
-                               $colour = $colour[$id];
+       if ($ip) {
+               foreach my $line (@network) {
+                       if ($network[$id] eq '') {
+                               $id++;
+                       } else {
+                               if (!$found && ipv4_in_network($network[$id], $masklen[$id], $ip) ) {
+                                       $found = 1;
+                                       $colour = $colour[$id];
+                               }
+                               $id++;
                        }
-                       $id++;
                }
        }
 
index 60c2e5869e260b89d2f37f1c98a90892ff6d9822..f2ae81300905ee5fafb995224471cdbe5a09aa54 100644 (file)
@@ -23,12 +23,9 @@ use strict;
 
 use Locale::Codes::Country;
 
-my $flagdir = '/srv/web/ipfire/html/images/flags';
+my $col;
 my $lines = '1';
 my $lines2 = '';
-my @flaglist=();
-my @flaglistfiles=();
-my $flag = '';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/geoip-functions.pl";
@@ -41,44 +38,41 @@ require "${General::swroot}/header.pl";
 &Header::openbigbox('100%', 'left');
 
 &Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
-print "<table class='tbl'>";
-print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
-print "<th>&nbsp;</th>";
-print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
-
-@flaglist = <$flagdir/*>;
-
-undef @flaglistfiles;
-
-foreach (@flaglist)
-{
-       if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1));    }
-}
-my $col="";
-foreach $flag (@flaglistfiles)
-{
+
+print<<END;
+<table class='tbl'>
+       <tr>
+               <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+               <th style='width=5%'><b>$Lang::tr{'countrycode'}</b></th>
+               <th style='width=40% text-align:left'><b>$Lang::tr{'country'}</b></th>
+               <th>&nbsp;</th>
+               <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+               <th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>
+               <th style='width=40% text-align:left;'><b>$Lang::tr{'country'}</b></th>
+       </tr>
+END
+
+# Get a list of all supported country codes.
+my @countries = Locale::Codes::Country::all_country_codes();
+
+# Loop through whole country list.
+foreach my $country (@countries) {
        $lines++;
 
-       my $flagcode = uc(substr($flag, 0, 2));
-       my $fcode = lc($flagcode);
+       # Convert country code into upper case.
+       my $country_uc = uc($country);
 
        # Get flag icon for of the country.
-       my $flag_icon = &GeoIP::get_flag_icon($fcode);
+       my $flag_icon = &GeoIP::get_flag_icon($country);
+
+       # Get country name.
+       my $name = &GeoIP::get_full_country_name($country);
 
-       my $country = Locale::Country::code2country($fcode);
-       if($fcode eq 'eu') { $country = 'Europe'; }
-       if($fcode eq 'tp') { $country = 'East Timor'; }
-       if($fcode eq 'yu') { $country = 'Yugoslavia'; }
        if ($lines % 2) {
-               print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
-               print "<td $col>$flagcode</td>";
-               print "<td $col>$country</td></tr>\n";
-       }
-       else {
+               print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
+               print "<td $col>$country_uc</td>";
+               print "<td $col>$name</td></tr>\n";
+       } else {
                $lines2++;
                if($lines2 % 2) {
                        $col="style='background-color:${Header::table2colour};'";
@@ -86,25 +80,25 @@ foreach $flag (@flaglistfiles)
                        $col="style='background-color:${Header::table1colour};'";
                }
                print "<tr>";
-               print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
-               print "<td $col>$flagcode</td>";
-               print "<td $col>$country</td>";
+               print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
+               print "<td $col>$country_uc</td>";
+               print "<td $col>$name</td>";
                print "<td $col>&nbsp;</td>";
+
+               # Finish column when the last element in the array has passed and we have an uneven amount of items.
+               if ( $country eq $countries[-1] ) {
+                       print "<td $col>&nbsp;</td>\n";
+                       print "<td $col>&nbsp;</td>\n";
+                       print "<td $col>&nbsp;</td></tr>\n";
+               }
        }
 }
-
-
 print "</table>";
 &Header::closebox();
 
 &Header::closebigbox();
 
-print <<END
-<div style='text-align:center'>
-<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
-</div>
-END
-; 
+print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n";
 
 &Header::closepage();
 
index 9a7d983eefd0233693a9e647a4c692ef2ef05442..dd48d58cb0d5cca8347e3ce93ca7361c6d48dc77 100644 (file)
@@ -438,6 +438,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') {
        if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
            unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n");
            &General::log($Lang::tr{'fixed ip lease added'});
+
+           # Enter edit mode
+           $dhcpsettings{'KEY2'} = $key;
        } else {
            @current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n";
            $dhcpsettings{'KEY2'} = '';       # End edit mode
@@ -857,12 +860,31 @@ print <<END
 </tr>
 </table>
 </form>
+<hr />
 END
 ;
 #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order'
 
+# Search for static leases
+my $search_query = $dhcpsettings{'q'};
+
+if (scalar @current2 >= 10) {
+       print <<END;
+               <form method="POST" action="#search">
+                       <a name="search"></a>
+                       <table width='100%'>
+                               <tr>
+                                       <td>
+                                               <input type="text" name="q" value="$search_query">
+                                               <input type="submit" value="$Lang::tr{'search'}">
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+END
+}
+
 print <<END
-<hr />
 <table width='100%' class='tbl'>
 <tr>
     <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
@@ -918,6 +940,11 @@ foreach my $line (@current2) {
        $gdesc = $Lang::tr{'click to enable'}; 
     }
 
+    # Skip all entries that do not match the search query
+    if ($search_query ne "") {
+       next if (!grep(/$search_query/, @temp));
+    }
+
     if ($dhcpsettings{'KEY2'} eq $key) {
        print "<tr>";
        $col="bgcolor='${Header::colouryellow}'";
index ccbfa926a0ad3c576217107f0fbc7842edf1cfc4..056b333e8c955eee667a982c2b227804c75c2d0b 100644 (file)
@@ -225,7 +225,16 @@ foreach my $location (@locations) {
        print "<td align='center' $col>$flag</td>\n";
        print "<td align='center' $col>$ccode_uc</td>\n";
        print "<td align='left' $col>$cname</td>$line_end\n";
-                       
+
+       # Finish column when the last element in the array has passed and we have an uneven amount of items.
+       if(! ($lines2 % 2) && ($location eq $locations[-1] )) {
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td></tr>\n";
+       }
+
 $lines2++;
 }
 
index 33f521e7569adcb7bf640ce44e0b81c59be280ab..59677a4d114a8088fe8e24accc15ca6f39258919 100644 (file)
@@ -793,15 +793,15 @@ print <<END
         <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
 </tr>
 <tr>
-        <td width='25%'>Peer</td>
+        <td width='25%'>$Lang::tr{'pptp peer'}:</td>
         <td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td>
 </tr>
 <tr>
-        <td width='25%'>My Netconfig</td>
+        <td width='25%'>$Lang::tr{'pptp netconfig'}:</td>
         <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td>
 </tr>
 <tr>
-        <td width='25%'>PPTP Route&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td width='25%'>$Lang::tr{'pptp route'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
         <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td>
 </tr>
 
index 2a020eaddd84060688898b4f66ede388726f2028..8c44b7e93a392babefcac16380b145156e217006 100644 (file)
@@ -253,8 +253,10 @@ sub writeipsecfiles {
     print CONF "\n";
 
     # Add user includes to config file
-    print CONF "include /etc/ipsec.user.conf\n";
-    print CONF "\n";
+    if (-e "/etc/ipsec.user.conf") {
+        print CONF "include /etc/ipsec.user.conf\n";
+        print CONF "\n";
+    }
 
     print SECRETS "include /etc/ipsec.user.secrets\n";
 
@@ -327,7 +329,13 @@ sub writeipsecfiles {
        if ($lconfighash{$key}[21] && $lconfighash{$key}[22]) {
                my @encs   = split('\|', $lconfighash{$key}[21]);
                my @ints   = split('\|', $lconfighash{$key}[22]);
-               my @groups = split('\|', $lconfighash{$key}[20]);
+               my @groups = split('\|', $lconfighash{$key}[23]);
+
+               # Use IKE grouptype if no ESP group type has been selected
+               # (for backwards compatibility)
+               if ($lconfighash{$key}[23] eq "") {
+                       @groups = split('\|', $lconfighash{$key}[20]);
+               }
 
                my @algos = &make_algos("esp", \@encs, \@ints, \@groups, ($pfs eq "on"));
                print CONF "\tesp=" . join(",", @algos);
@@ -407,6 +415,14 @@ sub writeipsecfiles {
 
        print CONF "\n";
     }#foreach key
+
+    # Add post user includes to config file
+    # After the GUI-connections allows to patch connections.
+    if (-e "/etc/ipsec.user-post.conf") {
+        print CONF "include /etc/ipsec.user-post.conf\n";
+        print CONF "\n";
+    }
+
     print SECRETS $last_secrets if ($last_secrets);
     close(CONF);
     close(SECRETS);
@@ -1260,6 +1276,9 @@ END
        $cgiparams{'ESP_ENCRYPTION'}    = $confighash{$cgiparams{'KEY'}}[21];
        $cgiparams{'ESP_INTEGRITY'}     = $confighash{$cgiparams{'KEY'}}[22];
        $cgiparams{'ESP_GROUPTYPE'}     = $confighash{$cgiparams{'KEY'}}[23];
+       if ($cgiparams{'ESP_GROUPTYPE'} eq "") {
+               $cgiparams{'ESP_GROUPTYPE'} = $cgiparams{'IKE_GROUPTYPE'};
+       }
        $cgiparams{'ESP_KEYLIFE'}       = $confighash{$cgiparams{'KEY'}}[17];
        $cgiparams{'COMPRESSION'}       = $confighash{$cgiparams{'KEY'}}[13];
        $cgiparams{'ONLY_PROPOSED'}     = $confighash{$cgiparams{'KEY'}}[24];
@@ -1855,7 +1874,7 @@ END
        $cgiparams{'IKE_LIFETIME'}   = '3';             #[16];
        $cgiparams{'ESP_ENCRYPTION'} = 'aes256gcm128|aes256gcm96|aes256gcm64|aes256|aes192gcm128|aes192gcm96|aes192gcm64|aes192|aes128gcm128|aes128gcm96|aes128gcm64|aes128';   #[21];
        $cgiparams{'ESP_INTEGRITY'}  = 'sha2_512|sha2_256|sha1';        #[22];
-       $cgiparams{'ESP_GROUPTYPE'}  = '';              #[23];
+       $cgiparams{'ESP_GROUPTYPE'}  = '4096|3072|2048|1536|1024';              #[23];
        $cgiparams{'ESP_KEYLIFE'}    = '1';             #[17];
        $cgiparams{'COMPRESSION'}    = 'on';            #[13];
        $cgiparams{'ONLY_PROPOSED'}  = 'off';           #[24];
@@ -2165,13 +2184,17 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                goto ADVANCED_ERROR;
            }
        }
-       if ($cgiparams{'ESP_GROUPTYPE'} ne '' &&
-           $cgiparams{'ESP_GROUPTYPE'} !~  /^ecp(192|224|256|384|512)(bp)?$/ &&
-           $cgiparams{'ESP_GROUPTYPE'} !~  /^modp(1024|1536|2048|2048s(256|224|160)|3072|4096|6144|8192)$/) {
+       @temp = split('\|', $cgiparams{'ESP_GROUPTYPE'});
+       if ($#temp < 0) {
            $errormessage = $Lang::tr{'invalid input'};
            goto ADVANCED_ERROR;
        }
-
+       foreach my $val (@temp) {
+           if ($val !~ /^(e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|1024|1536|2048|2048s256|2048s224|2048s160|3072|4096|6144|8192|none)$/) {
+               $errormessage = $Lang::tr{'invalid input'};
+               goto ADVANCED_ERROR;
+           }
+       }
        if ($cgiparams{'ESP_KEYLIFE'} !~ /^\d+$/) {
            $errormessage = $Lang::tr{'invalid input for esp keylife'};
            goto ADVANCED_ERROR;
@@ -2234,6 +2257,9 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
        $cgiparams{'ESP_ENCRYPTION'} = $confighash{$cgiparams{'KEY'}}[21];
        $cgiparams{'ESP_INTEGRITY'}  = $confighash{$cgiparams{'KEY'}}[22];
        $cgiparams{'ESP_GROUPTYPE'}  = $confighash{$cgiparams{'KEY'}}[23];
+       if ($cgiparams{'ESP_GROUPTYPE'} eq "") {
+               $cgiparams{'ESP_GROUPTYPE'} = $cgiparams{'IKE_GROUPTYPE'};
+       }
        $cgiparams{'ESP_KEYLIFE'}    = $confighash{$cgiparams{'KEY'}}[17];
        $cgiparams{'COMPRESSION'}    = $confighash{$cgiparams{'KEY'}}[13];
        $cgiparams{'ONLY_PROPOSED'}  = $confighash{$cgiparams{'KEY'}}[24];
@@ -2323,7 +2349,17 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
     $checked{'ESP_INTEGRITY'}{'aesxcbc'} = '';
     @temp = split('\|', $cgiparams{'ESP_INTEGRITY'});
     foreach my $key (@temp) {$checked{'ESP_INTEGRITY'}{$key} = "selected='selected'"; }
-    $checked{'ESP_GROUPTYPE'}{$cgiparams{'ESP_GROUPTYPE'}} = "selected='selected'";
+    $checked{'ESP_GROUPTYPE'}{'768'} = '';
+    $checked{'ESP_GROUPTYPE'}{'1024'} = '';
+    $checked{'ESP_GROUPTYPE'}{'1536'} = '';
+    $checked{'ESP_GROUPTYPE'}{'2048'} = '';
+    $checked{'ESP_GROUPTYPE'}{'3072'} = '';
+    $checked{'ESP_GROUPTYPE'}{'4096'} = '';
+    $checked{'ESP_GROUPTYPE'}{'6144'} = '';
+    $checked{'ESP_GROUPTYPE'}{'8192'} = '';
+    $checked{'ESP_GROUPTYPE'}{'none'} = '';
+    @temp = split('\|', $cgiparams{'ESP_GROUPTYPE'});
+    foreach my $key (@temp) {$checked{'ESP_GROUPTYPE'}{$key} = "selected='selected'"; }
 
     $checked{'COMPRESSION'} = $cgiparams{'COMPRESSION'} eq 'on' ? "checked='checked'" : '' ;
     $checked{'ONLY_PROPOSED'} = $cgiparams{'ONLY_PROPOSED'} eq 'on' ? "checked='checked'" : '' ;
@@ -2484,7 +2520,30 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                                        <option value='1024' $checked{'IKE_GROUPTYPE'}{'1024'}>MODP-1024</option>
                                </select>
                        </td>
-                       <td></td>
+                       <td class='boldbase'>
+                               <select name='ESP_GROUPTYPE' multiple='multiple' size='6' style='width: 100%'>
+                                       <option value='e521' $checked{'ESP_GROUPTYPE'}{'e521'}>ECP-521 (NIST)</option>
+                                       <option value='e512bp' $checked{'ESP_GROUPTYPE'}{'e512bp'}>ECP-512 (Brainpool)</option>
+                                       <option value='e384' $checked{'ESP_GROUPTYPE'}{'e384'}>ECP-384 (NIST)</option>
+                                       <option value='e384bp' $checked{'ESP_GROUPTYPE'}{'e384bp'}>ECP-384 (Brainpool)</option>
+                                       <option value='e256' $checked{'ESP_GROUPTYPE'}{'e256'}>ECP-256 (NIST)</option>
+                                       <option value='e256bp' $checked{'ESP_GROUPTYPE'}{'e256bp'}>ECP-256 (Brainpool)</option>
+                                       <option value='e224' $checked{'ESP_GROUPTYPE'}{'e224'}>ECP-224 (NIST)</option>
+                                       <option value='e224bp' $checked{'ESP_GROUPTYPE'}{'e224bp'}>ECP-224 (Brainpool)</option>
+                                       <option value='e192' $checked{'ESP_GROUPTYPE'}{'e192'}>ECP-192 (NIST)</option>
+                                       <option value='8192' $checked{'ESP_GROUPTYPE'}{'8192'}>MODP-8192</option>
+                                       <option value='6144' $checked{'ESP_GROUPTYPE'}{'6144'}>MODP-6144</option>
+                                       <option value='4096' $checked{'ESP_GROUPTYPE'}{'4096'}>MODP-4096</option>
+                                       <option value='3072' $checked{'ESP_GROUPTYPE'}{'3072'}>MODP-3072</option>
+                                       <option value='2048s256' $checked{'ESP_GROUPTYPE'}{'2048s256'}>MODP-2048/256</option>
+                                       <option value='2048s224' $checked{'ESP_GROUPTYPE'}{'2048s224'}>MODP-2048/224</option>
+                                       <option value='2048s160' $checked{'ESP_GROUPTYPE'}{'2048s160'}>MODP-2048/160</option>
+                                       <option value='2048' $checked{'ESP_GROUPTYPE'}{'2048'}>MODP-2048</option>
+                                       <option value='1536' $checked{'ESP_GROUPTYPE'}{'1536'}>MODP-1536</option>
+                                       <option value='1024' $checked{'ESP_GROUPTYPE'}{'1024'}>MODP-1024</option>
+                                       <option value='none' $checked{'ESP_GROUPTYPE'}{'none'}>- $Lang::tr{'none'} -</option>
+                               </select>
+                       </td>
                </tr>
        </tbody>
     </table>
@@ -3030,7 +3089,9 @@ sub make_algos($$$$$) {
                                                push(@algo, $int);
                                        }
 
-                                       if ($grp =~ m/^e(.*)$/) {
+                                       if ($grp eq "none") {
+                                               # noop
+                                       } elsif ($grp =~ m/^e(.*)$/) {
                                                push(@algo, "ecp$1");
                                        } else {
                                                push(@algo, "modp$grp");
index b38171762dafb736acd95cde6f5110bb9bf38f7c..afa3770cf93f05a7bd2635e30b0c08a8093952ad 100644 (file)
@@ -30,7 +30,6 @@ my $acl_src_noaccess_mac = "$apdir/acls/src_noaccess_mac.acl";
 
 my $banner = "A D V A N C E D &nbsp; P R O X Y &nbsp; - &nbsp; W E B &nbsp; A C C E S S &nbsp; M A N A G E R";
 my %cgiparams;
-my %mainsettings;
 my %proxysettings;
 
 my %acl=();
@@ -38,18 +37,10 @@ my @group_defs=();
 my @groups=();
 
 ### Initialize environment
-&readhash("${swroot}/main/settings", \%mainsettings);
 &readhash("${swroot}/proxy/advanced/settings", \%proxysettings);
-$language = $mainsettings{'LANGUAGE'};
 
 ### Initialize language
-if ($language =~ /^(\w+)$/) {$language = $1;}
- #
- # Uncomment this to force a certain language:
- # $language='en';
- #
-require "${swroot}/langs/en.pl";
-require "${swroot}/langs/${language}.pl";
+require "${swroot}/lang.pl";
 
 &getcgihash(\%cgiparams);
 
index e29541256b06300509675bd555b9d420bf703d51..48ade280a866034f59cf4deca47cd8f6421ec2d7 100644 (file)
 'dhcp advopt removed' => 'DHCP Option entfernt',
 'dhcp advopt scope' => 'Options-Wertebereich',
 'dhcp advopt scope global' => 'Global',
-'dhcp advopt scope help' => 'Globaler Bereich oder begenze Bereich auf Ã¼berprüfte Schnittstellen',
+'dhcp advopt scope help' => 'Globaler Bereich oder begrenze Bereich auf Ã¼berprüfte Schnittstellen',
 'dhcp advopt unknown' => 'Name der DHCP Option wurde nicht erkannt',
 'dhcp advopt value' => 'Optionswert',
 'dhcp allow bootp' => 'BOOTP Clients zulassen',
 'ppp setup' => 'PPP-Einstellungen',
 'pppoe' => 'PPPoE',
 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:',
+'pptp netconfig' => 'Eigene Netzkonfiguration',
+'pptp peer' => 'Gegenstelle',
+'pptp route' => 'PPTP-Route',
 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:',
 'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz',
 'prefered master' => 'Prefered Master',
 'save settings' => 'Einstellungen speichern',
 'save-adv-options' => 'Erweiterte Optionen speichern',
 'script name' => 'Skriptname:',
+'search' => 'Suchen',
 'secondary dns' => 'Sekundärer DNS:',
 'secondary ntp server' => 'Sekundärer NTP-Server',
 'secondary wins server address' => 'Sekundäre WINS-Server Adresse',
index 80c05520b60f9c6f3dca5a2bd4789fc92ce32500..af7fda947e2b15c3ace8d0de4c0d28cecdaf660d 100644 (file)
 'no modem selected' => 'No modem selected',
 'no set selected' => 'No set was selected',
 'no time limit' => 'unlimited time',
+'none' => 'none',
 'none found' => 'none found',
 'nonetworkname' => 'No Network Name entered',
 'noservicename' => 'No Service Name entered',
 'ppp setup' => 'PPP setup',
 'pppoe' => 'PPPoE',
 'pppoe settings' => 'Additional PPPoE settings:',
+'pptp netconfig' => 'My Net Config',
+'pptp peer' => 'Peer',
+'pptp route' => 'PPTP Route',
 'pptp settings' => 'Additional PPTP settings:',
 'pre-shared key is too short' => 'Pre-shared key is too short.',
 'prefered master' => 'Prefered Master',
 'save settings' => 'Save settings',
 'save-adv-options' => 'Save advanced options',
 'script name' => 'Script name:',
+'search' => 'Search',
 'secondary dns' => 'Secondary DNS:',
 'secondary ntp server' => 'Secondary NTP server',
 'secondary wins server address' => 'Secondary WINS server address',
index 2a826cd7039b7996feab4e4ce242189739167f6b..fc87bd62b472be117b8024551fcd9bd7e30b37f4 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 3
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -100,5 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f $(DIR_APP)/tools/mkimap /usr/bin
        sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
        chown cyrus.mail /var/imap/socket
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \
+               /var/ipfire/backup/addons/includes/cyrus-imapd
        @rm -rf $(DIR_APP) /usr/include/com_err.h
        @$(POSTBUILD)
index 3dac04285a983f3df7e5b331750996209182ee8c..857434c3d7015ecc3aa16da04ef404604a4a3832 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# 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        #
@@ -160,13 +160,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0093-Tweak-last-commit.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
        cd $(DIR_APP) && sed -i src/config.h \
                -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \
index 59f1426ead95a57304beb675cc97e5cc161b268b..2727423f0269a565d5ed7a2f0e993695740bcdd9 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
index 0547589805cb28f25d9bfc3905471a68db6508cc..a9efd99b3c2559caa134dc4a02f42e52b0eeca63 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
 
 include Config
 
-VER        = 1.1.2.1
+VER        = 1.1.6
 
 THISAPP    = libnet-$(VER)
-DL_FILE    = libnet.tar.gz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/libnet
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be845c41170d72c7db524f3411b50256
+$(DL_FILE)_MD5 = 710296fe424a49344e5fcc0d09e53317
 
 install : $(TARGET)
 
index e6bcd4060cebb5be364c57ad899722871e497a55..01721450553d5d88009ba56b80458e8134361263 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.2
+VER        = 2.4.4
 
 THISAPP    = libtool-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2ec8997e0c07249eb4cbd072417d70fe
+$(DL_FILE)_MD5 = 51bf400de3354687d68dfa2392506b7e
 
 install : $(TARGET)
 
index 4a25c4ca5f81a66af1d77f297d04dfebcb119a06..ae2621b032376ee0e4c8ef211b811113dc367e6f 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.32
+VER        = 2.9.2
 
 THISAPP    = libxml2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2621d322c16f0257e30f0ff2b13384de
+$(DL_FILE)_MD5 = 9e6a9aca9d155737868b3dc5fd82f788
 
 install : $(TARGET)
 
index 47ee4f8cd9c0bf0ed671d6af73cd624368cff799..1339f42f9545170b9c0016855e661b973f145912 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.17
+VER        = 1.1.28
 
 THISAPP    = libxslt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fde6a7a93c0eb14cba628692fa3a1000
+$(DL_FILE)_MD5 = 9667bf6f9310b957254fdcf6596600b7
 
 install : $(TARGET)
 
index b2d2552dc848200fec573a8c6e2c022a579a62b9..f59a709a5827eeab1e70cb3b54dea57011b5074b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
 
 include Config
 
-VER        = 3.14.41
+VER        = 3.14.43
 
-RPI_PATCHES = 3.14.41-grsec-ipfire1
-A7M_PATCHES = 3.14.41-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1-3.14.41-201505072056.patch.xz
+RPI_PATCHES = 3.14.43-grsec-ipfire1
+A7M_PATCHES = 3.14.43-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1-3.14.43-201505191737.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 59
+PAK_VER    = 61
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz         = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)                                 = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                                 = b28dfc6907c388c2adcc65aee2ad68ff
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 9c8b20647429a64d656999a3c7af890f
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
-$(GRS_PATCHES)_MD5                             = 8af3b27954311da581cc6f803f048779
+$(DL_FILE)_MD5                                 = 927f2343f298dfe531a8371f81356e53
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = b5ba925ae1d4279d3ac0f03c27dd16eb
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = b9c696fe4f22b05b81c168329ca33c94
+$(GRS_PATCHES)_MD5                             = 35e26b1214b1b0b515ee67e5ce50633a
 
 install : $(TARGET)
 
index 388b20b120d68a5396e7568e275901b85faf5a22..b51367855f714f3b330790da7d05aa24ee335c64 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 
 include Config
 
-VER        = 5.4.2.1
+VER        = 5.7.3
 
 THISAPP    = net-snmp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG      = netsnmpd
-PAK_VER           = 2
+PROG       = netsnmpd
+PAK_VER    = 4
 DEPS       = ""
 
 ###############################################################################
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 984932520143f0c8bf7b7ce1fc9e1da1
+$(DL_FILE)_MD5 = d4a3459e1577d0efa8d96ca70a885e53
 
 install : $(TARGET)
 
@@ -77,21 +77,22 @@ $(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 \
-                                   --with-default-snmp-version="2" \
-                                   --with-sys-contact="root@" \
-                                   --with-sys-location="localhost" \
-                                   --with-logfile="/var/log/snmpd.log" \
-                                   --with-persistent-directory="/var/net-snmp" \
-                                   --libdir=/usr/lib \
-                                   --sysconfdir="/etc"
+               --prefix=/usr \
+               --with-default-snmp-version="2" \
+               --with-sys-contact="root@" \
+               --with-sys-location="localhost" \
+               --with-logfile="/var/log/snmpd.log" \
+               --with-persistent-directory="/var/net-snmp" \
+               --libdir=/usr/lib \
+               --sysconfdir="/etc"
        cd $(DIR_APP) && make 
        cd $(DIR_APP) && make install
        install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \
+               /var/ipfire/backup/addons/includes/netsnmpd
        install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd
        ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd
        ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd
        ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-       
index daad9dce9198f9714152ac2836395f8b0dfc1fdb..ed535620c75124b43f5216e225321f3e7479fdcd 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.52.17
+VER        = 0.52.18
 
 THISAPP    = newt-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f36d4d908965a0c89fd6fd8b61a6118b
+$(DL_FILE)_MD5 = 685721bee1a318570704b19dcf31d268
 
 install : $(TARGET)
 
index d8f337baf873ba5d4c91d490499af9d07545f1c1..7e6e3764152c30b6a8badca9a76114085ab74a10 100644 (file)
@@ -70,9 +70,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(PADLOCK)" "1"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch
-endif
        cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
                    --libexecdir=/usr/lib/openssh --with-md5-passwords \
index 455dcf15cbdeef2044a879e477f3e6baa44fb0a9..3b9f3e1210b68b13894bf768057c18559c21f86d 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2a
+VER        = 1.0.2b
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a06c547dac9044161a477211049f60ef
+$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b
 
 install : $(TARGET)
 
index f5c771ca81ea21ab838fb71b03cbbd67c36e6666..175afc09e246b06db8cb96cd16403eedfb15235d 100644 (file)
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.36
+VER        = 8.37
 
 THISAPP    = pcre-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ff7b4bb14e355f04885cf18ff4125c98
+$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
 
 install : $(TARGET)
 
index 77c6dd0e4aefbccb08c5bd9a6a45492a7e79e005..fd332537a78cae1262f1a2bb7479b383d3c3182d 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = "amavisd mysql"
 
index 7b9e0c7c8625bd8aadf6b8c3a5dd62b691ca8cb8..3b9f1c5c6f1760d09c154f8e6de317adf8f0a0b3 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2015  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 
 include Config
 
-VER       = 2.7.1
+VER       = 2.7.3
 
 include python
 
 PROG      = python-optional-src
-PAK_VER    = 2
+PAK_VER    = 3
 DEPS       =
 
 dist: 
index c8794fe7e0c7790c2014ffb1c05cd9170a619dad..ce309a12bb601154542f7a908b188b7cbb801900 100644 (file)
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - An Open Source Firewall Solution                               #
-# Copyright (C) 2012 Michael Tremer                                           #
+# Copyright (C) 2014 Michael Tremer                                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.3.3
+VER        = 2.3.9
 
 THISAPP    = sarg-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 09dba9a960d500acd7f17802de62512c
+$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428
 
 install : $(TARGET)
 
index 55590f7cb2c8bff423d8f5328d7589a0ab9925e8..d913cdf2547b270d26f0300f4bc8e05d4efe7ab3 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.4
+VER        = 2.3.0
 
 THISAPP    = slang-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 86cd8689cd71e281b4720fef8453ceeb
+$(DL_FILE)_MD5 = 80f4e64189b6f28fd420b829b44a6723
 
 install : $(TARGET)
 
index f227bba66555cd0c4a2b4083673c93293f6ea7c3..d1a5b8c1507c4941f15384b1231e777f2dcda93c 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.0
+VER        = 5.3.1
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c52d4228231c2025d9c320d0e9990327
+$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013
 
 install : $(TARGET)
 
@@ -78,10 +78,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
 
-       cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
+       cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP) && ./configure \
                --prefix="/usr" \
                --sysconfdir="/etc" \
diff --git a/lfs/tor b/lfs/tor
index 8eca48df58064e85430e5f908113f8a10a08c2ae..eb188373d80bd6b03cf34203049f3be4420a91b1 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.2.5.12
+VER        = 0.2.6.9
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 89745069a7efb7aafd01ae263bd0fe5c
+$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d
 
 install : $(TARGET)
 
index f3e74a00e1ac37e0e8b1f0656e107dd7d106b71a..7284be96150a4987b7a812b3b30a08fd42c7d9f9 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = ""
 
diff --git a/make.sh b/make.sh
index 835a3a623eff40e012bd41d10428819e11cc5179..29245bc59debe70b7350791372ea79db0bc38e39 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
-CORE="90"                                                      # Core Level (Filename)
-PAKFIRE_CORE="90"                                              # Core Level (PAKFIRE)
+CORE="91"                                                      # Core Level (Filename)
+PAKFIRE_CORE="91"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
index dca3e40163caeb050dc546684ff0d00258171851..70c30b4e230fb8b9fcff9e4f607394f2f948e8b1 100644 (file)
@@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
        fi
 fi
 
index 21c523600c75b5223106d6aeb284db40f30e9531..f77c2dfb53da72f7cf4371110d219f34591fb308 100644 (file)
@@ -79,18 +79,13 @@ int main(int argc, char *argv[])
        freekeyvalues(kv);
        kv = NULL;
 
-       if (!(gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r")))
-       {
+       if ((gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) {
+               if (fgets(gateway, STRING_SIZE, gw) == NULL) {
+                       fprintf(stderr, "Couldn't read remote-ipaddress\n");
+                       exit(1);
+               }
+       } else {
                fprintf(stderr, "Couldn't open remote-ipaddress file\n");
-               fclose(gw);
-               gw = NULL;
-               exit(1);
-       }
-
-       if (fgets(gateway, STRING_SIZE, gw) == NULL)
-       {
-               fprintf(stderr, "Couldn't read remote-ipaddress\n");
-               exit(1);
        }
 
        if (!(fd = fopen(CONFIG_ROOT "/main/hosts", "r")))
@@ -112,7 +107,8 @@ int main(int argc, char *argv[])
        else
                fprintf(hosts, "%s\t%s\n",address,hostname);
 
-       fprintf(hosts, "%s\tgateway\n",gateway);
+       if (strlen(gateway) > 0)
+               fprintf(hosts, "%s\tgateway\n", gateway);
 
        while (fgets(buffer, STRING_SIZE, fd))
        {
index d14e0314da05e1a7bfd5377cd7811c1812e22afd..d2f77fa8f18134d421e166ce808901dc2ae67b54 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -393,6 +393,7 @@ sub dbgetlist {
        foreach $file (@files) {
                next if ( $file eq "." );
                next if ( $file eq ".." );
+               next if ( $file eq "meta-" );
                next if ( $file =~ /^old/ );
                open(FILE, "<$Conf::dbdir/meta/$file");
                @meta = <FILE>;
@@ -589,6 +590,25 @@ sub resolvedeps {
        return @all;
 }
 
+sub resolvedeps_recursive {
+       my @packages = shift;
+       my @result = ();
+
+       foreach my $pkg (@packages) {
+               my @deps = &Pakfire::resolvedeps($pkg);
+
+               foreach my $dep (@deps) {
+                       push(@result, $dep);
+               }
+       }
+
+       # Sort the result array and remove dupes
+       my %sort = map{ $_, 1 } @result;
+       @result = keys %sort;
+
+       return @result;
+}
+
 sub cleanup {
        my $dir = shift;
        my $path;
@@ -695,7 +715,7 @@ sub getpak {
        }
        
        unless ($file) {
-               message("No filename given in meta-file. Please phone the developers.");
+               message("No filename given in meta-file.");
                exit 1;
        }
        
@@ -870,6 +890,7 @@ sub checkcryptodb {
        unless ( "$ret" eq "0" ) {
                message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
                message("CRYPTO WARN: It's normal to see this on first execution.");
+               message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
                my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
                system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
                system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
index 3d0270aa41db8fb49f0f4f1002c9ba1e826606e6..8bca061aba696b34807c6cda0e19f928fa668736 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
        } elsif ("$ARGV[0]" eq "upgrade") {
                &Pakfire::upgradecore();
                my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
-               my @temp, $pak;
-               
-               foreach (@upgradepaks) {
-                       @temp = &Pakfire::resolvedeps("$_");
-                       foreach (@temp) { push(@upgradepaks,$_) if $_; }
-               }
-               
+
                if (@upgradepaks) {
+                       # Resolve the dependencies of the to be upgraded packages
+                       my @deps = &Pakfire::resolvedeps_recursive(@upgradepaks);
+
                        &Pakfire::message("");
                        &Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above.");
                        if ($interactive) {
                        }
                }
                
-               ### Download first
+               # Download packages
                foreach $pak (@upgradepaks) {
-                       #system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
                        &Pakfire::getpak("$pak", "");
                }
-               
+
+               # Download dependencies
+               foreach $pak (@deps) {
+                       &Pakfire::getpak("$pak", "");
+               }
+
+               # Install dependencies first
+               foreach $pak (@deps) {
+                       &Pakfire::setuppak("$pak");
+               }
+
+               # Install all upgrades
                foreach $pak (@upgradepaks) {
-                       if (&Pakfire::upgradepak("$pak")) {
-                               #system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
-                       }
+                       &Pakfire::upgradepak("$pak");
                }
                
        } elsif ("$ARGV[0]" eq "list") {
index 0d2109eb9e6337d1c5838982f6b82f04e7f4e4d1..e34fa5698fd7c31fca33c23ec6b928071079d4a8 100644 (file)
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files
index c980a0136bfd81732965bfda823522846531895d..27e665f9243b1e18be7a31b5d23b6843be7957fe 100644 (file)
@@ -55,29 +55,24 @@ depmod -a $KVER-ipfire-pae
 #
 /usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
-
-ROOT="$(find_partition "/")"
-case $ROOT in
-       xvd* )
-               #
-               # We are on XEN so create new grub.conf / menu.lst for pygrub
-               #
-               echo "timeout 10"                          > /boot/grub/grub.conf
-               echo "default 0"                          >> /boot/grub/grub.conf
-               echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
-               echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
-                                                         >> /boot/grub/grub.conf
-               echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
-               echo "# savedefault 0"                    >> /boot/grub/grub.conf
-               ln -s grub.conf $MNThdd/boot/grub/menu.lst
-               ;;
-       * )
-               #
-               # Update grub2 config
-               #
-               grub-mkconfig > /boot/grub/grub.cfg
-               ;;
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+       #
+       # Update grub2 config
+       #
+       grub-mkconfig > /boot/grub/grub.cfg
+else
+       #
+       # xen pv with pygrub need grub.conf / menu.lst
+       #
+       echo "timeout 10"                          > /boot/grub/grub.conf
+       echo "default 0"                          >> /boot/grub/grub.conf
+       echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
+       echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
+                                                 >> /boot/grub/grub.conf
+       echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
+       echo "# savedefault 0"                    >> /boot/grub/grub.conf
+       ln -s grub.conf $MNThdd/boot/grub/menu.lst
+fi
 
 # request a reboot if pae is supported
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
similarity index 98%
rename from src/paks/net-snmp/uninstall.sh
rename to src/paks/netsnmpd/uninstall.sh
index a7b8a5370f68e23809d3bd94083f0150545980cb..278218b26066bb104c4e310d58e5e9f4782f00e4 100644 (file)
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files
index 56c23e2c26bdea3576128c2881ab25171122267d..0932d2e54e46c5af3360449669dec2c27d9dcf8a 100644 (file)
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
+restore_backup ${NAME}
 postalias /etc/aliases
 # Set postfix's hostname
 postconf -e "myhostname=$(hostname -f)"
-/etc/init.d/postfix start
+
+start_service ${NAME}
 
 # Enable autostart for postfix
 ln -sf  ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
index 39f1ef969c3b233713530dc1a8ae23e3f039f3f9..bc70451a17f90af3ae12de6fc4d87894e8d2118a 100644 (file)
@@ -22,5 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
+stop_service ${NAME}
+make_backup ${NAME}
 remove_files
 rm -rfv /etc/rc.d/rc*.d/*postfix
index 1d6a657831c7e34f7d1cdedea0d1bfdffcb1daee..57c9ff13fcf76f45e5d45a3163289d721355ea89 100644 (file)
@@ -1,7 +1,7 @@
 From f2658275b25ebfe691cdcb9fede85a3088cca168 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 25 Sep 2014 21:51:25 +0100
-Subject: [PATCH 01/87] Add newline at the end of example config file.
+Subject: [PATCH 01/98] Add newline at the end of example config file.
 
 ---
  dnsmasq.conf.example | 2 +-
index 54a36a7329c5e6f700ff8de4ea72be4c17fb1115..86eb603ae796817552cef15f3cdeb353fa11e6b1 100644 (file)
@@ -1,7 +1,7 @@
 From 00cd9d551998307225312fd21f761cfa8868bd2c Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 2 Oct 2014 21:44:21 +0100
-Subject: [PATCH 02/87] crash at startup when an empty suffix is supplied to
+Subject: [PATCH 02/98] crash at startup when an empty suffix is supplied to
  --conf-dir
 
 ---
index eda96854290add1c70e3d821a533966fbf5029d7..b0badb1f00f9658b0aaef24b2451ef3a998c2a8a 100644 (file)
@@ -1,7 +1,7 @@
 From 6ac3bc0452a74e16e3d620a0757b0f8caab182ec Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 3 Oct 2014 08:48:11 +0100
-Subject: [PATCH 03/87] Debian build fixes for kFreeBSD
+Subject: [PATCH 03/98] Debian build fixes for kFreeBSD
 
 ---
  src/tables.c | 6 +++++-
index 6374fefbd382c5c1b1b16e04fb8be65d9c4c00a4..b2725d4a27a74133d590135813beeae7126bf7cf 100644 (file)
@@ -1,7 +1,7 @@
 From e9828b6f66b22ce8873f8d30a773137d1aef1b92 Mon Sep 17 00:00:00 2001
 From: Karl Vogel <karl.vogel@gmail.com>
 Date: Fri, 3 Oct 2014 21:45:15 +0100
-Subject: [PATCH 04/87] Set conntrack mark before connect() call.
+Subject: [PATCH 04/98] Set conntrack mark before connect() call.
 
 SO_MARK has to be done before issuing the connect() call on the
 TCP socket.
index 6052d454f4ae520a13020f2be93c9aea72a09df0..84be7de37a06dacc0f016b325ef211ee5743f938 100644 (file)
@@ -1,7 +1,7 @@
 From 17b475912f6a4e72797a543dad59d4d5dde6bb1b Mon Sep 17 00:00:00 2001
 From: Daniel Collins <daniel.collins@smoothwall.net>
 Date: Fri, 3 Oct 2014 21:58:43 +0100
-Subject: [PATCH 05/87] Fix typo in new Dbus code.
+Subject: [PATCH 05/98] Fix typo in new Dbus code.
 
 Simon's fault.
 ---
index d7a0207b74c6863d356d0a46f93221eab714985b..0cb139f8164e96a2f51de99e8edc2c06090a1712 100644 (file)
@@ -1,7 +1,7 @@
 From 3d9d2dd0018603a2ae4b9cd65ac6ff959f4fd8c7 Mon Sep 17 00:00:00 2001
 From: Tomas Hozza <thozza@redhat.com>
 Date: Mon, 6 Oct 2014 10:46:48 +0100
-Subject: [PATCH 06/87] Fit example conf file typo.
+Subject: [PATCH 06/98] Fit example conf file typo.
 
 ---
  dnsmasq.conf.example | 2 +-
index 81e67b1a084b8ae6658444bcea8c073d4a7b5167..286ddcf682bbba43b5a30b2b8cc7ee0a733bd78b 100644 (file)
@@ -1,7 +1,7 @@
 From b9ff5c8f435173cfa616e3c398bdc089ef690a07 Mon Sep 17 00:00:00 2001
 From: Vladislav Grishenko <themiron@mail.ru>
 Date: Mon, 6 Oct 2014 14:34:24 +0100
-Subject: [PATCH 07/87] Improve RFC-compliance when unable to supply addresses
+Subject: [PATCH 07/98] Improve RFC-compliance when unable to supply addresses
  in DHCPv6
 
 While testing https://github.com/sbyx/odhcp6c client I have noticed it
index a0706ba6e2bdf949d625bce031d16ea7a4160a7f..f667cf3cedbb24ee37be6069da42270524ede29b 100644 (file)
@@ -1,7 +1,7 @@
 From 98906275a02ae260fe3f82133bd79054f8315f06 Mon Sep 17 00:00:00 2001
 From: Hans Dedecker <dedeckeh@gmail.com>
 Date: Tue, 9 Dec 2014 22:22:53 +0000
-Subject: [PATCH 08/87] Fix conntrack with --bind-interfaces
+Subject: [PATCH 08/98] Fix conntrack with --bind-interfaces
 
 Make sure dst_addr is assigned the correct address in receive_query when OPTNOWILD is
 enabled so the assigned mark can be correctly retrieved and set in forward_query when
index 28dae8c2db27dede2e5017b0b77b80013b85bde9..3d6654068a3c15ae3d298e2b576826787a98715e 100644 (file)
@@ -1,7 +1,7 @@
 From 193de4abf59e49c6b70d54cfe9720fcb95ca2f71 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 10 Dec 2014 17:32:16 +0000
-Subject: [PATCH 09/87] Use inotify instead of polling on Linux.
+Subject: [PATCH 09/98] Use inotify instead of polling on Linux.
 
 This should solve problems people are seeing when a file changes
 twice within a second and thus is missed for polling.
index 34dbf3a144164b7c765f9240d4da8a3b7ff154ee..2ddef28b6969d92a417fcabe9bc7fe7ae768d12d 100644 (file)
@@ -1,7 +1,7 @@
 From 857973e6f7e0a3d03535a9df7f9373fd7a0b65cc Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 15 Dec 2014 15:58:13 +0000
-Subject: [PATCH 10/87] Teach the new inotify code about symlinks.
+Subject: [PATCH 10/98] Teach the new inotify code about symlinks.
 
 ---
  src/inotify.c | 43 +++++++++++++++++++++++++++----------------
index b7c670fca1cc57a093f52b874382134343cb2cd1..c4dd777cbbf79c39f47fe8172e22609b98fb9ca6 100644 (file)
@@ -1,7 +1,7 @@
 From 800c5cc1e7438818fd80f08c2d472df249a6942d Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 15 Dec 2014 17:50:15 +0000
-Subject: [PATCH 11/87] Remove floor on EDNS0 packet size with DNSSEC.
+Subject: [PATCH 11/98] Remove floor on EDNS0 packet size with DNSSEC.
 
 ---
  CHANGELOG     | 6 +++++-
index 8dbf7bdc9012b4198c52004df55eb72bb5899f00..0044a39a2972b891ad1897aa32609780801ef58a 100644 (file)
@@ -1,7 +1,7 @@
 From ad946d555dce44eb690c7699933b6ff40ab85bb6 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 15 Dec 2014 17:52:22 +0000
-Subject: [PATCH 12/87] CHANGELOG re. inotify.
+Subject: [PATCH 12/98] CHANGELOG re. inotify.
 
 ---
  CHANGELOG | 4 ++++
index c102b72f7317b8df994df016261b86e6d3ed9990..8f67d2a81e8f2e19ba7e8dfc99c583aa59111982 100644 (file)
@@ -1,7 +1,7 @@
 From 3ad3f3bbd4ee716a7d2fb1e115cf89bd1b1a5de9 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 16 Dec 2014 18:25:17 +0000
-Subject: [PATCH 13/87] Fix breakage of --domain=<domain>,<subnet>,local
+Subject: [PATCH 13/98] Fix breakage of --domain=<domain>,<subnet>,local
 
 ---
  CHANGELOG    |  4 ++++
index 8d818256965585074ae9c7bc600d39285490b180..19f03225dcb6df1e243337821b64ec8b42109442 100644 (file)
@@ -1,7 +1,7 @@
 From bd9520b7ade7098ee423acc38965376aa57feb07 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 16 Dec 2014 20:41:29 +0000
-Subject: [PATCH 14/87] Remove redundant IN6_IS_ADDR_ULA(a) macro defn.
+Subject: [PATCH 14/98] Remove redundant IN6_IS_ADDR_ULA(a) macro defn.
 
 ---
  src/network.c | 4 ----
index 9544a167d144165254356e8bf8aac0d7dd8c64f0..2c9c2a64a863d2535555b74883c6ebbd46471f38 100644 (file)
@@ -1,7 +1,7 @@
 From 476693678e778886b64d0b56e27eb7695cbcca99 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 17 Dec 2014 12:41:56 +0000
-Subject: [PATCH 15/87] Eliminate IPv6 privacy addresses from --interface-name
+Subject: [PATCH 15/98] Eliminate IPv6 privacy addresses from --interface-name
  answers.
 
 ---
index 9fb6efb83c6ff87b03fdf2a2643dda367a962256..3b984f34f9e0f567834bcb1b32efe0df82e93109 100644 (file)
@@ -1,7 +1,7 @@
 From 3267804598047bd1781cab91508d1bc516e5ddbb Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 17 Dec 2014 20:38:20 +0000
-Subject: [PATCH 16/87] Tweak field width in cache dump to avoid truncating
+Subject: [PATCH 16/98] Tweak field width in cache dump to avoid truncating
  IPv6 addresses.
 
 ---
index 45370a6fe9787f0481d8c57a14e8bf51fbf30fb3..0aa4fe912dbe5051a975fad2da1b99deb3ee8e0f 100644 (file)
@@ -1,7 +1,7 @@
 From 094b5c3d904bae9aeb3206d9f3b8348926b84975 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 21 Dec 2014 16:11:52 +0000
-Subject: [PATCH 17/87] Fix crash in DNSSEC code when attempting to verify
+Subject: [PATCH 17/98] Fix crash in DNSSEC code when attempting to verify
  large RRs.
 
 ---
index 11e517853563fb027ab711d3ec4f07fd0d056378..e80f0e3957bd7c6f3034d9df8db533ba58e5a833 100644 (file)
@@ -1,7 +1,7 @@
 From cbc652423403e3cef00e00240f6beef713142246 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 21 Dec 2014 21:21:53 +0000
-Subject: [PATCH 18/87] Make caching work for CNAMEs pointing to A/AAAA records
+Subject: [PATCH 18/98] Make caching work for CNAMEs pointing to A/AAAA records
  shadowed in /etc/hosts
 
 If the answer to an upstream query is a CNAME which points to an
index 4fe15f0939205981d37efcf12949541e4795b7f9..7bd143ede6656ff4803f5ee8c5d3df45e4a46300 100644 (file)
@@ -1,7 +1,7 @@
 From fbc5205702c7f6f431d9f1043c553d7fb62ddfdb Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 23 Dec 2014 15:46:08 +0000
-Subject: [PATCH 19/87] Fix problems validating NSEC3 and wildcards.
+Subject: [PATCH 19/98] Fix problems validating NSEC3 and wildcards.
 
 ---
  src/dnssec.c | 253 ++++++++++++++++++++++++++++++-----------------------------
index cfa39ce27d74e20e5d261f48a128420a384623f3..27d121710b7ec6f1d01fa97f0cfe968c93e63768 100644 (file)
@@ -1,7 +1,7 @@
 From 83d2ed09fc0216b567d7fb2197e4ff3eae150b0d Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 23 Dec 2014 18:42:38 +0000
-Subject: [PATCH 20/87] Initialise return value.
+Subject: [PATCH 20/98] Initialise return value.
 
 ---
  src/dnssec.c | 7 +++++--
index d3fda4b7ed883279e137eef2923b76e446c5d666..ab6e7a514c711b8bd25443244e9d3dfc6eb6d2f6 100644 (file)
@@ -1,7 +1,7 @@
 From 32fc6dbe03569d70dd394420ceb73532cf303c33 Mon Sep 17 00:00:00 2001
 From: Glen Huang <curvedmark@gmail.com>
 Date: Sat, 27 Dec 2014 15:28:12 +0000
-Subject: [PATCH 21/87] Add --ignore-address option.
+Subject: [PATCH 21/98] Add --ignore-address option.
 
 ---
  CHANGELOG     |  8 ++++++++
index 58ac5eb06c90ee25f70f3fdea2c6cc9bc35274aa..0c8250614385f97f7c5f610dfe269e095ae93876 100644 (file)
@@ -1,7 +1,7 @@
 From 0b1008d367d44e77352134a4c5178f896f0db3e7 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 27 Dec 2014 15:33:32 +0000
-Subject: [PATCH 22/87] Bad packet protection.
+Subject: [PATCH 22/98] Bad packet protection.
 
 ---
  src/dnssec.c | 2 +-
index ebfa6b15b5a2a1e777200860daa24997e3ca7c63..5bf7d6300eb84abd581061418552e4dee1fef202 100644 (file)
@@ -1,7 +1,7 @@
 From d310ab7ecbffce79d3d90debba621e0222f9bced Mon Sep 17 00:00:00 2001
 From: Matthias Andree <matthias.andree@gmx.de>
 Date: Sat, 27 Dec 2014 15:36:38 +0000
-Subject: [PATCH 23/87] Fix build failure in new inotify code on BSD.
+Subject: [PATCH 23/98] Fix build failure in new inotify code on BSD.
 
 ---
  src/inotify.c | 4 ++--
index 64219ff260a17b32bb3dcd8efbef2eccf60ee2ef..41662b7e3ce7506a5cc3fe17af0b20dc2c900e6e 100644 (file)
@@ -1,7 +1,7 @@
 From 81c538efcebfce2ce4a1d3a420b6c885b8f08df9 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Sat, 3 Jan 2015 16:36:14 +0000
-Subject: [PATCH 24/87] Implement makefile dependencies on COPTS variable.
+Subject: [PATCH 24/98] Implement makefile dependencies on COPTS variable.
 
 ---
  .gitignore |  2 +-
index 2297e6f2c5821e14b68f5f4adb8f29ab47b70abc..4de48837e344c4f0edb69d8fe0bf16314adcb0f2 100644 (file)
@@ -1,7 +1,7 @@
 From d8dbd903d024f84a149dac2f8a674a68dfed47a3 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Mon, 5 Jan 2015 17:03:35 +0000
-Subject: [PATCH 25/87] Fix race condition issue in makefile.
+Subject: [PATCH 25/98] Fix race condition issue in makefile.
 
 ---
  Makefile | 4 +++-
index 6fb5db1246f2df0470964a8a4d68aaedc66ac8d5..cb9c925ecca63b54489202eafb409319ebe35302 100644 (file)
@@ -1,7 +1,7 @@
 From 97e618a0e3f29465acc689d87288596b006f197e Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 7 Jan 2015 21:55:43 +0000
-Subject: [PATCH 26/87] DNSSEC: do top-down search for limit of secure
+Subject: [PATCH 26/98] DNSSEC: do top-down search for limit of secure
  delegation.
 
 ---
index 41e3649f5cabee5862263aa1bc8ec6a78dd77e49..6b752538b0b8b00b13bcf01315260fc90429e295 100644 (file)
@@ -1,7 +1,7 @@
 From 25cf5e373eb41c088d4ee5e625209c4cf6a5659e Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 9 Jan 2015 15:53:03 +0000
-Subject: [PATCH 27/87] Add --log-queries=extra option for more complete
+Subject: [PATCH 27/98] Add --log-queries=extra option for more complete
  logging.
 
 ---
index 85de912de2ec869f081873630c35c81cabb71f35..6bb1c97fbb8d37c211f7e792bb8642eb8161016b 100644 (file)
@@ -1,7 +1,7 @@
 From 28de38768e2c7d763b9aa5b7a4d251d5e56bab0b Mon Sep 17 00:00:00 2001
 From: RinSatsuki <aa65535@live.com>
 Date: Sat, 10 Jan 2015 15:22:21 +0000
-Subject: [PATCH 28/87] Add --min-cache-ttl option.
+Subject: [PATCH 28/98] Add --min-cache-ttl option.
 
 ---
  CHANGELOG     |  7 +++++++
index afbece3a6c037fbedd288e4c911c693892db11f0..0e63180c2d5a65031134ff2f0b4ad379b0016f7a 100644 (file)
@@ -1,7 +1,7 @@
 From 9f79ee4ae34886c0319f06d8f162b81ef79d62fb Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 12 Jan 2015 20:18:18 +0000
-Subject: [PATCH 29/87] Log port of requestor when doing extra logging.
+Subject: [PATCH 29/98] Log port of requestor when doing extra logging.
 
 ---
  src/cache.c | 6 +++---
index ac206e386fd8240de194b6f918d1c315552bcaa6..6817da140b901f925610a4670fd74b5dd590f192 100644 (file)
@@ -1,7 +1,7 @@
 From 5e321739db381a1d7b5964d76e9c81471d2564c9 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 12 Jan 2015 23:16:56 +0000
-Subject: [PATCH 30/87] Don't answer from cache RRsets from wildcards, as we
+Subject: [PATCH 30/98] Don't answer from cache RRsets from wildcards, as we
  don't have NSECs.
 
 ---
index 20a0e4ba005e25fa08f9f88805ebfc0f6d8ce5be..2b86121b1fcd3fb3be1fd259ee3c7e484eb1e362 100644 (file)
@@ -1,7 +1,7 @@
 From ae4624bf46b5e37ff1a9a2ba3c927e0dede95adb Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 12 Jan 2015 23:22:08 +0000
-Subject: [PATCH 31/87] Logs for DS records consistent.
+Subject: [PATCH 31/98] Logs for DS records consistent.
 
 ---
  src/rfc1035.c | 2 +-
index 5b5fc07ffa0ec0dde23647a764865ab4e3e87733..d3d1277fc49b6b80711534ddecb0e99d938ef9f5 100644 (file)
@@ -1,7 +1,7 @@
 From 393415597c8b5b09558b789ab9ac238dbe3db65d Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 18 Jan 2015 22:11:10 +0000
-Subject: [PATCH 32/87] Cope with multiple interfaces with the same LL address.
+Subject: [PATCH 32/98] Cope with multiple interfaces with the same LL address.
 
 ---
  CHANGELOG  | 4 ++++
index 926885f322f0362e72c28395c6f0c3a5c39d006c..07cc0804b24c0496b2e67656e9efe111da96fbee 100644 (file)
@@ -1,7 +1,7 @@
 From 2ae195f5a71f7c5a75717845de1bd72fc7dd67f3 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 18 Jan 2015 22:20:48 +0000
-Subject: [PATCH 33/87] Don't treat SERVFAIL as a recoverable error.....
+Subject: [PATCH 33/98] Don't treat SERVFAIL as a recoverable error.....
 
 ---
  src/forward.c | 2 +-
index 4ca8cc5d0399b78b14ca25ed91982ad2d98923fb..b93d9cce5c8116eaa5dc03afd3642463c5c93cba 100644 (file)
@@ -1,7 +1,7 @@
 From 5f4dc5c6ca50655ab14f572c7e30815ed74cd51a Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 20 Jan 2015 20:51:02 +0000
-Subject: [PATCH 34/87] Add --dhcp-hostsdir config option.
+Subject: [PATCH 34/98] Add --dhcp-hostsdir config option.
 
 ---
  CHANGELOG     |   5 +++
index 23f1a5fae55eab7bed96d6615044a9078eb2c408..820bce138eb4d89ad3f4263ddaa535df8063e285 100644 (file)
@@ -1,7 +1,7 @@
 From fbf01f7046e75f9aa73fd4aab2a94e43386d9052 Mon Sep 17 00:00:00 2001
 From: Conrad Kostecki <ck@conrad-kostecki.de>
 Date: Tue, 20 Jan 2015 21:07:56 +0000
-Subject: [PATCH 35/87] Update German translation.
+Subject: [PATCH 35/98] Update German translation.
 
 ---
  po/de.po | 101 +++++++++++++++++++++++++++++----------------------------------
index c89b6788dc9803fcb6d4ac458f801d946a081fbc..88562363e15bb4013fe60af7a73f1c848084fa6b 100644 (file)
@@ -1,7 +1,7 @@
 From 61b838dd574c51d96fef100285a0d225824534f9 Mon Sep 17 00:00:00 2001
 From: Win King Wan <pinwing+dnsmasq@gmail.com>
 Date: Wed, 21 Jan 2015 20:41:48 +0000
-Subject: [PATCH 36/87] Don't reply to DHCPv6 SOLICIT messages when not
+Subject: [PATCH 36/98] Don't reply to DHCPv6 SOLICIT messages when not
  configured for statefull DHCPv6.
 
 ---
index 16170959375f4ce299ad8d6f6ad04eff54817839..2a4df45c0531e70077473c33a8f0047451cd84bd 100644 (file)
@@ -1,7 +1,7 @@
 From 0491805d2ff6e7727f0272c94fd97d9897d1e22c Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 26 Jan 2015 11:23:43 +0000
-Subject: [PATCH 37/87] Allow inotify to be disabled at compile time on Linux.
+Subject: [PATCH 37/98] Allow inotify to be disabled at compile time on Linux.
 
 ---
  CHANGELOG     |  4 +++-
index fee3aaee6685b5dcad11996eb39679683fccb602..cd35f366ae699810f3348b4e846f76536b2a6d14 100644 (file)
@@ -1,7 +1,7 @@
 From 70d1873dd9e70041ed4bb88c69d5b886b7cc634c Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 31 Jan 2015 19:59:29 +0000
-Subject: [PATCH 38/87] Expand inotify code to dhcp-hostsdir, dhcp-optsdir and
+Subject: [PATCH 38/98] Expand inotify code to dhcp-hostsdir, dhcp-optsdir and
  hostsdir.
 
 ---
index 58a4ce6d4589333513e35efa4c0a5732bc6ec73e..7cf3fa7cc579190bc8b65fc3cd8bf5ec63501d25 100644 (file)
@@ -1,7 +1,7 @@
 From aff3396280e944833f0e23d834aa6acd5fe2605a Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 31 Jan 2015 20:13:40 +0000
-Subject: [PATCH 39/87] Update copyrights for dawn of 2015.
+Subject: [PATCH 39/98] Update copyrights for dawn of 2015.
 
 ---
  Makefile             | 2 +-
index bd0ce4d3ac4b4f60c523ba85b758acb024526fed..3ed1b15eabfc3d528785c358039b94693d16952f 100644 (file)
@@ -1,7 +1,7 @@
 From 3d04f46334d0e345f589eda1372e638b946fe637 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 31 Jan 2015 21:59:13 +0000
-Subject: [PATCH 40/87] inotify documentation updates.
+Subject: [PATCH 40/98] inotify documentation updates.
 
 ---
  man/dnsmasq.8 | 11 +++++++++--
index be9122c09060b08ac91ee3bf14d5de25cac4daff..56dcc5f137c072f82aec25c6ba4eb2ddc6ee0d60 100644 (file)
@@ -1,7 +1,7 @@
 From 6ef15b34ca83c62a939f69356d5c3f7a6bfef3d0 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 31 Jan 2015 22:44:26 +0000
-Subject: [PATCH 41/87] Fix broken ECDSA DNSSEC signatures.
+Subject: [PATCH 41/98] Fix broken ECDSA DNSSEC signatures.
 
 ---
  CHANGELOG    | 2 ++
index a60c1bddb587e8e6d3b25641d11293cb4864a97f..65842537c08f757de0a27b24a75786f0882219b3 100644 (file)
@@ -1,7 +1,7 @@
 From 106266761828a0acb006346ae47bf031dee46a5d Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 1 Feb 2015 00:15:16 +0000
-Subject: [PATCH 42/87] BSD make support
+Subject: [PATCH 42/98] BSD make support
 
 ---
  Makefile | 6 ++++--
index 0fcc8cd3bea21b4765d726d27a0498a5aa974174..a8c26bf393af8a72a3a715713bd4508c9a7c0abc 100644 (file)
@@ -1,7 +1,7 @@
 From 8d8a54ec79d9f96979fabbd97b1dd2ddebc7d78f Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 1 Feb 2015 21:48:46 +0000
-Subject: [PATCH 43/87] Fix build failure on openBSD.
+Subject: [PATCH 43/98] Fix build failure on openBSD.
 
 ---
  src/tables.c | 2 +-
index dd45634c996e5b540f6fb09ce7788f0ab1c069af..f8bd5fc1834579ed9b97b1f8799ff57146b92bd6 100644 (file)
@@ -1,7 +1,7 @@
 From d36b732c4cfa91ea09af64b5dc0f3a85a075e5bc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <thiebaud@weksteen.fr>
 Date: Mon, 2 Feb 2015 21:37:27 +0000
-Subject: [PATCH 44/87] Manpage typo fix.
+Subject: [PATCH 44/98] Manpage typo fix.
 
 ---
  man/dnsmasq.8 | 2 +-
index 7a719f83ea140c16c4d7afedd8ecd8405cde6185..7f6d39f6cfe6088630bfb59f78ae2faee5991411 100644 (file)
@@ -1,7 +1,7 @@
 From 2941d3ac898cf84b544e47c9735c5e4111711db1 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 2 Feb 2015 22:36:42 +0000
-Subject: [PATCH 45/87] Fixup dhcp-configs after reading extra hostfiles with
+Subject: [PATCH 45/98] Fixup dhcp-configs after reading extra hostfiles with
  inotify.
 
 ---
index 3db945d8f329b70478a9457b5b69b9f43ee26977..b15ef9a65a0203f060ed29e822b42506ce7c7799 100644 (file)
@@ -1,7 +1,7 @@
 From f9c863708c6b0aea31ff7a466647685dc739de50 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 3 Feb 2015 21:52:48 +0000
-Subject: [PATCH 46/87] Extra logging for inotify code.
+Subject: [PATCH 46/98] Extra logging for inotify code.
 
 ---
  src/cache.c   | 9 ++++-----
index 5a81152473bebd9abec42d8f756351641c6d5b0c..5557b51318ac260369be9b20d7535fb5b24e6e2b 100644 (file)
@@ -1,7 +1,7 @@
 From efb8b5566aafc1f3ce18514a2df93af5a2e4998c Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 7 Feb 2015 22:36:34 +0000
-Subject: [PATCH 47/87] man page typo.
+Subject: [PATCH 47/98] man page typo.
 
 ---
  man/dnsmasq.8 | 1 +
index e69e0a6184342731394f7e630f9a2b595f824f67..c70ca461294456d204018e443a4493cf20facc7b 100644 (file)
@@ -1,7 +1,7 @@
 From f4f400776b3c1aa303d1a0fcd500f0ab5bc970f2 Mon Sep 17 00:00:00 2001
 From: Shantanu Gadgil <shantanugadgil@yahoo.com>
 Date: Wed, 11 Feb 2015 20:16:59 +0000
-Subject: [PATCH 48/87] Fix get-version script which returned wrong tag in some
+Subject: [PATCH 48/98] Fix get-version script which returned wrong tag in some
  situations.
 
 ---
index e78f185dd10f24328c81c7c5102d1f73f2e1dfec..1c711806e5bc265c82b5e1b9b171688934978e17 100644 (file)
@@ -1,7 +1,7 @@
 From 8ff70de618eb7de9147dbfbd4deca4a2dd62f0cb Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 14 Feb 2015 20:02:37 +0000
-Subject: [PATCH 49/87] Typos.
+Subject: [PATCH 49/98] Typos.
 
 ---
  src/inotify.c | 3 ++-
index 7b5a92dd360a165a1d4ac76e4a4b8a6a49c856fa..38736c7a741b700df365cda31d01494d63154f9a 100644 (file)
@@ -1,7 +1,7 @@
 From caeea190f12efd20139f694aac4942d1ac00019f Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 14 Feb 2015 20:08:56 +0000
-Subject: [PATCH 50/87] Make dynamic hosts files work when --no-hosts set.
+Subject: [PATCH 50/98] Make dynamic hosts files work when --no-hosts set.
 
 ---
  src/cache.c | 21 +++++++++++----------
index cfc7b00eebb25b45a962c08c56b614dfe802874f..fb15cc2b9e8bd13fff42030114d36a8d9798c718 100644 (file)
@@ -1,7 +1,7 @@
 From 28b879ac47b872af6e8c5e86d76806c69338434d Mon Sep 17 00:00:00 2001
 From: Chen Wei <weichen302@icloud.com>
 Date: Tue, 17 Feb 2015 22:07:35 +0000
-Subject: [PATCH 51/87] Fix trivial memory leaks to quieten valgrind.
+Subject: [PATCH 51/98] Fix trivial memory leaks to quieten valgrind.
 
 ---
  src/dnsmasq.c |  2 ++
index 0a50689ff04a4fbc40115a92feda59304050c601..dabc770a4dc50fce66e16e90648b354f2cf1e846 100644 (file)
@@ -1,7 +1,7 @@
 From 0705a7e2d57654b27c7e14f35ca77241c1821f4d Mon Sep 17 00:00:00 2001
 From: Tomas Hozza <thozza@redhat.com>
 Date: Mon, 23 Feb 2015 21:26:26 +0000
-Subject: [PATCH 52/87] Fix uninitialized value used in get_client_mac()
+Subject: [PATCH 52/98] Fix uninitialized value used in get_client_mac()
 
 ---
  src/dhcp6.c | 4 +++-
index 854771a9bad395b265c05efd5d64ea02e77b86d7..82e38fcdef8b0bcb7c83edc5adf63d476508080d 100644 (file)
@@ -1,7 +1,7 @@
 From 47b9ac59c715827252ae6e6732903c3dabb697fb Mon Sep 17 00:00:00 2001
 From: Joachim Zobel <jz-2014@heute-morgen.de>
 Date: Mon, 23 Feb 2015 21:38:11 +0000
-Subject: [PATCH 53/87] Log parsing utils in contrib/reverse-dns
+Subject: [PATCH 53/98] Log parsing utils in contrib/reverse-dns
 
 ---
  contrib/reverse-dns/README             | 18 ++++++++++++++++++
index cb9e86fdfaaf7ffda0b8ebb521d389b00a15b3d2..6d57b653af04c41dd8ce6fc96ce232c79d05e428 100644 (file)
@@ -1,7 +1,7 @@
 From f6e62e2af96f5fa0d1e3d93167a93a8f09bf6e61 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 1 Mar 2015 18:17:54 +0000
-Subject: [PATCH 54/87] Add --dnssec-timestamp option and facility.
+Subject: [PATCH 54/98] Add --dnssec-timestamp option and facility.
 
 ---
  CHANGELOG     |  6 +++++
index 40b6607b7f9acafc03427b5104f9281ef47d2c44..53e1388b973fca4508eee4cbf94a8e0c4e9d0df7 100644 (file)
@@ -1,7 +1,7 @@
 From 9003b50b13da624ca45f3e0cf99abb623b8d026b Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 2 Mar 2015 22:47:23 +0000
-Subject: [PATCH 55/87] Fix last commit to not crash if uid changing not
+Subject: [PATCH 55/98] Fix last commit to not crash if uid changing not
  configured.
 
 ---
index f6f787366d9c500bbe41c3f539226cbec18ea3f0..32cd7431aaf2a3a509a7b16eb1a1517cb354d366 100644 (file)
@@ -1,7 +1,7 @@
 From 4c960fa90a975d20f75a1ecabd217247f1922c8f Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 4 Mar 2015 20:32:26 +0000
-Subject: [PATCH 56/87] New version of contrib/reverse-dns
+Subject: [PATCH 56/98] New version of contrib/reverse-dns
 
 ---
  contrib/reverse-dns/README             |  22 +++---
index 924e3dcd638b0e1d069dbe5a9c69119915e23158..d63c0474489005705ef781726798206060b6dcb2 100644 (file)
@@ -1,7 +1,7 @@
 From 360f2513ab12a9bf1e262d388dd2ea8a566590a3 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 7 Mar 2015 18:28:06 +0000
-Subject: [PATCH 57/87] Tweak DNSSEC timestamp code to create file later,
+Subject: [PATCH 57/98] Tweak DNSSEC timestamp code to create file later,
  removing need to chown it.
 
 ---
index ded09841f0e5230c60fc7946a5828b155ca66a03..f746fcfbf563069922839f32da863d383f19e5d2 100644 (file)
@@ -1,7 +1,7 @@
 From ff841ebf5a5d6864ff48571f607c32ce80dbb75a Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 11 Mar 2015 21:36:30 +0000
-Subject: [PATCH 58/87] Fix boilerplate code for re-running system calls on
+Subject: [PATCH 58/98] Fix boilerplate code for re-running system calls on
  EINTR and EAGAIN etc.
 
 The nasty code with static variable in retry_send() which
index f8091d4d7d140864d1c83c3281581076ee82d38b..d986e8eaaa010fd47c6e65a57af2c22caebcd753 100644 (file)
@@ -1,7 +1,7 @@
 From 979fe86bc8693f660eddea232ae39cbbb50b294c Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 19 Mar 2015 22:50:22 +0000
-Subject: [PATCH 59/87] Make --address=/example.com/ equivalent to
+Subject: [PATCH 59/98] Make --address=/example.com/ equivalent to
  --server=/example.com/
 
 ---
index dcf1a3cb0e34f665c0e20142d64fe1b2c5497cc0..6810930725565aff311f3614c75ccb3f01a80b1a 100644 (file)
@@ -1,7 +1,7 @@
 From 65c721200023ef0023114459a8d12f8b0a24cfd8 Mon Sep 17 00:00:00 2001
 From: Lung-Pin Chang <changlp@cs.nctu.edu.tw>
 Date: Thu, 19 Mar 2015 23:22:21 +0000
-Subject: [PATCH 60/87] dhcp: set outbound interface via cmsg in unicast reply
+Subject: [PATCH 60/98] dhcp: set outbound interface via cmsg in unicast reply
 
   If multiple routes to the same network exist, Linux blindly picks
   the first interface (route) based on destination address, which might not be
index 7f2b1b042dfce4ccfdcd55ea720ff52dec8eeb88..af79f156dae7976371d8e049932ec748c667006c 100644 (file)
@@ -1,7 +1,7 @@
 From 8805283088d670baecb92569252c01cf754cda51 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 26 Mar 2015 21:15:43 +0000
-Subject: [PATCH 61/87] Don't fail DNSSEC when a signed CNAME dangles into an
+Subject: [PATCH 61/98] Don't fail DNSSEC when a signed CNAME dangles into an
  unsigned zone.
 
 ---
index 496776deb21ee3bed3477b8950d0bdec05c3b1b7..0b64aa7baca8efc095c6114e982632568e543445 100644 (file)
@@ -1,7 +1,7 @@
 From 150162bc37170a6edae9d488435e836b1e4e3a4e Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 27 Mar 2015 09:58:26 +0000
-Subject: [PATCH 62/87] Return SERVFAIL when validation abandoned.
+Subject: [PATCH 62/98] Return SERVFAIL when validation abandoned.
 
 ---
  src/forward.c | 11 +++++++++--
index 25ae12e6a87f0bd85ddad9f9d01ed2a43c41e15d..9ecd43b7f96a422310b7399755cf26e7a9ec9f6b 100644 (file)
@@ -1,7 +1,7 @@
 From 0b8a5a30a77331974ba24a04e43e720585dfbc61 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 27 Mar 2015 11:44:55 +0000
-Subject: [PATCH 63/87] Protect against broken DNSSEC upstreams.
+Subject: [PATCH 63/98] Protect against broken DNSSEC upstreams.
 
 ---
  src/dnssec.c | 7 +++++--
index 41730b80183d5e1b61191492cc4a1ee1e3636c72..bfd703d3a00b875a8819750603f0082502b93bc2 100644 (file)
@@ -1,7 +1,7 @@
 From 1e153945def3c50d1e59ceea6a768db0ac770f98 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 28 Mar 2015 21:34:07 +0000
-Subject: [PATCH 64/87] DNSSEC fix for non-ascii characters in labels.
+Subject: [PATCH 64/98] DNSSEC fix for non-ascii characters in labels.
 
 ---
  src/dnssec.c  | 34 +++++++++++++++++-----------------
index 212fe30c3c3e95786fc99debcb72f8200aacf5da..f67b65af15b25fdaa1ae5a05969748ae263416f4 100644 (file)
@@ -1,7 +1,7 @@
 From 394ff492da6af5da7e7d356be9586683bc5fc011 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 29 Mar 2015 22:17:14 +0100
-Subject: [PATCH 65/87] Allow control characters in names in the cache, handle
+Subject: [PATCH 65/98] Allow control characters in names in the cache, handle
  when logging.
 
 ---
index dbc4deb9063d2f9cf7d67a2357e6fc3af3f4d57c..7a227d557393ee2357e69d3748606b7a746b4f2b 100644 (file)
@@ -1,7 +1,7 @@
 From 794fccca7ffebfba4468bfffc6276b68bbf6afd9 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 29 Mar 2015 22:35:44 +0100
-Subject: [PATCH 66/87] Fix crash in last commit.
+Subject: [PATCH 66/98] Fix crash in last commit.
 
 ---
  src/cache.c | 7 ++++---
index ac735bdc7db3552a56ab051aebc0a3a09be9ec3d..a88db2234cad64216aff2d291c9cd628953bdbf2 100644 (file)
@@ -1,7 +1,7 @@
 From fd6ad9e481ab7c812a6b1515244908818cbb0442 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 30 Mar 2015 07:52:21 +0100
-Subject: [PATCH 67/87] Merge message translations.
+Subject: [PATCH 67/98] Merge message translations.
 
 ---
  po/de.po    | 803 +++++++++++++++++++++++++++++++++--------------------------
index b61ad0a17e6749f67c027f9d7bdcaaff140ed266..b273220d69c5586adb1b298ae56e607de854130e 100644 (file)
@@ -1,7 +1,7 @@
 From 30d0879ed55cb67b1b735beab3d93f3bb3ef1dd2 Mon Sep 17 00:00:00 2001
 From: Stefan Tomanek <stefan.tomanek+dnsmasq@wertarbyte.de>
 Date: Tue, 31 Mar 2015 22:32:11 +0100
-Subject: [PATCH 68/87] add --tftp-no-fail to ignore missing tftp root
+Subject: [PATCH 68/98] add --tftp-no-fail to ignore missing tftp root
 
 ---
  CHANGELOG            |  3 +++
index 865e9a91d737181293c5437f1ac4082b3adf23e7..684ef64218527216b7d1e53225bb711ca2211dc2 100644 (file)
@@ -1,7 +1,7 @@
 From 7aa970e2c7043201663d86a4b5d8cd5c592cef39 Mon Sep 17 00:00:00 2001
 From: Stefan Tomanek <stefan.tomanek+dnsmasq@wertarbyte.de>
 Date: Wed, 1 Apr 2015 17:55:07 +0100
-Subject: [PATCH 69/87] Whitespace fixes.
+Subject: [PATCH 69/98] Whitespace fixes.
 
 ---
  src/dnsmasq.c | 14 +++++++-------
index a2f96385c467c9df7fe1f3fe67836e408644e851..aa24c012a7e7b21e38c80dd2866d85bde0352a3a 100644 (file)
@@ -1,7 +1,7 @@
 From fe3992f9fa69fa975ea31919c53933b5f6a63527 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 3 Apr 2015 21:25:05 +0100
-Subject: [PATCH 70/87] Return INSECURE, rather than BOGUS when DS proved not
+Subject: [PATCH 70/98] Return INSECURE, rather than BOGUS when DS proved not
  to exist.
 
 Return INSECURE when validating DNS replies which have RRSIGs, but
index 723c492acc370b35db7692330071f6704ed0cb91..ac57b8bb1b8025557d4e816d038ac7715ada6585 100644 (file)
@@ -1,7 +1,7 @@
 From 982faf402487e265ed11ac03524531d42b03c966 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 3 Apr 2015 21:42:30 +0100
-Subject: [PATCH 71/87] Fix compiler warning when not including DNSSEC.
+Subject: [PATCH 71/98] Fix compiler warning when not including DNSSEC.
 
 ---
  src/forward.c | 3 ++-
index 3f579bda589b2aefb2f613f8f910844ebc108ad3..2303ec3211d20e29e98aaf9074ac16d995adaf31 100644 (file)
@@ -1,7 +1,7 @@
 From 04b0ac05377936d121a36873bb63d492cde292c9 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 6 Apr 2015 17:19:13 +0100
-Subject: [PATCH 72/87] Fix crash caused by looking up servers.bind when many
+Subject: [PATCH 72/98] Fix crash caused by looking up servers.bind when many
  servers defined.
 
 ---
index 27e4cde3d141b452ea47fe00f47bd1f0a8348c60..82471ae99cc5b47058594c6de3d007ee0f453caf 100644 (file)
@@ -1,7 +1,7 @@
 From ad4a8ff7d9097008d7623df8543df435bfddeac8 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 9 Apr 2015 21:48:00 +0100
-Subject: [PATCH 73/87] Fix crash on receipt of certain malformed DNS requests.
+Subject: [PATCH 73/98] Fix crash on receipt of certain malformed DNS requests.
 
 ---
  CHANGELOG     | 3 +++
index 2435371a7ad40cf4a7beb67dcd6dda9fea3ac942..6a7d79874bde9cb8113accca35a982221572f939 100644 (file)
@@ -1,7 +1,7 @@
 From 38440b204db65f9be16c4c3daa7e991e4356f6ed Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 12 Apr 2015 21:52:47 +0100
-Subject: [PATCH 74/87] Fix crash in auth code with odd configuration.
+Subject: [PATCH 74/98] Fix crash in auth code with odd configuration.
 
 ---
  CHANGELOG  | 32 +++++++++++++++++++++-----------
index fbc38022bba844a7814caab4e3b73691c735827c..76f31433fa861656466251090b11f7071143a597 100644 (file)
@@ -1,7 +1,7 @@
 From 78c6184752dce27849e36cce4360abc27b8d76d2 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 16 Apr 2015 15:05:30 +0100
-Subject: [PATCH 75/87] Auth: correct replies to NS and SOA in .arpa zones.
+Subject: [PATCH 75/98] Auth: correct replies to NS and SOA in .arpa zones.
 
 ---
  CHANGELOG  |  8 ++++++++
index 1598460b7cb97548eeba2a3bed13c5699bc1414b..9401cb9e8131d2017d3d539a4c2fb68a5f6d2659 100644 (file)
@@ -1,7 +1,7 @@
 From b4c0f092d8ce63ea4763c0ac17aa8d24318ad301 Mon Sep 17 00:00:00 2001
 From: Stefan Tomanek <stefan.tomanek+dnsmasq@wertarbyte.de>
 Date: Thu, 16 Apr 2015 15:20:59 +0100
-Subject: [PATCH 76/87] Fix (srk induced) crash in new tftp_no_fail code.
+Subject: [PATCH 76/98] Fix (srk induced) crash in new tftp_no_fail code.
 
 ---
  src/dnsmasq.c | 6 ++++--
index a68ac4c4eae6833a7bc32c9726da8b95c68ad7e4..a14b1a8159e56a93638f9c2e7c19081c5caf1b0d 100644 (file)
@@ -1,7 +1,7 @@
 From 0df29f5e23fd2f16181847db1fcf3a8b392d869a Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Thu, 16 Apr 2015 15:24:52 +0100
-Subject: [PATCH 77/87] Note CVE-2015-3294
+Subject: [PATCH 77/98] Note CVE-2015-3294
 
 ---
  CHANGELOG | 3 +++
index 2e040e320ccc12ec97cdf651a416f0a4a194da75..2204d246a8ca6aea90427abc545464aa1d109734 100644 (file)
@@ -1,7 +1,7 @@
 From 554b580e970275d5a869cb4fbfb2716f92b2f664 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Fri, 17 Apr 2015 22:50:20 +0100
-Subject: [PATCH 78/87] Log domain when reporting DNSSEC validation failure.
+Subject: [PATCH 78/98] Log domain when reporting DNSSEC validation failure.
 
 ---
  src/forward.c | 15 ++++++++++-----
index 6b0453e03596f3129a68f3d60cca2f6d5208d5b4..6db33bbf9164855ed3cf9a1e676b1b1d6d0b0194 100644 (file)
@@ -1,7 +1,7 @@
 From a006eb7e1486023480ea40244720ef7aab51de71 Mon Sep 17 00:00:00 2001
 From: Moshe Levi <moshele@mellanox.com>
 Date: Sun, 19 Apr 2015 22:10:40 +0100
-Subject: [PATCH 79/87] Check IP address command line arg in dhcp_release.c
+Subject: [PATCH 79/98] Check IP address command line arg in dhcp_release.c
 
 ---
  contrib/wrt/dhcp_release.c | 5 +++++
index 8aa5c5cecc90993564f07726eaac5b264c84a444..4fe26ac01576239f13f7517bc91ed1ffdb404ce6 100644 (file)
@@ -1,7 +1,7 @@
 From 338b340be9e7198f5c0f68133d070d6598a0814c Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Mon, 20 Apr 2015 21:34:05 +0100
-Subject: [PATCH 80/87] Revert 61b838dd574c51d96fef100285a0d225824534f9 and
+Subject: [PATCH 80/98] Revert 61b838dd574c51d96fef100285a0d225824534f9 and
  just quieten log instead.
 
 ---
index 4fb78d4cafee6c05a25a6dd38c42435ba17e2881..13ff0595fc263c18c50b8dcaff7e6e0979894a22 100644 (file)
@@ -1,7 +1,7 @@
 From cbe379ad6b52a538a4416a7cd992817e5637ccf9 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 21 Apr 2015 22:57:06 +0100
-Subject: [PATCH 81/87] Handle domain names with '.' or /000 within labels.
+Subject: [PATCH 81/98] Handle domain names with '.' or /000 within labels.
 
 Only in DNSSEC mode, where we might need to validate or store
 such names. In none-DNSSEC mode, simply don't cache these, as before.
index ea6f08d7e7aab549fb5ad21b05c7db512cb27636..2429e992b06c9a57129765cbe0330ed9d7e07d27 100644 (file)
@@ -1,7 +1,7 @@
 From b8f16556d36924cd8dc7663cb4129d7b1f3fc2be Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 22 Apr 2015 21:14:31 +0100
-Subject: [PATCH 82/87] Tweaks to previous, DNS label charset commit.
+Subject: [PATCH 82/98] Tweaks to previous, DNS label charset commit.
 
 ---
  src/dns-protocol.h |  6 +++++-
index 96dc14bc09e53914b09d91c0e6be6e8d76ea8537..423b40e4ef784dbacb1c4ddab6ffceb1a50728b4 100644 (file)
@@ -1,7 +1,7 @@
 From a5ae1f85873829efe473075ad77806cc02792622 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sat, 25 Apr 2015 21:46:10 +0100
-Subject: [PATCH 83/87] Logs in DHCPv6 not suppressed by dhcp6-quiet.
+Subject: [PATCH 83/98] Logs in DHCPv6 not suppressed by dhcp6-quiet.
 
 ---
  CHANGELOG     | 6 +++++-
index 38670a819af9fffd642018f6357d985b216e7ead..555bd6cd5a30abf7d6e80daaef7d129ac19a8324 100644 (file)
@@ -1,7 +1,7 @@
 From 8efd731cc4ed2baa42aa69d0a9d336392e9987cb Mon Sep 17 00:00:00 2001
 From: "Johnny S. Lee" <_@jsl.io>
 Date: Sun, 26 Apr 2015 22:23:57 +0100
-Subject: [PATCH 84/87] Make get-version work when repo is a git submodule.
+Subject: [PATCH 84/98] Make get-version work when repo is a git submodule.
 
 ---
  bld/get-version | 5 +++--
index 04bee995069e59283c017fdbb4f392a462b6e976..828c21f631f1434fa0efbd8e05c844ad33c609ce 100644 (file)
@@ -1,7 +1,7 @@
 From e66b4dff3c562c7836d5be4c26972d665ad783f1 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 28 Apr 2015 20:45:57 +0100
-Subject: [PATCH 85/87] Fix argument-order botch which broke DNSSEC for TCP
+Subject: [PATCH 85/98] Fix argument-order botch which broke DNSSEC for TCP
  queries.
 
 ---
index 1fa5c7ac5b42cc2e0fb68d99384310e330401966..9d3aadc89ad4b135021a2cb9f3435cd16bb384b3 100644 (file)
@@ -1,7 +1,7 @@
 From 2ed162ac204f3609fe4d9f9a0430baeaa352d88f Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Tue, 28 Apr 2015 21:26:35 +0100
-Subject: [PATCH 86/87] Don't remove RRSIG RR from answers to ANY queries when
+Subject: [PATCH 86/98] Don't remove RRSIG RR from answers to ANY queries when
  the do bit is not set.
 
 ---
index 8d1ca9e6e47cddeff5c2b08821e52d2c125f8b51..743548ef31bafbdb6d81124b33b7d7a6fa1a04ab 100644 (file)
@@ -1,7 +1,7 @@
 From 64bcff1c7c72eecda8750bc2dca8b4c5dc38a837 Mon Sep 17 00:00:00 2001
 From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
 Date: Tue, 28 Apr 2015 21:55:18 +0100
-Subject: [PATCH 87/87] Constify some DHCP lease management functions.
+Subject: [PATCH 87/98] Constify some DHCP lease management functions.
 
 ---
  src/dnsmasq.h | 7 ++++---
diff --git a/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch
new file mode 100644 (file)
index 0000000..af4d6d7
--- /dev/null
@@ -0,0 +1,332 @@
+From a77cec8d58231d71cbc26615f0c0f0292c09ef54 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 8 May 2015 16:25:38 +0100
+Subject: [PATCH 88/98] Handle UDP packet loss when fragmentation of large
+ packets is broken.
+
+---
+ CHANGELOG     |  6 ++++++
+ src/config.h  |  1 +
+ src/dnsmasq.h |  5 +++--
+ src/dnssec.c  | 11 +++++++++--
+ src/forward.c | 37 +++++++++++++++++++++++++++++--------
+ src/network.c |  1 +
+ src/option.c  | 18 +++++++++++-------
+ src/rfc1035.c | 22 ++++++----------------
+ 8 files changed, 66 insertions(+), 35 deletions(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index af2b22cf8f73..d8fc57a418bb 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -109,6 +109,12 @@ version 2.73
+           by quiet-dhcp6. Thanks to J. Pablo Abonia for 
+           spotting the problem.
++          Try and handle net connections with broken fragmentation 
++          that lose large UDP packets. If a server times out, 
++            reduce the maximum UDP packet size field in the EDNS0
++          header to 1280 bytes. If it then answers, make that
++          change permanent.
++
+       
+ version 2.72
+             Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
+diff --git a/src/config.h b/src/config.h
+index 8def6f200461..f75fe9db7081 100644
+--- a/src/config.h
++++ b/src/config.h
+@@ -19,6 +19,7 @@
+ #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */
+ #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */
+ #define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */
++#define SAFE_PKTSZ 1280 /* "go anywhere" UDP packet size */
+ #define KEYBLOCK_LEN 40 /* choose to mininise fragmentation when storing DNSSEC keys */
+ #define DNSSEC_WORK 50 /* Max number of queries to validate one question */
+ #define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */
+diff --git a/src/dnsmasq.h b/src/dnsmasq.h
+index 824a86009439..ab16f79b3ec9 100644
+--- a/src/dnsmasq.h
++++ b/src/dnsmasq.h
+@@ -504,7 +504,7 @@ struct server {
+   char interface[IF_NAMESIZE+1];
+   struct serverfd *sfd; 
+   char *domain; /* set if this server only handles a domain. */ 
+-  int flags, tcpfd;
++  int flags, tcpfd, edns_pktsz;
+   unsigned int queries, failed_queries;
+ #ifdef HAVE_LOOP
+   u32 uid;
+@@ -594,6 +594,7 @@ struct hostsfile {
+ #define FREC_DO_QUESTION       64
+ #define FREC_ADDED_PHEADER    128
+ #define FREC_CHECK_NOSIGN     256
++#define FREC_TEST_PKTSZ       512
+ #ifdef HAVE_DNSSEC
+ #define HASH_SIZE 20 /* SHA-1 digest size */
+@@ -1148,7 +1149,7 @@ int in_zone(struct auth_zone *zone, char *name, char **cut);
+ #endif
+ /* dnssec.c */
+-size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr);
++size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr, int edns_pktsz);
+ int dnssec_validate_by_ds(time_t now, struct dns_header *header, size_t n, char *name, char *keyname, int class);
+ int dnssec_validate_ds(time_t now, struct dns_header *header, size_t plen, char *name, char *keyname, int class);
+ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, char *name, char *keyname, int *class, int *neganswer, int *nons);
+diff --git a/src/dnssec.c b/src/dnssec.c
+index a9e12153ccf2..e91d7c2cf040 100644
+--- a/src/dnssec.c
++++ b/src/dnssec.c
+@@ -2162,10 +2162,12 @@ int dnskey_keytag(int alg, int flags, unsigned char *key, int keylen)
+     }
+ }
+-size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr)
++size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, 
++                           int type, union mysockaddr *addr, int edns_pktsz)
+ {
+   unsigned char *p;
+   char *types = querystr("dnssec-query", type);
++  size_t ret;
+   if (addr->sa.sa_family == AF_INET) 
+     log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, name, (struct all_addr *)&addr->in.sin_addr, types);
+@@ -2194,7 +2196,12 @@ size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, i
+   PUTSHORT(type, p);
+   PUTSHORT(class, p);
+-  return add_do_bit(header, p - (unsigned char *)header, end);
++  ret = add_do_bit(header, p - (unsigned char *)header, end);
++
++  if (find_pseudoheader(header, ret, NULL, &p, NULL))
++    PUTSHORT(edns_pktsz, p);
++
++  return ret;
+ }
+ /* Go through a domain name, find "pointers" and fix them up based on how many bytes
+diff --git a/src/forward.c b/src/forward.c
+index a8e403c4b25e..592243fd4d35 100644
+--- a/src/forward.c
++++ b/src/forward.c
+@@ -253,6 +253,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
+   void *hash = &crc;
+ #endif
+  unsigned int gotname = extract_request(header, plen, daemon->namebuff, NULL);
++ unsigned char *pheader;
+  (void)do_bit;
+@@ -261,19 +262,32 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
+     forward = NULL;
+   else if (forward || (hash && (forward = lookup_frec_by_sender(ntohs(header->id), udpaddr, hash))))
+     {
++      /* If we didn't get an answer advertising a maximal packet in EDNS,
++       fall back to 1280, which should work everywhere on IPv6.
++       If that generates an answer, it will become the new default
++       for this server */
++      forward->flags |= FREC_TEST_PKTSZ;
++      
+ #ifdef HAVE_DNSSEC
+       /* If we've already got an answer to this query, but we're awaiting keys for validation,
+        there's no point retrying the query, retry the key query instead...... */
+       if (forward->blocking_query)
+       {
+         int fd;
+-
++        
++        forward->flags &= ~FREC_TEST_PKTSZ;
++        
+         while (forward->blocking_query)
+           forward = forward->blocking_query;
++         
++        forward->flags |= FREC_TEST_PKTSZ;
+         
+         blockdata_retrieve(forward->stash, forward->stash_len, (void *)header);
+         plen = forward->stash_len;
+         
++        if (find_pseudoheader(header, plen, NULL, &pheader, NULL))
++          PUTSHORT((forward->flags & FREC_TEST_PKTSZ) ? SAFE_PKTSZ : forward->sentto->edns_pktsz, pheader);
++
+         if (forward->sentto->addr.sa.sa_family == AF_INET) 
+           log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&forward->sentto->addr.in.sin_addr, "dnssec");
+ #ifdef HAVE_IPV6
+@@ -417,7 +431,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
+         plen = new_plen;
+       }
+ #endif
+-
++      
+       while (1)
+       { 
+         /* only send to servers dealing with our domain.
+@@ -464,6 +478,9 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
+                   }
+ #endif
+               }
++
++            if (find_pseudoheader(header, plen, NULL, &pheader, NULL))
++              PUTSHORT((forward->flags & FREC_TEST_PKTSZ) ? SAFE_PKTSZ : start->edns_pktsz, pheader);
+             
+             if (retry_send(sendto(fd, (char *)header, plen, 0,
+                                   &start->addr.sa,
+@@ -760,7 +777,6 @@ void reply_query(int fd, int family, time_t now)
+     }   
+    
+   server = forward->sentto;
+-  
+   if ((forward->sentto->flags & SERV_TYPE) == 0)
+     {
+       if (RCODE(header) == REFUSED)
+@@ -781,7 +797,12 @@ void reply_query(int fd, int family, time_t now)
+       if (!option_bool(OPT_ALL_SERVERS))
+       daemon->last_server = server;
+     }
+-
++ 
++  /* We tried resending to this server with a smaller maximum size and got an answer.
++     Make that permanent. */
++  if (server && (forward->flags & FREC_TEST_PKTSZ))
++    server->edns_pktsz = SAFE_PKTSZ;
++  
+   /* If the answer is an error, keep the forward record in place in case
+      we get a good reply from another server. Kill it when we've
+      had replies from all to avoid filling the forwarding table when
+@@ -890,7 +911,7 @@ void reply_query(int fd, int family, time_t now)
+                   {
+                     new->flags |= FREC_DNSKEY_QUERY; 
+                     nn = dnssec_generate_query(header, ((char *) header) + daemon->packet_buff_sz,
+-                                               daemon->keyname, forward->class, T_DNSKEY, &server->addr);
++                                               daemon->keyname, forward->class, T_DNSKEY, &server->addr, server->edns_pktsz);
+                   }
+                 else 
+                   {
+@@ -899,7 +920,7 @@ void reply_query(int fd, int family, time_t now)
+                     else
+                       new->flags |= FREC_DS_QUERY;
+                     nn = dnssec_generate_query(header,((char *) header) + daemon->packet_buff_sz,
+-                                               daemon->keyname, forward->class, T_DS, &server->addr);
++                                               daemon->keyname, forward->class, T_DS, &server->addr, server->edns_pktsz);
+                   }
+                 if ((hash = hash_questions(header, nn, daemon->namebuff)))
+                   memcpy(new->hash, hash, HASH_SIZE);
+@@ -1526,7 +1547,7 @@ static int  tcp_check_for_unsigned_zone(time_t now, struct dns_header *header, s
+       
+       /* Can't find it in the cache, have to send a query */
+-      m = dnssec_generate_query(header, ((char *) header) + 65536, name_start, class, T_DS, &server->addr);
++      m = dnssec_generate_query(header, ((char *) header) + 65536, name_start, class, T_DS, &server->addr, server->edns_pktsz);
+       
+       *length = htons(m);
+       
+@@ -1638,7 +1659,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si
+     another_tcp_key:
+       m = dnssec_generate_query(new_header, ((char *) new_header) + 65536, keyname, class, 
+-                              new_status == STAT_NEED_KEY ? T_DNSKEY : T_DS, &server->addr);
++                              new_status == STAT_NEED_KEY ? T_DNSKEY : T_DS, &server->addr, server->edns_pktsz);
+       
+       *length = htons(m);
+       
+diff --git a/src/network.c b/src/network.c
+index 992f023c31de..a1d90c876fc1 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -1396,6 +1396,7 @@ void add_update_server(int flags,
+       serv->domain = domain_str;
+       serv->next = next;
+       serv->queries = serv->failed_queries = 0;
++      serv->edns_pktsz = daemon->edns_pktsz;
+ #ifdef HAVE_LOOP
+       serv->uid = rand32();
+ #endif      
+diff --git a/src/option.c b/src/option.c
+index f91cfbb1aa54..c7add88de7ac 100644
+--- a/src/option.c
++++ b/src/option.c
+@@ -4498,15 +4498,19 @@ void read_opts(int argc, char **argv, char *compile_opts)
+     {
+       struct server *tmp;
+       for (tmp = daemon->servers; tmp; tmp = tmp->next)
+-      if (!(tmp->flags & SERV_HAS_SOURCE))
+-        {
+-          if (tmp->source_addr.sa.sa_family == AF_INET)
+-            tmp->source_addr.in.sin_port = htons(daemon->query_port);
++      {
++        tmp->edns_pktsz = daemon->edns_pktsz;
++       
++        if (!(tmp->flags & SERV_HAS_SOURCE))
++          {
++            if (tmp->source_addr.sa.sa_family == AF_INET)
++              tmp->source_addr.in.sin_port = htons(daemon->query_port);
+ #ifdef HAVE_IPV6
+-          else if (tmp->source_addr.sa.sa_family == AF_INET6)
+-            tmp->source_addr.in6.sin6_port = htons(daemon->query_port);
++            else if (tmp->source_addr.sa.sa_family == AF_INET6)
++              tmp->source_addr.in6.sin6_port = htons(daemon->query_port);
+ #endif 
+-        } 
++          }
++      } 
+     }
+   
+   if (daemon->if_addrs)
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index 5828055caa5d..8b1709dd3495 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -552,7 +552,7 @@ static size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned
+       return plen;
+       *p++ = 0; /* empty name */
+       PUTSHORT(T_OPT, p);
+-      PUTSHORT(daemon->edns_pktsz, p); /* max packet length */
++      PUTSHORT(SAFE_PKTSZ, p); /* max packet length, this will be overwritten */
+       PUTSHORT(0, p);    /* extended RCODE and version */
+       PUTSHORT(set_do ? 0x8000 : 0, p); /* DO flag */
+       lenp = p;
+@@ -1537,7 +1537,6 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+   unsigned short flag;
+   int q, ans, anscount = 0, addncount = 0;
+   int dryrun = 0, sec_reqd = 0, have_pseudoheader = 0;
+-  int is_sign;
+   struct crec *crecp;
+   int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1;
+   struct mx_srv_record *rec;
+@@ -1557,28 +1556,19 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+      forward rather than answering from the cache, which doesn't include
+      security information, unless we're in DNSSEC validation mode. */
+-  if (find_pseudoheader(header, qlen, NULL, &pheader, &is_sign))
++  if (find_pseudoheader(header, qlen, NULL, &pheader, NULL))
+     { 
+-      unsigned short udpsz, flags;
+-      unsigned char *psave = pheader;
+-
++      unsigned short flags;
++      
+       have_pseudoheader = 1;
+-      GETSHORT(udpsz, pheader);
+-      pheader += 2; /* ext_rcode */
++      pheader += 4; /* udp size, ext_rcode */
+       GETSHORT(flags, pheader);
+       
+       if ((sec_reqd = flags & 0x8000))
+       *do_bit = 1;/* do bit */ 
+-      *ad_reqd = 1;
+-
+-      /* If our client is advertising a larger UDP packet size
+-       than we allow, trim it so that we don't get an overlarge
+-       response from upstream */
+-
+-      if (!is_sign && (udpsz > daemon->edns_pktsz))
+-      PUTSHORT(daemon->edns_pktsz, psave); 
++      *ad_reqd = 1;
+       dryrun = 1;
+     }
+-- 
+2.1.0
+
diff --git a/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch
new file mode 100644 (file)
index 0000000..c75d864
--- /dev/null
@@ -0,0 +1,59 @@
+From b059c96dc69dfe3055c5b32b078a05c53b11ebb3 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 8 May 2015 20:25:51 +0100
+Subject: [PATCH 89/98] Check IPv4-mapped IPv6 addresses with --stop-rebind.
+
+---
+ CHANGELOG     |  3 +++
+ src/rfc1035.c | 21 +++++++++++++++++----
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index d8fc57a418bb..94a521f996e2 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -115,6 +115,9 @@ version 2.73
+           header to 1280 bytes. If it then answers, make that
+           change permanent.
++          Check IPv4-mapped IPv6 addresses when --stop-rebind
++          is active. Thanks to Jordan Milne for spotting this.
++
+       
+ version 2.72
+             Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index 8b1709dd3495..5e3f566fdbc5 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -1117,10 +1117,23 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t
+                     memcpy(&addr, p1, addrlen);
+                     
+                     /* check for returned address in private space */
+-                    if (check_rebind &&
+-                        (flags & F_IPV4) &&
+-                        private_net(addr.addr.addr4, !option_bool(OPT_LOCAL_REBIND)))
+-                      return 1;
++                    if (check_rebind)
++                      {
++                        if ((flags & F_IPV4) &&
++                            private_net(addr.addr.addr4, !option_bool(OPT_LOCAL_REBIND)))
++                          return 1;
++                        
++#ifdef HAVE_IPV6
++                        if ((flags & F_IPV6) &&
++                            IN6_IS_ADDR_V4MAPPED(&addr.addr.addr6))
++                          {
++                            struct in_addr v4;
++                            v4.s_addr = ((const uint32_t *) (&addr.addr.addr6))[3];
++                            if (private_net(v4, !option_bool(OPT_LOCAL_REBIND)))
++                              return 1;
++                          }
++#endif
++                      }
+                     
+ #ifdef HAVE_IPSET
+                     if (ipsets && (flags & (F_IPV4 | F_IPV6)))
+-- 
+2.1.0
+
index de1e0e6ef5dcb924ad49585e883a3e5b9b187d91..d50872bb360c2d297e2b05fbbe4de6303b90a65f 100644 (file)
@@ -1,14 +1,14 @@
 From 86fa1046920dedc8134136a6244ca96e8a37e9d8 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Sun, 10 May 2015 13:50:59 +0100
-Subject: [PATCH] Tweak EDNS timeout code.
+Subject: [PATCH 90/98] Tweak EDNS timeout code.
 
 ---
- src/forward.c |    6 ++++--
+ src/forward.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/forward.c b/src/forward.c
-index 592243f..74e5ab6 100644
+index 592243fd4d35..74e5ab66c423 100644
 --- a/src/forward.c
 +++ b/src/forward.c
 @@ -799,8 +799,10 @@ void reply_query(int fd, int family, time_t now)
@@ -25,5 +25,4 @@ index 592243f..74e5ab6 100644
    
    /* If the answer is an error, keep the forward record in place in case
 -- 
-1.7.10.4
-
+2.1.0
diff --git a/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch
new file mode 100644 (file)
index 0000000..b65bb87
--- /dev/null
@@ -0,0 +1,28 @@
+From 585840b03365372679907f175b07a01c9d621ae0 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Wed, 13 May 2015 12:35:57 +0100
+Subject: [PATCH 91/98] Pointer to mail-archive mailing list mirror in
+ doc.html.
+
+---
+ doc.html | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/doc.html b/doc.html
+index 92c9d0d6f34c..54f59bbbd4d0 100644
+--- a/doc.html
++++ b/doc.html
+@@ -74,7 +74,9 @@ for details.
+ There is a dnsmasq mailing list at <A
+ HREF="http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss">
+ http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss</A> which should be the
+-first location for queries, bugreports, suggestions etc.
++first location for queries, bugreports, suggestions etc. The list is mirrored, with a
++search facility, at <A HREF="https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/">
++https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/</A>.
+ You can contact me at <A
+ HREF="mailto:simon@thekelleys.org.uk">simon@thekelleys.org.uk</A>.
+-- 
+2.1.0
+
index a0987679c8e91e31ca24464e8c12afb3cb972b65..0cf44932fc87a7367da1b8fdeaefeede6db11452 100644 (file)
@@ -1,17 +1,17 @@
 From ca85a28241ef87919d68d52c843b6964b7070e11 Mon Sep 17 00:00:00 2001
 From: Simon Kelley <simon@thekelleys.org.uk>
 Date: Wed, 13 May 2015 22:33:04 +0100
-Subject: [PATCH] Allow T1 and T2 DHCPv4 options to be set.
+Subject: [PATCH 92/98] Allow T1 and T2 DHCPv4 options to be set.
 
 ---
- CHANGELOG            |    3 +++
- dnsmasq.conf.example |    8 ++++++
- src/dhcp-common.c    |    4 +--
- src/rfc2131.c        |   71 +++++++++++++++++++++++++++++++++++---------------
+ CHANGELOG            |  3 +++
+ dnsmasq.conf.example |  8 ++++++
+ src/dhcp-common.c    |  4 +--
+ src/rfc2131.c        | 71 ++++++++++++++++++++++++++++++++++++----------------
  4 files changed, 63 insertions(+), 23 deletions(-)
 
 diff --git a/CHANGELOG b/CHANGELOG
-index 94a521f..ef39a41 100644
+index 94a521f996e2..ef39a415788b 100644
 --- a/CHANGELOG
 +++ b/CHANGELOG
 @@ -118,6 +118,9 @@ version 2.73
@@ -25,7 +25,7 @@ index 94a521f..ef39a41 100644
  version 2.72
              Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.
 diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example
-index 67be99a..1ae11df 100644
+index 67be99acb028..1ae11dfb5358 100644
 --- a/dnsmasq.conf.example
 +++ b/dnsmasq.conf.example
 @@ -345,6 +345,14 @@
@@ -44,7 +44,7 @@ index 67be99a..1ae11df 100644
  # is running dnsmasq
  #dhcp-option=42,0.0.0.0
 diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index ce11520..bc48f41 100644
+index ce115202a646..bc48f41a14d7 100644
 --- a/src/dhcp-common.c
 +++ b/src/dhcp-common.c
 @@ -545,8 +545,8 @@ static const struct opttab_t {
@@ -59,7 +59,7 @@ index ce11520..bc48f41 100644
    { "client-id", 61, OT_INTERNAL },
    { "nis+-domain", 64, OT_NAME },
 diff --git a/src/rfc2131.c b/src/rfc2131.c
-index 5552644..a10e499 100644
+index 55526443dc84..a10e499ef768 100644
 --- a/src/rfc2131.c
 +++ b/src/rfc2131.c
 @@ -52,7 +52,9 @@ static void do_options(struct dhcp_context *context,
@@ -160,16 +160,16 @@ index 5552644..a10e499 100644
 +        if (hval < lease_time && hval > 2)
 +          t2val = hval;
 +      }
-+
-+       /* ensure T1 is still < T2 */
-+       if (t2val <= t1val)
-+       t1val = t2val - 1; 
-+
++                
 +       while (fuzz > (t1val/8))
 +       fuzz = fuzz/2;
-+
++       
 +       t1val -= fuzz;
 +       t2val -= fuzz;
++       
++       /* ensure T1 is still < T2 */
++       if (t2val <= t1val)
++       t1val = t2val - 1; 
 +
 +       option_put(mess, end, OPTION_T1, 4, t1val);
 +       option_put(mess, end, OPTION_T2, 4, t2val);
@@ -196,5 +196,4 @@ index 5552644..a10e499 100644
  
        if (optno == OPTION_SNAME && done_server)
 -- 
-1.7.10.4
-
+2.1.0
diff --git a/src/patches/dnsmasq/0093-Tweak-last-commit.patch b/src/patches/dnsmasq/0093-Tweak-last-commit.patch
new file mode 100644 (file)
index 0000000..578e764
--- /dev/null
@@ -0,0 +1,37 @@
+From 7c0f2543a7e761d1ec82738374556beeb8a35bef Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 14 May 2015 21:16:18 +0100
+Subject: [PATCH 93/98] Tweak last commit.
+
+---
+ src/rfc2131.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index a10e499ef768..b95f9beadf59 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -2275,16 +2275,16 @@ static void do_options(struct dhcp_context *context,
+           t2val = hval;
+       }
+                 
++       /* ensure T1 is still < T2 */
++       if (t2val <= t1val)
++       t1val = t2val - 1; 
++
+        while (fuzz > (t1val/8))
+        fuzz = fuzz/2;
+        
+        t1val -= fuzz;
+        t2val -= fuzz;
+        
+-       /* ensure T1 is still < T2 */
+-       if (t2val <= t1val)
+-       t1val = t2val - 1; 
+-
+        option_put(mess, end, OPTION_T1, 4, t1val);
+        option_put(mess, end, OPTION_T2, 4, t2val);
+     }
+-- 
+2.1.0
+
diff --git a/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch b/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch
new file mode 100644 (file)
index 0000000..a7d7546
--- /dev/null
@@ -0,0 +1,29 @@
+From 62018e1f720fa11e83879111a4b1b3753b5c25bb Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 14 May 2015 21:30:00 +0100
+Subject: [PATCH 94/98] Use correct DHCP context for PXE-proxy server-id.
+
+---
+ src/rfc2131.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index b95f9beadf59..70d1e59530ad 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -888,10 +888,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
+                 
+                 option_put(mess, end, OPTION_MESSAGE_TYPE, 1, 
+                            mess_type == DHCPDISCOVER ? DHCPOFFER : DHCPACK);
+-                option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
++                option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(tmp->local.s_addr));
+                 pxe_misc(mess, end, uuid);
+                 prune_vendor_opts(tagif_netid);
+-                do_encap_opts(pxe_opts(pxearch, tagif_netid, context->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0);
++                do_encap_opts(pxe_opts(pxearch, tagif_netid, tmp->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0);
+                 
+                 log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", NULL, mess->xid);
+                 log_tags(tagif_netid, ntohl(mess->xid));
+-- 
+2.1.0
+
diff --git a/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch b/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch
new file mode 100644 (file)
index 0000000..b1b06f2
--- /dev/null
@@ -0,0 +1,49 @@
+From 5d07d77e75e0f02bc0a8f6029ffbc8b371fa804e Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 15 May 2015 18:13:06 +0100
+Subject: [PATCH 95/98] Fix buffer overflow introduced in 2.73rc6.
+
+Fix off-by-one in code which checks for over-long domain names
+in received DNS packets. This enables buffer overflow attacks
+which can certainly crash dnsmasq and may allow for arbitrary
+code execution. The problem was introduced in commit b8f16556d,
+release 2.73rc6, so has not escaped into any stable release.
+Note that the off-by-one was in the label length determination,
+so the buffer can be overflowed by as many bytes as there are
+labels in the name - ie, many.
+
+Thanks to Ron Bowes, who used lcmatuf's afl-fuzz tool to find
+the problem.
+---
+ src/rfc1035.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index 5e3f566fdbc5..a95241f83523 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -94,8 +94,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
+           count = 256;
+         digs = ((count-1)>>2)+1;
+         
+-        /* output is \[x<hex>/siz]. which is digs+6/7/8 chars */
+-        namelen += digs+6;
++        /* output is \[x<hex>/siz]. which is digs+7/8/9 chars */
++        namelen += digs+7;
+         if (count > 9)
+           namelen++;
+         if (count > 99)
+@@ -125,8 +125,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
+       }
+       else 
+       { /* label_type = 0 -> label. */
+-        namelen += l;
+-        if (namelen+1 >= MAXDNAME)
++        namelen += l + 1; /* include period */
++        if (namelen >= MAXDNAME)
+           return 0;
+         if (!CHECK_LEN(header, p, plen, l))
+           return 0;
+-- 
+2.1.0
+
diff --git a/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch b/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch
new file mode 100644 (file)
index 0000000..db0a1e5
--- /dev/null
@@ -0,0 +1,89 @@
+From 06568c663643b9ed1577d95efee69d734f427cf5 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 15 May 2015 20:43:48 +0100
+Subject: [PATCH 96/98] Remove support for DNS Extended Label Types.
+
+The support was only partial, and the whole concept is
+now deprecated in the standards.
+---
+ src/rfc1035.c | 52 ++++------------------------------------------------
+ 1 file changed, 4 insertions(+), 48 deletions(-)
+
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index a95241f83523..56647b02ab4d 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -77,53 +77,7 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
+         
+         p = l + (unsigned char *)header;
+       }
+-      else if (label_type == 0x80)
+-      return 0; /* reserved */
+-      else if (label_type == 0x40)
+-      { /* ELT */
+-        unsigned int count, digs;
+-        
+-        if ((l & 0x3f) != 1)
+-          return 0; /* we only understand bitstrings */
+-
+-        if (!isExtract)
+-          return 0; /* Cannot compare bitsrings */
+-        
+-        count = *p++;
+-        if (count == 0)
+-          count = 256;
+-        digs = ((count-1)>>2)+1;
+-        
+-        /* output is \[x<hex>/siz]. which is digs+7/8/9 chars */
+-        namelen += digs+7;
+-        if (count > 9)
+-          namelen++;
+-        if (count > 99)
+-          namelen++;
+-        if (namelen+1 >= MAXDNAME)
+-          return 0;
+-
+-        if (!CHECK_LEN(header, p, plen, (count-1)>>3))
+-          return 0;
+-
+-        *cp++ = '\\';
+-        *cp++ = '[';
+-        *cp++ = 'x';
+-        for (j=0; j<digs; j++)
+-          {
+-            unsigned int dig;
+-            if (j%2 == 0)
+-              dig = *p >> 4;
+-            else
+-              dig = *p++ & 0x0f;
+-            
+-            *cp++ = dig < 10 ? dig + '0' : dig + 'A' - 10;
+-          } 
+-        cp += sprintf((char *)cp, "/%d]", count);
+-        /* do this here to overwrite the zero char from sprintf */
+-        *cp++ = '.';
+-      }
+-      else 
++      else if (label_type == 0x00)
+       { /* label_type = 0 -> label. */
+         namelen += l + 1; /* include period */
+         if (namelen >= MAXDNAME)
+@@ -176,12 +130,14 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
+                     retvalue =  2;
+                 }
+             }
+-        
++          
+         if (isExtract)
+           *cp++ = '.';
+         else if (*cp != 0 && *cp++ != '.')
+           retvalue = 2;
+       }
++      else
++      return 0; /* label types 0x40 and 0x80 not supported */
+     }
+ }
+  
+-- 
+2.1.0
+
diff --git a/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch b/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch
new file mode 100644 (file)
index 0000000..b9f2e63
--- /dev/null
@@ -0,0 +1,26 @@
+From 7f8565b94ca52dde31f7688a9f9a0cc611d9dae3 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Tue, 19 May 2015 23:01:27 +0100
+Subject: [PATCH 97/98] Select correct DHCP context when in PXE bootserver
+ mode.
+
+---
+ src/rfc2131.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index 70d1e59530ad..e602a21585c9 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -805,7 +805,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
+           if (service->type == type)
+             break;
+         
+-        if (!service || !service->basename)
++        if (!service || !service->basename || !(context = narrow_context(context, mess->ciaddr, tagif_netid)))
+           return 0;
+         
+         clear_packet(mess, end);
+-- 
+2.1.0
+
diff --git a/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch b/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch
new file mode 100644 (file)
index 0000000..1be4278
--- /dev/null
@@ -0,0 +1,33 @@
+From 549b1a478c5eee9dbd3a0709913a26ec29d30f2c Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Wed, 20 May 2015 20:20:24 +0100
+Subject: [PATCH 98/98] Tweak immediately previous patch.
+
+---
+ src/rfc2131.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index e602a21585c9..9f69ed595903 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -805,9 +805,14 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
+           if (service->type == type)
+             break;
+         
+-        if (!service || !service->basename || !(context = narrow_context(context, mess->ciaddr, tagif_netid)))
+-          return 0;
++        for (; context; context = context->current)
++          if (match_netid(context->filter, tagif_netid, 1) &&
++              is_same_net(mess->ciaddr, context->start, context->netmask))
++            break;
+         
++        if (!service || !service->basename || !context)
++          return 0;
++                
+         clear_packet(mess, end);
+         
+         mess->yiaddr = mess->ciaddr;
+-- 
+2.1.0
+
diff --git a/src/patches/openssl-1.0.2-fix_parallel_build-1.patch b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch
new file mode 100644 (file)
index 0000000..acfaa72
--- /dev/null
@@ -0,0 +1,340 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2015-01-23
+Initial Package Version: 1.0.1e
+Upstream Status:         Unknown
+Origin:                  https://github.com/Alexpux/Qt-builds/tree/master/patches/openssl
+Description:             Fixes build when using more than one make job to build the package.
+
+--- a/crypto/Makefile  2015-01-22 17:12:09.000000000 +0100
++++ b/crypto/Makefile  2015-01-23 16:42:13.460175569 +0100
+@@ -85,11 +85,11 @@
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ subdirs:
+-      @target=all; $(RECURSIVE_MAKE)
++      +@target=all; $(RECURSIVE_MAKE)
+ files:
+       $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
+-      @target=files; $(RECURSIVE_MAKE)
++      +@target=files; $(RECURSIVE_MAKE)
+ links:
+       @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -100,7 +100,7 @@
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:  $(LIB)
+       @touch lib
+-$(LIB):       $(LIBOBJ)
++$(LIB):       $(LIBOBJ) | subdirs
+       $(AR) $(LIB) $(LIBOBJ)
+       test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+       $(RANLIB) $(LIB) || echo Never mind.
+@@ -111,7 +111,7 @@
+       fi
+ libs:
+-      @target=lib; $(RECURSIVE_MAKE)
++      +@target=lib; $(RECURSIVE_MAKE)
+ install:
+       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -120,7 +120,7 @@
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
+-      @target=install; $(RECURSIVE_MAKE)
++      +@target=install; $(RECURSIVE_MAKE)
+ lint:
+       @target=lint; $(RECURSIVE_MAKE)
+--- a/engines/Makefile 2015-01-22 17:12:24.000000000 +0100
++++ b/engines/Makefile 2015-01-23 16:42:13.461175596 +0100
+@@ -72,7 +72,7 @@
+ all:  lib subdirs
+-lib:  $(LIBOBJ)
++lib:  $(LIBOBJ) | subdirs
+       @if [ -n "$(SHARED_LIBS)" ]; then \
+               set -e; \
+               for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@
+ subdirs:
+       echo $(EDIRS)
+-      @target=all; $(RECURSIVE_MAKE)
++      +@target=all; $(RECURSIVE_MAKE)
+ files:
+       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@
+                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+               done; \
+       fi
+-      @target=install; $(RECURSIVE_MAKE)
++      +@target=install; $(RECURSIVE_MAKE)
+ tags:
+       ctags $(SRC)
+--- a/Makefile.org     2015-01-22 15:58:06.000000000 +0100
++++ b/Makefile.org     2015-01-23 16:42:13.461175596 +0100
+@@ -274,17 +274,17 @@
+ build_libs: build_crypto build_ssl build_engines
+ build_crypto:
+-      @dir=crypto; target=all; $(BUILD_ONE_CMD)
+-build_ssl:
+-      @dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
+-      @dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
+-      @dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
+-      @dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
+-      @dir=tools; target=all; $(BUILD_ONE_CMD)
++      +@dir=crypto; target=all; $(BUILD_ONE_CMD)
++build_ssl: build_crypto
++      +@dir=ssl; target=all; $(BUILD_ONE_CMD)
++build_engines: build_crypto
++      +@dir=engines; target=all; $(BUILD_ONE_CMD)
++build_apps: build_libs
++      +@dir=apps; target=all; $(BUILD_ONE_CMD)
++build_tests: build_libs
++      +@dir=test; target=all; $(BUILD_ONE_CMD)
++build_tools: build_libs
++      +@dir=tools; target=all; $(BUILD_ONE_CMD)
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -536,9 +536,9 @@
+ dist_pem_h:
+       (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+-install: all install_docs install_sw
++install: install_docs install_sw
+-install_sw:
++install_dirs:
+       @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -547,12 +547,19 @@
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/private
++      @$(PERL) $(TOP)/util/mkdir-p.pl \
++              $(INSTALL_PREFIX)$(MANDIR)/man1 \
++              $(INSTALL_PREFIX)$(MANDIR)/man3 \
++              $(INSTALL_PREFIX)$(MANDIR)/man5 \
++              $(INSTALL_PREFIX)$(MANDIR)/man7
++
++install_sw: install_dirs
+       @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+       do \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
+-      @set -e; target=install; $(RECURSIVE_BUILD_CMD)
++      +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+       @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+       do \
+               if [ -f "$$i" ]; then \
+@@ -636,12 +643,7 @@
+               done; \
+       done
+-install_docs:
+-      @$(PERL) $(TOP)/util/mkdir-p.pl \
+-              $(INSTALL_PREFIX)$(MANDIR)/man1 \
+-              $(INSTALL_PREFIX)$(MANDIR)/man3 \
+-              $(INSTALL_PREFIX)$(MANDIR)/man5 \
+-              $(INSTALL_PREFIX)$(MANDIR)/man7
++install_docs: install_dirs
+       @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+       here="`pwd`"; \
+       filecase=; \
+--- a/Makefile.shared  2015-01-20 13:33:36.000000000 +0100
++++ b/Makefile.shared  2015-01-23 16:42:13.461175596 +0100
+@@ -105,6 +105,7 @@
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+       -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +123,7 @@
+                       done; \
+               fi; \
+               if [ -n "$$SHLIB_SOVER" ]; then \
++                      [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+                       ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+                         ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+               fi; \
+--- a/test/Makefile    2015-01-22 17:12:26.000000000 +0100
++++ b/test/Makefile    2015-01-23 16:42:13.461175596 +0100
+@@ -132,7 +132,7 @@
+ tags:
+       ctags $(SRC)
+-tests:        exe apps $(TESTS)
++tests:        exe $(TESTS)
+ apps:
+       @(cd ..; $(MAKE) DIRS=apps all)
+@@ -398,109 +398,109 @@
+               link_app.$${shlib_target}
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-      @target=$(RSATEST); $(BUILD_CMD)
++      +@target=$(RSATEST); $(BUILD_CMD)
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-      @target=$(BNTEST); $(BUILD_CMD)
++      +@target=$(BNTEST); $(BUILD_CMD)
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-      @target=$(ECTEST); $(BUILD_CMD)
++      +@target=$(ECTEST); $(BUILD_CMD)
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-      @target=$(EXPTEST); $(BUILD_CMD)
++      +@target=$(EXPTEST); $(BUILD_CMD)
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-      @target=$(IDEATEST); $(BUILD_CMD)
++      +@target=$(IDEATEST); $(BUILD_CMD)
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-      @target=$(MD2TEST); $(BUILD_CMD)
++      +@target=$(MD2TEST); $(BUILD_CMD)
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-      @target=$(SHATEST); $(BUILD_CMD)
++      +@target=$(SHATEST); $(BUILD_CMD)
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-      @target=$(SHA1TEST); $(BUILD_CMD)
++      +@target=$(SHA1TEST); $(BUILD_CMD)
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-      @target=$(SHA256TEST); $(BUILD_CMD)
++      +@target=$(SHA256TEST); $(BUILD_CMD)
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-      @target=$(SHA512TEST); $(BUILD_CMD)
++      +@target=$(SHA512TEST); $(BUILD_CMD)
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-      @target=$(RMDTEST); $(BUILD_CMD)
++      +@target=$(RMDTEST); $(BUILD_CMD)
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-      @target=$(MDC2TEST); $(BUILD_CMD)
++      +@target=$(MDC2TEST); $(BUILD_CMD)
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-      @target=$(MD4TEST); $(BUILD_CMD)
++      +@target=$(MD4TEST); $(BUILD_CMD)
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-      @target=$(MD5TEST); $(BUILD_CMD)
++      +@target=$(MD5TEST); $(BUILD_CMD)
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-      @target=$(HMACTEST); $(BUILD_CMD)
++      +@target=$(HMACTEST); $(BUILD_CMD)
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-      @target=$(WPTEST); $(BUILD_CMD)
++      +@target=$(WPTEST); $(BUILD_CMD)
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-      @target=$(RC2TEST); $(BUILD_CMD)
++      +@target=$(RC2TEST); $(BUILD_CMD)
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-      @target=$(BFTEST); $(BUILD_CMD)
++      +@target=$(BFTEST); $(BUILD_CMD)
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-      @target=$(CASTTEST); $(BUILD_CMD)
++      +@target=$(CASTTEST); $(BUILD_CMD)
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-      @target=$(RC4TEST); $(BUILD_CMD)
++      +@target=$(RC4TEST); $(BUILD_CMD)
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-      @target=$(RC5TEST); $(BUILD_CMD)
++      +@target=$(RC5TEST); $(BUILD_CMD)
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-      @target=$(DESTEST); $(BUILD_CMD)
++      +@target=$(DESTEST); $(BUILD_CMD)
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-      @target=$(RANDTEST); $(BUILD_CMD)
++      +@target=$(RANDTEST); $(BUILD_CMD)
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-      @target=$(DHTEST); $(BUILD_CMD)
++      +@target=$(DHTEST); $(BUILD_CMD)
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-      @target=$(DSATEST); $(BUILD_CMD)
++      +@target=$(DSATEST); $(BUILD_CMD)
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-      @target=$(METHTEST); $(BUILD_CMD)
++      +@target=$(METHTEST); $(BUILD_CMD)
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-      @target=$(SSLTEST); $(FIPS_BUILD_CMD)
++      +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-      @target=$(ENGINETEST); $(BUILD_CMD)
++      +@target=$(ENGINETEST); $(BUILD_CMD)
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-      @target=$(EVPTEST); $(BUILD_CMD)
++      +@target=$(EVPTEST); $(BUILD_CMD)
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-      @target=$(ECDSATEST); $(BUILD_CMD)
++      +@target=$(ECDSATEST); $(BUILD_CMD)
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-      @target=$(ECDHTEST); $(BUILD_CMD)
++      +@target=$(ECDHTEST); $(BUILD_CMD)
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-      @target=$(IGETEST); $(BUILD_CMD)
++      +@target=$(IGETEST); $(BUILD_CMD)
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-      @target=$(JPAKETEST); $(BUILD_CMD)
++      +@target=$(JPAKETEST); $(BUILD_CMD)
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-      @target=$(ASN1TEST); $(BUILD_CMD)
++      +@target=$(ASN1TEST); $(BUILD_CMD)
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-      @target=$(SRPTEST); $(BUILD_CMD)
++      +@target=$(SRPTEST); $(BUILD_CMD)
+ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
+       @target=$(V3NAMETEST); $(BUILD_CMD)
+@@ -522,7 +522,7 @@
+ #     fi
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-      @target=dummytest; $(BUILD_CMD)
++      +@target=dummytest; $(BUILD_CMD)
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch b/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch
deleted file mode 100644 (file)
index 2252e31..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4b59d129fd1026bab37256af0df9ae7ace39e7ba Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Mon, 27 Apr 2015 18:49:45 +0200
-Subject: [PATCH] stroke: Increase stroke buffer size to 8k
-
-Complicated connections can have lots of arguments
-for the ike= and esp= directives in the ipsec.conf
-configuration file. strongSwan wouldn't import those
-because the size of the message that is send from
-stroke to charon exceeded the limit of 4k.
-
-This patch increases the size of the buffer that
-can be passed to charon to 8k which should be enough
-even for connections with longer configurations.
----
- src/stroke/stroke_msg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
-index c2b923f6db9a..c391efa00105 100644
---- a/src/stroke/stroke_msg.h
-+++ b/src/stroke/stroke_msg.h
-@@ -32,7 +32,7 @@
-  */
- #define STROKE_SOCKET IPSEC_PIDDIR "/charon.ctl"
--#define STROKE_BUF_LEN                4096
-+#define STROKE_BUF_LEN                8192
- typedef enum list_flag_t list_flag_t;
--- 
-2.1.0
-
diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch
new file mode 100644 (file)
index 0000000..948c4fc
--- /dev/null
@@ -0,0 +1,11 @@
+--- strongswan-5.3.1/scripts/Makefile.am.old   2015-06-04 17:20:43.539244145 +0000
++++ strongswan-5.3.1/scripts/Makefile.am       2015-06-04 17:20:51.760510631 +0000
+@@ -42,7 +42,7 @@
+ dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+ aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+ settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+-timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
++timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB)
+ key2keyid.o : $(top_builddir)/config.status