SF.net SVN: gar:[26325] csw/mgar/pkg/libpsl/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Jan 16 15:30:05 CET 2018 

Revision: 26325
          http://sourceforge.net/p/gar/code/26325
Author:   dmichelsen
Date:     2018-01-16 14:30:04 +0000 (Tue, 16 Jan 2018)
Log Message:
-----------
libpsl/trunk: Update to 0.19.1

Modified Paths:
--------------
    csw/mgar/pkg/libpsl/trunk/Makefile
    csw/mgar/pkg/libpsl/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
    csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch

Removed Paths:
-------------
    csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch

Modified: csw/mgar/pkg/libpsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpsl/trunk/Makefile	2018-01-16 12:45:25 UTC (rev 26324)
+++ csw/mgar/pkg/libpsl/trunk/Makefile	2018-01-16 14:30:04 UTC (rev 26325)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = libpsl
-VERSION = 0.14.0
+VERSION = 0.19.1
 GARTYPE = v2
 
 DESCRIPTION = Provides functions to check domains against the Mozilla Public Suffix List
@@ -11,25 +11,34 @@
 DISTFILES += $(DISTNAME).tar.gz
 
 # Use patch until this is fixed:
-#   https://github.com/rockdaboot/libpsl/pull/54
-PATCHFILES += 0001-Use-proper-library-path-and-libs-for-ICU.patch
+#   https://github.com/rockdaboot/libpsl/pull/88
+PATCHFILES += 0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
 
+# Use patch until this is fixed:
+#   https://github.com/rockdaboot/libpsl/pull/89
+PATCHFILES += 0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
+
 PACKAGES += CSWlibpsl5
 SPKG_DESC_CSWlibpsl5 = Public Suffix List library, libpsl.so.5
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibicuuc57
-RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibicudata57
+PKGFILES_CSWlibpsl5 += $(call pkgfiles_lib,libpsl.so.5)
+RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibidn2-0
 RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWpublic-suffix-list
 CHECKPKG_OVERRIDES_CSWlibpsl5 += surplus-dependency|CSWpublic-suffix-list
 
 PACKAGES += CSWlibpsl-dev
 SPKG_DESC_CSWlibpsl-dev = Development files for libpsl.so.5
-PKGFILES_CSWlibpsl-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWlibpsl-dev += $(bindir)/.*
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibpsl5
 RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibicuuc57
 RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibicudata57
-RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibpsl5
+RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibidn2-0
 
+PACKAGES += CSWlibpsl-util
+SPKG_DESC_CSWlibpsl-util = Utilities for handling Public Suffix Lists
+PKGFILES_CSWlibpsl-util += $(bindir)/psl
+RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibpsl5
+RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibidn2-0
+
 BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
@@ -41,8 +50,15 @@
 # This is needed for sha1sum
 BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
 
+# Testsuite needs fmemopen() which we don't have in Solaris
+SKIPTEST ?= 1
+
 include gar/category.mk
 
 post-patch:
 	cd $(WORKSRC) && autoreconf -fi
 	@$(MAKECOOKIE)
+
+post-install:
+	ginstall -D -m 0755 $(WORKSRC)/src/psl-make-dafsa $(DESTDIR)$(bindir)/psl-make-dafsa
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libpsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpsl/trunk/checksums	2018-01-16 12:45:25 UTC (rev 26324)
+++ csw/mgar/pkg/libpsl/trunk/checksums	2018-01-16 14:30:04 UTC (rev 26325)
@@ -1 +1 @@
-ace83b37a37d94fa2dd543ccda80138b  libpsl-0.14.0.tar.gz
+663de429bfa0eb96c39ba57fb0866f5b  libpsl-0.19.1.tar.gz

Added: csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
===================================================================
--- csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch	                        (rev 0)
+++ csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch	2018-01-16 14:30:04 UTC (rev 26325)
@@ -0,0 +1,22 @@
+From c80c5fb8bbbc47e27c66809c43f7d0def7ac8772 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 16 Jan 2018 13:46:42 +0100
+Subject: [PATCH] Remove unconditional setting of GCC-specific flag
+
+---
+ fuzz/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
+index fcdfe16..f98d186 100644
+--- a/fuzz/Makefile.am
++++ b/fuzz/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) -Wno-unused-parameter
++AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -DSRCDIR=\"$(abs_srcdir)\" -DTEST_RUN
+ #AM_LDFLAGS = -static
+ AM_LDFLAGS = -no-install
+-- 
+2.4.0
+

Added: csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
===================================================================
--- csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch	                        (rev 0)
+++ csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch	2018-01-16 14:30:04 UTC (rev 26325)
@@ -0,0 +1,29 @@
+From c8bb81364f5c02cff69b84eeb53bbb9a7bf47bca Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 16 Jan 2018 13:33:24 +0100
+Subject: [PATCH] Use LIBIDN2_LIBS instead of hardcoding
+
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index de0926d..9a98e61 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -14,10 +14,10 @@ if WITH_LIBICU
+   libpsl_la_LDFLAGS += $(LIBICU_LIBS)
+ endif
+ if WITH_LIBIDN2
+-  libpsl_la_LDFLAGS += -lidn2 -lunistring
++  libpsl_la_LDFLAGS += $(LIBIDN2_LIBS)
+ endif
+ if WITH_LIBIDN
+-  libpsl_la_LDFLAGS += -lidn -lunistring
++  libpsl_la_LDFLAGS += $(LIBIDN_LIBS)
+ endif
+ 
+ # Build rule for suffix_dafsa.c
+-- 
+2.4.0
+

Deleted: csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch
===================================================================
--- csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch	2018-01-16 12:45:25 UTC (rev 26324)
+++ csw/mgar/pkg/libpsl/trunk/files/0001-Use-proper-library-path-and-libs-for-ICU.patch	2018-01-16 14:30:04 UTC (rev 26325)
@@ -1,34 +0,0 @@
-From 9527a804deaf2bf4644779793ccb9ea9aa68a881 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sun, 21 Aug 2016 15:02:39 +0200
-Subject: [PATCH] Use proper library path and libs for ICU
-
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 71a1d01..c0f0b3e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,7 +11,7 @@ libpsl_la_CPPFLAGS = -I$(top_srcdir)/include
- # include ABI version information
- libpsl_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
- if WITH_LIBICU
--  libpsl_la_LDFLAGS += -licuuc
-+  libpsl_la_LDFLAGS += $(LIBICU_LIBS)
- endif
- if WITH_LIBIDN2
-   libpsl_la_LDFLAGS += -lidn2 -lunistring
-@@ -24,7 +24,7 @@ noinst_PROGRAMS = psl2c
- psl2c_SOURCES = psl2c.c lookup_string_in_fixed_set.c
- psl2c_CPPFLAGS = -I$(top_srcdir)/include -DMAKE_DAFSA=\"$(top_srcdir)/src/psl-make-dafsa\"
- if BUILTIN_GENERATOR_LIBICU
--  psl2c_LDADD = -licuuc
-+  psl2c_LDADD = $(LIBICU_LIBS)
- endif
- if BUILTIN_GENERATOR_LIBIDN2
-   psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring
--- 
-2.4.0
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list