From 14f5e0ae680a0ea4d716fc5114fe21ec34d69f09 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:37:38 +0000 Subject: [PATCH] import UBI uuid-1.6.2-65.el10 --- .gitignore | 2 +- .uuid.metadata | 1 - SOURCES/uuid-1.6.2-vaendfix.patch | 19 -- sources | 1 + ....6.1-mkdir.patch => uuid-1.6.1-mkdir.patch | 0 ...-1.6.1-ossp.patch => uuid-1.6.1-ossp.patch | 0 ....2-hwaddr.patch => uuid-1.6.2-hwaddr.patch | 0 ...flagsfix.patch => uuid-1.6.2-ldflags.patch | 6 +- ....2-manfix.patch => uuid-1.6.2-manfix.patch | 0 ...-nostrip.patch => uuid-1.6.2-nostrip.patch | 0 ....6.2-php54.patch => uuid-1.6.2-php54.patch | 0 .../uuid-aarch64.patch => uuid-aarch64.patch | 0 SPECS/uuid.spec => uuid.spec | 167 +++++++++++------- 13 files changed, 111 insertions(+), 85 deletions(-) delete mode 100644 .uuid.metadata delete mode 100644 SOURCES/uuid-1.6.2-vaendfix.patch create mode 100644 sources rename SOURCES/uuid-1.6.1-mkdir.patch => uuid-1.6.1-mkdir.patch (100%) rename SOURCES/uuid-1.6.1-ossp.patch => uuid-1.6.1-ossp.patch (100%) rename SOURCES/uuid-1.6.2-hwaddr.patch => uuid-1.6.2-hwaddr.patch (100%) rename SOURCES/uuid-1.6.2-ldflagsfix.patch => uuid-1.6.2-ldflags.patch (82%) rename SOURCES/uuid-1.6.2-manfix.patch => uuid-1.6.2-manfix.patch (100%) rename SOURCES/uuid-1.6.2-nostrip.patch => uuid-1.6.2-nostrip.patch (100%) rename SOURCES/uuid-1.6.2-php54.patch => uuid-1.6.2-php54.patch (100%) rename SOURCES/uuid-aarch64.patch => uuid-aarch64.patch (100%) rename SPECS/uuid.spec => uuid.spec (75%) diff --git a/.gitignore b/.gitignore index 0050fbc..4ffb8fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/uuid-1.6.2.tar.gz +uuid-1.6.2.tar.gz diff --git a/.uuid.metadata b/.uuid.metadata deleted file mode 100644 index 808fb23..0000000 --- a/.uuid.metadata +++ /dev/null @@ -1 +0,0 @@ -3e22126f0842073f4ea6a50b1f59dcb9d094719f SOURCES/uuid-1.6.2.tar.gz diff --git a/SOURCES/uuid-1.6.2-vaendfix.patch b/SOURCES/uuid-1.6.2-vaendfix.patch deleted file mode 100644 index c6ff8f6..0000000 --- a/SOURCES/uuid-1.6.2-vaendfix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up uuid-1.6.2/uuid_str.c.vaendfix uuid-1.6.2/uuid_str.c ---- uuid-1.6.2/uuid_str.c.vaendfix 2008-03-07 11:49:59.000000000 +0100 -+++ uuid-1.6.2/uuid_str.c 2018-10-14 12:56:20.500131215 +0200 -@@ -698,6 +698,7 @@ str_vasprintf( - - va_copy(ap_tmp, ap); - n = str_vsnprintf(NULL, 0, fmt, ap_tmp); -+ va_end(ap_tmp); - if ((rv = (char *)malloc(n+1)) == NULL) - return NULL; - str_vsnprintf(rv, n+1, fmt, ap); -@@ -738,6 +739,7 @@ str_vrsprintf( - va_copy(ap_tmp, ap); - n = strlen(*str); - rv = str_vsnprintf(NULL, 0, fmt, ap_tmp); -+ va_end(ap_tmp); - if ((*str = (char *)realloc(*str, n+rv+1)) == NULL) - return -1; - str_vsnprintf((*str)+n, rv+1, fmt, ap); diff --git a/sources b/sources new file mode 100644 index 0000000..6b05647 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (uuid-1.6.2.tar.gz) = 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e diff --git a/SOURCES/uuid-1.6.1-mkdir.patch b/uuid-1.6.1-mkdir.patch similarity index 100% rename from SOURCES/uuid-1.6.1-mkdir.patch rename to uuid-1.6.1-mkdir.patch diff --git a/SOURCES/uuid-1.6.1-ossp.patch b/uuid-1.6.1-ossp.patch similarity index 100% rename from SOURCES/uuid-1.6.1-ossp.patch rename to uuid-1.6.1-ossp.patch diff --git a/SOURCES/uuid-1.6.2-hwaddr.patch b/uuid-1.6.2-hwaddr.patch similarity index 100% rename from SOURCES/uuid-1.6.2-hwaddr.patch rename to uuid-1.6.2-hwaddr.patch diff --git a/SOURCES/uuid-1.6.2-ldflagsfix.patch b/uuid-1.6.2-ldflags.patch similarity index 82% rename from SOURCES/uuid-1.6.2-ldflagsfix.patch rename to uuid-1.6.2-ldflags.patch index 60082a9..1d0ae2d 100644 --- a/SOURCES/uuid-1.6.2-ldflagsfix.patch +++ b/uuid-1.6.2-ldflags.patch @@ -1,6 +1,6 @@ -diff -up uuid-1.6.2/Makefile.in.ldflagsfix uuid-1.6.2/Makefile.in ---- uuid-1.6.2/Makefile.in.ldflagsfix 2018-10-02 14:55:42.239927382 +0200 -+++ uuid-1.6.2/Makefile.in 2018-10-02 14:55:42.267927246 +0200 +diff -up uuid-1.6.2/Makefile.in.ldflags uuid-1.6.2/Makefile.in +--- uuid-1.6.2/Makefile.in.ldflags 2022-01-24 20:53:01.992171989 +0100 ++++ uuid-1.6.2/Makefile.in 2022-01-24 20:53:02.025171559 +0100 @@ -112,15 +112,15 @@ all: $(TARGETS) @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< diff --git a/SOURCES/uuid-1.6.2-manfix.patch b/uuid-1.6.2-manfix.patch similarity index 100% rename from SOURCES/uuid-1.6.2-manfix.patch rename to uuid-1.6.2-manfix.patch diff --git a/SOURCES/uuid-1.6.2-nostrip.patch b/uuid-1.6.2-nostrip.patch similarity index 100% rename from SOURCES/uuid-1.6.2-nostrip.patch rename to uuid-1.6.2-nostrip.patch diff --git a/SOURCES/uuid-1.6.2-php54.patch b/uuid-1.6.2-php54.patch similarity index 100% rename from SOURCES/uuid-1.6.2-php54.patch rename to uuid-1.6.2-php54.patch diff --git a/SOURCES/uuid-aarch64.patch b/uuid-aarch64.patch similarity index 100% rename from SOURCES/uuid-aarch64.patch rename to uuid-aarch64.patch diff --git a/SPECS/uuid.spec b/uuid.spec similarity index 75% rename from SPECS/uuid.spec rename to uuid.spec index 3454fdb..f27f550 100644 --- a/SPECS/uuid.spec +++ b/uuid.spec @@ -6,10 +6,9 @@ Name: uuid Version: 1.6.2 -Release: 43%{?dist} +Release: 65%{?dist} Summary: Universally Unique Identifier library License: MIT -Group: System Environment/Libraries URL: http://www.ossp.org/pkg/lib/uuid/ Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz Patch0: uuid-1.6.1-ossp.patch @@ -21,12 +20,14 @@ Patch3: uuid-1.6.2-hwaddr.patch # do not strip binaries Patch4: uuid-1.6.2-nostrip.patch -Patch5: uuid-1.6.2-manfix.patch -Patch6: uuid-aarch64.patch -Patch7: uuid-1.6.2-ldflagsfix.patch -Patch8: uuid-1.6.2-vaendfix.patch +Patch5: uuid-1.6.2-manfix.patch +Patch6: uuid-aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# use ldflags for libs too +Patch7: uuid-1.6.2-ldflags.patch + +BuildRequires: make +BuildRequires: gcc-c++ BuildRequires: libtool Obsoletes: %{name}-pgsql < 1.6.2-24 @@ -44,7 +45,6 @@ Data::UUID APIs. %package devel Summary: Development support for Universally Unique Identifier library -Group: Development/Libraries Requires: pkgconfig Requires: %{name} = %{version}-%{release} @@ -53,7 +53,6 @@ Development headers and libraries for OSSP uuid. %package c++ Summary: C++ support for Universally Unique Identifier library -Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description c++ @@ -61,7 +60,6 @@ C++ libraries for OSSP uuid. %package c++-devel Summary: C++ development support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name}-c++ = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} @@ -70,13 +68,21 @@ C++ development headers and libraries for OSSP uuid. %package perl Summary: Perl support for Universally Unique Identifier library -Group: Development/Libraries BuildRequires: perl-devel BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(Carp) +BuildRequires: perl(Config) BuildRequires: perl(Data::UUID) +BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(IO::File) +BuildRequires: perl(MIME::Base64) +BuildRequires: perl(strict) BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Tie::Scalar) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) Requires: %{name} = %{version}-%{release} Requires: perl(Data::UUID) @@ -85,7 +91,6 @@ Perl OSSP uuid module. %package dce Summary: DCE support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description dce @@ -93,7 +98,6 @@ DCE OSSP uuid library. %package dce-devel Summary: DCE development support for Universally Unique Identifier library -Group: Development/Libraries Requires: %{name}-dce = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} @@ -102,15 +106,14 @@ DCE development headers and libraries for OSSP uuid. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .php54 -%patch3 -p1 -b .hwaddr -%patch4 -p1 -b .nostrip -%patch5 -p1 -b .manfix -%patch6 -p1 -b .aarch64 -%patch7 -p1 -b .ldflagsfix -%patch8 -p1 -b .vaendfix +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 -b .php54 +%patch -P3 -p1 -b .hwaddr +%patch -P4 -p1 -b .nostrip +%patch -P5 -p1 -b .manfix +%patch -P6 -p1 -b .aarch64 +%patch -P7 -p1 -b .ldflags %build # Build the library. @@ -119,8 +122,7 @@ export DCE_NAME=libossp-uuid_dce.la export CXX_NAME=libossp-uuid++.la export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" + %configure \ --disable-static \ --without-perl \ @@ -129,7 +131,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" --with-cxx \ --without-pgsql -make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} +make LIBTOOL=/usr/bin/libtool CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" %{?_smp_mflags} # Build the Perl module. pushd perl @@ -156,13 +158,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* popd -# fix multilib issues -cp $RPM_BUILD_ROOT/%{_bindir}/uuid-config $RPM_BUILD_ROOT/%{_bindir}/uuid-config.$(uname -m) -cat >$RPM_BUILD_ROOT/%{_bindir}/uuid-config < - 1.6.2-43 -- fix multilib compatibility (#1853169) +* Tue Oct 29 2024 Troy Dawson - 1.6.2-65 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Mon Oct 15 2018 Michal Hlavinka - 1.6.2-42 -- fix coverity scan found issues (#1602724) +* Thu Aug 08 2024 Troy Dawson - 1.6.2-64 +- Bump release for Aug 2024 java mass rebuild -* Tue Oct 02 2018 Michal Hlavinka - 1.6.2-41 -- make sure ldflags are used (#1630635) +* Mon Jun 24 2024 Troy Dawson - 1.6.2-63 +- Bump release for June 2024 mass rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.6.2-62 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Oct 20 2023 Sérgio Basto - 1.6.2-61 +- Use standard Fedora linker flags (bug #1548666) + https://src.fedoraproject.org/rpms/uuid/pull-request/1 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.6.2-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 1.6.2-59 +- Perl 5.38 rebuild + +* Wed Apr 26 2023 Michal Hlavinka - 1.6.2-58 +- update license tag format (SPDX migration) for https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.6.2-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.6.2-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 31 2022 Jitka Plesnikova - 1.6.2-55 +- Perl 5.36 rebuild + +* Mon Jan 24 2022 Michal Hlavinka - 1.6.2-54 +- make sure LDFLAGS are used during build + +* Sat Jan 22 2022 Fedora Release Engineering - 1.6.2-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.6.2-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.6.2-51 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.6.2-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.2-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 1.6.2-48 +- Perl 5.32 rebuild + +* Mon Mar 16 2020 Jitka Plesnikova - 1.6.2-47 +- Specify all perl dependencies + +* Fri Jan 31 2020 Fedora Release Engineering - 1.6.2-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.6.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 31 2019 Jitka Plesnikova - 1.6.2-44 +- Perl 5.30 rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.6.2-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Jitka Plesnikova - 1.6.2-41 +- Perl 5.28 rebuild * Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild