IPFire-SCM May 2015

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e97d4c98963477b5247005d33acd9d4b5fe1ca8e
by git＠ipfire.org 31 May '15

31 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via e97d4c98963477b5247005d33acd9d4b5fe1ca8e (commit) via a21df193794d422a85f822bd8cb3470b74826262 (commit) via cb3c00e01e4f41c2712914eb13e766fdaf7f8c99 (commit) via 79fac0111b3ecce2615d50690c492c1b4546b957 (commit) via 648f2001879954088dd830873b141b330def52e9 (commit) via 454a80d1dba502716ab72128da0fe1bbe2fe66c6 (commit) via 38b8efddca9432f119fc4f71605c5fdb79b2c492 (commit) via 739e4ba2296e67c6b8fd80163a07aa88113c6fbb (commit) via 465a08b6290e42e2dbf771505c0a87deb4ba756d (commit) via d6a15c76a779697faf64b727cfff35a871c1ee08 (commit) via bfa284b41cb96f44e9dc1fa948d865e1b9205c1e (commit) via 888c41dea8eae268d3a9518e83b863f1bfa871f3 (commit) via 9d05aa770ae2ee6b34c0a0921f83b7c4663b9af3 (commit) via 888726854ff409a6f57b01592083eb6256d65250 (commit) via 5f51d10373a8224027a14c055ec87e3109d58511 (commit) via e35d81be8c6ddb797e329ad1ad3288267ba23d05 (commit) via be131623add2c819e6433e8d593ddcfc5c5b0441 (commit) via 1af34aa810cc86fb182635cca0bb6ac783ab584d (commit) via 9f1f68f17ade67dbd52a58837f7a47a8458055e4 (commit) via b47472c1865f1777251a43376286ce884b8a4ba8 (commit) via 49d769c6e6eae844c6ffe30817024ea70bb2f60c (commit) via 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 (commit) via 7b9233935e451d4305e7454bfbcc964cfb53d2bb (commit) via 8fba24ec1503d9cf3ace983d35dc0bab54a1e510 (commit) via 0ee211ee6be85fa6d12bc6f9278fc2c0a44ea420 (commit) via 51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 (commit) via 5f0a2ba1048850620c0aa44e80e0a58ff36039c3 (commit) via ab8775b7bb13ecfff12c9e94e107bd86b488e04d (commit) via 2fd3387aec57a23e43a70531aba3b58bbb11b19f (commit) via 9ba3be2bebcc589243a626d7b958be96b82ba3aa (commit) via 3a2e08b29df2e8a7899e8512adad45659a379a0d (commit) from e80a7ef36a74053fa40adb454700926242970c74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e97d4c98963477b5247005d33acd9d4b5fe1ca8e Merge: e80a7ef a21df19 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 31 20:08:58 2015 +0200 Merge branch 'master' into next Conflicts: lfs/netsnmpd ----------------------------------------------------------------------- Summary of changes: config/backup/includes/cyrus-imapd | 4 + config/rootfiles/common/web-user-interface | 1 + config/rootfiles/core/89/update.sh | 18 +++-- config/rootfiles/core/90/exclude | 1 - config/rootfiles/core/90/filelists/files | 2 + .../{oldcore/66 => core/90}/filelists/openldap | 0 config/rootfiles/core/90/update.sh | 32 +++----- config/rootfiles/packages/cyrus-imapd | 1 + html/cgi-bin/country.cgi | 88 ++++++++++------------ html/cgi-bin/geoip-block.cgi | 11 ++- html/cgi-bin/vpnmain.cgi | 6 -- lfs/cyrus-imapd | 6 +- lfs/elinks | 4 +- lfs/linux | 18 ++--- lfs/netsnmpd | 2 +- src/initscripts/init.d/firstsetup | 3 - src/pakfire/lib/functions.pl | 24 +++++- src/pakfire/pakfire | 33 ++++---- src/paks/cyrus-imapd/uninstall.sh | 1 + src/paks/linux-pae/install.sh | 41 +++++----- src/paks/net-snmp/uninstall.sh | 27 ------- src/paks/{net-snmp => netsnmpd}/install.sh | 0 src/paks/{igmpproxy => netsnmpd}/uninstall.sh | 2 +- src/paks/{net-snmp => netsnmpd}/update.sh | 0 24 files changed, 158 insertions(+), 167 deletions(-) create mode 100644 config/backup/includes/cyrus-imapd copy config/rootfiles/{oldcore/66 => core/90}/filelists/openldap (100%) delete mode 100644 src/paks/net-snmp/uninstall.sh rename src/paks/{net-snmp => netsnmpd}/install.sh (100%) copy src/paks/{igmpproxy => netsnmpd}/uninstall.sh (100%) rename src/paks/{net-snmp => netsnmpd}/update.sh (100%) Difference in files: diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd new file mode 100644 index 0000000..bb1bb3b --- /dev/null +++ b/config/backup/includes/cyrus-imapd @@ -0,0 +1,4 @@ +/usr/sieve +/var/imap +/var/ipfire/cyrusimap +/var/log/imap diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 5da892b..08b87a3 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -92,6 +92,7 @@ srv/web/ipfire/html/blob.gif srv/web/ipfire/html/clwarn.cgi srv/web/ipfire/html/dial.cgi srv/web/ipfire/html/favicon.ico +#srv/web/ipfire/html/graphs #srv/web/ipfire/html/images srv/web/ipfire/html/images/IPFire.png srv/web/ipfire/html/images/add.gif diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh index 90a6d77..13c645a 100644 --- a/config/rootfiles/core/89/update.sh +++ b/config/rootfiles/core/89/update.sh @@ -75,15 +75,17 @@ chown nobody.nobody \ /var/run/ovpnserver.log # Update OpenVPN/collectd configuration -files=`find /var/ipfire/ovpn/n2nconf/ -type d` -for i in $files; -do - if ! grep -q "status-version" $i/${i##*/}.conf; then - echo "# Logfile" >> $i/${i##*/}.conf - echo "status-version 1" >> $i/${i##*/}.conf +for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do + name="${i##*/}" + name="${name%*.conf}" + + if ! grep -qE "^status-version" ${i}; then + echo "# Logfile" >> ${i} + echo "status-version 1" >> ${i} fi - if ! grep -q "status " $i/${i##*/}.conf; then - echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf + + if ! grep -qE "^status " ${i}; then + echo "status /var/run/openvpn/${name}-n2n 10" >> ${i} fi done diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude index 56e840d..73b7b73 100644 --- a/config/rootfiles/core/90/exclude +++ b/config/rootfiles/core/90/exclude @@ -15,7 +15,6 @@ etc/sudoers etc/sysconfig/firewall.local etc/sysconfig/modules etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules srv/web/ipfire/html/proxy.pac var/ipfire/firewall/geoipblock var/ipfire/fwhosts/custmgeoipgrp diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 431dcd6..ee596a0 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -5,6 +5,8 @@ etc/rc.d/init.d/network-trigger etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red.up/99-geoip-database etc/rc.d/rcsysinit.d/S90network-trigger +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/firewall.cgi diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/core/90/filelists/openldap new file mode 120000 index 0000000..80c324f --- /dev/null +++ b/config/rootfiles/core/90/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 4835c5a..34dacf1 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -208,6 +208,13 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Remove old udev configuration +rm -vf /etc/udev/rules.d/30-persistent-network.rules + +# Remove pids from dhcp client because it hang at normal shutdown +# so let the sysvinit kill it +rm -f /run/dhcpcd-*.pid + # # Start services # @@ -218,22 +225,9 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi -case "$(uname -m)" in - i?86) - case "$(find_device "/")" in - xvd* ) - echo Skip remove grub2 files, because pygrub fail. - rm -f /boot/grub/* - echo config will recreated by linux-pae install. - ;; - * ) - # - # Update to GRUB2 config - # - grub-mkconfig > /boot/grub/grub.cfg - ;; - esac -esac +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi # Upadate Kernel version uEnv.txt if [ -e /boot/uEnv.txt ]; then @@ -247,7 +241,7 @@ fi # Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae +rm -rf /opt/pakfire/db/installed/meta-linux-pae if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` @@ -258,9 +252,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae +# rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null fi fi diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd index 0c0485e..bbaec3f 100644 --- a/config/rootfiles/packages/cyrus-imapd +++ b/config/rootfiles/packages/cyrus-imapd @@ -146,6 +146,7 @@ var/imap/msg var/imap/proc var/imap/ptclient var/imap/socket +var/ipfire/backup/addons/includes/cyrus-imapd var/ipfire/cyrusimap var/ipfire/cyrusimap/cyrus.conf var/ipfire/cyrusimap/imapd.conf diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 60c2e58..f2ae813 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -23,12 +23,9 @@ use strict; use Locale::Codes::Country; -my $flagdir = '/srv/web/ipfire/html/images/flags'; +my $col; my $lines = '1'; my $lines2 = ''; -my @flaglist=(); -my @flaglistfiles=(); -my $flag = ''; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/geoip-functions.pl"; @@ -41,44 +38,41 @@ require "${General::swroot}/header.pl"; &Header::openbigbox('100%', 'left'); &Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'}); -print "<table class='tbl'>"; -print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>"; -print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>"; -print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>"; -print "<th> </th>"; -print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>"; -print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>"; -print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>"; - -@flaglist = <$flagdir/*>; - -undef @flaglistfiles; - -foreach (@flaglist) -{ - if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1)); } -} -my $col=""; -foreach $flag (@flaglistfiles) -{ + +print<<END; +<table class='tbl'> + <tr> + <th style='width=5%'><b>$Lang::tr{'flag'}</b></th> + <th style='width=5%'><b>$Lang::tr{'countrycode'}</b></th> + <th style='width=40% text-align:left'><b>$Lang::tr{'country'}</b></th> + <th> </th> + <th style='width=5%'><b>$Lang::tr{'flag'}</b></th> + <th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th> + <th style='width=40% text-align:left;'><b>$Lang::tr{'country'}</b></th> + </tr> +END + +# Get a list of all supported country codes. +my @countries = Locale::Codes::Country::all_country_codes(); + +# Loop through whole country list. +foreach my $country (@countries) { $lines++; - my $flagcode = uc(substr($flag, 0, 2)); - my $fcode = lc($flagcode); + # Convert country code into upper case. + my $country_uc = uc($country); # Get flag icon for of the country. - my $flag_icon = &GeoIP::get_flag_icon($fcode); + my $flag_icon = &GeoIP::get_flag_icon($country); + + # Get country name. + my $name = &GeoIP::get_full_country_name($country); - my $country = Locale::Country::code2country($fcode); - if($fcode eq 'eu') { $country = 'Europe'; } - if($fcode eq 'tp') { $country = 'East Timor'; } - if($fcode eq 'yu') { $country = 'Yugoslavia'; } if ($lines % 2) { - print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>"; - print "<td $col>$flagcode</td>"; - print "<td $col>$country</td></tr>\n"; - } - else { + print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>"; + print "<td $col>$country_uc</td>"; + print "<td $col>$name</td></tr>\n"; + } else { $lines2++; if($lines2 % 2) { $col="style='background-color:${Header::table2colour};'"; @@ -86,25 +80,25 @@ foreach $flag (@flaglistfiles) $col="style='background-color:${Header::table1colour};'"; } print "<tr>"; - print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>"; - print "<td $col>$flagcode</td>"; - print "<td $col>$country</td>"; + print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>"; + print "<td $col>$country_uc</td>"; + print "<td $col>$name</td>"; print "<td $col> </td>"; + + # Finish column when the last element in the array has passed and we have an uneven amount of items. + if ( $country eq $countries[-1] ) { + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td></tr>\n"; + } } } - - print "</table>"; &Header::closebox(); &Header::closebigbox(); -print <<END -<div style='text-align:center'> -<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a> -</div> -END -; +print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n"; &Header::closepage(); diff --git a/html/cgi-bin/geoip-block.cgi b/html/cgi-bin/geoip-block.cgi index ccbfa92..056b333 100644 --- a/html/cgi-bin/geoip-block.cgi +++ b/html/cgi-bin/geoip-block.cgi @@ -225,7 +225,16 @@ foreach my $location (@locations) { print "<td align='center' $col>$flag</td>\n"; print "<td align='center' $col>$ccode_uc</td>\n"; print "<td align='left' $col>$cname</td>$line_end\n"; - + + # Finish column when the last element in the array has passed and we have an uneven amount of items. + if(! ($lines2 % 2) && ($location eq $locations[-1] )) { + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td>\n"; + print "<td $col> </td></tr>\n"; + } + $lines2++; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 2a020ea..9490076 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -3029,12 +3029,6 @@ sub make_algos($$$$$) { if (!$is_aead) { push(@algo, $int); } - - if ($grp =~ m/^e(.*)$/) { - push(@algo, "ecp$1"); - } else { - push(@algo, "modp$grp"); - } } push(@algos, join("-", @algo)); diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 2a826cd..fc87bd6 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cyrus-imapd -PAK_VER = 3 +PAK_VER = 5 DEPS = "" @@ -100,5 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_APP)/tools/mkimap /usr/bin sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf chown cyrus.mail /var/imap/socket + install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \ + /var/ipfire/backup/addons/includes/cyrus-imapd @rm -rf $(DIR_APP) /usr/include/com_err.h @$(POSTBUILD) diff --git a/lfs/elinks b/lfs/elinks index 59f1426..2727423 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elinks -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/lfs/linux b/lfs/linux index b2d2552..f59a709 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,11 +24,11 @@ include Config -VER = 3.14.41 +VER = 3.14.43 -RPI_PATCHES = 3.14.41-grsec-ipfire1 -A7M_PATCHES = 3.14.41-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1-3.14.41-201505072056.patch.xz +RPI_PATCHES = 3.14.43-grsec-ipfire1 +A7M_PATCHES = 3.14.43-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1-3.14.43-201505191737.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 59 +PAK_VER = 61 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = b28dfc6907c388c2adcc65aee2ad68ff -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9c8b20647429a64d656999a3c7af890f -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc -$(GRS_PATCHES)_MD5 = 8af3b27954311da581cc6f803f048779 +$(DL_FILE)_MD5 = 927f2343f298dfe531a8371f81356e53 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = b5ba925ae1d4279d3ac0f03c27dd16eb +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = b9c696fe4f22b05b81c168329ca33c94 +$(GRS_PATCHES)_MD5 = 35e26b1214b1b0b515ee67e5ce50633a install : $(TARGET) diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 1ea0a4e..b513678 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netsnmpd -PAK_VER = 3 +PAK_VER = 4 DEPS = "" ############################################################################### diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup index dca3e40..70c30b4 100644 --- a/src/initscripts/init.d/firstsetup +++ b/src/initscripts/init.d/firstsetup @@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae fi fi diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index d14e031..6bf85af 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -393,6 +393,7 @@ sub dbgetlist { foreach $file (@files) { next if ( $file eq "." ); next if ( $file eq ".." ); + next if ( $file eq "meta-" ); next if ( $file =~ /^old/ ); open(FILE, "<$Conf::dbdir/meta/$file"); @meta = <FILE>; @@ -589,6 +590,25 @@ sub resolvedeps { return @all; } +sub resolvedeps_recursive { + my @packages = shift; + my @result = (); + + foreach my $pkg (@packages) { + my @deps = &Pakfire::resolvedeps($pkg); + + foreach my $dep (@deps) { + push(@result, $dep); + } + } + + # Sort the result array and remove dupes + my %sort = map{ $_, 1 } @result; + @result = keys %sort; + + return @result; +} + sub cleanup { my $dir = shift; my $path; @@ -695,7 +715,7 @@ sub getpak { } unless ($file) { - message("No filename given in meta-file. Please phone the developers."); + message("No filename given in meta-file."); exit 1; } diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 3d0270a..8bca061 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2015 IPFire Team <info(a)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 # @@ -255,14 +255,11 @@ } elsif ("$ARGV[0]" eq "upgrade") { &Pakfire::upgradecore(); my @upgradepaks = &Pakfire::dblist("upgrade", "noweb"); - my @temp, $pak; - - foreach (@upgradepaks) { - @temp = &Pakfire::resolvedeps("$_"); - foreach (@temp) { push(@upgradepaks,$_) if $_; } - } - + if (@upgradepaks) { + # Resolve the dependencies of the to be upgraded packages + my @deps = &Pakfire::resolvedeps_recursive(@upgradepaks); + &Pakfire::message(""); &Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above."); if ($interactive) { @@ -277,16 +274,24 @@ } } - ### Download first + # Download packages foreach $pak (@upgradepaks) { - #system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak"); &Pakfire::getpak("$pak", ""); } - + + # Download dependencies + foreach $pak (@deps) { + &Pakfire::getpak("$pak", ""); + } + + # Install dependencies first + foreach $pak (@deps) { + &Pakfire::setuppak("$pak"); + } + + # Install all upgrades foreach $pak (@upgradepaks) { - if (&Pakfire::upgradepak("$pak")) { - #system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak"); - } + &Pakfire::upgradepak("$pak"); } } elsif ("$ARGV[0]" eq "list") { diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 0d2109e..6e1468e 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,6 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_include stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index c980a01..27e665f 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -55,29 +55,24 @@ depmod -a $KVER-ipfire-pae # /usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae - -ROOT="$(find_partition "/")" -case $ROOT in - xvd* ) - # - # We are on XEN so create new grub.conf / menu.lst for pygrub - # - echo "timeout 10" > /boot/grub/grub.conf - echo "default 0" >> /boot/grub/grub.conf - echo "title IPFire (pae-kernel)" >> /boot/grub/grub.conf - echo " kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \ - >> /boot/grub/grub.conf - echo " initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf - echo "# savedefault 0" >> /boot/grub/grub.conf - ln -s grub.conf $MNThdd/boot/grub/menu.lst - ;; - * ) - # - # Update grub2 config - # - grub-mkconfig > /boot/grub/grub.cfg - ;; -esac +if [ -e /boot/grub/grub.cfg ]; then + # + # Update grub2 config + # + grub-mkconfig > /boot/grub/grub.cfg +else + # + # xen pv with pygrub need grub.conf / menu.lst + # + echo "timeout 10" > /boot/grub/grub.conf + echo "default 0" >> /boot/grub/grub.conf + echo "title IPFire (pae-kernel)" >> /boot/grub/grub.conf + echo " kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \ + >> /boot/grub/grub.conf + echo " initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf + echo "# savedefault 0" >> /boot/grub/grub.conf + ln -s grub.conf $MNThdd/boot/grub/menu.lst +fi # request a reboot if pae is supported if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then diff --git a/src/paks/net-snmp/install.sh b/src/paks/net-snmp/install.sh deleted file mode 100644 index 31c5fec..0000000 --- a/src/paks/net-snmp/install.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -start_service --background ${NAME} diff --git a/src/paks/net-snmp/uninstall.sh b/src/paks/net-snmp/uninstall.sh deleted file mode 100644 index a7b8a53..0000000 --- a/src/paks/net-snmp/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/net-snmp/update.sh b/src/paks/net-snmp/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/net-snmp/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/netsnmpd/install.sh b/src/paks/netsnmpd/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/netsnmpd/install.sh @@ -0,0 +1,27 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/netsnmpd/uninstall.sh b/src/paks/netsnmpd/uninstall.sh new file mode 100644 index 0000000..278218b --- /dev/null +++ b/src/paks/netsnmpd/uninstall.sh @@ -0,0 +1,28 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/netsnmpd/update.sh b/src/paks/netsnmpd/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/netsnmpd/update.sh @@ -0,0 +1,26 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. a21df193794d422a85f822bd8cb3470b74826262
by git＠ipfire.org 31 May '15

31 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via a21df193794d422a85f822bd8cb3470b74826262 (commit) via cb3c00e01e4f41c2712914eb13e766fdaf7f8c99 (commit) via 79fac0111b3ecce2615d50690c492c1b4546b957 (commit) via 648f2001879954088dd830873b141b330def52e9 (commit) via 454a80d1dba502716ab72128da0fe1bbe2fe66c6 (commit) from 38b8efddca9432f119fc4f71605c5fdb79b2c492 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a21df193794d422a85f822bd8cb3470b74826262 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 31 18:56:13 2015 +0200 netsnmpd: bump PAK_VER. commit cb3c00e01e4f41c2712914eb13e766fdaf7f8c99 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 31 12:03:38 2015 +0200 cyrus-imapd: add backupinclude. commit 79fac0111b3ecce2615d50690c492c1b4546b957 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 31 11:37:10 2015 +0200 remove unused net-snmp pakfiles. commit 648f2001879954088dd830873b141b330def52e9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 31 11:35:34 2015 +0200 netsnmpd: extract backup include at update. commit 454a80d1dba502716ab72128da0fe1bbe2fe66c6 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed May 27 22:19:39 2015 +0200 netsnmpd: Update to 5.7.3, include backup Conflicts: lfs/netsnmpd ----------------------------------------------------------------------- Summary of changes: config/backup/includes/cyrus-imapd | 4 + config/backup/includes/netsnmpd | 1 + config/rootfiles/packages/cyrus-imapd | 1 + config/rootfiles/packages/netsnmpd | 346 ++++++++++++++------------ lfs/cyrus-imapd | 4 +- lfs/netsnmpd | 29 +-- src/paks/cyrus-imapd/uninstall.sh | 1 + src/paks/net-snmp/uninstall.sh | 27 -- src/paks/{net-snmp => netsnmpd}/install.sh | 0 src/paks/{igmpproxy => netsnmpd}/uninstall.sh | 2 +- src/paks/{net-snmp => netsnmpd}/update.sh | 0 11 files changed, 210 insertions(+), 205 deletions(-) create mode 100644 config/backup/includes/cyrus-imapd create mode 100644 config/backup/includes/netsnmpd delete mode 100644 src/paks/net-snmp/uninstall.sh rename src/paks/{net-snmp => netsnmpd}/install.sh (100%) copy src/paks/{igmpproxy => netsnmpd}/uninstall.sh (100%) rename src/paks/{net-snmp => netsnmpd}/update.sh (100%) Difference in files: diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd new file mode 100644 index 0000000..bb1bb3b --- /dev/null +++ b/config/backup/includes/cyrus-imapd @@ -0,0 +1,4 @@ +/usr/sieve +/var/imap +/var/ipfire/cyrusimap +/var/log/imap diff --git a/config/backup/includes/netsnmpd b/config/backup/includes/netsnmpd new file mode 100644 index 0000000..78ac6ac --- /dev/null +++ b/config/backup/includes/netsnmpd @@ -0,0 +1 @@ +/etc/snmpd.conf diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd index 0c0485e..bbaec3f 100644 --- a/config/rootfiles/packages/cyrus-imapd +++ b/config/rootfiles/packages/cyrus-imapd @@ -146,6 +146,7 @@ var/imap/msg var/imap/proc var/imap/ptclient var/imap/socket +var/ipfire/backup/addons/includes/cyrus-imapd var/ipfire/cyrusimap var/ipfire/cyrusimap/cyrus.conf var/ipfire/cyrusimap/imapd.conf diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 30dbf93..6328949 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -2,12 +2,16 @@ etc/rc.d/rc0.d/K02netsnmpd etc/rc.d/rc3.d/S65netsnmpd etc/rc.d/rc6.d/K02netsnmpd etc/snmpd.conf +usr/bin/agentxtrap usr/bin/encode_keychange usr/bin/fixproc usr/bin/ipf-mod.pl usr/bin/mib2c usr/bin/mib2c-update +usr/bin/net-snmp-cert usr/bin/net-snmp-config +usr/bin/net-snmp-create-v3-user +usr/bin/snmp-bridge-mib usr/bin/snmpbulkget usr/bin/snmpbulkwalk usr/bin/snmpcheck @@ -37,6 +41,7 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/agent_module_config.h #usr/include/net-snmp/agent/agent_read_config.h #usr/include/net-snmp/agent/agent_registry.h +#usr/include/net-snmp/agent/agent_sysORTable.h #usr/include/net-snmp/agent/agent_trap.h #usr/include/net-snmp/agent/all_helpers.h #usr/include/net-snmp/agent/auto_nlist.h @@ -62,9 +67,12 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/serialize.h #usr/include/net-snmp/agent/set_helper.h #usr/include/net-snmp/agent/snmp_agent.h +#usr/include/net-snmp/agent/snmp_get_statistic.h #usr/include/net-snmp/agent/snmp_vars.h #usr/include/net-snmp/agent/stash_cache.h #usr/include/net-snmp/agent/stash_to_next.h +#usr/include/net-snmp/agent/struct.h +#usr/include/net-snmp/agent/sysORTable.h #usr/include/net-snmp/agent/table.h #usr/include/net-snmp/agent/table_array.h #usr/include/net-snmp/agent/table_container.h @@ -72,7 +80,11 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/table_dataset.h #usr/include/net-snmp/agent/table_iterator.h #usr/include/net-snmp/agent/table_tdata.h +#usr/include/net-snmp/agent/util_funcs #usr/include/net-snmp/agent/util_funcs.h +#usr/include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h +#usr/include/net-snmp/agent/util_funcs/header_generic.h +#usr/include/net-snmp/agent/util_funcs/header_simple_table.h #usr/include/net-snmp/agent/var_struct.h #usr/include/net-snmp/agent/watcher.h #usr/include/net-snmp/config_api.h @@ -81,8 +93,8 @@ usr/bin/traptoemail #usr/include/net-snmp/library/README #usr/include/net-snmp/library/asn1.h #usr/include/net-snmp/library/callback.h +#usr/include/net-snmp/library/cert_util.h #usr/include/net-snmp/library/check_varbind.h -#usr/include/net-snmp/library/cmu_compat.h #usr/include/net-snmp/library/container.h #usr/include/net-snmp/library/container_binary_array.h #usr/include/net-snmp/library/container_iterator.h @@ -90,25 +102,34 @@ usr/bin/traptoemail #usr/include/net-snmp/library/container_null.h #usr/include/net-snmp/library/data_list.h #usr/include/net-snmp/library/default_store.h +#usr/include/net-snmp/library/dir_utils.h #usr/include/net-snmp/library/factory.h #usr/include/net-snmp/library/fd_event_manager.h #usr/include/net-snmp/library/file_utils.h #usr/include/net-snmp/library/getopt.h #usr/include/net-snmp/library/int64.h #usr/include/net-snmp/library/keytools.h +#usr/include/net-snmp/library/large_fd_set.h #usr/include/net-snmp/library/lcd_time.h #usr/include/net-snmp/library/md5.h #usr/include/net-snmp/library/mib.h #usr/include/net-snmp/library/mt_support.h +#usr/include/net-snmp/library/oid.h #usr/include/net-snmp/library/oid_stash.h #usr/include/net-snmp/library/parse.h #usr/include/net-snmp/library/read_config.h #usr/include/net-snmp/library/scapi.h #usr/include/net-snmp/library/snmp-tc.h #usr/include/net-snmp/library/snmp.h +#usr/include/net-snmp/library/snmpAliasDomain.h #usr/include/net-snmp/library/snmpCallbackDomain.h +#usr/include/net-snmp/library/snmpIPv4BaseDomain.h +#usr/include/net-snmp/library/snmpSocketBaseDomain.h +#usr/include/net-snmp/library/snmpTCPBaseDomain.h #usr/include/net-snmp/library/snmpTCPDomain.h +#usr/include/net-snmp/library/snmpUDPBaseDomain.h #usr/include/net-snmp/library/snmpUDPDomain.h +#usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h #usr/include/net-snmp/library/snmpUnixDomain.h #usr/include/net-snmp/library/snmp_alarm.h #usr/include/net-snmp/library/snmp_api.h @@ -129,6 +150,7 @@ usr/bin/traptoemail #usr/include/net-snmp/library/text_utils.h #usr/include/net-snmp/library/tools.h #usr/include/net-snmp/library/transform_oids.h +#usr/include/net-snmp/library/types.h #usr/include/net-snmp/library/ucd_compat.h #usr/include/net-snmp/library/vacm.h #usr/include/net-snmp/library/winpipe.h @@ -137,6 +159,7 @@ usr/bin/traptoemail #usr/include/net-snmp/machine/generic.h #usr/include/net-snmp/mib_api.h #usr/include/net-snmp/net-snmp-config.h +#usr/include/net-snmp/net-snmp-features.h #usr/include/net-snmp/net-snmp-includes.h #usr/include/net-snmp/output_api.h #usr/include/net-snmp/pdu_api.h @@ -150,17 +173,24 @@ usr/bin/traptoemail #usr/include/net-snmp/system/bsdi4.h #usr/include/net-snmp/system/cygwin.h #usr/include/net-snmp/system/darwin.h +#usr/include/net-snmp/system/darwin10.h #usr/include/net-snmp/system/darwin7.h #usr/include/net-snmp/system/darwin8.h #usr/include/net-snmp/system/darwin9.h #usr/include/net-snmp/system/dragonfly.h #usr/include/net-snmp/system/dynix.h #usr/include/net-snmp/system/freebsd.h +#usr/include/net-snmp/system/freebsd10.h +#usr/include/net-snmp/system/freebsd11.h +#usr/include/net-snmp/system/freebsd12.h #usr/include/net-snmp/system/freebsd2.h #usr/include/net-snmp/system/freebsd3.h #usr/include/net-snmp/system/freebsd4.h #usr/include/net-snmp/system/freebsd5.h #usr/include/net-snmp/system/freebsd6.h +#usr/include/net-snmp/system/freebsd7.h +#usr/include/net-snmp/system/freebsd8.h +#usr/include/net-snmp/system/freebsd9.h #usr/include/net-snmp/system/generic.h #usr/include/net-snmp/system/hpux.h #usr/include/net-snmp/system/irix.h @@ -169,6 +199,8 @@ usr/bin/traptoemail #usr/include/net-snmp/system/mips.h #usr/include/net-snmp/system/netbsd.h #usr/include/net-snmp/system/openbsd.h +#usr/include/net-snmp/system/openbsd4.h +#usr/include/net-snmp/system/openbsd5.h #usr/include/net-snmp/system/osf5.h #usr/include/net-snmp/system/solaris.h #usr/include/net-snmp/system/solaris2.3.h @@ -186,28 +218,28 @@ usr/bin/traptoemail #usr/lib/libnetsnmp.a #usr/lib/libnetsnmp.la usr/lib/libnetsnmp.so -usr/lib/libnetsnmp.so.15 -usr/lib/libnetsnmp.so.15.1.2 +usr/lib/libnetsnmp.so.30 +usr/lib/libnetsnmp.so.30.0.3 #usr/lib/libnetsnmpagent.a #usr/lib/libnetsnmpagent.la usr/lib/libnetsnmpagent.so -usr/lib/libnetsnmpagent.so.15 -usr/lib/libnetsnmpagent.so.15.1.2 +usr/lib/libnetsnmpagent.so.30 +usr/lib/libnetsnmpagent.so.30.0.3 #usr/lib/libnetsnmphelpers.a #usr/lib/libnetsnmphelpers.la usr/lib/libnetsnmphelpers.so -usr/lib/libnetsnmphelpers.so.15 -usr/lib/libnetsnmphelpers.so.15.1.2 +usr/lib/libnetsnmphelpers.so.30 +usr/lib/libnetsnmphelpers.so.30.0.3 #usr/lib/libnetsnmpmibs.a #usr/lib/libnetsnmpmibs.la usr/lib/libnetsnmpmibs.so -usr/lib/libnetsnmpmibs.so.15 -usr/lib/libnetsnmpmibs.so.15.1.2 +usr/lib/libnetsnmpmibs.so.30 +usr/lib/libnetsnmpmibs.so.30.0.3 #usr/lib/libnetsnmptrapd.a #usr/lib/libnetsnmptrapd.la usr/lib/libnetsnmptrapd.so -usr/lib/libnetsnmptrapd.so.15 -usr/lib/libnetsnmptrapd.so.15.1.2 +usr/lib/libnetsnmptrapd.so.30 +usr/lib/libnetsnmptrapd.so.30.0.3 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP @@ -253,159 +285,37 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_s #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix -#usr/man/man1/encode_keychange.1 -#usr/man/man1/fixproc.1 -#usr/man/man1/mib2c-update.1 -#usr/man/man1/mib2c.1 -#usr/man/man1/net-snmp-config.1 -#usr/man/man1/snmpbulkget.1 -#usr/man/man1/snmpbulkwalk.1 -#usr/man/man1/snmpcmd.1 -#usr/man/man1/snmpconf.1 -#usr/man/man1/snmpdelta.1 -#usr/man/man1/snmpdf.1 -#usr/man/man1/snmpget.1 -#usr/man/man1/snmpgetnext.1 -#usr/man/man1/snmpinform.1 -#usr/man/man1/snmpnetstat.1 -#usr/man/man1/snmpset.1 -#usr/man/man1/snmpstatus.1 -#usr/man/man1/snmptable.1 -#usr/man/man1/snmptest.1 -#usr/man/man1/snmptranslate.1 -#usr/man/man1/snmptrap.1 -#usr/man/man1/snmpusm.1 -#usr/man/man1/snmpvacm.1 -#usr/man/man1/snmpwalk.1 -#usr/man/man1/tkmib.1 -#usr/man/man1/traptoemail.1 -#usr/man/man3/add_mibdir.3 -#usr/man/man3/add_module_replacement.3 -#usr/man/man3/config_perror.3 -#usr/man/man3/config_pwarn.3 -#usr/man/man3/default_store.3 -#usr/man/man3/fprint_description.3 -#usr/man/man3/fprint_objid.3 -#usr/man/man3/fprint_value.3 -#usr/man/man3/fprint_variable.3 -#usr/man/man3/get_module_node.3 -#usr/man/man3/init_mib.3 -#usr/man/man3/init_mib_internals.3 -#usr/man/man3/mib_api.3 -#usr/man/man3/netsnmp_Container_iterator.3 -#usr/man/man3/netsnmp_agent.3 -#usr/man/man3/netsnmp_baby_steps.3 -#usr/man/man3/netsnmp_bulk_to_next.3 -#usr/man/man3/netsnmp_cache_handler.3 -#usr/man/man3/netsnmp_container.3 -#usr/man/man3/netsnmp_debug.3 -#usr/man/man3/netsnmp_ds_get_boolean.3 -#usr/man/man3/netsnmp_ds_get_int.3 -#usr/man/man3/netsnmp_ds_get_string.3 -#usr/man/man3/netsnmp_ds_register_config.3 -#usr/man/man3/netsnmp_ds_register_premib.3 -#usr/man/man3/netsnmp_ds_set_boolean.3 -#usr/man/man3/netsnmp_ds_set_int.3 -#usr/man/man3/netsnmp_ds_set_string.3 -#usr/man/man3/netsnmp_ds_shutdown.3 -#usr/man/man3/netsnmp_example_scalar_int.3 -#usr/man/man3/netsnmp_handler.3 -#usr/man/man3/netsnmp_instance.3 -#usr/man/man3/netsnmp_iterator_info_s.3 -#usr/man/man3/netsnmp_leaf.3 -#usr/man/man3/netsnmp_library.3 -#usr/man/man3/netsnmp_mib_handler_methods.3 -#usr/man/man3/netsnmp_mib_utilities.3 -#usr/man/man3/netsnmp_mode_end_call.3 -#usr/man/man3/netsnmp_multiplexer.3 -#usr/man/man3/netsnmp_old_api.3 -#usr/man/man3/netsnmp_read_only.3 -#usr/man/man3/netsnmp_row_merge.3 -#usr/man/man3/netsnmp_scalar.3 -#usr/man/man3/netsnmp_scalar_group_group.3 -#usr/man/man3/netsnmp_serialize.3 -#usr/man/man3/netsnmp_stash_cache.3 -#usr/man/man3/netsnmp_table.3 -#usr/man/man3/netsnmp_table_array.3 -#usr/man/man3/netsnmp_table_data.3 -#usr/man/man3/netsnmp_table_dataset.3 -#usr/man/man3/netsnmp_table_iterator.3 -#usr/man/man3/netsnmp_utilities.3 -#usr/man/man3/netsnmp_watcher.3 -#usr/man/man3/print_description.3 -#usr/man/man3/print_mib.3 -#usr/man/man3/print_objid.3 -#usr/man/man3/print_value.3 -#usr/man/man3/print_variable.3 -#usr/man/man3/read_all_mibs.3 -#usr/man/man3/read_config.3 -#usr/man/man3/read_config_print_usage.3 -#usr/man/man3/read_configs.3 -#usr/man/man3/read_mib.3 -#usr/man/man3/read_module.3 -#usr/man/man3/read_module_node.3 -#usr/man/man3/read_objid.3 -#usr/man/man3/read_premib_configs.3 -#usr/man/man3/register_app_config_handler.3 -#usr/man/man3/register_app_premib_handler.3 -#usr/man/man3/register_config_handler.3 -#usr/man/man3/register_mib_handlers.3 -#usr/man/man3/register_premib_handler.3 -#usr/man/man3/send_easy_trap.3 -#usr/man/man3/send_trap_vars.3 -#usr/man/man3/send_v2trap.3 -#usr/man/man3/shutdown_mib.3 -#usr/man/man3/snmp_agent_api.3 -#usr/man/man3/snmp_alarm.3 -#usr/man/man3/snmp_alarm_register.3 -#usr/man/man3/snmp_alarm_register_hr.3 -#usr/man/man3/snmp_alarm_unregister.3 -#usr/man/man3/snmp_api.3 -#usr/man/man3/snmp_api_errstring.3 -#usr/man/man3/snmp_close.3 -#usr/man/man3/snmp_error.3 -#usr/man/man3/snmp_free_pdu.3 -#usr/man/man3/snmp_open.3 -#usr/man/man3/snmp_perror.3 -#usr/man/man3/snmp_read.3 -#usr/man/man3/snmp_select_info.3 -#usr/man/man3/snmp_send.3 -#usr/man/man3/snmp_sess_api.3 -#usr/man/man3/snmp_sess_async_send.3 -#usr/man/man3/snmp_sess_close.3 -#usr/man/man3/snmp_sess_error.3 -#usr/man/man3/snmp_sess_init.3 -#usr/man/man3/snmp_sess_open.3 -#usr/man/man3/snmp_sess_perror.3 -#usr/man/man3/snmp_sess_read.3 -#usr/man/man3/snmp_sess_select_info.3 -#usr/man/man3/snmp_sess_send.3 -#usr/man/man3/snmp_sess_session.3 -#usr/man/man3/snmp_sess_timeout.3 -#usr/man/man3/snmp_set_mib_warnings.3 -#usr/man/man3/snmp_set_save_descriptions.3 -#usr/man/man3/snmp_timeout.3 -#usr/man/man3/snmp_trap_api.3 -#usr/man/man3/snprint_objid.3 -#usr/man/man3/snprint_value.3 -#usr/man/man3/snprint_variable.3 -#usr/man/man3/sprint_realloc_objid.3 -#usr/man/man3/sprint_realloc_value.3 -#usr/man/man3/sprint_realloc_variable.3 -#usr/man/man3/unregister_app_config_handler.3 -#usr/man/man3/unregister_config_handler.3 -#usr/man/man5/mib2c.conf.5 -#usr/man/man5/snmp.conf.5 -#usr/man/man5/snmp_config.5 -#usr/man/man5/snmpd.conf.5 -#usr/man/man5/snmpd.examples.5 -#usr/man/man5/snmpd.internal.5 -#usr/man/man5/snmptrapd.conf.5 -#usr/man/man5/variables.5 -#usr/man/man8/snmpd.8 -#usr/man/man8/snmptrapd.8 usr/sbin/snmpd usr/sbin/snmptrapd +#usr/share/man/man1/agentxtrap.1 +#usr/share/man/man1/encode_keychange.1 +#usr/share/man/man1/fixproc.1 +#usr/share/man/man1/mib2c-update.1 +#usr/share/man/man1/mib2c.1 +#usr/share/man/man1/net-snmp-config.1 +#usr/share/man/man1/net-snmp-create-v3-user.1 +#usr/share/man/man1/snmp-bridge-mib.1 +#usr/share/man/man1/snmpbulkget.1 +#usr/share/man/man1/snmpbulkwalk.1 +#usr/share/man/man1/snmpcmd.1 +#usr/share/man/man1/snmpconf.1 +#usr/share/man/man1/snmpdelta.1 +#usr/share/man/man1/snmpdf.1 +#usr/share/man/man1/snmpget.1 +#usr/share/man/man1/snmpgetnext.1 +#usr/share/man/man1/snmpinform.1 +#usr/share/man/man1/snmpnetstat.1 +#usr/share/man/man1/snmpset.1 +#usr/share/man/man1/snmpstatus.1 +#usr/share/man/man1/snmptable.1 +#usr/share/man/man1/snmptest.1 +#usr/share/man/man1/snmptranslate.1 +#usr/share/man/man1/snmptrap.1 +#usr/share/man/man1/snmpusm.1 +#usr/share/man/man1/snmpvacm.1 +#usr/share/man/man1/snmpwalk.1 +#usr/share/man/man1/tkmib.1 +#usr/share/man/man1/traptoemail.1 #usr/share/man/man3/NetSNMP::ASN.3 #usr/share/man/man3/NetSNMP::OID.3 #usr/share/man/man3/NetSNMP::TrapReceiver.3 @@ -414,6 +324,109 @@ usr/sbin/snmptrapd #usr/share/man/man3/NetSNMP::default_store.3 #usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3 #usr/share/man/man3/SNMP.3 +#usr/share/man/man3/add_mibdir.3 +#usr/share/man/man3/add_module_replacement.3 +#usr/share/man/man3/config_perror.3 +#usr/share/man/man3/config_pwarn.3 +#usr/share/man/man3/default_store.3 +#usr/share/man/man3/fprint_description.3 +#usr/share/man/man3/fprint_objid.3 +#usr/share/man/man3/fprint_value.3 +#usr/share/man/man3/fprint_variable.3 +#usr/share/man/man3/get_module_node.3 +#usr/share/man/man3/netsnmp_agent_api.3 +#usr/share/man/man3/netsnmp_config_api.3 +#usr/share/man/man3/netsnmp_init_mib.3 +#usr/share/man/man3/netsnmp_mib_api.3 +#usr/share/man/man3/netsnmp_pdu_api.3 +#usr/share/man/man3/netsnmp_read_module.3 +#usr/share/man/man3/netsnmp_sess_api.3 +#usr/share/man/man3/netsnmp_session_api.3 +#usr/share/man/man3/netsnmp_trap_api.3 +#usr/share/man/man3/netsnmp_varbind_api.3 +#usr/share/man/man3/print_description.3 +#usr/share/man/man3/print_mib.3 +#usr/share/man/man3/print_objid.3 +#usr/share/man/man3/print_value.3 +#usr/share/man/man3/print_variable.3 +#usr/share/man/man3/read_all_mibs.3 +#usr/share/man/man3/read_config_print_usage.3 +#usr/share/man/man3/read_configs.3 +#usr/share/man/man3/read_mib.3 +#usr/share/man/man3/read_objid.3 +#usr/share/man/man3/read_premib_configs.3 +#usr/share/man/man3/register_app_config_handler.3 +#usr/share/man/man3/register_app_prenetsnmp_mib_handler.3 +#usr/share/man/man3/register_config_handler.3 +#usr/share/man/man3/register_const_config_handler.3 +#usr/share/man/man3/register_mib_handlers.3 +#usr/share/man/man3/register_prenetsnmp_mib_handler.3 +#usr/share/man/man3/send_easy_trap.3 +#usr/share/man/man3/send_trap_vars.3 +#usr/share/man/man3/send_v2trap.3 +#usr/share/man/man3/shutdown_mib.3 +#usr/share/man/man3/snmp_add_null_var.3 +#usr/share/man/man3/snmp_alarm.3 +#usr/share/man/man3/snmp_alarm_register.3 +#usr/share/man/man3/snmp_alarm_register_hr.3 +#usr/share/man/man3/snmp_alarm_unregister.3 +#usr/share/man/man3/snmp_api_errstring.3 +#usr/share/man/man3/snmp_async_send.3 +#usr/share/man/man3/snmp_clone_pdu.3 +#usr/share/man/man3/snmp_clone_varbind.3 +#usr/share/man/man3/snmp_close.3 +#usr/share/man/man3/snmp_error.3 +#usr/share/man/man3/snmp_fix_pdu.3 +#usr/share/man/man3/snmp_free_pdu.3 +#usr/share/man/man3/snmp_free_var.3 +#usr/share/man/man3/snmp_free_varbind.3 +#usr/share/man/man3/snmp_open.3 +#usr/share/man/man3/snmp_parse_oid.3 +#usr/share/man/man3/snmp_pdu_add_variable.3 +#usr/share/man/man3/snmp_pdu_create.3 +#usr/share/man/man3/snmp_perror.3 +#usr/share/man/man3/snmp_read.3 +#usr/share/man/man3/snmp_select_info.3 +#usr/share/man/man3/snmp_send.3 +#usr/share/man/man3/snmp_sess_async_send.3 +#usr/share/man/man3/snmp_sess_close.3 +#usr/share/man/man3/snmp_sess_error.3 +#usr/share/man/man3/snmp_sess_init.3 +#usr/share/man/man3/snmp_sess_open.3 +#usr/share/man/man3/snmp_sess_perror.3 +#usr/share/man/man3/snmp_sess_read.3 +#usr/share/man/man3/snmp_sess_select_info.3 +#usr/share/man/man3/snmp_sess_send.3 +#usr/share/man/man3/snmp_sess_session.3 +#usr/share/man/man3/snmp_sess_synch_response.3 +#usr/share/man/man3/snmp_sess_timeout.3 +#usr/share/man/man3/snmp_set_mib_errors.3 +#usr/share/man/man3/snmp_set_mib_warnings.3 +#usr/share/man/man3/snmp_set_save_descriptions.3 +#usr/share/man/man3/snmp_set_var_objid.3 +#usr/share/man/man3/snmp_set_var_typed_integer.3 +#usr/share/man/man3/snmp_set_var_typed_value.3 +#usr/share/man/man3/snmp_set_var_value.3 +#usr/share/man/man3/snmp_synch_response.3 +#usr/share/man/man3/snmp_timeout.3 +#usr/share/man/man3/snmp_varlist_add_variable.3 +#usr/share/man/man3/snprint_description.3 +#usr/share/man/man3/snprint_objid.3 +#usr/share/man/man3/snprint_value.3 +#usr/share/man/man3/snprint_variable.3 +#usr/share/man/man3/unregister_all_config_handlers.3 +#usr/share/man/man3/unregister_app_config_handler.3 +#usr/share/man/man3/unregister_config_handler.3 +#usr/share/man/man5/mib2c.conf.5 +#usr/share/man/man5/snmp.conf.5 +#usr/share/man/man5/snmp_config.5 +#usr/share/man/man5/snmpd.conf.5 +#usr/share/man/man5/snmpd.examples.5 +#usr/share/man/man5/snmpd.internal.5 +#usr/share/man/man5/snmptrapd.conf.5 +#usr/share/man/man5/variables.5 +#usr/share/man/man8/snmpd.8 +#usr/share/man/man8/snmptrapd.8 usr/share/snmp usr/share/snmp/mib2c-data usr/share/snmp/mib2c-data/default-mfd-top.m2c @@ -425,6 +438,7 @@ usr/share/snmp/mib2c-data/generic-ctx-get.m2i usr/share/snmp/mib2c-data/generic-ctx-set.m2i usr/share/snmp/mib2c-data/generic-data-allocate.m2i usr/share/snmp/mib2c-data/generic-data-context.m2i +usr/share/snmp/mib2c-data/generic-get-U64.m2i usr/share/snmp/mib2c-data/generic-get-char.m2i usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i usr/share/snmp/mib2c-data/generic-get-decl.m2i @@ -500,10 +514,12 @@ usr/share/snmp/mib2c.mfd.conf usr/share/snmp/mib2c.notify.conf usr/share/snmp/mib2c.old-api.conf usr/share/snmp/mib2c.perl.conf +usr/share/snmp/mib2c.raw-table.conf usr/share/snmp/mib2c.scalar.conf usr/share/snmp/mib2c.table_data.conf usr/share/snmp/mibs usr/share/snmp/mibs/AGENTX-MIB.txt +usr/share/snmp/mibs/BRIDGE-MIB.txt usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -520,6 +536,7 @@ usr/share/snmp/mibs/IF-MIB.txt usr/share/snmp/mibs/INET-ADDRESS-MIB.txt usr/share/snmp/mibs/IP-FORWARD-MIB.txt usr/share/snmp/mibs/IP-MIB.txt +usr/share/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt usr/share/snmp/mibs/IPV6-ICMP-MIB.txt usr/share/snmp/mibs/IPV6-MIB.txt usr/share/snmp/mibs/IPV6-TC.txt @@ -529,6 +546,7 @@ usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt usr/share/snmp/mibs/NET-SNMP-MIB.txt +usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt usr/share/snmp/mibs/NET-SNMP-TC.txt usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt @@ -544,6 +562,8 @@ usr/share/snmp/mibs/SNMP-MPD-MIB.txt usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt usr/share/snmp/mibs/SNMP-PROXY-MIB.txt usr/share/snmp/mibs/SNMP-TARGET-MIB.txt +usr/share/snmp/mibs/SNMP-TLS-TM-MIB.txt +usr/share/snmp/mibs/SNMP-TSM-MIB.txt usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt @@ -555,6 +575,7 @@ usr/share/snmp/mibs/SNMPv2-TC.txt usr/share/snmp/mibs/SNMPv2-TM.txt usr/share/snmp/mibs/TCP-MIB.txt usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +usr/share/snmp/mibs/TUNNEL-MIB.txt usr/share/snmp/mibs/UCD-DEMO-MIB.txt usr/share/snmp/mibs/UCD-DISKIO-MIB.txt usr/share/snmp/mibs/UCD-DLMOD-MIB.txt @@ -586,4 +607,5 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle +var/ipfire/backup/addons/includes/netsnmpd etc/rc.d/init.d/netsnmpd diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 8e61354..fc87bd6 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cyrus-imapd -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -100,5 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_APP)/tools/mkimap /usr/bin sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf chown cyrus.mail /var/imap/socket + install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \ + /var/ipfire/backup/addons/includes/cyrus-imapd @rm -rf $(DIR_APP) /usr/include/com_err.h @$(POSTBUILD) diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 6615965..b513678 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2015 IPFire Team <info(a)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,15 +24,15 @@ include Config -VER = 5.4.2.1 +VER = 5.7.3 THISAPP = net-snmp-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = netsnmpd -PAK_VER = 3 +PROG = netsnmpd +PAK_VER = 4 DEPS = "" ############################################################################### @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 984932520143f0c8bf7b7ce1fc9e1da1 +$(DL_FILE)_MD5 = d4a3459e1577d0efa8d96ca70a885e53 install : $(TARGET) @@ -77,21 +77,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --with-default-snmp-version="2" \ - --with-sys-contact="root@" \ - --with-sys-location="localhost" \ - --with-logfile="/var/log/snmpd.log" \ - --with-persistent-directory="/var/net-snmp" \ - --libdir=/usr/lib \ - --sysconfdir="/etc" + --prefix=/usr \ + --with-default-snmp-version="2" \ + --with-sys-contact="root@" \ + --with-sys-location="localhost" \ + --with-logfile="/var/log/snmpd.log" \ + --with-persistent-directory="/var/net-snmp" \ + --libdir=/usr/lib \ + --sysconfdir="/etc" cd $(DIR_APP) && make cd $(DIR_APP) && make install install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf + install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \ + /var/ipfire/backup/addons/includes/netsnmpd install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd @rm -rf $(DIR_APP) @$(POSTBUILD) - diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 0d2109e..6e1468e 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,6 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_include stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/net-snmp/install.sh b/src/paks/net-snmp/install.sh deleted file mode 100644 index 31c5fec..0000000 --- a/src/paks/net-snmp/install.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -start_service --background ${NAME} diff --git a/src/paks/net-snmp/uninstall.sh b/src/paks/net-snmp/uninstall.sh deleted file mode 100644 index a7b8a53..0000000 --- a/src/paks/net-snmp/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/net-snmp/update.sh b/src/paks/net-snmp/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/net-snmp/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/netsnmpd/install.sh b/src/paks/netsnmpd/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/netsnmpd/install.sh @@ -0,0 +1,27 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/netsnmpd/uninstall.sh b/src/paks/netsnmpd/uninstall.sh new file mode 100644 index 0000000..278218b --- /dev/null +++ b/src/paks/netsnmpd/uninstall.sh @@ -0,0 +1,28 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/netsnmpd/update.sh b/src/paks/netsnmpd/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/netsnmpd/update.sh @@ -0,0 +1,26 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b6dcfa1f85030abd44d01b49bdd0f1e45e8fc367
by git＠ipfire.org 31 May '15

31 May '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e80a7ef36a74053fa40adb454700926242970c74
by git＠ipfire.org 28 May '15

28 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via e80a7ef36a74053fa40adb454700926242970c74 (commit) from 031b9f7b4ffc3138ad4362665ad623ae897e0eed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e80a7ef36a74053fa40adb454700926242970c74 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Wed May 27 22:19:39 2015 +0200 netsnmpd: Update to 5.7.3, include backup ----------------------------------------------------------------------- Summary of changes: config/backup/includes/netsnmpd | 1 + config/rootfiles/packages/netsnmpd | 346 ++++++++++++++++++++----------------- lfs/netsnmpd | 29 ++-- 3 files changed, 200 insertions(+), 176 deletions(-) create mode 100644 config/backup/includes/netsnmpd Difference in files: diff --git a/config/backup/includes/netsnmpd b/config/backup/includes/netsnmpd new file mode 100644 index 0000000..78ac6ac --- /dev/null +++ b/config/backup/includes/netsnmpd @@ -0,0 +1 @@ +/etc/snmpd.conf diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 30dbf93..6328949 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -2,12 +2,16 @@ etc/rc.d/rc0.d/K02netsnmpd etc/rc.d/rc3.d/S65netsnmpd etc/rc.d/rc6.d/K02netsnmpd etc/snmpd.conf +usr/bin/agentxtrap usr/bin/encode_keychange usr/bin/fixproc usr/bin/ipf-mod.pl usr/bin/mib2c usr/bin/mib2c-update +usr/bin/net-snmp-cert usr/bin/net-snmp-config +usr/bin/net-snmp-create-v3-user +usr/bin/snmp-bridge-mib usr/bin/snmpbulkget usr/bin/snmpbulkwalk usr/bin/snmpcheck @@ -37,6 +41,7 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/agent_module_config.h #usr/include/net-snmp/agent/agent_read_config.h #usr/include/net-snmp/agent/agent_registry.h +#usr/include/net-snmp/agent/agent_sysORTable.h #usr/include/net-snmp/agent/agent_trap.h #usr/include/net-snmp/agent/all_helpers.h #usr/include/net-snmp/agent/auto_nlist.h @@ -62,9 +67,12 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/serialize.h #usr/include/net-snmp/agent/set_helper.h #usr/include/net-snmp/agent/snmp_agent.h +#usr/include/net-snmp/agent/snmp_get_statistic.h #usr/include/net-snmp/agent/snmp_vars.h #usr/include/net-snmp/agent/stash_cache.h #usr/include/net-snmp/agent/stash_to_next.h +#usr/include/net-snmp/agent/struct.h +#usr/include/net-snmp/agent/sysORTable.h #usr/include/net-snmp/agent/table.h #usr/include/net-snmp/agent/table_array.h #usr/include/net-snmp/agent/table_container.h @@ -72,7 +80,11 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/table_dataset.h #usr/include/net-snmp/agent/table_iterator.h #usr/include/net-snmp/agent/table_tdata.h +#usr/include/net-snmp/agent/util_funcs #usr/include/net-snmp/agent/util_funcs.h +#usr/include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h +#usr/include/net-snmp/agent/util_funcs/header_generic.h +#usr/include/net-snmp/agent/util_funcs/header_simple_table.h #usr/include/net-snmp/agent/var_struct.h #usr/include/net-snmp/agent/watcher.h #usr/include/net-snmp/config_api.h @@ -81,8 +93,8 @@ usr/bin/traptoemail #usr/include/net-snmp/library/README #usr/include/net-snmp/library/asn1.h #usr/include/net-snmp/library/callback.h +#usr/include/net-snmp/library/cert_util.h #usr/include/net-snmp/library/check_varbind.h -#usr/include/net-snmp/library/cmu_compat.h #usr/include/net-snmp/library/container.h #usr/include/net-snmp/library/container_binary_array.h #usr/include/net-snmp/library/container_iterator.h @@ -90,25 +102,34 @@ usr/bin/traptoemail #usr/include/net-snmp/library/container_null.h #usr/include/net-snmp/library/data_list.h #usr/include/net-snmp/library/default_store.h +#usr/include/net-snmp/library/dir_utils.h #usr/include/net-snmp/library/factory.h #usr/include/net-snmp/library/fd_event_manager.h #usr/include/net-snmp/library/file_utils.h #usr/include/net-snmp/library/getopt.h #usr/include/net-snmp/library/int64.h #usr/include/net-snmp/library/keytools.h +#usr/include/net-snmp/library/large_fd_set.h #usr/include/net-snmp/library/lcd_time.h #usr/include/net-snmp/library/md5.h #usr/include/net-snmp/library/mib.h #usr/include/net-snmp/library/mt_support.h +#usr/include/net-snmp/library/oid.h #usr/include/net-snmp/library/oid_stash.h #usr/include/net-snmp/library/parse.h #usr/include/net-snmp/library/read_config.h #usr/include/net-snmp/library/scapi.h #usr/include/net-snmp/library/snmp-tc.h #usr/include/net-snmp/library/snmp.h +#usr/include/net-snmp/library/snmpAliasDomain.h #usr/include/net-snmp/library/snmpCallbackDomain.h +#usr/include/net-snmp/library/snmpIPv4BaseDomain.h +#usr/include/net-snmp/library/snmpSocketBaseDomain.h +#usr/include/net-snmp/library/snmpTCPBaseDomain.h #usr/include/net-snmp/library/snmpTCPDomain.h +#usr/include/net-snmp/library/snmpUDPBaseDomain.h #usr/include/net-snmp/library/snmpUDPDomain.h +#usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h #usr/include/net-snmp/library/snmpUnixDomain.h #usr/include/net-snmp/library/snmp_alarm.h #usr/include/net-snmp/library/snmp_api.h @@ -129,6 +150,7 @@ usr/bin/traptoemail #usr/include/net-snmp/library/text_utils.h #usr/include/net-snmp/library/tools.h #usr/include/net-snmp/library/transform_oids.h +#usr/include/net-snmp/library/types.h #usr/include/net-snmp/library/ucd_compat.h #usr/include/net-snmp/library/vacm.h #usr/include/net-snmp/library/winpipe.h @@ -137,6 +159,7 @@ usr/bin/traptoemail #usr/include/net-snmp/machine/generic.h #usr/include/net-snmp/mib_api.h #usr/include/net-snmp/net-snmp-config.h +#usr/include/net-snmp/net-snmp-features.h #usr/include/net-snmp/net-snmp-includes.h #usr/include/net-snmp/output_api.h #usr/include/net-snmp/pdu_api.h @@ -150,17 +173,24 @@ usr/bin/traptoemail #usr/include/net-snmp/system/bsdi4.h #usr/include/net-snmp/system/cygwin.h #usr/include/net-snmp/system/darwin.h +#usr/include/net-snmp/system/darwin10.h #usr/include/net-snmp/system/darwin7.h #usr/include/net-snmp/system/darwin8.h #usr/include/net-snmp/system/darwin9.h #usr/include/net-snmp/system/dragonfly.h #usr/include/net-snmp/system/dynix.h #usr/include/net-snmp/system/freebsd.h +#usr/include/net-snmp/system/freebsd10.h +#usr/include/net-snmp/system/freebsd11.h +#usr/include/net-snmp/system/freebsd12.h #usr/include/net-snmp/system/freebsd2.h #usr/include/net-snmp/system/freebsd3.h #usr/include/net-snmp/system/freebsd4.h #usr/include/net-snmp/system/freebsd5.h #usr/include/net-snmp/system/freebsd6.h +#usr/include/net-snmp/system/freebsd7.h +#usr/include/net-snmp/system/freebsd8.h +#usr/include/net-snmp/system/freebsd9.h #usr/include/net-snmp/system/generic.h #usr/include/net-snmp/system/hpux.h #usr/include/net-snmp/system/irix.h @@ -169,6 +199,8 @@ usr/bin/traptoemail #usr/include/net-snmp/system/mips.h #usr/include/net-snmp/system/netbsd.h #usr/include/net-snmp/system/openbsd.h +#usr/include/net-snmp/system/openbsd4.h +#usr/include/net-snmp/system/openbsd5.h #usr/include/net-snmp/system/osf5.h #usr/include/net-snmp/system/solaris.h #usr/include/net-snmp/system/solaris2.3.h @@ -186,28 +218,28 @@ usr/bin/traptoemail #usr/lib/libnetsnmp.a #usr/lib/libnetsnmp.la usr/lib/libnetsnmp.so -usr/lib/libnetsnmp.so.15 -usr/lib/libnetsnmp.so.15.1.2 +usr/lib/libnetsnmp.so.30 +usr/lib/libnetsnmp.so.30.0.3 #usr/lib/libnetsnmpagent.a #usr/lib/libnetsnmpagent.la usr/lib/libnetsnmpagent.so -usr/lib/libnetsnmpagent.so.15 -usr/lib/libnetsnmpagent.so.15.1.2 +usr/lib/libnetsnmpagent.so.30 +usr/lib/libnetsnmpagent.so.30.0.3 #usr/lib/libnetsnmphelpers.a #usr/lib/libnetsnmphelpers.la usr/lib/libnetsnmphelpers.so -usr/lib/libnetsnmphelpers.so.15 -usr/lib/libnetsnmphelpers.so.15.1.2 +usr/lib/libnetsnmphelpers.so.30 +usr/lib/libnetsnmphelpers.so.30.0.3 #usr/lib/libnetsnmpmibs.a #usr/lib/libnetsnmpmibs.la usr/lib/libnetsnmpmibs.so -usr/lib/libnetsnmpmibs.so.15 -usr/lib/libnetsnmpmibs.so.15.1.2 +usr/lib/libnetsnmpmibs.so.30 +usr/lib/libnetsnmpmibs.so.30.0.3 #usr/lib/libnetsnmptrapd.a #usr/lib/libnetsnmptrapd.la usr/lib/libnetsnmptrapd.so -usr/lib/libnetsnmptrapd.so.15 -usr/lib/libnetsnmptrapd.so.15.1.2 +usr/lib/libnetsnmptrapd.so.30 +usr/lib/libnetsnmptrapd.so.30.0.3 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP @@ -253,159 +285,37 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_s #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix -#usr/man/man1/encode_keychange.1 -#usr/man/man1/fixproc.1 -#usr/man/man1/mib2c-update.1 -#usr/man/man1/mib2c.1 -#usr/man/man1/net-snmp-config.1 -#usr/man/man1/snmpbulkget.1 -#usr/man/man1/snmpbulkwalk.1 -#usr/man/man1/snmpcmd.1 -#usr/man/man1/snmpconf.1 -#usr/man/man1/snmpdelta.1 -#usr/man/man1/snmpdf.1 -#usr/man/man1/snmpget.1 -#usr/man/man1/snmpgetnext.1 -#usr/man/man1/snmpinform.1 -#usr/man/man1/snmpnetstat.1 -#usr/man/man1/snmpset.1 -#usr/man/man1/snmpstatus.1 -#usr/man/man1/snmptable.1 -#usr/man/man1/snmptest.1 -#usr/man/man1/snmptranslate.1 -#usr/man/man1/snmptrap.1 -#usr/man/man1/snmpusm.1 -#usr/man/man1/snmpvacm.1 -#usr/man/man1/snmpwalk.1 -#usr/man/man1/tkmib.1 -#usr/man/man1/traptoemail.1 -#usr/man/man3/add_mibdir.3 -#usr/man/man3/add_module_replacement.3 -#usr/man/man3/config_perror.3 -#usr/man/man3/config_pwarn.3 -#usr/man/man3/default_store.3 -#usr/man/man3/fprint_description.3 -#usr/man/man3/fprint_objid.3 -#usr/man/man3/fprint_value.3 -#usr/man/man3/fprint_variable.3 -#usr/man/man3/get_module_node.3 -#usr/man/man3/init_mib.3 -#usr/man/man3/init_mib_internals.3 -#usr/man/man3/mib_api.3 -#usr/man/man3/netsnmp_Container_iterator.3 -#usr/man/man3/netsnmp_agent.3 -#usr/man/man3/netsnmp_baby_steps.3 -#usr/man/man3/netsnmp_bulk_to_next.3 -#usr/man/man3/netsnmp_cache_handler.3 -#usr/man/man3/netsnmp_container.3 -#usr/man/man3/netsnmp_debug.3 -#usr/man/man3/netsnmp_ds_get_boolean.3 -#usr/man/man3/netsnmp_ds_get_int.3 -#usr/man/man3/netsnmp_ds_get_string.3 -#usr/man/man3/netsnmp_ds_register_config.3 -#usr/man/man3/netsnmp_ds_register_premib.3 -#usr/man/man3/netsnmp_ds_set_boolean.3 -#usr/man/man3/netsnmp_ds_set_int.3 -#usr/man/man3/netsnmp_ds_set_string.3 -#usr/man/man3/netsnmp_ds_shutdown.3 -#usr/man/man3/netsnmp_example_scalar_int.3 -#usr/man/man3/netsnmp_handler.3 -#usr/man/man3/netsnmp_instance.3 -#usr/man/man3/netsnmp_iterator_info_s.3 -#usr/man/man3/netsnmp_leaf.3 -#usr/man/man3/netsnmp_library.3 -#usr/man/man3/netsnmp_mib_handler_methods.3 -#usr/man/man3/netsnmp_mib_utilities.3 -#usr/man/man3/netsnmp_mode_end_call.3 -#usr/man/man3/netsnmp_multiplexer.3 -#usr/man/man3/netsnmp_old_api.3 -#usr/man/man3/netsnmp_read_only.3 -#usr/man/man3/netsnmp_row_merge.3 -#usr/man/man3/netsnmp_scalar.3 -#usr/man/man3/netsnmp_scalar_group_group.3 -#usr/man/man3/netsnmp_serialize.3 -#usr/man/man3/netsnmp_stash_cache.3 -#usr/man/man3/netsnmp_table.3 -#usr/man/man3/netsnmp_table_array.3 -#usr/man/man3/netsnmp_table_data.3 -#usr/man/man3/netsnmp_table_dataset.3 -#usr/man/man3/netsnmp_table_iterator.3 -#usr/man/man3/netsnmp_utilities.3 -#usr/man/man3/netsnmp_watcher.3 -#usr/man/man3/print_description.3 -#usr/man/man3/print_mib.3 -#usr/man/man3/print_objid.3 -#usr/man/man3/print_value.3 -#usr/man/man3/print_variable.3 -#usr/man/man3/read_all_mibs.3 -#usr/man/man3/read_config.3 -#usr/man/man3/read_config_print_usage.3 -#usr/man/man3/read_configs.3 -#usr/man/man3/read_mib.3 -#usr/man/man3/read_module.3 -#usr/man/man3/read_module_node.3 -#usr/man/man3/read_objid.3 -#usr/man/man3/read_premib_configs.3 -#usr/man/man3/register_app_config_handler.3 -#usr/man/man3/register_app_premib_handler.3 -#usr/man/man3/register_config_handler.3 -#usr/man/man3/register_mib_handlers.3 -#usr/man/man3/register_premib_handler.3 -#usr/man/man3/send_easy_trap.3 -#usr/man/man3/send_trap_vars.3 -#usr/man/man3/send_v2trap.3 -#usr/man/man3/shutdown_mib.3 -#usr/man/man3/snmp_agent_api.3 -#usr/man/man3/snmp_alarm.3 -#usr/man/man3/snmp_alarm_register.3 -#usr/man/man3/snmp_alarm_register_hr.3 -#usr/man/man3/snmp_alarm_unregister.3 -#usr/man/man3/snmp_api.3 -#usr/man/man3/snmp_api_errstring.3 -#usr/man/man3/snmp_close.3 -#usr/man/man3/snmp_error.3 -#usr/man/man3/snmp_free_pdu.3 -#usr/man/man3/snmp_open.3 -#usr/man/man3/snmp_perror.3 -#usr/man/man3/snmp_read.3 -#usr/man/man3/snmp_select_info.3 -#usr/man/man3/snmp_send.3 -#usr/man/man3/snmp_sess_api.3 -#usr/man/man3/snmp_sess_async_send.3 -#usr/man/man3/snmp_sess_close.3 -#usr/man/man3/snmp_sess_error.3 -#usr/man/man3/snmp_sess_init.3 -#usr/man/man3/snmp_sess_open.3 -#usr/man/man3/snmp_sess_perror.3 -#usr/man/man3/snmp_sess_read.3 -#usr/man/man3/snmp_sess_select_info.3 -#usr/man/man3/snmp_sess_send.3 -#usr/man/man3/snmp_sess_session.3 -#usr/man/man3/snmp_sess_timeout.3 -#usr/man/man3/snmp_set_mib_warnings.3 -#usr/man/man3/snmp_set_save_descriptions.3 -#usr/man/man3/snmp_timeout.3 -#usr/man/man3/snmp_trap_api.3 -#usr/man/man3/snprint_objid.3 -#usr/man/man3/snprint_value.3 -#usr/man/man3/snprint_variable.3 -#usr/man/man3/sprint_realloc_objid.3 -#usr/man/man3/sprint_realloc_value.3 -#usr/man/man3/sprint_realloc_variable.3 -#usr/man/man3/unregister_app_config_handler.3 -#usr/man/man3/unregister_config_handler.3 -#usr/man/man5/mib2c.conf.5 -#usr/man/man5/snmp.conf.5 -#usr/man/man5/snmp_config.5 -#usr/man/man5/snmpd.conf.5 -#usr/man/man5/snmpd.examples.5 -#usr/man/man5/snmpd.internal.5 -#usr/man/man5/snmptrapd.conf.5 -#usr/man/man5/variables.5 -#usr/man/man8/snmpd.8 -#usr/man/man8/snmptrapd.8 usr/sbin/snmpd usr/sbin/snmptrapd +#usr/share/man/man1/agentxtrap.1 +#usr/share/man/man1/encode_keychange.1 +#usr/share/man/man1/fixproc.1 +#usr/share/man/man1/mib2c-update.1 +#usr/share/man/man1/mib2c.1 +#usr/share/man/man1/net-snmp-config.1 +#usr/share/man/man1/net-snmp-create-v3-user.1 +#usr/share/man/man1/snmp-bridge-mib.1 +#usr/share/man/man1/snmpbulkget.1 +#usr/share/man/man1/snmpbulkwalk.1 +#usr/share/man/man1/snmpcmd.1 +#usr/share/man/man1/snmpconf.1 +#usr/share/man/man1/snmpdelta.1 +#usr/share/man/man1/snmpdf.1 +#usr/share/man/man1/snmpget.1 +#usr/share/man/man1/snmpgetnext.1 +#usr/share/man/man1/snmpinform.1 +#usr/share/man/man1/snmpnetstat.1 +#usr/share/man/man1/snmpset.1 +#usr/share/man/man1/snmpstatus.1 +#usr/share/man/man1/snmptable.1 +#usr/share/man/man1/snmptest.1 +#usr/share/man/man1/snmptranslate.1 +#usr/share/man/man1/snmptrap.1 +#usr/share/man/man1/snmpusm.1 +#usr/share/man/man1/snmpvacm.1 +#usr/share/man/man1/snmpwalk.1 +#usr/share/man/man1/tkmib.1 +#usr/share/man/man1/traptoemail.1 #usr/share/man/man3/NetSNMP::ASN.3 #usr/share/man/man3/NetSNMP::OID.3 #usr/share/man/man3/NetSNMP::TrapReceiver.3 @@ -414,6 +324,109 @@ usr/sbin/snmptrapd #usr/share/man/man3/NetSNMP::default_store.3 #usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3 #usr/share/man/man3/SNMP.3 +#usr/share/man/man3/add_mibdir.3 +#usr/share/man/man3/add_module_replacement.3 +#usr/share/man/man3/config_perror.3 +#usr/share/man/man3/config_pwarn.3 +#usr/share/man/man3/default_store.3 +#usr/share/man/man3/fprint_description.3 +#usr/share/man/man3/fprint_objid.3 +#usr/share/man/man3/fprint_value.3 +#usr/share/man/man3/fprint_variable.3 +#usr/share/man/man3/get_module_node.3 +#usr/share/man/man3/netsnmp_agent_api.3 +#usr/share/man/man3/netsnmp_config_api.3 +#usr/share/man/man3/netsnmp_init_mib.3 +#usr/share/man/man3/netsnmp_mib_api.3 +#usr/share/man/man3/netsnmp_pdu_api.3 +#usr/share/man/man3/netsnmp_read_module.3 +#usr/share/man/man3/netsnmp_sess_api.3 +#usr/share/man/man3/netsnmp_session_api.3 +#usr/share/man/man3/netsnmp_trap_api.3 +#usr/share/man/man3/netsnmp_varbind_api.3 +#usr/share/man/man3/print_description.3 +#usr/share/man/man3/print_mib.3 +#usr/share/man/man3/print_objid.3 +#usr/share/man/man3/print_value.3 +#usr/share/man/man3/print_variable.3 +#usr/share/man/man3/read_all_mibs.3 +#usr/share/man/man3/read_config_print_usage.3 +#usr/share/man/man3/read_configs.3 +#usr/share/man/man3/read_mib.3 +#usr/share/man/man3/read_objid.3 +#usr/share/man/man3/read_premib_configs.3 +#usr/share/man/man3/register_app_config_handler.3 +#usr/share/man/man3/register_app_prenetsnmp_mib_handler.3 +#usr/share/man/man3/register_config_handler.3 +#usr/share/man/man3/register_const_config_handler.3 +#usr/share/man/man3/register_mib_handlers.3 +#usr/share/man/man3/register_prenetsnmp_mib_handler.3 +#usr/share/man/man3/send_easy_trap.3 +#usr/share/man/man3/send_trap_vars.3 +#usr/share/man/man3/send_v2trap.3 +#usr/share/man/man3/shutdown_mib.3 +#usr/share/man/man3/snmp_add_null_var.3 +#usr/share/man/man3/snmp_alarm.3 +#usr/share/man/man3/snmp_alarm_register.3 +#usr/share/man/man3/snmp_alarm_register_hr.3 +#usr/share/man/man3/snmp_alarm_unregister.3 +#usr/share/man/man3/snmp_api_errstring.3 +#usr/share/man/man3/snmp_async_send.3 +#usr/share/man/man3/snmp_clone_pdu.3 +#usr/share/man/man3/snmp_clone_varbind.3 +#usr/share/man/man3/snmp_close.3 +#usr/share/man/man3/snmp_error.3 +#usr/share/man/man3/snmp_fix_pdu.3 +#usr/share/man/man3/snmp_free_pdu.3 +#usr/share/man/man3/snmp_free_var.3 +#usr/share/man/man3/snmp_free_varbind.3 +#usr/share/man/man3/snmp_open.3 +#usr/share/man/man3/snmp_parse_oid.3 +#usr/share/man/man3/snmp_pdu_add_variable.3 +#usr/share/man/man3/snmp_pdu_create.3 +#usr/share/man/man3/snmp_perror.3 +#usr/share/man/man3/snmp_read.3 +#usr/share/man/man3/snmp_select_info.3 +#usr/share/man/man3/snmp_send.3 +#usr/share/man/man3/snmp_sess_async_send.3 +#usr/share/man/man3/snmp_sess_close.3 +#usr/share/man/man3/snmp_sess_error.3 +#usr/share/man/man3/snmp_sess_init.3 +#usr/share/man/man3/snmp_sess_open.3 +#usr/share/man/man3/snmp_sess_perror.3 +#usr/share/man/man3/snmp_sess_read.3 +#usr/share/man/man3/snmp_sess_select_info.3 +#usr/share/man/man3/snmp_sess_send.3 +#usr/share/man/man3/snmp_sess_session.3 +#usr/share/man/man3/snmp_sess_synch_response.3 +#usr/share/man/man3/snmp_sess_timeout.3 +#usr/share/man/man3/snmp_set_mib_errors.3 +#usr/share/man/man3/snmp_set_mib_warnings.3 +#usr/share/man/man3/snmp_set_save_descriptions.3 +#usr/share/man/man3/snmp_set_var_objid.3 +#usr/share/man/man3/snmp_set_var_typed_integer.3 +#usr/share/man/man3/snmp_set_var_typed_value.3 +#usr/share/man/man3/snmp_set_var_value.3 +#usr/share/man/man3/snmp_synch_response.3 +#usr/share/man/man3/snmp_timeout.3 +#usr/share/man/man3/snmp_varlist_add_variable.3 +#usr/share/man/man3/snprint_description.3 +#usr/share/man/man3/snprint_objid.3 +#usr/share/man/man3/snprint_value.3 +#usr/share/man/man3/snprint_variable.3 +#usr/share/man/man3/unregister_all_config_handlers.3 +#usr/share/man/man3/unregister_app_config_handler.3 +#usr/share/man/man3/unregister_config_handler.3 +#usr/share/man/man5/mib2c.conf.5 +#usr/share/man/man5/snmp.conf.5 +#usr/share/man/man5/snmp_config.5 +#usr/share/man/man5/snmpd.conf.5 +#usr/share/man/man5/snmpd.examples.5 +#usr/share/man/man5/snmpd.internal.5 +#usr/share/man/man5/snmptrapd.conf.5 +#usr/share/man/man5/variables.5 +#usr/share/man/man8/snmpd.8 +#usr/share/man/man8/snmptrapd.8 usr/share/snmp usr/share/snmp/mib2c-data usr/share/snmp/mib2c-data/default-mfd-top.m2c @@ -425,6 +438,7 @@ usr/share/snmp/mib2c-data/generic-ctx-get.m2i usr/share/snmp/mib2c-data/generic-ctx-set.m2i usr/share/snmp/mib2c-data/generic-data-allocate.m2i usr/share/snmp/mib2c-data/generic-data-context.m2i +usr/share/snmp/mib2c-data/generic-get-U64.m2i usr/share/snmp/mib2c-data/generic-get-char.m2i usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i usr/share/snmp/mib2c-data/generic-get-decl.m2i @@ -500,10 +514,12 @@ usr/share/snmp/mib2c.mfd.conf usr/share/snmp/mib2c.notify.conf usr/share/snmp/mib2c.old-api.conf usr/share/snmp/mib2c.perl.conf +usr/share/snmp/mib2c.raw-table.conf usr/share/snmp/mib2c.scalar.conf usr/share/snmp/mib2c.table_data.conf usr/share/snmp/mibs usr/share/snmp/mibs/AGENTX-MIB.txt +usr/share/snmp/mibs/BRIDGE-MIB.txt usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -520,6 +536,7 @@ usr/share/snmp/mibs/IF-MIB.txt usr/share/snmp/mibs/INET-ADDRESS-MIB.txt usr/share/snmp/mibs/IP-FORWARD-MIB.txt usr/share/snmp/mibs/IP-MIB.txt +usr/share/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt usr/share/snmp/mibs/IPV6-ICMP-MIB.txt usr/share/snmp/mibs/IPV6-MIB.txt usr/share/snmp/mibs/IPV6-TC.txt @@ -529,6 +546,7 @@ usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt usr/share/snmp/mibs/NET-SNMP-MIB.txt +usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt usr/share/snmp/mibs/NET-SNMP-TC.txt usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt @@ -544,6 +562,8 @@ usr/share/snmp/mibs/SNMP-MPD-MIB.txt usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt usr/share/snmp/mibs/SNMP-PROXY-MIB.txt usr/share/snmp/mibs/SNMP-TARGET-MIB.txt +usr/share/snmp/mibs/SNMP-TLS-TM-MIB.txt +usr/share/snmp/mibs/SNMP-TSM-MIB.txt usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt @@ -555,6 +575,7 @@ usr/share/snmp/mibs/SNMPv2-TC.txt usr/share/snmp/mibs/SNMPv2-TM.txt usr/share/snmp/mibs/TCP-MIB.txt usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +usr/share/snmp/mibs/TUNNEL-MIB.txt usr/share/snmp/mibs/UCD-DEMO-MIB.txt usr/share/snmp/mibs/UCD-DISKIO-MIB.txt usr/share/snmp/mibs/UCD-DLMOD-MIB.txt @@ -586,4 +607,5 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle +var/ipfire/backup/addons/includes/netsnmpd etc/rc.d/init.d/netsnmpd diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 388b20b..1ea0a4e 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2015 IPFire Team <info(a)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,15 +24,15 @@ include Config -VER = 5.4.2.1 +VER = 5.7.3 THISAPP = net-snmp-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = netsnmpd -PAK_VER = 2 +PROG = netsnmpd +PAK_VER = 3 DEPS = "" ############################################################################### @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 984932520143f0c8bf7b7ce1fc9e1da1 +$(DL_FILE)_MD5 = d4a3459e1577d0efa8d96ca70a885e53 install : $(TARGET) @@ -77,21 +77,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --with-default-snmp-version="2" \ - --with-sys-contact="root@" \ - --with-sys-location="localhost" \ - --with-logfile="/var/log/snmpd.log" \ - --with-persistent-directory="/var/net-snmp" \ - --libdir=/usr/lib \ - --sysconfdir="/etc" + --prefix=/usr \ + --with-default-snmp-version="2" \ + --with-sys-contact="root@" \ + --with-sys-location="localhost" \ + --with-logfile="/var/log/snmpd.log" \ + --with-persistent-directory="/var/net-snmp" \ + --libdir=/usr/lib \ + --sysconfdir="/etc" cd $(DIR_APP) && make cd $(DIR_APP) && make install install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf + install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \ + /var/ipfire/backup/addons/includes/netsnmpd install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd @rm -rf $(DIR_APP) @$(POSTBUILD) - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 031b9f7b4ffc3138ad4362665ad623ae897e0eed
by git＠ipfire.org 28 May '15

28 May '15

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4001fdd069f7082fe7087172933e572b14f0dfa4
by git＠ipfire.org 28 May '15

28 May '15

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 59ee75fd70f786e472b059db96d6c4d988940af1
by git＠ipfire.org 28 May '15

28 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 59ee75fd70f786e472b059db96d6c4d988940af1 (commit) from b6159043c0aa625206070ea194259fc5ab105960 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 59ee75fd70f786e472b059db96d6c4d988940af1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 27 12:59:40 2015 +0000 collecty: Update to version 002 ----------------------------------------------------------------------- Summary of changes: collecty/collecty.nm | 47 ++++++++++++++++++--- .../patches/0001-Install-daemon-to-usr-sbin.patch | 49 ---------------------- 2 files changed, 42 insertions(+), 54 deletions(-) delete mode 100644 collecty/patches/0001-Install-daemon-to-usr-sbin.patch Difference in files: diff --git a/collecty/collecty.nm b/collecty/collecty.nm index deb7fb4..9c46acc 100644 --- a/collecty/collecty.nm +++ b/collecty/collecty.nm @@ -4,7 +4,7 @@ ############################################################################### name = collecty -version = 0.0.2 +version = 002 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -23,18 +23,55 @@ source_dl = http://source.ipfire.org/releases/collecty/ build requires - gettext + autoconf + automake + docbook-utils + docbook-xsl + gettext-devel + intltool + libtool-devel + libxslt python + systemd-devel end - install - mkdir -pv %{BUILDROOT}%{bindir} - make install DESTDIR=%{BUILDROOT} + prepare_cmds + [ -e "configure" ] || ./autogen.sh end end packages package %{name} groups += Base + + requires + pygobject2 + python-dbus + python-rrdtool + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + + # The collecty service should be started on default. + systemctl enable collecty.service > /dev/null 2>&1 || : + end + + # Disable the service that is to be removed and stop it if it is still running. + script preun + systemctl --no-reload disable collecty.service >/dev/null 2>&1 || : + systemctl stop collecty.service >/dev/null 2>&1 || : + end + + # Just tell systemd that unitfiles have been removed. + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + # Try to restart the service if it is running. + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart collecty.service >/dev/null 2>&1 || : + end end end diff --git a/collecty/patches/0001-Install-daemon-to-usr-sbin.patch b/collecty/patches/0001-Install-daemon-to-usr-sbin.patch deleted file mode 100644 index cc5cac2..0000000 --- a/collecty/patches/0001-Install-daemon-to-usr-sbin.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 82c136f87bb13aea4f27b669ee98ff7e798ad8b3 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat, 1 Sep 2012 18:56:19 +0000 -Subject: [PATCH] Install daemon to /usr/sbin. - ---- - Makefile | 5 ++++- - collecty.service | 2 +- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7d679af..6fcc787 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,6 +24,7 @@ PACKAGE_VERSION = 0.0.2 - DESTDIR = - PREFIX = /usr - BINDIR = $(PREFIX)/bin -+SBINDIR = $(PREFIX)/sbin - LOCALEDIR = $(PREFIX)/share/locale - UNITDIR = $(PREFIX)/lib/systemd/system - -@@ -55,7 +56,9 @@ dist: - install: $(MO_FILES) - -mkdir -pv $(PYTHON_DIR) - cp -rvf collecty $(PYTHON_DIR) -- install -v -m 755 collectyd $(DESTDIR)$(BINDIR) -+ -+ -mkdir -pv $(DESTDIR)$(SBINDIR) -+ install -v -m 755 collectyd $(DESTDIR)$(SBINDIR) - - # Install configuration - -mkdir -pv $(DESTDIR)/etc/$(PACKAGE_NAME) -diff --git a/collecty.service b/collecty.service -index ac4a893..78bd26e 100644 ---- a/collecty.service -+++ b/collecty.service -@@ -2,7 +2,7 @@ - Description=collecty - A system data collecting daemon - - [Service] --ExecStart=/usr/bin/collectyd -+ExecStart=/usr/sbin/collectyd - ExecReload=/bin/kill -HUP $MAINPID - - [Install] --- -1.7.8.2 - hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81daa02876b36868a6c96a57dd0e07e787910c61
by git＠ipfire.org 27 May '15

27 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 81daa02876b36868a6c96a57dd0e07e787910c61 (commit) via ffeecf70b0a7a02a4c3d5a3161e90cb53cef5802 (commit) via 1292598207d74304227a3c77346c1d046eb51975 (commit) via 016e63e8185fb0cb670bfd05d5292aec05bc42ab (commit) via b9f4c9f85f8072048cd835d5a0d913eeb926d2c5 (commit) via f042e1d398bf4bade415773fe5849791f864444c (commit) via 1f8dddccb6f3f8f8b05074d8375708af9ddfb3eb (commit) via 188c4ba444b31343c29b311fcb2d0c0ba84e80ee (commit) via bee99d28c9cf28d167beb416cdcfb9e56b542902 (commit) via 5bf8008bddecb3838f1691a54f819ff4a8d08ffa (commit) via 56d2b9f3603a35718cd490d573d6f8b76d056257 (commit) via e448795559f316992b336b4304fd1b9b7847c16c (commit) via 5d6c888cc523583ab533a7eaf9524bd9ac32e786 (commit) via 1bebab64407f7836d31bc8b86a46db1984d804a9 (commit) via fef975eef76fbc752afcf9be6881d9739471e4dc (commit) via 8377733a388c19864fb55f48cdd3d040e538f549 (commit) via f09f3fd8819de0565c6ac73048b0dcfcff0c75ec (commit) via dc264702f688643dc8cc052f8a18187786481620 (commit) via 82402a051b49a8b89ee23a75d912f8241389fce6 (commit) via 765423cebe798bb4c8db75755979ce943f484792 (commit) via 9148fbc468aa86504d6e96d5b896b30778d6cad3 (commit) via ae4149506cf64738da74373db8b0c756f260093f (commit) via c199aa774cccd349713c6c917cf5e8f209a713c5 (commit) via bbc7cc3189f7ae5f4a645211951e42f6e761f244 (commit) via cfede492da5a5a02e0766e31565e2791206fe2d7 (commit) via b6128a64b8e7edcd21094406113192c46849544e (commit) via 15a9c45825fd205ca2c996e64969fad2cd467ff6 (commit) via 562cc8f7214635af6c167d1c844f589f57a70054 (commit) from 4ec81074d1a918c965a373ae31766bd35475b376 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 81daa02876b36868a6c96a57dd0e07e787910c61 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 27 11:22:49 2015 +0200 core91: Add missing newline in filelist commit ffeecf70b0a7a02a4c3d5a3161e90cb53cef5802 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:30:46 2015 +0200 core91: Add updated python commit 1292598207d74304227a3c77346c1d046eb51975 Merge: 016e63e 765423c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:30:27 2015 +0200 Merge remote-tracking branch 'mfischer/python' into next commit 016e63e8185fb0cb670bfd05d5292aec05bc42ab Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Mon Feb 9 19:08:23 2015 +0100 openssh: lfs-update commit b9f4c9f85f8072048cd835d5a0d913eeb926d2c5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:28:05 2015 +0200 core91: Add updated slang commit f042e1d398bf4bade415773fe5849791f864444c Merge: 1f8dddc c199aa7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:27:32 2015 +0200 Merge remote-tracking branch 'mfischer/slang' into next commit 1f8dddccb6f3f8f8b05074d8375708af9ddfb3eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:27:18 2015 +0200 core91: Add updated newt commit 188c4ba444b31343c29b311fcb2d0c0ba84e80ee Merge: bee99d2 bbc7cc3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:27:02 2015 +0200 Merge remote-tracking branch 'mfischer/newt' into next commit bee99d28c9cf28d167beb416cdcfb9e56b542902 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:26:38 2015 +0200 core91: Add updated libxslt commit 5bf8008bddecb3838f1691a54f819ff4a8d08ffa Merge: 56d2b9f cfede49 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:26:23 2015 +0200 Merge remote-tracking branch 'mfischer/libxslt' into next commit 56d2b9f3603a35718cd490d573d6f8b76d056257 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:25:47 2015 +0200 core91: Add updated libxml2 commit e448795559f316992b336b4304fd1b9b7847c16c Merge: 5d6c888 b6128a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:25:27 2015 +0200 Merge remote-tracking branch 'mfischer/libxml2' into next commit 5d6c888cc523583ab533a7eaf9524bd9ac32e786 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:19:21 2015 +0200 core91: Add updated libtool commit 1bebab64407f7836d31bc8b86a46db1984d804a9 Merge: fef975e 15a9c45 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:18:40 2015 +0200 Merge remote-tracking branch 'mfischer/libtool' into next commit fef975eef76fbc752afcf9be6881d9739471e4dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:17:48 2015 +0200 libnet: Keep the version number in source tarball filename commit 8377733a388c19864fb55f48cdd3d040e538f549 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:14:09 2015 +0200 core91: Add changed libnet commit f09f3fd8819de0565c6ac73048b0dcfcff0c75ec Merge: dc26470 562cc8f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:13:44 2015 +0200 Merge remote-tracking branch 'mfischer/libnet' into next commit dc264702f688643dc8cc052f8a18187786481620 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 26 14:13:19 2015 +0200 Start Core Update 91 commit 82402a051b49a8b89ee23a75d912f8241389fce6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue May 26 14:09:40 2015 +0200 sarg: Update to 2.3.9 commit 765423cebe798bb4c8db75755979ce943f484792 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu Feb 12 20:16:09 2015 +0100 Python: Update to 2.7.9 commit 9148fbc468aa86504d6e96d5b896b30778d6cad3 Merge: ae41495 0cf8de0 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Thu Feb 12 19:40:54 2015 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit ae4149506cf64738da74373db8b0c756f260093f Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 8 14:03:43 2015 +0100 Typo in 'de.pl' commit c199aa774cccd349713c6c917cf5e8f209a713c5 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 1 20:45:58 2015 +0100 slang: Update to 2.3.0 commit bbc7cc3189f7ae5f4a645211951e42f6e761f244 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 1 20:39:16 2015 +0100 newt: Update to 0.52.18 commit cfede492da5a5a02e0766e31565e2791206fe2d7 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 1 20:34:36 2015 +0100 libxslt: Update to 1.1.28 commit b6128a64b8e7edcd21094406113192c46849544e Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 1 20:31:06 2015 +0100 libxml2: Update to 2.9.2 commit 15a9c45825fd205ca2c996e64969fad2cd467ff6 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 1 17:39:33 2015 +0100 libtool: Update to 2.4.4 commit 562cc8f7214635af6c167d1c844f589f57a70054 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun Feb 1 17:35:28 2015 +0100 libnet: Update to 1.1.6 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libnet | 8 + config/rootfiles/common/libtool | 63 ++- config/rootfiles/common/libxml2 | 431 +++++++++++---------- config/rootfiles/common/libxslt | 218 ++++++----- config/rootfiles/common/newt | 6 +- config/rootfiles/common/python | 234 ++++++++++- config/rootfiles/common/slang | 28 +- config/rootfiles/{oldcore/85 => core/91}/exclude | 0 .../{oldcore/60 => core/91}/filelists/files | 0 config/rootfiles/core/91/filelists/libnet | 1 + .../{oldcore/66 => core/91}/filelists/libtool | 0 .../{oldcore/77 => core/91}/filelists/libxml2 | 0 config/rootfiles/core/91/filelists/libxslt | 1 + .../{oldcore/87 => core/91}/filelists/newt | 0 .../{oldcore/59 => core/91}/filelists/python | 0 .../{oldcore/87 => core/91}/filelists/slang | 0 config/rootfiles/{oldcore/87 => core/91}/meta | 0 config/rootfiles/{oldcore/82 => core/91}/update.sh | 13 +- langs/de/cgi-bin/de.pl | 2 +- lfs/libnet | 10 +- lfs/libtool | 6 +- lfs/libxml2 | 6 +- lfs/libxslt | 6 +- lfs/newt | 6 +- lfs/openssh | 3 - lfs/python | 6 +- lfs/sarg | 8 +- lfs/slang | 6 +- make.sh | 2 +- ....7.3-gdbm-1.patch => Python-2.7.9-gdbm-1.patch} | 0 .../openssl-1.0.2-fix_parallel_build-1.patch | 340 ++++++++++++++++ 31 files changed, 1024 insertions(+), 380 deletions(-) copy config/rootfiles/{oldcore/85 => core/91}/exclude (100%) copy config/rootfiles/{oldcore/60 => core/91}/filelists/files (100%) create mode 120000 config/rootfiles/core/91/filelists/libnet copy config/rootfiles/{oldcore/66 => core/91}/filelists/libtool (100%) copy config/rootfiles/{oldcore/77 => core/91}/filelists/libxml2 (100%) create mode 120000 config/rootfiles/core/91/filelists/libxslt copy config/rootfiles/{oldcore/87 => core/91}/filelists/newt (100%) copy config/rootfiles/{oldcore/59 => core/91}/filelists/python (100%) copy config/rootfiles/{oldcore/87 => core/91}/filelists/slang (100%) copy config/rootfiles/{oldcore/87 => core/91}/meta (100%) copy config/rootfiles/{oldcore/82 => core/91}/update.sh (91%) copy src/patches/{Python-2.7.3-gdbm-1.patch => Python-2.7.9-gdbm-1.patch} (100%) create mode 100644 src/patches/openssl-1.0.2-fix_parallel_build-1.patch Difference in files: diff --git a/config/rootfiles/common/libnet b/config/rootfiles/common/libnet index 8fe7c17..e36695e 100644 --- a/config/rootfiles/common/libnet +++ b/config/rootfiles/common/libnet @@ -1,3 +1,4 @@ +#usr/bin/libnet-config #usr/include/libnet #usr/include/libnet.h #usr/include/libnet/libnet-asn1.h @@ -7,3 +8,10 @@ #usr/include/libnet/libnet-structures.h #usr/include/libnet/libnet-types.h #usr/lib/libnet.a +#usr/lib/libnet.la +#usr/lib/libnet.so +#usr/lib/libnet.so.1 +#usr/lib/libnet.so.1.7.0 +#usr/share/man/man3/libnet-functions.h.3 +#usr/share/man/man3/libnet-macros.h.3 +#usr/share/man/man3/libnet.h.3 diff --git a/config/rootfiles/common/libtool b/config/rootfiles/common/libtool index 5646be2..23753c7 100644 --- a/config/rootfiles/common/libtool +++ b/config/rootfiles/common/libtool @@ -9,9 +9,10 @@ #usr/lib/libltdl.la usr/lib/libltdl.so usr/lib/libltdl.so.7 -usr/lib/libltdl.so.7.3.0 +usr/lib/libltdl.so.7.3.1 #usr/share/aclocal/argz.m4 #usr/share/aclocal/libtool.m4 +#usr/share/aclocal/ltargz.m4 #usr/share/aclocal/ltdl.m4 #usr/share/aclocal/ltoptions.m4 #usr/share/aclocal/ltsugar.m4 @@ -21,6 +22,32 @@ usr/lib/libltdl.so.7.3.0 #usr/share/info/libtool.info-1 #usr/share/info/libtool.info-2 #usr/share/libtool +#usr/share/libtool/config-h.in +#usr/share/libtool/configure +#usr/share/libtool/configure.ac +#usr/share/libtool/COPYING.LIB +#usr/share/libtool/Makefile.am +#usr/share/libtool/Makefile.in +#usr/share/libtool/README +#usr/share/libtool/aclocal.m4 +#usr/share/libtool/lt__alloc.c +#usr/share/libtool/lt__argz.c +#usr/share/libtool/lt__dirent.c +#usr/share/libtool/lt__strl.c +#usr/share/libtool/lt_dlloader.c +#usr/share/libtool/lt_error.c +#usr/share/libtool/ltdl.c +#usr/share/libtool/ltdl.h +#usr/share/libtool/ltdl.mk +#usr/share/libtool/slist.c +#usr/share/libtool/build-aux +#usr/share/libtool/build-aux/compile +#usr/share/libtool/build-aux/config.guess +#usr/share/libtool/build-aux/config.sub +#usr/share/libtool/build-aux/depcomp +#usr/share/libtool/build-aux/install-sh +#usr/share/libtool/build-aux/ltmain.sh +#usr/share/libtool/build-aux/missing #usr/share/libtool/config #usr/share/libtool/config/compile #usr/share/libtool/config/config.guess @@ -41,6 +68,24 @@ usr/lib/libltdl.so.7.3.0 #usr/share/libtool/libltdl/config-h.in #usr/share/libtool/libltdl/configure #usr/share/libtool/libltdl/configure.ac +#usr/share/libtool/libltdl/lt__alloc.c +#usr/share/libtool/libltdl/lt__dirent.c +#usr/share/libtool/libltdl/lt__strl.c +#usr/share/libtool/libltdl/lt_dlloader.c +#usr/share/libtool/libltdl/lt_error.c +#usr/share/libtool/libltdl/ltdl.c +#usr/share/libtool/libltdl/ltdl.h +#usr/share/libtool/libltdl/slist.c +#usr/share/libtool/libltdl/lt__alloc.h +#usr/share/libtool/libltdl/lt__argz_.h +#usr/share/libtool/libltdl/lt__dirent.h +#usr/share/libtool/libltdl/lt__glibc.h +#usr/share/libtool/libltdl/lt__private.h +#usr/share/libtool/libltdl/lt__strl.h +#usr/share/libtool/libltdl/lt_dlloader.h +#usr/share/libtool/libltdl/lt_error.h +#usr/share/libtool/libltdl/lt_system.h +#usr/share/libtool/libltdl/slist.h #usr/share/libtool/libltdl/libltdl #usr/share/libtool/libltdl/libltdl/lt__alloc.h #usr/share/libtool/libltdl/libltdl/lt__dirent.h @@ -59,13 +104,13 @@ usr/lib/libltdl.so.7.3.0 #usr/share/libtool/libltdl/loaders/loadlibrary.c #usr/share/libtool/libltdl/loaders/preopen.c #usr/share/libtool/libltdl/loaders/shl_load.c -#usr/share/libtool/libltdl/lt__alloc.c -#usr/share/libtool/libltdl/lt__dirent.c -#usr/share/libtool/libltdl/lt__strl.c -#usr/share/libtool/libltdl/lt_dlloader.c -#usr/share/libtool/libltdl/lt_error.c -#usr/share/libtool/libltdl/ltdl.c -#usr/share/libtool/libltdl/ltdl.h -#usr/share/libtool/libltdl/slist.c +#usr/share/libtool/loaders +#usr/share/libtool/loaders/dld_link.c +#usr/share/libtool/loaders/dlopen.c +#usr/share/libtool/loaders/dyld.c +#usr/share/libtool/loaders/load_add_on.c +#usr/share/libtool/loaders/loadlibrary.c +#usr/share/libtool/loaders/preopen.c +#usr/share/libtool/loaders/shl_load.c #usr/share/man/man1/libtool.1 #usr/share/man/man1/libtoolize.1 diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2 index 07c1edd..1298651 100644 --- a/config/rootfiles/common/libxml2 +++ b/config/rootfiles/common/libxml2 @@ -50,11 +50,14 @@ #usr/include/libxml2/libxml/xpath.h #usr/include/libxml2/libxml/xpathInternals.h #usr/include/libxml2/libxml/xpointer.h +#usr/lib/cmake +#usr/lib/cmake/libxml2 +#usr/lib/cmake/libxml2/libxml2-config.cmake #usr/lib/libxml2.a #usr/lib/libxml2.la usr/lib/libxml2.so usr/lib/libxml2.so.2 -usr/lib/libxml2.so.2.6.32 +usr/lib/libxml2.so.2.9.2 #usr/lib/pkgconfig/libxml-2.0.pc usr/lib/python2.7/site-packages/drv_libxml2.py usr/lib/python2.7/site-packages/libxml2.py @@ -63,218 +66,220 @@ usr/lib/python2.7/site-packages/libxml2.py usr/lib/python2.7/site-packages/libxml2mod.so #usr/lib/xml2Conf.sh #usr/share/aclocal/libxml.m4 -#usr/share/doc/libxml2-2.6.32 -#usr/share/doc/libxml2-2.6.32/Copyright -#usr/share/doc/libxml2-2.6.32/examples -#usr/share/doc/libxml2-2.6.32/examples/testHTML.c -#usr/share/doc/libxml2-2.6.32/examples/testSAX.c -#usr/share/doc/libxml2-2.6.32/examples/testXPath.c -#usr/share/doc/libxml2-2.6.32/examples/xmllint.c -#usr/share/doc/libxml2-2.6.32/html -#usr/share/doc/libxml2-2.6.32/html/DOM.gif -#usr/share/doc/libxml2-2.6.32/html/FAQ.html -#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-180x168.gif -#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-90x34.gif -#usr/share/doc/libxml2-2.6.32/html/encoding.html -#usr/share/doc/libxml2-2.6.32/html/examples.xml -#usr/share/doc/libxml2-2.6.32/html/examples.xsl -#usr/share/doc/libxml2-2.6.32/html/html -#usr/share/doc/libxml2-2.6.32/html/html/book1.html -#usr/share/doc/libxml2-2.6.32/html/html/home.png -#usr/share/doc/libxml2-2.6.32/html/html/index.html -#usr/share/doc/libxml2-2.6.32/html/html/left.png -#usr/share/doc/libxml2-2.6.32/html/html/libxml-DOCBparser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLparser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLtree.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX2.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-c14n.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-catalog.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-chvalid.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-debugXML.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-dict.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-encoding.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-entities.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-globals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-hash.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-lib.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-list.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanoftp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanohttp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-parser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-parserInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-pattern.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-relaxng.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-schemasInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-schematron.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-threads.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-tree.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-uri.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-valid.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xinclude.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xlink.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlIO.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlautomata.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlerror.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlexports.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmemory.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmodule.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlreader.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlregexp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlsave.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemas.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemastypes.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlstring.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlunicode.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlversion.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlwriter.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpath.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpathInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpointer.html -#usr/share/doc/libxml2-2.6.32/html/html/right.png -#usr/share/doc/libxml2-2.6.32/html/html/up.png -#usr/share/doc/libxml2-2.6.32/html/io1.c -#usr/share/doc/libxml2-2.6.32/html/io1.res -#usr/share/doc/libxml2-2.6.32/html/io2.c -#usr/share/doc/libxml2-2.6.32/html/io2.res -#usr/share/doc/libxml2-2.6.32/html/libxml.gif -#usr/share/doc/libxml2-2.6.32/html/parse1.c -#usr/share/doc/libxml2-2.6.32/html/parse2.c -#usr/share/doc/libxml2-2.6.32/html/parse3.c -#usr/share/doc/libxml2-2.6.32/html/parse4.c -#usr/share/doc/libxml2-2.6.32/html/reader1.c -#usr/share/doc/libxml2-2.6.32/html/reader1.res -#usr/share/doc/libxml2-2.6.32/html/reader2.c -#usr/share/doc/libxml2-2.6.32/html/reader3.c -#usr/share/doc/libxml2-2.6.32/html/reader3.res -#usr/share/doc/libxml2-2.6.32/html/reader4.c -#usr/share/doc/libxml2-2.6.32/html/reader4.res -#usr/share/doc/libxml2-2.6.32/html/redhat.gif -#usr/share/doc/libxml2-2.6.32/html/smallfootonly.gif -#usr/share/doc/libxml2-2.6.32/html/structure.gif -#usr/share/doc/libxml2-2.6.32/html/test1.xml -#usr/share/doc/libxml2-2.6.32/html/test2.xml -#usr/share/doc/libxml2-2.6.32/html/test3.xml -#usr/share/doc/libxml2-2.6.32/html/testWriter.c -#usr/share/doc/libxml2-2.6.32/html/tree1.c -#usr/share/doc/libxml2-2.6.32/html/tree1.res -#usr/share/doc/libxml2-2.6.32/html/tree2.c -#usr/share/doc/libxml2-2.6.32/html/tree2.res -#usr/share/doc/libxml2-2.6.32/html/tst.xml -#usr/share/doc/libxml2-2.6.32/html/tutorial -#usr/share/doc/libxml2-2.6.32/html/tutorial/apa.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apb.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apc.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apd.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ape.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apf.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apg.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/aph.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/api.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s02.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s03.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s04.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s05.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s06.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s07.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s08.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s09.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/images -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/blank.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/1.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/10.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/2.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/3.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/4.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/5.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/6.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/7.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/8.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/9.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/caution.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/draft.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/home.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/important.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/next.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/note.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/prev.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/tip.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-blank.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-minus.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-plus.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/up.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/warning.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddattribute.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddkeyword.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeconvert.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includegetattribute.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includekeyword.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includexpath.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/index.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ix01.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/xmltutorial.pdf -#usr/share/doc/libxml2-2.6.32/html/w3c.png -#usr/share/doc/libxml2-2.6.32/html/writer.xml -#usr/share/doc/libxml2-2.6.32/html/xml.html -#usr/share/doc/libxml2-2.6.32/html/xpath1.c -#usr/share/doc/libxml2-2.6.32/html/xpath1.res -#usr/share/doc/libxml2-2.6.32/html/xpath2.c -#usr/share/doc/libxml2-2.6.32/html/xpath2.res -#usr/share/doc/libxml2-python-2.6.32 -#usr/share/doc/libxml2-python-2.6.32/TODO -#usr/share/doc/libxml2-python-2.6.32/examples -#usr/share/doc/libxml2-python-2.6.32/examples/attribs.py -#usr/share/doc/libxml2-python-2.6.32/examples/build.py -#usr/share/doc/libxml2-python-2.6.32/examples/compareNodes.py -#usr/share/doc/libxml2-python-2.6.32/examples/ctxterror.py -#usr/share/doc/libxml2-python-2.6.32/examples/cutnpaste.py -#usr/share/doc/libxml2-python-2.6.32/examples/dtdvalid.py -#usr/share/doc/libxml2-python-2.6.32/examples/error.py -#usr/share/doc/libxml2-python-2.6.32/examples/inbuf.py -#usr/share/doc/libxml2-python-2.6.32/examples/indexes.py -#usr/share/doc/libxml2-python-2.6.32/examples/invalid.xml -#usr/share/doc/libxml2-python-2.6.32/examples/nsdel.py -#usr/share/doc/libxml2-python-2.6.32/examples/outbuf.py -#usr/share/doc/libxml2-python-2.6.32/examples/push.py -#usr/share/doc/libxml2-python-2.6.32/examples/pushSAX.py -#usr/share/doc/libxml2-python-2.6.32/examples/pushSAXhtml.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader2.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader3.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader4.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader5.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader6.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader7.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader8.py -#usr/share/doc/libxml2-python-2.6.32/examples/readererr.py -#usr/share/doc/libxml2-python-2.6.32/examples/readernext.py -#usr/share/doc/libxml2-python-2.6.32/examples/regexp.py -#usr/share/doc/libxml2-python-2.6.32/examples/relaxng.py -#usr/share/doc/libxml2-python-2.6.32/examples/resolver.py -#usr/share/doc/libxml2-python-2.6.32/examples/schema.py -#usr/share/doc/libxml2-python-2.6.32/examples/serialize.py -#usr/share/doc/libxml2-python-2.6.32/examples/sync.py -#usr/share/doc/libxml2-python-2.6.32/examples/test.dtd -#usr/share/doc/libxml2-python-2.6.32/examples/thread2.py -#usr/share/doc/libxml2-python-2.6.32/examples/tst.py -#usr/share/doc/libxml2-python-2.6.32/examples/tst.xml -#usr/share/doc/libxml2-python-2.6.32/examples/tstLastError.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstURI.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstmem.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstxpath.py -#usr/share/doc/libxml2-python-2.6.32/examples/valid.xml -#usr/share/doc/libxml2-python-2.6.32/examples/validDTD.py -#usr/share/doc/libxml2-python-2.6.32/examples/validRNG.py -#usr/share/doc/libxml2-python-2.6.32/examples/validSchemas.py -#usr/share/doc/libxml2-python-2.6.32/examples/validate.py -#usr/share/doc/libxml2-python-2.6.32/examples/walker.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpath.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathext.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathns.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathret.py -#usr/share/gtk-doc -#usr/share/gtk-doc/html +#usr/share/doc/libxml2-2.9.2 +#usr/share/doc/libxml2-2.9.2/Copyright +#usr/share/doc/libxml2-2.9.2/examples +#usr/share/doc/libxml2-2.9.2/examples/testHTML.c +#usr/share/doc/libxml2-2.9.2/examples/testSAX.c +#usr/share/doc/libxml2-2.9.2/examples/testXPath.c +#usr/share/doc/libxml2-2.9.2/examples/xmllint.c +#usr/share/doc/libxml2-2.9.2/html +#usr/share/doc/libxml2-2.9.2/html/DOM.gif +#usr/share/doc/libxml2-2.9.2/html/FAQ.html +#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-180x168.gif +#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-90x34.gif +#usr/share/doc/libxml2-2.9.2/html/encoding.html +#usr/share/doc/libxml2-2.9.2/html/examples.xml +#usr/share/doc/libxml2-2.9.2/html/examples.xsl +#usr/share/doc/libxml2-2.9.2/html/html +#usr/share/doc/libxml2-2.9.2/html/html/book1.html +#usr/share/doc/libxml2-2.9.2/html/html/home.png +#usr/share/doc/libxml2-2.9.2/html/html/index.html +#usr/share/doc/libxml2-2.9.2/html/html/left.png +#usr/share/doc/libxml2-2.9.2/html/html/libxml-DOCBparser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLparser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLtree.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX2.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-c14n.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-catalog.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-chvalid.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-debugXML.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-dict.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-encoding.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-entities.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-globals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-hash.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-lib.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-list.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanoftp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanohttp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-parser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-parserInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-pattern.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-relaxng.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-schemasInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-schematron.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-threads.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-tree.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-uri.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-valid.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xinclude.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xlink.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlIO.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlautomata.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlerror.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlexports.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmemory.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmodule.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlreader.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlregexp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlsave.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemas.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemastypes.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlstring.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlunicode.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlversion.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlwriter.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpath.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpathInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpointer.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xzlib.html +#usr/share/doc/libxml2-2.9.2/html/html/right.png +#usr/share/doc/libxml2-2.9.2/html/html/up.png +#usr/share/doc/libxml2-2.9.2/html/index.html +#usr/share/doc/libxml2-2.9.2/html/io1.c +#usr/share/doc/libxml2-2.9.2/html/io1.res +#usr/share/doc/libxml2-2.9.2/html/io2.c +#usr/share/doc/libxml2-2.9.2/html/io2.res +#usr/share/doc/libxml2-2.9.2/html/libxml.gif +#usr/share/doc/libxml2-2.9.2/html/parse1.c +#usr/share/doc/libxml2-2.9.2/html/parse2.c +#usr/share/doc/libxml2-2.9.2/html/parse3.c +#usr/share/doc/libxml2-2.9.2/html/parse4.c +#usr/share/doc/libxml2-2.9.2/html/reader1.c +#usr/share/doc/libxml2-2.9.2/html/reader1.res +#usr/share/doc/libxml2-2.9.2/html/reader2.c +#usr/share/doc/libxml2-2.9.2/html/reader3.c +#usr/share/doc/libxml2-2.9.2/html/reader3.res +#usr/share/doc/libxml2-2.9.2/html/reader4.c +#usr/share/doc/libxml2-2.9.2/html/reader4.res +#usr/share/doc/libxml2-2.9.2/html/redhat.gif +#usr/share/doc/libxml2-2.9.2/html/smallfootonly.gif +#usr/share/doc/libxml2-2.9.2/html/structure.gif +#usr/share/doc/libxml2-2.9.2/html/test1.xml +#usr/share/doc/libxml2-2.9.2/html/test2.xml +#usr/share/doc/libxml2-2.9.2/html/test3.xml +#usr/share/doc/libxml2-2.9.2/html/testWriter.c +#usr/share/doc/libxml2-2.9.2/html/tree1.c +#usr/share/doc/libxml2-2.9.2/html/tree1.res +#usr/share/doc/libxml2-2.9.2/html/tree2.c +#usr/share/doc/libxml2-2.9.2/html/tree2.res +#usr/share/doc/libxml2-2.9.2/html/tst.xml +#usr/share/doc/libxml2-2.9.2/html/tutorial +#usr/share/doc/libxml2-2.9.2/html/tutorial/apa.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apb.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apc.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apd.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ape.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apf.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apg.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/aph.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/api.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s02.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s03.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s04.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s05.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s06.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s07.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s08.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s09.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/images +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/blank.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/1.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/10.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/2.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/3.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/4.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/5.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/6.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/7.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/8.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/9.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/caution.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/draft.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/home.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/important.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/next.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/note.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/prev.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/tip.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-blank.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-minus.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-plus.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/up.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/warning.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddattribute.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddkeyword.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeconvert.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includegetattribute.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includekeyword.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includexpath.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/index.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ix01.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/xmltutorial.pdf +#usr/share/doc/libxml2-2.9.2/html/w3c.png +#usr/share/doc/libxml2-2.9.2/html/writer.xml +#usr/share/doc/libxml2-2.9.2/html/xml.html +#usr/share/doc/libxml2-2.9.2/html/xpath1.c +#usr/share/doc/libxml2-2.9.2/html/xpath1.res +#usr/share/doc/libxml2-2.9.2/html/xpath2.c +#usr/share/doc/libxml2-2.9.2/html/xpath2.res +#usr/share/doc/libxml2-python-2.9.2 +#usr/share/doc/libxml2-python-2.9.2/TODO +#usr/share/doc/libxml2-python-2.9.2/examples +#usr/share/doc/libxml2-python-2.9.2/examples/attribs.py +#usr/share/doc/libxml2-python-2.9.2/examples/build.py +#usr/share/doc/libxml2-python-2.9.2/examples/compareNodes.py +#usr/share/doc/libxml2-python-2.9.2/examples/ctxterror.py +#usr/share/doc/libxml2-python-2.9.2/examples/cutnpaste.py +#usr/share/doc/libxml2-python-2.9.2/examples/dtdvalid.py +#usr/share/doc/libxml2-python-2.9.2/examples/error.py +#usr/share/doc/libxml2-python-2.9.2/examples/inbuf.py +#usr/share/doc/libxml2-python-2.9.2/examples/indexes.py +#usr/share/doc/libxml2-python-2.9.2/examples/input_callback.py +#usr/share/doc/libxml2-python-2.9.2/examples/invalid.xml +#usr/share/doc/libxml2-python-2.9.2/examples/nsdel.py +#usr/share/doc/libxml2-python-2.9.2/examples/outbuf.py +#usr/share/doc/libxml2-python-2.9.2/examples/push.py +#usr/share/doc/libxml2-python-2.9.2/examples/pushSAX.py +#usr/share/doc/libxml2-python-2.9.2/examples/pushSAXhtml.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader2.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader3.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader4.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader5.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader6.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader7.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader8.py +#usr/share/doc/libxml2-python-2.9.2/examples/readererr.py +#usr/share/doc/libxml2-python-2.9.2/examples/readernext.py +#usr/share/doc/libxml2-python-2.9.2/examples/regexp.py +#usr/share/doc/libxml2-python-2.9.2/examples/relaxng.py +#usr/share/doc/libxml2-python-2.9.2/examples/resolver.py +#usr/share/doc/libxml2-python-2.9.2/examples/schema.py +#usr/share/doc/libxml2-python-2.9.2/examples/serialize.py +#usr/share/doc/libxml2-python-2.9.2/examples/sync.py +#usr/share/doc/libxml2-python-2.9.2/examples/test.dtd +#usr/share/doc/libxml2-python-2.9.2/examples/thread2.py +#usr/share/doc/libxml2-python-2.9.2/examples/tst.py +#usr/share/doc/libxml2-python-2.9.2/examples/tst.xml +#usr/share/doc/libxml2-python-2.9.2/examples/tstLastError.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstURI.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstmem.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstxpath.py +#usr/share/doc/libxml2-python-2.9.2/examples/valid.xml +#usr/share/doc/libxml2-python-2.9.2/examples/validDTD.py +#usr/share/doc/libxml2-python-2.9.2/examples/validRNG.py +#usr/share/doc/libxml2-python-2.9.2/examples/validSchemas.py +#usr/share/doc/libxml2-python-2.9.2/examples/validate.py +#usr/share/doc/libxml2-python-2.9.2/examples/walker.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpath.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathext.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathleak.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathns.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathret.py #usr/share/gtk-doc/html/libxml2 #usr/share/gtk-doc/html/libxml2/general.html #usr/share/gtk-doc/html/libxml2/home.png diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt index a6e2ab3..be00b24 100644 --- a/config/rootfiles/common/libxslt +++ b/config/rootfiles/common/libxslt @@ -24,18 +24,19 @@ usr/bin/xsltproc #usr/include/libxslt/xsltInternals.h #usr/include/libxslt/xsltconfig.h #usr/include/libxslt/xsltexports.h +#usr/include/libxslt/xsltlocale.h #usr/include/libxslt/xsltutils.h #usr/lib/libexslt.a #usr/lib/libexslt.la usr/lib/libexslt.so usr/lib/libexslt.so.0 -usr/lib/libexslt.so.0.8.13 +usr/lib/libexslt.so.0.8.17 #usr/lib/libxslt-plugins #usr/lib/libxslt.a #usr/lib/libxslt.la usr/lib/libxslt.so usr/lib/libxslt.so.1 -usr/lib/libxslt.so.1.1.17 +usr/lib/libxslt.so.1.1.28 #usr/lib/pkgconfig/libexslt.pc #usr/lib/pkgconfig/libxslt.pc usr/lib/python2.7/site-packages/libxml2.pyc @@ -44,108 +45,113 @@ usr/lib/python2.7/site-packages/libxml2.pyc #usr/lib/python2.7/site-packages/libxsltmod.la usr/lib/python2.7/site-packages/libxsltmod.so #usr/lib/xsltConf.sh -#usr/man/man1/xsltproc.1 -#usr/man/man3/libexslt.3 -#usr/man/man3/libxslt.3 #usr/share/aclocal/libxslt.m4 -#usr/share/doc/libxslt-1.1.17 -#usr/share/doc/libxslt-1.1.17/html -#usr/share/doc/libxslt-1.1.17/html/API.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk0.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk1.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk2.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk3.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk4.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk5.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk6.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk7.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk8.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk9.html -#usr/share/doc/libxslt-1.1.17/html/APIconstructors.html -#usr/share/doc/libxslt-1.1.17/html/APIfiles.html -#usr/share/doc/libxslt-1.1.17/html/APIfunctions.html -#usr/share/doc/libxslt-1.1.17/html/APIsymbols.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIchunk0.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIconstructors.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfiles.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfunctions.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIsymbols.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/bugs.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/docs.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/downloads.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/exslt.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/help.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/index.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/intro.html -#usr/share/doc/libxslt-1.1.17/html/FAQ.html -#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-180x168.gif -#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-90x34.gif -#usr/share/doc/libxslt-1.1.17/html/bugs.html -#usr/share/doc/libxslt-1.1.17/html/contexts.gif -#usr/share/doc/libxslt-1.1.17/html/contribs.html -#usr/share/doc/libxslt-1.1.17/html/docbook.html -#usr/share/doc/libxslt-1.1.17/html/docs.html -#usr/share/doc/libxslt-1.1.17/html/downloads.html -#usr/share/doc/libxslt-1.1.17/html/extensions.html -#usr/share/doc/libxslt-1.1.17/html/help.html -#usr/share/doc/libxslt-1.1.17/html/html -#usr/share/doc/libxslt-1.1.17/html/html/book1.html -#usr/share/doc/libxslt-1.1.17/html/html/home.png -#usr/share/doc/libxslt-1.1.17/html/html/index.html -#usr/share/doc/libxslt-1.1.17/html/html/left.png -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-attributes.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-documents.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extensions.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extra.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-functions.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-imports.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-keys.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-lib.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-namespaces.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-numbersInternals.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-pattern.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-preproc.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-security.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-templates.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-transform.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-variables.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xslt.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltInternals.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltexports.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltutils.html -#usr/share/doc/libxslt-1.1.17/html/html/right.png -#usr/share/doc/libxslt-1.1.17/html/html/up.png -#usr/share/doc/libxslt-1.1.17/html/index.html -#usr/share/doc/libxslt-1.1.17/html/internals.html -#usr/share/doc/libxslt-1.1.17/html/intro.html -#usr/share/doc/libxslt-1.1.17/html/news.html -#usr/share/doc/libxslt-1.1.17/html/node.gif -#usr/share/doc/libxslt-1.1.17/html/object.gif -#usr/share/doc/libxslt-1.1.17/html/processing.gif -#usr/share/doc/libxslt-1.1.17/html/python.html -#usr/share/doc/libxslt-1.1.17/html/redhat.gif -#usr/share/doc/libxslt-1.1.17/html/smallfootonly.gif -#usr/share/doc/libxslt-1.1.17/html/stylesheet.gif -#usr/share/doc/libxslt-1.1.17/html/templates.gif -#usr/share/doc/libxslt-1.1.17/html/tutorial -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslt_tutorial.c -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.html -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.xml -#usr/share/doc/libxslt-1.1.17/html/tutorial2 -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.c -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.html -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.xml -#usr/share/doc/libxslt-1.1.17/html/xslt.html -#usr/share/doc/libxslt-1.1.17/html/xsltproc.html -#usr/share/doc/libxslt-1.1.17/html/xsltproc2.html -#usr/share/doc/libxslt-python-1.1.17 -#usr/share/doc/libxslt-python-1.1.17/TODO -#usr/share/doc/libxslt-python-1.1.17/examples -#usr/share/doc/libxslt-python-1.1.17/examples/basic.py -#usr/share/doc/libxslt-python-1.1.17/examples/exslt.py -#usr/share/doc/libxslt-python-1.1.17/examples/extelem.py -#usr/share/doc/libxslt-python-1.1.17/examples/extfunc.py -#usr/share/doc/libxslt-python-1.1.17/examples/pyxsltproc.py -#usr/share/doc/libxslt-python-1.1.17/examples/test.xml -#usr/share/doc/libxslt-python-1.1.17/examples/test.xsl +#usr/share/doc/libxslt-1.1.28 +#usr/share/doc/libxslt-1.1.28/html +#usr/share/doc/libxslt-1.1.28/html/API.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk0.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk1.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk10.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk11.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk12.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk13.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk2.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk3.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk4.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk5.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk6.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk7.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk8.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk9.html +#usr/share/doc/libxslt-1.1.28/html/APIconstructors.html +#usr/share/doc/libxslt-1.1.28/html/APIfiles.html +#usr/share/doc/libxslt-1.1.28/html/APIfunctions.html +#usr/share/doc/libxslt-1.1.28/html/APIsymbols.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIchunk0.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIconstructors.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfiles.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfunctions.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIsymbols.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/bugs.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/docs.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/downloads.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/exslt.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/help.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/index.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/intro.html +#usr/share/doc/libxslt-1.1.28/html/FAQ.html +#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-180x168.gif +#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-90x34.gif +#usr/share/doc/libxslt-1.1.28/html/bugs.html +#usr/share/doc/libxslt-1.1.28/html/contexts.gif +#usr/share/doc/libxslt-1.1.28/html/contribs.html +#usr/share/doc/libxslt-1.1.28/html/docbook.html +#usr/share/doc/libxslt-1.1.28/html/docs.html +#usr/share/doc/libxslt-1.1.28/html/downloads.html +#usr/share/doc/libxslt-1.1.28/html/extensions.html +#usr/share/doc/libxslt-1.1.28/html/help.html +#usr/share/doc/libxslt-1.1.28/html/html +#usr/share/doc/libxslt-1.1.28/html/html/book1.html +#usr/share/doc/libxslt-1.1.28/html/html/home.png +#usr/share/doc/libxslt-1.1.28/html/html/index.html +#usr/share/doc/libxslt-1.1.28/html/html/left.png +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-attributes.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-documents.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extensions.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extra.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-functions.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-imports.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-keys.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-lib.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-namespaces.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-numbersInternals.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-pattern.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-preproc.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-security.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-templates.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-transform.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-variables.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xslt.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltInternals.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltexports.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltlocale.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltutils.html +#usr/share/doc/libxslt-1.1.28/html/html/right.png +#usr/share/doc/libxslt-1.1.28/html/html/up.png +#usr/share/doc/libxslt-1.1.28/html/index.html +#usr/share/doc/libxslt-1.1.28/html/internals.html +#usr/share/doc/libxslt-1.1.28/html/intro.html +#usr/share/doc/libxslt-1.1.28/html/news.html +#usr/share/doc/libxslt-1.1.28/html/node.gif +#usr/share/doc/libxslt-1.1.28/html/object.gif +#usr/share/doc/libxslt-1.1.28/html/processing.gif +#usr/share/doc/libxslt-1.1.28/html/python.html +#usr/share/doc/libxslt-1.1.28/html/redhat.gif +#usr/share/doc/libxslt-1.1.28/html/smallfootonly.gif +#usr/share/doc/libxslt-1.1.28/html/stylesheet.gif +#usr/share/doc/libxslt-1.1.28/html/templates.gif +#usr/share/doc/libxslt-1.1.28/html/tutorial +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslt_tutorial.c +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.html +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.xml +#usr/share/doc/libxslt-1.1.28/html/tutorial2 +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.c +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.html +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.xml +#usr/share/doc/libxslt-1.1.28/html/xslt.html +#usr/share/doc/libxslt-1.1.28/html/xsltproc.html +#usr/share/doc/libxslt-1.1.28/html/xsltproc2.html +#usr/share/doc/libxslt-python-1.1.28 +#usr/share/doc/libxslt-python-1.1.28/TODO +#usr/share/doc/libxslt-python-1.1.28/examples +#usr/share/doc/libxslt-python-1.1.28/examples/basic.py +#usr/share/doc/libxslt-python-1.1.28/examples/exslt.py +#usr/share/doc/libxslt-python-1.1.28/examples/extelem.py +#usr/share/doc/libxslt-python-1.1.28/examples/extfunc.py +#usr/share/doc/libxslt-python-1.1.28/examples/pyxsltproc.py +#usr/share/doc/libxslt-python-1.1.28/examples/test.xml +#usr/share/doc/libxslt-python-1.1.28/examples/test.xsl +#usr/share/man/man1/xsltproc.1 +#usr/share/man/man3/libexslt.3 +#usr/share/man/man3/libxslt.3 diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt index 2fbd2b3..adc9b75 100644 --- a/config/rootfiles/common/newt +++ b/config/rootfiles/common/newt @@ -3,7 +3,7 @@ usr/bin/whiptail #usr/lib/libnewt.a #usr/lib/libnewt.so usr/lib/libnewt.so.0.52 -usr/lib/libnewt.so.0.52.17 +usr/lib/libnewt.so.0.52.18 #usr/lib/pkgconfig/libnewt.pc #usr/lib/python2.7/site-packages/_snack.so #usr/lib/python2.7/site-packages/snack.py @@ -13,8 +13,6 @@ usr/lib/libnewt.so.0.52.17 #usr/share/locale/as #usr/share/locale/as/LC_MESSAGES #usr/share/locale/as/LC_MESSAGES/newt.mo -#usr/share/locale/ast -#usr/share/locale/ast/LC_MESSAGES #usr/share/locale/ast/LC_MESSAGES/newt.mo #usr/share/locale/bal #usr/share/locale/bal/LC_MESSAGES @@ -102,8 +100,6 @@ usr/lib/libnewt.so.0.52.17 #usr/share/locale/nn #usr/share/locale/nn/LC_MESSAGES #usr/share/locale/nn/LC_MESSAGES/newt.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/newt.mo #usr/share/locale/pl/LC_MESSAGES/newt.mo #usr/share/locale/pt/LC_MESSAGES/newt.mo diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 3472e25..4f11c56 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -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 @@ -605,6 +611,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 +1461,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-1.5.6-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-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 +1605,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 +1730,77 @@ 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_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 @@ -1809,6 +1909,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 +1922,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.9-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 +1963,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 +2029,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 +2069,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 +2098,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.9.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.9.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 +2126,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 +2331,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 +2753,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 +2793,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 +2981,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/dh512.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 +3001,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 +3022,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 +3055,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 +3083,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 +3106,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 +3118,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 +3139,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 +3474,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 +3507,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 +3645,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 +3657,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 +3747,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 +3819,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 +4053,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 +4065,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 +4101,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 @@ -3955,6 +4176,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 +4624,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 diff --git a/config/rootfiles/common/slang b/config/rootfiles/common/slang index 0ebef78..71802d4 100644 --- a/config/rootfiles/common/slang +++ b/config/rootfiles/common/slang @@ -4,21 +4,26 @@ #usr/include/slcurses.h #usr/lib/libslang.so usr/lib/libslang.so.2 -usr/lib/libslang.so.2.2.4 +usr/lib/libslang.so.2.3.0 #usr/lib/pkgconfig/slang.pc #usr/lib/slang #usr/lib/slang/v2 #usr/lib/slang/v2/modules +usr/lib/slang/v2/modules/base64-module.so +usr/lib/slang/v2/modules/chksum-module.so usr/lib/slang/v2/modules/csv-module.so usr/lib/slang/v2/modules/fcntl-module.so usr/lib/slang/v2/modules/fork-module.so +usr/lib/slang/v2/modules/histogram-module.so usr/lib/slang/v2/modules/iconv-module.so +usr/lib/slang/v2/modules/json-module.so usr/lib/slang/v2/modules/pcre-module.so usr/lib/slang/v2/modules/png-module.so usr/lib/slang/v2/modules/rand-module.so usr/lib/slang/v2/modules/select-module.so usr/lib/slang/v2/modules/slsmg-module.so usr/lib/slang/v2/modules/socket-module.so +usr/lib/slang/v2/modules/stats-module.so usr/lib/slang/v2/modules/sysconf-module.so usr/lib/slang/v2/modules/termios-module.so usr/lib/slang/v2/modules/varray-module.so @@ -35,6 +40,10 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/doc/slsh #usr/share/doc/slsh/html #usr/share/doc/slsh/html/slshfun-1.html +#usr/share/doc/slsh/html/slshfun-10.html +#usr/share/doc/slsh/html/slshfun-11.html +#usr/share/doc/slsh/html/slshfun-12.html +#usr/share/doc/slsh/html/slshfun-13.html #usr/share/doc/slsh/html/slshfun-2.html #usr/share/doc/slsh/html/slshfun-3.html #usr/share/doc/slsh/html/slshfun-4.html @@ -48,13 +57,18 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh #usr/share/slsh/arrayfuns.sl #usr/share/slsh/autoload.sl +#usr/share/slsh/base64.sl +#usr/share/slsh/chksum.sl #usr/share/slsh/cmaps #usr/share/slsh/cmaps/cool.map #usr/share/slsh/cmaps/coolwarm.map #usr/share/slsh/cmaps/copper.map +#usr/share/slsh/cmaps/cubicl.map +#usr/share/slsh/cmaps/cubicyf.map #usr/share/slsh/cmaps/drywet.map #usr/share/slsh/cmaps/ds9b.map #usr/share/slsh/cmaps/ds9sls.map +#usr/share/slsh/cmaps/edge.map #usr/share/slsh/cmaps/gebco.map #usr/share/slsh/cmaps/globe.map #usr/share/slsh/cmaps/gray.map @@ -76,13 +90,20 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/csv.sl #usr/share/slsh/fcntl.sl #usr/share/slsh/fork.sl +#usr/share/slsh/fswalk.sl #usr/share/slsh/glob.sl #usr/share/slsh/help #usr/share/slsh/help/arrayfuns.hlp +#usr/share/slsh/help/base64funs.hlp +#usr/share/slsh/help/chksumfuns.hlp #usr/share/slsh/help/cmdopt.hlp #usr/share/slsh/help/csvfuns.hlp #usr/share/slsh/help/forkfuns.hlp +#usr/share/slsh/help/fswalk.hlp #usr/share/slsh/help/glob.hlp +#usr/share/slsh/help/histfuns.hlp +#usr/share/slsh/help/jsonfuns.hlp +#usr/share/slsh/help/listfuns.hlp #usr/share/slsh/help/onigfuns.hlp #usr/share/slsh/help/pcrefuns.hlp #usr/share/slsh/help/pngfuns.hlp @@ -95,8 +116,12 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/help/setfuns.hlp #usr/share/slsh/help/slsmg.hlp #usr/share/slsh/help/sockfuns.hlp +#usr/share/slsh/help/statsfuns.hlp #usr/share/slsh/help/structfuns.hlp +#usr/share/slsh/histogram.sl #usr/share/slsh/iconv.sl +#usr/share/slsh/json.sl +#usr/share/slsh/listfuns.sl #usr/share/slsh/local-packages #usr/share/slsh/onig.sl #usr/share/slsh/pcre.sl @@ -132,6 +157,7 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/slshrl.sl #usr/share/slsh/slsmg.sl #usr/share/slsh/socket.sl +#usr/share/slsh/stats.sl #usr/share/slsh/stkcheck.sl #usr/share/slsh/structfuns.sl #usr/share/slsh/sysconf.sl diff --git a/config/rootfiles/core/91/exclude b/config/rootfiles/core/91/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/91/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/91/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/91/filelists/libnet b/config/rootfiles/core/91/filelists/libnet new file mode 120000 index 0000000..26e5f79 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libnet @@ -0,0 +1 @@ +../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/core/91/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/core/91/filelists/libxml2 new file mode 120000 index 0000000..242e69f --- /dev/null +++ b/config/rootfiles/core/91/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/core/91/filelists/libxslt new file mode 120000 index 0000000..bf9d766 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libxslt @@ -0,0 +1 @@ +../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/newt b/config/rootfiles/core/91/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/core/91/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/python b/config/rootfiles/core/91/filelists/python new file mode 120000 index 0000000..ffe6e2c --- /dev/null +++ b/config/rootfiles/core/91/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/core/91/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/core/91/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/core/91/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/91/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh new file mode 100644 index 0000000..dfacbfe --- /dev/null +++ b/config/rootfiles/core/91/update.sh @@ -0,0 +1,50 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=91 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Extract files +extract_files + +# Update Language cache +update-lang-cache + +sync + +# 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/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e295412..defb632 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -691,7 +691,7 @@ 'dhcp advopt removed' => 'DHCP Option entfernt', 'dhcp advopt scope' => 'Options-Wertebereich', 'dhcp advopt scope global' => 'Global', -'dhcp advopt scope help' => 'Globaler Bereich oder begenze Bereich auf überprüfte Schnittstellen', +'dhcp advopt scope help' => 'Globaler Bereich oder begrenze Bereich auf überprüfte Schnittstellen', 'dhcp advopt unknown' => 'Name der DHCP Option wurde nicht erkannt', 'dhcp advopt value' => 'Optionswert', 'dhcp allow bootp' => 'BOOTP Clients zulassen', diff --git a/lfs/libnet b/lfs/libnet index 0547589..a9efd99 100644 --- a/lfs/libnet +++ b/lfs/libnet @@ -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,12 +24,12 @@ include Config -VER = 1.1.2.1 +VER = 1.1.6 THISAPP = libnet-$(VER) -DL_FILE = libnet.tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/libnet +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = be845c41170d72c7db524f3411b50256 +$(DL_FILE)_MD5 = 710296fe424a49344e5fcc0d09e53317 install : $(TARGET) diff --git a/lfs/libtool b/lfs/libtool index e6bcd40..0172145 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.4.2 +VER = 2.4.4 THISAPP = libtool-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2ec8997e0c07249eb4cbd072417d70fe +$(DL_FILE)_MD5 = 51bf400de3354687d68dfa2392506b7e install : $(TARGET) diff --git a/lfs/libxml2 b/lfs/libxml2 index 4a25c4c..ae2621b 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.6.32 +VER = 2.9.2 THISAPP = libxml2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2621d322c16f0257e30f0ff2b13384de +$(DL_FILE)_MD5 = 9e6a9aca9d155737868b3dc5fd82f788 install : $(TARGET) diff --git a/lfs/libxslt b/lfs/libxslt index 47ee4f8..1339f42 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.1.17 +VER = 1.1.28 THISAPP = libxslt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fde6a7a93c0eb14cba628692fa3a1000 +$(DL_FILE)_MD5 = 9667bf6f9310b957254fdcf6596600b7 install : $(TARGET) diff --git a/lfs/newt b/lfs/newt index daad9dc..ed53562 100644 --- a/lfs/newt +++ b/lfs/newt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.52.17 +VER = 0.52.18 THISAPP = newt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f36d4d908965a0c89fd6fd8b61a6118b +$(DL_FILE)_MD5 = 685721bee1a318570704b19dcf31d268 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index d8f337b..7e6e376 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -70,9 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(PADLOCK)" "1" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch -endif cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \ --libexecdir=/usr/lib/openssh --with-md5-passwords \ diff --git a/lfs/python b/lfs/python index 6095e5e..acd230c 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)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.9 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 = 38d530f7efc373d64a8fb1637e3baaa7 install : $(TARGET) diff --git a/lfs/sarg b/lfs/sarg index c8794fe..ce309a1 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) 2012 Michael Tremer # +# Copyright (C) 2014 Michael Tremer # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.3.3 +VER = 2.3.9 THISAPP = sarg-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 09dba9a960d500acd7f17802de62512c +$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428 install : $(TARGET) diff --git a/lfs/slang b/lfs/slang index 55590f7..d913cdf 100644 --- a/lfs/slang +++ b/lfs/slang @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.2.4 +VER = 2.3.0 THISAPP = slang-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 86cd8689cd71e281b4720fef8453ceeb +$(DL_FILE)_MD5 = 80f4e64189b6f28fd420b829b44a6723 install : $(TARGET) diff --git a/make.sh b/make.sh index 835a3a6..3d43603 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="90" # Core Level (Filename) +CORE="91" # Core Level (Filename) PAKFIRE_CORE="90" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan 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 index 0000000..c72b452 --- /dev/null +++ b/src/patches/Python-2.7.9-gdbm-1.patch @@ -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'], diff --git a/src/patches/openssl-1.0.2-fix_parallel_build-1.patch b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch new file mode 100644 index 0000000..acfaa72 --- /dev/null +++ b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch @@ -0,0 +1,340 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-01-23 +Initial Package Version: 1.0.1e +Upstream Status: Unknown +Origin: https://github.com/Alexpux/Qt-builds/tree/master/patches/openssl +Description: Fixes build when using more than one make job to build the package. + +--- a/crypto/Makefile 2015-01-22 17:12:09.000000000 +0100 ++++ b/crypto/Makefile 2015-01-23 16:42:13.460175569 +0100 +@@ -85,11 +85,11 @@ + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + + subdirs: +- @target=all; $(RECURSIVE_MAKE) ++ +@target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO +- @target=files; $(RECURSIVE_MAKE) ++ +@target=files; $(RECURSIVE_MAKE) + + links: + @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) +@@ -100,7 +100,7 @@ + # lib: $(LIB): are splitted to avoid end-less loop + lib: $(LIB) + @touch lib +-$(LIB): $(LIBOBJ) ++$(LIB): $(LIBOBJ) | subdirs + $(AR) $(LIB) $(LIBOBJ) + test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o + $(RANLIB) $(LIB) || echo Never mind. +@@ -111,7 +111,7 @@ + fi + + libs: +- @target=lib; $(RECURSIVE_MAKE) ++ +@target=lib; $(RECURSIVE_MAKE) + + install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... +@@ -120,7 +120,7 @@ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; +- @target=install; $(RECURSIVE_MAKE) ++ +@target=install; $(RECURSIVE_MAKE) + + lint: + @target=lint; $(RECURSIVE_MAKE) +--- a/engines/Makefile 2015-01-22 17:12:24.000000000 +0100 ++++ b/engines/Makefile 2015-01-23 16:42:13.461175596 +0100 +@@ -72,7 +72,7 @@ + + all: lib subdirs + +-lib: $(LIBOBJ) ++lib: $(LIBOBJ) | subdirs + @if [ -n "$(SHARED_LIBS)" ]; then \ + set -e; \ + for l in $(LIBNAMES); do \ +@@ -89,7 +89,7 @@ + + subdirs: + echo $(EDIRS) +- @target=all; $(RECURSIVE_MAKE) ++ +@target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO +@@ -128,7 +128,7 @@ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ + done; \ + fi +- @target=install; $(RECURSIVE_MAKE) ++ +@target=install; $(RECURSIVE_MAKE) + + tags: + ctags $(SRC) +--- a/Makefile.org 2015-01-22 15:58:06.000000000 +0100 ++++ b/Makefile.org 2015-01-23 16:42:13.461175596 +0100 +@@ -274,17 +274,17 @@ + build_libs: build_crypto build_ssl build_engines + + build_crypto: +- @dir=crypto; target=all; $(BUILD_ONE_CMD) +-build_ssl: +- @dir=ssl; target=all; $(BUILD_ONE_CMD) +-build_engines: +- @dir=engines; target=all; $(BUILD_ONE_CMD) +-build_apps: +- @dir=apps; target=all; $(BUILD_ONE_CMD) +-build_tests: +- @dir=test; target=all; $(BUILD_ONE_CMD) +-build_tools: +- @dir=tools; target=all; $(BUILD_ONE_CMD) ++ +@dir=crypto; target=all; $(BUILD_ONE_CMD) ++build_ssl: build_crypto ++ +@dir=ssl; target=all; $(BUILD_ONE_CMD) ++build_engines: build_crypto ++ +@dir=engines; target=all; $(BUILD_ONE_CMD) ++build_apps: build_libs ++ +@dir=apps; target=all; $(BUILD_ONE_CMD) ++build_tests: build_libs ++ +@dir=test; target=all; $(BUILD_ONE_CMD) ++build_tools: build_libs ++ +@dir=tools; target=all; $(BUILD_ONE_CMD) + + all_testapps: build_libs build_testapps + build_testapps: +@@ -536,9 +536,9 @@ + dist_pem_h: + (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) + +-install: all install_docs install_sw ++install: install_docs install_sw + +-install_sw: ++install_dirs: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ +@@ -547,12 +547,19 @@ + $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/private ++ @$(PERL) $(TOP)/util/mkdir-p.pl \ ++ $(INSTALL_PREFIX)$(MANDIR)/man1 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man3 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man5 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man7 ++ ++install_sw: install_dirs + @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; +- @set -e; target=install; $(RECURSIVE_BUILD_CMD) ++ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) + @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ + do \ + if [ -f "$$i" ]; then \ +@@ -636,12 +643,7 @@ + done; \ + done + +-install_docs: +- @$(PERL) $(TOP)/util/mkdir-p.pl \ +- $(INSTALL_PREFIX)$(MANDIR)/man1 \ +- $(INSTALL_PREFIX)$(MANDIR)/man3 \ +- $(INSTALL_PREFIX)$(MANDIR)/man5 \ +- $(INSTALL_PREFIX)$(MANDIR)/man7 ++install_docs: install_dirs + @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ + here="`pwd`"; \ + filecase=; \ +--- a/Makefile.shared 2015-01-20 13:33:36.000000000 +0100 ++++ b/Makefile.shared 2015-01-23 16:42:13.461175596 +0100 +@@ -105,6 +105,7 @@ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ ++ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ + LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ +@@ -122,6 +123,7 @@ + done; \ + fi; \ + if [ -n "$$SHLIB_SOVER" ]; then \ ++ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ + ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ + ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ + fi; \ +--- a/test/Makefile 2015-01-22 17:12:26.000000000 +0100 ++++ b/test/Makefile 2015-01-23 16:42:13.461175596 +0100 +@@ -132,7 +132,7 @@ + tags: + ctags $(SRC) + +-tests: exe apps $(TESTS) ++tests: exe $(TESTS) + + apps: + @(cd ..; $(MAKE) DIRS=apps all) +@@ -398,109 +398,109 @@ + link_app.$${shlib_target} + + $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) +- @target=$(RSATEST); $(BUILD_CMD) ++ +@target=$(RSATEST); $(BUILD_CMD) + + $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) +- @target=$(BNTEST); $(BUILD_CMD) ++ +@target=$(BNTEST); $(BUILD_CMD) + + $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) +- @target=$(ECTEST); $(BUILD_CMD) ++ +@target=$(ECTEST); $(BUILD_CMD) + + $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) +- @target=$(EXPTEST); $(BUILD_CMD) ++ +@target=$(EXPTEST); $(BUILD_CMD) + + $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) +- @target=$(IDEATEST); $(BUILD_CMD) ++ +@target=$(IDEATEST); $(BUILD_CMD) + + $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) +- @target=$(MD2TEST); $(BUILD_CMD) ++ +@target=$(MD2TEST); $(BUILD_CMD) + + $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) +- @target=$(SHATEST); $(BUILD_CMD) ++ +@target=$(SHATEST); $(BUILD_CMD) + + $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) +- @target=$(SHA1TEST); $(BUILD_CMD) ++ +@target=$(SHA1TEST); $(BUILD_CMD) + + $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) +- @target=$(SHA256TEST); $(BUILD_CMD) ++ +@target=$(SHA256TEST); $(BUILD_CMD) + + $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) +- @target=$(SHA512TEST); $(BUILD_CMD) ++ +@target=$(SHA512TEST); $(BUILD_CMD) + + $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) +- @target=$(RMDTEST); $(BUILD_CMD) ++ +@target=$(RMDTEST); $(BUILD_CMD) + + $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) +- @target=$(MDC2TEST); $(BUILD_CMD) ++ +@target=$(MDC2TEST); $(BUILD_CMD) + + $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) +- @target=$(MD4TEST); $(BUILD_CMD) ++ +@target=$(MD4TEST); $(BUILD_CMD) + + $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) +- @target=$(MD5TEST); $(BUILD_CMD) ++ +@target=$(MD5TEST); $(BUILD_CMD) + + $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) +- @target=$(HMACTEST); $(BUILD_CMD) ++ +@target=$(HMACTEST); $(BUILD_CMD) + + $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) +- @target=$(WPTEST); $(BUILD_CMD) ++ +@target=$(WPTEST); $(BUILD_CMD) + + $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) +- @target=$(RC2TEST); $(BUILD_CMD) ++ +@target=$(RC2TEST); $(BUILD_CMD) + + $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) +- @target=$(BFTEST); $(BUILD_CMD) ++ +@target=$(BFTEST); $(BUILD_CMD) + + $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) +- @target=$(CASTTEST); $(BUILD_CMD) ++ +@target=$(CASTTEST); $(BUILD_CMD) + + $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) +- @target=$(RC4TEST); $(BUILD_CMD) ++ +@target=$(RC4TEST); $(BUILD_CMD) + + $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) +- @target=$(RC5TEST); $(BUILD_CMD) ++ +@target=$(RC5TEST); $(BUILD_CMD) + + $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) +- @target=$(DESTEST); $(BUILD_CMD) ++ +@target=$(DESTEST); $(BUILD_CMD) + + $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) +- @target=$(RANDTEST); $(BUILD_CMD) ++ +@target=$(RANDTEST); $(BUILD_CMD) + + $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) +- @target=$(DHTEST); $(BUILD_CMD) ++ +@target=$(DHTEST); $(BUILD_CMD) + + $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) +- @target=$(DSATEST); $(BUILD_CMD) ++ +@target=$(DSATEST); $(BUILD_CMD) + + $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) +- @target=$(METHTEST); $(BUILD_CMD) ++ +@target=$(METHTEST); $(BUILD_CMD) + + $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) +- @target=$(SSLTEST); $(FIPS_BUILD_CMD) ++ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) + + $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) +- @target=$(ENGINETEST); $(BUILD_CMD) ++ +@target=$(ENGINETEST); $(BUILD_CMD) + + $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) +- @target=$(EVPTEST); $(BUILD_CMD) ++ +@target=$(EVPTEST); $(BUILD_CMD) + + $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) +- @target=$(ECDSATEST); $(BUILD_CMD) ++ +@target=$(ECDSATEST); $(BUILD_CMD) + + $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) +- @target=$(ECDHTEST); $(BUILD_CMD) ++ +@target=$(ECDHTEST); $(BUILD_CMD) + + $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) +- @target=$(IGETEST); $(BUILD_CMD) ++ +@target=$(IGETEST); $(BUILD_CMD) + + $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) +- @target=$(JPAKETEST); $(BUILD_CMD) ++ +@target=$(JPAKETEST); $(BUILD_CMD) + + $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) +- @target=$(ASN1TEST); $(BUILD_CMD) ++ +@target=$(ASN1TEST); $(BUILD_CMD) + + $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) +- @target=$(SRPTEST); $(BUILD_CMD) ++ +@target=$(SRPTEST); $(BUILD_CMD) + + $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) + @target=$(V3NAMETEST); $(BUILD_CMD) +@@ -522,7 +522,7 @@ + # fi + + dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) +- @target=dummytest; $(BUILD_CMD) ++ +@target=dummytest; $(BUILD_CMD) + + # DO NOT DELETE THIS LINE -- make depend depends on it. + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 38b8efddca9432f119fc4f71605c5fdb79b2c492
by git＠ipfire.org 25 May '15

25 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 38b8efddca9432f119fc4f71605c5fdb79b2c492 (commit) from 739e4ba2296e67c6b8fd80163a07aa88113c6fbb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 38b8efddca9432f119fc4f71605c5fdb79b2c492 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 25 14:35:28 2015 +0200 netsnmpd: bump pak version. ----------------------------------------------------------------------- Summary of changes: lfs/netsnmpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 388b20b..6615965 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netsnmpd -PAK_VER = 2 +PAK_VER = 3 DEPS = "" ############################################################################### hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 739e4ba2296e67c6b8fd80163a07aa88113c6fbb
by git＠ipfire.org 24 May '15

24 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 739e4ba2296e67c6b8fd80163a07aa88113c6fbb (commit) from 465a08b6290e42e2dbf771505c0a87deb4ba756d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 739e4ba2296e67c6b8fd80163a07aa88113c6fbb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 24 11:10:04 2015 +0200 web-user-interface: add missing graphs folder. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/web-user-interface | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 5da892b..08b87a3 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -92,6 +92,7 @@ srv/web/ipfire/html/blob.gif srv/web/ipfire/html/clwarn.cgi srv/web/ipfire/html/dial.cgi srv/web/ipfire/html/favicon.ico +#srv/web/ipfire/html/graphs #srv/web/ipfire/html/images srv/web/ipfire/html/images/IPFire.png srv/web/ipfire/html/images/add.gif hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2015