From: "cron2 (Code Review)" Date: Mon, 2 Jun 2025 15:38:46 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="6MrYTAM7CQY="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Delete old sample-windows file and obsolete Windows sample handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --6MrYTAM7CQY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos. cron2 has uploaded a new patch set (#3) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1036?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 The change is no longer submittable: Code-Review and checks~ChecksSubmitRul= e are unsatisfied now. Change subject: Delete old sample-windows file and obsolete Windows sample = handling ...................................................................... Delete old sample-windows file and obsolete Windows sample handling This file is apparently over 20 years old and was never updated besides fixing some obvious syntax errors with new versions. So let's just get rid of it. AFAICT the Windows installer does not use it. Only the {server,client}.ovpn. And even there, it just uses the files directly from the build directory and does not depend on us renaming them (which is obvious since we do not use the Makefile at all in the Windows build, only CMake). Github: Closes OpenVPN/openvpn#758 Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4 Signed-off-by: Frank Lichtenheld --- M sample/Makefile.am D sample/sample-windows/sample.ovpn 2 files changed, 0 insertions(+), 117 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1036/3 diff --git a/sample/Makefile.am b/sample/Makefile.am index 9443cf3..4ed78a6e 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -18,20 +18,5 @@ EXTRA_DIST =3D \ sample-plugins \ sample-config-files \ - sample-windows \ sample-keys \ sample-scripts - -if WIN32 -sample_DATA =3D \ - client.ovpn \ - server.ovpn \ - sample-windows/sample.ovpn - -client.ovpn: sample-config-files/client.conf - -rm -f client.ovpn - cp "$(srcdir)/sample-config-files/client.conf" client.ovpn -server.ovpn: sample-config-files/server.conf - -rm -f server.ovpn - cp "$(srcdir)/sample-config-files/server.conf" server.ovpn -endif diff --git a/sample/sample-windows/sample.ovpn b/sample/sample-windows/samp= le.ovpn deleted file mode 100755 index be24faa..0000000 --- a/sample/sample-windows/sample.ovpn +++ /dev/null @@ -1,102 +0,0 @@ -# Edit this file, and save to a .ovpn extension -# so that OpenVPN will activate it when run -# as a service. - -# Change 'myremote' to be your remote host, -# or comment out to enter a listening -# server mode. -remote myremote - -# Uncomment this line to use a different -# port number than the default of 1194. -; port 1194 - -# Choose one of three protocols supported by -# OpenVPN. If left commented out, defaults -# to udp. -; proto [tcp-server | tcp-client | udp] - -# You must specify one of two possible network -# protocols, 'dev tap' or 'dev tun' to be used -# on both sides of the connection. 'tap' creates -# a VPN using the ethernet protocol while 'tun' -# uses the IP protocol. You must use 'tap' -# if you are ethernet bridging or want to route -# broadcasts. 'tun' is somewhat more efficient -# but requires configuration of client software -# to not depend on broadcasts. Some platforms -# such as Solaris, OpenBSD, and Mac OS X only -# support 'tun' interfaces, so if you are -# connecting to such a platform, you must also -# use a 'tun' interface on the Windows side. - -# Enable 'dev tap' or 'dev tun' but not both! -dev tap - -# This is a 'dev tap' ifconfig that creates -# a virtual ethernet subnet. -# 10.3.0.1 is the local VPN IP address -# and 255.255.255.0 is the VPN subnet. -# Only define this option for 'dev tap'. -ifconfig 10.3.0.1 255.255.255.0 - -# This is a 'dev tun' ifconfig that creates -# a point-to-point IP link. -# 10.3.0.1 is the local VPN IP address and -# 10.3.0.2 is the remote VPN IP address. -# Only define this option for 'dev tun'. -# Make sure to include the "tun-mtu" option -# on the remote machine, but swap the order -# of the ifconfig addresses. -;tun-mtu 1500 -;ifconfig 10.3.0.1 10.3.0.2 - -# If you have fragmentation issues or misconfigured -# routers in the path which block Path MTU discovery, -# lower the TCP MSS and internally fragment non-TCP -# protocols. -;fragment 1300 -;mssfix - -# If you have set up more than one TAP-Win32 adapter -# on your system, you must refer to it by name. -;dev-node my-tap - -# You can generate a static OpenVPN key -# by selecting the Generate Key option -# in the start menu. -# -# You can also generate key.txt manually -# with the following command: -# openvpn --genkey secret key.txt -# -# key must match on both ends of the connection, -# so you should generate it on one machine and -# copy it to the other over a secure medium. -# Place key.txt in the same directory as this -# config file. -secret key.txt - -# Uncomment this section for a more reliable -# detection when a system loses its connection. -# For example, dial-ups or laptops that travel -# to other locations. -# -# If this section is enabled and "myremote" -# above is a dynamic DNS name (i.e. dyndns.org), -# OpenVPN will dynamically "follow" the IP -# address of "myremote" if it changes. -; ping-restart 60 -; ping-timer-rem -; persist-tun -; resolv-retry 86400 - -# keep-alive ping -ping 10 - -# enable LZO compression -comp-lzo - -# moderate verbosity -verb 4 -mute 10 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1036?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I15c730c9eb3f1338019577e7c665c0ca5b1edcd4 Gerrit-Change-Number: 1036 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --6MrYTAM7CQY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld, plaisthos. <= /p>

cron2 uploaded patch set #3 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outd= ated and were removed: Code-Review+2 by cron2

The change is no longer submittable: Code-Revi= ew and checks~ChecksSubmitRule are unsatisfied now.

Delete old sample-windo=
ws file and obsolete Windows sample handling

This file is apparently= over 20 years old and
was never updated besides fixing some obvious
= syntax errors with new versions.

So let's just get rid of it. AF= AICT the Windows
installer does not use it. Only the
{server,client}.= ovpn. And even there, it just uses
the files directly from the build dir= ectory and
does not depend on us renaming them (which is
obvious sinc= e we do not use the Makefile at all
in the Windows build, only CMake).
Github: Closes OpenVPN/openvpn#758
Change-Id: I15c730c9eb3f1338019= 577e7c665c0ca5b1edcd4
Signed-off-by: Frank Lichtenheld <frank@...2746...= ...>
---
M sample/Makefile.am
D sample/sample-windows/sample.ov= pn
2 files changed, 0 insertions(+), 117 deletions(-)

git pull=
 ssh://gerrit.openvpn.net:29418/openvpn refs/changes/36/1036/3
diff=
 --git a/sample/Makefile.am b/sample/Makefile.am
index 9443= cf3..4ed78a6e 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -18,20 +18,5 @@
EXTRA_DIST =3D \
sample-plugins \
= sample-config-files \
-= sample-windows \
sample-keys \
sample-= scripts
-
-if WIN32
-sample_DATA =3D \
- client.ovpn \
- server.ovpn \
- sample-windows/sample.ovpn
-
-client= .ovpn: sample-config-files/client.conf
- -rm -f client.ovpn
- cp "$(srcdir)/sample-config-files/client.conf" cl= ient.ovpn
-server.ovpn:= sample-config-files/server.conf
- -rm -f server.ovpn
- cp "$(srcdir)/sample-config-files/server.conf" server.o= vpn
-endif
diff --git a/sample/sample-windows/sample.ovpn b/sample/sample-windows/= sample.ovpn
deleted file mode 100755
index = be24faa..0000000
--- a/sample/sample-windows/sample.ovpn

+++ /dev/null
@@ -1,102 +0,0 @@
-# Edit this file, and save to a .ov= pn extension
-# so that= OpenVPN will activate it when run
-# as a service.
-
-# Change '= myremote' to be your remote host,
-# or comment out to enter a listening
-# server mode.
-remote myremote
-
-# = Uncomment this line to use a different
-# port number than the default of 1194.
-; port 1194
-
-# Choose one of three protocols supported by
-# OpenVPN. If left commented out, defaults
-# to udp.
-; proto [tcp-server | tcp-client | udp= ]
-
-# You must specify one of two possible ne= twork
-# protocols, = 9;dev tap' or 'dev tun' to be used
-# on both sides of the connection. 'tap' = creates
-# a VPN using = the ethernet protocol while 'tun'
-# uses the IP protocol. You must use 'tap'

-# if you are ethernet bri= dging or want to route
= -# broadcasts. 'tun' is somewhat more efficient
-# but requires configuration of client s= oftware
-# to not depen= d on broadcasts. Some platforms
-# such as Solaris, OpenBSD, and Mac OS X only
-# support 'tun' interfaces, so i= f you are
-# connecting= to such a platform, you must also
-# use a 'tun' interface on the Windows side.-
-# Enable 'dev tap' or 'dev tun' but = not both!
-dev tap
-
-# This is a 'dev tap' ifconfig that cre= ates
-# a virtual ether= net subnet.
-# 10.3.0.1= is the local VPN IP address
-# and 255.255.255.0 is the VPN subnet.
-# Only define this option for 'dev tap'.

-ifconfig 10.3.0.1 255.25= 5.255.0
-
-# This is a 'dev tun' ifcon= fig that creates
-# a p= oint-to-point IP link.
= -# 10.3.0.1 is the local VPN IP address and
-# 10.3.0.2 is the remote VPN IP address.
<= span style=3D"color: hsl(0, 100%, 40%);">-# Only define this option for = 9;dev tun'.
-# Make= sure to include the "tun-mtu" option
-# on the remote machine, but swap the order
-# of the ifconfig addresses= .
-;tun-mtu 1500=
-;ifconfig 10.3.0.1 10.3.0.2<= /span>
-
-# If you have fragmentation issues or misco= nfigured
-# routers in = the path which block Path MTU discovery,
-# lower the TCP MSS and internally fragment non-TCP
-# protocols.
-;fragment 1300

-;mssfix
-
-# = If you have set up more than one TAP-Win32 adapter
-# on your system, you must refer to it by name= .
-;dev-node my-tap

-
-# You can generate a static OpenVPN key=
-# by selecting the Generate = Key option
-# in the st= art menu.
-#
= -# You can also generate key.txt = manually
-# with the fo= llowing command:
-# o= penvpn --genkey secret key.txt
-#
-# key must = match on both ends of the connection,
-# so you should generate it on one machine and
-# copy it to the other over a secu= re medium.
-# Place key= .txt in the same directory as this
-# config file.
-secret key.txt
-<= /span>
-# Uncomment this secti= on for a more reliable
= -# detection when a system loses its connection.
-# For example, dial-ups or laptops that travel
-# to other locations.
-#
-# If this section is enabled and "myre= mote"
-# above is = a dynamic DNS name (i.e. dyndns.org),
-# OpenVPN will dynamically "follow" the IP=
-# address of "myremote&= quot; if it changes.
-;= ping-restart 60
-; pin= g-timer-rem
-; persist-= tun
-; resolv-retry 864= 00
-
-# keep-alive ping
-ping 10
-
-# e= nable LZO compression
-= comp-lzo
-
-# moderate verbosity

-verb 4

-mute 10

To vie= w, visit change 1036. To unsubscribe, or for help writing mail filters, visit <= a href=3D"http://gerrit.openvpn.net/settings">settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I15c730c9eb3f1338019577e7c66= 5c0ca5b1edcd4
Gerrit-Change-Number: 1036
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--6MrYTAM7CQY=--