Skip to content

Commit 1543e95

Browse files
basil00basil00
committed
Dual-license WinDivert under the LGPLv3 and GPLv2.
This allows projects that are strictly "GPLv2 only" to use WinDivert without licensing issues. See the FSF's compatibility matrix here: https://www.gnu.org/licenses/gpl-faq.en.html This change does not affect existing projects that can continue to use the LGPLv3 as before. Also, bump the WinDivert version to 1.4.1.
1 parent a67886e commit 1543e95

29 files changed

+866
-284
lines changed

‎CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,5 @@ WinDivert 1.4.0-rc
121121
- The WINDIVERT_HELPER_NO_REPLACE flag for WinDivertHelperCalcChecksums()
122122
has been deprecated. It is no longer necessary to calculate checksums
123123
for unmodified packets.
124+
WinDivert 1.4.1
125+
- Dual license WinDivert under LGPLv3 and GPLv2.

‎LICENSE

Lines changed: 407 additions & 3 deletions
Large diffs are not rendered by default.

‎README

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,9 @@ For more detailed build instructions, see doc\windivert.html
102102
5. License
103103
----------
104104

105-
This package is distributed under the GNU Lesser General Public License
106-
(LGPL) Version 3. See LICENSE for more information.
107-
108-
This program is free software: you can redistribute it and/or modify
109-
it under the terms of the GNU Lesser General Public License as published by
110-
the Free Software Foundation, either version 3 of the License, or
111-
(at your option) any later version.
112-
113-
This program is distributed in the hope that it will be useful,
114-
but WITHOUT ANY WARRANTY; without even the implied warranty of
115-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
116-
GNU Lesser General Public License for more details.
117-
118-
You should have received a copy of the GNU Lesser General Public License
119-
along with this program. If not, see <http://www.gnu.org/licenses/>
105+
WinDivert is dual-licensed, and is available under the GNU Lesser General
106+
Public License (LGPL) Version 3 or the GNU General Public License (GPL)
107+
Version 2. See the LICENSE file for more information.
120108

121109
6. About
122110
--------

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0-rc
1+
1.4.1

‎dll/sources

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
# sources
2-
# (C) 2016, all rights reserved,
3-
#
4-
# This program is free software: you can redistribute it and/or modify
5-
# it under the terms of the GNU Lesser 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.
8-
#
9-
# This program is distributed in the hope that it will be useful,
10-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU Lesser General Public License for more details.
13-
#
14-
# You should have received a copy of the GNU Lesser General Public License
15-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
161

172
TARGETNAME=WinDivert
183
TARGETTYPE=DYNLINK

‎dll/windivert.c

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
11
/*
22
* windivert.c
3-
* (C) 2016, all rights reserved,
3+
* (C) 2018, all rights reserved,
44
*
5-
* This program is free software: you can redistribute it and/or modify
6-
* it under the terms of the GNU Lesser 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.
5+
* This file is part of WinDivert.
96
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
7+
* WinDivert is free software: you can redistribute it and/or modify it under
8+
* the terms of the GNU Lesser General Public License as published by the
9+
* Free Software Foundation, either version 3 of the License, or (at your
10+
* option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful, but
13+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
15+
* License for more details.
1416
*
1517
* You should have received a copy of the GNU Lesser General Public License
1618
* along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
*
20+
* WinDivert is free software; you can redistribute it and/or modify it under
21+
* the terms of the GNU General Public License as published by the Free
22+
* Software Foundation; either version 2 of the License, or (at your option)
23+
* any later version.
24+
*
25+
* This program is distributed in the hope that it will be useful, but
26+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
27+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
28+
* for more details.
29+
*
30+
* You should have received a copy of the GNU General Public License along
31+
* with this program; if not, write to the Free Software Foundation, Inc., 51
32+
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1733
*/
1834

1935
#ifndef UNICODE

‎dll/windivert_helper.c

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
11
/*
22
* windivert_helper.c
3-
* (C) 2017, all rights reserved,
3+
* (C) 2018, all rights reserved,
44
*
5-
* This program is free software: you can redistribute it and/or modify
6-
* it under the terms of the GNU Lesser 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.
5+
* This file is part of WinDivert.
96
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
7+
* WinDivert is free software: you can redistribute it and/or modify it under
8+
* the terms of the GNU Lesser General Public License as published by the
9+
* Free Software Foundation, either version 3 of the License, or (at your
10+
* option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful, but
13+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
15+
* License for more details.
1416
*
1517
* You should have received a copy of the GNU Lesser General Public License
1618
* along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
*
20+
* WinDivert is free software; you can redistribute it and/or modify it under
21+
* the terms of the GNU General Public License as published by the Free
22+
* Software Foundation; either version 2 of the License, or (at your option)
23+
* any later version.
24+
*
25+
* This program is distributed in the hope that it will be useful, but
26+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
27+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
28+
* for more details.
29+
*
30+
* You should have received a copy of the GNU General Public License along
31+
* with this program; if not, write to the Free Software Foundation, Inc., 51
32+
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1733
*/
1834

1935
/****************************************************************************/

‎doc/windivert.html

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,12 +1816,17 @@ <h2>Table of Contents</h2>
18161816
<hr>
18171817
<a name="license"><h2>10. License</h2></a>
18181818
<p>
1819-
This package is distributed <i>strictly</i> under the
1819+
WinDivert is dual-licensed, and is available under the
18201820
<a href="http://www.gnu.org/licenses/lgpl-3.0.txt">GNU Lesser General
1821-
Public License (GPL) Version 3</a>.
1822-
Please note the following:
1821+
Public License (LGPL) Version 3</a> or the
1822+
<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">
1823+
GNU General Public License (GPL) Version 2</a>.
1824+
Please see the notices below:
1825+
</p>
1826+
<p>
1827+
<b>LGPL version 3</b>:
18231828
<pre>
1824-
This program is free software: you can redistribute it and/or modify
1829+
WinDivert is free software: you can redistribute it and/or modify
18251830
it under the terms of the GNU Lesser General Public License as published by
18261831
the Free Software Foundation, either version 3 of the License, or
18271832
(at your option) any later version.
@@ -1835,8 +1840,23 @@ <h2>Table of Contents</h2>
18351840
along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
18361841
</pre>
18371842
</p>
1838-
<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
1839-
<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
1840-
<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
1843+
<p>
1844+
<b>GPL version 2</b>:
1845+
<pre>
1846+
WinDivert is free software; you can redistribute it and/or modify
1847+
it under the terms of the GNU General Public License as published by
1848+
the Free Software Foundation; either version 2 of the License, or
1849+
(at your option) any later version.
1850+
1851+
This program is distributed in the hope that it will be useful,
1852+
but WITHOUT ANY WARRANTY; without even the implied warranty of
1853+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1854+
GNU General Public License for more details.
1855+
1856+
You should have received a copy of the GNU General Public License along
1857+
with this program; if not, write to the Free Software Foundation, Inc.,
1858+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1859+
</pre>
1860+
</p>
18411861
</body>
18421862
</html>

‎examples/netdump/netdump.c

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
11
/*
22
* netdump.c
3-
* (C) 2017, all rights reserved,
3+
* (C) 2018, all rights reserved,
44
*
5-
* This program is free software: you can redistribute it and/or modify
6-
* it under the terms of the GNU Lesser 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.
5+
* This file is part of WinDivert.
96
*
10-
* This program is distributed in the hope that it will be useful,
11-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
* GNU Lesser General Public License for more details.
7+
* WinDivert is free software: you can redistribute it and/or modify it under
8+
* the terms of the GNU Lesser General Public License as published by the
9+
* Free Software Foundation, either version 3 of the License, or (at your
10+
* option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful, but
13+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
15+
* License for more details.
1416
*
1517
* You should have received a copy of the GNU Lesser General Public License
1618
* along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
*
20+
* WinDivert is free software; you can redistribute it and/or modify it under
21+
* the terms of the GNU General Public License as published by the Free
22+
* Software Foundation; either version 2 of the License, or (at your option)
23+
* any later version.
24+
*
25+
* This program is distributed in the hope that it will be useful, but
26+
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
27+
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
28+
* for more details.
29+
*
30+
* You should have received a copy of the GNU General Public License along
31+
* with this program; if not, write to the Free Software Foundation, Inc., 51
32+
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1733
*/
1834

1935
/*

‎examples/netdump/sources

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
# sources
2-
# (C) 2016, all rights reserved,
3-
#
4-
# This program is free software: you can redistribute it and/or modify
5-
# it under the terms of the GNU Lesser 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.
8-
#
9-
# This program is distributed in the hope that it will be useful,
10-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU Lesser General Public License for more details.
13-
#
14-
# You should have received a copy of the GNU Lesser General Public License
15-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
161

172
!IF "$(_BUILDARCH)" == "x86"
183
CPU=i386

0 commit comments

Comments
 (0)