From c816ce6969197204a85d51b5a5a121fbf2f654a5 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Thu, 11 Jul 2019 03:36:03 -0500
Subject: [PATCH] pkgconf 1.6.2. (closes #38, #40, #41)

---
 CMakeLists.txt          |  4 ++--
 Makefile.lite           |  4 ++--
 NEWS                    | 12 ++++++++++++
 configure.ac            |  2 +-
 libpkgconf/libpkgconf.h |  4 ++--
 meson.build             |  4 ++--
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a4fd6..a68a0d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,9 +10,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1 FATAL_ERROR)
 
 PROJECT(pkgconf C)
 
-SET(PACKAGE_BUGREPORT http://github.com/pkgconf/pkgconf/issues)
+SET(PACKAGE_BUGREPORT http://git.dereferenced.org/pkgconf/pkgconf/issues)
 SET(PACKAGE_NAME pkgconf)
-SET(PACKAGE_VERSION 1.6.0)
+SET(PACKAGE_VERSION 1.6.2)
 SET(LIBPKGCONF_VERSION "3.0.0")
 SET(LIBPKGCONF_SOVERSION 3)
 
diff --git a/Makefile.lite b/Makefile.lite
index fe73305..bfcbdf8 100644
--- a/Makefile.lite
+++ b/Makefile.lite
@@ -38,8 +38,8 @@ all: pkgconf-lite
 
 libpkgconf/config.h:
 	@echo '#define PACKAGE_NAME "pkgconf-lite"' >> $@
-	@echo '#define PACKAGE_BUGREPORT "https://git.dereferenced.org/pkgconf/pkgconf/issues/new"' >> $@
-	@echo '#define PACKAGE_VERSION "1.6.1"' >> $@
+	@echo '#define PACKAGE_BUGREPORT "https://git.dereferenced.org/pkgconf/pkgconf/issues"' >> $@
+	@echo '#define PACKAGE_VERSION "1.6.2"' >> $@
 	@echo '#define PACKAGE PACKAGE_NAME " " PACKAGE_VERSION' >> $@
 	@echo '#define HAVE_STRLCPY' >> $@
 	@echo '#define HAVE_STRLCAT' >> $@
diff --git a/NEWS b/NEWS
index bf8cdd3..b1bebfa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,18 @@
 Changes from previous version of pkgconf
 ========================================
 
+Changes from 1.6.1 to 1.6.2:
+----------------------------
+
+* Bug fixes:
+  - Fixed a memory leak when deduplicating paths.
+  - Fixed strndup-related build regression on Windows.
+
+* Enhancements:
+  - Added pkgconf-lite variant.  pkgconf-lite is a stripped down
+    variant of pkgconf that only includes pkg-config features.
+  - Added --modversion description to pkgconf(1) man page.
+
 Changes from 1.6.0 to 1.6.1:
 ----------------------------
 
diff --git a/configure.ac b/configure.ac
index 12fcbf0..f51e8c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl implied.  In no event shall the authors be liable for any damages arising
 dnl from the use of this software.
 
 AC_PREREQ([2.68])
-AC_INIT([pkgconf], [1.6.1], [http://github.com/pkgconf/pkgconf/issues])
+AC_INIT([pkgconf], [1.6.2], [http://git.dereferenced.org/pkgconf/pkgconf/issues])
 AC_CONFIG_SRCDIR([cli/main.c])
 AC_CONFIG_MACRO_DIRS([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index abf55c7..f120e80 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -78,8 +78,8 @@ typedef struct pkgconf_cross_personality_ pkgconf_cross_personality_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
 
-#define LIBPKGCONF_VERSION	10600
-#define LIBPKGCONF_VERSION_STR	"1.6.0"
+#define LIBPKGCONF_VERSION	10602
+#define LIBPKGCONF_VERSION_STR	"1.6.2"
 
 struct pkgconf_fragment_ {
 	pkgconf_node_t iter;
diff --git a/meson.build b/meson.build
index afd9d0c..fe1f216 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pkgconf', 'c',
-  version : '1.6.0',
+  version : '1.6.2',
   license : 'ISC',
   meson_version : '>=0.40')
 
@@ -56,7 +56,7 @@ cdata.set_quoted('PKG_DEFAULT_PATH', ':'.join(default_path))
 cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path))
 cdata.set_quoted('PACKAGE_NAME', meson.project_name())
 cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
-cdata.set_quoted('PACKAGE_BUGREPORT', 'http://github.com/pkgconf/pkgconf/issues')
+cdata.set_quoted('PACKAGE_BUGREPORT', 'http://git.dereferenced.org/pkgconf/pkgconf/issues')
 cdata.set('abs_top_srcdir', meson.source_root())
 cdata.set('abs_top_builddir', meson.build_root())