diff --git a/srcpkgs/ppp/patches/fix-openssl-pc.patch b/srcpkgs/ppp/patches/fix-openssl-pc.patch new file mode 100644 index 00000000000..561620cc752 --- /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 72fd115f9ec..00000000000 --- 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 -+#include - #endif - - extern bool DesSetkey __P((u_char *)); diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template index 013dd2a03b9..391cfb2fea5 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 " 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" } }