summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-04-30 17:58:18 +0000
committerZach van Rijn <me@zv.io>2022-10-21 18:33:58 -0500
commitc0a4ae36fe955a5571622473bf211e7f5ef678a7 (patch)
treefda6e606e7e48d73491d6821fdc86826a5c3e991
parentae83bc4545580779cc1189a5ba297eb43bf6f60f (diff)
downloadpackages-c0a4ae36fe955a5571622473bf211e7f5ef678a7.tar.gz
packages-c0a4ae36fe955a5571622473bf211e7f5ef678a7.tar.bz2
packages-c0a4ae36fe955a5571622473bf211e7f5ef678a7.tar.xz
packages-c0a4ae36fe955a5571622473bf211e7f5ef678a7.zip
user/ppp: add patch for linux headers 5.15. fixes #626.
-rw-r--r--user/ppp/APKBUILD4
-rw-r--r--user/ppp/fix-linux-5.15-include.patch12
2 files changed, 15 insertions, 1 deletions
diff --git a/user/ppp/APKBUILD b/user/ppp/APKBUILD
index 82545b0f7..50aead456 100644
--- a/user/ppp/APKBUILD
+++ b/user/ppp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ppp
pkgver=2.4.8
-pkgrel=0
+pkgrel=1
pkgdesc="Point-to-Point Protocol (PPP) implementation for serial networking"
url="https://ppp.samba.org/"
arch="all"
@@ -35,6 +35,7 @@ source="https://github.com/paulusmack/ppp/archive/ppp-$pkgver.tar.gz
install-path.patch
musl-fix-headers.patch
utmpx.patch
+ fix-linux-5.15-include.patch
ppp.mod
ppp.pamd
@@ -114,6 +115,7 @@ e5638fd6e7b573552a7354fad3c91a8bde86760fb17d510e7e925ee8c1f60f7d39efe95134cb0a1c
fb4ae2c2ba4ecdd1c85f6e5f730fd9659cf1fbc7a8a004b09042adafee7e4af6238df8deb3dbd3dc9c69407d9ebc4c82e1792a43b4aaf8ac18ebe18268b50597 install-path.patch
ba240d483ada6865bf52497ce00cb9ae8d750e8f650e501d0d068b132d364ae4d09ac2e290b903e246aa35d33cf984aa29a6be41906df355b1c1e2b7637dc8b0 musl-fix-headers.patch
723ff3dd0aee13f9878559aa433b314af6043523a2bafd5957258809a645942f7d34b5bd659869a1528cf7b1a462ad7cc2dbf18e7986220f5f685f2c1ea1d36b utmpx.patch
+cb73d66244e457bb8b01f5ddc3132f1599542e872033f392841d7218749de6863083eb2746e43da7bbdabb292c012016e59dc29963040a0dfea5a8bfec287d36 fix-linux-5.15-include.patch
58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 ppp.mod
e30a397392d467ac3c78f6533f3adff5de7d38f0372d8d6f7b186db4ec69ddf12463d467d8a86eb5867effeb7dd6bd16942a98fb3a3ab59ff754a123e16d0938 ppp.pamd
bd6f43588b037367ffdb57f5e331492dcaa5969003e219c2dc8b90e6be1aa407282ff6114b91d1379ebeff766983fa0622456520cc0ac592b4f0b1496acf21bf pppd.initd"
diff --git a/user/ppp/fix-linux-5.15-include.patch b/user/ppp/fix-linux-5.15-include.patch
new file mode 100644
index 000000000..080c306b4
--- /dev/null
+++ b/user/ppp/fix-linux-5.15-include.patch
@@ -0,0 +1,12 @@
+diff -ur a/pppd/Makefile.linux b/pppd/Makefile.linux
+--- a/pppd/Makefile.linux 2022-04-30 17:56:16.092083205 +0000
++++ b/pppd/Makefile.linux 2022-04-30 17:56:55.423147553 +0000
+@@ -88,7 +88,7 @@
+
+ INCLUDE_DIRS= -I../include
+
+-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
++COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP
+
+ CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
+