libnsl: bump dependent package versions

tcp_wrappers & vsftpd depend on libnsl. These need to be bumped after upgrading lbnsl major version. Change-Id: Ia595c99b9f467842086698e900d8aba67ed15452 Signed-off-by: Shreenidhi Shedi <[email protected]> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/16521 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Tapas Kundu <[email protected]>
shatur93 · May 31, 2022 · 60d8f41 · 60d8f41
1 parent 31cadb6
commit 60d8f41
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 37 deletions.
diff --git a/SPECS/libnsl/libnsl.spec b/SPECS/libnsl/libnsl.spec
@@ -2,15 +2,18 @@ Summary:        Libraries for the public client interface for NIS(YP) and NIS+.
 Name:           libnsl
 Version:        2.0.0
 Release:        1%{?dist}
-Source0:        https://github.com/thkukuk/libnsl/archive/v%{version}/libnsl-%{version}.tar.gz
-%define sha512  libnsl=86a7738707a3e4e56b60c8de0445fb576e66148bc12fa2a6aab422ea81eb4b42be3287a12f78384acd2b8bfb3885e9a0ce4f7328f078da3a5099acb66a35a935
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            https://github.com/thkukuk/libnsl
 Vendor:         VMware, Inc.
 Distribution:   Photon
+
+Source0:        https://github.com/thkukuk/libnsl/archive/v%{version}/libnsl-%{version}.tar.gz
+%define sha512  %{name}=86a7738707a3e4e56b60c8de0445fb576e66148bc12fa2a6aab422ea81eb4b42be3287a12f78384acd2b8bfb3885e9a0ce4f7328f078da3a5099acb66a35a935
+
 Requires:       libtirpc
 Requires:       rpcsvc-proto
+
 BuildRequires:  libtirpc-devel
 BuildRequires:  rpcsvc-proto-devel
 
@@ -29,7 +32,7 @@ Requires:       rpcsvc-proto-devel
 This package includes header files and libraries necessary for developing programs which use the nsl library.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 autoreconf -fi
@@ -39,11 +42,8 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %{_libdir}/*.so

diff --git a/SPECS/tcp_wrappers/tcp_wrappers.spec b/SPECS/tcp_wrappers/tcp_wrappers.spec
@@ -1,48 +1,54 @@
-Summary:	TCP/IP daemon wrapper package
-Name:		tcp_wrappers
-Version:	7.6
-Release:	7%{?dist}
-License: 	BSD
-Group: 		System Environment/Networking
-Vendor:		VMware, Inc.
-Distribution: 	Photon
-URL: 		ftp://ftp.porcupine.org/pub/security/index.html
-Source0: 	ftp://ftp.porcupine.org/pub/security/%{name}_%{version}.tar.gz
-%define sha1 tcp_wrappers=61689ec85b80f4ca0560aef3473eccd9e9e80481
-Patch0:		http://www.linuxfromscratch.org/patches/blfs/6.3/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
+Summary:    TCP/IP daemon wrapper package
+Name:       tcp_wrappers
+Version:    7.6
+Release:    8%{?dist}
+License:    BSD
+Group:      System Environment/Networking
+Vendor:     VMware, Inc.
+Distribution:   Photon
+URL:            http://ftp.porcupine.org/pub/security/index.html
+
+Source0:    http://ftp.porcupine.org/pub/security/%{name}_%{version}.tar.gz
+%define sha512 %{name}=2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
+
+# Patch0 is taken from:
+# http://www.linuxfromscratch.org/patches/blfs/6.3/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
+Patch0: %{name}-%{version}-shared_lib_plus_plus-1.patch
+
 Requires:       finger
-BuildRequires:  libnsl-devel
 Requires:       libnsl
 
+BuildRequires:  libnsl-devel
+
 %description
 The TCP Wrapper package provides daemon wrapper programs that report the name of the client requesting network services and the requested service.
 
 %package devel
-Summary:	The libraries and header files needed for tcp_wrappers development.
-Requires: 	%{name} = %{version}-%{release}
-Requires:	libnsl-devel
+Summary:    The libraries and header files needed for tcp_wrappers development.
+Requires:   %{name} = %{version}-%{release}
+Requires:   libnsl-devel
 
 %description devel
 The libraries and header files needed for tcp_wrappers development.
 
 %prep
-%setup -qn %{name}_%{version}
-%patch0 -p1
+%autosetup -p1 -n %{name}_%{version}
 
 %build
 sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c
 sed -i 's/-O2/-O2 -DUSE_GETDOMAIN/g' Makefile
-make REAL_DAEMON_DIR=%{_sbindir} STYLE=-DPROCESS_OPTIONS CC=%{_host}-gcc linux
+make REAL_DAEMON_DIR=%{_sbindir} STYLE=-DPROCESS_OPTIONS CC=%{_host}-gcc linux %{?_smp_mflags}
 
 %install
-mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_mandir}/man{3,5,8}
-mkdir -p %{buildroot}%{_includedir}
-make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_libdir} \
+         %{buildroot}%{_sbindir} \
+         %{buildroot}%{_mandir}/man{3,5,8} \
+         %{buildroot}%{_includedir}
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -59,6 +65,8 @@ make DESTDIR=%{buildroot} install
 %{_includedir}/*.h
 
 %changelog
+* Sun May 29 2022 Shreenidhi Shedi <[email protected]> 7.6-8
+- Bump version as a part of libnsl upgrade
 * Tue Aug 25 2020 Keerthana K <[email protected]> 7.6-7
 - Added HAVE_STRERROR CFLAGS for linux target in Makefile
 - to build with glibc v2.32 since sys_errlist and sys_nerr are deprecated.
@@ -74,4 +82,3 @@ make DESTDIR=%{buildroot} install
 - GA - Bump release of all rpms
 * Fri Aug 28 2015 Divya Thaluru <[email protected]> 7.6-1
 - Initial version
-
diff --git a/SPECS/vsftpd/vsftpd.spec b/SPECS/vsftpd/vsftpd.spec
@@ -1,15 +1,15 @@
 Summary:        Very secure and very small FTP daemon.
 Name:           vsftpd
 Version:        3.0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2 with exceptions
 URL:            https://security.appspot.com/vsftpd.html
 Group:          System Environment/Daemons
 Vendor:         VMware, Inc.
 Distribution:   Photon
 
 Source0:        https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
-%define sha1    %{name}=0159531cc9f9fc6dd64cd734e2fd42601e44b5d9
+%define sha512  %{name}=9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
 
 Patch0: add-debug-symbols-to-build.patch
 Patch1: fix-libssl-link.patch
@@ -100,6 +100,8 @@ fi
 %{_datadir}/*
 
 %changelog
+* Sun May 29 2022 Shreenidhi Shedi <[email protected]> 3.0.5-3
+- Bump version as a part of libnsl upgrade
 * Wed Apr 06 2022 Shreenidhi Shedi <[email protected]> 3.0.5-2
 - Fix spec issues
 * Fri Feb 11 2022 Shreenidhi Shedi <[email protected]> 3.0.5-1