PR#21: pam-redhat 1.1.5 - rpms/pam - src.fedoraproject.org

rpms / pam

#21 pam-redhat 1.1.5

Merged 2 years ago by besser82. Opened 2 years ago by besser82.

rpms/ besser82/pam topic/besser82/pam_redhat_115 into rawhide

Conditionalize BR: openssl >= 3.0.0 to supported distributions

Björn Esser • 2 years ago

9f38c53

Drop explicit dependency on openssl, as auto-deps will pull it in

Björn Esser • 2 years ago

64abd3f

Rebase to pam-redhat-1.1.5

Björn Esser • 2 years ago

75bbb9a

.gitignore

file modified

+5 -12

		`@@ -1,12 +1,5 @@`
		`- *.src.rpm`
		`- *.tar.bz2`
		`- /Linux-PAM-1.3.1.tar.xz`
		`- /Linux-PAM-1.3.1.tar.xz.asc`
		`- /Linux-PAM-1.4.0.tar.xz`
		`- /Linux-PAM-1.4.0.tar.xz.asc`
		`- /Linux-PAM-1.5.0.tar.xz`
		`- /Linux-PAM-1.5.0.tar.xz.asc`
		`- /Linux-PAM-1.5.1.tar.xz`
		`- /Linux-PAM-1.5.1.tar.xz.asc`
		`- /Linux-PAM-1.5.2.tar.xz`
		`- /Linux-PAM-1.5.2.tar.xz.asc`
		`+ /*.src.rpm`
		`+ /Linux-PAM-*.tar.xz`
		`+ /Linux-PAM-*.tar.xz.asc`
		`+ /pam-redhat-*.tar.bz2`
		`+ /pam-redhat-*.tar.xz`

pam-1.5.2-pam_console-fix_parallel_build.patch

file removed

-33

		`@@ -1,33 +0,0 @@`
		`- Index: Linux-PAM-1.5.2/modules/pam_console/Makefile.am`
		`- ===================================================================`
		`- --- Linux-PAM-1.5.2.orig/modules/pam_console/Makefile.am`
		`- +++ Linux-PAM-1.5.2/modules/pam_console/Makefile.am`
		`- @@ -44,6 +44,8 @@ secureconf_DATA = console.perms console.`
		`- FLEX_OPTS = -Cr`
		`- BISON_OPTS = -d`
		`-`
		`- +BUILT_SOURCES = configfile.tab.h configfile.tab.c configfile.lex.c`
		`- +`
		`- pam_console_la_SOURCES = pam_console.c pam_console.h regerr.c handlers.c handlers.h`
		`- pam_console_apply_SOURCES = pam_console_apply.c pam_console.h chmod.c modechange.c regerr.c \`
		`- configfile.c configfile.h hashtable.c hashtable.h hashtable_private.h`
		`- @@ -51,15 +53,17 @@ pam_console_apply_SOURCES = pam_console_`
		`- pam_console_la_CFLAGS = $(AM_CFLAGS)`
		`- pam_console_apply_CFLAGS = $(AM_CFLAGS) @EXE_CFLAGS@`
		`-`
		`- +configfile.tab.h: configfile.tab.c`
		`- +`
		`- configfile.tab.c: configfile.y`
		`- $(YACC) $(BISON_OPTS) -o $@ -p _pc_yy $<`
		`- sh $(srcdir)/sed-static $@`
		`-`
		`- -configfile.lex.c: configfile.l configfile.tab.c`
		`- +configfile.lex.c: configfile.l configfile.tab.h`
		`- $(LEX) $(FLEX_OPTS) -o$@ -P_pc_yy $<`
		`- sh $(srcdir)/sed-static $@`
		`-`
		`- -configfile.c: configfile.tab.c configfile.lex.c`
		`- +configfile.c: configfile.tab.h configfile.tab.c configfile.lex.c`
		`-`
		`- install-data-local:`
		`- mkdir -p $(DESTDIR)$(secureconfdir)/console.apps`

pam-1.5.2-pam_console-fix_setgroups_not_defined.patch

file removed

-12

		`@@ -1,12 +0,0 @@`
		`- Index: Linux-PAM-1.5.2/modules/pam_console/handlers.c`
		`- ===================================================================`
		`- --- Linux-PAM-1.5.2.orig/modules/pam_console/handlers.c`
		`- +++ Linux-PAM-1.5.2/modules/pam_console/handlers.c`
		`- @@ -28,6 +28,7 @@`
		`- #include <sys/types.h>`
		`- #include <pwd.h>`
		`- #include <syslog.h>`
		`- +#include <grp.h>`
		`-`
		`- #include "handlers.h"`
		`- #include "pam_console.h"`

pam.spec

file modified

+12 -9

		`@@ -1,10 +1,10 @@`
		`%global so_ver 0`
		`- %global pam_redhat_version 1.1.4`
		`+ %global pam_redhat_version 1.1.5`

		`Summary: An extensible library which provides authentication for applications`
		`Name: pam`
		`Version: 1.5.2`
		`- Release: 4%{?dist}`
		`+ Release: 5%{?dist}`
		`# The library is BSD licensed with option to relicense as GPLv2+`
		`# - this option is redundant as the BSD license allows that anyway.`
		`# pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+.`
		`@@ -12,7 +12,7 @@`
		`URL: http://www.linux-pam.org/`
		`Source0: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz`
		`Source1: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz.asc`
		`- Source2: https://releases.pagure.org/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2`
		`+ Source2: https://releases.pagure.org/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.xz`
		`Source3: macros.%{name}`
		`Source5: other.pamd`
		`Source6: system-auth.pamd`
		`@@ -30,8 +30,6 @@`
		`Patch1: pam-1.5.0-redhat-modules.patch`
		`Patch2: pam-1.5.0-noflex.patch`
		`Patch3: pam-1.3.0-unix-nomsg.patch`
		`- Patch4: pam-1.5.2-pam_console-fix_parallel_build.patch`
		`- Patch5: pam-1.5.2-pam_console-fix_setgroups_not_defined.patch`

		`%{load:%{SOURCE3}}`

		`@@ -46,7 +44,6 @@`
		`### Dependencies ###`
		`Requires: libeconf >= 0.3.5`
		`Requires: libpwquality >= 0.9.9`
		`- Requires: openssl >= 3.0.0`
ipedrosa commented 2 years ago Why have you dropped openssl requirement? The target system will need it to perform the hmac calculations
		`Requires: setup`
		`%if %{WITH_AUDIT}`
		`Requires: audit-libs >= 1.0.8`
		`@@ -69,7 +66,9 @@`
		`BuildRequires: libtool`
		`BuildRequires: libxcrypt-devel >= 4.3.3-2`
		`BuildRequires: make`
		`+ %if 0%{?fedora} >= 36 \|\| 0%{?rhel} >= 9`
		`BuildRequires: openssl-devel >= 3.0.0`
		`+ %endif`
		`BuildRequires: perl-interpreter`
		`BuildRequires: pkgconfig`
		`BuildRequires: sed`
		`@@ -126,8 +125,6 @@`
		`%patch1 -p1 -b .redhat-modules`
		`%patch2 -p1 -b .noflex`
		`%patch3 -p1 -b .nomsg`
		`- %patch4 -p1 -b .parallel_build`
		`- %patch5 -p1 -b .setgroups_not_defined`

		`autoreconf -i`

		`@@ -404,9 +401,15 @@`
		`exit 0`

		`%changelog`
		`+ * Thu Sep 23 2021 Björn Esser <besser82@fedoraproject.org> - 1.5.2-5`
		`+ - Rebase to pam-redhat-1.1.5`
		`+ - Drop explicit dependency on openssl, as auto-deps will pull it in`
		`+ - Conditionalize BR: openssl >= 3.0.0 to supported distributions`
		`+`
		`* Thu Sep 23 2021 Iker Pedrosa <ipedrosa@redhat.com> - 1.5.2-4`
		`- Remove the /etc/motd.d directory to exclude its ownership from pam (#1968131)`
		`- - pam_timestamp: enable openssl hmac authentication (#1947294)`
		`+ - pam_timestamp: enable openssl hmac authentication on supported`
		`+ distributions (Fedora >= 36 and RHEL >= 9) (#1947294)`
		`- Clean spec file: organize dependencies and move URL location`

		`* Thu Sep 23 2021 Björn Esser <besser82@fedoraproject.org> - 1.5.2-3`

sources

file modified

+1 -1

		`@@ -1,3 +1,3 @@`
		`SHA512 (Linux-PAM-1.5.2.tar.xz) = fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144`
		`SHA512 (Linux-PAM-1.5.2.tar.xz.asc) = 5e4d9ac533651a9479ef26719430c1fdf31e2b70de859a4f09b17f9e14e8fb25d74a059332841dc8ed9db764971c3e4d9941d613a7bfbb6450122462810109ad`
		`- SHA512 (pam-redhat-1.1.4.tar.bz2) = ad3b53744505faf7c93b1f0c1ef4434c2567b97e292859963401b0c117e824704713c69f7a661cccd3aecd1208facb39c433703c1f3cdea1dbda2c380006bfc4`
		`+ SHA512 (pam-redhat-1.1.5.tar.xz) = b93b80e9aa0dd8b38045b2a8cc36006b1b651a2724e64fcd9ed87af1fc36008acf9e62e2950097bebfccd657a064b748311f4b9c826f76d7b8c4299feb070bb8`

besser82 commented 2 years ago

Rebase to pam-redhat-1.1.5.
Drop explicit dependency on openssl, as auto-deps will pull it in.
Conditionalize BR: openssl >= 3.0.0 to supported distributions.

zuul commented 2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

check-for-arches : SUCCESS in 1m 19s
rpm-scratch-build : SUCCESS in 9m 26s
rpm-scratch-build-s390x : SKIPPED (non-voting)
rpm-scratch-build-ppc64le : SKIPPED (non-voting)
rpm-scratch-build-i686 : SKIPPED (non-voting)
rpm-scratch-build-armv7hl : SKIPPED (non-voting)
rpm-scratch-build-aarch64 : SKIPPED (non-voting)
rpm-linter : FAILURE in 4m 16s
rpm-rpminspect : SUCCESS in 7m 18s (non-voting)
check-for-tests : SUCCESS in 1m 08s
check-for-fmf-tests : SUCCESS in 57s
rpm-install-test : SKIPPED
rpm-test : FAILURE in 5m 48s
rpm-tmt-test : SKIPPED

ipedrosa commented on line 36 of pam.spec 2 years ago

Why have you dropped openssl requirement? The target system will need it to perform the hmac calculations

besser82 commented 2 years ago

Why have you dropped openssl requirement? The target system will need it to perform the hmac calculations

Because it will be pulled by the autogenerated dependency in pam:

libcrypto.so.3()(64bit)
libcrypto.so.3(OPENSSL_3.0.0)(64bit)

From what I can see in the code, there are no calls to the openssl binary, as the code does the calculations interfacing libcrypto.so directly.

Edited 2 years ago by besser82

ipedrosa commented 2 years ago

LGTM, please feel free to merge it. Thank you!

besser82 commented 2 years ago

Thank you for the review! =)

Pull-Request has been merged by besser82

2 years ago

Metadata

Assignee

None

Tags

No Tags

Changes Summary 5

file removed

pam-1.5.2-pam_console-fix_parallel_build.patch

-12

file removed

pam-1.5.2-pam_console-fix_setgroups_not_defined.patch

rpms / pam

Source Code

#21 pam-redhat 1.1.5 Merged 2 years ago by besser82. Opened 2 years ago by besser82. rpms/ besser82/pam topic/besser82/pam_redhat_115 into rawhide

Metadata

Changes Summary 5

#21 pam-redhat 1.1.5

Merged 2 years ago by besser82. Opened 2 years ago by besser82.

rpms/ besser82/pam topic/besser82/pam_redhat_115 into rawhide