From 5ed46f56f07400dd681ad22e1f7f502e165b1946 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Aug 2018 17:47:19 +0200 Subject: [PATCH 1/4] libX11: Use new, secure source URL The current URL moved permanently. ``` $ curl -I http://xorg.freedesktop.org/releases/individual/lib/ HTTP/1.1 301 Moved Permanently Date: Tue, 21 Aug 2018 15:47:31 GMT Server: Apache/2.4.25 (Debian) Location: https://www.x.org/releases/individual/lib/ Content-Type: text/html; charset=iso-8859-1 ``` --- libX11-1.6.2-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libX11-1.6.2-0.bee b/libX11-1.6.2-0.bee index 12f9e6a25..41e725c0a 100755 --- a/libX11-1.6.2-0.bee +++ b/libX11-1.6.2-0.bee @@ -7,7 +7,7 @@ ## 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://xorg.freedesktop.org/releases/individual/lib/libX11-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://www.x.org/releases/individual/lib/libX11-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From a74a4f9cdda992b59e3e075a984603f3a1376a41 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Aug 2018 17:50:31 +0200 Subject: [PATCH 2/4] libX11: Recreate bee file with current template $ bee init -f https://www.x.org/releases/individual/lib/libX11-1.6.2.tar.bz2 creating libX11-1.6.2-0.bee from template '/etc/default/bee/templates/fallback' --- libX11-1.6.2-0.bee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libX11-1.6.2-0.bee b/libX11-1.6.2-0.bee index 41e725c0a..5ba967598 100755 --- a/libX11-1.6.2-0.bee +++ b/libX11-1.6.2-0.bee @@ -22,8 +22,8 @@ SRCURL[0]="https://www.x.org/releases/individual/lib/libX11-${PKGVERSION}.tar.bz # EXCLUDE+=() ############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source ## directory. # build_in_sourcedir @@ -52,7 +52,7 @@ SRCURL[0]="https://www.x.org/releases/individual/lib/libX11-${PKGVERSION}.tar.bz #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { @@ -71,7 +71,7 @@ SRCURL[0]="https://www.x.org/releases/individual/lib/libX11-${PKGVERSION}.tar.bz ## The name of this bee-file should follow the following naming convention: ## pkgname-pkgversion-pkgrevision.bee ## -## You may remove all comments as long as SRCURL[0]="" is set. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## From c10365e02ec5bd5ce718255218473ce1d5e7f77f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Aug 2018 17:51:55 +0200 Subject: [PATCH 3/4] libX11: Convert to versionless bee file --- libX11-1.6.2-0.bee => libX11.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libX11-1.6.2-0.bee => libX11.be0 (98%) diff --git a/libX11-1.6.2-0.bee b/libX11.be0 similarity index 98% rename from libX11-1.6.2-0.bee rename to libX11.be0 index 5ba967598..79bcc6ac5 100755 --- a/libX11-1.6.2-0.bee +++ b/libX11.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libX11-1.6.2-0 + ## 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 09e98c4741d4d59b15a183d8c310c46f138b794a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Aug 2018 17:52:08 +0200 Subject: [PATCH 4/4] libX11: Update version from 1.6.2 to 1.6.6 See the [announcement][1], and [security advisory][2]. [1]: https://lists.x.org/archives/xorg-announce/2018-August/002916.html [2]: https://lists.x.org/archives/xorg-announce/2018-August/002915.html --- libX11.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libX11.be0 b/libX11.be0 index 79bcc6ac5..daeb11478 100755 --- a/libX11.be0 +++ b/libX11.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libX11-1.6.2-0 +# BEE_VERSION libX11-1.6.6-0 ## 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.)