From c4c1723d10042b295ab60e67dbdfb63dd3913e41 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 12:32:01 +0100 Subject: [PATCH 01/13] apr: Remove trailing space --- apr-1.5.1-2.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-1.5.1-2.bee b/apr-1.5.1-2.bee index d513f0ed8..a6790fd61 100755 --- a/apr-1.5.1-2.bee +++ b/apr-1.5.1-2.bee @@ -52,7 +52,7 @@ SRCURL[0]="http://mirror.serversupportforum.de/apache/apr/apr-${PKGVERSION}.tar. #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From c2bc1896bb05e9b68e14d3ed0b848821301dce5c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 12:32:20 +0100 Subject: [PATCH 02/13] apr: Convert to versionless bee file --- apr-1.5.1-2.bee => apr.be0 | 3 +++ 1 file changed, 3 insertions(+) rename apr-1.5.1-2.bee => apr.be0 (98%) diff --git a/apr-1.5.1-2.bee b/apr.be0 similarity index 98% rename from apr-1.5.1-2.bee rename to apr.be0 index a6790fd61..d82a03068 100755 --- a/apr-1.5.1-2.bee +++ b/apr.be0 @@ -1,4 +1,7 @@ #!/usr/bin/env beesh + +# BEE_VERSION apr-1.5.1-2 + BEE_BUILDTYPE=autotools ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 36f5b7e135af513ecb1b95eb21d8f595b8664a5d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 12:33:10 +0100 Subject: [PATCH 03/13] apr: Update version from 1.5.1 to 1.6.5 --- apr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr.be0 b/apr.be0 index d82a03068..49cebd682 100755 --- a/apr.be0 +++ b/apr.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION apr-1.5.1-2 +# BEE_VERSION apr-1.6.5-0 BEE_BUILDTYPE=autotools ## this file was created by bee init and should be executed to build a From a7e310a83886603b7ff37f195e39b0f87fb34c40 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 12:36:34 +0100 Subject: [PATCH 04/13] apr: Change mirror to ftp.fau.de --- apr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr.be0 b/apr.be0 index 49cebd682..4ceb5b9e9 100755 --- a/apr.be0 +++ b/apr.be0 @@ -10,7 +10,7 @@ BEE_BUILDTYPE=autotools ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://mirror.serversupportforum.de/apache/apr/apr-${PKGVERSION}.tar.gz" +SRCURL[0]="http://ftp.fau.de/apache/apr/apr-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From d15182fddfa197fa04e525137e9327390479e12d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:16:30 +0100 Subject: [PATCH 05/13] apr: Securely download source archive over HTTPS --- apr.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr.be0 b/apr.be0 index 4ceb5b9e9..fcad66b8c 100755 --- a/apr.be0 +++ b/apr.be0 @@ -10,7 +10,7 @@ BEE_BUILDTYPE=autotools ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://ftp.fau.de/apache/apr/apr-${PKGVERSION}.tar.gz" +SRCURL[0]="https://ftp.fau.de/apache/apr/apr-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 641c5095212a0a8e2dc2ba17d37ccb038150fc83 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:04:59 +0100 Subject: [PATCH 06/13] apr-util: Convert to versionless bee file --- apr-util-1.5.4-0.bee => apr-util.be0 | 3 +++ 1 file changed, 3 insertions(+) rename apr-util-1.5.4-0.bee => apr-util.be0 (98%) diff --git a/apr-util-1.5.4-0.bee b/apr-util.be0 similarity index 98% rename from apr-util-1.5.4-0.bee rename to apr-util.be0 index 73b8f203d..88cbb2eb6 100755 --- a/apr-util-1.5.4-0.bee +++ b/apr-util.be0 @@ -1,4 +1,7 @@ #!/usr/bin/env beesh + +# BEE_VERSION apr-util-1.5.4-0 + BEE_BUILDTYPE=autotools ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 74c86adc2516218b78e63e0053cb9310d3a99fab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:06:51 +0100 Subject: [PATCH 07/13] apr-util: Use ftp.fau.de as source mirror The server should be in the DFN, so use that one. --- apr-util.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-util.be0 b/apr-util.be0 index 88cbb2eb6..54a4cd398 100755 --- a/apr-util.be0 +++ b/apr-util.be0 @@ -10,7 +10,7 @@ BEE_BUILDTYPE=autotools ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://mirror.netcologne.de/apache.org//apr/apr-util-${PKGVERSION}.tar.gz" +SRCURL[0]="http://ftp.fau.de/apache/apr/apr-util-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From dc86acbe4ad91c1f0829fe09c6d269540c147c97 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:07:56 +0100 Subject: [PATCH 08/13] apr-util: Update version from 1.5.4 to 1.6.1 --- apr-util.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-util.be0 b/apr-util.be0 index 54a4cd398..e8f5bc7c8 100755 --- a/apr-util.be0 +++ b/apr-util.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION apr-util-1.5.4-0 +# BEE_VERSION apr-util-1.6.1-0 BEE_BUILDTYPE=autotools ## this file was created by bee init and should be executed to build a From 739f510cdc0cbf03d2750bf408b3f46c1c17e38a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:17:19 +0100 Subject: [PATCH 09/13] apr-util: Securely download source archive over HTTPS --- apr-util.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-util.be0 b/apr-util.be0 index e8f5bc7c8..566a0cc5b 100755 --- a/apr-util.be0 +++ b/apr-util.be0 @@ -10,7 +10,7 @@ BEE_BUILDTYPE=autotools ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://ftp.fau.de/apache/apr/apr-util-${PKGVERSION}.tar.gz" +SRCURL[0]="https://ftp.fau.de/apache/apr/apr-util-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 97ac42ec28020fe5be4b51e7d0bd38d3aa256c98 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:11:35 +0100 Subject: [PATCH 10/13] apr-iconv: Strip trailing space --- apr-iconv-1.2.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-iconv-1.2.1-0.bee b/apr-iconv-1.2.1-0.bee index 3e27b5f97..affeaab2b 100755 --- a/apr-iconv-1.2.1-0.bee +++ b/apr-iconv-1.2.1-0.bee @@ -52,7 +52,7 @@ SRCURL[0]="http://mirror.synyx.de/apache//apr/apr-iconv-${PKGVERSION}.tar.gz" #} mee_configure() { - bee_configure --with-apr=/usr/bin/apr-1-config + bee_configure --with-apr=/usr/bin/apr-1-config } #mee_build() { From f5293180b83d06cfc3080c4c4a7b457960ae3e55 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:12:07 +0100 Subject: [PATCH 11/13] apr-iconv: Convert to versionless bee file --- apr-iconv-1.2.1-0.bee => apr-iconv.be0 | 3 +++ 1 file changed, 3 insertions(+) rename apr-iconv-1.2.1-0.bee => apr-iconv.be0 (98%) diff --git a/apr-iconv-1.2.1-0.bee b/apr-iconv.be0 similarity index 98% rename from apr-iconv-1.2.1-0.bee rename to apr-iconv.be0 index affeaab2b..7b3f733fc 100755 --- a/apr-iconv-1.2.1-0.bee +++ b/apr-iconv.be0 @@ -1,4 +1,7 @@ #!/usr/bin/env beesh + +# BEE_VERSION apr-iconv-1.2.1-0 + BEE_BUILDTYPE=autotools ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 5f9a4cf21c6ee55c47d138bb34e4bca8c062004b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:12:31 +0100 Subject: [PATCH 12/13] apr-iconv: Update version from 1.2.1 to 1.2.2 [Changes with APR-ICONV 1.2.2][1]: > *) Win32: Resolve build issues with modern Visual Studio toolchains. > Specifically changed the handling of precompiled headers; the .obj > file which contains a traceable flavor of the intrinsic functions > is now required. [William Rowe] [1]: https://ftp.fau.de/apache//apr/CHANGES-APR-ICONV-1.2 --- apr-iconv.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-iconv.be0 b/apr-iconv.be0 index 7b3f733fc..fdba4216b 100755 --- a/apr-iconv.be0 +++ b/apr-iconv.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION apr-iconv-1.2.1-0 +# BEE_VERSION apr-iconv-1.2.2-0 BEE_BUILDTYPE=autotools ## this file was created by bee init and should be executed to build a From 4ae66b57500ce714a7f8849fdb64fdd0e6d788c5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 23 Nov 2018 13:14:18 +0100 Subject: [PATCH 13/13] apr-iconv: Use ftp.fau.de as source mirror The server should be in the DFN, so use that one. While at it, use HTTPS to securely download the source file. --- apr-iconv.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apr-iconv.be0 b/apr-iconv.be0 index fdba4216b..fae0b795c 100755 --- a/apr-iconv.be0 +++ b/apr-iconv.be0 @@ -10,7 +10,7 @@ BEE_BUILDTYPE=autotools ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://mirror.synyx.de/apache//apr/apr-iconv-${PKGVERSION}.tar.gz" +SRCURL[0]="https://ftp.fau.de/apache//apr/apr-iconv-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array.