c/cyrus-sasl/cyrus-sasl-vl.spec

@@ -2,6 +2,13 @@
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
+%global username    saslauth
+%if %{with systemd}
+%global homedir     /run/saslauthd
+%else
+%global homedir     /var/run/saslauthd
+%endif
+
 %define _plugindir2 %{_libdir}/sasl2
 
 Summary: The Cyrus SASL library.
@@ -20,26 +27,29 @@ Source4: saslauthd.init
 Source5: README.RPM
 Source9: saslauthd.sysconfig
 Source10: saslauthd.service
-#
+## From upstream git, required for reconfigure after applying patches to configure.ac
+# https://raw.githubusercontent.com/cyrusimap/cyrus-sasl/master/autogen.sh
+Source11: autogen.sh
+
 Patch11: cyrus-sasl-2.1.25-no_rpath.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
+Patch23: cyrus-sasl-2.1.23-man.patch
 Patch24: cyrus-sasl-2.1.21-sizes.patch
 # The 64 bit *INT8 type is not used anywhere and other types match
 Patch49: cyrus-sasl-2.1.26-md5global.patch
-Patch60: cyrus-sasl-pr559-RC4-openssl.patch
-Patch100: cyrus-sasl-cve-2019-19906.patch
+
 Patch101: cyrus-sasl-2.1.27-Add-basic-test-infrastructure.patch
 Patch102: cyrus-sasl-2.1.27-Add-Channel-Binding-support-for-GSSAPI-GSS-SPNEGO.patch
-Patch103: cyrus-sasl-2.1.27-Add-support-for-setting-max-ssf-0-to-GSS-SPNEGO.patch
-Patch104: cyrus-sasl-2.1.27-Emit-debug-log-only-in-case-of-errors.patch
-Patch105: cyrus-sasl-2.1.27-fix-for-autoconf270.patch
 #https://github.com/simo5/cyrus-sasl/commit/ebd2387f06c84c7f9aac3167ec041bb01e5c6e48
 Patch106: cyrus-sasl-2.1.27-nostrncpy.patch
 # Upstream PR: https://github.com/cyrusimap/cyrus-sasl/pull/635
-Patch107: cyrus-sasl-2.1.27-Add-basic-test-plain-auth.patch
+Patch107: cyrus-sasl-2.1.27-more-tests.patch
+Patch108: cyrus-sasl-2.1.27-Add-support-for-setting-max-ssf-0-to-GSS-SPNEGO.patch
 #Migration tool should be removed from Fedora 36
-Patch108: cyrus-sasl-2.1.27-Migration-from-BerkeleyDB.patch
+Patch109: cyrus-sasl-2.1.27-Migration-from-BerkeleyDB.patch
 Patch500: cyrus-sasl-2.1.27-coverity.patch
+Patch501: cyrus-sasl-2.1.27-cumulative-digestmd5.patch
+Patch502: cyrus-sasl-2.1.27-cumulative-ossl3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool
@@ -293,28 +303,26 @@ chmod -x include/*.h
 %else
 sed -i -e 's|/usr/local/etc|/etc|g' saslauthd/saslauthd.mdoc
 %endif
+%patch23 -p1 -b .man
 %patch24 -p1 -b .sizes
 %patch49 -p1 -b .md5global.h
-%patch60 -p1 -b .openssl_rc4
-%patch100 -p1 -b .cve_2019_19906
 %patch101 -p1 -b .tests
 %patch102 -p1 -b .gssapi_cbs
-%patch103 -p1 -b .maxssf0
-%patch104 -p1 -b .nolog
-%patch105 -p1 -b .autoconf270
 %patch106 -p1 -b .nostrncpy
-%patch107 -p1 -b .plaintests
-%patch108 -p1 -b .frombdb
+%patch107 -p1 -b .moretests
+%patch108 -p1 -b .maxssf0
+%patch109 -p1 -b .frombdb
 %patch500 -p1 -b .coverity
+%patch501 -p1 -b .digestmd5
+%patch502 -p1 -b .ossl3
 
 
 %build
-# FIXME - we remove these files directly so that we can avoid using the -f
-# flag, which has a nasty habit of overwriting files like COPYING.
-rm -f config/config.guess config/config.sub 
-rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-rm -fr autom4te.cache
-autoreconf -vif
+# reconfigure
+cp %{SOURCE11} ./
+rm configure aclocal.m4 config/ltmain.sh Makefile.in
+export NOCONFIGURE=yes
+sh autogen.sh
 
 # Find Kerberos.
 krb5_prefix=`krb5-config --prefix`
@@ -366,11 +374,7 @@ echo "$LDFLAGS"
 	--with-rc4 \
 	--with-dblib=berkeley \
         --with-bdb=db \
-%if %{with systemd}
-	--with-saslauthd=/run/saslauthd --without-pwcheck \
-%else
-	--with-saslauthd=/var/run/saslauthd --without-pwcheck \
-%endif
+	--with-saslauthd=%{homedir} --without-pwcheck \
 	--with-ldap \
 	--with-devrandom=/dev/urandom \
 	--enable-anon \
@@ -439,8 +443,8 @@ test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
 %if %{with systemd}
 %pre
-getent group %{username} >/dev/null || groupadd -g 76 -r saslauth
-getent passwd %{username} >/dev/null || useradd -r -g saslauth -d /run/saslauthd -s /sbin/nologin -c "Saslauthd user" saslauth
+getent group %{username} >/dev/null || groupadd -g 76 -r %{username}
+getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -c "Saslauthd user" %{username}
 %endif
 
 %post
@@ -595,8 +599,9 @@ exit 0
 
 
 %changelog
-* Wed Feb 23 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.28-1
+* Tue Mar 01 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.28-1
 - new upstream release.
+- re-imported patches from rawhide.
 
 * Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.27-3
 - rebuilt with openssl-3.0.0.

g/groonga/groonga-vl.spec

@@ -4,7 +4,7 @@
 
 Name:		groonga
 Summary:	An Embeddable Fulltext Search Engine
-Version:	11.1.1
+Version:	12.0.1
 Release:	1%{?_dist_release}%{?with_systemd:.systemd}
 Group:		office
 Vendor:		Project Vine
@@ -457,6 +457,9 @@ chown -R groonga:groonga %{_localstatedir}/run/groonga
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/*
 
 %changelog
+* Wed Mar 02 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 12.0.1-1
+- new upstream release.
+
 * Tue Dec 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 11.1.1-1
 - new upstream release.
 

lib/libs/libsass/libsass-vl.spec

@@ -1,5 +1,5 @@
 Name:           libsass
-Version:        3.6.4
+Version:        3.6.5
 Release:        1%{?_dist_release}
 Summary:        C/C++ port of the Sass CSS precompiler
 Summary(ja):    C/C++ Sass CSS プリコンパイラ
@@ -70,6 +70,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Mar 04 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.6.5-1
+- new upstream release.
+
 * Fri Mar 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.6.4-1
 - new upstream release.
 - dropped scriptlets.

p/polkit/polkit-vl.spec

@@ -4,7 +4,7 @@ Summary: PolicyKit Authorization Framework
 Summary(ja): PolicyKit 認証フレームワーク
 Name: polkit
 Version: 0.120
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -14,6 +14,7 @@ URL: https://www.freedesktop.org/wiki/Software/polkit
 Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
 Patch0: polkit-0.115-elogind.patch
 Patch1001: CVE-2021-4034.patch
+Patch1002: CVE-2021-4115.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
@@ -81,6 +82,7 @@ Development documentation for PolicyKit.
 %patch0 -p1
 %endif
 %patch1001 -p1
+%patch1002 -p1
 
 
 %build
@@ -187,6 +189,9 @@ exit 0
 
 
 %changelog
+* Sat Mar 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.120-2
+- imported Patch1002 from upstream to fix CVE-2021-4115.
+
 * Thu Jan 27 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.120-1
 - new upstream release.
 - dropped Patch1000: fixed in upstream.

s/sassc/sassc-vl.spec

@@ -1,9 +1,9 @@
 %bcond_with check
-%global testspec_version 3.6.0
+%global testspec_version 3.6.3
 
 Name:           sassc
-Version:        3.6.1
-Release:        2%{?_dist_release}
+Version:        3.6.2
+Release:        1%{?_dist_release}
 Group:          publishing
 Summary:        Wrapper around libsass to compile CSS stylesheet
 Summary(ja):    libsassのコマンドラインラッパー
@@ -12,7 +12,7 @@ Distribution:   Vine Linux
 
 License:        MIT
 URL:            http://github.com/sass/sassc
-Source0:        https://github.com/sass/sassc/archive/%{version}.tar.gz
+Source0:        https://github.com/sass/sassc/archive/refs/tags/%{version}.tar.gz
 # Test suite spec. According to this comment from an upstream dev, we should
 # not use the release tags on the test spec:
 # https://github.com/sass/libsass/issues/2258#issuecomment-268196004
@@ -20,9 +20,6 @@ Source0:        https://github.com/sass/sassc/archive/%{version}.tar.gz
 # https://github.com/sass/sass-spec/archive/v%%{testspec_version}.tar.gz
 Source1:        https://github.com/sass/sass-spec/archive/libsass-%{testspec_version}.tar.gz
 
-# libsass is built as a shared library.
-Patch0:         %{name}-3.5.0-build.patch
-
 BuildRequires:  libsass-devel >= %{version}
 BuildRequires:  gcc-c++
 %if %{with check}
@@ -42,19 +39,17 @@ application that can be installed and packaged for several operating systems.
 %prep
 %setup -q -a 1
 mv sass-spec-libsass-%{testspec_version} sass-spec
-%patch0 -p1
+autoreconf -fiv
 
 
 %build
-%make_build build-shared \
-    LDFLAGS="%{build_ldflags}" \
-    CFLAGS="$RPM_OPT_FLAGS" \
-    CXXFLAGS="$RPM_OPT_FLAGS"
+%configure
+%make_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -p -m755 -D bin/sassc $RPM_BUILD_ROOT%{_bindir}/%{name}
+%make_install
 
 
 %if %{with check}
@@ -69,6 +64,9 @@ ruby sass-spec/sass-spec.rb -V 3.6 -c bin/%{name} --impl libsass sass-spec/spec
 
 
 %changelog
+* Fri Mar 04 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.6.2-1
+- new upstream relaase.
+
 * Fri Mar 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.6.1-2
 - rebuilt with current environment.