Hi Michael,
I will first respond to the apr changes (I shortened the response):
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
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
You don't need to package the .so files. They are just needed for linking which we never do on the firewall system.
Just ship the .so.X and .so.X.Y files.
Ok, I will change that. Currently, the .so files are shipped and they are actually only a symbolic link to the .so.X.Y file. Are you sure I should leave them out?
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?
Yes, you are right, I will disable it in the rootfile of apache 2.2. I tried to perform only the absolute minimum changes in the apache 2.2 package, this is why they were still there.
(...)
+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
Same as above. The static library .a isn't needed on the system either.
You mean the .la file, right? I will remove that, this is currently not shipped, I added it by accident. I will also remove the .exp file.
Also the alphabetical order of the rootfile is messed up. The build system should complain about that.
It did not (well, at least not in the last lines), I will sort that out.
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 @@
(...)
+usr/lib/aprutil.exp
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.
There is a build option that hopefully fixes that.
(...)
###########
+include Config
+VER = 1.6.2
+THISAPP = apr-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
(...)
- cd $(DIR_APP) && sed -i "/seems to be moved/s/^/#/"
build/ltmain.sh
What is this supposed to do? Please add a comment.
This was part of the LFS build "Installation of Apr" process. It is not anymore for apr 1.6.2, so I will remove this line.
(...)
--- 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
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?
I added it some months ago, I actually don't remember. I will test if I can move it directly in front of aprutil.
Best regards, Wolfgang
Hi,
thank you for your feedback on my last email.
On Wed, 2017-08-16 at 21:59 +0200, Wolfgang Apolinarski wrote:
Hi Michael,
I will first respond to the apr changes (I shortened the response):
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
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
You don't need to package the .so files. They are just needed for linking which we never do on the firewall system.
Just ship the .so.X and .so.X.Y files.
Ok, I will change that. Currently, the .so files are shipped and they are actually 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.
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?
Yes, you are right, I will disable it in the rootfile of apache 2.2. I tried to perform only the absolute minimum changes in the apache 2.2 package, this is why they were still there.
(...)
+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
Same as above. The static library .a isn't needed on the system either.
You mean the .la file, right? I will remove that, this is currently not shipped, I added it by accident. I will also remove the .exp file.
Both .la und .a don't need to be shipped. See above.
Also the alphabetical order of the rootfile is messed up. The build system should complain about that.
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.
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 @@
(...)
+usr/lib/aprutil.exp
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.
There is a build option that hopefully fixes that.
Cool.
(...)
###########
+include Config
+VER = 1.6.2
+THISAPP = apr-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
(...)
- cd $(DIR_APP) && sed -i "/seems to be moved/s/^/#/"
build/ltmain.sh
What is this supposed to do? Please add a comment.
This was part of the LFS build "Installation of Apr" process. It is not anymore for apr 1.6.2, so I will remove this line.
(...)
--- 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
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?
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.
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.
-
Michael Tremer -
Wolfgang Apolinarski