From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 1/2] apr and aprutil: Added as requirement for apache 2.4 Date: Thu, 17 Aug 2017 14:05:14 +0100 Message-ID: <1502975114.2431.10.camel@ipfire.org> In-Reply-To: <001c01d316ca$2c890b20$859b2160$@googlemail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3380278453382827227==" List-Id: --===============3380278453382827227== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, thank you for your feedback on my last email. On Wed, 2017-08-16 at 21:59 +0200, Wolfgang Apolinarski wrote: > Hi Michael, >=20 > I will first respond to the apr changes (I shortened the response): >=20 > > > config/rootfiles/common/apache2 | 8 ++-- > > > config/rootfiles/common/apr | 57 ++++++++++++++++++++++++++++ > > > config/rootfiles/common/aprutil | 52 +++++++++++++++++++++++++ > > > lfs/apr | 84 > > > +++++++++++++++++++++++++++++++++++++++++ > > > lfs/aprutil | 84 > > > +++++++++++++++++++++++++++++++++++++++++ > > > make.sh | 2 + > > > 6 files changed, 283 insertions(+), 4 deletions(-) > > > create mode 100644 config/rootfiles/common/apr > > > create mode 100644 config/rootfiles/common/aprutil > > > create mode 100644 lfs/apr > > > create mode 100644 lfs/aprutil > > >=20 > > > diff --git a/config/rootfiles/common/apache2 > > > b/config/rootfiles/common/apache2 > > > index 7e33a155e..360f5ae61 100644 > > > --- a/config/rootfiles/common/apache2 > > > +++ b/config/rootfiles/common/apache2 > > > @@ -1342,22 +1342,22 @@ usr/lib/apache/mod_usertrack.so > > > usr/lib/apache/mod_version.so > > > usr/lib/apache/mod_vhost_alias.so > > > #usr/lib/apr-util-1 > > > -usr/lib/apr-util-1/apr_dbd_sqlite3-1.so > > > +#usr/lib/apr-util-1/apr_dbd_sqlite3-1.so > > > #usr/lib/apr-util-1/apr_dbd_sqlite3.a > > > #usr/lib/apr-util-1/apr_dbd_sqlite3.la > > > -usr/lib/apr-util-1/apr_dbd_sqlite3.so > > > +#usr/lib/apr-util-1/apr_dbd_sqlite3.so > > > #usr/lib/apr.exp > > > #usr/lib/aprutil.exp > > > #usr/lib/libapr-1.a > > > #usr/lib/libapr-1.la > > > usr/lib/libapr-1.so > > > usr/lib/libapr-1.so.0 > > > -usr/lib/libapr-1.so.0.5.1 > > > +#usr/lib/libapr-1.so.0.5.1 > > > #usr/lib/libaprutil-1.a > > > #usr/lib/libaprutil-1.la > > > usr/lib/libaprutil-1.so > > > usr/lib/libaprutil-1.so.0 > > > -usr/lib/libaprutil-1.so.0.5.3 > > > +#usr/lib/libaprutil-1.so.0.5.3 > > > #usr/lib/pkgconfig/apr-1.pc > > > #usr/lib/pkgconfig/apr-util-1.pc > > > #usr/sbin/ab > >=20 > > You don't need to package the .so files. They are just needed for > > linking which we never do on the firewall system. > >=20 > > Just ship the .so.X and .so.X.Y files. >=20 > Ok, I will change that. Currently, the .so files are shipped and they are a= ctually only a symbolic link to the .so.X.Y file. Are you sure I should leave= them out? You will need the .so files with a number after them: So in this case you will need to ship: libaprutil-1.so.0 and libaprutil.so.0.5.3. The .so link is just for the linker and the .la file is something similar for the statically linked .a files which are of no use at runtime either. So there is no need to ship them. >=20 > > Here it seems taht you are not shipping libaprutil at all. Can we not > > disable it in the build since it is being compiled in an extra package? >=20 > Yes, you are right, I will disable it in the rootfile of apache 2.2. I trie= d to perform only the absolute minimum changes in the apache 2.2 package, thi= s is why they were still there. >=20 > (...) > > > +usr/lib/libapr-1.so.0.6.2 > > > +usr/lib/apr.exp > > > +usr/lib/libapr-1.la > > > +usr/lib/libapr-1.so > > > +usr/lib/libapr-1.so.0 > > > +#usr/lib/pkgconfig/apr-1.pc > > > +#usr/share/apr-1 > > > +#usr/share/apr-1/build > > > +#usr/share/apr-1/build/apr_common.m4 > > > +#usr/share/apr-1/build/apr_rules.mk > > > +#usr/share/apr-1/build/find_apr.m4 > > > +#usr/share/apr-1/build/libtool > > > +#usr/share/apr-1/build/make_exports.awk > > > +#usr/share/apr-1/build/make_var_export.awk > > > +#usr/share/apr-1/build/mkdir.sh > >=20 > > Same as above. The static library .a isn't needed on the system either. >=20 > You mean the .la file, right? I will remove that, this is currently not shi= pped, I added it by accident. > I will also remove the .exp file. Both .la und .a don't need to be shipped. See above. >=20 > > Also the alphabetical order of the rootfile is messed up. The build > > system should complain about that. >=20 > It did not (well, at least not in the last lines), I will sort that out. Not a big issue at all, but I thought I would sort it out. >=20 > > > diff --git a/config/rootfiles/common/aprutil > > > b/config/rootfiles/common/aprutil > > > new file mode 100644 > > > index 000000000..7b0bbb8d7 > > > --- /dev/null > > > +++ b/config/rootfiles/common/aprutil > > > @@ -0,0 +1,52 @@ >=20 > (...) > > > +usr/lib/aprutil.exp > >=20 > > The package has a bundled version of libexpat. We have a package for > > that. Please disable this here. aprutil is compiled after expat, but it > > does not seem to find it or it is not happy with the version. >=20 > There is a build option that hopefully fixes that.=20 Cool. >=20 > (...) > > > ########### > > > + > > > +include Config > > > + > > > +VER =3D 1.6.2 > > > + > > > +THISAPP =3D apr-$(VER) > > > +DL_FILE =3D $(THISAPP).tar.bz2 > > > +DL_FROM =3D http://archive.apache.org/dist/apr > > > +DIR_APP =3D $(DIR_SRC)/$(THISAPP) > > > + > > > +TARGET =3D $(DIR_INFO)/$(THISAPP) >=20 > (...) > > > + > > > + cd $(DIR_APP) && sed -i "/seems to be moved/s/^/#/" > > > build/ltmain.sh > >=20 > > What is this supposed to do? Please add a comment. >=20 > This was part of the LFS build "Installation of Apr" process. It is not any= more for apr 1.6.2, so I will remove this line. >=20 > (...) > > > --- a/make.sh > > > +++ b/make.sh > > > @@ -358,6 +358,7 @@ buildbase() { > > > lfsmake2 bzip2 > > > lfsmake2 pcre > > > lfsmake2 pcre-compat > > > + lfsmake2 apr > > > lfsmake2 bash > > > lfsmake2 diffutils > > > lfsmake2 e2fsprogs > >=20 > > Does apr need to be built this early in the processs? Why can we not > > have it in the IPFire stage? Is anything suddenly depending on it? >=20 > I added it some months ago, I actually don't remember. I will test if I can= move it directly in front of aprutil. I am quite sure it will. >=20 > Best regards, > Wolfgang Best, -Michael P.S. So core update 113 is about to be closed by the end of this week. And that will open the merge window for 114. Let's aim for that if we can, but I would rather have a well-tested set of patches instead of shipping this at the earliest occasion. >=20 --===============3380278453382827227== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxtVmxJb0FDZ2tRZ0hudy8yK1EKQ1Fmb0R4QUFqZnRzdkdnenFi dWJydmIzenNmQkJsTW5FUGRuWVpnemljUXp6QmEyY0ZYZjBISHFqdXlVTU0rOQptbXltSEM2Z3hk c2JuUW5kcmhCVzYwWjRLMkRrSXI4QmxidGJXbUI1em8xbVZvRGJheTBoNWJXUkVSOHFERFF3Ck1R dGhOTGNJcWJPaEdMNXVqbHJIbENjeVBKMkJ1OEo2WlNvemhMTlM4aUVCaUVzTElpR2ZHTUgrS3cz bFBaOUgKdzZsYUdWYi9BNzdIVEtjcnhEMmhDVW92QUtBVnN3TElLWEVqdjZMaUVwczFIN3lkOXNF MjdGT25TeEJBQUI4YwplaEtFRExueG1WczlOK2p6aDNkVFh1c2NQVThXVkJWTDlOT1FjYlA5QWhn TlljSjNQdy9ac0lYeE1iZ3NqY0NLCnJuN2p4SW1lV2NxY3RHaGdSN01LS0dUcU1ZRjBqV1o4bU9K eVdqTHBPTURqd0VXc08yZWhwWklUWFZCVlFId3MKVjVuLzErVkxxYStZUllsK0Q0YTBib3hmZHJZ dUZXbzRLSlVkMXRObTluY1FrMkpkVWR0R3pxZ2ZHUjNBS1loMQpRWnBSVGExcy80VzBYVzZTU2V5 bzdadDlNZGR5bDBkNHRYYmVlSFpIRVdlMFhuWmVJMTJHVDFMZ002emxHVllMClZYRjBPL04reWtH QUdVNDNZZ1dNdTNWZ0hIOG5QVTNjamY2ajlqaVFidmtIc2ZuVnZ2VHJsTHdqa0ZQckxHenoKUStl cFlCY2Z4Qi9SUlFkcm1scndtMVZmdXhqU1gwNHFYaDBIS0tpYm1MZUFXZy9RbGNsc1ZPWDFEL1lr Um5BRQpWa2k0cFhGcDRRMnlheUd6ZzQxQm4wMmFhVzlzMXlNaWVMM00vQ2cvQzNkdG1yV2RGZFU9 Cj1WaE1hCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============3380278453382827227==--