* [PR PATCH] ppp: update to 2.5.0, update NetworkManager-*
@ 2024-03-27 12:53 sgn
2024-03-27 13:23 ` [PR PATCH] [Updated] " sgn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: sgn @ 2024-03-27 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages ppp-2.5.0
https://github.com/void-linux/void-packages/pull/49563
ppp: update to 2.5.0, update NetworkManager-*
<!-- Uncomment relevant sections and delete options which are not applicable -->
- L2TP works
- I never managed to work with PPTP, so I don't know
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49563.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ppp-2.5.0-49563.patch --]
[-- Type: text/x-diff, Size: 9008 bytes --]
From d315dce4461a478cb9a1f278fcfaedf92eff7426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:43 +0700
Subject: [PATCH 1/4] ppp: update to 2.5.0.
---
srcpkgs/ppp/patches/openssl_include.patch | 11 ---------
srcpkgs/ppp/template | 29 ++++++++++-------------
2 files changed, 12 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/ppp/patches/openssl_include.patch
diff --git a/srcpkgs/ppp/patches/openssl_include.patch b/srcpkgs/ppp/patches/openssl_include.patch
deleted file mode 100644
index 72fd115f9ecb04..00000000000000
--- a/srcpkgs/ppp/patches/openssl_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pppd/pppcrypt.h
-+++ b/pppd/pppcrypt.h
-@@ -38,7 +38,7 @@
- #endif
-
- #ifndef USE_CRYPT
--#include <des.h>
-+#include <openssl/des.h>
- #endif
-
- extern bool DesSetkey __P((u_char *));
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 013dd2a03b9359..76dbf3ecfd59fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -5,15 +5,17 @@
# * NetworkManager-l2tp
# When update this package
pkgname=ppp
-version=2.4.9
-revision=4
+version=2.5.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-cbcp"
makedepends="libpcap-devel openssl-devel"
short_desc="PPP (Point-to-Point Protocol) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"
homepage="https://ppp.samba.org/"
distfiles="https://ftp.samba.org/pub/ppp/ppp-$version.tar.gz"
-checksum=f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d
+checksum=5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff
make_dirs="
/etc/ppp/ipv6-down.d 0755 root root
/etc/ppp/peers 0755 root root"
@@ -23,6 +25,8 @@ conf_files="
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
/etc/ppp/options
+ /etc/ppp/eaptls-client
+ /etc/ppp/eaptls-server
/etc/ppp/chap-secrets
/etc/ppp/pap-secrets"
@@ -30,23 +34,15 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-do_configure() {
- ./configure --prefix=/usr --cc="${CC}" --cflags="${CFLAGS}"
-}
-
-do_build() {
- make LDFLAGS="${LDFLAGS}" CBCP=y ${makejobs}
-}
-
-do_install() {
- make DESTDIR=${DESTDIR}/usr BINDIR=${DESTDIR}/usr/bin install
-
+post_install() {
case "$XBPS_TARGET_MACHINE" in
*-musl) vinstall include/net/ppp_defs.h 644 usr/include/net;;
esac
chmod 755 ${DESTDIR}/usr/lib/pppd/${version}/*.so
+ rm -f "${DESTDIR}/etc/ppp/openssl.cnf"
+
vinstall ${FILESDIR}/options 644 etc/ppp
vinstall ${FILESDIR}/ip-up 755 etc/ppp
vinstall ${FILESDIR}/ip-down 755 etc/ppp
@@ -62,9 +58,6 @@ do_install() {
vbin scripts/poff
vbin scripts/plog
- vinstall etc.ppp/pap-secrets 600 etc/ppp
- vinstall etc.ppp/chap-secrets 600 etc/ppp
-
head -n67 pppd/main.c > LICENSE
vlicense LICENSE
}
@@ -74,5 +67,7 @@ ppp-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/pppd/${version}/*.la"
}
}
From bcf90141ada445c5ba890dedb56c28927805c222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:32 +0700
Subject: [PATCH 2/4] NetworkManager: revbump for ppp 2.5.0
---
srcpkgs/NetworkManager/template | 4 ++--
srcpkgs/avahi-discover/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 70dd9c5b7115bd..b4aeabc5895c91 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dsystemd_journal=false
@@ -9,7 +9,7 @@ configure_args="-Dsystemd_journal=false
-Dmodify_system=true -Dsystemdsystemunitdir=no
-Dpppd=/usr/bin/pppd -Dqt=false
-Dsession_tracking_consolekit=false
- -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
+ -Dresolvconf=/usr/bin/resolvconf
-Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
-Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
-Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables -Dnft=/usr/bin/nft
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 2461a76e41bf5b..769296f689a88e 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -31,7 +31,7 @@ skip_extraction="build-db.txt"
python_version=3
-hostmakedepends="automake libtool pkg-config intltool gettext-devel
+hostmakedepends="automake libtool pkg-config gettext-devel
python3-dbus python3-setuptools gobject-introspection glib-devel
qt5-host-tools xmltoman"
makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel libevent-devel
@@ -49,8 +49,8 @@ post_extract() {
}
pre_configure() {
+ sed -e 's,-Werror,,g' -i configure.ac
autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
}
do_install() {
From ef5420633f427939e62ef49c3a79824137f78680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:16 +0700
Subject: [PATCH 3/4] NetworkManager-pptp: update to 1.2.12.
---
srcpkgs/NetworkManager-pptp/template | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 22028d520886ac..293ed4c023eff7 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
-version=1.2.8
-revision=6
+version=1.2.12
+revision=1
build_style=gnu-configure
-configure_args="--without-libnm-glib"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+configure_args="--with-gtk4 --disable-static"
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel
NetworkManager-devel ppp-devel"
depends="pptpclient"
short_desc="NetworkManager VPN plugin for pptp"
@@ -13,14 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f8e35e4a9a76312975c317cd315e5e9bd23bba2b5c31c3259c8c150583dc1953
-
-do_configure() {
- PPP_VERSION=$(sed -n '/VERSION/s/.*"\(.*\)".*/\1/p' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
-
- ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
-}
-
-post_install() {
- mv $DESTDIR/etc/dbus-1 $DESTDIR/usr/share
-}
+checksum=e5fa59fe46117f0ee86e9ca62c6943bc063884b04dd2396ccec38a2d1f414982
From 5d0e748cc5d59bbdd8d7a1d51b6eafdfa4c7590a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 19:49:37 +0700
Subject: [PATCH 4/4] NetworkManager-l2tp: update to 1.20.12.
---
srcpkgs/NetworkManager-l2tp/template | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 7f9f0455adedd4..7b10a1239364bd 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-l2tp'
pkgname=NetworkManager-l2tp
-version=1.8.6
-revision=4
+version=1.20.12
+revision=1
build_style=gnu-configure
-configure_args="--runstatedir=/run"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
+configure_args="--runstatedir=/run --with-gtk4"
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="gtk+3-devel gtk4-devel libglib-devel libnma-devel openssl-devel
libsecret-devel nss-devel ppp-devel"
depends="strongswan xl2tpd ppp"
short_desc="NetworkManager VPN plugin for L2TP/IPsec"
@@ -13,12 +13,4 @@ maintainer="Douglas Kosovic <doug@uq.edu.au>"
license="GPL-2.0-or-later"
homepage="https://github.com/nm-l2tp/NetworkManager-l2tp"
distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=e345263c440ef8f48bcd95661d7772ffdbdd65e37d0a3eca813a542a3357ac23
-
-# Automatically determine the pppd plugin dir location, but will need to
-# revbump this package whenever version of ppp package is updated.
-do_configure() {
- PPP_VERSION=$(awk '/VERSION/{print $3}' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
-
- ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
-}
+checksum=22d99e3fb0b5ea026303d39e7329f387c11ba9c59b035360d10e075b1dfea0cc
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] ppp: update to 2.5.0, update NetworkManager-*
2024-03-27 12:53 [PR PATCH] ppp: update to 2.5.0, update NetworkManager-* sgn
@ 2024-03-27 13:23 ` sgn
2024-03-27 14:12 ` sgn
2024-03-28 1:31 ` [PR PATCH] [Merged]: " sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-03-27 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages ppp-2.5.0
https://github.com/void-linux/void-packages/pull/49563
ppp: update to 2.5.0, update NetworkManager-*
<!-- Uncomment relevant sections and delete options which are not applicable -->
- L2TP works
- I never managed to work with PPTP, so I don't know
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49563.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ppp-2.5.0-49563.patch --]
[-- Type: text/x-diff, Size: 9587 bytes --]
From 4c341f9d84370e9495e604517da1e6096e22ab27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:43 +0700
Subject: [PATCH 1/4] ppp: update to 2.5.0.
---
srcpkgs/ppp/patches/fix-openssl-pc.patch | 11 +++++++++
srcpkgs/ppp/patches/openssl_include.patch | 11 ---------
srcpkgs/ppp/template | 30 ++++++++++-------------
3 files changed, 24 insertions(+), 28 deletions(-)
create mode 100644 srcpkgs/ppp/patches/fix-openssl-pc.patch
delete mode 100644 srcpkgs/ppp/patches/openssl_include.patch
diff --git a/srcpkgs/ppp/patches/fix-openssl-pc.patch b/srcpkgs/ppp/patches/fix-openssl-pc.patch
new file mode 100644
index 00000000000000..561620cc752432
--- /dev/null
+++ b/srcpkgs/ppp/patches/fix-openssl-pc.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -14175,7 +14175,7 @@ fi
+ #
+ # Check for OpenSSL
+
+- found=false
++ found=
+
+ # Check whether --with-openssl was given.
+ if test ${with_openssl+y}
diff --git a/srcpkgs/ppp/patches/openssl_include.patch b/srcpkgs/ppp/patches/openssl_include.patch
deleted file mode 100644
index 72fd115f9ecb04..00000000000000
--- a/srcpkgs/ppp/patches/openssl_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pppd/pppcrypt.h
-+++ b/pppd/pppcrypt.h
-@@ -38,7 +38,7 @@
- #endif
-
- #ifndef USE_CRYPT
--#include <des.h>
-+#include <openssl/des.h>
- #endif
-
- extern bool DesSetkey __P((u_char *));
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 013dd2a03b9359..391cfb2fea5158 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -5,15 +5,18 @@
# * NetworkManager-l2tp
# When update this package
pkgname=ppp
-version=2.4.9
-revision=4
+version=2.5.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-cbcp"
+hostmakedepends="pkg-config"
makedepends="libpcap-devel openssl-devel"
short_desc="PPP (Point-to-Point Protocol) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"
homepage="https://ppp.samba.org/"
distfiles="https://ftp.samba.org/pub/ppp/ppp-$version.tar.gz"
-checksum=f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d
+checksum=5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff
make_dirs="
/etc/ppp/ipv6-down.d 0755 root root
/etc/ppp/peers 0755 root root"
@@ -23,6 +26,8 @@ conf_files="
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
/etc/ppp/options
+ /etc/ppp/eaptls-client
+ /etc/ppp/eaptls-server
/etc/ppp/chap-secrets
/etc/ppp/pap-secrets"
@@ -30,23 +35,15 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-do_configure() {
- ./configure --prefix=/usr --cc="${CC}" --cflags="${CFLAGS}"
-}
-
-do_build() {
- make LDFLAGS="${LDFLAGS}" CBCP=y ${makejobs}
-}
-
-do_install() {
- make DESTDIR=${DESTDIR}/usr BINDIR=${DESTDIR}/usr/bin install
-
+post_install() {
case "$XBPS_TARGET_MACHINE" in
*-musl) vinstall include/net/ppp_defs.h 644 usr/include/net;;
esac
chmod 755 ${DESTDIR}/usr/lib/pppd/${version}/*.so
+ rm -f "${DESTDIR}/etc/ppp/openssl.cnf"
+
vinstall ${FILESDIR}/options 644 etc/ppp
vinstall ${FILESDIR}/ip-up 755 etc/ppp
vinstall ${FILESDIR}/ip-down 755 etc/ppp
@@ -62,9 +59,6 @@ do_install() {
vbin scripts/poff
vbin scripts/plog
- vinstall etc.ppp/pap-secrets 600 etc/ppp
- vinstall etc.ppp/chap-secrets 600 etc/ppp
-
head -n67 pppd/main.c > LICENSE
vlicense LICENSE
}
@@ -74,5 +68,7 @@ ppp-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/pppd/${version}/*.la"
}
}
From b9114cd8ede4dc8fd63eb2a0434347f8b562c238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:32 +0700
Subject: [PATCH 2/4] NetworkManager: revbump for ppp 2.5.0
---
srcpkgs/NetworkManager/template | 4 ++--
srcpkgs/avahi-discover/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 70dd9c5b7115bd..b4aeabc5895c91 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dsystemd_journal=false
@@ -9,7 +9,7 @@ configure_args="-Dsystemd_journal=false
-Dmodify_system=true -Dsystemdsystemunitdir=no
-Dpppd=/usr/bin/pppd -Dqt=false
-Dsession_tracking_consolekit=false
- -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
+ -Dresolvconf=/usr/bin/resolvconf
-Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
-Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
-Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables -Dnft=/usr/bin/nft
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 2461a76e41bf5b..769296f689a88e 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -31,7 +31,7 @@ skip_extraction="build-db.txt"
python_version=3
-hostmakedepends="automake libtool pkg-config intltool gettext-devel
+hostmakedepends="automake libtool pkg-config gettext-devel
python3-dbus python3-setuptools gobject-introspection glib-devel
qt5-host-tools xmltoman"
makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel libevent-devel
@@ -49,8 +49,8 @@ post_extract() {
}
pre_configure() {
+ sed -e 's,-Werror,,g' -i configure.ac
autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
}
do_install() {
From ea4b51e51a42ec861984c9c2dfc09a8a7806ed1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:16 +0700
Subject: [PATCH 3/4] NetworkManager-pptp: update to 1.2.12.
---
srcpkgs/NetworkManager-pptp/template | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 22028d520886ac..293ed4c023eff7 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
-version=1.2.8
-revision=6
+version=1.2.12
+revision=1
build_style=gnu-configure
-configure_args="--without-libnm-glib"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+configure_args="--with-gtk4 --disable-static"
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel
NetworkManager-devel ppp-devel"
depends="pptpclient"
short_desc="NetworkManager VPN plugin for pptp"
@@ -13,14 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f8e35e4a9a76312975c317cd315e5e9bd23bba2b5c31c3259c8c150583dc1953
-
-do_configure() {
- PPP_VERSION=$(sed -n '/VERSION/s/.*"\(.*\)".*/\1/p' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
-
- ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
-}
-
-post_install() {
- mv $DESTDIR/etc/dbus-1 $DESTDIR/usr/share
-}
+checksum=e5fa59fe46117f0ee86e9ca62c6943bc063884b04dd2396ccec38a2d1f414982
From 7799468332249b141f821c012d873d6a42ceebb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 19:49:37 +0700
Subject: [PATCH 4/4] NetworkManager-l2tp: update to 1.20.12.
---
srcpkgs/NetworkManager-l2tp/template | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 7f9f0455adedd4..7b10a1239364bd 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-l2tp'
pkgname=NetworkManager-l2tp
-version=1.8.6
-revision=4
+version=1.20.12
+revision=1
build_style=gnu-configure
-configure_args="--runstatedir=/run"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
+configure_args="--runstatedir=/run --with-gtk4"
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="gtk+3-devel gtk4-devel libglib-devel libnma-devel openssl-devel
libsecret-devel nss-devel ppp-devel"
depends="strongswan xl2tpd ppp"
short_desc="NetworkManager VPN plugin for L2TP/IPsec"
@@ -13,12 +13,4 @@ maintainer="Douglas Kosovic <doug@uq.edu.au>"
license="GPL-2.0-or-later"
homepage="https://github.com/nm-l2tp/NetworkManager-l2tp"
distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=e345263c440ef8f48bcd95661d7772ffdbdd65e37d0a3eca813a542a3357ac23
-
-# Automatically determine the pppd plugin dir location, but will need to
-# revbump this package whenever version of ppp package is updated.
-do_configure() {
- PPP_VERSION=$(awk '/VERSION/{print $3}' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
-
- ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
-}
+checksum=22d99e3fb0b5ea026303d39e7329f387c11ba9c59b035360d10e075b1dfea0cc
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] ppp: update to 2.5.0, update NetworkManager-*
2024-03-27 12:53 [PR PATCH] ppp: update to 2.5.0, update NetworkManager-* sgn
2024-03-27 13:23 ` [PR PATCH] [Updated] " sgn
@ 2024-03-27 14:12 ` sgn
2024-03-28 1:31 ` [PR PATCH] [Merged]: " sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-03-27 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages ppp-2.5.0
https://github.com/void-linux/void-packages/pull/49563
ppp: update to 2.5.0, update NetworkManager-*
<!-- Uncomment relevant sections and delete options which are not applicable -->
- L2TP works
- I never managed to work with PPTP, so I don't know
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49563.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ppp-2.5.0-49563.patch --]
[-- Type: text/x-diff, Size: 9614 bytes --]
From 4c341f9d84370e9495e604517da1e6096e22ab27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:43 +0700
Subject: [PATCH 1/4] ppp: update to 2.5.0.
---
srcpkgs/ppp/patches/fix-openssl-pc.patch | 11 +++++++++
srcpkgs/ppp/patches/openssl_include.patch | 11 ---------
srcpkgs/ppp/template | 30 ++++++++++-------------
3 files changed, 24 insertions(+), 28 deletions(-)
create mode 100644 srcpkgs/ppp/patches/fix-openssl-pc.patch
delete mode 100644 srcpkgs/ppp/patches/openssl_include.patch
diff --git a/srcpkgs/ppp/patches/fix-openssl-pc.patch b/srcpkgs/ppp/patches/fix-openssl-pc.patch
new file mode 100644
index 00000000000000..561620cc752432
--- /dev/null
+++ b/srcpkgs/ppp/patches/fix-openssl-pc.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -14175,7 +14175,7 @@ fi
+ #
+ # Check for OpenSSL
+
+- found=false
++ found=
+
+ # Check whether --with-openssl was given.
+ if test ${with_openssl+y}
diff --git a/srcpkgs/ppp/patches/openssl_include.patch b/srcpkgs/ppp/patches/openssl_include.patch
deleted file mode 100644
index 72fd115f9ecb04..00000000000000
--- a/srcpkgs/ppp/patches/openssl_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pppd/pppcrypt.h
-+++ b/pppd/pppcrypt.h
-@@ -38,7 +38,7 @@
- #endif
-
- #ifndef USE_CRYPT
--#include <des.h>
-+#include <openssl/des.h>
- #endif
-
- extern bool DesSetkey __P((u_char *));
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 013dd2a03b9359..391cfb2fea5158 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -5,15 +5,18 @@
# * NetworkManager-l2tp
# When update this package
pkgname=ppp
-version=2.4.9
-revision=4
+version=2.5.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-cbcp"
+hostmakedepends="pkg-config"
makedepends="libpcap-devel openssl-devel"
short_desc="PPP (Point-to-Point Protocol) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"
homepage="https://ppp.samba.org/"
distfiles="https://ftp.samba.org/pub/ppp/ppp-$version.tar.gz"
-checksum=f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d
+checksum=5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff
make_dirs="
/etc/ppp/ipv6-down.d 0755 root root
/etc/ppp/peers 0755 root root"
@@ -23,6 +26,8 @@ conf_files="
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
/etc/ppp/options
+ /etc/ppp/eaptls-client
+ /etc/ppp/eaptls-server
/etc/ppp/chap-secrets
/etc/ppp/pap-secrets"
@@ -30,23 +35,15 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-do_configure() {
- ./configure --prefix=/usr --cc="${CC}" --cflags="${CFLAGS}"
-}
-
-do_build() {
- make LDFLAGS="${LDFLAGS}" CBCP=y ${makejobs}
-}
-
-do_install() {
- make DESTDIR=${DESTDIR}/usr BINDIR=${DESTDIR}/usr/bin install
-
+post_install() {
case "$XBPS_TARGET_MACHINE" in
*-musl) vinstall include/net/ppp_defs.h 644 usr/include/net;;
esac
chmod 755 ${DESTDIR}/usr/lib/pppd/${version}/*.so
+ rm -f "${DESTDIR}/etc/ppp/openssl.cnf"
+
vinstall ${FILESDIR}/options 644 etc/ppp
vinstall ${FILESDIR}/ip-up 755 etc/ppp
vinstall ${FILESDIR}/ip-down 755 etc/ppp
@@ -62,9 +59,6 @@ do_install() {
vbin scripts/poff
vbin scripts/plog
- vinstall etc.ppp/pap-secrets 600 etc/ppp
- vinstall etc.ppp/chap-secrets 600 etc/ppp
-
head -n67 pppd/main.c > LICENSE
vlicense LICENSE
}
@@ -74,5 +68,7 @@ ppp-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/pppd/${version}/*.la"
}
}
From b9114cd8ede4dc8fd63eb2a0434347f8b562c238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:32 +0700
Subject: [PATCH 2/4] NetworkManager: revbump for ppp 2.5.0
---
srcpkgs/NetworkManager/template | 4 ++--
srcpkgs/avahi-discover/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 70dd9c5b7115bd..b4aeabc5895c91 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.46.0
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Dsystemd_journal=false
@@ -9,7 +9,7 @@ configure_args="-Dsystemd_journal=false
-Dmodify_system=true -Dsystemdsystemunitdir=no
-Dpppd=/usr/bin/pppd -Dqt=false
-Dsession_tracking_consolekit=false
- -Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
+ -Dresolvconf=/usr/bin/resolvconf
-Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
-Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
-Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables -Dnft=/usr/bin/nft
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 2461a76e41bf5b..769296f689a88e 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -31,7 +31,7 @@ skip_extraction="build-db.txt"
python_version=3
-hostmakedepends="automake libtool pkg-config intltool gettext-devel
+hostmakedepends="automake libtool pkg-config gettext-devel
python3-dbus python3-setuptools gobject-introspection glib-devel
qt5-host-tools xmltoman"
makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel libevent-devel
@@ -49,8 +49,8 @@ post_extract() {
}
pre_configure() {
+ sed -e 's,-Werror,,g' -i configure.ac
autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
}
do_install() {
From df098064c182f0accf58ddba2f32884694cee4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 18:35:16 +0700
Subject: [PATCH 3/4] NetworkManager-pptp: update to 1.2.12.
---
srcpkgs/NetworkManager-pptp/template | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template
index 22028d520886ac..a44045ba5568c0 100644
--- a/srcpkgs/NetworkManager-pptp/template
+++ b/srcpkgs/NetworkManager-pptp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-pptp'
pkgname=NetworkManager-pptp
-version=1.2.8
-revision=6
+version=1.2.12
+revision=1
build_style=gnu-configure
-configure_args="--without-libnm-glib"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel
+configure_args="--with-gtk4 --disable-static"
+hostmakedepends="pkg-config gettext glib-devel libxml2"
+makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel gtk4-devel
NetworkManager-devel ppp-devel"
depends="pptpclient"
short_desc="NetworkManager VPN plugin for pptp"
@@ -13,14 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f8e35e4a9a76312975c317cd315e5e9bd23bba2b5c31c3259c8c150583dc1953
-
-do_configure() {
- PPP_VERSION=$(sed -n '/VERSION/s/.*"\(.*\)".*/\1/p' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
-
- ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
-}
-
-post_install() {
- mv $DESTDIR/etc/dbus-1 $DESTDIR/usr/share
-}
+checksum=e5fa59fe46117f0ee86e9ca62c6943bc063884b04dd2396ccec38a2d1f414982
From f0788edb5c3296f148f2d987ddd52844d1302cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Mar 2024 19:49:37 +0700
Subject: [PATCH 4/4] NetworkManager-l2tp: update to 1.20.12.
---
srcpkgs/NetworkManager-l2tp/template | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 7f9f0455adedd4..e841efc695070a 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-l2tp'
pkgname=NetworkManager-l2tp
-version=1.8.6
-revision=4
+version=1.20.12
+revision=1
build_style=gnu-configure
-configure_args="--runstatedir=/run"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
+configure_args="--runstatedir=/run --with-gtk4"
+hostmakedepends="pkg-config gettext glib-devel gtk4-devel libxml2"
+makedepends="gtk+3-devel gtk4-devel libglib-devel libnma-devel openssl-devel
libsecret-devel nss-devel ppp-devel"
depends="strongswan xl2tpd ppp"
short_desc="NetworkManager VPN plugin for L2TP/IPsec"
@@ -13,12 +13,4 @@ maintainer="Douglas Kosovic <doug@uq.edu.au>"
license="GPL-2.0-or-later"
homepage="https://github.com/nm-l2tp/NetworkManager-l2tp"
distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=e345263c440ef8f48bcd95661d7772ffdbdd65e37d0a3eca813a542a3357ac23
-
-# Automatically determine the pppd plugin dir location, but will need to
-# revbump this package whenever version of ppp package is updated.
-do_configure() {
- PPP_VERSION=$(awk '/VERSION/{print $3}' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
-
- ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
-}
+checksum=22d99e3fb0b5ea026303d39e7329f387c11ba9c59b035360d10e075b1dfea0cc
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: ppp: update to 2.5.0, update NetworkManager-*
2024-03-27 12:53 [PR PATCH] ppp: update to 2.5.0, update NetworkManager-* sgn
2024-03-27 13:23 ` [PR PATCH] [Updated] " sgn
2024-03-27 14:12 ` sgn
@ 2024-03-28 1:31 ` sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-03-28 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]
There's a merged pull request on the void-packages repository
ppp: update to 2.5.0, update NetworkManager-*
https://github.com/void-linux/void-packages/pull/49563
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
- L2TP works
- I never managed to work with PPTP, so I don't know
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-28 1:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-27 12:53 [PR PATCH] ppp: update to 2.5.0, update NetworkManager-* sgn
2024-03-27 13:23 ` [PR PATCH] [Updated] " sgn
2024-03-27 14:12 ` sgn
2024-03-28 1:31 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).