walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Release v0.16.1 

-----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEHLJ9vJhhSy1YQWRtCDAttqJnBCgFAlhShqkTHHRpbS5ydWVo
 c2VuQGdteC5kZQAKCRAIMC22omcEKPMAEACKxJNQrdQbcmGBwwZgH31sW9Z6PWll
 MMTpuLeLl7OLHWQ+/Cp//6qLcH2zbRl/X3vHDQ3CDq3DtPm1WIWn+MMZPU/EvwDR
 EdFnCBcuhHb3Yg+9XfMNFSMFQYXZVZAcE/y4Ux32qTkgFDwAYBUUx86RtoPF3pSn
 9gbBI2DFR+l6aedXM+8xcQoocROJn2EhcIIfGeLdEyQ5XpmOMUoxZb9y7Rg2xrR/
 zK+uZhmVUcyzV2MFD5PgyXhVgJncmJdipxblXhH/1LoVqa+5QvMX3XPcWp1D/Up+
 eyzBdzU1CKFH1aRrflEGBehWSFQr/zIYBqYhL3BQANXc7SSryCj9Ah5wO5Hxffpq
 v+trGEVkUtlAHolGnDJawjUDNbFFUo31Cc9gkqkPqWuko+iQ1SmeLgbGzCmPY8x9
 5wt2sGce7EbimhYYyAM78oRqMlb9+fOiRXgDpQhldZHy+yJrGwIQCblx3BFcuEje
 z8O9w14zqfvdzHSm/IQVZmnIigjUvrRO1Dmlj41vhwlEk0v8+ZsNcaewVroPsP+o
 M2p34jBiWxs0nRBsOBStS4rhKchYC6lQbv39BvSTa9bYyyGD61XxtHqQrPB/MxJM
 gluZ3XOWIhcN63bOCS/jlAO9CiOeHhqAWxrGOYpraiAlA55bdR8W3YFb+KmdwFfp
 /2oXinKXLP6h7g==
 =bfx+
 -----END PGP SIGNATURE-----

Merge tag 'libpsl-0.16.1' into debian

Release v0.16.1
This commit is contained in:
Tim Rühsen 2016-12-15 15:44:33 +01:00
parent 440268f912 7d5f3a67af
commit 841a7d3e77
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,5 +1,9 @@
Copyright (C) 2014-2016 Tim Rühsen Copyright (C) 2014-2016 Tim Rühsen
15.12.2016 Release V0.16.1
* Fix SO_VERSION to 6:0:1
* Add --use-latest-psl to tools/psl as default
16.12.2016 Release V0.16.0 16.12.2016 Release V0.16.0
* Add functions psl_latest() and psl_dist_filename() * Add functions psl_latest() and psl_dist_filename()
* Do not taint out variable on error in psl_str_to_utf8lower() * Do not taint out variable on error in psl_str_to_utf8lower()

4
configure.ac
View File

@ -1,5 +1,5 @@
AC_INIT([libpsl], [0.16.0], [tim.ruehsen@gmx.de], [libpsl], [https://github.com/rockdaboot/libpsl]) AC_INIT([libpsl], [0.16.1], [tim.ruehsen@gmx.de], [libpsl], [https://github.com/rockdaboot/libpsl])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.10 no-define foreign]) AM_INIT_AUTOMAKE([1.10 no-define foreign])
@ -88,7 +88,7 @@ PKG_PROG_PKG_CONFIG
# 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
# 5. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been added since the last public release, then increment age.
# 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0. # 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0.
AC_SUBST([LIBPSL_SO_VERSION], [6:0:0]) AC_SUBST([LIBPSL_SO_VERSION], [6:0:1])
AC_SUBST([LIBPSL_VERSION], $VERSION) AC_SUBST([LIBPSL_VERSION], $VERSION)
# Check for enable/disable builtin PSL data # Check for enable/disable builtin PSL data

7
tools/psl.1
View File

@ -42,12 +42,15 @@ show library version information
\fB\-\-print\-info\fR \fB\-\-print\-info\fR
print info about library builtin data print info about library builtin data
.SH PUBLIC SUFFIX DATA .SH PUBLIC SUFFIX DATA
By default, `psl' will use built-in Public Suffix data. By default, `psl' will use the latest available Public Suffix data.
.br .br
You can also direct it to use a different file: You can also direct it to use a different file:
.TP .TP
\fB\-\-use\-latest\-data\fR
use the latest available PSL data [default]
.TP
\fB\-\-use\-builtin\-data\fR \fB\-\-use\-builtin\-data\fR
use the builtin PSL data [default] use the builtin PSL data
.TP .TP
\fB\-\-load\-psl\-file\fR <filename> \fB\-\-load\-psl\-file\fR <filename>
load PSL data from file load PSL data from file

12
tools/psl.c
View File

@ -45,7 +45,8 @@ static void usage(int err, FILE* f)
fprintf(f, "\n"); fprintf(f, "\n");
fprintf(f, "Options:\n"); fprintf(f, "Options:\n");
fprintf(f, " --version show library version information\n"); fprintf(f, " --version show library version information\n");
fprintf(f, " --use-builtin-data use the builtin PSL data [default]\n"); fprintf(f, " --use-latest-data use the latest PSL data available [default]\n");
fprintf(f, " --use-builtin-data use the builtin PSL data\n");
fprintf(f, " --load-psl-file <filename> load PSL data from file\n"); fprintf(f, " --load-psl-file <filename> load PSL data from file\n");
fprintf(f, " --is-public-suffix check if domains are public suffixes [default]\n"); fprintf(f, " --is-public-suffix check if domains are public suffixes [default]\n");
fprintf(f, " --is-cookie-domain-acceptable <cookie-domain>\n"); fprintf(f, " --is-cookie-domain-acceptable <cookie-domain>\n");
@ -92,6 +93,15 @@ int main(int argc, const char *const *argv)
mode = 4; mode = 4;
cookie_domain = *(++arg); cookie_domain = *(++arg);
} }
else if (!strcmp(*arg, "--use-latest-data")) {
psl_free(psl);
if (psl_file) {
fprintf(stderr, "Dropped data from %s\n", psl_file);
psl_file = NULL;
}
if (!(psl = (psl_ctx_t *) psl_latest(NULL)))
printf("No PSL data available\n");
}
else if (!strcmp(*arg, "--use-builtin-data")) { else if (!strcmp(*arg, "--use-builtin-data")) {
psl_free(psl); psl_free(psl);
if (psl_file) { if (psl_file) {