Browse Source

updated 6 packages

glibc-2.33-2

openssh-8.5p1-1

redis-6.2.1-1

rpm-4.16.1.2-2

thunderbird-78.8.1-1

vine-rpm-macros-5-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
a17952732e

+ 29 - 17
g/glibc/glibc-vl.spec

@@ -30,11 +30,18 @@
 # Remove -s to get verbose output.
 %define silentrules PARALLELMFLAGS=-s
 
+# We need to run ldconfig manually because __brp_ldconfig assumes that
+# glibc itself is always installed in $RPM_BUILD_ROOT, but with sysroots
+# we may be installed into a subdirectory of that path.  Therefore we
+# unset __brp_ldconfig and run ldconfig by hand with the sysroots path
+# passed to -r.
+%undefine __brp_ldconfig
+
 Summary: The GNU libc libraries
 Summary(ja): GNU libc ライブラリ
 Name: glibc
 Version: %{glibcversion}
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -60,7 +67,7 @@ Source11: SUPPORTED
 Source1000: rpm-old-changelog.txt
 
 # patched form upstream
-Patch0: glibc-2.33-20210209.patch
+Patch0: glibc-2.33-20210308.patch
 
 # patches from Fedora
 #Patch1: glibc-post_upgrade.patch
@@ -319,8 +326,7 @@ Provides: %{name}-headers(%{_target_cpu})
 %ifarch x86_64
 # If both -m32 and -m64 is to be supported on AMD64, x86_64 glibc-headers
 # have to be installed, not i586 ones.
-Obsoletes: %{name}-headers(i586)
-Obsoletes: %{name}-headers(i686)
+Obsoletes: %{name}-headers < %{version}-%{release}
 %endif
 Requires(pre): kernel-headers
 Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release}
@@ -1512,6 +1518,20 @@ popd
 %endif # %{run_glibc_tests}
 
 
+######################################################################
+# File triggers to do ldconfig calls automatically (see rhbz#1380878)
+######################################################################
+
+# File triggers for when libraries are added or removed in standard
+# paths.
+%transfiletriggerin common -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
+/sbin/ldconfig
+%end
+
+%transfiletriggerpostun common -P 2000000 -- /lib /usr/lib /lib64 /usr/lib64
+/sbin/ldconfig
+%end
+
 %pre -p <lua>
 -- Check that the running kernel is new enough
 required = '%{enablekernel}'
@@ -1656,11 +1676,6 @@ else
   io.stdout:write ("Error: Missing " .. iconv_cache .. " file.\n")
 end
 
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
 %triggerin common -p <lua> -- glibc
 if posix.stat("%{_prefix}/lib/locale/locale-archive.tmpl", "size") > 0 then
   pid = posix.fork()
@@ -1778,10 +1793,6 @@ if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
-%post utils -p /sbin/ldconfig
-
-%postun utils -p /sbin/ldconfig
-
 %pre -n nscd
 getent group nscd >/dev/null || /usr/sbin/groupadd -g 28 -r nscd
 getent passwd nscd >/dev/null ||
@@ -1817,15 +1828,12 @@ if [ "$1" -ge "1" ]; then
 fi
 %endif
 
-%if %{xenpackage}
-%post xen -p /sbin/ldconfig
-%postun xen -p /sbin/ldconfig
-%endif
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 rm -f *.filelist*
 
+
 %files -f glibc.filelist
 %defattr(-,root,root)
 /sbin/ldconfig
@@ -1940,6 +1948,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.33-2
+- updated Patch0.
+- added filetriggers.
+
 * Tue Feb 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.33-1
 - updated to 2.33.
 - updated Patch0.

+ 20 - 11
o/openssh/openssh-vl.spec

@@ -56,7 +56,7 @@
 Summary: The OpenSSH implementation of SSH.
 Summary(ja): OpenSSH - フリーの Secure Shell (SSH) の実装
 Name: openssh
-Version: 8.4p1
+Version: 8.5p1
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: network
 Vendor: Project Vine
@@ -280,23 +280,26 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
 %endif
 %if %{pie}
 %ifarch s390 s390x sparc sparc64
-CFLAGS="$CFLAGS -fPIE"
+CFLAGS="$CFLAGS -fPIC"
 %else
-CFLAGS="$CFLAGS -fpie"
+CFLAGS="$CFLAGS -fpic"
 %endif
+SAVE_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS -pie -z relro -z now"; export LDFLAGS
 export CFLAGS
-LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
+export LDFLAGS
 %endif
 
 %configure \
 	--sysconfdir=%{_sysconfdir}/ssh \
 	--libexecdir=%{_libexecdir}/openssh \
 	--datadir=%{_datadir}/openssh \
-	--with-tcp-wrappers \
 	--with-default-path=/usr/local/bin:/bin:/usr/bin \
-	--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
-        --with-privsep-path=%{_var}/empty/sshd \
-        --enable-vendor-patchlevel="VL-%{version}-%{release}" \
+	--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin 	--with-privsep-path=%{_var}/empty/sshd \
+	--disable-strip \
+	--with-ipaddr-display \
+	--with-pie=no \
+	--enable-vendor-patchlevel="VL-%{version}-%{release}" \
 	--with-libedit \
 	--with-xauth=/usr/bin/xauth \
 %if %{scard}
@@ -319,12 +322,12 @@ LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
 perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
 %endif
 
-make
+%make_build
 
 %if %{gtk3}
 	gtk3=yes
 %else
-        gtk3=no
+	gtk3=no
 %endif
 
 %if ! %{no_gnome_askpass}
@@ -339,6 +342,7 @@ fi
 popd
 %endif
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh
@@ -446,7 +450,9 @@ getent group ssh_keys >/dev/null || groupadd -r ssh_keys || :
 %systemd_postun_with_restart sshd.service
 %else
 # /sbin/service sshd condrestart > /dev/null 2>&1 || :
-/sbin/service sshd condrestart
+if [ "$1" -gt 0 ]; then
+	/sbin/service sshd condrestart
+fi
 exit 0
 %endif
 
@@ -544,6 +550,9 @@ fi
 
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.5p1-1
+- new upstream release.
+
 * Wed Oct 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.4p1-1
 - new upstream release.
 - updated Patch0.

+ 11 - 8
r/redis/redis-vl.spec

@@ -6,7 +6,7 @@
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
 #global doc_commit 4f1da37c03daa943f2cf3cd5fda8dbd1bf1f22d7
-%global doc_commit 0ee00bbc97dda36d09a2559f20dafd236d5426a2
+%global doc_commit 64a0d67c3a69052b551d149b17870dc5ebf82f35
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{rpmmacrodir} not usable on EL-6
@@ -18,7 +18,7 @@
 %endif
 
 Name:             redis
-Version:          6.0.9
+Version:          6.2.1
 Release:          1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:          A persistent in-memory key-value database
 Summary(ja):      永続化可能なキー・バリュー型インメモリデータベース
@@ -49,10 +49,9 @@ Source10:         https://github.com/redis/%{name}-doc/archive/%{doc_commit}/%{n
 # Update configuration for Fedora
 # https://github.com/antirez/redis/pull/3491 - man pages
 Patch0001:         0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
-# https://github.com/antirez/redis/pull/3494 - symlink
-Patch0002:         0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
 
 BuildRoot:	  %{_tmppath}/%{name}-%{version}-root
+BuildRequires:    jemalloc-devel
 %if %{?with_perftools}
 BuildRequires:    gperftools-devel
 %endif
@@ -118,7 +117,6 @@ administration and development.
 %setup -q
 mv ../%{name}-doc-%{doc_commit} doc
 %patch0001 -p1
-%patch0002 -p1
 
 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/hiredis/COPYING  COPYING-hiredis
@@ -146,8 +144,6 @@ fi
 %build
 make %{?_smp_mflags} %{make_flags} all
 
-%check
-# make test
 
 %install
 make %{make_flags} install
@@ -182,7 +178,6 @@ install -pm755 %{S:5} %{buildroot}%{_initdir}/%{name}
 install -pm755 %{S:8} %{buildroot}%{_initdir}/%{name}-limit
 %endif
 
-
 # Fix non-standard-executable-perm error.
 chmod 755 %{buildroot}%{_bindir}/%{name}-*
 
@@ -215,6 +210,10 @@ mkdir -p %{buildroot}%{macrosdir}
 install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name}
 
 
+%check
+# make test
+
+
 %post
 %if %{with systemd}
 %systemd_post %{name}.service
@@ -305,6 +304,10 @@ fi
 
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.2.1-1
+- new upstream release.
+- dropped Patch0002: fixed in upstream.
+
 * Sat Dec 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0.9-1
 - new upstream release.
 

+ 9 - 11
r/rpm/rpm-vl.spec

@@ -52,7 +52,7 @@ Summary(ja): RPM パッケージ管理システム
 Name: rpm
 Version: 4.16.1.2
 %define rpm_version %{version}
-Release: 1%{_dist_release}%{?with_systemd:.systemd}
+Release: 2%{_dist_release}%{?with_systemd:.systemd}
 Group: admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -353,6 +353,7 @@ install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}/etc/logrotate.d/rpm
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 mkdir -p $RPM_BUILD_ROOT%{rpmhome}/macros.d
+mkdir -p $RPM_BUILD_ROOT%{rpmhome}/vine
 mkdir -p $RPM_BUILD_ROOT/var/lib/rpm
 
 # init an empty database for %ghost'ing for all supported backends
@@ -467,27 +468,17 @@ fi
 exit 0
 
 %post
-/sbin/ldconfig
 # Establish correct rpmdb (db5) ownership.
 /bin/chown rpm.rpm /var/lib/rpm/[A-Z]* >/dev/null 2>&1 ||:
 exit 0
 
 %postun
-/sbin/ldconfig
 if [ $1 = 0 ]; then
     /usr/sbin/userdel rpm
     /usr/sbin/groupdel rpm
 fi
 exit 0
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
-
-%if %{with_python_subpackage}
-%post -n python3-rpm -p /sbin/ldconfig
-%postun -n python3-rpm -p /sbin/ldconfig
-%endif
-
 %define	rpmattr		%attr(0755, rpm, rpm)
 %define	rpmdbattr	%attr(0644, rpm, rpm) %verify(not md5 size mtime) %ghost %config(missingok,noreplace)
 
@@ -510,6 +501,9 @@ exit 0
 %rpmdbattr	/var/lib/rpm/*
 %rpmdbattr	/var/lib/rpm/.*.lock
 
+%dir %{rpmhome}/macros.d
+%dir %{rpmhome}/vine
+
 %rpmattr	/bin/rpm
 %{__bindir}/rpm
 %rpmattr	%{__bindir}/rpm2archive
@@ -607,6 +601,10 @@ exit 0
 
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.16.1.2-2
+- added missing directories.
+- dropped ldconfig scriptlets.
+
 * Sun Feb 21 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.16.1.2-1
 - updated to 4.16.1.2.
 - updated patches from fedora.

+ 5 - 19
t/thunderbird/thunderbird-vl.spec

@@ -28,7 +28,7 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	78.8.0
+Version:	78.8.1
 Release:	1%{?_dist_release}
 Group:		internet,communication
 Vendor:		Project Vine
@@ -412,24 +412,6 @@ install -m644 %{SOURCE1030} $RPM_BUILD_ROOT%{_datadir}/metainfo/mozilla-thunderb
 
 #===============================================================================
 
-%post
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-
-%postun
-update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 -a -x %{_bindir}/gtk-update-icon-cache ]; then
-  touch --no-create %{_datadir}/icons/hicolor
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%posttrans
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-#===============================================================================
-
 %files
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
@@ -450,6 +432,10 @@ fi
 #===============================================================================
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.8.1-1
+- new upstream release.
+- dropped scriptlets.
+
 * Fri Feb 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.8.0-1
 - new upstream release.
 

+ 9 - 5
v/vine-rpm-macros/vine-rpm-macros-vl.spec

@@ -1,14 +1,15 @@
 Summary:        rpm macros for Vine Linux
 Summary(ja):    Vine Linux用rpmマクロ
 Name:           vine-rpm-macros
-Version:        4
+Version:        5
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPL2
-Source0:        macros.vine
+Source0:        rpmrc
+Source1:        macros.vine
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
@@ -48,9 +49,8 @@ This package contains rpm macros to build packages for Vine Linux.
 
 %install
 %{__rm} -rf %{buildroot}
-install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
-#install -Dpm644 %{SOURCE1} %{buildroot}%{_fileattrsdir}/metainfo.attr
-#install -Dpm755 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/metainfo.prov
+install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/vine/rpmrc
+install -Dpm644 %{SOURCE1} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
 
 
 %clean
@@ -59,6 +59,7 @@ install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
 
 %files
 %defattr(-,root,root)
+/usr/lib/rpm/vine/*
 /usr/lib/rpm/macros.d/*
 
 %files -n vine-rpm-build-macros
@@ -68,6 +69,9 @@ install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
 
 
 %changelog
+* Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5-1
+- imported some macros from redhat-rpm-config.
+
 * Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4-1
 - imported some macros from redhat-rpm-config.