updated 3 packages

git-2.26.1-1

jwhois-4.0-8

uw-imap-2007f-4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12385 ec354946-7b23-47d6-9f5a-488ba84defc7

g/git/git-vl.spec

@@ -4,28 +4,34 @@
 %define emacsen_pkgdir /usr/lib/emacsen-common/packages
 
 # Pass --without docs to rpmbuild if you don't want the documentation
-Name:    git
+Name:           git
-Version: 2.24.1
+Version:        2.26.1
-Release: 1%{?_dist_release}
+Release:        1%{?_dist_release}
-Summary: Core git tools
+Summary:        Core git tools
-Summary(ja): Core git ツール
+Summary(ja):    Core git ツール
-License:  GPLv2
+Group:          Development/Tools
-Group:    Development/Tools
+Vendor:         Project Vine
-URL:      http://git-scm.com/
+Distribution:   Vine Linux
-Source0:  https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
+Packager:       iwaim
-Source1:  vine-default-git.el
+
-Source2:  git.xinetd
+License:        GPLv2
-Source3:  git.conf.httpd
+URL:            http://git-scm.com/
-Source4:  gitweb.conf.in
+Source0:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
-Source10: %{name}-install.sh
+Source1:        vine-default-git.el
-Source11: %{name}-remove.sh
+Source2:        git.xinetd
-Source12: git-init.el
+Source3:        git.conf.httpd
-Patch0:   git-1.5-gitweb-home-link.patch
+Source4:        gitweb.conf.in
-Patch1000: git-curl-disable-http2.patch
+Source10:       %{name}-install.sh
+Source11:       %{name}-remove.sh
+Source12:       git-init.el
+Patch0:         git-1.5-gitweb-home-link.patch
+Patch1000:      git-curl-disable-http2.patch
 	
 # Security
 # none
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel
 BuildRequires:  expat-devel, gettext, asciidoc
 BuildRequires:  pcre-devel
@@ -34,17 +40,11 @@ BuildRequires:  xmlto
 # git-credential-gnome-keyring
 BuildRequires:  glib2-devel libgnome-keyring-devel
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Requires:	perl-Git = %{version}-%{release}
 Requires:	zlib
 Provides:	git-core = %{version}-%{release}
 Obsoletes:	git-core <= 1.5.4.3
 
-Vendor: 	Project Vine
-Distribution: 	Vine Linux
-Packager: 	iwaim
-
 %description
 Git is a fast, scalable, distributed revision control system with an
 unusually rich command set that provides both high-level operations
@@ -450,6 +450,9 @@ fi
 # No files for you!
 
 %changelog
+* Mon Apr 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.26.1-1
+- updated to 2.26.1.
+
 * Mon Dec 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.24.1-1
 - updated to 2.24.1.
 

j/jwhois/jwhois-vl.spec

@@ -2,22 +2,19 @@ Summary: Internet whois/nicname client.
 Summary(ja): whois クライアント
 Name: jwhois
 Version: 4.0
-Release: 7%{?_dist_release}
+Release: 8%{?_dist_release}
+Group: Applications/Internet
+Vendor: Project Vine
+Distribution: Vine Linux
 
 License: GPLv3
-Group: Applications/Internet
 URL: http://www.gnu.org/software/jwhois/
+Source: https://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
+Source1: https://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
 
-Source: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
+# newest jwhois.conf
-Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
+# https://github.com/robert-scheck/jwhois/blob/master/example/jwhois.conf
-
+Source10: https://raw.githubusercontent.com/robert-scheck/jwhois/2018b4f8f0799e6c55e4d11f0ab653f1801d85aa/example/jwhois.conf
-# newest jwhois.conf can be obtained from:
-# https://github.com/jodrell/jwhois/tree/master/example
-# revision: cdad436 (28 Jun 2014)
-Source10: jwhois.conf
-# # http://savannah.gnu.org/cgi-bin/viewcvs/jwhois/jwhois/example/jwhois.conf
-# # revision: 1.143
-# Source10: jwhois-r1.143.conf
 
 Patch0: jwhois-4.0-connect.patch
 Patch1: jwhois-4.0-ipv6match.patch
@@ -28,7 +25,10 @@ Patch5: jwhois-4.0-multi-homed.patch
 Patch6: jwhois-4.0-libidn2.patch
 Patch7: jwhois-4.0-idna.patch
 Patch8: jwhois-4.0-idnfail.patch
-Patch9: jwhois-4.0-conf-update-newgTLD.patch
+# Patch9: adds options to force querying on ipv4 or ipv6, see rhbz#1551215
+Patch9: jwhois-4.0-ipv4_ipv6.patch
+
+Patch1000: jwhois-4.0-conf-update-newgTLD.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libidn-devel
@@ -36,9 +36,6 @@ Obsoletes: fwhois, whois
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 A whois client that accepts both traditional and finger-style queries.
 
@@ -56,17 +53,21 @@ A whois client that accepts both traditional and finger-style queries.
 %patch6 -p1 -b .libidn2
 %patch7 -p1 -b .idna
 %patch8 -p1 -b .idnfail
+%patch9 -p1 -b .ipv4_ipv6
+
 # add several new gTLD
 # http://fukumoto-tech.serveblog.net/wiki/index.php?%BF%B7gTLD%A4%CEwhois%20%A5%B5%A1%BC%A5%D0%C5%D0%CF%BF%C6%E2%CD%C6%A4%CB%A4%C4%A4%A4%A4%C6
-%patch9 -b .conf-update-newgTLD
+%patch1000 -p1 -b .conf-update-newgTLD
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
 
+
 %build
 %configure --without-cache
 make %{?_smp_mflags}
 
+
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 %makeinstall
@@ -93,6 +94,7 @@ echo .so man1/jwhois.1 > $RPM_BUILD_ROOT/%{_mandir}/man1/whois.1
 %{_infodir}/jwhois.info.gz
 %config(noreplace) %{_sysconfdir}/jwhois.conf
 
+
 %post
 /sbin/install-info %{_infodir}/jwhois.info.gz %{_infodir}/dir
 
@@ -101,11 +103,18 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/jwhois.info.gz %{_infodir}/dir
 fi
 
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-8
+- updated Source10.
+- renumbered Patch9 to Patch1000.
+- updated Patch1000.
+- imported Patch9 from rawhide.
+
 * Sat Nov 12 2016 Toshiaki Ara <ara_t@384.jp> 4.0-7
 - update jwhois.conf from GitHub head
 - add several new gTLD

u/uw-imap/uw-imap-vl.spec

@@ -2,22 +2,22 @@
 # to the named subdirectory of the user's home directory
 %define mail_subdirectory      Mail
 
-Summary: UW Server daemons for IMAP and POP network mail protocols
+Summary:        UW Server daemons for IMAP and POP network mail protocols
-Summary(ja): IMAP/POP ネットワークメールプロトコル用デーモン
+Summary(ja):    IMAP/POP ネットワークメールプロトコル用デーモン
-Name:	 uw-imap 
+Name:           uw-imap 
-Version: 2007f
+Version:        2007f
-Release: 3%{?_dist_release}
+Release:        4%{?_dist_release}
+Group:          System Environment/Daemons
+Distribution:   Vine Linux
+Vendor:         Project Vine
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
-License: ASL 2.0
+License:        ASL 2.0
-Group: 	 System Environment/Daemons
+URL:            http://www.washington.edu/imap/
-URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.gz
+Source0:        ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Distribution: Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-Vendor: Project Vine
 
 %define soname    c-client
 %define somajor   2007 
@@ -27,11 +27,6 @@ Vendor: Project Vine
 # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
 %define sslcerts  %{expand:%(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)}
 
-# imap -> uw-imap rename
-Obsoletes: imap < 1:%{version}
-
-Source10: c-client.cf
-
 # new pam setup, using new "include" feature
 Source21: imap.pam
 # legacy/old pam setup, using pam_stack.so
@@ -46,9 +41,9 @@ Source35: pop3s-xinetd
 Patch1: imap-2007-paths.patch
 # See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271
 Patch2: imap-2004a-doc.patch
-Patch5: imap-2001a-overflow.patch
+Patch5: imap-2007e-overflow.patch
-Patch9: imap-2002e-shared.patch
+Patch9: imap-2007e-shared.patch
-Patch10: imap-2002e-authmd5.patch
+Patch10: imap-2007e-authmd5.patch
 Patch11: imap-2007e-system_c_client.patch
 Patch12: imap-2007f-format-security.patch
 Patch13: imap-2007e-poll.patch
@@ -60,12 +55,14 @@ Patch15: imap-2007f-ldflags.patch
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
 BuildRequires: krb5-devel
-
 # Prereq is shorter than separate Requires, Requires(post), Requires(postun)
 Requires(pre): xinetd
 Requires(post): openssl
 Requires: %{imap_libs} = %{version}-%{release}
 
+# imap -> uw-imap rename
+Obsoletes: imap < 1:%{version}
+
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
 Message Access Protocol) and POP (Post Office Protocol) mail access
@@ -124,11 +121,7 @@ This package contains some utilities for managing UW IMAP email,including:
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
 
-#if 0%{?fedora} > 4 || 0%{?rhel} > 4
 install -p -m644 %{SOURCE21} imap.pam
-#else
-#install -p -m644 %{SOURCE22} imap.pam
-#endif
 
 %patch12 -p1 -b .fmt-sec
 %patch13 -p1 -b .poll
@@ -290,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2007f-4
+- updated Patch5, 9 and 10.
+
 * Mon Nov 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2007f-3
 - imported Patch13-15 from rawhide.