svn commit: r511366 - head/security/fsh/files

[Kyle Evans]

Author: kevans (src committer)
Date: Fri Sep  6 21:20:25 2019
New Revision: 511366
URL: https://svnweb.freebsd.org/changeset/ports/511366

Log:
  security/fsh: Remove redundant escapes of ordinary characters
  
  Makefile.in has a number of escapes (all following @ in the sed expression)
  that only serve to stop a sed in the configure script from replacing them.
  Escaping ordinary characters is considered undefined behavior by POSIX, and
  the patch in bug #229925 aims to serve out errors for escaping of most
  ordinary characters to reduce friction when some of these sequences are
  given special meaning.
  
  QA:
   * portlint: OK (minor warnings that should be addressed separately)
   * testport: OK (poudriere: 13.0-CURRENT and 12.0-RELEASE, amd64)
   * diffoscope: OK (only minor metadata changes to package)
  
  PR:		240308
  Approved by:	koobs (ports)

Added:
  head/security/fsh/files/
  head/security/fsh/files/patch-Makefile.in   (contents, props changed)
  head/security/fsh/files/patch-configure   (contents, props changed)

Added: head/security/fsh/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/fsh/files/patch-Makefile.in	Fri Sep  6 21:20:25 2019	(r511366)
@@ -0,0 +1,71 @@
+--- Makefile.in.orig	2001-12-23 11:10:13 UTC
++++ Makefile.in
+@@ -40,7 +40,7 @@ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+ sbindir = @sbindir@
+-libexecdir = @libexecdir@
++libexecdir = @ac_libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+@@ -81,7 +81,7 @@ EXEEXT = @EXEEXT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+-PYTHON = @PYTHON@
++PYTHON = @PYTHON_CMD@
+ VERSION = @VERSION@
+ am__include = @am__include@
+ am__quote = @am__quote@
+@@ -576,16 +576,16 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
+ 
+ starter: Makefile $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE)
+ 	rm -f $@ $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE) > $@.tmp
+ 	mv $@.tmp $@
+ 
+ fsh: fsh.in Makefile starter
+ 	rm -f $@ $@.tmp
+ 	cat starter > $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/fsh.in >> $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
+@@ -593,8 +593,8 @@ fsh: fsh.in Makefile starter
+ fshd: fshd.in Makefile starter
+ 	rm -f $@ $@.tmp
+ 	cat starter > $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/fshd.in >> $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
+@@ -602,15 +602,15 @@ fshd: fshd.in Makefile starter
+ in.fshd: in.fshd.in Makefile starter
+ 	rm -f $@ $@.tmp
+ 	cat starter > $@.tmp
+-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
+-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
++	sed -e 's%@PYTHON@%$(PYTHON)%' \
++	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
+ 	    < $(srcdir)/in.fshd.in >> $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@
+ 
+ fcp: fcp.sh Makefile
+ 	rm -f $@ $@.tmp
+-	sed -e 's%@\libexecdir@%$(libexecdir)%g' \
++	sed -e 's%@libexecdir@%$(libexecdir)%g' \
+ 	    < $(srcdir)/fcp.sh > $@.tmp
+ 	chmod +x $@.tmp
+ 	mv $@.tmp $@

Added: head/security/fsh/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/fsh/files/patch-configure	Fri Sep  6 21:20:25 2019	(r511366)
@@ -0,0 +1,20 @@
+--- configure.orig	2001-12-23 11:10:13 UTC
++++ configure
+@@ -2732,7 +2732,7 @@ s, at prefix@,$prefix,;t t
+ s, at program_transform_name@,$program_transform_name,;t t
+ s, at bindir@,$bindir,;t t
+ s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
++s, at ac_libexecdir@,$libexecdir,;t t
+ s, at datadir@,$datadir,;t t
+ s, at sysconfdir@,$sysconfdir,;t t
+ s, at sharedstatedir@,$sharedstatedir,;t t
+@@ -2778,7 +2778,7 @@ s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+ s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+ s, at DEPDIR@,$DEPDIR,;t t
+ s, at DEFAULT_FSHD_TIMEOUT@,$DEFAULT_FSHD_TIMEOUT,;t t
+-s, at PYTHON@,$PYTHON,;t t
++s, at PYTHON_CMD@,$PYTHON,;t t
+ s, at PYTHON_SCRIPT_TEMPLATE@,$PYTHON_SCRIPT_TEMPLATE,;t t
+ s, at CC@,$CC,;t t
+ s, at CFLAGS@,$CFLAGS,;t t