Browse Source

updated 7 packages

OpenEXR-2.4.1-1

ipset-7.6-1

meson-0.54.0-1

ninja-1.10.0-1

postsrsd-1.6-2

stunnel-5.56-1

ulogd-2.0.7-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12383 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
58070e55ac

+ 7 - 6
O/OpenEXR/OpenEXR-vl.spec

@@ -3,16 +3,14 @@
 Name:	        OpenEXR
 Summary:        A high dynamic-range (HDR) image file format
 Summary(ja):    高ダイナミックレンジ(HDR)画像ファイルフォーマット
-Version:        2.4.0
+Version:        2.4.1
 Release:        1%{?_dist_release}
-
-License:        BSD
-Group:          Applications/Graphics
-URL:            http://www.openexr.com/
-
 Vendor:         Project Vine
 Distribution:   Vine Linux
+Group:          Applications/Graphics
 
+License:        BSD
+URL:            http://www.openexr.com/
 Source0:        https://github.com/openexr/openexr/archive/v%{version}.tar.gz#/openexr-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -196,6 +194,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.1-1
+- new upstream release.
+
 * Fri Oct 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.0-1
 - new upstream release.
 - unified IlmBase into OpenEXR.

+ 44 - 25
i/ipset/ipset-vl.spec

@@ -1,21 +1,29 @@
-Name:             ipset
-Version:          6.32
-Release:          1%{?_dist_release}
-Group:            Applications/System
-Summary:          Manage Linux IP sets
+%bcond_with systemd
 
-License:          GPLv2
-URL:              http://ipset.netfilter.org/
-Source0:          http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
-Source1:          %{name}.service
-Source2:          %{name}.start-stop
-Source3:          %{name}.init
+Name:           ipset
+Summary:        Manage Linux IP sets
+Version:        7.6
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          Applications/System
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-BuildRequires:    libmnl-devel
+License:        GPLv2
+URL:            http://ipset.netfilter.org/
+Source0:        http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
+Source1:        %{name}.service
+Source2:        %{name}.start-stop
+Source3:        %{name}.init
+
+BuildRequires:  libmnl-devel
 
 # An explicit requirement is needed here, to avoid cases where a user would
 # explicitly update only one of the two (e.g 'yum update ipset')
 Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
+%if !%{with systemd}
+Requires(post): chkconfig
+Requires(preun): chkconfig /sbin/service
+%endif
 
 %description
 IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which can be
@@ -53,12 +61,12 @@ This package contains the files required to develop software using the %{name}
 libraries.
 
 
-%if 0
+%if %{with systemd}
 %package service
 Summary:          %{name} service for %{name}s
 Requires:         %{name} = %{version}-%{release}
 BuildRequires:    systemd
-Requires:         iptables-services
+#Requires:         iptables-services
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -93,10 +101,7 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 
-mkdir -p %{buildroot}%{_initdir}
-install -m755 %{SOURCE3} %{buildroot}%{_initdir}/%{name}
-
-%if 0
+%if %{with systemd}
 # install systemd unit file
 install -d -m 755 %{buildroot}/%{_unitdir}
 install -c -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}
@@ -104,19 +109,26 @@ install -c -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}
 # install supporting script
 install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
 install -c -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/%{name}
+%else
+mkdir -p %{buildroot}%{_initdir}
+install -m755 %{SOURCE3} %{buildroot}%{_initdir}/%{name}
 %endif
 
 # Create directory for configuration
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 
+
+%if !%{with systemd}
 %post
 /sbin/chkconfig --add ipset
-
+%endif
 
 %preun
+%if !%{with systemd}
 if [ "$1" = 0 ]; then
     /sbin/chkconfig --del ipset
 fi
+%endif
 if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
     rmmod xt_set 2>/dev/null
     [[ $? -ne 0 ]] && echo Current iptables configuration requires ipsets && exit 1
@@ -128,7 +140,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 
-%if 0
+%if %{with systemd}
 %post service
 %systemd_post %{name}.service
 
@@ -141,25 +153,29 @@ fi
 
 %postun service
 %systemd_postun_with_restart %{name}.service
-
 %endif
 
 %files
-%doc COPYING ChangeLog
+%license COPYING
+%doc ChangeLog
 %doc %{_mandir}/man8/%{name}.8.gz
 %{_sbindir}/%{name}
+%if !%{with systemd}
 %{_initdir}/%{name}
+%dir %{_sysconfdir}/%{name}
+%endif
 
 %files libs
-%doc COPYING
-%{_libdir}/lib%{name}.so.3*
+%license COPYING
+%{_libdir}/lib%{name}.so.*
 
 %files devel
 %{_includedir}/lib%{name}
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/lib%{name}.pc
+%{_mandir}/man3/libipset.3.*
 
-%if 0
+%if %{with systemd}
 %files service
 %{_unitdir}/%{name}.service
 %dir %{_libexecdir}/%{name}
@@ -169,6 +185,9 @@ fi
 
 
 %changelog
+* Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.6-1
+- new upstream release.
+
 * Mon May  8 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.32-1
 - new upstream release.
 

+ 11 - 11
m/meson/meson-vl.spec

@@ -3,24 +3,21 @@
 %global libname mesonbuild
 
 Name:           meson
-Version:        0.51.2
-Release:        1%{?_dist_release}
-Group:          Development/Tools
 Summary:        High productivity build system
 Summary(ja):    高生産性ビルドシステム
+Version:        0.54.0
+Release:        1%{?_dist_release}
+Group:          Development/Tools
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildArch:      noarch
 
 License:        ASL 2.0
-URL:            http://mesonbuild.com/
+URL:            https://mesonbuild.com/
 Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        macros.meson
 
-BuildArch:      noarch
 Obsoletes:      %{name}-gui < 0.31.0-3
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python-rpm-macros
@@ -74,7 +71,7 @@ install -Dpm0644 %{SOURCE1} %{buildroot}%{rpmmacrodir}/macros.%{name}
 
 %check
 export MESON_PRINT_TEST_OUTPUT=1
-#python3 ./run_tests.py ||:
+python3 ./run_tests.py ||:
 
 %files
 %license COPYING
@@ -86,6 +83,9 @@ export MESON_PRINT_TEST_OUTPUT=1
 %{rpmmacrodir}/macros.*
 
 %changelog
+* Sun Apr 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.54.0-1
+- new upstream release.
+
 * Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.51.2-1
 - updated to 0.51.2.
 

+ 9 - 4
n/ninja/ninja-vl.spec

@@ -1,17 +1,18 @@
 Name:           ninja
-Version:        1.7.2
+Version:        1.10.0
 Release:        1%{?_dist_release}
 Summary:        A small build system with a focus on speed
 Summary(ja):    スピードを重視した小さなビルドシステム
 Group:          Development/Tools
-License:        ASL 2.0
-URL:            http://martine.github.com/ninja/
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
+License:        ASL 2.0
+URL:            https://ninja-build.org/
 Source0:        https://github.com/martine/ninja/archive/v%{version}.tar.gz#/ninja-%{version}.tar.gz
 Source1:        macros.ninja
 Source2:        ninja.vim
+
 BuildRequires:  asciidoc
 BuildRequires:  gtest-devel
 BuildRequires:  python-devel
@@ -62,7 +63,8 @@ ulimit -n 4096 && ulimit -u 4096
 ./ninja_test
 
 %files
-%doc COPYING HACKING.md README doc/manual.html
+%license
+%doc HACKING.md README doc/manual.html
 %{_sysconfdir}/rpm/macros.ninja
 %{_bindir}/ninja
 %{_bindir}/ninja-build
@@ -78,6 +80,9 @@ ulimit -n 4096 && ulimit -u 4096
 
 
 %changelog
+* Sun Apr 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.0-1
+- new upstream release.
+
 * Mon Sep 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-1
 - updated to 1.7.2.
 - added rpmmacros.

+ 12 - 2
p/postsrsd/postsrsd-vl.spec

@@ -2,7 +2,7 @@
 
 Name:           postsrsd
 Version:        1.6
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Sender Rewriting Scheme (SRS) provider
 
 Vendor:         Project Vine
@@ -11,6 +11,8 @@ Distribution:   Vine Linux
 License:        GPLv2+
 URL:            https://github.com/roehling/postsrsd
 Source0:        https://github.com/roehling/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:        postsrsd.conf
+Source2:        postsrsd.init
 
 BuildRequires:  gcc
 BuildRequires:  cmake
@@ -24,6 +26,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 %endif
+Requires:       postfix
 
 %description
 PostSRSd provides the Sender Rewriting Scheme (SRS) via TCP-based lookup tables for Postfix.
@@ -56,9 +59,12 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_unitdir}
 mv -f %{buildroot}/%{_sysconfdir}/systemd/system/%{name}.service \
 	%{buildroot}%{_unitdir}/
+mkdir -p %{buildroot}%{_tmpfilesdir}/
+install -m644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/
 %else
+rm -f %{buildroot}/%{_sysconfdir}/init.d/postsrsd
 mkdir -p %{buildroot}/%{_initdir}
-mv -f %{buildroot}/%{_sysconfdir}/init.d/postsrsd %{buildroot}%{_initdir}/
+install -m755 %{SOURCE2} %{buildroot}%{_initdir}/postsrsd
 %endif
 
 # %%ghost file requires it is present in the build root
@@ -75,6 +81,7 @@ sed -i 's/^CHROOT=.*/CHROOT=\/run\/postsrsd/' %{buildroot}/%{_sysconfdir}/defaul
 %config(noreplace) %{_sysconfdir}/default/%{name}
 %if %{with systemd}
 %{_unitdir}/postsrsd.service
+%{_tmpfilesdir}/*
 %else
 %{_initdir}/postsrsd
 %endif
@@ -112,6 +119,9 @@ fi
 
 
 %changelog
+* Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.6-2
+- made to create chroot directory at boot.
+
 * Thu Apr 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.6-1
 - new upstream release.
 - added systemd support (disabled as default).

+ 84 - 27
s/stunnel/stunnel-vl.spec

@@ -1,12 +1,15 @@
-%define ver 5.49
-%define rel 1
+%bcond_with systemd
 
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-License: GPLv2
+Version: 5.56
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: Applications/Internet
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
+
+License: GPLv2
 URL: https://www.stunnel.org/
 Source0: https://www.stunnel.org/downloads/stunnel-%{version}.tar.gz
 Source1: https://www.stunnel.org/downloads/stunnel-%{version}.tar.gz.asc
@@ -15,19 +18,36 @@ Source3: sfinger.xinetd
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
+Source7: stunnel@.service
 Source100: stunnel.init
-Patch0: 0001-authpriv.patch
-Patch1: 0002-config.patch
+
+Patch0: stunnel-5.50-authpriv.patch
+Patch3: stunnel-5.56-system-ciphers.patch
+Patch4: stunnel-5.56-coverity.patch
+Patch5: stunnel-5.56-default-tls-version.patch
+Patch6: stunnel-5.56-curves-doc-update.patch
+
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-BuildRequires: tcp_wrappers
 BuildRequires: util-linux
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig /sbin/service
+Requires(postun): /sbin/service
+%endif
+
+%if %{with systemd}
+%global pidfile %{_rundir}/stunnel.pid
+%else
+%global pidfile %{_localstatedir}/run/stunnel.pid
+%endif
+
+# Do not generate provides for private libraries
+%global __provides_exclude_from ^%{_libdir}/stunnel/.*$
 
 %description
 Stunnel is a socket wrapper which can provide SSL (Secure Sockets
@@ -36,8 +56,13 @@ in conjunction with imapd to create an SSL secure IMAP server.
 
 %prep
 %setup -q
-%patch0 -p1 -b .authpriv
-%patch1 -p1 -b .config
+%autopatch -p1
+
+# Fix a testcase with system-ciphers support
+sed -i '/client = yes/a \\  ciphers = PSK' tests/recipes/014_PSK_secrets
+
+# modify systemd service unit
+sed -i '/Type=forking/a \\PrivateTmp=true' tools/stunnel.service.in
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -45,8 +70,8 @@ if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
 	LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
 fi
-%configure --disable-fips --enable-ipv6 \
-	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
+%configure --disable-fips --enable-ipv6 --with-ssl=%{_prefix} \
+	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{pidfile}\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
 
 %install
@@ -62,43 +87,65 @@ for lang in pl ; do
 	rename ".${lang}" "" $RPM_BUILD_ROOT/%{_mandir}/${lang}/man8/*
 done
 
+mkdir -p srpm-docs
+cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} srpm-docs
+
+%if %{with systemd}
+mkdir -p %{buildroot}%{_unitdir}
+cp %{buildroot}%{_datadir}/doc/stunnel/examples/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
+cp %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service
+%else
 install -d -m755 %{buildroot}%{_initdir}
 install -m755 %{SOURCE100} %{buildroot}%{_initdir}/stunnel
-
 install -d m755 %{buildroot}%{_sysconfdir}/sysconfig
 cat <<EOF > %{buildroot}%{_sysconfdir}/sysconfig/stunnel
 ENABLED=0
 EOF
+%endif
 
-mkdir -p srpm-docs
-cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} srpm-docs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-getent group stunnel >/dev/null || groupadd -r stunnel
-getent passwd stunnel >/dev/null || \
-useradd -r -g stunnel -d /dev/null -s /sbin/nologin \
-  -c "stunnel service account" stunnel
 
 %post
+%if %{with systemd}
+%systemd_post %{name}.service
+%else
 /sbin/chkconfig --add stunnel
+%endif
 
 %preun
-if [ $1 -eq 0 ]; then
+%if %{with systemd}
+%systemd_preun %{name}.service
+%else
+if [ $1 -eq 0 -o -x /bin/systemctl ]; then
+  /sbin/service stunnel stop /dev/null 2>/dev/null ||:
   /sbin/chkconfig --del stunnel
 fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart %{name}.service
+%else
+if [ $1 -gt 0 ]; then
+  if /sbin/service stunnel status >/dev/null; then
+    /sbin/service stunnel restart
+  fi
+fi
+%endif
+
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS ChangeLog COPY* CREDITS PORTS README TODO
+%doc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
 %doc tools/stunnel.conf-sample
 %doc srpm-docs/*
+%license COPY*
 %lang(en) %doc doc/en/*
 %lang(po) %doc doc/pl/*
 %{_bindir}/stunnel
-%{_initdir}/stunnel
 %exclude %{_bindir}/stunnel3
 %exclude %{_datadir}/doc/stunnel
 %{_libdir}/stunnel
@@ -109,9 +156,19 @@ fi
 %dir %{_sysconfdir}/%{name}/conf.d
 %exclude %{_sysconfdir}/stunnel/stunnel.conf-sample
 %exclude %{_sysconfdir}/stunnel/stunnel.pem
+%if %{with systemd}
+%{_unitdir}/%{name}*.service
+%else
+%{_initdir}/stunnel
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%endif
 
 %changelog
+* Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.56-1
+- new upstream release.
+- replaced all patches.
+- added systemd support (disabled as default).
+
 * Sat Dec 01 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.49-1
 - new upstream release.
 - updated Patch0,1.

+ 42 - 9
u/ulogd/ulogd-vl.spec

@@ -1,15 +1,20 @@
+%bcond_with systemd
 %bcond_with doc
 
 Summary: Userspace logging daemon for netfilter
 Name: ulogd
 Version: 2.0.7
-Release: 1%{?_dist_release}
-License: GPLv2+
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Daemons
-URL: http://www.netfilter.org/projects/%{name}/
-Source0: http://ftp.netfilter.org/pub/%{name}/%{name}-%{version}.tar.bz2
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPLv2+
+URL: https://netfilter.org/projects/ulogd/
+Source0: https://netfilter.org/projects/ulogd/files/%{name}-%{version}.tar.bz2
 Source1: %{name}.init
 Source2: %{name}.logrotate
+Source3: %{name}.service
 
 BuildRequires: libnetfilter_conntrack-devel >= 0.0.95
 BuildRequires: libnetfilter_log-devel >= 1.0.0
@@ -21,15 +26,15 @@ BuildRequires: linuxdoc-tools
 BuildRequires: texlive-collection-fontsrecommended
 %endif
 
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post): /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+%endif
 
 %description
 %{name} is a logging daemon that reads event messages coming from the Netfilter
@@ -114,36 +119,61 @@ firewall information into an SQLITE database.
 %{__mkdir_p} -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d/
 %{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
+%if %{with systemd}
+%{__mkdir_p} -m 0755 %{buildroot}%{_unitdir}/
+%{__install} -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
+%else
 %{__mkdir_p} -m 0755 %{buildroot}%{_initrddir}/
 %{__install} -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
+%endif
+
 
 %post
+%if %{with systemd}
+%systemd_post %{name}.service
+%else
 /sbin/chkconfig --add %{name}
 /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+%endif
 
 %preun
+%if %{with systemd}
+%systemd_preun %{name}.service
+%else
 # if we are uninstalling...
-if [ "$1" = 0 ]; then
+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 we are upgrading...
 if [ "$1" -ge "1" ]; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
+%endif
+
 
 %check
 %{__make} %{?_smp_mflags} check
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files
 %defattr(0755,root,root,0755)
 %{_sbindir}/%{name}
+%if %{with systemd}
+%{_unitdir}/%{name}.service
+%else
 %{_initrddir}/%{name}
+%endif
 %{_libdir}/%{name}
 %defattr(0644,root,root,0755)
 %license COPYING
@@ -193,6 +223,9 @@ fi
 %license COPYING
 
 %changelog
+* Sat Apr 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.7-2
+- added systemd support (disabled as default).
+
 * Sun Aug 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.7-1
 - new upstream release.
 - added Source2: dropped in upstream.