Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 pmdk (1.8~rc1-2) experimental; urgency=medium
 .
   * Pick pre-release fixes.
   * Re-enable out_err_mt tests.
Author: Adam Borowski <kilobyte@angband.pl>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2020-01-21

--- pmdk-1.8~rc1.orig/CONTRIBUTING.md
+++ pmdk-1.8~rc1/CONTRIBUTING.md
@@ -10,8 +10,8 @@ There are several good ways to suggest n
 or just begin a dialog about the Persistent Memory Development Kit:
 
 * Open an issue in our [GitHub Issues Database](https://github.com/pmem/issues/issues)
-* Suggest a feature, ask a question, start a discussion, etc. in our [pmem Google group](http://groups.google.com/group/pmem)
-* Chat with members of the PMDK team real-time on the **#pmem** IRC channel on [OFTC](http://www.oftc.net)
+* Suggest a feature, ask a question, start a discussion, etc. in our [pmem Google group](https://groups.google.com/group/pmem)
+* Chat with members of the PMDK team real-time on the **#pmem** IRC channel on [OFTC](https://www.oftc.net)
 
 **NOTE: If you do decide to implement code changes and contribute them,
 please make sure you agree your contribution can be made available
@@ -64,7 +64,7 @@ Please feel free to use the forums menti
 for comments & questions on your code before submitting
 a pull request.  The Persistent Memory Development Kit project uses the common
 *fork and merge* workflow used by most GitHub-hosted projects.
-The [Git Workflow blog article](http://pmem.io/2014/09/09/git-workflow.html)
+The [Git Workflow blog article](https://pmem.io/2014/09/09/git-workflow.html)
 describes our workflow in more detail.
 
 #### Linux/FreeBSD
@@ -99,7 +99,7 @@ On Windows to check the code for style i
 
 To check or format C++ files, you may use a standalone Visual Studio plugin
 for clang-format.  The plugin installer can be downloaded from
-[LLVM Builds](http://llvm.org/builds) page.
+[LLVM Builds](https://llvm.org/builds) page.
 
 If you are actively working on an PMDK feature, please let other
 developers know by [creating an issue](https://github.com/pmem/issues/issues).
--- pmdk-1.8~rc1.orig/ChangeLog
+++ pmdk-1.8~rc1/ChangeLog
@@ -1,41 +1,41 @@
 Fri Jan 17 2020 Marcin Ślusarz <marcin.slusarz@intel.com>
 
-    * Version 1.8-rc1
+	* Version 1.8-rc1
 
-    This release:
-    - Introduces new API in libpmemobj for user-assisted defragmentation
-      (see pmemobj_defrag man page for details).
-    - Introduces experimental support for PPC64LE architecture.
-    - Introduces new flag in libpmemobj for opting-out of transaction aborts
-      on failure (POBJ_TX_NO_ABORT), along with new variants of existing APIs
-      that didn't accept flags (pmemobj_tx_xfree, pmemobj_tx_xpublish,
-      pmemobj_tx_xlock, pmemobj_tx_xlog_append_buffer, pmemobj_tx_xstrdup,
-      pmemobj_tx_xwcsdup).
-    - Moves out libvmem and libvmmalloc to the new repository
-      (https://github.com/pmem/vmem).
-
-    Other changes:
-    - obj: introduce new statistics useful for defrag
-    - obj: introduce transient/persistent statistics enabling
-    - obj: introduce pmemobj_tx_(set/get)_user_data funcs
-    - obj: introduce pmemobj_(set/get)_user_data funcs
-    - obj: disable workaround for offsetof() since VS 15.5 in public header
-    - common: drop support for libndctl < 63 on Linux
-    - pool: rename -N --no-exec to -d --dry-run
-
-    Notable bug fixes:
-    - obj: fix potential NULL-dereference in ulog_store
-    - obj: fix unintended recursive locking during palloc
-    - obj: fix lock release order in palloc publish
-    - obj: fix transient redo log of more than 64 entries
-    - obj: fix capacity ulog calculation
-    - obj: fix check of unaligned capacity size
-    - rpmem: add a missing case for GPSPM + FLUSH_STRICT
-    - pmem: fix pmemcheck support on platforms with eADR
-    - pool: fix possible memory leak
-    - rpmem: fix possible memory leak in rpmemd_config_read
-    - rpmem: fix possible memory leak in rpmemd_log_init
-    - rpmem: fix possible use-after-free
+	This release:
+	- Introduces new API in libpmemobj for user-assisted defragmentation
+	  (see pmemobj_defrag man page for details).
+	- Introduces experimental support for PPC64LE architecture.
+	- Introduces new flag in libpmemobj for opting-out of transaction aborts
+	  on failure (POBJ_TX_NO_ABORT), along with new variants of existing APIs
+	  that didn't accept flags (pmemobj_tx_xfree, pmemobj_tx_xpublish,
+	  pmemobj_tx_xlock, pmemobj_tx_xlog_append_buffer, pmemobj_tx_xstrdup,
+	  pmemobj_tx_xwcsdup).
+	- Moves out libvmem and libvmmalloc to the new repository
+	  (https://github.com/pmem/vmem).
+
+	Other changes:
+	- obj: introduce new statistics useful for defrag
+	- obj: introduce transient/persistent statistics enabling
+	- obj: introduce pmemobj_tx_(set/get)_user_data funcs
+	- obj: introduce pmemobj_(set/get)_user_data funcs
+	- obj: disable workaround for offsetof() since VS 15.5 in public header
+	- common: drop support for libndctl < 63 on Linux
+	- pool: rename -N --no-exec to -d --dry-run
+
+	Notable bug fixes:
+	- obj: fix potential NULL-dereference in ulog_store
+	- obj: fix unintended recursive locking during palloc
+	- obj: fix lock release order in palloc publish
+	- obj: fix transient redo log of more than 64 entries
+	- obj: fix capacity ulog calculation
+	- obj: fix check of unaligned capacity size
+	- rpmem: add a missing case for GPSPM + FLUSH_STRICT
+	- pmem: fix pmemcheck support on platforms with eADR
+	- pool: fix possible memory leak
+	- rpmem: fix possible memory leak in rpmemd_config_read
+	- rpmem: fix possible memory leak in rpmemd_log_init
+	- rpmem: fix possible use-after-free
 
 Mon Sep 30 2019 Marcin Ślusarz <marcin.slusarz@intel.com>
 
@@ -285,7 +285,7 @@ Fri Oct 26 2018 Marcin Ślusarz <marcin.
 	changed, which means that old pools have to be converted using pmdk-convert.
 	libpmemcto experiment has been finished and removed from the tree.
 
-	For more details, please see http://pmem.io/2018/10/22/release-1-5.html.
+	For more details, please see https://pmem.io/2018/10/22/release-1-5.html.
 
 	New features:
 	- common: unsafe shutdown detection (SDS)
@@ -382,7 +382,7 @@ Thu Mar 29 2018 Krzysztof Czurylo <krzys
 	and it does not affect the names of the PMDK packages.
 	See this blog article for more details on the reasons and
 	impact of the name change:
-	http://pmem.io/2017/12/11/NVML-is-now-PMDK.html
+	https://pmem.io/2017/12/11/NVML-is-now-PMDK.html
 
 	New features:
 	- common: support for concatenated Device-DAX devices
@@ -631,7 +631,7 @@ Thu Dec 15 2016 Krzysztof Czurylo <krzys
 	  or if the user does not want to use the file system for some reason.
 	- Add a package for libpmemobj C++ bindings.
 	  C++ API is no longer considered experimental.
-	  Web-based documentation for C++ API is available on http://pmem.io.
+	  Web-based documentation for C++ API is available on https://pmem.io.
 	- Add "sync" and "transform" commands to pmempool utility.
 	  The "sync" command allows one to recover missing or corrupted part(s)
 	  of a pool set from a healthy replica, while the "transform" command
@@ -704,7 +704,7 @@ Thu Jun 23 2016 Krzysztof Czurylo <krzys
 
 	Experimental features:
 	- Implementation of C++ bindings for libpmempobj is complete.
-	  Web-based documentation for C++ API is available on http://pmem.io.
+	  Web-based documentation for C++ API is available on https://pmem.io.
 	  Note that C++ API is still considered experimental.  Do not use it
 	  in production environments.
 	- Porting NVML to Windows is in progress.  There are MS Visual Studio
--- /dev/null
+++ pmdk-1.8~rc1/GIT_VERSION
@@ -0,0 +1 @@
+$Format:%h %d$
\ No newline at end of file
--- pmdk-1.8~rc1.orig/README.md
+++ pmdk-1.8~rc1/README.md
@@ -7,7 +7,7 @@
 [![PMDK release version](https://img.shields.io/github/release/pmem/pmdk.svg?sort=semver)](https://github.com/pmem/pmdk/releases/latest)
 [![Coverage Status](https://codecov.io/github/pmem/pmdk/coverage.svg?branch=master)](https://codecov.io/gh/pmem/pmdk/branch/master)
 
-The **Persistent Memory Development Kit (PMDK)** is a collection of libraries and tools for System Administrators and Application Developers to simplify managing and accessing persistent memory devices. For more information, see http://pmem.io.
+The **Persistent Memory Development Kit (PMDK)** is a collection of libraries and tools for System Administrators and Application Developers to simplify managing and accessing persistent memory devices. For more information, see https://pmem.io.
 
 To install PMDK libraries, either install pre-built packages, which we build for every stable release, or clone the tree and build it yourself. **Pre-built** packages can be found in popular Linux distribution package repositories, or you can check out our recent stable releases on our [github release page](https://github.com/pmem/pmdk/releases). Specific installation instructions are outlined below.
 
@@ -35,26 +35,26 @@ Bugs and feature requests for this repo
 
 ## Libraries and Utilities
 Available Libraries:
-- [libpmem](http://pmem.io/pmdk/libpmem/):  provides low level persistent memory support
+- [libpmem](https://pmem.io/pmdk/libpmem/):  provides low level persistent memory support
 
-- [libpmemobj](http://pmem.io/pmdk/libpmemobj/):  provides a transactional object store, providing memory allocation, transactions, and general facilities for persistent memory programming.
+- [libpmemobj](https://pmem.io/pmdk/libpmemobj/):  provides a transactional object store, providing memory allocation, transactions, and general facilities for persistent memory programming.
 
-- [libpmemblk](http://pmem.io/pmdk/libpmemblk/):  supports arrays of pmem-resident blocks, all the same size, that are atomically updated.
+- [libpmemblk](https://pmem.io/pmdk/libpmemblk/):  supports arrays of pmem-resident blocks, all the same size, that are atomically updated.
 
-- [libpmemlog](http://pmem.io/pmdk/libpmemlog/):  provides a pmem-resident log file.
+- [libpmemlog](https://pmem.io/pmdk/libpmemlog/):  provides a pmem-resident log file.
 
-- [libpmempool](http://pmem.io/pmdk/libpmempool/):  provides support for off-line pool management and diagnostics.
+- [libpmempool](https://pmem.io/pmdk/libpmempool/):  provides support for off-line pool management and diagnostics.
 
-- [librpmem](http://pmem.io/pmdk/librpmem/)<sup>1</sup>:  provides low-level support for remote access to persistent memory utilizing RDMA-capable RNICs.
+- [librpmem](https://pmem.io/pmdk/librpmem/)<sup>1</sup>:  provides low-level support for remote access to persistent memory utilizing RDMA-capable RNICs.
 
 If you're looking for *libvmem* and *libvmmalloc*, they have been moved to a
 [separate repository](https://github.com/pmem/vmem).
 
 Available Utilities:
 
-- [pmempool](http://pmem.io/pmdk/pmempool/): Manage and analyze persistent memory pools with this stand-alone utility
+- [pmempool](https://pmem.io/pmdk/pmempool/): Manage and analyze persistent memory pools with this stand-alone utility
 
-- [pmemcheck](http://pmem.io/2015/07/17/pmemcheck-basic.html): Use dynamic runtime analysis with an enhanced version of Valgrind for use with persistent memory.
+- [pmemcheck](https://pmem.io/2015/07/17/pmemcheck-basic.html): Use dynamic runtime analysis with an enhanced version of Valgrind for use with persistent memory.
 
 Currently these libraries only work on 64-bit Linux, Windows<sup>2</sup>, and 64-bit FreeBSD 11+<sup>3</sup>.
 For information on how these libraries are licensed, see our [LICENSE](LICENSE) file.
@@ -380,4 +380,4 @@ are only validated to "early access" qua
 For more information on this library, contact
 Marcin Slusarz (marcin.slusarz@intel.com),
 Andy Rudoff (andy.rudoff@intel.com), or post to our
-[Google group](http://groups.google.com/group/pmem).
+[Google group](https://groups.google.com/group/pmem).
--- pmdk-1.8~rc1.orig/doc/Makefile
+++ pmdk-1.8~rc1/doc/Makefile
@@ -103,7 +103,8 @@ MANPAGES_3_DUMMY = libpmem/pmem_drain.3
 		   libpmemobj/pmemobj_next.3 libpmemobj/pobj_first_type_num.3 libpmemobj/pobj_first.3 libpmemobj/pobj_next_type_num.3 libpmemobj/pobj_next.3 libpmemobj/pobj_foreach.3 libpmemobj/pobj_foreach_safe.3 libpmemobj/pobj_foreach_type.3 libpmemobj/pobj_foreach_safe_type.3 \
 		   libpmemobj/pmemobj_root_construct.3 libpmemobj/pobj_root.3 libpmemobj/pmemobj_root_size.3 \
 		   libpmemobj/pmemobj_check_version.3 libpmemobj/pmemobj_check.3 libpmemobj/pmemobj_errormsg.3 libpmemobj/pmemobj_set_funcs.3 \
-		   libpmemobj/pmemobj_reserve.3 libpmemobj/pmemobj_xreserve.3 libpmemobj/pmemobj_defer_free.3 libpmemobj/pmemobj_set_value.3 libpmemobj/pmemobj_publish.3 libpmemobj/pmemobj_tx_publish.3 libpmemobj/pmemobj_tx_xpublish.3 libpmemobj/pmemobj_cancel.3 libpmemobj/pobj_reserve_new.3 libpmemobj/pobj_reserve_alloc.3 libpmemobj/pobj_xreserve_new.3 libpmemobj/pobj_xreserve_alloc.3
+		   libpmemobj/pmemobj_reserve.3 libpmemobj/pmemobj_xreserve.3 libpmemobj/pmemobj_defer_free.3 libpmemobj/pmemobj_set_value.3 libpmemobj/pmemobj_publish.3 libpmemobj/pmemobj_tx_publish.3 libpmemobj/pmemobj_tx_xpublish.3 libpmemobj/pmemobj_cancel.3 libpmemobj/pobj_reserve_new.3 libpmemobj/pobj_reserve_alloc.3 libpmemobj/pobj_xreserve_new.3 libpmemobj/pobj_xreserve_alloc.3 \
+		   libpmemobj/pmemobj_defrag.3 libpmemobj/pmemobj_get_user_data.3 libpmemobj/pmemobj_set_user_data.3 libpmemobj/pmemobj_tx_get_user_data.3 libpmemobj/pmemobj_tx_set_user_data.3
 
 MANPAGES_WEBDIR_LINUX = web_linux
 MANPAGES_WEBDIR_WINDOWS = web_windows
@@ -236,7 +237,7 @@ $(MANPAGES_WEBDIR_LINUX) $(MANPAGES_WEBD
 
 html: $(HTMLFILES)
 
-web: | $(MANPAGES_WEBDIR_LINUX) $(MANPAGES_WEBDIR_WINDOWS)
+web: $(MANPAGES) | $(MANPAGES_WEBDIR_LINUX) $(MANPAGES_WEBDIR_WINDOWS)
 	$(MAKE) -C generated all
 	$(foreach f, $(MANPAGES_7_MD), WEB=1 WIN32="" ../utils/md2man.sh $(f) default.man $(MANPAGES_WEBDIR_LINUX)/$(f);)
 	$(foreach f, $(MANPAGES_5_MD), WEB=1 WIN32="" ../utils/md2man.sh $(f) default.man $(MANPAGES_WEBDIR_LINUX)/$(f);)
--- pmdk-1.8~rc1.orig/doc/README
+++ pmdk-1.8~rc1/doc/README
@@ -5,7 +5,7 @@ This is doc/README.
 Subdirectories of this directory contain source for the man pages for the
 Persistent Memory Development Kit in markdown format (.md files).
 If you're looking for documentation to
-get you started using PMDK, start here: http://pmem.io/pmdk and follow the
+get you started using PMDK, start here: https://pmem.io/pmdk and follow the
 links to examples and man pages. Developers new to PMDK are probably looking
 for libpmemobj.
 
--- pmdk-1.8~rc1.orig/doc/daxio/daxio.1.md
+++ pmdk-1.8~rc1/doc/daxio/daxio.1.md
@@ -129,4 +129,4 @@ Prints synopsis and list of options.
 # SEE ALSO #
 
 **daxctl**(1), **ndctl**(1)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem/libpmem.7.md
+++ pmdk-1.8~rc1/doc/libpmem/libpmem.7.md
@@ -378,14 +378,14 @@ main(int argc, char *argv[])
 }
 ```
 
-See <http://pmem.io/pmdk/libpmem>
+See <https://pmem.io/pmdk/libpmem>
 for more examples using the **libpmem** API.
 
 # ACKNOWLEDGEMENTS #
 
 **libpmem** builds on the persistent memory programming model
 recommended by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
@@ -393,4 +393,4 @@ recommended by the SNIA NVM Programming
 **pmem_flush**(3), **pmem_is_pmem**(3), **pmem_memmove_persist**(3),
 **pmem_msync**(3), **pmem_persist**(3), **strerror**(3),
 **libpmemblk**(7), **libpmemlog**(7), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem/pmem_flush.3.md
+++ pmdk-1.8~rc1/doc/libpmem/pmem_flush.3.md
@@ -219,4 +219,4 @@ function always returns false. Despite t
 # SEE ALSO #
 
 **msync**(2), **pmem_is_pmem**(3), **libpmem**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem/pmem_is_pmem.3.md
+++ pmdk-1.8~rc1/doc/libpmem/pmem_is_pmem.3.md
@@ -183,4 +183,4 @@ the underlying file system does not supp
 
 **creat**(2), **ftruncate**(2), **mmap**(2),  **msync**(2), **munmap**(2),
 **open**(2), **pmem_persist**(3),
-**posix_fallocate**(3), **libpmem**(7) and **<http://pmem.io>**
+**posix_fallocate**(3), **libpmem**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem/pmem_memmove_persist.3.md
+++ pmdk-1.8~rc1/doc/libpmem/pmem_memmove_persist.3.md
@@ -170,4 +170,4 @@ Volume 1, "Caching of Temporal vs. Non-T
 # SEE ALSO #
 
 **memcpy**(3), **memmove**(3), **memset**(3),
-**libpmem**(7) and **<http://pmem.io>**
+**libpmem**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem2/libpmem2.7.md
+++ pmdk-1.8~rc1/doc/libpmem2/libpmem2.7.md
@@ -114,9 +114,9 @@ written to *stderr*.
 
 **libpmem2** builds on the persistent memory programming model recommended
 by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
 **libpmem**(7), **libpmemblk**(7), **libpmemlog**(7), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem2/pmem2_config.3.md
+++ pmdk-1.8~rc1/doc/libpmem2/pmem2_config.3.md
@@ -64,4 +64,4 @@ int pmem2_config_set_handle(struct pmem2
 
 # SEE ALSO #
 
-**libpmem2**(7) and **<http://pmem.io>**
+**libpmem2**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem2/pmem2_errormsg.3.md
+++ pmdk-1.8~rc1/doc/libpmem2/pmem2_errormsg.3.md
@@ -77,4 +77,4 @@ error code as returned by **strerror**(3
 
 # SEE ALSO #
 
-**strerror**(3), **libpmem2**(7) and **<http://pmem.io>**
+**strerror**(3), **libpmem2**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmem2/pmem2_mapping.3.md
+++ pmdk-1.8~rc1/doc/libpmem2/pmem2_mapping.3.md
@@ -60,4 +60,4 @@ int pmem2_map(const struct pmem2_config
 
 # SEE ALSO #
 
-**libpmem2**(7) and **<http://pmem.io>**
+**libpmem2**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemblk/libpmemblk.7.md
+++ pmdk-1.8~rc1/doc/libpmemblk/libpmemblk.7.md
@@ -321,7 +321,7 @@ main(int argc, char *argv[])
 }
 ```
 
-See <http://pmem.io/pmdk/libpmemblk> for more examples using the **libpmemblk** API.
+See <https://pmem.io/pmdk/libpmemblk> for more examples using the **libpmemblk** API.
 
 # BUGS #
 
@@ -332,7 +332,7 @@ Thus, specifying replica sections in poo
 
 **libpmemblk** builds on the persistent memory programming model recommended
 by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
@@ -340,4 +340,4 @@ by the SNIA NVM Programming Technical Wo
 **pmemblk_ctl_exec**(3), **pmemblk_ctl_get**(3), **pmemblk_ctl_set**(3),
 **pmemblk_read**(3), **pmemblk_set_zero**(3), **pmem_is_pmem**(3),
 **pmem_persist**(3), **strerror**(3), **libpmem**(7),
-**libpmemlog**(7), **libpmemobj**(7) and **<http://pmem.io>**
+**libpmemlog**(7), **libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemblk/pmemblk_bsize.3.md
+++ pmdk-1.8~rc1/doc/libpmemblk/pmemblk_bsize.3.md
@@ -78,4 +78,4 @@ pool, expressed as the number of blocks
 # SEE ALSO #
 
 **pmemblk_create**(3), **pmemblk_open**(3),
-**libpmemblk**(7) and **<http://pmem.io>**
+**libpmemblk**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemblk/pmemblk_create.3.md
+++ pmdk-1.8~rc1/doc/libpmemblk/pmemblk_create.3.md
@@ -174,4 +174,4 @@ fail if the underlying file system does
 # SEE ALSO #
 **pmempool**(1), **creat**(2), **pmemblk_nblock**(3),
 **posix_fallocate**(3), **poolset**(5),
-**libpmemblk**(7) and **<http://pmem.io>**
+**libpmemblk**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemblk/pmemblk_ctl_get.3.md
+++ pmdk-1.8~rc1/doc/libpmemblk/pmemblk_ctl_get.3.md
@@ -137,4 +137,4 @@ See more in **pmem_ctl**(5) man page.
 
 # SEE ALSO #
 
-**libpmemblk**(7), **pmem_ctl**(5) and **<http://pmem.io>**
+**libpmemblk**(7), **pmem_ctl**(5) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemblk/pmemblk_read.3.md
+++ pmdk-1.8~rc1/doc/libpmemblk/pmemblk_read.3.md
@@ -75,4 +75,4 @@ On error, they return -1 and set *errno*
 
 # SEE ALSO #
 
-**libpmemblk**(7) and **<http://pmem.io>**
+**libpmemblk**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemblk/pmemblk_set_zero.3.md
+++ pmdk-1.8~rc1/doc/libpmemblk/pmemblk_set_zero.3.md
@@ -74,4 +74,4 @@ On error, they return -1 and set *errno*
 
 # SEE ALSO #
 
-**libpmemblk**(7) and **<http://pmem.io>**
+**libpmemblk**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemlog/libpmemlog.7.md
+++ pmdk-1.8~rc1/doc/libpmemlog/libpmemlog.7.md
@@ -323,7 +323,7 @@ main(int argc, char *argv[])
 }
 ```
 
-See <http://pmem.io/pmdk/libpmemlog>
+See <https://pmem.io/pmdk/libpmemlog>
 for more examples using the **libpmemlog** API.
 
 # BUGS #
@@ -335,7 +335,7 @@ Thus, specifying replica sections in poo
 
 **libpmemlog** builds on the persistent memory programming model recommended
 by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
@@ -343,4 +343,4 @@ by the SNIA NVM Programming Technical Wo
 **pmemlog_ctl_exec**(3), **pmemlog_ctl_get**(3), **pmemlog_ctl_set**(3),
 **pmemlog_nbyte**(3), **pmemlog_tell**(3), **strerror**(3),
 **libpmem**(7), **libpmemblk**(7), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemlog/pmemlog_append.3.md
+++ pmdk-1.8~rc1/doc/libpmemlog/pmemlog_append.3.md
@@ -92,4 +92,4 @@ No attempt is made to detect NULL or inc
 
 # SEE ALSO #
 
-**writev**(2), **libpmemlog**(7) and **<http://pmem.io>**
+**writev**(2), **libpmemlog**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemlog/pmemlog_create.3.md
+++ pmdk-1.8~rc1/doc/libpmemlog/pmemlog_create.3.md
@@ -162,4 +162,4 @@ fail if the underlying file system does
 
 **pmempool**(1), **creat**(2), **posix_fallocate**(3),
 **pmemlog_nbyte**(3), **poolset**(5), **libpmemlog**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemlog/pmemlog_ctl_get.3.md
+++ pmdk-1.8~rc1/doc/libpmemlog/pmemlog_ctl_get.3.md
@@ -137,4 +137,4 @@ See more in **pmem_ctl**(5) man page.
 
 # SEE ALSO #
 
-**libpmemlog**(7), **pmem_ctl**(5) and **<http://pmem.io>**
+**libpmemlog**(7), **pmem_ctl**(5) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemlog/pmemlog_nbyte.3.md
+++ pmdk-1.8~rc1/doc/libpmemlog/pmemlog_nbyte.3.md
@@ -66,4 +66,4 @@ The **pmemlog_nbyte**() function returns
 
 # SEE ALSO #
 
-**libpmemlog**(7) and **<http://pmem.io>**
+**libpmemlog**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemlog/pmemlog_tell.3.md
+++ pmdk-1.8~rc1/doc/libpmemlog/pmemlog_tell.3.md
@@ -92,4 +92,4 @@ The **pmemlog_rewind**() and **pmemlog_w
 
 # SEE ALSO #
 
-**libpmemlog**(7) and **<http://pmem.io>**
+**libpmemlog**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/libpmemobj.7.md
+++ pmdk-1.8~rc1/doc/libpmemobj/libpmemobj.7.md
@@ -261,15 +261,15 @@ about other environment variables affect
 
 # EXAMPLE #
 
-See <http://pmem.io/pmdk/libpmemobj> for examples using the **libpmemobj** API.
+See <https://pmem.io/pmdk/libpmemobj> for examples using the **libpmemobj** API.
 
 # ACKNOWLEDGEMENTS #
 
 **libpmemobj** builds on the persistent memory programming model recommended
 by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
 **OID_IS_NULL**(3), **pmemobj_alloc**(3), **pmemobj_ctl_exec**(3), **pmemobj_ctl_get**(3), **pmemobj_ctl_set**(3), **pmemobj_first**(3), **pmemobj_list_insert**(3), **pmemobj_memcpy_persist**(3), **pmemobj_mutex_zero**(3), **pmemobj_open**(3), **pmemobj_root**(3), **pmemobj_tx_add_range**(3), **pmemobj_tx_alloc**(3), **pmemobj_tx_begin**(3), **POBJ_LAYOUT_BEGIN**(3), **POBJ_LIST_HEAD**(3), **strerror**(3), **TOID_DECLARE**(3), **libpmem**(7), **libpmemblk**(7), **libpmemlog**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/oid_is_null.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/oid_is_null.3.md
@@ -212,4 +212,4 @@ assert(*foo == 0);
 
 # SEE ALSO #
 
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_action.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_action.3.md
@@ -211,4 +211,4 @@ is set appropriately.
 # SEE ALSO #
 
 **pmemobj_alloc**(3), **pmemobj_tx_alloc**(3), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_alloc.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_alloc.3.md
@@ -46,7 +46,7 @@ date: pmemobj API version 2.3
 
 **pmemobj_alloc**(), **pmemobj_xalloc**(), **pmemobj_zalloc**(),
 **pmemobj_realloc**(), **pmemobj_zrealloc**(), **pmemobj_strdup**(),
-**pmemobj_wcsdup**(), **pmemobj_alloc_usable_size**(),
+**pmemobj_wcsdup**(), **pmemobj_alloc_usable_size**(), **pmemobj_defrag**(),
 **POBJ_NEW**(), **POBJ_ALLOC**(), **POBJ_ZNEW**(), **POBJ_ZALLOC**(),
 **POBJ_REALLOC**(), **POBJ_ZREALLOC**(), **POBJ_FREE**()
 - non-transactional atomic allocations
@@ -297,4 +297,4 @@ through due to lack of resources), -1 is
 
 **free**(3), **POBJ_FOREACH**(3), **realloc**(3),
 **strdup**(3), **wcsdup**(3), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_ctl_get.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_ctl_get.3.md
@@ -419,4 +419,4 @@ See more in **pmem_ctl**(5) man page.
 
 # SEE ALSO #
 
-**libpmemobj**(7), **pmem_ctl**(5) and **<http://pmem.io>**
+**libpmemobj**(7), **pmem_ctl**(5) and **<https://pmem.io>**
--- /dev/null
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_defrag.3
@@ -0,0 +1 @@
+.so pmemobj_alloc.3
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_first.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_first.3.md
@@ -124,4 +124,4 @@ is *OID_NULL*, **pmemobj_next**() return
 
 # SEE ALSO #
 
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- /dev/null
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_get_user_data.3
@@ -0,0 +1 @@
+.so pmemobj_open.3
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_list_insert.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_list_insert.3.md
@@ -184,4 +184,4 @@ On other errors, **OID_NULL** is returne
 # SEE ALSO #
 
 **pmemobj_first**(3), **POBJ_FOREACH**(3), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_memcpy_persist.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_memcpy_persist.3.md
@@ -206,4 +206,4 @@ pmemobj_persist(PMEMobjpool *pop, const
 
 **memcpy**(3), **memset**(3), **pmem_msync**(3),
 **pmem_persist**(3), **libpmem**(7) **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_mutex_zero.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_mutex_zero.3.md
@@ -221,4 +221,4 @@ number will be returned to indicate the
 
 **pmemobj_tx_zalloc**(3), **pmemobj_zalloc**(3), **pthread_cond_init**(3),
 **pthread_mutex_init**(3), **pthread_rwlock_init**(3), **libpmem**(7),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_open.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_open.3.md
@@ -194,4 +194,4 @@ fail if the underlying file system does
 
 **creat**(2), **msync**(2), **pmem_is_pmem**(3), **pmem_persist**(3),
 **posix_fallocate**(3), **libpmem**(7), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_root.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_root.3.md
@@ -118,4 +118,4 @@ root object has not been allocated yet,
 
 # SEE ALSO #
 
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- /dev/null
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_set_user_data.3
@@ -0,0 +1 @@
+.so pmemobj_open.3
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_tx_add_range.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_tx_add_range.3.md
@@ -214,4 +214,4 @@ when flags do not contain **POBJ_XADD_NO
 # SEE ALSO #
 
 **pmemobj_tx_alloc**(3), **pmemobj_tx_begin**(3),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_tx_alloc.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_tx_alloc.3.md
@@ -280,4 +280,4 @@ the transaction is aborted.
 # SEE ALSO #
 
 **pmemobj_tx_add_range**(3), **pmemobj_tx_begin**(3),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pmemobj_tx_begin.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_tx_begin.3.md
@@ -551,4 +551,4 @@ resources associated with that thread mi
 **dlclose**(3), **longjmp**(3), **pmemobj_tx_add_range**(3),
 **pmemobj_tx_alloc**(3), **pthread_setcancelstate**(3),
 **pthread_setcanceltype**(3), **setjmp**(3),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- /dev/null
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_tx_get_user_data.3
@@ -0,0 +1 @@
+.so pmemobj_tx_begin.3
--- /dev/null
+++ pmdk-1.8~rc1/doc/libpmemobj/pmemobj_tx_set_user_data.3
@@ -0,0 +1 @@
+.so pmemobj_tx_begin.3
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pobj_layout_begin.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pobj_layout_begin.3.md
@@ -125,4 +125,4 @@ int num_of_types = POBJ_LAYOUT_TYPES_NUM
 
 # SEE ALSO #
 
-**TOID_DECLARE**(3), **libpmemobj**(7) and **<http://pmem.io>**
+**TOID_DECLARE**(3), **libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/pobj_list_head.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/pobj_list_head.3.md
@@ -272,4 +272,4 @@ structure that are used to connect the e
 
 # SEE ALSO #
 
-**queue**(3), **libpmemobj**(7) and **<http://pmem.io>**
+**queue**(3), **libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmemobj/toid_declare.3.md
+++ pmdk-1.8~rc1/doc/libpmemobj/toid_declare.3.md
@@ -130,4 +130,4 @@ read-only (const) pointer (*TYPE\**) to
 # SEE ALSO #
 
 **OID_IS_NULL**(3), **POBJ_LAYOUT_ROOT**(3), **POBJ_LAYOUT_TOID**(3),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmempool/libpmempool.7.md
+++ pmdk-1.8~rc1/doc/libpmempool/libpmempool.7.md
@@ -283,18 +283,18 @@ main(int argc, char *argv[])
 }
 ```
 
-See <http://pmem.io/pmdk/libpmempool> for more examples using the
+See <https://pmem.io/pmdk/libpmempool> for more examples using the
 **libpmempool** API.
 
 # ACKNOWLEDGEMENTS #
 
 **libpmempool** builds on the persistent memory programming model
 recommended by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
 **dlclose**(3), **pmempool_check_init**(3), **pmempool_feature_query**(3),
 **pmempool_rm**(3), **pmempool_sync**(3), **strerror**(3), **libpmem**(7),
 **libpmemblk**(7), **libpmemlog**(7), **libpmemobj**(7)**
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmempool/pmempool_check_init.3.md
+++ pmdk-1.8~rc1/doc/libpmempool/pmempool_check_init.3.md
@@ -299,4 +299,4 @@ Currently, checking the consistency of a
 
 # SEE ALSO #
 
-**libpmemlog**(7), **libpmemobj**(7) and **<http://pmem.io>**
+**libpmemlog**(7), **libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmempool/pmempool_feature_query.3.md
+++ pmdk-1.8~rc1/doc/libpmempool/pmempool_feature_query.3.md
@@ -125,4 +125,4 @@ returns -1.
 
 # SEE ALSO #
 
-**poolset**(5) and **<http://pmem.io>**
+**poolset**(5) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmempool/pmempool_rm.3.md
+++ pmdk-1.8~rc1/doc/libpmempool/pmempool_rm.3.md
@@ -83,4 +83,4 @@ On success, _UW(pmempool_rm) returns 0.
 # SEE ALSO #
 
 **rpmem_remove**(3), **unlink**(3), **libpmemlog**(7),
-**libpmemobj**(7), **librpmem**(7) and **<http://pmem.io>**
+**libpmemobj**(7), **librpmem**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/libpmempool/pmempool_sync.3.md
+++ pmdk-1.8~rc1/doc/libpmempool/pmempool_sync.3.md
@@ -197,4 +197,4 @@ versions of the library.
 
 # SEE ALSO #
 
-**libpmemlog**(7), **libpmemobj**(7) and **<http://pmem.io>**
+**libpmemlog**(7), **libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/librpmem/librpmem.7.md
+++ pmdk-1.8~rc1/doc/librpmem/librpmem.7.md
@@ -472,7 +472,7 @@ compatibility will be preserved.
 
 **librpmem** builds on the persistent memory programming model
 recommended by the SNIA NVM Programming Technical Work Group:
-<http://snia.org/nvmp>
+<https://snia.org/nvmp>
 
 # SEE ALSO #
 
@@ -481,4 +481,4 @@ recommended by the SNIA NVM Programming
 **rpmem_open**(3), **rpmem_persist**(3), **strerror**(3), **limits.conf**(5),
 **fabric**(7), **fi_sockets**(7), **fi_verbs**(7), **libpmem**(7), **libpmemblk**(7),
 **libpmemlog**(7), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/librpmem/rpmem_create.3.md
+++ pmdk-1.8~rc1/doc/librpmem/rpmem_create.3.md
@@ -194,4 +194,4 @@ If the system runs out of free file desc
 # SEE ALSO #
 
 **rpmem_persist**(3), **sysconf**(3), **limits.conf**(5),
-**libpmemobj**(7), **librpmem**(7) and **<http://pmem.io>**
+**libpmemobj**(7), **librpmem**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/librpmem/rpmem_persist.3.md
+++ pmdk-1.8~rc1/doc/librpmem/rpmem_persist.3.md
@@ -151,4 +151,4 @@ different *lane* values is not guarantee
 
 **rpmem_create**(3), **rpmem_open**(3), **rpmem_persist**(3),
 **sysconf**(3), **limits.conf**(5), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmem_ctl/pmem_ctl.5.md
+++ pmdk-1.8~rc1/doc/pmem_ctl/pmem_ctl.5.md
@@ -148,4 +148,4 @@ prefault.
 # SEE ALSO #
 
 **libpmemblk_ctl_get**(3), **libpmemlog_ctl_get**(3), **libpmemobj_ctl_get**(3)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-check.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-check.1.md
@@ -135,4 +135,4 @@ increased verbosity level.
 # SEE ALSO #
 
 **pmempool**(1), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7), **libpmempool**(7) and **<http://pmem.io>**
+**libpmemobj**(7), **libpmempool**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-convert.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-convert.1.md
@@ -50,4 +50,4 @@ can be found in **pmdk-convert**(1) man
 # SEE ALSO #
 
 **pmdk-convert**(1), **pmempool**(1), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7), **libpmempool**(7) and **<http://pmem.io>**
+**libpmemobj**(7), **libpmempool**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-create.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-create.1.md
@@ -168,4 +168,4 @@ Create a pool file based on pool.log fil
 # SEE ALSO #
 
 **pmempool**(1), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-dump.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-dump.1.md
@@ -136,4 +136,4 @@ Dump data form 1K to 2K from pool.bin fi
 # SEE ALSO #
 
 **pmempool**(1), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-feature.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-feature.1.md
@@ -144,4 +144,4 @@ Prints POOL_FEAT_CKSUM_2K incompat featu
 
 # SEE ALSO #
 
-**poolset**(5) and **<http://pmem.io>**
+**poolset**(5) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-info.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-info.1.md
@@ -382,4 +382,4 @@ skip blocks marked with error flag and n
 # SEE ALSO #
 
 **pmempool**(1), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-rm.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-rm.1.md
@@ -131,4 +131,4 @@ remote pool set files.
 # SEE ALSO #
 
 **pmempool**(1), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7), **librpmem**(7) and **<http://pmem.io>**
+**libpmemobj**(7), **librpmem**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-sync.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-sync.1.md
@@ -117,4 +117,4 @@ viability of synchronization.
 # SEE ALSO #
 
 **pmempool(1)**, **libpmemblk(7)**, **libpmemlog(7)**,
-**libpmempool(7)** and **<http://pmem.io>**
+**libpmempool(7)** and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool-transform.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool-transform.1.md
@@ -192,4 +192,4 @@ unchanged and the size of the pool is st
 # SEE ALSO #
 
 **pmempool(1)**, **libpmemblk(7)**, **libpmemlog(7)**,
-**libpmempool(7)** and **<http://pmem.io>**
+**libpmempool(7)** and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmempool/pmempool.1.md
+++ pmdk-1.8~rc1/doc/pmempool/pmempool.1.md
@@ -114,4 +114,4 @@ In order to get more information about s
 # SEE ALSO #
 
 **libpmemblk**(7), **libpmemlog**(7), **libpmemobj**(7)
-and **<http://pmem.io>**
+and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/pmreorder/pmreorder.1.md
+++ pmdk-1.8~rc1/doc/pmreorder/pmreorder.1.md
@@ -426,4 +426,4 @@ to `pmreorder_out.log`.
 
 # SEE ALSO #
 
-**<http://pmem.io>**
+**<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/poolset/poolset.5.md
+++ pmdk-1.8~rc1/doc/poolset/poolset.5.md
@@ -312,4 +312,4 @@ that was used for pool set creation.
 
 **ndctl-create-namespace**(1), **pmemblk_create**(3), **pmemlog_create**(3),
 **pmemobj_create**(3), **sysconf**(3), **libpmemblk**(7), **libpmemlog**(7),
-**libpmemobj**(7) and **<http://pmem.io>**
+**libpmemobj**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/doc/rpmemd/rpmemd.1.md
+++ pmdk-1.8~rc1/doc/rpmemd/rpmemd.1.md
@@ -227,4 +227,4 @@ See **pmem_persist**(3) and **pmem_msync
 
 **ssh**(1), **pmem_msync**(3), **pmem_persist**(3),
 **syslog**(3), **libpmem**(7), **libpmemobj**(7),
-**librpmem**(7) and **<http://pmem.io>**
+**librpmem**(7) and **<https://pmem.io>**
--- pmdk-1.8~rc1.orig/src/examples/README
+++ pmdk-1.8~rc1/src/examples/README
@@ -8,7 +8,7 @@ are here just to check that the example
 appropriate library, and passes cstyle.
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 man pages.  Developers new to PMDK are probably looking for libpmemobj.
 
 Many of the examples in this directory are described in more detail
@@ -16,24 +16,24 @@ on the above web site.
 
 libpmem(7) -- low-level persistent memory support
     Example programs are in the libpmem directory.
-    More documentation: http://pmem.io/pmdk/libpmem
+    More documentation: https://pmem.io/pmdk/libpmem
 
 libpmemblk(7) -- pmem-resident arrays of blocks
     Example programs are in the libpmemblk directory.
-    More documentation: http://pmem.io/pmdk/libpmemblk
+    More documentation: https://pmem.io/pmdk/libpmemblk
 
 libpmemlog(7) -- pmem-resident log files
     Example programs are in the libpmemlog directory.
-    More documentation: http://pmem.io/pmdk/libpmemlog
+    More documentation: https://pmem.io/pmdk/libpmemlog
 
 libpmemobj(7) -- transactional object store
     Example programs are in the libpmemobj directory.
-    More documentation: http://pmem.io/pmdk/libpmemobj
+    More documentation: https://pmem.io/pmdk/libpmemobj
 
 libpmempool(7) -- pool management, diagnostics and repair
     Example programs are in the libpmempool directory.
-    More documentation: http://pmem.io/pmdk/libpmempool
+    More documentation: https://pmem.io/pmdk/libpmempool
 
 librpmem(7) -- remote access to persistent memory
     Example programs are in the librpmem directory.
-    More documentation: http://pmem.io/pmdk/librpmem
+    More documentation: https://pmem.io/pmdk/librpmem
--- pmdk-1.8~rc1.orig/src/examples/libpmem/README
+++ pmdk-1.8~rc1/src/examples/libpmem/README
@@ -4,7 +4,7 @@ This is examples/libpmem/README.
 
 This directory contains examples for libpmem, the library containing
 low-level persistent memory support.  A detailed explanation of these
-examples can be found here: http://pmem.io/pmdk/libpmem
+examples can be found here: https://pmem.io/pmdk/libpmem
 
 manpage.c is the example used in the libpmem man page.
 
@@ -19,5 +19,5 @@ These examples can be built against an i
 	make LIBDIR=/usr/lib INCDIR=/usr/include
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 man pages.  Developers new to PMDK are probably looking for libpmemobj.
--- pmdk-1.8~rc1.orig/src/examples/libpmemblk/README
+++ pmdk-1.8~rc1/src/examples/libpmemblk/README
@@ -4,7 +4,7 @@ This is examples/libpmemblk/README.
 
 This directory contains examples for libpmemblk, the library providing
 pmem-resident arrays of blocks.  Some of these examples are explained
-in more detail here: http://pmem.io/pmdk/libpmemblk
+in more detail here: https://pmem.io/pmdk/libpmemblk
 
 manpage.c is the example used in the libpmemblk man page.
 
@@ -17,5 +17,5 @@ These examples can be built against an i
 	make LIBDIR=/usr/lib INCDIR=/usr/include
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 man pages.  Developers new to PMDK are probably looking for libpmemobj.
--- pmdk-1.8~rc1.orig/src/examples/libpmemlog/README
+++ pmdk-1.8~rc1/src/examples/libpmemlog/README
@@ -4,7 +4,7 @@ This is examples/libpmemlog/README.
 
 This directory contains examples for libpmemlog, the library providing
 pmem-resident log files.  Some of these examples are explained in more
-detail here: http://pmem.io/pmdk/libpmemlog
+detail here: https://pmem.io/pmdk/libpmemlog
 
 manpage.c is the example used in the libpmemlog man page.
 
@@ -17,5 +17,5 @@ These examples can be built against an i
 	make LIBDIR=/usr/lib INCDIR=/usr/include
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 man pages.  Developers new to PMDK are probably looking for libpmemobj.
--- pmdk-1.8~rc1.orig/src/examples/libpmemobj/README
+++ pmdk-1.8~rc1/src/examples/libpmemobj/README
@@ -4,7 +4,7 @@ This is examples/libpmemobj/README.
 
 This directory contains examples for libpmemobj, the library providing
 a transactional object store for pmem.  Some of these examples are explained
-in more detail here: http://pmem.io/pmdk/libpmemobj
+in more detail here: https://pmem.io/pmdk/libpmemobj
 
 manpage.c and setjmp.c are the examples used in the libpmemobj man page.
 
@@ -15,5 +15,5 @@ These examples can be built against an i
 	make LIBDIR=/usr/lib INCDIR=/usr/include
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 man pages.
--- pmdk-1.8~rc1.orig/src/examples/libpmempool/README
+++ pmdk-1.8~rc1/src/examples/libpmempool/README
@@ -5,7 +5,7 @@ This is examples/libpmempool/README.
 This directory contains examples for libpmempool, the library providing
 support for off-line pool management, diagnostics and repair.
 Some of these examples are explained in more detail
-here: http://pmem.io/pmdk/libpmempool
+here: https://pmem.io/pmdk/libpmempool
 
 manpage.c is the example used in the libpmempool man page.
 
@@ -16,5 +16,5 @@ These examples can be built against an i
 	make LIBDIR=/usr/lib INCDIR=/usr/include
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 man pages.  Developers new to PMDK are probably looking for libpmemobj.
--- pmdk-1.8~rc1.orig/src/examples/pmreorder/README
+++ pmdk-1.8~rc1/src/examples/pmreorder/README
@@ -4,7 +4,7 @@ This is examples/pmreorder/README.
 
 This directory contains example for pmreorder tool.
 A detailed explanation of this tool can be found here:
-http://pmem.io/pmdk/manpages/linux/master/pmreorder/pmreorder.1.html
+https://pmem.io/pmdk/manpages/linux/master/pmreorder/pmreorder.1.html
 
 pmreorder_list: simple list to check pmem consistency using pmreorder tool
 
@@ -40,5 +40,5 @@ pmreorder.py \
 -p "./pmreorder_list c"
 
 If you're looking for documentation to get you started using PMDK,
-start here: http://pmem.io/pmdk and follow the links to examples and
+start here: https://pmem.io/pmdk and follow the links to examples and
 blog posts.
--- pmdk-1.8~rc1.orig/src/libpmemobj/ravl.c
+++ pmdk-1.8~rc1/src/libpmemobj/ravl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Intel Corporation
+ * Copyright 2018-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
 
 /*
  * ravl.c -- implementation of a RAVL tree
- * http://sidsen.azurewebsites.net//papers/ravl-trees-journal.pdf
+ * https://sidsen.azurewebsites.net//papers/ravl-trees-journal.pdf
  */
 
 #include <stdlib.h>
--- pmdk-1.8~rc1.orig/src/test/libpmempool_api/out12.log.match
+++ pmdk-1.8~rc1/src/test/libpmempool_api/out12.log.match
@@ -11,7 +11,8 @@ arena 0: BTT Info header checksum correc
 checking BTT Map and Flog
 arena 0: checking BTT Map and Flog
 arena 0: invalid BTT Flog entry at 0
-arena 0: unmapped block 40322
+$(OPT)arena 0: unmapped block 40322
+$(OPX)arena 0: unmapped block 40203
 arena 0: number of unmapped blocks: 1
 arena 0: number of invalid BTT Flog entries: 1
 the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag
@@ -25,10 +26,12 @@ arena 0: BTT Info header checksum correc
 checking BTT Map and Flog
 arena 0: checking BTT Map and Flog
 arena 0: invalid BTT Flog entry at 0
-arena 0: unmapped block 40322
+$(OPT)arena 0: unmapped block 40322
+$(OPX)arena 0: unmapped block 40203
 arena 0: number of unmapped blocks: 1
 arena 0: number of invalid BTT Flog entries: 1
 Do you want to repair invalid BTT Flog entries?
-arena 0: repairing BTT Flog at 0 with free block entry 0x40009d82
+$(OPT)arena 0: repairing BTT Flog at 0 with free block entry 0x40009d82
+$(OPX)arena 0: repairing BTT Flog at 0 with free block entry 0x40009d0b
 status = repaired
 libpmempool_api/TEST12: DONE
--- pmdk-1.8~rc1.orig/src/test/libpmempool_map_flog/out2.log.match
+++ pmdk-1.8~rc1/src/test/libpmempool_map_flog/out2.log.match
@@ -22,15 +22,21 @@ arena 0: checking BTT Map and Flog
 arena 0: invalid BTT Flog entry at 3
 arena 0: invalid BTT Flog entry at 4
 arena 0: invalid BTT Flog entry at 5
-arena 0: unmapped block 40325
-arena 0: unmapped block 40326
-arena 0: unmapped block 40327
+$(OPT)arena 0: unmapped block 40325
+$(OPX)arena 0: unmapped block 40206
+$(OPT)arena 0: unmapped block 40326
+$(OPX)arena 0: unmapped block 40207
+$(OPT)arena 0: unmapped block 40327
+$(OPX)arena 0: unmapped block 40208
 arena 0: number of unmapped blocks: 3
 arena 0: number of invalid BTT Flog entries: 3
 Do you want to repair invalid BTT Flog entries?
-arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
-arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
-arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPT)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
+$(OPX)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d10
+$(OPT)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
+$(OPX)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d0f
+$(OPT)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPX)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d0e
 status = repaired
 libpmempool_map_flog$(nW)TEST2: DONE
 Error: bttdevice.arena.btt_map(0)=0x40000000
@@ -57,15 +63,21 @@ arena 0: checking BTT Map and Flog
 arena 0: invalid BTT Flog entry at 3
 arena 0: invalid BTT Flog entry at 4
 arena 0: invalid BTT Flog entry at 5
-arena 0: unmapped block 40325
-arena 0: unmapped block 40326
-arena 0: unmapped block 40327
+$(OPT)arena 0: unmapped block 40325
+$(OPX)arena 0: unmapped block 40206
+$(OPT)arena 0: unmapped block 40326
+$(OPX)arena 0: unmapped block 40207
+$(OPT)arena 0: unmapped block 40327
+$(OPX)arena 0: unmapped block 40208
 arena 0: number of unmapped blocks: 3
 arena 0: number of invalid BTT Flog entries: 3
 Do you want to repair invalid BTT Flog entries?
-arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
-arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
-arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPT)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
+$(OPX)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d10
+$(OPT)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
+$(OPX)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d0f
+$(OPT)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPX)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d0e
 status = repaired
 libpmempool_map_flog$(nW)TEST2: DONE
 Initial: bttdevice.arena.btt_map(0)=0x00000000
@@ -92,15 +104,21 @@ arena 0: checking BTT Map and Flog
 arena 0: invalid BTT Flog entry at 3
 arena 0: invalid BTT Flog entry at 4
 arena 0: invalid BTT Flog entry at 5
-arena 0: unmapped block 40325
-arena 0: unmapped block 40326
-arena 0: unmapped block 40327
+$(OPT)arena 0: unmapped block 40325
+$(OPX)arena 0: unmapped block 40206
+$(OPT)arena 0: unmapped block 40326
+$(OPX)arena 0: unmapped block 40207
+$(OPT)arena 0: unmapped block 40327
+$(OPX)arena 0: unmapped block 40208
 arena 0: number of unmapped blocks: 3
 arena 0: number of invalid BTT Flog entries: 3
 Do you want to repair invalid BTT Flog entries?
-arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
-arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
-arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPT)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
+$(OPX)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d10
+$(OPT)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
+$(OPX)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d0f
+$(OPT)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPX)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d0e
 status = repaired
 libpmempool_map_flog$(nW)TEST2: DONE
 Normal: bttdevice.arena.btt_map(0)=0xC0000000
@@ -127,14 +145,20 @@ arena 0: checking BTT Map and Flog
 arena 0: invalid BTT Flog entry at 3
 arena 0: invalid BTT Flog entry at 4
 arena 0: invalid BTT Flog entry at 5
-arena 0: unmapped block 40325
-arena 0: unmapped block 40326
-arena 0: unmapped block 40327
+$(OPT)arena 0: unmapped block 40325
+$(OPX)arena 0: unmapped block 40206
+$(OPT)arena 0: unmapped block 40326
+$(OPX)arena 0: unmapped block 40207
+$(OPT)arena 0: unmapped block 40327
+$(OPX)arena 0: unmapped block 40208
 arena 0: number of unmapped blocks: 3
 arena 0: number of invalid BTT Flog entries: 3
 Do you want to repair invalid BTT Flog entries?
-arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
-arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
-arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPT)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d87
+$(OPX)arena 0: repairing BTT Flog at 5 with free block entry 0x40009d10
+$(OPT)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d86
+$(OPX)arena 0: repairing BTT Flog at 4 with free block entry 0x40009d0f
+$(OPT)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d85
+$(OPX)arena 0: repairing BTT Flog at 3 with free block entry 0x40009d0e
 status = repaired
 libpmempool_map_flog$(nW)TEST2: DONE
--- pmdk-1.8~rc1.orig/src/test/libpmempool_sync/TEST0
+++ pmdk-1.8~rc1/src/test/libpmempool_sync/TEST0
@@ -52,7 +52,7 @@ POOLSET=$DIR/pool0.set
 M=$(( 1024 * 1024 ))
 M20=$(( 20 * $M ))
 M40=$(( 40 * $M ))
-POOL_HEADER_OFFSET=4096
+POOL_HEADER_OFFSET=$(getconf PAGE_SIZE)
 ADDR_MASK=0xFFFFF000
 
 # Create poolset file
--- pmdk-1.8~rc1.orig/src/test/obj_tx_strdup/TEST1
+++ pmdk-1.8~rc1/src/test/obj_tx_strdup/TEST1
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2015-2019, Intel Corporation
+# Copyright 2015-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,7 +39,7 @@
 
 require_test_type medium
 require_build_type debug
-require_fs_type any
+require_fs_type pmem
 configure_valgrind pmemcheck force-enable
 setup
 
--- pmdk-1.8~rc1.orig/src/test/out_err_mt/TEST0
+++ pmdk-1.8~rc1/src/test/out_err_mt/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2015-2019, Intel Corporation
+# Copyright 2015-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,6 +39,7 @@
 
 require_test_type medium
 require_fs_type any
+disable_eatmydata
 
 setup
 
--- pmdk-1.8~rc1.orig/src/test/out_err_mt/TEST1
+++ pmdk-1.8~rc1/src/test/out_err_mt/TEST1
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2015-2019, Intel Corporation
+# Copyright 2015-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,6 +39,7 @@
 
 require_test_type medium
 require_fs_type any
+disable_eatmydata
 
 require_valgrind 3.7
 configure_valgrind drd force-enable
--- pmdk-1.8~rc1.orig/src/test/out_err_mt/TEST2
+++ pmdk-1.8~rc1/src/test/out_err_mt/TEST2
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2015-2019, Intel Corporation
+# Copyright 2015-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,6 +39,7 @@
 
 require_test_type medium
 require_fs_type any
+disable_eatmydata
 
 require_valgrind 3.7
 configure_valgrind helgrind force-enable
--- pmdk-1.8~rc1.orig/src/test/unittest/unittest.h
+++ pmdk-1.8~rc1/src/test/unittest/unittest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019, Intel Corporation
+ * Copyright 2014-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -257,7 +257,7 @@ void ut_err(const char *file, int line,
 #define UT_ASSERT_COMPILE_ERROR_ON(cond) UT_COMPILE_ERROR_ON(cond)
 #else /* __cplusplus */
 /*
- * XXX - workaround for http://github.com/pmem/issues/issues/189
+ * XXX - workaround for https://github.com/pmem/issues/issues/189
  */
 #define UT_ASSERT_COMPILE_ERROR_ON(cond) UT_ASSERT_rt(!(cond))
 #endif /* __cplusplus */
--- pmdk-1.8~rc1.orig/src/test/unittest/unittest.sh
+++ pmdk-1.8~rc1/src/test/unittest/unittest.sh
@@ -1455,6 +1455,19 @@ require_dax_device_alignments() {
 }
 
 #
+# disable_eatmydata -- ensure invalid msyncs fail
+#
+# Distros (and people) like to use eatmydata to kill fsync-likes during builds
+# and testing. This is nice for speed, but we actually rely on msync failing
+# in some tests.
+#
+disable_eatmydata() {
+	export LD_PRELOAD="${LD_PRELOAD/#libeatmydata.so/}"
+	export LD_PRELOAD="${LD_PRELOAD/ libeatmydata.so/}"
+	export LD_PRELOAD="${LD_PRELOAD/:libeatmydata.so/}"
+}
+
+#
 # require_fs_type -- only allow script to continue for a certain fs type
 #
 function require_fs_type() {
--- pmdk-1.8~rc1.orig/src/windows/getopt/getopt.c
+++ pmdk-1.8~rc1/src/windows/getopt/getopt.c
@@ -53,9 +53,9 @@ static void rotate(char **argv, int argc
    optopt is handled FreeBSD-style, per [3].
    Other GNU and FreeBSD extensions are purely accidental.
 
-[1] http://pubs.opengroup.org/onlinepubs/000095399/functions/getopt.html
-[2] http://www.kernel.org/doc/man-pages/online/pages/man3/getopt.3.html
-[3] http://www.freebsd.org/cgi/man.cgi?query=getopt&sektion=3&manpath=FreeBSD+9.0-RELEASE
+[1] https://pubs.opengroup.org/onlinepubs/000095399/functions/getopt.html
+[2] https://www.kernel.org/doc/man-pages/online/pages/man3/getopt.3.html
+[3] https://www.freebsd.org/cgi/man.cgi?query=getopt&sektion=3&manpath=FreeBSD+9.0-RELEASE
 */
 int getopt(int argc, char* const argv[], const char* optstring) {
   int optchar = -1;
@@ -180,7 +180,7 @@ no_more_optchars:
 
 /* Implementation based on [1].
 
-[1] http://www.kernel.org/doc/man-pages/online/pages/man3/getopt.3.html
+[1] https://www.kernel.org/doc/man-pages/online/pages/man3/getopt.3.html
 */
 int getopt_long(int argc, char* const argv[], const char* optstring,
   const struct option* longopts, int* longindex) {
--- pmdk-1.8~rc1.orig/utils/build-dpkg.sh
+++ pmdk-1.8~rc1/utils/build-dpkg.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2019, Intel Corporation
+# Copyright 2014-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -196,7 +196,7 @@ cat << EOF > debian/librpmem-dev.lintian
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
@@ -288,7 +288,7 @@ cat << EOF > debian/libpmem2-dev.lintian
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
@@ -418,7 +418,7 @@ Section: libs
 Priority: optional
 Standards-version: 4.1.4
 Build-Depends: debhelper (>= 9)
-Homepage: http://pmem.io/pmdk/
+Homepage: https://pmem.io/pmdk/
 
 Package: libpmem
 Architecture: any
@@ -619,7 +619,7 @@ cat << EOF > debian/libpmem-dev.lintian-
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
@@ -656,7 +656,7 @@ cat << EOF > debian/libpmemblk-dev.linti
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
@@ -692,7 +692,7 @@ cat << EOF > debian/libpmemlog-dev.linti
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
@@ -735,7 +735,7 @@ cat << EOF > debian/libpmemobj-dev.linti
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
@@ -771,7 +771,7 @@ cat << EOF > debian/libpmempool-dev.lint
 $ITP_BUG_EXCUSE
 new-package-should-close-itp-bug
 # The following warnings are triggered by a bug in debhelper:
-# http://bugs.debian.org/204975
+# https://bugs.debian.org/204975
 postinst-has-useless-call-to-ldconfig
 postrm-has-useless-call-to-ldconfig
 # We do not want to compile with -O2 for debug version
--- pmdk-1.8~rc1.orig/utils/get_aliases.sh
+++ pmdk-1.8~rc1/utils/get_aliases.sh
@@ -83,7 +83,7 @@ function list_pages {
 	fi
 
 	if [ "$parent" == "libpmem2" ]; then
-		man_child=($(ls pmem2_*.3))
+		man_child=($(ls -1 ../libpmem2 | grep -e ".*\.3$"))
 		echo -n "- $parent: " >> $map_file
 		echo "${man_child[@]}" >> $map_file
 	fi
--- pmdk-1.8~rc1.orig/utils/libpmem.pc.in
+++ pmdk-1.8~rc1/utils/libpmem.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: libpmem
 Description: libpmem library from PMDK project
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires:
 Libs: -L${libdir} -lpmem
 Cflags: -I${includedir}
--- pmdk-1.8~rc1.orig/utils/libpmem2.pc.in
+++ pmdk-1.8~rc1/utils/libpmem2.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: libpmem2
 Description: libpmem2 library from PMDK project (EXPERIMENTAL)
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires:
 Libs: -L${libdir} -lpmem2
 Cflags: -I${includedir}
--- pmdk-1.8~rc1.orig/utils/libpmemblk.pc.in
+++ pmdk-1.8~rc1/utils/libpmemblk.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: libpmemblk
 Description: libpmemblk library from PMDK project
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires.private: libpmem${rasdeps}
 Libs: -L${libdir} -lpmemblk
 Cflags: -I${includedir}
--- pmdk-1.8~rc1.orig/utils/libpmemlog.pc.in
+++ pmdk-1.8~rc1/utils/libpmemlog.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: libpmemlog
 Description: libpmemlog library from PMDK project
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires.private: libpmem${rasdeps}
 Libs: -L${libdir} -lpmemlog
 Cflags: -I${includedir}
--- pmdk-1.8~rc1.orig/utils/libpmemobj.pc.in
+++ pmdk-1.8~rc1/utils/libpmemobj.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: libpmemobj
 Description: libpmemobj library from PMDK project
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires.private: libpmem${rasdeps}
 Libs: -L${libdir} -lpmemobj
 Libs.private: -ldl
--- pmdk-1.8~rc1.orig/utils/libpmempool.pc.in
+++ pmdk-1.8~rc1/utils/libpmempool.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: libpmempool
 Description: libpmempool library from PMDK project
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires.private: libpmem${rasdeps}
 Libs: -L${libdir} -lpmempool
 Libs.private: -ldl
--- pmdk-1.8~rc1.orig/utils/librpmem.pc.in
+++ pmdk-1.8~rc1/utils/librpmem.pc.in
@@ -3,7 +3,7 @@ includedir=${prefix}/include
 Name: librpmem
 Description: librpmem library from PMDK project
 Version: ${version}
-URL: http://pmem.io/pmdk
+URL: https://pmem.io/pmdk
 Requires:
 Libs: -L${libdir} -lrpmem
 Cflags: -I${includedir}
--- pmdk-1.8~rc1.orig/utils/pkg-config.sh
+++ pmdk-1.8~rc1/utils/pkg-config.sh
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2019, Intel Corporation
+# Copyright 2014-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -42,4 +42,4 @@ PACKAGE_SUMMARY="Persistent Memory Devel
 PACKAGE_DESCRIPTION="The collection of libraries and utilities for Persistent Memory Programming"
 
 # Website
-PACKAGE_URL="http://pmem.io/pmdk"
+PACKAGE_URL="https://pmem.io/pmdk"
--- pmdk-1.8~rc1.orig/utils/pmdk.spec.in
+++ pmdk-1.8~rc1/utils/pmdk.spec.in
@@ -37,7 +37,7 @@ Summary:	__PACKAGE_SUMMARY__
 Packager:	__PACKAGE_MAINTAINER__
 Group:		__GROUP_SYS_LIBS__
 License:	__LICENSE__
-URL:		http://pmem.io/pmdk
+URL:		https://pmem.io/pmdk
 
 Source0:	%{name}-%{version}.tar.gz
 
