Bump to version 8.0.0 and update copyright notices

Signed-off-by: Rob White <rob@blue-wave.net>
This commit is contained in:
Rob White
2021-01-02 09:17:34 +00:00
parent 0fae7dcacf
commit e39ace8199
21 changed files with 35 additions and 38 deletions

View File

@@ -47,18 +47,14 @@ install:
mkdir -p $(DESTDIR)/usr/lib/opennds
cp forward_authentication_service/binauth/binauth_log.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/binauth_log.sh
cp forward_authentication_service/binauth/binauth_sitewide.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/binauth_sitewide.sh
cp forward_authentication_service/binauth/userlist.dat $(DESTDIR)/etc/opennds/
cp forward_authentication_service/binauth/splash_sitewide.html $(DESTDIR)/etc/opennds/htdocs/
cp forward_authentication_service/PreAuth/login.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/login.sh
cp forward_authentication_service/PreAuth/login-remote-image.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/login-remote-image.sh
cp forward_authentication_service/libs/get_client_interface.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/get_client_interface.sh
cp forward_authentication_service/libs/get_client_token.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/get_client_token.sh
cp forward_authentication_service/libs/client_params.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/client_params.sh
cp forward_authentication_service/libs/unescape.sh $(DESTDIR)/usr/lib/opennds/
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/unescape.sh
cp forward_authentication_service/libs/authmon.sh $(DESTDIR)/usr/lib/opennds/
@@ -67,6 +63,7 @@ install:
sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/opennds/dnsconfig.sh
cp forward_authentication_service/libs/post-request.php $(DESTDIR)/usr/lib/opennds/
cp forward_authentication_service/fas-aes/fas-aes.php $(DESTDIR)/etc/opennds/
cp forward_authentication_service/fas-hid/fas-hid.php $(DESTDIR)/etc/opennds/
cp forward_authentication_service/fas-aes/fas-aes-https.php $(DESTDIR)/etc/opennds/

View File

@@ -52,7 +52,7 @@ master_doc = 'index'
# General information about the project.
project = 'openNDS'
copyright = '2016 - 2020, The NoDogSplash and openNDS Contributors'
copyright = '2016 - 2021, The NoDogSplash and openNDS Contributors'
author = 'The openNDS Contributors'
# The version info for the project you're documenting, acts as replacement for
@@ -60,9 +60,9 @@ author = 'The openNDS Contributors'
# built documents.
#
# The short X.Y version.
version = '7.0.2beta'
version = '8.0.0beta'
# The full version, including alpha/beta/rc tags.
release = '7.0.2beta'
release = '8.0.0beta'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View File

@@ -1,6 +1,6 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) The openNDS Contributors 2004-2021
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)

View File

@@ -1,10 +1,10 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) The openNDS Contributors 2004-2021
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)
# This is changed to bash automatically by Makefile for Debian
# This is changed to bash automatically by Makefile for generic Linux
#
# functions:

View File

@@ -1,6 +1,6 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) The openNDS Contributors 2004-2021
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
# This is an example script for BinAuth

View File

@@ -1,6 +1,6 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) The openNDS Contributors 2004-2021
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
# This is an example script for BinAuth

View File

@@ -89,7 +89,7 @@ Available variables:
<copy-right>
<img style="float:left; max-height:5em; height:auto; width:auto" src="/images/splash.jpg" alt="Splash Page: For access to the Internet.">
<br><br><br>
Copyright &copy; The openNDS Contributors 2004-2020.<br>
Copyright &copy; The openNDS Contributors 2004-2021.<br>
This software is released under the GNU GPL license.<br>
openNDS version $version
</copy-right>

View File

@@ -1,5 +1,5 @@
<?php
/* (c) Blue Wave Projects and Services 2015-2020. This software is released under the GNU GPL license.
/* (c) Blue Wave Projects and Services 2015-2021. This software is released under the GNU GPL license.
This is a FAS script providing an example of remote Forward Authentication for openNDS (NDS) on an http web server supporting PHP.

View File

@@ -1,4 +1,6 @@
#!/bin/sh
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
url=$1
gatewayhash=$2

View File

@@ -1,5 +1,4 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2021
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#

View File

@@ -1,6 +1,5 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)

View File

@@ -1,6 +1,5 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)

View File

@@ -1,6 +1,6 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) The openNDS Contributors 2004-2021
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)

View File

@@ -1,5 +1,6 @@
<?php
//Copyright (C) BlueWave Projects and Services 2016-2020
#Copyright (C) BlueWave Projects and Services 2016-2021
#This software is released under the GNU GPL license.
if (isset($argv[1])) {$remote_url=$argv[1];} else {echo "missing argument\n"; exit(1);}
if (isset($argv[2])) {$action=$argv[2];} else {echo "missing argument\n"; exit(1);}

View File

@@ -1,6 +1,6 @@
#!/bin/sh
#Copyright (C) The openNDS Contributors 2004-2020
#Copyright (C) BlueWave Projects and Services 2015-2020
#Copyright (C) BlueWave Projects and Services 2015-2021
#This software is released under the GNU GPL license.
#
# Warning - shebang sh is for compatibliity with busybox ash (eg on OpenWrt)

View File

@@ -1,7 +1,7 @@
Forwarding Authentication Service (FAS)
Author: Rob White @bluewavenet - BlueWave Projects and Services
Copyright (C) 2015-2020 BlueWave Projects and Services. This software is released under the GNU GPL license.
Copyright (C) 2015-2021 BlueWave Projects and Services. This software is released under the GNU GPL license.
openNDS (NDS) supports external (to NDS) authentication with with simple config options.
In addition, Binauth can be configured to be operational at the same time as FAS to provide post authentication processing.

View File

@@ -3,7 +3,7 @@ Upstream-Name: opennds
Source: http://github.com/opennds
Files: *
Copyright: (C) 2013-20 BlueWave Projects and Services <dot@blue-wave.net>
Copyright: (C) 2013-21 BlueWave Projects and Services <dot@blue-wave.net>
(C) 2013-20 Moritz Warning <moritzwarning@web.de>
(C) 2013 Shiao-An Yuan <shiao.an.yuan@gmail.com>
(C) 2010 Fred Moyer <fred@slwifi.com>

View File

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=opennds
PKG_FIXUP:=autoreconf
PKG_VERSION:=7.0.2beta
PKG_VERSION:=8.0.0beta
PKG_RELEASE:=1
PKG_SOURCE_URL:=https://codeload.github.com/opennds/opennds/tar.gz/v$(PKG_VERSION)?

View File

@@ -14,9 +14,9 @@ When ready to do a release, do the following:
12. Commit and Push to origin
13. Github - Create Pull Request and Merge to master
14. Github proceed to "Draft New Release"
15. Github tag release as eg. v7.0.2 (remembering the leading "v"")
(or use git tag -a v7.0.2 -m "opennds release 7.0.2 " and git push --tags.)
15. Github tag release as eg. v8.0.0 (remembering the leading "v"")
(or use git tag -a v8.0.1 -m "opennds release 8.0.1 " and git push --tags.)
16. In your local repository, make a new branch called "stable"
17. Push branch "stable" to origin, overwriting the existing "stable".
Note:Branch stable is the source for the readthedocs stable documentation at https://openndsdocs.readthedocs.io/en/stable/
18. In Master, set version to -beta eg 7.0.3-beta in conf.h, conf.py, openwrt/Makefile
18. In Master, set version to -beta eg 8.0.1-beta in conf.h, conf.py, openwrt/Makefile

View File

@@ -36,7 +36,7 @@ Status:
<p><italic-black>You can use your Browser, Email and other network Apps as you normally would.</italic-black></p>
<hr>
<copy-right>Copyright &copy; The openNDS Contributors 2004-2020.<br>
<copy-right>Copyright &copy; The openNDS Contributors 2004-2021.<br>
This software is released under the GNU GPL license.<br>
openNDS version $version
</copy-right>

View File

@@ -24,12 +24,12 @@
@author Copyright (C) 2007 Paul Kube <nodogsplash@kokoro.ucsd.edu>
*/
#define COPYRIGHT "openNDS, Copyright (C) 2020, The openNDS Contributors"
#define COPYRIGHT "openNDS, Copyright (C) 2021, The openNDS Contributors"
#ifndef _CONF_H_
#define _CONF_H_
#define VERSION "7.0.2beta"
#define VERSION "8.0.0beta"
/*
* Defines how many times should we try detecting the interface with the default route (in seconds).