From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Pull request - pending updates
Date: Wed, 27 May 2015 11:36:21 +0200 [thread overview]
Message-ID: <1432719381.16602.151.camel@ipfire.org> (raw)
In-Reply-To: <55604C01.6080104@t-online.de>
[-- Attachment #1: Type: text/plain, Size: 8726 bytes --]
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=0996d7b598bfe835f8c36c6c43d75a4fbca97d5a
>
> pam: Update to 1.1.8 (0.99.10.0)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=d086fc2e451e4430c8fd3dd74ef3dfa8375d2b97
>
> sarg: Update to 2.3.9 (2.3.3)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=5f0c62353db2839404dad5192691643ec347dd69
Merged.
> Archive-Tar: Update to 2.02 (1.29)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=faeb35874a7ce4fc47564933bce20f4da92f917f
>
> Archive-Zip: Update to 1.39 (1.16)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=252ae243d1079f9d0d46e6685673352525088106
> [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=562cc8f7214635af6c167d1c844f589f57a70054
Merged.
> libtool: Update to 2.4.4 (2.4.2)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=15a9c45825fd205ca2c996e64969fad2cd467ff6
Merged.
> libxml2: Update to 2.9.2 (2.6.32)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=b6128a64b8e7edcd21094406113192c46849544e
Merged.
> libxslt: Update to 1.1.28 (1.1.17)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=cfede492da5a5a02e0766e31565e2791206fe2d7
Merged.
> newt: Update to 0.52.18 (0.52.17)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=bbc7cc3189f7ae5f4a645211951e42f6e761f244
Merged.
> slang: Update to 2.3.0 (2.2.4)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=c199aa774cccd349713c6c917cf5e8f209a713c5
Merged.
> krb5: Update to 1.13 (1.12.1)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=3f509f5c5010e58a494c9b1dd33f36048339da34
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=cafa4da7efbc41f477ededeeb82de206d87e5f05
>
> libusbx: Update to 1.0.18 (1.0.11)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=4afebeca4abbcbeddf5d5b3a864dc7eda8cf2af4
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=95b9318140c733dfc44485938f7704896cab5213
>
> Python: Update to 2.7.9 (2.7.3)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=765423cebe798bb4c8db75755979ce943f484792
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=192ab87d47d8ea0514234866f5cb7c74a902fb5f
>
> bind: Update to 9.10.2 (9.9.5)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=59747c4a7985b72cb7cd655e41734dad0e98ed9e
>
> mc: Update to 4.8.14 (4.8.13)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=8f12dc57ce46d6495cb1b9e5a04bb3d22f67bdb3
>
> wget: Update to 1.16.3 (1.16)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=15a75c8041a003c017a501bf18926c12a0cf7fc7
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=336260704f0f50ce64df895870909f26157dc54c
>
> powertop: Update to 2.7 (1.13)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=493265547cf67c153ba13536248c92807a7f2025
>
> libusb: Update to 1.0.19 (0.1.12)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=e8b1e94a38d3fca4165836e8c05836dd09308083
>
> libusb-compat: Fixed rootfile (removed file '23-usb.rules')
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=dbd678443dc31f60ec1f58c3cfc431fbce8f0264
>
> 7zip: Update to 9.38.1 (4.65)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=c6b652856dc3ff2d27d7fa8518c3d756835f7243
>
> gnupg: Update to 1.4.19 (1.4.18)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=e6b176ddbcb84d4d068a5be271a0bc78d92ca268
>
> bison: Update to 3.0.4 (2.5.1)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=3dd5bfd30b8315a6b9027e1414b82a05fe22482c
>
> libgcrypt: Update to 1.6.3 (1.6.1)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2738f4a2d1219a9e97ffe5e32220b61d9b69ea6a
>
> libassuan: Update to 2.2.0 (2.1.3)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=dbcf9987334e700b8e97d2a8306924e6c1427682
>
> libgpg-error: Update to 1.18 (1.13)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=ad89d796130566a0950ec26a04c8f2c443e52fda
>
> 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=45fdfa7097d0a8fbdd421bf807b2076f978b475b
>
> privoxy 3.0.23
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=shortlog;h=refs/heads/privoxy
>
> rrdtool: Update to 1.5.3 (1.4.7)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=1772bbdf49da8502f46cdb2684fbc8e3612a1346
>
> graphs.pl: bugfixes regarding rrdtool
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=55b550dc1bf9835747013ca968c266226dcf6c46
>
> logrotate: Update to 3.9.1 (3.8.1)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=1eebd09289512ef0ddbf079a2e8489235148b29b
>
> 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=faebd81203dad95380e3ad3b0c1ef2f3a3bb391c
>
> nano: Update to 2.4.1 (2.2.6)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=c94c4dfde7dee26220ce7ad22cad2ed87e5b53af
>
> tcpdump: Update to 4.7.4 (4.6.2)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=0a82a5855c79137a6f6cba8798bb30532509d37c
>
> libpcap: Update to 1.7.3 (1.6.2)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2a68a2fd12be1d8b00510b47a1fa983aba830d4b
>
> pcre: Update to 8.37 (8.36)
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=0d377d35805b8ca9dca32d5711dd902e6968a892
>
> 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=d545ccf1dd2f688df557f5862abd1a976c1fba29
>
> ids.cgi: update download url for snort rules
> http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=42f52bcabcfb38b1cf2e286c2575ceb0937b9cd5
>
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-05-27 9:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-23 9:44 Matthias Fischer
2015-05-27 9:36 ` Michael Tremer [this message]
2015-05-25 12:38 Matthias Fischer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432719381.16602.151.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox