updated 9 packages

createrepo_c-0.16.0-1

dovecot-2.3.11.3-2

libsmbios-2.4.3-2

python-sphinx-3.2.1-2

python-sphinxcontrib-jsmath-1.0.1-10

rspamd-2.5-3

strongswan-5.9.0-1

system-storage-manager-1.4-1

trousers-0.3.14-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12476 ec354946-7b23-47d6-9f5a-488ba84defc7

c/createrepo_c/createrepo_c-vl.spec

@@ -0,0 +1,465 @@
+%{!?_licensedir:%global license %%doc}
+
+%global bash_completion %config%{_sysconfdir}/bash_completion.d/createrepo_c.bash
+
+%{!?python2_sitearch:%global python2_sitearch %{python_sitearch}}
+
+%bcond_without python3
+%bcond_with    drpm
+
+Summary:        Creates a common metadata repository
+Name:           createrepo_c
+Version:        0.16.0
+Release:        1%{?_dist_release}
+Group:          admin-tools
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2+
+URL:            https://github.com/rpm-software-management/createrepo_c
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  bzip2-devel
+BuildRequires:  doxygen
+BuildRequires:  expat-devel
+BuildRequires:  file-devel
+BuildRequires:  glib2-devel >= 2.22.0
+BuildRequires:  curl-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  openssl-devel
+BuildRequires:  rpm-devel >= 4.8.0-28
+BuildRequires:  sqlite-devel
+BuildRequires:  xz-devel
+BuildRequires:  zlib-devel
+Requires:       %{name}-libs =  %{version}-%{release}
+%if 0%{?rhel} == 6
+Requires: rpm >= 4.8.0-28
+%else
+BuildRequires:  bash-completion
+Requires: rpm >= 4.9.0
+%endif
+%if %{with drpm}
+BuildRequires:  drpm-devel >= 0.1.3
+%endif
+
+%description
+C implementation of Createrepo.
+A set of utilities (createrepo_c, mergerepo_c, modifyrepo_c)
+for generating a common metadata repository from a directory of
+rpm packages and maintaining it.
+
+
+%package libs
+Summary:    Library for repodata manipulation
+Group:      system
+
+%description libs
+Libraries for applications using the createrepo_c library
+for easy manipulation with a repodata.
+
+
+%package devel
+Summary:    Library for repodata manipulation
+Group:      programming
+Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains the createrepo_c C library and header files.
+These development files are for easy manipulation with a repodata.
+
+
+%if %{with python3}
+%package -n python3-%{name}
+Summary:        Python 3 bindings for the createrepo_c library
+Group:          programming
+%{?python_provide:%python_provide python3-%{name}}
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-devel
+BuildRequires:  python3-nose
+BuildRequires:  python3-sphinx
+Requires:       %{name}-libs = %{version}-%{release}
+
+%description -n python3-%{name}
+Python 3 bindings for the createrepo_c library.
+%endif
+
+
+%prep
+%setup -q
+mkdir build
+
+
+%build
+# Build createrepo_c with Python
+pushd build
+%cmake ../ \
+	-DPYTHON_DESIRED:FILEPATH=%{__python3} \
+	-DWITH_ZCHUNK=OFF \
+	-DWITH_LIBMODULEMD=OFF \
+	-DENABLE_DRPM=OFF
+
+make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+# Build C documentation
+make doc-c
+popd
+
+
+%install
+rm -rf %{buildroot}
+pushd build
+  make install DESTDIR=%{buildroot}
+popd
+
+ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo
+ln -sr %{buildroot}%{_bindir}/mergerepo_c %{buildroot}%{_bindir}/mergerepo
+ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
+
+
+%check
+pushd build
+  # Compile C tests
+  make tests
+  # Run Python3 tests
+  make ARGS="-V" test
+popd
+
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%license COPYING
+%doc README.md
+%{_mandir}/man8/createrepo_c.8*
+%{_mandir}/man8/mergerepo_c.8*
+%{_mandir}/man8/modifyrepo_c.8*
+%{_mandir}/man8/sqliterepo_c.8*
+#%{bash_completion}
+%{_bindir}/createrepo_c
+%{_bindir}/mergerepo_c
+%{_bindir}/modifyrepo_c
+%{_bindir}/sqliterepo_c
+%{_bindir}/createrepo
+%{_bindir}/mergerepo
+%{_bindir}/modifyrepo
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/*
+
+%files libs
+%license COPYING
+%{_libdir}/lib%{name}.so.*
+
+%files devel
+%doc build/doc/html
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/%{name}/
+
+%if %{with python3}
+%files -n python3-%{name}
+%{python3_sitearch}/*
+%endif
+
+
+%changelog
+* Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.16.0-1
+- new upstream release.
+
+* Mon May 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.13.2-1
+- new upstream release.
+
+* Mon Dec 10 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.11.1-1
+- new upstream release.
+
+* Sun Jul 17 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.10.0-6
+- initial build for Vine Linux.
+
+* Tue Apr 12 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.10.0-5
+- Make drpm builds conditional
+
+* Sun Apr 10 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.10.0-4
+- Don't own python3_sitearch dir in python3 subpkg
+- Use %%license macro
+- Follow modern packaging guidelines
+- Cleanups in spec file
+- Follow packaging guidelines about SourceURL
+- Fix license
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 8 2016 Orion Poplawski <orion@cora.nwra.com> - 0.10.0-2
+- Remove comments causing trouble with post/postun scriptlets
+
+* Tue Jan   5 2016 Tomas Mlcoch <tmlcoch at redhat.com> - 0.10.0-1
+- Python 3 support (made by Ralph Bean)
+- Modify gen_rst.py to indicate --sqliterepo is an option too (Neal Gompa)
+- Do not compress manpages at generation time (Neal Gompa)
+
+* Tue Oct  20 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.9.1-1
+- Fix double free during parsing broken XML metadata (Issue #33)
+- Tests: Add acceptance test for --general-compress-type option
+- Fix 'CR_CW_UNKNOWN_COMPRESSION cannot be used' error
+- Refactoring: Fix compiler warnings
+- Add --general-compress-type option (RhBug 1253850)
+- Enable drpm support when drpm library is detected on system (RhBug: 1261031) (Issue #37)
+- fix traceback on non-complete datetime information (Jarek Polok)
+- parsehdr: Skip broken dependency with bad (non-numerical) epoch and print warning about that
+  (https://lists.fedoraproject.org/pipermail/devel/2015-August/213882.html)
+- misc: cr_str_to_evr(): Return NULL instead of "0" for bad (non-numerical) epoch
+- updateinfo: Fix a typo in the package release attribute (Luke Macken)
+- CMake: Don't require CXX compiler
+- Tests for different checksum type for RPMs and repodata files (#31)
+- Support different checksum type for RPMs and repodata files (#31)
+
+* Tue Jul   7 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.9.0-2
+- Add drpm as a BuildRequire
+
+* Thu May  28 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.9.0-1
+- mergerepo_c: Prepend protocol (file://) for URLs in pkgorigins (if --koji is used)
+- Update bash completion
+- doc: Update manpages
+- mergerepo: Fix NVR merging method
+- mergerepo: Fix behavior of --all param
+- createrepo: Add --cut-dirs and --location-prefix options
+- misc: Add cr_cut_dirs()
+- mergerepo: Use better version comparison algorithm
+- utils: Port cr_cmp_version_str() to rpm's algorithm (rpmvercmp)
+- misc: Rename elements in cr_Version structure
+- mergerepo: Fix version-release comparison for packages when --all is used
+- mergerepo: Show warnings if some groupfile cannot be automatically used
+- mergerepo: Exit with error code when a groupfile cannot be copied
+
+* Fri May  15 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.8.3-1
+- mergerepo: Do not prepend file:// if protocol is already specified
+
+* Thu May  14 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.8.2-1
+- doc: Add man pages for sqliterepo and update manpages for other tools
+- mergerepo: Work only with noarch packages if --koji is used and
+  no archlist is specified
+- mergerepo: Use file:// protocol in local baseurl
+- mergerepo: Do not include baseurl for first repo if --koji is specified (RhBug: 1220082)
+- mergerepo_c: Support multilib arch for --koji repos
+- mergerepo_c: Refactoring
+- Print debug message with version in each tool when --verbose is used
+- modifyrepo: Don't override file with itself (RhBug: 1215229)
+
+* Wed May   6 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.8.1-1
+- Fix bash completion for RHEL 6
+
+* Tue May   5 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.8.0-1
+- New tool Sqliterepo_c - It generates sqlite databases into repos
+  where the sqlite is missing.
+- Internal refactoring and code cleanup
+
+* Fri Feb  20 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.7-1
+- Proper directory for temporary files when --local-sqlite is used (Issue #12)
+- Bring bash completion install dir and filenames up to date with current bash-completion
+
+* Thu Jan   8 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.6-1
+- Python: Add __contains__ method to Repomd() class
+
+* Sun Dec  28 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.5-1
+- Python repomd: Support for iteration and indexing by type - e.g. record = repomd['primary']
+- Show warning if an XML parser probably parsed a bad type of medata (New XML parser warning type CR_XML_WARNING_BADMDTYPE)
+- drpm library: Explicitly try to locate libdrpm.so.0
+- deltarpms: Don't show options for delta rpms if support is not available
+
+* Tue Nov  11 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.4-1
+- createrepo_c, mergerepo_c: Follow redirs by default while downloading remote repos
+- mergerepo_c: Fix segfault when a package without sourcerpm is part of metadata and --koji option is used
+
+* Mon Nov  10 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.3-1
+- xml_parser: Add file path into error messages
+- Refactor: Replace g_error() with g_critical() (RhBug: 1162102)
+
+* Thu Nov  06 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.2-1
+- createrepo_c: New option --local-sqlite
+
+* Fri Oct  31 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.1-1
+- Mergerepo: Fix mergerepo
+- Mergerepo: Add some debugging of metadata read.
+
+* Mon Oct  20 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.7.0-1
+- deltarpms: Update module to work with current version of drpm
+- mergerepo_c: Add --omit-baseurl option
+- craterepo_c: Gen empty repo if empty pkglist is used
+- Docs: Output python docs to separate directory
+- Several small fixes
+
+* Tue Aug  12 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.6.1-1
+- updateinfo: Use Python datetime objects in python bindings
+
+* Tue Aug   5 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.6.0-1
+- Support for updateinfo.xml manipulation (including Python bindings)
+
+* Fri Jul  18 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.5.0-1
+- Experimental delta rpm (DRPM) support (Disabled in Fedora build).
+
+* Thu Jun  26 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.4.1-1
+- Initialize threads correctly on old versions of GLib2 (RhBug: 1108787)
+- Do not print log domain (get rid off C_CREATEREPOLIB prefix in log messages)
+- Implements support for --cachedir
+- New option --retain-old-md-by-age
+- Few small API changes
+
+* Tue May   6 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.4.0-1
+- Change default behavior of repodata files handling. (RhBug: 1094539)
+  See: https://github.com/Tojaj/createrepo_c/wiki/New-File-Handling
+  By default, createrepo leaves old groupfiles (comps files)
+  in the repodata/ directory during update.
+  Createrepo_c did the same thing but the version 0.4.0 changes this behaviour.
+
+* Thu Apr  10 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.3.1-2
+- Support for weak and rich dependecies
+
+* Mon Mar  10 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.3.0-1
+- Relevant only for developers using createrepo_c library: New approach for
+  metadata loading in case of internal high-level parser functions (see commit
+  messages for more information: d6ed327595, 0b0e75203e, ad1e8450f5)
+- Support for changelog limit value == -1 (include all changelogs)
+- Update debug compilation flags
+- Update man pages (Add synompsis with usage)
+- Update usage examples in help
+
+* Thu Feb  20 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.2.2-1
+- Temporary remove deltarepo subpackages
+- cmake: Do not install deltarepo stuff yet
+- helper: Removed cr_remove_metadata() and cr_get_list_of_md_locations()
+- Add module helpers
+- Sanitize strings before writting them to XML or sqlitedb (ISSUE #3)
+
+* Mon Jan  27 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.2.1-3
+- New expert option: --ignore-lock
+
+* Mon Jan  20 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 0.2.1-2
+- More effort to avoid residual .repodata/ directory on error
+- Add deltarepo and python-deltarepo subpackages
+- Add modifyrepo_c
+- Add documentation for python bindings
+- Refactored code & a lot of little bug fixes
+
+* Wed Aug  14 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.2.1-1
+- checksum: Set SHA to be the same as SHA1 (For compatibility with original
+  Createrepo)
+
+* Mon Aug   5 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.2.0-1
+- Speedup (More parallelization)
+- Changed C API
+- Add python bindings
+- A lot of bugfixes
+- Add new make targets: tests (make tests - builds c tests) and test
+  (make test - runs c and python test suits).
+- Changed interface of most of C modules - Better error reporting
+  (Add GError ** param).
+- Experimental Python bindings (Beware: The interface is not final yet!).
+- package: Add cr_package_copy method.
+- sqlite: Do not recreate tables and triggers while opening existing db.
+- mergerepo_c: Implicitly use --all with --koji.
+- Man page update.
+
+* Thu Apr  11 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.17-3
+- mergerepo_c: Add --simple-md-filenames and --unique-md-filenames
+options. (RhBug: 950994)
+- mergerepo_c: Always include noarch while mimic koji
+mergerepos. (RhBug: 950991)
+- Rename cr_package_parser_shutdown to cr_package_parser_cleanup()
+- cr_db_info_update is now safe from sqlinjection.
+
+* Mon Mar  25 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.17-1
+- Fix double free() when old metadata parsing failed. (related to RhBug: 920795)
+- Convert all strings to UTF-8 while dumping XML. (related RhBug: 920795)
+
+* Mon Mar  11 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.16-2
+- Remove creation of own empty rpm keyring for a transaction set.
+This is not necessary since rpm-4.8.0-28 (rpm commit
+cad147070e5513312d851f44998012e8f0cdf1e3). Moreover, own rpm keyring
+causes a race condition in threads (causing double free()) which use
+rpmReadPackageFile() called from cr_package_from_rpm().
+
+* Thu Mar  07 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.16-1
+- Fix usage of rpm keyring (RhBug:918645)
+- More generic interface of repomd module
+- Code refactoring
+- Add some usage examples into the doxygen documentation and .h files
+- Rename version constants in version.h
+- New function cr_package_nevra (returns package nevra string)
+
+* Mon Feb  11 2013 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.15-1
+- Fix bug in final move from .repodata/ -> repodata/
+- Fix warnings from RPM library. RPM library is thread-unsafe. This
+includes also reading headers. Use of empty keyring for rpm transaction
+should work around the problem.
+
+* Tue Nov  27 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.14-1
+- Fix filelists database generation (use '.' instead of '' for current dir)
+
+* Tue Nov  20 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.13-1
+- Fix race-condition during task buffering in createrepo_c
+
+* Tue Nov  20 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.12-2
+- Fix removing old repomd.xml while --update
+
+* Thu Nov  15 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.12-1
+- Fix bug in sqlite filelists database
+- Fix memory leak
+
+* Fri Nov  09 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.11-1
+- Deterministic output! Packages in output repodata are now sorted
+by ASCII value
+- Support for Koji mergerepos behaviour in mergerepo_c
+(new --koji, --groupfile and --blocked params)
+- Better atomicity while finall move .repodata/ -> repodata/
+- Repomd module supports pkgorigins record
+- Some new functions in misc module
+- Small changes in library interface
+
+* Wed Oct  03 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.10-1
+- Another memory usage optimalization
+
+* Mon Sep  03 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.9-1
+- Some changes in library interface
+- Memory usage optimalization
+- Fix a segfault and a race condition
+- New cmd options: --read-pkgs-list and --retain-old-md param
+- Few other bugfixes
+
+* Wed Aug  15 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.8-1
+- New interface of repomd module
+- New cmd options: --repo --revision --distro --content --basedir
+- New createrepo_c specific cmd option --keep-all-metadata
+- Few bugfixes
+
+* Thu Jul  26 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.7-1
+- SQLite support
+- Bash completion
+- createrepo_c support for --compress-type param
+- Improved logging
+- Subpackages -devel and -libsi
+- Relicensed to GPLv2
+- Doxygen documentation in devel package
+- README update
+
+* Mon Jun  11 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.5-1
+- Support for .xz compression
+- Unversioned .so excluded from installation
+
+* Mon Jun   4 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.4-1
+- New mergerepo params: --all, --noarch-repo and --method
+- Fix segfault when more than one --excludes param used
+
+* Mon May  28 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.3-1
+- Set RelWithDebInfo as default cmake build type
+
+* Wed May  23 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.2-1
+- Add version.h header file
+
+* Wed May  23 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.1-1
+- Add license
+
+* Wed May  9 2012 Tomas Mlcoch <tmlcoch at redhat.com> - 0.1.0-1
+- First public release

d/dovecot/dovecot-vl.spec

@@ -7,7 +7,7 @@
 
 # pigeonhole
 %define build_pigeonhole 1
-%define pigeonholever 0.5.10
+%define pigeonholever 0.5.11
 
 # pop before smtp (drac)
 %define build_drac 0
@@ -15,17 +15,17 @@
 Summary: Dovecot Secure imap server
 Summary(ja): Dovecot セキュア IMAP サーバ
 Name: dovecot
-Version: 2.3.10.1
+Version: 2.3.11.3
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Daemons
+Group: servers
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: iwamoto
 
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2 and BSD with advertising
-URL: http://www.dovecot.org/
+URL: https://www.dovecot.org/
-%global  shortver %(echo "%{version}" | perl -p -e 's/^([0-9]+\.[0-9]+).*$/\\1/')
+%global  shortver %(echo "%{version}" | cut -d . -f 1,2)
 Source:  https://dovecot.org/releases/%{shortver}/%{name}-%{version}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
@@ -109,28 +109,29 @@ The SQL drivers and authentication plugins are in their subpackages.
 Requires: %{name} = %{version}-%{release}
 Obsoletes: dovecot-sieve
 Summary: Sieve and managesieve plug-in for dovecot
-Group: System Environment/Daemons
+Group: servers
 License: MIT and LGPLv2
 
 %description pigeonhole
 This package provides sieve and managesieve plug-in for dovecot LDA.
-
 %endif
 
+
 %if %{build_postgres}
 %package pgsql
 Requires: %{name} = %{version}-%{release}
 Summary: Postgres SQL backend for dovecot
-Group: System Environment/Daemons
+Group: servers
 %description pgsql
 This package provides the Postgres SQL backend for dovecot-auth etc.
 %endif
 
+
 %if %{build_mysql}
 %package mysql
 Requires: %{name} = %{version}-%{release}
 Summary: MySQL backend for dovecot
-Group: System Environment/Daemons
+Group: servers
 %description mysql
 This package provides the MySQL backend for dovecot-auth etc.
 %endif
@@ -139,7 +140,7 @@ This package provides the MySQL backend for dovecot-auth etc.
 %package sqlite
 Requires: %{name} = %{version}-%{release}
 Summary: SQLite backend for dovecot
-Group: System Environment/Daemons
+Group: servers
 %description sqlite
 This package provides the SQLite backend for dovecot-auth etc.
 %endif
@@ -148,7 +149,7 @@ This package provides the SQLite backend for dovecot-auth etc.
 %package ldap
 Requires: %{name} = %{version}-%{release}
 Summary: LDAP auth plugin for dovecot
-Group: System Environment/Daemons
+Group: servers
 %description ldap
 This package provides the LDAP auth plugin for dovecot-auth etc.
 %endif
@@ -156,7 +157,7 @@ This package provides the LDAP auth plugin for dovecot-auth etc.
 %if %{build_drac}
 %package drac
 Summary: Dovecot plugin module for support drac (POP before SMTP)
-Group: System Environment/Daemons
+Group: servers
 Requires: %{name} = %{version}-%{release}
 Requires: dracd
 Obsoletes: %{name}-plugin-drac < %{version}-%{release}
@@ -168,11 +169,14 @@ Dovecot plugin module for support drac (POP before SMTP)
 %package devel
 Requires: %{name} = %{version}-%{release}
 Summary: Development files dor dovecot
-Group: Development/Libraries
+Group: programming
 %description devel
 This package provides the development files for dovecot.
 
 
+%debug_package
+
+
 %prep
 
 %setup -q
@@ -193,6 +197,7 @@ cp %{SOURCE110} .
 %setup -q -D -T -a 8
 %endif
 
+
 %build
 # rm -f ./configure
 # autoreconf -i -f
@@ -249,6 +254,7 @@ make DOVDIR=../
 popd
 %endif
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -346,7 +352,9 @@ popd
 
 
 %check
+%ifnarch %{ix86}
 make check
+%endif
 cd dovecot-2.3-pigeonhole-%{pigeonholever}
 make check
 
@@ -530,6 +538,13 @@ fi
 %endif
 
 %changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.11.3-2
+- enabled debuginfo.
+
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.11.3-1
+- new upstream release.
+- updated pigeonhole to 0.5.11.
+
 * Mon May 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.10.1-1
 - new upstream release.
 - added systemd support (disabled as default).

lib/libs/libsmbios/libsmbios-vl.spec

@@ -1,9 +1,9 @@
 Name: libsmbios
 Version: 2.4.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Summary: Libsmbios C/C++ shared libraries
 Summary(ja): Libsmbios C/C++ 共有ライブラリ
-Group: System Environment/Libraries
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: shaolin, daisuke
@@ -43,19 +43,19 @@ should use the libsmbios C interface.
 %package -n python3-smbios
 Summary: Python interface to Libsmbios C library
 Summary(ja): libsmbios C ライブラリへの Python インターフェース
-Group: System Environment/Libraries
+Group: programming
 BuildRequires: python3-devel python3-setuptools python3-rpm-macros
 Requires: %{name} = %{version}-%{release}
 Requires: python3
 
-
 %description -n python3-smbios
 This package provides a Python interface to libsmbios
 
+
 %package -n smbios-utils
 Summary: Meta-package that pulls in all smbios binaries and python scripts
 Summary(ja): すべての smbios プログラムと python スクリプトをインストールするための仮想パッケージ
-Group: Applications/System
+Group: admin-tools
 Requires: smbios-utils-bin = %{version}-%{release}
 Requires: smbios-utils-python3 = %{version}-%{release}
 
@@ -63,20 +63,22 @@ Requires: smbios-utils-python3 = %{version}-%{release}
 This is a meta-package that pulls in the binary libsmbios executables as well
 as the python executables.
 
+
 %package -n smbios-utils-bin
 Summary: Binary utilities that use libsmbios
 Summary(ja): libsmbios を用いたユーティリティ集
-Group: Applications/System
+Group: admin-tools
 Requires: %{name} = %{version}-%{release}
 
 %description -n smbios-utils-bin
 Get BIOS information, such as System product name, product id, service tag and
 asset tag.
 
+
 %package -n smbios-utils-python3
 Summary: Python executables that use libsmbios
 Summary(ja): libsmbios を用いた Python スクリプト集
-Group: Applications/System
+Group: admin-tools
 Requires: python3-smbios = %{version}-%{release}
 Obsoletes: smbios-utils-python < %{version}-%{release}
 Provides: smbios-utils-python = %{version}-%{release}
@@ -87,11 +89,12 @@ asset tag. Set service and asset tags on Dell machines. Manipulate wireless
 cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems.
 Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
 
+
 # name the devel package libsmbios-devel regardless of package name, per suse/fedora convention
 %package -n libsmbios-devel
 Summary: Development headers and archives
 Summary(ja): libsmbios の開発用ヘッダファイルとライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 
 %description -n libsmbios-devel
@@ -101,6 +104,7 @@ information from standard BIOS tables, such as the SMBIOS table.
 This package contains the headers and .a files necessary to compile new client
 programs against libsmbios.
 
+
 %prep
 %setup -q -n libsmbios-%{version}
 find . -type d -exec chmod -f 755 {} \;
@@ -176,12 +180,15 @@ cat > files-smbios-utils-python3 <<-EOF
 	%{_datadir}/smbios-utils
 EOF
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
 %license COPYING* src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt
@@ -229,6 +236,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-2
+- rebuilt with python3.8.
+
 * Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-1
 - new upstream release.
 - dropped python2 support.

p/python-sphinx/python-sphinx-vl.spec

@@ -6,7 +6,7 @@
 Summary:        Python documentation generator
 Name:           python-sphinx
 Version:        3.2.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          publishing,programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -95,6 +95,7 @@ BuildRequires: python3-sphinxcontrib-applehelp
 BuildRequires: python3-sphinxcontrib-devhelp
 BuildRequires: python3-sphinxcontrib-htmlhelp
 BuildRequires: python3-sphinxcontrib-qthelp
+BuildRequires: python3-sphinxcontrib-jsmath
 Requires:      python3-pygments
 Requires:      python3-sphinxcontrib-websupport
 Requires:      python3-sphinxcontrib-serializinghtml
@@ -102,6 +103,7 @@ Requires:      python3-sphinxcontrib-applehelp
 Requires:      python3-sphinxcontrib-devhelp
 Requires:      python3-sphinxcontrib-htmlhelp
 Requires:      python3-sphinxcontrib-qthelp
+Requires:      python3-sphinxcontrib-jsmath
 %endif
 
 %description -n python3-sphinx
@@ -276,6 +278,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.1-2
+- added R:python3-sphinxcontrib-jsmath.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.1-1
 - new upstream release.
 - built with python3 only.

p/python-sphinxcontrib-jsmath/python-sphinxcontrib-jsmath-vl.spec

@@ -0,0 +1,98 @@
+%global pypi_name sphinxcontrib-jsmath
+
+# when bootstrapping sphinx, we cannot run tests yet
+%bcond_with check
+
+Summary:        Sphinx extension for math in HTML via JavaScript
+Name:           python-%{pypi_name}
+Version:        1.0.1
+Release:        10%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://sphinx-doc.org/
+Source0:        %{pypi_source}
+
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx >= 1:2
+%endif
+
+%description
+sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML
+via JavaScript.
+
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+Group:          programming
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML
+via JavaScript.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+
+
+%build
+%py3_build
+
+
+%install
+%py3_install
+
+
+%if %{with check}
+%check
+%{__python3} -m pytest
+%endif
+
+
+%files -n python3-%{pypi_name}
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_jsmath-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_jsmath-%{version}-py%{python3_version}.egg-info/
+
+
+%changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.1-10
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-1
+- Initial package

r/rspamd/rspamd-vl.spec

@@ -0,0 +1,254 @@
+%bcond_with systemd
+
+%define rspamd_user      _rspamd
+%define rspamd_group     %{rspamd_user}
+%define rspamd_home      %{_localstatedir}/lib/rspamd
+%define rspamd_logdir    %{_localstatedir}/log/rspamd
+%define rspamd_confdir   %{_sysconfdir}/rspamd
+%define rspamd_pluginsdir   %{_datadir}/rspamd/plugins
+%define rspamd_rulesdir   %{_datadir}/rspamd/rules
+%define rspamd_wwwdir   %{_datadir}/rspamd/www
+
+Name:           rspamd
+Version:        2.5
+Release:        3%{?_dist_release}%{?with_systemd:.systemd}
+Summary:        Rapid spam filtering system
+Group:          servers
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        ASL 2.0
+URL:            https://rspamd.com
+Source0:        https://github.com/rspamd/rspamd/archive/%{version}.tar.gz#/%{name}-%{version}.tar.xz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
+
+BuildRequires:  cmake
+BuildRequires:  file-devel
+BuildRequires:  glib2-devel
+BuildRequires:  gmime-devel
+%ifarch x86_64
+BuildRequires:  hyperscan-devel
+%endif
+BuildRequires:  libevent-devel
+BuildRequires:  libicu-devel
+BuildRequires:  libsodium-devel
+BuildRequires:  libunwind-devel
+BuildRequires:  lua-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pcre2-devel
+BuildRequires:	perl
+BuildRequires:  ragel
+BuildRequires:  sqlite3-devel
+%if %{with systemd}
+BuildRequires:  systemd
+%endif
+
+Requires:       logrotate
+Requires(pre):  shadow-utils
+%if %{with systemd}
+Requires(pre):  systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
+Requires(postun): initscripts
+%endif
+
+%description
+Rspamd is a rapid, modular and lightweight spam filter. It is designed to work
+with big amount of mail and can be easily extended with own filters written in
+lua.
+
+
+%debug_package
+
+
+%prep
+%setup -q
+
+
+%build
+%{__cmake} \
+		-DCMAKE_C_OPT_FLAGS="%{optflags}" \
+        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DCONFDIR=%{_sysconfdir}/rspamd \
+        -DINCLUDEDIR=%{_includedir} \
+        -DLIBDIR=%{_libdir}/rspamd/ \
+        -DMANDIR=%{_mandir} \
+        -DSHAREDIR=%{_datadir}/rspamd \
+        -DDBDIR=%{_localstatedir}/lib/rspamd \
+        -DRUNDIR=%{_localstatedir}/run/rspamd \
+        -DLOGDIR=%{_localstatedir}/log/rspamd \
+        -DEXAMPLESDIR=%{_datadir}/examples/rspamd \
+        -DNO_SHARED=ON \
+        -DDEBIAN_BUILD=0 \
+        -DRSPAMD_GROUP=%{rspamd_group} \
+        -DRSPAMD_USER=%{rspamd_user} \
+%if %{with systemd}
+        -DWANT_SYSTEMD_UNITS=ON \
+        -DSYSTEMDDIR=%{_unitdir} \
+%else
+        -DWANT_SYSTEMD_UNITS=OFF \
+        -DDISABLE_PTHREAD_MUTEX=1 \
+%endif
+%ifarch x86_64
+        -DENABLE_HYPERSCAN=ON \
+%endif
+        -DENABLE_LIBUNWIND=ON \
+        -DENABLE_LUAJIT=OFF \
+        -DENABLE_PCRE2=ON \
+        %nil
+
+        #-DCMAKE_SKIP_INSTALL_RPATH=ON \
+
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__make} install DESTDIR=%{buildroot} INSTALLDIRS=vendor
+
+pushd ./centos/sources/
+
+%{__install} -p -D -m 0644 80-rspamd.preset %{buildroot}%{_presetdir}/80-rspamd.preset
+
+%if %{with systemd}
+%{__install} -p -D -m 0644 %{name}.logrotate.systemd %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -d -p -m 0755 %{buildroot}%{rspamd_logdir}
+%else
+%{__install} -p -D -m 0755 %{name}.init %{buildroot}%{_initrddir}/%{name}
+%{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/run/rspamd
+%{__install} -p -D -m 0644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -d -p -m 0755 %{buildroot}%{rspamd_logdir}
+%endif
+
+%{__install} -d -p -m 0755 %{buildroot}%{rspamd_home}
+%{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/local.d/
+%{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d/
+
+popd
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%pre
+%{_sbindir}/groupadd -r %{rspamd_group} 2>/dev/null || :
+%{_sbindir}/useradd -g %{rspamd_group} -c "Rspamd user" -s /bin/false -r -d %{rspamd_home} %{rspamd_user} 2>/dev/null || :
+
+%post
+#to allow easy upgrade from 0.8.1
+%{__chown} -R %{rspamd_user}:%{rspamd_group} %{rspamd_home}
+
+%if %{with systemd}
+#Macro is not used as we want to do this on upgrade
+#%systemd_post %{name}.service
+systemctl --no-reload preset %{name}.service >/dev/null 2>&1 || :
+%{__chown} %{rspamd_user}:%{rspamd_group} %{rspamd_logdir}
+%else
+/sbin/chkconfig --add %{name}
+%endif
+
+%preun
+%if %{with systemd}
+%systemd_preun %{name}.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
+    /sbin/service %{name} stop >/dev/null 2>&1
+    /sbin/chkconfig --del %{name}
+fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart %{name}.service
+%else
+if [ $1 -ge 1 ]; then
+    /sbin/service %{name} condrestart > /dev/null 2>&1 || :
+fi
+%endif
+
+
+%files
+%defattr(-,root,root,-)
+%license LICENSE.md
+%doc AUTHORS.md ChangeLog README.md
+%if %{with systemd}
+%{_unitdir}/%{name}.service
+%{_presetdir}/80-rspamd.preset
+%else
+%{_initrddir}/%{name}
+%dir %{_localstatedir}/run/rspamd
+%endif
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %{rspamd_logdir}
+%{_mandir}/man8/%{name}.*
+%{_mandir}/man1/rspamc.*
+%{_mandir}/man1/rspamadm.*
+%{_bindir}/rspamd
+%{_bindir}/rspamd-*
+%{_bindir}/rspamd_stats
+%{_bindir}/rspamc
+%{_bindir}/rspamc-*
+%{_bindir}/rspamadm
+%{_bindir}/rspamadm-*
+%attr(-, %{rspamd_user}, %{rspamd_group}) %dir %{rspamd_home}
+%dir %{rspamd_rulesdir}/regexp
+%dir %{rspamd_rulesdir}
+%dir %{rspamd_confdir}
+%dir %{rspamd_confdir}/modules.d
+%dir %{rspamd_confdir}/local.d
+%dir %{rspamd_confdir}/maps.d
+%dir %{rspamd_confdir}/override.d
+%dir %{rspamd_confdir}/scores.d
+%dir %{rspamd_wwwdir}
+%dir %{_libdir}/rspamd
+%config(noreplace) %{rspamd_confdir}/*.conf
+%config(noreplace) %{rspamd_confdir}/*.inc
+%config(noreplace) %{rspamd_confdir}/maps.d/*
+%config(noreplace) %{rspamd_confdir}/modules.d/*
+%config(noreplace) %{rspamd_confdir}/scores.d/*
+%dir %{rspamd_pluginsdir}
+%{rspamd_pluginsdir}/*.lua
+%dir %{_datadir}/rspamd/lualib
+%dir %{_datadir}/rspamd/lualib/lua_content
+%dir %{_datadir}/rspamd/lualib/lua_ffi
+%dir %{_datadir}/rspamd/lualib/lua_magic
+%dir %{_datadir}/rspamd/lualib/lua_selectors
+%dir %{_datadir}/rspamd/lualib/lua_scanners
+%dir %{_datadir}/rspamd/lualib/rspamadm
+%{_datadir}/rspamd/lualib/*.lua
+%{_datadir}/rspamd/lualib/lua_content/*.lua
+%{_datadir}/rspamd/lualib/lua_ffi/*.lua
+%{_datadir}/rspamd/lualib/lua_magic/*.lua
+%{_datadir}/rspamd/lualib/lua_selectors/*.lua
+%{_datadir}/rspamd/lualib/lua_scanners/*.lua
+%{_datadir}/rspamd/lualib/rspamadm/*.lua
+%{rspamd_rulesdir}/regexp/*.lua
+%{rspamd_rulesdir}/*.lua
+%{rspamd_wwwdir}/*
+%{_libdir}/rspamd/*
+%{_datadir}/rspamd/effective_tld_names.dat
+%dir %{_datadir}/rspamd/languages
+%{_datadir}/rspamd/languages/*
+%dir %{_datadir}/rspamd/elastic
+%{_datadir}/rspamd/elastic/*
+
+
+%changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5-3
+- rebuilt with current envirionment.
+
+* Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5-2
+- rebuilt with icu-67.
+
+* Thu Apr 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5-1
+- new upstream release.
+
+* Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4-2
+- rebuilt with libicu66.
+
+* Sat Mar 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4-1
+- initial build for Vine Linux.

s/strongswan/strongswan-vl.spec

@@ -7,10 +7,11 @@
 #%%define prerelease dr1
 
 Name:           strongswan
-Version:        5.8.4
+Version:        5.9.0
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 Summary(ja):    オープンソースのIPsec VPN/TNCソリューション
+Group:          servers,security
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -101,6 +102,7 @@ PT-TLS to support TNC over TLS.
 %patch1 -p1
 %patch3 -p1
 
+
 %build
 # only for snapshots
 #autoreconf
@@ -196,10 +198,9 @@ PT-TLS to support TNC over TLS.
 %endif
     --enable-kernel-libipsec
 
-
-
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -257,6 +258,7 @@ if [ $1 -gt 0 ]; then
 fi
 %endif
 
+
 %files
 %doc README NEWS TODO ChangeLog
 %{!?_licensedir:%global license %%doc}
@@ -332,7 +334,11 @@ fi
 %{_libexecdir}/strongswan/charon-nm
 %endif
 
+
 %changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.9.0-1
+- new upstream release.
+
 * Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.8.4-1
 - new upstream release.
 - imported Patch0 from rawhide.

s/system-storage-manager/system-storage-manager-vl.spec

@@ -1,20 +1,19 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
+Summary:        A single tool to manage your storage
 Name:           system-storage-manager
-Version:        1.2
+Version:        1.4
 Release:        1%{?_dist_release}
-Summary:        A single tool to manage your storage
+Group:          admin-tools
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://system-storage-manager.github.io/
 Source0:        https://github.com/system-storage-manager/ssm/archive/%{name}-%{version}.tar.gz
 
 Patch1:         python3-sphinx.patch
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
 BuildArch:      noarch
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-rpm-macros
@@ -80,6 +79,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.4-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2-1
 - new upstream release.
 

t/trousers/trousers-vl.spec

@@ -4,20 +4,27 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
 Version: 0.3.14
-Release: 1%{?_dist_release}
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Libraries
+Group: system
-
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: tomop
 
 License: BSD
 URL: http://trousers.sourceforge.net
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: tcsd.service
 Source1000: tcsd.init
-Patch1:  trousers-0.3.13-noinline.patch
+
-Patch2:  trousers-openssl1.1.patch
+Patch1:  trousers-0.3.14-noinline.patch
+# submitted upstream
+Patch2: trousers-0.3.14-unlock-in-err-path.patch
+Patch3: trousers-0.3.14-fix-indent-obj_policy.patch
+Patch4: trousers-0.3.14-double-free.patch
+Patch5: trousers-0.3.14-fix-indent-tspi_key.patch
+Patch6: trousers-0.3.14-tcsd-header-fix.patch
+
+Patch1003: 0003-trousers-clean-up-use-after-free-in-Transport_Termin.patch
+Patch1005: 0005-Correct-multiple-security-issues-that-are-present-if.patch
 
 BuildRequires: libtool, openssl-devel
 Requires(pre): shadow-utils
@@ -36,18 +43,20 @@ of your TPM hardware. TPM hardware can create, store and use RSA keys
 securely (without ever being exposed in memory), verify a platform's software
 state using cryptographic hashes and more.
 
+
 %package lib
 Summary: TrouSerS libtspi library
-Group: Development/Libraries
+Group: system
 # Needed obsoletes due to the -lib subpackage split
 Obsoletes: trousers < 0.3.13-4
 
 %description lib
 The libtspi library for use in Trusted Computing enabled applications.
 
+
 %package static
 Summary: TrouSerS TCG Device Driver Library
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description static
@@ -56,26 +65,29 @@ interface to the TPM's device driver. For more information about writing
 applications to the TDDL interface, see the latest TSS spec at
 https://www.trustedcomputinggroup.org/specs/TSS.
 
+
 %package devel
 Summary: TrouSerS header files and documentation
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-lib%{?_isa} = %{version}-%{release}
 
 %description devel
 Header files and man pages for use in creating Trusted Computing enabled
 applications.
 
+
 %prep
 %setup -q -c
-%patch1 -p1 -b .noinline
+%autopatch -p1
-%patch2 -p1 -b .ssl1.1
 # fix man page paths
 sed -i -e 's|/var/tpm|/var/lib/tpm|g' -e 's|/usr/local/var|/var|g' man/man5/tcsd.conf.5.in man/man8/tcsd.8.in
 
+
 %build
 %configure --with-gui=openssl
 make -k %{?_smp_mflags}
 
+
 %install
 mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/lib/tpm
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
@@ -89,6 +101,7 @@ mkdir -p $RPM_BUILD_ROOT%{_initdir}
 install -m 0755 %{SOURCE1000} $RPM_BUILD_ROOT%{_initdir}/tcsd
 %endif
 
+
 %pre
 getent group tss >/dev/null || groupadd -g 59 -r tss
 getent passwd tss >/dev/null || \
@@ -107,7 +120,7 @@ exit 0
 %if %{with systemd}
 %systemd_preun tcsd.service
 %else
-if [ $1 -eq 0 ]; then 
+if [ $1 -eq 0 -o -x /bin/systemctl ]; then 
   /sbin/service tcsd stop
   /sbin/chkconfig --del tcsd
 fi
@@ -123,9 +136,9 @@ fi
 %endif
 
 %post lib -p /sbin/ldconfig
-
 %postun lib -p /sbin/ldconfig
 
+
 %files
 %doc README ChangeLog
 %{_sbindir}/tcsd
@@ -158,9 +171,13 @@ fi
 # The only static library shipped by trousers, the TDDL
 %{_libdir}/libtddl.a
 
+
 %changelog
-* Wed Nov 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.14-1
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.14-1
 - new upstream release.
+- dropped Patch1 and 2.
+- imported Patch1-6 from rawhide.
+- imported Patch1003 and 1005 from upstream to fix vulnerabilities.
 
 * Wed Nov 07 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.13-12
 - rebuilt with openssl-1.1.1.