updated 2 packages

clamav-0.104.0-1

json-c-0.15-1

c/clamav/clamav-vl.spec

@@ -5,12 +5,10 @@
 
 %define milter 1
 
-%define pcre_cflags %(pcre-config --cflags)
-
 Summary: Clam AntiVirus
 Summary(ja): Clamアンチウィルススキャナ
 Name: clamav
-Version: 0.103.3
+Version: 0.104.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: security
 Vendor: Project Vine
@@ -32,10 +30,13 @@ Source100:  clamonacc.service
 Source330:  clamav-milter.systemd
 #for scanner-systemd/server-systemd
 Source530:  clamd.service
+Source550:  clamav-freshclam.service
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: cmake
 BuildRequires: bzip2-devel, curl-devel > 7.10.0, gmp-devel, ncurses-devel
-BuildRequires: openssl-devel, pcre-devel, libxml2-devel, zlib-devel
+BuildRequires: openssl-devel, pcre2-devel, libxml2-devel, zlib-devel
+BuildRequires: json-c-devel
 %if %{with external_llvm}
 BuildRequires: llvm-devel
 %endif
@@ -46,6 +47,7 @@ BuildRequires: libmilter-devel
 Requires: logrotate
 Requires(pre): shadow-utils, grep
 %if %{with systemd}
+#BuildRequires: systemd-devel
 %{?systemd_requires}
 %else
 Requires(post): chkconfig
@@ -111,25 +113,20 @@ export CLAMAV_MILTER_LIBS="-lpthread -lmilter"
 export have_milter=yes
 %endif
 
-CFLAGS="%{pcre_cflags}" \
+%cmake \
-%configure \
+	-DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
-	--disable-rpath \
+	-DAPP_CONFIG_DIRECTORY:STRING=/etc \
-	--disable-silent-rules \
+	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-	--enable-clamdtop \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
-	--disable-clamav \
+	-DENABLE_TESTS:BOOL=OFF \
-	--enable-id-check \
-	--enable-dns \
-%if %{with external_llvm}
-	--enable-llvm \
-%else
-	--with-system-llvm=no \
-%endif
 %if %{?milter}
-	--enable-milter \
+	-DENABLE_MILTER:BOOL=ON \
+%else
+	-DENABLE_MILTER:BOOL=OFF \
 %endif
-	--with-dbdir=%{dbdir}
+	-DDATABASE_DIRECTORY:STRING=%{dbdir}
 
-make %{?_smp_mflags}
+%cmake_build
 
 
 %install
@@ -139,13 +136,14 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 mkdir -p %{buildroot}%{_initdir}
 mkdir -p %{buildroot}%{_localstatedir}/run/clamav
 mkdir -p %{buildroot}%{_localstatedir}/log/clamav
-make install DESTDIR=%{buildroot} transform='s,x,x,'
+%cmake_install
 
 %if %{with systemd}
 rm -f %{buildroot}%{_unitdir}/clamav-daemon.s*
 rm -f %{buildroot}%{_unitdir}/clamav-clamonacc.s*
 install -Dpm 0644 %{SOURCE100} %{buildroot}%{_unitdir}/clamonacc.service
 install -Dpm 0644 %{SOURCE530} %{buildroot}%{_unitdir}/clamd.service
+install -Dpm 0644 %{SOURCE550} %{buildroot}%{_unitdir}/clamav-freshclam.service
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat << EOF > %{buildroot}%{_tmpfilesdir}/clamav.conf
 d %{_rundir}/clamav 0710 clamav clamav
@@ -295,7 +293,6 @@ fi
 %defattr(-,root,root)
 %license COPYING*
 %doc NEWS* README* examples
-%doc docs/UserManual
 %if %{with systemd}
 %{_unitdir}/clamav-freshclam.service
 %{_unitdir}/clamd.service
@@ -347,6 +344,9 @@ fi
 
 
 %changelog
+* Fri Sep 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.104.0-1
+- new upstream release.
+
 * Tue Jun 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.103.3-1
 - new upstream release.
 

j/json-c/json-c-vl.spec

@@ -1,17 +1,15 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define pkg_version	0.14
+%define pkg_date	20200726
-%define pkg_date	20200419
 
 Summary:	A JSON implementation in C
 Name:		json-c
-Version:	%{pkg_version}
+Version:	0.15
 Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
-
 License:	MIT
 URL:		https://github.com/json-c/json-c/wiki
 Source0: 	https://github.com/json-c/json-c/archive/json-c-%{version}-%{pkg_date}.tar.gz
@@ -20,7 +18,6 @@ Patch1000:	CVE-2020-12762.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	cmake
 
-
 %description
 JSON-C implements a reference counting object model that allows you to easily
 construct JSON objects in C, output them as JSON formatted strings and parse
@@ -29,7 +26,7 @@ JSON formatted strings back into the C representation of JSON objects.
 
 %package devel
 Summary:	Development files for json-c
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -40,7 +37,7 @@ for writing applications that are using json-c.
 
 %package doc
 Summary:	Documentation for json-c
-Group:		Documentation
+Group:		documentation
 Requires:	%{name} = %{version}-%{release}
 BuildArch:	noarch
 
@@ -50,7 +47,7 @@ This package contains documentation for json-c.
 
 %package -n compat32-%{name}
 Summary:	A JSON implementation in C
-Group:		System Environment/Libraries
+Group:		system,legacy
 Requires:	%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -60,7 +57,7 @@ JSON formatted strings back into the C representation of JSON objects.
 
 %package -n compat32-%{name}-devel
 Summary:	Development files for json-c
-Group:		Development/Libraries
+Group:		programming,legacy
 Requires:	compat32-%{name} = %{version}-%{release}
 Requires:	pkgconfig
 
@@ -69,51 +66,37 @@ This package contains the libraries and header files that are needed
 for writing applications that are using json-c.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n json-c-json-c-%{version}-%{pkg_date}
-%patch1000 -p1
 
 
 %build
-mkdir -p build
-pushd build
 %cmake \
 	-DBUILD_SHARED_LIBS=ON \
 	-DBUILD_STATIC_LIBS=OFF \
 	-DENABLE_RDRAND=ON \
 	../
-make %{_smp_mflags}
+%cmake_build
-popd
 
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-pushd build
+%cmake_install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
-popd
 
 
 %check
-pushd build
+%ctest
-make %{_smp_mflags} test
-popd
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -145,6 +128,10 @@ popd
 
 
 %changelog
+* Fri Sep 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.15-1
+- new upstream release.
+- dropped Patch1000: fixed in upstream.
+
 * Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.14-1
 - updated to 0.14.
 - added Patch1000 to fix CVE-2020-12762.