ppp-alt/ppp-2.4.2-alt-makefile.patch

   1 --- ppp-2.4.2/chat/Makefile.linux.vns   2004-01-13 06:57:55 +0300
   2 +++ ppp-2.4.2/chat/Makefile.linux       2004-05-28 11:59:01 +0400
   3 @@ -6,8 +6,7 @@
   4  CDEF4= -DFNDELAY=O_NDELAY              # Old name value
   5  CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
   6
   7 -COPTS= -O2 -g -pipe $(CDEFS)
   8 -CFLAGS=        $(COPTS) $(CDEFS)
   9 +CFLAGS=        $(CDEFS) $(RPM_OPT_FLAGS)
  10
  11  INSTALL= install
  12
  13 @@ -20,9 +19,9 @@
  14         $(CC) -c $(CFLAGS) -o chat.o chat.c
  15
  16  install: chat
  17 -       mkdir -p $(BINDIR)
  18 -       $(INSTALL) -s -c chat $(BINDIR)
  19 -       $(INSTALL) -c -m 644 chat.8 $(MANDIR)/man8
  20 +       mkdir -p $(BINDIR) $(MANDIR)/man8
  21 +       $(INSTALL) -m 755 chat $(BINDIR)/
  22 +       $(INSTALL) -m 644 chat.8 $(MANDIR)/man8/
  23
  24  clean:
  25         rm -f chat.o chat *~
  26 --- ppp-2.4.2/linux/Makefile.top.vns    2002-09-07 14:37:49 +0400
  27 +++ ppp-2.4.2/linux/Makefile.top        2004-05-28 11:56:52 +0400
  28 @@ -3,7 +3,7 @@
  29
  30  BINDIR = $(DESTDIR)/usr/sbin
  31  INCDIR = $(DESTDIR)/usr/include
  32 -MANDIR = $(DESTDIR)/usr/man
  33 +MANDIR = $(DESTDIR)/usr/share/man
  34  ETCDIR = $(DESTDIR)/etc/ppp
  35
  36  # uid 0 = root
  37 --- ppp-2.4.2/pppd/plugins/radius/radiusclient/etc/Makefile.am.vns      2002-11-09 14:24:42 +0300
  38 +++ ppp-2.4.2/pppd/plugins/radius/radiusclient/etc/Makefile.am  2004-05-28 11:56:52 +0400
  39 @@ -28,12 +28,12 @@
  40             <$(srcdir)/radiusclient.conf.in >radiusclient.conf
  41
  42  install-data-local: realms servers
  43 -       $(mkinstalldirs) $(pkgsysconfdir); \
  44 -        echo " $(INSTALL) -m600 $(srcdir)/realms $(pkgsysconfdir)/realms"; \
  45 -        $(INSTALL) -m600 $(srcdir)/realms $(pkgsysconfdir)/realms; \
  46 -        echo " $(INSTALL) -m600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
  47 -        $(INSTALL) -m600 $(srcdir)/servers $(pkgsysconfdir)/servers
  48 +       $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir); \
  49 +        echo " $(INSTALL) -m600 $(srcdir)/realms $(DESTDIR)$(pkgsysconfdir)/realms"; \
  50 +        $(INSTALL) -m600 $(srcdir)/realms $(DESTDIR)$(pkgsysconfdir)/realms; \
  51 +        echo " $(INSTALL) -m600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers"; \
  52 +        $(INSTALL) -m600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers
  53
  54  uninstall-local:
  55 -       rm -f $(pkgsysconfdir)/realms
  56 -       rm -f $(pkgsysconfdir)/servers
  57 +       rm -f $(DESTDIR)$(pkgsysconfdir)/realms
  58 +       rm -f $(DESTDIR)$(pkgsysconfdir)/servers
  59 --- ppp-2.4.2/pppd/plugins/radius/Makefile.linux.vns    2002-11-09 14:24:42 +0300
  60 +++ ppp-2.4.2/pppd/plugins/radius/Makefile.linux        2004-05-28 11:56:52 +0400
  61 @@ -3,9 +3,8 @@
  62  # Copyright 2002 Roaring Penguin Software Inc.
  63  #
  64
  65 -MANDIR=/usr/man
  66  PLUGIN=radius.so radattr.so radrealms.so
  67 -CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
  68 +CFLAGS = $(RPM_OPT_FLAGS) -I../.. -I../../../include -Iradiusclient/include
  69
  70  # Uncomment the next line to include support for Microsoft's
  71  # MS-CHAP authentication protocol.
  72 @@ -29,15 +28,15 @@
  73
  74  install: all
  75         $(MAKE) $(MFLAGS) -C radiusclient install
  76 -       $(INSTALL) -d -m 755 $(LIBDIR)
  77 -       $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
  78 -       $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
  79 -       $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
  80 -       $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8
  81 -       $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8
  82 +       mkdir -p $(LIBDIR) $(MANDIR)/man8
  83 +       $(INSTALL) -m 755 radius.so $(LIBDIR)/
  84 +       $(INSTALL) -m 755 radattr.so $(LIBDIR)/
  85 +       $(INSTALL) -m 755 radrealms.so $(LIBDIR)/
  86 +       $(INSTALL) -m 644 pppd-radius.8 $(MANDIR)/man8/
  87 +       $(INSTALL) -m 644 pppd-radattr.8 $(MANDIR)/man8/
  88
  89 -radius.so: radiusclient/lib/.libs/libradiusclient.a radius.o
  90 -       gcc -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a
  91 +radius.so: radiusclient/lib/.libs/libradiusclient.so radius.o
  92 +       gcc -o radius.so -shared radius.o -L./radiusclient/lib/.libs -lradiusclient
  93
  94  radattr.so: radattr.o
  95         gcc -o radattr.so -shared radattr.o
  96 @@ -54,7 +53,7 @@
  97  radrealms.o: radrealms.c
  98         gcc $(CFLAGS) -c -o radrealms.o -fPIC radrealms.c
  99
 100 -radiusclient/lib/.libs/libradiusclient.a:
 101 +radiusclient/lib/.libs/libradiusclient.so:
 102         test -r radiusclient/Makefile ||           \
 103                 (cd radiusclient;                  \
 104                  ./configure --prefix=/usr         \
 105 --- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.vns  2004-01-13 06:57:55 +0300
 106 +++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux      2004-05-28 12:01:51 +0400
 107 @@ -16,16 +16,15 @@
 108  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 109  VERSION=3.3
 110
 111 -COPTS=-O2 -g
 112 -CFLAGS=$(COPTS) -I../../../include/linux
 113 +CFLAGS += $(RPM_OPT_FLAGS) -I../../../include/linux
 114  all: rp-pppoe.so
 115
 116  rp-pppoe.so: libplugin.a plugin.o
 117         gcc -o rp-pppoe.so -shared plugin.o libplugin.a
 118
 119  install: all
 120 -       $(INSTALL) -d -m 755 $(LIBDIR)
 121 -       $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
 122 +       mkdir -p $(LIBDIR)
 123 +       $(INSTALL) -m 755 rp-pppoe.so $(LIBDIR)/
 124
 125  clean:
 126         rm -f *.o *.so
 127 --- ppp-2.4.2/pppd/plugins/Makefile.linux.vns   2004-01-13 06:56:24 +0300
 128 +++ ppp-2.4.2/pppd/plugins/Makefile.linux       2004-05-28 11:59:44 +0400
 129 @@ -1,8 +1,7 @@
 130  CC     = gcc
 131 -COPTS  = -O2 -g
 132 -CFLAGS = $(COPTS) -I.. -I../../include -fPIC
 133 +CFLAGS = $(RPM_OPT_FLAGS) -I.. -I../../include -fPIC
 134  LDFLAGS        = -shared
 135 -INSTALL        = install -o root
 136 +INSTALL        = install
 137
 138  SUBDIRS := rp-pppoe
 139  # Uncomment the next line to include the radius authentication plugin
 140 @@ -24,10 +23,10 @@
 141  LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION)
 142
 143  install: $(PLUGINS)
 144 -       $(INSTALL) -d $(LIBDIR)
 145 +       mkdir -p $(LIBDIR)
 146         $(INSTALL) $? $(LIBDIR)
 147 -       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d INSTALL=$(INSTALL) \
 148 -                               LIBDIR=$(LIBDIR) install; done
 149 +       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d INSTALL='$(INSTALL)' \
 150 +                               LIBDIR='$(LIBDIR)' install; done
 151
 152  clean:
 153         rm -f *.o *.so *.a
 154 --- ppp-2.4.2/pppd/Makefile.linux.vns   2003-11-28 00:55:19 +0300
 155 +++ ppp-2.4.2/pppd/Makefile.linux       2004-05-28 11:56:52 +0400
 156 @@ -5,7 +5,7 @@
 157
 158  # Default installation locations
 159  BINDIR = $(DESTDIR)/usr/sbin
 160 -MANDIR = $(DESTDIR)/usr/man
 161 +MANDIR = $(DESTDIR)/usr/share/man
 162  INCDIR = $(DESTDIR)/usr/include
 163
 164  TARGETS = pppd
 165 @@ -29,10 +29,10 @@
 166  include .depend
 167  endif
 168
 169 -# CC = gcc
 170 +CC = gcc
 171  #
 172 -COPTS = -O2 -pipe -Wall -g
 173 -LIBS =
 174 +COPTS = -Wall $(RPM_OPT_FLAGS)
 175 +LIBS = -lutil
 176
 177  # Uncomment the next 2 lines to include support for Microsoft's
 178  # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
 179 @@ -60,7 +60,7 @@
 180  USE_TDB=y
 181
 182  HAS_SHADOW=y
 183 -#USE_PAM=y
 184 +USE_PAM=y
 185  #HAVE_INET6=y
 186
 187  # Enable plugins
 188 @@ -98,7 +98,7 @@
 189  CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 190  LIBS   += -lsrp -L/usr/local/ssl/lib -lcrypto
 191  TARGETS        += srp-entry
 192 -EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
 193 +EXTRAINSTALL = $(INSTALL) -m 755 srp-entry $(BINDIR)/
 194  MANPAGES += srp-entry.8
 195  EXTRACLEAN += srp-entry.o
 196  NEEDDES=y
 197 @@ -119,7 +119,7 @@
 198  ifneq ($(wildcard /usr/include/crypt.h),)
 199  CFLAGS   += -DHAVE_CRYPT_H=1
 200  endif
 201 -ifneq ($(wildcard /usr/lib/libcrypt.*),)
 202 +ifneq ($(wildcard /usr/lib/libcrypt.so),)
 203  LIBS   += -lcrypt
 204  endif
 205
 206 @@ -136,7 +136,7 @@
 207  # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
 208  ifdef USE_PAM
 209  CFLAGS   += -DUSE_PAM
 210 -LIBS     += -lpam -ldl
 211 +LIBS     += -lpam
 212  endif
 213
 214  # Multi-linnk
 215 @@ -192,17 +192,15 @@
 216       CFLAGS += -DMAXOCTETS
 217  endif
 218
 219 -INSTALL= install -o root
 220 +INSTALL = install
 221
 222  all: $(TARGETS)
 223
 224  install: pppd
 225         mkdir -p $(BINDIR) $(MANDIR)
 226         $(EXTRAINSTALL)
 227 -       $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
 228 -       if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 229 -         chmod o-rx,u+s $(BINDIR)/pppd; fi
 230 -       $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
 231 +       $(INSTALL) -m 755 pppd $(BINDIR)/pppd
 232 +       $(INSTALL) -m 644 pppd.8 $(MANDIR)/man8/
 233
 234  pppd: $(PPPDOBJS)
 235         $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
 236 @@ -212,7 +210,7 @@
 237
 238  install-devel:
 239         mkdir -p $(INCDIR)/pppd
 240 -       $(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd
 241 +       $(INSTALL) -m 644 $(HEADERS) $(INCDIR)/pppd/
 242
 243  clean:
 244         rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
 245 --- ppp-2.4.2/pppdump/Makefile.linux.vns        1999-07-26 15:09:29 +0400
 246 +++ ppp-2.4.2/pppdump/Makefile.linux    2004-05-28 11:56:52 +0400
 247 @@ -1,7 +1,7 @@
 248 -CFLAGS= -O -I../include/net
 249 +CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
 250  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
 251
 252 -INSTALL= install
 253 +INSTALL = install
 254
 255  all:   pppdump
 256
 257 @@ -13,5 +13,5 @@
 258
 259  install:
 260         mkdir -p $(BINDIR) $(MANDIR)/man8
 261 -       $(INSTALL) -s -c pppdump $(BINDIR)
 262 -       $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8
 263 +       $(INSTALL) -m 755 pppdump $(BINDIR)/
 264 +       $(INSTALL) -m 644 pppdump.8 $(MANDIR)/man8/
 265 --- ppp-2.4.2/pppstats/Makefile.linux.vns       2002-11-09 14:24:43 +0300
 266 +++ ppp-2.4.2/pppstats/Makefile.linux   2004-05-28 11:56:52 +0400
 267 @@ -6,21 +6,21 @@
 268  PPPSTATSRCS = pppstats.c
 269  PPPSTATOBJS = pppstats.o
 270
 271 -#CC = gcc
 272 -COPTS = -O
 273 +CC = gcc
 274 +COPTS = $(RPM_OPT_FLAGS)
 275  COMPILE_FLAGS = -I../include
 276  LIBS =
 277
 278 -INSTALL= install -o root -g daemon
 279 +INSTALL = install
 280
 281  CFLAGS = $(COPTS) $(COMPILE_FLAGS)
 282
 283  all: pppstats
 284
 285  install: pppstats
 286 -       -mkdir -p $(MANDIR)/man8
 287 -       $(INSTALL) -s -c pppstats $(BINDIR)/pppstats
 288 -       $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8
 289 +       mkdir -p $(BINDIR) $(MANDIR)/man8
 290 +       $(INSTALL) -s -c pppstats $(BINDIR)/
 291 +       $(INSTALL) -c -m 644 pppstats.8 $(MANDIR)/man8/
 292
 293  pppstats: $(PPPSTATSRCS)
 294         $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)