rpms
/
uuid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: rpms:imports/c9-beta/uuid-1.6.2-55.el9
Branches Tags
rpms:c8
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8s
rpms:imports/c9/uuid-1.6.2-55.el9
rpms:imports/c9-beta/uuid-1.6.2-55.el9
rpms:imports/c9-beta/uuid-1.6.2-53.el9
rpms:imports/c8-beta/uuid-1.6.2-43.el8
rpms:imports/c8-beta/uuid-1.6.2-42.el8
rpms:imports/c8s/uuid-1.6.2-43.el8
rpms:imports/c8/uuid-1.6.2-43.el8
rpms:imports/c8/uuid-1.6.2-42.el8
...
compare: rpms:c8
Branches Tags
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8s
rpms:c8
rpms:imports/c9/uuid-1.6.2-55.el9
rpms:imports/c9-beta/uuid-1.6.2-55.el9
rpms:imports/c9-beta/uuid-1.6.2-53.el9
rpms:imports/c8-beta/uuid-1.6.2-43.el8
rpms:imports/c8-beta/uuid-1.6.2-42.el8
rpms:imports/c8s/uuid-1.6.2-43.el8
rpms:imports/c8/uuid-1.6.2-43.el8
rpms:imports/c8/uuid-1.6.2-42.el8

No commits in common. "imports/c9-beta/uuid-1.6.2-55.el9" and "c8" have entirely different histories.
imports/c9 ... c8

3 changed files with 64 additions and 66 deletions
Show Stats Expand all files Collapse all files

6
SOURCES/uuid-1.6.2-ldflags.patch → SOURCES/uuid-1.6.2-ldflagsfix.patch
View File

@ -1,6 +1,6 @@
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
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
@@ -112,15 +112,15 @@ all: $(TARGETS)
@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<

19
SOURCES/uuid-1.6.2-vaendfix.patch Normal file
View File

@ -0,0 +1,19 @@
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);

105
SPECS/uuid.spec
View File

@ -6,9 +6,10 @@
Name: uuid
Version: 1.6.2
Release: 55%{?dist}
Release: 43%{?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
@ -20,14 +21,12 @@ 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
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
# use ldflags for libs too
Patch7: uuid-1.6.2-ldflags.patch
BuildRequires: make
BuildRequires: gcc-c++
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
Obsoletes: %{name}-pgsql < 1.6.2-24
@ -45,6 +44,7 @@ Data::UUID APIs.
%package devel
Summary: Development support for Universally Unique Identifier library
Group: Development/Libraries
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
@ -53,6 +53,7 @@ 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++
@ -60,6 +61,7 @@ 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}
@ -68,21 +70,12 @@ 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)
BuildRequires: perl(Tie::Scalar)
BuildRequires: perl(warnings)
BuildRequires: perl(XSLoader)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: %{name} = %{version}-%{release}
Requires: perl(Data::UUID)
@ -92,6 +85,7 @@ Perl OSSP uuid module.
%package dce
Summary: DCE support for Universally Unique Identifier library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description dce
@ -99,6 +93,7 @@ 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}
@ -114,7 +109,8 @@ DCE development headers and libraries for OSSP uuid.
%patch4 -p1 -b .nostrip
%patch5 -p1 -b .manfix
%patch6 -p1 -b .aarch64
%patch7 -p1 -b .ldflags
%patch7 -p1 -b .ldflagsfix
%patch8 -p1 -b .vaendfix
%build
# Build the library.
@ -125,7 +121,6 @@ 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"
export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}"
%configure \
--disable-static \
--without-perl \
@ -178,11 +173,23 @@ perl -MData::UUID -e 'print "Testing compatibility of Data::UUID version $Data::
LD_LIBRARY_PATH=../.libs make test TEST_FILES=uuid_compat.ts
popd
%ldconfig_scriptlets
%ldconfig_scriptlets c++
%ldconfig_scriptlets dce
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%post c++ -p /sbin/ldconfig
%post dce -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun c++ -p /sbin/ldconfig
%postun dce -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
%{_bindir}/uuid
%{_libdir}/libossp-uuid.so.*
@ -190,6 +197,7 @@ popd
%exclude %{_mandir}/man1/uuid-config.*
%files devel
%defattr(-,root,root,-)
%{_bindir}/uuid-config*
%{_includedir}/uuid.h
%{_libdir}/libossp-uuid.so
@ -198,68 +206,39 @@ popd
%{_mandir}/man1/uuid-config.*
%files c++
%defattr(-,root,root,-)
%{_libdir}/libossp-uuid++.so.*
%files c++-devel
%defattr(-,root,root,-)
%{_includedir}/uuid++.hh
%{_libdir}/libossp-uuid++.so
%{_mandir}/man3/uuid++.3*
%files perl
%defattr(-,root,root,-)
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/OSSP*
%{_mandir}/man3/OSSP::uuid.3*
%files dce
%defattr(-,root,root,-)
%{_libdir}/libossp-uuid_dce.so.*
%files dce-devel
%defattr(-,root,root,-)
%{_includedir}/uuid_dce.h
%{_libdir}/libossp-uuid_dce.so
%changelog
* Thu Feb 24 2022 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-55
- fix build flags (#2044896)
* Fri Oct 30 2020 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-43
- fix multilib compatibility (#1853169)
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.2-53
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Oct 15 2018 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-42
- fix coverity scan found issues (#1602724)
* Fri Aug 6 2021 Florian Weimer <fweimer@redhat.com> - 1.6.2-52
- Rebuild to pick up new build flags from redhat-rpm-config (#1984652)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.2-51
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-49
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-48
- Perl 5.32 rebuild
* Mon Mar 16 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-47
- Specify all perl dependencies
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-44
- Perl 5.30 rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.6.2-41
- Perl 5.28 rebuild
* Tue Oct 02 2018 Michal Hlavinka <mhlavink@redhat.com> - 1.6.2-41
- make sure ldflags are used (#1630635)
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild