From 58b3ddd664ab241833c71fdda67921ef276a7868 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 15 Jun 2023 12:20:01 +0300 Subject: [PATCH] upg ppp --- ppp/PKGBUILD | 76 +++++++++++++----------- ppp/PKGBUILD-arch | 27 ++------- ppp/config | 148 ++++++++++++++++++++++++++++++++++++++++++++++ ppp/time | 6 +- 4 files changed, 198 insertions(+), 59 deletions(-) create mode 100644 ppp/config diff --git a/ppp/PKGBUILD b/ppp/PKGBUILD index 82b595e..5e91a35 100644 --- a/ppp/PKGBUILD +++ b/ppp/PKGBUILD @@ -6,50 +6,54 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=ppp -pkgver=2.4.9 -pkgrel=03 -pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking - no ipv6 w/o systemd" -arch=(x86_64) +pkgver=2.5.0 +pkgrel=01 +pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking - w/o systemd & ipv6" url="https://www.samba.org/ppp/" depends=('glibc' 'libpcap' 'libxcrypt' 'openssl') backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh}) source=(https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz{,.asc} - ppp-2.4.6-makefiles.patch options ip-up ip-down ip-up.d.dns.sh ip-down.d.dns.sh -# ipv6-up -# ipv6-down -# ipv6-up.d.iface-config.sh LICENSE) -prepare() { - cd $pkgname-$pkgver - - patch -p1 -i "$srcdir"/ppp-2.4.6-makefiles.patch - - # enable active filter - sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux - # enable ipv6 support -# sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux - # Enable Microsoft proprietary Callback Control Protocol - sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux -} +#prepare() { +# cd $pkgname-$pkgver +# +# patch -p1 -i "$srcdir"/ppp-2.4.6-makefiles.patch +# +# # enable active filter +# sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux +# # enable ipv6 support +## sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux +# # Enable Microsoft proprietary Callback Control Protocol +# sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux +#} build() { cd $pkgname-$pkgver - # -D_GNU_SOURCE is needed for IPv6 to work apparently -## CFLAGS="$CPPFLAGS $CFLAGS -D_GNU_SOURCE" LDFLAGS="$LDFLAGS" ./configure --prefix=/usr - CFLAGS="$CPPFLAGS $CFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix=/usr - make +# CFLAGS="$CPPFLAGS $CFLAGS" LDFLAGS="$LDFLAGS" ./configure --prefix=/usr +# make + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --runstatedir=/run \ + --disable-systemd \ + --disable-ipv6cp \ + --enable-cbcp \ + --enable-multilink + +make } package() { cd $pkgname-$pkgver - make INSTROOT="$pkgdir" install + make DESTDIR="$pkgdir" install install -D -m644 ../options "$pkgdir"/etc/ppp/options install -D -m755 ../ip-up "$pkgdir"/etc/ppp/ip-up @@ -93,20 +97,22 @@ backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns # install -D -m644 "$srcdir"/ppp.systemd "$pkgdir"/usr/lib/systemd/system/ppp@.service # install -D -m644 "$srcdir"/ppp.systemd "$pkgdir"/usr/lib/systemd/system/ppp@.service -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL' 'BSD') validpgpkeys=('631E179E370CD727A7F2A33A9E4295D605F66CE9' # Paul Mackerras (Signing key) 'DE8E01561D8276A4DBFAEFCC040F1D49EC9DBB8C') # Paul Mackerras -sha256sums=(f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d # ppp-2.4.9.tar.gz - 9f5cc230f2b2d750135bee36ec8e3c86fbf76428b9fc66b11442c585c83398e6 # ppp-2.4.9.tar.gz.asc - 91acaa378a052ac4fb0c3df20c4c5fcdb416ee437777d6668a946d27cf12ef5f # ppp-2.4.6-makefiles.patch - c74f0e09724b90d9fbdbb921b5d6f27812d650945d6d8015f4f06089f5562d9c # options - ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd # ip-up - 658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897 # ip-down - aafb75b978aa13225444dc6b914fab324d686821be93c49e893800e647aa7648 # ip-up.d.dns.sh - 17b486fa69a71dafcbe543dc4f2b8cb9ed31e675aabc5f6c98ef94dbc1561c85 # ip-down.d.dns.sh - 96fd35104e3d0ec472517afecead88419913ae73ae0189476d5dad9029c2be42) # LICENSE +sha256sums=(5cae0e8075f8a1755f16ca290eb44e6b3545d3f292af4da65ecffe897de636ff # ppp-2.5.0.tar.gz + a8f99019f6d3c7ded5069dbd61283953eae06e8321e3acbc9fe341722766865e # ppp-2.5.0.tar.gz.asc + c74f0e09724b90d9fbdbb921b5d6f27812d650945d6d8015f4f06089f5562d9c # options + ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd # ip-up + 658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897 # ip-down + aafb75b978aa13225444dc6b914fab324d686821be93c49e893800e647aa7648 # ip-up.d.dns.sh + 17b486fa69a71dafcbe543dc4f2b8cb9ed31e675aabc5f6c98ef94dbc1561c85 # ip-down.d.dns.sh + 96fd35104e3d0ec472517afecead88419913ae73ae0189476d5dad9029c2be42) # LICENSE +## 5e3baa73c5457d0aad43b111b335470917f87b5f971648197305daf1962e6c4f ppp-2.5.0-01-x86_64.pkg.tar.lz diff --git a/ppp/PKGBUILD-arch b/ppp/PKGBUILD-arch index 381bf67..3a37554 100644 --- a/ppp/PKGBUILD-arch +++ b/ppp/PKGBUILD-arch @@ -2,8 +2,8 @@ # Contributor: Thomas Baechler pkgname=ppp -pkgver=2.4.9 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(x86_64) url="https://www.samba.org/ppp/" @@ -11,7 +11,6 @@ license=('GPL' 'BSD') depends=('glibc' 'libpcap' 'libxcrypt' 'openssl') backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh}) source=(https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz{,.asc} - ppp-2.4.6-makefiles.patch options ip-up ip-down @@ -22,9 +21,8 @@ source=(https://download.samba.org/pub/ppp/ppp-$pkgver.tar.gz{,.asc} ipv6-up.d.iface-config.sh ppp.systemd LICENSE) -sha512sums=('5721b1915f2d02b895508601120d09ff17a76cbab62cbcb7d0216837bdf84f10f345311b77f346b120bda3b488ae10d7d942c4d7d5f1e369d0a002f3071099f1' +sha512sums=('094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed' 'SKIP' - '90b6b7c40cece43ed90a69aa1a2fa11c23da85045105354e7440cdb0d059f9ea660b58bf9d3045e32ffb05a8e65ff3d5a101002ac1f48f3f608b1706d6bc5c81' '4324a9abe79b20735b87de2158bb73b6449415a4760f06a06b648dfb53517f8d9907b094a88d1b492b24c8720cfd9b17d491fbe236fbd51ba9042af60483b231' 'bdaaac792dd448ff31da6da2749d8c2f9c4e0311b1d4639de7c68038fcaa333cc28e25f5a6308de0ecb24b60b2e7284a811482df990da5f54d5581a746964f3c' '92f3a5e383f2c888938e891ba831042e7f8c026b0ddf5ce8c3523d06ac32fa81742e638a4c665975cbc79868b98806d92574ee2ee8e034e33b065a90ee3ab28b' @@ -38,30 +36,17 @@ sha512sums=('5721b1915f2d02b895508601120d09ff17a76cbab62cbcb7d0216837bdf84f10f34 validpgpkeys=('631E179E370CD727A7F2A33A9E4295D605F66CE9' # Paul Mackerras (Signing key) 'DE8E01561D8276A4DBFAEFCC040F1D49EC9DBB8C') # Paul Mackerras -prepare() { - cd $pkgname-$pkgver - - patch -p1 -i "$srcdir"/ppp-2.4.6-makefiles.patch - - # enable active filter - sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux - # enable ipv6 support - sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux - # Enable Microsoft proprietary Callback Control Protocol - sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux -} - build() { cd $pkgname-$pkgver - # -D_GNU_SOURCE is needed for IPv6 to work apparently - CFLAGS="$CPPFLAGS $CFLAGS -D_GNU_SOURCE" LDFLAGS="$LDFLAGS" ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --runstatedir=/run \ + --enable-systemd --enable-cbcp --enable-multilink make } package() { cd $pkgname-$pkgver - make INSTROOT="$pkgdir" install + make DESTDIR="$pkgdir" install install -D -m644 ../options "$pkgdir"/etc/ppp/options install -D -m755 ../ip-up "$pkgdir"/etc/ppp/ip-up diff --git a/ppp/config b/ppp/config new file mode 100644 index 0000000..21e318f --- /dev/null +++ b/ppp/config @@ -0,0 +1,148 @@ +`configure' configures ppp 2.5.0 to adapt to many kinds of systems. + +Usage: src/ppp-2.5.0/configure [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print `checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for `--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or `..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [/usr/local] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, `make install' will install all the files in +`/usr/local/bin', `/usr/local/lib' etc. You can specify +an installation prefix other than `/usr/local' using `--prefix', +for instance `--prefix=$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/ppp] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-static[=PKGS] build static libraries [default=no] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-systemd Enable support for systemd notification + --enable-cbcp Enable Callback Protocol + --disable-microsoft-extensions + Disable Microsoft CHAP / MPPE extensions + --enable-mslanman Enable Microsoft LAN Manager support + --disable-ipv6cp Disable IPv6 Control Protocol + --enable-multilink Enable multilink support + --disable-plugins Disable support for loadable plugins + --disable-eaptls Disable EAP-TLS authentication support + --disable-peap Disable PEAP authentication support + --disable-openssl-engine + Disable OpenSSL engine support + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + --with-plugin-dir=DIR Specify the plugin directory for pppd + --with-runtime-dir=DIR Specify the runtime directory for pppd + --with-logfile-dir=DIR Specify the log directory for pppd + --with-system-ca-path=/path/to/ssl/certs + path to system CA certificates + --with-openssl=DIR With openssl support, see http://www.openssl.org + --with-srp=DIR With libsrp support, see http://srp.stanford.edu + --with-atm=DIR With libatm support, see + http://linux-atm.sourceforge.net + --with-pam=DIR With libpam support, see ftp.redhat.com:/pub/pam + --with-pcap=DIR With libpcap support, see https://www.tcpdump.org + --with-gtk Build contributions with the GTK+ interface + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + SYSTEMD_CFLAGS + C compiler flags for SYSTEMD, overriding pkg-config + SYSTEMD_LIBS + linker flags for SYSTEMD, overriding pkg-config + CPP C preprocessor + GTK_CFLAGS C compiler flags for GTK, overriding pkg-config + GTK_LIBS linker flags for GTK, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . diff --git a/ppp/time b/ppp/time index eaefd45..5100792 100644 --- a/ppp/time +++ b/ppp/time @@ -1,6 +1,6 @@ -real 0m19.808s -user 0m16.243s -sys 0m1.266s +real 0m21.674s +user 0m20.093s +sys 0m2.539s