Browse Source

updated 4 packages

ethtool-5.8-1

gettext-0.21-1

rsync-3.2.3-1

squid-4.13-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12485 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
99c08c93b1
4 changed files with 190 additions and 93 deletions
  1. 20 16
      e/ethtool/ethtool-vl.spec
  2. 63 23
      g/gettext/gettext-vl.spec
  3. 90 33
      r/rsync/rsync-vl.spec
  4. 17 21
      s/squid/squid-vl.spec

+ 20 - 16
e/ethtool/ethtool-vl.spec

@@ -1,22 +1,23 @@
 # install ethtool to /sbin
 %define _sbindir /sbin
 
-Summary:      A tool for setting ethernet parameters
-Summary(ja):  Ethernet コントローラ設定ツール
-Name:         ethtool
-Epoch:	      1
-Version:      5.4
-Release:      1%{?_dist_release}
-Group:        Applications/System
-Vendor:       Project Vine
-Distribution: Vine Linux
-Packager:     shaolin, daisuke
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-
-License:      GPL
-URL:          https://www.kernel.org/pub/software/network/ethtool/
-Source:       https://mirrors.edge.kernel.org/pub/software/network/ethtool/%{name}-%{version}.tar.xz
-
+Summary:        A tool for setting ethernet parameters
+Summary(ja):    Ethernet コントローラ設定ツール
+Name:           ethtool
+Epoch:	          1
+Version:        5.8
+Release:        1%{?_dist_release}
+Group:          admin-tools,network
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       shaolin, daisuke
+
+License:        GPL
+URL:            https://www.kernel.org/pub/software/network/ethtool/
+Source:         https://mirrors.edge.kernel.org/pub/software/network/ethtool/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  libmnl-devel
 
 %description
 Ethtool is a small utility to get and set values from your your ethernet 
@@ -67,6 +68,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Sun Sep 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:5.8-1
+- new upstream release.
+
 * Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:5.4-1
 - new upstream release.
 

+ 63 - 23
g/gettext/gettext-vl.spec

@@ -1,34 +1,41 @@
 %define libtoolize :
 
-%define src_ver 0.20.1
-%define so_ver 0.20.1
-%define short_ver 0.20
+%define src_ver 0.21
+%define so_ver 0.21
+%define short_ver 0.21
 
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Summary(ja): マルチリンガルメッセージを生成するためのGNU ライブラリ/ユーティリティ
 Name: gettext
 Version: %{src_ver}
-Release: 2%{?_dist_release}
-License: GPLv3 and LGPLv2+
-Group: Development/Tools
-Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
+Release: 1%{?_dist_release}
+Group: programming
+Packager: daisuke
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPLv3+ and LGPLv2+ and GFDL
+Source: https://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
 URL: http://www.gnu.org/software/gettext/
 Source2: msghack.py
 Source3: msghack.1
 
 Patch1: gettext-msgmerge-for-msgfmt.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
 BuildRequires: libtool, bison, gcc-c++
-BuildRequires: expat-devel
-BuildRequires: libacl-devel, libcroco-devel
+# following suggested by DEPENDENCIES:
+BuildRequires: ncurses-devel
+BuildRequires: libxml2-devel
+BuildRequires: glib2-devel
+BuildRequires: libacl-devel
+BuildRequires: libunistring-devel
+# ensure 'ARCHIVE_FORMAT=dirxz'
+BuildRequires: xz
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-
-Packager: daisuke
-Vendor: Project Vine
-Distribution: Vine Linux
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -52,17 +59,22 @@ GNU gettext パッケージはプログラム中でマルチリンガルメッ
 と自然言語のカタログを生成, 使用, 修正するツールと, 国際化プログラム
 のための強力かつシンプルな方法を提供します.
 
+
 %package devel
 Summary: Development files for gettext
 Summary(ja): gettext 用開発ファイル
-Group: Development/Libraries
-License: LGPLv2+
+Group: programming
+# autopoint is GPLv3+
+# libasprintf is LGPLv2+
+# libgettextpo is GPLv3+
+License: LGPLv2+ and GPLv3+ and GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
+Requires: xz
+Requires: diffutils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-
 %description devel
 This package contains all development related files necessary for
 developing or compiling applications/libraries that needs
@@ -78,9 +90,10 @@ want to add gettext support for your project.
 %package libs
 Summary: Libraries for gettext
 Summary(ja): gettext 用共有ライブラリ
-Group: System Environment/Libraries
-License: LGPLv2+
-
+Group: system
+# libasprintf is LGPLv2+
+# libgettextpo is GPLv3+
+License: LGPLv2+ and GPLv3+
 
 %description libs
 This package contains libraries used internationalization support.
@@ -91,16 +104,38 @@ This package contains libraries used internationalization support.
 
 %prep
 %setup -q
-%patch1 -p1
+
+# Defeat libtextstyle attempt to bundle libxml2.  The comments
+# indicate this is done because the libtextstyle authors do not want
+# applications using their code to suffer startup delays due to the
+# relocations.  This is not a sufficient reason for Fedora.
+sed -e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
+    -i libtextstyle/configure
 
 
 %build
 ## running autoreconf for automake-1.11.1
 autoreconf -fi
 [ -f  /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || :
+
+# libxml2-devel package has an extra "libxml2" path component.
+export CPPFLAGS="-I%{_includedir}/libxml2"
+# Side effect of unbundling libxml2 from libtextstyle.
+export LIBS="-lxml2"
+
 %configure --without-included-gettext --enable-nls \
-	--enable-shared --disable-static --with-pic=yes \
-	--disable-csharp --disable-java
+	--enable-shared --disable-static --disable-rpath \
+	--with-pic=yes \
+	--disable-csharp --disable-java \
+    --with-xz
+
+# Eliminate hardcoded rpaths; workaround libtool reordering -Wl,--as-needed
+# after all the libraries.
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|CC=.g..|& -Wl,--as-needed|' \
+    -i $(find . -name libtool)
+
 make %{?_smp_mflags}
 
 
@@ -223,6 +258,11 @@ fi
 
 
 %changelog
+* Sun Sep 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.21-1
+- new upstream release.
+- updated Source2 and 3 for python3.
+- dropped Patch1.
+
 * Tue Sep 17 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.20.1-2
 - moved libtextstyle.so.* to gettext-libs.
 

+ 90 - 33
r/rsync/rsync-vl.spec

@@ -1,31 +1,38 @@
+%bcond_with systemd
+
 Summary:     A program for synchronizing files over a network.
 Summary(ja): ネットワーク越しにファイルを同期させるプログラム
 Name: rsync
-Version: 3.1.3
-Release: 1%{_dist_release}
-Group: Applications/Internet
+Version: 3.2.3
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
+Group: network
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: GPLv3+
 URL: https://rsync.samba.org/
 Source:	https://download.samba.org/pub/rsync/src/rsync-%{version}.tar.gz
 Source1: https://download.samba.org/pub/rsync/src/rsync-patches-%{version}.tar.gz
-Source2: rsync.xinetd
-
-Patch0: ssh-6-option.diff
-Patch1: rsync-man.patch
-Patch2: rsync-noatime.patch
-Patch3: rsync-3.0.6-iconv-logging.patch
+Source2: rsyncd.socket
+Source3: rsyncd.service
+Source4: rsyncd.conf
+Source5: rsyncd.sysconfig
+Source6: rsyncd@.service
+Source100: rsync.xinetd
+
+#Added temporarily until new rebase
+Patch0: rsync-3.2.2-ssl-verify-hostname.patch
+#Added due to rhbz#1873975 - default-acls test fail on s390x due to libacl
+Patch1: rsync-3.2.2-runtests.patch
 
 # security fixes
 # none
 
-Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
 BuildRequires: libacl-devel libattr-devel popt-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+BuildRequires: lz4-devel openssl-devel libzstd-devel
+BuildRequires: acl attr
 
 %description
 Rsync uses a quick and reliable algorithm to very quickly bring
@@ -49,54 +56,104 @@ rsync は高速で信頼性の高いアルゴリズムを使い,遠隔ホス
 強力なミラープログラムが必要ならば rsync をインストールして下さい.
 
 
+%package daemon
+Summary: Service for anonymous access to rsync
+Group: servers
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires: xinetd
+%endif
+%description daemon
+Rsync can be used to offer read only access to anonymous clients. This
+package provides the anonymous rsync service.
+
+
 %prep
 %setup -q -b 1
 
-# backword compatibility fix patches
-patch -p1 -i patches/acls.diff
-patch -p1 -i patches/xattrs.diff
-
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
 
-%patch0 -p1 -b .ssh
-%patch1 -p1 -b .man
-%patch2 -p1 -b .noatime
-%patch3 -p1 -b .iconv
+%patch0 -p1 -b .verify-hostname
+%patch1 -p1 -b .runtests
 
 # security fixes
 # none
 
 %build
-autoreconf
-# %configure
-make reconfigure
+%configure --disable-xxhash
 make %{?_smp_mflags} CCOPTFLAGS="$RPM_OPT_FLAGS"
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
+
+install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/rsyncd.conf
+%if %{with systemd}
+install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.service
+install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.socket
+install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
+install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyncd
+%else
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/xinetd.d/rsync
+install -m 644 %{SOURCE100} $RPM_BUILD_ROOT/etc/xinetd.d/rsync
+%endif
+
+
+%check
+make check
+chmod -x support/*
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{with systemd}
+%post daemon
+%systemd_post rsyncd.service
+
+%preun daemon
+%systemd_preun rsyncd.service
+
+%postun daemon
+%systemd_postun_with_restart rsyncd.service
+%endif
+
+
 %files
 %defattr(-,root,root)
 %license COPYING
-%doc README tech_report.tex
-%doc NEWS OLDNEWS TODO
-/etc/xinetd.d/rsync
-%{_prefix}/bin/rsync
-%{_mandir}/man1/rsync.1*
+%doc README* tech_report.tex support/
+%doc NEWS* TODO
+%{_bindir}/%{name}
+%{_bindir}/%{name}-ssl
+%config(noreplace) %{_sysconfdir}/rsyncd.conf
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}-ssl.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
+%files daemon
+%if %{with systemd}
+%{_unitdir}/rsyncd.socket
+%{_unitdir}/rsyncd.service
+%{_unitdir}/rsyncd@.service
+%config(noreplace) %{_sysconfdir}/sysconfig/rsyncd
+%else
+%config(noreplace) /etc/xinetd.d/rsync
+%endif
+
 
 %changelog
+* Fri Sep 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.3-1
+- updated to 3.2.3.
+- re-impoerted all patches from rawhide.
+- added systemd support (disabled as default).
+
 * Wed Oct 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.3-1
 - updated to 3.1.2.
 - imported Patch1-3 from rawhide.

+ 17 - 21
s/squid/squid-vl.spec

@@ -2,7 +2,7 @@
 
 %define         base_name       squid
 %define         pkg_epoch       7
-%define         pkg_version     4.12
+%define         pkg_version     4.13
 %define         pkg_release     1%{?_dist_release}%{?with_systemd:.systemd}
 %define         uid             23
 %define         gid             23
@@ -15,7 +15,7 @@ Name:           %{base_name}
 Epoch:          %{pkg_epoch}
 Version:        %{pkg_version}
 Release:        %{pkg_release}
-Group:          Applications/Services
+Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -80,6 +80,7 @@ Squid は、メインのサーバプログラム squid と、 Domain Name System
 %prep
 %autosetup -p1
 
+
 %build
 TIRPC_CFLAGS=$(pkg-config --cflags libtirpc)
 TIRPC_LIBS=$(pkg-config --libs libtirpc)
@@ -140,6 +141,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
     %{?_smp_mflags} \
     DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{base_name}"
 
+
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
 
@@ -187,9 +189,11 @@ mv -f ChangeLog.tmp ChangeLog
 # remove unpackaged files from the buildroot
 rm -f ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp
 
+
 %clean
 [ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
 
+
 %pretrans
 for l in zh-cn zh-tw; do
   if [ -d /usr/share/squid/errors/$l -a ! -L /usr/share/squid/errors/$l ]; then
@@ -225,7 +229,6 @@ if ! /sbin/chkconfig %{base_name}; then
 fi
 %endif
 
-
 %preun
 %if %{with systemd}
 %systemd_preun %{name}.service
@@ -250,29 +253,18 @@ fi
 /usr/sbin/usermod -a -G wbpriv %{base_name} >/dev/null 2>&1 || \
     chgrp %{base_name} %{_localstatedir}/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
+
 %files
 %defattr(-,root,root,-)
-
 # Directory
 %dir %{_sysconfdir}/%{base_name}/
 %dir %{_libdir}/%{base_name}
 %dir %{_datadir}/%{base_name}
-
 %attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/log/%{base_name}
 %attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/cache/%{base_name}
-
 # Program Files
 %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_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_*
@@ -286,28 +278,29 @@ fi
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/storeid_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
-
 # Config Files
+%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(0640,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
 %attr(0644,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/cachemgr.conf
 %config(noreplace) %{_sysconfdir}/%{base_name}/mime.conf
 %config(noreplace) %{_sysconfdir}/%{base_name}/errorpage.css
-
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{base_name}.conf
-
 %config(noreplace) %{_sysconfdir}/sysconfig/%{base_name}
 %config(noreplace) %{_sysconfdir}/pam.d/%{base_name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{base_name}
-
 # Sample Config Files
 %config %{_sysconfdir}/%{base_name}/%{base_name}.conf.default
 %config %{_sysconfdir}/%{base_name}/cachemgr.conf.default
 %config %{_sysconfdir}/%{base_name}/mime.conf.default
 %config %{_sysconfdir}/%{base_name}/errorpage.css.default
-
 # Data Files
 %{_datadir}/%{base_name}/*
-
 # Document Files
 %license COPYING
 %doc README ChangeLog QUICKSTART
@@ -318,6 +311,9 @@ fi
 
 
 %changelog
+* Fri Sep 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13-1
+- new upstream release.
+
 * Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12-1
 - new upstream release.