pam-1.5.2-1

p/pam/pam-vl.spec

@@ -7,8 +7,8 @@
 Summary: A security tool which provides authentication for applications
 Summary(ja): アプリケーションに認証の仕組みを提供するセキュリティツール
 Name: pam
-Version: 1.5.1
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Version: 1.5.2
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -35,22 +35,18 @@ Source15: pamtmp.conf
 Source16: postlogin.pamd
 Source17: postlogin.5
 Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+Source1000: linux-pam-ja.po
 Patch1:  pam-1.5.0-redhat-modules.patch
 Patch2:  pam-1.5.0-noflex.patch
 Patch3:  pam-1.3.0-unix-nomsg.patch
-# https://github.com/linux-pam/linux-pam/pull/368
-Patch4: pam-1.5.1-no_crypt_checksalt_for_pw_expiration.patch
-# https://github.com/linux-pam/linux-pam/commit/ec0e724fe53188c5c762c34ca9db6681c0de01b8
-Patch5:  pam-1.5.1-pam_filter_close_file_after_controlling_tty.patch
 
-Patch1000: pam-1.5.1-ja.po.patch
+#Patch1000: pam-1.5.1-ja.po.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
 %define _secconfdir %{_sysconfdir}/security
 %define _pamconfdir %{_sysconfdir}/pam.d
 %global _pamvendordir %{_datadir}/pam.d
-%global _systemdlibdir /lib/systemd/system
 
 # VINE
 %define WITH_SELINUX 0
@@ -173,10 +169,9 @@ cp %{SOURCE18} .
 %patch1 -p1 -b .redhat-modules
 %patch2 -p1 -b .noflex
 %patch3 -p1 -b .nomsg
-%patch4 -p1 -b .no_crypt_checksalt_for_pw_expiration
-%patch5 -p1 -b .pam_filter_close_file_after_controlling_tty
 
-%patch1000 -p1 -b .ja
+#patch1000 -p1 -b .ja
+cp %{SOURCE1000} po/ja.po
 
 ## security patch(es)
 
@@ -190,6 +185,9 @@ autoreconf -i
 	--includedir=%{_includedir}/security \
 	--enable-vendordir=%{_datadir} \
 	--enable-isadir=../..%{_moduledir} \
+%if %{with systemd}
+	--with-systemdunitdir=%{_unitdir} \
+%endif
 %if ! %{WITH_SELINUX}
 	--disable-selinux \
 %endif
@@ -268,6 +266,10 @@ rm -f %{buildroot}/%{_lib}/${lib}.la
 done
 rm -f %{buildroot}%{_moduledir}/*.la
 
+mv -f %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}/pkgconfig
+sed -i -e 's|^libdir=.*$|libdir=%{_libdir}|' \
+	%{buildroot}/%{_libdir}/pkgconfig/*.pc
+
 # Duplicate doc file sets.
 rm -fr %{buildroot}/usr/share/doc/pam
 
@@ -277,8 +279,6 @@ install -m755 -d %{buildroot}/lib/security
 %if %{with systemd}
 # Install the file for autocreation of /run subdirectories on boot
 install -m644 -D %{SOURCE15} %{buildroot}%{_prefix}/lib/tmpfiles.d/pam.conf
-mkdir -p %{buildroot}%{_unitdir}
-mv %{buildroot}/usr/lib/systemd/system/pam_namespace.service %{buildroot}%{_unitdir}/
 %else
 rm -f %{buildroot}/usr/lib/systemd/system/pam_namespace.service
 %endif
@@ -471,6 +471,7 @@ end
 %{_libdir}/libpam.so
 %{_libdir}/libpamc.so
 %{_libdir}/libpam_misc.so
+%{_libdir}/pkgconfig/*.pc
 %doc doc/adg/*.txt doc/adg/html
 
 %if %{build_compat32}
@@ -548,6 +549,12 @@ end
 
 
 %changelog
+* Fri Sep 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.2-1
+- updated to 1.5.2.
+- dropped Patch4 and 5: fixed in upstream.
+- dropped Patch1000.
+- updated ja.po.
+
 * Thu Aug 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.1-2
 - imported Patch4 from upstream for libxcrypt >= 4.4.22.
 - imported Patch5 from upstream.