[Libguestfs] [p2v PATCH v2] Use URL to point to GNU licenses
Pino Toscano
ptoscano at redhat.com
Wed Sep 18 14:18:18 UTC 2019
Adjust almost all the license headers to point to the GNU website
instead of the FSF postal address.
3rd party code copies are unchanged.
Spotted by Rpmlint.
---
v1 is:
https://www.redhat.com/archives/libguestfs/2019-September/msg00079.html
Makefile.am | 3 +--
autogen.sh | 3 +--
bash/Makefile.am | 3 +--
bash/test-complete-in-script.sh | 3 +--
bash/virt-p2v-make-disk | 3 +--
configure.ac | 3 +--
contrib/aux-scripts/do-build.sh | 3 +--
contrib/build-p2v-iso.sh | 3 +--
contrib/test-p2v-iso.sh | 3 +--
conversion.c | 3 +--
cpuid.c | 3 +--
docs/Makefile.am | 3 +--
generate-p2v-authors.pl | 3 +--
generate-p2v-config.pl | 3 +--
gui-gtk2-compat.h | 3 +--
gui-gtk3-compat.h | 3 +--
gui.c | 6 ++----
inhibit.c | 3 +--
kernel-cmdline.c | 3 +--
kernel.c | 3 +--
launch-virt-p2v | 3 +--
m4/p2v-bash-completion.m4 | 3 +--
m4/p2v-c.m4 | 3 +--
m4/p2v-libraries.m4 | 3 +--
m4/p2v-progs.m4 | 3 +--
m4/p2v-tests.m4 | 3 +--
main.c | 3 +--
nbd.c | 3 +--
p2v.h | 3 +--
p2v.ks.in | 3 +--
p2v.service | 3 +--
physical-xml.c | 3 +--
podcheck.pl | 3 +--
podwrapper.pl.in | 14 +++++---------
rtc.c | 3 +--
run.in | 5 ++---
ssh.c | 3 +--
subdir-rules.mk | 3 +--
test-functions.sh | 3 +--
test-virt-p2v-cmdline.sh | 3 +--
test-virt-p2v-docs.sh | 3 +--
test-virt-p2v-nbdkit.sh | 3 +--
test-virt-p2v-pxe.sh | 3 +--
test-virt-p2v-pxe.sshd_config.in | 3 +--
test-virt-p2v-scp.sh | 3 +--
test-virt-p2v-ssh.sh | 3 +--
test-virt-p2v.sh | 3 +--
utils.c | 3 +--
valgrind-suppressions | 3 +--
virt-p2v-make-disk.in | 3 +--
virt-p2v-make-kickstart.in | 3 +--
virt-p2v-make-kiwi.in | 3 +--
whole-file.c | 5 ++---
53 files changed, 60 insertions(+), 117 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b868d1b..d27219d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
include $(top_srcdir)/subdir-rules.mk
diff --git a/autogen.sh b/autogen.sh
index fcdd0ce..f055ffc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# Rebuild the autotools environment.
diff --git a/bash/Makefile.am b/bash/Makefile.am
index 2a59f75..c8e54c8 100644
--- a/bash/Makefile.am
+++ b/bash/Makefile.am
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
include $(top_srcdir)/subdir-rules.mk
diff --git a/bash/test-complete-in-script.sh b/bash/test-complete-in-script.sh
index 7fff0bc..d369dda 100755
--- a/bash/test-complete-in-script.sh
+++ b/bash/test-complete-in-script.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test that the correct 'complete' command is included in the script.
# Mainly prevents symlinking errors and some omissions.
diff --git a/bash/virt-p2v-make-disk b/bash/virt-p2v-make-disk
index 6a879a1..c892b41 100644
--- a/bash/virt-p2v-make-disk
+++ b/bash/virt-p2v-make-disk
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
_p2v_options_only ()
{
diff --git a/configure.ac b/configure.ac
index 8838de1..72843bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# The major, minor, and release fields MUST be numbers. Packagers can
# add extra information using --with-extra="..." which may be any
diff --git a/contrib/aux-scripts/do-build.sh b/contrib/aux-scripts/do-build.sh
index dd6424b..53a844d 100644
--- a/contrib/aux-scripts/do-build.sh
+++ b/contrib/aux-scripts/do-build.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# See build-p2v-iso.sh
diff --git a/contrib/build-p2v-iso.sh b/contrib/build-p2v-iso.sh
index 2c6bd10..1bc4d24 100755
--- a/contrib/build-p2v-iso.sh
+++ b/contrib/build-p2v-iso.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# This script is used to build the virt-p2v ISO on RHEL 5/6/7,
# for 32 bit (i686) and 64 bit (x86-64).
diff --git a/contrib/test-p2v-iso.sh b/contrib/test-p2v-iso.sh
index ff6453b..9ac4c6a 100755
--- a/contrib/test-p2v-iso.sh
+++ b/contrib/test-p2v-iso.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Once you have built a virt-p2v ISO (see build-p2v-iso.sh), you
# can interactively test it using this script.
diff --git a/conversion.c b/conversion.c
index 044cee3..d7e91a8 100644
--- a/conversion.c
+++ b/conversion.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/cpuid.c b/cpuid.c
index ef3574d..c12224a 100644
--- a/cpuid.c
+++ b/cpuid.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9ad83aa..afb797e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
include $(top_srcdir)/subdir-rules.mk
diff --git a/generate-p2v-authors.pl b/generate-p2v-authors.pl
index 18a825b..cd1c509 100755
--- a/generate-p2v-authors.pl
+++ b/generate-p2v-authors.pl
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
use strict;
use warnings;
diff --git a/generate-p2v-config.pl b/generate-p2v-config.pl
index be98838..06a2e2c 100755
--- a/generate-p2v-config.pl
+++ b/generate-p2v-config.pl
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
use strict;
use warnings;
diff --git a/gui-gtk2-compat.h b/gui-gtk2-compat.h
index 65569dd..ac9cb60 100644
--- a/gui-gtk2-compat.h
+++ b/gui-gtk2-compat.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* Backwards compatibility for ancient RHEL 5 Gtk 2.10. */
diff --git a/gui-gtk3-compat.h b/gui-gtk3-compat.h
index 212c3af..5388c3a 100644
--- a/gui-gtk3-compat.h
+++ b/gui-gtk3-compat.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* Backwards compatibility for some deprecated functions in Gtk 3. */
diff --git a/gui.c b/gui.c
index 32c56dd..3463637 100644
--- a/gui.c
+++ b/gui.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
@@ -152,8 +151,7 @@ static const char gplv2plus[] =
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License\n"
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n";
+ "along with this program. If not, see <https://www.gnu.org/licenses/>.\n";
#endif
/**
diff --git a/inhibit.c b/inhibit.c
index 7615d65..d902e2b 100644
--- a/inhibit.c
+++ b/inhibit.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/kernel-cmdline.c b/kernel-cmdline.c
index c53b978..008f3f6 100644
--- a/kernel-cmdline.c
+++ b/kernel-cmdline.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/kernel.c b/kernel.c
index e9a0630..7adf659 100644
--- a/kernel.c
+++ b/kernel.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/launch-virt-p2v b/launch-virt-p2v
index 925aa6d..9d1e8d3 100755
--- a/launch-virt-p2v
+++ b/launch-virt-p2v
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# This normally runs from systemd which deals with logging.
diff --git a/m4/p2v-bash-completion.m4 b/m4/p2v-bash-completion.m4
index eee5067..9589d7d 100644
--- a/m4/p2v-bash-completion.m4
+++ b/m4/p2v-bash-completion.m4
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
dnl Bash completion.
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
diff --git a/m4/p2v-c.m4 b/m4/p2v-c.m4
index e3d045f..772e48d 100644
--- a/m4/p2v-c.m4
+++ b/m4/p2v-c.m4
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
dnl The C compiler environment.
dnl Define the host CPU architecture (defines 'host_cpu')
diff --git a/m4/p2v-libraries.m4 b/m4/p2v-libraries.m4
index c776a10..9e1236a 100644
--- a/m4/p2v-libraries.m4
+++ b/m4/p2v-libraries.m4
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
dnl Any C libraries required by virt-p2v.
diff --git a/m4/p2v-progs.m4 b/m4/p2v-progs.m4
index b3d0ce7..3ddb13c 100644
--- a/m4/p2v-progs.m4
+++ b/m4/p2v-progs.m4
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Check for external programs required to either build or run
# virt-p2v.
diff --git a/m4/p2v-tests.m4 b/m4/p2v-tests.m4
index 7de356d..9b4a77f 100644
--- a/m4/p2v-tests.m4
+++ b/m4/p2v-tests.m4
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
dnl Should we run the gnulib tests?
AC_MSG_CHECKING([if we should run the GNUlib tests])
diff --git a/main.c b/main.c
index 424bccf..9039e82 100644
--- a/main.c
+++ b/main.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/nbd.c b/nbd.c
index 8b80803..3bbde1e 100644
--- a/nbd.c
+++ b/nbd.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/p2v.h b/p2v.h
index 52842bd..eb518f7 100644
--- a/p2v.h
+++ b/p2v.h
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef P2V_H
diff --git a/p2v.ks.in b/p2v.ks.in
index 32f3665..9bb31ab 100644
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Generated by virt-p2v-make-kickstart __PACKAGE_VERSION_FULL__
diff --git a/p2v.service b/p2v.service
index 7096eb1..2c431b5 100644
--- a/p2v.service
+++ b/p2v.service
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# NB: This cannot be called "virt-p2v.service" because on Fedora the
# virt- prefix will cause it to get the wrong SELinux label.
diff --git a/physical-xml.c b/physical-xml.c
index 08f4430..1855190 100644
--- a/physical-xml.c
+++ b/physical-xml.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/podcheck.pl b/podcheck.pl
index 527a2e4..0f1f2e9 100755
--- a/podcheck.pl
+++ b/podcheck.pl
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
use warnings;
use strict;
diff --git a/podwrapper.pl.in b/podwrapper.pl.in
index ea24b5e..dad667b 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -14,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
use warnings;
use strict;
@@ -374,10 +373,8 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA
+You should have received a copy of the GNU Lesser General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
";
my $GPLv2plus =
@@ -391,9 +388,8 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
";
my $examples_license =
diff --git a/rtc.c b/rtc.c
index 28884fc..05d0fae 100644
--- a/rtc.c
+++ b/rtc.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/run.in b/run.in
index fbb1247..7329856 100755
--- a/run.in
+++ b/run.in
@@ -14,9 +14,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
#----------------------------------------------------------------------
diff --git a/ssh.c b/ssh.c
index 59d1891..7d85b40 100644
--- a/ssh.c
+++ b/ssh.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
diff --git a/subdir-rules.mk b/subdir-rules.mk
index ce05874..7896105 100644
--- a/subdir-rules.mk
+++ b/subdir-rules.mk
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# subdir-rules.mk should be included in every *subdirectory* Makefile.am.
diff --git a/test-functions.sh b/test-functions.sh
index 1b5ac00..f6c9ee3 100755
--- a/test-functions.sh
+++ b/test-functions.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Most of the tests written in shell script source this file for
# useful functions.
diff --git a/test-virt-p2v-cmdline.sh b/test-virt-p2v-cmdline.sh
index 2fbca1e..cd76044 100755
--- a/test-virt-p2v-cmdline.sh
+++ b/test-virt-p2v-cmdline.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test virt-p2v command line parsing in non-GUI mode.
diff --git a/test-virt-p2v-docs.sh b/test-virt-p2v-docs.sh
index d4942de..8d17fce 100755
--- a/test-virt-p2v-docs.sh
+++ b/test-virt-p2v-docs.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
set -e
diff --git a/test-virt-p2v-nbdkit.sh b/test-virt-p2v-nbdkit.sh
index cf7a416..9adb195 100755
--- a/test-virt-p2v-nbdkit.sh
+++ b/test-virt-p2v-nbdkit.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test virt-p2v in non-GUI mode using nbdkit instead of qemu-nbd.
diff --git a/test-virt-p2v-pxe.sh b/test-virt-p2v-pxe.sh
index bad4188..f0cadf4 100755
--- a/test-virt-p2v-pxe.sh
+++ b/test-virt-p2v-pxe.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test virt-p2v in non-GUI mode with something resembling the
# PXE boot code path. This tests:
diff --git a/test-virt-p2v-pxe.sshd_config.in b/test-virt-p2v-pxe.sshd_config.in
index d6ce578..6475e2b 100644
--- a/test-virt-p2v-pxe.sshd_config.in
+++ b/test-virt-p2v-pxe.sshd_config.in
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Minimal sshd_config used by test-virt-p2v-pxe.ssh when it runs
# a captive sshd.
diff --git a/test-virt-p2v-scp.sh b/test-virt-p2v-scp.sh
index 53f9781..ca85101 100755
--- a/test-virt-p2v-scp.sh
+++ b/test-virt-p2v-scp.sh
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# This is an scp substitute used by test-virt-p2v.sh.
diff --git a/test-virt-p2v-ssh.sh b/test-virt-p2v-ssh.sh
index 79dc883..2442b7d 100755
--- a/test-virt-p2v-ssh.sh
+++ b/test-virt-p2v-ssh.sh
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# This is an ssh substitute used by test-virt-p2v.sh.
diff --git a/test-virt-p2v.sh b/test-virt-p2v.sh
index a6b0727..9629e1b 100755
--- a/test-virt-p2v.sh
+++ b/test-virt-p2v.sh
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test virt-p2v in non-GUI mode.
diff --git a/utils.c b/utils.c
index 4b5e723..932c1c1 100644
--- a/utils.c
+++ b/utils.c
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/valgrind-suppressions b/valgrind-suppressions
index 1687c82..ca4149e 100644
--- a/valgrind-suppressions
+++ b/valgrind-suppressions
@@ -12,8 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Valgrind suppressions used when testing only. There are no known
# resource leaks in virt-p2v. This file is only for leaks in
diff --git a/virt-p2v-make-disk.in b/virt-p2v-make-disk.in
index e353f3f..1bec4e3 100644
--- a/virt-p2v-make-disk.in
+++ b/virt-p2v-make-disk.in
@@ -14,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
unset CDPATH
diff --git a/virt-p2v-make-kickstart.in b/virt-p2v-make-kickstart.in
index 97610cd..779ba62 100644
--- a/virt-p2v-make-kickstart.in
+++ b/virt-p2v-make-kickstart.in
@@ -14,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
unset CDPATH
diff --git a/virt-p2v-make-kiwi.in b/virt-p2v-make-kiwi.in
index 405b629..987de11 100644
--- a/virt-p2v-make-kiwi.in
+++ b/virt-p2v-make-kiwi.in
@@ -14,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
unset CDPATH
diff --git a/whole-file.c b/whole-file.c
index 63597e0..156bb9b 100644
--- a/whole-file.c
+++ b/whole-file.c
@@ -11,9 +11,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <config.h>
--
2.21.0
More information about the Libguestfs
mailing list