From a6a18c375b55b871328eed766758a7a6c65b15e5 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 23 May 2018 13:55:35 +0000 Subject: [PATCH 01/13] Added modulemd --- squid.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 squid.yaml diff --git a/squid.yaml b/squid.yaml new file mode 100644 index 0000000..f6c9d45 --- /dev/null +++ b/squid.yaml @@ -0,0 +1,30 @@ +document: modulemd +version: 1 +data: + summary: Squid - Optimising Web Delivery + description: an initial version of the squid caching proxy module + license: + module: [ MIT ] + dependencies: + - buildrequires: + platform: [f28] + requires: + platform: [f28] + references: + documentation: http://www.squid-cache.org/Doc/ + tracker: https://bugs.squid-cache.org/index.cgi + profiles: + default: + rpms: + - squid + api: + rpms: + - squid + components: + rpms: + squid: + rationale: Module API. + ref: stream-4.0 + libecap: + rationale: library needed by Squid + ref: stream-1.0 \ No newline at end of file From a7fac5a53f822ace273daef6c0ea2158045aa31c Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 23 May 2018 14:14:08 +0000 Subject: [PATCH 02/13] Fix modulemd version --- squid.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squid.yaml b/squid.yaml index f6c9d45..a45ef25 100644 --- a/squid.yaml +++ b/squid.yaml @@ -1,5 +1,5 @@ document: modulemd -version: 1 +version: 2 data: summary: Squid - Optimising Web Delivery description: an initial version of the squid caching proxy module @@ -27,4 +27,4 @@ data: ref: stream-4.0 libecap: rationale: library needed by Squid - ref: stream-1.0 \ No newline at end of file + ref: stream-1.0 From f37fb1b5ca3ad5276dab8ed368f0ea8497ead6d3 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Mon, 4 Jun 2018 14:32:49 +0000 Subject: [PATCH 03/13] squid rebuild - removed strict error check From 95085427ec414a0adbbb24a98ecd3cc43d75b91a Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Mon, 4 Jun 2018 14:53:26 +0000 Subject: [PATCH 04/13] squid rebuild - merged squid component with fedora rawhide From bac1cde0f9e3f545bb2f9c2893b1cf64cc9b7c57 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Thu, 28 Jun 2018 10:19:54 +0000 Subject: [PATCH 05/13] rebase to squid 4.0.25 From 613fc43cd55df0aba8ab4cbd2e8c661f2a90b509 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Fri, 10 Aug 2018 09:04:21 +0000 Subject: [PATCH 06/13] New branch for stream-4 --- squid.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squid.yaml b/squid.yaml index a45ef25..ef9f2b6 100644 --- a/squid.yaml +++ b/squid.yaml @@ -24,7 +24,7 @@ data: rpms: squid: rationale: Module API. - ref: stream-4.0 + ref: stream-4 libecap: rationale: library needed by Squid ref: stream-1.0 From 8612dcffcab60312947c6410b26ba0aa65590964 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Tue, 28 May 2019 14:31:26 +0200 Subject: [PATCH 07/13] Update yaml file, fix buildorder --- squid.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/squid.yaml b/squid.yaml index ef9f2b6..3d45103 100644 --- a/squid.yaml +++ b/squid.yaml @@ -23,8 +23,10 @@ data: components: rpms: squid: - rationale: Module API. + rationale: squid caching proxy ref: stream-4 + buildorder: 2 libecap: rationale: library needed by Squid ref: stream-1.0 + buildorder: 1 From 0bbcd10060032e35355805b80e38890840c09bb2 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Tue, 28 May 2019 14:52:39 +0200 Subject: [PATCH 08/13] Build only on f31 --- squid.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squid.yaml b/squid.yaml index 3d45103..32553e5 100644 --- a/squid.yaml +++ b/squid.yaml @@ -7,9 +7,9 @@ data: module: [ MIT ] dependencies: - buildrequires: - platform: [f28] + platform: [f31] requires: - platform: [f28] + platform: [f31] references: documentation: http://www.squid-cache.org/Doc/ tracker: https://bugs.squid-cache.org/index.cgi From 4bf1615dc799d9b95bca407bd7ffe3d5fd9a0105 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Tue, 28 May 2019 15:41:30 +0200 Subject: [PATCH 09/13] Updated libecap (missing gcc BuildRequires) From a9cc52c0d1448cbbf8ef805c84429b4975b82b9c Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 29 May 2019 10:40:37 +0200 Subject: [PATCH 10/13] Change profile name from default to common --- squid.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squid.yaml b/squid.yaml index 32553e5..7d8273a 100644 --- a/squid.yaml +++ b/squid.yaml @@ -14,7 +14,7 @@ data: documentation: http://www.squid-cache.org/Doc/ tracker: https://bugs.squid-cache.org/index.cgi profiles: - default: + common: rpms: - squid api: From 06c082753d9087db6fefd7092dc26f98f49fec88 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Mon, 3 Jun 2019 14:12:52 +0200 Subject: [PATCH 11/13] Set module name and stream in yaml file --- squid.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/squid.yaml b/squid.yaml index 7d8273a..9119c1f 100644 --- a/squid.yaml +++ b/squid.yaml @@ -1,6 +1,8 @@ document: modulemd version: 2 data: + name: squid + stream: 4 summary: Squid - Optimising Web Delivery description: an initial version of the squid caching proxy module license: From 2020d850d796d1db9128a70f16642690700823bb Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 10 Jul 2019 14:00:31 +0200 Subject: [PATCH 12/13] Merge stream-4 with Master. - update to 4.8 - fix for CVe-2019-13345 From e267053794a10f3f4385705da7ee098dce7da16d Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Thu, 6 Aug 2020 10:49:34 +0200 Subject: [PATCH 13/13] Build for all --- squid.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squid.yaml b/squid.yaml index 9119c1f..cad731f 100644 --- a/squid.yaml +++ b/squid.yaml @@ -9,9 +9,9 @@ data: module: [ MIT ] dependencies: - buildrequires: - platform: [f31] + platform: [] requires: - platform: [f31] + platform: [] references: documentation: http://www.squid-cache.org/Doc/ tracker: https://bugs.squid-cache.org/index.cgi