Browse Source

updated 4 packages

gjs-1.54.3-1

mozjs60-60.9.0-6

pam-1.3.1-1

polkit-0.116-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12349 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
713fca91ba
4 changed files with 583 additions and 109 deletions
  1. 46 38
      g/gjs/gjs-vl.spec
  2. 402 0
      m/mozjs60/mozjs60-vl.spec
  3. 128 68
      p/pam/pam-vl.spec
  4. 7 3
      p/polkit/polkit-vl.spec

+ 46 - 38
g/gjs/gjs-vl.spec

@@ -1,35 +1,35 @@
-%define pkg_version 1.53.4
-%define pkg_release 2%{?_dist_release}
-%define mozjs mozjs52
-
-Summary:     Javascript binding for GNOME
-Summary(ja): GNOME 向け JavaScript バインディング
-Name:        gjs
-Version:     %{pkg_version}
-Release:     %{pkg_release}
-Source0:     http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.44/%{name}-%{version}.tar.xz
-
-License:     MPL1.1/LGPLv2+/GPLv2+
-Group:       System Environment/Libraries
-URL:         http://live.gnome.org/GnomeShell
-
-Patch0:      fix-override.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pkgconfig >= 0.14.0
-BuildRequires: glib2-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: gobject-introspection-devel >= 1.29.16
-BuildRequires: cairo-devel
-BuildRequires: %{mozjs}-devel
-BuildRequires: yelp-tools
-BuildRequires: desktop-file-utils
-BuildRequires: autoconf >= 2.69
-BuildRequires: automake
-BuildRequires: gnome-common
-
-Vendor: Project Vine
-Distribution: Vine Linux
+%define pkg_version 1.54.3
+%define pkg_release 1%{?_dist_release}
+%define mozjs mozjs60
+
+Summary:        Javascript binding for GNOME
+Summary(ja):    GNOME 向け JavaScript バインディング
+Name:           gjs
+Version:        %{pkg_version}
+Release:        %{pkg_release}
+Group:          System Environment/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MPL1.1/LGPLv2+/GPLv2+
+URL:            https://wiki.gnome.org/Projects/GnomeShell
+%global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  pkgconfig >= 0.14.0
+BuildRequires:  glib2-devel
+BuildRequires:  dbus-glib-devel
+BuildRequires:  gobject-introspection-devel >= 1.29.16
+BuildRequires:  cairo-devel
+BuildRequires:  %{mozjs}-devel
+BuildRequires:  readline-devel
+BuildRequires:  yelp-tools
+BuildRequires:  desktop-file-utils
+BuildRequires:  autoconf >= 2.69
+BuildRequires:  automake
+BuildRequires:  gnome-common
 
 
 %description
@@ -51,7 +51,6 @@ Development files of the gjs library.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -62,14 +61,18 @@ rm -f configure
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
-%{__make} install DESTDIR=${RPM_BUILD_ROOT}
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+find %{buildroot} -name '*.la' -exec rm -f {} \;
+
+
+#check
+#{__make} %{?_smp_mflags} check
 
 
 %clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -78,7 +81,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README
+%license COPYING
+%doc ChangeLog NEWS README
 %{_bindir}/gjs*
 %{_libdir}/lib*.so.*
 %{_libdir}/gjs/*
@@ -96,6 +100,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 
 %changelog
+* Tue Mar 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.54.3-1
+- new upstream release.
+- dropped Patch0: fixed in upstream.
+
 * Sun Dec 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.53.4-2
 - added Patch0.
 - added "R:mozjs52-devel" to gjs-devel.

+ 402 - 0
m/mozjs60/mozjs60-vl.spec

@@ -0,0 +1,402 @@
+%global major 60
+
+# Enable LTO
+%global optflags        %{?optflags} -flto
+%global build_ldflags   %{?build_ldflags} -flto
+
+# Require libatomic for ppc
+%ifarch ppc
+%global system_libatomic 1
+%endif
+
+# Big endian platforms
+%ifarch ppc ppc64 s390 s390x
+%global big_endian 1
+%endif
+
+Name:           mozjs%{major}
+Version:        60.9.0
+Release:        6%{?_dist_release}
+Summary:        SpiderMonkey JavaScript library
+
+Vendor:         Project Vine
+Distribution:   Vine Linux.
+
+License:        MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
+URL:            https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+Source0:        https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
+
+# Patches from Debian mozjs52_52.3.1-4.debian.tar.xz:
+Patch0001:      fix-soname.patch
+Patch0002:      copy-headers.patch
+Patch0003:      tests-increase-timeout.patch
+Patch0008:      Always-use-the-equivalent-year-to-determine-the-time-zone.patch
+Patch0009:      icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
+Patch0010:      icu_sources_data-Write-command-output-to-our-stderr.patch
+Patch0011:      tests-For-tests-that-are-skipped-on-64-bit-mips64-is-also.patch
+
+# Patches from Debian mozjs60_60.8.0-2.debian.tar.xz
+Patch001000:    tests-Expect-some-floating-point-tests-to-fail-on-i386.patch
+
+# Build fixes - https://hg.mozilla.org/mozilla-central/rev/ca36a6c4f8a4a0ddaa033fdbe20836d87bbfb873
+Patch12:        emitter.patch
+Patch13:        emitter_test.patch
+Patch14:        init_patch.patch
+
+# s390x fixes:
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/enddianness.patch
+Patch15:        enddianness.patch
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/jsproperty-endian.patch
+Patch16:        jsproperty-endian.patch
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/tests-Skip-a-test-on-s390x.patch
+Patch17:        tests-Skip-a-test-on-s390x.patch
+# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/tests-Expect-a-test-to-fail-on-big-endian.patch
+Patch18:        tests-Expect-a-test-to-fail-on-big-endian.patch
+
+# Patches from Fedora firefox package:
+Patch26:        build-icu-big-endian.patch
+
+# aarch64 fixes for -O2
+Patch30:        Save-x28-before-clobbering-it-in-the-regex-compiler.patch
+Patch31:        Save-and-restore-non-volatile-x28-on-ARM64-for-generated-unboxed-object-constructor.patch
+
+BuildRequires:  autoconf213
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  perl
+BuildRequires:  pkgconfig(libffi)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  python-devel
+BuildRequires:  python-rpm-macros
+BuildRequires:  readline-devel
+BuildRequires:  /usr/bin/zip
+%if 0%{?system_libatomic}
+BuildRequires:  libatomic
+%endif
+
+# Firefox does not allow to build with system version of jemalloc
+Provides: bundled(jemalloc) = 4.3.1
+
+%description
+SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of
+JavaScript. It is intended to be embedded in other applications
+that provide host environments for JavaScript.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q -n firefox-%{version}/js/src
+
+pushd ../..
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
+%patch0011 -p1
+
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+# s390x fixes
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+
+# Patch for big endian platforms only
+%if 0%{?big_endian}
+%patch26 -p1 -b .icu
+%endif
+
+# aarch64 -O2 fixes
+%ifarch aarch64
+%patch30 -p1
+%patch31 -p1
+%endif
+
+%ifarch %{ix86}
+%patch1000 -p1
+%endif
+
+# make sure we don't ever accidentally link against bundled security libs
+rm -rf security/
+popd
+
+# Remove zlib directory (to be sure using system version)
+rm -rf ../../modules/zlib
+
+%build
+# Enable LTO
+export AR=%{_bindir}/gcc-ar
+export RANLIB=%{_bindir}/gcc-ranlib
+export NM=%{_bindir}/gcc-nm
+
+export CFLAGS="%{optflags}"
+
+# workaround for ix86 (32bit)
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1621900
+%ifarch %{ix86}
+export CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
+%endif
+
+export CXXFLAGS="$CFLAGS"
+export LINKFLAGS="%{?__global_ldflags}"
+export PYTHON="%{__python}"
+
+autoconf-2.13
+%configure \
+  --without-system-icu \
+  --enable-posix-nspr-emulation \
+  --with-system-zlib \
+  --enable-tests \
+  --disable-strip \
+  --with-intl-api \
+  --enable-readline \
+  --enable-shared-js \
+  --disable-optimize \
+  --enable-pie \
+  --disable-jemalloc \
+
+%if 0%{?big_endian}
+echo "Generate big endian version of config/external/icu/data/icud58l.dat"
+pushd ../..
+  ./mach python intl/icu_sources_data.py .
+  ls -l config/external/icu/data
+  rm -f config/external/icu/data/icudt*l.dat
+popd
+%endif
+
+%make_build
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+# Fix permissions
+chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
+
+# Avoid multilib conflicts
+case `uname -i` in
+  i386 | ppc | s390 | sparc )
+    wordsize="32"
+    ;;
+  x86_64 | ppc64 | s390x | sparc64 )
+    wordsize="64"
+    ;;
+  *)
+    wordsize=""
+    ;;
+esac
+
+if test -n "$wordsize"
+then
+  mv %{buildroot}%{_includedir}/mozjs-60/js-config.h \
+     %{buildroot}%{_includedir}/mozjs-60/js-config-$wordsize.h
+
+  cat >%{buildroot}%{_includedir}/mozjs-60/js-config.h <<EOF
+#ifndef JS_CONFIG_H_MULTILIB
+#define JS_CONFIG_H_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "js-config-32.h"
+#elif __WORDSIZE == 64
+# include "js-config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
+fi
+
+# Remove unneeded files
+rm %{buildroot}%{_bindir}/js%{major}-config
+rm %{buildroot}%{_libdir}/libjs_static.ajs
+
+# Rename library and create symlinks, following fix-soname.patch
+mv %{buildroot}%{_libdir}/libmozjs-%{major}.so \
+   %{buildroot}%{_libdir}/libmozjs-%{major}.so.0.0.0
+ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0
+ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
+
+%check
+# Run SpiderMonkey tests
+%{__python} tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js \
+%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le s390x
+;
+%else
+|| :
+%endif
+
+# Run basic JIT tests
+%{__python} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic \
+%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le s390x
+;
+%else
+|| :
+%endif
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc README.html
+%{_libdir}/libmozjs-%{major}.so.0*
+
+%files devel
+%{_bindir}/js%{major}
+%{_libdir}/libmozjs-%{major}.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/mozjs-%{major}/
+
+%changelog
+* Mon Mar 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 60.9.0-6
+- initial build for Vine Linux.
+- added Patch1000 for i686.
+
+* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 60.9.0-5
+- Update enddianness.patch with more s390x fixes
+- Enable tests on s390x again
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 60.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 60.9.0-3
+- Fix multilib conflicts in js-config.h
+
+* Sat Sep 07 2019 Kalev Lember <klember@redhat.com> - 60.9.0-2
+- Backport patches for s390x support
+
+* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 60.9.0-1
+- Update to 60.9.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 60.8.0-2
+- Enable LTO
+
+* Tue Jul 09 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.8.0-1
+- Update to 60.8.0
+
+* Sat Jun 22 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.7.2-1
+- Update to 60.7.2
+
+* Wed Jun 19 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.7.1-1
+- Update to 60.7.1
+
+* Tue May 21 2019 Kalev Lember <klember@redhat.com> - 60.7.0-1
+- Update to 60.7.0
+
+* Mon Apr 15 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.6.1-2
+- Backport two Firefox 61 patches and allow compiler optimizations on aarch64
+
+* Sun Apr 14 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.6.1-1
+- Update to 60.6.1
+
+* Thu Feb 21 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.4.0-5
+- Re-enable null pointer gcc optimization
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 60.4.0-4
+- Rebuild for readline 8.0
+
+* Thu Feb 14 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.4.0-3
+- Build aarch64 with -O0 because of rhbz#1676292
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 60.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 02 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.4.0-1
+- Update to 60.4.0
+
+* Mon Nov 12 2018 Kalev Lember <klember@redhat.com> - 60.3.0-1
+- Update to 60.3.0
+
+* Thu Oct 04 2018 Kalev Lember <klember@redhat.com> - 60.2.2-1
+- Update to 60.2.2
+
+* Fri Sep 28 2018 Kalev Lember <klember@redhat.com> - 60.2.1-1
+- Update to 60.2.1
+
+* Tue Sep 11 2018 Kalev Lember <klember@redhat.com> - 60.2.0-1
+- Update to 60.2.0
+
+* Tue Sep 04 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 60.1.0-1
+- Update to 60.1.0
+
+* Wed Jul 25 2018 Kalev Lember <klember@redhat.com> - 52.9.0-1
+- Update to 52.9.0
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 11 2018 Ray Strode <rstrode@redhat.com> - 52.8.0-2
+- safeguard against linking against bundled nss
+  Related: #1563708
+
+* Fri May 11 2018 Kalev Lember <klember@redhat.com> - 52.8.0-1
+- Update to 52.8.0
+- Fix the build on ppc
+- Disable JS Helper threads on ppc64le (#1523121)
+
+* Sat Apr 07 2018 Kalev Lember <klember@redhat.com> - 52.7.3-1
+- Update to 52.7.3
+
+* Tue Mar 20 2018 Kalev Lember <klember@redhat.com> - 52.7.2-1
+- Update to 52.7.2
+- Switch to %%ldconfig_scriptlets
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 23 2018 Kalev Lember <klember@redhat.com> - 52.6.0-1
+- Update to 52.6.0
+
+* Fri Nov 24 2017 Björn Esser <besser82@fedoraproject.org> - 52.5.0-5
+- SpiderMonkey tests have regressions on %%{power64}, too
+
+* Fri Nov 24 2017 Björn Esser <besser82@fedoraproject.org> - 52.5.0-4
+- SpiderMonkey tests have regressions on big endian platforms
+
+* Fri Nov 24 2017 Björn Esser <besser82@fedoraproject.org> - 52.5.0-3
+- SpiderMonkey tests do not fail on any arch
+- Basic JIT tests are failing on s390 arches, only
+- Use macro for ppc64 arches
+- Run tests using Python2 explicitly
+- Simplify %%check
+- Use the %%{major} macro consequently
+- Replace %%define with %%global
+
+* Fri Nov 24 2017 Björn Esser <besser82@fedoraproject.org> - 52.5.0-2
+- Use macro for Python 2 interpreter
+- Use proper export and quoting
+
+* Tue Nov 14 2017 Kalev Lember <klember@redhat.com> - 52.5.0-1
+- Update to 52.5.0
+
+* Tue Oct 31 2017 Kalev Lember <klember@redhat.com> - 52.4.0-3
+- Include standalone /usr/bin/js52 interpreter
+
+* Tue Oct 31 2017 Kalev Lember <klember@redhat.com> - 52.4.0-2
+- Various secondary arch fixes
+
+* Thu Sep 28 2017 Kalev Lember <klember@redhat.com> - 52.4.0-1
+- Update to 52.4.0
+
+* Wed Sep 20 2017 Kalev Lember <klember@redhat.com> - 52.3.0-1
+- Initial Fedora packaging, based on earlier mozjs45 work

+ 128 - 68
p/pam/pam-vl.spec

@@ -1,20 +1,25 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define pam_redhat_version 0.99.11
+%define pam_redhat_version 1.1.2
 
 Summary: A security tool which provides authentication for applications
 Summary(ja): アプリケーションに認証の仕組みを提供するセキュリティツール
 Name: pam
-Version: 1.3.0
-Release: 2%{?_dist_release}
-# The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
-# as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+
-License: BSD and GPLv2+
+Version: 1.3.1
+Release: 1%{?_dist_release}
 Group: System Environment/Base
-URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html
 
-Source0: http://www.linux-pam.org/library/Linux-PAM-%{version}.tar.bz2
-Source2: https://fedorahosted.org/releases/p/a/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
+# 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+.
+License: BSD and GPLv2+
+URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html
+Source0: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz
+Source2: https://releases.pagure.org/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2
 Source5: other.pamd
 Source6: system-auth.pamd
 Source7: password-auth.pamd
@@ -28,25 +33,48 @@ Source14: 90-nproc.conf
 Source15: pamtmp.conf
 Source16: postlogin.pamd
 Source17: postlogin.5
-Patch1:  pam-1.2.0-redhat-modules.patch
-Patch4:  pam-1.1.0-console-nochmod.patch
-Patch5:  pam-1.1.0-notally.patch
-Patch7:  pam-1.2.1-faillock.patch
-Patch8:  pam-1.2.1-faillock-admin-group.patch
-Patch9:  pam-1.1.6-noflex.patch
+Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+Patch1:  pam-1.3.1-redhat-modules.patch
+Patch9:  pam-1.3.1-noflex.patch
 Patch10: pam-1.1.3-nouserenv.patch
 Patch13: pam-1.1.6-limits-user.patch
 Patch15: pam-1.1.8-full-relro.patch
-# FIPS related - non upstreamable
-Patch20: pam-1.2.0-unix-no-fallback.patch
-Patch28: pam-1.1.1-console-errmsg.patch
 # Upstreamed partially
 Patch29: pam-1.3.0-pwhistory-helper.patch
 Patch31: pam-1.1.8-audit-user-mgmt.patch
-Patch32: pam-1.2.1-console-devname.patch
 Patch33: pam-1.3.0-unix-nomsg.patch
-
-Patch1000: pam-1.3.0-ja.po.patch
+Patch34: pam-1.3.1-coverity.patch
+# https://github.com/linux-pam/linux-pam/commit/a2b72aeb86f297d349bc9e6a8f059fedf97a499a
+Patch36: pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch
+# https://github.com/linux-pam/linux-pam/commit/f7abb8c1ef3aa31e6c2564a8aaf69683a77c2016.patch
+Patch37: pam-1.3.1-unix-bcrypt_b.patch
+# https://github.com/linux-pam/linux-pam/commit/dce80b3f11b3c3aa137d18f22699809094dd64b6
+Patch38: pam-1.3.1-unix-gensalt-autoentropy.patch
+Patch39: pam-1.3.1-unix-crypt_checksalt.patch
+# https://github.com/linux-pam/linux-pam/commit/16bd523f85ede9fa9115f80e826f2d803d7e61d4
+Patch40: pam-1.3.1-unix-yescrypt.patch
+# To be upstreamed soon.
+Patch41: pam-1.3.1-unix-no-fallback.patch
+# https://github.com/linux-pam/linux-pam/commit/f9c9c72121eada731e010ab3620762bcf63db08f
+# https://github.com/linux-pam/linux-pam/commit/8eaf5570cf011148a0b55c53570df5edaafebdb0
+Patch42: pam-1.3.1-motd-multiple-paths.patch
+# https://github.com/linux-pam/linux-pam/commit/86eed7ca01864b9fd17099e57f10f2b9b6b568a1
+Patch43: pam-1.3.1-unix-checksalt_syslog.patch
+# https://github.com/linux-pam/linux-pam/commit/d8d11db2cef65da5d2afa7acf21aa9c8cd88abed
+Patch44: pam-1.3.1-unix-fix_checksalt_syslog.patch
+Patch45: pam-1.3.1-namespace-mntopts.patch
+Patch46: pam-1.3.1-lastlog-no-showfailed.patch
+Patch47: pam-1.3.1-lastlog-unlimited-fsize.patch
+Patch48: pam-1.3.1-unix-improve-logging.patch
+Patch49: pam-1.3.1-tty-audit-manfix.patch
+Patch50: pam-1.3.1-fds-closing.patch
+Patch51: pam-1.3.1-authtok-verify-fix.patch
+Patch52: pam-1.3.1-add-pam_usertype.patch
+Patch53: pam-1.3.1-add-pam_usertype-fix-backport.patch
+Patch54: pam-1.3.1-pam_selinux-check-unknown-objects.patch
+
+
+Patch1000: pam-1.3.1-ja.po.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -85,9 +113,6 @@ BuildRequires: libdb-devel
 # pam.d/login in old util-linux uses obsolete pam module.
 Conflicts: util-linux < 2.14
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
 
 %description
 PAM (Pluggable Authentication Modules) is a system security tool that
@@ -167,25 +192,41 @@ PAM (Pluggable Authentication Modules) は,システム管理者が
 
 %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
 
 # Add custom modules.
 mv pam-redhat-%{pam_redhat_version}/* modules
 
+cp %{SOURCE18} .
+
 %patch1 -p1 -b .redhat-modules
-%patch4 -p1 -b .nochmod
-%patch5 -p1 -b .notally
-%patch7 -p1 -b .faillock
-%patch8 -p1 -b .admin-group
 %patch9 -p1 -b .noflex
 %patch10 -p1 -b .nouserenv
 %patch13 -p1 -b .limits
 %patch15 -p1 -b .relro
-%patch20 -p1 -b .no-fallback
-%patch28 -p1 -b .errmsg
 %patch29 -p1 -b .pwhhelper
 %patch31 -p1 -b .audit-user-mgmt
-%patch32 -p1 -b .devname
 %patch33 -p1 -b .nomsg
+%patch34 -p1 -b .coverity
+%patch36 -p1 -b .remove-prototype
+%patch37 -p1 -b .bcrypt_b
+%patch38 -p1 -b .gensalt-autoentropy
+%patch39 -p1 -b .crypt_checksalt
+%patch40 -p1 -b .yescrypt
+%patch41 -p1 -b .no-fallback
+%patch42 -p1 -b .multiple-paths
+%patch43 -p1 -b .checksalt_syslog
+%patch44 -p1 -b .fix_checksalt_syslog
+%patch45 -p1 -b .mntopts
+%patch46 -p1 -b .no-showfailed
+%patch47 -p1 -b .unlimited-fsize
+%patch48 -p1 -b .improve-logging
+%patch49 -p1 -b .tty-audit-manfix
+%patch50 -p1 -b .fds-closing
+%patch51 -p1 -b .authtok-verify-fix
+%patch52 -p1 -b .add-pam_usertype
+%patch53 -p1 -b .add-pam_usertype-backport
+%patch54 -p1 -b .pam_selinux-check-unknown-objects
 
 %patch1000 -p1 -b .ja
 
@@ -213,68 +254,75 @@ make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 mkdir -p doc/txts
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
 done
 
+rm -rf doc/txts/README.pam_tally*
+rm -rf doc/sag/html/*pam_tally*
+
 # Install the binaries, libraries, and modules.
-make install DESTDIR=$RPM_BUILD_ROOT LDCONFIG=:
+make install DESTDIR=%{buildroot} LDCONFIG=:
 
 %if %{WITH_SELINUX}
 # Temporary compat link
-ln -sf pam_sepermit.so $RPM_BUILD_ROOT%{_moduledir}/pam_selinux_permit.so
+ln -sf pam_sepermit.so %{buildroot}%{_moduledir}/pam_selinux_permit.so
 %endif
 
 # RPM uses docs from source tree
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/Linux-PAM
+rm -rf %{buildroot}%{_datadir}/doc/Linux-PAM
 # Included in setup package
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/environment
+rm -f %{buildroot}%{_sysconfdir}/environment
 
 # Install default configuration files.
-install -d -m 755 $RPM_BUILD_ROOT%{_pamconfdir}
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_pamconfdir}/other
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pamconfdir}/system-auth
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pamconfdir}/password-auth
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_pamconfdir}/fingerprint-auth
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_pamconfdir}/smartcard-auth
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_pamconfdir}/config-util
-install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_pamconfdir}/postlogin
-install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_secconfdir}/limits.d/90-nproc.conf
-install -m 600 /dev/null $RPM_BUILD_ROOT%{_secconfdir}/opasswd
+install -d -m 755 %{buildroot}%{_pamconfdir}
+install -m 644 %{SOURCE5} %{buildroot}%{_pamconfdir}/other
+install -m 644 %{SOURCE6} %{buildroot}%{_pamconfdir}/system-auth
+install -m 644 %{SOURCE7} %{buildroot}%{_pamconfdir}/password-auth
+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
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/faillog
-install -m 600 /dev/null $RPM_BUILD_ROOT/var/log/tallylog
+install -d -m 755 $RPM_BUILD_ROOT/var/run/faillock
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/motd.d
+install -d -m 755 $RPM_BUILD_ROOT/usr/lib/motd.d
+install -d -m 755 $RPM_BUILD_ROOT/run/motd.d
+
 
 # Install man pages.
-install -m 644 %{SOURCE12} %{SOURCE13} ${SOURCE17} $RPM_BUILD_ROOT%{_mandir}/man5/
+install -m 644 %{SOURCE12} %{SOURCE13} ${SOURCE17} %{buildroot}%{_mandir}/man5/
 
 for phase in auth acct passwd session ; do
-	ln -sf pam_unix.so $RPM_BUILD_ROOT%{_moduledir}/pam_unix_${phase}.so 
+	ln -sf pam_unix.so %{buildroot}%{_moduledir}/pam_unix_${phase}.so 
 done
 
 # Remove .la files and make new .so links -- this depends on the value
 # of _libdir not changing, and *not* being /usr/lib.
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
+install -d -m 755 %{buildroot}%{_libdir}
 for lib in libpam libpamc libpam_misc ; do
-pushd $RPM_BUILD_ROOT%{_libdir}
+pushd %{buildroot}%{_libdir}
 ln -sf ../../%{_lib}/${lib}.so.*.* ${lib}.so
 popd
-rm -f $RPM_BUILD_ROOT/%{_lib}/${lib}.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/${lib}.la
+rm -f %{buildroot}/%{_lib}/${lib}.so
+rm -f %{buildroot}/%{_lib}/${lib}.la
 done
-rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la
+rm -f %{buildroot}%{_moduledir}/*.la
 
 # Duplicate doc file sets.
-rm -fr $RPM_BUILD_ROOT/usr/share/doc/pam
+rm -fr %{buildroot}/usr/share/doc/pam
 
 # Install the file for autocreation of /var/run subdirectories on boot
-install -m644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/pam.conf
+install -m644 -D %{SOURCE15} %{buildroot}%{_prefix}/lib/tmpfiles.d/pam.conf
 
 # Create /lib/security in case it isn't the same as %{_moduledir}.
-install -m755 -d $RPM_BUILD_ROOT/lib/security
+install -m755 -d %{buildroot}/lib/security
 
 %find_lang Linux-PAM
 
@@ -291,7 +339,8 @@ if [ -d ${dir} ] ; then
         [ ${dir} = "modules/pam_tty_audit" ] && continue
 %endif	
         [ ${dir} = "modules/pam_tally" ] && continue
-	if ! ls -1 $RPM_BUILD_ROOT%{_moduledir}/`basename ${dir}`*.so ; then
+        [ ${dir} = "modules/pam_tally2" ] && continue
+	if ! ls -1 %{buildroot}%{_moduledir}/`basename ${dir}`*.so ; then
 		echo ERROR `basename ${dir}` did not build a module.
 		exit 1
 	fi
@@ -300,10 +349,10 @@ done
 
 # Check for module problems.  Specifically, check that every module we just
 # installed can actually be loaded by a minimal PAM-aware application.
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}
-for module in $RPM_BUILD_ROOT%{_moduledir}/pam*.so ; do
-	if ! env LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib} \
-		 %{SOURCE11} -ldl -lpam -L$RPM_BUILD_ROOT/%{_libdir} ${module} ; then
+/sbin/ldconfig -n %{buildroot}/%{_lib}
+for module in %{buildroot}%{_moduledir}/pam*.so ; do
+	if ! env LD_LIBRARY_PATH=%{buildroot}/%{_lib} \
+		 %{SOURCE11} -ldl -lpam -L%{buildroot}/%{_libdir} ${module} ; then
 		echo ERROR module: ${module} cannot be loaded.
 		exit 1
 	fi
@@ -311,7 +360,7 @@ done
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p <lua>
 os.execute("/sbin/ldconfig")
@@ -345,7 +394,8 @@ end
 %config(noreplace) %{_pamconfdir}/smartcard-auth
 %config(noreplace) %{_pamconfdir}/config-util
 %config(noreplace) %{_pamconfdir}/postlogin
-%doc Copyright
+%license Copyright
+%license gpl-2.0.txt
 %doc doc/txts
 %doc doc/sag/*.txt doc/sag/html
 %doc doc/specs/rfc86.0.txt
@@ -353,7 +403,6 @@ end
 /%{_lib}/libpamc.so.*
 /%{_lib}/libpam_misc.so.*
 %{_sbindir}/pam_console_apply
-%{_sbindir}/pam_tally2
 %{_sbindir}/faillock
 %attr(4755,root,root) %{_sbindir}/pam_timestamp_check
 %attr(4755,root,root) %{_sbindir}/unix_chkpwd
@@ -404,7 +453,6 @@ end
 %{_moduledir}/pam_shells.so
 %{_moduledir}/pam_stress.so
 %{_moduledir}/pam_succeed_if.so
-%{_moduledir}/pam_tally2.so
 %{_moduledir}/pam_time.so
 %{_moduledir}/pam_timestamp.so
 %if %{WITH_AUDIT}
@@ -417,6 +465,7 @@ end
 %{_moduledir}/pam_unix_passwd.so
 %{_moduledir}/pam_unix_session.so
 %{_moduledir}/pam_userdb.so
+%{_moduledir}/pam_usertype.so
 %{_moduledir}/pam_warn.so
 %{_moduledir}/pam_wheel.so
 %{_moduledir}/pam_xauth.so
@@ -426,6 +475,7 @@ end
 %config(noreplace) %{_secconfdir}/chroot.conf
 %config %{_secconfdir}/console.perms
 %config(noreplace) %{_secconfdir}/console.handlers
+%config(noreplace) %{_secconfdir}/faillock.conf
 %config(noreplace) %{_secconfdir}/group.conf
 %config(noreplace) %{_secconfdir}/limits.conf
 %dir %{_secconfdir}/limits.d
@@ -436,7 +486,12 @@ end
 %config(noreplace) %{_secconfdir}/pam_env.conf
 %if %{WITH_SELINUX}
 %config(noreplace) %{_secconfdir}/sepermit.conf
+%dir /var/run/sepermit
 %endif
+%dir /var/run/faillock
+%dir %{_sysconfdir}/motd.d
+%dir /run/motd.d
+%dir /usr/lib/motd.d
 %config(noreplace) %{_secconfdir}/time.conf
 %config(noreplace) %{_secconfdir}/opasswd
 %dir %{_secconfdir}/console.apps
@@ -510,7 +565,6 @@ end
 %{_moduledir}/pam_shells.so
 %{_moduledir}/pam_stress.so
 %{_moduledir}/pam_succeed_if.so
-%{_moduledir}/pam_tally2.so
 %{_moduledir}/pam_time.so
 %{_moduledir}/pam_timestamp.so
 %if %{WITH_AUDIT}
@@ -523,6 +577,7 @@ end
 %{_moduledir}/pam_unix_passwd.so
 %{_moduledir}/pam_unix_session.so
 %{_moduledir}/pam_userdb.so
+%{_moduledir}/pam_usertype.so
 %{_moduledir}/pam_warn.so
 %{_moduledir}/pam_wheel.so
 %{_moduledir}/pam_xauth.so
@@ -537,6 +592,11 @@ end
 
 
 %changelog
+* Tue Mar 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.1-1
+- updated to 1.3.1.
+- updated rawhide's patches.
+- updated Patch1000.
+
 * Thu Nov 09 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.0-2
 - updated ja.po.
 

+ 7 - 3
p/polkit/polkit-vl.spec

@@ -1,8 +1,8 @@
 Summary: PolicyKit Authorization Framework
 Summary(ja): PolicyKit 認証フレームワーク
 Name: polkit
-Version: 0.115
-Release: 2%{?_dist_release}
+Version: 0.116
+Release: 1%{?_dist_release}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/polkit
 Source0: http://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
@@ -13,7 +13,7 @@ BuildRequires: elogind-devel
 BuildRequires: glib2-devel
 BuildRequires: expat-devel
 BuildRequires: pam-devel
-BuildRequires: mozjs52-devel
+BuildRequires: mozjs60-devel
 BuildRequires: gtk-doc
 BuildRequires: intltool
 BuildRequires: gobject-introspection-devel
@@ -73,6 +73,7 @@ export CXXFLAGS="%{optflags} -std=gnu++11"
 	--enable-introspection \
 	--enable-libelogind=yes \
 	--enable-examples
+
 make
 
 %install
@@ -141,6 +142,9 @@ exit 0
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Mar 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.116-1
+- new upstream release.
+
 * Fri Jan 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.115-2
 - really enabled elogind.