Browse Source

updated 15 packages

ant-1.9.14-1

ccid-1.4.31-1

extra-cmake-modules-5.63.0-1

file-5.37-2

iputils-20190709-1

libarchive-3.4.0-1

libidn2-2.2.0-1

libmodsecurity-3.0.3-4

libxslt-1.1.33-2

ncurses-6.1-3

pcsc-lite-1.8.25-1

polkit-qt-0.112.0-3

qca2-2.2.1-1

rdesktop-1.9.0-1

util-linux-2.34-1

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

+ 15 - 7
a/ant/ant-vl.spec

@@ -4,15 +4,19 @@
 Name:           ant
 Name:           ant
 Summary:        Ant build tool for java
 Summary:        Ant build tool for java
 Summary(ja):    Java 用ビルドツール
 Summary(ja):    Java 用ビルドツール
-Version:        1.8.4
+Version:        1.9.14
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-
-License:        ASL 2.0
-URL:            http://ant.apache.org/
 Group:          Development/Tools
 Group:          Development/Tools
 
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License:        ASL 2.0
+URL:            https://ant.apache.org/
 # using binary for bootstrap
 # using binary for bootstrap
-Source0:        http://www.apache.org/dist/ant/binaries/apache-ant-%{version}-bin.tar.bz2
+#Source0:        http://www.apache.org/dist/ant/binaries/apache-ant-%{version}-bin.tar.bz2
+Source0:        http://ftp.jaist.ac.jp/pub/apache/ant/binaries/apache-ant-%{version}-bin.tar.bz2
+
 Source1:        apache-ant-1.7.ant.conf
 Source1:        apache-ant-1.7.ant.conf
 
 
 BuildRequires:  jpackage-utils >= 1.7.5
 BuildRequires:  jpackage-utils >= 1.7.5
@@ -194,7 +198,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(0644,root,root,0755)
 %defattr(0644,root,root,0755)
-%doc KEYS LICENSE NOTICE README WHATSNEW
+%license LICENSE
+%doc KEYS NOTICE README WHATSNEW
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %dir %{_sysconfdir}/%{name}.d
 %dir %{_sysconfdir}/%{name}.d
 %{_sysconfdir}/%{name}.d/*
 %{_sysconfdir}/%{name}.d/*
@@ -214,7 +219,10 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 
 
 %changelog
 %changelog
-* Sun Jun 16 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.8.4-1
+* Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.14-1
+- new upstream release.
+
+* Sat Jun 16 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.8.4-1
 - updated to 1.8.4
 - updated to 1.8.4
 
 
 * Sat Aug 28 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.8.1-1
 * Sat Aug 28 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.8.1-1

+ 13 - 10
c/ccid/ccid-vl.spec

@@ -1,17 +1,20 @@
 %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
 %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
 %define libusb1_ver 1.0.9
 %define libusb1_ver 1.0.9
-%define pcsc_lite_ver 1.8.13
+%define pcsc_lite_ver 1.8.25
 
 
 Name:           ccid
 Name:           ccid
-Version:        1.4.18
+Version:        1.4.31
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Generic USB CCID smart card reader driver
 Summary:        Generic USB CCID smart card reader driver
 Summary(ja):        Generic USB CCID smart card reader driver
 Summary(ja):        Generic USB CCID smart card reader driver
-
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        LGPLv2+
 License:        LGPLv2+
-URL:            http://pcsclite.alioth.debian.org/ccid.html
-Source0:        http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.bz2
+URL:            https://ccid.apdu.fr/
+Source0:        https://ccid.apdu.fr/files/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildRequires:  libusb1-devel >= %{libusb1_ver}
 BuildRequires:  libusb1-devel >= %{libusb1_ver}
@@ -32,10 +35,6 @@ Generic USB CCID (Chip/Smart Card Interface Devices) driver.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-for f in ChangeLog README ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
-
 
 
 %build
 %build
 %configure --disable-dependency-tracking --disable-static --enable-twinserial
 %configure --disable-dependency-tracking --disable-static --enable-twinserial
@@ -64,7 +63,8 @@ exit 0
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README SCARDGETATTRIB.txt
+%license COPYING
+%doc README.md SCARDGETATTRIB.txt
 %{dropdir}/ifd-ccid.bundle/
 %{dropdir}/ifd-ccid.bundle/
 %{dropdir}/serial/
 %{dropdir}/serial/
 %config(noreplace) %{_sysconfdir}/reader.conf.d/libccidtwin
 %config(noreplace) %{_sysconfdir}/reader.conf.d/libccidtwin
@@ -72,6 +72,9 @@ exit 0
 
 
 
 
 %changelog
 %changelog
+* Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.31-1
+- new upstream release.
+
 * Mon May 04 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.18-1
 * Mon May 04 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.18-1
 - new upstream release
 - new upstream release
 
 

+ 5 - 2
e/extra-cmake-modules/extra-cmake-modules-vl.spec

@@ -11,7 +11,7 @@
 
 
 Name:           extra-cmake-modules
 Name:           extra-cmake-modules
 Summary:        Additional modules for CMake build system
 Summary:        Additional modules for CMake build system
-Version:        5.24.0
+Version:        5.63.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 
 
 License:        BSD
 License:        BSD
@@ -27,7 +27,7 @@ Distribution:   Vine Linux
 %else
 %else
 %global stable stable
 %global stable stable
 %endif
 %endif
-Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{name}-%{version}.tar.xz
+Source0:        https://download.kde.org/%{stable}/frameworks/%{versiondir}/%{name}-%{version}.tar.xz
 BuildArch:      noarch
 BuildArch:      noarch
 
 
 BuildRequires: cmake
 BuildRequires: cmake
@@ -100,6 +100,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform}
 
 
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.63.0-1
+- new upstream release.
+
 * Tue Jul 12 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.24.0-1
 * Tue Jul 12 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.24.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 6 - 3
f/file/file-vl.spec

@@ -4,7 +4,7 @@ Summary:        A utility for determining file types.
 Summary(ja):    ファイルの種類を判別するユーティリティー
 Summary(ja):    ファイルの種類を判別するユーティリティー
 Name:           file
 Name:           file
 Version:        5.37
 Version:        5.37
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          Applications/System
 Group:          Applications/System
 License:        BSD
 License:        BSD
 
 
@@ -31,7 +31,7 @@ Patch14: file-5.37-double-free.patch
 Patch1000: file-5.14-magicbuild-fix.patch
 Patch1000: file-5.14-magicbuild-fix.patch
 
 
 # Security
 # Security
-#  none
+Patch9000: CVE-2019-18218.patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: automake
 #BuildRequires: automake
@@ -111,7 +111,7 @@ autoreconf -ivf
 %patch1000 -p1
 %patch1000 -p1
 
 
 # Security
 # Security
-#  none
+%patch9000 -p1
 
 
 cat %{SOURCE10} >> ./magic/Localstuff
 cat %{SOURCE10} >> ./magic/Localstuff
 
 
@@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.37-2
+- added Patch9000.
+
 * Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.37-1
 * Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.37-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 24 - 20
i/iputils/iputils-vl.spec

@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Summary: Network monitoring tools including ping.
 Summary(ja): ping 等のネットワークモニタツール集
 Summary(ja): ping 等のネットワークモニタツール集
 Name: iputils
 Name: iputils
-Version: 20180629
+Version: 20190709
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 # some parts are under the original BSD (ping.c)
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 # some are under GPLv2+ (tracepath.c)
@@ -18,12 +18,10 @@ Source7: ninfod.sysconfig
 Source10: bsd.txt
 Source10: bsd.txt
 Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
 
-Patch0: iputils-rh.patch
 Patch1: iputils-ifenslave.patch
 Patch1: iputils-ifenslave.patch
 
 
 # Vine Source(s)/Patch(es)
 # Vine Source(s)/Patch(es)
-Source1000: iputils-s20180629-ja.po
-Patch1000: iputils-s20180629-gettext.patch
+
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-utils perl-SGMLSpm
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -32,7 +30,8 @@ BuildRequires: libidn2-devel
 BuildRequires: openssl-devel
 BuildRequires: openssl-devel
 BuildRequires: libcap-devel
 BuildRequires: libcap-devel
 BuildRequires: libxslt
 BuildRequires: libxslt
-BuildRequires: docbook-style-xsl
+BuildRequires: docbook5-style-xsl
+BuildRequires: meson
 Requires(post): chkconfig
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(preun): initscripts
@@ -52,15 +51,8 @@ the target machine is alive and receiving network traffic.
 
 
 cp %{SOURCE10} %{SOURCE11} .
 cp %{SOURCE10} %{SOURCE11} .
 
 
-%patch0 -p1
 %patch1 -p1
 %patch1 -p1
 
 
-#
-%patch1000 -p1 -b .gettext
-
-# add ja.po
-cp %{SOURCE1000} po/ja.po
-
 %build
 %build
 %ifarch s390 s390x
 %ifarch s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIE"
 export CFLAGS="$RPM_OPT_FLAGS -fPIE"
@@ -69,10 +61,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
 %endif
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
 
-make %{?_smp_mflags} arping clockdiff ping rdisc tracepath ninfod
+%meson
+%meson_build
+%ninja_build -C %{_target_platform} iputils-gmo
+
 gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
 gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
-make -C doc man
-make -C po
+
 
 
 %install
 %install
 rm -rf ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
@@ -82,11 +76,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
 mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 
+pushd %{_target_platform}
 install -c clockdiff		${RPM_BUILD_ROOT}%{_sbindir}/
 install -c clockdiff		${RPM_BUILD_ROOT}%{_sbindir}/
 install -cp arping		${RPM_BUILD_ROOT}/sbin/
 install -cp arping		${RPM_BUILD_ROOT}/sbin/
 ln -s /sbin/arping		${RPM_BUILD_ROOT}%{_sbindir}/arping
 ln -s /sbin/arping		${RPM_BUILD_ROOT}%{_sbindir}/arping
 install -cp ping		${RPM_BUILD_ROOT}/bin/
 install -cp ping		${RPM_BUILD_ROOT}/bin/
-install -cp ifenslave		${RPM_BUILD_ROOT}/sbin/
+install -cp ../ifenslave		${RPM_BUILD_ROOT}/sbin/
 install -cp rdisc		${RPM_BUILD_ROOT}/sbin/
 install -cp rdisc		${RPM_BUILD_ROOT}/sbin/
 install -cp tracepath		${RPM_BUILD_ROOT}/bin/
 install -cp tracepath		${RPM_BUILD_ROOT}/bin/
 install -cp ninfod/ninfod	${RPM_BUILD_ROOT}/sbin/
 install -cp ninfod/ninfod	${RPM_BUILD_ROOT}/sbin/
@@ -103,10 +98,14 @@ install -cp doc/ping.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/rdisc.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/rdisc.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/tracepath.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/tracepath.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/ninfod.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -cp doc/ninfod.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -cp ifenslave.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp ../ifenslave.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
 ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
 
+install -dp ${RPM_BUILD_ROOT}%{_datadir}/locale/ja/LC_MESSAGES
+install -m 644 po/ja.gmo $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/iputils.mo
+popd
+
 find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
 find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
 
 
 install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
@@ -115,8 +114,6 @@ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rdisc
 install -m 755 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/ninfod
 install -m 755 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/ninfod
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
 
 
-make -C po install DESTDIR=$RPM_BUILD_ROOT
-
 %find_lang %{name}
 %find_lang %{name}
 
 
 %post
 %post
@@ -143,7 +140,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc LICENSE* README.*
+%license LICENSE*
+%doc README.*
 %{_sbindir}/clockdiff
 %{_sbindir}/clockdiff
 /sbin/arping
 /sbin/arping
 %{_sbindir}/arping
 %{_sbindir}/arping
@@ -163,6 +161,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
 
 
 %changelog
 %changelog
+* Tue Oct 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190709-1
+- updated to 20190709.
+- dropped Source1000 and Patch1000: merged into upstream.
+- switched buildsystem to meson.
+- dropped Patch0: Makefile is deprecated.
+
 * Sat Nov 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20180629-1
 * Sat Nov 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20180629-1
 - updated to 20180629.
 - updated to 20180629.
 - dropped Patch2-5 (fixed in upstream).
 - dropped Patch2-5 (fixed in upstream).

+ 12 - 9
lib/liba/libarchive/libarchive-vl.spec

@@ -1,13 +1,15 @@
 Name:          libarchive
 Name:          libarchive
 Summary:       A library for handling streaming archive formats 
 Summary:       A library for handling streaming archive formats 
-Version:       3.3.3
+Version:       3.4.0
 Release:       1%{?_dist_release}
 Release:       1%{?_dist_release}
-
 Group:         System Environment/Libraries
 Group:         System Environment/Libraries
-License:       BSD
-URL:           http://www.libarchive.org/
 
 
-Source0:       http://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
+Vendor:        Project Vine
+Distribution:  Vine Linux
+
+License:       BSD
+URL:           https://www.libarchive.org/
+Source0:       https://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
 
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 BuildRequires: zlib-devel
@@ -18,9 +20,6 @@ BuildRequires: openssl-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-devel
 BuildRequires: xz-devel
 BuildRequires: xz-devel
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 
 
 %description
 %description
 Libarchive is a programming library that can create and read several different 
 Libarchive is a programming library that can create and read several different 
@@ -65,7 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc COPYING README* NEWS
+%license COPYING
+%doc README* NEWS
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 
 
 %files devel
 %files devel
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
 %changelog
+* Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.0-1
+- new upstream release.
+
 * Fri Nov 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.3-1
 * Fri Nov 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.3-1
 - new upstream release.
 - new upstream release.
 
 

+ 9 - 8
lib/libi/libidn2/libidn2-vl.spec

@@ -3,15 +3,14 @@
 Summary:          Library to support IDNA2008 internationalized domain names
 Summary:          Library to support IDNA2008 internationalized domain names
 Summary(ja):      IDNA2008 国際化ドメイン名をサポートするためのライブラリ
 Summary(ja):      IDNA2008 国際化ドメイン名をサポートするためのライブラリ
 Name:             libidn2
 Name:             libidn2
-Version:          2.0.4
-Release:          4%{?_dist_release}
+Version:          2.2.0
+Release:          1%{?_dist_release}
 License:          (GPLv2+ or LGPLv3+) and GPLv3+
 License:          (GPLv2+ or LGPLv3+) and GPLv3+
 Group:            System Environment/Libraries
 Group:            System Environment/Libraries
 URL:              https://www.gnu.org/software/libidn/#libidn2
 URL:              https://www.gnu.org/software/libidn/#libidn2
 Source0:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
 Source0:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
 Source1:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz.sig
 Source1:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz.sig
 Patch0:           libidn2-2.0.0-rpath.patch
 Patch0:           libidn2-2.0.0-rpath.patch
-Patch1:           libidn2-2.0.4-std3-ascii-rules.patch
 BuildRequires:    libunistring-devel
 BuildRequires:    libunistring-devel
 Requires(post):   /sbin/install-info, /sbin/ldconfig
 Requires(post):   /sbin/install-info, /sbin/ldconfig
 Requires(preun):  /sbin/install-info
 Requires(preun):  /sbin/install-info
@@ -67,10 +66,6 @@ developing applications that use libidn2.
 %patch0 -p1 -b .rpath
 %patch0 -p1 -b .rpath
 touch -c -r configure.rpath configure
 touch -c -r configure.rpath configure
 touch -c -r m4/libtool.m4.rpath m4/libtool.m4
 touch -c -r m4/libtool.m4.rpath m4/libtool.m4
-%patch1 -p1 -b .std3-ascii-rules
-touch -c -r lib/idna.c.std3-ascii-rules lib/idna.c
-touch -c -r lib/lookup.c.std3-ascii-rules lib/lookup.c
-touch -c -r tests/test-lookup.c.std3-ascii-rules tests/test-lookup.c
 
 
 %build
 %build
 %configure --disable-static
 %configure --disable-static
@@ -90,6 +85,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # Some file cleanups
 # Some file cleanups
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
 
+%find_lang libidn2
+
 %check
 %check
 make %{?_smp_mflags} -C tests check
 make %{?_smp_mflags} -C tests check
 
 
@@ -110,7 +107,7 @@ fi
 %postun -n compat32-%{name} -p /sbin/ldconfig
 %postun -n compat32-%{name} -p /sbin/ldconfig
 %endif
 %endif
 
 
-%files
+%files -f libidn2.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LESSERv3 COPYING.unicode COPYINGv2
 %license COPYING COPYING.LESSERv3 COPYING.unicode COPYINGv2
@@ -143,6 +140,10 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Tue Oct 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.0-1
+- new upstream release.
+- dropped Patch1: fixed in upstream.
+
 * Fri Feb 23 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.4-4
 * Fri Feb 23 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.4-4
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 8 - 5
lib/libm/libmodsecurity/libmodsecurity-vl.spec

@@ -1,7 +1,7 @@
 
 
 Name:           libmodsecurity
 Name:           libmodsecurity
 Version:        3.0.3
 Version:        3.0.3
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
 Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
 Group:          Development/Libraries
 Group:          Development/Libraries
 
 
@@ -75,18 +75,18 @@ applications that use %{name}.
 
 
 
 
 %files
 %files
+%license LICENSE
 %doc README.md AUTHORS
 %doc README.md AUTHORS
+%doc modsecurity.conf-recommended unicode.mapping
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 %{_bindir}/*
 %{_bindir}/*
-%license LICENSE
 
 
 %files devel
 %files devel
+%license LICENSE
 %doc README.md AUTHORS
 %doc README.md AUTHORS
 %{_includedir}/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/*.so
-%{_libdir}/pkgconfig
-%license LICENSE
-%doc modsecurity.conf-recommended unicode.mapping
+%{_libdir}/pkgconfig/*
 
 
 %files static
 %files static
 %{_libdir}/*.a
 %{_libdir}/*.a
@@ -94,6 +94,9 @@ applications that use %{name}.
 
 
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.3-4
+- added sample configurations to %%doc.
+
 * Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.3-3
 * Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.3-3
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 16 - 6
lib/libx/libxslt/libxslt-vl.spec

@@ -5,11 +5,20 @@ Summary: Library providing the Gnome XSLT engine
 Summary(ja): XSLT エンジンライブラリ
 Summary(ja): XSLT エンジンライブラリ
 Name: libxslt
 Name: libxslt
 Version: 1.1.33
 Version: 1.1.33
-Release: 1%{_dist_release}
-License: MIT
+Release: 2%{_dist_release}
 Group: System Environment/Libraries
 Group: System Environment/Libraries
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: MIT
 URL: http://xmlsoft.org/XSLT/
 URL: http://xmlsoft.org/XSLT/
-Source0: ftp://xmlsoft.org/XSLT/%{name}-%{version}.tar.gz
+Source0: ftp://xmlsoft.org/libxslt/%{name}-%{version}.tar.gz
+
+Patch1: CVE-2019-11068.patch
+Patch2: CVE-2019-13117.patch
+Patch3: CVE-2019-13118.patch
+Patch4: CVE-2019-18197.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtirpc-devel
 BuildRequires: libtirpc-devel
@@ -23,8 +32,6 @@ BuildRequires: python3 python3-devel python3-rpm-macros python3-libxml2
 %endif
 %endif
 Requires: libxml2 >= 2.9.9
 Requires: libxml2 >= 2.9.9
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 %description
 %description
 This C library allows to transform XML files into other XML files
 This C library allows to transform XML files into other XML files
@@ -132,7 +139,7 @@ installed.
 XSLTのための開発用ファイルです。
 XSLTのための開発用ファイルです。
 
 
 %prep
 %prep
-%setup -q
+%autosetup -p1
 chmod 644 python/tests/*
 chmod 644 python/tests/*
 
 
 %build
 %build
@@ -243,6 +250,9 @@ rm -vrf %{buildroot}%{_docdir}
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.33-2
+- added Patch1-4.
+
 * Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.33-1
 * Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.33-1
 - updated to 1.1.33.
 - updated to 1.1.33.
 - added a sub-package "python3-libxslt".
 - added a sub-package "python3-libxslt".

+ 5 - 2
n/ncurses/ncurses-vl.spec

@@ -6,7 +6,7 @@ Name: ncurses
 Version: 6.1
 Version: 6.1
 %define includedirw %{_includedir}/ncursesw
 %define includedirw %{_includedir}/ncursesw
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: distributable
 License: distributable
 Group: System Environment/Libraries
 Group: System Environment/Libraries
 URL: https://invisible-island.net/ncurses/ncurses.html
 URL: https://invisible-island.net/ncurses/ncurses.html
@@ -118,7 +118,7 @@ C++ bindings to ncurses
 %prep
 %prep
 %setup -q -n %{name}-%{version}-%{revision}
 %setup -q -n %{name}-%{version}-%{revision}
 
 
-%patch8 -p1 -b .config
+#%patch8 -p1 -b .config
 %patch9 -p1 -b .libs
 %patch9 -p1 -b .libs
 %patch11 -p1 -b .urxvt
 %patch11 -p1 -b .urxvt
 %patch12 -p1 -b .kbs
 %patch12 -p1 -b .kbs
@@ -346,6 +346,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.1-3
+- dropped Patch8.
+
 * Fri Oct 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.1-2
 * Fri Oct 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.1-2
 - updated to 6.1 + 20191015.
 - updated to 6.1 + 20191015.
 - updated Patch8.
 - updated Patch8.

+ 32 - 13
p/pcsc-lite/pcsc-lite-vl.spec

@@ -2,16 +2,18 @@ Summary:        PC/SC Lite smart card framework and applications
 Summary(ja):    PC/SC Lite スマートカードフレームワークおよびアプリケーション
 Summary(ja):    PC/SC Lite スマートカードフレームワークおよびアプリケーション
 
 
 Name:           pcsc-lite
 Name:           pcsc-lite
-Version:        1.8.13
+Version:        1.8.25
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-
 Group:          System Environment/Daemons
 Group:          System Environment/Daemons
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        BSD
 License:        BSD
-URL:            http://pcsclite.alioth.debian.org/
-Source0:        https://alioth.debian.org/frs/download.php/file/4126/%{name}-%{version}.tar.bz2
+URL:            https://pcsclite.apdu.fr/
+Source0:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
 Source1:        org.debian.pcsc-lite.policy
 Source1:        org.debian.pcsc-lite.policy
-Patch0:         pcsc-lite-1.8.13-docinst.patch
-Patch1:         pcsc-lite-1.8.13-etc.patch
+Source2:        pcscd.init
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -19,6 +21,8 @@ BuildRequires:  eudev-libudev-devel
 BuildRequires:  polkit-devel
 BuildRequires:  polkit-devel
 BuildRequires:  doxygen
 BuildRequires:  doxygen
 BuildRequires:  flex
 BuildRequires:  flex
+BuildRequires:  python3
+BuildRequires:  python3-rpm-macros
 Requires(post): initscripts
 Requires(post): initscripts
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -62,6 +66,7 @@ Summary:        PC/SC API spy
 Summary(ja):        PC/SC API spy
 Summary(ja):        PC/SC API spy
 Group:          Development/Tools
 Group:          Development/Tools
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
+Requires:       python3
 
 
 %description    spy
 %description    spy
 The purpose of pcsc-spy is to spy all the calls between the PC/SC client
 The purpose of pcsc-spy is to spy all the calls between the PC/SC client
@@ -78,14 +83,21 @@ Group:          Documentation
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .docinst
-%patch1 -p1 -b .etc
+
+# Convert to utf-8
+for file in ChangeLog; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
 
 
 %build
 %build
-autoreconf -if
+#autoreconf -if
 %configure \
 %configure \
   --disable-dependency-tracking \
   --disable-dependency-tracking \
   --disable-static \
   --disable-static \
+  --disable-libsystemd \
   --enable-polkit \
   --enable-polkit \
   --enable-runpid=%{_localstatedir}/run/pcscd.pid \
   --enable-runpid=%{_localstatedir}/run/pcscd.pid \
   --enable-ipcdir=%{_localstatedir}/run \
   --enable-ipcdir=%{_localstatedir}/run \
@@ -93,6 +105,8 @@ autoreconf -if
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
 doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
 
 
+%{_libdir}/python3.5/Tools/scripts/pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p src/spy/pcsc-spy
+
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -104,7 +118,7 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/
 
 
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
 
 
-install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd
+install -Dpm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/pcscd
 
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
 
 
@@ -112,7 +126,7 @@ rm -f $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.l
 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/README.DAEMON
 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/README.DAEMON
 
 
 # formaticc doesn't exist any more, don't include the man page
 # formaticc doesn't exist any more, don't include the man page
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1*
+#rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1*
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -139,7 +153,8 @@ fi
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO READ
+%license COPYING
+%doc AUTHORS ChangeLog HELP README SECURITY TODO
 %dir %{_sysconfdir}/reader.conf.d/
 %dir %{_sysconfdir}/reader.conf.d/
 %{_initrddir}/pcscd
 %{_initrddir}/pcscd
 %{_sbindir}/pcscd
 %{_sbindir}/pcscd
@@ -150,6 +165,7 @@ fi
 
 
 %files libs
 %files libs
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
+%license COPYING
 %{_libdir}/libpcsclite.so.*
 %{_libdir}/libpcsclite.so.*
 %{_libdir}/libpcscspy.so.*
 %{_libdir}/libpcscspy.so.*
 
 
@@ -163,7 +179,7 @@ fi
 %files spy
 %files spy
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_bindir}/pcsc-spy
 %{_bindir}/pcsc-spy
-%{_mandir}/man1/pcsc-spy.1.gz
+%{_mandir}/man1/pcsc-spy.1*
 
 
 %files doc
 %files doc
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -172,6 +188,9 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.25-1
+- new upstream release.
+
 * Mon May 04 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.13-1
 * Mon May 04 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.13-1
 - new upstream release
 - new upstream release
 - updata Patch0 (pcsc-lite-1.8.13-docinst.patch)
 - updata Patch0 (pcsc-lite-1.8.13-docinst.patch)

+ 63 - 10
p/polkit-qt/polkit-qt-vl.spec

@@ -2,7 +2,7 @@ Name:		polkit-qt
 Summary:	Qt bindings for PolicyKit
 Summary:	Qt bindings for PolicyKit
 Summary(ja):	PolicyKit の Qt バインディング
 Summary(ja):	PolicyKit の Qt バインディング
 Version:	0.112.0
 Version:	0.112.0
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 
 
 Group:		System Environment/Libraries
 Group:		System Environment/Libraries
 License:	GPLv2+
 License:	GPLv2+
@@ -16,6 +16,7 @@ BuildRequires:  cmake
 BuildRequires:  glib2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  polkit-devel
 BuildRequires:  polkit-devel
 BuildRequires:  qt4-devel
 BuildRequires:  qt4-devel
+BuildRequires:  qt5-qtbase-devel
 
 
 %description
 %description
 Polkit-qt is a library that lets developers use the PolicyKit API through a nice
 Polkit-qt is a library that lets developers use the PolicyKit API through a nice
@@ -33,6 +34,28 @@ Requires: pkgconfig
 %description devel
 %description devel
 %{summary}.
 %{summary}.
 
 
+
+%package -n polkit-qt5
+Summary:	Qt5 bindings for PolicyKit
+Summary(ja):	PolicyKit の Qt5 バインディング
+Group: System Environment/Libraries
+
+%description -n polkit-qt5
+%{summary}.
+
+
+%package -n polkit-qt5-devel
+Summary: Development files for polkit-qt5
+Summary(ja): polkit-qt5 の開発用ファイル
+Group: Development/Libraries
+Requires: polkit-qt5 = %{version}-%{release}
+Requires: polkit-devel
+Requires: pkgconfig
+
+%description -n polkit-qt5-devel
+%{summary}.
+
+
 #package examples 
 #package examples 
 #Summary: Example files for %{name}
 #Summary: Example files for %{name}
 #Group: Development/Libraries
 #Group: Development/Libraries
@@ -49,18 +72,31 @@ Requires: pkgconfig
 %ifarch x86_64
 %ifarch x86_64
 PATH="$PATH:`/usr/bin/pkg-config --variable=bindir Qt`"
 PATH="$PATH:`/usr/bin/pkg-config --variable=bindir Qt`"
 %endif
 %endif
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
+mkdir -p build_qt4
+pushd build_qt4
 %cmake \
 %cmake \
+    -DUSE_QT4=ON \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_BUILD_TYPE=release \
     -DBUILD_EXAMPLES=0 ..
     -DBUILD_EXAMPLES=0 ..
+
+make %{?_smp_mflags}
+popd
+
+mkdir -p build_qt5
+pushd build_qt5
+%cmake \
+    -DUSE_QT5=ON \
+    -DCMAKE_BUILD_TYPE=release \
+    -DBUILD_EXAMPLES=0 ..
+
+make %{?_smp_mflags}
 popd
 popd
 
 
-make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C build_qt4
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C build_qt5
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -72,15 +108,29 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_libdir}/libpolkit-qt*.so.*
+%license COPYING
+%doc AUTHORS README
+%{_libdir}/libpolkit-qt-*.so.*
+
+%files -n polkit-qt5
+%defattr(-,root,root,-)
+%license COPYING
+%doc AUTHORS README
+%{_libdir}/libpolkit-qt5-*.so.*
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_includedir}/polkit-qt-1/
 %{_includedir}/polkit-qt-1/
-%{_libdir}/libpolkit-qt*.so
-%{_libdir}/pkgconfig/polkit-qt*.pc
-%{_libdir}/cmake/*
+%{_libdir}/libpolkit-qt-*.so
+%{_libdir}/pkgconfig/polkit-qt-*.pc
+%{_libdir}/cmake/PolkitQt-1
+
+%files -n polkit-qt5-devel
+%defattr(-,root,root,-)
+%{_includedir}/polkit-qt5-1/
+%{_libdir}/libpolkit-qt5-*.so
+%{_libdir}/pkgconfig/polkit-qt5-*.pc
+%{_libdir}/cmake/PolkitQt5-1
 
 
 #%files examples
 #%files examples
 #%defattr(-,root,root,-)
 #%defattr(-,root,root,-)
@@ -91,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.112-0-3
+- enabled Qt5.
+
 * Mon Jul 04 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.112.0-2
 * Mon Jul 04 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.112.0-2
 - rebuild with gcc-5.4.0
 - rebuild with gcc-5.4.0
 
 

+ 112 - 29
q/qca2/qca2-vl.spec

@@ -1,20 +1,26 @@
 Name:           qca2
 Name:           qca2
-Version:        2.0.3
-Release:        5%{?_dist_release}
+Version:        2.2.1
+Release:        1%{?_dist_release}
 Summary:        Qt Cryptographic Architecture
 Summary:        Qt Cryptographic Architecture
 Summary(ja):    Qt 暗号アーキテクチャ
 Summary(ja):    Qt 暗号アーキテクチャ
-
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
-License:        LGPLv2+
-URL:            http://delta.affinix.com/qca
 
 
-Source0:        http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.bz2
-# Allow gcc to compile qca
-Patch0:         qca-2.0.3-gcc47.patch
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2+
+URL:            https://userbase.kde.org/QCA
+Source0:        http://download.kde.org/stable/qca/%{version}/qca-%{version}.tar.xz
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  qt4-devel >= 4.2
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig
+BuildRequires:  cmake
+BuildRequires:  extra-cmake-modules
+BuildRequires:  qt5-rpm-macros
+BuildRequires:  openssl-devel
+BuildRequires:  qt4-devel
+BuildRequires:  qt5-qtbase-devel
+Provides:       qca-qt4 = %{version}-%{release}
 
 
 %description
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -26,64 +32,141 @@ on any particular cryptographic library. This allows one to easily change
 or upgrade crypto implementations without even needing to recompile the
 or upgrade crypto implementations without even needing to recompile the
 application!
 application!
 
 
+
 %package        devel
 %package        devel
 Summary:        Qt Cryptographic Architecture development files
 Summary:        Qt Cryptographic Architecture development files
 Summary(ja):    Qt 暗号アーキテクチャの開発用ファイル
 Summary(ja):    Qt 暗号アーキテクチャの開発用ファイル
 Group:          Development/Libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       qt4-devel >= %{_qt4_version}
 Requires:       qt4-devel >= %{_qt4_version}
+Provides:       qca-qt4-devel = %{version}-%{release}
 
 
 %description    devel
 %description    devel
 This packages contains the development files for QCA
 This packages contains the development files for QCA
 
 
+
+%package -n     qca2-qt5
+Summary:        Qt5 Cryptographic Architecture
+Summary(ja):    Qt5 暗号アーキテクチャ
+Group:          System Environment/Libraries
+Provides:       qca-qt5 = %{version}-%{release}
+
+%description -n qca2-qt5
+Taking a hint from the similarly-named Java Cryptography Architecture,
+QCA aims to provide a straightforward and cross-platform crypto API,
+using Qt datatypes and conventions. QCA separates the API from the
+implementation, using plugins known as Providers. The advantage of this
+model is to allow applications to avoid linking to or explicitly depending
+on any particular cryptographic library. This allows one to easily change
+or upgrade crypto implementations without even needing to recompile the
+application!
+
+
+%package -n     qca2-qt5-devel
+Summary:        Qt5 Cryptographic Architecture development files
+Summary(ja):    Qt5 暗号アーキテクチャの開発用ファイル
+Group:          Development/Libraries
+Provides:       qca-qt5-devel = %{version}-%{release}
+Requires:       qca2-qt5 = %{version}-%{release}
+Requires:       qt5-qtbase-devel
+
+%description -n qca2-qt5-devel
+This packages contains the development files for QCA
+
+
 %prep
 %prep
 %setup -q -n qca-%{version}
 %setup -q -n qca-%{version}
-%patch0 -p1
 
 
 %build
 %build
-unset QTDIR
-./configure \
-      --prefix=%{_prefix} \
-      --includedir=%{_includedir} \
-      --libdir=%{_libdir} \
-      --datadir=%{_datadir} \
-      --no-separate-debug-info \
-      --verbose
-
-sed -i -e /strip/d Makefile
+
+mkdir build_qt5
+pushd build_qt5
+
+%{cmake} .. \
+  -DQCA_BINARY_INSTALL_DIR:STRING=%{_bindir} \
+  -DQCA_FEATURE_INSTALL_DIR:PATH=%{_qt5_archdatadir}/mkspecs/features \
+  -DQCA_INCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \
+  -DQCA_LIBRARY_INSTALL_DIR:PATH=%{_qt5_libdir} \
+  -DQCA_PLUGINS_INSTALL_DIR:PATH=%{_qt5_plugindir} \
+  -DQCA_PRIVATE_INCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \
+  -DQT4_BUILD:BOOL=OFF
+
 make %{?_smp_mflags}
 make %{?_smp_mflags}
+popd
+
+mkdir build_qt4
+pushd build_qt4
+%{cmake} .. \
+  -DQCA_BINARY_INSTALL_DIR:STRING=%{_bindir} \
+  -DQCA_FEATURE_INSTALL_DIR:PATH=%{_qt4_prefix}/mkspecs/features \
+  -DQCA_INCLUDE_INSTALL_DIR:PATH=%{_qt4_headerdir} \
+  -DQCA_LIBRARY_INSTALL_DIR:PATH=%{_qt4_libdir} \
+  -DQCA_PLUGINS_INSTALL_DIR:PATH=%{_qt4_plugindir} \
+  -DQCA_PRIVATE_INCLUDE_INSTALL_DIR:PATH=%{_qt4_headerdir} \
+  -DQT4_BUILD:BOOL=ON
+
+make %{?_smp_mflags}
+popd
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
-make install INSTALL_ROOT=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C build_qt5
+make install/fast DESTDIR=%{buildroot} -C build_qt4
 
 
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
+%post -n qca2-qt5 -p /sbin/ldconfig
+%postun -n qca2-qt5 -p /sbin/ldconfig
+
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc COPYING README TODO
-%{_bindir}/qcatool2
-%{_libdir}/*.so.*
-%{_mandir}/*/*
+%license COPYING
+%doc README TODO
+%{_qt4_libdir}/libqca.so.2*
+%{_bindir}/mozcerts
+%{_bindir}/qcatool
+%{_mandir}/man1/qcatool.1*
+%dir %{_qt4_plugindir}/crypto/
+%{_qt4_plugindir}/crypto/*
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_includedir}/QtCrypto
 %{_includedir}/QtCrypto
-%{_libdir}/*.so
+%{_libdir}/libqca.so
 %{_libdir}/pkgconfig/qca2.pc
 %{_libdir}/pkgconfig/qca2.pc
-%{_libdir}/libqca.prl
+%{_libdir}/cmake/Qca/
 %{_qt4_datadir}/mkspecs/features/crypto.prf
 %{_qt4_datadir}/mkspecs/features/crypto.prf
 
 
+%files -n qca2-qt5
+%doc README TODO
+%license COPYING
+%{_bindir}/mozcerts-qt5
+%{_bindir}/qcatool-qt5
+%{_mandir}/man1/qcatool-qt5.1*
+%{_qt5_libdir}/libqca-qt5.so.2*
+%dir %{_qt5_plugindir}/crypto/
+%{_qt5_plugindir}/crypto/*
+
+%files -n qca2-qt5-devel
+%{_qt5_headerdir}/QtCrypto
+%{_qt5_libdir}/libqca-qt5.so
+%{_libdir}/pkgconfig/qca2-qt5.pc
+%{_libdir}/cmake/Qca-qt5/
+%{_qt5_archdatadir}/mkspecs/features/crypto.prf
+
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.1-1
+- new upstream release.
+- added Qt5 support.
+
 * Mon Jul 04 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.0.3-5
 * Mon Jul 04 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.0.3-5
 - rebuild with gcc-5.4.0
 - rebuild with gcc-5.4.0
 
 

+ 36 - 24
r/rdesktop/rdesktop-vl.spec

@@ -1,21 +1,29 @@
-Summary: A Remote Desktop Protocol Client
-Summary(ja): リモートデスクトッププロトコルクライアント
-Name: rdesktop
-Version: 1.7.1
-Release: 1%{?_dist_release}
-Source0: %{name}-%{version}.tar.gz
-Patch10: rdesktop-win2k-ts-license-hack.patch
-Patch11: rdesktop-1.6.0-skip-load-license.patch
-Patch12: rdesktop-enable-fontsmoothing.patch
-URL: http://www.rdesktop.org/
-License: GPLv3
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel
-BuildRequires: libX11-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libao-devel
+Summary:        A Remote Desktop Protocol Client
+Summary(ja):    リモートデスクトッププロトコルクライアント
+Name:           rdesktop
+Version:        1.9.0
+Release:        1%{?_dist_release}
+Group:          User Interface/Desktops
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv3
+URL:            http://www.rdesktop.org/
+Source0:        https://github.com/rdesktop/rdesktop/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Patch1:         %{name}-libao.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  gnutls-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXcursor-devel
+BuildRequires:  libXrandr-devel
+BuildRequires:  libao-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  libtasn1-devel
+BuildRequires:  nettle-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pcsc-lite-devel
+BuildRequires:  autoconf automake libtool
 
 
 %description
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
 rdesktop is an open source client for Windows NT Terminal Server and
@@ -29,14 +37,14 @@ rdesktop は Windows NT ターミナルサーバ、Windows 20000 ターミナル
 利用してユーザの Windows デスクトップを表示します。Citrix ICA のような
 利用してユーザの Windows デスクトップを表示します。Citrix ICA のような
 サーバ拡張は必要ありません。
 サーバ拡張は必要ありません。
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
-%patch10 -p1 -b .win2k-ts-license-hack
-%patch11 -p1 -b .skip-load-license
-%patch12 -p1 -b .enable-font-smoothing
+%patch1 -p1 -b .ao
+
 
 
 %build
 %build
-%configure
+%configure --with-ipv6 --with-sound=libao --disable-credssp
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
 %install
 %install
@@ -48,12 +56,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc COPYING doc/ChangeLog doc/AUTHORS doc/HACKING doc/TODO doc/*.txt
+%license COPYING
+%doc doc/ChangeLog doc/AUTHORS doc/HACKING doc/TODO doc/*.txt
 %{_bindir}/rdesktop
 %{_bindir}/rdesktop
 %{_datadir}/rdesktop
 %{_datadir}/rdesktop
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 
 
 %changelog
 %changelog
+* Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.0-1
+- new upstream release.
+
 * Fri Jul 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.1-1
 * Fri Jul 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.1-1
 - new upstream release 
 - new upstream release 
 
 
@@ -88,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 - new upstream release
 - new upstream release
 - fixed typo in spec file <BTS:425>
 - fixed typo in spec file <BTS:425>
 
 
-* Thu Oct 04 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.1-0vl1
+* Tue Oct 04 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.1-0vl1
 - new upstream release
 - new upstream release
 
 
 * Sun Apr 10 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.0-0vl1
 * Sun Apr 10 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.0-0vl1

+ 26 - 12
u/util-linux/util-linux-vl.spec

@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Summary: A collection of basic system utilities
 Summary(ja): 基本システムユーティリティー集
 Summary(ja): 基本システムユーティリティー集
 Name: util-linux
 Name: util-linux
-Version: 2.33
+Version: 2.34
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 Group: System Environment/Base
@@ -52,7 +52,7 @@ BuildRequires: libuser-devel
 BuildRequires: automake, autoconf, libtool
 BuildRequires: automake, autoconf, libtool
 
 
 ### Sources
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/%{name}-%{version}.tar.xz
+Source0: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v%{version}/%{name}-%{version}.tar.xz
 Source1: util-linux-login.pamd
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
 Source3: util-linux-chsh-chfn.pamd
@@ -137,11 +137,12 @@ Packager: daisuke
 ### Ready for upstream?
 ### Ready for upstream?
 ###
 ###
 # 151635 - makeing /var/log/lastlog
 # 151635 - makeing /var/log/lastlog
-Patch7: 2.28-login-lastlog-create.patch
+Patch0: 2.28-login-lastlog-create.patch
 
 
-### Upstream patches from proposed stable/v2.22.x branch
-### (remove after update to the final 2.22.3)
-###
+# 1751290 - regression: lsblk not showing PKNAME in f31+
+Patch1: lsblk-force-to-print-PKNAME-for-partition.patch
+# https://github.com/systemd/systemd/issues/10872
+Patch2: libmount-improve-mountinfo-reliability.patch
 
 
 %description
 %description
 The util-linux-ng package contains a large variety of low-level system
 The util-linux-ng package contains a large variety of low-level system
@@ -404,9 +405,7 @@ across a network.
 
 
 
 
 %prep
 %prep
-%setup -q
-
-%patch7 -p1
+%autosetup -p1
 
 
 %build
 %build
 unset LINGUAS || :
 unset LINGUAS || :
@@ -416,6 +415,8 @@ unset LINGUAS || :
 export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
 export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
 export SUID_CFLAGS="-fpie"
 export SUID_CFLAGS="-fpie"
 export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+export DAEMON_CFLAGS="$SUID_CFLAGS"
+export DAEMON_LDFLAGS="$SUID_LDFLAGS"
 %configure \
 %configure \
 	--bindir=/bin \
 	--bindir=/bin \
 	--sbindir=/sbin \
 	--sbindir=/sbin \
@@ -599,6 +600,14 @@ rm -rf %{buildroot}%{python_sitearch}/libmount
 rm -rf %{buildroot}%{compldir}
 rm -rf %{buildroot}%{compldir}
 %endif
 %endif
 
 
+
+%check
+#to run tests use "--with check"
+%if %{?_with_check:1}%{!?_with_check:0}
+make check
+%endif
+
+
 %clean
 %clean
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
 
@@ -685,7 +694,7 @@ fi
 %doc README NEWS AUTHORS
 %doc README NEWS AUTHORS
 %doc Documentation/deprecated.txt 
 %doc Documentation/deprecated.txt 
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
-%license Documentation/licenses/*
+%license README.licensing Documentation/licenses/*
 %doc misc-utils/getopt-*.{bash,tcsh}
 %doc misc-utils/getopt-*.{bash,tcsh}
 
 
 %config(noreplace)	%{_sysconfdir}/pam.d/chfn
 %config(noreplace)	%{_sysconfdir}/pam.d/chfn
@@ -764,6 +773,7 @@ fi
 %{_bindir}/fincore
 %{_bindir}/fincore
 %{_bindir}/flock
 %{_bindir}/flock
 %{_bindir}/getopt
 %{_bindir}/getopt
+%{_bindir}/hardlink
 %{_bindir}/hexdump
 %{_bindir}/hexdump
 %{_bindir}/ionice
 %{_bindir}/ionice
 %{_bindir}/ipcmk
 %{_bindir}/ipcmk
@@ -826,6 +836,7 @@ fi
 %{_mandir}/man1/fallocate.1*
 %{_mandir}/man1/fallocate.1*
 %{_mandir}/man1/flock.1*
 %{_mandir}/man1/flock.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/getopt.1*
+%{_mandir}/man1/hardlink.1*
 %{_mandir}/man1/hexdump.1*
 %{_mandir}/man1/hexdump.1*
 %{_mandir}/man1/ionice.1*
 %{_mandir}/man1/ionice.1*
 %{_mandir}/man1/ipcmk.1*
 %{_mandir}/man1/ipcmk.1*
@@ -960,7 +971,7 @@ fi
 %files -n libfdisk
 %files -n libfdisk
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
-%license Documentation/licenses/COPYING.LGPLv2.1* libfdisk/COPYING*
+%license Documentation/licenses/COPYING.LGPL-2.1* libfdisk/COPYING*
 /%{_lib}/libfdisk.so.*
 /%{_lib}/libfdisk.so.*
 
 
 %files -n libfdisk-devel
 %files -n libfdisk-devel
@@ -973,7 +984,7 @@ fi
 %files -n libsmartcols
 %files -n libsmartcols
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
-%license Documentation/licenses/COPYING.LGPLv2.1* libsmartcols/COPYING*
+%license Documentation/licenses/COPYING.LGPL-2.1* libsmartcols/COPYING*
 /%{_lib}/libsmartcols.so.*
 /%{_lib}/libsmartcols.so.*
 
 
 %files -n libsmartcols-devel
 %files -n libsmartcols-devel
@@ -1068,6 +1079,9 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.34-1
+- updated to 2.34.
+
 * Wed Dec 26 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.33-1
 * Wed Dec 26 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.33-1
 - updated to 2.33.
 - updated to 2.33.
 - dropped R:ConsoleKit-libs (ConsoleKit is obsolete).
 - dropped R:ConsoleKit-libs (ConsoleKit is obsolete).