Browse Source

updated 2 packages

pam-1.5.1-1

postsrsd-1.10-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12518 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
d2e2d4f921
2 changed files with 41 additions and 44 deletions
  1. 30 41
      p/pam/pam-vl.spec
  2. 11 3
      p/postsrsd/postsrsd-vl.spec

+ 30 - 41
p/pam/pam-vl.spec

@@ -1,5 +1,5 @@
 %bcond_with systemd
-%define pam_redhat_version 1.1.3
+%define pam_redhat_version 1.1.4
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
@@ -7,9 +7,9 @@
 Summary: A security tool which provides authentication for applications
 Summary(ja): アプリケーションに認証の仕組みを提供するセキュリティツール
 Name: pam
-Version: 1.4.0
+Version: 1.5.1
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Base
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -35,29 +35,18 @@ Source15: pamtmp.conf
 Source16: postlogin.pamd
 Source17: postlogin.5
 Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-Patch1:  pam-1.4.0-redhat-modules.patch
-Patch9:  pam-1.4.0-noflex.patch
-Patch10: pam-1.4.0-nouserenv.patch
-Patch13: pam-1.1.6-limits-user.patch
-Patch15: pam-1.4.0-full-relro.patch
-# Upstreamed partially
-Patch29: pam-1.4.0-pwhistory-helper.patch
-Patch31: pam-1.1.8-audit-user-mgmt.patch
-Patch33: pam-1.3.0-unix-nomsg.patch
-Patch34: pam-1.4.0-coverity.patch
-# https://github.com/linux-pam/linux-pam/commit/af0faf666c5008e54dfe43684f210e3581ff1bca
-# https://github.com/linux-pam/linux-pam/commit/0e9b286afe1224b91ff00936058b084ad4b776e4
-Patch57: pam-1.4.0-determine-user-exists.patch
-# https://github.com/linux-pam/linux-pam/commit/395915dae1571e10e2766c999974de864655ea3a
-Patch58: pam-1.3.1-faillock-change-file-permissions.patch
-
-
-Patch1000: pam-1.4.0-ja.po.patch
+Patch1:  pam-1.5.0-redhat-modules.patch
+Patch2:  pam-1.5.0-noflex.patch
+Patch3:  pam-1.3.0-unix-nomsg.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
@@ -91,7 +80,6 @@ BuildRequires: libdb-devel
 # pam.d/login in old util-linux uses obsolete pam module.
 Conflicts: util-linux < 2.14
 
-
 %description
 PAM (Pluggable Authentication Modules) is a system security tool that
 allows system administrators to set authentication policy without
@@ -106,7 +94,7 @@ PAM (Pluggable Authentication Modules) は,システム管理者が
 %package -n compat32-%{name}
 Summary: A security tool which provides authentication for applications.
 Summary(ja): アプリケーションに認証の仕組みを提供するセキュリティツール
-Group: System Environment/Base
+Group: system
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -123,12 +111,11 @@ PAM (Pluggable Authentication Modules) は,システム管理者が
 
 
 %package devel
-Group: Development/Libraries
+Group: programming
 Summary: Files needed for developing PAM-aware applications and modules for PAM
 Summary(ja): PAM 対応アプリケーションや PAM モジュール開発に必要なファイル
 Requires: pam = %{version}-%{release}
 
-
 %description devel
 PAM (Pluggable Authentication Modules) is a system security tool that
 allows system administrators to set authentication policy without
@@ -146,13 +133,12 @@ PAM (Pluggable Authentication Modules) は,システム管理者が
 
 
 %package -n compat32-%{name}-devel
-Group: Development/Libraries
+Group: programming
 Summary: Files needed for developing PAM-aware applications and modules for PAM.
 Summary(ja): PAM 対応アプリケーションや PAM モジュール開発に必要なファイル
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel    = %{version}-%{release}
 
-
 %description -n compat32-%{name}-devel
 PAM (Pluggable Authentication Modules) is a system security tool
 which allows system administrators to set authentication policy
@@ -168,6 +154,9 @@ PAM (Pluggable Authentication Modules) は,システム管理者が
 開発するのに必要なヘッダファイルと静的ライブラリが収められています.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n Linux-PAM-%{version} -a 2
 perl -pi -e "s/\/lib \/usr\/lib/\/lib \/usr\/lib \/lib64 \/usr\/lib64/" m4/libtool.m4
@@ -178,16 +167,8 @@ mv pam-redhat-%{pam_redhat_version}/* modules
 cp %{SOURCE18} .
 
 %patch1 -p1 -b .redhat-modules
-%patch9 -p1 -b .noflex
-%patch10 -p1 -b .nouserenv
-%patch13 -p1 -b .limits
-%patch15 -p1 -b .relro
-%patch29 -p1 -b .pwhhelper
-%patch31 -p1 -b .audit-user-mgmt
-%patch33 -p1 -b .nomsg
-%patch34 -p1 -b .coverity
-%patch57 -p1 -b .determinine-user-exists
-%patch58 -p1 -b .faillock-change-file-permissions
+%patch2 -p1 -b .noflex
+%patch3 -p1 -b .nomsg
 
 %patch1000 -p1 -b .ja
 
@@ -201,6 +182,7 @@ autoreconf -i
 	--disable-rpath \
 	--libdir=/%{_lib} \
 	--includedir=%{_includedir}/security \
+	--enable-vendordir=%{_datadir} \
 	--enable-isadir=../..%{_moduledir} \
 %if ! %{WITH_SELINUX}
 	--disable-selinux \
@@ -241,6 +223,7 @@ rm -f %{buildroot}%{_sysconfdir}/environment
 
 # Install default configuration files.
 install -d -m 755 %{buildroot}%{_pamconfdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_pamvendordir}
 install -m 644 %{SOURCE5} %{buildroot}%{_pamconfdir}/other
 install -m 644 %{SOURCE6} %{buildroot}%{_pamconfdir}/system-auth
 install -m 644 %{SOURCE7} %{buildroot}%{_pamconfdir}/password-auth
@@ -248,7 +231,6 @@ install -m 644 %{SOURCE8} %{buildroot}%{_pamconfdir}/fingerprint-auth
 install -m 644 %{SOURCE9} %{buildroot}%{_pamconfdir}/smartcard-auth
 install -m 644 %{SOURCE10} %{buildroot}%{_pamconfdir}/config-util
 install -m 644 %{SOURCE16} %{buildroot}%{_pamconfdir}/postlogin
-install -m 644 %{SOURCE14} %{buildroot}%{_secconfdir}/limits.d/90-nproc.conf
 install -m 600 /dev/null %{buildroot}%{_secconfdir}/opasswd
 
 install -d -m 755 $RPM_BUILD_ROOT/var/log
@@ -260,6 +242,9 @@ install -d -m 755 $RPM_BUILD_ROOT/run/motd.d
 
 # Install man pages.
 install -m 644 %{SOURCE12} %{SOURCE13} ${SOURCE17} %{buildroot}%{_mandir}/man5/
+ln -sf system-auth.5 $RPM_BUILD_ROOT%{_mandir}/man5/password-auth.5
+ln -sf system-auth.5 $RPM_BUILD_ROOT%{_mandir}/man5/fingerprint-auth.5
+ln -sf system-auth.5 $RPM_BUILD_ROOT%{_mandir}/man5/smartcard-auth.5
 
 for phase in auth acct passwd session ; do
 	ln -sf pam_unix.so %{buildroot}%{_moduledir}/pam_unix_${phase}.so 
@@ -358,6 +343,7 @@ end
 %files -f Linux-PAM.lang
 %defattr(-,root,root)
 %dir %{_pamconfdir}
+%dir %{_pamvendordir}
 %config(noreplace) %{_pamconfdir}/other
 %config(noreplace) %{_pamconfdir}/system-auth
 %config(noreplace) %{_pamconfdir}/password-auth
@@ -451,7 +437,6 @@ end
 %config(noreplace) %{_secconfdir}/group.conf
 %config(noreplace) %{_secconfdir}/limits.conf
 %dir %{_secconfdir}/limits.d
-%config(noreplace) %{_secconfdir}/limits.d/90-nproc.conf
 %config(noreplace) %{_secconfdir}/namespace.conf
 %dir %{_secconfdir}/namespace.d
 %attr(755,root,root) %config(noreplace) %{_secconfdir}/namespace.init
@@ -481,7 +466,6 @@ end
 %{_unitdir}/pam_namespace.service
 %endif
 
-
 %files devel
 %defattr(-,root,root)
 %{_includedir}/security/
@@ -491,7 +475,6 @@ end
 %{_libdir}/libpam_misc.so
 %doc doc/adg/*.txt doc/adg/html
 
-
 %if %{build_compat32}
 %files -n compat32-%{name}
 %defattr(-,root,root)
@@ -567,6 +550,12 @@ end
 
 
 %changelog
+* Wed Dec 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.1-1
+- updated to 1.5.1.
+- updated pam-redhat to 1.1.4.
+- updated rawhide's patches.
+- updated Patch1000 (ja.po).
+
 * Sat Jul 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-1
 - updated to 1.4.0.
 - updated rawhide's patches.

+ 11 - 3
p/postsrsd/postsrsd-vl.spec

@@ -1,10 +1,10 @@
 %bcond_with systemd
 
 Name:           postsrsd
-Version:        1.6
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        1.10
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Sender Rewriting Scheme (SRS) provider
-
+Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -33,6 +33,9 @@ PostSRSd provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables
 SRS is needed if your mail server acts as forwarder.
 
 
+%debug_package
+
+
 %prep
 %autosetup -n %{name}-%{version}
 mkdir build
@@ -80,10 +83,12 @@ sed -i 's/^CHROOT=.*/CHROOT=\/run\/postsrsd/' %{buildroot}/%{_sysconfdir}/defaul
 %ghost %{_sysconfdir}/postsrsd.secret
 %config(noreplace) %{_sysconfdir}/default/%{name}
 %if %{with systemd}
+%{_datadir}/postsrsd/postsrsd-systemd-launcher
 %{_unitdir}/postsrsd.service
 %{_tmpfilesdir}/*
 %else
 %{_initdir}/postsrsd
+%exclude %{_datadir}/postsrsd/postsrsd-systemd-launcher
 %endif
 %{_sbindir}/postsrsd
 %{_docdir}/%{name}
@@ -119,6 +124,9 @@ fi
 
 
 %changelog
+* Wed Dec 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.10-1
+- new upstream release.
+
 * Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.6-2
 - made to create chroot directory at boot.