!24 修正0017补丁代码

From: @laokz 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw

backport-0027-Set-LIBDIR-for-RISCV.patch

@@ -10,92 +10,101 @@ an RISC-V host.
 
 Signed-off-by: whoisxxx <zhangxuzhou4@huawei.com>
 ---
- pppd/Makefile.linux                  | 2 +-
+rebased-by: laokz <zhangkai@iscas.ac.cn>
- pppd/plugins/Makefile.linux          | 2 +-
- pppd/plugins/pppoatm/Makefile.linux  | 2 +-
- pppd/plugins/pppol2tp/Makefile.linux | 2 +-
- pppd/plugins/radius/Makefile.linux   | 2 +-
- pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index c1cf794..da8718d 100644
+index 07df6a7..7dd3a1b 100644
 --- a/pppd/Makefile.linux
 +++ b/pppd/Makefile.linux
-@@ -8,7 +8,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
+@@ -12,7 +12,11 @@ DESTDIR = $(INSTROOT)@DESTDIR@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
  INCDIR = $(DESTDIR)/include
--LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
++ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
++else
 +LIBDIR = $(DESTDIR)/lib64
++endif
  
  TARGETS = pppd
  
 diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index cf73fa9..0ed5168 100644
+index f42d18c..958923f 100644
 --- a/pppd/plugins/Makefile.linux
 +++ b/pppd/plugins/Makefile.linux
-@@ -10,7 +10,7 @@ CFLAGS += -DUSE_EAPTLS=1
+@@ -5,7 +5,11 @@ COPTS=@CFLAGS@
  DESTDIR = $(INSTROOT)@DESTDIR@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++else
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
++endif
  
- SUBDIRS := rp-pppoe pppoatm pppol2tp
+ CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- # Uncomment the next line to include the radius authentication plugin
+ LDFLAGS_SHARED	= -shared
 diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
-index 1961e0e..a538eef 100644
+index 6387970..daaaa4e 100644
 --- a/pppd/plugins/pppoatm/Makefile.linux
 +++ b/pppd/plugins/pppoatm/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL	= install
+@@ -4,7 +4,11 @@ CC=$(CROSS_COMPILE)@CC@
- #***********************************************************************
+ COPTS=@CFLAGS@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
--LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++else
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
++endif
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
+diff --git a/pppd/plugins/pppoe/Makefile.linux b/pppd/plugins/pppoe/Makefile.linux
+index 6cb8397..af5f9fb 100644
+--- a/pppd/plugins/pppoe/Makefile.linux
++++ b/pppd/plugins/pppoe/Makefile.linux
+@@ -19,7 +19,11 @@ COPTS=@CFLAGS@
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+ MANDIR = $(DESTDIR)/share/man/man8
++ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
++else
++LIBDIR = $(DESTDIR)/lib64/pppd/$(PPPDVERSION)
++endif
+ 
+ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
 diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index 7b23b25..225a4a9 100644
+index e4442f9..d9ae2ca 100644
 --- a/pppd/plugins/pppol2tp/Makefile.linux
 +++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL	= install
+@@ -4,7 +4,11 @@ CC=$(CROSS_COMPILE)@CC@
- #***********************************************************************
+ COPTS=@CFLAGS@
  
- DESTDIR = $(INSTROOT)@DESTDIR@
+ DESTDIR = $(INSTROOT)/@DESTDIR@
--LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++else
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
++endif
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
-index 2150332..ff0e8f3 100644
+index d2ef044..1ccc171 100644
 --- a/pppd/plugins/radius/Makefile.linux
 +++ b/pppd/plugins/radius/Makefile.linux
-@@ -5,7 +5,7 @@
+@@ -9,7 +9,11 @@ COPTS=@CFLAGS@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
  MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
++else
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
++endif
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index 5f79284..bd95832 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -17,7 +17,7 @@
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
-+LIBDIR = $(DESTDIR)/lib64/pppd/$(PPPDVERSION)
- 
- PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
- 
--- 
-2.23.0
-

ppp.spec

@@ -1,6 +1,6 @@
 Name:           ppp
 Version:        2.4.9
-Release:        3
+Release:        4
 Summary:        The Point-to-Point Protocol
 
 License:        BSD and LGPLv2+ and GPLv2+ and Public Domain
@@ -43,9 +43,7 @@ Patch0013:      backport-0023-build-sys-install-rp-pppoe-plugin-files-with-stand
 Patch0014:      backport-0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
 Patch0015:      backport-ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
 Patch0016:      backport-ppp-2.4.9-configure-cflags-allow-commas.patch
-%ifarch riscv64 
 Patch0017:      backport-0027-Set-LIBDIR-for-RISCV.patch
-%endif
 Patch0018:      backport-pppd-Negotiate-IP-address-when-only-peer-addresses-are-provided.patch
 Patch0019:      backport-CVE-2022-4603.patch
 
@@ -143,6 +141,12 @@ mkdir -p %{buildroot}%{_rundir}/lock/ppp
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Tue Feb 28 2023 laokz <zhangkai@iscas.ac.cn> - 2.4.9-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix patch0017 for riscv64
+
 * Thu Dec 29 2022 gaihuiying <eaglegai@163.com> - 2.4.9-3
 - Type:cves
 - ID:NA