Add packer tool SPEC and remove packer symlink in cracklib-dicts conflicts with packer tool (#3131)
* Add packer SPEC to Mariner * Remove packer symlink not necessary conflicts with Packer tool * Bump up version python3-cracklib in tool chain * Correct typo in cracklib spec file
This commit is contained in:
parent
e32438e241
commit
d739589153
File diff suppressed because one or more lines are too long
|
@ -2013,6 +2013,7 @@
|
|||
"nmi",
|
||||
"node-problem-detector",
|
||||
"ntopng",
|
||||
"packer",
|
||||
"pcaudiolib",
|
||||
"pcre2",
|
||||
"perl-Test-Warnings",
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
Summary: A password strength-checking library.
|
||||
Name: cracklib
|
||||
Version: 2.9.7
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Group: System Environment/Libraries
|
||||
URL: https://github.com/cracklib/cracklib
|
||||
License: LGPLv2+
|
||||
|
@ -117,7 +117,6 @@ util/cracklib-format dicts/cracklib* | util/cracklib-packer $RPM_BUILD_ROOT/%{_d
|
|||
echo password | util/cracklib-packer $RPM_BUILD_ROOT/%{_datadir}/cracklib/empty
|
||||
rm -f $RPM_BUILD_ROOT/%{_datadir}/cracklib/cracklib-small
|
||||
ln -s cracklib-format $RPM_BUILD_ROOT/%{_sbindir}/mkdict
|
||||
ln -s cracklib-packer $RPM_BUILD_ROOT/%{_sbindir}/packer
|
||||
|
||||
pushd python
|
||||
python3 setup.py install --skip-build --root %{buildroot}
|
||||
|
@ -185,6 +184,9 @@ rm -f %{_datadir}/cracklib/pw_dict.pwi
|
|||
%{_datadir}/locale/*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 06 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 2.9.7-5
|
||||
- Remove packer symlink- not necessary, conflicts with Hashicorp's packer tool
|
||||
|
||||
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.9.7-4
|
||||
- Removing the explicit %%clean stage.
|
||||
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"packer-1.8.1.tar.gz": "2a264119f7bdeeb82e79e0c9a02e4fa3d9bdf3e984c47e0c89ca2856eecb3b88",
|
||||
"packer-1.8.1-vendor.tar.gz": "e9c56ee2307590ab771cc943eb9948c4aee3de95189eae7a1e153e999d88d704"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,65 @@
|
|||
Summary: Tool for creating identical machine images for multiple platforms from a single source configuration.
|
||||
Name: packer
|
||||
Version: 1.8.1
|
||||
Release: 1%{?dist}
|
||||
License: MPLv2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: Applications/Tools
|
||||
URL: https://github.com/hashicorp/packer
|
||||
Source0: https://github.com/hashicorp/packer/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# Below is a manually created tarball, no download link.
|
||||
# We're using pre-populated Go modules from this tarball, since network is disabled during build time.
|
||||
# How to re-build this file:
|
||||
# 1. wget https://github.com/hashicorp/packer/archive/v%{version}.tar.gz -O %%{name}-%%{version}.tar.gz
|
||||
# 2. tar -xf %%{name}-%%{version}.tar.gz
|
||||
# 3. cd %%{name}-%%{version}
|
||||
# 4. go mod vendor
|
||||
# 5. tar --sort=name \
|
||||
# --mtime="2021-04-26 00:00Z" \
|
||||
# --owner=0 --group=0 --numeric-owner \
|
||||
# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
|
||||
# -cf %%{name}-%%{version}-vendor.tar.gz vendor
|
||||
#
|
||||
# NOTES:
|
||||
# - You require GNU tar version 1.28+.
|
||||
# - The additional options enable generation of a tarball with the same hash every time regardless of the environment.
|
||||
# See: https://reproducible-builds.org/docs/archives/
|
||||
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
|
||||
Source1: %{name}-%{version}-vendor.tar.gz
|
||||
|
||||
BuildRequires: golang >= 1.17.1
|
||||
BuildRequires: kernel-headers
|
||||
BuildRequires: glibc-devel
|
||||
%global debug_package %{nil}
|
||||
%define our_gopath %{_topdir}/.gopath
|
||||
|
||||
%description
|
||||
Packer is a tool for building identical machine images for multiple platforms from a single source configuration.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
tar --no-same-owner -xf %{SOURCE1}
|
||||
export GOPATH=%{our_gopath}
|
||||
go build -mod=vendor -v -a -o packer
|
||||
|
||||
%install
|
||||
install -m 755 -d %{buildroot}%{_bindir}
|
||||
install -p -m 755 -t %{buildroot}%{_bindir} ./packer/packer
|
||||
|
||||
%check
|
||||
go test -mod=vendor
|
||||
./packer/packer -help
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%doc README.md CHANGELOG.md
|
||||
%{_bindir}/packer
|
||||
|
||||
%changelog
|
||||
* Tue Jun 06 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 1.8.1-1
|
||||
- Original version for CBL-Mariner.
|
||||
- License verified.
|
|
@ -13709,6 +13709,16 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "packer",
|
||||
"version": "1.8.1",
|
||||
"downloadUrl": "https://github.com/hashicorp/packer/archive/v1.8.1.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
|
|
|
@ -36,11 +36,11 @@ coreutils-lang-8.32-3.cm2.aarch64.rpm
|
|||
cpio-2.13-4.cm2.aarch64.rpm
|
||||
cpio-debuginfo-2.13-4.cm2.aarch64.rpm
|
||||
cpio-lang-2.13-4.cm2.aarch64.rpm
|
||||
cracklib-2.9.7-4.cm2.aarch64.rpm
|
||||
cracklib-debuginfo-2.9.7-4.cm2.aarch64.rpm
|
||||
cracklib-devel-2.9.7-4.cm2.aarch64.rpm
|
||||
cracklib-dicts-2.9.7-4.cm2.aarch64.rpm
|
||||
cracklib-lang-2.9.7-4.cm2.aarch64.rpm
|
||||
cracklib-2.9.7-5.cm2.aarch64.rpm
|
||||
cracklib-debuginfo-2.9.7-5.cm2.aarch64.rpm
|
||||
cracklib-devel-2.9.7-5.cm2.aarch64.rpm
|
||||
cracklib-dicts-2.9.7-5.cm2.aarch64.rpm
|
||||
cracklib-lang-2.9.7-5.cm2.aarch64.rpm
|
||||
createrepo_c-0.17.5-1.cm2.aarch64.rpm
|
||||
createrepo_c-debuginfo-0.17.5-1.cm2.aarch64.rpm
|
||||
createrepo_c-devel-0.17.5-1.cm2.aarch64.rpm
|
||||
|
@ -501,7 +501,7 @@ pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm
|
|||
python-markupsafe-debuginfo-2.1.0-1.cm2.aarch64.rpm
|
||||
python3-3.9.12-1.cm2.aarch64.rpm
|
||||
python3-audit-3.0.6-6.cm2.aarch64.rpm
|
||||
python3-cracklib-2.9.7-4.cm2.aarch64.rpm
|
||||
python3-cracklib-2.9.7-5.cm2.aarch64.rpm
|
||||
python3-curses-3.9.12-1.cm2.aarch64.rpm
|
||||
python3-Cython-0.29.26-1.cm2.aarch64.rpm
|
||||
python3-debuginfo-3.9.12-1.cm2.aarch64.rpm
|
||||
|
|
|
@ -36,11 +36,11 @@ coreutils-lang-8.32-3.cm2.x86_64.rpm
|
|||
cpio-2.13-4.cm2.x86_64.rpm
|
||||
cpio-debuginfo-2.13-4.cm2.x86_64.rpm
|
||||
cpio-lang-2.13-4.cm2.x86_64.rpm
|
||||
cracklib-2.9.7-4.cm2.x86_64.rpm
|
||||
cracklib-debuginfo-2.9.7-4.cm2.x86_64.rpm
|
||||
cracklib-devel-2.9.7-4.cm2.x86_64.rpm
|
||||
cracklib-dicts-2.9.7-4.cm2.x86_64.rpm
|
||||
cracklib-lang-2.9.7-4.cm2.x86_64.rpm
|
||||
cracklib-2.9.7-5.cm2.x86_64.rpm
|
||||
cracklib-debuginfo-2.9.7-5.cm2.x86_64.rpm
|
||||
cracklib-devel-2.9.7-5.cm2.x86_64.rpm
|
||||
cracklib-dicts-2.9.7-5.cm2.x86_64.rpm
|
||||
cracklib-lang-2.9.7-5.cm2.x86_64.rpm
|
||||
createrepo_c-0.17.5-1.cm2.x86_64.rpm
|
||||
createrepo_c-debuginfo-0.17.5-1.cm2.x86_64.rpm
|
||||
createrepo_c-devel-0.17.5-1.cm2.x86_64.rpm
|
||||
|
@ -501,7 +501,7 @@ pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm
|
|||
python-markupsafe-debuginfo-2.1.0-1.cm2.x86_64.rpm
|
||||
python3-3.9.12-1.cm2.x86_64.rpm
|
||||
python3-audit-3.0.6-6.cm2.x86_64.rpm
|
||||
python3-cracklib-2.9.7-4.cm2.x86_64.rpm
|
||||
python3-cracklib-2.9.7-5.cm2.x86_64.rpm
|
||||
python3-curses-3.9.12-1.cm2.x86_64.rpm
|
||||
python3-Cython-0.29.26-1.cm2.x86_64.rpm
|
||||
python3-debuginfo-3.9.12-1.cm2.x86_64.rpm
|
||||
|
|
Loading…
Reference in New Issue