Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Sat, 20 Jun 2015 21:08:05 +0000 (23:08 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Sat, 20 Jun 2015 21:08:05 +0000 (23:08 +0200)
267 files changed:
config/rootfiles/common/libgcrypt
config/rootfiles/common/libgpg-error
config/rootfiles/common/libpcap
config/rootfiles/common/libusb
config/rootfiles/common/libusb-compat [new file with mode: 0644]
config/rootfiles/common/libusbx [deleted file]
config/rootfiles/common/python
config/rootfiles/common/web-user-interface
config/rootfiles/core/92/exclude [moved from config/rootfiles/core/88/exclude with 100% similarity]
config/rootfiles/core/92/filelists/dnsmasq [moved from config/rootfiles/core/89/filelists/dnsmasq with 100% similarity]
config/rootfiles/core/92/filelists/files [new file with mode: 0644]
config/rootfiles/core/92/filelists/libgcrypt [new symlink]
config/rootfiles/core/92/filelists/libgpg-error [new symlink]
config/rootfiles/core/92/filelists/libpcap [moved from config/rootfiles/core/89/filelists/libpcap with 100% similarity]
config/rootfiles/core/92/filelists/libusb [new symlink]
config/rootfiles/core/92/filelists/libusb-compat [new symlink]
config/rootfiles/core/92/filelists/rrdtool [new symlink]
config/rootfiles/core/92/meta [moved from config/rootfiles/core/88/meta with 100% similarity]
config/rootfiles/core/92/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/88/exclude [moved from config/rootfiles/core/89/exclude with 100% similarity]
config/rootfiles/oldcore/88/filelists/files [moved from config/rootfiles/core/88/filelists/files with 100% similarity]
config/rootfiles/oldcore/88/filelists/fireinfo [moved from config/rootfiles/core/88/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/88/filelists/openssh [moved from config/rootfiles/core/88/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/88/filelists/openssl [moved from config/rootfiles/core/88/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/88/filelists/openssl-compat [moved from config/rootfiles/core/88/filelists/openssl-compat with 100% similarity]
config/rootfiles/oldcore/88/meta [moved from config/rootfiles/core/89/meta with 100% similarity]
config/rootfiles/oldcore/88/update.sh [moved from config/rootfiles/core/88/update.sh with 100% similarity]
config/rootfiles/oldcore/89/exclude [moved from config/rootfiles/core/91/exclude with 100% similarity]
config/rootfiles/oldcore/89/filelists/collectd [moved from config/rootfiles/core/89/filelists/collectd with 100% similarity]
config/rootfiles/oldcore/89/filelists/daq [moved from config/rootfiles/core/89/filelists/daq with 100% similarity]
config/rootfiles/oldcore/89/filelists/ddns [moved from config/rootfiles/core/89/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/89/filelists/dnsmasq [moved from config/rootfiles/core/90/filelists/dnsmasq with 100% similarity]
config/rootfiles/oldcore/89/filelists/ethtool [moved from config/rootfiles/core/89/filelists/ethtool with 100% similarity]
config/rootfiles/oldcore/89/filelists/fcron [moved from config/rootfiles/core/89/filelists/fcron with 100% similarity]
config/rootfiles/oldcore/89/filelists/file [moved from config/rootfiles/core/89/filelists/file with 100% similarity]
config/rootfiles/oldcore/89/filelists/files [moved from config/rootfiles/core/89/filelists/files with 100% similarity]
config/rootfiles/oldcore/89/filelists/fuse [moved from config/rootfiles/core/89/filelists/fuse with 100% similarity]
config/rootfiles/oldcore/89/filelists/gnupg [moved from config/rootfiles/core/89/filelists/gnupg with 100% similarity]
config/rootfiles/oldcore/89/filelists/grep [moved from config/rootfiles/core/89/filelists/grep with 100% similarity]
config/rootfiles/oldcore/89/filelists/hdparm [moved from config/rootfiles/core/89/filelists/hdparm with 100% similarity]
config/rootfiles/oldcore/89/filelists/libart [moved from config/rootfiles/core/89/filelists/libart with 100% similarity]
config/rootfiles/oldcore/89/filelists/libcap [moved from config/rootfiles/core/89/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/89/filelists/libffi [moved from config/rootfiles/core/89/filelists/libffi with 100% similarity]
config/rootfiles/oldcore/89/filelists/libpcap [new symlink]
config/rootfiles/oldcore/89/filelists/ntfs-3g [moved from config/rootfiles/core/89/filelists/ntfs-3g with 100% similarity]
config/rootfiles/oldcore/89/filelists/openssh [moved from config/rootfiles/core/89/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/89/filelists/openssl [moved from config/rootfiles/core/89/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/89/filelists/openssl-compat [moved from config/rootfiles/core/89/filelists/openssl-compat with 100% similarity]
config/rootfiles/oldcore/89/filelists/pcre [moved from config/rootfiles/core/89/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/89/filelists/screen [moved from config/rootfiles/core/89/filelists/screen with 100% similarity]
config/rootfiles/oldcore/89/filelists/setup [moved from config/rootfiles/core/89/filelists/setup with 100% similarity]
config/rootfiles/oldcore/89/filelists/smartmontools [moved from config/rootfiles/core/89/filelists/smartmontools with 100% similarity]
config/rootfiles/oldcore/89/filelists/snort [moved from config/rootfiles/core/89/filelists/snort with 100% similarity]
config/rootfiles/oldcore/89/filelists/sqlite [moved from config/rootfiles/core/89/filelists/sqlite with 100% similarity]
config/rootfiles/oldcore/89/filelists/squid [moved from config/rootfiles/core/89/filelists/squid with 100% similarity]
config/rootfiles/oldcore/89/filelists/strongswan [moved from config/rootfiles/core/89/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/89/filelists/tar [moved from config/rootfiles/core/89/filelists/tar with 100% similarity]
config/rootfiles/oldcore/89/filelists/tzdata [moved from config/rootfiles/core/89/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/89/filelists/wget [moved from config/rootfiles/core/89/filelists/wget with 100% similarity]
config/rootfiles/oldcore/89/filelists/zlib [moved from config/rootfiles/core/89/filelists/zlib with 100% similarity]
config/rootfiles/oldcore/89/meta [moved from config/rootfiles/core/90/meta with 100% similarity]
config/rootfiles/oldcore/89/update.sh [moved from config/rootfiles/core/89/update.sh with 100% similarity]
config/rootfiles/oldcore/90/exclude [moved from config/rootfiles/core/90/exclude with 100% similarity]
config/rootfiles/oldcore/90/filelists/Locale-Country [moved from config/rootfiles/core/90/filelists/Locale-Country with 100% similarity]
config/rootfiles/oldcore/90/filelists/apache2 [moved from config/rootfiles/core/90/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/90/filelists/armv5tel/glibc [moved from config/rootfiles/core/90/filelists/armv5tel/glibc with 100% similarity]
config/rootfiles/oldcore/90/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/90/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/oldcore/90/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/90/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/oldcore/90/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/90/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/90/filelists/curl [moved from config/rootfiles/core/90/filelists/curl with 100% similarity]
config/rootfiles/oldcore/90/filelists/cyrus-sasl [moved from config/rootfiles/core/90/filelists/cyrus-sasl with 100% similarity]
config/rootfiles/oldcore/90/filelists/ddns [moved from config/rootfiles/core/90/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/90/filelists/dhcp [moved from config/rootfiles/core/90/filelists/dhcp with 100% similarity]
config/rootfiles/oldcore/90/filelists/dhcpcd [moved from config/rootfiles/core/90/filelists/dhcpcd with 100% similarity]
config/rootfiles/oldcore/90/filelists/dnsmasq [new symlink]
config/rootfiles/oldcore/90/filelists/dracut [moved from config/rootfiles/core/90/filelists/dracut with 100% similarity]
config/rootfiles/oldcore/90/filelists/expat [moved from config/rootfiles/core/90/filelists/expat with 100% similarity]
config/rootfiles/oldcore/90/filelists/files [moved from config/rootfiles/core/90/filelists/files with 100% similarity]
config/rootfiles/oldcore/90/filelists/fireinfo [moved from config/rootfiles/core/90/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/90/filelists/flag-icons [moved from config/rootfiles/core/90/filelists/flag-icons with 100% similarity]
config/rootfiles/oldcore/90/filelists/groff [moved from config/rootfiles/core/90/filelists/groff with 100% similarity]
config/rootfiles/oldcore/90/filelists/i586/acpid [moved from config/rootfiles/core/90/filelists/i586/acpid with 100% similarity]
config/rootfiles/oldcore/90/filelists/i586/glibc [moved from config/rootfiles/core/90/filelists/i586/glibc with 100% similarity]
config/rootfiles/oldcore/90/filelists/i586/linux [moved from config/rootfiles/core/90/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/90/filelists/i586/linux-initrd [moved from config/rootfiles/core/90/filelists/i586/linux-initrd with 100% similarity]
config/rootfiles/oldcore/90/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/90/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/90/filelists/iptables [moved from config/rootfiles/core/90/filelists/iptables with 100% similarity]
config/rootfiles/oldcore/90/filelists/iputils [moved from config/rootfiles/core/90/filelists/iputils with 100% similarity]
config/rootfiles/oldcore/90/filelists/libjpeg [moved from config/rootfiles/core/90/filelists/libjpeg with 100% similarity]
config/rootfiles/oldcore/90/filelists/logrotate [moved from config/rootfiles/core/90/filelists/logrotate with 100% similarity]
config/rootfiles/oldcore/90/filelists/logwatch [moved from config/rootfiles/core/90/filelists/logwatch with 100% similarity]
config/rootfiles/oldcore/90/filelists/openldap [moved from config/rootfiles/core/90/filelists/openldap with 100% similarity]
config/rootfiles/oldcore/90/filelists/openssl [moved from config/rootfiles/core/90/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/90/filelists/openssl-0.9.8-files [moved from config/rootfiles/core/90/filelists/openssl-0.9.8-files with 100% similarity]
config/rootfiles/oldcore/90/filelists/perl-Text-CSV_XS [moved from config/rootfiles/core/90/filelists/perl-Text-CSV_XS with 100% similarity]
config/rootfiles/oldcore/90/filelists/squid [moved from config/rootfiles/core/90/filelists/squid with 100% similarity]
config/rootfiles/oldcore/90/filelists/strongswan [moved from config/rootfiles/core/90/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/90/filelists/tzdata [moved from config/rootfiles/core/90/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/90/filelists/udev [moved from config/rootfiles/core/90/filelists/udev with 100% similarity]
config/rootfiles/oldcore/90/filelists/wpa_supplicant [moved from config/rootfiles/core/90/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/oldcore/90/filelists/xtables-addons [moved from config/rootfiles/core/90/filelists/xtables-addons with 100% similarity]
config/rootfiles/oldcore/90/filelists/xz [moved from config/rootfiles/core/90/filelists/xz with 100% similarity]
config/rootfiles/oldcore/90/meta [moved from config/rootfiles/core/91/meta with 100% similarity]
config/rootfiles/oldcore/90/update.sh [moved from config/rootfiles/core/90/update.sh with 100% similarity]
config/rootfiles/oldcore/91/exclude [new file with mode: 0644]
config/rootfiles/oldcore/91/filelists/files [moved from config/rootfiles/core/91/filelists/files with 100% similarity]
config/rootfiles/oldcore/91/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/91/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/91/filelists/i586/strongswan-padlock [moved from config/rootfiles/core/91/filelists/i586/strongswan-padlock with 100% similarity]
config/rootfiles/oldcore/91/filelists/libnet [moved from config/rootfiles/core/91/filelists/libnet with 100% similarity]
config/rootfiles/oldcore/91/filelists/libtool [moved from config/rootfiles/core/91/filelists/libtool with 100% similarity]
config/rootfiles/oldcore/91/filelists/libxml2 [moved from config/rootfiles/core/91/filelists/libxml2 with 100% similarity]
config/rootfiles/oldcore/91/filelists/libxslt [moved from config/rootfiles/core/91/filelists/libxslt with 100% similarity]
config/rootfiles/oldcore/91/filelists/newt [moved from config/rootfiles/core/91/filelists/newt with 100% similarity]
config/rootfiles/oldcore/91/filelists/openssh [moved from config/rootfiles/core/91/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/91/filelists/openssl [moved from config/rootfiles/core/91/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/91/filelists/pcre [moved from config/rootfiles/core/91/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/91/filelists/slang [moved from config/rootfiles/core/91/filelists/slang with 100% similarity]
config/rootfiles/oldcore/91/filelists/strongswan [moved from config/rootfiles/core/91/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/91/meta [new file with mode: 0644]
config/rootfiles/oldcore/91/update.sh [moved from config/rootfiles/core/91/update.sh with 100% similarity]
config/rootfiles/packages/7zip
config/rootfiles/packages/git
config/rootfiles/packages/libassuan
config/rootfiles/packages/nano
config/rootfiles/packages/perl-Authen-SASL [new file with mode: 0644]
config/rootfiles/packages/perl-MIME-Base64 [new file with mode: 0644]
config/rootfiles/packages/perl-Net-SMTP-SSL [new file with mode: 0644]
config/rootfiles/packages/powertop
html/cgi-bin/dhcp.cgi
html/html/themes/maniac/images/Thumbs.db [deleted file]
lfs/7zip
lfs/dnsmasq
lfs/git
lfs/libassuan
lfs/libgcrypt
lfs/libgpg-error
lfs/libpcap
lfs/libusb
lfs/libusb-compat [moved from lfs/libusbx with 89% similarity]
lfs/nano
lfs/perl-Authen-SASL [new file with mode: 0644]
lfs/perl-MIME-Base64 [new file with mode: 0644]
lfs/perl-Net-SMTP-SSL [new file with mode: 0644]
lfs/powertop
lfs/python
lfs/python-optional-src
lfs/tcpdump
make.sh
src/patches/Python-2.7.9-gdbm-1.patch [new file with mode: 0644]
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
src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.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/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch
src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch [new file with mode: 0644]
src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch
src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch
src/patches/dnsmasq/0093-Tweak-last-commit.patch
src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch [new file with mode: 0644]
src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch [new file with mode: 0644]
src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch
src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch
src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch
src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch
src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch
src/patches/dnsmasq/0099-Man-page-typo.patch [new file with mode: 0644]
src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch [new file with mode: 0644]
src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch [new file with mode: 0644]
src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch [new file with mode: 0644]
src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch [new file with mode: 0644]
src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch [new file with mode: 0644]
src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch [new file with mode: 0644]
src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch [new file with mode: 0644]
src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch [new file with mode: 0644]
src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch [new file with mode: 0644]
src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch [new file with mode: 0644]
src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch [new file with mode: 0644]
src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch [new file with mode: 0644]
src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch [new file with mode: 0644]
src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch [new file with mode: 0644]

index 96e48e1..344a055 100644 (file)
@@ -6,7 +6,7 @@
 #usr/lib/libgcrypt.la
 #usr/lib/libgcrypt.so
 usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.0.1
+usr/lib/libgcrypt.so.20.0.3
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
 #usr/share/info/gcrypt.info-1
index cbb7dec..4d6febc 100644 (file)
@@ -4,7 +4,7 @@ usr/bin/gpg-error
 #usr/lib/libgpg-error.la
 #usr/lib/libgpg-error.so
 usr/lib/libgpg-error.so.0
-usr/lib/libgpg-error.so.0.11.0
+usr/lib/libgpg-error.so.0.14.0
 #usr/share/aclocal/gpg-error.m4
 #usr/share/common-lisp
 #usr/share/common-lisp/source
@@ -13,19 +13,24 @@ usr/lib/libgpg-error.so.0.11.0
 #usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
 #usr/share/common-lisp/source/gpg-error/gpg-error.asd
 #usr/share/common-lisp/source/gpg-error/gpg-error.lisp
+#usr/share/info/gpgrt.info
 #usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-#usr/share/locale/eo
-#usr/share/locale/eo/LC_MESSAGES
 #usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo
+#usr/share/man/man1/gpg-error-config.1
index b8e9648..9031c6e 100644 (file)
@@ -15,7 +15,7 @@
 #usr/lib/libpcap.a
 usr/lib/libpcap.so
 usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.6.2
+usr/lib/libpcap.so.1.7.3
 #usr/share/man/man1/pcap-config.1
 #usr/share/man/man3/pcap.3pcap
 #usr/share/man/man3/pcap_activate.3pcap
index 61c2f2a..5be9bdf 100644 (file)
@@ -1,15 +1,16 @@
 etc/udev/rules.d/23-usb.rules
 #usr/bin/libusb-config
+#usr/include/libusb-1.0
+#usr/include/libusb-1.0/libusb.h
 #usr/include/usb.h
-#usr/include/usbpp.h
-usr/lib/libusb-0.1.so.4
-usr/lib/libusb-0.1.so.4.4.4
-#usr/lib/libusb.a
+#usr/lib/libusb-0.1.so.4
+#usr/lib/libusb-0.1.so.4.4.4
+#usr/lib/libusb-1.0.a
+#usr/lib/libusb-1.0.la
+#usr/lib/libusb-1.0.so
+usr/lib/libusb-1.0.so.0
+usr/lib/libusb-1.0.so.0.1.0
 #usr/lib/libusb.la
-usr/lib/libusb.so
-usr/lib/libusbpp-0.1.so.4
-usr/lib/libusbpp-0.1.so.4.4.4
-#usr/lib/libusbpp.a
-#usr/lib/libusbpp.la
-usr/lib/libusbpp.so
+#usr/lib/libusb.so
+#usr/lib/pkgconfig/libusb-1.0.pc
 #usr/lib/pkgconfig/libusb.pc
diff --git a/config/rootfiles/common/libusb-compat b/config/rootfiles/common/libusb-compat
new file mode 100644 (file)
index 0000000..ca3007e
--- /dev/null
@@ -0,0 +1,7 @@
+#usr/bin/libusb-config
+#usr/include/usb.h
+usr/lib/libusb-0.1.so.4
+usr/lib/libusb-0.1.so.4.4.4
+#usr/lib/libusb.la
+usr/lib/libusb.so
+#usr/lib/pkgconfig/libusb.pc
diff --git a/config/rootfiles/common/libusbx b/config/rootfiles/common/libusbx
deleted file mode 100644 (file)
index 62d6492..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#usr/include/libusb-1.0
-#usr/include/libusb-1.0/libusb.h
-#usr/lib/libusb-1.0.a
-#usr/lib/libusb-1.0.la
-#usr/lib/libusb-1.0.so
-usr/lib/libusb-1.0.so.0
-usr/lib/libusb-1.0.so.0.1.0
-#usr/lib/pkgconfig/libusb-1.0.pc
index 3472e25..6542f0d 100644 (file)
@@ -171,12 +171,18 @@ usr/lib/python2.7/__phello__.foo.pyc
 #usr/lib/python2.7/_abcoll.py
 usr/lib/python2.7/_abcoll.pyc
 #usr/lib/python2.7/_abcoll.pyo
+#usr/lib/python2.7/_osx_support.py
+#usr/lib/python2.7/_osx_support.pyc
+#usr/lib/python2.7/_osx_support.pyo
 #usr/lib/python2.7/_pyio.py
 usr/lib/python2.7/_pyio.pyc
 #usr/lib/python2.7/_pyio.pyo
 #usr/lib/python2.7/_strptime.py
 usr/lib/python2.7/_strptime.pyc
 #usr/lib/python2.7/_strptime.pyo
+#usr/lib/python2.7/_sysconfigdata.py
+#usr/lib/python2.7/_sysconfigdata.pyc
+#usr/lib/python2.7/_sysconfigdata.pyo
 #usr/lib/python2.7/_threading_local.py
 usr/lib/python2.7/_threading_local.pyc
 #usr/lib/python2.7/_threading_local.pyo
@@ -488,9 +494,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc
 #usr/lib/python2.7/ctypes/test/test_delattr.py
 #usr/lib/python2.7/ctypes/test/test_delattr.pyc
 #usr/lib/python2.7/ctypes/test/test_delattr.pyo
-#usr/lib/python2.7/ctypes/test/test_errcheck.py
-#usr/lib/python2.7/ctypes/test/test_errcheck.pyc
-#usr/lib/python2.7/ctypes/test/test_errcheck.pyo
 #usr/lib/python2.7/ctypes/test/test_errno.py
 #usr/lib/python2.7/ctypes/test/test_errno.pyc
 #usr/lib/python2.7/ctypes/test/test_errno.pyo
@@ -512,9 +515,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc
 #usr/lib/python2.7/ctypes/test/test_init.py
 #usr/lib/python2.7/ctypes/test/test_init.pyc
 #usr/lib/python2.7/ctypes/test/test_init.pyo
-#usr/lib/python2.7/ctypes/test/test_integers.py
-#usr/lib/python2.7/ctypes/test/test_integers.pyc
-#usr/lib/python2.7/ctypes/test/test_integers.pyo
 #usr/lib/python2.7/ctypes/test/test_internals.py
 #usr/lib/python2.7/ctypes/test/test_internals.pyc
 #usr/lib/python2.7/ctypes/test/test_internals.pyo
@@ -605,6 +605,9 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc
 #usr/lib/python2.7/ctypes/test/test_win32.py
 #usr/lib/python2.7/ctypes/test/test_win32.pyc
 #usr/lib/python2.7/ctypes/test/test_win32.pyo
+#usr/lib/python2.7/ctypes/test/test_wintypes.py
+#usr/lib/python2.7/ctypes/test/test_wintypes.pyc
+#usr/lib/python2.7/ctypes/test/test_wintypes.pyo
 #usr/lib/python2.7/ctypes/util.py
 usr/lib/python2.7/ctypes/util.pyc
 #usr/lib/python2.7/ctypes/util.pyo
@@ -1452,6 +1455,19 @@ usr/lib/python2.7/encodings/uu_codec.pyc
 #usr/lib/python2.7/encodings/zlib_codec.py
 usr/lib/python2.7/encodings/zlib_codec.pyc
 #usr/lib/python2.7/encodings/zlib_codec.pyo
+#usr/lib/python2.7/ensurepip
+#usr/lib/python2.7/ensurepip/__init__.py
+#usr/lib/python2.7/ensurepip/__init__.pyc
+#usr/lib/python2.7/ensurepip/__init__.pyo
+#usr/lib/python2.7/ensurepip/__main__.py
+#usr/lib/python2.7/ensurepip/__main__.pyc
+#usr/lib/python2.7/ensurepip/__main__.pyo
+#usr/lib/python2.7/ensurepip/_bundled
+#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_uninstall.py
+#usr/lib/python2.7/ensurepip/_uninstall.pyc
+#usr/lib/python2.7/ensurepip/_uninstall.pyo
 #usr/lib/python2.7/filecmp.py
 usr/lib/python2.7/filecmp.pyc
 #usr/lib/python2.7/filecmp.pyo
@@ -1583,6 +1599,13 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/Icons
 #usr/lib/python2.7/idlelib/Icons/folder.gif
 #usr/lib/python2.7/idlelib/Icons/idle.icns
+#usr/lib/python2.7/idlelib/Icons/idle.ico
+#usr/lib/python2.7/idlelib/Icons/idle_16.gif
+#usr/lib/python2.7/idlelib/Icons/idle_16.png
+#usr/lib/python2.7/idlelib/Icons/idle_32.gif
+#usr/lib/python2.7/idlelib/Icons/idle_32.png
+#usr/lib/python2.7/idlelib/Icons/idle_48.gif
+#usr/lib/python2.7/idlelib/Icons/idle_48.png
 #usr/lib/python2.7/idlelib/Icons/minusnode.gif
 #usr/lib/python2.7/idlelib/Icons/openfolder.gif
 #usr/lib/python2.7/idlelib/Icons/plusnode.gif
@@ -1701,6 +1724,80 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/idle.pyc
 #usr/lib/python2.7/idlelib/idle.pyo
 #usr/lib/python2.7/idlelib/idle.pyw
+#usr/lib/python2.7/idlelib/idle_test
+#usr/lib/python2.7/idlelib/idle_test/README.txt
+#usr/lib/python2.7/idlelib/idle_test/__init__.py
+#usr/lib/python2.7/idlelib/idle_test/__init__.pyc
+#usr/lib/python2.7/idlelib/idle_test/__init__.pyo
+#usr/lib/python2.7/idlelib/idle_test/htest.py
+#usr/lib/python2.7/idlelib/idle_test/htest.pyc
+#usr/lib/python2.7/idlelib/idle_test/htest.pyo
+#usr/lib/python2.7/idlelib/idle_test/mock_idle.py
+#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyc
+#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyo
+#usr/lib/python2.7/idlelib/idle_test/mock_tk.py
+#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc
+#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py
+#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py
+#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_calltips.py
+#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_config_name.py
+#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_configdialog.py
+#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_delegator.py
+#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
+#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_grep.py
+#usr/lib/python2.7/idlelib/idle_test/test_grep.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_grep.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py
+#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py
+#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_io.py
+#usr/lib/python2.7/idlelib/idle_test/test_io.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_io.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py
+#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py
+#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_rstrip.py
+#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py
+#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_searchengine.py
+#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_text.py
+#usr/lib/python2.7/idlelib/idle_test/test_text.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_text.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_textview.py
+#usr/lib/python2.7/idlelib/idle_test/test_textview.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_textview.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_warning.py
+#usr/lib/python2.7/idlelib/idle_test/test_warning.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_warning.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py
+#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyo
 #usr/lib/python2.7/idlelib/idlever.py
 #usr/lib/python2.7/idlelib/idlever.pyc
 #usr/lib/python2.7/idlelib/idlever.pyo
@@ -1719,9 +1816,6 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/tabbedpages.py
 #usr/lib/python2.7/idlelib/tabbedpages.pyc
 #usr/lib/python2.7/idlelib/tabbedpages.pyo
-#usr/lib/python2.7/idlelib/testcode.py
-#usr/lib/python2.7/idlelib/testcode.pyc
-#usr/lib/python2.7/idlelib/testcode.pyo
 #usr/lib/python2.7/idlelib/textView.py
 #usr/lib/python2.7/idlelib/textView.pyc
 #usr/lib/python2.7/idlelib/textView.pyo
@@ -1809,6 +1903,9 @@ usr/lib/python2.7/json/scanner.pyc
 #usr/lib/python2.7/json/tests/test_speedups.py
 #usr/lib/python2.7/json/tests/test_speedups.pyc
 #usr/lib/python2.7/json/tests/test_speedups.pyo
+#usr/lib/python2.7/json/tests/test_tool.py
+#usr/lib/python2.7/json/tests/test_tool.pyc
+#usr/lib/python2.7/json/tests/test_tool.pyo
 #usr/lib/python2.7/json/tests/test_unicode.py
 #usr/lib/python2.7/json/tests/test_unicode.pyc
 #usr/lib/python2.7/json/tests/test_unicode.pyo
@@ -1819,7 +1916,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -1860,7 +1957,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so
 usr/lib/python2.7/lib-dynload/cmath.so
 usr/lib/python2.7/lib-dynload/crypt.so
 usr/lib/python2.7/lib-dynload/datetime.so
-usr/lib/python2.7/lib-dynload/dbm.so
+#usr/lib/python2.7/lib-dynload/dbm_failed.so
 usr/lib/python2.7/lib-dynload/dl.so
 usr/lib/python2.7/lib-dynload/fcntl.so
 usr/lib/python2.7/lib-dynload/future_builtins.so
@@ -1926,12 +2023,27 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py
 #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc
 #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyo
 #usr/lib/python2.7/lib-tk/test/test_ttk
 #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py
 #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.pyc
@@ -1951,6 +2063,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py
 #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyc
 #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyo
+#usr/lib/python2.7/lib-tk/test/widget_tests.py
+#usr/lib/python2.7/lib-tk/test/widget_tests.pyc
+#usr/lib/python2.7/lib-tk/test/widget_tests.pyo
 #usr/lib/python2.7/lib-tk/tkColorChooser.py
 #usr/lib/python2.7/lib-tk/tkColorChooser.pyc
 #usr/lib/python2.7/lib-tk/tkColorChooser.pyo
@@ -1977,9 +2092,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
@@ -2005,6 +2120,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/fixes/fix_apply.py
 #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyo
+#usr/lib/python2.7/lib2to3/fixes/fix_asserts.py
+#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyc
+#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyo
 #usr/lib/python2.7/lib2to3/fixes/fix_basestring.py
 #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyo
@@ -2207,6 +2325,7 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/tests/data/bom.py
 #usr/lib/python2.7/lib2to3/tests/data/crlf.py
 #usr/lib/python2.7/lib2to3/tests/data/different_encoding.py
+#usr/lib/python2.7/lib2to3/tests/data/false_encoding.py
 #usr/lib/python2.7/lib2to3/tests/data/fixers
 #usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.py
 #usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes
@@ -2628,12 +2747,33 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/__init__.py
 #usr/lib/python2.7/test/__init__.pyc
 #usr/lib/python2.7/test/__init__.pyo
+#usr/lib/python2.7/test/_mock_backport.py
+#usr/lib/python2.7/test/_mock_backport.pyc
+#usr/lib/python2.7/test/_mock_backport.pyo
+#usr/lib/python2.7/test/audiodata
+#usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm16.au
+#usr/lib/python2.7/test/audiodata/pluck-pcm16.wav
+#usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm24.wav
+#usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm32.au
+#usr/lib/python2.7/test/audiodata/pluck-pcm32.wav
+#usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm8.au
+#usr/lib/python2.7/test/audiodata/pluck-pcm8.wav
+#usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc
+#usr/lib/python2.7/test/audiodata/pluck-ulaw.au
 #usr/lib/python2.7/test/audiotest.au
+#usr/lib/python2.7/test/audiotests.py
+#usr/lib/python2.7/test/audiotests.pyc
+#usr/lib/python2.7/test/audiotests.pyo
 #usr/lib/python2.7/test/autotest.py
 #usr/lib/python2.7/test/autotest.pyc
 #usr/lib/python2.7/test/autotest.pyo
 #usr/lib/python2.7/test/bad_coding.py
 #usr/lib/python2.7/test/bad_coding2.py
+#usr/lib/python2.7/test/bad_coding3.py
 #usr/lib/python2.7/test/badcert.pem
 #usr/lib/python2.7/test/badkey.pem
 #usr/lib/python2.7/test/badsyntax_future3.py
@@ -2647,6 +2787,11 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/buffer_tests.py
 #usr/lib/python2.7/test/buffer_tests.pyc
 #usr/lib/python2.7/test/buffer_tests.pyo
+#usr/lib/python2.7/test/capath
+#usr/lib/python2.7/test/capath/4e1295a3.0
+#usr/lib/python2.7/test/capath/5ed36f99.0
+#usr/lib/python2.7/test/capath/6e88d7b8.0
+#usr/lib/python2.7/test/capath/99d0fa06.0
 #usr/lib/python2.7/test/cfgparser.1
 #usr/lib/python2.7/test/check_soundcard.vbs
 #usr/lib/python2.7/test/cjkencodings
@@ -2830,6 +2975,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest
 #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest
 #usr/lib/python2.7/test/decimaltestdata/xor.decTest
+#usr/lib/python2.7/test/dh1024.pem
 #usr/lib/python2.7/test/doctest_aliases.py
 #usr/lib/python2.7/test/doctest_aliases.pyc
 #usr/lib/python2.7/test/doctest_aliases.pyo
@@ -2849,6 +2995,18 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/greyrgb.uue
 #usr/lib/python2.7/test/https_svn_python_org_root.pem
 #usr/lib/python2.7/test/ieee754.txt
+#usr/lib/python2.7/test/imghdrdata
+#usr/lib/python2.7/test/imghdrdata/python.bmp
+#usr/lib/python2.7/test/imghdrdata/python.gif
+#usr/lib/python2.7/test/imghdrdata/python.jpg
+#usr/lib/python2.7/test/imghdrdata/python.pbm
+#usr/lib/python2.7/test/imghdrdata/python.pgm
+#usr/lib/python2.7/test/imghdrdata/python.png
+#usr/lib/python2.7/test/imghdrdata/python.ppm
+#usr/lib/python2.7/test/imghdrdata/python.ras
+#usr/lib/python2.7/test/imghdrdata/python.sgi
+#usr/lib/python2.7/test/imghdrdata/python.tiff
+#usr/lib/python2.7/test/imghdrdata/python.xbm
 #usr/lib/python2.7/test/infinite_reload.py
 #usr/lib/python2.7/test/infinite_reload.pyc
 #usr/lib/python2.7/test/infinite_reload.pyo
@@ -2858,18 +3016,29 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/inspect_fodder2.py
 #usr/lib/python2.7/test/inspect_fodder2.pyc
 #usr/lib/python2.7/test/inspect_fodder2.pyo
+#usr/lib/python2.7/test/keycert.passwd.pem
 #usr/lib/python2.7/test/keycert.pem
+#usr/lib/python2.7/test/keycert2.pem
+#usr/lib/python2.7/test/keycert3.pem
+#usr/lib/python2.7/test/keycert4.pem
 #usr/lib/python2.7/test/list_tests.py
 #usr/lib/python2.7/test/list_tests.pyc
 #usr/lib/python2.7/test/list_tests.pyo
 #usr/lib/python2.7/test/lock_tests.py
 #usr/lib/python2.7/test/lock_tests.pyc
 #usr/lib/python2.7/test/lock_tests.pyo
+#usr/lib/python2.7/test/make_ssl_certs.py
+#usr/lib/python2.7/test/make_ssl_certs.pyc
+#usr/lib/python2.7/test/make_ssl_certs.pyo
 #usr/lib/python2.7/test/mapping_tests.py
 #usr/lib/python2.7/test/mapping_tests.pyc
 #usr/lib/python2.7/test/mapping_tests.pyo
 #usr/lib/python2.7/test/math_testcases.txt
+#usr/lib/python2.7/test/mp_fork_bomb.py
+#usr/lib/python2.7/test/mp_fork_bomb.pyc
+#usr/lib/python2.7/test/mp_fork_bomb.pyo
 #usr/lib/python2.7/test/nokia.pem
+#usr/lib/python2.7/test/nullbytecert.pem
 #usr/lib/python2.7/test/nullcert.pem
 #usr/lib/python2.7/test/outstanding_bugs.py
 #usr/lib/python2.7/test/outstanding_bugs.pyc
@@ -2880,6 +3049,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/profilee.py
 #usr/lib/python2.7/test/profilee.pyc
 #usr/lib/python2.7/test/profilee.pyo
+#usr/lib/python2.7/test/pycacert.pem
 #usr/lib/python2.7/test/pyclbr_input.py
 #usr/lib/python2.7/test/pyclbr_input.pyc
 #usr/lib/python2.7/test/pyclbr_input.pyo
@@ -2907,12 +3077,20 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/reperf.py
 #usr/lib/python2.7/test/reperf.pyc
 #usr/lib/python2.7/test/reperf.pyo
+#usr/lib/python2.7/test/revocation.crl
 #usr/lib/python2.7/test/sample_doctest.py
 #usr/lib/python2.7/test/sample_doctest.pyc
 #usr/lib/python2.7/test/sample_doctest.pyo
+#usr/lib/python2.7/test/sample_doctest_no_docstrings.py
+#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyc
+#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyo
+#usr/lib/python2.7/test/sample_doctest_no_doctests.py
+#usr/lib/python2.7/test/sample_doctest_no_doctests.pyc
+#usr/lib/python2.7/test/sample_doctest_no_doctests.pyo
 #usr/lib/python2.7/test/script_helper.py
 #usr/lib/python2.7/test/script_helper.pyc
 #usr/lib/python2.7/test/script_helper.pyo
+#usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem
 #usr/lib/python2.7/test/seq_tests.py
 #usr/lib/python2.7/test/seq_tests.pyc
 #usr/lib/python2.7/test/seq_tests.pyo
@@ -2922,7 +3100,11 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/sortperf.pyc
 #usr/lib/python2.7/test/sortperf.pyo
 #usr/lib/python2.7/test/ssl_cert.pem
+#usr/lib/python2.7/test/ssl_key.passwd.pem
 #usr/lib/python2.7/test/ssl_key.pem
+#usr/lib/python2.7/test/ssl_servers.py
+#usr/lib/python2.7/test/ssl_servers.pyc
+#usr/lib/python2.7/test/ssl_servers.pyo
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
@@ -2930,6 +3112,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
 #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc
 #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo
+#usr/lib/python2.7/test/symlink_support.py
+#usr/lib/python2.7/test/symlink_support.pyc
+#usr/lib/python2.7/test/symlink_support.pyo
 #usr/lib/python2.7/test/test_MimeWriter.py
 #usr/lib/python2.7/test/test_MimeWriter.pyc
 #usr/lib/python2.7/test/test_MimeWriter.pyo
@@ -2948,6 +3133,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test__locale.py
 #usr/lib/python2.7/test/test__locale.pyc
 #usr/lib/python2.7/test/test__locale.pyo
+#usr/lib/python2.7/test/test__osx_support.py
+#usr/lib/python2.7/test/test__osx_support.pyc
+#usr/lib/python2.7/test/test__osx_support.pyo
 #usr/lib/python2.7/test/test_abc.py
 #usr/lib/python2.7/test/test_abc.pyc
 #usr/lib/python2.7/test/test_abc.pyo
@@ -3280,6 +3468,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_email_renamed.py
 #usr/lib/python2.7/test/test_email_renamed.pyc
 #usr/lib/python2.7/test/test_email_renamed.pyo
+#usr/lib/python2.7/test/test_ensurepip.py
+#usr/lib/python2.7/test/test_ensurepip.pyc
+#usr/lib/python2.7/test/test_ensurepip.pyo
 #usr/lib/python2.7/test/test_enumerate.py
 #usr/lib/python2.7/test/test_enumerate.pyc
 #usr/lib/python2.7/test/test_enumerate.pyo
@@ -3310,6 +3501,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_file2k.py
 #usr/lib/python2.7/test/test_file2k.pyc
 #usr/lib/python2.7/test/test_file2k.pyo
+#usr/lib/python2.7/test/test_file_eintr.py
+#usr/lib/python2.7/test/test_file_eintr.pyc
+#usr/lib/python2.7/test/test_file_eintr.pyo
 #usr/lib/python2.7/test/test_filecmp.py
 #usr/lib/python2.7/test/test_filecmp.pyc
 #usr/lib/python2.7/test/test_filecmp.pyo
@@ -3445,6 +3639,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_httpservers.py
 #usr/lib/python2.7/test/test_httpservers.pyc
 #usr/lib/python2.7/test/test_httpservers.pyo
+#usr/lib/python2.7/test/test_idle.py
+#usr/lib/python2.7/test/test_idle.pyc
+#usr/lib/python2.7/test/test_idle.pyo
 #usr/lib/python2.7/test/test_imageop.py
 #usr/lib/python2.7/test/test_imageop.pyc
 #usr/lib/python2.7/test/test_imageop.pyo
@@ -3454,6 +3651,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_imgfile.py
 #usr/lib/python2.7/test/test_imgfile.pyc
 #usr/lib/python2.7/test/test_imgfile.pyo
+#usr/lib/python2.7/test/test_imghdr.py
+#usr/lib/python2.7/test/test_imghdr.pyc
+#usr/lib/python2.7/test/test_imghdr.pyo
 #usr/lib/python2.7/test/test_imp.py
 #usr/lib/python2.7/test/test_imp.pyc
 #usr/lib/python2.7/test/test_imp.pyo
@@ -3541,6 +3741,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_macpath.py
 #usr/lib/python2.7/test/test_macpath.pyc
 #usr/lib/python2.7/test/test_macpath.pyo
+#usr/lib/python2.7/test/test_macurl2path.py
+#usr/lib/python2.7/test/test_macurl2path.pyc
+#usr/lib/python2.7/test/test_macurl2path.pyo
 #usr/lib/python2.7/test/test_mailbox.py
 #usr/lib/python2.7/test/test_mailbox.pyc
 #usr/lib/python2.7/test/test_mailbox.pyo
@@ -3610,6 +3813,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_nis.py
 #usr/lib/python2.7/test/test_nis.pyc
 #usr/lib/python2.7/test/test_nis.pyo
+#usr/lib/python2.7/test/test_nntplib.py
+#usr/lib/python2.7/test/test_nntplib.pyc
+#usr/lib/python2.7/test/test_nntplib.pyo
 #usr/lib/python2.7/test/test_normalization.py
 #usr/lib/python2.7/test/test_normalization.pyc
 #usr/lib/python2.7/test/test_normalization.pyo
@@ -3841,6 +4047,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sort.py
 #usr/lib/python2.7/test/test_sort.pyc
 #usr/lib/python2.7/test/test_sort.pyo
+#usr/lib/python2.7/test/test_spwd.py
+#usr/lib/python2.7/test/test_spwd.pyc
+#usr/lib/python2.7/test/test_spwd.pyo
 #usr/lib/python2.7/test/test_sqlite.py
 #usr/lib/python2.7/test/test_sqlite.pyc
 #usr/lib/python2.7/test/test_sqlite.pyo
@@ -3850,6 +4059,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_startfile.py
 #usr/lib/python2.7/test/test_startfile.pyc
 #usr/lib/python2.7/test/test_startfile.pyo
+#usr/lib/python2.7/test/test_stat.py
+#usr/lib/python2.7/test/test_stat.pyc
+#usr/lib/python2.7/test/test_stat.pyo
 #usr/lib/python2.7/test/test_str.py
 #usr/lib/python2.7/test/test_str.pyc
 #usr/lib/python2.7/test/test_str.pyo
@@ -3883,6 +4095,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_subprocess.py
 #usr/lib/python2.7/test/test_subprocess.pyc
 #usr/lib/python2.7/test/test_subprocess.pyo
+#usr/lib/python2.7/test/test_sunau.py
+#usr/lib/python2.7/test/test_sunau.pyc
+#usr/lib/python2.7/test/test_sunau.pyo
 #usr/lib/python2.7/test/test_sunaudiodev.py
 #usr/lib/python2.7/test/test_sunaudiodev.pyc
 #usr/lib/python2.7/test/test_sunaudiodev.pyo
@@ -3946,6 +4161,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_time.py
 #usr/lib/python2.7/test/test_time.pyc
 #usr/lib/python2.7/test/test_time.pyo
+#usr/lib/python2.7/test/test_timeit.py
+#usr/lib/python2.7/test/test_timeit.pyc
+#usr/lib/python2.7/test/test_timeit.pyo
 #usr/lib/python2.7/test/test_timeout.py
 #usr/lib/python2.7/test/test_timeout.pyc
 #usr/lib/python2.7/test/test_timeout.pyo
@@ -3955,6 +4173,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_tokenize.py
 #usr/lib/python2.7/test/test_tokenize.pyc
 #usr/lib/python2.7/test/test_tokenize.pyo
+#usr/lib/python2.7/test/test_tools.py
+#usr/lib/python2.7/test/test_tools.pyc
+#usr/lib/python2.7/test/test_tools.pyo
 #usr/lib/python2.7/test/test_trace.py
 #usr/lib/python2.7/test/test_trace.pyc
 #usr/lib/python2.7/test/test_trace.pyo
@@ -4400,4 +4621,6 @@ usr/lib/python2.7/xmlrpclib.pyc
 #usr/lib/python2.7/zipfile.py
 usr/lib/python2.7/zipfile.pyc
 #usr/lib/python2.7/zipfile.pyo
+#usr/share/man/man1/python.1
+#usr/share/man/man1/python2.1
 #usr/share/man/man1/python2.7.1
index 3f22b72..dc22367 100644 (file)
@@ -341,7 +341,6 @@ srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
 srv/web/ipfire/html/themes/maniac
 srv/web/ipfire/html/themes/maniac/images
 srv/web/ipfire/html/themes/maniac/images/IPFire.png
-srv/web/ipfire/html/themes/maniac/images/Thumbs.db
 srv/web/ipfire/html/themes/maniac/images/b1.gif
 srv/web/ipfire/html/themes/maniac/images/b2.gif
 srv/web/ipfire/html/themes/maniac/images/b3.gif
diff --git a/config/rootfiles/core/92/filelists/files b/config/rootfiles/core/92/filelists/files
new file mode 100644 (file)
index 0000000..9c5a302
--- /dev/null
@@ -0,0 +1,10 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
+var/ipfire/graphs.pl
+var/ipfire/network-functions.pl
+var/ipfire/langs
+var/ipfire/urlfilter/bin/autoupdate.pl
diff --git a/config/rootfiles/core/92/filelists/libgcrypt b/config/rootfiles/core/92/filelists/libgcrypt
new file mode 120000 (symlink)
index 0000000..2df12a2
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/92/filelists/libgpg-error b/config/rootfiles/core/92/filelists/libgpg-error
new file mode 120000 (symlink)
index 0000000..cad4313
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libgpg-error
\ No newline at end of file
diff --git a/config/rootfiles/core/92/filelists/libusb b/config/rootfiles/core/92/filelists/libusb
new file mode 120000 (symlink)
index 0000000..edbe8c2
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libusb
\ No newline at end of file
diff --git a/config/rootfiles/core/92/filelists/libusb-compat b/config/rootfiles/core/92/filelists/libusb-compat
new file mode 120000 (symlink)
index 0000000..35c3237
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libusb-compat
\ No newline at end of file
diff --git a/config/rootfiles/core/92/filelists/rrdtool b/config/rootfiles/core/92/filelists/rrdtool
new file mode 120000 (symlink)
index 0000000..7a82e41
--- /dev/null
@@ -0,0 +1 @@
+../../../common/rrdtool
\ No newline at end of file
diff --git a/config/rootfiles/core/92/update.sh b/config/rootfiles/core/92/update.sh
new file mode 100644 (file)
index 0000000..0314d80
--- /dev/null
@@ -0,0 +1,61 @@
+#!/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=92
+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
+
+# 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
diff --git a/config/rootfiles/oldcore/89/filelists/libpcap b/config/rootfiles/oldcore/89/filelists/libpcap
new file mode 120000 (symlink)
index 0000000..c7f9f52
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libpcap
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/90/filelists/dnsmasq b/config/rootfiles/oldcore/90/filelists/dnsmasq
new file mode 120000 (symlink)
index 0000000..d469c74
--- /dev/null
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/91/exclude b/config/rootfiles/oldcore/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/oldcore/91/meta b/config/rootfiles/oldcore/91/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
index ff0eea8..15d9515 100644 (file)
@@ -9,55 +9,65 @@ usr/local/lib/p7zip
 #usr/local/man/man1/7zr.1
 #usr/local/share/doc/p7zip
 #usr/local/share/doc/p7zip/ChangeLog
-#usr/local/share/doc/p7zip/DOCS
-#usr/local/share/doc/p7zip/DOCS/7zC.txt
-#usr/local/share/doc/p7zip/DOCS/7zFormat.txt
-#usr/local/share/doc/p7zip/DOCS/License.txt
-#usr/local/share/doc/p7zip/DOCS/MANUAL
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/add.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/index.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/list.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/style.css
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/test.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/update.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/index.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/style.css
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/include.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/index.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/method.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/password.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/style.css
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/type.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/update.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm
-#usr/local/share/doc/p7zip/DOCS/MANUAL/syntax.htm
-#usr/local/share/doc/p7zip/DOCS/Methods.txt
-#usr/local/share/doc/p7zip/DOCS/copying.txt
-#usr/local/share/doc/p7zip/DOCS/history.txt
-#usr/local/share/doc/p7zip/DOCS/lzma.txt
-#usr/local/share/doc/p7zip/DOCS/readme.txt
-#usr/local/share/doc/p7zip/DOCS/unRarLicense.txt
+#usr/local/share/doc/p7zip/DOC
+#usr/local/share/doc/p7zip/DOC/7zC.txt
+#usr/local/share/doc/p7zip/DOC/7zFormat.txt
+#usr/local/share/doc/p7zip/DOC/License.txt
+#usr/local/share/doc/p7zip/DOC/MANUAL
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/add.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/bench.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/delete.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/extract.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/extract_full.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/hash.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/index.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/list.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/rename.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/style.css
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/test.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/commands/update.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/exit_codes.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/index.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/style.css
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_exclude.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_include.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_no.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/charset.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/exclude.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/include.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/index.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/large_pages.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/list_tech.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/method.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/output_dir.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/overwrite.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/password.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/recurse.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sa.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/scrc.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sdel.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sfx.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sni.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sns.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/spf.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ssc.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stdin.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stdout.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stl.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stop_switch.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/style.css
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/type.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/update.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/volume.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/working_dir.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/switches/yes.htm
+#usr/local/share/doc/p7zip/DOC/MANUAL/syntax.htm
+#usr/local/share/doc/p7zip/DOC/Methods.txt
+#usr/local/share/doc/p7zip/DOC/copying.txt
+#usr/local/share/doc/p7zip/DOC/lzma.txt
+#usr/local/share/doc/p7zip/DOC/readme.txt
+#usr/local/share/doc/p7zip/DOC/src-history.txt
+#usr/local/share/doc/p7zip/DOC/unRarLicense.txt
 #usr/local/share/doc/p7zip/README
index 5584c25..e168483 100644 (file)
@@ -95,8 +95,8 @@ usr/libexec/git-core/git-index-pack
 usr/libexec/git-core/git-init
 usr/libexec/git-core/git-init-db
 usr/libexec/git-core/git-instaweb
+usr/libexec/git-core/git-interpret-trailers
 usr/libexec/git-core/git-log
-usr/libexec/git-core/git-lost-found
 usr/libexec/git-core/git-ls-files
 usr/libexec/git-core/git-ls-remote
 usr/libexec/git-core/git-ls-tree
@@ -126,7 +126,6 @@ usr/libexec/git-core/git-pack-redundant
 usr/libexec/git-core/git-pack-refs
 usr/libexec/git-core/git-parse-remote
 usr/libexec/git-core/git-patch-id
-usr/libexec/git-core/git-peek-remote
 usr/libexec/git-core/git-prune
 usr/libexec/git-core/git-prune-packed
 usr/libexec/git-core/git-pull
@@ -150,7 +149,6 @@ usr/libexec/git-core/git-remote-https
 usr/libexec/git-core/git-remote-testsvn
 usr/libexec/git-core/git-repack
 usr/libexec/git-core/git-replace
-usr/libexec/git-core/git-repo-config
 usr/libexec/git-core/git-request-pull
 usr/libexec/git-core/git-rerere
 usr/libexec/git-core/git-reset
@@ -177,7 +175,6 @@ usr/libexec/git-core/git-submodule
 usr/libexec/git-core/git-svn
 usr/libexec/git-core/git-symbolic-ref
 usr/libexec/git-core/git-tag
-usr/libexec/git-core/git-tar-tree
 usr/libexec/git-core/git-unpack-file
 usr/libexec/git-core/git-unpack-objects
 usr/libexec/git-core/git-update-index
@@ -186,6 +183,7 @@ usr/libexec/git-core/git-update-server-info
 usr/libexec/git-core/git-upload-archive
 usr/libexec/git-core/git-upload-pack
 usr/libexec/git-core/git-var
+usr/libexec/git-core/git-verify-commit
 usr/libexec/git-core/git-verify-pack
 usr/libexec/git-core/git-verify-tag
 usr/libexec/git-core/git-web--browse
@@ -193,6 +191,7 @@ usr/libexec/git-core/git-whatchanged
 usr/libexec/git-core/git-write-tree
 usr/libexec/git-core/mergetools
 usr/libexec/git-core/mergetools/araxis
+usr/libexec/git-core/mergetools/bc
 usr/libexec/git-core/mergetools/bc3
 usr/libexec/git-core/mergetools/codecompare
 usr/libexec/git-core/mergetools/deltawalker
@@ -202,6 +201,7 @@ usr/libexec/git-core/mergetools/ecmerge
 usr/libexec/git-core/mergetools/emerge
 usr/libexec/git-core/mergetools/gvimdiff
 usr/libexec/git-core/mergetools/gvimdiff2
+usr/libexec/git-core/mergetools/gvimdiff3
 usr/libexec/git-core/mergetools/kdiff3
 usr/libexec/git-core/mergetools/kompare
 usr/libexec/git-core/mergetools/meld
@@ -211,6 +211,7 @@ usr/libexec/git-core/mergetools/tkdiff
 usr/libexec/git-core/mergetools/tortoisemerge
 usr/libexec/git-core/mergetools/vimdiff
 usr/libexec/git-core/mergetools/vimdiff2
+usr/libexec/git-core/mergetools/vimdiff3
 usr/libexec/git-core/mergetools/xxdiff
 usr/share/git-core
 usr/share/git-core/templates
@@ -257,6 +258,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/merge.tcl
 #usr/share/git-gui/lib/mergetool.tcl
 #usr/share/git-gui/lib/msgs
+#usr/share/git-gui/lib/msgs/bg.msg
 #usr/share/git-gui/lib/msgs/de.msg
 #usr/share/git-gui/lib/msgs/el.msg
 #usr/share/git-gui/lib/msgs/fr.msg
@@ -267,6 +269,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/msgs/pt_br.msg
 #usr/share/git-gui/lib/msgs/ru.msg
 #usr/share/git-gui/lib/msgs/sv.msg
+#usr/share/git-gui/lib/msgs/vi.msg
 #usr/share/git-gui/lib/msgs/zh_cn.msg
 #usr/share/git-gui/lib/option.tcl
 #usr/share/git-gui/lib/remote.tcl
@@ -287,6 +290,8 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk
 #usr/share/gitk/lib
 #usr/share/gitk/lib/msgs
+#usr/share/gitk/lib/msgs/bg.msg
+#usr/share/gitk/lib/msgs/ca.msg
 #usr/share/gitk/lib/msgs/de.msg
 #usr/share/gitk/lib/msgs/es.msg
 #usr/share/gitk/lib/msgs/fr.msg
@@ -296,6 +301,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib/msgs/pt_br.msg
 #usr/share/gitk/lib/msgs/ru.msg
 #usr/share/gitk/lib/msgs/sv.msg
+#usr/share/gitk/lib/msgs/vi.msg
 #usr/share/gitweb
 #usr/share/gitweb/gitweb.cgi
 #usr/share/gitweb/static
@@ -303,15 +309,14 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitweb/static/git-logo.png
 #usr/share/gitweb/static/gitweb.css
 #usr/share/gitweb/static/gitweb.js
-#usr/share/locale/da/LC_MESSAGES/git.mo
+#usr/share/locale/bg/LC_MESSAGES/git.mo
+#usr/share/locale/ca/LC_MESSAGES/git.mo
 #usr/share/locale/de/LC_MESSAGES/git.mo
 #usr/share/locale/fr/LC_MESSAGES/git.mo
 #usr/share/locale/is/LC_MESSAGES/git.mo
 #usr/share/locale/it/LC_MESSAGES/git.mo
-#usr/share/locale/nl/LC_MESSAGES/git.mo
-#usr/share/locale/pt_PT
-#usr/share/locale/pt_PT/LC_MESSAGES
 #usr/share/locale/pt_PT/LC_MESSAGES/git.mo
+#usr/share/locale/ru/LC_MESSAGES/git.mo
 #usr/share/locale/sv/LC_MESSAGES/git.mo
 #usr/share/locale/vi/LC_MESSAGES/git.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/git.mo
index 79b74ca..9c7aadb 100644 (file)
@@ -3,6 +3,6 @@ usr/bin/libassuan-config
 #usr/lib/libassuan.la
 usr/lib/libassuan.so
 usr/lib/libassuan.so.0
-usr/lib/libassuan.so.0.4.3
+usr/lib/libassuan.so.0.5.0
 #usr/share/aclocal/libassuan.m4
 #usr/share/info/assuan.info
index 815c3fa..67cf060 100644 (file)
@@ -3,6 +3,11 @@ etc/nano/nanorc.sample
 usr/bin/nano
 usr/bin/pico
 usr/bin/rnano
+#usr/share/doc/nano
+#usr/share/doc/nano/faq.html
+#usr/share/doc/nano/nano.1.html
+#usr/share/doc/nano/nanorc.5.html
+#usr/share/doc/nano/rnano.1.html
 #usr/share/info/nano.info
 #usr/share/man/man1/nano.1
 #usr/share/man/man1/rnano.1
@@ -11,19 +16,21 @@ usr/bin/rnano
 usr/share/nano/asm.nanorc
 usr/share/nano/awk.nanorc
 usr/share/nano/c.nanorc
+#usr/share/nano/changelog.nanorc
 usr/share/nano/cmake.nanorc
 usr/share/nano/css.nanorc
 usr/share/nano/debian.nanorc
+usr/share/nano/default.nanorc
 usr/share/nano/fortran.nanorc
 usr/share/nano/gentoo.nanorc
+#usr/share/nano/go.nanorc
 usr/share/nano/groff.nanorc
 usr/share/nano/html.nanorc
 usr/share/nano/java.nanorc
+#usr/share/nano/javascript.nanorc
+#usr/share/nano/json.nanorc
+#usr/share/nano/lua.nanorc
 usr/share/nano/makefile.nanorc
-#usr/share/nano/man-html
-#usr/share/nano/man-html/nano.1.html
-#usr/share/nano/man-html/nanorc.5.html
-#usr/share/nano/man-html/rnano.1.html
 usr/share/nano/man.nanorc
 usr/share/nano/mgp.nanorc
 usr/share/nano/mutt.nanorc
@@ -33,10 +40,13 @@ usr/share/nano/ocaml.nanorc
 usr/share/nano/patch.nanorc
 usr/share/nano/perl.nanorc
 usr/share/nano/php.nanorc
+usr/share/nano/po.nanorc
 usr/share/nano/pov.nanorc
 usr/share/nano/python.nanorc
 usr/share/nano/ruby.nanorc
 usr/share/nano/sh.nanorc
+usr/share/nano/spec.nanorc
 usr/share/nano/tcl.nanorc
 usr/share/nano/tex.nanorc
+usr/share/nano/texinfo.nanorc
 usr/share/nano/xml.nanorc
diff --git a/config/rootfiles/packages/perl-Authen-SASL b/config/rootfiles/packages/perl-Authen-SASL
new file mode 100644 (file)
index 0000000..a44b726
--- /dev/null
@@ -0,0 +1,28 @@
+#usr/lib/perl5/site_perl/5.12.3/Authen
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL.pm
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL.pod
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/CRAM_MD5.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/EXTERNAL.pm
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl.pm
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl.pod
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/ANONYMOUS.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/CRAM_MD5.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/DIGEST_MD5.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/EXTERNAL.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/GSSAPI.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/LOGIN.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/PLAIN.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen/SASL
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen/SASL/.packlist
+#usr/share/man/man3/Authen::SASL.3
+#usr/share/man/man3/Authen::SASL::Perl.3
+#usr/share/man/man3/Authen::SASL::Perl::ANONYMOUS.3
+#usr/share/man/man3/Authen::SASL::Perl::CRAM_MD5.3
+#usr/share/man/man3/Authen::SASL::Perl::DIGEST_MD5.3
+#usr/share/man/man3/Authen::SASL::Perl::EXTERNAL.3
+#usr/share/man/man3/Authen::SASL::Perl::GSSAPI.3
+#usr/share/man/man3/Authen::SASL::Perl::LOGIN.3
+#usr/share/man/man3/Authen::SASL::Perl::PLAIN.3
diff --git a/config/rootfiles/packages/perl-MIME-Base64 b/config/rootfiles/packages/perl-MIME-Base64
new file mode 100644 (file)
index 0000000..59ca61f
--- /dev/null
@@ -0,0 +1,7 @@
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME/Base64.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME/QuotedPrint.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/Base64.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/Base64.so
diff --git a/config/rootfiles/packages/perl-Net-SMTP-SSL b/config/rootfiles/packages/perl-Net-SMTP-SSL
new file mode 100644 (file)
index 0000000..c39425e
--- /dev/null
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.12.3/Net/SMTP
+usr/lib/perl5/site_perl/5.12.3/Net/SMTP/SSL.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP/SSL
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP/SSL/.packlist
+#usr/share/man/man3/Net::SMTP::SSL.3
index 1bf6f25..d14bcee 100644 (file)
@@ -1,4 +1,4 @@
-usr/bin/powertop
+usr/sbin/powertop
 #usr/share/locale/de/LC_MESSAGES/powertop.mo
 #usr/share/locale/es/LC_MESSAGES/powertop.mo
 #usr/share/locale/fi/LC_MESSAGES/powertop.mo
index dd48d58..971c51e 100644 (file)
@@ -244,7 +244,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) {
        } # enabled
     }#loop interface verify
 
-    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2'); # Must not be saved 
+    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2','q');     # Must not be saved
     &General::writehash($setting, \%dhcpsettings);             # Save good settings
     $dhcpsettings{'ACTION'} = $Lang::tr{'save'};               # create an 'ACTION'
     map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2');       # and reinit vars to empty
@@ -267,7 +267,7 @@ if ($ENV{'QUERY_STRING'} =~ /^FETHER|^FIPADDR/ ) {
        $newsort.=$Rev;
     }
     $dhcpsettings{'SORT_FLEASELIST'}=$newsort;
-    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2'); # Must never be saved 
+    map (delete ($dhcpsettings{$_}) ,@nosaved,'ACTION','KEY1','KEY2', 'q');    # Must never be saved
     &General::writehash($setting, \%dhcpsettings);
     &sortcurrent2;
     $dhcpsettings{'ACTION'} = 'SORT';                  # create an 'ACTION'
@@ -942,7 +942,10 @@ foreach my $line (@current2) {
 
     # Skip all entries that do not match the search query
     if ($search_query ne "") {
-       next if (!grep(/$search_query/, @temp));
+       if (!grep(/$search_query/, @temp)) {
+               $key++;
+               next;
+       }
     }
 
     if ($dhcpsettings{'KEY2'} eq $key) {
diff --git a/html/html/themes/maniac/images/Thumbs.db b/html/html/themes/maniac/images/Thumbs.db
deleted file mode 100644 (file)
index 37ec790..0000000
Binary files a/html/html/themes/maniac/images/Thumbs.db and /dev/null differ
index c007371..f8ac672 100644 (file)
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -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        = 4.65
+VER        = 9.38.1
 
 THISAPP    = p7zip_$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP)_src_all.tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = 7zip
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f78ed232436dc8f8be25a2f95d4e5f9a
+$(DL_FILE)_MD5 = 6cba8402ccab2370d3b70c5e28b3d651
 
 install : $(TARGET)
 
index 857434c..e4410cc 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.72
+VER        = 2.73
 
 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0256e0a71e27c8d8a5c89a0d18f3cfe2
+$(DL_FILE)_MD5 = b8bfe96d22945c8cf4466826ba9b21bd
 
 install : $(TARGET)
 
@@ -73,104 +73,6 @@ $(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/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0020-Initialise-return-value.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0021-Add-ignore-address-option.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0022-Bad-packet-protection.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0035-Update-German-translation.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0040-inotify-documentation-updates.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0042-BSD-make-support.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0044-Manpage-typo-fix.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0047-man-page-typo.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0049-Typos.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0067-Merge-message-translations.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0069-Whitespace-fixes.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch
-       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-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.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-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' \
diff --git a/lfs/git b/lfs/git
index 23838e4..bbec140 100644 (file)
--- a/lfs/git
+++ b/lfs/git
 
 include Config
 
-VER        = 1.8.5.2
+VER        = 2.4.4
 
 THISAPP    = git-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 10
+PAK_VER    = 12
 
-DEPS       = ""
+DEPS       = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = df8519044f9880f3687d863d99245282
+$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31
 
 install : $(TARGET)
 
@@ -78,7 +78,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure \
-               --prefix=/usr
+               --prefix=/usr \
+               --with-libpcre \
+               --with-curl \
+               --with-expat
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
index 9670b7b..0137d14 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014  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.1.3
+VER        = 2.2.0
 
 THISAPP    = libassuan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libassuan
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b5373485419a7e2c23457d20811caabe
+$(DL_FILE)_MD5 = a104faed3e97b9c302c5d67cc22b1d60
 
 install : $(TARGET)
 
index 76ee3d0..0596ebf 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.6.1
+VER        = 1.6.3
 
 THISAPP    = libgcrypt-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a5a5060dc2f80bcac700ab0236ea47dc
+$(DL_FILE)_MD5 = 4262c3aadf837500756c2051a5c4ae5e
 
 install : $(TARGET)
 
index 7faf289..83c403d 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.13
+VER        = 1.18
 
 THISAPP    = libgpg-error-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fe0cfa7e15262ef8fdeee366109e9ff6
+$(DL_FILE)_MD5 = 12312802d2065774b787cbfc22cc04e9
 
 install : $(TARGET)
 
index fa2aae8..32b2f36 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014  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.6.2
+VER        = 1.7.3
 
 THISAPP    = libpcap-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5f14191c1a684a75532c739c2c4059fa
+$(DL_FILE)_MD5 = 9ce284eacc02cb5491e123b875f3f63c
 
 install : $(TARGET)
 
index b35c90c..f557bd8 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        = 0.1.12
+VER        = 1.0.19
 
 THISAPP    = libusb-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 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 = caf182cbc7565dac0fd72155919672e6
+$(DL_FILE)_MD5 = f9e2bb5879968467e5ca756cb4e1fa7e
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
similarity index 89%
rename from lfs/libusbx
rename to lfs/libusb-compat
index 167b945..6d63843 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# 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,9 +24,9 @@
 
 include Config
 
-VER        = 1.0.11
+VER        = 0.1.5
 
-THISAPP    = libusbx-$(VER)
+THISAPP    = libusb-compat-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9aaab6aee72f65900cc731ecbffb4cf4
+$(DL_FILE)_MD5 = 2780b6a758a1e2c2943bdbf7faf740e4
 
 install : $(TARGET)
 
@@ -69,10 +69,12 @@ $(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) && ./configure --prefix=/usr \
-               --enable-examples-build
-       cd $(DIR_APP) && make $(MAKETUNING)
+
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+       cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index b034677..4eec9c1 100644 (file)
--- a/lfs/nano
+++ b/lfs/nano
@@ -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.6
+VER        = 2.4.1
 
 THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nano
-PAK_VER    = 3
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807
+$(DL_FILE)_MD5 = 1c612b478f976abf8ef926480c7a3684
 
 install : $(TARGET)
 
diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL
new file mode 100644 (file)
index 0000000..4052c44
--- /dev/null
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.16
+
+THISAPP    = Authen-SASL-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-Authen-SASL
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7c03a689d4c689e5a9e2f18a1c586b2f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64
new file mode 100644 (file)
index 0000000..f406ae9
--- /dev/null
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.15
+
+THISAPP    = MIME-Base64-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-MIME-Base64
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ef958dc2bf96be5f759391c6ac1debd4
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL
new file mode 100644 (file)
index 0000000..2e2ec57
--- /dev/null
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.02
+
+THISAPP    = Net-SMTP-SSL-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-Net-SMTP-SSL
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = e67b4d842a51b9a453aeeaeed45fb8e1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index f10dca9..8520f94 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.13
+VER        = 2.7
 
 THISAPP    = powertop-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = powertop
-PAK_VER    = 0
+PAK_VER    = 1
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 78aa17c8f55178004223bf236654298e
+$(DL_FILE)_MD5 = e0d686e47daaf7e9d89031f7763432ef
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       
+       cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
index 6095e5e..013f9c1 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.3
+VER        = 2.7.10
 
 THISAPP    = Python-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0
+$(DL_FILE)_MD5 = c685ef0b8e9f27b5e3db5db12b268ac6
 
 install : $(TARGET)
 
@@ -70,8 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
-       cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
+       rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
+       cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
+               --prefix=/usr --enable-shared --with-system-ffi
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index 3b9f1c5..d09f4a4 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER       = 2.7.3
+VER       = 2.7.9
 
 include python
 
index 6fe6f98..646250d 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        = 4.6.2
+VER        = 4.7.4
 
 THISAPP    = tcpdump-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tcpdump
-PAK_VER    = 4
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 74d0d3728b3cdc60db872d842e7f1598
+$(DL_FILE)_MD5 = 58af728de36f499341918fc4b8e827c3
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 29245bc..d3c23c6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
-CORE="91"                                                      # Core Level (Filename)
+CORE="92"                                                      # 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
@@ -385,7 +385,7 @@ buildipfire() {
   ipfiremake backup
   ipfiremake pkg-config
   ipfiremake libusb
-  ipfiremake libusbx
+  ipfiremake libusb-compat
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake pptp
@@ -476,6 +476,7 @@ buildipfire() {
   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite
+  ipfiremake libffi
   ipfiremake python
   ipfiremake fireinfo
   ipfiremake libnet
@@ -579,7 +580,6 @@ buildipfire() {
   ipfiremake python-mechanize
   ipfiremake python-feedparser
   ipfiremake python-rssdler
-  ipfiremake libffi
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -702,6 +702,9 @@ buildipfire() {
   ipfiremake mpd
   ipfiremake libmpdclient
   ipfiremake mpc
+  ipfiremake perl-Net-SMTP-SSL
+  ipfiremake perl-MIME-Base64
+  ipfiremake perl-Authen-SASL
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake vnstat
diff --git a/src/patches/Python-2.7.9-gdbm-1.patch b/src/patches/Python-2.7.9-gdbm-1.patch
new file mode 100644 (file)
index 0000000..c72b452
--- /dev/null
@@ -0,0 +1,21 @@
+diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py
+--- Python-2.7-org/setup.py    2010-06-27 14:36:16.000000000 +0200
++++ Python-2.7/setup.py        2010-07-13 22:23:04.000000000 +0200
+@@ -1125,7 +1125,7 @@
+                                                                'ndbm'):
+                             ndbm_libs = ['ndbm']
+                         else:
+-                            ndbm_libs = []
++                            ndbm_libs = ['gdbm', 'gdbm_compat' ]
+                         print "building dbm using ndbm"
+                         dbmext = Extension('dbm', ['dbmmodule.c'],
+                                            define_macros=[
+@@ -1140,7 +1140,7 @@
+                         if self.compiler.find_library_file(lib_dirs,
+                                                                'gdbm_compat'):
+                             gdbm_libs.append('gdbm_compat')
+-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
++                        if find_file("ndbm.h", inc_dirs, []) is not None:
+                             print "building dbm using gdbm"
+                             dbmext = Extension(
+                                 'dbm', ['dbmmodule.c'],
index 57c9ff1..3c67b64 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/98] Add newline at the end of example config file.
+Subject: [PATCH 001/113] Add newline at the end of example config file.
 
 ---
  dnsmasq.conf.example | 2 +-
index 86eb603..090892d 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/98] crash at startup when an empty suffix is supplied to
+Subject: [PATCH 002/113] crash at startup when an empty suffix is supplied to
  --conf-dir
 
 ---
index b0badb1..1fcb041 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/98] Debian build fixes for kFreeBSD
+Subject: [PATCH 003/113] Debian build fixes for kFreeBSD
 
 ---
  src/tables.c | 6 +++++-
index b2725d4..f734fbc 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/98] Set conntrack mark before connect() call.
+Subject: [PATCH 004/113] Set conntrack mark before connect() call.
 
 SO_MARK has to be done before issuing the connect() call on the
 TCP socket.
index 84be7de..ef70ae3 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/98] Fix typo in new Dbus code.
+Subject: [PATCH 005/113] Fix typo in new Dbus code.
 
 Simon's fault.
 ---
index 0cb139f..c6dc31e 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/98] Fit example conf file typo.
+Subject: [PATCH 006/113] Fit example conf file typo.
 
 ---
  dnsmasq.conf.example | 2 +-
index 286ddcf..bc24281 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Improve RFC-compliance when unable to supply addresses
- in DHCPv6
+Subject: [PATCH 007/113] Improve RFC-compliance when unable to supply
addresses in DHCPv6
 
 While testing https://github.com/sbyx/odhcp6c client I have noticed it
 permanently crashes after startup.
index f667cf3..47f0ea6 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/98] Fix conntrack with --bind-interfaces
+Subject: [PATCH 008/113] 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 3d66540..3cefd02 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/98] Use inotify instead of polling on Linux.
+Subject: [PATCH 009/113] 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 2ddef28..35c405b 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/98] Teach the new inotify code about symlinks.
+Subject: [PATCH 010/113] Teach the new inotify code about symlinks.
 
 ---
  src/inotify.c | 43 +++++++++++++++++++++++++++----------------
index c4dd777..d1766f5 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/98] Remove floor on EDNS0 packet size with DNSSEC.
+Subject: [PATCH 011/113] Remove floor on EDNS0 packet size with DNSSEC.
 
 ---
  CHANGELOG     | 6 +++++-
index 0044a39..5fe1dfb 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/98] CHANGELOG re. inotify.
+Subject: [PATCH 012/113] CHANGELOG re. inotify.
 
 ---
  CHANGELOG | 4 ++++
index 8f67d2a..284b5cc 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/98] Fix breakage of --domain=<domain>,<subnet>,local
+Subject: [PATCH 013/113] Fix breakage of --domain=<domain>,<subnet>,local
 
 ---
  CHANGELOG    |  4 ++++
index 19f0322..65030e9 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/98] Remove redundant IN6_IS_ADDR_ULA(a) macro defn.
+Subject: [PATCH 014/113] Remove redundant IN6_IS_ADDR_ULA(a) macro defn.
 
 ---
  src/network.c | 4 ----
index 2c9c2a6..8aca09f 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Eliminate IPv6 privacy addresses from --interface-name
- answers.
+Subject: [PATCH 015/113] Eliminate IPv6 privacy addresses from
--interface-name answers.
 
 ---
  CHANGELOG     |  5 +++++
index 3b984f3..df1268f 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/98] Tweak field width in cache dump to avoid truncating
+Subject: [PATCH 016/113] Tweak field width in cache dump to avoid truncating
  IPv6 addresses.
 
 ---
index 0aa4fe9..81a39be 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/98] Fix crash in DNSSEC code when attempting to verify
+Subject: [PATCH 017/113] Fix crash in DNSSEC code when attempting to verify
  large RRs.
 
 ---
index e80f0e3..6f41cf2 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Make caching work for CNAMEs pointing to A/AAAA records
- shadowed in /etc/hosts
+Subject: [PATCH 018/113] 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
 A/AAAA record which also exists in /etc/hosts and friends, then
index 7bd143e..1755c3a 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/98] Fix problems validating NSEC3 and wildcards.
+Subject: [PATCH 019/113] Fix problems validating NSEC3 and wildcards.
 
 ---
  src/dnssec.c | 253 ++++++++++++++++++++++++++++++-----------------------------
index 27d1217..2dd2f26 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/98] Initialise return value.
+Subject: [PATCH 020/113] Initialise return value.
 
 ---
  src/dnssec.c | 7 +++++--
index ab6e7a5..7ff57af 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/98] Add --ignore-address option.
+Subject: [PATCH 021/113] Add --ignore-address option.
 
 ---
  CHANGELOG     |  8 ++++++++
index 0c82506..96c4696 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/98] Bad packet protection.
+Subject: [PATCH 022/113] Bad packet protection.
 
 ---
  src/dnssec.c | 2 +-
index 5bf7d63..f5dfad8 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/98] Fix build failure in new inotify code on BSD.
+Subject: [PATCH 023/113] Fix build failure in new inotify code on BSD.
 
 ---
  src/inotify.c | 4 ++--
index 41662b7..6f29876 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/98] Implement makefile dependencies on COPTS variable.
+Subject: [PATCH 024/113] Implement makefile dependencies on COPTS variable.
 
 ---
  .gitignore |  2 +-
index 4de4883..84245f8 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/98] Fix race condition issue in makefile.
+Subject: [PATCH 025/113] Fix race condition issue in makefile.
 
 ---
  Makefile | 4 +++-
index cb9c925..e715c50 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/98] DNSSEC: do top-down search for limit of secure
+Subject: [PATCH 026/113] DNSSEC: do top-down search for limit of secure
  delegation.
 
 ---
index 6b75253..f643527 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/98] Add --log-queries=extra option for more complete
+Subject: [PATCH 027/113] Add --log-queries=extra option for more complete
  logging.
 
 ---
index 6bb1c97..8714feb 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/98] Add --min-cache-ttl option.
+Subject: [PATCH 028/113] Add --min-cache-ttl option.
 
 ---
  CHANGELOG     |  7 +++++++
index 0e63180..6c4423e 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/98] Log port of requestor when doing extra logging.
+Subject: [PATCH 029/113] Log port of requestor when doing extra logging.
 
 ---
  src/cache.c | 6 +++---
index 6817da1..3be42b4 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/98] Don't answer from cache RRsets from wildcards, as we
+Subject: [PATCH 030/113] Don't answer from cache RRsets from wildcards, as we
  don't have NSECs.
 
 ---
index 2b86121..eafd381 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/98] Logs for DS records consistent.
+Subject: [PATCH 031/113] Logs for DS records consistent.
 
 ---
  src/rfc1035.c | 2 +-
index d3d1277..4997b83 100644 (file)
@@ -1,7 +1,8 @@
 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/98] Cope with multiple interfaces with the same LL address.
+Subject: [PATCH 032/113] Cope with multiple interfaces with the same LL
+ address.
 
 ---
  CHANGELOG  | 4 ++++
index 07cc080..fe05a9c 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/98] Don't treat SERVFAIL as a recoverable error.....
+Subject: [PATCH 033/113] Don't treat SERVFAIL as a recoverable error.....
 
 ---
  src/forward.c | 2 +-
index b93d9cc..636e91d 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/98] Add --dhcp-hostsdir config option.
+Subject: [PATCH 034/113] Add --dhcp-hostsdir config option.
 
 ---
  CHANGELOG     |   5 +++
index 820bce1..99f7687 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/98] Update German translation.
+Subject: [PATCH 035/113] Update German translation.
 
 ---
  po/de.po | 101 +++++++++++++++++++++++++++++----------------------------------
index 8856236..23d497e 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/98] Don't reply to DHCPv6 SOLICIT messages when not
+Subject: [PATCH 036/113] Don't reply to DHCPv6 SOLICIT messages when not
  configured for statefull DHCPv6.
 
 ---
index 2a4df45..d962964 100644 (file)
@@ -1,7 +1,8 @@
 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/98] Allow inotify to be disabled at compile time on Linux.
+Subject: [PATCH 037/113] Allow inotify to be disabled at compile time on
+ Linux.
 
 ---
  CHANGELOG     |  4 +++-
index cd35f36..2059922 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Expand inotify code to dhcp-hostsdir, dhcp-optsdir and
- hostsdir.
+Subject: [PATCH 038/113] Expand inotify code to dhcp-hostsdir, dhcp-optsdir
and hostsdir.
 
 ---
  src/cache.c   |  81 +++++++++++++++++---------
index 7cf3fa7..4b56034 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/98] Update copyrights for dawn of 2015.
+Subject: [PATCH 039/113] Update copyrights for dawn of 2015.
 
 ---
  Makefile             | 2 +-
index 3ed1b15..0a4a91a 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/98] inotify documentation updates.
+Subject: [PATCH 040/113] inotify documentation updates.
 
 ---
  man/dnsmasq.8 | 11 +++++++++--
index 56dcc5f..01033f4 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/98] Fix broken ECDSA DNSSEC signatures.
+Subject: [PATCH 041/113] Fix broken ECDSA DNSSEC signatures.
 
 ---
  CHANGELOG    | 2 ++
index 6584253..6e9bc47 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/98] BSD make support
+Subject: [PATCH 042/113] BSD make support
 
 ---
  Makefile | 6 ++++--
index a8c26bf..6953204 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/98] Fix build failure on openBSD.
+Subject: [PATCH 043/113] Fix build failure on openBSD.
 
 ---
  src/tables.c | 2 +-
index f8bd5fc..5c01cfe 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/98] Manpage typo fix.
+Subject: [PATCH 044/113] Manpage typo fix.
 
 ---
  man/dnsmasq.8 | 2 +-
index 7f6d39f..b4c2748 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/98] Fixup dhcp-configs after reading extra hostfiles with
+Subject: [PATCH 045/113] Fixup dhcp-configs after reading extra hostfiles with
  inotify.
 
 ---
index b15ef9a..d4f823d 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/98] Extra logging for inotify code.
+Subject: [PATCH 046/113] Extra logging for inotify code.
 
 ---
  src/cache.c   | 9 ++++-----
index 5557b51..bcf53f1 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/98] man page typo.
+Subject: [PATCH 047/113] man page typo.
 
 ---
  man/dnsmasq.8 | 1 +
index c70ca46..47ada5b 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Fix get-version script which returned wrong tag in some
- situations.
+Subject: [PATCH 048/113] Fix get-version script which returned wrong tag in
+ some situations.
 
 ---
  bld/get-version | 2 +-
index 1c71180..88ace38 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/98] Typos.
+Subject: [PATCH 049/113] Typos.
 
 ---
  src/inotify.c | 3 ++-
index 38736c7..fda7094 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/98] Make dynamic hosts files work when --no-hosts set.
+Subject: [PATCH 050/113] Make dynamic hosts files work when --no-hosts set.
 
 ---
  src/cache.c | 21 +++++++++++----------
index fb15cc2..72bd1ca 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/98] Fix trivial memory leaks to quieten valgrind.
+Subject: [PATCH 051/113] Fix trivial memory leaks to quieten valgrind.
 
 ---
  src/dnsmasq.c |  2 ++
index dabc770..1e28322 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/98] Fix uninitialized value used in get_client_mac()
+Subject: [PATCH 052/113] Fix uninitialized value used in get_client_mac()
 
 ---
  src/dhcp6.c | 4 +++-
index 82e38fc..9a53149 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/98] Log parsing utils in contrib/reverse-dns
+Subject: [PATCH 053/113] Log parsing utils in contrib/reverse-dns
 
 ---
  contrib/reverse-dns/README             | 18 ++++++++++++++++++
index 6d57b65..4eebb74 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/98] Add --dnssec-timestamp option and facility.
+Subject: [PATCH 054/113] Add --dnssec-timestamp option and facility.
 
 ---
  CHANGELOG     |  6 +++++
index 53e1388..e41596b 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/98] Fix last commit to not crash if uid changing not
+Subject: [PATCH 055/113] Fix last commit to not crash if uid changing not
  configured.
 
 ---
index 32cd743..50b0db3 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/98] New version of contrib/reverse-dns
+Subject: [PATCH 056/113] New version of contrib/reverse-dns
 
 ---
  contrib/reverse-dns/README             |  22 +++---
index d63c047..f33e4d2 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/98] Tweak DNSSEC timestamp code to create file later,
+Subject: [PATCH 057/113] Tweak DNSSEC timestamp code to create file later,
  removing need to chown it.
 
 ---
index f746fcf..18bae12 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/98] Fix boilerplate code for re-running system calls on
+Subject: [PATCH 058/113] Fix boilerplate code for re-running system calls on
  EINTR and EAGAIN etc.
 
 The nasty code with static variable in retry_send() which
index d986e8e..83690d3 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/98] Make --address=/example.com/ equivalent to
+Subject: [PATCH 059/113] Make --address=/example.com/ equivalent to
  --server=/example.com/
 
 ---
index 6810930..0033d01 100644 (file)
@@ -1,7 +1,8 @@
 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/98] dhcp: set outbound interface via cmsg in unicast reply
+Subject: [PATCH 060/113] 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 af79f15..67bf508 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/98] Don't fail DNSSEC when a signed CNAME dangles into an
+Subject: [PATCH 061/113] Don't fail DNSSEC when a signed CNAME dangles into an
  unsigned zone.
 
 ---
index 0b64aa7..ed4068e 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/98] Return SERVFAIL when validation abandoned.
+Subject: [PATCH 062/113] Return SERVFAIL when validation abandoned.
 
 ---
  src/forward.c | 11 +++++++++--
index 9ecd43b..3372b2d 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/98] Protect against broken DNSSEC upstreams.
+Subject: [PATCH 063/113] Protect against broken DNSSEC upstreams.
 
 ---
  src/dnssec.c | 7 +++++--
index bfd703d..2a26325 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/98] DNSSEC fix for non-ascii characters in labels.
+Subject: [PATCH 064/113] DNSSEC fix for non-ascii characters in labels.
 
 ---
  src/dnssec.c  | 34 +++++++++++++++++-----------------
index f67b65a..fc41947 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Allow control characters in names in the cache, handle
- when logging.
+Subject: [PATCH 065/113] Allow control characters in names in the cache,
handle when logging.
 
 ---
  src/cache.c   | 19 +++++++++++++++++--
index 7a227d5..8625dae 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/98] Fix crash in last commit.
+Subject: [PATCH 066/113] Fix crash in last commit.
 
 ---
  src/cache.c | 7 ++++---
index a88db22..67849f6 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/98] Merge message translations.
+Subject: [PATCH 067/113] Merge message translations.
 
 ---
  po/de.po    | 803 +++++++++++++++++++++++++++++++++--------------------------
index b273220..e8f796e 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/98] add --tftp-no-fail to ignore missing tftp root
+Subject: [PATCH 068/113] add --tftp-no-fail to ignore missing tftp root
 
 ---
  CHANGELOG            |  3 +++
index 684ef64..49dca71 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/98] Whitespace fixes.
+Subject: [PATCH 069/113] Whitespace fixes.
 
 ---
  src/dnsmasq.c | 14 +++++++-------
index aa24c01..142f4c9 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/98] Return INSECURE, rather than BOGUS when DS proved not
+Subject: [PATCH 070/113] Return INSECURE, rather than BOGUS when DS proved not
  to exist.
 
 Return INSECURE when validating DNS replies which have RRSIGs, but
index ac57b8b..37f09d7 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/98] Fix compiler warning when not including DNSSEC.
+Subject: [PATCH 071/113] Fix compiler warning when not including DNSSEC.
 
 ---
  src/forward.c | 3 ++-
index 2303ec3..7baedf0 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/98] Fix crash caused by looking up servers.bind when many
+Subject: [PATCH 072/113] Fix crash caused by looking up servers.bind when many
  servers defined.
 
 ---
index 82471ae..cc7ed4b 100644 (file)
@@ -1,7 +1,8 @@
 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/98] Fix crash on receipt of certain malformed DNS requests.
+Subject: [PATCH 073/113] Fix crash on receipt of certain malformed DNS
+ requests.
 
 ---
  CHANGELOG     | 3 +++
index 6a7d798..4b4ff32 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/98] Fix crash in auth code with odd configuration.
+Subject: [PATCH 074/113] Fix crash in auth code with odd configuration.
 
 ---
  CHANGELOG  | 32 +++++++++++++++++++++-----------
index 76f3143..b125a92 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/98] Auth: correct replies to NS and SOA in .arpa zones.
+Subject: [PATCH 075/113] Auth: correct replies to NS and SOA in .arpa zones.
 
 ---
  CHANGELOG  |  8 ++++++++
index 9401cb9..8702f53 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/98] Fix (srk induced) crash in new tftp_no_fail code.
+Subject: [PATCH 076/113] Fix (srk induced) crash in new tftp_no_fail code.
 
 ---
  src/dnsmasq.c | 6 ++++--
index a14b1a8..9f2c6d8 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/98] Note CVE-2015-3294
+Subject: [PATCH 077/113] Note CVE-2015-3294
 
 ---
  CHANGELOG | 3 +++
index 2204d24..f833b93 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/98] Log domain when reporting DNSSEC validation failure.
+Subject: [PATCH 078/113] Log domain when reporting DNSSEC validation failure.
 
 ---
  src/forward.c | 15 ++++++++++-----
index 6db33bb..9916cb7 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/98] Check IP address command line arg in dhcp_release.c
+Subject: [PATCH 079/113] Check IP address command line arg in dhcp_release.c
 
 ---
  contrib/wrt/dhcp_release.c | 5 +++++
index 4fe26ac..c4e2103 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/98] Revert 61b838dd574c51d96fef100285a0d225824534f9 and
+Subject: [PATCH 080/113] Revert 61b838dd574c51d96fef100285a0d225824534f9 and
  just quieten log instead.
 
 ---
index 13ff059..a2f10fe 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/98] Handle domain names with '.' or /000 within labels.
+Subject: [PATCH 081/113] 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 2429e99..1b2b73b 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/98] Tweaks to previous, DNS label charset commit.
+Subject: [PATCH 082/113] Tweaks to previous, DNS label charset commit.
 
 ---
  src/dns-protocol.h |  6 +++++-
index 423b40e..bd800c7 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/98] Logs in DHCPv6 not suppressed by dhcp6-quiet.
+Subject: [PATCH 083/113] Logs in DHCPv6 not suppressed by dhcp6-quiet.
 
 ---
  CHANGELOG     | 6 +++++-
index 555bd6c..bafdeb2 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/98] Make get-version work when repo is a git submodule.
+Subject: [PATCH 084/113] Make get-version work when repo is a git submodule.
 
 ---
  bld/get-version | 5 +++--
index 828c21f..0b5a6cf 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/98] Fix argument-order botch which broke DNSSEC for TCP
+Subject: [PATCH 085/113] Fix argument-order botch which broke DNSSEC for TCP
  queries.
 
 ---
index 9d3aadc..afa4831 100644 (file)
@@ -1,8 +1,8 @@
 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/98] Don't remove RRSIG RR from answers to ANY queries when
- the do bit is not set.
+Subject: [PATCH 086/113] Don't remove RRSIG RR from answers to ANY queries
when the do bit is not set.
 
 ---
  src/rfc1035.c | 5 +++++
index 743548e..0023ab5 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/98] Constify some DHCP lease management functions.
+Subject: [PATCH 087/113] Constify some DHCP lease management functions.
 
 ---
  src/dnsmasq.h | 7 ++++---
index af4d6d7..af86776 100644 (file)
@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 088/113] Handle UDP packet loss when fragmentation of large
  packets is broken.
 
 ---
diff --git a/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch
new file mode 100644 (file)
index 0000000..0b12cb8
--- /dev/null
@@ -0,0 +1,331 @@
+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] 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 af2b22c..d8fc57a 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 8def6f2..f75fe9d 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 824a860..ab16f79 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 a9e1215..e91d7c2 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 a8e403c..592243f 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 992f023..a1d90c8 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 f91cfbb..c7add88 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 5828055..8b1709d 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;
+     }
+-- 
+1.7.10.4
diff --git a/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch