Hi,

thank you very much for sending this in.

This is all a bit much so we will go slowly through it. I merged some of the not so scary things already. Some other things I would like to keep out of the upcoming core update and postpone them so that they can get some more testing.

Please note the commends inline.

On Sat, 2015-05-23 at 11:44 +0200, Matthias Fischer wrote:

Hi all,

I tried to clean my various GIT-branches - the following updates were not yet merged. Version-Numbers in round brackets show actual version in 'next', handle as you like: ;-)

XML-Parser: Update to 2.43 (2.34) expat: Update to 2.1.0 (2.1.0) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=0996d7b59...

pam: Update to 1.1.8 (0.99.10.0) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=d086fc2e4...

sarg: Update to 2.3.9 (2.3.3) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=5f0c62353...

Merged.

Archive-Tar: Update to 2.02 (1.29) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=faeb35874...

Archive-Zip: Update to 1.39 (1.16) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=252ae243d... [During testing, this update had problems with Perl, OpenVPN-GUI won't open! => httpd/error_log: ... Can't locate Compress/Raw/Zlib.pm in @INC (@INC contains: /usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi /usr/lib/perl5/site_perl/5.12.3 /usr/lib/perl5/5.12.3/i586-linux-thread-multi /usr/lib/perl5/5.12.3 .) at /usr/lib/perl5/site_perl/5.12.3/Archive/Zip.pm line 9] ...

This is a serious issue and needs to be fixed first.

libnet: Update to 1.1.6 (1.1.2.1) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=562cc8f72...

Merged.

libtool: Update to 2.4.4 (2.4.2) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=15a9c4582...

Merged.

libxml2: Update to 2.9.2 (2.6.32) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=b6128a64b...

Merged.

libxslt: Update to 1.1.28 (1.1.17) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=cfede492d...

Merged.

newt: Update to 0.52.18 (0.52.17) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=bbc7cc318...

Merged.

slang: Update to 2.3.0 (2.2.4) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=c199aa774...

Merged.

krb5: Update to 1.13 (1.12.1) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=3f509f5c5...

This is mainly used for AD authentication of the web proxy. I do not have a domain controller by hand for testing.

HTML-Parser: Update to 3.71 (3.45) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=cafa4da7e...

libusbx: Update to 1.0.18 (1.0.11) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=4afebeca4...

We talked about this some time ago that libusbx has been merged back into libusb again and that we should probably go back to that then. libusb-compat needs to be kept because that is a completely different library.

openssh: lfs-update (removed 'padlock') http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=95b931814...

Python: Update to 2.7.9 (2.7.3) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=765423ceb...

Merged.

urfilter.dat: Suggested update to show 'Older'/'Newer' links on TOP of the Urlfilter-Log-List http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=192ab87d4...

bind: Update to 9.10.2 (9.9.5) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=59747c4a7...

mc: Update to 4.8.14 (4.8.13) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=8f12dc57c...

wget: Update to 1.16.3 (1.16) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=15a75c804...

Merged.

Most of the branches after this point are not based on master or next and merging them into next causes a lot of merge conflicts as well as it pulls in changes that do not belong into these branches any way. Could you have a look and rebase or create a clean branch and cherry-pick maybe?

libidn: Update to 1.30 (0.6.14) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=336260704...

powertop: Update to 2.7 (1.13) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=493265547...

libusb: Update to 1.0.19 (0.1.12) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=e8b1e94a3...

libusb-compat: Fixed rootfile (removed file '23-usb.rules') http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=dbd678443...

7zip: Update to 9.38.1 (4.65) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=c6b652856...

gnupg: Update to 1.4.19 (1.4.18) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=e6b176ddb...

bison: Update to 3.0.4 (2.5.1) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=3dd5bfd30...

libgcrypt: Update to 1.6.3 (1.6.1) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2738f4a2d...

libassuan: Update to 2.2.0 (2.1.3) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=dbcf99873...

libgpg-error: Update to 1.18 (1.13) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=ad89d7961...

automake: Update to 1.15 (1.12.4) igmpproxy: Updated lfs-file for compatibility with automake 1.15 http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=45fdfa709...

privoxy 3.0.23 http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=shortlog;h=refs/he...

rrdtool: Update to 1.5.3 (1.4.7) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=1772bbdf4...

graphs.pl: bugfixes regarding rrdtool http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=55b550dc1...

logrotate: Update to 3.9.1 (3.8.1) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=1eebd0928...

If you like to keep it: boost: Update to 1_58_0 (1_55_0) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=faebd8120...

nano: Update to 2.4.1 (2.2.6) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=c94c4dfde...

tcpdump: Update to 4.7.4 (4.6.2) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=0a82a5855...

libpcap: Update to 1.7.3 (1.6.2) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2a68a2fd1...

pcre: Update to 8.37 (8.36) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=0d377d358...

snort: Update to 2.9.7.3 (2.9.7.0) http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=d545ccf1d...

ids.cgi: update download url for snort rules http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=42f52bcab...

I tested all these updates in productive mode (IPFire 2.17/Core 89). For me, they seem to run fine - if there are problems, please let me know!

As you are sending in so many changes, maybe it is better to send proper pull requests as shown here: http://wiki.ipfire.org/devel/submit-patches

This will help us to make the review process a bit more efficient.

-Michael

Regards Matthias