[dev] `cyrus-sasl`: adding and splitting subpackages (second attempt) (#1401)
This commit is contained in:
Pawel Winogrodzki
GitHub
Родитель
c705c193d9
Коммит
bd5407103a
|
|
@ -1,7 +1,10 @@
|
|||
%define _soversion 3
|
||||
%global _plugindir2 %{_libdir}/sasl2
|
||||
|
||||
Summary: Cyrus Simple Authentication Service Layer (SASL) library
|
||||
Name: cyrus-sasl
|
||||
Version: 2.1.27
|
||||
Release: 5%{?dist}
|
||||
Release: 9%{?dist}
|
||||
License: BSD with advertising
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -12,19 +15,22 @@ Patch0: CVE-2019-19906.patch
|
|||
# CVE-2020-8032 only applies to the packaging of openSUSE's version of cyrus-sasl
|
||||
# https://bugzilla.suse.com/show_bug.cgi?id=1180669
|
||||
Patch1: CVE-2020-8032.nopatch
|
||||
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: krb5-devel >= 1.12
|
||||
BuildRequires: mariadb-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: postgresql-libs
|
||||
BuildRequires: systemd
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Requires: krb5 >= 1.12
|
||||
Requires: openssl
|
||||
Requires: pam
|
||||
Requires: systemd
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
Provides: %{name}-gssapi = %{version}-%{release}
|
||||
Provides: %{name}-gssapi%{?_isa} = %{version}-%{release}
|
||||
Provides: %{name}-plain = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The Cyrus SASL package contains a Simple Authentication and Security
|
||||
|
|
@ -35,31 +41,150 @@ optionally negotiating protection of subsequent protocol interactions.
|
|||
If its use is negotiated, a security layer is inserted between the
|
||||
protocol and the connection.
|
||||
|
||||
%package devel
|
||||
Summary: Files needed for developing applications with Cyrus SASL
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Requires: pkg-config
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains files needed for developing and
|
||||
compiling applications which use the Cyrus SASL library.
|
||||
|
||||
%package gs2
|
||||
Summary: GS2 support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description gs2
|
||||
The %{name}-gs2 package contains the Cyrus SASL plugin which supports
|
||||
the GS2 authentication scheme.
|
||||
|
||||
%package gssapi
|
||||
Summary: GSSAPI authentication support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description gssapi
|
||||
The %{name}-gssapi package contains the Cyrus SASL plugins which
|
||||
support GSSAPI authentication. GSSAPI is commonly used for Kerberos
|
||||
authentication.
|
||||
|
||||
%package ldap
|
||||
Summary: LDAP auxprop support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description ldap
|
||||
The %{name}-ldap package contains the Cyrus SASL plugin which supports using
|
||||
a directory server, accessed using LDAP, for storing shared secrets.
|
||||
|
||||
%package lib
|
||||
Summary: Shared libraries needed by applications which use Cyrus SASL
|
||||
|
||||
%description lib
|
||||
The %{name}-lib package contains shared libraries which are needed by
|
||||
applications which use the Cyrus SASL library.
|
||||
|
||||
%package md5
|
||||
Summary: CRAM-MD5 and DIGEST-MD5 authentication support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description md5
|
||||
The %{name}-md5 package contains the Cyrus SASL plugins which support
|
||||
CRAM-MD5 and DIGEST-MD5 authentication schemes.
|
||||
|
||||
%package ntlm
|
||||
Summary: NTLM authentication support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description ntlm
|
||||
The %{name}-ntlm package contains the Cyrus SASL plugin which supports
|
||||
the NTLM authentication scheme.
|
||||
|
||||
%package plain
|
||||
Summary: PLAIN and LOGIN authentication support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description plain
|
||||
The %{name}-plain package contains the Cyrus SASL plugins which support
|
||||
PLAIN and LOGIN authentication schemes.
|
||||
|
||||
%package scram
|
||||
Summary: SCRAM auxprop support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description scram
|
||||
The %{name}-scram package contains the Cyrus SASL plugin which supports
|
||||
the SCRAM authentication scheme.
|
||||
|
||||
%package sql
|
||||
Summary: SQL auxprop support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
|
||||
%description sql
|
||||
The %{name}-sql package contains the Cyrus SASL plugin which supports
|
||||
using a RDBMS for storing shared secrets.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# Find the MySQL libraries used needed by the SQL auxprop plugin.
|
||||
INC_DIR="`mysql_config --include`"
|
||||
if test x"$INC_DIR" != "x-I%{_includedir}"; then
|
||||
CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
|
||||
fi
|
||||
LIB_DIR="`mysql_config --libs | sed -e 's,-[^L][^ ]*,,g' -e 's,^ *,,' -e 's, *$,,' -e 's, *, ,g'`"
|
||||
if test x"$LIB_DIR" != "x-L%{_libdir}"; then
|
||||
LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
|
||||
fi
|
||||
|
||||
# Find the PostgreSQL libraries used needed by the SQL auxprop plugin.
|
||||
INC_DIR="-I`pg_config --includedir`"
|
||||
if test x"$INC_DIR" != "x-I%{_includedir}"; then
|
||||
CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
|
||||
fi
|
||||
LIB_DIR="-L`pg_config --libdir`"
|
||||
if test x"$LIB_DIR" != "x-L%{_libdir}"; then
|
||||
LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
|
||||
fi
|
||||
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
CFLAGS="%{optflags} -fPIC" \
|
||||
CXXFLAGS="%{optflags}" \
|
||||
--with-plugindir=%{_libdir}/sasl2 \
|
||||
--without-dblib \
|
||||
--disable-macos-framework \
|
||||
--disable-otp \
|
||||
--disable-sample \
|
||||
--disable-srp \
|
||||
--disable-static \
|
||||
--enable-anon \
|
||||
--enable-digest \
|
||||
--enable-fast-install \
|
||||
--enable-gss_mutexes \
|
||||
--enable-krb4 \
|
||||
--enable-ldapdb \
|
||||
--enable-login \
|
||||
--enable-ntlm \
|
||||
--enable-plain \
|
||||
--enable-shared \
|
||||
--enable-sql \
|
||||
--with-bdb=db \
|
||||
--with-dblib=berkeley \
|
||||
--with-ldap \
|
||||
--with-mysql=yes \
|
||||
--with-pgsql=yes \
|
||||
--with-plugindir=%{_plugindir2} \
|
||||
--with-saslauthd=/run/saslauthd \
|
||||
--without-authdaemond \
|
||||
--disable-macos-framework \
|
||||
--disable-sample \
|
||||
--disable-digest \
|
||||
--disable-otp \
|
||||
--enable-plain \
|
||||
--enable-login \
|
||||
--disable-anon \
|
||||
--enable-srp \
|
||||
--enable-gss_mutexes \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--enable-fast-install \
|
||||
--enable-krb4
|
||||
--without-sqlite
|
||||
|
||||
make
|
||||
|
||||
|
|
@ -124,16 +249,79 @@ make %{?_smp_mflags} check
|
|||
%{_sysconfdir}/sysconfig/saslauthd
|
||||
/lib/systemd/system/saslauthd.service
|
||||
%{_libdir}/systemd/system-preset/50-saslauthd.preset
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so*
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_libdir}/sasl2/*
|
||||
%{_sbindir}/*
|
||||
%{_mandir}/man3/*
|
||||
%{_datadir}/licenses/%{name}/LICENSE
|
||||
%{_mandir}/man8/saslauthd.8.gz
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*
|
||||
%{_libdir}/libsasl2.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files gs2
|
||||
%{_plugindir2}/libgs2.so
|
||||
%{_plugindir2}/libgs2.so.%{_soversion}*
|
||||
|
||||
%files gssapi
|
||||
%{_plugindir2}/libgssapiv2.so
|
||||
%{_plugindir2}/libgssapiv2.so.%{_soversion}*
|
||||
|
||||
%files ldap
|
||||
%{_plugindir2}/libldapdb.so
|
||||
%{_plugindir2}/libldapdb.so.%{_soversion}*
|
||||
|
||||
%files lib
|
||||
%license COPYING
|
||||
%doc AUTHORS doc/html/*.html
|
||||
%{_libdir}/libsasl2.so.%{_soversion}*
|
||||
%dir %{_plugindir2}/
|
||||
%{_plugindir2}/libanonymous.so
|
||||
%{_plugindir2}/libanonymous.so.%{_soversion}*
|
||||
%{_plugindir2}/libsasldb.so
|
||||
%{_plugindir2}/libsasldb.so.%{_soversion}*
|
||||
%{_sbindir}/saslpasswd2
|
||||
%{_sbindir}/sasldblistusers2
|
||||
|
||||
%files md5
|
||||
%{_plugindir2}/libcrammd5.so
|
||||
%{_plugindir2}/libcrammd5.so.%{_soversion}*
|
||||
%{_plugindir2}/libdigestmd5.so
|
||||
%{_plugindir2}/libdigestmd5.so.%{_soversion}*
|
||||
|
||||
%files ntlm
|
||||
%{_plugindir2}/libntlm.so
|
||||
%{_plugindir2}/libntlm.so.%{_soversion}*
|
||||
|
||||
%files plain
|
||||
%{_plugindir2}/liblogin.so
|
||||
%{_plugindir2}/liblogin.so.%{_soversion}*
|
||||
%{_plugindir2}/libplain.so
|
||||
%{_plugindir2}/libplain.so.%{_soversion}*
|
||||
|
||||
%files scram
|
||||
%{_plugindir2}/libscram.so
|
||||
%{_plugindir2}/libscram.so.%{_soversion}*
|
||||
|
||||
%files sql
|
||||
%{_plugindir2}/libsql.so
|
||||
%{_plugindir2}/libsql.so.%{_soversion}*
|
||||
|
||||
%changelog
|
||||
* Tue Sep 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.27-9
|
||||
- Introduced following subpackages using Fedora 32 (license: MIT) specs as guidance:
|
||||
- cyrus-sasl-gs2,
|
||||
- cyrus-sasl-ldap,
|
||||
- cyrus-sasl-lib,
|
||||
- cyrus-sasl-md5,
|
||||
- cyrus-sasl-ntlm,
|
||||
- cyrus-sasl-plain,
|
||||
- cyrus-sasl-scram,
|
||||
- cyrus-sasl-sql.
|
||||
- Moving common libs into the "*-devel" and "*-libs" subpackages.
|
||||
- Moving MD5 plug-in libs into the "*-md5" subpackage.
|
||||
- Removed SRP libs as they were unused.
|
||||
|
||||
* Fri Apr 02 2021 Thomas Crain <thcrain@microsoft.com> - 2.1.27-8
|
||||
- Merge the following releases from 1.0 to dev branch
|
||||
- thcrain@microsoft.com, 2.1.27-5: Add nopatch for CVE-2020-8032, Lint spec
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
Summary: The Apache Kafka C library
|
||||
Name: librdkafka
|
||||
Version: 1.4.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
# files like src/crc32c.c are under zlib license
|
||||
# files like win32/wingetopt.c are under ISC
|
||||
# files like src/rdfnv1a.c are under Public Domain
|
||||
|
|
@ -17,7 +17,7 @@ Group: Development/Libraries/C and C++
|
|||
URL: https://github.com/edenhill/librdkafka
|
||||
#Source0: https://github.com/edenhill/%{name}/archive/v%{version}.tar.gz
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
BuildRequires: cyrus-sasl
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: gcc >= 4.1
|
||||
BuildRequires: libstdc++-devel
|
||||
BuildRequires: openssl-devel
|
||||
|
|
@ -95,6 +95,9 @@ rm -rf %{buildroot}
|
|||
%{_libdir}/pkgconfig/rdkafka++-static.pc
|
||||
|
||||
%changelog
|
||||
* Tue Sep 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.0-2
|
||||
- Updating BRs to pull in "cyrus-sasl-devel".
|
||||
|
||||
* Mon Jan 04 2021 Henry Li <lihl@microsoft.com> - 1.2.0-1
|
||||
- Initial CBL-Mariner import from Magnus Edenhill Open Source (license: BSD).
|
||||
- License verified.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Summary: OpenLDAP (Lightweight Directory Access Protocol)
|
||||
Name: openldap
|
||||
Version: 2.4.57
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: OpenLDAP
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -14,11 +14,9 @@ Patch0: openldap-2.4.40-gssapi-1.patch
|
|||
Patch1: openldap-2.4.44-consolidated-2.patch
|
||||
Patch2: CVE-2015-3276.patch
|
||||
Patch3: CVE-2021-27212.patch
|
||||
BuildRequires: cyrus-sasl >= 2.1
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: groff
|
||||
BuildRequires: openssl-devel >= 1.0.1
|
||||
Requires: cyrus-sasl >= 2.1
|
||||
Requires: openssl >= 1.0.1
|
||||
Provides: %{name}-clients = %{version}-%{release}
|
||||
Provides: %{name}-compat = %{version}-%{release}
|
||||
|
|
@ -44,7 +42,8 @@ export CPPFLAGS="-D_REENTRANT -DLDAP_CONNECTIONLESS -D_GNU_SOURCE -D_AVL_H"
|
|||
--disable-static \
|
||||
--disable-debug \
|
||||
--disable-slapd \
|
||||
--with-tls=openssl
|
||||
--with-tls=openssl \
|
||||
--without-cyrus-sasl
|
||||
%make_build depend
|
||||
%make_build
|
||||
|
||||
|
|
@ -71,6 +70,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
%{_sysconfdir}/openldap/*
|
||||
|
||||
%changelog
|
||||
* Tue Sep 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.4.57-5
|
||||
- Removing dependency on "cyrus-sasl".
|
||||
|
||||
* Fri Jul 23 2021 Thomas Crain <thcrain@microsoft.com> - 2.4.57-4
|
||||
- Add clients, compat subpackage provides from base package
|
||||
- Minor macro linting
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Programs for handling passwords in a secure way
|
||||
Name: shadow-utils
|
||||
Version: 4.9
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: BSD
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -31,6 +31,7 @@ BuildRequires: cracklib-devel
|
|||
BuildRequires: libselinux-devel
|
||||
BuildRequires: libsemanage-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: pam-devel
|
||||
Requires: cracklib
|
||||
Requires: libselinux
|
||||
|
|
@ -150,27 +151,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
%{_bindir}/*
|
||||
%{_sbindir}/*
|
||||
/bin/passwd
|
||||
%{_mandir}/man1
|
||||
%{_mandir}/man5
|
||||
%{_mandir}/man8
|
||||
%exclude %{_mandir}/cs
|
||||
%exclude %{_mandir}/da
|
||||
%exclude %{_mandir}/de
|
||||
%exclude %{_mandir}/fi
|
||||
%exclude %{_mandir}/fr
|
||||
%exclude %{_mandir}/hu
|
||||
%exclude %{_mandir}/id
|
||||
%exclude %{_mandir}/it
|
||||
%exclude %{_mandir}/ja
|
||||
%exclude %{_mandir}/ko
|
||||
%exclude %{_mandir}/man3
|
||||
%exclude %{_mandir}/pl
|
||||
%exclude %{_mandir}/pt_BR
|
||||
%exclude %{_mandir}/ru
|
||||
%exclude %{_mandir}/sv
|
||||
%exclude %{_mandir}/tr
|
||||
%exclude %{_mandir}/zh_CN
|
||||
%exclude %{_mandir}/zh_TW
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/*
|
||||
|
||||
%files subid
|
||||
|
|
@ -182,6 +162,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
%{_libdir}/libsubid.so
|
||||
|
||||
%changelog
|
||||
* Tue Sep 21 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.9-4
|
||||
- Adding missing BR for "libxslt".
|
||||
- Removing not built man pages.
|
||||
|
||||
* Thu Sep 16 2021 Chris PeBenito <chpebeni@microsoft.com> - 4.9-3
|
||||
- Update pam.d configuration for SELinux logins.
|
||||
- Change loginuid to be set only on logins.
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@ alsa-lib-1.2.2-2.cm2.aarch64.rpm
|
|||
alsa-lib-debuginfo-1.2.2-2.cm2.aarch64.rpm
|
||||
alsa-lib-devel-1.2.2-2.cm2.aarch64.rpm
|
||||
asciidoc-9.1.0-1.cm2.noarch.rpm
|
||||
audit-3.0-7.cm2.aarch64.rpm
|
||||
audit-debuginfo-3.0-7.cm2.aarch64.rpm
|
||||
audit-devel-3.0-7.cm2.aarch64.rpm
|
||||
audit-libs-3.0-7.cm2.aarch64.rpm
|
||||
autoconf-2.69-11.cm2.noarch.rpm
|
||||
automake-1.16.1-3.cm2.noarch.rpm
|
||||
bash-4.4.18-7.cm2.aarch64.rpm
|
||||
|
|
@ -54,8 +50,6 @@ curl-7.76.0-5.cm2.aarch64.rpm
|
|||
curl-debuginfo-7.76.0-5.cm2.aarch64.rpm
|
||||
curl-devel-7.76.0-5.cm2.aarch64.rpm
|
||||
curl-libs-7.76.0-5.cm2.aarch64.rpm
|
||||
cyrus-sasl-2.1.27-5.cm2.aarch64.rpm
|
||||
cyrus-sasl-debuginfo-2.1.27-5.cm2.aarch64.rpm
|
||||
device-mapper-2.03.05-7.cm2.aarch64.rpm
|
||||
device-mapper-devel-2.03.05-7.cm2.aarch64.rpm
|
||||
device-mapper-event-2.03.05-7.cm2.aarch64.rpm
|
||||
|
|
@ -228,10 +222,6 @@ libselinux-debuginfo-3.2-1.cm2.aarch64.rpm
|
|||
libselinux-devel-3.2-1.cm2.aarch64.rpm
|
||||
libselinux-python3-3.2-1.cm2.aarch64.rpm
|
||||
libselinux-utils-3.2-1.cm2.aarch64.rpm
|
||||
libsemanage-3.2-1.cm2.aarch64.rpm
|
||||
libsemanage-debuginfo-3.2-1.cm2.aarch64.rpm
|
||||
libsemanage-devel-3.2-1.cm2.aarch64.rpm
|
||||
libsemanage-python3-3.2-1.cm2.aarch64.rpm
|
||||
libsepol-3.2-1.cm2.aarch64.rpm
|
||||
libsepol-debuginfo-3.2-1.cm2.aarch64.rpm
|
||||
libsepol-devel-3.2-1.cm2.aarch64.rpm
|
||||
|
|
@ -313,8 +303,6 @@ openjdk8-doc-1.8.0.292-1.cm2.aarch64.rpm
|
|||
openjdk8-sample-1.8.0.292-1.cm2.aarch64.rpm
|
||||
openjdk8-src-1.8.0.292-1.cm2.aarch64.rpm
|
||||
openjre8-1.8.0.292-1.cm2.aarch64.rpm
|
||||
openldap-2.4.57-4.cm2.aarch64.rpm
|
||||
openldap-debuginfo-2.4.57-4.cm2.aarch64.rpm
|
||||
openssl-1.1.1k-5.cm2.aarch64.rpm
|
||||
openssl-debuginfo-1.1.1k-5.cm2.aarch64.rpm
|
||||
openssl-devel-1.1.1k-5.cm2.aarch64.rpm
|
||||
|
|
@ -555,7 +543,6 @@ procps-ng-debuginfo-3.3.15-5.cm2.aarch64.rpm
|
|||
procps-ng-devel-3.3.15-5.cm2.aarch64.rpm
|
||||
procps-ng-lang-3.3.15-5.cm2.aarch64.rpm
|
||||
python3-3.7.10-3.cm2.aarch64.rpm
|
||||
python3-audit-3.0-7.cm2.aarch64.rpm
|
||||
python3-cracklib-2.9.7-3.cm2.aarch64.rpm
|
||||
python3-curses-3.7.10-3.cm2.aarch64.rpm
|
||||
python3-debuginfo-3.7.10-3.cm2.aarch64.rpm
|
||||
|
|
@ -588,10 +575,6 @@ rpm-libs-4.14.2.1-4.cm2.aarch64.rpm
|
|||
sed-4.5-3.cm2.aarch64.rpm
|
||||
sed-debuginfo-4.5-3.cm2.aarch64.rpm
|
||||
sed-lang-4.5-3.cm2.aarch64.rpm
|
||||
shadow-utils-4.9-3.cm2.aarch64.rpm
|
||||
shadow-utils-debuginfo-4.9-3.cm2.aarch64.rpm
|
||||
shadow-utils-subid-4.9-3.cm2.aarch64.rpm
|
||||
shadow-utils-subid-devel-4.9-3.cm2.aarch64.rpm
|
||||
sqlite-3.34.1-1.cm2.aarch64.rpm
|
||||
sqlite-debuginfo-3.34.1-1.cm2.aarch64.rpm
|
||||
sqlite-devel-3.34.1-1.cm2.aarch64.rpm
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@ alsa-lib-1.2.2-2.cm2.x86_64.rpm
|
|||
alsa-lib-debuginfo-1.2.2-2.cm2.x86_64.rpm
|
||||
alsa-lib-devel-1.2.2-2.cm2.x86_64.rpm
|
||||
asciidoc-9.1.0-1.cm2.noarch.rpm
|
||||
audit-3.0-7.cm2.x86_64.rpm
|
||||
audit-debuginfo-3.0-7.cm2.x86_64.rpm
|
||||
audit-devel-3.0-7.cm2.x86_64.rpm
|
||||
audit-libs-3.0-7.cm2.x86_64.rpm
|
||||
autoconf-2.69-11.cm2.noarch.rpm
|
||||
automake-1.16.1-3.cm2.noarch.rpm
|
||||
bash-4.4.18-7.cm2.x86_64.rpm
|
||||
|
|
@ -54,8 +50,6 @@ curl-7.76.0-5.cm2.x86_64.rpm
|
|||
curl-debuginfo-7.76.0-5.cm2.x86_64.rpm
|
||||
curl-devel-7.76.0-5.cm2.x86_64.rpm
|
||||
curl-libs-7.76.0-5.cm2.x86_64.rpm
|
||||
cyrus-sasl-2.1.27-5.cm2.x86_64.rpm
|
||||
cyrus-sasl-debuginfo-2.1.27-5.cm2.x86_64.rpm
|
||||
device-mapper-2.03.05-7.cm2.x86_64.rpm
|
||||
device-mapper-devel-2.03.05-7.cm2.x86_64.rpm
|
||||
device-mapper-event-2.03.05-7.cm2.x86_64.rpm
|
||||
|
|
@ -228,10 +222,6 @@ libselinux-debuginfo-3.2-1.cm2.x86_64.rpm
|
|||
libselinux-devel-3.2-1.cm2.x86_64.rpm
|
||||
libselinux-python3-3.2-1.cm2.x86_64.rpm
|
||||
libselinux-utils-3.2-1.cm2.x86_64.rpm
|
||||
libsemanage-3.2-1.cm2.x86_64.rpm
|
||||
libsemanage-debuginfo-3.2-1.cm2.x86_64.rpm
|
||||
libsemanage-devel-3.2-1.cm2.x86_64.rpm
|
||||
libsemanage-python3-3.2-1.cm2.x86_64.rpm
|
||||
libsepol-3.2-1.cm2.x86_64.rpm
|
||||
libsepol-debuginfo-3.2-1.cm2.x86_64.rpm
|
||||
libsepol-devel-3.2-1.cm2.x86_64.rpm
|
||||
|
|
@ -313,8 +303,6 @@ openjdk8-doc-1.8.0.292-1.cm2.x86_64.rpm
|
|||
openjdk8-sample-1.8.0.292-1.cm2.x86_64.rpm
|
||||
openjdk8-src-1.8.0.292-1.cm2.x86_64.rpm
|
||||
openjre8-1.8.0.292-1.cm2.x86_64.rpm
|
||||
openldap-2.4.57-4.cm2.x86_64.rpm
|
||||
openldap-debuginfo-2.4.57-4.cm2.x86_64.rpm
|
||||
openssl-1.1.1k-5.cm2.x86_64.rpm
|
||||
openssl-debuginfo-1.1.1k-5.cm2.x86_64.rpm
|
||||
openssl-devel-1.1.1k-5.cm2.x86_64.rpm
|
||||
|
|
@ -555,7 +543,6 @@ procps-ng-debuginfo-3.3.15-5.cm2.x86_64.rpm
|
|||
procps-ng-devel-3.3.15-5.cm2.x86_64.rpm
|
||||
procps-ng-lang-3.3.15-5.cm2.x86_64.rpm
|
||||
python3-3.7.10-3.cm2.x86_64.rpm
|
||||
python3-audit-3.0-7.cm2.x86_64.rpm
|
||||
python3-cracklib-2.9.7-3.cm2.x86_64.rpm
|
||||
python3-curses-3.7.10-3.cm2.x86_64.rpm
|
||||
python3-debuginfo-3.7.10-3.cm2.x86_64.rpm
|
||||
|
|
@ -588,10 +575,6 @@ rpm-libs-4.14.2.1-4.cm2.x86_64.rpm
|
|||
sed-4.5-3.cm2.x86_64.rpm
|
||||
sed-debuginfo-4.5-3.cm2.x86_64.rpm
|
||||
sed-lang-4.5-3.cm2.x86_64.rpm
|
||||
shadow-utils-4.9-3.cm2.x86_64.rpm
|
||||
shadow-utils-debuginfo-4.9-3.cm2.x86_64.rpm
|
||||
shadow-utils-subid-4.9-3.cm2.x86_64.rpm
|
||||
shadow-utils-subid-devel-4.9-3.cm2.x86_64.rpm
|
||||
sqlite-3.34.1-1.cm2.x86_64.rpm
|
||||
sqlite-debuginfo-3.34.1-1.cm2.x86_64.rpm
|
||||
sqlite-devel-3.34.1-1.cm2.x86_64.rpm
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ remove_packages_for_pkggen_core () {
|
|||
sed -i '/ca-certificates-[0-9]/d' $TmpPkgGen
|
||||
sed -i '/ca-certificates-legacy/d' $TmpPkgGen
|
||||
sed -i '/ca-certificates-microsoft/d' $TmpPkgGen
|
||||
sed -i '/cyrus-sasl/d' $TmpPkgGen
|
||||
sed -i '/libtasn1-d/d' $TmpPkgGen
|
||||
sed -i '/libpkgconf-devel/d' $TmpPkgGen
|
||||
sed -i '/lua-static/d' $TmpPkgGen
|
||||
|
|
@ -79,7 +78,6 @@ remove_packages_for_pkggen_core () {
|
|||
sed -i '/libdb-utils/d' $TmpPkgGen
|
||||
sed -i '/libgpg-error-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/libgcrypt-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/libsemanage-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/libselinux-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/libsepol-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/libsolv-tools/d' $TmpPkgGen
|
||||
|
|
@ -202,7 +200,6 @@ remove_packages_for_pkggen_core () {
|
|||
sed -i '/python3-rpm/d' $TmpPkgGen
|
||||
sed -i '/python3-test/d' $TmpPkgGen
|
||||
sed -i '/python3-tools/d' $TmpPkgGen
|
||||
sed -i '/shadow/d' $TmpPkgGen
|
||||
sed -i '/tdnf-python/d' $TmpPkgGen
|
||||
sed -i '/tcp_wrappers-[[:alpha:]]/d' $TmpPkgGen
|
||||
sed -i '/util-linux-lang/d' $TmpPkgGen
|
||||
|
|
@ -307,7 +304,6 @@ generate_pkggen_core () {
|
|||
grep "^python3-" $TmpPkgGen
|
||||
grep "^systemd-rpm-macros-" $TmpPkgGen
|
||||
grep "^which-" $TmpPkgGen
|
||||
grep "^cyrus-sasl-" $TmpPkgGen
|
||||
grep "^libselinux-" $TmpPkgGen
|
||||
} > "$1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -483,7 +483,7 @@ build_rpm_in_chroot_no_install libsepol
|
|||
# libselinux requires libsepol
|
||||
chroot_and_install_rpms libsepol
|
||||
build_rpm_in_chroot_no_install libselinux
|
||||
# util-linux, rpm, libsemanage and shadow-utils require libselinux
|
||||
# util-linux and rpm require libselinux
|
||||
chroot_and_install_rpms libselinux
|
||||
build_rpm_in_chroot_no_install util-linux
|
||||
build_rpm_in_chroot_no_install rpm
|
||||
|
|
@ -545,8 +545,6 @@ chroot_and_install_rpms libnsl2
|
|||
chroot_and_install_rpms finger
|
||||
build_rpm_in_chroot_no_install tcp_wrappers
|
||||
|
||||
build_rpm_in_chroot_no_install cyrus-sasl
|
||||
|
||||
# groff needs perl-File-HomeDir installed to run
|
||||
# perl-File-HomeDir needs perl-File-Which installed to run
|
||||
build_rpm_in_chroot_no_install perl-File-Which
|
||||
|
|
@ -554,30 +552,16 @@ chroot_and_install_rpms perl-File-Which
|
|||
build_rpm_in_chroot_no_install perl-File-HomeDir
|
||||
chroot_and_install_rpms perl-File-HomeDir
|
||||
|
||||
# openldap needs groff, cyrus-sasl
|
||||
# Removed 'openldap', might not need: groff
|
||||
chroot_and_install_rpms groff
|
||||
chroot_and_install_rpms cyrus-sasl
|
||||
build_rpm_in_chroot_no_install openldap
|
||||
|
||||
build_rpm_in_chroot_no_install libcap-ng
|
||||
|
||||
# audit needs systemd, golang, openldap, tcp_wrappers and libcap-ng
|
||||
# Removed 'audit', might not need: systemd, golang, tcp_wrappers and libcap-ng
|
||||
chroot_and_install_rpms systemd
|
||||
chroot_and_install_rpms golang
|
||||
chroot_and_install_rpms openldap
|
||||
chroot_and_install_rpms tcp_wrappers
|
||||
chroot_and_install_rpms libcap-ng
|
||||
build_rpm_in_chroot_no_install audit
|
||||
|
||||
# libsemanage requires libaudit
|
||||
chroot_and_install_rpms audit
|
||||
build_rpm_in_chroot_no_install libsemanage
|
||||
|
||||
# shadow-utils requires libsemanage
|
||||
chroot_and_install_rpms libsemanage
|
||||
# shadow-utils needs the pam.d sources in the root of SOURCES_DIR
|
||||
cp $SPECROOT/shadow-utils/pam.d/* $CHROOT_SOURCES_DIR
|
||||
build_rpm_in_chroot_no_install shadow-utils
|
||||
|
||||
# p11-kit needs libtasn1
|
||||
chroot_and_install_rpms libtasn1
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче