Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 611526 - net-misc/networkmanager: Invalid license in files/init.d.NetworkManager and files/init.d.NetworkManager-r1
Summary: net-misc/networkmanager: Invalid license in files/init.d.NetworkManager and f...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Linux Gnome Desktop Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-03-03 13:46 UTC by Ulrich Müller
Modified: 2017-03-28 16:48 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ulrich Müller gentoo-dev 2017-03-03 13:46:18 UTC
That license doesn't exist:

# Distributed under the terms of the GNU General Purpose License v2
Comment 1 Mart Raudsepp gentoo-dev 2017-03-28 13:44:44 UTC
Feel free to get in contact with the author or clean room reimplement them or declare it is OK to change the license to GNU General Public License v2 without author relicensing.
Or maybe I can just drop openrc support instead? :D
Comment 2 Ulrich Müller gentoo-dev 2017-03-28 15:25:58 UTC
(In reply to Mart Raudsepp from comment #1)
> Feel free to get in contact with the author [...]

It's not even clear to me who the author is. I can trace the file back to bug 444814 comment 2, and it was posted there in 2012 with a date of 2008:

# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
# Distributed under the terms of the GNU General Purpose License v2

CCing Pavel Šimerda who contributed it. Can you clarify where that init file originates from?
Comment 3 Pavel Šimerda 2017-03-28 15:56:16 UTC
Thanks for looking me up, I didn't even remember doing that and was going to question my role in the process.


My proposal to include the initscript directly in Gentoo was a result of the following commit back in 2012:

commit 449ca34cb042dce0f5265e1ea42160332d702c36
Author: Pavel Šimerda <psimerda@redhat.com>
Date:   Sun Nov 18 13:49:07 2012 +0100

    initscripts: remove Gentoo initscript
    
    The Gentoo initscript is being patched downstream anyway. It
    will be easier to maintain it in just one place.
    
    See discussion at bugs.gentoo.org:
    
    https://bugs.gentoo.org/show_bug.cgi?id=441754

diff --git a/configure.ac b/configure.ac
index 6f01330f2..c5e494002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,7 +687,6 @@ cli/Makefile
 cli/src/Makefile
 test/Makefile
 initscript/RedHat/NetworkManager
-initscript/Gentoo/NetworkManager
 initscript/Debian/NetworkManager
 initscript/Slackware/rc.networkmanager
 initscript/SUSE/networkmanager
diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in
deleted file mode 100755
index 7db410be9..000000000
--- a/initscript/Gentoo/NetworkManager.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
-# Distributed under the terms of the GNU General Purpose License v2
-# $Header: $
-
-depend() {
-   need dbus
-}
-
-start() {
-   ebegin "Starting NetworkManager"
-   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
-      --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping NetworkManager"
-   start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
-   eend $?
-}
-
-# vim: set ft=gentoo-init-d ts=3 sw=3 et:


The copyright notice comes from the following commit:

commit 616663c69dedc8e44d89055fc44a4dbfdb736939
Author: Saleem Abdulrasool <asaleem@svn.gnome.org>
Date:   Thu Feb 28 06:07:50 2008 +0000

    new initscripts for Gentoo
    
    git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3346 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index e2977378d..7966017a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-27  Saleem Abdulrasool  <compnerd@compnerd.org>
+
+	reviewed by: steev@steev.net
+
+	* initscript/Gentoo/NetworkManager.in:
+	* initscript/Gentoo/NetworkManagerDispatcher.in:
+		Update the scripts and move them to Gentoo style.
+
 2008-02-27  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Will Stephenson <wstephenson@kde.org>
diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in
index 10988cc06..9b23185b3 100755
--- a/initscript/Gentoo/NetworkManager.in
+++ b/initscript/Gentoo/NetworkManager.in
@@ -1,55 +1,28 @@
 #!/sbin/runscript
-#
-# NetworkManager:   NetworkManager daemon
-#
-# chkconfig: 345 98 02
-# description:  This is a daemon for automatically switching network \
-#               connections to the best available connection. \
-#
-# processname: NetworkManager
-# pidfile: /var/run/NetworkManager.pid
-#
-### BEGIN INIT INFO
-# Provides: $network
-### END INIT INFO
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-
-NETWORKMANAGER_BIN=${sbindir}/NetworkManager
-
-# Sanity checks.
-[ -x $NETWORKMANAGER_BIN ] || exit 0
-
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 0
-
-# so we can rearrange this easily
-processname=$NETWORKMANAGER_BIN
-pidfile=/var/run/NetworkManager.pid
+# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Distributed under the terms of the GNU General Purpose License v2
+# $Header: $
 
 depend() {
-	need hald dhcdbd
+   need hald
 }
 
-start()
-{
-	if [ -e ${pidfile} ]; then
-		rm -f ${pidfile}
-	fi
-	ebegin "Starting NetworkManager"
-	start-stop-daemon --start --quiet --exec ${processname}
-	eend $?
-	echo $(/bin/pidof NetworkManager) > ${pidfile}
+start() {
+   ebegin "Starting NetworkManager"
+   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid --exec /usr/sbin/NetworkManager
+   eend $?
 }
 
-stop()
-{
-	ebegin "Stopping NetworkManager"
-	start-stop-daemon --stop --quiet --exec ${processname} --pidfile ${pidfile}
-	eend $?
-	if [ -e ${pidfile} ]; then
-		rm -f $pidfile
-	fi
+stop() {
+   local retval
+
+   ebegin "Stopping NetworkManager"
+   start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
+   retval=$?
+   eend ${retval}
+
+   [ -e /var/run/NetworkManager.pid ] && rm -f /var/run/NetworkManager.pid
+   return ${retval}
 }
+
+# vim: set ft=gentoo-init-d ts=3 sw=3 et:
diff --git a/initscript/Gentoo/NetworkManagerDispatcher.in b/initscript/Gentoo/NetworkManagerDispatcher.in
index dcfe4534b..8165275d3 100755
--- a/initscript/Gentoo/NetworkManagerDispatcher.in
+++ b/initscript/Gentoo/NetworkManagerDispatcher.in
@@ -1,52 +1,27 @@
 #!/sbin/runscript
-#
-# NetworkManagerDispatcher:   NetworkManagerDispatcher daemon
-#
-# chkconfig: 345 98 02
-# description:  This is a daemon for automatically executing scripts \
-#               when network connections change. \
-#
-# processname: NetworkManagerDispatcher
-# pidfile: /var/run/NetworkManagerDispatcher.pid
-#
-### BEGIN INIT INFO
-# Provides: networkmanager-dispatcher
-### END INIT INFO
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-
-NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# Sanity checks.
-[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 0
-
-# so we can rearrange this easily
-processname=$NETWORKMANAGERDISPATCHER_BIN
-pidfile=/var/run/NetworkManagerDispatcher.pid
+# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Distributed under the terms of the GNU General Purpose License v2
+# $Header: $
 
 depend() {
-	need NetworkManager
+   need NetworkManager
 }
 
-start()
-{
-	if [ -e ${pidfile} ]; then
-		rm -f ${pidfile}
-	fi
-	ebegin "Starting NetworkManagerDispatcher"
-	start-stop-daemon --start --quiet --exec ${processname}
-	eend $?
-	echo $(/bin/pidof NetworkManagerDispatcher) > ${pidfile}
+start() {
+   ebegin "Starting NetworkManagerDispatcher"
+      start-stop-daemon --start --quiet --pidfile /var/run/NetworkManagerDispatcher.pid --exec /usr/sbin/NetworkManagerDispatcher
+      eend $?
 }
 
-stop()
-{
-	ebegin "Stopping NetworkManagerDispatcher"
-	start-stop-daemon --stop --quiet --exec ${processname} --pidfile ${pidfile}
-	eend $?
-	if [ -e ${pidfile} ]; then
-		rm -f $pidfile
-	fi
+stop() {
+   local retval
+
+   ebegin "Stopping NetworkManagerDispatcher"
+   start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManagerDispatcher.pid
+   retval=$?
+   eend ${retval}
+
+   [ -e /var/run/NetworkManagerDispatcher.pid ] && rm -f /var/run/NetworkManagerDispatcher.pid
 }
+
+# vim: set ft=gentoo-init-d ts=3 sw=3 et:


The license line here is simply bogus. It refers to a GNU license and the reference was clearly meant to be to GNU General Public License. My opinion is that there is no ambiguity plus the initscript was contributed to the NetworkManager upstream project which is indeed GPLv2-licensed. Hope that helps.
Comment 4 Ulrich Müller gentoo-dev 2017-03-28 16:48:13 UTC
(In reply to Pavel Šimerda (pavlix) from comment #3)

Thank you for your quick but nevertheless exhaustive reply.

I have fixed the license line now, and also added a Gentoo copyright for the changes since it is in the Gentoo repository.
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d956356351a02e9363fcdb185d4b39487fbb3bd