- fixed scripts (was stoppng service on upgrade), STBR

[packages/capi4k-utils.git] / capi4k-utils-amd64.patch

diff --git a/capi4k-utils-amd64.patch b/capi4k-utils-amd64.patch
index f13aff77839b9638eaed6429ccd94fbcd315d4e1..ea1493c8adee97e3cb5405e4a84ea8d1f299b91f 100644 (file)
--- a/capi4k-utils-amd64.patch
+++ b/capi4k-utils-amd64.patch
@@ -1,6 +1,51 @@
+diff -Naur capi4k-utils.orig/capi20/Makefile.in capi4k-utils/capi20/Makefile.in
+--- capi4k-utils.orig/capi20/Makefile.in       2004-12-21 17:45:25.000000000 +0100
++++ capi4k-utils/capi20/Makefile.in    2004-12-22 20:44:32.481754152 +0100
+@@ -118,7 +118,7 @@
+ libcapi20_la_LIBADD = 
+ libcapi20_la_OBJECTS =  capi20.lo capifunc.lo convert.lo
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+@@ -261,7 +261,7 @@
+       done
+ 
+ libcapi20.la: $(libcapi20_la_OBJECTS) $(libcapi20_la_DEPENDENCIES)
+-      $(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS)
++      $(LINK) -rpath $(libdir) $(libcapi20_la_LDFLAGS) $(libcapi20_la_CFLAGS) $(libcapi20_la_OBJECTS) $(libcapi20_la_LIBADD) $(LIBS)
+ 
+ install-includeHEADERS: $(include_HEADERS)
+       @$(NORMAL_INSTALL)
+diff -Naur capi4k-utils.orig/Makefile capi4k-utils/Makefile
+--- capi4k-utils.orig/Makefile 2004-12-21 17:45:25.000000000 +0100
++++ capi4k-utils/Makefile      2004-12-22 20:44:47.104531152 +0100
+@@ -121,7 +121,7 @@
+       @set -e; for i in `echo $(SUBDIRS)`; do \
+               if [ -x $$i/configure ] ; then \
+                       echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
+-                      (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++                      (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --libdir=$(CONFIG_LIBDIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+               elif [ -f $$i/Makefile.in ] ; then \
+                       echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
+                       $(MAKE) -C $$i -f Makefile.in config; \
+diff -Naur capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile
+--- capi4k-utils.orig/pppdcapiplugin/ppp-2.4.2/Makefile        2004-12-21 17:45:25.000000000 +0100
++++ capi4k-utils/pppdcapiplugin/ppp-2.4.2/Makefile     2004-12-22 20:44:47.104531152 +0100
+@@ -8,7 +8,7 @@
+ #  as published by the Free Software Foundation; either version
+ #  2 of the License, or (at your option) any later version.
+ 
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}/usr/lib64/pppd/$(PPPVERSION)
+ 
+ include $(TOPDIR)/Rules.make
+ 
 diff -Naur capi4k-utils.orig/pppdcapiplugin/Rules.make capi4k-utils/pppdcapiplugin/Rules.make
---- capi4k-utils.orig/pppdcapiplugin/Rules.make        2004-12-21 17:45:25.851790632 +0100
-+++ capi4k-utils/pppdcapiplugin/Rules.make     2004-12-21 17:48:14.556143672 +0100
+--- capi4k-utils.orig/pppdcapiplugin/Rules.make        2004-12-21 17:45:25.000000000 +0100
++++ capi4k-utils/pppdcapiplugin/Rules.make     2004-12-22 20:44:32.481754152 +0100
 @@ -21,7 +21,7 @@
  all:  $(ALL)