updated 4 packages

clamav-0.102.0-2

dar-2.6.6-1

thunderbird-68.1.2-1

unbound-1.9.4-1

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

c/clamav/clamav-vl.spec

@@ -14,7 +14,7 @@ Summary: Clam AntiVirus
 Summary(ja): Clamアンチウィルススキャナ
 Name: clamav
 Version: 0.102.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: Applications/System
 URL: http://www.clamav.net/
@@ -243,6 +243,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Oct 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.102.0-2
+- fixed freshclam.init.
+
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.102.0-1
 - new upstream release.
 

d/dar/dar-vl.spec

@@ -1,10 +1,13 @@
 Name:           dar
 Summary:        Disk ARchive: Backup directory tree and files
 Summary(ja):    ディスクアーカイブ: ディレクトリツリーとファイルをバックアップ
-Version:        2.5.5
+Version:        2.6.6
 Release:        1%{?_dist_release}
-
 Group:          Applications/Archiving
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        GPLv2+
 URL:            http://dar.linux.free.fr/
 
@@ -93,7 +96,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc html/ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL
+%license COPYING
+%doc html/ ABOUT-NLS AUTHORS ChangeLog INSTALL
 %doc NEWS README THANKS TODO
 %{_bindir}/dar
 %{_bindir}/dar_cp
@@ -116,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.6.6-1
+- new upstream release.
+
 * Wed Jun 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.5-1
 - new upstream release.
 

t/thunderbird/thunderbird-vl.spec

@@ -1,10 +1,6 @@
-%bcond_without clang
+%bcond_with clang
 
-# do not include minor version number in MOZILLA_FIVE_HOME
+%global disable_elfhack 1
-%define tbmajor 60.3.3
-#%define tbversion %{tbmajor}.10
-%define tbversion %{tbmajor}
-%define tbrelease 1%{?_dist_release}
 
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
@@ -16,7 +12,6 @@
 
 %define objdir       objdir
 %define mozappdir    %{_libdir}/%{name}
-%define version_internal %{tbmajor}
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 %global langpackdir   %{mozappdir}/distribution/extensions
 
@@ -41,14 +36,14 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	%{tbversion}
+Version:	68.1.2
-Release:	%{tbrelease}
+Release:	1%{?_dist_release}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
 Group:		Applications/Internet
 
-Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.xz
+Source0:	https://archive.mozilla.org/pub/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.xz
-Source1:	thunderbird-langpacks-%{version}-20181205.tar.xz
+Source1:	thunderbird-langpacks-%{version}.tar.xz
 Source2:	lightning-langpacks-%{version}.tar.xz
 Source3:	get-calendar-langpacks.sh
 Source4:	thunderbird-legacy-aurora.tar.xz
@@ -61,27 +56,45 @@ Source41:	thunderbird-unofficial-branding-tb-brand.dtd
 Source42:	thunderbird-unofficial-branding-tb-ja-brand.properties
 Source43:	thunderbird-unofficial-branding-tb-ja-brand.dtd
 Source44:	tb-about-wordmark.svg
+Source99:	cbindgen-vendor.tar.xz
 Source100:  find-external-requires
-Source1010:	mozconfig-thunderbird-vine6
-Source1020:	mozconfig-thunderbird-vine7
 
-# upstream patch
+# for newer rust
+Source900:      https://raw.githubusercontent.com/servo/rust-cssparser/master/src/parser.rs
 
-# Mozilla (XULRunner) patches
+Source1010:	mozconfig-thunderbird-vine6
-Patch37:        build-jit-atomic-always-lucky.patch
+Source1020:	mozconfig-thunderbird-vine7
+Source1030:	thunderbird.metainfo.xml
+
+%define tbversion %{version}
+%define version_internal %{version}
+
+# Build patches
+Patch9:         mozilla-build-arm.patch
+Patch226:       rhbz-1354671.patch
+Patch416:       firefox-SIOCGSTAMP.patch
+Patch417:       build-aarch64-user_vfp.patch
+Patch418:       mozilla-1512162.patch
+Patch105:       thunderbird-debug.patch
+
+# PPC fix
+Patch304:       mozilla-1245783.patch
+Patch306:       mozilla-1353817.patch
 Patch307:       build-disable-elfhack.patch
-Patch417:       bug1375074-save-restore-x28.patch
 
 # Fedora specific patches
-Patch310:       disable-dbus-remote.patch
+
-Patch312:       thunderbird-dbus-remote.patch
+# Upstream patches
+Patch402:       mozilla-526293.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{with clang}
-BuildRequires:  clang-devel, lld, llvm-devel
+BuildRequires:  lld
 %endif
 BuildRequires:  rust, cargo
+BuildRequires:  clang-devel
+BuildRequires:  llvm-devel
 BuildRequires:	pango-devel
 BuildRequires:	cairo-devel >= %{cairo_version}
 %if %{build_vine7}
@@ -123,7 +136,9 @@ BuildRequires:	startup-notification-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	alsa-lib-devel
 BuildRequires:	yasm
-BuildRequires:	autoconf213
+BuildRequires:  nodejs
+BuildRequires:  nasm
+BuildRequires:  autoconf213
 %if %{build_vine7}
 Requires:	sqlite3 >= %{sqlite_version}
 %endif
@@ -135,7 +150,7 @@ Provides:	MozillaThunderbird = %{version}
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
-Packager:	daisuke, ryoichi, kazutaka, Takemikaduchi
+Packager:	daisuke, ryoichi, kazutaka
 
 AutoProv: 0
 %define _use_internal_dependency_generator 0
@@ -156,15 +171,27 @@ cd %{tarballdir}
 # Mozilla (XULRunner) patches
 #cd mozilla
 
-%patch310 -p1 -b .disable-dbus-remote
+# Build patches
+%patch9   -p2 -b .arm
+%patch105 -p1 -b .debug
+
+%patch304 -p1 -b .1245783
 
-%patch37 -p1 -b .jit-atomic-lucky
+#ARM run-time patch
-%patch417 -p1 -b .bug1375074-save-restore-x28
+%patch416 -p1 -b .SIOCGSTAMP
+%patch417 -p1 -b .aarch64-user_vfp
+%patch418 -p1 -b .mozbz-1512162
 
+%patch306 -p1 -b .1353817
+%if 0%{?disable_elfhack}
 %patch307 -p1 -b .elfhack
+%endif
+
+%patch402 -p1 -b .526293
 
-# TODO - needs fixes
+# replace source for newer rust
-%patch312 -p1 -b .thunderbird-dbus-remote
+cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
+sed -i -e 's/"files":{[^}]*}/"files":{ }/' ./third_party/rust/cssparser/.cargo-checksum.json
 
 %{__rm} -f .mozconfig
 %if %{build_vine6}
@@ -195,7 +222,24 @@ echo "ac_add_options --enable-linker=lld" >> .mozconfig
 
 %build
 cd %{tarballdir}
-autoconf-2.13
+
+# install bundled cbindgen
+mkdir -p my_rust_vendor
+cd my_rust_vendor
+%{__tar} xf %{SOURCE99}
+cd -
+mkdir -p .cargo
+cat > .cargo/config <<EOL
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "`pwd`/my_rust_vendor"
+EOL
+
+env CARGO_HOME=.cargo cargo install cbindgen
+export PATH=`pwd`/.cargo/bin:$PATH
+
 
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{mozappdir}
@@ -203,14 +247,13 @@ MOZ_APP_DIR=%{mozappdir}
 # Update the various config.guess to upstream release for aarch64 support
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
-                      %{__sed} -e 's/-Wall//')
+                %{__sed} -e 's/-Wall//')
-#rhbz#1037353
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
 
-export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'`
-export CXXFLAGS=$MOZ_OPT_FLAGS
-export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
@@ -222,8 +265,20 @@ export LLVM_PROFDATA="llvm-profdata"
 export AR="llvm-ar"
 export NM="llvm-nm"
 export RANLIB="llvm-ranlib"
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wno-ignored-optimization-argument"
+%else
+export CC=gcc
+export CXX=g++
+export AR="gcc-ar"
+export NM="gcc-nm"
+export RANLIB="gcc-ranlib"
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 
+export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'`
+export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
+
 MOZ_SMP_FLAGS=-j1
 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
@@ -341,44 +396,8 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 #
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mozilla-thunderbird.appdata.xml <<EOF
+install -m644 %{SOURCE1030} $RPM_BUILD_ROOT%{_datadir}/metainfo/mozilla-thunderbird.metainfo.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071065
-SentUpstream: 2014-09-22
--->
-<application>
-  <id type="desktop">mozilla-thunderbird.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <description>
-    <p>
-      Thunderbird is an email client that allows you to read, write and organise all
-      of your email messages. It is compatible with most email accounts, including the
-      most popular webmail services.
-    </p>
-    <p>
-      Thunderbird is designed by Mozilla, a global community working together to make
-      the Internet better. Mozilla believe that the Internet should be open, public,
-      and accessible to everyone without any restrictions.
-    </p>
-    <ul>
-      <li>Easier than ever to set up a new e-mail account</li>
-      <li>Awesome search allows you to find your messages fast</li>
-      <li>Thousands of add-ons give you the freedom to make Thunderbird your own</li>
-    </ul>
-  </description>
-  <url type="homepage">http://www.mozilla.org/thunderbird/</url>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png</screenshot>
-  </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-EOF
-
 
 #install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 #%{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
@@ -411,7 +430,7 @@ fi
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/vine-thunderbird.desktop
-%{_datadir}/appdata/*.appdata.xml
+%{_datadir}/metainfo/*.xml
 %dir %{_datadir}/mozilla/extensions/%{thunderbird_app_id}
 %dir %{_libdir}/mozilla/extensions/%{thunderbird_app_id}
 %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
@@ -427,6 +446,13 @@ fi
 #===============================================================================
 
 %changelog
+* Sat Oct 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.1.2-1
+- new upstream release.
+
+* Thu Oct 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.1.1-1
+- new upstream release.
+- replaced all patches.
+
 * Sun Dec 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.3.3-1
 - new upstream release.
 - replaced all patches.

u/unbound/unbound-vl.spec

@@ -6,22 +6,16 @@
 # not ready yet
 %{?!with_python:      %global with_python      0}
 
-%if %{with_python}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%endif
-
 %define _sharedstatedir /var/lib
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.9.3
+Version: 1.9.4
 Release: 1%{?_dist_release}
 License: BSD
 Url: http://www.unbound.net/
 Source: https://nlnetlabs.nl/downloads/unbound/%{name}-%{version}.tar.gz
 Source1: unbound.init
-Source2: unbound.conf
 Source3: unbound.munin
 Source4: dlv.isc.org.key
 Source5: root.key
@@ -39,7 +33,7 @@ BuildRequires: flex
 BuildRequires: libevent-devel
 BuildRequires: expat-devel
 %if %{with_python}
-BuildRequires:  python-devel swig
+BuildRequires:  python-devel python-rpm-macros swig
 %endif
 %if %{enable_gost}
 BuildRequires: openssl-devel >= 1.0.0
@@ -138,7 +132,7 @@ Contains libraries used by the unbound server and client applications
 %endif
             --enable-sha2 \
             --disable-sha1 \
-	    --with-rootkey-file=%{_sharedstatedir}/unbound/root.key
+            --with-rootkey-file=%{_sharedstatedir}/unbound/root.key
 
 %{__make} %{?_smp_mflags}
 
@@ -147,11 +141,12 @@ rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d 0755 %{buildroot}%{_initrddir}
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
-install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
+install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/unbound
-install -m 0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/unbound
 install -d 0755 %{buildroot}%{_sysconfdir}/cron.d
 install -p -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.d/unbound-anchor
 
+echo "include: %{_sysconfdir}/unbound/conf.d/*.conf" >> %{buildroot}%{_sysconfdir}/unbound/unbound.conf
+
 %if %{with_munin}
 # Install munin plugin and its softlinks
 install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
@@ -286,6 +281,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Fri Oct 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.4-1
+- updated to 1.9.4.
+
 * Tue Aug 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.3-1
 - updated to 1.9.3.