mirror of
https://abf.rosa.ru/djam/ppp.git
synced 2025-02-23 06:03:01 +00:00
Automatic import for version 2.4.5-11
This commit is contained in:
Rosa
parent
c366fd0efb
commit
386cb24dba
2 changed files with 150 additions and 159 deletions
|
|
@ -1,17 +1,57 @@
|
|||
--- ppp-2.4.3/chat/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
|
||||
+++ ppp-2.4.3/chat/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
--- ppp-2.4.5/chat/Makefile.linux.nostrip~ 2012-05-24 12:36:45.000000000 +0200
|
||||
+++ ppp-2.4.5/chat/Makefile.linux 2012-05-24 12:37:05.901103002 +0200
|
||||
@@ -25,7 +25,7 @@ chat.o: chat.c
|
||||
|
||||
install: chat
|
||||
mkdir -p $(BINDIR)
|
||||
mkdir -p $(BINDIR) $(MANDIR)
|
||||
- $(INSTALL) -s -c chat $(BINDIR)
|
||||
+ $(INSTALL) -c chat $(BINDIR)
|
||||
$(INSTALL) -c -m 644 chat.8 $(MANDIR)
|
||||
|
||||
clean:
|
||||
--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
|
||||
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
|
||||
@@ -36,9 +36,9 @@
|
||||
--- ppp-2.4.5/pppd/Makefile.linux.nostrip~ 2012-05-24 12:36:45.785354484 +0200
|
||||
+++ ppp-2.4.5/pppd/Makefile.linux 2012-05-24 12:36:45.843353758 +0200
|
||||
@@ -64,7 +64,7 @@ NOEXT_TRAFFIC=y
|
||||
|
||||
HAS_SHADOW=y
|
||||
USE_PAM=y
|
||||
-#HAVE_INET6=y
|
||||
+HAVE_INET6=y
|
||||
|
||||
# Enable plugins
|
||||
PLUGIN=y
|
||||
@@ -105,7 +105,7 @@ ifdef USE_SRP
|
||||
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
|
||||
@@ -206,7 +206,7 @@ all: $(TARGETS)
|
||||
install: pppd
|
||||
mkdir -p $(BINDIR) $(MANDIR)
|
||||
$(EXTRAINSTALL)
|
||||
- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
|
||||
+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
|
||||
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
|
||||
chmod o-rx,u+s $(BINDIR)/pppd; fi
|
||||
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
|
||||
--- ppp-2.4.5/pppd/plugins/dhcp/Makefile.linux.nostrip~ 2012-05-24 12:36:45.839353809 +0200
|
||||
+++ ppp-2.4.5/pppd/plugins/dhcp/Makefile.linux 2012-05-24 12:36:45.843353758 +0200
|
||||
@@ -11,7 +11,7 @@ all: $(PLUGIN)
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
||||
- $(INSTALL) -s -c -m 755 dhcpc.so $(LIBDIR)
|
||||
+ $(INSTALL) -c -m 755 dhcpc.so $(LIBDIR)
|
||||
|
||||
$(PLUGIN): $(LTLIB)
|
||||
gcc -o $@ $(OBJS:%.lo=.libs/%.o) $(LIBS)
|
||||
--- ppp-2.4.5/pppd/plugins/radius/Makefile.linux.nostrip~ 2012-05-24 12:36:45.745354984 +0200
|
||||
+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2012-05-24 12:36:45.842353771 +0200
|
||||
@@ -36,9 +36,9 @@ all: $(PLUGIN)
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
||||
|
|
@ -24,9 +64,9 @@
|
|||
$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
|
||||
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
|
||||
|
||||
--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
|
||||
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
|
||||
@@ -39,9 +39,9 @@
|
||||
--- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux.nostrip~ 2012-05-24 12:36:45.000000000 +0200
|
||||
+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2012-05-24 12:37:30.615794026 +0200
|
||||
@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o c
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
||||
|
|
@ -37,59 +77,19 @@
|
|||
+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
|
||||
|
||||
clean:
|
||||
rm -f *.o *.so
|
||||
--- ppp-2.4.3/pppd/plugins/dhcp/Makefile.linux.nostrip 2005-08-28 12:38:09.000000000 +0200
|
||||
+++ ppp-2.4.3/pppd/plugins/dhcp/Makefile.linux 2005-08-28 12:38:09.000000000 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
||||
- $(INSTALL) -s -c -m 755 dhcpc.so $(LIBDIR)
|
||||
+ $(INSTALL) -c -m 755 dhcpc.so $(LIBDIR)
|
||||
|
||||
$(PLUGIN): $(LTLIB)
|
||||
gcc -o $@ $(OBJS:%.lo=.libs/%.o) $(LIBS)
|
||||
--- ppp-2.4.3/pppd/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
|
||||
+++ ppp-2.4.3/pppd/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
HAS_SHADOW=y
|
||||
USE_PAM=y
|
||||
-#HAVE_INET6=y
|
||||
+HAVE_INET6=y
|
||||
|
||||
# Enable plugins
|
||||
PLUGIN=y
|
||||
@@ -105,7 +105,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
|
||||
@@ -208,7 +208,7 @@
|
||||
install: pppd
|
||||
mkdir -p $(BINDIR) $(MANDIR)
|
||||
$(EXTRAINSTALL)
|
||||
- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
|
||||
+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
|
||||
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
|
||||
chmod o-rx,u+s $(BINDIR)/pppd; fi
|
||||
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
|
||||
--- ppp-2.4.3/pppdump/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
|
||||
+++ ppp-2.4.3/pppdump/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
|
||||
@@ -17,5 +17,5 @@
|
||||
rm -f *.o *.so pppoe-discovery
|
||||
--- ppp-2.4.5/pppdump/Makefile.linux.nostrip~ 2012-05-24 12:36:45.769354684 +0200
|
||||
+++ ppp-2.4.5/pppdump/Makefile.linux 2012-05-24 12:36:45.844353746 +0200
|
||||
@@ -17,5 +17,5 @@ clean:
|
||||
|
||||
install:
|
||||
mkdir -p $(BINDIR) $(MANDIR)
|
||||
- $(INSTALL) -s -c pppdump $(BINDIR)
|
||||
+ $(INSTALL) -c pppdump $(BINDIR)
|
||||
$(INSTALL) -c pppdump.8 $(MANDIR)
|
||||
--- ppp-2.4.3/pppstats/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
|
||||
+++ ppp-2.4.3/pppstats/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
--- ppp-2.4.5/pppstats/Makefile.linux.nostrip~ 2012-05-24 12:36:45.746354972 +0200
|
||||
+++ ppp-2.4.5/pppstats/Makefile.linux 2012-05-24 12:36:45.844353746 +0200
|
||||
@@ -22,7 +22,7 @@ all: pppstats
|
||||
|
||||
install: pppstats
|
||||
-mkdir -p $(MANDIR)
|
||||
195
ppp.spec
195
ppp.spec
|
|
@ -1,27 +1,15 @@
|
|||
%define major 0
|
||||
%define libname %mklibname radiusclient %{major}
|
||||
%define develname %mklibname radiusclient -d
|
||||
%define major 0
|
||||
%define libname %mklibname radiusclient %{major}
|
||||
%define devname %mklibname radiusclient -d
|
||||
|
||||
%define name ppp
|
||||
%define version 2.4.5
|
||||
%define release %mkrel 8
|
||||
|
||||
%define enable_inet6 1
|
||||
%{?_with_inet6: %{expand: %%global enable_inet6 1}}
|
||||
%{?_without_inet6: %{expand: %%global enable_inet6 0}}
|
||||
|
||||
%define enable_debug 0
|
||||
%{?_with_debug: %global enable_debug 1}
|
||||
%{?_without_debug: %global use_debug 0}
|
||||
|
||||
%define enable_radiusclient 0
|
||||
%{?_with_radiusclient: %{expand: %%global enable_radiusclient 1}}
|
||||
%{?_without_radiusclient: %{expand: %%global enable_radiusclient 0}}
|
||||
%bcond_without inet6
|
||||
%bcond_with radiusclient
|
||||
%bcond_without uclibc
|
||||
|
||||
Summary: The PPP daemon and documentation for Linux 1.3.xx and greater
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Name: ppp
|
||||
Version: 2.4.5
|
||||
Release: 11
|
||||
License: BSD-like
|
||||
Url: http://www.samba.org/ppp/
|
||||
Group: System/Servers
|
||||
|
|
@ -39,15 +27,15 @@ Patch5: ppp-2.4.3-pppdump-Makefile.patch
|
|||
Patch6: ppp-2.4.3-noexttraffic.patch
|
||||
# (blino) use external libatm for pppoatm plugin
|
||||
Patch7: ppp-2.4.3-libatm.patch
|
||||
Patch8: ppp-2.4.2-pie.patch
|
||||
Patch9: ppp-2.4.4-multipledefrt.patch
|
||||
Patch8: ppp-2.4.2-pie.patch
|
||||
Patch9: ppp-2.4.4-multipledefrt.patch
|
||||
Patch10: ppp-2.4.4-dontwriteetc.patch
|
||||
# (blino) http://orakel.tznetz.com/dload/ppp-2.4.4-mppe-mppc-1.1.patch.gz
|
||||
# original patch on http://mppe-mppc.alphacron.de/
|
||||
# (tpg) disable this patch, because it need a rediff and also there are some legal issues
|
||||
# Although the module's source code is completely free, MPPC itself is patented algorithm.
|
||||
#Patent for *Microsoft* PPC is holded by the Hifn Inc. This is obvious ;-).
|
||||
#Furthermore, MPPE uses RC4[1] encryption algorithm which itself isn't patented,
|
||||
#Furthermore, MPPE uses RC4[1] encryption algorithm which itself isn't patented,
|
||||
#but RC4 is trademark of RSA Data Security Inc.
|
||||
#To avoid legal problems, US citizens shouldn't use this module.
|
||||
Patch11: ppp-2.4.4-mppe-mppc-1.1.patch
|
||||
|
|
@ -55,16 +43,18 @@ Patch15: ppp-2.4.3-pic.patch
|
|||
Patch16: ppp-2.4.3-etcppp.patch
|
||||
Patch18: ppp-2.4.5-includes-sha1.patch
|
||||
Patch19: ppp-2.4.5-makeopt2.patch
|
||||
Patch20: ppp-2.4.3-nostrip.patch
|
||||
Patch20: ppp-2.4.5-nostrip.patch
|
||||
Patch21: ppp-2.4.5-pppol2tpv3.patch
|
||||
BuildRequires: libatm-devel
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: openssl-devel >= 0.9.7
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: libtool
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
Requires: glibc >= 2.0.6
|
||||
|
||||
# XXX: hm, this shoulda been default behaviour of rpm.. need to investigate why
|
||||
%define __noautoreqfiles %{_docdir}/*
|
||||
|
||||
%description
|
||||
The ppp package contains the PPP (Point-to-Point Protocol) daemon
|
||||
and documentation for PPP support. The PPP protocol provides a
|
||||
|
|
@ -73,6 +63,17 @@ method for transmitting datagrams over serial point-to-point links.
|
|||
The ppp package should be installed if your machine need to support
|
||||
the PPP protocol.
|
||||
|
||||
%if %{with uclibc}
|
||||
%package -n uclibc-pppd
|
||||
Summary: uClibc-linked build of pppd
|
||||
Group: System/Servers
|
||||
BuildRequires: uClibc-devel >= 0.9.33.2-3
|
||||
|
||||
%description -n uclibc-pppd
|
||||
This package ships a build of pppd linked against uClibc.
|
||||
|
||||
It's primarily targetted for inclusion with the DrakX installer.
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
Summary: PPP devel files
|
||||
|
|
@ -115,7 +116,7 @@ Requires: %{name} = %{version}
|
|||
%description dhcp
|
||||
DHCP plugin for %{name}.
|
||||
|
||||
%if %enable_radiusclient
|
||||
%if %{with radiusclient}
|
||||
%package -n radiusclient-utils
|
||||
Summary: Radiusclient library
|
||||
Group: System/Servers
|
||||
|
|
@ -137,14 +138,14 @@ Group: System/Libraries
|
|||
%description -n %{libname}
|
||||
Libraries required for Radiusclient
|
||||
|
||||
%package -n %{develname}
|
||||
%package -n %{devname}
|
||||
Summary: Header files and development documentation for radiusclient
|
||||
Group: Development/C
|
||||
Requires: %{libname} = %{version}-%{release}
|
||||
Provides: radiusclient-devel = %{version}-%{release}
|
||||
Provides: libradiusclient-devel = %{version}-%{release}
|
||||
|
||||
%description -n %{develname}
|
||||
%description -n %{devname}
|
||||
Header files and development documentation for radiusclient.
|
||||
|
||||
%package -n %{staticname}
|
||||
|
|
@ -159,34 +160,36 @@ Radiusclient static library.
|
|||
%prep
|
||||
%setup -q
|
||||
find -type d -name CVS|xargs rm -rf
|
||||
%patch0 -p1 -b .make
|
||||
%patch1 -p1 -b .sample
|
||||
%patch2 -p1 -b .wtmp
|
||||
%patch4 -p1 -b .options
|
||||
%patch5 -p1 -b .pppdump-Makefile
|
||||
%patch0 -p1 -b .make~
|
||||
%patch1 -p1
|
||||
%patch2 -p1 -b .wtmp~
|
||||
%patch4 -p1 -b .options~
|
||||
%patch5 -p1 -b .pppdump-Makefile~
|
||||
|
||||
# (gg) add noext-traffic option
|
||||
%patch6 -p1 -b .noext
|
||||
%patch6 -p1 -b .noext~
|
||||
|
||||
%patch7 -p1 -b .libatm
|
||||
%patch8 -p1 -b .pie
|
||||
%patch9 -p1 -b .multipledefrt
|
||||
%patch7 -p1 -b .libatm~
|
||||
%patch8 -p1 -b .pie~
|
||||
%patch9 -p1 -b .multipledefrt~
|
||||
|
||||
tar -xjf %{SOURCE2}
|
||||
pushd pppd/plugins
|
||||
tar -xjf %{SOURCE5}
|
||||
popd
|
||||
|
||||
%patch10 -p1 -b .dontwriteetc
|
||||
#%patch11 -p1 -b .mppe_mppc
|
||||
%patch15 -p1 -b .pic
|
||||
%patch16 -p1 -b .etcppp
|
||||
%patch18 -p1 -b .incsha1
|
||||
%patch19 -p1 -b .dhcp
|
||||
%if %enable_debug
|
||||
%patch20 -p1 -b .nostrip
|
||||
%endif
|
||||
%patch21 -p1 -b .pppol2tpv3
|
||||
%patch10 -p1 -b .dontwriteetc~
|
||||
#patch11 -p1 -b .mppe_mppc~
|
||||
%patch15 -p1 -b .pic~
|
||||
%patch16 -p1 -b .etcppp~
|
||||
%patch18 -p1 -b .incsha1~
|
||||
%patch19 -p1 -b .dhcp~
|
||||
%patch20 -p1 -b .nostrip~
|
||||
%patch21 -p1 -b .pppol2tpv3~
|
||||
|
||||
cp %{SOURCE3} .
|
||||
|
||||
chmod go+r scripts/*
|
||||
|
||||
# lib64 fixes
|
||||
perl -pi -e "s|^(LIBDIR.*)\\\$\(DESTDIR\)/lib|\1\\\$(INSTROOT)%{_libdir}|g" pppd/Makefile.linux pppd/plugins/Makefile.linux pppd/plugins/{pppoatm,radius,rp-pppoe,pppol2tp}/Makefile.linux
|
||||
|
|
@ -203,7 +206,7 @@ perl -pi -e "s|/usr/local/bin/pppd|%{_sbindir}/pppd|g;
|
|||
scripts/ppp-on-ssh \
|
||||
scripts/secure-card
|
||||
|
||||
%if %enable_inet6
|
||||
%if %{with inet6}
|
||||
perl -pi -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
|
||||
%endif
|
||||
|
||||
|
|
@ -214,12 +217,7 @@ perl -pi -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
|
|||
%serverbuild
|
||||
%endif
|
||||
|
||||
# stpcpy() is a GNU extension
|
||||
%if %enable_debug
|
||||
OPT_FLAGS="%{optflags} -g -D_GNU_SOURCE"
|
||||
%else
|
||||
OPT_FLAGS="%{optflags} -D_GNU_SOURCE"
|
||||
%endif
|
||||
OPT_FLAGS="%{optflags}"
|
||||
perl -pi -e "s/openssl/openssl -DOPENSSL_NO_SHA1/;" openssl/crypto/sha/Makefile
|
||||
|
||||
CFLAGS="$OPT_FLAGS" CXXFLAGS="$OPT_FLAGS" %configure2_5x
|
||||
|
|
@ -228,26 +226,28 @@ CFLAGS="$OPT_FLAGS" CXXFLAGS="$OPT_FLAGS" %configure2_5x
|
|||
%make RPM_OPT_FLAGS="$OPT_FLAGS" LIBDIR=%{_libdir}
|
||||
%make -C pppd/plugins -f Makefile.linux
|
||||
|
||||
%if %{with uclibc}
|
||||
pushd pppd
|
||||
%{uclibc_cc} -I../include -I. -o pppd-uclibc main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c chap-md5.c md5.c ccp.c auth.c options.c demand.c utils.c sys-linux.c ipxcp.c tdb.c tty.c session.c ecp.c spinlock.c eap.c -lcrypt -static -lutil -Wall -Wno-deprecated-declarations %{uclibc_cflags} -static -Os -fwhole-program -flto %{ldflags}
|
||||
popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}{%{_sbindir},%{_bindir},/usr/X11R6/bin/,%{_mandir}/man8,%{_sysconfdir}/{ppp/peers,pam.d}}
|
||||
install -d %{buildroot}%{_sysconfdir}/ppp/peers
|
||||
|
||||
%makeinstall LIBDIR=%{buildroot}%{_libdir}/pppd/%{version}/ INSTALL=install -C pppd/plugins/dhcp
|
||||
%makeinstall INSTROOT=%{buildroot} SUBDIRS="pppoatm rp-pppoe radius pppol2tp"
|
||||
|
||||
%if %{with uclibc}
|
||||
install -m755 pppd/pppd-uclibc -D %{buildroot}%{uclibc_root}/sbin/pppd
|
||||
%endif
|
||||
|
||||
%multiarch_includes %{buildroot}%{_includedir}/pppd/pathnames.h
|
||||
|
||||
# (gg) Allow stripping
|
||||
chmod u+w %{buildroot}%{_sbindir}/*
|
||||
|
||||
%if !%enable_debug
|
||||
# (florin) strip the binary
|
||||
strip %{buildroot}%{_sbindir}/pppd
|
||||
%endif
|
||||
|
||||
chmod go+r scripts/*
|
||||
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
|
||||
install -m 644 %{SOURCE3} %{_builddir}/%{name}-%{version}/
|
||||
install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/pam.d/ppp
|
||||
|
||||
# (stew) fix permissions
|
||||
chmod 0755 `find %{buildroot} -name "*\.so"`
|
||||
|
|
@ -258,42 +258,16 @@ touch %{buildroot}/var/run/ppp/resolv.conf
|
|||
ln -s ../../var/log/ppp/connect-errors %{buildroot}/etc/ppp/connect-errors
|
||||
ln -s ../../var/run/ppp/resolv.conf %{buildroot}/etc/ppp/resolv.conf
|
||||
|
||||
# Logrotate script
|
||||
mkdir -p %{buildroot}/etc/logrotate.d
|
||||
install -m 644 %{SOURCE4} %{buildroot}/etc/logrotate.d/ppp
|
||||
install -m644 %{SOURCE4} -D %{buildroot}/etc/logrotate.d/ppp/ppp.logrotate
|
||||
|
||||
%if !%enable_radiusclient
|
||||
%if !%{with radiusclient}
|
||||
rm -rf %{buildroot}%{_sbindir}/*rad*
|
||||
rm -rf %{buildroot}%{_sysconfdir}/*rad*
|
||||
rm -rf %{buildroot}%{_includedir}/*rad*
|
||||
rm -rf %{buildroot}%{_libdir}/*rad*
|
||||
%endif
|
||||
|
||||
%if %enable_debug
|
||||
export DONT_STRIP=1
|
||||
%endif
|
||||
|
||||
%if %enable_radiusclient
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{develname} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{develname} -p /sbin/ldconfig
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc FAQ PLUGINS README* scripts sample
|
||||
%{_sbindir}/chat
|
||||
%{_sbindir}/pppdump
|
||||
|
|
@ -321,37 +295,37 @@ rm -rf %{buildroot}
|
|||
%config(noreplace) %{_sysconfdir}/pam.d/ppp
|
||||
%config(noreplace) /etc/logrotate.d/ppp
|
||||
|
||||
%if %{with uclibc}
|
||||
%files -n uclibc-pppd
|
||||
%{uclibc_root}/sbin/pppd
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc README*
|
||||
%{_includedir}/pppd/*
|
||||
%{multiarch_includedir}/pppd/pathnames.h
|
||||
|
||||
%files pppoatm
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%{_libdir}/pppd/%{version}/pppoatm.so
|
||||
|
||||
%files pppoe
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%{_libdir}/pppd/%{version}/rp-pppoe.so
|
||||
%attr(755,root,root) %{_sbindir}/pppoe-discovery
|
||||
|
||||
%files radius
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%{_libdir}/pppd/%{version}/rad*.so
|
||||
%{_mandir}/man8/*rad*
|
||||
|
||||
%files dhcp
|
||||
%defattr(-,root,root)
|
||||
%doc pppd/plugins/dhcp/README
|
||||
%doc pppd/plugins/dhcp/AUTHORS
|
||||
%doc pppd/plugins/dhcp/COPYING
|
||||
%{_libdir}/pppd/%{version}/dhcpc.so
|
||||
|
||||
%if %enable_radiusclient
|
||||
%if %{with radiusclient}
|
||||
%files -n radiusclient-utils
|
||||
%defattr(644,root,root,755)
|
||||
%doc pppd/plugins/radius/radiusclient/BUGS
|
||||
|
|
@ -363,10 +337,9 @@ rm -rf %{buildroot}
|
|||
%attr(755,root,root) %{_sbindir}/*rad*
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root)
|
||||
%attr(755,root,root) %{_libdir}/lib*.so.%{major}*
|
||||
|
||||
%files -n %{develname}
|
||||
%files -n %{devname}
|
||||
%defattr(644,root,root,755)
|
||||
%attr(755,root,root) %{_libdir}/lib*.so
|
||||
%attr(755,root,root) %{_libdir}/lib*.la
|
||||
|
|
@ -379,7 +352,25 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 28 2011 Oden Eriksson <oeriksson@mandriva.com> 2.4.5-8mdv2012.0
|
||||
* Thu May 24 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 2.4.5-11
|
||||
+ Revision: 800388
|
||||
- make sure that we don't pull in any additional dependencies from doc files
|
||||
|
||||
* Thu May 24 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 2.4.5-10
|
||||
+ Revision: 800375
|
||||
- move uclibc pppd to %%{uclibc_root}/sbin
|
||||
|
||||
* Thu May 24 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 2.4.5-9
|
||||
+ Revision: 800374
|
||||
- fix mixed-use-of-spaces-and-tabs
|
||||
- fix macro-in-comment
|
||||
- fix backup-file-in-package
|
||||
- drop ancient debug package crap, everything should always be compiled with
|
||||
debug flags and any stripping done should be left to rpm's own script to handle
|
||||
- clean out a lot of old *junk*
|
||||
- build uclibc linked version of pppd for inclusion with DrakX installer
|
||||
|
||||
* Mon Nov 28 2011 Oden Eriksson <oeriksson@mandriva.com> 2.4.5-8
|
||||
+ Revision: 734987
|
||||
- relink against new pcap
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue