Tim Rühsen
864d938f39
Add brackets for AC_INIT argument
2022-01-15 14:18:18 +01:00
Tim Rühsen
5f796be788
Merge pull request #177 from equeim/meson-static
...
meson: automatically add PSL_STATIC define when building Windows static library and fix tests/tools link errors
2022-01-15 13:54:28 +01:00
Alexey Rochev
1159bd46c3
meson: fix tests/tools link errors when building shared library for Windows
...
We need to link them with ws2_32 explicitly.
2022-01-13 01:55:03 +03:00
Alexey Rochev
ba6f11f751
meson: automatically add PSL_STATIC define when building Windows static library
2022-01-13 01:54:38 +03:00
Tim Rühsen
4a10a1698b
Merge pull request #179 from equeim/meson-libicu-static
...
Use C++ linker when building with libicu
2022-01-08 19:43:10 +01:00
Alexey Rochev
02c8476071
Use C++ linker when building with libicu
...
ICU is a C++ library, event though it has C interface.
Therefore we have to use C++ linker when linking with it.
2022-01-07 01:12:17 +03:00
Tim Rühsen
88a75d4711
Merge pull request #178 from equeim/tests-libicu
...
Fix Meson build
2022-01-06 19:29:39 +01:00
Alexey Rochev
5a29a64444
Remove libicu includes from test-registrable-domain.c
...
It doesn't seem like they are used,
and they cause build failures with meson.
2022-01-06 03:03:43 +03:00
Alexey Rochev
43fc4f0631
meson: bring back libiconv dependency lookup
2022-01-06 03:03:43 +03:00
Alexey Rochev
0ecc788797
Remove meson.build generation and separate project and library versions in their own files
...
Project and library version are now stored in
version.txt and libtool_version_info.txt files respectively.
Both autotools and meson get their versioning information from this files.
Meson additionally automatically transforms library version
from libtool's own format.
Also raise meson version requirement from 0.47 to 0.57 which
is required by these changes.
2022-01-06 03:02:33 +03:00
Tim Rühsen
4afd9e705b
Merge pull request #174 from rockdaboot/tmp-wsa-startup
...
Add WSAStartup() for Windows psl tool and tests.
2021-11-26 19:18:19 +01:00
Tim Rühsen
f5035b854b
Add WSAStartup() for Windows psl tool and tests.
...
As reported at https://github.com/rockdaboot/libpsl/issues/173 ,
psl_is_cookie_domain_acceptable() doesn't work properly without
WSAStartup() on Windows.
Co-authored-by: gvanem@yahoo.no
2021-11-26 19:10:37 +01:00
Tim Rühsen
b2625f93f2
Fix write buffer overflow by 1 in domain_to_punycode()
...
This issue has been triggered after the previous commit increased
the size of label_buf.
It has been found by OSS-Fuzz (issue 39226).
The testcase is included into the unit tests.
2021-09-26 18:02:04 +02:00
Tim Rühsen
304ca77522
Increase label size from 48 -> 128
2021-09-18 12:24:45 +02:00
Tim Rühsen
50ff7f2edf
Update upstream PSL
2021-09-18 12:22:16 +02:00
Tim Rühsen
6ce6c4e399
Merge pull request #168 from nacho/nacho/gtk-doc
...
meson: build reference manual with gtk_doc
2021-01-31 17:38:23 +01:00
Ignacio Casal Quinteiro
a1b91e86e4
meson: build reference manual with gtk_doc
2021-01-26 12:38:01 +01:00
Tim Rühsen
6f4f6d766c
Replace obsolete AC_HELP_STRING with AS_HELP_STRING
2021-01-16 18:16:35 +01:00
Tim Rühsen
99e7e6a2af
Merge pull request #166 from quink-black/fix-build-iconv
...
Add libiconv dep to meson build again
2021-01-16 18:07:35 +01:00
Tim Rühsen
44443ad3a4
Update PSL data from upstream
2021-01-16 17:56:23 +01:00
Tim Rühsen
fef1568bef
Merge pull request #167 from SteelPangolin/meson-install-more
...
Meson: install libpsl man page, DAFSA builder
2021-01-16 17:46:39 +01:00
Erica Ehrhardt
62081a021f
Meson: install libpsl man page, DAFSA builder
...
Partially addresses issue #136 ,
at least when building from a distribution tarball.
2021-01-14 17:13:46 -08:00
Zhao Zhili
5b63816e82
Add libiconv dep to meson build again
...
Build success on macOS and ubuntu.
2021-01-07 20:59:17 +08:00
Tim Rühsen
6a5e41edc5
Merge pull request #164 from tp-m/fix-meson-build
...
meson: fix build
2020-10-26 21:27:11 +01:00
Tim-Philipp Müller
8e02c2c4f1
meson: fix build
...
src/meson.build:19:0: ERROR: Unknown variable "libiconv".
2020-10-26 10:46:53 +00:00
Tim Rühsen
d61859f4b5
Merge pull request #163 from rockdaboot/tmp-doc-buildfromtarball
...
Add 'Building from tarball' to README.md
2020-10-25 11:56:20 +01:00
Tim Rühsen
5ccf1e85fe
Add 'Building from tarball' to README.md
2020-10-25 11:55:17 +01:00
Tim Rühsen
03df58fc96
Merge pull request #162 from thinkski/master
...
Add libiconv dep to meson build
2020-09-21 16:22:17 +02:00
Chris Hiszpanski
079e8d0f6c
Add libiconv dep to meson build
2020-09-20 04:57:12 -07:00
Tim Rühsen
17cce94216
Merge pull request #158 from kloczek/master
...
Install psl executable and man pages.
2020-08-05 20:06:12 +02:00
Tomasz Kłoczko
47bab910ee
Install psl executable and man pages.
...
Resolve #156
2020-08-05 18:38:11 +01:00
Tim Rühsen
a5e6f26cce
Release V0.21.1
2020-07-18 13:15:00 +02:00
Tim Rühsen
0073dd737d
Merge pull request #155 from damz/pr/fix-coveralls
...
Upgrade Ubuntu to fix the coveralls issue
2020-07-02 18:52:47 +02:00
Damien Tournoud
c471792664
Try if upgrading ubuntu helps with the coveralls issue
2020-07-02 09:43:52 -07:00
Tim Rühsen
f5142207aa
Merge pull request #154 from kotnik/psh-test-update
...
Update Platform.sh example in test_data
2020-07-02 18:38:52 +02:00
Nikola Kotur
f364cea73e
Update Platform.sh example in test data
2020-07-02 17:04:27 +02:00
Tim Rühsen
72365d3036
Merge pull request #153 from nirbheek/fix-build-windows
...
meson: Fix running of psl-make-dafsa on Windows
2020-04-06 17:03:17 +02:00
Nirbheek Chauhan
0c11bf19df
meson: Fix running of psl-make-dafsa on Windows
...
`find_program()` evaluates to `python psl-make-dafsa` on Windows, so
running it with `python` evaluates to `python python psl-make-dafsa`,
causing this error on Windows:
```
"c:/python38/python.exe" "python" "C:/projects/repos/libpsl/src/psl-make-dafsa" "--output-format=binary" "C:/projects/repos/libpsl/list/public_suffix_list.dat" "tests/psl.dafsa"
c:/python38/python.exe: can't open file 'python': [Errno 2] No such file or directory
```
2020-04-06 20:18:45 +05:30
Tim Rühsen
20ad8fb106
Merge pull request #152 from nirbheek/fix-typo
...
meson: Fix typo
2020-04-03 17:29:05 +02:00
Nirbheek Chauhan
116b5fe7b9
meson: Fix typo
2020-04-03 20:50:07 +05:30
Tim Rühsen
8d9e490ee7
Merge pull request #151 from nirbheek/fix-buildtype-usage
...
meson: Use the b_vscrt option for selecting the CRT
2020-04-03 15:22:51 +02:00
Nirbheek Chauhan
a582a9c142
meson: Use the b_vscrt option for selecting the CRT
...
This option has been available since 0.48, and we should use it
instead of only guessing based on buildtype.
2020-04-03 16:45:11 +05:30
Tim Rühsen
96412ad0e0
Merge pull request #150 from ystreet/meson-python
...
meson: run python script against the meson version of python
2020-04-02 10:22:12 +02:00
Matthew Waters
a10c374dad
meson: run python script against the meson version of python
...
Avoids using a python that may not exist in a python3 only distribution:
/usr/bin/env: ‘python’: No such file or directory
2020-04-02 15:16:20 +11:00
Tim Rühsen
d54ecbd05e
Add meson check for strings.h
2020-03-10 15:57:33 +01:00
Tim Rühsen
55889b1d9e
Add recent changes from meson.build to meson.build.in
2020-03-10 15:47:55 +01:00
Tim Rühsen
b9a190264f
psl.c: Include strings.h only if it is available
2020-03-10 15:16:25 +01:00
Tim Rühsen
a2411a7207
Add Github FUNDING.yml
2020-03-07 20:42:04 +01:00
Tim Rühsen
d26a0acfd7
Merge pull request #148 from nirbheek/meson-port
...
meson: Use libtool library versioning, same as autotools
2020-02-28 14:01:36 +01:00
Nirbheek Chauhan
841ae6dddd
meson: Use libtool library versioning, same as autotools
...
This helps maintain ABI compatibility with the Autotools build so it's
a drop-in replacement.
2020-02-28 13:20:23 +05:30