ALT Linux repos
| S: | 2.5.0-alt1 |
| 5.0: | 2.4.4-alt11 |
| 4.1: | 2.4.4-alt10.M41.1 |
| 4.0: | 2.4.4-alt10 |
| +updates: | 2.4.4-alt10 |
| 3.0: | 2.4.2-alt6 |
| +updates: | 2.4.2-alt6.M30.1 |
Group :: Networking/Other
RPM: ppp
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: ppp-2.4.4-alt-lib64.patch
Download
Download
diff -ur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4/pppd/Makefile.linux
--- ppp-2.4.4.orig/pppd/Makefile.linux 2006-06-04 09:07:46 +0400
+++ ppp-2.4.4/pppd/Makefile.linux 2007-03-14 00:26:59 +0300
@@ -8,6 +8,7 @@
BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8
INCDIR = $(DESTDIR)/include
+LIBDIR = $(DESTDIR)/$(libdir)
TARGETS = pppd
@@ -79,7 +80,7 @@
COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' '-DLIBDIR="$(libdir)"'
ifdef CHAPMS
CFLAGS += -DCHAPMS=1
diff -ur ppp-2.4.4.orig/pppd/pathnames.h ppp-2.4.4/pppd/pathnames.h
--- ppp-2.4.4.orig/pppd/pathnames.h 2005-08-26 03:59:34 +0400
+++ ppp-2.4.4/pppd/pathnames.h 2007-03-14 00:06:16 +0300
@@ -57,7 +57,7 @@
#ifdef PLUGIN
#ifdef __STDC__
-#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION
+#define _PATH_PLUGIN LIBDIR "/pppd/" VERSION
#else /* __STDC__ */
#define _PATH_PLUGIN "/usr/lib/pppd"
#endif /* __STDC__ */
diff -ur ppp-2.4.4.orig/pppd/plugins/Makefile.linux ppp-2.4.4/pppd/plugins/Makefile.linux
--- ppp-2.4.4.orig/pppd/plugins/Makefile.linux 2006-06-04 09:04:14 +0400
+++ ppp-2.4.4/pppd/plugins/Makefile.linux 2007-03-14 00:17:26 +0300
@@ -7,7 +7,8 @@
DESTDIR = $(INSTROOT)@DESTDIR@
BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)+LIBDIR = $(DESTDIR)/$(libdir)/pppd/$(VERSION)
SUBDIRS := rp-pppoe pppoatm
# Uncomment the next line to include the radius authentication plugin
@@ -25,8 +26,6 @@
%.so: %.c
$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)-
install: $(PLUGINS)
$(INSTALL) -d $(LIBDIR)
$(INSTALL) $? $(LIBDIR)
diff -ur ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux
--- ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 04:12:10 +0300
+++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2007-03-14 00:17:41 +0300
@@ -7,9 +7,8 @@
#***********************************************************************
DESTDIR = @DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)+LIBDIR = $(DESTDIR)/$(libdir)/pppd/$(VERSION)
PLUGIN := pppoatm.so
PLUGIN_OBJS := pppoatm.o
diff -ur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4/pppd/plugins/radius/Makefile.linux
--- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux 2006-06-04 09:04:14 +0400
+++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2007-03-14 00:17:58 +0300
@@ -5,9 +5,8 @@
DESTDIR = $(INSTROOT)@DESTDIR@
MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)+LIBDIR = $(DESTDIR)/$(libdir)/pppd/$(VERSION)
INSTALL = install
diff -ur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux 2006-06-04 09:07:46 +0400
+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2007-03-14 00:18:15 +0300
@@ -15,9 +15,8 @@
DESTDIR = $(INSTROOT)@DESTDIR@
BINDIR = $(DESTDIR)/sbin
-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
-
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)+LIBDIR = $(DESTDIR)/$(libdir)/pppd/$(PPPDVERSION)
INSTALL = install