diff --git a/.gitignore b/.gitignore index 76b8f83..05e4e47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ocfs2-tools-1.4.3.tar.gz /ocfs2-tools-1.6.3.tar.gz +/ocfs2-tools-1.8.5.tar.gz diff --git a/0001-Update-FSF-address-in-GPL2-license.patch b/0001-Update-FSF-address-in-GPL2-license.patch new file mode 100644 index 0000000..85fed21 --- /dev/null +++ b/0001-Update-FSF-address-in-GPL2-license.patch @@ -0,0 +1,3124 @@ +From 70aec706fa87edf7e94db5770126173578b93df7 Mon Sep 17 00:00:00 2001 +From: Valentin Vidic +Date: Thu, 29 Jun 2017 23:13:06 +0200 +Subject: [PATCH] Update FSF address in GPL2 license + +--- + COPYING | 4 ++-- + config.guess | 2 +- + config.sub | 4 ++-- + debugfs.ocfs2/commands.c | 4 ++-- + debugfs.ocfs2/dump.c | 4 ++-- + debugfs.ocfs2/dump_dlm_locks.c | 4 ++-- + debugfs.ocfs2/dump_fs_locks.c | 4 ++-- + debugfs.ocfs2/dump_net_stats.c | 4 ++-- + debugfs.ocfs2/find_block_inode.c | 4 ++-- + debugfs.ocfs2/find_inode_paths.c | 4 ++-- + debugfs.ocfs2/include/commands.h | 4 ++-- + debugfs.ocfs2/include/dump_dlm_locks.h | 4 ++-- + debugfs.ocfs2/include/dump_fs_locks.h | 4 ++-- + debugfs.ocfs2/include/dump_net_stats.h | 4 ++-- + debugfs.ocfs2/include/find_block_inode.h | 4 ++-- + debugfs.ocfs2/include/find_inode_paths.h | 4 ++-- + debugfs.ocfs2/include/journal.h | 4 ++-- + debugfs.ocfs2/include/main.h | 4 ++-- + debugfs.ocfs2/include/ocfs2_internals.h | 4 ++-- + debugfs.ocfs2/include/stat_sysdir.h | 4 ++-- + debugfs.ocfs2/include/utils.h | 4 ++-- + debugfs.ocfs2/journal.c | 4 ++-- + debugfs.ocfs2/main.c | 4 ++-- + debugfs.ocfs2/stat_sysdir.c | 4 ++-- + debugfs.ocfs2/utils.c | 4 ++-- + extras/compute_groups.c | 4 ++-- + extras/decode_lockres.c | 4 ++-- + extras/encode_lockres.c | 4 ++-- + extras/find_allocation_fragments.c | 4 ++-- + extras/find_dup_extents.c | 4 ++-- + extras/find_hardlinks.c | 4 ++-- + extras/find_inode_paths.c | 4 ++-- + extras/mark_journal_dirty.c | 4 ++-- + extras/resize_slotmap.c | 4 ++-- + extras/set_random_bits.c | 4 ++-- + extras/verify_backup_super | 4 ++-- + fsck.ocfs2/dirblocks.c | 4 ++-- + fsck.ocfs2/dirparents.c | 4 ++-- + fsck.ocfs2/extent.c | 4 ++-- + fsck.ocfs2/fsck.c | 4 ++-- + fsck.ocfs2/icount.c | 4 ++-- + fsck.ocfs2/include/dirblocks.h | 4 ++-- + fsck.ocfs2/include/dirparents.h | 4 ++-- + fsck.ocfs2/include/extent.h | 4 ++-- + fsck.ocfs2/include/fsck.h | 4 ++-- + fsck.ocfs2/include/icount.h | 4 ++-- + fsck.ocfs2/include/journal.h | 4 ++-- + fsck.ocfs2/include/pass0.h | 4 ++-- + fsck.ocfs2/include/pass1.h | 4 ++-- + fsck.ocfs2/include/pass2.h | 4 ++-- + fsck.ocfs2/include/pass3.h | 4 ++-- + fsck.ocfs2/include/pass4.h | 4 ++-- + fsck.ocfs2/include/problem.h | 4 ++-- + fsck.ocfs2/include/strings.h | 4 ++-- + fsck.ocfs2/include/util.h | 4 ++-- + fsck.ocfs2/pass0.c | 4 ++-- + fsck.ocfs2/pass1.c | 4 ++-- + fsck.ocfs2/pass2.c | 4 ++-- + fsck.ocfs2/pass3.c | 4 ++-- + fsck.ocfs2/pass4.c | 4 ++-- + fsck.ocfs2/pass5.c | 4 ++-- + fsck.ocfs2/problem.c | 4 ++-- + fsck.ocfs2/strings.c | 4 ++-- + fsck.ocfs2/util.c | 4 ++-- + fswreck/chain.c | 4 ++-- + fswreck/corrupt.c | 4 ++-- + fswreck/dir.c | 4 ++-- + fswreck/extent.c | 4 ++-- + fswreck/group.c | 4 ++-- + fswreck/include/chain.h | 4 ++-- + fswreck/include/corrupt.h | 4 ++-- + fswreck/include/dir.h | 4 ++-- + fswreck/include/extent.h | 4 ++-- + fswreck/include/fsck_type.h | 4 ++-- + fswreck/include/group.h | 4 ++-- + fswreck/include/inode.h | 4 ++-- + fswreck/include/local_alloc.h | 4 ++-- + fswreck/include/main.h | 4 ++-- + fswreck/include/special.h | 4 ++-- + fswreck/include/symlink.h | 4 ++-- + fswreck/include/truncate_log.h | 4 ++-- + fswreck/inode.c | 4 ++-- + fswreck/local_alloc.c | 4 ++-- + fswreck/main.c | 4 ++-- + fswreck/special.c | 4 ++-- + fswreck/symlink.c | 4 ++-- + fswreck/truncate_log.c | 4 ++-- + include/o2cb/o2cb.h | 4 ++-- + include/o2cb/ocfs2_heartbeat.h | 4 ++-- + include/o2cb/ocfs2_nodemanager.h | 4 ++-- + include/o2dlm/o2dlm.h | 4 ++-- + include/ocfs2-kernel/ocfs1_fs_compat.h | 4 ++-- + include/ocfs2-kernel/ocfs2_fs.h | 4 ++-- + include/ocfs2-kernel/ocfs2_lockid.h | 4 ++-- + include/ocfs2/bitops.h | 4 ++-- + include/ocfs2/byteorder.h | 4 ++-- + include/ocfs2/image.h | 4 ++-- + include/ocfs2/kernel-rbtree.h | 2 +- + include/ocfs2/ocfs2.h | 4 ++-- + libo2cb/o2cb_abi.h | 4 ++-- + libo2cb/o2cb_crc32.c | 2 +- + libo2cb/o2cb_crc32.h | 4 ++-- + libo2cb/o2cb_err.et | 4 ++-- + libo2dlm/libdlm-compat.h | 2 +- + libo2dlm/o2dlm.c | 4 ++-- + libo2dlm/o2dlm_err.et | 4 ++-- + libo2dlm/o2dlm_test.c | 4 ++-- + libocfs2/alloc.c | 4 ++-- + libocfs2/backup_super.c | 4 ++-- + libocfs2/bitmap.c | 4 ++-- + libocfs2/bitmap.h | 4 ++-- + libocfs2/bitops.c | 4 ++-- + libocfs2/cached_inode.c | 4 ++-- + libocfs2/chain.c | 4 ++-- + libocfs2/chainalloc.c | 4 ++-- + libocfs2/checkhb.c | 4 ++-- + libocfs2/closefs.c | 4 ++-- + libocfs2/dir_iterate.c | 4 ++-- + libocfs2/dir_iterate.h | 4 ++-- + libocfs2/dir_scan.c | 4 ++-- + libocfs2/dir_util.h | 4 ++-- + libocfs2/dirblock.c | 4 ++-- + libocfs2/dlm.c | 4 ++-- + libocfs2/expanddir.c | 4 ++-- + libocfs2/extend_file.c | 4 ++-- + libocfs2/extent_map.c | 4 ++-- + libocfs2/extent_map.h | 4 ++-- + libocfs2/extents.c | 4 ++-- + libocfs2/feature_string.c | 4 ++-- + libocfs2/fileio.c | 4 ++-- + libocfs2/freefs.c | 4 ++-- + libocfs2/heartbeat.c | 4 ++-- + libocfs2/image.c | 4 ++-- + libocfs2/inode.c | 4 ++-- + libocfs2/kernel-rbtree.c | 2 +- + libocfs2/link.c | 4 ++-- + libocfs2/lockid.c | 4 ++-- + libocfs2/lookup.c | 4 ++-- + libocfs2/memory.c | 4 ++-- + libocfs2/mkjournal.c | 4 ++-- + libocfs2/namei.c | 4 ++-- + libocfs2/ocfs2_err.et | 4 ++-- + libocfs2/openfs.c | 4 ++-- + libocfs2/quota.c | 4 ++-- + libocfs2/slot_map.c | 4 ++-- + libocfs2/sysfile.c | 4 ++-- + libocfs2/truncate.c | 4 ++-- + libocfs2/unix_io.c | 4 ++-- + libocfs2/unlink.c | 4 ++-- + listuuid/listuuid.c | 4 ++-- + mkfs.ocfs2/check.c | 4 ++-- + mkfs.ocfs2/mkfs.h | 4 ++-- + mount.ocfs2/mount.ocfs2.c | 4 ++-- + mount.ocfs2/mount.ocfs2.h | 4 ++-- + mount.ocfs2/nls.h | 4 ++-- + mount.ocfs2/opts.c | 4 ++-- + mount.ocfs2/opts.h | 4 ++-- + mounted.ocfs2/mounted.c | 4 ++-- + o2cb_ctl/jiterator.c | 4 ++-- + o2cb_ctl/o2cb_config.c | 4 ++-- + o2cb_ctl/o2cb_config.h | 4 ++-- + o2cb_ctl/o2cb_ctl.c | 4 ++-- + o2image/o2image.c | 4 ++-- + ocfs2_hb_ctl/ocfs2_hb_ctl.c | 4 ++-- + ocfs2cdsl/ocfs2cdsl.c | 4 ++-- + ocfs2console/ocfs2interface/__init__.py | 2 +- + ocfs2console/ocfs2interface/about.py | 6 +++--- + ocfs2console/ocfs2interface/bosa.py | 2 +- + ocfs2console/ocfs2interface/classlabel.py | 2 +- + ocfs2console/ocfs2interface/confdefs.py.in | 2 +- + ocfs2console/ocfs2interface/console.py | 2 +- + ocfs2console/ocfs2interface/format.py | 2 +- + ocfs2console/ocfs2interface/fsck.py | 2 +- + ocfs2console/ocfs2interface/fstab.py | 2 +- + ocfs2console/ocfs2interface/fswidgets.py | 2 +- + ocfs2console/ocfs2interface/general.py | 2 +- + ocfs2console/ocfs2interface/gidlemodule.c | 4 ++-- + ocfs2console/ocfs2interface/guiutil.py | 2 +- + ocfs2console/ocfs2interface/ls.py | 2 +- + ocfs2console/ocfs2interface/menu.py | 2 +- + ocfs2console/ocfs2interface/mount.py | 2 +- + ocfs2console/ocfs2interface/nodeconfig.py | 2 +- + ocfs2console/ocfs2interface/o2cb_ctl.py | 2 +- + ocfs2console/ocfs2interface/o2cbmodule.c | 4 ++-- + ocfs2console/ocfs2interface/ocfs2module.c | 4 ++-- + ocfs2console/ocfs2interface/ocfsplist.c | 4 ++-- + ocfs2console/ocfs2interface/ocfsplist.h | 4 ++-- + ocfs2console/ocfs2interface/partitionview.py | 2 +- + ocfs2console/ocfs2interface/plistmodule.c | 4 ++-- + ocfs2console/ocfs2interface/process.py | 2 +- + ocfs2console/ocfs2interface/pushconfig.py | 2 +- + ocfs2console/ocfs2interface/terminal.py | 2 +- + ocfs2console/ocfs2interface/toolbar.py | 2 +- + ocfs2console/ocfs2interface/tune.py | 2 +- + python.m4 | 4 ++-- + runlog.m4 | 4 ++-- + sizetest/sizetest.c | 4 ++-- + 197 files changed, 368 insertions(+), 368 deletions(-) + +diff --git a/COPYING b/COPYING +index d60c31a9..b2fe7b6a 100644 +--- a/COPYING ++++ b/COPYING +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + + Also add information on how to contact you by electronic and paper mail. +diff --git a/config.guess b/config.guess +index 82294713..10efd597 100755 +--- a/config.guess ++++ b/config.guess +@@ -17,7 +17,7 @@ timestamp='2004-11-12' + # + # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/config.sub b/config.sub +index 0f84ac2c..de924033 100755 +--- a/config.sub ++++ b/config.sub +@@ -21,8 +21,8 @@ timestamp='2004-11-30' + # + # 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., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, ++# Boston, MA 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/debugfs.ocfs2/commands.c b/debugfs.ocfs2/commands.c +index 1f31d5ca..cc88583c 100644 +--- a/debugfs.ocfs2/commands.c ++++ b/debugfs.ocfs2/commands.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/dump.c b/debugfs.ocfs2/dump.c +index 8969493b..137e7c89 100644 +--- a/debugfs.ocfs2/dump.c ++++ b/debugfs.ocfs2/dump.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/debugfs.ocfs2/dump_dlm_locks.c b/debugfs.ocfs2/dump_dlm_locks.c +index 6344ff18..421f996d 100644 +--- a/debugfs.ocfs2/dump_dlm_locks.c ++++ b/debugfs.ocfs2/dump_dlm_locks.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/dump_fs_locks.c b/debugfs.ocfs2/dump_fs_locks.c +index ce5ab9e8..05f52274 100644 +--- a/debugfs.ocfs2/dump_fs_locks.c ++++ b/debugfs.ocfs2/dump_fs_locks.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/dump_net_stats.c b/debugfs.ocfs2/dump_net_stats.c +index a3bdb681..fb48aad9 100644 +--- a/debugfs.ocfs2/dump_net_stats.c ++++ b/debugfs.ocfs2/dump_net_stats.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/find_block_inode.c b/debugfs.ocfs2/find_block_inode.c +index c609f40f..2150145b 100644 +--- a/debugfs.ocfs2/find_block_inode.c ++++ b/debugfs.ocfs2/find_block_inode.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/find_inode_paths.c b/debugfs.ocfs2/find_inode_paths.c +index 03d6a3b0..a49cbbcf 100644 +--- a/debugfs.ocfs2/find_inode_paths.c ++++ b/debugfs.ocfs2/find_inode_paths.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/dir_iterate.c + * Copyright (C) 1993, 1994, 1994, 1995, 1996, 1997 Theodore Ts'o. +diff --git a/debugfs.ocfs2/include/commands.h b/debugfs.ocfs2/include/commands.h +index 7f929a50..33620046 100644 +--- a/debugfs.ocfs2/include/commands.h ++++ b/debugfs.ocfs2/include/commands.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Sunil Mushran + */ +diff --git a/debugfs.ocfs2/include/dump_dlm_locks.h b/debugfs.ocfs2/include/dump_dlm_locks.h +index 7bc35bac..bb6640f1 100644 +--- a/debugfs.ocfs2/include/dump_dlm_locks.h ++++ b/debugfs.ocfs2/include/dump_dlm_locks.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/dump_fs_locks.h b/debugfs.ocfs2/include/dump_fs_locks.h +index 9445c31f..0e01a880 100644 +--- a/debugfs.ocfs2/include/dump_fs_locks.h ++++ b/debugfs.ocfs2/include/dump_fs_locks.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/dump_net_stats.h b/debugfs.ocfs2/include/dump_net_stats.h +index 1e57b6e9..0b3e702d 100644 +--- a/debugfs.ocfs2/include/dump_net_stats.h ++++ b/debugfs.ocfs2/include/dump_net_stats.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/find_block_inode.h b/debugfs.ocfs2/include/find_block_inode.h +index 079e6517..44752c6d 100644 +--- a/debugfs.ocfs2/include/find_block_inode.h ++++ b/debugfs.ocfs2/include/find_block_inode.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/find_inode_paths.h b/debugfs.ocfs2/include/find_inode_paths.h +index a4966b6e..a824026a 100644 +--- a/debugfs.ocfs2/include/find_inode_paths.h ++++ b/debugfs.ocfs2/include/find_inode_paths.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/journal.h b/debugfs.ocfs2/include/journal.h +index 4c7e5e41..fbfda993 100644 +--- a/debugfs.ocfs2/include/journal.h ++++ b/debugfs.ocfs2/include/journal.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Sunil Mushran, Mark Fasheh + */ +diff --git a/debugfs.ocfs2/include/main.h b/debugfs.ocfs2/include/main.h +index a951c060..bc7e7866 100644 +--- a/debugfs.ocfs2/include/main.h ++++ b/debugfs.ocfs2/include/main.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/ocfs2_internals.h b/debugfs.ocfs2/include/ocfs2_internals.h +index 87ea1aa7..001f847a 100644 +--- a/debugfs.ocfs2/include/ocfs2_internals.h ++++ b/debugfs.ocfs2/include/ocfs2_internals.h +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef _OCFS2_INTERNALS_H_ +diff --git a/debugfs.ocfs2/include/stat_sysdir.h b/debugfs.ocfs2/include/stat_sysdir.h +index b2076b58..f2dbfca1 100644 +--- a/debugfs.ocfs2/include/stat_sysdir.h ++++ b/debugfs.ocfs2/include/stat_sysdir.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/include/utils.h b/debugfs.ocfs2/include/utils.h +index 59302a80..1faa0ae3 100644 +--- a/debugfs.ocfs2/include/utils.h ++++ b/debugfs.ocfs2/include/utils.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/journal.c b/debugfs.ocfs2/journal.c +index decc5531..0b74658e 100644 +--- a/debugfs.ocfs2/journal.c ++++ b/debugfs.ocfs2/journal.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Sunil Mushran, Mark Fasheh + */ +diff --git a/debugfs.ocfs2/main.c b/debugfs.ocfs2/main.c +index 1402d5e7..31132952 100644 +--- a/debugfs.ocfs2/main.c ++++ b/debugfs.ocfs2/main.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Sunil Mushran, Manish Singh + */ +diff --git a/debugfs.ocfs2/stat_sysdir.c b/debugfs.ocfs2/stat_sysdir.c +index b4ab7ae9..e770cad9 100644 +--- a/debugfs.ocfs2/stat_sysdir.c ++++ b/debugfs.ocfs2/stat_sysdir.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/debugfs.ocfs2/utils.c b/debugfs.ocfs2/utils.c +index 4e7f1b03..57c5e6bb 100644 +--- a/debugfs.ocfs2/utils.c ++++ b/debugfs.ocfs2/utils.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/extras/compute_groups.c b/extras/compute_groups.c +index 3dcfe34c..b32a954e 100644 +--- a/extras/compute_groups.c ++++ b/extras/compute_groups.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Tao Ma + */ +diff --git a/extras/decode_lockres.c b/extras/decode_lockres.c +index afdf1893..ff7764ac 100644 +--- a/extras/decode_lockres.c ++++ b/extras/decode_lockres.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/extras/encode_lockres.c b/extras/encode_lockres.c +index 137a0b37..7b3fdbd2 100644 +--- a/extras/encode_lockres.c ++++ b/extras/encode_lockres.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/extras/find_allocation_fragments.c b/extras/find_allocation_fragments.c +index 07246559..990c0906 100644 +--- a/extras/find_allocation_fragments.c ++++ b/extras/find_allocation_fragments.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/extras/find_dup_extents.c b/extras/find_dup_extents.c +index f3985154..e8961a9c 100644 +--- a/extras/find_dup_extents.c ++++ b/extras/find_dup_extents.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + * +diff --git a/extras/find_hardlinks.c b/extras/find_hardlinks.c +index 710a403f..9c9cbeb8 100644 +--- a/extras/find_hardlinks.c ++++ b/extras/find_hardlinks.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + * +diff --git a/extras/find_inode_paths.c b/extras/find_inode_paths.c +index 5cee21d5..f6bb4b94 100644 +--- a/extras/find_inode_paths.c ++++ b/extras/find_inode_paths.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh, Joel Becker + * +diff --git a/extras/mark_journal_dirty.c b/extras/mark_journal_dirty.c +index 7a225e22..aa36a70e 100644 +--- a/extras/mark_journal_dirty.c ++++ b/extras/mark_journal_dirty.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/extras/resize_slotmap.c b/extras/resize_slotmap.c +index 0195b966..082f544c 100644 +--- a/extras/resize_slotmap.c ++++ b/extras/resize_slotmap.c +@@ -16,8 +16,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */ +diff --git a/extras/set_random_bits.c b/extras/set_random_bits.c +index dab38270..6bbc7e93 100644 +--- a/extras/set_random_bits.c ++++ b/extras/set_random_bits.c +@@ -20,8 +20,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/extras/verify_backup_super b/extras/verify_backup_super +index 4bc49344..199a08e9 100755 +--- a/extras/verify_backup_super ++++ b/extras/verify_backup_super +@@ -13,8 +13,8 @@ + # + # 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., 59 Temple Place - Suite 330, +-# Boston, MA 021110-1307, USA. ++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++# Boston, MA 02110-1301 USA. + # + # Author: Sunil Mushran 03/01/2007 + # +diff --git a/fsck.ocfs2/dirblocks.c b/fsck.ocfs2/dirblocks.c +index af0b5ce7..b4b5c059 100644 +--- a/fsck.ocfs2/dirblocks.c ++++ b/fsck.ocfs2/dirblocks.c +@@ -14,8 +14,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/dirparents.c b/fsck.ocfs2/dirparents.c +index 626030bd..b79cccb6 100644 +--- a/fsck.ocfs2/dirparents.c ++++ b/fsck.ocfs2/dirparents.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/extent.c b/fsck.ocfs2/extent.c +index f222c710..8aad1278 100644 +--- a/fsck.ocfs2/extent.c ++++ b/fsck.ocfs2/extent.c +@@ -14,8 +14,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/fsck.c b/fsck.ocfs2/fsck.c +index e5c7cfa4..98c5987c 100644 +--- a/fsck.ocfs2/fsck.c ++++ b/fsck.ocfs2/fsck.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * Roughly o2fsck performs the following operations. Each pass' file has +diff --git a/fsck.ocfs2/icount.c b/fsck.ocfs2/icount.c +index 68781cd8..2b163cc3 100644 +--- a/fsck.ocfs2/icount.c ++++ b/fsck.ocfs2/icount.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/include/dirblocks.h b/fsck.ocfs2/include/dirblocks.h +index a5af3039..ef6eb815 100644 +--- a/fsck.ocfs2/include/dirblocks.h ++++ b/fsck.ocfs2/include/dirblocks.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/dirparents.h b/fsck.ocfs2/include/dirparents.h +index 8f85ca9e..da00a247 100644 +--- a/fsck.ocfs2/include/dirparents.h ++++ b/fsck.ocfs2/include/dirparents.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/extent.h b/fsck.ocfs2/include/extent.h +index badd5931..959bc0d6 100644 +--- a/fsck.ocfs2/include/extent.h ++++ b/fsck.ocfs2/include/extent.h +@@ -13,8 +13,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef __O2FSCK_EXTENT_H__ +diff --git a/fsck.ocfs2/include/fsck.h b/fsck.ocfs2/include/fsck.h +index 80aeba3e..b03f35ff 100644 +--- a/fsck.ocfs2/include/fsck.h ++++ b/fsck.ocfs2/include/fsck.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/icount.h b/fsck.ocfs2/include/icount.h +index ae73e6ea..a83ba195 100644 +--- a/fsck.ocfs2/include/icount.h ++++ b/fsck.ocfs2/include/icount.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/journal.h b/fsck.ocfs2/include/journal.h +index b9c6c46d..04c6c8bf 100644 +--- a/fsck.ocfs2/include/journal.h ++++ b/fsck.ocfs2/include/journal.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/pass0.h b/fsck.ocfs2/include/pass0.h +index 496fd350..4b7cdf6c 100644 +--- a/fsck.ocfs2/include/pass0.h ++++ b/fsck.ocfs2/include/pass0.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/pass1.h b/fsck.ocfs2/include/pass1.h +index 4556b8d1..95b1dc43 100644 +--- a/fsck.ocfs2/include/pass1.h ++++ b/fsck.ocfs2/include/pass1.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/pass2.h b/fsck.ocfs2/include/pass2.h +index 1a89c4ee..9fa60419 100644 +--- a/fsck.ocfs2/include/pass2.h ++++ b/fsck.ocfs2/include/pass2.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/pass3.h b/fsck.ocfs2/include/pass3.h +index 96c5de3d..87e624ab 100644 +--- a/fsck.ocfs2/include/pass3.h ++++ b/fsck.ocfs2/include/pass3.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/pass4.h b/fsck.ocfs2/include/pass4.h +index a37d02fb..d2be65b8 100644 +--- a/fsck.ocfs2/include/pass4.h ++++ b/fsck.ocfs2/include/pass4.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/problem.h b/fsck.ocfs2/include/problem.h +index 86587e81..e64ffd15 100644 +--- a/fsck.ocfs2/include/problem.h ++++ b/fsck.ocfs2/include/problem.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/strings.h +index 22be678f..69a1be9c 100644 +--- a/fsck.ocfs2/include/strings.h ++++ b/fsck.ocfs2/include/strings.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/include/util.h b/fsck.ocfs2/include/util.h +index b3d3a6f0..52f78091 100644 +--- a/fsck.ocfs2/include/util.h ++++ b/fsck.ocfs2/include/util.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Zach Brown + */ +diff --git a/fsck.ocfs2/pass0.c b/fsck.ocfs2/pass0.c +index 992a94e2..148877cb 100644 +--- a/fsck.ocfs2/pass0.c ++++ b/fsck.ocfs2/pass0.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/pass1.c b/fsck.ocfs2/pass1.c +index da11d22c..54e02f42 100644 +--- a/fsck.ocfs2/pass1.c ++++ b/fsck.ocfs2/pass1.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c +index e1319b43..181febb9 100644 +--- a/fsck.ocfs2/pass2.c ++++ b/fsck.ocfs2/pass2.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * Pass 2 iterates through the directory blocks that pass 1 found under +diff --git a/fsck.ocfs2/pass3.c b/fsck.ocfs2/pass3.c +index 61fde807..43b5650f 100644 +--- a/fsck.ocfs2/pass3.c ++++ b/fsck.ocfs2/pass3.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * Pass 3 makes sure that all directories are connected to the file system +diff --git a/fsck.ocfs2/pass4.c b/fsck.ocfs2/pass4.c +index de3f672d..06b81d2f 100644 +--- a/fsck.ocfs2/pass4.c ++++ b/fsck.ocfs2/pass4.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c +index 787fcdc0..5c2d899f 100644 +--- a/fsck.ocfs2/pass5.c ++++ b/fsck.ocfs2/pass5.c +@@ -14,8 +14,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * Pass 5 tries to read as much data as possible from the global quota file. +diff --git a/fsck.ocfs2/problem.c b/fsck.ocfs2/problem.c +index dac86f74..acd8790a 100644 +--- a/fsck.ocfs2/problem.c ++++ b/fsck.ocfs2/problem.c +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c +index 77cef6ba..4ad37822 100644 +--- a/fsck.ocfs2/strings.c ++++ b/fsck.ocfs2/strings.c +@@ -14,8 +14,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fsck.ocfs2/util.c b/fsck.ocfs2/util.c +index a8841af7..560fca67 100644 +--- a/fsck.ocfs2/util.c ++++ b/fsck.ocfs2/util.c +@@ -14,8 +14,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * -- + * +diff --git a/fswreck/chain.c b/fswreck/chain.c +index e7fb0199..cca436e3 100644 +--- a/fswreck/chain.c ++++ b/fswreck/chain.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/corrupt.c b/fswreck/corrupt.c +index 2f6074e3..7667fee1 100644 +--- a/fswreck/corrupt.c ++++ b/fswreck/corrupt.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/dir.c b/fswreck/dir.c +index d362351e..09c9452a 100644 +--- a/fswreck/dir.c ++++ b/fswreck/dir.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/extent.c b/fswreck/extent.c +index c12ace06..ef548fcd 100644 +--- a/fswreck/extent.c ++++ b/fswreck/extent.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/group.c b/fswreck/group.c +index a1b000f2..f7e40b21 100644 +--- a/fswreck/group.c ++++ b/fswreck/group.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/chain.h b/fswreck/include/chain.h +index 8fbbcfa4..b6a29778 100644 +--- a/fswreck/include/chain.h ++++ b/fswreck/include/chain.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/corrupt.h b/fswreck/include/corrupt.h +index 7037b162..f56d642a 100644 +--- a/fswreck/include/corrupt.h ++++ b/fswreck/include/corrupt.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/dir.h b/fswreck/include/dir.h +index a7ddec0d..5a78e1e3 100644 +--- a/fswreck/include/dir.h ++++ b/fswreck/include/dir.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/extent.h b/fswreck/include/extent.h +index c273d53c..76651ee5 100644 +--- a/fswreck/include/extent.h ++++ b/fswreck/include/extent.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/fsck_type.h b/fswreck/include/fsck_type.h +index 956a1e27..623c998e 100644 +--- a/fswreck/include/fsck_type.h ++++ b/fswreck/include/fsck_type.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/group.h b/fswreck/include/group.h +index b7e23ca9..c4a956ca 100644 +--- a/fswreck/include/group.h ++++ b/fswreck/include/group.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/inode.h b/fswreck/include/inode.h +index 8d01ae7c..27190ddd 100644 +--- a/fswreck/include/inode.h ++++ b/fswreck/include/inode.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/local_alloc.h b/fswreck/include/local_alloc.h +index ad9721aa..fb50d944 100644 +--- a/fswreck/include/local_alloc.h ++++ b/fswreck/include/local_alloc.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/main.h b/fswreck/include/main.h +index 6c5857f2..24aeadf5 100644 +--- a/fswreck/include/main.h ++++ b/fswreck/include/main.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/special.h b/fswreck/include/special.h +index 6d74a1c2..b5660b20 100644 +--- a/fswreck/include/special.h ++++ b/fswreck/include/special.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/symlink.h b/fswreck/include/symlink.h +index 4bd0c4bf..12093355 100644 +--- a/fswreck/include/symlink.h ++++ b/fswreck/include/symlink.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/include/truncate_log.h b/fswreck/include/truncate_log.h +index e4356296..dbf913a4 100644 +--- a/fswreck/include/truncate_log.h ++++ b/fswreck/include/truncate_log.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/inode.c b/fswreck/inode.c +index 5426c610..77a78aed 100644 +--- a/fswreck/inode.c ++++ b/fswreck/inode.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/local_alloc.c b/fswreck/local_alloc.c +index 9d7c3da5..fe2fcf3f 100644 +--- a/fswreck/local_alloc.c ++++ b/fswreck/local_alloc.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/main.c b/fswreck/main.c +index 016fc036..7fa9404d 100644 +--- a/fswreck/main.c ++++ b/fswreck/main.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/special.c b/fswreck/special.c +index b2283d6a..5b0adec4 100644 +--- a/fswreck/special.c ++++ b/fswreck/special.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/symlink.c b/fswreck/symlink.c +index 7af56899..8cbaffe1 100644 +--- a/fswreck/symlink.c ++++ b/fswreck/symlink.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/fswreck/truncate_log.c b/fswreck/truncate_log.c +index c2cdee5d..d38851d0 100644 +--- a/fswreck/truncate_log.c ++++ b/fswreck/truncate_log.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/include/o2cb/o2cb.h b/include/o2cb/o2cb.h +index 5ef97549..a4283097 100644 +--- a/include/o2cb/o2cb.h ++++ b/include/o2cb/o2cb.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef _O2CB_H +diff --git a/include/o2cb/ocfs2_heartbeat.h b/include/o2cb/ocfs2_heartbeat.h +index 3f4151da..0d11f53a 100644 +--- a/include/o2cb/ocfs2_heartbeat.h ++++ b/include/o2cb/ocfs2_heartbeat.h +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef _OCFS2_HEARTBEAT_H +diff --git a/include/o2cb/ocfs2_nodemanager.h b/include/o2cb/ocfs2_nodemanager.h +index 49b59432..d6f08415 100644 +--- a/include/o2cb/ocfs2_nodemanager.h ++++ b/include/o2cb/ocfs2_nodemanager.h +@@ -20,8 +20,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/include/o2dlm/o2dlm.h b/include/o2dlm/o2dlm.h +index 2919b23a..06b8fd34 100644 +--- a/include/o2dlm/o2dlm.h ++++ b/include/o2dlm/o2dlm.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/include/ocfs2-kernel/ocfs1_fs_compat.h b/include/ocfs2-kernel/ocfs1_fs_compat.h +index dfb313bd..92d2d01c 100644 +--- a/include/ocfs2-kernel/ocfs1_fs_compat.h ++++ b/include/ocfs2-kernel/ocfs1_fs_compat.h +@@ -21,8 +21,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef _OCFS1_FS_COMPAT_H +diff --git a/include/ocfs2-kernel/ocfs2_fs.h b/include/ocfs2-kernel/ocfs2_fs.h +index a85d2187..a981b527 100644 +--- a/include/ocfs2-kernel/ocfs2_fs.h ++++ b/include/ocfs2-kernel/ocfs2_fs.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef _OCFS2_FS_H +diff --git a/include/ocfs2-kernel/ocfs2_lockid.h b/include/ocfs2-kernel/ocfs2_lockid.h +index d277aabf..1bc78653 100644 +--- a/include/ocfs2-kernel/ocfs2_lockid.h ++++ b/include/ocfs2-kernel/ocfs2_lockid.h +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef OCFS2_LOCKID_H +diff --git a/include/ocfs2/bitops.h b/include/ocfs2/bitops.h +index 9e9e7337..4ee80f83 100644 +--- a/include/ocfs2/bitops.h ++++ b/include/ocfs2/bitops.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + * +diff --git a/include/ocfs2/byteorder.h b/include/ocfs2/byteorder.h +index 53d41406..be74a90e 100644 +--- a/include/ocfs2/byteorder.h ++++ b/include/ocfs2/byteorder.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + */ +diff --git a/include/ocfs2/image.h b/include/ocfs2/image.h +index aed99a45..637f392e 100644 +--- a/include/ocfs2/image.h ++++ b/include/ocfs2/image.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + /* +diff --git a/include/ocfs2/kernel-rbtree.h b/include/ocfs2/kernel-rbtree.h +index 4c0256ee..254718ff 100644 +--- a/include/ocfs2/kernel-rbtree.h ++++ b/include/ocfs2/kernel-rbtree.h +@@ -14,7 +14,7 @@ + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + rbtree.h + +diff --git a/include/ocfs2/ocfs2.h b/include/ocfs2/ocfs2.h +index f399c67d..b937ca31 100644 +--- a/include/ocfs2/ocfs2.h ++++ b/include/ocfs2/ocfs2.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + */ +diff --git a/libo2cb/o2cb_abi.h b/libo2cb/o2cb_abi.h +index 677944f7..c915d054 100644 +--- a/libo2cb/o2cb_abi.h ++++ b/libo2cb/o2cb_abi.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #ifndef _O2CB_ABI_H +diff --git a/libo2cb/o2cb_crc32.c b/libo2cb/o2cb_crc32.c +index cefea6ea..78a7ba13 100644 +--- a/libo2cb/o2cb_crc32.c ++++ b/libo2cb/o2cb_crc32.c +@@ -32,7 +32,7 @@ + + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ++ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ + + static const unsigned int crctab32[] = + { +diff --git a/libo2cb/o2cb_crc32.h b/libo2cb/o2cb_crc32.h +index 6d56a68b..b8cefdf0 100644 +--- a/libo2cb/o2cb_crc32.h ++++ b/libo2cb/o2cb_crc32.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/libo2cb/o2cb_err.et b/libo2cb/o2cb_err.et +index 88c5d7be..c05b399a 100644 +--- a/libo2cb/o2cb_err.et ++++ b/libo2cb/o2cb_err.et +@@ -16,8 +16,8 @@ + # + # 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., 59 Temple Place - Suite 330, +-# Boston, MA 021110-1307, USA. ++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++# Boston, MA 02110-1301 USA. + # + error_table o2cb + +diff --git a/libo2dlm/libdlm-compat.h b/libo2dlm/libdlm-compat.h +index 99de9ffe..3decc4ef 100644 +--- a/libo2dlm/libdlm-compat.h ++++ b/libo2dlm/libdlm-compat.h +@@ -16,7 +16,7 @@ + ** + ** 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + ** + ******************************************************************************* + ******************************************************************************/ +diff --git a/libo2dlm/o2dlm.c b/libo2dlm/o2dlm.c +index 375f659c..0a2f6627 100644 +--- a/libo2dlm/o2dlm.c ++++ b/libo2dlm/o2dlm.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/libo2dlm/o2dlm_err.et b/libo2dlm/o2dlm_err.et +index 9b757c82..9144e922 100644 +--- a/libo2dlm/o2dlm_err.et ++++ b/libo2dlm/o2dlm_err.et +@@ -16,8 +16,8 @@ + # + # 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., 59 Temple Place - Suite 330, +-# Boston, MA 021110-1307, USA. ++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++# Boston, MA 02110-1301 USA. + # + error_table o2dl + +diff --git a/libo2dlm/o2dlm_test.c b/libo2dlm/o2dlm_test.c +index b89d0d5d..9f105c2f 100644 +--- a/libo2dlm/o2dlm_test.c ++++ b/libo2dlm/o2dlm_test.c +@@ -16,8 +16,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/libocfs2/alloc.c b/libocfs2/alloc.c +index 258d4e5c..df228532 100644 +--- a/libocfs2/alloc.c ++++ b/libocfs2/alloc.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/backup_super.c b/libocfs2/backup_super.c +index 3fb026e6..4c197395 100644 +--- a/libocfs2/backup_super.c ++++ b/libocfs2/backup_super.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/libocfs2/bitmap.c b/libocfs2/bitmap.c +index 9c2104ed..72c77e39 100644 +--- a/libocfs2/bitmap.c ++++ b/libocfs2/bitmap.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/bitmap.h b/libocfs2/bitmap.h +index a6ce0187..c9526116 100644 +--- a/libocfs2/bitmap.h ++++ b/libocfs2/bitmap.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + */ +diff --git a/libocfs2/bitops.c b/libocfs2/bitops.c +index 4bbaca01..09df7bb0 100644 +--- a/libocfs2/bitops.c ++++ b/libocfs2/bitops.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/bitops.c + * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/cached_inode.c b/libocfs2/cached_inode.c +index 8b7126b6..47788b25 100644 +--- a/libocfs2/cached_inode.c ++++ b/libocfs2/cached_inode.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */ +diff --git a/libocfs2/chain.c b/libocfs2/chain.c +index e1e50fbd..9abf4e87 100644 +--- a/libocfs2/chain.c ++++ b/libocfs2/chain.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */ +diff --git a/libocfs2/chainalloc.c b/libocfs2/chainalloc.c +index a8669458..5c603015 100644 +--- a/libocfs2/chainalloc.c ++++ b/libocfs2/chainalloc.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/checkhb.c b/libocfs2/checkhb.c +index d223891b..83e98f40 100644 +--- a/libocfs2/checkhb.c ++++ b/libocfs2/checkhb.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _LARGEFILE64_SOURCE +diff --git a/libocfs2/closefs.c b/libocfs2/closefs.c +index 383a67c0..5f6130cb 100644 +--- a/libocfs2/closefs.c ++++ b/libocfs2/closefs.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Ideas taken from e2fsprogs/lib/ext2fs/closefs.c + * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/dir_iterate.c b/libocfs2/dir_iterate.c +index add3445c..9dc1c4b6 100644 +--- a/libocfs2/dir_iterate.c ++++ b/libocfs2/dir_iterate.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/dir_iterate.c + * Copyright (C) 1993, 1994, 1994, 1995, 1996, 1997 Theodore Ts'o. +diff --git a/libocfs2/dir_iterate.h b/libocfs2/dir_iterate.h +index 7f44702d..0cc4798d 100644 +--- a/libocfs2/dir_iterate.h ++++ b/libocfs2/dir_iterate.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + */ +diff --git a/libocfs2/dir_scan.c b/libocfs2/dir_scan.c +index 6b15c06b..d481a4b8 100644 +--- a/libocfs2/dir_scan.c ++++ b/libocfs2/dir_scan.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Manish Singh + */ +diff --git a/libocfs2/dir_util.h b/libocfs2/dir_util.h +index eac668b2..63478f02 100644 +--- a/libocfs2/dir_util.h ++++ b/libocfs2/dir_util.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + */ +diff --git a/libocfs2/dirblock.c b/libocfs2/dirblock.c +index 52ac78ff..dc9418fc 100644 +--- a/libocfs2/dirblock.c ++++ b/libocfs2/dirblock.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/dirblock.c + * Copyright (C) 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/dlm.c b/libocfs2/dlm.c +index 8c4a3ae5..e4f3a7da 100644 +--- a/libocfs2/dlm.c ++++ b/libocfs2/dlm.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/libocfs2/expanddir.c b/libocfs2/expanddir.c +index a81cfbea..11775b57 100644 +--- a/libocfs2/expanddir.c ++++ b/libocfs2/expanddir.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/expanddir.c + * Copyright (C) 1993, 1999 Theodore Ts'o. +diff --git a/libocfs2/extend_file.c b/libocfs2/extend_file.c +index 10389339..3c8f41b7 100644 +--- a/libocfs2/extend_file.c ++++ b/libocfs2/extend_file.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/extent_map.c b/libocfs2/extent_map.c +index 00beb6e6..ce84d7ec 100644 +--- a/libocfs2/extent_map.c ++++ b/libocfs2/extent_map.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/extent_map.h b/libocfs2/extent_map.h +index 99f74de8..07cb859a 100644 +--- a/libocfs2/extent_map.h ++++ b/libocfs2/extent_map.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Joel Becker + */ +diff --git a/libocfs2/extents.c b/libocfs2/extents.c +index d72ae664..bf49e690 100644 +--- a/libocfs2/extents.c ++++ b/libocfs2/extents.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Ideas taken from e2fsprogs/lib/ext2fs/block.c + * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/feature_string.c b/libocfs2/feature_string.c +index e987293a..07d80fd3 100644 +--- a/libocfs2/feature_string.c ++++ b/libocfs2/feature_string.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/libocfs2/fileio.c b/libocfs2/fileio.c +index 2f30e98d..a14a3edb 100644 +--- a/libocfs2/fileio.c ++++ b/libocfs2/fileio.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Ideas taken from e2fsprogs/lib/ext2fs/fileio.c + * Copyright (C) 1997 Theodore Ts'o. +diff --git a/libocfs2/freefs.c b/libocfs2/freefs.c +index ab8a8ea8..e36d8b3d 100644 +--- a/libocfs2/freefs.c ++++ b/libocfs2/freefs.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Ideas taken from e2fsprogs/lib/ext2fs/freefs.c + * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/heartbeat.c b/libocfs2/heartbeat.c +index cf291e20..b83cdfbe 100644 +--- a/libocfs2/heartbeat.c ++++ b/libocfs2/heartbeat.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh, Zach Brown + */ +diff --git a/libocfs2/image.c b/libocfs2/image.c +index 4d4cce2a..4ceab676 100644 +--- a/libocfs2/image.c ++++ b/libocfs2/image.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/inode.c b/libocfs2/inode.c +index ad1e0169..2f7d570b 100644 +--- a/libocfs2/inode.c ++++ b/libocfs2/inode.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Ideas taken from e2fsprogs/lib/ext2fs/inode.c + * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/kernel-rbtree.c b/libocfs2/kernel-rbtree.c +index 629d472b..3312e8ec 100644 +--- a/libocfs2/kernel-rbtree.c ++++ b/libocfs2/kernel-rbtree.c +@@ -23,7 +23,7 @@ + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + linux/lib/rbtree.c + */ +diff --git a/libocfs2/link.c b/libocfs2/link.c +index 310c24e7..8f389b53 100644 +--- a/libocfs2/link.c ++++ b/libocfs2/link.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/link.c + * Copyright (C) 1993, 1994 Theodore Ts'o. +diff --git a/libocfs2/lockid.c b/libocfs2/lockid.c +index ddc93b2b..a9e7b149 100644 +--- a/libocfs2/lockid.c ++++ b/libocfs2/lockid.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include "ocfs2/byteorder.h" +diff --git a/libocfs2/lookup.c b/libocfs2/lookup.c +index dac83c0d..c217c12d 100644 +--- a/libocfs2/lookup.c ++++ b/libocfs2/lookup.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/lookup.c + * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o. +diff --git a/libocfs2/memory.c b/libocfs2/memory.c +index d5a293a3..ecdccc5c 100644 +--- a/libocfs2/memory.c ++++ b/libocfs2/memory.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Portions of this code from e2fsprogs/lib/ext2fs/ext2fs.h + * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +diff --git a/libocfs2/mkjournal.c b/libocfs2/mkjournal.c +index 5389b51d..6c425626 100644 +--- a/libocfs2/mkjournal.c ++++ b/libocfs2/mkjournal.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Portions of the code from e2fsprogs/lib/ext2fs/mkjournal.c + * Copyright (C) 2000 Theodore Ts'o. +diff --git a/libocfs2/namei.c b/libocfs2/namei.c +index 9241d3b0..20c70f02 100644 +--- a/libocfs2/namei.c ++++ b/libocfs2/namei.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/namei.c + * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o. +diff --git a/libocfs2/ocfs2_err.et b/libocfs2/ocfs2_err.et +index 605345fe..34cefede 100644 +--- a/libocfs2/ocfs2_err.et ++++ b/libocfs2/ocfs2_err.et +@@ -16,8 +16,8 @@ + # + # 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., 59 Temple Place - Suite 330, +-# Boston, MA 021110-1307, USA. ++# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++# Boston, MA 02110-1301 USA. + # + error_table ocfs + +diff --git a/libocfs2/openfs.c b/libocfs2/openfs.c +index 4fc38bdc..21a78c1d 100644 +--- a/libocfs2/openfs.c ++++ b/libocfs2/openfs.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Ideas taken from e2fsprogs/lib/ext2fs/openfs.c + * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o. +diff --git a/libocfs2/quota.c b/libocfs2/quota.c +index e6cd1ecf..1928bee4 100644 +--- a/libocfs2/quota.c ++++ b/libocfs2/quota.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/libocfs2/slot_map.c b/libocfs2/slot_map.c +index c33f4582..66f35418 100644 +--- a/libocfs2/slot_map.c ++++ b/libocfs2/slot_map.c +@@ -14,8 +14,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */ +diff --git a/libocfs2/sysfile.c b/libocfs2/sysfile.c +index 81ce0200..b574dcd0 100644 +--- a/libocfs2/sysfile.c ++++ b/libocfs2/sysfile.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */ +diff --git a/libocfs2/truncate.c b/libocfs2/truncate.c +index 79e692aa..fcfd9521 100644 +--- a/libocfs2/truncate.c ++++ b/libocfs2/truncate.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/libocfs2/unix_io.c b/libocfs2/unix_io.c +index b431b29f..3508e04e 100644 +--- a/libocfs2/unix_io.c ++++ b/libocfs2/unix_io.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Portions of this code from e2fsprogs/lib/ext2fs/unix_io.c + * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +diff --git a/libocfs2/unlink.c b/libocfs2/unlink.c +index 9ebba380..1f45f540 100644 +--- a/libocfs2/unlink.c ++++ b/libocfs2/unlink.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * This code is a port of e2fsprogs/lib/ext2fs/unlink.c + * Copyright (C) 1993, 1994, 1997 Theodore Ts'o. +diff --git a/listuuid/listuuid.c b/listuuid/listuuid.c +index e1fb6218..d89ec310 100644 +--- a/listuuid/listuuid.c ++++ b/listuuid/listuuid.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Sunil Mushran + */ +diff --git a/mkfs.ocfs2/check.c b/mkfs.ocfs2/check.c +index 79583bf3..3aea83da 100644 +--- a/mkfs.ocfs2/check.c ++++ b/mkfs.ocfs2/check.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mkfs.ocfs2/mkfs.h b/mkfs.ocfs2/mkfs.h +index 13b4fb52..f9ba4dcf 100644 +--- a/mkfs.ocfs2/mkfs.h ++++ b/mkfs.ocfs2/mkfs.h +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mount.ocfs2/mount.ocfs2.c b/mount.ocfs2/mount.ocfs2.c +index d0cfcb7f..e3d88716 100644 +--- a/mount.ocfs2/mount.ocfs2.c ++++ b/mount.ocfs2/mount.ocfs2.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mount.ocfs2/mount.ocfs2.h b/mount.ocfs2/mount.ocfs2.h +index 91d97d0e..d4bf0164 100644 +--- a/mount.ocfs2/mount.ocfs2.h ++++ b/mount.ocfs2/mount.ocfs2.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mount.ocfs2/nls.h b/mount.ocfs2/nls.h +index bfebba3e..06a2c915 100644 +--- a/mount.ocfs2/nls.h ++++ b/mount.ocfs2/nls.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mount.ocfs2/opts.c b/mount.ocfs2/opts.c +index 96037dae..ae8129a4 100644 +--- a/mount.ocfs2/opts.c ++++ b/mount.ocfs2/opts.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mount.ocfs2/opts.h b/mount.ocfs2/opts.h +index e848c01a..c9b39cb2 100644 +--- a/mount.ocfs2/opts.h ++++ b/mount.ocfs2/opts.h +@@ -15,8 +15,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/mounted.ocfs2/mounted.c b/mounted.ocfs2/mounted.c +index a1b81723..1576f902 100644 +--- a/mounted.ocfs2/mounted.c ++++ b/mounted.ocfs2/mounted.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + */ + +diff --git a/o2cb_ctl/jiterator.c b/o2cb_ctl/jiterator.c +index 76adca05..ac825e3c 100644 +--- a/o2cb_ctl/jiterator.c ++++ b/o2cb_ctl/jiterator.c +@@ -19,8 +19,8 @@ + * + * You should have recieved a copy of the GNU Library General Public + * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + /* +diff --git a/o2cb_ctl/o2cb_config.c b/o2cb_ctl/o2cb_config.c +index 2bb10946..46836fdf 100644 +--- a/o2cb_ctl/o2cb_config.c ++++ b/o2cb_ctl/o2cb_config.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/o2cb_ctl/o2cb_config.h b/o2cb_ctl/o2cb_config.h +index 6041bd5a..c9a7ac0d 100644 +--- a/o2cb_ctl/o2cb_config.h ++++ b/o2cb_ctl/o2cb_config.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + +diff --git a/o2cb_ctl/o2cb_ctl.c b/o2cb_ctl/o2cb_ctl.c +index afef9bfc..c590fe51 100644 +--- a/o2cb_ctl/o2cb_ctl.c ++++ b/o2cb_ctl/o2cb_ctl.c +@@ -19,8 +19,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/o2image/o2image.c b/o2image/o2image.c +index ee62acf0..1dd16ed5 100644 +--- a/o2image/o2image.c ++++ b/o2image/o2image.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #define _XOPEN_SOURCE 600 /* Triggers magic in features.h */ +diff --git a/ocfs2_hb_ctl/ocfs2_hb_ctl.c b/ocfs2_hb_ctl/ocfs2_hb_ctl.c +index 270fb6b4..ecd3af6f 100644 +--- a/ocfs2_hb_ctl/ocfs2_hb_ctl.c ++++ b/ocfs2_hb_ctl/ocfs2_hb_ctl.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Mark Fasheh + */ +diff --git a/ocfs2cdsl/ocfs2cdsl.c b/ocfs2cdsl/ocfs2cdsl.c +index 33bc8e1a..a0bb56a9 100644 +--- a/ocfs2cdsl/ocfs2cdsl.c ++++ b/ocfs2cdsl/ocfs2cdsl.c +@@ -18,8 +18,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Manish Singh + */ +diff --git a/ocfs2console/ocfs2interface/__init__.py b/ocfs2console/ocfs2interface/__init__.py +index 26615279..b496c4e0 100644 +--- a/ocfs2console/ocfs2interface/__init__.py ++++ b/ocfs2console/ocfs2interface/__init__.py +@@ -13,6 +13,6 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + '''Just a dummy file, so packages work''' +diff --git a/ocfs2console/ocfs2interface/about.py b/ocfs2console/ocfs2interface/about.py +index 55c59e95..58674f35 100644 +--- a/ocfs2console/ocfs2interface/about.py ++++ b/ocfs2console/ocfs2interface/about.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import sys + from confdefs import OCFS2TOOLS_VERSION +@@ -71,8 +71,8 @@ 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., 59 Temple Place - Suite 330, +-Boston, MA 02111-1307, USA. ++Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++Boston, MA 02110-1301, USA. + ''' + blurb = 'GUI frontend for OCFS2 management' + +diff --git a/ocfs2console/ocfs2interface/bosa.py b/ocfs2console/ocfs2interface/bosa.py +index f9aefc40..32b8c362 100644 +--- a/ocfs2console/ocfs2interface/bosa.py ++++ b/ocfs2console/ocfs2interface/bosa.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + import gobject +diff --git a/ocfs2console/ocfs2interface/classlabel.py b/ocfs2console/ocfs2interface/classlabel.py +index 63d9bfd9..c966cbc7 100644 +--- a/ocfs2console/ocfs2interface/classlabel.py ++++ b/ocfs2console/ocfs2interface/classlabel.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import re + +diff --git a/ocfs2console/ocfs2interface/confdefs.py.in b/ocfs2console/ocfs2interface/confdefs.py.in +index 4626cef2..f3e1e13a 100644 +--- a/ocfs2console/ocfs2interface/confdefs.py.in ++++ b/ocfs2console/ocfs2interface/confdefs.py.in +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + OCFS2TOOLS_VERSION = '@VERSION@' + +diff --git a/ocfs2console/ocfs2interface/console.py b/ocfs2console/ocfs2interface/console.py +index 1361222a..a0edd8aa 100644 +--- a/ocfs2console/ocfs2interface/console.py ++++ b/ocfs2console/ocfs2interface/console.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/format.py b/ocfs2console/ocfs2interface/format.py +index c76b43a0..d5af519c 100644 +--- a/ocfs2console/ocfs2interface/format.py ++++ b/ocfs2console/ocfs2interface/format.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/fsck.py b/ocfs2console/ocfs2interface/fsck.py +index c89575e3..a180d3eb 100644 +--- a/ocfs2console/ocfs2interface/fsck.py ++++ b/ocfs2console/ocfs2interface/fsck.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + import gobject +diff --git a/ocfs2console/ocfs2interface/fstab.py b/ocfs2console/ocfs2interface/fstab.py +index 4404e29b..2cecc0cc 100644 +--- a/ocfs2console/ocfs2interface/fstab.py ++++ b/ocfs2console/ocfs2interface/fstab.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + PATH_FSTAB = '/etc/fstab' + +diff --git a/ocfs2console/ocfs2interface/fswidgets.py b/ocfs2console/ocfs2interface/fswidgets.py +index f65ddc6d..b6654612 100644 +--- a/ocfs2console/ocfs2interface/fswidgets.py ++++ b/ocfs2console/ocfs2interface/fswidgets.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/general.py b/ocfs2console/ocfs2interface/general.py +index de282799..1869020c 100644 +--- a/ocfs2console/ocfs2interface/general.py ++++ b/ocfs2console/ocfs2interface/general.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/gidlemodule.c b/ocfs2console/ocfs2interface/gidlemodule.c +index da7e90ef..b20a5ca9 100644 +--- a/ocfs2console/ocfs2interface/gidlemodule.c ++++ b/ocfs2console/ocfs2interface/gidlemodule.c +@@ -19,8 +19,8 @@ + * + * You should have recieved a copy of the GNU General Public + * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/ocfs2console/ocfs2interface/guiutil.py b/ocfs2console/ocfs2interface/guiutil.py +index 521ebcdb..774c78af 100644 +--- a/ocfs2console/ocfs2interface/guiutil.py ++++ b/ocfs2console/ocfs2interface/guiutil.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/ls.py b/ocfs2console/ocfs2interface/ls.py +index 21c15d82..84ab17b8 100644 +--- a/ocfs2console/ocfs2interface/ls.py ++++ b/ocfs2console/ocfs2interface/ls.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import stat + import pwd +diff --git a/ocfs2console/ocfs2interface/menu.py b/ocfs2console/ocfs2interface/menu.py +index ada6f689..d3c262a1 100644 +--- a/ocfs2console/ocfs2interface/menu.py ++++ b/ocfs2console/ocfs2interface/menu.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/mount.py b/ocfs2console/ocfs2interface/mount.py +index a7133937..707b211e 100644 +--- a/ocfs2console/ocfs2interface/mount.py ++++ b/ocfs2console/ocfs2interface/mount.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/nodeconfig.py b/ocfs2console/ocfs2interface/nodeconfig.py +index 4da29dec..87c224f6 100644 +--- a/ocfs2console/ocfs2interface/nodeconfig.py ++++ b/ocfs2console/ocfs2interface/nodeconfig.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import os + +diff --git a/ocfs2console/ocfs2interface/o2cb_ctl.py b/ocfs2console/ocfs2interface/o2cb_ctl.py +index cb74f76c..a44065f3 100644 +--- a/ocfs2console/ocfs2interface/o2cb_ctl.py ++++ b/ocfs2console/ocfs2interface/o2cb_ctl.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + from cStringIO import StringIO + +diff --git a/ocfs2console/ocfs2interface/o2cbmodule.c b/ocfs2console/ocfs2interface/o2cbmodule.c +index 9b2db0ae..2c4fb022 100644 +--- a/ocfs2console/ocfs2interface/o2cbmodule.c ++++ b/ocfs2console/ocfs2interface/o2cbmodule.c +@@ -19,8 +19,8 @@ + * + * You should have recieved a copy of the GNU General Public + * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/ocfs2console/ocfs2interface/ocfs2module.c b/ocfs2console/ocfs2interface/ocfs2module.c +index 18ad04cb..625682f5 100644 +--- a/ocfs2console/ocfs2interface/ocfs2module.c ++++ b/ocfs2console/ocfs2interface/ocfs2module.c +@@ -19,8 +19,8 @@ + * + * You should have recieved a copy of the GNU General Public + * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/ocfs2console/ocfs2interface/ocfsplist.c b/ocfs2console/ocfs2interface/ocfsplist.c +index aab8d75a..9dd4643f 100644 +--- a/ocfs2console/ocfs2interface/ocfsplist.c ++++ b/ocfs2console/ocfs2interface/ocfsplist.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Manish Singh + */ +diff --git a/ocfs2console/ocfs2interface/ocfsplist.h b/ocfs2console/ocfs2interface/ocfsplist.h +index bbf84622..0c733746 100644 +--- a/ocfs2console/ocfs2interface/ocfsplist.h ++++ b/ocfs2console/ocfs2interface/ocfsplist.h +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Author: Manish Singh + */ +diff --git a/ocfs2console/ocfs2interface/partitionview.py b/ocfs2console/ocfs2interface/partitionview.py +index 883e0319..8de08633 100644 +--- a/ocfs2console/ocfs2interface/partitionview.py ++++ b/ocfs2console/ocfs2interface/partitionview.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/plistmodule.c b/ocfs2console/ocfs2interface/plistmodule.c +index 11ecf9ea..cbe70efa 100644 +--- a/ocfs2console/ocfs2interface/plistmodule.c ++++ b/ocfs2console/ocfs2interface/plistmodule.c +@@ -19,8 +19,8 @@ + * + * You should have recieved a copy of the GNU General Public + * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + */ + + #include +diff --git a/ocfs2console/ocfs2interface/process.py b/ocfs2console/ocfs2interface/process.py +index 0013e03c..9527e439 100644 +--- a/ocfs2console/ocfs2interface/process.py ++++ b/ocfs2console/ocfs2interface/process.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import os + import fcntl +diff --git a/ocfs2console/ocfs2interface/pushconfig.py b/ocfs2console/ocfs2interface/pushconfig.py +index c7add2d1..2eb2ee38 100644 +--- a/ocfs2console/ocfs2interface/pushconfig.py ++++ b/ocfs2console/ocfs2interface/pushconfig.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import socket + +diff --git a/ocfs2console/ocfs2interface/terminal.py b/ocfs2console/ocfs2interface/terminal.py +index b6c07d65..f7c16210 100644 +--- a/ocfs2console/ocfs2interface/terminal.py ++++ b/ocfs2console/ocfs2interface/terminal.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/toolbar.py b/ocfs2console/ocfs2interface/toolbar.py +index ac21d586..d3c9a157 100644 +--- a/ocfs2console/ocfs2interface/toolbar.py ++++ b/ocfs2console/ocfs2interface/toolbar.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/ocfs2console/ocfs2interface/tune.py b/ocfs2console/ocfs2interface/tune.py +index 0e514bd6..e42bef9c 100644 +--- a/ocfs2console/ocfs2interface/tune.py ++++ b/ocfs2console/ocfs2interface/tune.py +@@ -13,7 +13,7 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + + import gtk + +diff --git a/python.m4 b/python.m4 +index 168ef751..f78d0f32 100644 +--- a/python.m4 ++++ b/python.m4 +@@ -19,8 +19,8 @@ + + # 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., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + +diff --git a/runlog.m4 b/runlog.m4 +index 43d68ba3..831b82a4 100644 +--- a/runlog.m4 ++++ b/runlog.m4 +@@ -12,8 +12,8 @@ + + # 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., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # AM_RUN_LOG(COMMAND) + # ------------------- +diff --git a/sizetest/sizetest.c b/sizetest/sizetest.c +index db24e120..10aec458 100644 +--- a/sizetest/sizetest.c ++++ b/sizetest/sizetest.c +@@ -17,8 +17,8 @@ + * + * 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., 59 Temple Place - Suite 330, +- * Boston, MA 021110-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301 USA. + * + * Authors: Sunil Mushran + */ +-- +2.13.6 + diff --git a/0001-Update-FSF-address-in-ipwidget.py.patch b/0001-Update-FSF-address-in-ipwidget.py.patch new file mode 100644 index 0000000..463e0aa --- /dev/null +++ b/0001-Update-FSF-address-in-ipwidget.py.patch @@ -0,0 +1,25 @@ +From 460afefe7c91b90d88e4dc0ed03f894134b9fb6a Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Tue, 6 Feb 2018 16:26:34 +0800 +Subject: [PATCH] Update FSF address in ipwidget.py + +--- + ocfs2console/ocfs2interface/ipwidget.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ocfs2console/ocfs2interface/ipwidget.py b/ocfs2console/ocfs2interface/ipwidget.py +index c4f18212..410345df 100644 +--- a/ocfs2console/ocfs2interface/ipwidget.py ++++ b/ocfs2console/ocfs2interface/ipwidget.py +@@ -11,7 +11,7 @@ + # + # You should have received a copy of the GNU Library Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + # + # Modified by Manish Singh + +-- +2.13.6 + diff --git a/0001-fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch b/0001-fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch new file mode 100644 index 0000000..ab518b0 --- /dev/null +++ b/0001-fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch @@ -0,0 +1,86 @@ +From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001 +From: Gang He +Date: Mon, 4 Sep 2017 14:08:59 +0800 +Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2, +the compile error messages like, + +In file included from /usr/include/string.h:431:0, + from ../include/ocfs2/ocfs2.h:41, + from pass4.c:32: +include/strings.h:37:1: error: unknown type name ‘errcode_t’; did you mean ‘mode_t’? + errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string, + ^~~~~~~~~ + mode_t +--- + fsck.ocfs2/Makefile | 2 +- + fsck.ocfs2/include/{strings.h => o2fsck_strings.h} | 0 + fsck.ocfs2/pass2.c | 2 +- + fsck.ocfs2/pass5.c | 2 +- + fsck.ocfs2/strings.c | 2 +- + 5 files changed, 4 insertions(+), 4 deletions(-) + rename fsck.ocfs2/include/{strings.h => o2fsck_strings.h} (100%) + +diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile +index 051ed742..baf1994d 100644 +--- a/fsck.ocfs2/Makefile ++++ b/fsck.ocfs2/Makefile +@@ -64,7 +64,7 @@ HFILES = include/fsck.h \ + include/problem.h \ + include/refcount.h \ + include/slot_recovery.h \ +- include/strings.h \ ++ include/o2fsck_strings.h \ + include/util.h + + +diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/o2fsck_strings.h +similarity index 100% +rename from fsck.ocfs2/include/strings.h +rename to fsck.ocfs2/include/o2fsck_strings.h +diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c +index 181febb9..a48a50b5 100644 +--- a/fsck.ocfs2/pass2.c ++++ b/fsck.ocfs2/pass2.c +@@ -43,7 +43,7 @@ + #include "fsck.h" + #include "pass2.h" + #include "problem.h" +-#include "strings.h" ++#include "o2fsck_strings.h" + #include "util.h" + + static const char *whoami = "pass2"; +diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c +index 5c2d899f..bfad1b72 100644 +--- a/fsck.ocfs2/pass5.c ++++ b/fsck.ocfs2/pass5.c +@@ -40,7 +40,7 @@ + #include "fsck.h" + #include "pass5.h" + #include "problem.h" +-#include "strings.h" ++#include "o2fsck_strings.h" + #include "util.h" + + static const char *whoami = "pass5"; +diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c +index 4ad37822..8a7a8d9d 100644 +--- a/fsck.ocfs2/strings.c ++++ b/fsck.ocfs2/strings.c +@@ -31,7 +31,7 @@ + #include "ocfs2/ocfs2.h" + + #include "fsck.h" +-#include "strings.h" ++#include "o2fsck_strings.h" + #include "util.h" + + struct string_entry { +-- +2.13.6 + diff --git a/0001-ocfs2console-explicitly-specified-link-libraries.patch b/0001-ocfs2console-explicitly-specified-link-libraries.patch new file mode 100644 index 0000000..5ded6cb --- /dev/null +++ b/0001-ocfs2console-explicitly-specified-link-libraries.patch @@ -0,0 +1,48 @@ +From e686b8013a14b9b28e77bf08457d426f45689e9d Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Mon, 29 Jan 2018 15:01:32 +0800 +Subject: [PATCH] ocfs2console: explicitly specified link libraries + +Signed-off-by: Robin Lee +--- + ocfs2console/ocfs2interface/Makefile | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile +index 54094559..7c7c9b1c 100644 +--- a/ocfs2console/ocfs2interface/Makefile ++++ b/ocfs2console/ocfs2interface/Makefile +@@ -19,6 +19,9 @@ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt + else + LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb + endif ++ifneq ($(BUILD_CMAP_SUPPORT),) ++LIBO2CB_LIBS += -lcmap ++endif + LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a + + ifdef HAVE_BLKID +@@ -94,16 +97,16 @@ INSTALL_RULES = install-pylib + DIST_FILES = $(PLIST_CFILES) $(PLIST_HFILES) $(GIDLE_CFILES) $(OCFS2_CFILES) $(O2CB_CFILES) $(PYSRC) $(addsuffix .in,$(BUILT_PYSRC)) + + plistmodule.so: $(PLIST_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) $(BLKID_DEPS) +- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS) ++ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(BLKID_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS) $(shell python-config --libs) + + gidlemodule.so: $(GIDLE_OBJS) +- $(LINK) -shared $(GLIB_LIBS) ++ $(LINK) -shared $(GLIB_LIBS) $(shell python-config --libs) + + ocfs2module.so: $(OCFS2_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS) +- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) ++ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS) $(shell python-config --libs) + + o2cbmodule.so: $(O2CB_OBJS) $(LIBO2CB_DEPS) +- $(LINK) -shared $(LIBO2CB_LIBS) $(COM_ERR_LIBS) ++ $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(shell python-config --libs) + + install-pylib: + $(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2interface +-- +2.13.6 + diff --git a/minor_build_fixes.diff b/minor_build_fixes.diff deleted file mode 100644 index c0e9e50..0000000 --- a/minor_build_fixes.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_controld/Makefile ---- ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile 2009-04-14 00:10:40.000000000 +0200 -+++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile 2009-09-30 08:22:04.000000000 +0200 -@@ -17,7 +17,7 @@ - PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS) - endif - --INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES) -+INCLUDES = -I/usr/include/libxml2 -I$(TOPDIR)/include -I. $(PCMK_INCLUDES) - LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb - LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a - LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2 -diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c ---- ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c 2009-05-06 03:36:57.000000000 +0200 -+++ ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c 2009-09-30 08:22:22.000000000 +0200 -@@ -22,6 +22,7 @@ - - #include - -+#include - #include - /* heartbeat support is irrelevant here */ - #undef SUPPORT_HEARTBEAT -@@ -155,7 +156,7 @@ - crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL); - - if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { -- log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE); -+ log_error("Connection to our AIS plugin (%d) failed", PCMK_SERVICE); - return -1; - } - diff --git a/no_stonithd.diff b/no_stonithd.diff deleted file mode 100644 index 72753dc..0000000 --- a/no_stonithd.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_controld/Makefile ---- ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile 2010-02-14 15:03:18.000000000 +0000 -+++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile 2010-02-14 15:03:49.000000000 +0000 -@@ -67,7 +67,7 @@ - ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS) - $(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \ - $(OPENAIS_LIBS) $(COROSYNC_LIBS) \ -- $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd -+ $(DLMCONTROL_LIBS) -lcrmcluster -lcrmcommon - - ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS) - $(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \ diff --git a/o2cb_pcmk.diff b/o2cb_pcmk.diff deleted file mode 100644 index c270a10..0000000 --- a/o2cb_pcmk.diff +++ /dev/null @@ -1,460 +0,0 @@ -diff -Nuard ocfs2-tools-1.4.2.orig/vendor/common/o2cb.ocf ocfs2-tools-1.4.2/vendor/common/o2cb.ocf ---- ocfs2-tools-1.4.2.orig/vendor/common/o2cb.ocf 1970-01-01 01:00:00.000000000 +0100 -+++ ocfs2-tools-1.4.2/vendor/common/o2cb.ocf 2009-09-15 06:30:58.000000000 +0200 -@@ -0,0 +1,456 @@ -+#!/bin/bash -+# Copyright (c) 2008 Andrew Beekhof -+# All Rights Reserved. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of version 2 of the GNU General Public License as -+# published by the Free Software Foundation. -+# -+# This program is distributed in the hope that it would be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+# -+# Further, this software is distributed without any warranty that it is -+# free of the rightful claim of any third person regarding infringement -+# or the like. Any license provided herein, whether implied or -+# otherwise, applies only to this software file. Patent licenses, if -+# any, provided herein do not apply to combinations of this program with -+# other software, or any other product whatsoever. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write the Free Software Foundation, -+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. -+# -+####################################################################### -+ -+# OCF initialization -+. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs -+ -+# Parameter defaults -+: ${OCF_RESKEY_stack:="pcmk"} -+: ${OCF_RESKEY_sysfs:="/sys/fs"} -+: ${OCF_RESKEY_daemon_timeout:="10"} -+: ${OCF_RESKEY_configfs:="/sys/kernel/config"} -+: ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"} -+ -+# Common variables -+DAEMON="/sbin/ocfs2_controld.${OCF_RESKEY_stack}" -+CLUSTER_STACK_FILE="${OCF_RESKEY_sysfs}/ocfs2/cluster_stack" -+LOADED_PLUGINS_FILE="${OCF_RESKEY_sysfs}/ocfs2/loaded_cluster_plugins" -+ -+# -+# Check to see if a filesystem driver is loaded. -+# 0 is loaded, 1 is not. -+# -+driver_filesystem() { -+ if [ -z "$1" ] -+ then -+ ocf_log err "driver_filesystem(): Missing an argument" -+ exit 1 -+ fi -+ FSNAME="$1" -+ -+ FSOUT="$(awk '(NF == 1 && $1 ~ /^'$FSNAME'$/) || $2 ~ /^'$FSNAME'$/{ -+ print $1;exit -+ }' /proc/filesystems 2>/dev/null)" -+ -+ test -n "$FSOUT" -+ return $? -+} -+ -+# -+# Check to see if a filesystem of type $1 is mounted at $2. -+# -+# 0 is mounted, 1 is not. -+# -+check_filesystem() -+{ -+ if [ "$#" != "2" -o -z "$1" -o -z "$2" ] -+ then -+ ocf_log err "check_filesystem(): Missing arguments" -+ exit 4 -+ fi -+ FSNAME="$1" -+ MOUNTPOINT="$2" -+ -+ FULL_MOUNTSEARCH="`echo "$MOUNTPOINT" | sed -e 's/\//\\\\\//g'`" -+ MOUNTOUT="`awk '$2 ~ /^'$FULL_MOUNTSEARCH'$/ && $3 ~ /^'$FSNAME'$/{print $2; exit}' < /proc/mounts 2>/dev/null`" -+ test -n "$MOUNTOUT" -+ return $? -+} -+ -+# -+# Unload a filesystem driver. -+# Be careful to notice if the driver is built-in and do nothing. -+# -+# 0 is success, 1 is error, 2 is already unloaded. -+# -+unload_filesystem() -+{ -+ if [ "$#" != "1" -o -z "$1" ] -+ then -+ ocf_log err "unload_filesystem(): Missing an argument" -+ return 1 -+ fi -+ FSNAME="$1" -+ -+ driver_filesystem "$FSNAME" || return 2 -+ -+ MODOUT="`awk '$1 ~ /^'$FSNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`" -+ if [ -z "$MODOUT" ]; then -+ # The driver is built in, we can't unload it. -+ return 0 -+ fi -+ -+ case "$MODOUT" in -+ $FSNAME\ 0) -+ ;; -+ $FSNAME\ *) -+ # The driver is busy, leave it alone -+ ocf_log err "Module $FSNAME is still in use" -+ return 1 -+ ;; -+ *) -+ ocf_log err "Invalid module parsing! " -+ return 1 -+ ;; -+ esac -+ -+ modprobe -rs "$FSNAME" -+ if [ "$?" != 0 ]; then -+ ocf_log err "Unable to unload module: $FSNAME" -+ return 1 -+ fi -+ -+ return 0 -+} -+ -+status_daemon() -+{ -+ PID=`pidof "$DAEMON"` -+ if [ -n "$PID" ]; then -+ return $OCF_SUCCESS -+ fi -+ return $OCF_NOT_RUNNING -+} -+ -+bringup_daemon() -+{ -+ if [ ! -e "$DAEMON" ]; then -+ ocf_log err "Required binary not found: $DAEMON" -+ return $OCF_ERR_INSTALLED -+ fi -+ -+ "$DAEMON"; rc=$? -+ if [ $rc != 0 ]; then -+ ocf_log err "Could not start $DAEMON" -+ return $OCF_ERR_GENERIC -+ fi -+ -+ sleep 1 -+ COUNT=0 -+ rc=$OCF_NOT_RUNNING -+ -+ while [ $rc = $OCF_NOT_RUNNING ]; do -+ COUNT=`expr $COUNT + 1` -+ if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then -+ ocf_log err "`basename $DAEMON` did not come up" -+ ps axf | grep -C 3 $$ -+ return $OCF_ERR_GENERIC -+ fi -+ status_daemon; rc=$? -+ sleep 1 -+ done -+ -+ return $rc -+} -+ -+kill_daemon() -+{ -+ status_daemon; rc=$? -+ if [ $rc != $OCF_SUCCESS ]; then -+ return $rc -+ fi -+ -+ ocf_log info "Stopping `basename "$DAEMON"`" -+ killproc "$DAEMON" -+ -+ while [ $rc = $OCF_NOT_RUNNING ]; do -+ sleep 1 -+ status_daemon; rc=$? -+ done -+ -+ return $OCF_SUCCESS -+} -+ -+# -+# Unload a module -+# 0 is success, 1 is error, 2 is not loaded -+# -+unload_module() -+{ -+ if [ "$#" -lt "1" -o -z "$1" ] -+ then -+ ocf_log err "unload_module(): Requires an argument" -+ return 1 -+ fi -+ MODNAME="$1" -+ -+ MODOUT="`awk '$1 ~ /^'$MODNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`" -+ if [ -z "$MODOUT" ] -+ then -+ return 2 -+ fi -+ -+ case "$MODOUT" in -+ $MODNAME\ 0) -+ ;; -+ $MODNAME\ *) -+ return 2 -+ ;; -+ *) -+ ocf_log err "Invalid module parsing!" -+ return 1 -+ ;; -+ esac -+ -+ modprobe -rs "$MODNAME" -+ if [ "$?" != 0 ]; then -+ ocf_log err "Unable to unload module \"$MODNAME\"" -+ return 1 -+ fi -+ -+ return 0 -+} -+ -+o2cb_start() { -+ -+ o2cb_monitor; rc=$? -+ if [ $rc != $OCF_NOT_RUNNING ]; then -+ return $rc -+ fi -+ -+ ocf_log info "Starting $OCF_RESOURCE_INSTANCE" -+ -+ if [ ! -e "$CLUSTER_STACK_FILE" ]; then -+ modprobe -s ocfs2_stackglue -+ if [ $? != 0 ]; then -+ ocf_log err "Could not load ocfs2_stackglue" -+ return $OCF_ERR_INSTALLED -+ fi -+ fi -+ -+ SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)" -+ if [ -z "$SP_OUT" ] -+ then -+ modprobe -s ocfs2_stack_user -+ if [ $? != 0 ]; then -+ ocf_log err "Could not load ocfs2_stack_user" -+ return $OCF_ERR_INSTALLED -+ fi -+ fi -+ -+ SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)" -+ if [ -z "$SP_OUT" ]; then -+ ocf_log err "Switch to userspace stack unsuccessful" -+ return $OCF_ERR_INSTALLED -+ fi -+ -+ if [ -f "$CLUSTER_STACK_FILE" ]; then -+ echo "$OCF_RESKEY_stack" >"$CLUSTER_STACK_FILE" -+ if [ $? != 0 ]; then -+ ocf_log err "Userspace stack '$OCF_RESKEY_stack' not supported" -+ return $OCF_ERR_INSTALLED -+ fi -+ else -+ ocf_log err "Switch to userspace stack not supported" -+ return $OCF_ERR_INSTALLED -+ fi -+ -+ driver_filesystem ocfs2; rc=$? -+ if [ $rc != 0 ]; then -+ modprobe -s ocfs2 -+ if [ "$?" != 0 ]; then -+ ocf_log err "Unable to load ocfs2 module" -+ return $OCF_ERR_INSTALLED -+ fi -+ fi -+ -+ bringup_daemon -+ return $? -+} -+ -+o2cb_stop() { -+ o2cb_monitor; rc=$? -+ case $rc in -+ $OCF_NOT_RUNNING) return $OCF_SUCCESS;; -+ esac -+ -+ ocf_log info "Stopping $OCF_RESOURCE_INSTANCE" -+ -+ kill_daemon -+ if [ $? != 0 ]; then -+ ocf_log err "Unable to unload modules: the cluster is still online" -+ return $OCF_ERR_GENERIC -+ fi -+ -+ unload_filesystem ocfs2 -+ if [ $? = 1 ]; then -+ ocf_log err "Unable to unload ocfs2 module" -+ return $OCF_ERR_GENERIC -+ fi -+ -+ # If we can't find the stack glue, we have nothing to do. -+ [ ! -e "$LOADED_PLUGINS_FILE" ] && return $OCF_SUCCESS -+ -+ while read plugin -+ do -+ unload_module "ocfs2_stack_${plugin}" -+ if [ $? = 1 ]; then -+ ocf_log err "Unable to unload ocfs2_stack_${plugin}" -+ return $OCF_ERR_GENERIC -+ fi -+ done <"$LOADED_PLUGINS_FILE" -+ -+ unload_module "ocfs2_stackglue" -+ if [ $? = 1 ]; then -+ ocf_log err "Unable to unload ocfs2_stackglue" -+ return $OCF_ERR_GENERIC -+ fi -+ -+ # Dont unmount configfs - its always in use by libdlm -+} -+ -+o2cb_monitor() { -+ o2cb_validate -+ -+ # Assume that ocfs2_controld will terminate if any of the conditions below are met -+ -+ driver_filesystem configfs; rc=$? -+ if [ $rc != 0 ]; then -+ ocf_log info "configfs not laoded" -+ return $OCF_NOT_RUNNING -+ fi -+ -+ check_filesystem configfs "${OCF_RESKEY_configfs}"; rc=$? -+ if [ $rc != 0 ]; then -+ ocf_log info "configfs not mounted" -+ return $OCF_NOT_RUNNING -+ fi -+ -+ if [ ! -e "$LOADED_PLUGINS_FILE" ]; then -+ ocf_log info "Stack glue driver not loaded" -+ return $OCF_NOT_RUNNING -+ fi -+ -+ grep user "$LOADED_PLUGINS_FILE" >/dev/null 2>&1; rc=$? -+ if [ $rc != 0 ]; then -+ ocf_log err "Wrong stack `cat $LOADED_PLUGINS_FILE`" -+ return $OCF_ERR_INSTALLED -+ fi -+ -+ driver_filesystem ocfs2; rc=$? -+ if [ $rc != 0 ]; then -+ ocf_log info "ocfs2 not loaded" -+ return $OCF_NOT_RUNNING -+ fi -+ -+ status_daemon -+ return $? -+} -+ -+o2cb_usage() { -+ echo "usage: $0 {start|stop|monitor|validate-all|meta-data}" -+ echo " Expects to have a fully populated OCF RA-compliant environment set." -+ echo " In particualr, a value for OCF_ROOT" -+} -+ -+o2cb_validate() { -+ : TODO: check for gloablly_unique=true and return OCF_ERR_CONFIGURED -+ case ${OCF_RESKEY_CRM_meta_gloablly_unique} in -+ yes|Yes|true|True|1) -+ ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the gloablly_unique=false meta attribute" -+ exit $OCF_ERR_CONFIGURED -+ ;; -+ esac -+ -+ return $OCF_SUCCESS -+} -+ -+meta_data() { -+ cat < -+ -+ -+ 1.0 -+ o2cb resource agent -+ -+This is a o2cb Resource Agent. It runs o2cb daemon as a instance of anonymous clone. -+ -+ -+ -+ -+ -+Location where sysfs is mounted -+ -+ Sysfs location -+ -+ -+ -+ -+ -+Location where configfs is mounted -+ -+ Configfs location -+ -+ -+ -+ -+ -+Which userspace stack to use. Known values: pcmk, cman -+ -+ Userspace stack -+ -+ -+ -+ -+ -+Number of seconds to allow the control daemon to come up -+ -+ Daemon Timeout -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+END -+} -+ -+case $__OCF_ACTION in -+meta-data) meta_data -+ exit $OCF_SUCCESS -+ ;; -+start) o2cb_start -+ ;; -+stop) o2cb_stop -+ ;; -+monitor) o2cb_monitor -+ ;; -+validate-all) o2cb_validate -+ ;; -+usage|help) o2cb_usage -+ exit $OCF_SUCCESS -+ ;; -+*) o2cb_usage -+ exit $OCF_ERR_UNIMPLEMENTED -+ ;; -+esac -+ -+exit $? diff --git a/ocfs2-tools-1.8.5-format-fortify.patch b/ocfs2-tools-1.8.5-format-fortify.patch new file mode 100644 index 0000000..f8ab313 --- /dev/null +++ b/ocfs2-tools-1.8.5-format-fortify.patch @@ -0,0 +1,13 @@ +diff --git a/tunefs.ocfs2/op_query.c b/tunefs.ocfs2/op_query.c +index 295c185b..40394d15 100644 +--- a/tunefs.ocfs2/op_query.c ++++ b/tunefs.ocfs2/op_query.c +@@ -339,7 +339,7 @@ static int query_run(struct tunefs_operation *op, ocfs2_filesys *fs, + register_printf_function('O', handle_ro_compat, handle_arginfo); + + query_fs = fs; +- fprintf(stdout, fmt); ++ fprintf(stdout, fmt, "dummy"); + query_fs = NULL; + + ocfs2_free(&fmt); diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index a361963..e1452c8 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -1,144 +1,151 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - %global with_console %{?_without_console: 0} %{?!_without_console: 1} -## define alphatag 20080221git -Summary: Tools for managing the Ocfs2 cluster file system +Summary: Tools for managing the Oracle Cluster Filesystem 2 Name: ocfs2-tools -Version: 1.6.3 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Version: 1.8.5 +Release: 3%{?dist} License: GPLv2 -Group: System Environment/Base -Source0: http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.6/%{name}-%{version}.tar.gz -Patch0: minor_build_fixes.diff -Patch1: o2cb_pcmk.diff -Patch2: no_stonithd.diff -URL: http://oss.oracle.com/projects/ocfs2-tools/ -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires: bash, coreutils, net-tools, modutils -Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3 -Requires: redhat-lsb +Source0: https://github.com/markfasheh/%{name}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +# applied in upstream git 0ffd58b2 +Patch0: 0001-fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch +# https://github.com/markfasheh/ocfs2-tools/issues/18#issuecomment-360449375 +Patch1: ocfs2-tools-1.8.5-format-fortify.patch +# applied in upstream git e686b801 +Patch2: 0001-ocfs2console-explicitly-specified-link-libraries.patch +# applied in upstream git 70aec706 +Patch3: 0001-Update-FSF-address-in-GPL2-license.patch +# patch3 missed a single file ipwidget.py +# applied in upstream git 460afefe +Patch4: 0001-Update-FSF-address-in-ipwidget.py.patch +URL: https://github.com/markfasheh/ocfs2-tools +Requires: bash +Requires: coreutils +Requires: net-tools +Requires: util-linux +Requires: e2fsprogs +Requires: glib2 >= 2.2.3 Provides: ocfs2-tools-pcmk = %{version} Obsoletes: ocfs2-tools-pcmk < 1.6.3-1 -BuildRequires: libuuid-devel, libcom_err-devel, libblkid-devel -BuildRequires: glib2-devel >= 2.2.3, compat-readline5-devel -BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5, desktop-file-utils -BuildRequires: corosynclib-devel, openaislib-devel, clusterlib-devel - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: autoconf, automake +%{?systemd_requires} +BuildRequires: systemd +BuildRequires: libuuid-devel +BuildRequires: libcom_err-devel +BuildRequires: libblkid-devel +BuildRequires: glib2-devel >= 2.2.3 +BuildRequires: readline-devel +BuildRequires: pacemaker-libs-devel +BuildRequires: dlm-devel +BuildRequires: libaio-devel +BuildRequires: pygtk2 >= 1.99.16 +BuildRequires: python2-devel >= 2.5 +BuildRequires: corosynclib-devel %description -Programs to manage the Ocfs2 cluster file system, including mkfs.ocfs2, +Programs to manage the OCFS2 cluster file system, including mkfs.ocfs2, tunefs.ocfs2 and fsck.ocfs2. -Ocfs2 is a general purpose extent based shared disk cluster file +OCFS2 is a general purpose extent based shared disk cluster file system. It supports 64 bit inode numbers, and has automatically extending metadata groups which may also make it attractive for -non-clustered use. Ocfs2 leverages some well tested kernel +non-clustered use. OCFS2 leverages some well tested kernel technologies, such as JBD - the same journaling subsystem in use by ext3. %if %{with_console} %package -n ocfs2console -Summary: GUI frontend for Ocfs2 management -Group: System Environment/Kernel -Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, pygtk2 >= 1.99.16 -Requires: python >= 2.5, %{name} = %{version}-%{release} +Summary: GUI frontend for OCFS2 management +Requires: e2fsprogs +Requires: glib2 >= 2.2.3 +Requires: vte >= 0.11.10 +Requires: pygtk2 >= 1.99.16 +Requires: python >= 2.5 +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n ocfs2console -Ocfs2console can make it easier to manage an Ocfs2 cluster by +ocfs2console can make it easier to manage an OCFS2 cluster by providing a gui front-end to common tasks, including initial cluster -setup. In addition to cluster setup, Ocfs2console can format and -mount Ocfs2 volumes. +setup. In addition to cluster setup, ocfs2console can format and +mount OCFS2 volumes. %endif %package devel Summary: Headers and static archives for ocfs2-tools -Group: Development/Libraries -Requires: e2fsprogs-devel, glib2-devel >= 2.2.3, pkgconfig -Requires: %{name} = %{version}-%{release} -Provides: %{name}-static = %{version}-%{release} +Requires: e2fsprogs-devel +Requires: glib2-devel >= 2.2.3 +Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %description devel ocfs2-tools-devel contains the libraries and header files needed to -develop Ocfs2 filesystem-specific programs. - -%package cman -Summary: Tools for managing the Ocfs2 cluster file system (cman component) -Group: System Environment/Base -Requires: cman >= 3.0.0-1 -Requires: %{name} = %{version}-%{release} - -%description cman -ocfs2-tools-cman contains the daemon required to use Ocfs2 with -cman cluster manager +develop OCFS2 filesystem-specific programs. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} +%patch3 -p1 +%patch4 -p1 %patch0 -p1 %patch1 -p1 %patch2 -p1 +# remove -Wno-format to prevent conflict with rpm optflags +sed -i -e 's/-Wno-format//g' {o2info,o2image,o2monitor}/Makefile %build -export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5" +./autogen.sh %{configure} \ -%if ! %{with_console} - --enable-ocfs2console=no \ +%if %{with_console} + --enable-ocfs2console=yes \ %endif --enable-dynamic-fsck=yes -# parallel build currently fails, so no %{_smp_mflags} +# parallel build currently fails, so no %%{_smp_mflags} CFLAGS="$(echo '%{optflags}')" make %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%make_install -mkdir -p %{buildroot}/%{_initrddir} -cp -f vendor/common/o2cb.init %{buildroot}/%{_initrddir}/o2cb -cp -f vendor/common/ocfs2.init %{buildroot}/%{_initrddir}/ocfs2 -mkdir -p %{buildroot}/etc/sysconfig -cp -f vendor/common/o2cb.sysconfig %{buildroot}/etc/sysconfig/o2cb -mkdir -p %{buildroot}/etc/udev/rules.d -cp -f vendor/common/51-ocfs2.rules \ - %{buildroot}/etc/udev/rules.d/51-ocfs2.rules -mkdir -p %{buildroot}/usr/lib/ocf/resource.d/ocfs2 -cp -f vendor/common/o2cb.ocf \ - %{buildroot}/usr/lib/ocf/resource.d/ocfs2/o2cb -chmod 0755 %{buildroot}/usr/lib/ocf/resource.d/ocfs2/o2cb +mkdir -p %{buildroot}%{_sysconfdir}/ocfs2 +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +cp -p vendor/common/o2cb.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/o2cb +mkdir -p %{buildroot}%{_udevrulesdir} +cp -p vendor/common/51-ocfs2.rules \ + %{buildroot}%{_udevrulesdir} -rm -f %{buildroot}/sbin/ocfs2_controld.pcmk +# for systemd +mkdir -p %{buildroot}/sbin +cp -p vendor/common/{o2cb,ocfs2}.init %{buildroot}/sbin +mkdir -p %{buildroot}%{_unitdir} +cp -p vendor/common/{o2cb,ocfs2}.service %{buildroot}%{_unitdir} +sed -i -e 's/network\.service/network-online.target/' %{buildroot}%{_unitdir}/o2cb.service -chmod 644 $RPM_BUILD_ROOT/%{_libdir}/*.a +chmod 644 %{buildroot}/%{_libdir}/*.a %if %{with_console} -%{__python} -c "import compileall; compileall.compile_dir('%{buildroot}/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')" # rpm autostripper needs to see these as executable chmod 755 %{buildroot}/%{python_sitearch}/ocfs2interface/*.so %endif -%clean -rm -rf %{buildroot} %post -/sbin/chkconfig --add o2cb -/sbin/chkconfig --add ocfs2 +%systemd_post {o2cb,ocfs2}.service %preun -if [ $1 = 0 ]; then # execute this only if we are NOT doing an upgrade - /sbin/service ocfs2 stop >/dev/null 2>&1 || : - /sbin/service o2cb stop >/dev/null 2>&1 || : - /sbin/chkconfig --del ocfs2 - /sbin/chkconfig --del o2cb -fi +%systemd_preun {o2cb,ocfs2}.service + +%postun +%systemd_postun {o2cb,ocfs2}.service + %files -%defattr(-,root,root,-) -%doc README.O2CB COPYING CREDITS MAINTAINERS +%doc README.O2CB CREDITS MAINTAINERS %doc documentation/users_guide.txt +%license COPYING +/sbin/o2cb +/sbin/o2cluster +%{_sbindir}/o2hbmonitor +%{_bindir}/o2info /sbin/fsck.ocfs2 /sbin/mkfs.ocfs2 /sbin/mounted.ocfs2 @@ -148,27 +155,17 @@ fi /sbin/mount.ocfs2 /sbin/ocfs2_hb_ctl /sbin/o2image -%{_initrddir}/o2cb -%{_initrddir}/ocfs2 -%config(noreplace) /etc/udev/rules.d/51-ocfs2.rules -%config(noreplace) /etc/sysconfig/o2cb -%{_mandir}/man7/o2cb.7.gz -%{_mandir}/man8/debugfs.ocfs2.8.gz -%{_mandir}/man8/fsck.ocfs2.8.gz -%{_mandir}/man8/fsck.ocfs2.checks.8.gz -%{_mandir}/man8/mkfs.ocfs2.8.gz -%{_mandir}/man8/tunefs.ocfs2.8.gz -%{_mandir}/man8/mount.ocfs2.8.gz -%{_mandir}/man8/mounted.ocfs2.8.gz -%{_mandir}/man8/o2cb_ctl.8.gz -%{_mandir}/man8/ocfs2_hb_ctl.8.gz -%{_mandir}/man8/o2image.8.gz -%dir %{_prefix}/lib/ocf/resource.d/ocfs2 -%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb +/sbin/o2cb.init +/sbin/ocfs2.init +%{_unitdir}/o2cb.service +%{_unitdir}/ocfs2.service +%{_sysconfdir}/ocfs2 +%{_udevrulesdir}/51-ocfs2.rules +%config(noreplace) %{_sysconfdir}/sysconfig/o2cb +%{_mandir}/man*/* %if %{with_console} %files -n ocfs2console -%defattr(-,root,root,-) %dir %{python_sitearch}/ocfs2interface %{python_sitearch}/ocfs2interface/* %{_sbindir}/ocfs2console @@ -176,7 +173,6 @@ fi %endif %files devel -%defattr(-,root,root,-) %{_libdir}/*.a %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/ocfs2-kernel @@ -188,11 +184,23 @@ fi %{_includedir}/o2dlm/* %{_includedir}/ocfs2/* -%files cman -%defattr(-,root,root,-) -/sbin/ocfs2_controld.cman - %changelog +* Tue Feb 6 2018 Robin Lee - 1.8.5-3 +- Remove Group tags +- Fix FSF address in files +- Move udev rule to %%{_udevrulesdir} +- Add needed %%{?_isa} +- BR python2-devel + +* Mon Jan 29 2018 Robin Lee - 1.8.5-2 +- Fix build for f28 +- Move COPYING to %%license +- Use %%make_install +- one BR or R per line + +* Tue Mar 28 2017 Robin Lee - 1.8.5-1 +- Update to 1.8.5 + * Tue Feb 08 2011 Fedora Release Engineering - 1.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index dc87300..f267342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -935278d269cb86bdaa6a638f37bdd68e ocfs2-tools-1.6.3.tar.gz +SHA512 (ocfs2-tools-1.8.5.tar.gz) = 94153af0570dafd60c4f6eb31d53ad222ec1e001acb1b29333cef3eafd0a134921566b8dcbd148b4b4af8067dd7419d5bd8d8cd3fef87ab0efcc6c8fb304d22d