[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/files/

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/files/

[Andrew Savchenko]

commit:     70e863ab94747fbfc26fb470203d7d08164f105f
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 23 02:22:13 2018 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Aug 23 02:29:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e863ab

net-dialup/openl2tp: fix spelling

Fix spelling in the init script.

Bug: https://bugs.gentoo.org/664266
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-dialup/openl2tp/files/openl2tpd.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/openl2tp/files/openl2tpd.initd b/net-dialup/openl2tp/files/openl2tpd.initd
index b1d1511a564..fda6770fa90 100644
--- a/net-dialup/openl2tp/files/openl2tpd.initd
+++ b/net-dialup/openl2tp/files/openl2tpd.initd
@@ -61,7 +61,7 @@ stop() {
     rc=$?
 
     if [ ${RC_CMD} = "restart" ]; then
-        einfo "sleepinng for server to finilize connections"
+        einfo "sleeping for server to finalize connections"
         sleep 2
     fi
 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/files/

[Andrew Savchenko]

commit:     598ce885303151097f29e96a0952c1ec642a4454
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 13:52:50 2020 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 14:15:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598ce885

net-dialup/openl2tp: fix rare parallel race

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 .../openl2tp/files/openl2tp-1.8-parallelbuild.patch | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
index fb6b9f96b35..8851f321f27 100644
--- a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
@@ -1,6 +1,5 @@
-diff -rau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile
---- openl2tp-1.8.o/Makefile	2011-06-03 18:21:09.000000000 +0200
-+++ openl2tp-1.8/Makefile	2011-06-03 18:54:43.000000000 +0200
+--- openl2tp-1.8/Makefile.orig	2020-07-12 12:53:31.484055262 +0300
++++ openl2tp-1.8/Makefile	2020-07-12 12:56:45.783822669 +0300
 @@ -197,7 +197,7 @@
  
  .PHONY:			$(SUBDIRS:%=subdir-%)
@@ -19,9 +18,19 @@ diff -rau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile
  			$(CC) -I. -MMD -w $(CFLAGS.optimize) -c -DYY_NO_UNPUT $<
  
  l2tp_config_parse.o:	l2tp_config_parse.c l2tp_config_parse.h
-@@ -271,7 +271,7 @@
- l2tpconfig:		$(L2TPCONFIG_SRCS.o)
- 			$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig)
+@@ -265,13 +265,13 @@
+ 			@for d in $(SUBDIRS); do $(MAKE) -C $$d $(MFLAGS) $@; done
+ 			etags $(wildcard *.c) $(wildcard *.h)
+ 
+-openl2tpd:		$(L2TPD_SRCS.o)
+-			$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpd)
++openl2tpd:	generated-files $(SUBDIRS:%=subdir-%) 	$(L2TPD_SRCS.o)
++			$(CC) $(LDFLAGS) -o $@ $(L2TPD_SRCS.o) $(LDFLAGS.l2tpd)
+ 
+-l2tpconfig:		$(L2TPCONFIG_SRCS.o)
+-			$(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig)
++l2tpconfig:	openl2tpd	$(L2TPCONFIG_SRCS.o)
++			$(CC) $(LDFLAGS) -o $@ $(L2TPCONFIG_SRCS.o) $(LDFLAGS.l2tpconfig)
  
 -%.o:	%.c
 +%.o:	%.c generated-files