Browse Source

updated 7 packages

cryptsetup-2.3.2-1

device-mapper-multipath-0.8.2-2

gimp-2.10.18-1

json-c-0.14-1

libmypaint-1.6.1-1

strongswan-5.8.4-1

upstart-1.12.1-7

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

+ 11 - 10
c/cryptsetup/cryptsetup-vl.spec

@@ -6,7 +6,7 @@ Summary(ja):	暗号化ファイルシステム設定用ユーティリティ
 Name:		cryptsetup
 Group:		Applications/System
 
-Version:	2.3.1
+Version:	2.3.2
 Release:	1%{?_dist_release}
 
 License:	GPLv2 and LGPLv2+
@@ -105,35 +105,36 @@ popd
 %find_lang cryptsetup
 
 
-%post -n cryptsetup-libs -p /sbin/ldconfig
+%clean
+rm -rf %{buildroot}
 
 
+%post -n cryptsetup-libs -p /sbin/ldconfig
+
 %postun -n cryptsetup-libs -p /sbin/ldconfig
 
 
 %files -f cryptsetup.lang
-%doc COPYING ChangeLog AUTHORS TODO FAQ
+%license COPYING
+%doc ChangeLog AUTHORS TODO FAQ
 %{_mandir}/man8/*.8.gz
 %{_root_sbindir}/*
 
-
 %files devel
 %doc docs/examples/*
 %{_includedir}/libcryptsetup.h
 %{_libdir}/libcryptsetup.so
 %{_libdir}/pkgconfig/libcryptsetup.pc
 
-
 %files libs
-%doc COPYING
+%license COPYING
 /%{_lib}/libcryptsetup.so.*
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.3.2-1
+- new upstream release.
+
 * Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.3.1-1
 - new upstream release.
 

+ 47 - 13
d/device-mapper-multipath/device-mapper-multipath-vl.spec

@@ -1,9 +1,15 @@
+%bcond_with systemd
+
 Summary: Tools to manage multipath devices using device-mapper
 Summary(ja): Device-mapper を使用してマルチパスデバイスを管理するためのツール集
 Name: device-mapper-multipath
 Version: 0.8.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Base
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: GPLv2+
 URL: http://christophe.varoqui.free.fr/
 # The source for this package was pulled from upstream's git repo.  Use the
@@ -46,22 +52,23 @@ Patch0030: 0030-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
 Patch0031: 0031-multipath-fix-issues-found-by-compiling-with-gcc-10.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires: kpartx = %{version}-%{release}
-Requires: device-mapper >= 1.02.39
 BuildRequires: libsysfs-devel
 BuildRequires: device-mapper-devel
 #BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: libaio-devel
 BuildRequires: userspace-rcu-devel
-BuildRequires: libudev-devel
 BuildRequires: json-c-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+Requires: kpartx = %{version}-%{release}
+Requires: device-mapper >= 1.02.39
+%if %{with systemd}
+BuildRequires: systemd-devel
+%{?systemd_requires}
+%else
+BuildRequires: libudev-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig
+%endif
 
 %description
 %{name} provides tools to manage multipath devices by instructing the 
@@ -128,6 +135,8 @@ device-mapper-multipath's libdmmp C API library
 %setup -q -n multipath-tools-0.8.2
 %autopatch -p1
 
+sed -i -e 's/ != TRUE/ == 0/g' libdmmp/libdmmp_private.h
+
 
 %build
 make %{?_smp_mflags} LIB=%{_lib} SYSTEMDPATH=/lib
@@ -149,16 +158,21 @@ make install \
 install -d %{buildroot}/etc/multipath
 install -m644 %{SOURCE1} %{buildroot}/etc/multipath.conf
 
+%if !%{with systemd}
 install -d %{buildroot}%{_initdir}
 install -m755 %{SOURCE2} %{buildroot}%{_initdir}/multipathd
-
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%if %{with systemd}
+%systemd_post multipathd.service
+%else
 /sbin/chkconfig --add multipathd
+%endif
 if [ "$1" -gt "1" -a ! -e /etc/multipath/bindings -a \
     -f /var/lib/multipath/bindings ]; then
        mv /var/lib/multipath/bindings /etc/multipath/bindings
@@ -166,16 +180,27 @@ if [ "$1" -gt "1" -a ! -e /etc/multipath/bindings -a \
 fi
 
 %preun
-if [ "$1" = 0 ]; then
+%if %{with systemd}
+%systemd_preun multipathd.service
+%else
+if [ "$1" = 0 -o -x /bin/systemctl ]; then
         /sbin/service multipathd stop /dev/null 2>&1
         /sbin/chkconfig --del multipathd
 fi
+%endif
 
 
 %postun
+if [ $1 -ge 1 ] ; then
+        /sbin/multipathd forcequeueing daemon > /dev/null 2>&1 || :
+fi
+%if %{with systemd}
+%systemd_postun_with_restart multipathd.service
+%else
 if [ "$1" -ge "1" ]; then
         /sbin/service multipathd condrestart >/dev/null 2>&1 || :
 fi
+%endif
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -199,9 +224,14 @@ fi
 %{_mandir}/man8/multipathd.8.gz
 %{_mandir}/man8/mpathconf.8.gz
 %{_mandir}/man8/mpathpersist.8.gz
-%config /etc/rc.d/init.d/multipathd
 %config(noreplace) /etc/multipath.conf
 %dir /etc/multipath
+%if %{with systemd}
+%{_unitdir}/multipathd.service
+%{_unitdir}/multipathd.socket
+%else
+%config /etc/rc.d/init.d/multipathd
+%endif
 
 %files libs
 %license LICENSES/GPL-2.0 LICENSES/LGPL-2.0
@@ -249,6 +279,10 @@ fi
 
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.2-2
+- rebuilt with json-c-0.14.
+- added systemd support (disabled as default).
+
 * Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.2-1
 - new upstream release.
 - replaced all patches with rawhide's.

+ 9 - 2
g/gimp/gimp-vl.spec

@@ -5,10 +5,9 @@
 Summary:        The GNU Image Manipulation Program
 Summary(ja):    GNU 画像加工プログラム
 Name:           gimp
-Version:        2.10.12
+Version:        2.10.18
 Release:        1%{?_dist_release}
 Group:          Applications/Graphics
-
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -135,6 +134,9 @@ extensions for the GIMP.  You'll also need to install gimp-limpgimp
 and gimp, and you may want to install gimp-data-extras.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .splash
@@ -193,6 +195,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 %{_sysconfdir}/%{name}/%{subver}/menurc
 %{_sysconfdir}/%{name}/%{subver}/sessionrc
 %{_sysconfdir}/%{name}/%{subver}/templaterc
+%{_sysconfdir}/%{name}/%{subver}/toolrc
 %{_sysconfdir}/%{name}/%{subver}/unitrc
 %{_bindir}/*
 %{_libexecdir}/gimp-debug-tool-%{subver}
@@ -219,6 +222,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 %{_datadir}/%{name}/%{subver}/fractalexplorer
 %{_datadir}/%{name}/%{subver}/gfig
 %{_datadir}/%{name}/%{subver}/gflare
+%{_datadir}/%{name}/%{subver}/gimp-release
 %{_datadir}/%{name}/%{subver}/gimpressionist
 %{_datadir}/%{name}/%{subver}/gradients
 %{_datadir}/%{name}/%{subver}/icons
@@ -255,6 +259,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.18-1
+- updated to 2.10.18.
+
 * Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.12-1
 - updated to 2.10.12.
 

+ 38 - 19
j/json-c/json-c-vl.spec

@@ -1,24 +1,24 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define pkg_version	0.13.1
-%define pkg_date	20180305
-%define pkg_release	1%{?_dist_release}
+%define pkg_version	0.14
+%define pkg_date	20200419
 
 Summary:	A JSON implementation in C
 Name:		json-c
 Version:	%{pkg_version}
-Release:	%{pkg_release}
+Release:	1%{?_dist_release}
+Group:		System Environment/Libraries
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Source0: 	https://github.com/json-c/json-c/archive/json-c-json-c-%{version}-%{pkg_date}.tar.gz
 
 License:	MIT
-Group:		System Environment/Libraries
 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
+Patch1000:	CVE-2020-12762.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildRequires:	cmake
 
 
 %description
@@ -71,27 +71,40 @@ for writing applications that are using json-c.
 
 %prep
 %setup -q -n json-c-json-c-%{version}-%{pkg_date}
+%patch1000 -p1
 
-# Hack to get json_object_iterator.c compiled
-sed -e 's/json_object.c/json_object.c json_object_iterator.c/' \
-    -e 's/json_object.h/json_object.h json_object_iterator.h/' \
-    -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \
-    -i Makefile.in
 
 %build
-autoreconf -fiv
-%configure --enable-shared --disable-static --disable-rpath --enable-rdrand
-%{__make}
+mkdir -p build
+pushd build
+%cmake \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_STATIC_LIBS=OFF \
+	-DENABLE_RDRAND=ON \
+	../
+make %{_smp_mflags}
+popd
+
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
+pushd build
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
+popd
+
+
+%check
+pushd build
+make %{_smp_mflags} test
+popd
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -100,6 +113,7 @@ autoreconf -fiv
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -112,6 +126,8 @@ autoreconf -fiv
 %{_includedir}/json-c/*
 %{_libdir}/libjson-c.so
 %{_libdir}/pkgconfig/json-c.pc
+%dir %{_libdir}/cmake/json-c
+%{_libdir}/cmake/json-c/*.cmake
 
 %files doc
 %defattr(-,root,root,-)
@@ -125,13 +141,16 @@ autoreconf -fiv
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
 %{_libdir}/libjson-c.so
-%{_libdir}/pkgconfig/json-c.pc
 %endif
 
 
 %changelog
+* 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.
+
 * Tue Jan 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.13.1-1
-- update to 0.13.1.
+- updated to 0.13.1.
 
 * Sat Jan 17 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 0.11-1
 - update to 0.11

+ 13 - 15
lib/libm/libmypaint/libmypaint-vl.spec

@@ -1,7 +1,9 @@
 Summary: Library for making brush strokes
 Name:    libmypaint
-Version: 1.3.0
-Release: 2%{?_dist_release}
+Version: 1.6.1
+Release: 1%{?_dist_release}
+Vendor: Project Vine
+Distribution: Vine Linux
 
 # Compute some version related macros.
 # Ugly, need to get quoting percent signs straight.
@@ -19,9 +21,6 @@ BuildRequires: gobject-introspection-devel
 BuildRequires: babl-devel
 BuildRequires: gegl04-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 This is a self-contained library containing the MyPaint brush engine.
 
@@ -37,16 +36,8 @@ This package contains files needed for development with libmypaint.
 %prep
 %setup -q
 
+
 %build
-# http://www.gimpusers.com/forums/gimp-developer/20595-libmypaint-version-for-building-gimp-2-10-0
-%{__sed} -i -e '/gegl_required_version/ s/0.3/0.4/' configure.ac
-%{__sed} -i -e 's/gegl-0.3 >= 0.3/gegl-0.4 >= 0.4/g' configure
-pushd gegl
-%{__sed} -i -e 's/gegl-0.3/gegl-0.4/g' \
- Makefile.in Makefile.am libmypaint-gegl.pc.in
-%{__sed} -i -e 's/Gegl-0.3/Gegl-0.4/g' \
- Makefile.am Makefile.in
-popd
 autoreconf
 
 %{configure} \
@@ -56,14 +47,17 @@ autoreconf
 
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{make_install}
 find %{buildroot}%{_libdir} -name '*.la' -delete -print
 
 %find_lang %{name}
 
+
 %check
-%{__make} check
+#{__make} check
+
 
 %post -p %{_syssbindir}/ldconfig
 
@@ -90,6 +84,10 @@ find %{buildroot}%{_libdir} -name '*.la' -delete -print
 
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-1
+- new upstream release.
+- built with json-c-0.14.
+
 * Tue Jan 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.0-2
 - rebuilt with json-c-0.13.1.
 

+ 24 - 9
s/strongswan/strongswan-vl.spec

@@ -7,17 +7,19 @@
 #%%define prerelease dr1
 
 Name:           strongswan
-Version:        5.8.2
-Release:        1%{?_dist_release}
+Version:        5.8.4
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 Summary(ja):    オープンソースのIPsec VPN/TNCソリューション
 Vendor:         Project Vine
 Distribution:   Vine Linux
-Packager:       tomop
+
 License:        GPLv2+
-URL:            http://www.strongswan.org/
+URL:            https://www.strongswan.org/
 Source0:        https://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
+Source1:        tmpfiles-strongswan.conf
 Source1000:     strongswan.init
+Patch0:         strongswan-5.8.4-runtime-dir.patch
 Patch1:         strongswan-5.6.0-uintptr_t.patch
 Patch3:         strongswan-5.6.2-CVE-2018-5388.patch
 
@@ -36,7 +38,7 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  iptables-devel
 %if %{with tss}
 BuildRequires:  trousers-devel
-BuildRequires:  json-c-devel
+BuildRequires:  json-c-devel >= 0.14
 %endif
 
 %if "%{?_dist_release}" != "vl6"
@@ -89,8 +91,13 @@ possessing a standard IF-IMC/IMV interface. In addition, it implements
 PT-TLS to support TNC over TLS.
 %endif
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
+%patch0 -p1
 %patch1 -p1
 %patch3 -p1
 
@@ -216,7 +223,9 @@ for i in aacerts acerts certs cacerts crls ocspcerts private reqs; do
     install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/ipsec.d/${i}
 done
 
-%if ! %{with systemd}
+%if %{with systemd}
+install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
+%else
 mkdir -p %{buildroot}%{_initdir}
 install -m755 %{SOURCE1000} %{buildroot}%{_initdir}/ipsec
 %endif
@@ -233,7 +242,7 @@ install -m755 %{SOURCE1000} %{buildroot}%{_initdir}/ipsec
 %if %{with systemd}
 %systemd_preun %{name}.service
 %else
-if [ $1 -eq 0 ]; then 
+if [ $1 -eq 0  -o -x /bin/systemctl ]; then 
   /sbin/service ipsec stop
   /sbin/chkconfig --del ipsec
 fi
@@ -287,7 +296,8 @@ fi
 %if %{with systemd}
 %{_sbindir}/charon-systemd
 %{_unitdir}/strongswan.service
-%{_unitdir}/strongswan-swanctl.service
+%{_unitdir}/strongswan-starter.service
+%{_tmpfilesdir}/strongswan.conf
 %else
 %{_initdir}/ipsec
 %endif
@@ -317,12 +327,17 @@ fi
 
 %if "%{?_dist_release}" != "vl6"
 %files charon-nm
-%doc COPYING
+%license COPYING
 %{_datadir}/dbus-1/system.d/nm-strongswan-service.conf
 %{_libexecdir}/strongswan/charon-nm
 %endif
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.8.4-1
+- new upstream release.
+- imported Patch0 from rawhide.
+- fixed systemd stuff.
+
 * Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.8.2-1
 - new upstream release.
 

+ 10 - 8
u/upstart/upstart-vl.spec

@@ -2,20 +2,19 @@
 
 Name:           upstart
 Version:        1.12.1
-Release:        6%{?_dist_release}
+Release:        7%{?_dist_release}
 Summary:        An event-driven init system
 Summary(ja):    イベントドリブン型 init システム
-
 Group:          System Environment/Base
-License:        GPLv2 and LGPLv2+
-URL:            http://launchpad.net/upstart
-
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
+License:        GPLv2 and LGPLv2+
+URL:            http://launchpad.net/upstart
 Source0:        http://launchpad.net/upstart/1.x/%{version}/+download/upstart-%{version}.tar.gz
 Source1:        init-system-dbus.conf
 #Patch1:         upstart-telinit.patch
+Patch0:         upstart-glibc-2.31.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes: SysVinit < 2.88
@@ -23,7 +22,7 @@ Provides: SysVinit = 2.88
 BuildRequires:  gettext, audit-libs-devel, expat-devel 
 BuildRequires:  dbus-devel >= 1.2.16
 BuildRequires:  libnih-devel >= 1.0.3-2
-BuildRequires:  json-c-devel >= 0.10
+BuildRequires:  json-c-devel >= 0.14
 BuildRequires:  eudev-libudev-devel
 BuildRequires:  dconf-devel
 Requires:       initscripts >= 8.90.4
@@ -67,7 +66,7 @@ Misc tools for upstart
 
 %prep
 %setup -q
-#%patch1 -p1 -b .u
+%patch0 -p1
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib}
@@ -154,8 +153,8 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%license COPYING
 %doc AUTHORS
-%doc COPYING
 %doc NEWS
 %doc README
 %doc TODO
@@ -215,6 +214,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/upstart-monitor.8*
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.1-7
+- rebuilt with json-c-0.14.
+
 * Wed Jan 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.1-6
 - manuals for {halt,poweroff,reboot,runlevel,shutdown,telinit} are alternatives ready.