Socat now installs as socat1, with symlink socat

This commit is contained in:
Gerhard Rieger 2023-10-26 18:44:10 +02:00
parent d10dd8a03e
commit 1861303728
3 changed files with 21 additions and 4 deletions

View file

@ -50,6 +50,9 @@ Features:
Red Hat issue 1853102 related. Red Hat issue 1853102 related.
Thanks to Jonathan Casiot for sending an initial patch. Thanks to Jonathan Casiot for sending an initial patch.
Socat now installs as socat1 and is referenced by symbolic link socat,
same with man page (socat1.1 by socat.1)
Corrections: Corrections:
When a sub process (EXEC, SYSTEM) terminated with exit code other than When a sub process (EXEC, SYSTEM) terminated with exit code other than
0, its last sent data might have been lost depending on timing of read/ 0, its last sent data might have been lost depending on timing of read/

View file

@ -124,17 +124,21 @@ strip: progs
install: progs $(srcdir)/doc/socat.1 install: progs $(srcdir)/doc/socat.1
mkdir -p $(DESTDIR)$(BINDEST) mkdir -p $(DESTDIR)$(BINDEST)
$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1
ln -s socat1 $(DESTDIR)$(BINDEST)/socat
$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
mkdir -p $(DESTDIR)$(MANDEST)/man1 mkdir -p $(DESTDIR)$(MANDEST)/man1
$(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/ $(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/socat1.1
ln -s socat1.1 $(DESTDIR)$(MANDEST)/man1/socat.1
uninstall: uninstall:
rm -f $(DESTDIR)$(BINDEST)/socat rm -f $(DESTDIR)$(BINDEST)/socat
rm -f $(DESTDIR)$(BINDEST)/socat1
rm -f $(DESTDIR)$(BINDEST)/procan rm -f $(DESTDIR)$(BINDEST)/procan
rm -f $(DESTDIR)$(BINDEST)/filan rm -f $(DESTDIR)$(BINDEST)/filan
rm -f $(DESTDIR)$(MANDEST)/man1/socat.1 rm -f $(DESTDIR)$(MANDEST)/man1/socat.1
rm -f $(DESTDIR)$(MANDEST)/man1/socat1.1
# make a GNU-zipped tar ball of the source files # make a GNU-zipped tar ball of the source files
dist: socat.tar.gz socat.tar.bz2 dist: socat.tar.gz socat.tar.bz2

View file

@ -38,6 +38,8 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_bindir}/socat $RPM_BUILD_ROOT%{_bindir}/socat1
mv $RPM_BUILD_ROOT%{_mandir}/man1/socat.1 $RPM_BUILD_ROOT%{_mandir}/man1/socat1.1
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -46,7 +48,15 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%doc README CHANGES EXAMPLES SECURITY doc/socat.html FAQ BUGREPORTS %doc README CHANGES EXAMPLES SECURITY doc/socat.html FAQ BUGREPORTS
%doc COPYING COPYING.OpenSSL FILES PORTING DEVELOPMENT %doc COPYING COPYING.OpenSSL FILES PORTING DEVELOPMENT
%{_bindir}/socat %{_bindir}/socat1
%{_bindir}/procan %{_bindir}/procan
%{_bindir}/filan %{_bindir}/filan
%{_mandir}/man1/socat.1* %{_mandir}/man1/socat1.1
%post
ln -s -f socat1 %{_binddir}/socat
ln -s -f socat1.1 %{_mandir}/man1/socat.1
%postun
rm -f %{_bindir}/socat
rm -f %{_mandir}/man1/socat.1