diff --git a/.gitignore b/.gitignore index 1d54b28..d9969b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ /vmod-uuid-1.3.tar.gz /vmod-uuid-1.5.tar.gz /vmod-uuid-1.6.tar.gz -/vmod-uuid-1.8.tar.gz -/vmod-uuid-1.9.tar.gz -/vmod-uuid-1.10.tar.gz diff --git a/sources b/sources index 6b6eb2a..c78d81f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vmod-uuid-1.10.tar.gz) = 47c91c47f2209ca7ff2352305b0cd9794c3ba917c88e49706e478316049a58900a896099ecff054ecc97ec5b05d5b4e4365dda02b15c0054a134faf60b1e325a +SHA512 (vmod-uuid-1.6.tar.gz) = 15728fd38282ab76a1fa69c4498790039c19dc71eb5d68f61219452aee46be610689d759e87a3b157f7e2fb0bfd2bea83c75652d9c51b385d3810ae65f955875 diff --git a/vmod-uuid-1.9_fix_autoconf_2.71.patch b/vmod-uuid-1.9_fix_autoconf_2.71.patch deleted file mode 100644 index 3dff6ea..0000000 --- a/vmod-uuid-1.9_fix_autoconf_2.71.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit ae0ca345b9974092bf139409d2852fc46886c250 -Author: Stefan Schmidt -Date: Tue Feb 16 11:56:10 2021 +0100 - - Fix autoconf error in version 2.70 - -diff --git a/configure.ac b/configure.ac -index 0596d45..5b73eb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ AC_ARG_WITH([rst2man], - [--with-rst2man=PATH], - [Location of rst2man (auto)]), - [RST2MAN="$withval"], -- AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])) -+ [AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])]) - - m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see INSTALL.rst])) - diff --git a/vmod-uuid-1.9_fix_for_varnish660.patch b/vmod-uuid-1.9_fix_for_varnish660.patch deleted file mode 100644 index 5e5cd8d..0000000 --- a/vmod-uuid-1.9_fix_for_varnish660.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 25d3873833ca6e0f4bcd46efd59f6955228bfabf -Author: Geoff Simmons -Date: Thu Dec 10 11:32:42 2020 +0100 - - Adjust to vmod_priv methods. - - Required for Varnish as of commit 681c11998ec56dc4460a30585210f95a7850ea3b - -diff --git a/src/vmod_uuid.c b/src/vmod_uuid.c -index 60d6928..3da20ab 100644 ---- a/src/vmod_uuid.c -+++ b/src/vmod_uuid.c -@@ -112,6 +112,12 @@ free_uuids(void *priv) - uuid_destroy(uuids[1]); - } - -+static const struct vmod_priv_methods uuid_priv_task_methods[1] = {{ -+ .magic = VMOD_PRIV_METHODS_MAGIC, -+ .type = "vmod_uuid_priv_task", -+ .fini = free_uuids -+}}; -+ - static inline uuid_t * - get_uuids(VRT_CTX, struct vmod_priv *priv, uuid_t **uuid_ns) - { -@@ -130,7 +136,7 @@ get_uuids(VRT_CTX, struct vmod_priv *priv, uuid_t **uuid_ns) - return NULL; - } - priv->priv = uuids; -- priv->free = free_uuids; -+ priv->methods = uuid_priv_task_methods; - uuids[0] = NULL; - uuids[1] = NULL; - UUID_CALL(rc, ctx, uuid_create(&uuid), NULL); diff --git a/vmod-uuid-1.9_fix_for_varnish660_free_uuids.patch b/vmod-uuid-1.9_fix_for_varnish660_free_uuids.patch deleted file mode 100644 index 155d24d..0000000 --- a/vmod-uuid-1.9_fix_for_varnish660_free_uuids.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit a0c20e8fc1ce423de3d6650770ea791dffd6398d -Author: Geoff Simmons -Date: Thu Jan 28 15:28:45 2021 +0100 - - Change signature of priv_task fini method (changed in Varnish). - -diff --git a/src/vmod_uuid.c b/src/vmod_uuid.c -index 3da20ab..fa94a1a 100644 ---- a/src/vmod_uuid.c -+++ b/src/vmod_uuid.c -@@ -101,9 +101,10 @@ _uuid(VRT_CTX, uuid_t *uuid, int utype, ...) - } - - static void --free_uuids(void *priv) -+free_uuids(VRT_CTX, void *priv) - { - uuid_t **uuids; -+ (void)ctx; - - AN(priv); - uuids = priv; diff --git a/vmod-uuid.spec b/vmod-uuid.spec index dc8d88d..ff2edfd 100644 --- a/vmod-uuid.spec +++ b/vmod-uuid.spec @@ -1,12 +1,8 @@ -%global docutils python3-docutils -%global rst2man rst2man - Name: vmod-uuid Summary: UUID module for Varnish Cache -Version: 1.10 -Release: 34%{?dist} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +Version: 1.6 +Release: 7%{?dist} +License: BSD URL: https://github.com/otto-de/libvmod-uuid Source0: https://github.com/otto-de/lib%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -17,29 +13,27 @@ BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig BuildRequires: uuid-devel -BuildRequires: varnish-devel >= 6.3.0 +BuildRequires: varnish-devel BuildRequires: varnish BuildRequires: check-devel # To build from a git checkout, add these BuildRequires: automake BuildRequires: libtool -BuildRequires: %docutils +BuildRequires: python3-docutils BuildRequires: autoconf-archive - %description UUID Varnish vmod used to generate a uuid, including versions 1, 3, 4 and 5 as specified in RFC 4122. See the RFC for details about the various versions. %prep -%setup -q -n lib%{name}-%{version} +%autosetup -n lib%{name}-%{version} %build ./autogen.sh -export RST2MAN=%rst2man %configure \ --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -71,134 +65,6 @@ find %{buildroot}/%{_libdir}/ -name '*.a' -delete %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.10-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Thu May 21 2026 Ingvar Hagelund - 1.10-33 -- Rebuild for varnish-9.0.3 - -* Fri May 15 2026 Ingvar Hagelund - 1.10-32 -- Rebuild for varnish-9.0.2 - -* Thu Apr 30 2026 Ingvar Hagelund - 1.10-31 -- Rebuild for varnish-9.0.1-1 - -* Fri Mar 27 2026 Ingvar Hagelund - 1.10-30 -- Rebuilt for varnish-9.0.0-1 - -* Tue Feb 10 2026 Ingvar Hagelund - 1.10-29 -- Rebuilt for varnish-8.0.0-2 - -* Sat Jan 17 2026 Fedora Release Engineering - 1.10-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Jan 08 2026 Ingvar Hagelund - 1.10-27 -- Rebuild for varnish-8.0.0-1 - -* Wed Nov 19 2025 Ingvar Hagelund - 1.10-26 -- Rebuild for varnish-7.7.3-2, rhbz#2407457 - -* Mon Sep 15 2025 Ingvar Hagelund - 1.10-25 -- Rebuild for varnish-7.7.3 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.10-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon May 26 2025 Ingvar Hagelund - 1.10-24 -- Rebuild for varnish-7.7.1 - -* Wed Mar 26 2025 Ingvar Hagelund - 1.10-23 -- Rebuild for varnish-7.7.0 - -* Sun Jan 19 2025 Fedora Release Engineering - 1.10-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Dec 06 2024 Ingvar Hagelund - 1.10-21 -- Rebuild for varnish-7.6.1 - -* Wed Sep 18 2024 Ingvar Hagelund - 1.10-20 -- Rebuild for varnish-7.6.0 - -* Wed Sep 04 2024 Miroslav Suchý - 1.10-19 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.10-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 23 2024 Ingvar Hagelund - 1.10-17 -- Rebuilt for varnish-7.5.0 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.10-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Nov 15 2023 Ingvar Hagelund - 1.10-15 -- Rebuilt for varnish-7.4.2 - -* Sat Jul 22 2023 Fedora Release Engineering - 1.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Mar 20 2023 Ingvar Hagelund - 1.10-13 -- Rebuilt for varnish-7.3.0 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.10-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 14 2022 Ingvar Hagelund - 1.10-11 -- Rebuilt for varnish-7.2.1 - -* Mon Sep 26 2022 Ingvar Hagelund - 1.10-10 -- Rebuilt for varnish-7.2.0 - -* Mon Aug 15 2022 Ingvar Hagelund - 1.10-9 -- Rebuilt for varnish-7.1.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Apr 04 2022 Ingvar Hagelund - 1.10-7 -- Rebuilt for varnish-7.1.0 - -* Tue Feb 08 2022 Ingvar Hagelund - 1.10-6 -- Rebuilt for varnish-7.0.2 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Oct 04 2021 Ingvar Hagelund - 1.10-4 -- Rebuilt for varnish-7.0.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Ingvar Hagelund 1.10-2 -- Rebuilt for varnish-6.6.1 - -* Tue May 18 2021 Ingvar Hagelund 1.10-1 -- New upstream release -- Dropped patches included in this release -- Built for varnish-6.6.0 - -* Fri Mar 26 2021 Ingvar Hagelund - 1.9-1 -- New upstream release -- Added patch for autoconf-2.71 from upstream, closes rhbz #1943109 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Sep 29 2020 Ingvar Hagelund - 1.8-2 -- Built for varnish-6.5.1 - -* Mon Sep 21 2020 Ingvar Hagelund - 1.8-1 -- New upstream release 1.8 -- Built for varnish-6.5.0 -- Added hacks for newer varnish on older rhel derivates - -* Wed Jul 29 2020 Fedora Release Engineering - 1.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Mar 26 2020 Ingvar Hagelund - 1.6-8 -- Rebuilt against varnish-6.4.0 - * Thu Mar 26 2020 Ingvar Hagelund - 1.6-7 - Rebuilt against varnish-6.3.2