Browse Source

updated 11 packages

dos2unix-7.4.1-1

enchant-1.6.0-2

enchant2-2.2.8-1

fetchmail-6.4.4-1

gmime-3.2.7-1

libical-3.0.8-1

nspr-4.25-1

re2c-1.3-1

samba-4.12.2-1

squid-4.11-1

unique-1.1.6-5

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

+ 21 - 10
d/dos2unix/dos2unix-vl.spec

@@ -1,13 +1,15 @@
 Name:		dos2unix
 Summary:	Text file format converters
 Summary(ja):	テキストファイルのフォーマット変換ツール
-Version:	5.3.3
+Version:	7.4.1
 Release:	1%{?_dist_release}
-
 Group:		Applications/Text
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	BSD
-URL:		http://www.xs4all.nl/~waterlan/dos2unix.html
-Source0:	http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz
+URL:		http://waterlan.home.xs4all.nl/dos2unix.html
+Source0:	http://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gettext
@@ -16,9 +18,6 @@ BuildRequires:	perl
 Provides:	unix2dos = %{version}-%{release}
 Obsoletes:	unix2dos < 5.1-1
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
 %description
 Convert text files with DOS or Mac line endings to Unix line endings and 
 vice versa.
@@ -27,14 +26,17 @@ vice versa.
 テキストファイル中の行末記号(LF)を DOS/Mac と Unix との間で
 相互に変換するためのツールです.
 
+
 %prep
 %setup -q
 rm -rf po/*/eo-x.*
 
+
 %build
 make CFLAGS="%{optflags} -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
   %{?_smp_mflags}
 
+
 %install
 make DESTDIR=%{buildroot} install
 
@@ -43,13 +45,19 @@ rm -rf %{buildroot}%{_docdir}
 
 %find_lang %{name} --with-man --all-name
 
+
+%check
+make test
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc dos2unix.htm  ChangeLog.txt COPYING.txt
-%doc NEWS.txt README.txt TODO.txt
+%license COPYING.txt
+%doc ChangeLog.txt NEWS.txt README.txt TODO.txt
 %{_bindir}/dos2unix
 %{_bindir}/mac2unix
 %{_bindir}/unix2dos
@@ -58,6 +66,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.4.1-1
+- new upstream release.
+
 * Wed Mar 21 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 5.3.3-1
 - updated to 5.3.3
 
@@ -207,7 +218,7 @@ rm -rf %{buildroot}
 - cleaned up specfile a bit
 - built for 7.1
 
-* Tue Jul 07 1999 Peter Soos <sp@osb.hu> 
+* Wed Jul 07 1999 Peter Soos <sp@osb.hu> 
 - Added Hungarian "Summary:" and "%%description" 
 - Corrected the file and directory attributes to rebuild the package 
   under RedHat Linux 6.0

+ 24 - 8
e/enchant/enchant-vl.spec

@@ -5,8 +5,11 @@ Summary: An Enchanting Spell Checking Library
 Summary(ja): スペルチェックライブラリ
 Name: enchant
 Version: 1.6.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: LGPLv2+
 Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
 URL: http://www.abisource.com/
@@ -24,6 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %description
 A library that wraps other spell checking backends.
 
+
 %package hunspell
 Summary: Integration with hunspell for libenchant
 Summary(ja): Integration with hunspell for libenchant
@@ -33,6 +37,7 @@ Requires: enchant = %{version}-%{release}
 %description hunspell
 Libraries necessary to integrate applications using libenchant with hunspell.
 
+
 %package voikko
 Summary: Integration with voikko for libenchant
 Summary(ja): Integration with voikko for libenchant
@@ -53,9 +58,11 @@ Requires: glib2-devel
 %description devel
 Libraries, headers, and support files necessary to compile applications using libenchant.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure \
   --disable-ispell \
@@ -73,15 +80,27 @@ Libraries, headers, and support files necessary to compile applications using li
   
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
 
+
+%clean
+rm -r $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING.LIB README
+%license COPYING.LIB
+%doc AUTHORS README
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/enchant
@@ -105,14 +124,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant/*.la
 %{_libdir}/pkgconfig/enchant.pc
 %{_includedir}/enchant
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
-rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.0-2
+- rebuilt with current environment.
+
 * Sat Apr 06 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.6.0-1
 - new upstream release
 

+ 22 - 10
e/enchant2/enchant2-vl.spec

@@ -4,16 +4,16 @@
 Summary: An Enchanting Spell Checking Library
 Summary(ja): スペルチェックライブラリ
 Name: enchant2
-Version: 2.2.3
+Version: 2.2.8
 Release: 1%{?_dist_release}
 Group: System Environment/Libraries
-License: LGPLv2+
-
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
+License: LGPLv2+
 URL: http://www.abisource.com/
+Source: https://github.com/AbiWord/enchant/releases/download/v%{version}/enchant-%{version}.tar.gz
+
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: aspell-devel
 %if %{with hunspell}
@@ -28,6 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %description
 A library that wraps other spell checking backends.
 
+
 %package hunspell
 Summary: Integration with hunspell for libenchant
 Summary(ja): Integration with hunspell for libenchant
@@ -37,6 +38,7 @@ Requires: enchant = %{version}-%{release}
 %description hunspell
 Libraries necessary to integrate applications using libenchant with hunspell.
 
+
 %package voikko
 Summary: Integration with voikko for libenchant
 Summary(ja): Integration with voikko for libenchant
@@ -57,9 +59,11 @@ Requires: glib2-devel
 %description devel
 Libraries, headers, and support files necessary to compile applications using libenchant.
 
+
 %prep
 %setup -q -n enchant-%{version}
 
+
 %build
 %configure \
   --disable-ispell \
@@ -80,12 +84,23 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
 
 make %{?_smp_mflags} pkgdatadir=%{_datadir}/enchant-2
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT pkgdatadir=%{_datadir}/enchant-2 install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant-2/*.la
 
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%clean
+rm -r $RPM_BUILD_ROOT
+
+
 %files
 %defattr(-,root,root)
 %license COPYING.LIB
@@ -114,14 +129,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/enchant-2/*.la
 %{_libdir}/pkgconfig/enchant-2.pc
 %{_includedir}/enchant-2
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
-rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.8-1
+- new upstream release.
+
 * Thu Jan 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.3-1
 - new upstream release.
 - renamed %%{name} to "enchant2".

+ 80 - 34
f/fetchmail/fetchmail-vl.spec

@@ -1,43 +1,37 @@
-
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%bcond_with systemd
+%bcond_with fetchmailconf
 
 Summary: A remote mail retrieval and forwarding utility.
 Summary(ja): 遠隔メール取得/フォワード用ユーティリティ
 Name: fetchmail
-Version: 6.3.26
-Release: 3%{_dist_release}
-Requires: smtpdaemon
+Version: 6.4.4
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 License: GPL
 Group: Applications/Internet
-URL: http://fetchmail.berlios.de/
-Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.xz
-Source1: fetchmailconf.1
+URL: http://www.fetchmail.info/
+%define shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+Source0: https://downloads.sourceforge.net/project/fetchmail/branch_%{shortver}/fetchmail-%{version}.tar.xz
 
-Patch1: fetchmail-6.3.22-stripnul.patch
-Patch2: fetchmail-6.3.22-nonewline.patch
-# Patch3: fetchmail-6.3.5-malformed_spam_crash.patch
-
-# security
-# Patch100: fetchmail-6.3.8_CVE-2007-4565.patch
-# Patch110: fetchmail-6.3.8_CVE-2008-2711.patch
+Source1: fetchmailconf.1
+Source2: fetchmail.service
+Source3: fetchmail@.service
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
+%if %{with systemd}
+%{?systemd_requires}
+%endif
 BuildRequires: openssl-devel
 BuildRequires: krb5-devel
-BuildRequires: python-devel
 BuildRequires: flex, bison
 Requires: krb5-libs
+%if %{without fetchmailconf}
+Obsoletes: fetchmailconf < 6.4.0
+%endif
 
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: iwamoto, inagaki
 
-%package -n fetchmailconf
-Summary: A GUI utility for configuring your fetchmail preferences.
-Summary(ja): fetchmail を設定する為の GUI ユーティリティ
-Group: Applications/Internet
-Requires: python, tk, tkinter, fetchmail = %{version}-%{release}
-
 %description
 Fetchmail is a remote mail retrieval and forwarding utility intended
 for use over on-demand TCP/IP links, like SLIP or PPP connections.
@@ -60,6 +54,15 @@ fetchmail はメールのフォワードには SMTP を用います.
 SLIP や PPP 接続でメールを取得したい場合は fetchmail を
 インストールして下さい.
 
+%if %{with fetchmailconf}
+%package -n fetchmailconf
+Summary: A GUI utility for configuring your fetchmail preferences.
+Summary(ja): fetchmail を設定する為の GUI ユーティリティ
+Group: Applications/Internet
+BuildRequires: python-devel
+BuildRequires: python-rpm-macros
+Requires: python, tk, tkinter, fetchmail = %{version}-%{release}
+
 %description -n fetchmailconf
 Fetchmailconf is a Tcl/Tk GUI application which edits your
 .fetchmailrc file, in order to configure the fetchmail mail retrieval
@@ -78,50 +81,93 @@ fetchmailconf を使うと混乱すること無く設定が行えます.
 fetchmail の設定を簡単に行いたい場合は fetchmailconf をインストール
 して下さい.fetchmail を使うには python と tk もインストールされている
 必要があります.
+%endif
+
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .stripnul
-%patch2 -p1 -b .nonewline
-# %patch3 -p0 -b .malformed_spam
-
-# %patch100 -p0 -b .CVE-2007-4565
-# %patch110 -p1 -b .CVE-2008-2711
 
 %build
+%if %{without fetchmailconf}
+export PYTHON=":"
+%endif
+
 %configure \
+     --enable-POP3 \
+     --enable-IMAP \
      --enable-NTLM \
      --with-ssl \
      --with-kerberos5 \
-     --with-gssapi
+     --with-gssapi \
+     --enable-fallback=no
 
 %__make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1*
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+
+rm -f %{buildroot}%{_mandir}/man1/fetchmailconf.1*
+%if %{with fetchmailconf}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
+%else
+rm -f %{buildroot}%{_bindir}/fetchmailconf
+%endif
+
+%if %{with systemd}
+install -Dpm644 %{SOURCE2} %{buildroot}%{_unitdir}/fetchmail.service
+install -Dpm644 %{SOURCE3} %{buildroot}%{_unitdir}/fetchmail@.service
+%endif
 
 %find_lang %name
 
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%if %{with systemd}
+%post
+%systemd_post %{name}.service
+
+%preun
+%systemd_preun %{name}.service
+
+%postun
+%systemd_postun_with_restart %{name}.service
+%endif
+
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc FEATURES README NEWS NOTES *.html FAQ COPYING INSTALL
+%license COPYING
+%doc FEATURES README NEWS NOTES *.html FAQ INSTALL
 %{_bindir}/fetchmail
 %{_mandir}/man1/fetchmail.1*
+%if %{with systemd}
+%{_unitdir}/*
+%endif
 
+%if %{with fetchmailconf}
 %files -n fetchmailconf
 %defattr(-,root,root)
 %{_bindir}/fetchmailconf
 %{python_sitelib}/fetchmailconf.py*
 %{_mandir}/man1/fetchmailconf.1*
+%endif
 
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.4.4-1
+- new upstream release.
+- added systemd support (disabled as default).
+- dropped R:smtpdaemon.
+
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.4.1-1
+- new upstream release.
+- disabled to build fetchmailconf as default.
+
 * Mon Nov 05 2018 Toshiaki Ara <ara_t@384.jp> 6.3.26-3
 - rebuild with openssl-1.1.1
 

+ 15 - 6
g/gmime/gmime-vl.spec

@@ -5,12 +5,17 @@
 Summary:        Library for creating and parsing MIME messages
 Summary(ja):	MIMEメッセージを生成またパースするためのライブラリ
 Name:           gmime
-Version:        3.2.3
+Version:        3.2.7
 Release:        1%{?_dist_release}
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        GPL
-URL:            http://spruce.sourceforge.net/gmime/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.xz
+URL:            https://github.com/jstedfast/gmime
+%global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+Source0:        https://download.gnome.org/sources/gmime/%{shortver}/%{name}-%{version}.tar.xz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  glib2-devel >= 2.26.0
@@ -28,9 +33,6 @@ BuildRequires:  gtk-sharp2 >= 2.8.0
 %define monodir %{_prefix}/lib/mono
 %endif
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The GMime suite provides a core library and set of utilities which may be
 used for the creation and parsing of messages using the Multipurpose
@@ -49,6 +51,7 @@ used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME). The devel-package contains header files
 to develop applications that use libgmime.
 
+
 %ifarch %mono_archs
 %package        sharp
 Summary:        mono bindings for gmime
@@ -63,9 +66,11 @@ Internet Mail Extension (MIME). The devel-package contains support
 for developing mono applications that use libgmime.
 %endif
 
+
 %prep
 %setup -q
 
+
 %build
 cp %{_datadir}/gettext/config.rpath .
 ## autoreconf --force --install
@@ -94,6 +99,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -125,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.7-1
+- new upstream release.
+
 * Sat Dec 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.3-1
 - new upstream release.
 - disabled to build mono stuff.

+ 11 - 9
lib/libi/libical/libical-vl.spec

@@ -2,26 +2,23 @@
 
 Name:		libical
 Summary:	An Open Source implementation of the iCalendar protocols and protocol data units
-Version:	3.0.5
+Version:	3.0.8
 Release:	1%{?_dist_release}
-
 Group:		System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       babasaki, daisuke, inagaki
+
 License:	LGPLv2 or MPLv1.1
 URL:		https://libical.github.io/libical/
-
 Source0:	https://github.com/libical/libical/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	cmake
 BuildRequires:	libxml2-devel
 BuildRequires:	glib2-devel
 Requires:	tzdata
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-Packager:       babasaki, daisuke, inagaki
-
 #----------------------------------------------------------------------------
 %description
 Reference implementation of the iCalendar data type and serialization format
@@ -106,7 +103,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE* ReadMe.* ReleaseNotes.txt THANKS TODO
+%license COPYING LICENSE*
+%doc AUTHORS ReadMe.* ReleaseNotes.txt THANKS TODO
 %{_libdir}/%{name}.so.*
 %{_libdir}/%{name}_cxx.so.*
 %{_libdir}/libicalss.so.*
@@ -139,7 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}-glib.so
 %{_libdir}/pkgconfig/libical-glib.pc
 
+
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.8-1
+- new upstream release.
+
 * Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.5-1
 - updated to 3.0.5.
 

+ 9 - 6
n/nspr/nspr-vl.spec

@@ -3,11 +3,15 @@
 Summary:	Netscape Portable Runtime
 Summary(ja):    Netscape ポータブルランタイム
 Name:		nspr
-Version:	4.22
+Version:	4.25
 Release:	1%{?_dist_release}
+Group:		System Environment/Libraries
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	daisuke
+
 License:	MPLv2.0
 URL:		http://www.mozilla.org/projects/nspr/
-Group:		System Environment/Libraries
 Source0:	https://archive.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
 
 Patch1:		nspr-config-pc.patch
@@ -16,10 +20,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Provides:	mozilla-nspr
 Obsoletes:	mozilla-nspr
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 NSPR provides platform independence for non-GUI operating system 
 facilities. These facilities include threads, thread synchronization, 
@@ -136,6 +136,9 @@ NSPR_VERSION=`./config/nspr-config --version`
 
 
 %changelog
+* Sun Apr 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.25-1
+- update to 4.25.
+
 * Fri Sep 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.22-1
 - update to 4.22.
 

+ 23 - 17
r/re2c/re2c-vl.spec

@@ -1,14 +1,16 @@
 Summary: Tool for generating C-based recognizers from regular expressions
 Name: re2c
-Version: 0.16
-Release: 2%{?_dist_release}
-License: Public Domain
+Version: 1.3
+Release: 1%{?_dist_release}
 Group: Development/Tools
-URL: http://re2c.org/
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source: http://downloads.sf.net/re2c/re2c-%{version}.tar.gz
+License: Public Domain
+URL: https://re2c.org/
+Source: https://github.com/skvadrik/re2c/releases/download/1.3/re2c-%{version}.tar.xz
+Patch0: CVE-2020-11958.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -22,25 +24,21 @@ quality.
 
 %prep
 %setup -q
-# Fix all those executable files, set executable only the ones that need to be
-find . -type f -exec chmod -x {} \;
-%{__chmod} +x configure depcomp install-sh missing
+%autopatch -p1
+
 
 %build
-%configure
-# Build re2c, then our own scanner.cc, then rebuild the final re2c with it
-#%{__make} %{?_smp_mflags} re2c
-#%{__rm} -f scanner.cc
-#./re2c -b -o scanner.cc scanner.re
-#%{__rm} -f re2c scanner.o
+%configure --disable-silent-rules
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-#%{__install} -D -p -m 0755 re2c %{buildroot}%{_bindir}/re2c
-#%{__install} -D -p -m 0644 re2c.1 %{buildroot}%{_mandir}/man1/re2c.1
+
+
+%check
+make tests
 
 
 %clean
@@ -49,12 +47,20 @@ find . -type f -exec chmod -x {} \;
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG README examples/ doc/* lessons/
+%license LICENSE
+%doc CHANGELOG README.md examples/ doc/*
 %{_bindir}/re2c
+%dir %{_datadir}/re2c
+%dir %{_datadir}/re2c/stdlib
+%{_datadir}/re2c/stdlib/unicode_categories.re
 %{_mandir}/man1/re2c.1*
 
 
 %changelog
+* Thu Apr 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3-1
+- new upstream release.
+- added Patch0 to fix CVE-2020-11958.
+
 * Tue Jul  5 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.16-2
 - rebuilt with new toolchain.
 

+ 5 - 2
s/samba/samba-vl.spec

@@ -1,9 +1,9 @@
 %bcond_with systemd
 %bcond_without pidl
 
-%define samba_version 4.12.1
+%define samba_version 4.12.2
 #define rc_number rc4
-%define samba_release 2
+%define samba_release 1
 
 %define doc_version 4.12.0
 %define api_version 4.0
@@ -1820,6 +1820,9 @@ fi
 %endif
 
 %changelog
+* Tue Apr 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.2-1
+- new upstream release.
+
 * Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.1-2
 - rebuilt with icu-67.
 

+ 59 - 16
s/squid/squid-vl.spec

@@ -1,7 +1,9 @@
+%bcond_with     systemd
+
 %define         base_name       squid
 %define         pkg_epoch       7
-%define         pkg_version     4.10
-%define         pkg_release     1%{?_dist_release}
+%define         pkg_version     4.11
+%define         pkg_release     1%{?_dist_release}%{?with_systemd:.systemd}
 %define         uid             23
 %define         gid             23
 
@@ -13,34 +15,39 @@ Name:           %{base_name}
 Epoch:          %{pkg_epoch}
 Version:        %{pkg_version}
 Release:        %{pkg_release}
+Group:          Applications/Services
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2+
+URL:            http://www.squid-cache.org
 Source0:        http://www.squid-cache.org/Versions/v4/%{base_name}-%{version}.tar.xz
 Source1:        %{base_name}.init
 Source2:        %{base_name}.logrotate
 Source3:        %{base_name}.sysconfig
 Source4:        %{base_name}.pam
-License:        GPLv2+
-Group:          Applications/Services
-URL:            http://www.squid-cache.org
+Source5:        %{base_name}.service
+Source6:        cache_swap.sh
 
 Patch1:         0001-config.patch
 Patch2:         0002-location.patch
 Patch3:         0003-perlpath.patch
 
+BuildRoot:      %{_tmppath}/%{base_name}-%{version}-root
+BuildRequires:  openldap-devel pam-devel openssl-devel krb5-devel
+BuildRequires:  cyrus-sasl-devel libcap-devel libdb-devel
 Requires:       bash >= 2.0
 Requires(pre):  shadow-utils
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post): %{_syssbindir}/chkconfig
 Requires(preun): %{_syssbindir}/chkconfig
-BuildRequires:  openldap-devel pam-devel openssl-devel krb5-devel
-BuildRequires:  cyrus-sasl-devel libcap-devel libdb-devel
-BuildRoot:      %{_tmppath}/%{base_name}-%{version}-root
+%endif
 
 Conflicts:      squid30
 Obsoletes:      squid-novm
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-Packager:       miyabi
-
 %description
 Squid is a high-performance proxy caching server for Web clients,
 supporting FTP, gopher, and HTTP data objects. Unlike traditional
@@ -66,6 +73,10 @@ Squid は、メインのサーバプログラム squid と、 Domain Name System
 問い合わせプログラム (dnsserver) と、 FTP データを取得するプログラム
 (ftpget) と、いくつかの管理用またはクライアントツールから成ります。
 
+
+%debug_package
+
+
 %prep
 %autosetup -p1
 
@@ -120,6 +131,9 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
    --with-openssl \
    --with-pthreads \
    --disable-arch-native \
+%if %{with systemd}
+   --with-pidfile='/run/squid.pid' \
+%endif
    --with-pic
 
 %{__make} \
@@ -154,7 +168,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/
 
+%if %{with systemd}
+install -Dpm644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
+install -Dpm755 %{SOURCE6} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/cache_swap.sh
+%else
 install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_initdir}/%{base_name}
+%endif
 install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{base_name}
 install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{base_name}
 install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/%{base_name}
@@ -198,20 +217,34 @@ done
 exit 0
 
 %post
+%if %{with systemd}
+%systemd_post %{name}.service
+%else
 if ! /sbin/chkconfig %{base_name}; then
   /sbin/chkconfig --add %{base_name}
 fi
+%endif
 
-if [ "$1" -eq "2" ]; then
-  %{_initdir}/%{base_name} condrestart
-fi
 
 %preun
-if [ "$1" -eq "0" ]; then
+%if %{with systemd}
+%systemd_preun %{name}.service
+%else
+if [ "$1" -eq "0" -o -x /bin/systemctl ]; then
   %{_initdir}/%{base_name} stop
   rm -f %{_localstatedir}/log/%{base_name}/*
   /sbin/chkconfig --del %{base_name}
 fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart %{name}.service
+%else
+if [ "$1" -gt 1 ]; then
+  %{_initdir}/%{base_name} condrestart
+fi
+%endif
 
 %triggerin -- samba-common
 /usr/sbin/usermod -a -G wbpriv %{base_name} >/dev/null 2>&1 || \
@@ -232,7 +265,13 @@ fi
 %attr(0755,root,root) %{_sbindir}/%{base_name}
 %attr(0755,root,root) %{_bindir}/*
 
+%if %{with systemd}
+%attr(0644,root,root) %{_unitdir}/%{base_name}.service
+%dir %{_libexecdir}/%{base_name}
+%attr(0755,root,root) %{_libexecdir}/%{base_name}/*
+%else
 %attr(0755,root,root) %{_initdir}/%{base_name}
+%endif
 
 %attr(0755,root,root) %{_libdir}/%{base_name}/cachemgr.cgi
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/basic_*
@@ -278,6 +317,10 @@ fi
 %{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
 
 %changelog
+* Thu Apr 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.11-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Mon Feb 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10-1
 - new upstream release.
 

+ 27 - 12
u/unique/unique-vl.spec

@@ -1,19 +1,22 @@
 Name:           unique
 Version:        1.1.6
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 Summary:        Single instance support for applications
 Summary(ja):    アプリケーションのシングルインスタンス支援
-
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
-Source0:        http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
+%global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+Source0:        http://download.gnome.org/sources/libunique/%{shortver}/libunique-%{version}.tar.bz2
 
-Patch0:			libunique-1.1.6-remove-disable-deprecated.patch
-Patch1:			fix-unused-but-set-variable.patch
-Patch2:			libunique-1.1.6-format-security.patch
+Patch0:         libunique-1.1.6-remove-disable-deprecated.patch
+Patch1:         fix-unused-but-set-variable.patch
+Patch2:         libunique-1.1.6-format-security.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gnome-doc-utils >= 0.3.2
@@ -22,15 +25,12 @@ BuildRequires:  glib2-devel >= 2.12.0
 BuildRequires:  gtk2-devel >= 2.11.0
 BuildRequires:	gtk-doc >= 1.11
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
 %description
 Unique is a library for writing single instance applications, that is
 applications that are run once and every further call to the same binary
 either exits immediately or sends a command to the running instance.
 
+
 %package devel
 Summary: Libraries and headers for Unique
 Summary(ja): Unique のライブラリとヘッダ
@@ -44,12 +44,18 @@ Requires: gtk2-devel
 %description devel
 Headers and libraries for Unique.
 
+
 %prep
 %setup -q -n libunique-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
+# fix compatibility with gtk-doc 1.26
+gtkdocize
+autoreconf -fiv
+
+
 %build
 %configure \
 	--enable-gtk-doc \
@@ -58,21 +64,26 @@ Headers and libraries for Unique.
 	--enable-maintainer-flags=no
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%license COPYING
+%doc AUTHORS ChangeLog README
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -82,7 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 %{_libdir}/lib*.so
 
+
 %changelog
+* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.6-5
+- rebuilt with current environment.
+
 * Fri Nov 25 2016 IWAI, Masaharu <iwaim.sub@gmail.com> 1.1.6-4
 - add some patches from Rawhide 1.1.6-15.fc24
  - fix-unused-but-set-variable.patch (Patch1)