Skip to contentSkip to conversation

cleanup: Remove RPM openvpn.spec build approach

PATCH In review David Sommerseth 2 participants 3 messages Feb 20, 2019 – Mar 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cleanup: Remove RPM openvpn.spec build approach

Linux packaging is quite a comprehensive task these days, with many Linux distributions and each with their own packaging guidelines. In addition OpenVPN is packaged for most important Linux distributions already.

The OpenVPN developers is not capable of keeping track of how all the various recommend packaging guidelines evoloves and our RPM build process is no longer consistent with guidelines from Fedora, RHEL or SUSE packaging. We also don't receive any updates improving this situation. Most likely due to packaging being handled fairly well by the Linux distributions directly.

In addition comes systemd into play, which more and more Linux distributions embraces - and even our own RPM openvpn.spec file didn't account for that move.

This removes all RPM related packaging files and updates the INSTALL file with pointers to several popular Linux distributions with accessible information of the OpenVPN packages they provide. Linux distributions is most likely much better at keeping the packaging up-to-shape much better than we.

---
 .gitignore                     |   1 -
 INSTALL                        |  47 +++---
 configure.ac                   |   2 -
 distro/Makefile.am             |   2 +-
 distro/rpm/Makefile.am         |  18 ---
 distro/rpm/openvpn.init.d.rhel | 244 ------------------------------
 distro/rpm/openvpn.init.d.suse | 264 ---------------------------------
 distro/rpm/openvpn.spec.in     | 248 -------------------------------
 8 files changed, 29 insertions(+), 797 deletions(-)
 delete mode 100644 distro/rpm/Makefile.am
 delete mode 100755 distro/rpm/openvpn.init.d.rhel
 delete mode 100644 distro/rpm/openvpn.init.d.suse
 delete mode 100644 distro/rpm/openvpn.spec.in
.gitignore +0 -1
index 25009d81..783ea84b 100644
@@ -53,7 +53,6 @@ doc/openvpn.8.html
 /doc/doxygen/html/
 /doc/doxygen/latex/
 /doc/doxygen/openvpn.doxyfile
-distro/rpm/openvpn.spec
 distro/systemd/*.service
 sample/sample-keys/sample-ca/
 vendor/.build
INSTALL +28 -19

60 lines not on this page · raw message

configure.ac +0 -2
index 84f12edc..dfb268ca 100644
@@ -1389,8 +1389,6 @@ AC_CONFIG_FILES([
 	build/msvc/Makefile
 	build/msvc/msvc-generate/Makefile
 	distro/Makefile
-	distro/rpm/Makefile
-	distro/rpm/openvpn.spec
 	distro/systemd/Makefile
 	doc/Makefile
 	doc/doxygen/Makefile
distro/Makefile.am +1 -1
index e2098c84..a6795c4d 100644
@@ -12,4 +12,4 @@
 MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.in
 
-SUBDIRS = rpm systemd
+SUBDIRS = systemd
distro/rpm/Makefile.am deleted +0 -18
deleted file mode 100644
index d16a5ac7..00000000
@@ -1,18 +0,0 @@
-#
-#  OpenVPN -- An application to securely tunnel IP networks
-#             over a single UDP port, with support for SSL/TLS-based
-#             session authentication and key exchange,
-#             packet encryption, packet authentication, and
-#             packet compression.
-#
-#  Copyright (C) 2002-2018 OpenVPN Inc <[email protected]...>
-#  Copyright (C) 2006-2012 Alon Bar-Lev <[email protected]...>
-#
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/Makefile.in
-
-dist_noinst_DATA = \
-	openvpn.spec \
-	openvpn.init.d.rhel \
-	openvpn.init.d.suse
distro/rpm/openvpn.init.d.rhel deleted +0 -244

244 lines not on this page · raw message

distro/rpm/openvpn.init.d.suse deleted +0 -264

264 lines not on this page · raw message

distro/rpm/openvpn.spec.in deleted +0 -248

248 lines not on this page · raw message

Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw

.. for the reasons given (as this is mostly removing non-code files, easy to review). Thanks for the documentation pointers.

I have tested with "make distcheck" that autoconf still agrees with you on "which files should be there for packaging" (it does).

Your patch has been applied to the master branch - I have no objections against inclusion in 2.4, but it wouldn't trivially apply and I was a bit too lazy to go fight the conflicts. So if you think it should be in 2.4, feel free to take my ACK and apply it yourself :-)

commit 57ec6cec85b92e6af35a7871d105d84a753d6549

Author: David Sommerseth
Date:   Wed Feb 20 14:19:06 2019 +0100
     cleanup: Remove RPM openvpn.spec build approach

     Signed-off-by: David Sommerseth <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18222.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#2 lore raw
In reply to David Sommerseth

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

I've fixed the minor differences causing conflict and applied it to release/2.4 as well, keeping Gerts ACK - as he said was fine in the previous "patch applied" mail.

Your patch has been applied to the following branches

commit 57ec6cec85b92e6af35a7871d105d84a753d6549 (master) commit f6a447cb42c097a2b35f55d3ca3e1a4be46738c6 (release/2.4)

Author: David Sommerseth
Date:   Wed Feb 20 14:19:06 2019 +0100
     cleanup: Remove RPM openvpn.spec build approach

     Signed-off-by: David Sommerseth <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18222.html
     Signed-off-by: Gert Doering <[email protected]...>

- --
kind regards,

David Sommerseth
OpenVPN Inc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCgAGBQJcgZwTAAoJEIbPlEyWcf3yKWQP/RvgQAmJGu/Y2DYwwPYvDM62 qfJ9mc77sETfwvEM+QcrfXlcrd+/WPOzhmDPfAWp8CGUyE7KS45Jo1a/QDgRRGxD eqvw7aVaZ2OXkhMM6m5iGNV+w1otls/3ISUvNxyhl8R/rQY6OJWfWZDL/E/pAgTy VBRtf5AIPBotftAweVoXBEz2k2urwrc+oKbv6V45ndT1qct6FdIDLGv9UxczUniv 9iX9pFsFDGjb5dN9x8mALYrncBR5TpXIxcFsJ/F0g8hX5KRRur0tI9a4rV0bcOh6 qUzndi2+PWuIX8cCsH6o7uzh0cThCrY3y/pGRgzQwqjLJneWUk9/arhdUlDfOZmw XpUEegpxF0MIinYN10HKDRBjxFPsvTea6vDBeZySJDkpWm5G5h6xulYuQQKUw9Aw 7mXdSeqv7e4aiEIa0Q8wxXoXQKaXYzscGho/GOKry8tGEVUA2UJvJryylxWCMX4J 52jJrKwvouDC4npEbPda395Tj702Vb8B/WozM58g1t0JVnTMzGJuoRzez4AlmL0q JfPNPy5aO2HePdXqeazUwuW3zlnBaVXV+vu2yKD6C4stsLbdYpiibTfL0EslhpId frPgO0KI5IlzbMYz644Kn426KLfJJv/3vAMJKL5HSi8KTRnM7eIS43klrImW46NP w+ukBpXCjtaax8iGAadZ
=G9WS
-----END PGP SIGNATURE-----