Skip to content

Commit d2c52e8

Browse files
committed
merge:
1 parent 8a7fde4 commit d2c52e8

37 files changed

+333
-370
lines changed

cmake/Modules/CheckCreds.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/CheckIPv6.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/CheckSockaddrStorage.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/CheckStructMember.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/ExternalIVYKIS.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
# Copyright (c) 2017 Balabit
33
# Copyright (c) 2017 Kokan
44
#
5-
# This library is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU Lesser General Public
7-
# License as published by the Free Software Foundation; either
8-
# version 2.1 of the License, or (at your option) any later version.
5+
# This program is free software: you can redistribute it and/or modify it
6+
# under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation, either version 3 of the License, or
8+
# (at your option) any later version.
99
#
10-
# This library is distributed in the hope that it will be useful,
10+
# This program is distributed in the hope that it will be useful,
1111
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
# Lesser General Public License for more details.
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
1414
#
15-
# You should have received a copy of the GNU Lesser General Public
16-
# License along with this library; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# You should have received a copy of the GNU General Public License
16+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1817
#
1918
# As an additional exemption you are allowed to compile & link against the
2019
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindCurl.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
# Copyright (c) 2016 Balabit
33
# Copyright (c) 2016 Todd C. Miller
44
#
5-
# This library is free software; you can redistribute it and/or
6-
# modify it under the terms of the GNU Lesser General Public
7-
# License as published by the Free Software Foundation; either
8-
# version 2.1 of the License, or (at your option) any later version.
5+
# This program is free software: you can redistribute it and/or modify it
6+
# under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation, either version 3 of the License, or
8+
# (at your option) any later version.
99
#
10-
# This library is distributed in the hope that it will be useful,
10+
# This program is distributed in the hope that it will be useful,
1111
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
# Lesser General Public License for more details.
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
1414
#
15-
# You should have received a copy of the GNU Lesser General Public
16-
# License along with this library; if not, write to the Free Software
17-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
# You should have received a copy of the GNU General Public License
16+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1817
#
1918
# As an additional exemption you are allowed to compile & link against the
2019
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindESMTP.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindFLEX.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindGettext.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindGradle.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindHiredis.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

cmake/Modules/FindIVYKIS.cmake

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#############################################################################
22
# Copyright (c) 2016 Balabit
33
#
4-
# This library is free software; you can redistribute it and/or
5-
# modify it under the terms of the GNU Lesser General Public
6-
# License as published by the Free Software Foundation; either
7-
# version 2.1 of the License, or (at your option) any later version.
4+
# This program is free software: you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
88
#
9-
# This library is distributed in the hope that it will be useful,
9+
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
# Lesser General Public License for more details.
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
1313
#
14-
# You should have received a copy of the GNU Lesser General Public
15-
# License along with this library; if not, write to the Free Software
16-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1716
#
1817
# As an additional exemption you are allowed to compile & link against the
1918
# OpenSSL libraries as published by the OpenSSL project. See the file

0 commit comments

Comments
 (0)