- updated to 2.4.8

- updated make,mppe-mppc-1.1 patches
- removed obsolete DES-openssl,ppp-linux48 patches

diff --git a/ppp-2.4.3-mppe-mppc-1.1.patch b/ppp-2.4.3-mppe-mppc-1.1.patch
index c315656a2eabd8b0167852716a9175003ca696cd..9f2ba47a869ffb0ee235e3c92bace69c2a168504 100644 (file)
--- a/ppp-2.4.3-mppe-mppc-1.1.patch
+++ b/ppp-2.4.3-mppe-mppc-1.1.patch
@@ -1463,16 +1463,16 @@ diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h
        ccp_localstate[f->unit] &= ~RACK_PENDING;
  }
 -
-diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h
---- ppp-2.4.3.orig/pppd/ccp.h  2004-11-04 11:02:26.000000000 +0100
-+++ ppp-2.4.3/pppd/ccp.h       2004-11-21 13:54:09.000000000 +0100
+--- ppp-2.4.8/pppd/ccp.h.orig  2020-04-16 06:33:49.345695328 +0200
++++ ppp-2.4.8/pppd/ccp.h       2020-04-16 07:25:41.255503333 +0200
 @@ -37,9 +37,17 @@
      bool predictor_2;         /* do Predictor-2? */
      bool deflate_correct;     /* use correct code for deflate? */
      bool deflate_draft;               /* use draft RFC code for deflate? */
+-    u_char mppe;              /* MPPE bitfield */
 +    bool lzs;                 /* do Stac LZS? */
 +    bool mppc;                        /* do MPPC? */
-     bool mppe;                        /* do MPPE? */
++    bool mppe;                        /* do MPPE? */
 +    bool mppe_40;             /* allow 40 bit encryption? */
 +    bool mppe_56;             /* allow 56 bit encryption? */
 +    bool mppe_128;            /* allow 128 bit encryption? */

diff --git a/ppp-2.4.7-DES-openssl.patch b/ppp-2.4.7-DES-openssl.patch
deleted file mode 100644 (file)
index ad3b268..0000000
--- a/ppp-2.4.7-DES-openssl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 534ccc2..cf11b74 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -41,7 +41,7 @@ COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
- # Uncomment the next 2 lines to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
- CHAPMS=y
--USE_CRYPT=y
-+#USE_CRYPT=y
- # Don't use MSLANMAN unless you really know what you're doing.
- #MSLANMAN=y
- # Uncomment the next line to include support for MPPE.  CHAPMS (above) must
-@@ -147,7 +147,8 @@ endif
- 
- ifdef NEEDDES
- ifndef USE_CRYPT
--LIBS     += -ldes $(LIBS)
-+CFLAGS   += -I/usr/include/openssl
-+LIBS     += -lcrypto
- else
- CFLAGS   += -DUSE_CRYPT=1
- endif
-diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
-index 8b85b13..6b35375 100644
---- a/pppd/pppcrypt.c
-+++ b/pppd/pppcrypt.c
-@@ -64,7 +64,7 @@ u_char *des_key;     /* OUT 64 bit DES key with parity bits added */
-       des_key[7] = Get7Bits(key, 49);
- 
- #ifndef USE_CRYPT
--      des_set_odd_parity((des_cblock *)des_key);
-+      DES_set_odd_parity((DES_cblock *)des_key);
- #endif
- }
- 
-@@ -158,25 +158,25 @@ u_char *clear;   /* OUT 8 octets */
- }
- 
- #else /* USE_CRYPT */
--static des_key_schedule       key_schedule;
-+static DES_key_schedule       key_schedule;
- 
- bool
- DesSetkey(key)
- u_char *key;
- {
--      des_cblock des_key;
-+      DES_cblock des_key;
-       MakeKey(key, des_key);
--      des_set_key(&des_key, key_schedule);
-+      DES_set_key(&des_key, &key_schedule);
-       return (1);
- }
- 
- bool
--DesEncrypt(clear, key, cipher)
-+DesEncrypt(clear, cipher)
- u_char *clear;        /* IN  8 octets */
- u_char *cipher;       /* OUT 8 octets */
- {
--      des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
--          key_schedule, 1);
-+      DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
-+          &key_schedule, 1);
-       return (1);
- }
- 
-@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
- u_char *cipher;       /* IN  8 octets */
- u_char *clear;        /* OUT 8 octets */
- {
--      des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
--          key_schedule, 0);
-+      DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
-+          &key_schedule, 0);
-       return (1);
- }
- 

diff --git a/ppp-linux48.patch b/ppp-linux48.patch
deleted file mode 100644 (file)
index 81a32aa..0000000
--- a/ppp-linux48.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h~   2014-08-09 14:31:39.000000000 +0200
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h    2018-09-17 20:30:34.820608088 +0200
-@@ -47,6 +47,8 @@
- #include <sys/socket.h>
- #endif
- 
-+#include <netinet/in.h>
-+
- /* Ugly header files on some Linux boxes... */
- #if defined(HAVE_LINUX_IF_H)
- #include <linux/if.h>
-@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t;
- #include <linux/if_ether.h>
- #endif
- 
--#include <netinet/in.h>
--
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <sys/types.h>
- 

diff --git a/ppp-make.patch b/ppp-make.patch
index 2758078717ed7c07253dda243e47c657133ae044..1026055ce09b2c5e8d5943334191e1614f9d5137 100644 (file)
--- a/ppp-make.patch
+++ b/ppp-make.patch
@@ -1,6 +1,5 @@
-diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
---- ppp-2.4.4.orig/chat/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4.make/chat/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
+--- ppp-2.4.8/chat/Makefile.linux.orig 2019-12-31 02:31:26.000000000 +0100
++++ ppp-2.4.8/chat/Makefile.linux      2020-04-15 21:37:01.126848887 +0200
 @@ -10,7 +10,7 @@
  CDEF4=        -DFNDELAY=O_NDELAY              # Old name value
  CDEFS=        $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
@@ -10,15 +9,7 @@ diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
  CFLAGS=       $(COPTS) $(CDEFS)
  
  INSTALL= install
-@@ -18,14 +18,14 @@
- all:  chat
- 
- chat: chat.o
--      $(CC) -o chat chat.o
-+      $(CC) $(OPTLDFLAGS) -o chat chat.o
- 
- chat.o:       chat.c
-       $(CC) -c $(CFLAGS) -o chat.o chat.c
+@@ -25,7 +25,7 @@
  
  install: chat
        mkdir -p $(BINDIR) $(MANDIR)
@@ -27,19 +18,18 @@ diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
        $(INSTALL) -c -m 644 chat.8 $(MANDIR)
  
  clean:
---- ppp-2.4.6/pppd/Makefile.linux.orig 2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/pppd/Makefile.linux      2014-02-16 12:21:01.278474470 +0100
-@@ -32,7 +32,8 @@
+--- ppp-2.4.8/pppd/Makefile.linux.orig 2019-12-31 02:31:26.000000000 +0100
++++ ppp-2.4.8/pppd/Makefile.linux      2020-04-16 06:28:33.674072135 +0200
+@@ -32,7 +32,7 @@
  
  # CC = gcc
  #
 -COPTS = -O2 -pipe -Wall -g
 +COPTS = $(OPT_FLAGS) -pipe -Wall -g
-+LDFLAGS += $(OPTLDFLAGS)
  LIBS =
  
- # Uncomment the next 2 lines to include support for Microsoft's
-@@ -68,7 +69,7 @@
+ # Uncomment the next line to include support for Microsoft's
+@@ -73,7 +73,7 @@
  PLUGIN=y
  
  # Enable Microsoft proprietary Callback Control Protocol
@@ -48,7 +38,16 @@ diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
  
  # Enable EAP SRP-SHA1 authentication (requires libsrp)
  #USE_SRP=y
-@@ -208,9 +209,7 @@
+@@ -107,7 +107,7 @@
+ CFLAGS        += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
+ LIBS  += -lsrp -L/usr/local/ssl/lib -lcrypto
+ TARGETS       += srp-entry
+-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
++EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
+ MANPAGES += srp-entry.8
+ EXTRACLEAN += srp-entry.o
+ NEEDDES=y
+@@ -219,9 +219,7 @@
  install: pppd
        mkdir -p $(BINDIR) $(MANDIR)
        $(EXTRAINSTALL)
@@ -59,34 +58,26 @@ diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
        $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
  
  pppd: $(PPPDOBJS)
-diff -Nur ppp-2.4.4.orig/pppd/plugins/Makefile.linux ppp-2.4.4.make/pppd/plugins/Makefile.linux
---- ppp-2.4.4.orig/pppd/plugins/Makefile.linux 2006-06-04 07:04:14.000000000 +0200
-+++ ppp-2.4.4.make/pppd/plugins/Makefile.linux 2006-08-04 03:12:23.000000000 +0200
-@@ -1,7 +1,7 @@
+--- ppp-2.4.8/pppd/plugins/Makefile.linux.orig 2020-04-15 06:28:15.995570205 +0200
++++ ppp-2.4.8/pppd/plugins/Makefile.linux      2020-04-16 06:29:27.190448878 +0200
+@@ -1,5 +1,5 @@
  #CC   = gcc
 -COPTS = -O2 -g
 +COPTS = $(OPT_FLAGS) -g
  CFLAGS        = $(COPTS) -I.. -I../../include -fPIC
--LDFLAGS       = -shared
-+LDFLAGS       = $(OPTLDFLAGS) -shared
+ LDFLAGS_SHARED        = -shared
  INSTALL       = install
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
-diff -Nur ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.4.make/pppd/plugins/pppoatm/Makefile.linux
---- ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 02:12:10.000000000 +0100
-+++ ppp-2.4.4.make/pppd/plugins/pppoatm/Makefile.linux 2006-08-04 03:15:04.000000000 +0200
-@@ -33,7 +33,7 @@
- all: $(PLUGIN)
- 
- $(PLUGIN): $(PLUGIN_OBJS)
--      $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
-+      $(CC) $(OPTLDFLAGS) $(CFLAGS) -o $@ -shared $^ $(LIBS)
- 
- install: all
-       $(INSTALL) -d -m 755 $(LIBDIR)
-diff -Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4.make/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux  2006-06-04 07:04:14.000000000 +0200
-+++ ppp-2.4.4.make/pppd/plugins/radius/Makefile.linux  2006-08-04 03:13:58.000000000 +0200
+--- ppp-2.4.8/pppd/plugins/pppoatm/Makefile.linux.orig 2020-04-15 06:28:15.995570205 +0200
++++ ppp-2.4.8/pppd/plugins/pppoatm/Makefile.linux      2020-04-16 06:29:56.933621079 +0200
+@@ -1,5 +1,5 @@
+ #CC   = gcc
+-COPTS = -O2 -g
++COPTS = $(OPT_FLAGS) -g
+ CFLAGS        = $(COPTS) -I../.. -I../../../include -fPIC
+ LDFLAGS_SHARED        = -shared
+ INSTALL       = install
+--- ppp-2.4.8/pppd/plugins/radius/Makefile.linux.orig  2019-12-31 02:31:26.000000000 +0100
++++ ppp-2.4.8/pppd/plugins/radius/Makefile.linux       2020-04-16 06:30:55.366637854 +0200
 @@ -12,7 +12,7 @@
  INSTALL       = install
  
@@ -96,7 +87,7 @@ diff -Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4.make/pppd/
  
  # Uncomment the next line to include support for Microsoft's
  # MS-CHAP authentication protocol.
-@@ -36,20 +36,20 @@
+@@ -36,9 +36,9 @@
  
  install: all
        $(INSTALL) -d -m 755 $(LIBDIR)
@@ -109,24 +100,9 @@ diff -Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4.make/pppd/
        $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
        $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  
- radius.so: radius.o libradiusclient.a
--      $(CC) -o radius.so -shared radius.o libradiusclient.a
-+      $(CC) $(OPTLDFLAGS) -o radius.so -shared radius.o libradiusclient.a
- 
- radattr.so: radattr.o
--      $(CC) -o radattr.so -shared radattr.o
-+      $(CC) $(OPTLDFLAGS) -o radattr.so -shared radattr.o
- 
- radrealms.so: radrealms.o
--      $(CC) -o radrealms.so -shared radrealms.o
-+      $(CC) $(OPTLDFLAGS) -o radrealms.so -shared radrealms.o
- 
- CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
-       clientid.o sendserver.o lock.o util.o md5.o
-diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux        2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux        2006-08-04 03:14:35.000000000 +0200
-@@ -25,12 +25,12 @@
+--- ppp-2.4.8/pppd/plugins/rp-pppoe/Makefile.linux.orig        2020-04-15 06:28:15.995570205 +0200
++++ ppp-2.4.8/pppd/plugins/rp-pppoe/Makefile.linux     2020-04-16 06:31:56.152975212 +0200
+@@ -25,7 +25,7 @@
  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
  RP_VERSION=3.8p
  
@@ -135,18 +111,7 @@ diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make/ppp
  CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
  all: rp-pppoe.so pppoe-discovery
  
- pppoe-discovery: pppoe-discovery.o debug.o
--      $(CC) -o pppoe-discovery pppoe-discovery.o debug.o
-+      $(CC) $(OPTLDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
- 
- pppoe-discovery.o: pppoe-discovery.c
-       $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
-@@ -39,13 +39,13 @@
-       $(CC) $(CFLAGS) -c -o debug.o debug.c
- 
- rp-pppoe.so: plugin.o discovery.o if.o common.o
--      $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
-+      $(CC) $(OPTLDFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
+@@ -43,9 +43,9 @@
  
  install: all
        $(INSTALL) -d -m 755 $(LIBDIR)
@@ -158,9 +123,8 @@ diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make/ppp
  
  clean:
        rm -f *.o *.so pppoe-discovery
-diff -Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4.make/pppdump/Makefile.linux
---- ppp-2.4.4.orig/pppdump/Makefile.linux      2006-06-04 07:04:14.000000000 +0200
-+++ ppp-2.4.4.make/pppdump/Makefile.linux      2006-08-04 03:12:23.000000000 +0200
+--- ppp-2.4.8/pppdump/Makefile.linux.orig      2019-12-31 02:31:26.000000000 +0100
++++ ppp-2.4.8/pppdump/Makefile.linux   2020-04-16 06:32:37.886082458 +0200
 @@ -2,7 +2,7 @@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
@@ -170,24 +134,15 @@ diff -Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4.make/pppdump/Makefile.
  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
  
  INSTALL= install
-@@ -10,12 +10,12 @@
- all:  pppdump
- 
- pppdump: $(OBJS)
--      $(CC) -o pppdump $(OBJS)
-+      $(CC) $(OPTLDFLAGS) -o pppdump $(OBJS)
- 
- clean:
-       rm -f pppdump $(OBJS) *~
+@@ -17,5 +17,5 @@
  
  install:
        mkdir -p $(BINDIR) $(MANDIR)
 -      $(INSTALL) -s -c pppdump $(BINDIR)
 +      $(INSTALL) -c pppdump $(BINDIR)
        $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4.make/pppstats/Makefile.linux
---- ppp-2.4.4.orig/pppstats/Makefile.linux     2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4.make/pppstats/Makefile.linux     2006-08-04 03:12:23.000000000 +0200
+--- ppp-2.4.8/pppstats/Makefile.linux.orig     2019-12-31 02:31:26.000000000 +0100
++++ ppp-2.4.8/pppstats/Makefile.linux  2020-04-16 06:33:05.635932124 +0200
 @@ -10,7 +10,7 @@
  PPPSTATOBJS = pppstats.o
  
@@ -197,7 +152,7 @@ diff -Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4.make/pppstats/Makefil
  COMPILE_FLAGS = -I../include
  LIBS =
  
-@@ -22,11 +22,11 @@
+@@ -22,7 +22,7 @@
  
  install: pppstats
        -mkdir -p $(MANDIR)
@@ -206,8 +161,3 @@ diff -Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4.make/pppstats/Makefil
        $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
  
  pppstats: $(PPPSTATSRCS)
--      $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
-+      $(CC) $(CFLAGS) $(OPTLDFLAGS) -o pppstats pppstats.c $(LIBS)
- 
- clean:
-       rm -f pppstats *~ #* core

diff --git a/ppp.spec b/ppp.spec
index ced813feef0fb3bda6cafb88ee56c5223a58044d..140ee24288689778f2d389c7e11f189cbc9ca6bd 100644 (file)
--- a/ppp.spec
+++ b/ppp.spec
@@ -3,9 +3,9 @@
 # - check if %{_libdir}/pppd/%{version} path is needed, if not drop the symlink
 
 # Conditional build:
-%bcond_without mppc    # without MPPC support
-%bcond_without pppoatm # without PPPoATM plugin (which requires kernel 2.4 and atm-devel)
-%bcond_with    srp     # without SRP support
+%bcond_without mppc    # MPPC support
+%bcond_without pppoatm # PPPoATM plugin (requires kernel 2.4+ and atm-devel)
+%bcond_with    srp     # SRP support
 #
 Summary:       ppp daemon package for Linux
 Summary(de.UTF-8):     ppp-Dämonpaket für Linux
@@ -17,13 +17,13 @@ Summary(ru.UTF-8):  Демон ppp
 Summary(tr.UTF-8):     PPP sunucu süreci
 Summary(zh_CN.UTF-8):  PPP 配置和管理软件包
 Name:          ppp
-Version:       2.4.7
-Release:       4
+Version:       2.4.8
+Release:       1
 Epoch:         3
 License:       distributable
 Group:         Networking/Daemons
-Source0:       ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.gz
-# Source0-md5: 78818f40e6d33a1d1de68a1551f6595a
+Source0:       https://www.samba.org/ftp/ppp/%{name}-%{version}.tar.gz
+# Source0-md5: 2ca8342b9804be15103fd3f687af701c
 Source1:       %{name}.pamd
 Source2:       %{name}.pon
 Source3:       %{name}.poff
@@ -44,8 +44,6 @@ Patch9:               %{name}-lib64.patch
 Patch10:       %{name}-2.4.3-mppe-mppc-1.1.patch
 Patch11:       %{name}-ifpppstatsreq.patch
 Patch12:       %{name}-libx32.patch
-Patch13:       ppp-2.4.7-DES-openssl.patch
-Patch14:       ppp-linux48.patch
 URL:           http://ppp.samba.org/
 BuildRequires: libpcap-devel >= 2:0.8.1
 %{?with_pppoatm:BuildRequires: linux-atm-devel}
@@ -138,8 +136,6 @@ Wtyczka PPPoATM dla pppd.
 %if "%{_lib}" == "libx32"
 %patch12 -p1
 %endif
-%patch13 -p1
-%patch14 -p1
 
 # use headers from llh instead of older supplied by ppp, incompatible with current llh
 %{__rm} include/linux/*.h
@@ -153,7 +149,7 @@ Wtyczka PPPoATM dla pppd.
        %{?with_srp:USE_SRP=y} \
        OPT_FLAGS="%{rpmcflags} %{rpmcppflags}" \
        COPTS="%{rpmcflags} %{rpmcppflags}" \
-       OPTLDFLAGS="%{rpmldflags}" \
+       LDFLAGS="%{rpmldflags}" \
        CC="%{__cc}"
 
 %install
@@ -181,13 +177,13 @@ bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/ppp
 > $RPM_BUILD_ROOT/var/log/ppp.log
 
-rm -f scripts/README
+%{__rm} scripts/README
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp
 
 cd $RPM_BUILD_ROOT%{_libdir}/pppd
 v=$(echo %{version}*)
-mv $v plugins
+%{__mv} $v plugins
 # not sure which path used, keep the old path for compat
 ln -s plugins $v
 
@@ -199,8 +195,8 @@ rm -rf $RPM_BUILD_ROOT
 if [ -d %{_libdir}/pppd/%{version} -a ! -L %{_libdir}/pppd/%{version} ]; then
        set -e
        rm -f %{_libdir}/pppd/plugins
-       mv %{_libdir}/pppd/{%{version},plugins}
-       ln -sn plugins %{_libdir}/pppd/%{version}
+       mv -f %{_libdir}/pppd/{%{version},plugins}
+       ln -snf plugins %{_libdir}/pppd/%{version}
 fi
 
 %files