Accepting request 226897 from home:aeneas_jaissle:branches:network

New upstream release 2.4.6

OBS-URL: https://build.opensuse.org/request/show/226897
OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=22

ppp-2.4.2-logwtmp.diff

@@ -1,95 +0,0 @@
---- ./pppd/pppd.h.orig	2003-04-07 00:01:46.000000000 +0000
-+++ ./pppd/pppd.h	2004-02-13 10:40:04.327682200 +0000
-@@ -628,8 +628,6 @@
- int  lock __P((char *));	/* Create lock file for device */
- int  relock __P((int));		/* Rewrite lock file with new pid */
- void unlock __P((void));	/* Delete previously-created lock file */
--void logwtmp __P((const char *, const char *, const char *));
--				/* Write entry to wtmp file */
- int  get_host_seed __P((void));	/* Get host-dependent random number seed */
- int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
- #ifdef PPP_FILTER
---- ./pppd/sys-linux.c.orig	2004-01-13 04:05:20.000000000 +0000
-+++ ./pppd/sys-linux.c	2004-02-13 10:40:17.986855427 +0000
-@@ -2151,81 +2151,6 @@
- 
- /********************************************************************
-  *
-- * Update the wtmp file with the appropriate user name and tty device.
-- */
--
--void logwtmp (const char *line, const char *name, const char *host)
--{
--    struct utmp ut, *utp;
--    pid_t  mypid = getpid();
--#if __GLIBC__ < 2
--    int    wtmp;
--#endif
--
--/*
-- * Update the signon database for users.
-- * Christoph Lameter: Copied from poeigl-1.36 Jan 3, 1996
-- */
--    utmpname(_PATH_UTMP);
--    setutent();
--    while ((utp = getutent()) && (utp->ut_pid != mypid))
--	/* nothing */;
--
--    if (utp)
--	memcpy(&ut, utp, sizeof(ut));
--    else
--	/* some gettys/telnetds don't initialize utmp... */
--	memset(&ut, 0, sizeof(ut));
--
--    if (ut.ut_id[0] == 0)
--	strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id));
--
--    strncpy(ut.ut_user, name, sizeof(ut.ut_user));
--    strncpy(ut.ut_line, line, sizeof(ut.ut_line));
--
--    time(&ut.ut_time);
--
--    ut.ut_type = USER_PROCESS;
--    ut.ut_pid  = mypid;
--
--    /* Insert the host name if one is supplied */
--    if (*host)
--	strncpy (ut.ut_host, host, sizeof(ut.ut_host));
--
--    /* Insert the IP address of the remote system if IP is enabled */
--    if (ipcp_protent.enabled_flag && ipcp_hisoptions[0].neg_addr)
--	memcpy(&ut.ut_addr, (char *) &ipcp_hisoptions[0].hisaddr,
--		 sizeof(ut.ut_addr));
--
--    /* CL: Makes sure that the logout works */
--    if (*host == 0 && *name==0)
--	ut.ut_host[0]=0;
--
--    pututline(&ut);
--    endutent();
--/*
-- * Update the wtmp file.
-- */
--#if __GLIBC__ >= 2
--    updwtmp(_PATH_WTMP, &ut);
--#else
--    wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY);
--    if (wtmp >= 0) {
--	flock(wtmp, LOCK_EX);
--
--	if (write (wtmp, (char *)&ut, sizeof(ut)) != sizeof(ut))
--	    warn("error writing %s: %m", _PATH_WTMP);
--
--	flock(wtmp, LOCK_UN);
--
--	close (wtmp);
--    }
--#endif
--}
--
--
--/********************************************************************
-- *
-  * sifvjcomp - config tcp header compression
-  */
- 

ppp-2.4.3-demand-fix.diff

@@ -1,19 +0,0 @@
---- pppd/auth.c
-+++ pppd/auth.c
-@@ -546,6 +546,8 @@
-     int unit;
- {
-     char *msg;
-+    if (phase == PHASE_DISCONNECT) /* we are called via link_terminated, must be ignored */
-+       return;
- 
-     new_phase(PHASE_SERIALCONN);
- 
-@@ -658,6 +660,7 @@
- 	the_channel->disconnect();
- 	devfd = -1;
-     }
-+    /* not only disconnect, cleanup should also be called to close the devices */
-     if (the_channel->cleanup)
- 	(*the_channel->cleanup)();
- 

ppp-2.4.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2fdfcde2e3bfdc490245527cd3e3d55165a0fe70c86ad7476d300535248ed2c
-size 556115

ppp-2.4.6-ifname.diff

@@ -1,6 +1,6 @@
 --- ./pppd/main.c.orig	2004-07-19 12:35:22.000000000 +0000
 +++ ./pppd/main.c	2004-07-19 14:34:38.542120946 +0000
-@@ -98,7 +98,7 @@
+@@ -124,7 +124,7 @@
  static const char rcsid[] = RCSID;
  
  /* interface vars */
@@ -9,7 +9,7 @@
  int ifunit;			/* Interface unit number */
  
  struct channel *the_channel;
-@@ -261,13 +261,6 @@
+@@ -298,13 +298,6 @@
      NULL
  };
  
@@ -23,7 +23,7 @@
  int
  main(argc, argv)
      int argc;
-@@ -777,8 +770,11 @@
+@@ -737,8 +730,11 @@
  set_ifunit(iskey)
      int iskey;
  {
@@ -38,7 +38,7 @@
  	create_pidfile(getpid());	/* write pid to file */
 --- ./pppd/options.c.orig	2004-07-19 12:59:21.000000000 +0000
 +++ ./pppd/options.c	2004-07-19 14:35:04.253865964 +0000
-@@ -102,6 +102,7 @@
+@@ -114,6 +114,7 @@
  bool	tune_kernel;		/* may alter kernel settings */
  int	connect_delay = 1000;	/* wait this many ms after connect script */
  int	req_unit = -1;		/* requested interface unit */
@@ -46,7 +46,7 @@
  bool	multilink = 0;		/* Enable multilink operation */
  char	*bundle_name = NULL;	/* bundle name for multilink */
  bool	dump_options;		/* print out option values */
-@@ -259,6 +260,10 @@
+@@ -283,6 +284,10 @@
        "PPP interface unit number to use if possible",
        OPT_PRIO | OPT_LLIMIT, 0, 0 },
  
@@ -59,7 +59,7 @@
      { "dryrun", o_bool, &dryrun,
 --- ./pppd/pppd.8.orig	2004-07-19 14:39:06.639320497 +0000
 +++ ./pppd/pppd.8	2004-07-19 15:00:37.339448432 +0000
-@@ -1020,7 +1020,12 @@
+@@ -1085,7 +1085,12 @@
  .TP
  .B unit \fInum
  Sets the ppp unit number (for a ppp0 or ppp1 etc interface name) for outbound
@@ -71,8 +71,8 @@
 +Set the ppp interface name for outbound connections.  A failure to set the
 +name will terminate the pppd.
  .TP
- .B updetach
+ .B unset \fIname
- With this option, pppd will detach from its controlling terminal once
+ Remove a variable from the environment variable for scripts that are
 --- ./pppd/pppd.h.orig	2004-07-19 12:59:16.000000000 +0000
 +++ ./pppd/pppd.h	2004-07-19 15:02:08.792752747 +0000
 @@ -80,6 +80,16 @@
@@ -92,7 +92,7 @@
  
  /*
   * Option descriptor structure.
-@@ -304,6 +314,7 @@
+@@ -317,6 +327,7 @@
  extern int	connect_delay;	/* Time to delay after connect script */
  extern int	max_data_rate;	/* max bytes/sec through charshunt */
  extern int	req_unit;	/* interface unit number to use */
@@ -102,7 +102,7 @@
  extern char	*bundle_name;	/* bundle name for multilink */
 --- ./pppd/sys-linux.c.orig	2004-07-19 12:33:29.000000000 +0000
 +++ ./pppd/sys-linux.c	2004-07-19 14:37:36.463754450 +0000
-@@ -649,6 +649,21 @@
+@@ -638,6 +638,21 @@
  	}
  	if (x < 0)
  		error("Couldn't create new ppp unit: %m");

ppp-2.4.6-lib64.patch

@@ -15,7 +15,7 @@ Index: README
 ===================================================================
 --- README.orig	2009-11-16 23:26:07.000000000 +0100
 +++ README	2011-01-05 11:03:50.806314592 +0100
-@@ -207,8 +207,8 @@ What was new in ppp-2.4.1.
+@@ -226,8 +226,8 @@ What was new in ppp-2.4.1.
    per-tty options file are parsed correctly, and don't override values
    from the command line in most cases.
  

ppp-2.4.6-make.diff

@@ -34,7 +34,7 @@
  
  # Uncomment the next 2 lines to include support for Microsoft's
  # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-@@ -200,10 +201,8 @@
+@@ -208,10 +209,8 @@
  install: pppd
  	mkdir -p $(BINDIR) $(MANDIR)
  	$(EXTRAINSTALL)
@@ -80,8 +80,8 @@
  
  install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR)
+-	$(INSTALL) -c -m 755 $(PLUGINS) $(LIBDIR)
-+	$(INSTALL) -m 4550 $(PLUGINS) $(LIBDIR)
++	$(INSTALL) -m 755 $(PLUGINS) $(LIBDIR)
  
  clean:
  	rm -f *.o *.so

ppp-2.4.6-misc.diff

@@ -1,17 +1,6 @@
---- pppd/utils.c
-+++ pppd/utils.c
-@@ -295,7 +295,7 @@
- #if 0	/* not used, and breaks on S/390, apparently */
- 	case 'r':
- 	    f = va_arg(args, char *);
--#ifndef __powerpc__
-+#if !defined __powerpc__ && !defined __x86_64__ && !defined __s390__ && !defined __s390x__
- 	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
- #else
- 	    /* On the powerpc, a va_list is an array of 1 structure */
 --- pppd/auth.c
 +++ pppd/auth.c
-@@ -1626,9 +1626,10 @@
+@@ -2091,9 +2091,10 @@
  
      if (fstat(fileno(f), &sbuf) < 0) {
  	warn("cannot stat secret file %s: %m", filename);
@@ -27,7 +16,7 @@
  
 --- pppd/lcp.c
 +++ pppd/lcp.c
-@@ -1876,7 +1876,7 @@
+@@ -2303,7 +2303,7 @@
      if (lcp_gotoptions[f->unit].neg_magicnumber
  	&& magic == lcp_gotoptions[f->unit].magicnumber) {
  	warn("appear to have received our own echo-reply!");
@@ -38,7 +27,7 @@
      /* Reset the number of outstanding echo frames */
 --- pppd/pppd.h
 +++ pppd/pppd.h
-@@ -589,15 +589,7 @@
+@@ -848,15 +848,7 @@
  #define DEBUGCHAP	1
  #endif
  
@@ -54,36 +43,3 @@
  
  #ifdef DEBUGMAIN
  #define MAINDEBUG(x)	if (debug) dbglog x
---- pppdump/pppdump.c
-+++ pppdump/pppdump.c
-@@ -191,7 +191,7 @@
- 	    show_time(f, c);
- 	    break;
- 	default:
--	    printf("?%.2x\n");
-+	    printf("?%.2x\n", c);
- 	}
-     }
- }
-@@ -421,7 +421,7 @@
- 	    show_time(f, c);
- 	    break;
- 	default:
--	    printf("?%.2x\n");
-+	    printf("?%.2x\n", c);
- 	}
-     }
- }
---- pppdump/bsd-comp.c
-+++ pppdump/bsd-comp.c
-@@ -560,7 +560,8 @@
-     u_int incode, oldcode, finchar;
-     u_char *p, *rptr, *wptr;
-     int ilen;
--    int dlen, space, codelen, extra;
-+    int dlen = 0;
-+    int space, codelen, extra;
-
-     rptr = cmsg;
-     if (*rptr == 0)
-

ppp-2.4.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d
+size 687744

ppp-terminate-correct.patch

@@ -1,89 +0,0 @@
-From 3eb9e810cfa515543655659b72dde30c54fea0a5 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@samba.org>
-Date: Sun, 7 Mar 2010 15:21:38 +1100
-Subject: [PATCH 1/1] pppd: Terminate correctly if lcp_lowerup delayed calling fsm_lowerup
-
-Cameron Hutchison noticed that if pppd gets asked to terminate the
-link in the period between when lcp_lowerup() is called and when
-fsm_lowerup() is called from lcp_delayed_up() (i.e. when listen_time
-is non-zero), pppd never exits.
-
-The reason is that lcp_close() doesn't handle the delayed-up case
-properly.  Since the FSM is still in STOPPED state, we don't call
-lcp_finished() and therefore never exit the main event loop.
-
-This fixes it by handling the delayed-up case in lcp_close() as if
-we had done the lowerup but the OPT_SILENT bit was set.  We use the
-silent case because we don't want to actually send a configure-request
-at this point.
-
-Signed-off-by: Paul Mackerras <paulus@samba.org>
----
- pppd/lcp.c |   28 +++++++++++++++++++---------
- 1 files changed, 19 insertions(+), 9 deletions(-)
-
-diff --git a/pppd/lcp.c b/pppd/lcp.c
-index 5c77490..8ed2778 100644
---- a/pppd/lcp.c
-+++ b/pppd/lcp.c
-@@ -397,21 +397,29 @@ lcp_close(unit, reason)
-     char *reason;
- {
-     fsm *f = &lcp_fsm[unit];
-+    int oldstate;
- 
-     if (phase != PHASE_DEAD && phase != PHASE_MASTER)
- 	new_phase(PHASE_TERMINATE);
--    if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
-+
-+    if (f->flags & DELAYED_UP) {
-+	untimeout(lcp_delayed_up, f);
-+	f->state = STOPPED;
-+    }
-+    oldstate = f->state;
-+
-+    fsm_close(f, reason);
-+    if (oldstate == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) {
- 	/*
- 	 * This action is not strictly according to the FSM in RFC1548,
- 	 * but it does mean that the program terminates if you do a
--	 * lcp_close() in passive/silent mode when a connection hasn't
--	 * been established.
-+	 * lcp_close() when a connection hasn't been established
-+	 * because we are in passive/silent mode or because we have
-+	 * delayed the fsm_lowerup() call and it hasn't happened yet.
- 	 */
--	f->state = CLOSED;
-+	f->flags &= ~DELAYED_UP;
- 	lcp_finished(f);
--
--    } else
--	fsm_close(f, reason);
-+    }
- }
- 
- 
-@@ -453,9 +461,10 @@ lcp_lowerdown(unit)
- {
-     fsm *f = &lcp_fsm[unit];
- 
--    if (f->flags & DELAYED_UP)
-+    if (f->flags & DELAYED_UP) {
- 	f->flags &= ~DELAYED_UP;
--    else
-+	untimeout(lcp_delayed_up, f);
-+    } else
- 	fsm_lowerdown(&lcp_fsm[unit]);
- }
- 
-@@ -489,6 +498,7 @@ lcp_input(unit, p, len)
- 
-     if (f->flags & DELAYED_UP) {
- 	f->flags &= ~DELAYED_UP;
-+	untimeout(lcp_delayed_up, f);
- 	fsm_lowerup(f);
-     }
-     fsm_input(f, p, len);
--- 
-1.7.1
-

ppp.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Mar 20 15:07:22 UTC 2014 - aj@ajaissle.de
+
+- Update to 2.4.6
+  + Man page updates.
+  + Several bug fixes.
+  + Options files can now set and unset environment variables for
+    scripts.
+  + The timeout for chat scripts can now be taken from an environment
+    variable.
+  + There is a new option, master_detach, which allows pppd to detach
+    from the controlling terminal when it is the multilink bundle master
+    but its own link has terminated, even if the nodetach option has
+    been given.
+
+- Removed the following patches;
+  - ppp-2.4.2-logwtmp.diff -- now checks for HAVE_LOGWTMP
+  - ppp-2.4.3-demand-fix.diff -- using 'status'
+  - ppp-terminate-correct.patch -- upstream inclusion
+
+- Rebased the following patches:
+  * ppp-2.4.3-make.diff as ppp-2.4.6-make.diff
+  * ppp-2.4.2-misc.diff as ppp-2.4.6-misc.diff
+  * ppp-2.4.2-ifname.diff as ppp-2.4.6-ifname.diff
+  * ppp-2.4.4-lib64.patch as ppp-2.4.6-lib64.patch
+
+- Url changed to ppp.samba.org
+- Use macros in spec file
+- We dont need to cleanup the buildroot
+
 -------------------------------------------------------------------
 Mon Sep  2 14:41:21 UTC 2013 - max@suse.com
 

ppp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ppp
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,14 +20,14 @@ Name:           ppp
 BuildRequires:  libpcap-devel
 BuildRequires:  linux-atm-devel
 BuildRequires:  pam-devel
-Url:            http://www.samba.org/ppp/
+Url:            http://ppp.samba.org/
-Version:        2.4.5
+Version:        2.4.6
 Release:        0
 Summary:        The Point to Point Protocol for Linux
 License:        BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
 Group:          Productivity/Networking/PPP
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        ftp://ftp.samba.org:/pub/ppp/ppp-%{version}.tar.bz2
+Source0:        ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
 # config for pam
 Source1:        ppp.pamd
 # templates for secrets
@@ -44,13 +44,11 @@ Source11:       ppp-peers
 Source12:       pptp-peers
 Source13:       pppoe-discovery.8.gz
 # Makefile changes
-Patch0:         ppp-2.4.3-make.diff
+Patch0:         ppp-2.4.6-make.diff
-# force pppd use the glibc's logwtmp instead of implementing its own
-Patch1:         ppp-2.4.2-logwtmp.diff
 # replacedefaultroute option
 Patch2:         ppp-2.4.2-cifdefroute.diff
 # misc tiny stuff
-Patch3:         ppp-2.4.2-misc.diff
+Patch3:         ppp-2.4.6-misc.diff
 # more log output for smpppd
 Patch4:         ppp-2.4.2-smpppd.diff
 # allow higher serial speeds
@@ -58,20 +56,18 @@ Patch5:         ppp-2.4.1-higher-speeds.diff
 # fixed use of libpcap including dial on demand
 Patch6:         ppp-2.4.3-filter.diff
 # option to rename ppp interface
-Patch8:         ppp-2.4.2-ifname.diff
+Patch8:         ppp-2.4.6-ifname.diff
 # Don't use __P from glibc (pppd uses it wrong)
 Patch9:         ppp-2.4.2-__P.diff
 Patch10:        ppp-2.4.3-pppoatm.diff
 Patch12:        ppp-2.4.2-pie.patch
-Patch13:        ppp-2.4.3-demand-fix.diff
 Patch14:        ppp-2.4.3-fork-fix.diff
 Patch17:        ppp-2.4.3-strip.diff
 Patch18:        ppp-2.4.3-winbind-setuidfix.patch
 Patch19:        ppp-2.4.4-strncatfix.patch
-Patch21:        ppp-2.4.4-lib64.patch
+Patch21:        ppp-2.4.6-lib64.patch
 Patch22:        ppp-2.4.4-var_run_resolv_conf.patch
 Patch23:        ppp-send-padt.patch
-Patch24:        ppp-terminate-correct.patch
 
 %description
 The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -93,7 +89,6 @@ plugins for the pppd.
 %prep
 %setup -q
 %patch0
-%patch1
 %patch2
 %patch3
 %patch4
@@ -103,7 +98,6 @@ plugins for the pppd.
 %patch9
 %patch10 -p1
 %patch12 -p1
-%patch13
 %patch14
 %patch17
 %patch18
@@ -113,7 +107,6 @@ plugins for the pppd.
 %endif
 %patch22
 %patch23 -p1
-%patch24 -p1
 sed -i -e '1s/local\///' scripts/secure-card
 find scripts -type f | xargs chmod a-x
 
@@ -122,52 +115,49 @@ find scripts -type f | xargs chmod a-x
 rm -f include/linux/if_pppol2tp.h
 export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP"
 ./configure --prefix=/usr
-make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y
+make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y HAVE_LOGWTMP=y
 
 %install
 make install DESTDIR=%{buildroot}%_prefix
-install -d -m 750		%{buildroot}/etc/ppp
+install -d -m 750		%{buildroot}%{_sysconfdir}/ppp
-install -m 644 %{S:5}		%{buildroot}/etc/ppp/options
+install -m 644 %{S:5}		%{buildroot}%{_sysconfdir}/ppp/options
-install -m 644 %{S:6}		%{buildroot}/etc/ppp/filters
+install -m 644 %{S:6}		%{buildroot}%{_sysconfdir}/ppp/filters
-install -m 600 %{S:2}		%{buildroot}/etc/ppp/pap-secrets
+install -m 600 %{S:2}		%{buildroot}%{_sysconfdir}/ppp/pap-secrets
-install -m 600 %{S:3}		%{buildroot}/etc/ppp/chap-secrets
+install -m 600 %{S:3}		%{buildroot}%{_sysconfdir}/ppp/chap-secrets
-install -d 755			%{buildroot}/etc/ppp/peers
+install -d 755			%{buildroot}%{_sysconfdir}/ppp/peers
-install -m 644 %{S:8}		%{buildroot}/etc/ppp/peers/pppoe
+install -m 644 %{S:8}		%{buildroot}%{_sysconfdir}/ppp/peers/pppoe
-install -m 644 %{S:9}		%{buildroot}/etc/ppp/peers/pppoe-rp
+install -m 644 %{S:9}		%{buildroot}%{_sysconfdir}/ppp/peers/pppoe-rp
 %ifnarch mips s390 s390x
-install -m 644 %{S:10}		%{buildroot}/etc/ppp/peers/pppoatm
+install -m 644 %{S:10}		%{buildroot}%{_sysconfdir}/ppp/peers/pppoatm
 %endif
-install -m 644 %{S:11}		%{buildroot}/etc/ppp/peers/ppp
+install -m 644 %{S:11}		%{buildroot}%{_sysconfdir}/ppp/peers/ppp
-install -m 644 %{S:12}		%{buildroot}/etc/ppp/peers/pptp
+install -m 644 %{S:12}		%{buildroot}%{_sysconfdir}/ppp/peers/pptp
-install -d 755			%{buildroot}/etc/pam.d
+install -d 755			%{buildroot}%{_sysconfdir}/pam.d
-install -m 644 %{S:1}		%{buildroot}/etc/pam.d/ppp
+install -m 644 %{S:1}		%{buildroot}%{_sysconfdir}/pam.d/ppp
-install -m 644 %{S:13}		%{buildroot}/%{_mandir}/man8/pppoe-discovery.8.gz
+install -m 644 %{S:13}		%{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
-
-%clean
-rm -rf %{buildroot}
 
 %files
 %defattr (-, root, root)
-%dir /etc/ppp/peers
+%dir %{_sysconfdir}/ppp/peers
-%config(noreplace) /etc/ppp/options
+%config(noreplace) %{_sysconfdir}/ppp/options
-%config(noreplace) /etc/ppp/filters
+%config(noreplace) %{_sysconfdir}/ppp/filters
-%config(noreplace) /etc/ppp/pap-secrets
+%config(noreplace) %{_sysconfdir}/ppp/pap-secrets
-%config(noreplace) /etc/ppp/chap-secrets
+%config(noreplace) %{_sysconfdir}/ppp/chap-secrets
-%config(noreplace) /etc/ppp/peers/*
+%config(noreplace) %{_sysconfdir}/ppp/peers/*
-%config(noreplace) /etc/pam.d/ppp
+%config(noreplace) %{_sysconfdir}/pam.d/ppp
 %doc FAQ README* SETUP scripts PLUGINS
 %doc %{_mandir}/*/*
-%attr (-, root, dialout) /usr/sbin/pppd
+%attr (-, root, dialout) %{_sbindir}/pppd
-/usr/sbin/chat
+%{_sbindir}/chat
-/usr/sbin/pppdump
+%{_sbindir}/pppdump
-/usr/sbin/pppstats
+%{_sbindir}/pppstats
-/usr/sbin/pppoe-discovery
+%{_sbindir}/pppoe-discovery
-%dir %_libdir/pppd
+%dir %{_libdir}/pppd
-%dir %_libdir/pppd/2.4.5
+%dir %{_libdir}/pppd/%{version}
-%attr(0755,root,root) %_libdir/pppd/2.4.5/*.so
+%attr(0755,root,root) %{_libdir}/pppd/%{version}/*.so
 
 %files devel
 %defattr (-, root, root)
-/usr/include/pppd
+%{_includedir}/pppd
 
 %changelog